158 files changed, 65238 insertions, 65238 deletions

diff --git a/asm/charmap.s b/asm/charmap.s
index 9ff6cda30..9e96e3966 100644
--- a/asm/charmap.s
+++ b/asm/charmap.s
@@ -85,7 +85,7 @@
 	.charmap ":", 0xF0
 	.charmap "$", 0xFF
 
-; Hiragana
+@ Hiragana
 	.charmap "あ", 0x01
 	.charmap "い", 0x02
 	.charmap "う", 0x03
@@ -167,7 +167,7 @@
 	.charmap "ぽ", 0x4F
 	.charmap "っ", 0x50
 
-; Katakana
+@ Katakana
 	.charmap "ア", 0x51
 	.charmap "イ", 0x52
 	.charmap "ウ", 0x53
@@ -253,16 +253,16 @@
 	.charmapconst PKMN, 0x53, 0x54
 	.charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59
 
-; string refs
-	; unknown (0xFD, 0x00)
+@ string refs
+	@ unknown (0xFD, 0x00)
 	.charmapconst PLAYER,   0xFD, 0x01
 	.charmapconst STRVAR_1, 0xFD, 0x02
 	.charmapconst STRVAR_2, 0xFD, 0x03
 	.charmapconst STRVAR_3, 0xFD, 0x04
-	; unknown (0xFD, 0x05)
+	@ unknown (0xFD, 0x05)
 	.charmapconst RIVAL,    0xFD, 0x06
-; version-dependent strings (originally made for Ruby/Sapphire differences)
-	.charmapconst VERSION,  0xFD, 0x07 ; "EMERALD"
+@ version-dependent strings (originally made for Ruby/Sapphire differences)
+	.charmapconst VERSION,  0xFD, 0x07 @ "EMERALD"
 	.charmapconst AQUA,     0xFD, 0x08
 	.charmapconst MAGMA,    0xFD, 0x09
 	.charmapconst ARCHIE,   0xFD, 0x0A
diff --git a/asm/crt0.s b/asm/crt0.s
index fa6d13c94..a6d0b07d7 100644
--- a/asm/crt0.s
+++ b/asm/crt0.s
@@ -1,24 +1,24 @@
-RomBase: ; 8000000
+RomBase: @ 8000000
 	b Init
 
 	.include "asm/rom_header.s"
 
-; 80000C0
+@ 80000C0
 	.4byte 0
 
-GPIOPortData: ; 80000C4
+GPIOPortData: @ 80000C4
 	.2byte 0
 
-GPIOPortDirection: ; 80000C6
+GPIOPortDirection: @ 80000C6
 	.2byte 0
 
-GPIOPortReadWrite: ; 80000C8
+GPIOPortReadWrite: @ 80000C8
 	.2byte 0
 
 	.incbin "base_emerald.gba", 0xCA, 0x204 - 0xCA
 
 	arm_func_start Init
-Init: ; 8000204
+Init: @ 8000204
 	mov r0, PSR_IRQ_MODE
 	msr cpsr_cf, r0
 	ldr sp, sp_irq
@@ -42,7 +42,7 @@ sp_irq: .4byte IWRAM_END - 0x60
 	arm_func_end Init
 
 	arm_func_start InterruptMain
-InterruptMain: ; 8000248
+InterruptMain: @ 8000248
 	mov r3, REG_BASE
 	add r3, r3, 0x200
 	ldr r2, [r3, OFFSET_REG_IE - 0x200]
diff --git a/asm/dma3_manager.s b/asm/dma3_manager.s
index c76abb419..33f0ad976 100644
--- a/asm/dma3_manager.s
+++ b/asm/dma3_manager.s
@@ -1,6 +1,6 @@
 	thumb_func_start ClearDma3Requests
-; void ClearDma3Requests()
-ClearDma3Requests: ; 8000BB8
+@ void ClearDma3Requests()
+ClearDma3Requests: @ 8000BB8
 	push {lr}
 	ldr r2, =gDma3ManagerLocked
 	movs r0, 0x1
@@ -27,8 +27,8 @@ _8000BCC:
 	thumb_func_end ClearDma3Requests
 
 	thumb_func_start ProcessDma3Requests
-; void ProcessDma3Requests()
-ProcessDma3Requests: ; 8000BF0
+@ void ProcessDma3Requests()
+ProcessDma3Requests: @ 8000BF0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -340,8 +340,8 @@ _08000E46:
 	thumb_func_end ProcessDma3Requests
 
 	thumb_func_start RequestDma3Copy
-; int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode)
-RequestDma3Copy: ; 8000E68
+@ int RequestDma3Copy(void *src, void *dest, u16 size, u8 mode)
+RequestDma3Copy: @ 8000E68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -420,8 +420,8 @@ _08000EF0:
 	thumb_func_end RequestDma3Copy
 
 	thumb_func_start RequestDma3Fill
-; int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
-RequestDma3Fill: ; 8000F00
+@ int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
+RequestDma3Fill: @ 8000F00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -506,8 +506,8 @@ _08000F96:
 	thumb_func_end RequestDma3Fill
 
 	thumb_func_start CheckForSpaceForDma3Request
-; int CheckForSpaceForDma3Request(s16 index)
-CheckForSpaceForDma3Request: ; 8000FA4
+@ int CheckForSpaceForDma3Request(s16 index)
+CheckForSpaceForDma3Request: @ 8000FA4
 	push {lr}
 	movs r2, 0
 	lsls r0, 16
diff --git a/asm/emerald.s b/asm/emerald.s
index 1b48e8b07..7e76882cf 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -24,7 +24,7 @@ Start:
 	.include "asm/string_util.s"
 
 	thumb_func_start sub_80093CC
-sub_80093CC: ; 80093CC
+sub_80093CC: @ 80093CC
 	push {lr}
 	bl sub_800B488
 	bl sub_800E700
@@ -48,7 +48,7 @@ _080093FE:
 	thumb_func_end sub_80093CC
 
 	thumb_func_start sub_8009404
-sub_8009404: ; 8009404
+sub_8009404: @ 8009404
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -58,7 +58,7 @@ sub_8009404: ; 8009404
 	thumb_func_end sub_8009404
 
 	thumb_func_start sub_8009414
-sub_8009414: ; 8009414
+sub_8009414: @ 8009414
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -159,7 +159,7 @@ _080094C0:
 	thumb_func_end sub_8009414
 
 	thumb_func_start sub_80094EC
-sub_80094EC: ; 80094EC
+sub_80094EC: @ 80094EC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -215,7 +215,7 @@ sub_80094EC: ; 80094EC
 	thumb_func_end sub_80094EC
 
 	thumb_func_start sub_8009570
-sub_8009570: ; 8009570
+sub_8009570: @ 8009570
 	push {r4,lr}
 	sub sp, 0x4
 	bl ResetAllObjectData
@@ -277,7 +277,7 @@ _080095A0:
 	thumb_func_end sub_8009570
 
 	thumb_func_start sub_8009628
-sub_8009628: ; 8009628
+sub_8009628: @ 8009628
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x020229cc
@@ -287,7 +287,7 @@ sub_8009628: ; 8009628
 	thumb_func_end sub_8009628
 
 	thumb_func_start sub_8009638
-sub_8009638: ; 8009638
+sub_8009638: @ 8009638
 	push {r4,r5,lr}
 	ldr r5, =0x020229cc
 	ldr r4, =0x03005d90
@@ -344,7 +344,7 @@ _0800969E:
 	thumb_func_end sub_8009638
 
 	thumb_func_start sub_80096BC
-sub_80096BC: ; 80096BC
+sub_80096BC: @ 80096BC
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -354,7 +354,7 @@ sub_80096BC: ; 80096BC
 	thumb_func_end sub_80096BC
 
 	thumb_func_start sub_80096D0
-sub_80096D0: ; 80096D0
+sub_80096D0: @ 80096D0
 	push {lr}
 	ldr r3, =0x020229c4
 	ldr r1, =0x03003110
@@ -375,7 +375,7 @@ _080096DC:
 	thumb_func_end sub_80096D0
 
 	thumb_func_start task02_080097CC
-task02_080097CC: ; 80096FC
+task02_080097CC: @ 80096FC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -403,7 +403,7 @@ _08009726:
 	thumb_func_end task02_080097CC
 
 	thumb_func_start sub_8009734
-sub_8009734: ; 8009734
+sub_8009734: @ 8009734
 	push {r4-r6,lr}
 	ldr r0, =0x030030fc
 	ldrb r4, [r0]
@@ -464,7 +464,7 @@ _080097BE:
 	thumb_func_end sub_8009734
 
 	thumb_func_start sub_80097E8
-sub_80097E8: ; 80097E8
+sub_80097E8: @ 80097E8
 	push {r4,lr}
 	ldr r0, =0x03003124
 	movs r4, 0
@@ -485,7 +485,7 @@ _080097FC:
 	thumb_func_end sub_80097E8
 
 	thumb_func_start sub_8009818
-sub_8009818: ; 8009818
+sub_8009818: @ 8009818
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -588,7 +588,7 @@ _080098CE:
 	thumb_func_end sub_8009818
 
 	thumb_func_start sub_8009900
-sub_8009900: ; 8009900
+sub_8009900: @ 8009900
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r4, =0x030022c0
@@ -674,7 +674,7 @@ _08009996:
 	thumb_func_end sub_8009900
 
 	thumb_func_start c2_08009A8C
-c2_08009A8C: ; 80099BC
+c2_08009A8C: @ 80099BC
 	push {lr}
 	bl sub_8009900
 	movs r0, 0x1
@@ -690,7 +690,7 @@ c2_08009A8C: ; 80099BC
 	thumb_func_end c2_08009A8C
 
 	thumb_func_start sub_80099E0
-sub_80099E0: ; 80099E0
+sub_80099E0: @ 80099E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x020229c4
@@ -745,7 +745,7 @@ _08009A3C:
 	thumb_func_end sub_80099E0
 
 	thumb_func_start sub_8009A58
-sub_8009A58: ; 8009A58
+sub_8009A58: @ 8009A58
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -784,7 +784,7 @@ _08009A94:
 	thumb_func_end sub_8009A58
 
 	thumb_func_start sub_8009AA0
-sub_8009AA0: ; 8009AA0
+sub_8009AA0: @ 8009AA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1127,7 +1127,7 @@ _08009D7A:
 	thumb_func_end sub_8009AA0
 
 	thumb_func_start sub_8009D90
-sub_8009D90: ; 8009D90
+sub_8009D90: @ 8009D90
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -1294,7 +1294,7 @@ _08009F06:
 	thumb_func_end sub_8009D90
 
 	thumb_func_start sub_8009F18
-sub_8009F18: ; 8009F18
+sub_8009F18: @ 8009F18
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -1311,7 +1311,7 @@ _08009F26:
 	thumb_func_end sub_8009F18
 
 	thumb_func_start sub_8009F3C
-sub_8009F3C: ; 8009F3C
+sub_8009F3C: @ 8009F3C
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -1337,7 +1337,7 @@ _08009F6A:
 	thumb_func_end sub_8009F3C
 
 	thumb_func_start sub_8009F70
-sub_8009F70: ; 8009F70
+sub_8009F70: @ 8009F70
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -1352,7 +1352,7 @@ _08009F80:
 	thumb_func_end sub_8009F70
 
 	thumb_func_start sub_8009F8C
-sub_8009F8C: ; 8009F8C
+sub_8009F8C: @ 8009F8C
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r1, [r0]
@@ -1371,7 +1371,7 @@ _08009FA4:
 	thumb_func_end sub_8009F8C
 
 	thumb_func_start sub_8009FAC
-sub_8009FAC: ; 8009FAC
+sub_8009FAC: @ 8009FAC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r1, [r0]
@@ -1390,7 +1390,7 @@ _08009FC4:
 	thumb_func_end sub_8009FAC
 
 	thumb_func_start sub_8009FCC
-sub_8009FCC: ; 8009FCC
+sub_8009FCC: @ 8009FCC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -1413,7 +1413,7 @@ _08009FF4:
 	thumb_func_end sub_8009FCC
 
 	thumb_func_start sub_8009FF8
-sub_8009FF8: ; 8009FF8
+sub_8009FF8: @ 8009FF8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -1452,13 +1452,13 @@ _0800A034:
 	thumb_func_end sub_8009FF8
 
 	thumb_func_start sub_800A03C
-sub_800A03C: ; 800A03C
+sub_800A03C: @ 800A03C
 	movs r0, 0x2
 	bx lr
 	thumb_func_end sub_800A03C
 
 	thumb_func_start sub_800A040
-sub_800A040: ; 800A040
+sub_800A040: @ 800A040
 	push {lr}
 	bl sub_8009FCC
 	lsls r0, 24
@@ -1481,7 +1481,7 @@ _0800A060:
 	thumb_func_end sub_800A040
 
 	thumb_func_start sub_800A064
-sub_800A064: ; 800A064
+sub_800A064: @ 800A064
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0x1
@@ -1498,7 +1498,7 @@ _0800A078:
 	thumb_func_end sub_800A064
 
 	thumb_func_start sub_800A07C
-sub_800A07C: ; 800A07C
+sub_800A07C: @ 800A07C
 	push {lr}
 	movs r0, 0x4
 	movs r1, 0x5
@@ -1525,7 +1525,7 @@ _0800A0A6:
 	thumb_func_end sub_800A07C
 
 	thumb_func_start sub_800A0AC
-sub_800A0AC: ; 800A0AC
+sub_800A0AC: @ 800A0AC
 	push {lr}
 	ldr r0, =0x03000d5c
 	movs r1, 0
@@ -1539,7 +1539,7 @@ sub_800A0AC: ; 800A0AC
 	thumb_func_end sub_800A0AC
 
 	thumb_func_start sub_800A0C8
-sub_800A0C8: ; 800A0C8
+sub_800A0C8: @ 800A0C8
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -1706,7 +1706,7 @@ _0800A22E:
 	thumb_func_end sub_800A0C8
 
 	thumb_func_start sub_800A23C
-sub_800A23C: ; 800A23C
+sub_800A23C: @ 800A23C
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r4, 0
@@ -1761,7 +1761,7 @@ _0800A298:
 	thumb_func_end sub_800A23C
 
 	thumb_func_start sub_800A2A4
-sub_800A2A4: ; 800A2A4
+sub_800A2A4: @ 800A2A4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020229e8
@@ -1776,7 +1776,7 @@ sub_800A2A4: ; 800A2A4
 	thumb_func_end sub_800A2A4
 
 	thumb_func_start sub_800A2BC
-sub_800A2BC: ; 800A2BC
+sub_800A2BC: @ 800A2BC
 	push {r4,r5,lr}
 	ldr r5, =0x020229e8
 	movs r4, 0x4
@@ -1796,7 +1796,7 @@ _0800A2C2:
 	thumb_func_end sub_800A2BC
 
 	thumb_func_start sub_800A2E0
-sub_800A2E0: ; 800A2E0
+sub_800A2E0: @ 800A2E0
 	ldr r1, =0x03000d10
 	movs r0, 0
 	strb r0, [r1, 0x8]
@@ -1808,7 +1808,7 @@ sub_800A2E0: ; 800A2E0
 	thumb_func_end sub_800A2E0
 
 	thumb_func_start sub_800A2F4
-sub_800A2F4: ; 800A2F4
+sub_800A2F4: @ 800A2F4
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	adds r6, r1, 0
@@ -1859,7 +1859,7 @@ _0800A34A:
 	thumb_func_end sub_800A2F4
 
 	thumb_func_start sub_800A364
-sub_800A364: ; 800A364
+sub_800A364: @ 800A364
 	push {lr}
 	ldr r1, =0x03000d50
 	ldr r0, [r1]
@@ -1877,7 +1877,7 @@ _0800A378:
 	thumb_func_end sub_800A364
 
 	thumb_func_start sub_800A388
-sub_800A388: ; 800A388
+sub_800A388: @ 800A388
 	push {r4-r6,lr}
 	ldr r0, =0x03000d10
 	ldr r5, [r0, 0x4]
@@ -1923,7 +1923,7 @@ _0800A3D0:
 	thumb_func_end sub_800A388
 
 	thumb_func_start sub_800A3EC
-sub_800A3EC: ; 800A3EC
+sub_800A3EC: @ 800A3EC
 	ldr r1, =0x03003140
 	movs r0, 0
 	str r0, [r1]
@@ -1932,7 +1932,7 @@ sub_800A3EC: ; 800A3EC
 	thumb_func_end sub_800A3EC
 
 	thumb_func_start sub_800A3F8
-sub_800A3F8: ; 800A3F8
+sub_800A3F8: @ 800A3F8
 	push {lr}
 	bl link_get_multiplayer_id
 	ldr r0, =0x00004444
@@ -1947,7 +1947,7 @@ sub_800A3F8: ; 800A3F8
 	thumb_func_end sub_800A3F8
 
 	thumb_func_start sub_800A418
-sub_800A418: ; 800A418
+sub_800A418: @ 800A418
 	push {lr}
 	ldr r1, =0x020223c0
 	movs r0, 0
@@ -1970,7 +1970,7 @@ _0800A43E:
 	thumb_func_end sub_800A418
 
 	thumb_func_start sub_800A44C
-sub_800A44C: ; 800A44C
+sub_800A44C: @ 800A44C
 	ldr r0, =0x020223c0
 	ldr r0, [r0]
 	bx lr
@@ -1978,7 +1978,7 @@ sub_800A44C: ; 800A44C
 	thumb_func_end sub_800A44C
 
 	thumb_func_start sub_800A458
-sub_800A458: ; 800A458
+sub_800A458: @ 800A458
 	push {lr}
 	ldr r0, =0x0000aaaa
 	bl sub_8009D90
@@ -1988,7 +1988,7 @@ sub_800A458: ; 800A458
 	thumb_func_end sub_800A458
 
 	thumb_func_start link_get_multiplayer_id
-link_get_multiplayer_id: ; 800A468
+link_get_multiplayer_id: @ 800A468
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -2010,7 +2010,7 @@ _0800A48C:
 	thumb_func_end link_get_multiplayer_id
 
 	thumb_func_start bitmask_all_link_players_but_self
-bitmask_all_link_players_but_self: ; 800A490
+bitmask_all_link_players_but_self: @ 800A490
 	push {lr}
 	bl link_get_multiplayer_id
 	adds r1, r0, 0
@@ -2027,7 +2027,7 @@ bitmask_all_link_players_but_self: ; 800A490
 	thumb_func_end bitmask_all_link_players_but_self
 
 	thumb_func_start link_0800A448
-link_0800A448: ; 800A4AC
+link_0800A448: @ 800A4AC
 	push {lr}
 	adds r3, r1, 0
 	lsls r2, 16
@@ -2051,7 +2051,7 @@ _0800A4CE:
 	thumb_func_end link_0800A448
 
 	thumb_func_start sub_800A4D8
-sub_800A4D8: ; 800A4D8
+sub_800A4D8: @ 800A4D8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -2087,7 +2087,7 @@ _0800A514:
 	thumb_func_end sub_800A4D8
 
 	thumb_func_start sub_800A520
-sub_800A520: ; 800A520
+sub_800A520: @ 800A520
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -2114,7 +2114,7 @@ _0800A546:
 	thumb_func_end sub_800A520
 
 	thumb_func_start sub_800A550
-sub_800A550: ; 800A550
+sub_800A550: @ 800A550
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -2143,7 +2143,7 @@ _0800A580:
 	thumb_func_end sub_800A550
 
 	thumb_func_start sub_800A588
-sub_800A588: ; 800A588
+sub_800A588: @ 800A588
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -2167,7 +2167,7 @@ _0800A5AC:
 	thumb_func_end sub_800A588
 
 	thumb_func_start sub_800A5B4
-sub_800A5B4: ; 800A5B4
+sub_800A5B4: @ 800A5B4
 	push {r4,lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -2200,7 +2200,7 @@ _0800A5E2:
 	thumb_func_end sub_800A5B4
 
 	thumb_func_start sub_800A5EC
-sub_800A5EC: ; 800A5EC
+sub_800A5EC: @ 800A5EC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -2227,7 +2227,7 @@ _0800A616:
 	thumb_func_end sub_800A5EC
 
 	thumb_func_start sub_800A620
-sub_800A620: ; 800A620
+sub_800A620: @ 800A620
 	push {lr}
 	ldr r0, =0x030030e0
 	ldr r1, [r0]
@@ -2249,7 +2249,7 @@ _0800A63C:
 	thumb_func_end sub_800A620
 
 	thumb_func_start sub_800A648
-sub_800A648: ; 800A648
+sub_800A648: @ 800A648
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -2278,7 +2278,7 @@ _0800A66E:
 	thumb_func_end sub_800A648
 
 	thumb_func_start sub_800A678
-sub_800A678: ; 800A678
+sub_800A678: @ 800A678
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2309,7 +2309,7 @@ sub_800A678: ; 800A678
 	thumb_func_end sub_800A678
 
 	thumb_func_start sub_800A6B0
-sub_800A6B0: ; 800A6B0
+sub_800A6B0: @ 800A6B0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2339,7 +2339,7 @@ sub_800A6B0: ; 800A6B0
 	thumb_func_end sub_800A6B0
 
 	thumb_func_start sub_800A6E8
-sub_800A6E8: ; 800A6E8
+sub_800A6E8: @ 800A6E8
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -2388,7 +2388,7 @@ _0800A734:
 	thumb_func_end sub_800A6E8
 
 	thumb_func_start sub_800A73C
-sub_800A73C: ; 800A73C
+sub_800A73C: @ 800A73C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2473,7 +2473,7 @@ _0800A7CA:
 	thumb_func_end sub_800A73C
 
 	thumb_func_start sub_800A7DC
-sub_800A7DC: ; 800A7DC
+sub_800A7DC: @ 800A7DC
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -2515,7 +2515,7 @@ _0800A81C:
 	thumb_func_end sub_800A7DC
 
 	thumb_func_start sub_800A824
-sub_800A824: ; 800A824
+sub_800A824: @ 800A824
 	push {lr}
 	ldr r0, =0x030030e0
 	ldr r0, [r0]
@@ -2536,7 +2536,7 @@ _0800A838:
 	thumb_func_end sub_800A824
 
 	thumb_func_start task00_link_test
-task00_link_test: ; 800A850
+task00_link_test: @ 800A850
 	push {r4-r6,lr}
 	sub sp, 0x20
 	ldr r1, =gUnknown_082ED1E4
@@ -2663,7 +2663,7 @@ _0800A94E:
 	thumb_func_end task00_link_test
 
 	thumb_func_start sub_800A994
-sub_800A994: ; 800A994
+sub_800A994: @ 800A994
 	ldr r2, =0x0300302c
 	str r0, [r2]
 	ldr r0, =0x03003070
@@ -2673,7 +2673,7 @@ sub_800A994: ; 800A994
 	thumb_func_end sub_800A994
 
 	thumb_func_start sub_800A9A8
-sub_800A9A8: ; 800A9A8
+sub_800A9A8: @ 800A9A8
 	push {r4,lr}
 	movs r1, 0
 	movs r2, 0
@@ -2701,7 +2701,7 @@ _0800A9CA:
 	thumb_func_end sub_800A9A8
 
 	thumb_func_start sub_800A9D8
-sub_800A9D8: ; 800A9D8
+sub_800A9D8: @ 800A9D8
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r5, 0
@@ -2727,7 +2727,7 @@ _0800A9EE:
 	thumb_func_end sub_800A9D8
 
 	thumb_func_start sub_800AA04
-sub_800AA04: ; 800AA04
+sub_800AA04: @ 800AA04
 	push {r4-r7,lr}
 	ldr r1, =0x03003100
 	strb r0, [r1]
@@ -2758,7 +2758,7 @@ _0800AA18:
 	thumb_func_end sub_800AA04
 
 	thumb_func_start sub_800AA48
-sub_800AA48: ; 800AA48
+sub_800AA48: @ 800AA48
 	ldr r0, =0x03003100
 	ldrb r0, [r0]
 	bx lr
@@ -2766,7 +2766,7 @@ sub_800AA48: ; 800AA48
 	thumb_func_end sub_800AA48
 
 	thumb_func_start sub_800AA54
-sub_800AA54: ; 800AA54
+sub_800AA54: @ 800AA54
 	ldr r0, =0x03003120
 	ldrb r0, [r0]
 	bx lr
@@ -2774,7 +2774,7 @@ sub_800AA54: ; 800AA54
 	thumb_func_end sub_800AA54
 
 	thumb_func_start sub_800AA60
-sub_800AA60: ; 800AA60
+sub_800AA60: @ 800AA60
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -2847,7 +2847,7 @@ _0800AAE6:
 	thumb_func_end sub_800AA60
 
 	thumb_func_start sub_800AAF4
-sub_800AAF4: ; 800AAF4
+sub_800AAF4: @ 800AAF4
 	push {r4,r5,lr}
 	ldr r5, =0x02022a74
 	movs r4, 0x3
@@ -2867,7 +2867,7 @@ _0800AAFA:
 	thumb_func_end sub_800AAF4
 
 	thumb_func_start sub_800AB18
-sub_800AB18: ; 800AB18
+sub_800AB18: @ 800AB18
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -2926,7 +2926,7 @@ _0800AB78:
 	thumb_func_end sub_800AB18
 
 	thumb_func_start sub_800AB98
-sub_800AB98: ; 800AB98
+sub_800AB98: @ 800AB98
 	ldr r0, =0x03003100
 	movs r1, 0
 	strb r1, [r0]
@@ -2937,7 +2937,7 @@ sub_800AB98: ; 800AB98
 	thumb_func_end sub_800AB98
 
 	thumb_func_start sub_800ABAC
-sub_800ABAC: ; 800ABAC
+sub_800ABAC: @ 800ABAC
 	ldr r0, =0x030030e0
 	ldr r0, [r0]
 	movs r1, 0x1C
@@ -2948,7 +2948,7 @@ sub_800ABAC: ; 800ABAC
 	thumb_func_end sub_800ABAC
 
 	thumb_func_start sub_800ABBC
-sub_800ABBC: ; 800ABBC
+sub_800ABBC: @ 800ABBC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -2971,7 +2971,7 @@ _0800ABE4:
 	thumb_func_end sub_800ABBC
 
 	thumb_func_start sub_800ABE8
-sub_800ABE8: ; 800ABE8
+sub_800ABE8: @ 800ABE8
 	ldr r0, =0x03000d58
 	ldrb r0, [r0]
 	bx lr
@@ -2979,7 +2979,7 @@ sub_800ABE8: ; 800ABE8
 	thumb_func_end sub_800ABE8
 
 	thumb_func_start sub_800ABF4
-sub_800ABF4: ; 800ABF4
+sub_800ABF4: @ 800ABF4
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -3008,7 +3008,7 @@ _0800AC20:
 	thumb_func_end sub_800ABF4
 
 	thumb_func_start sub_800AC34
-sub_800AC34: ; 800AC34
+sub_800AC34: @ 800AC34
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -3042,7 +3042,7 @@ _0800AC70:
 	thumb_func_end sub_800AC34
 
 	thumb_func_start sub_800AC80
-sub_800AC80: ; 800AC80
+sub_800AC80: @ 800AC80
 	push {lr}
 	ldr r0, =0x03004130
 	ldrb r0, [r0]
@@ -3060,7 +3060,7 @@ _0800AC96:
 	thumb_func_end sub_800AC80
 
 	thumb_func_start sub_800ACAC
-sub_800ACAC: ; 800ACAC
+sub_800ACAC: @ 800ACAC
 	push {r4,lr}
 	bl sub_8009FCC
 	lsls r0, 24
@@ -3106,7 +3106,7 @@ _0800ACF4:
 	thumb_func_end sub_800ACAC
 
 	thumb_func_start sub_800AD10
-sub_800AD10: ; 800AD10
+sub_800AD10: @ 800AD10
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -3140,7 +3140,7 @@ _0800AD4C:
 	thumb_func_end sub_800AD10
 
 	thumb_func_start sub_800AD5C
-sub_800AD5C: ; 800AD5C
+sub_800AD5C: @ 800AD5C
 	push {lr}
 	ldr r0, =0x03004130
 	ldrb r0, [r0]
@@ -3158,7 +3158,7 @@ _0800AD72:
 	thumb_func_end sub_800AD5C
 
 	thumb_func_start sub_800AD88
-sub_800AD88: ; 800AD88
+sub_800AD88: @ 800AD88
 	push {r4,r5,lr}
 	bl sub_8009FCC
 	lsls r0, 24
@@ -3210,7 +3210,7 @@ _0800ADDA:
 	thumb_func_end sub_800AD88
 
 	thumb_func_start sub_800ADF8
-sub_800ADF8: ; 800ADF8
+sub_800ADF8: @ 800ADF8
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -3237,7 +3237,7 @@ _0800AE1E:
 	thumb_func_end sub_800ADF8
 
 	thumb_func_start sub_800AE30
-sub_800AE30: ; 800AE30
+sub_800AE30: @ 800AE30
 	push {lr}
 	ldr r0, =0x03004130
 	ldrb r0, [r0]
@@ -3255,7 +3255,7 @@ _0800AE46:
 	thumb_func_end sub_800AE30
 
 	thumb_func_start sub_800AE5C
-sub_800AE5C: ; 800AE5C
+sub_800AE5C: @ 800AE5C
 	push {r4,lr}
 	bl sub_8009FCC
 	lsls r0, 24
@@ -3302,7 +3302,7 @@ _0800AEA4:
 	thumb_func_end sub_800AE5C
 
 	thumb_func_start sub_800AEB4
-sub_800AEB4: ; 800AEB4
+sub_800AEB4: @ 800AEB4
 	push {lr}
 	ldr r0, =0x020229c4
 	ldrb r0, [r0]
@@ -3341,7 +3341,7 @@ _0800AEF4:
 	thumb_func_end sub_800AEB4
 
 	thumb_func_start sub_800AF18
-sub_800AF18: ; 800AF18
+sub_800AF18: @ 800AF18
 	push {r4,lr}
 	ldr r4, =0x02022b00
 	str r0, [r4]
@@ -3355,7 +3355,7 @@ sub_800AF18: ; 800AF18
 	thumb_func_end sub_800AF18
 
 	thumb_func_start c2_800ACD4
-c2_800ACD4: ; 800AF30
+c2_800ACD4: @ 800AF30
 	push {r4,lr}
 	movs r0, 0
 	movs r1, 0
@@ -3465,7 +3465,7 @@ _0800B03C:
 	thumb_func_end c2_800ACD4
 
 	thumb_func_start sub_800B080
-sub_800B080: ; 800B080
+sub_800B080: @ 800B080
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r1, =gUnknown_082ED168
@@ -3534,7 +3534,7 @@ sub_800B080: ; 800B080
 	thumb_func_end sub_800B080
 
 	thumb_func_start sub_800B138
-sub_800B138: ; 800B138
+sub_800B138: @ 800B138
 	push {lr}
 	sub sp, 0xC
 	ldr r1, =gUnknown_082ED168
@@ -3576,7 +3576,7 @@ sub_800B138: ; 800B138
 	thumb_func_end sub_800B138
 
 	thumb_func_start sub_800B1A0
-sub_800B1A0: ; 800B1A0
+sub_800B1A0: @ 800B1A0
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -3725,7 +3725,7 @@ _0800B2DC:
 	thumb_func_end sub_800B1A0
 
 	thumb_func_start sub_800B2E8
-sub_800B2E8: ; 800B2E8
+sub_800B2E8: @ 800B2E8
 	ldr r0, =0x04000128
 	ldrh r0, [r0]
 	lsrs r0, 2
@@ -3736,7 +3736,7 @@ sub_800B2E8: ; 800B2E8
 	thumb_func_end sub_800B2E8
 
 	thumb_func_start sub_800B2F8
-sub_800B2F8: ; 800B2F8
+sub_800B2F8: @ 800B2F8
 	push {lr}
 	movs r3, 0
 	ldr r2, =0x04000128
@@ -3759,7 +3759,7 @@ _0800B314:
 	thumb_func_end sub_800B2F8
 
 	thumb_func_start sub_800B320
-sub_800B320: ; 800B320
+sub_800B320: @ 800B320
 	ldr r0, =0x030030e0
 	ldr r0, [r0]
 	lsrs r0, 6
@@ -3770,7 +3770,7 @@ sub_800B320: ; 800B320
 	thumb_func_end sub_800B320
 
 	thumb_func_start sub_800B330
-sub_800B330: ; 800B330
+sub_800B330: @ 800B330
 	ldr r1, =0x030030f8
 	strb r0, [r1]
 	bx lr
@@ -3778,7 +3778,7 @@ sub_800B330: ; 800B330
 	thumb_func_end sub_800B330
 
 	thumb_func_start sub_800B33C
-sub_800B33C: ; 800B33C
+sub_800B33C: @ 800B33C
 	ldr r0, =0x0300306c
 	ldrb r0, [r0]
 	bx lr
@@ -3786,7 +3786,7 @@ sub_800B33C: ; 800B33C
 	thumb_func_end sub_800B33C
 
 	thumb_func_start sub_800B348
-sub_800B348: ; 800B348
+sub_800B348: @ 800B348
 	push {r4-r6,lr}
 	bl sub_8009638
 	ldr r1, =0x03003030
@@ -3826,7 +3826,7 @@ sub_800B348: ; 800B348
 	thumb_func_end sub_800B348
 
 	thumb_func_start sub_800B3A4
-sub_800B3A4: ; 800B3A4
+sub_800B3A4: @ 800B3A4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3872,7 +3872,7 @@ _0800B3F4:
 	thumb_func_end sub_800B3A4
 
 	thumb_func_start HandleLinkConnection
-HandleLinkConnection: ; 800B40C
+HandleLinkConnection: @ 800B40C
 	push {r4,r5,lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -3923,7 +3923,7 @@ _0800B482:
 	thumb_func_end HandleLinkConnection
 
 	thumb_func_start sub_800B488
-sub_800B488: ; 800B488
+sub_800B488: @ 800B488
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -3939,7 +3939,7 @@ _0800B498:
 	thumb_func_end sub_800B488
 
 	thumb_func_start sub_800B4A4
-sub_800B4A4: ; 800B4A4
+sub_800B4A4: @ 800B4A4
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r1, [r0]
@@ -3954,7 +3954,7 @@ _0800B4B2:
 	thumb_func_end sub_800B4A4
 
 	thumb_func_start sub_800B4C0
-sub_800B4C0: ; 800B4C0
+sub_800B4C0: @ 800B4C0
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r1, [r0]
@@ -3969,7 +3969,7 @@ _0800B4CE:
 	thumb_func_end sub_800B4C0
 
 	thumb_func_start sub_800B4DC
-sub_800B4DC: ; 800B4DC
+sub_800B4DC: @ 800B4DC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -3989,7 +3989,7 @@ _0800B500:
 	thumb_func_end sub_800B4DC
 
 	thumb_func_start sub_800B504
-sub_800B504: ; 800B504
+sub_800B504: @ 800B504
 	push {lr}
 	bl sub_800B4DC
 	cmp r0, 0x2
@@ -4004,7 +4004,7 @@ _0800B514:
 	thumb_func_end sub_800B504
 
 	thumb_func_start sub_800B518
-sub_800B518: ; 800B518
+sub_800B518: @ 800B518
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
 	bx lr
@@ -4012,7 +4012,7 @@ sub_800B518: ; 800B518
 	thumb_func_end sub_800B518
 
 	thumb_func_start sub_800B524
-sub_800B524: ; 800B524
+sub_800B524: @ 800B524
 	push {lr}
 	ldrb r1, [r0, 0x10]
 	strb r1, [r0, 0x12]
@@ -4026,7 +4026,7 @@ sub_800B524: ; 800B524
 	thumb_func_end sub_800B524
 
 	thumb_func_start sub_800B53C
-sub_800B53C: ; 800B53C
+sub_800B53C: @ 800B53C
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0xC0
@@ -4061,7 +4061,7 @@ sub_800B53C: ; 800B53C
 	thumb_func_end sub_800B53C
 
 	thumb_func_start sub_800B594
-sub_800B594: ; 800B594
+sub_800B594: @ 800B594
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0xC0
@@ -4111,7 +4111,7 @@ sub_800B594: ; 800B594
 	thumb_func_end sub_800B594
 
 	thumb_func_start sub_800B628
-sub_800B628: ; 800B628
+sub_800B628: @ 800B628
 	push {lr}
 	bl sub_800B594
 	bl sub_800B53C
@@ -4120,7 +4120,7 @@ sub_800B628: ; 800B628
 	thumb_func_end sub_800B628
 
 	thumb_func_start sub_800B638
-sub_800B638: ; 800B638
+sub_800B638: @ 800B638
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -4265,7 +4265,7 @@ _0800B75A:
 	thumb_func_end sub_800B638
 
 	thumb_func_start sub_800B764
-sub_800B764: ; 800B764
+sub_800B764: @ 800B764
 	push {lr}
 	ldr r0, =0x04000128
 	ldr r1, [r0]
@@ -4289,7 +4289,7 @@ _0800B78C:
 	thumb_func_end sub_800B764
 
 	thumb_func_start sub_800B790
-sub_800B790: ; 800B790
+sub_800B790: @ 800B790
 	push {lr}
 	ldr r0, =0x03003170
 	ldrb r0, [r0]
@@ -4311,7 +4311,7 @@ _0800B7AE:
 	thumb_func_end sub_800B790
 
 	thumb_func_start sub_800B7C0
-sub_800B7C0: ; 800B7C0
+sub_800B7C0: @ 800B7C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4416,7 +4416,7 @@ _0800B874:
 	thumb_func_end sub_800B7C0
 
 	thumb_func_start sub_800B8A8
-sub_800B8A8: ; 800B8A8
+sub_800B8A8: @ 800B8A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4549,7 +4549,7 @@ _0800B990:
 	thumb_func_end sub_800B8A8
 
 	thumb_func_start sub_800B9B8
-sub_800B9B8: ; 800B9B8
+sub_800B9B8: @ 800B9B8
 	push {r4,lr}
 	ldr r3, =0x03003170
 	ldrb r4, [r3]
@@ -4612,7 +4612,7 @@ _0800BA1E:
 	thumb_func_end sub_800B9B8
 
 	thumb_func_start Timer3Intr
-Timer3Intr: ; 800BA28
+Timer3Intr: @ 800BA28
 	push {lr}
 	bl sub_800BD98
 	bl sub_800BAC0
@@ -4621,7 +4621,7 @@ Timer3Intr: ; 800BA28
 	thumb_func_end Timer3Intr
 
 	thumb_func_start sub_800BA38
-sub_800BA38: ; 800BA38
+sub_800BA38: @ 800BA38
 	push {r4,lr}
 	ldr r4, =0x03003170
 	ldr r0, =0x04000128
@@ -4683,7 +4683,7 @@ _0800BAAA:
 	thumb_func_end sub_800BA38
 
 	thumb_func_start sub_800BAC0
-sub_800BAC0: ; 800BAC0
+sub_800BAC0: @ 800BAC0
 	ldr r0, =0x04000128
 	ldrh r1, [r0]
 	movs r2, 0x80
@@ -4694,7 +4694,7 @@ sub_800BAC0: ; 800BAC0
 	thumb_func_end sub_800BAC0
 
 	thumb_func_start sub_800BAD0
-sub_800BAD0: ; 800BAD0
+sub_800BAD0: @ 800BAD0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -4812,7 +4812,7 @@ _0800BBBE:
 	thumb_func_end sub_800BAD0
 
 	thumb_func_start sub_800BBCC
-sub_800BBCC: ; 800BBCC
+sub_800BBCC: @ 800BBCC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -4954,7 +4954,7 @@ _0800BCD0:
 	thumb_func_end sub_800BBCC
 
 	thumb_func_start sub_800BCE4
-sub_800BCE4: ; 800BCE4
+sub_800BCE4: @ 800BCE4
 	push {r4,lr}
 	ldr r0, =0x03003170
 	ldrb r1, [r0, 0x16]
@@ -5040,7 +5040,7 @@ _0800BD8C:
 	thumb_func_end sub_800BCE4
 
 	thumb_func_start sub_800BD98
-sub_800BD98: ; 800BD98
+sub_800BD98: @ 800BD98
 	push {lr}
 	ldr r0, =0x03003170
 	ldrb r0, [r0]
@@ -5062,7 +5062,7 @@ _0800BDB4:
 	thumb_func_end sub_800BD98
 
 	thumb_func_start sub_800BDCC
-sub_800BDCC: ; 800BDCC
+sub_800BDCC: @ 800BDCC
 	push {lr}
 	ldr r1, =0x03003170
 	ldrb r0, [r1, 0x17]
@@ -5089,7 +5089,7 @@ _0800BDF4:
 	thumb_func_end sub_800BDCC
 
 	thumb_func_start sub_800BDFC
-sub_800BDFC: ; 800BDFC
+sub_800BDFC: @ 800BDFC
 	push {r4-r6,lr}
 	ldr r1, =0x03003170
 	ldr r2, =0x00000339
@@ -5131,7 +5131,7 @@ _0800BE22:
 	thumb_func_end sub_800BDFC
 
 	thumb_func_start sub_800BE50
-sub_800BE50: ; 800BE50
+sub_800BE50: @ 800BE50
 	push {r4-r7,lr}
 	ldr r1, =0x03003170
 	ldr r2, =0x00000fbd
@@ -5187,7 +5187,7 @@ _0800BE86:
 	thumb_func_end sub_800BE50
 
 	thumb_func_start sub_800BEC0
-sub_800BEC0: ; 800BEC0
+sub_800BEC0: @ 800BEC0
 	push {r4,lr}
 	bl rfu_REQBN_softReset_and_checkID
 	adds r4, r0, 0
@@ -5225,7 +5225,7 @@ _0800BEE8:
 	thumb_func_end sub_800BEC0
 
 	thumb_func_start rfu_REQ_sendData_wrapper
-rfu_REQ_sendData_wrapper: ; 800BF0C
+rfu_REQ_sendData_wrapper: @ 800BF0C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -5256,7 +5256,7 @@ _0800BF3C:
 	thumb_func_end rfu_REQ_sendData_wrapper
 
 	thumb_func_start sub_800BF4C
-sub_800BF4C: ; 800BF4C
+sub_800BF4C: @ 800BF4C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -5292,7 +5292,7 @@ _0800BF96:
 	thumb_func_end sub_800BF4C
 
 	thumb_func_start sub_800BFA0
-sub_800BFA0: ; 800BFA0
+sub_800BFA0: @ 800BFA0
 	push {r4,lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -5313,7 +5313,7 @@ sub_800BFA0: ; 800BFA0
 	thumb_func_end sub_800BFA0
 
 	thumb_func_start sub_800BFCC
-sub_800BFCC: ; 800BFCC
+sub_800BFCC: @ 800BFCC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_800C000
@@ -5341,7 +5341,7 @@ _0800BFF4:
 	thumb_func_end sub_800BFCC
 
 	thumb_func_start sub_800C000
-sub_800C000: ; 800C000
+sub_800C000: @ 800C000
 	push {r4,r5,lr}
 	ldr r2, =0x03004140
 	movs r0, 0
@@ -5380,7 +5380,7 @@ _0800C028:
 	thumb_func_end sub_800C000
 
 	thumb_func_start sub_800C048
-sub_800C048: ; 800C048
+sub_800C048: @ 800C048
 	ldr r1, =0x03004140
 	movs r0, 0x15
 	strb r0, [r1, 0x4]
@@ -5389,7 +5389,7 @@ sub_800C048: ; 800C048
 	thumb_func_end sub_800C048
 
 	thumb_func_start sub_800C054
-sub_800C054: ; 800C054
+sub_800C054: @ 800C054
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -5502,7 +5502,7 @@ _0800C122:
 	thumb_func_end sub_800C054
 
 	thumb_func_start sub_800C12C
-sub_800C12C: ; 800C12C
+sub_800C12C: @ 800C12C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -5619,7 +5619,7 @@ _0800C204:
 	thumb_func_end sub_800C12C
 
 	thumb_func_start sub_800C210
-sub_800C210: ; 800C210
+sub_800C210: @ 800C210
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -5675,7 +5675,7 @@ _0800C26C:
 	thumb_func_end sub_800C210
 
 	thumb_func_start sub_800C27C
-sub_800C27C: ; 800C27C
+sub_800C27C: @ 800C27C
 	push {r4,r5,lr}
 	lsls r0, 24
 	movs r2, 0
@@ -5790,7 +5790,7 @@ _0800C366:
 	thumb_func_end sub_800C27C
 
 	thumb_func_start sub_800C36C
-sub_800C36C: ; 800C36C
+sub_800C36C: @ 800C36C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -6022,7 +6022,7 @@ _0800C518:
 	thumb_func_end sub_800C36C
 
 	thumb_func_start rfu_syncVBlank_
-rfu_syncVBlank_: ; 800C530
+rfu_syncVBlank_: @ 800C530
 	push {lr}
 	bl rfu_syncVBlank
 	lsls r0, 16
@@ -6038,7 +6038,7 @@ _0800C548:
 	thumb_func_end rfu_syncVBlank_
 
 	thumb_func_start sub_800C54C
-sub_800C54C: ; 800C54C
+sub_800C54C: @ 800C54C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r1, =0x03004140
@@ -6251,7 +6251,7 @@ _0800C736:
 	thumb_func_end sub_800C54C
 
 	thumb_func_start sub_800C744
-sub_800C744: ; 800C744
+sub_800C744: @ 800C744
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =0x03004140
@@ -6315,7 +6315,7 @@ _0800C7AE:
 	thumb_func_end sub_800C744
 
 	thumb_func_start sub_800C7B4
-sub_800C7B4: ; 800C7B4
+sub_800C7B4: @ 800C7B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -7169,7 +7169,7 @@ _0800CEA4:
 	thumb_func_end sub_800C7B4
 
 	thumb_func_start sub_800CEB0
-sub_800CEB0: ; 800CEB0
+sub_800CEB0: @ 800CEB0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -7233,7 +7233,7 @@ _0800CF28:
 	thumb_func_end sub_800CEB0
 
 	thumb_func_start sub_800CF34
-sub_800CF34: ; 800CF34
+sub_800CF34: @ 800CF34
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7507,7 +7507,7 @@ _0800D146:
 	thumb_func_end sub_800CF34
 
 	thumb_func_start sub_800D158
-sub_800D158: ; 800D158
+sub_800D158: @ 800D158
 	push {r4-r6,lr}
 	ldr r1, =0x04000208
 	ldrh r0, [r1]
@@ -7593,7 +7593,7 @@ _0800D1F6:
 	thumb_func_end sub_800D158
 
 	thumb_func_start sub_800D20C
-sub_800D20C: ; 800D20C
+sub_800D20C: @ 800D20C
 	push {r4,r5,lr}
 	ldr r5, =0x03004140
 	ldrb r0, [r5, 0x4]
@@ -7638,7 +7638,7 @@ _0800D258:
 	thumb_func_end sub_800D20C
 
 	thumb_func_start sub_800D268
-sub_800D268: ; 800D268
+sub_800D268: @ 800D268
 	push {lr}
 	ldr r1, =0x03004140
 	ldrb r0, [r1, 0x6]
@@ -7664,7 +7664,7 @@ _0800D28C:
 	thumb_func_end sub_800D268
 
 	thumb_func_start sub_800D294
-sub_800D294: ; 800D294
+sub_800D294: @ 800D294
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7728,7 +7728,7 @@ _0800D2F0:
 	thumb_func_end sub_800D294
 
 	thumb_func_start sub_800D30C
-sub_800D30C: ; 800D30C
+sub_800D30C: @ 800D30C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -7750,7 +7750,7 @@ _0800D322:
 	thumb_func_end sub_800D30C
 
 	thumb_func_start sub_800D334
-sub_800D334: ; 800D334
+sub_800D334: @ 800D334
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -7768,7 +7768,7 @@ sub_800D334: ; 800D334
 	thumb_func_end sub_800D334
 
 	thumb_func_start sub_800D358
-sub_800D358: ; 800D358
+sub_800D358: @ 800D358
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -7881,7 +7881,7 @@ _0800D41C:
 	thumb_func_end sub_800D358
 
 	thumb_func_start sub_800D434
-sub_800D434: ; 800D434
+sub_800D434: @ 800D434
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -8011,7 +8011,7 @@ _0800D510:
 	thumb_func_end sub_800D434
 
 	thumb_func_start sub_800D52C
-sub_800D52C: ; 800D52C
+sub_800D52C: @ 800D52C
 	push {lr}
 	ldr r1, =0x03004140
 	str r0, [r1, 0x44]
@@ -8023,7 +8023,7 @@ sub_800D52C: ; 800D52C
 	thumb_func_end sub_800D52C
 
 	thumb_func_start sub_800D544
-sub_800D544: ; 800D544
+sub_800D544: @ 800D544
 	ldr r1, =0x03004140
 	str r0, [r1, 0x40]
 	bx lr
@@ -8031,7 +8031,7 @@ sub_800D544: ; 800D544
 	thumb_func_end sub_800D544
 
 	thumb_func_start sub_800D550
-sub_800D550: ; 800D550
+sub_800D550: @ 800D550
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -8068,7 +8068,7 @@ _0800D588:
 	thumb_func_end sub_800D550
 
 	thumb_func_start sub_800D594
-sub_800D594: ; 800D594
+sub_800D594: @ 800D594
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -8099,7 +8099,7 @@ _0800D5C8:
 	thumb_func_end sub_800D594
 
 	thumb_func_start sub_800D5D0
-sub_800D5D0: ; 800D5D0
+sub_800D5D0: @ 800D5D0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -8135,7 +8135,7 @@ _0800D60A:
 	thumb_func_end sub_800D5D0
 
 	thumb_func_start sub_800D610
-sub_800D610: ; 800D610
+sub_800D610: @ 800D610
 	push {lr}
 	ldr r1, =0x03004140
 	ldrb r0, [r1, 0x2]
@@ -8154,7 +8154,7 @@ _0800D628:
 	thumb_func_end sub_800D610
 
 	thumb_func_start sub_800D630
-sub_800D630: ; 800D630
+sub_800D630: @ 800D630
 	push {lr}
 	ldr r1, =0x03004140
 	ldrb r0, [r1, 0x2]
@@ -8178,7 +8178,7 @@ _0800D654:
 	thumb_func_end sub_800D630
 
 	thumb_func_start sub_800D658
-sub_800D658: ; 800D658
+sub_800D658: @ 800D658
 	push {lr}
 	ldr r0, =0x03004140
 	ldrb r1, [r0, 0x7]
@@ -8235,7 +8235,7 @@ _0800D6C2:
 	thumb_func_end sub_800D658
 
 	thumb_func_start sub_800D6C8
-sub_800D6C8: ; 800D6C8
+sub_800D6C8: @ 800D6C8
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r0, 0
@@ -8281,7 +8281,7 @@ _0800D6DC:
 	thumb_func_end sub_800D6C8
 
 	thumb_func_start sub_800D724
-sub_800D724: ; 800D724
+sub_800D724: @ 800D724
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r1, 0
@@ -8328,7 +8328,7 @@ _0800D73A:
 	thumb_func_end sub_800D724
 
 	thumb_func_start sub_800D780
-sub_800D780: ; 800D780
+sub_800D780: @ 800D780
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r1, 0
@@ -8373,7 +8373,7 @@ _0800D792:
 	thumb_func_end sub_800D780
 
 	thumb_func_start sub_800D7D8
-sub_800D7D8: ; 800D7D8
+sub_800D7D8: @ 800D7D8
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -8468,7 +8468,7 @@ _0800D87E:
 	thumb_func_end sub_800D7D8
 
 	thumb_func_start sub_800D888
-sub_800D888: ; 800D888
+sub_800D888: @ 800D888
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -8559,7 +8559,7 @@ _0800D92A:
 	thumb_func_end sub_800D888
 
 	thumb_func_start sub_800D934
-sub_800D934: ; 800D934
+sub_800D934: @ 800D934
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -8642,7 +8642,7 @@ _0800D9CA:
 	thumb_func_end sub_800D934
 
 	thumb_func_start sub_800D9DC
-sub_800D9DC: ; 800D9DC
+sub_800D9DC: @ 800D9DC
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -8712,7 +8712,7 @@ _0800DA54:
 	thumb_func_end sub_800D9DC
 
 	thumb_func_start sub_800DA68
-sub_800DA68: ; 800DA68
+sub_800DA68: @ 800DA68
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -8766,7 +8766,7 @@ _0800DAC0:
 	thumb_func_end sub_800DA68
 
 	thumb_func_start sub_800DAC8
-sub_800DAC8: ; 800DAC8
+sub_800DAC8: @ 800DAC8
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -8814,7 +8814,7 @@ _0800DB12:
 	thumb_func_end sub_800DAC8
 
 	thumb_func_start sub_800DB18
-sub_800DB18: ; 800DB18
+sub_800DB18: @ 800DB18
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -8872,7 +8872,7 @@ _0800DB7A:
 	thumb_func_end sub_800DB18
 
 	thumb_func_start sub_800DB84
-sub_800DB84: ; 800DB84
+sub_800DB84: @ 800DB84
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -8933,7 +8933,7 @@ _0800DBEA:
 	thumb_func_end sub_800DB84
 
 	thumb_func_start sub_800DBF8
-sub_800DBF8: ; 800DBF8
+sub_800DBF8: @ 800DBF8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -9040,7 +9040,7 @@ _0800DCAA:
 	thumb_func_end sub_800DBF8
 
 	thumb_func_start sub_800DCB4
-sub_800DCB4: ; 800DCB4
+sub_800DCB4: @ 800DCB4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r3, 0
@@ -9071,7 +9071,7 @@ _0800DCD8:
 	thumb_func_end sub_800DCB4
 
 	thumb_func_start sub_800DCE8
-sub_800DCE8: ; 800DCE8
+sub_800DCE8: @ 800DCE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r3, 0
@@ -9102,7 +9102,7 @@ _0800DD0C:
 	thumb_func_end sub_800DCE8
 
 	thumb_func_start sub_800DD1C
-sub_800DD1C: ; 800DD1C
+sub_800DD1C: @ 800DD1C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -9170,7 +9170,7 @@ _0800DD8C:
 	thumb_func_end sub_800DD1C
 
 	thumb_func_start sub_800DD94
-sub_800DD94: ; 800DD94
+sub_800DD94: @ 800DD94
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -9284,7 +9284,7 @@ _0800DDC8:
 	thumb_func_end sub_800DD94
 
 	thumb_func_start sub_800DE7C
-sub_800DE7C: ; 800DE7C
+sub_800DE7C: @ 800DE7C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -9371,7 +9371,7 @@ _0800DF24:
 	thumb_func_end sub_800DE7C
 
 	thumb_func_start sub_800DF34
-sub_800DF34: ; 800DF34
+sub_800DF34: @ 800DF34
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -9416,7 +9416,7 @@ _0800DF88:
 	thumb_func_end sub_800DF34
 
 	thumb_func_start sub_800DF90
-sub_800DF90: ; 800DF90
+sub_800DF90: @ 800DF90
 	push {r4,lr}
 	adds r4, r1, 0
 	ldr r1, =0x02022b14
@@ -9433,7 +9433,7 @@ sub_800DF90: ; 800DF90
 	thumb_func_end sub_800DF90
 
 	thumb_func_start sub_800DFB4
-sub_800DFB4: ; 800DFB4
+sub_800DFB4: @ 800DFB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -9520,7 +9520,7 @@ _0800E06A:
 	thumb_func_end sub_800DFB4
 
 	thumb_func_start sub_800E084
-sub_800E084: ; 800E084
+sub_800E084: @ 800E084
 	push {r4,lr}
 	ldr r4, =0x02020630
 	ldr r3, =0x02022b10
@@ -9562,7 +9562,7 @@ _0800E0CA:
 	thumb_func_end sub_800E084
 
 	thumb_func_start sub_800E0E8
-sub_800E0E8: ; 800E0E8
+sub_800E0E8: @ 800E0E8
 	push {r4,lr}
 	ldr r4, =gUnknown_082ED5E0
 	ldrh r0, [r4, 0x6]
@@ -9586,7 +9586,7 @@ _0800E100:
 	thumb_func_end sub_800E0E8
 
 	thumb_func_start sub_800E124
-sub_800E124: ; 800E124
+sub_800E124: @ 800E124
 	push {r4,lr}
 	ldr r1, =0x03007890
 	ldr r0, [r1]
@@ -9619,7 +9619,7 @@ _0800E156:
 	thumb_func_end sub_800E124
 
 	thumb_func_start sub_800E15C
-sub_800E15C: ; 800E15C
+sub_800E15C: @ 800E15C
 	push {lr}
 	adds r2, r0, 0
 	movs r3, 0x32
@@ -9636,7 +9636,7 @@ _0800E170:
 	thumb_func_end sub_800E15C
 
 	thumb_func_start sub_800E174
-sub_800E174: ; 800E174
+sub_800E174: @ 800E174
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -9879,7 +9879,7 @@ _0800E346:
 	thumb_func_end sub_800E174
 
 	thumb_func_start sub_800E378
-sub_800E378: ; 800E378
+sub_800E378: @ 800E378
 	push {lr}
 	stm r0!, {r1}
 	adds r1, r2, 0
@@ -9889,7 +9889,7 @@ sub_800E378: ; 800E378
 	thumb_func_end sub_800E378
 
 	thumb_func_start sub_800E388
-sub_800E388: ; 800E388
+sub_800E388: @ 800E388
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -9911,7 +9911,7 @@ _0800E3A2:
 	thumb_func_end sub_800E388
 
 	thumb_func_start sub_800E3A8
-sub_800E3A8: ; 800E3A8
+sub_800E3A8: @ 800E3A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -10106,7 +10106,7 @@ _0800E520:
 	thumb_func_end sub_800E3A8
 
 	thumb_func_start sub_800E540
-sub_800E540: ; 800E540
+sub_800E540: @ 800E540
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -10161,7 +10161,7 @@ _0800E59E:
 	thumb_func_end sub_800E540
 
 	thumb_func_start sub_800E5AC
-sub_800E5AC: ; 800E5AC
+sub_800E5AC: @ 800E5AC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -10200,17 +10200,17 @@ _0800E5C0:
 	thumb_func_end sub_800E5AC
 
 	thumb_func_start nullsub_5
-nullsub_5: ; 800E5FC
+nullsub_5: @ 800E5FC
 	bx lr
 	thumb_func_end nullsub_5
 
 	thumb_func_start nullsub_13
-nullsub_13: ; 800E600
+nullsub_13: @ 800E600
 	bx lr
 	thumb_func_end nullsub_13
 
 	thumb_func_start sub_800E604
-sub_800E604: ; 800E604
+sub_800E604: @ 800E604
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -10290,7 +10290,7 @@ _0800E64A:
 	thumb_func_end sub_800E604
 
 	thumb_func_start sub_800E6D0
-sub_800E6D0: ; 800E6D0
+sub_800E6D0: @ 800E6D0
 	push {r4-r6,lr}
 	ldr r4, =0x03002710
 	ldr r5, [r4, 0x4]
@@ -10312,7 +10312,7 @@ sub_800E6D0: ; 800E6D0
 	thumb_func_end sub_800E6D0
 
 	thumb_func_start sub_800E700
-sub_800E700: ; 800E700
+sub_800E700: @ 800E700
 	push {r4,lr}
 	ldr r0, =0x03004190
 	ldr r1, =0x00000e64
@@ -10341,7 +10341,7 @@ _0800E732:
 	thumb_func_end sub_800E700
 
 	thumb_func_start sub_800E748
-sub_800E748: ; 800E748
+sub_800E748: @ 800E748
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -10452,7 +10452,7 @@ _0800E862:
 	thumb_func_end sub_800E748
 
 	thumb_func_start sub_800E87C
-sub_800E87C: ; 800E87C
+sub_800E87C: @ 800E87C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_082ED6A5
@@ -10463,7 +10463,7 @@ sub_800E87C: ; 800E87C
 	thumb_func_end sub_800E87C
 
 	thumb_func_start sub_800E88C
-sub_800E88C: ; 800E88C
+sub_800E88C: @ 800E88C
 	push {r4-r7,lr}
 	adds r2, r0, 0
 	adds r5, r1, 0
@@ -10572,7 +10572,7 @@ _0800E942:
 	thumb_func_end sub_800E88C
 
 	thumb_func_start sub_800E94C
-sub_800E94C: ; 800E94C
+sub_800E94C: @ 800E94C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -10720,7 +10720,7 @@ _0800EA9A:
 	thumb_func_end sub_800E94C
 
 	thumb_func_start sub_800EAB4
-sub_800EAB4: ; 800EAB4
+sub_800EAB4: @ 800EAB4
 	push {r4,r5,lr}
 	ldr r0, =0x03004140
 	ldrb r5, [r0]
@@ -10756,7 +10756,7 @@ _0800EAE0:
 	thumb_func_end sub_800EAB4
 
 	thumb_func_start sub_800EAFC
-sub_800EAFC: ; 800EAFC
+sub_800EAFC: @ 800EAFC
 	push {r4-r6,lr}
 	ldr r0, =0x03004140
 	ldrb r5, [r0]
@@ -10787,7 +10787,7 @@ sub_800EAFC: ; 800EAFC
 	thumb_func_end sub_800EAFC
 
 	thumb_func_start sub_800EB44
-sub_800EB44: ; 800EB44
+sub_800EB44: @ 800EB44
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -10957,7 +10957,7 @@ _0800ECF4:
 	thumb_func_end sub_800EB44
 
 	thumb_func_start sub_800ED10
-sub_800ED10: ; 800ED10
+sub_800ED10: @ 800ED10
 	push {lr}
 	ldr r3, =gUnknown_082ED6E0
 	movs r0, 0x1
@@ -10970,7 +10970,7 @@ sub_800ED10: ; 800ED10
 	thumb_func_end sub_800ED10
 
 	thumb_func_start sub_800ED28
-sub_800ED28: ; 800ED28
+sub_800ED28: @ 800ED28
 	push {lr}
 	movs r0, 0
 	bl sub_800C27C
@@ -10979,7 +10979,7 @@ sub_800ED28: ; 800ED28
 	thumb_func_end sub_800ED28
 
 	thumb_func_start sub_800ED34
-sub_800ED34: ; 800ED34
+sub_800ED34: @ 800ED34
 	push {r4,lr}
 	ldr r0, =0x03005000
 	movs r2, 0
@@ -11036,7 +11036,7 @@ _0800ED9A:
 	thumb_func_end sub_800ED34
 
 	thumb_func_start sub_800EDBC
-sub_800EDBC: ; 800EDBC
+sub_800EDBC: @ 800EDBC
 	ldr r0, =0x03005000
 	ldr r1, =0x00000cdb
 	adds r0, r1
@@ -11048,7 +11048,7 @@ sub_800EDBC: ; 800EDBC
 	thumb_func_end sub_800EDBC
 
 	thumb_func_start sub_800EDD4
-sub_800EDD4: ; 800EDD4
+sub_800EDD4: @ 800EDD4
 	push {r4-r6,lr}
 	bl sub_800C048
 	ldr r4, =0x03005000
@@ -11120,7 +11120,7 @@ _0800EE5E:
 	thumb_func_end sub_800EDD4
 
 	thumb_func_start sub_800EE78
-sub_800EE78: ; 800EE78
+sub_800EE78: @ 800EE78
 	push {lr}
 	ldr r0, =sub_800E748
 	movs r1, 0x1
@@ -11134,7 +11134,7 @@ sub_800EE78: ; 800EE78
 	thumb_func_end sub_800EE78
 
 	thumb_func_start sub_800EE94
-sub_800EE94: ; 800EE94
+sub_800EE94: @ 800EE94
 	push {lr}
 	ldr r1, =0x03005000
 	ldrh r0, [r1, 0x4]
@@ -11156,7 +11156,7 @@ _0800EEB6:
 	thumb_func_end sub_800EE94
 
 	thumb_func_start sub_800EEBC
-sub_800EEBC: ; 800EEBC
+sub_800EEBC: @ 800EEBC
 	push {r4,lr}
 	ldr r4, =0x03005000
 	ldrh r0, [r4, 0x4]
@@ -11189,7 +11189,7 @@ _0800EEFA:
 	thumb_func_end sub_800EEBC
 
 	thumb_func_start sub_800EF00
-sub_800EF00: ; 800EF00
+sub_800EF00: @ 800EF00
 	push {lr}
 	ldr r0, =sub_800E94C
 	movs r1, 0x1
@@ -11203,7 +11203,7 @@ sub_800EF00: ; 800EF00
 	thumb_func_end sub_800EF00
 
 	thumb_func_start sub_800EF1C
-sub_800EF1C: ; 800EF1C
+sub_800EF1C: @ 800EF1C
 	push {lr}
 	ldr r0, =0x03004140
 	ldrb r0, [r0]
@@ -11220,7 +11220,7 @@ _0800EF32:
 	thumb_func_end sub_800EF1C
 
 	thumb_func_start sub_800EF38
-sub_800EF38: ; 800EF38
+sub_800EF38: @ 800EF38
 	ldr r1, =0x03005000
 	movs r0, 0x4
 	strh r0, [r1, 0x4]
@@ -11234,7 +11234,7 @@ sub_800EF38: ; 800EF38
 	thumb_func_end sub_800EF38
 
 	thumb_func_start sub_800EF58
-sub_800EF58: ; 800EF58
+sub_800EF58: @ 800EF58
 	push {lr}
 	adds r1, r0, 0
 	ldr r2, =0x03005000
@@ -11257,7 +11257,7 @@ _0800EF76:
 	thumb_func_end sub_800EF58
 
 	thumb_func_start sub_800EF7C
-sub_800EF7C: ; 800EF7C
+sub_800EF7C: @ 800EF7C
 	ldr r1, =0x03005000
 	movs r0, 0xE
 	strh r0, [r1, 0x4]
@@ -11266,7 +11266,7 @@ sub_800EF7C: ; 800EF7C
 	thumb_func_end sub_800EF7C
 
 	thumb_func_start sub_800EF88
-sub_800EF88: ; 800EF88
+sub_800EF88: @ 800EF88
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -11292,7 +11292,7 @@ _0800EFAC:
 	thumb_func_end sub_800EF88
 
 	thumb_func_start sub_800EFB0
-sub_800EFB0: ; 800EFB0
+sub_800EFB0: @ 800EFB0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r2, 0
@@ -11339,7 +11339,7 @@ _0800EFD0:
 	thumb_func_end sub_800EFB0
 
 	thumb_func_start sub_800F014
-sub_800F014: ; 800F014
+sub_800F014: @ 800F014
 	push {lr}
 	ldr r3, =0x03003110
 	ldr r2, =0x03003090
@@ -11367,7 +11367,7 @@ _0800F032:
 	thumb_func_end sub_800F014
 
 	thumb_func_start sub_800F048
-sub_800F048: ; 800F048
+sub_800F048: @ 800F048
 	push {r4,r5,lr}
 	ldr r4, =0x03005000
 	ldr r0, =0x00000c3c
@@ -11418,7 +11418,7 @@ _0800F09E:
 	thumb_func_end sub_800F048
 
 	thumb_func_start sub_800F0B8
-sub_800F0B8: ; 800F0B8
+sub_800F0B8: @ 800F0B8
 	push {r4,lr}
 	ldr r0, =0x03007890
 	ldr r0, [r0]
@@ -11456,7 +11456,7 @@ _0800F0EC:
 	thumb_func_end sub_800F0B8
 
 	thumb_func_start sub_800F0F8
-sub_800F0F8: ; 800F0F8
+sub_800F0F8: @ 800F0F8
 	push {r4-r6,lr}
 	ldr r6, =0x03005000
 	ldrh r0, [r6, 0x4]
@@ -11548,7 +11548,7 @@ _0800F1D2:
 	thumb_func_end sub_800F0F8
 
 	thumb_func_start sub_800F1E0
-sub_800F1E0: ; 800F1E0
+sub_800F1E0: @ 800F1E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -11867,7 +11867,7 @@ _0800F486:
 	thumb_func_end sub_800F1E0
 
 	thumb_func_start sub_800F498
-sub_800F498: ; 800F498
+sub_800F498: @ 800F498
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r2, r1, 0
@@ -11917,7 +11917,7 @@ _0800F4EA:
 	thumb_func_end sub_800F498
 
 	thumb_func_start sub_800F4F0
-sub_800F4F0: ; 800F4F0
+sub_800F4F0: @ 800F4F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -12062,7 +12062,7 @@ _0800F604:
 	thumb_func_end sub_800F4F0
 
 	thumb_func_start sub_800F638
-sub_800F638: ; 800F638
+sub_800F638: @ 800F638
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -12156,7 +12156,7 @@ _0800F6D4:
 	thumb_func_end sub_800F638
 
 	thumb_func_start sub_800F6FC
-sub_800F6FC: ; 800F6FC
+sub_800F6FC: @ 800F6FC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -12182,7 +12182,7 @@ _0800F724:
 	thumb_func_end sub_800F6FC
 
 	thumb_func_start sub_800F728
-sub_800F728: ; 800F728
+sub_800F728: @ 800F728
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x03005000
@@ -12202,7 +12202,7 @@ sub_800F728: ; 800F728
 	thumb_func_end sub_800F728
 
 	thumb_func_start sub_800F74C
-sub_800F74C: ; 800F74C
+sub_800F74C: @ 800F74C
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r0, =0x03005000
@@ -12240,7 +12240,7 @@ _0800F786:
 	thumb_func_end sub_800F74C
 
 	thumb_func_start rfu_func_080F97B8
-rfu_func_080F97B8: ; 800F794
+rfu_func_080F97B8: @ 800F794
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -12272,14 +12272,14 @@ _0800F7C6:
 	thumb_func_end rfu_func_080F97B8
 
 	thumb_func_start sub_800F7DC
-sub_800F7DC: ; 800F7DC
+sub_800F7DC: @ 800F7DC
 	ldr r0, =0x02022b14
 	bx lr
 	.pool
 	thumb_func_end sub_800F7DC
 
 	thumb_func_start sub_800F7E4
-sub_800F7E4: ; 800F7E4
+sub_800F7E4: @ 800F7E4
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x03005000
@@ -12296,7 +12296,7 @@ _0800F7F4:
 	thumb_func_end sub_800F7E4
 
 	thumb_func_start sub_800F804
-sub_800F804: ; 800F804
+sub_800F804: @ 800F804
 	ldr r1, =0x03005000
 	ldr r0, =rfu_func_080F97B8
 	str r0, [r1]
@@ -12305,7 +12305,7 @@ sub_800F804: ; 800F804
 	thumb_func_end sub_800F804
 
 	thumb_func_start Rfu_set_zero
-Rfu_set_zero: ; 800F814
+Rfu_set_zero: @ 800F814
 	ldr r1, =0x03005000
 	movs r0, 0
 	str r0, [r1]
@@ -12314,7 +12314,7 @@ Rfu_set_zero: ; 800F814
 	thumb_func_end Rfu_set_zero
 
 	thumb_func_start sub_800F820
-sub_800F820: ; 800F820
+sub_800F820: @ 800F820
 	push {lr}
 	movs r0, 0x88
 	lsls r0, 7
@@ -12337,7 +12337,7 @@ _0800F83C:
 	thumb_func_end sub_800F820
 
 	thumb_func_start sub_800F850
-sub_800F850: ; 800F850
+sub_800F850: @ 800F850
 	push {lr}
 	ldr r1, =0x03005000
 	ldr r0, [r1]
@@ -12352,7 +12352,7 @@ _0800F85E:
 	thumb_func_end sub_800F850
 
 	thumb_func_start sub_800F86C
-sub_800F86C: ; 800F86C
+sub_800F86C: @ 800F86C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -12814,7 +12814,7 @@ _0800FC50:
 	thumb_func_end sub_800F86C
 
 	thumb_func_start sub_800FC60
-sub_800FC60: ; 800FC60
+sub_800FC60: @ 800FC60
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x03005000
@@ -12839,7 +12839,7 @@ _0800FC82:
 	thumb_func_end sub_800FC60
 
 	thumb_func_start sub_800FC88
-sub_800FC88: ; 800FC88
+sub_800FC88: @ 800FC88
 	push {r4,lr}
 	movs r1, 0
 	ldr r2, =0x03005000
@@ -12876,7 +12876,7 @@ _0800FCBE:
 	thumb_func_end sub_800FC88
 
 	thumb_func_start sub_800FCC4
-sub_800FCC4: ; 800FCC4
+sub_800FCC4: @ 800FCC4
 	movs r2, 0
 	movs r1, 0
 	strh r1, [r0]
@@ -12890,7 +12890,7 @@ sub_800FCC4: ; 800FCC4
 	thumb_func_end sub_800FCC4
 
 	thumb_func_start sub_800FCD8
-sub_800FCD8: ; 800FCD8
+sub_800FCD8: @ 800FCD8
 	push {r4,lr}
 	movs r2, 0
 	movs r1, 0
@@ -12924,7 +12924,7 @@ _0800FCFE:
 	thumb_func_end sub_800FCD8
 
 	thumb_func_start sub_800FD14
-sub_800FD14: ; 800FD14
+sub_800FD14: @ 800FD14
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -13078,7 +13078,7 @@ _0800FE46:
 	thumb_func_end sub_800FD14
 
 	thumb_func_start sub_800FE50
-sub_800FE50: ; 800FE50
+sub_800FE50: @ 800FE50
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x03003110
@@ -13103,8 +13103,8 @@ _0800FE76:
 	thumb_func_end sub_800FE50
 
 	thumb_func_start sub_800FE84
-; bool8 sub_800FE84(u32 a1, u32 size)
-sub_800FE84: ; 800FE84
+@ bool8 sub_800FE84(u32 a1, u32 size)
+sub_800FE84: @ 800FE84
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -13198,7 +13198,7 @@ _0800FF32:
 	thumb_func_end sub_800FE84
 
 	thumb_func_start rfufunc_80F9F44
-rfufunc_80F9F44: ; 800FF4C
+rfufunc_80F9F44: @ 800FF4C
 	push {r4,r5,lr}
 	ldr r0, =0x03003110
 	ldrh r0, [r0]
@@ -13246,7 +13246,7 @@ _0800FFA0:
 	thumb_func_end rfufunc_80F9F44
 
 	thumb_func_start sub_800FFB0
-sub_800FFB0: ; 800FFB0
+sub_800FFB0: @ 800FFB0
 	push {r4-r6,lr}
 	ldr r0, =0x03005000
 	mov r12, r0
@@ -13306,7 +13306,7 @@ _08010014:
 	thumb_func_end sub_800FFB0
 
 	thumb_func_start rfufunc_80FA020
-rfufunc_80FA020: ; 8010028
+rfufunc_80FA020: @ 8010028
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -13409,7 +13409,7 @@ _080100F4:
 	thumb_func_end rfufunc_80FA020
 
 	thumb_func_start sub_8010100
-sub_8010100: ; 8010100
+sub_8010100: @ 8010100
 	push {lr}
 	ldr r1, =0x03005000
 	adds r1, 0x5A
@@ -13424,7 +13424,7 @@ sub_8010100: ; 8010100
 	thumb_func_end sub_8010100
 
 	thumb_func_start sub_801011C
-sub_801011C: ; 801011C
+sub_801011C: @ 801011C
 	push {lr}
 	bl rfu_clearAllSlot
 	bl sub_800C048
@@ -13444,7 +13444,7 @@ sub_801011C: ; 801011C
 	thumb_func_end sub_801011C
 
 	thumb_func_start sub_8010148
-sub_8010148: ; 8010148
+sub_8010148: @ 8010148
 	push {lr}
 	ldr r0, =0x03007890
 	ldr r0, [r0]
@@ -13460,7 +13460,7 @@ sub_8010148: ; 8010148
 	thumb_func_end sub_8010148
 
 	thumb_func_start sub_8010168
-sub_8010168: ; 8010168
+sub_8010168: @ 8010168
 	push {r4,lr}
 	ldr r4, =0x03005000
 	ldrb r0, [r4, 0xC]
@@ -13484,7 +13484,7 @@ _0801018C:
 	thumb_func_end sub_8010168
 
 	thumb_func_start sub_8010198
-sub_8010198: ; 8010198
+sub_8010198: @ 8010198
 	push {lr}
 	bl sub_800D630
 	ldr r2, =0x03005000
@@ -13506,7 +13506,7 @@ sub_8010198: ; 8010198
 	thumb_func_end sub_8010198
 
 	thumb_func_start sub_80101CC
-sub_80101CC: ; 80101CC
+sub_80101CC: @ 80101CC
 	push {r4,r5,lr}
 	ldr r0, =0x03005000
 	ldrb r5, [r0, 0xD]
@@ -13555,7 +13555,7 @@ _08010220:
 	thumb_func_end sub_80101CC
 
 	thumb_func_start sub_801022C
-sub_801022C: ; 801022C
+sub_801022C: @ 801022C
 	push {r4,lr}
 	ldr r0, =0x03003110
 	ldrh r0, [r0]
@@ -13580,7 +13580,7 @@ _0801024E:
 	thumb_func_end sub_801022C
 
 	thumb_func_start sub_8010264
-sub_8010264: ; 8010264
+sub_8010264: @ 8010264
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -13603,7 +13603,7 @@ _08010284:
 	thumb_func_end sub_8010264
 
 	thumb_func_start task_add_05_task_del_08FA224_when_no_RfuFunc
-task_add_05_task_del_08FA224_when_no_RfuFunc: ; 8010294
+task_add_05_task_del_08FA224_when_no_RfuFunc: @ 8010294
 	push {r4,lr}
 	ldr r4, =sub_8010264
 	adds r0, r4, 0
@@ -13622,7 +13622,7 @@ _080102AC:
 	thumb_func_end task_add_05_task_del_08FA224_when_no_RfuFunc
 
 	thumb_func_start sub_80102B8
-sub_80102B8: ; 80102B8
+sub_80102B8: @ 80102B8
 	push {r4,r5,lr}
 	bl link_get_multiplayer_id
 	lsls r0, 24
@@ -13704,7 +13704,7 @@ _0801033E:
 	thumb_func_end sub_80102B8
 
 	thumb_func_start sub_8010358
-sub_8010358: ; 8010358
+sub_8010358: @ 8010358
 	push {r4,lr}
 	ldr r4, =0x03005000
 	ldr r1, =0x000009e6
@@ -13729,7 +13729,7 @@ _0801037A:
 	thumb_func_end sub_8010358
 
 	thumb_func_start sub_8010390
-sub_8010390: ; 8010390
+sub_8010390: @ 8010390
 	push {r4,lr}
 	bl link_get_multiplayer_id
 	lsls r0, 24
@@ -13802,7 +13802,7 @@ _0801041E:
 	thumb_func_end sub_8010390
 
 	thumb_func_start sub_8010434
-sub_8010434: ; 8010434
+sub_8010434: @ 8010434
 	push {lr}
 	ldr r1, =0x03005000
 	ldr r2, [r1]
@@ -13820,7 +13820,7 @@ _08010448:
 	thumb_func_end sub_8010434
 
 	thumb_func_start sub_8010454
-sub_8010454: ; 8010454
+sub_8010454: @ 8010454
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r1, =gUnknown_082ED6E0
@@ -13851,7 +13851,7 @@ _08010484:
 	thumb_func_end sub_8010454
 
 	thumb_func_start sub_801048C
-sub_801048C: ; 801048C
+sub_801048C: @ 801048C
 	push {lr}
 	cmp r0, 0
 	beq _080104A0
@@ -13873,7 +13873,7 @@ _080104AC:
 	thumb_func_end sub_801048C
 
 	thumb_func_start sub_80104B0
-sub_80104B0: ; 80104B0
+sub_80104B0: @ 80104B0
 	push {lr}
 	ldr r0, =0x03005000
 	ldr r1, =0x00000cd9
@@ -13888,7 +13888,7 @@ sub_80104B0: ; 80104B0
 	thumb_func_end sub_80104B0
 
 	thumb_func_start rfu_get_multiplayer_id
-rfu_get_multiplayer_id: ; 80104D0
+rfu_get_multiplayer_id: @ 80104D0
 	push {lr}
 	ldr r1, =0x03005000
 	ldrb r0, [r1, 0xC]
@@ -13907,7 +13907,7 @@ _080104EE:
 	thumb_func_end rfu_get_multiplayer_id
 
 	thumb_func_start sub_80104F4
-sub_80104F4: ; 80104F4
+sub_80104F4: @ 80104F4
 	ldr r0, =0x03005000
 	ldrb r0, [r0, 0xD]
 	bx lr
@@ -13915,7 +13915,7 @@ sub_80104F4: ; 80104F4
 	thumb_func_end sub_80104F4
 
 	thumb_func_start sub_8010500
-sub_8010500: ; 8010500
+sub_8010500: @ 8010500
 	push {lr}
 	ldr r2, =0x03005000
 	adds r0, r2, 0
@@ -13940,7 +13940,7 @@ _08010524:
 	thumb_func_end sub_8010500
 
 	thumb_func_start sub_8010528
-sub_8010528: ; 8010528
+sub_8010528: @ 8010528
 	push {lr}
 	ldr r0, =0x03005000
 	ldr r0, [r0]
@@ -13954,7 +13954,7 @@ _08010536:
 	thumb_func_end sub_8010528
 
 	thumb_func_start sub_8010540
-sub_8010540: ; 8010540
+sub_8010540: @ 8010540
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -14035,7 +14035,7 @@ _080105DA:
 	thumb_func_end sub_8010540
 
 	thumb_func_start sub_80105EC
-sub_80105EC: ; 80105EC
+sub_80105EC: @ 80105EC
 	push {r4-r6,lr}
 	movs r3, 0
 	movs r1, 0
@@ -14088,7 +14088,7 @@ _08010644:
 	thumb_func_end sub_80105EC
 
 	thumb_func_start sub_801064C
-sub_801064C: ; 801064C
+sub_801064C: @ 801064C
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -14118,7 +14118,7 @@ _08010682:
 	thumb_func_end sub_801064C
 
 	thumb_func_start sub_8010688
-sub_8010688: ; 8010688
+sub_8010688: @ 8010688
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r0, r2, 0
@@ -14153,7 +14153,7 @@ sub_8010688: ; 8010688
 	thumb_func_end sub_8010688
 
 	thumb_func_start sub_80106D4
-sub_80106D4: ; 80106D4
+sub_80106D4: @ 80106D4
 	push {r4,r5,lr}
 	ldr r4, =0x03005000
 	ldr r0, =0x00000c85
@@ -14181,7 +14181,7 @@ sub_80106D4: ; 80106D4
 	thumb_func_end sub_80106D4
 
 	thumb_func_start sub_8010714
-sub_8010714: ; 8010714
+sub_8010714: @ 8010714
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -14214,7 +14214,7 @@ _0801074A:
 	thumb_func_end sub_8010714
 
 	thumb_func_start sub_8010750
-sub_8010750: ; 8010750
+sub_8010750: @ 8010750
 	push {r4,r5,lr}
 	bl sub_8010540
 	movs r4, 0
@@ -14254,7 +14254,7 @@ _08010788:
 	thumb_func_end sub_8010750
 
 	thumb_func_start sub_80107A0
-sub_80107A0: ; 80107A0
+sub_80107A0: @ 80107A0
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r1, =0x03005000
@@ -14335,7 +14335,7 @@ _08010844:
 	thumb_func_end sub_80107A0
 
 	thumb_func_start sub_801084C
-sub_801084C: ; 801084C
+sub_801084C: @ 801084C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -14534,7 +14534,7 @@ _080109D2:
 	thumb_func_end sub_801084C
 
 	thumb_func_start sub_80109E8
-sub_80109E8: ; 80109E8
+sub_80109E8: @ 80109E8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -14561,7 +14561,7 @@ _08010A04:
 	thumb_func_end sub_80109E8
 
 	thumb_func_start sub_8010A14
-sub_8010A14: ; 8010A14
+sub_8010A14: @ 8010A14
 	push {r4-r7,lr}
 	adds r2, r0, 0
 	ldr r1, =0x03005000
@@ -14607,7 +14607,7 @@ _08010A3C:
 	thumb_func_end sub_8010A14
 
 	thumb_func_start sub_8010A70
-sub_8010A70: ; 8010A70
+sub_8010A70: @ 8010A70
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -14635,7 +14635,7 @@ _08010A9C:
 	thumb_func_end sub_8010A70
 
 	thumb_func_start sub_8010AAC
-sub_8010AAC: ; 8010AAC
+sub_8010AAC: @ 8010AAC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -14899,7 +14899,7 @@ _08010CF0:
 	thumb_func_end sub_8010AAC
 
 	thumb_func_start sub_8010D0C
-sub_8010D0C: ; 8010D0C
+sub_8010D0C: @ 8010D0C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -14978,7 +14978,7 @@ _08010DA6:
 	thumb_func_end sub_8010D0C
 
 	thumb_func_start sub_8010DB4
-sub_8010DB4: ; 8010DB4
+sub_8010DB4: @ 8010DB4
 	push {r4-r7,lr}
 	ldr r0, =0x03005000
 	adds r1, r0, 0
@@ -15079,7 +15079,7 @@ _08010E8E:
 	thumb_func_end sub_8010DB4
 
 	thumb_func_start rfu_REQ_recvData_then_sendData
-rfu_REQ_recvData_then_sendData: ; 8010EA0
+rfu_REQ_recvData_then_sendData: @ 8010EA0
 	push {lr}
 	ldr r0, =0x03004140
 	ldrb r0, [r0, 0x6]
@@ -15096,7 +15096,7 @@ _08010EB8:
 	thumb_func_end rfu_REQ_recvData_then_sendData
 
 	thumb_func_start sub_8010EC0
-sub_8010EC0: ; 8010EC0
+sub_8010EC0: @ 8010EC0
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =0x03005000
@@ -15142,7 +15142,7 @@ _08010F14:
 	thumb_func_end sub_8010EC0
 
 	thumb_func_start sub_8010F1C
-sub_8010F1C: ; 8010F1C
+sub_8010F1C: @ 8010F1C
 	push {r4,lr}
 	movs r4, 0
 	ldr r1, =0x03005000
@@ -15167,7 +15167,7 @@ _08010F3C:
 	thumb_func_end sub_8010F1C
 
 	thumb_func_start sub_8010F48
-sub_8010F48: ; 8010F48
+sub_8010F48: @ 8010F48
 	push {lr}
 	ldr r0, =0x02022b22
 	ldr r1, =0x03005d90
@@ -15179,7 +15179,7 @@ sub_8010F48: ; 8010F48
 	thumb_func_end sub_8010F48
 
 	thumb_func_start sub_8010F60
-sub_8010F60: ; 8010F60
+sub_8010F60: @ 8010F60
 	push {r4,lr}
 	ldr r4, =0x02022b14
 	adds r0, r4, 0
@@ -15198,7 +15198,7 @@ sub_8010F60: ; 8010F60
 	thumb_func_end sub_8010F60
 
 	thumb_func_start sub_8010F84
-sub_8010F84: ; 8010F84
+sub_8010F84: @ 8010F84
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -15214,7 +15214,7 @@ sub_8010F84: ; 8010F84
 	thumb_func_end sub_8010F84
 
 	thumb_func_start sub_8010FA0
-sub_8010FA0: ; 8010FA0
+sub_8010FA0: @ 8010FA0
 	push {r4,r5,lr}
 	ldr r5, =0x02022b14
 	movs r4, 0x1
@@ -15239,7 +15239,7 @@ sub_8010FA0: ; 8010FA0
 	thumb_func_end sub_8010FA0
 
 	thumb_func_start sub_8010FCC
-sub_8010FCC: ; 8010FCC
+sub_8010FCC: @ 8010FCC
 	push {r4,r5,lr}
 	ldr r5, =0x02022b14
 	lsls r0, 2
@@ -15269,7 +15269,7 @@ sub_8010FCC: ; 8010FCC
 	thumb_func_end sub_8010FCC
 
 	thumb_func_start sub_801100C
-sub_801100C: ; 801100C
+sub_801100C: @ 801100C
 	push {r4,lr}
 	movs r4, 0x80
 	ldr r3, =0x020229e8
@@ -15295,7 +15295,7 @@ sub_801100C: ; 801100C
 	thumb_func_end sub_801100C
 
 	thumb_func_start sub_801103C
-sub_801103C: ; 801103C
+sub_801103C: @ 801103C
 	push {r4,r5,lr}
 	ldr r5, =0x02022b14
 	movs r4, 0x1
@@ -15319,7 +15319,7 @@ _08011054:
 	thumb_func_end sub_801103C
 
 	thumb_func_start sub_8011068
-sub_8011068: ; 8011068
+sub_8011068: @ 8011068
 	push {lr}
 	lsls r0, 24
 	ldr r2, =0x02022b14
@@ -15339,7 +15339,7 @@ sub_8011068: ; 8011068
 	thumb_func_end sub_8011068
 
 	thumb_func_start sub_8011090
-sub_8011090: ; 8011090
+sub_8011090: @ 8011090
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -15358,7 +15358,7 @@ _0801109E:
 	thumb_func_end sub_8011090
 
 	thumb_func_start sub_80110B8
-sub_80110B8: ; 80110B8
+sub_80110B8: @ 80110B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -15446,7 +15446,7 @@ _0801114C:
 	thumb_func_end sub_80110B8
 
 	thumb_func_start sub_8011170
-sub_8011170: ; 8011170
+sub_8011170: @ 8011170
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03005000
@@ -15472,7 +15472,7 @@ _08011192:
 	thumb_func_end sub_8011170
 
 	thumb_func_start sub_80111A0
-sub_80111A0: ; 80111A0
+sub_80111A0: @ 80111A0
 	ldr r0, =0x03005000
 	adds r0, 0xEE
 	ldrb r1, [r0]
@@ -15483,7 +15483,7 @@ sub_80111A0: ; 80111A0
 	thumb_func_end sub_80111A0
 
 	thumb_func_start sub_80111B0
-sub_80111B0: ; 80111B0
+sub_80111B0: @ 80111B0
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0
@@ -15507,7 +15507,7 @@ _080111D2:
 	thumb_func_end sub_80111B0
 
 	thumb_func_start sub_80111DC
-sub_80111DC: ; 80111DC
+sub_80111DC: @ 80111DC
 	push {lr}
 	ldr r0, =0x03004140
 	ldrb r0, [r0]
@@ -15522,7 +15522,7 @@ sub_80111DC: ; 80111DC
 	thumb_func_end sub_80111DC
 
 	thumb_func_start sub_80111FC
-sub_80111FC: ; 80111FC
+sub_80111FC: @ 80111FC
 	ldr r1, =0x03005000
 	ldr r0, =sub_80111DC
 	str r0, [r1]
@@ -15531,7 +15531,7 @@ sub_80111FC: ; 80111FC
 	thumb_func_end sub_80111FC
 
 	thumb_func_start sub_801120C
-sub_801120C: ; 801120C
+sub_801120C: @ 801120C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -15772,7 +15772,7 @@ _080113EE:
 	thumb_func_end sub_801120C
 
 	thumb_func_start sub_8011404
-sub_8011404: ; 8011404
+sub_8011404: @ 8011404
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -15994,7 +15994,7 @@ _080115DE:
 	thumb_func_end sub_8011404
 
 	thumb_func_start sub_80115EC
-sub_80115EC: ; 80115EC
+sub_80115EC: @ 80115EC
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -16026,7 +16026,7 @@ _08011610:
 	thumb_func_end sub_80115EC
 
 	thumb_func_start sub_8011628
-sub_8011628: ; 8011628
+sub_8011628: @ 8011628
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r3, 0
@@ -16068,7 +16068,7 @@ _0801165C:
 	thumb_func_end sub_8011628
 
 	thumb_func_start sub_8011674
-sub_8011674: ; 8011674
+sub_8011674: @ 8011674
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -16513,7 +16513,7 @@ _08011A42:
 	thumb_func_end sub_8011674
 
 	thumb_func_start sub_8011A50
-sub_8011A50: ; 8011A50
+sub_8011A50: @ 8011A50
 	ldr r0, =0x03005000
 	ldr r1, =0x00000ce4
 	adds r0, r1
@@ -16524,7 +16524,7 @@ sub_8011A50: ; 8011A50
 	thumb_func_end sub_8011A50
 
 	thumb_func_start sub_8011A64
-sub_8011A64: ; 8011A64
+sub_8011A64: @ 8011A64
 	ldr r2, =0x03005000
 	adds r3, r2, 0
 	adds r3, 0xF1
@@ -16535,7 +16535,7 @@ sub_8011A64: ; 8011A64
 	thumb_func_end sub_8011A64
 
 	thumb_func_start sub_8011A74
-sub_8011A74: ; 8011A74
+sub_8011A74: @ 8011A74
 	ldr r0, =0x03005000
 	adds r0, 0xF1
 	ldrb r0, [r0]
@@ -16544,7 +16544,7 @@ sub_8011A74: ; 8011A74
 	thumb_func_end sub_8011A74
 
 	thumb_func_start sub_8011A80
-sub_8011A80: ; 8011A80
+sub_8011A80: @ 8011A80
 	push {lr}
 	bl sub_8011A74
 	lsls r0, 24
@@ -16562,7 +16562,7 @@ _08011A96:
 	thumb_func_end sub_8011A80
 
 	thumb_func_start sub_8011A9C
-sub_8011A9C: ; 8011A9C
+sub_8011A9C: @ 8011A9C
 	ldr r0, =0x03005000
 	ldr r1, =0x00000ce8
 	adds r0, r1
@@ -16572,7 +16572,7 @@ sub_8011A9C: ; 8011A9C
 	thumb_func_end sub_8011A9C
 
 	thumb_func_start sub_8011AB0
-sub_8011AB0: ; 8011AB0
+sub_8011AB0: @ 8011AB0
 	ldr r0, =0x03005000
 	ldrb r0, [r0, 0xC]
 	bx lr
@@ -16580,7 +16580,7 @@ sub_8011AB0: ; 8011AB0
 	thumb_func_end sub_8011AB0
 
 	thumb_func_start rfu_syncVBlank__
-rfu_syncVBlank__: ; 8011ABC
+rfu_syncVBlank__: @ 8011ABC
 	push {lr}
 	bl rfu_syncVBlank_
 	pop {r0}
@@ -16588,7 +16588,7 @@ rfu_syncVBlank__: ; 8011ABC
 	thumb_func_end rfu_syncVBlank__
 
 	thumb_func_start sub_8011AC8
-sub_8011AC8: ; 8011AC8
+sub_8011AC8: @ 8011AC8
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -16604,7 +16604,7 @@ sub_8011AC8: ; 8011AC8
 	thumb_func_end sub_8011AC8
 
 	thumb_func_start sub_8011AE8
-sub_8011AE8: ; 8011AE8
+sub_8011AE8: @ 8011AE8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -16614,7 +16614,7 @@ sub_8011AE8: ; 8011AE8
 	thumb_func_end sub_8011AE8
 
 	thumb_func_start sub_8011AFC
-sub_8011AFC: ; 8011AFC
+sub_8011AFC: @ 8011AFC
 	push {r4,lr}
 	bl ResetAllObjectData
 	bl ResetObjectPaletteAllocator
@@ -16665,7 +16665,7 @@ _08011B70:
 	thumb_func_end sub_8011AFC
 
 	thumb_func_start sub_8011B90
-sub_8011B90: ; 8011B90
+sub_8011B90: @ 8011B90
 	push {lr}
 	ldr r0, =sub_800EB44
 	bl is_function_an_active_task
@@ -16677,7 +16677,7 @@ sub_8011B90: ; 8011B90
 	thumb_func_end sub_8011B90
 
 	thumb_func_start sub_8011BA4
-sub_8011BA4: ; 8011BA4
+sub_8011BA4: @ 8011BA4
 	push {r4,lr}
 	ldr r4, =nullsub_89
 	adds r0, r4, 0
@@ -16699,7 +16699,7 @@ _08011BC2:
 	thumb_func_end sub_8011BA4
 
 	thumb_func_start sub_8011BD0
-sub_8011BD0: ; 8011BD0
+sub_8011BD0: @ 8011BD0
 	push {lr}
 	ldr r0, =nullsub_89
 	bl is_function_an_active_task
@@ -16718,7 +16718,7 @@ _08011BEA:
 	thumb_func_end sub_8011BD0
 
 	thumb_func_start sub_8011BF8
-sub_8011BF8: ; 8011BF8
+sub_8011BF8: @ 8011BF8
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -16729,7 +16729,7 @@ sub_8011BF8: ; 8011BF8
 	thumb_func_end sub_8011BF8
 
 	thumb_func_start sub_8011C10
-sub_8011C10: ; 8011C10
+sub_8011C10: @ 8011C10
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r1, =0x03005000
@@ -16759,7 +16759,7 @@ sub_8011C10: ; 8011C10
 	thumb_func_end sub_8011C10
 
 	thumb_func_start sub_8011C5C
-sub_8011C5C: ; 8011C5C
+sub_8011C5C: @ 8011C5C
 	push {lr}
 	ldr r1, =0x03005000
 	movs r0, 0
@@ -16775,7 +16775,7 @@ sub_8011C5C: ; 8011C5C
 	thumb_func_end sub_8011C5C
 
 	thumb_func_start sub_8011C84
-sub_8011C84: ; 8011C84
+sub_8011C84: @ 8011C84
 	push {r4-r7,lr}
 	ldr r4, =0x03005000
 	movs r5, 0
@@ -16808,7 +16808,7 @@ sub_8011C84: ; 8011C84
 	thumb_func_end sub_8011C84
 
 	thumb_func_start sub_8011CD8
-sub_8011CD8: ; 8011CD8
+sub_8011CD8: @ 8011CD8
 	ldrb r1, [r0, 0x1]
 	lsls r1, 8
 	ldrb r0, [r0]
@@ -16817,7 +16817,7 @@ sub_8011CD8: ; 8011CD8
 	thumb_func_end sub_8011CD8
 
 	thumb_func_start sub_8011CE4
-sub_8011CE4: ; 8011CE4
+sub_8011CE4: @ 8011CE4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -16888,7 +16888,7 @@ _08011D56:
 	thumb_func_end sub_8011CE4
 
 	thumb_func_start sub_8011D6C
-sub_8011D6C: ; 8011D6C
+sub_8011D6C: @ 8011D6C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r0, r6, 24
@@ -16922,7 +16922,7 @@ sub_8011D6C: ; 8011D6C
 	thumb_func_end sub_8011D6C
 
 	thumb_func_start sub_8011DC0
-sub_8011DC0: ; 8011DC0
+sub_8011DC0: @ 8011DC0
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -16940,7 +16940,7 @@ _08011DDA:
 	thumb_func_end sub_8011DC0
 
 	thumb_func_start sub_8011DE0
-sub_8011DE0: ; 8011DE0
+sub_8011DE0: @ 8011DE0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	cmp r4, 0
@@ -16982,7 +16982,7 @@ _08011E20:
 	thumb_func_end sub_8011DE0
 
 	thumb_func_start sub_8011E2C
-sub_8011E2C: ; 8011E2C
+sub_8011E2C: @ 8011E2C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -17028,7 +17028,7 @@ _08011E7A:
 	thumb_func_end sub_8011E2C
 
 	thumb_func_start sub_8011E94
-sub_8011E94: ; 8011E94
+sub_8011E94: @ 8011E94
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -17075,7 +17075,7 @@ _08011EDC:
 	thumb_func_end sub_8011E94
 
 	thumb_func_start sub_8011EF4
-sub_8011EF4: ; 8011EF4
+sub_8011EF4: @ 8011EF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -17170,7 +17170,7 @@ _08011FC2:
 	thumb_func_end sub_8011EF4
 
 	thumb_func_start sub_8011FC8
-sub_8011FC8: ; 8011FC8
+sub_8011FC8: @ 8011FC8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r5, r1, 16
@@ -17200,7 +17200,7 @@ sub_8011FC8: ; 8011FC8
 	thumb_func_end sub_8011FC8
 
 	thumb_func_start sub_801200C
-sub_801200C: ; 801200C
+sub_801200C: @ 801200C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -17275,7 +17275,7 @@ _08012094:
 	thumb_func_end sub_801200C
 
 	thumb_func_start sub_801209C
-sub_801209C: ; 801209C
+sub_801209C: @ 801209C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -17379,7 +17379,7 @@ _0801217C:
 	thumb_func_end sub_801209C
 
 	thumb_func_start sub_8012188
-sub_8012188: ; 8012188
+sub_8012188: @ 8012188
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -17447,7 +17447,7 @@ _0801221E:
 	thumb_func_end sub_8012188
 
 	thumb_func_start sub_8012224
-sub_8012224: ; 8012224
+sub_8012224: @ 8012224
 	push {lr}
 	ldr r0, =0x03005000
 	adds r0, 0xF0
@@ -17465,7 +17465,7 @@ _0801223A:
 	thumb_func_end sub_8012224
 
 	thumb_func_start sub_8012240
-sub_8012240: ; 8012240
+sub_8012240: @ 8012240
 	push {r4,lr}
 	movs r1, 0
 	ldr r0, =0x03004140
@@ -17497,7 +17497,7 @@ _08012274:
 	thumb_func_end sub_8012240
 
 	thumb_func_start sub_801227C
-sub_801227C: ; 801227C
+sub_801227C: @ 801227C
 	push {r4,lr}
 	movs r4, 0
 _08012280:
@@ -17516,7 +17516,7 @@ _08012280:
 	thumb_func_end sub_801227C
 
 	thumb_func_start sub_801229C
-sub_801229C: ; 801229C
+sub_801229C: @ 801229C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -17765,7 +17765,7 @@ _080124AA:
 	thumb_func_end sub_801229C
 
 	thumb_func_start sub_80124C0
-sub_80124C0: ; 80124C0
+sub_80124C0: @ 80124C0
 	ldr r0, =0x03005000
 	ldr r1, =0x00000c1a
 	adds r0, r1
@@ -17775,7 +17775,7 @@ sub_80124C0: ; 80124C0
 	thumb_func_end sub_80124C0
 
 	thumb_func_start sub_80124D4
-sub_80124D4: ; 80124D4
+sub_80124D4: @ 80124D4
 	ldr r0, =0x03005000
 	ldr r1, =0x000009e6
 	adds r0, r1
@@ -17785,12 +17785,12 @@ sub_80124D4: ; 80124D4
 	thumb_func_end sub_80124D4
 
 	thumb_func_start nullsub_89
-nullsub_89: ; 80124E8
+nullsub_89: @ 80124E8
 	bx lr
 	thumb_func_end nullsub_89
 
 	thumb_func_start sub_80124EC
-sub_80124EC: ; 80124EC
+sub_80124EC: @ 80124EC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r1, 0
@@ -17894,7 +17894,7 @@ _080125A6:
 	thumb_func_end sub_80124EC
 
 	thumb_func_start sub_80125BC
-sub_80125BC: ; 80125BC
+sub_80125BC: @ 80125BC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -17946,7 +17946,7 @@ sub_80125BC: ; 80125BC
 	thumb_func_end sub_80125BC
 
 	thumb_func_start sub_801262C
-sub_801262C: ; 801262C
+sub_801262C: @ 801262C
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -18000,7 +18000,7 @@ _080126C0:
 	thumb_func_end sub_801262C
 
 	thumb_func_start sub_80126CC
-sub_80126CC: ; 80126CC
+sub_80126CC: @ 80126CC
 	push {lr}
 	subs r0, 0x9
 	cmp r0, 0x12
@@ -18043,7 +18043,7 @@ _08012736:
 	thumb_func_end sub_80126CC
 
 	thumb_func_start BerryBlenderLinkBecomeLeader
-BerryBlenderLinkBecomeLeader: ; 801273C
+BerryBlenderLinkBecomeLeader: @ 801273C
 	push {lr}
 	ldr r0, =sub_8012780
 	movs r1, 0
@@ -18070,7 +18070,7 @@ BerryBlenderLinkBecomeLeader: ; 801273C
 	thumb_func_end BerryBlenderLinkBecomeLeader
 
 	thumb_func_start sub_8012780
-sub_8012780: ; 8012780
+sub_8012780: @ 8012780
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -18960,7 +18960,7 @@ _08012F50:
 	thumb_func_end sub_8012780
 
 	thumb_func_start sub_8012F64
-sub_8012F64: ; 8012F64
+sub_8012F64: @ 8012F64
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x11]
@@ -18999,7 +18999,7 @@ sub_8012F64: ; 8012F64
 	thumb_func_end sub_8012F64
 
 	thumb_func_start sub_8012FC4
-sub_8012FC4: ; 8012FC4
+sub_8012FC4: @ 8012FC4
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -19065,7 +19065,7 @@ _08013070:
 	thumb_func_end sub_8012FC4
 
 	thumb_func_start sub_8013078
-sub_8013078: ; 8013078
+sub_8013078: @ 8013078
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -19098,7 +19098,7 @@ _080130AA:
 	thumb_func_end sub_8013078
 
 	thumb_func_start sub_80130B4
-sub_80130B4: ; 80130B4
+sub_80130B4: @ 80130B4
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -19159,7 +19159,7 @@ _08013158:
 	thumb_func_end sub_80130B4
 
 	thumb_func_start sub_8013160
-sub_8013160: ; 8013160
+sub_8013160: @ 8013160
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -19220,7 +19220,7 @@ _08013204:
 	thumb_func_end sub_8013160
 
 	thumb_func_start sub_801320C
-sub_801320C: ; 801320C
+sub_801320C: @ 801320C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -19270,7 +19270,7 @@ _08013272:
 	thumb_func_end sub_801320C
 
 	thumb_func_start sub_8013278
-sub_8013278: ; 8013278
+sub_8013278: @ 8013278
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r1, 0
@@ -19320,7 +19320,7 @@ _080132B4:
 	thumb_func_end sub_8013278
 
 	thumb_func_start sub_80132D4
-sub_80132D4: ; 80132D4
+sub_80132D4: @ 80132D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -19426,7 +19426,7 @@ _08013388:
 	thumb_func_end sub_80132D4
 
 	thumb_func_start sub_8013398
-sub_8013398: ; 8013398
+sub_8013398: @ 8013398
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -19568,7 +19568,7 @@ _08013494:
 	thumb_func_end sub_8013398
 
 	thumb_func_start BerryBlenderLinkJoinGroup
-BerryBlenderLinkJoinGroup: ; 80134A4
+BerryBlenderLinkJoinGroup: @ 80134A4
 	push {lr}
 	ldr r0, =sub_80134E8
 	movs r1, 0
@@ -19595,7 +19595,7 @@ BerryBlenderLinkJoinGroup: ; 80134A4
 	thumb_func_end BerryBlenderLinkJoinGroup
 
 	thumb_func_start sub_80134E8
-sub_80134E8: ; 80134E8
+sub_80134E8: @ 80134E8
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -20270,7 +20270,7 @@ _08013B82:
 	thumb_func_end sub_80134E8
 
 	thumb_func_start sub_8013B8C
-sub_8013B8C: ; 8013B8C
+sub_8013B8C: @ 8013B8C
 	push {lr}
 	lsls r1, 5
 	ldr r0, [r0]
@@ -20312,7 +20312,7 @@ _08013BD4:
 	thumb_func_end sub_8013B8C
 
 	thumb_func_start sub_8013BD8
-sub_8013BD8: ; 8013BD8
+sub_8013BD8: @ 8013BD8
 	push {r4,lr}
 	adds r4, r0, 0
 	strb r1, [r4, 0xF]
@@ -20356,7 +20356,7 @@ sub_8013BD8: ; 8013BD8
 	thumb_func_end sub_8013BD8
 
 	thumb_func_start sub_8013C40
-sub_8013C40: ; 8013C40
+sub_8013C40: @ 8013C40
 	push {lr}
 	ldr r0, =sub_8013C7C
 	movs r1, 0
@@ -20381,7 +20381,7 @@ sub_8013C40: ; 8013C40
 	thumb_func_end sub_8013C40
 
 	thumb_func_start sub_8013C7C
-sub_8013C7C: ; 8013C7C
+sub_8013C7C: @ 8013C7C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -20491,7 +20491,7 @@ _08013D80:
 	thumb_func_end sub_8013C7C
 
 	thumb_func_start sub_8013D88
-sub_8013D88: ; 8013D88
+sub_8013D88: @ 8013D88
 	push {lr}
 	adds r2, r0, 0
 	cmp r1, 0xFF
@@ -20525,7 +20525,7 @@ _08013DB8:
 	thumb_func_end sub_8013D88
 
 	thumb_func_start sub_8013DBC
-sub_8013DBC: ; 8013DBC
+sub_8013DBC: @ 8013DBC
 	push {lr}
 	ldr r0, [r0]
 	lsls r1, 5
@@ -20561,7 +20561,7 @@ _08013DF0:
 	thumb_func_end sub_8013DBC
 
 	thumb_func_start sub_8013DF4
-sub_8013DF4: ; 8013DF4
+sub_8013DF4: @ 8013DF4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -20601,7 +20601,7 @@ sub_8013DF4: ; 8013DF4
 	thumb_func_end sub_8013DF4
 
 	thumb_func_start sub_8013E44
-sub_8013E44: ; 8013E44
+sub_8013E44: @ 8013E44
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -20750,7 +20750,7 @@ _08013F44:
 	thumb_func_end sub_8013E44
 
 	thumb_func_start sub_8013F60
-sub_8013F60: ; 8013F60
+sub_8013F60: @ 8013F60
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -20764,7 +20764,7 @@ sub_8013F60: ; 8013F60
 	thumb_func_end sub_8013F60
 
 	thumb_func_start sub_8013F78
-sub_8013F78: ; 8013F78
+sub_8013F78: @ 8013F78
 	push {lr}
 	ldr r0, =sub_8013F60
 	movs r1, 0
@@ -20777,7 +20777,7 @@ sub_8013F78: ; 8013F78
 	thumb_func_end sub_8013F78
 
 	thumb_func_start sub_8013F90
-sub_8013F90: ; 8013F90
+sub_8013F90: @ 8013F90
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -20913,7 +20913,7 @@ _080140BC:
 	thumb_func_end sub_8013F90
 
 	thumb_func_start sub_80140E0
-sub_80140E0: ; 80140E0
+sub_80140E0: @ 80140E0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -21004,7 +21004,7 @@ _0801419E:
 	thumb_func_end sub_80140E0
 
 	thumb_func_start sub_80141A4
-sub_80141A4: ; 80141A4
+sub_80141A4: @ 80141A4
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -21051,7 +21051,7 @@ _080141F2:
 	thumb_func_end sub_80141A4
 
 	thumb_func_start sub_8014210
-sub_8014210: ; 8014210
+sub_8014210: @ 8014210
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r6, 16
@@ -21102,7 +21102,7 @@ sub_8014210: ; 8014210
 	thumb_func_end sub_8014210
 
 	thumb_func_start sub_8014290
-sub_8014290: ; 8014290
+sub_8014290: @ 8014290
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -21157,7 +21157,7 @@ sub_8014290: ; 8014290
 	thumb_func_end sub_8014290
 
 	thumb_func_start sub_8014304
-sub_8014304: ; 8014304
+sub_8014304: @ 8014304
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -21212,7 +21212,7 @@ sub_8014304: ; 8014304
 	thumb_func_end sub_8014304
 
 	thumb_func_start sub_8014384
-sub_8014384: ; 8014384
+sub_8014384: @ 8014384
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -21254,7 +21254,7 @@ _080143C6:
 	thumb_func_end sub_8014384
 
 	thumb_func_start sub_80143E4
-sub_80143E4: ; 80143E4
+sub_80143E4: @ 80143E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -21277,7 +21277,7 @@ _08014404:
 	thumb_func_end sub_80143E4
 
 	thumb_func_start sub_801440C
-sub_801440C: ; 801440C
+sub_801440C: @ 801440C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -21579,7 +21579,7 @@ _0801477C:
 	thumb_func_end sub_801440C
 
 	thumb_func_start sub_8014790
-sub_8014790: ; 8014790
+sub_8014790: @ 8014790
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -21803,7 +21803,7 @@ _080149B2:
 	thumb_func_end sub_8014790
 
 	thumb_func_start sub_80149C4
-sub_80149C4: ; 80149C4
+sub_80149C4: @ 80149C4
 	push {lr}
 	ldr r0, =sub_8014790
 	movs r1, 0
@@ -21814,7 +21814,7 @@ sub_80149C4: ; 80149C4
 	thumb_func_end sub_80149C4
 
 	thumb_func_start sub_80149D8
-sub_80149D8: ; 80149D8
+sub_80149D8: @ 80149D8
 	push {lr}
 	ldr r0, =sub_801440C
 	movs r1, 0
@@ -21834,7 +21834,7 @@ sub_80149D8: ; 80149D8
 	thumb_func_end sub_80149D8
 
 	thumb_func_start sub_8014A00
-sub_8014A00: ; 8014A00
+sub_8014A00: @ 8014A00
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_8014A40
@@ -21862,7 +21862,7 @@ sub_8014A00: ; 8014A00
 	thumb_func_end sub_8014A00
 
 	thumb_func_start sub_8014A40
-sub_8014A40: ; 8014A40
+sub_8014A40: @ 8014A40
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -22380,7 +22380,7 @@ _08014EF2:
 	thumb_func_end sub_8014A40
 
 	thumb_func_start sub_8014EFC
-sub_8014EFC: ; 8014EFC
+sub_8014EFC: @ 8014EFC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_8014F48
@@ -22411,7 +22411,7 @@ sub_8014EFC: ; 8014EFC
 	thumb_func_end sub_8014EFC
 
 	thumb_func_start sub_8014F48
-sub_8014F48: ; 8014F48
+sub_8014F48: @ 8014F48
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -22769,7 +22769,7 @@ _080152A0:
 	thumb_func_end sub_8014F48
 
 	thumb_func_start sub_80152A8
-sub_80152A8: ; 80152A8
+sub_80152A8: @ 80152A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =task00_081182DC
@@ -22800,7 +22800,7 @@ sub_80152A8: ; 80152A8
 	thumb_func_end sub_80152A8
 
 	thumb_func_start task00_081182DC
-task00_081182DC: ; 80152F4
+task00_081182DC: @ 80152F4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -23141,7 +23141,7 @@ _08015604:
 	thumb_func_end task00_081182DC
 
 	thumb_func_start UnionRoomSpecial
-UnionRoomSpecial: ; 801560C
+UnionRoomSpecial: @ 801560C
 	push {r4,lr}
 	bl sub_8010F60
 	ldr r0, =sub_80156E0
@@ -23171,7 +23171,7 @@ UnionRoomSpecial: ; 801560C
 	thumb_func_end UnionRoomSpecial
 
 	thumb_func_start sub_8015658
-sub_8015658: ; 8015658
+sub_8015658: @ 8015658
 	ldrb r1, [r0, 0x1]
 	lsls r1, 8
 	ldrb r0, [r0]
@@ -23180,7 +23180,7 @@ sub_8015658: ; 8015658
 	thumb_func_end sub_8015658
 
 	thumb_func_start sub_8015664
-sub_8015664: ; 8015664
+sub_8015664: @ 8015664
 	push {lr}
 	adds r3, r1, 0
 	ldr r1, =0x02022c30
@@ -23200,7 +23200,7 @@ _0801567E:
 	thumb_func_end sub_8015664
 
 	thumb_func_start sub_801568C
-sub_801568C: ; 801568C
+sub_801568C: @ 801568C
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02022c30
@@ -23219,7 +23219,7 @@ _080156A4:
 	thumb_func_end sub_801568C
 
 	thumb_func_start sub_80156B0
-sub_80156B0: ; 80156B0
+sub_80156B0: @ 80156B0
 	push {lr}
 	ldr r3, =0x0201ff00
 	ldr r1, [r0]
@@ -23233,7 +23233,7 @@ sub_80156B0: ; 80156B0
 	thumb_func_end sub_80156B0
 
 	thumb_func_start sub_80156C8
-sub_80156C8: ; 80156C8
+sub_80156C8: @ 80156C8
 	push {lr}
 	ldr r0, [r0]
 	ldr r1, =0x0201ff00
@@ -23246,7 +23246,7 @@ sub_80156C8: ; 80156C8
 	thumb_func_end sub_80156C8
 
 	thumb_func_start sub_80156E0
-sub_80156E0: ; 80156E0
+sub_80156E0: @ 80156E0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -25082,7 +25082,7 @@ _08016878:
 	thumb_func_end sub_80156E0
 
 	thumb_func_start var_800D_set_xB
-var_800D_set_xB: ; 8016884
+var_800D_set_xB: @ 8016884
 	push {lr}
 	bl InUnionRoom
 	cmp r0, 0x1
@@ -25097,7 +25097,7 @@ _08016894:
 	thumb_func_end var_800D_set_xB
 
 	thumb_func_start sub_801689C
-sub_801689C: ; 801689C
+sub_801689C: @ 801689C
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	ldr r3, =0x03003090
@@ -25132,7 +25132,7 @@ _080168D0:
 	thumb_func_end sub_801689C
 
 	thumb_func_start sub_80168DC
-sub_80168DC: ; 80168DC
+sub_80168DC: @ 80168DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r4, 0
@@ -25176,7 +25176,7 @@ _0801692E:
 	thumb_func_end sub_80168DC
 
 	thumb_func_start sub_8016934
-sub_8016934: ; 8016934
+sub_8016934: @ 8016934
 	push {r4,r5,lr}
 	ldr r5, =0x02022c20
 	movs r0, 0xFF
@@ -25206,7 +25206,7 @@ sub_8016934: ; 8016934
 	thumb_func_end sub_8016934
 
 	thumb_func_start task00_081199FC
-task00_081199FC: ; 801697C
+task00_081199FC: @ 801697C
 	push {r4-r6,lr}
 	sub sp, 0x20
 	lsls r0, 24
@@ -25354,7 +25354,7 @@ _08016AC8:
 	thumb_func_end task00_081199FC
 
 	thumb_func_start sp182_move_string
-sp182_move_string: ; 8016AD4
+sp182_move_string: @ 8016AD4
 	push {r4,lr}
 	ldr r4, =0x02022c20
 	ldrb r0, [r4]
@@ -25378,7 +25378,7 @@ _08016AF6:
 	thumb_func_end sp182_move_string
 
 	thumb_func_start sub_8016B00
-sub_8016B00: ; 8016B00
+sub_8016B00: @ 8016B00
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -25592,7 +25592,7 @@ _08016C90:
 	thumb_func_end sub_8016B00
 
 	thumb_func_start sub_8016CA0
-sub_8016CA0: ; 8016CA0
+sub_8016CA0: @ 8016CA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -25761,7 +25761,7 @@ _08016DDC:
 	thumb_func_end sub_8016CA0
 
 	thumb_func_start sub_8016DF0
-sub_8016DF0: ; 8016DF0
+sub_8016DF0: @ 8016DF0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -25787,7 +25787,7 @@ sub_8016DF0: ; 8016DF0
 	thumb_func_end sub_8016DF0
 
 	thumb_func_start sub_8016E24
-sub_8016E24: ; 8016E24
+sub_8016E24: @ 8016E24
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -25910,7 +25910,7 @@ _08016ED2:
 	thumb_func_end sub_8016E24
 
 	thumb_func_start sub_8016F1C
-sub_8016F1C: ; 8016F1C
+sub_8016F1C: @ 8016F1C
 	push {lr}
 	lsls r1, 16
 	asrs r1, 16
@@ -25938,7 +25938,7 @@ _08016F40:
 	thumb_func_end sub_8016F1C
 
 	thumb_func_start sub_8016F44
-sub_8016F44: ; 8016F44
+sub_8016F44: @ 8016F44
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -26000,7 +26000,7 @@ _08016F86:
 	thumb_func_end sub_8016F44
 
 	thumb_func_start sub_8016FC0
-sub_8016FC0: ; 8016FC0
+sub_8016FC0: @ 8016FC0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -26024,7 +26024,7 @@ sub_8016FC0: ; 8016FC0
 	thumb_func_end sub_8016FC0
 
 	thumb_func_start sub_8016FF0
-sub_8016FF0: ; 8016FF0
+sub_8016FF0: @ 8016FF0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -26048,7 +26048,7 @@ sub_8016FF0: ; 8016FF0
 	thumb_func_end sub_8016FF0
 
 	thumb_func_start sub_8017020
-sub_8017020: ; 8017020
+sub_8017020: @ 8017020
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81973A4
@@ -26069,7 +26069,7 @@ sub_8017020: ; 8017020
 	thumb_func_end sub_8017020
 
 	thumb_func_start sub_801704C
-sub_801704C: ; 801704C
+sub_801704C: @ 801704C
 	push {lr}
 	bl sub_8197224
 	lsls r0, 16
@@ -26085,7 +26085,7 @@ _0801705E:
 	thumb_func_end sub_801704C
 
 	thumb_func_start sub_8017064
-sub_8017064: ; 8017064
+sub_8017064: @ 8017064
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -26128,7 +26128,7 @@ _080170B0:
 	thumb_func_end sub_8017064
 
 	thumb_func_start sub_80170B8
-sub_80170B8: ; 80170B8
+sub_80170B8: @ 80170B8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -26182,7 +26182,7 @@ _08017110:
 	thumb_func_end sub_80170B8
 
 	thumb_func_start sub_8017118
-sub_8017118: ; 8017118
+sub_8017118: @ 8017118
 	push {r4,lr}
 	sub sp, 0x8
 	bl AddWindow
@@ -26218,7 +26218,7 @@ sub_8017118: ; 8017118
 	thumb_func_end sub_8017118
 
 	thumb_func_start sub_8017168
-sub_8017168: ; 8017168
+sub_8017168: @ 8017168
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -26228,7 +26228,7 @@ sub_8017168: ; 8017168
 	thumb_func_end sub_8017168
 
 	thumb_func_start sub_8017178
-sub_8017178: ; 8017178
+sub_8017178: @ 8017178
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -26368,7 +26368,7 @@ _08017292:
 	thumb_func_end sub_8017178
 
 	thumb_func_start sub_80172A0
-sub_80172A0: ; 80172A0
+sub_80172A0: @ 80172A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -26497,7 +26497,7 @@ _080173A0:
 	thumb_func_end sub_80172A0
 
 	thumb_func_start sub_80173B0
-sub_80173B0: ; 80173B0
+sub_80173B0: @ 80173B0
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x20
@@ -26517,7 +26517,7 @@ sub_80173B0: ; 80173B0
 	thumb_func_end sub_80173B0
 
 	thumb_func_start sub_80173D4
-sub_80173D4: ; 80173D4
+sub_80173D4: @ 80173D4
 	push {lr}
 	bl script_env_2_enable_and_set_ctx_running
 	pop {r0}
@@ -26525,7 +26525,7 @@ sub_80173D4: ; 80173D4
 	thumb_func_end sub_80173D4
 
 	thumb_func_start sub_80173E0
-sub_80173E0: ; 80173E0
+sub_80173E0: @ 80173E0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	ldr r5, [sp, 0x1C]
@@ -26739,7 +26739,7 @@ _0801756E:
 	thumb_func_end sub_80173E0
 
 	thumb_func_start sub_8017580
-sub_8017580: ; 8017580
+sub_8017580: @ 8017580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -26797,7 +26797,7 @@ _080175D8:
 	thumb_func_end sub_8017580
 
 	thumb_func_start sub_80175EC
-sub_80175EC: ; 80175EC
+sub_80175EC: @ 80175EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -26835,7 +26835,7 @@ _08017604:
 	thumb_func_end sub_80175EC
 
 	thumb_func_start sub_8017630
-sub_8017630: ; 8017630
+sub_8017630: @ 8017630
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -26879,7 +26879,7 @@ _08017670:
 	thumb_func_end sub_8017630
 
 	thumb_func_start sub_8017678
-sub_8017678: ; 8017678
+sub_8017678: @ 8017678
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -26938,7 +26938,7 @@ _080176DE:
 	thumb_func_end sub_8017678
 
 	thumb_func_start sub_80176E4
-sub_80176E4: ; 80176E4
+sub_80176E4: @ 80176E4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -26983,7 +26983,7 @@ _0801771E:
 	thumb_func_end sub_80176E4
 
 	thumb_func_start sub_8017734
-sub_8017734: ; 8017734
+sub_8017734: @ 8017734
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -27056,7 +27056,7 @@ _080177AA:
 	thumb_func_end sub_8017734
 
 	thumb_func_start sub_80177B8
-sub_80177B8: ; 80177B8
+sub_80177B8: @ 80177B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -27161,7 +27161,7 @@ _08017884:
 	thumb_func_end sub_80177B8
 
 	thumb_func_start sub_80178A0
-sub_80178A0: ; 80178A0
+sub_80178A0: @ 80178A0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -27236,7 +27236,7 @@ _0801792A:
 	thumb_func_end sub_80178A0
 
 	thumb_func_start sub_8017940
-sub_8017940: ; 8017940
+sub_8017940: @ 8017940
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -27273,7 +27273,7 @@ _0801797A:
 	thumb_func_end sub_8017940
 
 	thumb_func_start sub_8017984
-sub_8017984: ; 8017984
+sub_8017984: @ 8017984
 	push {lr}
 	cmp r0, 0x4
 	beq _0801799C
@@ -27301,7 +27301,7 @@ _080179A6:
 	thumb_func_end sub_8017984
 
 	thumb_func_start sub_80179AC
-sub_80179AC: ; 80179AC
+sub_80179AC: @ 80179AC
 	push {r4,lr}
 	sub sp, 0x20
 	adds r4, r0, 0
@@ -27322,7 +27322,7 @@ sub_80179AC: ; 80179AC
 	thumb_func_end sub_80179AC
 
 	thumb_func_start sub_80179D4
-sub_80179D4: ; 80179D4
+sub_80179D4: @ 80179D4
 	push {r4-r6,lr}
 	adds r6, r3, 0
 	lsls r1, 24
@@ -27479,12 +27479,12 @@ _08017B2A:
 	thumb_func_end sub_80179D4
 
 	thumb_func_start nullsub_14
-nullsub_14: ; 8017B38
+nullsub_14: @ 8017B38
 	bx lr
 	thumb_func_end nullsub_14
 
 	thumb_func_start sub_8017B3C
-sub_8017B3C: ; 8017B3C
+sub_8017B3C: @ 8017B3C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -27567,7 +27567,7 @@ _08017BD4:
 	thumb_func_end sub_8017B3C
 
 	thumb_func_start sub_8017BE8
-sub_8017BE8: ; 8017BE8
+sub_8017BE8: @ 8017BE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -27663,7 +27663,7 @@ _08017CA0:
 	thumb_func_end sub_8017BE8
 
 	thumb_func_start sub_8017CB0
-sub_8017CB0: ; 8017CB0
+sub_8017CB0: @ 8017CB0
 	push {r4-r7,lr}
 	movs r4, 0
 	movs r3, 0
@@ -27704,7 +27704,7 @@ _08017CF0:
 	thumb_func_end sub_8017CB0
 
 	thumb_func_start sub_8017CF8
-sub_8017CF8: ; 8017CF8
+sub_8017CF8: @ 8017CF8
 	lsls r0, 5
 	adds r0, r1
 	ldrb r0, [r0, 0xB]
@@ -27714,7 +27714,7 @@ sub_8017CF8: ; 8017CF8
 	thumb_func_end sub_8017CF8
 
 	thumb_func_start sub_8017D04
-sub_8017D04: ; 8017D04
+sub_8017D04: @ 8017D04
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0xCE
@@ -27789,7 +27789,7 @@ _08017D90:
 	thumb_func_end sub_8017D04
 
 	thumb_func_start sub_8017D9C
-sub_8017D9C: ; 8017D9C
+sub_8017D9C: @ 8017D9C
 	push {lr}
 	adds r3, r0, 0
 	cmp r1, 0x44
@@ -27840,7 +27840,7 @@ _08017DF6:
 	thumb_func_end sub_8017D9C
 
 	thumb_func_start sub_8017E00
-sub_8017E00: ; 8017E00
+sub_8017E00: @ 8017E00
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -27920,7 +27920,7 @@ _08017E94:
 	thumb_func_end sub_8017E00
 
 	thumb_func_start sub_8017EA0
-sub_8017EA0: ; 8017EA0
+sub_8017EA0: @ 8017EA0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -28060,7 +28060,7 @@ _08017FC6:
 	thumb_func_end sub_8017EA0
 
 	thumb_func_start sub_8017FD8
-sub_8017FD8: ; 8017FD8
+sub_8017FD8: @ 8017FD8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x03003090
@@ -28086,7 +28086,7 @@ _08017FFE:
 	thumb_func_end sub_8017FD8
 
 	thumb_func_start InUnionRoom
-InUnionRoom: ; 8018004
+InUnionRoom: @ 8018004
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x03005d8c
@@ -28104,7 +28104,7 @@ _08018016:
 	thumb_func_end InUnionRoom
 
 	thumb_func_start sub_8018024
-sub_8018024: ; 8018024
+sub_8018024: @ 8018024
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -28152,7 +28152,7 @@ _08018076:
 	thumb_func_end sub_8018024
 
 	thumb_func_start sub_801807C
-sub_801807C: ; 801807C
+sub_801807C: @ 801807C
 	movs r1, 0
 	strh r1, [r0]
 	strh r1, [r0, 0x2]
@@ -28166,7 +28166,7 @@ sub_801807C: ; 801807C
 	thumb_func_end sub_801807C
 
 	thumb_func_start sub_8018090
-sub_8018090: ; 8018090
+sub_8018090: @ 8018090
 	push {lr}
 	ldr r0, =0x02022c40
 	bl sub_801807C
@@ -28176,7 +28176,7 @@ sub_8018090: ; 8018090
 	thumb_func_end sub_8018090
 
 	thumb_func_start sub_80180A0
-sub_80180A0: ; 80180A0
+sub_80180A0: @ 80180A0
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	movs r1, 0x64
@@ -28213,7 +28213,7 @@ _080180E2:
 	thumb_func_end sub_80180A0
 
 	thumb_func_start sub_80180E8
-sub_80180E8: ; 80180E8
+sub_80180E8: @ 80180E8
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	movs r1, 0x64
@@ -28240,7 +28240,7 @@ sub_80180E8: ; 80180E8
 	thumb_func_end sub_80180E8
 
 	thumb_func_start sub_8018120
-sub_8018120: ; 8018120
+sub_8018120: @ 8018120
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -28299,7 +28299,7 @@ _08018176:
 	thumb_func_end sub_8018120
 
 	thumb_func_start sub_801818C
-sub_801818C: ; 801818C
+sub_801818C: @ 801818C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80173B0
@@ -28327,7 +28327,7 @@ _080181BC:
 	thumb_func_end sub_801818C
 
 	thumb_func_start sub_80181CC
-sub_80181CC: ; 80181CC
+sub_80181CC: @ 80181CC
 	push {lr}
 	bl script_env_2_enable
 	bl sub_80983E8
@@ -28336,7 +28336,7 @@ sub_80181CC: ; 80181CC
 	thumb_func_end sub_80181CC
 
 	thumb_func_start sub_80181DC
-sub_80181DC: ; 80181DC
+sub_80181DC: @ 80181DC
 	push {r4,lr}
 	movs r3, 0x80
 	movs r2, 0
@@ -28376,7 +28376,7 @@ _08018216:
 	thumb_func_end sub_80181DC
 
 	thumb_func_start sub_8018220
-sub_8018220: ; 8018220
+sub_8018220: @ 8018220
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -28581,7 +28581,7 @@ _080183F0:
 	thumb_func_end sub_8018220
 
 	thumb_func_start sub_8018404
-sub_8018404: ; 8018404
+sub_8018404: @ 8018404
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -28598,7 +28598,7 @@ sub_8018404: ; 8018404
 	thumb_func_end sub_8018404
 
 	thumb_func_start sub_8018424
-sub_8018424: ; 8018424
+sub_8018424: @ 8018424
 	push {lr}
 	bl ProcessObjectCopyRequests
 	bl LoadOamFromSprites
@@ -28608,7 +28608,7 @@ sub_8018424: ; 8018424
 	thumb_func_end sub_8018424
 
 	thumb_func_start sub_8018438
-sub_8018438: ; 8018438
+sub_8018438: @ 8018438
 	push {lr}
 	bl RunActiveTasks
 	bl RunTextPrinters
@@ -28619,7 +28619,7 @@ sub_8018438: ; 8018438
 	thumb_func_end sub_8018438
 
 	thumb_func_start sub_8018450
-sub_8018450: ; 8018450
+sub_8018450: @ 8018450
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r7, r0, 0
@@ -28828,7 +28828,7 @@ _08018646:
 	thumb_func_end sub_8018450
 
 	thumb_func_start c2_mystery_gift
-c2_mystery_gift: ; 8018650
+c2_mystery_gift: @ 8018650
 	push {lr}
 	movs r0, 0
 	bl sub_8018450
@@ -28848,7 +28848,7 @@ _0801866C:
 	thumb_func_end c2_mystery_gift
 
 	thumb_func_start sub_801867C
-sub_801867C: ; 801867C
+sub_801867C: @ 801867C
 	push {lr}
 	movs r0, 0x1
 	bl sub_8018450
@@ -28867,7 +28867,7 @@ _08018698:
 	thumb_func_end sub_801867C
 
 	thumb_func_start sub_80186A4
-sub_80186A4: ; 80186A4
+sub_80186A4: @ 80186A4
 	push {lr}
 	ldr r1, =0x02022c60
 	movs r0, 0
@@ -28893,7 +28893,7 @@ sub_80186A4: ; 80186A4
 	thumb_func_end sub_80186A4
 
 	thumb_func_start sub_80186EC
-sub_80186EC: ; 80186EC
+sub_80186EC: @ 80186EC
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -28959,7 +28959,7 @@ _08018720:
 	thumb_func_end sub_80186EC
 
 	thumb_func_start sub_8018784
-sub_8018784: ; 8018784
+sub_8018784: @ 8018784
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -28971,7 +28971,7 @@ sub_8018784: ; 8018784
 	thumb_func_end sub_8018784
 
 	thumb_func_start sub_8018798
-sub_8018798: ; 8018798
+sub_8018798: @ 8018798
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -29055,7 +29055,7 @@ _08018812:
 	thumb_func_end sub_8018798
 
 	thumb_func_start sub_8018838
-sub_8018838: ; 8018838
+sub_8018838: @ 8018838
 	push {lr}
 	sub sp, 0xC
 	cmp r0, 0
@@ -29096,7 +29096,7 @@ _08018876:
 	thumb_func_end sub_8018838
 
 	thumb_func_start sub_8018884
-sub_8018884: ; 8018884
+sub_8018884: @ 8018884
 	push {r4,lr}
 	sub sp, 0x14
 	adds r1, r0, 0
@@ -29135,7 +29135,7 @@ sub_8018884: ; 8018884
 	thumb_func_end sub_8018884
 
 	thumb_func_start sub_80188DC
-sub_80188DC: ; 80188DC
+sub_80188DC: @ 80188DC
 	push {lr}
 	movs r0, 0x1
 	bl rbox_fill_rectangle
@@ -29149,7 +29149,7 @@ sub_80188DC: ; 80188DC
 	thumb_func_end sub_80188DC
 
 	thumb_func_start mevent_0814257C
-mevent_0814257C: ; 80188F8
+mevent_0814257C: @ 80188F8
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -29226,7 +29226,7 @@ _08018982:
 	thumb_func_end mevent_0814257C
 
 	thumb_func_start sub_801898C
-sub_801898C: ; 801898C
+sub_801898C: @ 801898C
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -29247,7 +29247,7 @@ sub_801898C: ; 801898C
 	thumb_func_end sub_801898C
 
 	thumb_func_start sub_80189B4
-sub_80189B4: ; 80189B4
+sub_80189B4: @ 80189B4
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x1
@@ -29268,7 +29268,7 @@ sub_80189B4: ; 80189B4
 	thumb_func_end sub_80189B4
 
 	thumb_func_start sub_80189DC
-sub_80189DC: ; 80189DC
+sub_80189DC: @ 80189DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -29305,7 +29305,7 @@ _08018A16:
 	thumb_func_end sub_80189DC
 
 	thumb_func_start sub_8018A1C
-sub_8018A1C: ; 8018A1C
+sub_8018A1C: @ 8018A1C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -29335,7 +29335,7 @@ _08018A48:
 	thumb_func_end sub_8018A1C
 
 	thumb_func_start sub_8018A50
-sub_8018A50: ; 8018A50
+sub_8018A50: @ 8018A50
 	push {r4,r5,lr}
 	sub sp, 0x24
 	lsls r2, 24
@@ -29421,7 +29421,7 @@ _08018AFA:
 	thumb_func_end sub_8018A50
 
 	thumb_func_start sub_8018B08
-sub_8018B08: ; 8018B08
+sub_8018B08: @ 8018B08
 	push {r4-r6,lr}
 	sub sp, 0x1C
 	adds r5, r0, 0
@@ -29566,7 +29566,7 @@ _08018C42:
 	thumb_func_end sub_8018B08
 
 	thumb_func_start sub_8018C4C
-sub_8018C4C: ; 8018C4C
+sub_8018C4C: @ 8018C4C
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r6, r0, 0
@@ -29706,7 +29706,7 @@ _08018D90:
 	thumb_func_end sub_8018C4C
 
 	thumb_func_start sub_8018D98
-sub_8018D98: ; 8018D98
+sub_8018D98: @ 8018D98
 	push {lr}
 	cmp r0, 0
 	beq _08018DA4
@@ -29720,7 +29720,7 @@ _08018DA8:
 	thumb_func_end sub_8018D98
 
 	thumb_func_start sub_8018DAC
-sub_8018DAC: ; 8018DAC
+sub_8018DAC: @ 8018DAC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrb r0, [r5]
@@ -29772,7 +29772,7 @@ _08018E02:
 	thumb_func_end sub_8018DAC
 
 	thumb_func_start sub_8018E08
-sub_8018E08: ; 8018E08
+sub_8018E08: @ 8018E08
 	push {lr}
 	cmp r0, 0
 	bne _08018E14
@@ -29787,7 +29787,7 @@ _08018E18:
 	thumb_func_end sub_8018E08
 
 	thumb_func_start sub_8018E20
-sub_8018E20: ; 8018E20
+sub_8018E20: @ 8018E20
 	push {lr}
 	cmp r0, 0
 	bne _08018E36
@@ -29815,7 +29815,7 @@ _08018E4A:
 	thumb_func_end sub_8018E20
 
 	thumb_func_start sub_8018E50
-sub_8018E50: ; 8018E50
+sub_8018E50: @ 8018E50
 	push {lr}
 	cmp r2, 0
 	beq _08018E60
@@ -29835,7 +29835,7 @@ _08018E62:
 	thumb_func_end sub_8018E50
 
 	thumb_func_start mevent_message_was_thrown_away
-mevent_message_was_thrown_away: ; 8018E74
+mevent_message_was_thrown_away: @ 8018E74
 	push {lr}
 	cmp r1, 0
 	beq _08018E84
@@ -29852,7 +29852,7 @@ _08018E86:
 	thumb_func_end mevent_message_was_thrown_away
 
 	thumb_func_start mevent_save_game
-mevent_save_game: ; 8018E94
+mevent_save_game: @ 8018E94
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -29913,7 +29913,7 @@ _08018F06:
 	thumb_func_end mevent_save_game
 
 	thumb_func_start mevent_message
-mevent_message: ; 8018F0C
+mevent_message: @ 8018F0C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -30051,7 +30051,7 @@ _08019034:
 	thumb_func_end mevent_message
 
 	thumb_func_start mevent_08142CE8
-mevent_08142CE8: ; 801903C
+mevent_08142CE8: @ 801903C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r0, r1, 0
@@ -30110,7 +30110,7 @@ _0801909C:
 	thumb_func_end mevent_08142CE8
 
 	thumb_func_start mevent_message_stamp_card_etc_send_status
-mevent_message_stamp_card_etc_send_status: ; 80190A4
+mevent_message_stamp_card_etc_send_status: @ 80190A4
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r1, =gUnknown_085EF014
@@ -30203,7 +30203,7 @@ _08019166:
 	thumb_func_end mevent_message_stamp_card_etc_send_status
 
 	thumb_func_start sub_8019174
-sub_8019174: ; 8019174
+sub_8019174: @ 8019174
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -30233,7 +30233,7 @@ _080191A2:
 	thumb_func_end sub_8019174
 
 	thumb_func_start task_add_00_mystery_gift
-task_add_00_mystery_gift: ; 80191AC
+task_add_00_mystery_gift: @ 80191AC
 	push {r4,lr}
 	ldr r0, =task00_mystery_gift
 	movs r1, 0
@@ -30268,7 +30268,7 @@ task_add_00_mystery_gift: ; 80191AC
 	thumb_func_end task_add_00_mystery_gift
 
 	thumb_func_start task00_mystery_gift
-task00_mystery_gift: ; 80191F4
+task00_mystery_gift: @ 80191F4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -31132,14 +31132,14 @@ _08019922:
 	thumb_func_end task00_mystery_gift
 
 	thumb_func_start sub_8019930
-sub_8019930: ; 8019930
+sub_8019930: @ 8019930
 	ldr r0, =0x000001a9
 	bx lr
 	.pool
 	thumb_func_end sub_8019930
 
 	thumb_func_start bgid_upload_textbox_1
-bgid_upload_textbox_1: ; 8019938
+bgid_upload_textbox_1: @ 8019938
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -31157,7 +31157,7 @@ bgid_upload_textbox_1: ; 8019938
 	thumb_func_end bgid_upload_textbox_1
 
 	thumb_func_start is_walking_or_running
-is_walking_or_running: ; 8019958
+is_walking_or_running: @ 8019958
 	push {lr}
 	ldr r0, =0x02037590
 	ldrb r0, [r0, 0x3]
@@ -31177,7 +31177,7 @@ _08019972:
 	thumb_func_end is_walking_or_running
 
 	thumb_func_start sub_8019978
-sub_8019978: ; 8019978
+sub_8019978: @ 8019978
 	ldr r3, =gUnknown_082F072C
 	movs r2, 0x7
 	ands r2, r1
@@ -31192,7 +31192,7 @@ sub_8019978: ; 8019978
 	thumb_func_end sub_8019978
 
 	thumb_func_start sub_8019990
-sub_8019990: ; 8019990
+sub_8019990: @ 8019990
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -31233,7 +31233,7 @@ sub_8019990: ; 8019990
 	thumb_func_end sub_8019990
 
 	thumb_func_start sub_80199E0
-sub_80199E0: ; 80199E0
+sub_80199E0: @ 80199E0
 	push {r4-r7,lr}
 	mov r12, r3
 	ldr r7, =gUnknown_082F0740
@@ -31276,7 +31276,7 @@ _08019A2A:
 	thumb_func_end sub_80199E0
 
 	thumb_func_start sub_8019A30
-sub_8019A30: ; 8019A30
+sub_8019A30: @ 8019A30
 	push {lr}
 	ldr r1, =0x000002bf
 	adds r0, r1
@@ -31291,7 +31291,7 @@ sub_8019A30: ; 8019A30
 	thumb_func_end sub_8019A30
 
 	thumb_func_start flag_set_x63
-flag_set_x63: ; 8019A4C
+flag_set_x63: @ 8019A4C
 	push {lr}
 	ldr r1, =0x000002bf
 	adds r0, r1
@@ -31304,7 +31304,7 @@ flag_set_x63: ; 8019A4C
 	thumb_func_end flag_set_x63
 
 	thumb_func_start flag_clear_x63
-flag_clear_x63: ; 8019A64
+flag_clear_x63: @ 8019A64
 	push {lr}
 	ldr r1, =0x000002bf
 	adds r0, r1
@@ -31317,7 +31317,7 @@ flag_clear_x63: ; 8019A64
 	thumb_func_end flag_clear_x63
 
 	thumb_func_start sub_8019A7C
-sub_8019A7C: ; 8019A7C
+sub_8019A7C: @ 8019A7C
 	push {lr}
 	ldr r2, =0x00004010
 	adds r0, r2
@@ -31332,7 +31332,7 @@ sub_8019A7C: ; 8019A7C
 	thumb_func_end sub_8019A7C
 
 	thumb_func_start sub_8019A98
-sub_8019A98: ; 8019A98
+sub_8019A98: @ 8019A98
 	push {lr}
 	ldr r1, =gUnknown_082F0774
 	adds r0, r1
@@ -31348,7 +31348,7 @@ sub_8019A98: ; 8019A98
 	thumb_func_end sub_8019A98
 
 	thumb_func_start sub_8019AB8
-sub_8019AB8: ; 8019AB8
+sub_8019AB8: @ 8019AB8
 	push {lr}
 	ldr r1, =gUnknown_082F0774
 	adds r0, r1
@@ -31364,7 +31364,7 @@ sub_8019AB8: ; 8019AB8
 	thumb_func_end sub_8019AB8
 
 	thumb_func_start sub_8019AD8
-sub_8019AD8: ; 8019AD8
+sub_8019AD8: @ 8019AD8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -31411,7 +31411,7 @@ _08019B32:
 	thumb_func_end sub_8019AD8
 
 	thumb_func_start sub_8019B3C
-sub_8019B3C: ; 8019B3C
+sub_8019B3C: @ 8019B3C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =gUnknown_082F0774
@@ -31462,7 +31462,7 @@ _08019B9E:
 	thumb_func_end sub_8019B3C
 
 	thumb_func_start sub_8019BA8
-sub_8019BA8: ; 8019BA8
+sub_8019BA8: @ 8019BA8
 	push {lr}
 	ldr r2, =0x02022c68
 	movs r1, 0
@@ -31489,7 +31489,7 @@ _08019BB8:
 	thumb_func_end sub_8019BA8
 
 	thumb_func_start sub_8019BDC
-sub_8019BDC: ; 8019BDC
+sub_8019BDC: @ 8019BDC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -31535,7 +31535,7 @@ _08019C30:
 	thumb_func_end sub_8019BDC
 
 	thumb_func_start sub_8019C38
-sub_8019C38: ; 8019C38
+sub_8019C38: @ 8019C38
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -31626,7 +31626,7 @@ _08019CE8:
 	thumb_func_end sub_8019C38
 
 	thumb_func_start sub_8019CF0
-sub_8019CF0: ; 8019CF0
+sub_8019CF0: @ 8019CF0
 	push {r4,lr}
 	ldr r3, =0x02022c64
 	lsls r0, 2
@@ -31653,7 +31653,7 @@ _08019D1A:
 	thumb_func_end sub_8019CF0
 
 	thumb_func_start AGBAssert
-AGBAssert: ; 8019D20
+AGBAssert: @ 8019D20
 	push {lr}
 	ldr r1, =0x02022c64
 	lsls r0, 2
@@ -31675,7 +31675,7 @@ _08019D3E:
 	thumb_func_end AGBAssert
 
 	thumb_func_start sub_8019D44
-sub_8019D44: ; 8019D44
+sub_8019D44: @ 8019D44
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -31752,7 +31752,7 @@ _08019DC6:
 	thumb_func_end sub_8019D44
 
 	thumb_func_start sub_8019DD0
-sub_8019DD0: ; 8019DD0
+sub_8019DD0: @ 8019DD0
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02022c64
@@ -31772,7 +31772,7 @@ _08019DD6:
 	thumb_func_end sub_8019DD0
 
 	thumb_func_start sub_8019DF4
-sub_8019DF4: ; 8019DF4
+sub_8019DF4: @ 8019DF4
 	push {r4,lr}
 	ldr r4, =sub_8019DD0
 	adds r0, r4, 0
@@ -31797,7 +31797,7 @@ _08019E1A:
 	thumb_func_end sub_8019DF4
 
 	thumb_func_start sub_8019E20
-sub_8019E20: ; 8019E20
+sub_8019E20: @ 8019E20
 	push {lr}
 	ldr r0, =sub_8019DD0
 	bl get_task_id_by_function
@@ -31813,7 +31813,7 @@ _08019E34:
 	thumb_func_end sub_8019E20
 
 	thumb_func_start sub_8019E3C
-sub_8019E3C: ; 8019E3C
+sub_8019E3C: @ 8019E3C
 	push {r4,lr}
 	movs r4, 0
 _08019E40:
@@ -31840,7 +31840,7 @@ _08019E56:
 	thumb_func_end sub_8019E3C
 
 	thumb_func_start sub_8019E70
-sub_8019E70: ; 8019E70
+sub_8019E70: @ 8019E70
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -31913,7 +31913,7 @@ _08019E9E:
 	thumb_func_end sub_8019E70
 
 	thumb_func_start sub_8019F04
-sub_8019F04: ; 8019F04
+sub_8019F04: @ 8019F04
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -31936,7 +31936,7 @@ _08019F0C:
 	thumb_func_end sub_8019F04
 
 	thumb_func_start sub_8019F2C
-sub_8019F2C: ; 8019F2C
+sub_8019F2C: @ 8019F2C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	movs r5, 0
@@ -31967,7 +31967,7 @@ _08019F38:
 	thumb_func_end sub_8019F2C
 
 	thumb_func_start sub_8019F64
-sub_8019F64: ; 8019F64
+sub_8019F64: @ 8019F64
 	push {lr}
 	adds r1, r0, 0
 	cmp r1, 0
@@ -31993,7 +31993,7 @@ _08019F88:
 	thumb_func_end sub_8019F64
 
 	thumb_func_start sub_8019F8C
-sub_8019F8C: ; 8019F8C
+sub_8019F8C: @ 8019F8C
 	push {lr}
 	adds r2, r0, 0
 	lsls r0, r2, 2
@@ -32008,7 +32008,7 @@ sub_8019F8C: ; 8019F8C
 	thumb_func_end sub_8019F8C
 
 	thumb_func_start sub_8019FA4
-sub_8019FA4: ; 8019FA4
+sub_8019FA4: @ 8019FA4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -32073,7 +32073,7 @@ _08019FE2:
 	thumb_func_end sub_8019FA4
 
 	thumb_func_start sub_801A02C
-sub_801A02C: ; 801A02C
+sub_801A02C: @ 801A02C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -32102,7 +32102,7 @@ sub_801A02C: ; 801A02C
 	thumb_func_end sub_801A02C
 
 	thumb_func_start sub_801A064
-sub_801A064: ; 801A064
+sub_801A064: @ 801A064
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -32231,7 +32231,7 @@ _0801A15C:
 	thumb_func_end sub_801A064
 
 	thumb_func_start sub_801A16C
-sub_801A16C: ; 801A16C
+sub_801A16C: @ 801A16C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -32299,7 +32299,7 @@ _0801A20E:
 	thumb_func_end sub_801A16C
 
 	thumb_func_start sub_801A214
-sub_801A214: ; 801A214
+sub_801A214: @ 801A214
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl AGBAssert
@@ -32317,7 +32317,7 @@ _0801A21E:
 	thumb_func_end sub_801A214
 
 	thumb_func_start sub_801A234
-sub_801A234: ; 801A234
+sub_801A234: @ 801A234
 	push {r4,r5,lr}
 	ldr r2, =0x02022c68
 	movs r1, 0
@@ -32352,7 +32352,7 @@ _0801A264:
 	thumb_func_end sub_801A234
 
 	thumb_func_start sub_801A274
-sub_801A274: ; 801A274
+sub_801A274: @ 801A274
 	ldr r1, =0x02022c68
 	movs r0, 0x96
 	lsls r0, 1
@@ -32362,7 +32362,7 @@ sub_801A274: ; 801A274
 	thumb_func_end sub_801A274
 
 	thumb_func_start sub_801A284
-sub_801A284: ; 801A284
+sub_801A284: @ 801A284
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02022c68
@@ -32382,7 +32382,7 @@ _0801A29E:
 	thumb_func_end sub_801A284
 
 	thumb_func_start sub_801A2A8
-sub_801A2A8: ; 801A2A8
+sub_801A2A8: @ 801A2A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -32514,7 +32514,7 @@ _0801A398:
 	thumb_func_end sub_801A2A8
 
 	thumb_func_start sub_801A3B0
-sub_801A3B0: ; 801A3B0
+sub_801A3B0: @ 801A3B0
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -32533,7 +32533,7 @@ sub_801A3B0: ; 801A3B0
 	thumb_func_end sub_801A3B0
 
 	thumb_func_start sub_801A3D0
-sub_801A3D0: ; 801A3D0
+sub_801A3D0: @ 801A3D0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -32553,7 +32553,7 @@ sub_801A3D0: ; 801A3D0
 	thumb_func_end sub_801A3D0
 
 	thumb_func_start sub_801A3F4
-sub_801A3F4: ; 801A3F4
+sub_801A3F4: @ 801A3F4
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -32570,7 +32570,7 @@ _0801A414:
 	thumb_func_end sub_801A3F4
 
 	thumb_func_start sub_801A418
-sub_801A418: ; 801A418
+sub_801A418: @ 801A418
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -32580,7 +32580,7 @@ sub_801A418: ; 801A418
 	thumb_func_end sub_801A418
 
 	thumb_func_start sub_801A42C
-sub_801A42C: ; 801A42C
+sub_801A42C: @ 801A42C
 	push {lr}
 	ldr r0, =sub_801A43C
 	bl SetMainCallback2
@@ -32590,7 +32590,7 @@ sub_801A42C: ; 801A42C
 	thumb_func_end sub_801A42C
 
 	thumb_func_start sub_801A43C
-sub_801A43C: ; 801A43C
+sub_801A43C: @ 801A43C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -32705,7 +32705,7 @@ sub_801A43C: ; 801A43C
 	thumb_func_end sub_801A43C
 
 	thumb_func_start sub_801A584
-sub_801A584: ; 801A584
+sub_801A584: @ 801A584
 	push {r4,lr}
 	bl FreeAllWindowBuffers
 	movs r4, 0
@@ -32729,7 +32729,7 @@ _0801A58C:
 	thumb_func_end sub_801A584
 
 	thumb_func_start sub_801A5BC
-sub_801A5BC: ; 801A5BC
+sub_801A5BC: @ 801A5BC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2]
@@ -32767,7 +32767,7 @@ _0801A5E4:
 	thumb_func_end sub_801A5BC
 
 	thumb_func_start sub_801A600
-sub_801A600: ; 801A600
+sub_801A600: @ 801A600
 	push {r4,r5,lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -32855,7 +32855,7 @@ _0801A644:
 	thumb_func_end sub_801A600
 
 	thumb_func_start sub_801A6C0
-sub_801A6C0: ; 801A6C0
+sub_801A6C0: @ 801A6C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -33082,7 +33082,7 @@ _0801A89C:
 	thumb_func_end sub_801A6C0
 
 	thumb_func_start sub_801A8B0
-sub_801A8B0: ; 801A8B0
+sub_801A8B0: @ 801A8B0
 	push {r4-r7,lr}
 	sub sp, 0x18
 	mov r12, r2
@@ -33176,7 +33176,7 @@ _0801A93A:
 	thumb_func_end sub_801A8B0
 
 	thumb_func_start sub_801A960
-sub_801A960: ; 801A960
+sub_801A960: @ 801A960
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -33268,7 +33268,7 @@ _0801A9EE:
 	thumb_func_end sub_801A960
 
 	thumb_func_start sub_801AA08
-sub_801AA08: ; 801AA08
+sub_801AA08: @ 801AA08
 	push {r4,lr}
 	movs r4, 0
 	adds r3, r1, 0
@@ -33294,7 +33294,7 @@ _0801AA28:
 	thumb_func_end sub_801AA08
 
 	thumb_func_start sub_801AA30
-sub_801AA30: ; 801AA30
+sub_801AA30: @ 801AA30
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -33380,7 +33380,7 @@ _0801AAC6:
 	thumb_func_end sub_801AA30
 
 	thumb_func_start sub_801AAD4
-sub_801AAD4: ; 801AAD4
+sub_801AAD4: @ 801AAD4
 	push {r4-r7,lr}
 	movs r0, 0xA
 	bl sub_8014210
@@ -33444,7 +33444,7 @@ _0801AB1E:
 	thumb_func_end sub_801AAD4
 
 	thumb_func_start sub_801AB68
-sub_801AB68: ; 801AB68
+sub_801AB68: @ 801AB68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -33502,7 +33502,7 @@ sub_801AB68: ; 801AB68
 	thumb_func_end sub_801AB68
 
 	thumb_func_start sub_801ABDC
-sub_801ABDC: ; 801ABDC
+sub_801ABDC: @ 801ABDC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -33555,7 +33555,7 @@ _0801AC38:
 	thumb_func_end sub_801ABDC
 
 	thumb_func_start sub_801AC40
-sub_801AC40: ; 801AC40
+sub_801AC40: @ 801AC40
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -33565,7 +33565,7 @@ sub_801AC40: ; 801AC40
 	thumb_func_end sub_801AC40
 
 	thumb_func_start sub_801AC54
-sub_801AC54: ; 801AC54
+sub_801AC54: @ 801AC54
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r1, =0x030022c0
@@ -33898,7 +33898,7 @@ _0801AFC2:
 	thumb_func_end sub_801AC54
 
 	thumb_func_start sub_801AFD8
-sub_801AFD8: ; 801AFD8
+sub_801AFD8: @ 801AFD8
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -33919,7 +33919,7 @@ sub_801AFD8: ; 801AFD8
 	thumb_func_end sub_801AFD8
 
 	thumb_func_start sub_801B00C
-sub_801B00C: ; 801B00C
+sub_801B00C: @ 801B00C
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003230
@@ -33929,7 +33929,7 @@ sub_801B00C: ; 801B00C
 	thumb_func_end sub_801B00C
 
 	thumb_func_start sav1_get_mevent_buffer_1
-sav1_get_mevent_buffer_1: ; 801B020
+sav1_get_mevent_buffer_1: @ 801B020
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x000033f0
@@ -33939,7 +33939,7 @@ sav1_get_mevent_buffer_1: ; 801B020
 	thumb_func_end sav1_get_mevent_buffer_1
 
 	thumb_func_start sav1_get_mevent_buffer_2
-sav1_get_mevent_buffer_2: ; 801B034
+sav1_get_mevent_buffer_2: @ 801B034
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	movs r1, 0xD5
@@ -33950,7 +33950,7 @@ sav1_get_mevent_buffer_2: ; 801B034
 	thumb_func_end sav1_get_mevent_buffer_2
 
 	thumb_func_start sub_801B044
-sub_801B044: ; 801B044
+sub_801B044: @ 801B044
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x0000356c
@@ -33960,7 +33960,7 @@ sub_801B044: ; 801B044
 	thumb_func_end sub_801B044
 
 	thumb_func_start sub_801B058
-sub_801B058: ; 801B058
+sub_801B058: @ 801B058
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003564
@@ -33970,7 +33970,7 @@ sub_801B058: ; 801B058
 	thumb_func_end sub_801B058
 
 	thumb_func_start sub_801B06C
-sub_801B06C: ; 801B06C
+sub_801B06C: @ 801B06C
 	push {lr}
 	bl sub_801B14C
 	pop {r0}
@@ -33978,7 +33978,7 @@ sub_801B06C: ; 801B06C
 	thumb_func_end sub_801B06C
 
 	thumb_func_start sub_801B078
-sub_801B078: ; 801B078
+sub_801B078: @ 801B078
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	bl sub_801B114
@@ -34016,7 +34016,7 @@ _0801B0C6:
 	thumb_func_end sub_801B078
 
 	thumb_func_start sub_801B0CC
-sub_801B0CC: ; 801B0CC
+sub_801B0CC: @ 801B0CC
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -34050,7 +34050,7 @@ _0801B10E:
 	thumb_func_end sub_801B0CC
 
 	thumb_func_start sub_801B114
-sub_801B114: ; 801B114
+sub_801B114: @ 801B114
 	push {lr}
 	ldrh r0, [r0]
 	cmp r0, 0
@@ -34065,7 +34065,7 @@ _0801B122:
 	thumb_func_end sub_801B114
 
 	thumb_func_start sub_801B128
-sub_801B128: ; 801B128
+sub_801B128: @ 801B128
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -34085,7 +34085,7 @@ _0801B146:
 	thumb_func_end sub_801B128
 
 	thumb_func_start sub_801B14C
-sub_801B14C: ; 801B14C
+sub_801B14C: @ 801B14C
 	push {r4,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -34108,7 +34108,7 @@ sub_801B14C: ; 801B14C
 	thumb_func_end sub_801B14C
 
 	thumb_func_start sub_801B180
-sub_801B180: ; 801B180
+sub_801B180: @ 801B180
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -34126,7 +34126,7 @@ sub_801B180: ; 801B180
 	thumb_func_end sub_801B180
 
 	thumb_func_start sub_801B1A4
-sub_801B1A4: ; 801B1A4
+sub_801B1A4: @ 801B1A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x03005d8c
@@ -34162,7 +34162,7 @@ _0801B1DC:
 	thumb_func_end sub_801B1A4
 
 	thumb_func_start sub_801B1E8
-sub_801B1E8: ; 801B1E8
+sub_801B1E8: @ 801B1E8
 	push {lr}
 	bl sub_801B330
 	bl sub_801B368
@@ -34181,7 +34181,7 @@ sub_801B1E8: ; 801B1E8
 	thumb_func_end sub_801B1E8
 
 	thumb_func_start sub_801B21C
-sub_801B21C: ; 801B21C
+sub_801B21C: @ 801B21C
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	bl sub_801B2CC
@@ -34225,7 +34225,7 @@ _0801B276:
 	thumb_func_end sub_801B21C
 
 	thumb_func_start sub_801B27C
-sub_801B27C: ; 801B27C
+sub_801B27C: @ 801B27C
 	push {r4,r5,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -34262,7 +34262,7 @@ _0801B2C6:
 	thumb_func_end sub_801B27C
 
 	thumb_func_start sub_801B2CC
-sub_801B2CC: ; 801B2CC
+sub_801B2CC: @ 801B2CC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2]
@@ -34299,7 +34299,7 @@ _0801B304:
 	thumb_func_end sub_801B2CC
 
 	thumb_func_start sub_801B308
-sub_801B308: ; 801B308
+sub_801B308: @ 801B308
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -34321,7 +34321,7 @@ _0801B32A:
 	thumb_func_end sub_801B308
 
 	thumb_func_start sub_801B330
-sub_801B330: ; 801B330
+sub_801B330: @ 801B330
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r5, 0
@@ -34345,7 +34345,7 @@ sub_801B330: ; 801B330
 	thumb_func_end sub_801B330
 
 	thumb_func_start sub_801B368
-sub_801B368: ; 801B368
+sub_801B368: @ 801B368
 	push {r4,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -34368,7 +34368,7 @@ sub_801B368: ; 801B368
 	thumb_func_end sub_801B368
 
 	thumb_func_start sub_801B39C
-sub_801B39C: ; 801B39C
+sub_801B39C: @ 801B39C
 	push {lr}
 	bl sub_801B27C
 	cmp r0, 0
@@ -34388,7 +34388,7 @@ _0801B3B4:
 	thumb_func_end sub_801B39C
 
 	thumb_func_start sub_801B3C0
-sub_801B3C0: ; 801B3C0
+sub_801B3C0: @ 801B3C0
 	push {lr}
 	adds r2, r0, 0
 	ldrb r1, [r2, 0x8]
@@ -34405,7 +34405,7 @@ _0801B3D4:
 	thumb_func_end sub_801B3C0
 
 	thumb_func_start sub_801B3D8
-sub_801B3D8: ; 801B3D8
+sub_801B3D8: @ 801B3D8
 	push {lr}
 	lsls r0, 16
 	ldr r1, =0xfc180000
@@ -34424,7 +34424,7 @@ _0801B3F2:
 	thumb_func_end sub_801B3D8
 
 	thumb_func_start sub_801B3F8
-sub_801B3F8: ; 801B3F8
+sub_801B3F8: @ 801B3F8
 	push {r4,lr}
 	bl sub_801B39C
 	lsls r0, 16
@@ -34456,7 +34456,7 @@ _0801B432:
 	thumb_func_end sub_801B3F8
 
 	thumb_func_start sub_801B438
-sub_801B438: ; 801B438
+sub_801B438: @ 801B438
 	push {lr}
 	movs r3, 0
 	cmp r3, r1
@@ -34483,7 +34483,7 @@ _0801B45A:
 	thumb_func_end sub_801B438
 
 	thumb_func_start sub_801B460
-sub_801B460: ; 801B460
+sub_801B460: @ 801B460
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -34525,7 +34525,7 @@ _0801B49C:
 	thumb_func_end sub_801B460
 
 	thumb_func_start sub_801B4A4
-sub_801B4A4: ; 801B4A4
+sub_801B4A4: @ 801B4A4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2]
@@ -34548,7 +34548,7 @@ _0801B4C6:
 	thumb_func_end sub_801B4A4
 
 	thumb_func_start sub_801B4CC
-sub_801B4CC: ; 801B4CC
+sub_801B4CC: @ 801B4CC
 	push {lr}
 	bl sub_801B27C
 	cmp r0, 0
@@ -34577,7 +34577,7 @@ _0801B502:
 	thumb_func_end sub_801B4CC
 
 	thumb_func_start sub_801B508
-sub_801B508: ; 801B508
+sub_801B508: @ 801B508
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x03005d8c
@@ -34639,7 +34639,7 @@ _0801B574:
 	thumb_func_end sub_801B508
 
 	thumb_func_start sub_801B580
-sub_801B580: ; 801B580
+sub_801B580: @ 801B580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -34769,7 +34769,7 @@ _0801B658:
 	thumb_func_end sub_801B580
 
 	thumb_func_start sub_801B6A0
-sub_801B6A0: ; 801B6A0
+sub_801B6A0: @ 801B6A0
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -34813,7 +34813,7 @@ _0801B6E6:
 	thumb_func_end sub_801B6A0
 
 	thumb_func_start sub_801B6EC
-sub_801B6EC: ; 801B6EC
+sub_801B6EC: @ 801B6EC
 	push {lr}
 	ldrh r1, [r1, 0x14]
 	cmp r1, 0
@@ -34834,7 +34834,7 @@ _0801B704:
 	thumb_func_end sub_801B6EC
 
 	thumb_func_start sub_801B708
-sub_801B708: ; 801B708
+sub_801B708: @ 801B708
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -34872,7 +34872,7 @@ _0801B742:
 	thumb_func_end sub_801B708
 
 	thumb_func_start sub_801B748
-sub_801B748: ; 801B748
+sub_801B748: @ 801B748
 	push {r4,lr}
 	movs r3, 0
 	adds r2, r0, 0
@@ -34898,7 +34898,7 @@ _0801B768:
 	thumb_func_end sub_801B748
 
 	thumb_func_start sub_801B770
-sub_801B770: ; 801B770
+sub_801B770: @ 801B770
 	push {lr}
 	adds r2, r0, 0
 	adds r2, 0x20
@@ -34911,7 +34911,7 @@ sub_801B770: ; 801B770
 	thumb_func_end sub_801B770
 
 	thumb_func_start sub_801B784
-sub_801B784: ; 801B784
+sub_801B784: @ 801B784
 	push {lr}
 	adds r2, r0, 0
 	cmp r1, 0x4
@@ -34957,7 +34957,7 @@ _0801B7D2:
 	thumb_func_end sub_801B784
 
 	thumb_func_start sub_801B7D8
-sub_801B7D8: ; 801B7D8
+sub_801B7D8: @ 801B7D8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03005d8c
@@ -35021,7 +35021,7 @@ _0801B850:
 	thumb_func_end sub_801B7D8
 
 	thumb_func_start mevent_081445C0
-mevent_081445C0: ; 801B860
+mevent_081445C0: @ 801B860
 	push {lr}
 	cmp r0, 0x4
 	bhi _0801B938
@@ -35122,7 +35122,7 @@ _0801B93A:
 	thumb_func_end mevent_081445C0
 
 	thumb_func_start sub_801B940
-sub_801B940: ; 801B940
+sub_801B940: @ 801B940
 	ldr r1, =0x02022c70
 	movs r0, 0
 	str r0, [r1]
@@ -35131,7 +35131,7 @@ sub_801B940: ; 801B940
 	thumb_func_end sub_801B940
 
 	thumb_func_start sub_801B94C
-sub_801B94C: ; 801B94C
+sub_801B94C: @ 801B94C
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -35164,7 +35164,7 @@ _0801B98A:
 	thumb_func_end sub_801B94C
 
 	thumb_func_start sub_801B990
-sub_801B990: ; 801B990
+sub_801B990: @ 801B990
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02022c70
@@ -35210,7 +35210,7 @@ _0801B9EC:
 	thumb_func_end sub_801B990
 
 	thumb_func_start sub_801B9F8
-sub_801B9F8: ; 801B9F8
+sub_801B9F8: @ 801B9F8
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -35229,7 +35229,7 @@ sub_801B9F8: ; 801B9F8
 	thumb_func_end sub_801B9F8
 
 	thumb_func_start sub_801BA24
-sub_801BA24: ; 801BA24
+sub_801BA24: @ 801BA24
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -35292,7 +35292,7 @@ _0801BA84:
 	thumb_func_end sub_801BA24
 
 	thumb_func_start sub_801BA8C
-sub_801BA8C: ; 801BA8C
+sub_801BA8C: @ 801BA8C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -35310,7 +35310,7 @@ _0801BAA4:
 	thumb_func_end sub_801BA8C
 
 	thumb_func_start sub_801BAAC
-sub_801BAAC: ; 801BAAC
+sub_801BAAC: @ 801BAAC
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -35392,7 +35392,7 @@ _0801BB3E:
 	thumb_func_end sub_801BAAC
 
 	thumb_func_start sub_801BB48
-sub_801BB48: ; 801BB48
+sub_801BB48: @ 801BB48
 	push {r4,lr}
 	ldr r4, =0x02022c74
 	ldr r0, [r4]
@@ -35413,7 +35413,7 @@ _0801BB64:
 	thumb_func_end sub_801BB48
 
 	thumb_func_start sub_801BB74
-sub_801BB74: ; 801BB74
+sub_801BB74: @ 801BB74
 	push {r4-r6,lr}
 	sub sp, 0x24
 	ldr r5, =0x02022c74
@@ -35661,7 +35661,7 @@ _0801BD98:
 	thumb_func_end sub_801BB74
 
 	thumb_func_start sub_801BDA4
-sub_801BDA4: ; 801BDA4
+sub_801BDA4: @ 801BDA4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r2, r0, 0
@@ -35819,7 +35819,7 @@ _0801BEEC:
 	thumb_func_end sub_801BDA4
 
 	thumb_func_start sub_801BEF8
-sub_801BEF8: ; 801BEF8
+sub_801BEF8: @ 801BEF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -36126,7 +36126,7 @@ _0801C168:
 	thumb_func_end sub_801BEF8
 
 	thumb_func_start sub_801C178
-sub_801C178: ; 801C178
+sub_801C178: @ 801C178
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -36524,7 +36524,7 @@ _0801C498:
 	thumb_func_end sub_801C178
 
 	thumb_func_start sub_801C4C0
-sub_801C4C0: ; 801C4C0
+sub_801C4C0: @ 801C4C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -36685,7 +36685,7 @@ _0801C5EE:
 	thumb_func_end sub_801C4C0
 
 	thumb_func_start sub_801C61C
-sub_801C61C: ; 801C61C
+sub_801C61C: @ 801C61C
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r4, =0x02022c74
@@ -36770,7 +36770,7 @@ _0801C6B4:
 	thumb_func_end sub_801C61C
 
 	thumb_func_start sub_801C6C8
-sub_801C6C8: ; 801C6C8
+sub_801C6C8: @ 801C6C8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	cmp r4, 0
@@ -36818,7 +36818,7 @@ _0801C71C:
 	thumb_func_end sub_801C6C8
 
 	thumb_func_start sub_801C72C
-sub_801C72C: ; 801C72C
+sub_801C72C: @ 801C72C
 	push {r4,lr}
 	ldr r4, =0x02022c78
 	ldr r0, [r4]
@@ -36839,7 +36839,7 @@ _0801C748:
 	thumb_func_end sub_801C72C
 
 	thumb_func_start sub_801C758
-sub_801C758: ; 801C758
+sub_801C758: @ 801C758
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -37170,7 +37170,7 @@ _0801CA3A:
 	thumb_func_end sub_801C758
 
 	thumb_func_start sub_801CA50
-sub_801CA50: ; 801CA50
+sub_801CA50: @ 801CA50
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r2, r0, 0
@@ -37386,7 +37386,7 @@ _0801CC2A:
 	thumb_func_end sub_801CA50
 
 	thumb_func_start sub_801CC38
-sub_801CC38: ; 801CC38
+sub_801CC38: @ 801CC38
 	push {r4,r5,lr}
 	ldr r4, =0x02022c78
 	ldr r2, [r4]
@@ -37423,7 +37423,7 @@ _0801CC72:
 	thumb_func_end sub_801CC38
 
 	thumb_func_start sub_801CC80
-sub_801CC80: ; 801CC80
+sub_801CC80: @ 801CC80
 	push {r4,lr}
 	ldr r4, =0x02022c78
 	ldr r2, [r4]
@@ -37463,7 +37463,7 @@ _0801CCC0:
 	thumb_func_end sub_801CC80
 
 	thumb_func_start sub_801CCD0
-sub_801CCD0: ; 801CCD0
+sub_801CCD0: @ 801CCD0
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -37597,7 +37597,7 @@ _0801CDC6:
 	thumb_func_end sub_801CCD0
 
 	thumb_func_start sub_801CDCC
-sub_801CDCC: ; 801CDCC
+sub_801CDCC: @ 801CDCC
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r4, =0x02022c78
@@ -37681,7 +37681,7 @@ _0801CE34:
 	thumb_func_end sub_801CDCC
 
 	thumb_func_start sub_801CE7C
-sub_801CE7C: ; 801CE7C
+sub_801CE7C: @ 801CE7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -37820,7 +37820,7 @@ _0801CF1C:
 	thumb_func_end sub_801CE7C
 
 	thumb_func_start sub_801CFA4
-sub_801CFA4: ; 801CFA4
+sub_801CFA4: @ 801CFA4
 	push {r4-r6,lr}
 	ldr r0, =0x02022c78
 	ldr r1, [r0]
@@ -37924,7 +37924,7 @@ _0801D070:
 	thumb_func_end sub_801CFA4
 
 	thumb_func_start mevent_srv_init_wnews
-mevent_srv_init_wnews: ; 801D07C
+mevent_srv_init_wnews: @ 801D07C
 	push {r4,lr}
 	ldr r4, =0x02022c7c
 	movs r0, 0x60
@@ -37941,7 +37941,7 @@ mevent_srv_init_wnews: ; 801D07C
 	thumb_func_end mevent_srv_init_wnews
 
 	thumb_func_start mevent_srv_new_wcard
-mevent_srv_new_wcard: ; 801D0A0
+mevent_srv_new_wcard: @ 801D0A0
 	push {r4,lr}
 	ldr r4, =0x02022c7c
 	movs r0, 0x60
@@ -37958,7 +37958,7 @@ mevent_srv_new_wcard: ; 801D0A0
 	thumb_func_end mevent_srv_new_wcard
 
 	thumb_func_start sub_801D0C4
-sub_801D0C4: ; 801D0C4
+sub_801D0C4: @ 801D0C4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r4, =0x02022c7c
@@ -37990,7 +37990,7 @@ _0801D0F8:
 	thumb_func_end sub_801D0C4
 
 	thumb_func_start mevent_srv_init_common
-mevent_srv_init_common: ; 801D100
+mevent_srv_init_common: @ 801D100
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -38033,7 +38033,7 @@ mevent_srv_init_common: ; 801D100
 	thumb_func_end mevent_srv_init_common
 
 	thumb_func_start mevent_srv_free_resources
-mevent_srv_free_resources: ; 801D158
+mevent_srv_free_resources: @ 801D158
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x18]
@@ -38050,7 +38050,7 @@ mevent_srv_free_resources: ; 801D158
 	thumb_func_end mevent_srv_free_resources
 
 	thumb_func_start mevent_srv_814501C
-mevent_srv_814501C: ; 801D17C
+mevent_srv_814501C: @ 801D17C
 	push {lr}
 	adds r0, 0x38
 	bl sub_801D904
@@ -38059,7 +38059,7 @@ mevent_srv_814501C: ; 801D17C
 	thumb_func_end mevent_srv_814501C
 
 	thumb_func_start sub_801D188
-sub_801D188: ; 801D188
+sub_801D188: @ 801D188
 	push {lr}
 	cmp r0, 0
 	bne _0801D190
@@ -38070,7 +38070,7 @@ _0801D190:
 	thumb_func_end sub_801D188
 
 	thumb_func_start sub_801D194
-sub_801D194: ; 801D194
+sub_801D194: @ 801D194
 	push {lr}
 	cmp r1, r0
 	bcs _0801D19E
@@ -38089,7 +38089,7 @@ _0801D1A8:
 	thumb_func_end sub_801D194
 
 	thumb_func_start sub_801D1AC
-sub_801D1AC: ; 801D1AC
+sub_801D1AC: @ 801D1AC
 	movs r1, 0x4
 	str r1, [r0, 0x8]
 	movs r0, 0
@@ -38097,13 +38097,13 @@ sub_801D1AC: ; 801D1AC
 	thumb_func_end sub_801D1AC
 
 	thumb_func_start sub_801D1B4
-sub_801D1B4: ; 801D1B4
+sub_801D1B4: @ 801D1B4
 	movs r0, 0x3
 	bx lr
 	thumb_func_end sub_801D1B4
 
 	thumb_func_start sub_801D1B8
-sub_801D1B8: ; 801D1B8
+sub_801D1B8: @ 801D1B8
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x38
@@ -38120,7 +38120,7 @@ _0801D1CA:
 	thumb_func_end sub_801D1B8
 
 	thumb_func_start sub_801D1D4
-sub_801D1D4: ; 801D1D4
+sub_801D1D4: @ 801D1D4
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x38
@@ -38137,7 +38137,7 @@ _0801D1E6:
 	thumb_func_end sub_801D1D4
 
 	thumb_func_start sub_801D1F0
-sub_801D1F0: ; 801D1F0
+sub_801D1F0: @ 801D1F0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0xC]
@@ -38436,7 +38436,7 @@ _0801D464:
 	thumb_func_end sub_801D1F0
 
 	thumb_func_start mevent_dispatch_08145600
-mevent_dispatch_08145600: ; 801D46C
+mevent_dispatch_08145600: @ 801D46C
 	push {lr}
 	ldr r2, =gUnknown_082F2548
 	ldr r1, [r0, 0x8]
@@ -38450,7 +38450,7 @@ mevent_dispatch_08145600: ; 801D46C
 	thumb_func_end mevent_dispatch_08145600
 
 	thumb_func_start sub_801D484
-sub_801D484: ; 801D484
+sub_801D484: @ 801D484
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02022c80
@@ -38469,7 +38469,7 @@ sub_801D484: ; 801D484
 	thumb_func_end sub_801D484
 
 	thumb_func_start sub_801D4A8
-sub_801D4A8: ; 801D4A8
+sub_801D4A8: @ 801D4A8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r4, =0x02022c80
@@ -38501,7 +38501,7 @@ _0801D4DC:
 	thumb_func_end sub_801D4A8
 
 	thumb_func_start sub_801D4E4
-sub_801D4E4: ; 801D4E4
+sub_801D4E4: @ 801D4E4
 	ldr r0, =0x02022c80
 	ldr r1, [r0]
 	ldr r0, [r1, 0xC]
@@ -38512,7 +38512,7 @@ sub_801D4E4: ; 801D4E4
 	thumb_func_end sub_801D4E4
 
 	thumb_func_start sub_801D4F4
-sub_801D4F4: ; 801D4F4
+sub_801D4F4: @ 801D4F4
 	ldr r0, =0x02022c80
 	ldr r0, [r0]
 	ldr r0, [r0, 0x20]
@@ -38521,7 +38521,7 @@ sub_801D4F4: ; 801D4F4
 	thumb_func_end sub_801D4F4
 
 	thumb_func_start sub_801D500
-sub_801D500: ; 801D500
+sub_801D500: @ 801D500
 	ldr r1, =0x02022c80
 	ldr r1, [r1]
 	str r0, [r1, 0x4]
@@ -38530,7 +38530,7 @@ sub_801D500: ; 801D500
 	thumb_func_end sub_801D500
 
 	thumb_func_start mevent_srv_ish_init
-mevent_srv_ish_init: ; 801D50C
+mevent_srv_ish_init: @ 801D50C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -38568,7 +38568,7 @@ mevent_srv_ish_init: ; 801D50C
 	thumb_func_end mevent_srv_ish_init
 
 	thumb_func_start sub_801D55C
-sub_801D55C: ; 801D55C
+sub_801D55C: @ 801D55C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x14]
@@ -38585,7 +38585,7 @@ sub_801D55C: ; 801D55C
 	thumb_func_end sub_801D55C
 
 	thumb_func_start sub_801D580
-sub_801D580: ; 801D580
+sub_801D580: @ 801D580
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x1C]
@@ -38601,7 +38601,7 @@ sub_801D580: ; 801D580
 	thumb_func_end sub_801D580
 
 	thumb_func_start sub_801D59C
-sub_801D59C: ; 801D59C
+sub_801D59C: @ 801D59C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -38628,7 +38628,7 @@ sub_801D59C: ; 801D59C
 	thumb_func_end sub_801D59C
 
 	thumb_func_start sub_801D5D0
-sub_801D5D0: ; 801D5D0
+sub_801D5D0: @ 801D5D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x1C]
@@ -38649,13 +38649,13 @@ sub_801D5D0: ; 801D5D0
 	thumb_func_end sub_801D5D0
 
 	thumb_func_start sub_801D5F8
-sub_801D5F8: ; 801D5F8
+sub_801D5F8: @ 801D5F8
 	movs r0, 0x6
 	bx lr
 	thumb_func_end sub_801D5F8
 
 	thumb_func_start sub_801D5FC
-sub_801D5FC: ; 801D5FC
+sub_801D5FC: @ 801D5FC
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x24
@@ -38674,7 +38674,7 @@ _0801D612:
 	thumb_func_end sub_801D5FC
 
 	thumb_func_start sub_801D61C
-sub_801D61C: ; 801D61C
+sub_801D61C: @ 801D61C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x24
@@ -38693,7 +38693,7 @@ _0801D632:
 	thumb_func_end sub_801D61C
 
 	thumb_func_start sub_801D63C
-sub_801D63C: ; 801D63C
+sub_801D63C: @ 801D63C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x10]
@@ -38910,7 +38910,7 @@ _0801D806:
 	thumb_func_end sub_801D63C
 
 	thumb_func_start sub_801D810
-sub_801D810: ; 801D810
+sub_801D810: @ 801D810
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, [r1, 0xC]
@@ -38927,7 +38927,7 @@ _0801D822:
 	thumb_func_end sub_801D810
 
 	thumb_func_start sub_801D828
-sub_801D828: ; 801D828
+sub_801D828: @ 801D828
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0xC]
@@ -38960,7 +38960,7 @@ _0801D858:
 	thumb_func_end sub_801D828
 
 	thumb_func_start sub_801D860
-sub_801D860: ; 801D860
+sub_801D860: @ 801D860
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r3, =0x0201c000
@@ -38985,7 +38985,7 @@ _0801D880:
 	thumb_func_end sub_801D860
 
 	thumb_func_start mevent_srv_ish_exec
-mevent_srv_ish_exec: ; 801D894
+mevent_srv_ish_exec: @ 801D894
 	push {r4,r5,lr}
 	sub sp, 0x20
 	mov r2, sp
@@ -39009,7 +39009,7 @@ mevent_srv_ish_exec: ; 801D894
 	thumb_func_end mevent_srv_ish_exec
 
 	thumb_func_start sub_801D8C0
-sub_801D8C0: ; 801D8C0
+sub_801D8C0: @ 801D8C0
 	push {lr}
 	ldr r1, [r0, 0x20]
 	bl _call_via_r1
@@ -39018,7 +39018,7 @@ sub_801D8C0: ; 801D8C0
 	thumb_func_end sub_801D8C0
 
 	thumb_func_start sub_801D8CC
-sub_801D8CC: ; 801D8CC
+sub_801D8CC: @ 801D8CC
 	push {lr}
 	ldr r1, [r0, 0x24]
 	bl _call_via_r1
@@ -39027,7 +39027,7 @@ sub_801D8CC: ; 801D8CC
 	thumb_func_end sub_801D8CC
 
 	thumb_func_start sub_801D8D8
-sub_801D8D8: ; 801D8D8
+sub_801D8D8: @ 801D8D8
 	movs r3, 0
 	strb r1, [r0, 0x4]
 	strb r2, [r0, 0x5]
@@ -39049,7 +39049,7 @@ sub_801D8D8: ; 801D8D8
 	thumb_func_end sub_801D8D8
 
 	thumb_func_start sub_801D904
-sub_801D904: ; 801D904
+sub_801D904: @ 801D904
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -39073,7 +39073,7 @@ _0801D920:
 	thumb_func_end sub_801D904
 
 	thumb_func_start sub_801D928
-sub_801D928: ; 801D928
+sub_801D928: @ 801D928
 	movs r3, 0
 	str r3, [r0]
 	strh r1, [r0, 0x6]
@@ -39085,7 +39085,7 @@ sub_801D928: ; 801D928
 	thumb_func_end sub_801D928
 
 	thumb_func_start sub_801D938
-sub_801D938: ; 801D938
+sub_801D938: @ 801D938
 	push {lr}
 	adds r3, r0, 0
 	adds r0, r1, 0
@@ -39100,7 +39100,7 @@ sub_801D938: ; 801D938
 	thumb_func_end sub_801D938
 
 	thumb_func_start sub_801D954
-sub_801D954: ; 801D954
+sub_801D954: @ 801D954
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_800A550
@@ -39122,7 +39122,7 @@ _0801D970:
 	thumb_func_end sub_801D954
 
 	thumb_func_start sub_801D978
-sub_801D978: ; 801D978
+sub_801D978: @ 801D978
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -39132,7 +39132,7 @@ sub_801D978: ; 801D978
 	thumb_func_end sub_801D978
 
 	thumb_func_start sub_801D988
-sub_801D988: ; 801D988
+sub_801D988: @ 801D988
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -39243,7 +39243,7 @@ _0801DA54:
 	thumb_func_end sub_801D988
 
 	thumb_func_start sub_801DA5C
-sub_801DA5C: ; 801DA5C
+sub_801DA5C: @ 801DA5C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -39374,7 +39374,7 @@ _0801DB60:
 	thumb_func_end sub_801DA5C
 
 	thumb_func_start sub_801DB68
-sub_801DB68: ; 801DB68
+sub_801DB68: @ 801DB68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_801B044
@@ -39421,7 +39421,7 @@ _0801DBB8:
 	thumb_func_end sub_801DB68
 
 	thumb_func_start sub_801DBC0
-sub_801DBC0: ; 801DBC0
+sub_801DBC0: @ 801DBC0
 	push {lr}
 	bl sub_801B044
 	movs r1, 0
@@ -39435,7 +39435,7 @@ sub_801DBC0: ; 801DBC0
 	thumb_func_end sub_801DBC0
 
 	thumb_func_start sub_801DBDC
-sub_801DBDC: ; 801DBDC
+sub_801DBDC: @ 801DBDC
 	push {r4,lr}
 	ldr r0, =0x0000402e
 	bl GetVarPointer
@@ -39468,7 +39468,7 @@ _0801DC10:
 	thumb_func_end sub_801DBDC
 
 	thumb_func_start sub_801DC20
-sub_801DC20: ; 801DC20
+sub_801DC20: @ 801DC20
 	push {r4-r6,lr}
 	ldr r6, =0x020375f0
 	bl sub_801B044
@@ -39532,7 +39532,7 @@ _0801DCA6:
 	thumb_func_end sub_801DC20
 
 	thumb_func_start sub_801DCAC
-sub_801DCAC: ; 801DCAC
+sub_801DCAC: @ 801DCAC
 	push {r4,lr}
 	ldrb r2, [r0]
 	movs r1, 0x4
@@ -39551,7 +39551,7 @@ sub_801DCAC: ; 801DCAC
 	thumb_func_end sub_801DCAC
 
 	thumb_func_start sub_801DCCC
-sub_801DCCC: ; 801DCCC
+sub_801DCCC: @ 801DCCC
 	ldrb r2, [r0]
 	movs r1, 0x1D
 	negs r1, r1
@@ -39561,7 +39561,7 @@ sub_801DCCC: ; 801DCCC
 	thumb_func_end sub_801DCCC
 
 	thumb_func_start sub_801DCD8
-sub_801DCD8: ; 801DCD8
+sub_801DCD8: @ 801DCD8
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, [r3]
@@ -39594,7 +39594,7 @@ _0801DD0A:
 	thumb_func_end sub_801DCD8
 
 	thumb_func_start sub_801DD10
-sub_801DD10: ; 801DD10
+sub_801DD10: @ 801DD10
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, [r3]
@@ -39624,7 +39624,7 @@ _0801DD3C:
 	thumb_func_end sub_801DD10
 
 	thumb_func_start sub_801DD44
-sub_801DD44: ; 801DD44
+sub_801DD44: @ 801DD44
 	push {lr}
 	adds r2, r0, 0
 	ldrb r1, [r2]
@@ -39678,7 +39678,7 @@ _0801DD92:
 	thumb_func_end sub_801DD44
 
 	thumb_func_start sub_801DD98
-sub_801DD98: ; 801DD98
+sub_801DD98: @ 801DD98
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	movs r0, 0xDE
@@ -39700,7 +39700,7 @@ sub_801DD98: ; 801DD98
 	thumb_func_end sub_801DD98
 
 	thumb_func_start sub_801DDD0
-sub_801DDD0: ; 801DDD0
+sub_801DDD0: @ 801DDD0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -39746,7 +39746,7 @@ _0801DE0E:
 	thumb_func_end sub_801DDD0
 
 	thumb_func_start sub_801DE30
-sub_801DE30: ; 801DE30
+sub_801DE30: @ 801DE30
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	ldr r0, [r4]
@@ -39764,7 +39764,7 @@ sub_801DE30: ; 801DE30
 	thumb_func_end sub_801DE30
 
 	thumb_func_start c2_081284E0
-c2_081284E0: ; 801DE54
+c2_081284E0: @ 801DE54
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -39850,7 +39850,7 @@ _0801DF04:
 	thumb_func_end c2_081284E0
 
 	thumb_func_start sub_801DF20
-sub_801DF20: ; 801DF20
+sub_801DF20: @ 801DF20
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -39861,7 +39861,7 @@ sub_801DF20: ; 801DF20
 	thumb_func_end sub_801DF20
 
 	thumb_func_start sub_801DF38
-sub_801DF38: ; 801DF38
+sub_801DF38: @ 801DF38
 	push {lr}
 	bl RunActiveTasks
 	bl sub_801F5B8
@@ -39873,7 +39873,7 @@ sub_801DF38: ; 801DF38
 	thumb_func_end sub_801DF38
 
 	thumb_func_start sub_801DF54
-sub_801DF54: ; 801DF54
+sub_801DF54: @ 801DF54
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	ldr r0, [r4]
@@ -39919,7 +39919,7 @@ _0801DF8A:
 	thumb_func_end sub_801DF54
 
 	thumb_func_start sub_801DFAC
-sub_801DFAC: ; 801DFAC
+sub_801DFAC: @ 801DFAC
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	ldr r0, [r4]
@@ -39984,7 +39984,7 @@ _0801E028:
 	thumb_func_end sub_801DFAC
 
 	thumb_func_start sub_801E030
-sub_801E030: ; 801E030
+sub_801E030: @ 801E030
 	push {r4,r5,lr}
 	ldr r5, =0x02022c84
 	ldr r3, [r5]
@@ -40102,7 +40102,7 @@ _0801E118:
 	thumb_func_end sub_801E030
 
 	thumb_func_start sub_801E120
-sub_801E120: ; 801E120
+sub_801E120: @ 801E120
 	push {r4-r6,lr}
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
@@ -40235,7 +40235,7 @@ _0801E23A:
 	thumb_func_end sub_801E120
 
 	thumb_func_start sub_801E240
-sub_801E240: ; 801E240
+sub_801E240: @ 801E240
 	push {r4,r5,lr}
 	ldr r1, =0x02022c84
 	ldr r0, [r1]
@@ -40490,7 +40490,7 @@ _0801E458:
 	thumb_func_end sub_801E240
 
 	thumb_func_start sub_801E460
-sub_801E460: ; 801E460
+sub_801E460: @ 801E460
 	push {r4,lr}
 	ldr r1, =0x02022c84
 	ldr r0, [r1]
@@ -40646,7 +40646,7 @@ _0801E5BC:
 	thumb_func_end sub_801E460
 
 	thumb_func_start sub_801E5C4
-sub_801E5C4: ; 801E5C4
+sub_801E5C4: @ 801E5C4
 	push {r4,r5,lr}
 	ldr r5, =0x02022c84
 	ldr r1, [r5]
@@ -40730,7 +40730,7 @@ _0801E662:
 	thumb_func_end sub_801E5C4
 
 	thumb_func_start sub_801E668
-sub_801E668: ; 801E668
+sub_801E668: @ 801E668
 	push {r4,lr}
 	ldr r1, =0x02022c84
 	ldr r0, [r1]
@@ -40845,7 +40845,7 @@ _0801E75C:
 	thumb_func_end sub_801E668
 
 	thumb_func_start sub_801E764
-sub_801E764: ; 801E764
+sub_801E764: @ 801E764
 	push {r4,lr}
 	ldr r1, =0x02022c84
 	ldr r0, [r1]
@@ -40943,7 +40943,7 @@ _0801E830:
 	thumb_func_end sub_801E764
 
 	thumb_func_start sub_801E838
-sub_801E838: ; 801E838
+sub_801E838: @ 801E838
 	push {r4,lr}
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
@@ -41087,7 +41087,7 @@ _0801E968:
 	thumb_func_end sub_801E838
 
 	thumb_func_start sub_801E978
-sub_801E978: ; 801E978
+sub_801E978: @ 801E978
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x02022c84
@@ -41358,7 +41358,7 @@ _0801EBC2:
 	thumb_func_end sub_801E978
 
 	thumb_func_start sub_801EBD4
-sub_801EBD4: ; 801EBD4
+sub_801EBD4: @ 801EBD4
 	ldr r1, =0x02022c84
 	ldr r1, [r1]
 	movs r2, 0
@@ -41369,7 +41369,7 @@ sub_801EBD4: ; 801EBD4
 	thumb_func_end sub_801EBD4
 
 	thumb_func_start sub_801EBE4
-sub_801EBE4: ; 801EBE4
+sub_801EBE4: @ 801EBE4
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r2, [r0, 0x30]
@@ -41463,7 +41463,7 @@ _0801EC8C:
 	thumb_func_end sub_801EBE4
 
 	thumb_func_start sub_801EC94
-sub_801EC94: ; 801EC94
+sub_801EC94: @ 801EC94
 	push {r4-r6,lr}
 	sub sp, 0x18
 	ldr r0, =0x02022c84
@@ -41573,7 +41573,7 @@ _0801ED5A:
 	thumb_func_end sub_801EC94
 
 	thumb_func_start sub_801ED68
-sub_801ED68: ; 801ED68
+sub_801ED68: @ 801ED68
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	ldr r1, [r4]
@@ -41598,7 +41598,7 @@ _0801ED8A:
 	thumb_func_end sub_801ED68
 
 	thumb_func_start sub_801ED94
-sub_801ED94: ; 801ED94
+sub_801ED94: @ 801ED94
 	push {lr}
 	ldr r0, =0x02022c84
 	ldr r1, [r0]
@@ -41623,7 +41623,7 @@ _0801EDB8:
 	thumb_func_end sub_801ED94
 
 	thumb_func_start sub_801EDC4
-sub_801EDC4: ; 801EDC4
+sub_801EDC4: @ 801EDC4
 	push {lr}
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
@@ -41641,7 +41641,7 @@ _0801EDDA:
 	thumb_func_end sub_801EDC4
 
 	thumb_func_start sub_801EDE0
-sub_801EDE0: ; 801EDE0
+sub_801EDE0: @ 801EDE0
 	push {r4,lr}
 	bl sub_801F114
 	adds r1, r0, 0
@@ -41665,7 +41665,7 @@ sub_801EDE0: ; 801EDE0
 	thumb_func_end sub_801EDE0
 
 	thumb_func_start sub_801EE10
-sub_801EE10: ; 801EE10
+sub_801EE10: @ 801EE10
 	ldr r1, =0x02022c84
 	ldr r2, [r1]
 	movs r0, 0xFF
@@ -41681,7 +41681,7 @@ sub_801EE10: ; 801EE10
 	thumb_func_end sub_801EE10
 
 	thumb_func_start sub_801EE2C
-sub_801EE2C: ; 801EE2C
+sub_801EE2C: @ 801EE2C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -41712,7 +41712,7 @@ _0801EE3E:
 	thumb_func_end sub_801EE2C
 
 	thumb_func_start sub_801EE6C
-sub_801EE6C: ; 801EE6C
+sub_801EE6C: @ 801EE6C
 	ldr r2, =0x02022c84
 	lsls r1, r0, 2
 	adds r1, r0
@@ -41726,7 +41726,7 @@ sub_801EE6C: ; 801EE6C
 	thumb_func_end sub_801EE6C
 
 	thumb_func_start sub_801EE84
-sub_801EE84: ; 801EE84
+sub_801EE84: @ 801EE84
 	push {lr}
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
@@ -41748,7 +41748,7 @@ _0801EE9C:
 	thumb_func_end sub_801EE84
 
 	thumb_func_start sub_801EEA8
-sub_801EEA8: ; 801EEA8
+sub_801EEA8: @ 801EEA8
 	push {lr}
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
@@ -41777,7 +41777,7 @@ _0801EECC:
 	thumb_func_end sub_801EEA8
 
 	thumb_func_start sub_801EED8
-sub_801EED8: ; 801EED8
+sub_801EED8: @ 801EED8
 	push {r4,lr}
 	ldr r4, =0x02022c84
 	ldr r0, [r4]
@@ -41815,14 +41815,14 @@ _0801EF0C:
 	thumb_func_end sub_801EED8
 
 	thumb_func_start sub_801EF1C
-sub_801EF1C: ; 801EF1C
+sub_801EF1C: @ 801EF1C
 	movs r1, 0
 	strb r1, [r0]
 	bx lr
 	thumb_func_end sub_801EF1C
 
 	thumb_func_start sub_801EF24
-sub_801EF24: ; 801EF24
+sub_801EF24: @ 801EF24
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -41842,7 +41842,7 @@ sub_801EF24: ; 801EF24
 	thumb_func_end sub_801EF24
 
 	thumb_func_start sub_801EF4C
-sub_801EF4C: ; 801EF4C
+sub_801EF4C: @ 801EF4C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -41864,7 +41864,7 @@ sub_801EF4C: ; 801EF4C
 	thumb_func_end sub_801EF4C
 
 	thumb_func_start sub_801EF7C
-sub_801EF7C: ; 801EF7C
+sub_801EF7C: @ 801EF7C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3
@@ -41885,7 +41885,7 @@ sub_801EF7C: ; 801EF7C
 	thumb_func_end sub_801EF7C
 
 	thumb_func_start sub_801EFA8
-sub_801EFA8: ; 801EFA8
+sub_801EFA8: @ 801EFA8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -41905,7 +41905,7 @@ sub_801EFA8: ; 801EFA8
 	thumb_func_end sub_801EFA8
 
 	thumb_func_start sub_801EFD0
-sub_801EFD0: ; 801EFD0
+sub_801EFD0: @ 801EFD0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -41925,7 +41925,7 @@ sub_801EFD0: ; 801EFD0
 	thumb_func_end sub_801EFD0
 
 	thumb_func_start sub_801EFF8
-sub_801EFF8: ; 801EFF8
+sub_801EFF8: @ 801EFF8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -42014,7 +42014,7 @@ _0801F0AA:
 	thumb_func_end sub_801EFF8
 
 	thumb_func_start sub_801F0B0
-sub_801F0B0: ; 801F0B0
+sub_801F0B0: @ 801F0B0
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x10]
@@ -42023,7 +42023,7 @@ sub_801F0B0: ; 801F0B0
 	thumb_func_end sub_801F0B0
 
 	thumb_func_start sub_801F0BC
-sub_801F0BC: ; 801F0BC
+sub_801F0BC: @ 801F0BC
 	ldr r2, =0x02022c84
 	ldr r3, [r2]
 	ldrb r2, [r3, 0x11]
@@ -42035,7 +42035,7 @@ sub_801F0BC: ; 801F0BC
 	thumb_func_end sub_801F0BC
 
 	thumb_func_start sub_801F0D0
-sub_801F0D0: ; 801F0D0
+sub_801F0D0: @ 801F0D0
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	adds r0, 0x1A
@@ -42044,7 +42044,7 @@ sub_801F0D0: ; 801F0D0
 	thumb_func_end sub_801F0D0
 
 	thumb_func_start sub_801F0DC
-sub_801F0DC: ; 801F0DC
+sub_801F0DC: @ 801F0DC
 	push {lr}
 	bl sub_801F0D0
 	bl GetStringLength_Multibyte
@@ -42053,7 +42053,7 @@ sub_801F0DC: ; 801F0DC
 	thumb_func_end sub_801F0DC
 
 	thumb_func_start sub_801F0EC
-sub_801F0EC: ; 801F0EC
+sub_801F0EC: @ 801F0EC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02022c84
@@ -42077,7 +42077,7 @@ _0801F10A:
 	thumb_func_end sub_801F0EC
 
 	thumb_func_start sub_801F114
-sub_801F114: ; 801F114
+sub_801F114: @ 801F114
 	push {lr}
 	bl sub_801EED8
 	lsls r0, 16
@@ -42106,7 +42106,7 @@ _0801F13A:
 	thumb_func_end sub_801F114
 
 	thumb_func_start sub_801F144
-sub_801F144: ; 801F144
+sub_801F144: @ 801F144
 	push {r4,lr}
 	bl sub_801EED8
 	lsls r0, 16
@@ -42141,7 +42141,7 @@ _0801F174:
 	thumb_func_end sub_801F144
 
 	thumb_func_start sub_801F180
-sub_801F180: ; 801F180
+sub_801F180: @ 801F180
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	adds r0, 0x39
@@ -42150,7 +42150,7 @@ sub_801F180: ; 801F180
 	thumb_func_end sub_801F180
 
 	thumb_func_start sub_801F18C
-sub_801F18C: ; 801F18C
+sub_801F18C: @ 801F18C
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x16]
@@ -42159,7 +42159,7 @@ sub_801F18C: ; 801F18C
 	thumb_func_end sub_801F18C
 
 	thumb_func_start sub_801F198
-sub_801F198: ; 801F198
+sub_801F198: @ 801F198
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x15]
@@ -42168,7 +42168,7 @@ sub_801F198: ; 801F198
 	thumb_func_end sub_801F198
 
 	thumb_func_start sub_801F1A4
-sub_801F1A4: ; 801F1A4
+sub_801F1A4: @ 801F1A4
 	push {lr}
 	bl sub_801EEA8
 	ldrb r1, [r0]
@@ -42193,7 +42193,7 @@ _0801F1CA:
 	thumb_func_end sub_801F1A4
 
 	thumb_func_start sub_801F1D0
-sub_801F1D0: ; 801F1D0
+sub_801F1D0: @ 801F1D0
 	ldr r0, =0x02022c84
 	ldr r0, [r0]
 	adds r0, 0x79
@@ -42202,7 +42202,7 @@ sub_801F1D0: ; 801F1D0
 	thumb_func_end sub_801F1D0
 
 	thumb_func_start copy_strings_to_sav1
-copy_strings_to_sav1: ; 801F1DC
+copy_strings_to_sav1: @ 801F1DC
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -42262,7 +42262,7 @@ copy_strings_to_sav1: ; 801F1DC
 	thumb_func_end copy_strings_to_sav1
 
 	thumb_func_start sub_801F2B4
-sub_801F2B4: ; 801F2B4
+sub_801F2B4: @ 801F2B4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -42524,7 +42524,7 @@ _0801F4C4:
 	thumb_func_end sub_801F2B4
 
 	thumb_func_start sub_801F4D0
-sub_801F4D0: ; 801F4D0
+sub_801F4D0: @ 801F4D0
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r0, =0x00002168
@@ -42563,7 +42563,7 @@ _0801F52E:
 	thumb_func_end sub_801F4D0
 
 	thumb_func_start sub_801F534
-sub_801F534: ; 801F534
+sub_801F534: @ 801F534
 	push {lr}
 	movs r0, 0
 	bl sub_801F644
@@ -42574,7 +42574,7 @@ sub_801F534: ; 801F534
 	thumb_func_end sub_801F534
 
 	thumb_func_start sub_801F544
-sub_801F544: ; 801F544
+sub_801F544: @ 801F544
 	push {r4,lr}
 	bl sub_80208D0
 	ldr r4, =0x02022c88
@@ -42596,7 +42596,7 @@ _0801F55A:
 	thumb_func_end sub_801F544
 
 	thumb_func_start sub_801F574
-sub_801F574: ; 801F574
+sub_801F574: @ 801F574
 	movs r2, 0
 	movs r1, 0xFF
 	strh r1, [r0, 0x18]
@@ -42606,7 +42606,7 @@ sub_801F574: ; 801F574
 	thumb_func_end sub_801F574
 
 	thumb_func_start sub_801F580
-sub_801F580: ; 801F580
+sub_801F580: @ 801F580
 	push {r4,r5,lr}
 	ldr r1, =0x02022c88
 	ldr r0, [r1]
@@ -42636,7 +42636,7 @@ _0801F5A8:
 	thumb_func_end sub_801F580
 
 	thumb_func_start sub_801F5B8
-sub_801F5B8: ; 801F5B8
+sub_801F5B8: @ 801F5B8
 	push {r4-r6,lr}
 	ldr r1, =0x02022c88
 	ldr r0, [r1]
@@ -42665,7 +42665,7 @@ _0801F5E0:
 	thumb_func_end sub_801F5B8
 
 	thumb_func_start sub_801F5EC
-sub_801F5EC: ; 801F5EC
+sub_801F5EC: @ 801F5EC
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -42711,7 +42711,7 @@ _0801F63E:
 	thumb_func_end sub_801F5EC
 
 	thumb_func_start sub_801F644
-sub_801F644: ; 801F644
+sub_801F644: @ 801F644
 	lsls r0, 24
 	ldr r1, =0x02022c88
 	ldr r1, [r1]
@@ -42723,7 +42723,7 @@ sub_801F644: ; 801F644
 	thumb_func_end sub_801F644
 
 	thumb_func_start sub_801F658
-sub_801F658: ; 801F658
+sub_801F658: @ 801F658
 	push {r4,lr}
 	adds r4, r0, 0
 	bl free_temp_tile_data_buffers_if_possible
@@ -42796,7 +42796,7 @@ _0801F6F0:
 	thumb_func_end sub_801F658
 
 	thumb_func_start sub_801F6F8
-sub_801F6F8: ; 801F6F8
+sub_801F6F8: @ 801F6F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -42828,7 +42828,7 @@ _0801F728:
 	thumb_func_end sub_801F6F8
 
 	thumb_func_start sub_801F730
-sub_801F730: ; 801F730
+sub_801F730: @ 801F730
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -42860,7 +42860,7 @@ _0801F760:
 	thumb_func_end sub_801F730
 
 	thumb_func_start sub_801F768
-sub_801F768: ; 801F768
+sub_801F768: @ 801F768
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -42915,7 +42915,7 @@ _0801F7CC:
 	thumb_func_end sub_801F768
 
 	thumb_func_start sub_801F7D4
-sub_801F7D4: ; 801F7D4
+sub_801F7D4: @ 801F7D4
 	push {lr}
 	bl sub_802093C
 	movs r0, 0
@@ -42924,7 +42924,7 @@ sub_801F7D4: ; 801F7D4
 	thumb_func_end sub_801F7D4
 
 	thumb_func_start sub_801F7E0
-sub_801F7E0: ; 801F7E0
+sub_801F7E0: @ 801F7E0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -42965,7 +42965,7 @@ _0801F826:
 	thumb_func_end sub_801F7E0
 
 	thumb_func_start sub_801F82C
-sub_801F82C: ; 801F82C
+sub_801F82C: @ 801F82C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43002,7 +43002,7 @@ _0801F86A:
 	thumb_func_end sub_801F82C
 
 	thumb_func_start sub_801F870
-sub_801F870: ; 801F870
+sub_801F870: @ 801F870
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -43058,7 +43058,7 @@ _0801F8D4:
 	thumb_func_end sub_801F870
 
 	thumb_func_start sub_801F8DC
-sub_801F8DC: ; 801F8DC
+sub_801F8DC: @ 801F8DC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -43141,7 +43141,7 @@ _0801F97A:
 	thumb_func_end sub_801F8DC
 
 	thumb_func_start sub_801F984
-sub_801F984: ; 801F984
+sub_801F984: @ 801F984
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -43223,7 +43223,7 @@ _0801FA22:
 	thumb_func_end sub_801F984
 
 	thumb_func_start sub_801FA2C
-sub_801FA2C: ; 801FA2C
+sub_801FA2C: @ 801FA2C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43257,7 +43257,7 @@ _0801FA60:
 	thumb_func_end sub_801FA2C
 
 	thumb_func_start sub_801FA68
-sub_801FA68: ; 801FA68
+sub_801FA68: @ 801FA68
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldrb r0, [r6]
@@ -43363,7 +43363,7 @@ _0801FB3C:
 	thumb_func_end sub_801FA68
 
 	thumb_func_start sub_801FB44
-sub_801FB44: ; 801FB44
+sub_801FB44: @ 801FB44
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43390,7 +43390,7 @@ _0801FB68:
 	thumb_func_end sub_801FB44
 
 	thumb_func_start sub_801FB70
-sub_801FB70: ; 801FB70
+sub_801FB70: @ 801FB70
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43427,7 +43427,7 @@ _0801FBAC:
 	thumb_func_end sub_801FB70
 
 	thumb_func_start sub_801FBB4
-sub_801FBB4: ; 801FBB4
+sub_801FBB4: @ 801FBB4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43464,7 +43464,7 @@ _0801FBF0:
 	thumb_func_end sub_801FBB4
 
 	thumb_func_start sub_801FBF8
-sub_801FBF8: ; 801FBF8
+sub_801FBF8: @ 801FBF8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43506,7 +43506,7 @@ _0801FC44:
 	thumb_func_end sub_801FBF8
 
 	thumb_func_start sub_801FC4C
-sub_801FC4C: ; 801FC4C
+sub_801FC4C: @ 801FC4C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43547,7 +43547,7 @@ _0801FC94:
 	thumb_func_end sub_801FC4C
 
 	thumb_func_start sub_801FC9C
-sub_801FC9C: ; 801FC9C
+sub_801FC9C: @ 801FC9C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43588,7 +43588,7 @@ _0801FCE4:
 	thumb_func_end sub_801FC9C
 
 	thumb_func_start sub_801FCEC
-sub_801FCEC: ; 801FCEC
+sub_801FCEC: @ 801FCEC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43625,7 +43625,7 @@ _0801FD28:
 	thumb_func_end sub_801FCEC
 
 	thumb_func_start sub_801FD30
-sub_801FD30: ; 801FD30
+sub_801FD30: @ 801FD30
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43667,7 +43667,7 @@ _0801FD80:
 	thumb_func_end sub_801FD30
 
 	thumb_func_start sub_801FD88
-sub_801FD88: ; 801FD88
+sub_801FD88: @ 801FD88
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -43708,13 +43708,13 @@ _0801FDD0:
 	thumb_func_end sub_801FD88
 
 	thumb_func_start sub_801FDD8
-sub_801FDD8: ; 801FDD8
+sub_801FDD8: @ 801FDD8
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_801FDD8
 
 	thumb_func_start sub_801FDDC
-sub_801FDDC: ; 801FDDC
+sub_801FDDC: @ 801FDDC
 	push {r4-r7,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -43809,7 +43809,7 @@ _0801FE94:
 	thumb_func_end sub_801FDDC
 
 	thumb_func_start sub_801FEBC
-sub_801FEBC: ; 801FEBC
+sub_801FEBC: @ 801FEBC
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r0, [r4]
@@ -43831,7 +43831,7 @@ _0801FEDA:
 	thumb_func_end sub_801FEBC
 
 	thumb_func_start sub_801FEE4
-sub_801FEE4: ; 801FEE4
+sub_801FEE4: @ 801FEE4
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r0, [r4]
@@ -43852,7 +43852,7 @@ _0801FEFE:
 	thumb_func_end sub_801FEE4
 
 	thumb_func_start sub_801FF08
-sub_801FF08: ; 801FF08
+sub_801FF08: @ 801FF08
 	push {lr}
 	bl ProcessMenuInput
 	lsls r0, 24
@@ -43862,7 +43862,7 @@ sub_801FF08: ; 801FF08
 	thumb_func_end sub_801FF08
 
 	thumb_func_start sub_801FF18
-sub_801FF18: ; 801FF18
+sub_801FF18: @ 801FF18
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -44037,7 +44037,7 @@ _08020082:
 	thumb_func_end sub_801FF18
 
 	thumb_func_start sub_8020094
-sub_8020094: ; 8020094
+sub_8020094: @ 8020094
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r0, [r4]
@@ -44063,7 +44063,7 @@ _080200B2:
 	thumb_func_end sub_8020094
 
 	thumb_func_start sub_80200C8
-sub_80200C8: ; 80200C8
+sub_80200C8: @ 80200C8
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r0, [r4]
@@ -44084,7 +44084,7 @@ _080200E2:
 	thumb_func_end sub_80200C8
 
 	thumb_func_start sub_80200EC
-sub_80200EC: ; 80200EC
+sub_80200EC: @ 80200EC
 	push {lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -44108,7 +44108,7 @@ sub_80200EC: ; 80200EC
 	thumb_func_end sub_80200EC
 
 	thumb_func_start sub_8020118
-sub_8020118: ; 8020118
+sub_8020118: @ 8020118
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -44178,7 +44178,7 @@ _08020154:
 	thumb_func_end sub_8020118
 
 	thumb_func_start sub_80201A4
-sub_80201A4: ; 80201A4
+sub_80201A4: @ 80201A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -44367,7 +44367,7 @@ _0802030C:
 	thumb_func_end sub_80201A4
 
 	thumb_func_start sub_8020320
-sub_8020320: ; 8020320
+sub_8020320: @ 8020320
 	push {r4,lr}
 	ldr r1, =0x02022c88
 	ldr r2, [r1]
@@ -44406,7 +44406,7 @@ _08020360:
 	thumb_func_end sub_8020320
 
 	thumb_func_start sub_8020368
-sub_8020368: ; 8020368
+sub_8020368: @ 8020368
 	push {r4,lr}
 	ldr r1, =0x02022c88
 	ldr r2, [r1]
@@ -44444,7 +44444,7 @@ _080203A8:
 	thumb_func_end sub_8020368
 
 	thumb_func_start sub_80203B0
-sub_80203B0: ; 80203B0
+sub_80203B0: @ 80203B0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x3
@@ -44486,7 +44486,7 @@ sub_80203B0: ; 80203B0
 	thumb_func_end sub_80203B0
 
 	thumb_func_start sub_802040C
-sub_802040C: ; 802040C
+sub_802040C: @ 802040C
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0
@@ -44498,7 +44498,7 @@ sub_802040C: ; 802040C
 	thumb_func_end sub_802040C
 
 	thumb_func_start sub_8020420
-sub_8020420: ; 8020420
+sub_8020420: @ 8020420
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r1, 0
@@ -44547,7 +44547,7 @@ sub_8020420: ; 8020420
 	thumb_func_end sub_8020420
 
 	thumb_func_start sub_8020480
-sub_8020480: ; 8020480
+sub_8020480: @ 8020480
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -44622,7 +44622,7 @@ sub_8020480: ; 8020480
 	thumb_func_end sub_8020480
 
 	thumb_func_start sub_8020538
-sub_8020538: ; 8020538
+sub_8020538: @ 8020538
 	push {r4,lr}
 	ldr r4, =0x02022c88
 	ldr r1, [r4]
@@ -44653,7 +44653,7 @@ sub_8020538: ; 8020538
 	thumb_func_end sub_8020538
 
 	thumb_func_start sub_8020584
-sub_8020584: ; 8020584
+sub_8020584: @ 8020584
 	push {lr}
 	sub sp, 0x8
 	movs r1, 0xC0
@@ -44678,7 +44678,7 @@ sub_8020584: ; 8020584
 	thumb_func_end sub_8020584
 
 	thumb_func_start sub_80205B4
-sub_80205B4: ; 80205B4
+sub_80205B4: @ 80205B4
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =gUnknown_08DD4BD0
@@ -44710,7 +44710,7 @@ sub_80205B4: ; 80205B4
 	thumb_func_end sub_80205B4
 
 	thumb_func_start task_tutorial_story_unknown
-task_tutorial_story_unknown: ; 8020604
+task_tutorial_story_unknown: @ 8020604
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =gUnknown_08DD4860
@@ -44760,7 +44760,7 @@ _0802064E:
 	thumb_func_end task_tutorial_story_unknown
 
 	thumb_func_start sub_8020680
-sub_8020680: ; 8020680
+sub_8020680: @ 8020680
 	push {lr}
 	ldr r0, =gUnknown_082F2C20
 	movs r1, 0x80
@@ -44777,7 +44777,7 @@ sub_8020680: ; 8020680
 	thumb_func_end sub_8020680
 
 	thumb_func_start sub_80206A4
-sub_80206A4: ; 80206A4
+sub_80206A4: @ 80206A4
 	push {lr}
 	ldr r0, =gUnknown_082F2C40
 	movs r1, 0xF0
@@ -44797,7 +44797,7 @@ sub_80206A4: ; 80206A4
 	thumb_func_end sub_80206A4
 
 	thumb_func_start sub_80206D0
-sub_80206D0: ; 80206D0
+sub_80206D0: @ 80206D0
 	push {lr}
 	movs r0, 0x2
 	bl PutWindowTilemap
@@ -44810,7 +44810,7 @@ sub_80206D0: ; 80206D0
 	thumb_func_end sub_80206D0
 
 	thumb_func_start sub_80206E8
-sub_80206E8: ; 80206E8
+sub_80206E8: @ 80206E8
 	push {r4,lr}
 	sub sp, 0xC
 	add r1, sp, 0x8
@@ -44852,7 +44852,7 @@ _080206F8:
 	thumb_func_end sub_80206E8
 
 	thumb_func_start sub_8020740
-sub_8020740: ; 8020740
+sub_8020740: @ 8020740
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0x11
@@ -44875,7 +44875,7 @@ sub_8020740: ; 8020740
 	thumb_func_end sub_8020740
 
 	thumb_func_start sub_8020770
-sub_8020770: ; 8020770
+sub_8020770: @ 8020770
 	push {lr}
 	sub sp, 0x10
 	ldr r0, =0xa2600001
@@ -44907,7 +44907,7 @@ sub_8020770: ; 8020770
 	thumb_func_end sub_8020770
 
 	thumb_func_start sub_80207C0
-sub_80207C0: ; 80207C0
+sub_80207C0: @ 80207C0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -44946,7 +44946,7 @@ sub_80207C0: ; 80207C0
 	thumb_func_end sub_80207C0
 
 	thumb_func_start sub_8020818
-sub_8020818: ; 8020818
+sub_8020818: @ 8020818
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -45001,7 +45001,7 @@ sub_8020818: ; 8020818
 	thumb_func_end sub_8020818
 
 	thumb_func_start sub_8020890
-sub_8020890: ; 8020890
+sub_8020890: @ 8020890
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =gUnknown_082F3134
@@ -45032,7 +45032,7 @@ _080208CA:
 	thumb_func_end sub_8020890
 
 	thumb_func_start sub_80208D0
-sub_80208D0: ; 80208D0
+sub_80208D0: @ 80208D0
 	push {lr}
 	ldr r0, =0x02022c8c
 	ldr r0, [r0]
@@ -45046,7 +45046,7 @@ _080208DE:
 	thumb_func_end sub_80208D0
 
 	thumb_func_start sub_80208E8
-sub_80208E8: ; 80208E8
+sub_80208E8: @ 80208E8
 	push {lr}
 	ldr r0, =gUnknown_082F319C
 	movs r1, 0xA
@@ -45069,7 +45069,7 @@ sub_80208E8: ; 80208E8
 	thumb_func_end sub_80208E8
 
 	thumb_func_start sub_802091C
-sub_802091C: ; 802091C
+sub_802091C: @ 802091C
 	ldr r1, =0x02022c8c
 	ldr r1, [r1]
 	ldr r2, [r1]
@@ -45088,7 +45088,7 @@ sub_802091C: ; 802091C
 	thumb_func_end sub_802091C
 
 	thumb_func_start sub_802093C
-sub_802093C: ; 802093C
+sub_802093C: @ 802093C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	bl sub_801F0B0
@@ -45143,7 +45143,7 @@ _08020992:
 	thumb_func_end sub_802093C
 
 	thumb_func_start sub_80209AC
-sub_80209AC: ; 80209AC
+sub_80209AC: @ 80209AC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 2
@@ -45167,7 +45167,7 @@ sub_80209AC: ; 80209AC
 	thumb_func_end sub_80209AC
 
 	thumb_func_start sub_80209E0
-sub_80209E0: ; 80209E0
+sub_80209E0: @ 80209E0
 	push {lr}
 	bl sub_801F0B0
 	lsls r0, 24
@@ -45198,7 +45198,7 @@ _08020A0C:
 	thumb_func_end sub_80209E0
 
 	thumb_func_start sub_8020A1C
-sub_8020A1C: ; 8020A1C
+sub_8020A1C: @ 8020A1C
 	push {r4,lr}
 	ldr r4, =0x02022c8c
 	ldr r1, [r4]
@@ -45241,7 +45241,7 @@ _08020A62:
 	thumb_func_end sub_8020A1C
 
 	thumb_func_start sub_8020A68
-sub_8020A68: ; 8020A68
+sub_8020A68: @ 8020A68
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_082F31BC
 	movs r1, 0x4C
@@ -45278,7 +45278,7 @@ sub_8020A68: ; 8020A68
 	thumb_func_end sub_8020A68
 
 	thumb_func_start sub_8020ABC
-sub_8020ABC: ; 8020ABC
+sub_8020ABC: @ 8020ABC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_801F198
@@ -45310,7 +45310,7 @@ _08020AEC:
 	thumb_func_end sub_8020ABC
 
 	thumb_func_start sub_8020AF4
-sub_8020AF4: ; 8020AF4
+sub_8020AF4: @ 8020AF4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -45336,7 +45336,7 @@ _08020B1A:
 	thumb_func_end sub_8020AF4
 
 	thumb_func_start sub_8020B20
-sub_8020B20: ; 8020B20
+sub_8020B20: @ 8020B20
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_082F322C
 	movs r1, 0x8
@@ -45378,7 +45378,7 @@ sub_8020B20: ; 8020B20
 	thumb_func_end sub_8020B20
 
 	thumb_func_start sub_8020B80
-sub_8020B80: ; 8020B80
+sub_8020B80: @ 8020B80
 	push {r4,lr}
 	bl sub_801F0B0
 	lsls r0, 24
@@ -45442,7 +45442,7 @@ _08020BF6:
 	thumb_func_end sub_8020B80
 
 	thumb_func_start sub_8020C00
-sub_8020C00: ; 8020C00
+sub_8020C00: @ 8020C00
 	ldr r0, =0x02022c90
 	ldr r0, [r0]
 	bx lr
@@ -45450,7 +45450,7 @@ sub_8020C00: ; 8020C00
 	thumb_func_end sub_8020C00
 
 	thumb_func_start sub_8020C0C
-sub_8020C0C: ; 8020C0C
+sub_8020C0C: @ 8020C0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02022c90
@@ -45496,7 +45496,7 @@ _08020C5C:
 	thumb_func_end sub_8020C0C
 
 	thumb_func_start sub_8020C70
-sub_8020C70: ; 8020C70
+sub_8020C70: @ 8020C70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -45620,7 +45620,7 @@ _08020D74:
 	thumb_func_end sub_8020C70
 
 	thumb_func_start sub_8020D8C
-sub_8020D8C: ; 8020D8C
+sub_8020D8C: @ 8020D8C
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r1, =0x0203ce7c
@@ -45685,7 +45685,7 @@ _08020DB0:
 	thumb_func_end sub_8020D8C
 
 	thumb_func_start sub_8020E1C
-sub_8020E1C: ; 8020E1C
+sub_8020E1C: @ 8020E1C
 	push {lr}
 	ldr r0, =0x02022c90
 	ldr r0, [r0]
@@ -45699,7 +45699,7 @@ sub_8020E1C: ; 8020E1C
 	thumb_func_end sub_8020E1C
 
 	thumb_func_start sub_8020E3C
-sub_8020E3C: ; 8020E3C
+sub_8020E3C: @ 8020E3C
 	push {lr}
 	ldr r0, =sub_8020F74
 	bl SetVBlankCallback
@@ -45709,7 +45709,7 @@ sub_8020E3C: ; 8020E3C
 	thumb_func_end sub_8020E3C
 
 	thumb_func_start sub_8020E4C
-sub_8020E4C: ; 8020E4C
+sub_8020E4C: @ 8020E4C
 	push {lr}
 	movs r0, 0
 	bl SetVBlankCallback
@@ -45718,7 +45718,7 @@ sub_8020E4C: ; 8020E4C
 	thumb_func_end sub_8020E4C
 
 	thumb_func_start sub_8020E58
-sub_8020E58: ; 8020E58
+sub_8020E58: @ 8020E58
 	push {r4-r6,lr}
 	ldr r4, =0x02022c90
 	ldr r0, [r4]
@@ -45858,7 +45858,7 @@ _08020F66:
 	thumb_func_end sub_8020E58
 
 	thumb_func_start sub_8020F74
-sub_8020F74: ; 8020F74
+sub_8020F74: @ 8020F74
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -45868,7 +45868,7 @@ sub_8020F74: ; 8020F74
 	thumb_func_end sub_8020F74
 
 	thumb_func_start sub_8020F88
-sub_8020F88: ; 8020F88
+sub_8020F88: @ 8020F88
 	push {lr}
 	bl RunActiveTasks
 	bl RunTextPrinters
@@ -45879,7 +45879,7 @@ sub_8020F88: ; 8020F88
 	thumb_func_end sub_8020F88
 
 	thumb_func_start sub_8020FA0
-sub_8020FA0: ; 8020FA0
+sub_8020FA0: @ 8020FA0
 	push {r4,lr}
 	ldr r4, =0x02022c90
 	ldr r0, [r4]
@@ -45899,7 +45899,7 @@ _08020FB4:
 	thumb_func_end sub_8020FA0
 
 	thumb_func_start sub_8020FC4
-sub_8020FC4: ; 8020FC4
+sub_8020FC4: @ 8020FC4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -45975,7 +45975,7 @@ _08021046:
 	thumb_func_end sub_8020FC4
 
 	thumb_func_start sub_802104C
-sub_802104C: ; 802104C
+sub_802104C: @ 802104C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	bl sub_8020C00
@@ -46261,7 +46261,7 @@ _08021304:
 	thumb_func_end sub_802104C
 
 	thumb_func_start sub_802130C
-sub_802130C: ; 802130C
+sub_802130C: @ 802130C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl sub_8020C00
@@ -46404,7 +46404,7 @@ _08021446:
 	thumb_func_end sub_802130C
 
 	thumb_func_start sub_8021450
-sub_8021450: ; 8021450
+sub_8021450: @ 8021450
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02021bbe
@@ -46434,7 +46434,7 @@ _0802147C:
 	thumb_func_end sub_8021450
 
 	thumb_func_start sub_8021488
-sub_8021488: ; 8021488
+sub_8021488: @ 8021488
 	movs r1, 0
 	ldr r2, =0x0000ff98
 	strh r2, [r0, 0x2A]
@@ -46448,7 +46448,7 @@ sub_8021488: ; 8021488
 	thumb_func_end sub_8021488
 
 	thumb_func_start sub_80214A8
-sub_80214A8: ; 80214A8
+sub_80214A8: @ 80214A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -46617,7 +46617,7 @@ _080215E4:
 	thumb_func_end sub_80214A8
 
 	thumb_func_start sub_8021608
-sub_8021608: ; 8021608
+sub_8021608: @ 8021608
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -46697,7 +46697,7 @@ _0802169A:
 	thumb_func_end sub_8021608
 
 	thumb_func_start sub_80216A8
-sub_80216A8: ; 80216A8
+sub_80216A8: @ 80216A8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -46727,7 +46727,7 @@ _080216D4:
 	thumb_func_end sub_80216A8
 
 	thumb_func_start sub_80216E0
-sub_80216E0: ; 80216E0
+sub_80216E0: @ 80216E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -46982,7 +46982,7 @@ _080218C4:
 	thumb_func_end sub_80216E0
 
 	thumb_func_start sub_80218D4
-sub_80218D4: ; 80218D4
+sub_80218D4: @ 80218D4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -47048,7 +47048,7 @@ _0802193C:
 	thumb_func_end sub_80218D4
 
 	thumb_func_start sub_8021944
-sub_8021944: ; 8021944
+sub_8021944: @ 8021944
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r4, r1, 16
@@ -47111,7 +47111,7 @@ _080219A6:
 	thumb_func_end sub_8021944
 
 	thumb_func_start sub_80219C8
-sub_80219C8: ; 80219C8
+sub_80219C8: @ 80219C8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -47160,7 +47160,7 @@ sub_80219C8: ; 80219C8
 	thumb_func_end sub_80219C8
 
 	thumb_func_start sub_8021A28
-sub_8021A28: ; 8021A28
+sub_8021A28: @ 8021A28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -47521,7 +47521,7 @@ _08021D14:
 	thumb_func_end sub_8021A28
 
 	thumb_func_start sub_8021D34
-sub_8021D34: ; 8021D34
+sub_8021D34: @ 8021D34
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -47873,7 +47873,7 @@ _08021FDE:
 	thumb_func_end sub_8021D34
 
 	thumb_func_start sub_8022070
-sub_8022070: ; 8022070
+sub_8022070: @ 8022070
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -48078,7 +48078,7 @@ _08022224:
 	thumb_func_end sub_8022070
 
 	thumb_func_start sub_802222C
-sub_802222C: ; 802222C
+sub_802222C: @ 802222C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xDD
@@ -48097,7 +48097,7 @@ sub_802222C: ; 802222C
 	thumb_func_end sub_802222C
 
 	thumb_func_start sub_8022250
-sub_8022250: ; 8022250
+sub_8022250: @ 8022250
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -48378,7 +48378,7 @@ _080224C0:
 	thumb_func_end sub_8022250
 
 	thumb_func_start sub_80224D0
-sub_80224D0: ; 80224D0
+sub_80224D0: @ 80224D0
 	push {lr}
 	bl script_env_2_enable
 	ldr r0, =sub_8022250
@@ -48416,7 +48416,7 @@ sub_80224D0: ; 80224D0
 	thumb_func_end sub_80224D0
 
 	thumb_func_start sub_8022524
-sub_8022524: ; 8022524
+sub_8022524: @ 8022524
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -48440,7 +48440,7 @@ sub_8022524: ; 8022524
 	thumb_func_end sub_8022524
 
 	thumb_func_start sub_8022554
-sub_8022554: ; 8022554
+sub_8022554: @ 8022554
 	push {lr}
 	ldr r2, [r0, 0x78]
 	adds r2, 0x3E
@@ -48467,7 +48467,7 @@ sub_8022554: ; 8022554
 	thumb_func_end sub_8022554
 
 	thumb_func_start sub_8022588
-sub_8022588: ; 8022588
+sub_8022588: @ 8022588
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -48522,7 +48522,7 @@ _080225E8:
 	thumb_func_end sub_8022588
 
 	thumb_func_start sub_8022600
-sub_8022600: ; 8022600
+sub_8022600: @ 8022600
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -48620,7 +48620,7 @@ _080226B6:
 	thumb_func_end sub_8022600
 
 	thumb_func_start sub_80226D0
-sub_80226D0: ; 80226D0
+sub_80226D0: @ 80226D0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -48667,7 +48667,7 @@ _0802271A:
 	thumb_func_end sub_80226D0
 
 	thumb_func_start sub_8022730
-sub_8022730: ; 8022730
+sub_8022730: @ 8022730
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -48923,7 +48923,7 @@ _08022928:
 	thumb_func_end sub_8022730
 
 	thumb_func_start sub_8022960
-sub_8022960: ; 8022960
+sub_8022960: @ 8022960
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -49013,7 +49013,7 @@ _08022A18:
 	thumb_func_end sub_8022960
 
 	thumb_func_start sub_8022A20
-sub_8022A20: ; 8022A20
+sub_8022A20: @ 8022A20
 	push {lr}
 	adds r3, r0, 0
 	adds r0, 0x3F
@@ -49039,7 +49039,7 @@ _08022A46:
 	thumb_func_end sub_8022A20
 
 	thumb_func_start sub_8022A4C
-sub_8022A4C: ; 8022A4C
+sub_8022A4C: @ 8022A4C
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r1, 0
@@ -49078,7 +49078,7 @@ _08022A5A:
 	thumb_func_end sub_8022A4C
 
 	thumb_func_start sub_8022A94
-sub_8022A94: ; 8022A94
+sub_8022A94: @ 8022A94
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -49154,7 +49154,7 @@ _08022B1A:
 	thumb_func_end sub_8022A94
 
 	thumb_func_start sub_8022B28
-sub_8022B28: ; 8022B28
+sub_8022B28: @ 8022B28
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -49249,7 +49249,7 @@ _08022BA6:
 	thumb_func_end sub_8022B28
 
 	thumb_func_start sub_8022BEC
-sub_8022BEC: ; 8022BEC
+sub_8022BEC: @ 8022BEC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -49309,7 +49309,7 @@ _08022C4A:
 	thumb_func_end sub_8022BEC
 
 	thumb_func_start sub_8022C58
-sub_8022C58: ; 8022C58
+sub_8022C58: @ 8022C58
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -49354,7 +49354,7 @@ sub_8022C58: ; 8022C58
 	thumb_func_end sub_8022C58
 
 	thumb_func_start sub_8022CB0
-sub_8022CB0: ; 8022CB0
+sub_8022CB0: @ 8022CB0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -49413,7 +49413,7 @@ _08022D0E:
 	thumb_func_end sub_8022CB0
 
 	thumb_func_start sub_8022D14
-sub_8022D14: ; 8022D14
+sub_8022D14: @ 8022D14
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -49547,7 +49547,7 @@ _08022E0E:
 	thumb_func_end sub_8022D14
 
 	thumb_func_start sub_8022E1C
-sub_8022E1C: ; 8022E1C
+sub_8022E1C: @ 8022E1C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_802104C
@@ -49566,7 +49566,7 @@ _08022E34:
 	thumb_func_end sub_8022E1C
 
 	thumb_func_start sub_8022E3C
-sub_8022E3C: ; 8022E3C
+sub_8022E3C: @ 8022E3C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_802130C
@@ -49585,7 +49585,7 @@ _08022E54:
 	thumb_func_end sub_8022E3C
 
 	thumb_func_start sub_8022E5C
-sub_8022E5C: ; 8022E5C
+sub_8022E5C: @ 8022E5C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xC]
@@ -49626,7 +49626,7 @@ _08022EA2:
 	thumb_func_end sub_8022E5C
 
 	thumb_func_start sub_8022EAC
-sub_8022EAC: ; 8022EAC
+sub_8022EAC: @ 8022EAC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -49674,7 +49674,7 @@ _08022EFA:
 	thumb_func_end sub_8022EAC
 
 	thumb_func_start sub_8022F04
-sub_8022F04: ; 8022F04
+sub_8022F04: @ 8022F04
 	push {lr}
 	movs r1, 0
 	str r1, [r0, 0x4]
@@ -49687,7 +49687,7 @@ sub_8022F04: ; 8022F04
 	thumb_func_end sub_8022F04
 
 	thumb_func_start sub_8022F1C
-sub_8022F1C: ; 8022F1C
+sub_8022F1C: @ 8022F1C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -49850,7 +49850,7 @@ _08023066:
 	thumb_func_end sub_8022F1C
 
 	thumb_func_start sub_8023070
-sub_8023070: ; 8023070
+sub_8023070: @ 8023070
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xC]
@@ -50005,7 +50005,7 @@ _080231AE:
 	thumb_func_end sub_8023070
 
 	thumb_func_start sub_80231B8
-sub_80231B8: ; 80231B8
+sub_80231B8: @ 80231B8
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrb r1, [r4, 0xC]
@@ -50154,7 +50154,7 @@ _080232E2:
 	thumb_func_end sub_80231B8
 
 	thumb_func_start sub_80232EC
-sub_80232EC: ; 80232EC
+sub_80232EC: @ 80232EC
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -50246,7 +50246,7 @@ _08023392:
 	thumb_func_end sub_80232EC
 
 	thumb_func_start sub_802339C
-sub_802339C: ; 802339C
+sub_802339C: @ 802339C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -50476,7 +50476,7 @@ _08023548:
 	thumb_func_end sub_802339C
 
 	thumb_func_start sub_8023558
-sub_8023558: ; 8023558
+sub_8023558: @ 8023558
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	movs r6, 0
@@ -50653,7 +50653,7 @@ _080236A8:
 	thumb_func_end sub_8023558
 
 	thumb_func_start sub_80236B8
-sub_80236B8: ; 80236B8
+sub_80236B8: @ 80236B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -50872,7 +50872,7 @@ _0802384C:
 	thumb_func_end sub_80236B8
 
 	thumb_func_start sub_802385C
-sub_802385C: ; 802385C
+sub_802385C: @ 802385C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -50952,7 +50952,7 @@ _080238EA:
 	thumb_func_end sub_802385C
 
 	thumb_func_start sub_80238F0
-sub_80238F0: ; 80238F0
+sub_80238F0: @ 80238F0
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x5C
@@ -51032,7 +51032,7 @@ _08023992:
 	thumb_func_end sub_80238F0
 
 	thumb_func_start sub_8023998
-sub_8023998: ; 8023998
+sub_8023998: @ 8023998
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x5C
@@ -51105,7 +51105,7 @@ _08023A28:
 	thumb_func_end sub_8023998
 
 	thumb_func_start sub_8023A30
-sub_8023A30: ; 8023A30
+sub_8023A30: @ 8023A30
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xC]
@@ -51291,7 +51291,7 @@ _08023BBA:
 	thumb_func_end sub_8023A30
 
 	thumb_func_start sub_8023BC0
-sub_8023BC0: ; 8023BC0
+sub_8023BC0: @ 8023BC0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -51407,7 +51407,7 @@ _08023CA2:
 	thumb_func_end sub_8023BC0
 
 	thumb_func_start sub_8023CAC
-sub_8023CAC: ; 8023CAC
+sub_8023CAC: @ 8023CAC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -51868,7 +51868,7 @@ _08024034:
 	thumb_func_end sub_8023CAC
 
 	thumb_func_start sub_8024048
-sub_8024048: ; 8024048
+sub_8024048: @ 8024048
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -51981,7 +51981,7 @@ _0802412A:
 	thumb_func_end sub_8024048
 
 	thumb_func_start sub_8024134
-sub_8024134: ; 8024134
+sub_8024134: @ 8024134
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -52092,7 +52092,7 @@ _0802421E:
 	thumb_func_end sub_8024134
 
 	thumb_func_start sub_8024228
-sub_8024228: ; 8024228
+sub_8024228: @ 8024228
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -52190,7 +52190,7 @@ _080242D8:
 	thumb_func_end sub_8024228
 
 	thumb_func_start sub_80242E0
-sub_80242E0: ; 80242E0
+sub_80242E0: @ 80242E0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -52303,7 +52303,7 @@ _080243B4:
 	thumb_func_end sub_80242E0
 
 	thumb_func_start sub_80243BC
-sub_80243BC: ; 80243BC
+sub_80243BC: @ 80243BC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -52377,7 +52377,7 @@ _0802443A:
 	thumb_func_end sub_80243BC
 
 	thumb_func_start sub_8024444
-sub_8024444: ; 8024444
+sub_8024444: @ 8024444
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -52477,7 +52477,7 @@ _080244FC:
 	thumb_func_end sub_8024444
 
 	thumb_func_start sub_8024508
-sub_8024508: ; 8024508
+sub_8024508: @ 8024508
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrb r4, [r5, 0xC]
@@ -52528,7 +52528,7 @@ _0802455E:
 	thumb_func_end sub_8024508
 
 	thumb_func_start sub_8024568
-sub_8024568: ; 8024568
+sub_8024568: @ 8024568
 	push {lr}
 	movs r0, 0
 	bl sub_8020C0C
@@ -52538,7 +52538,7 @@ sub_8024568: ; 8024568
 	thumb_func_end sub_8024568
 
 	thumb_func_start sub_8024578
-sub_8024578: ; 8024578
+sub_8024578: @ 8024578
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -52610,7 +52610,7 @@ _080245B8:
 	thumb_func_end sub_8024578
 
 	thumb_func_start sub_8024604
-sub_8024604: ; 8024604
+sub_8024604: @ 8024604
 	push {r4-r6,lr}
 	sub sp, 0x8
 	str r2, [sp, 0x4]
@@ -52645,7 +52645,7 @@ sub_8024604: ; 8024604
 	thumb_func_end sub_8024604
 
 	thumb_func_start sub_8024644
-sub_8024644: ; 8024644
+sub_8024644: @ 8024644
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, [sp, 0x10]
@@ -52667,7 +52667,7 @@ sub_8024644: ; 8024644
 	thumb_func_end sub_8024644
 
 	thumb_func_start sub_8024668
-sub_8024668: ; 8024668
+sub_8024668: @ 8024668
 	ldr r1, =0x03005d90
 	ldr r1, [r1]
 	adds r1, 0xAC
@@ -52679,7 +52679,7 @@ sub_8024668: ; 8024668
 	thumb_func_end sub_8024668
 
 	thumb_func_start sub_802467C
-sub_802467C: ; 802467C
+sub_802467C: @ 802467C
 	ldr r2, =0x03005d90
 	ldr r2, [r2]
 	adds r2, 0xAC
@@ -52691,7 +52691,7 @@ sub_802467C: ; 802467C
 	thumb_func_end sub_802467C
 
 	thumb_func_start sub_8024690
-sub_8024690: ; 8024690
+sub_8024690: @ 8024690
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03005d90
@@ -52706,7 +52706,7 @@ sub_8024690: ; 8024690
 	thumb_func_end sub_8024690
 
 	thumb_func_start sub_80246AC
-sub_80246AC: ; 80246AC
+sub_80246AC: @ 80246AC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x03005d90
@@ -52729,7 +52729,7 @@ _080246CE:
 	thumb_func_end sub_80246AC
 
 	thumb_func_start sub_80246D4
-sub_80246D4: ; 80246D4
+sub_80246D4: @ 80246D4
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -52752,7 +52752,7 @@ _080246FA:
 	thumb_func_end sub_80246D4
 
 	thumb_func_start sub_8024700
-sub_8024700: ; 8024700
+sub_8024700: @ 8024700
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x03005d90
@@ -52783,7 +52783,7 @@ _0802473A:
 	thumb_func_end sub_8024700
 
 	thumb_func_start sub_8024740
-sub_8024740: ; 8024740
+sub_8024740: @ 8024740
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x03005d90
@@ -52814,7 +52814,7 @@ _08024776:
 	thumb_func_end sub_8024740
 
 	thumb_func_start sub_802477C
-sub_802477C: ; 802477C
+sub_802477C: @ 802477C
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -52846,7 +52846,7 @@ _080247B6:
 	thumb_func_end sub_802477C
 
 	thumb_func_start sub_80247BC
-sub_80247BC: ; 80247BC
+sub_80247BC: @ 80247BC
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -52860,7 +52860,7 @@ sub_80247BC: ; 80247BC
 	thumb_func_end sub_80247BC
 
 	thumb_func_start sub_80247D4
-sub_80247D4: ; 80247D4
+sub_80247D4: @ 80247D4
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -52905,7 +52905,7 @@ sub_80247D4: ; 80247D4
 	thumb_func_end sub_80247D4
 
 	thumb_func_start sub_802482C
-sub_802482C: ; 802482C
+sub_802482C: @ 802482C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -52952,7 +52952,7 @@ sub_802482C: ; 802482C
 	thumb_func_end sub_802482C
 
 	thumb_func_start sub_802488C
-sub_802488C: ; 802488C
+sub_802488C: @ 802488C
 	push {lr}
 	sub sp, 0x4
 	bl sub_80247BC
@@ -52971,7 +52971,7 @@ sub_802488C: ; 802488C
 	thumb_func_end sub_802488C
 
 	thumb_func_start sub_80248B0
-sub_80248B0: ; 80248B0
+sub_80248B0: @ 80248B0
 	push {r4,r5,lr}
 	sub sp, 0x18
 	movs r0, 0x7
@@ -53016,7 +53016,7 @@ sub_80248B0: ; 80248B0
 	thumb_func_end sub_80248B0
 
 	thumb_func_start sub_8024918
-sub_8024918: ; 8024918
+sub_8024918: @ 8024918
 	push {r4,lr}
 	ldr r4, =0x02022c94
 	ldrb r0, [r4]
@@ -53033,7 +53033,7 @@ sub_8024918: ; 8024918
 	thumb_func_end sub_8024918
 
 	thumb_func_start sub_802493C
-sub_802493C: ; 802493C
+sub_802493C: @ 802493C
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -53116,7 +53116,7 @@ _08024A16:
 	thumb_func_end sub_802493C
 
 	thumb_func_start sub_8024A1C
-sub_8024A1C: ; 8024A1C
+sub_8024A1C: @ 8024A1C
 	push {lr}
 	bl clear_tasks
 	bl ResetAllObjectData
@@ -53126,7 +53126,7 @@ sub_8024A1C: ; 8024A1C
 	thumb_func_end sub_8024A1C
 
 	thumb_func_start sub_8024A30
-sub_8024A30: ; 8024A30
+sub_8024A30: @ 8024A30
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -53336,7 +53336,7 @@ _08024BB6:
 	thumb_func_end sub_8024A30
 
 	thumb_func_start sub_8024BC8
-sub_8024BC8: ; 8024BC8
+sub_8024BC8: @ 8024BC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -53504,7 +53504,7 @@ _08024D40:
 	thumb_func_end sub_8024BC8
 
 	thumb_func_start sub_8024D4C
-sub_8024D4C: ; 8024D4C
+sub_8024D4C: @ 8024D4C
 	push {lr}
 	bl sub_8025D04
 	ldr r1, =gUnknown_082F7AC4
@@ -53528,7 +53528,7 @@ _08024D70:
 	thumb_func_end sub_8024D4C
 
 	thumb_func_start sub_8024D84
-sub_8024D84: ; 8024D84
+sub_8024D84: @ 8024D84
 	push {lr}
 	bl sub_8025E0C
 	ldr r1, =gUnknown_082F7AF4
@@ -53552,7 +53552,7 @@ _08024DA8:
 	thumb_func_end sub_8024D84
 
 	thumb_func_start sub_8024DBC
-sub_8024DBC: ; 8024DBC
+sub_8024DBC: @ 8024DBC
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r0, [r4]
@@ -53586,7 +53586,7 @@ _08024DF8:
 	thumb_func_end sub_8024DBC
 
 	thumb_func_start sub_8024E00
-sub_8024E00: ; 8024E00
+sub_8024E00: @ 8024E00
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r1, [r4]
@@ -53615,7 +53615,7 @@ _08024E30:
 	thumb_func_end sub_8024E00
 
 	thumb_func_start sub_8024E38
-sub_8024E38: ; 8024E38
+sub_8024E38: @ 8024E38
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x02022c98
@@ -53712,7 +53712,7 @@ _08024F08:
 	thumb_func_end sub_8024E38
 
 	thumb_func_start sub_8024F10
-sub_8024F10: ; 8024F10
+sub_8024F10: @ 8024F10
 	push {lr}
 	ldr r0, =0x02022c98
 	ldr r1, [r0]
@@ -53734,7 +53734,7 @@ _08024F2E:
 	thumb_func_end sub_8024F10
 
 	thumb_func_start sub_8024F38
-sub_8024F38: ; 8024F38
+sub_8024F38: @ 8024F38
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r2, [r4]
@@ -53828,7 +53828,7 @@ _08024FF6:
 	thumb_func_end sub_8024F38
 
 	thumb_func_start sub_8024FFC
-sub_8024FFC: ; 8024FFC
+sub_8024FFC: @ 8024FFC
 	push {lr}
 	ldr r0, =0x02022c98
 	ldr r2, [r0]
@@ -53925,7 +53925,7 @@ _080250CA:
 	thumb_func_end sub_8024FFC
 
 	thumb_func_start sub_80250D4
-sub_80250D4: ; 80250D4
+sub_80250D4: @ 80250D4
 	push {r4,r5,lr}
 	bl sub_802671C
 	bl sub_8025F48
@@ -53991,7 +53991,7 @@ _08025150:
 	thumb_func_end sub_80250D4
 
 	thumb_func_start sub_8025158
-sub_8025158: ; 8025158
+sub_8025158: @ 8025158
 	push {lr}
 	bl sub_8026044
 	bl sub_8026C90
@@ -54005,7 +54005,7 @@ _0802516C:
 	thumb_func_end sub_8025158
 
 	thumb_func_start sub_8025170
-sub_8025170: ; 8025170
+sub_8025170: @ 8025170
 	push {r4,lr}
 	bl sub_800A550
 	adds r4, r0, 0
@@ -54028,7 +54028,7 @@ _08025192:
 	thumb_func_end sub_8025170
 
 	thumb_func_start sub_8025198
-sub_8025198: ; 8025198
+sub_8025198: @ 8025198
 	push {r4,r5,lr}
 	ldr r5, =0x02022c98
 	ldr r1, [r5]
@@ -54107,7 +54107,7 @@ _08025226:
 	thumb_func_end sub_8025198
 
 	thumb_func_start sub_8025230
-sub_8025230: ; 8025230
+sub_8025230: @ 8025230
 	push {r4,r5,lr}
 	ldr r5, =0x02022c98
 	ldr r2, [r5]
@@ -54228,7 +54228,7 @@ _08025316:
 	thumb_func_end sub_8025230
 
 	thumb_func_start sub_8025324
-sub_8025324: ; 8025324
+sub_8025324: @ 8025324
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r1, 0x1
@@ -54381,7 +54381,7 @@ _08025466:
 	thumb_func_end sub_8025324
 
 	thumb_func_start sub_8025470
-sub_8025470: ; 8025470
+sub_8025470: @ 8025470
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r4, =0x02022c98
@@ -54595,7 +54595,7 @@ _0802563C:
 	thumb_func_end sub_8025470
 
 	thumb_func_start sub_8025644
-sub_8025644: ; 8025644
+sub_8025644: @ 8025644
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r0, [r4]
@@ -54649,7 +54649,7 @@ _080256A0:
 	thumb_func_end sub_8025644
 
 	thumb_func_start sub_80256AC
-sub_80256AC: ; 80256AC
+sub_80256AC: @ 80256AC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02022c98
@@ -54729,7 +54729,7 @@ _0802574C:
 	thumb_func_end sub_80256AC
 
 	thumb_func_start sub_8025758
-sub_8025758: ; 8025758
+sub_8025758: @ 8025758
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02022c98
@@ -54868,7 +54868,7 @@ _0802588C:
 	thumb_func_end sub_8025758
 
 	thumb_func_start sub_802589C
-sub_802589C: ; 802589C
+sub_802589C: @ 802589C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -54929,7 +54929,7 @@ _08025904:
 	thumb_func_end sub_802589C
 
 	thumb_func_start sub_8025910
-sub_8025910: ; 8025910
+sub_8025910: @ 8025910
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -55043,7 +55043,7 @@ _080259E8:
 	thumb_func_end sub_8025910
 
 	thumb_func_start sub_80259FC
-sub_80259FC: ; 80259FC
+sub_80259FC: @ 80259FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -55298,7 +55298,7 @@ _08025BF6:
 	thumb_func_end sub_80259FC
 
 	thumb_func_start sub_8025C0C
-sub_8025C0C: ; 8025C0C
+sub_8025C0C: @ 8025C0C
 	push {r4-r7,lr}
 	sub sp, 0x18
 	ldr r5, =0x02022c98
@@ -55415,7 +55415,7 @@ _08025CFA:
 	thumb_func_end sub_8025C0C
 
 	thumb_func_start sub_8025D04
-sub_8025D04: ; 8025D04
+sub_8025D04: @ 8025D04
 	push {r4,r5,lr}
 	ldr r5, =0x02022c98
 	ldr r0, [r5]
@@ -55456,7 +55456,7 @@ _08025D4A:
 	thumb_func_end sub_8025D04
 
 	thumb_func_start sub_8025D50
-sub_8025D50: ; 8025D50
+sub_8025D50: @ 8025D50
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r0, =0x02022c98
@@ -55539,7 +55539,7 @@ _08025DF4:
 	thumb_func_end sub_8025D50
 
 	thumb_func_start sub_8025E0C
-sub_8025E0C: ; 8025E0C
+sub_8025E0C: @ 8025E0C
 	push {r4-r6,lr}
 	sub sp, 0x18
 	ldr r0, =0x02022c98
@@ -55630,7 +55630,7 @@ _08025EC0:
 	thumb_func_end sub_8025E0C
 
 	thumb_func_start sub_8025ED8
-sub_8025ED8: ; 8025ED8
+sub_8025ED8: @ 8025ED8
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r1, [r4]
@@ -55687,7 +55687,7 @@ _08025F40:
 	thumb_func_end sub_8025ED8
 
 	thumb_func_start sub_8025F48
-sub_8025F48: ; 8025F48
+sub_8025F48: @ 8025F48
 	push {r4-r6,lr}
 	ldr r6, =0x02022c98
 	ldr r2, [r6]
@@ -55806,7 +55806,7 @@ _0802603C:
 	thumb_func_end sub_8025F48
 
 	thumb_func_start sub_8026044
-sub_8026044: ; 8026044
+sub_8026044: @ 8026044
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -55995,7 +55995,7 @@ _080261C0:
 	thumb_func_end sub_8026044
 
 	thumb_func_start sub_80261CC
-sub_80261CC: ; 80261CC
+sub_80261CC: @ 80261CC
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -56006,7 +56006,7 @@ sub_80261CC: ; 80261CC
 	thumb_func_end sub_80261CC
 
 	thumb_func_start sub_80261E4
-sub_80261E4: ; 80261E4
+sub_80261E4: @ 80261E4
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -56016,7 +56016,7 @@ sub_80261E4: ; 80261E4
 	thumb_func_end sub_80261E4
 
 	thumb_func_start sub_80261F8
-sub_80261F8: ; 80261F8
+sub_80261F8: @ 80261F8
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -56028,7 +56028,7 @@ sub_80261F8: ; 80261F8
 	thumb_func_end sub_80261F8
 
 	thumb_func_start sub_802620C
-sub_802620C: ; 802620C
+sub_802620C: @ 802620C
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -56038,7 +56038,7 @@ sub_802620C: ; 802620C
 	thumb_func_end sub_802620C
 
 	thumb_func_start sub_802621C
-sub_802621C: ; 802621C
+sub_802621C: @ 802621C
 	push {lr}
 	movs r1, 0x1
 	bl AddTask
@@ -56058,7 +56058,7 @@ sub_802621C: ; 802621C
 	thumb_func_end sub_802621C
 
 	thumb_func_start sub_8026240
-sub_8026240: ; 8026240
+sub_8026240: @ 8026240
 	push {r4,lr}
 	ldr r2, =0x02022c98
 	ldr r1, [r2]
@@ -56078,7 +56078,7 @@ sub_8026240: ; 8026240
 	thumb_func_end sub_8026240
 
 	thumb_func_start sub_8026264
-sub_8026264: ; 8026264
+sub_8026264: @ 8026264
 	push {r4,lr}
 	ldr r3, =0x02022c98
 	ldr r1, [r3]
@@ -56126,7 +56126,7 @@ _080262BA:
 	thumb_func_end sub_8026264
 
 	thumb_func_start sub_80262C0
-sub_80262C0: ; 80262C0
+sub_80262C0: @ 80262C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -56177,7 +56177,7 @@ _0802630C:
 	thumb_func_end sub_80262C0
 
 	thumb_func_start sub_8026324
-sub_8026324: ; 8026324
+sub_8026324: @ 8026324
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -56564,7 +56564,7 @@ _08026614:
 	thumb_func_end sub_8026324
 
 	thumb_func_start sub_8026634
-sub_8026634: ; 8026634
+sub_8026634: @ 8026634
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -56680,7 +56680,7 @@ _0802670C:
 	thumb_func_end sub_8026634
 
 	thumb_func_start sub_802671C
-sub_802671C: ; 802671C
+sub_802671C: @ 802671C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -56980,7 +56980,7 @@ _08026974:
 	thumb_func_end sub_802671C
 
 	thumb_func_start sub_8026988
-sub_8026988: ; 8026988
+sub_8026988: @ 8026988
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -57107,7 +57107,7 @@ _08026A7A:
 	thumb_func_end sub_8026988
 
 	thumb_func_start sub_8026A88
-sub_8026A88: ; 8026A88
+sub_8026A88: @ 8026A88
 	push {r4-r6,lr}
 	ldr r1, =0x02022c98
 	ldr r0, [r1]
@@ -57141,7 +57141,7 @@ _08026ABA:
 	thumb_func_end sub_8026A88
 
 	thumb_func_start sub_8026AC8
-sub_8026AC8: ; 8026AC8
+sub_8026AC8: @ 8026AC8
 	push {r4,r5,lr}
 	ldr r0, =0x02022c98
 	ldr r0, [r0]
@@ -57167,7 +57167,7 @@ _08026AEA:
 	thumb_func_end sub_8026AC8
 
 	thumb_func_start sub_8026AF4
-sub_8026AF4: ; 8026AF4
+sub_8026AF4: @ 8026AF4
 	push {lr}
 	bl sub_8026988
 	ldr r0, =0x02022c98
@@ -57193,7 +57193,7 @@ _08026B14:
 	thumb_func_end sub_8026AF4
 
 	thumb_func_start sub_8026B28
-sub_8026B28: ; 8026B28
+sub_8026B28: @ 8026B28
 	push {lr}
 	bl sub_8026988
 	ldr r0, =0x02022c98
@@ -57219,7 +57219,7 @@ _08026B48:
 	thumb_func_end sub_8026B28
 
 	thumb_func_start sub_8026B5C
-sub_8026B5C: ; 8026B5C
+sub_8026B5C: @ 8026B5C
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -57272,7 +57272,7 @@ _08026BB4:
 	thumb_func_end sub_8026B5C
 
 	thumb_func_start sub_8026BB8
-sub_8026BB8: ; 8026BB8
+sub_8026BB8: @ 8026BB8
 	push {r4-r6,lr}
 	ldr r1, =0x02022c98
 	ldr r0, [r1]
@@ -57335,7 +57335,7 @@ _08026C20:
 	thumb_func_end sub_8026BB8
 
 	thumb_func_start sub_8026C28
-sub_8026C28: ; 8026C28
+sub_8026C28: @ 8026C28
 	push {r4,lr}
 	movs r1, 0
 	ldr r4, =0x02022c98
@@ -57359,7 +57359,7 @@ _08026C34:
 	thumb_func_end sub_8026C28
 
 	thumb_func_start sub_8026C50
-sub_8026C50: ; 8026C50
+sub_8026C50: @ 8026C50
 	push {r4,lr}
 	ldr r3, =0x02022c98
 	ldr r1, [r3]
@@ -57395,7 +57395,7 @@ _08026C8A:
 	thumb_func_end sub_8026C50
 
 	thumb_func_start sub_8026C90
-sub_8026C90: ; 8026C90
+sub_8026C90: @ 8026C90
 	push {r4-r6,lr}
 	ldr r4, =0x02022c98
 	ldr r1, [r4]
@@ -57468,7 +57468,7 @@ _08026D16:
 	thumb_func_end sub_8026C90
 
 	thumb_func_start sub_8026D1C
-sub_8026D1C: ; 8026D1C
+sub_8026D1C: @ 8026D1C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -57523,7 +57523,7 @@ _08026D76:
 	thumb_func_end sub_8026D1C
 
 	thumb_func_start sub_8026D8C
-sub_8026D8C: ; 8026D8C
+sub_8026D8C: @ 8026D8C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =gUnknown_082F4648
@@ -57542,7 +57542,7 @@ sub_8026D8C: ; 8026D8C
 	thumb_func_end sub_8026D8C
 
 	thumb_func_start sub_8026DB0
-sub_8026DB0: ; 8026DB0
+sub_8026DB0: @ 8026DB0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -57641,7 +57641,7 @@ _08026E5A:
 	thumb_func_end sub_8026DB0
 
 	thumb_func_start sub_8026E70
-sub_8026E70: ; 8026E70
+sub_8026E70: @ 8026E70
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -57706,7 +57706,7 @@ _08026EE4:
 	thumb_func_end sub_8026E70
 
 	thumb_func_start sub_8026EEC
-sub_8026EEC: ; 8026EEC
+sub_8026EEC: @ 8026EEC
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -57736,7 +57736,7 @@ _08026F14:
 	thumb_func_end sub_8026EEC
 
 	thumb_func_start sub_8026F1C
-sub_8026F1C: ; 8026F1C
+sub_8026F1C: @ 8026F1C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -58118,7 +58118,7 @@ _0802722C:
 	thumb_func_end sub_8026F1C
 
 	thumb_func_start sub_8027234
-sub_8027234: ; 8027234
+sub_8027234: @ 8027234
 	push {r4,r5,lr}
 	adds r1, r0, 0
 	ldr r4, =0x02022c98
@@ -58179,7 +58179,7 @@ _0802729E:
 	thumb_func_end sub_8027234
 
 	thumb_func_start sub_80272A4
-sub_80272A4: ; 80272A4
+sub_80272A4: @ 80272A4
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r2, =0x02022c98
@@ -58217,7 +58217,7 @@ _080272DC:
 	thumb_func_end sub_80272A4
 
 	thumb_func_start sub_80272E8
-sub_80272E8: ; 80272E8
+sub_80272E8: @ 80272E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -58341,7 +58341,7 @@ _08027310:
 	thumb_func_end sub_80272E8
 
 	thumb_func_start sub_80273F0
-sub_80273F0: ; 80273F0
+sub_80273F0: @ 80273F0
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r0, =0x02022c98
@@ -58396,7 +58396,7 @@ _08027436:
 	thumb_func_end sub_80273F0
 
 	thumb_func_start sub_802745C
-sub_802745C: ; 802745C
+sub_802745C: @ 802745C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -58429,7 +58429,7 @@ _0802748E:
 	thumb_func_end sub_802745C
 
 	thumb_func_start sub_802749C
-sub_802749C: ; 802749C
+sub_802749C: @ 802749C
 	push {r4-r6,lr}
 	ldr r5, =0x02022c98
 	ldr r0, [r5]
@@ -58485,7 +58485,7 @@ _080274FE:
 	thumb_func_end sub_802749C
 
 	thumb_func_start sub_8027518
-sub_8027518: ; 8027518
+sub_8027518: @ 8027518
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -58519,7 +58519,7 @@ _0802752C:
 	thumb_func_end sub_8027518
 
 	thumb_func_start sub_8027554
-sub_8027554: ; 8027554
+sub_8027554: @ 8027554
 	push {r4,lr}
 	ldr r4, =0x02022c98
 	ldr r3, [r4]
@@ -58608,7 +58608,7 @@ _08027600:
 	thumb_func_end sub_8027554
 
 	thumb_func_start sub_8027608
-sub_8027608: ; 8027608
+sub_8027608: @ 8027608
 	ldr r0, =0x02022c98
 	ldr r1, [r0]
 	adds r0, r1, 0
@@ -58627,7 +58627,7 @@ sub_8027608: ; 8027608
 	thumb_func_end sub_8027608
 
 	thumb_func_start sub_802762C
-sub_802762C: ; 802762C
+sub_802762C: @ 802762C
 	ldr r0, =0x02022c98
 	ldr r1, [r0]
 	adds r0, r1, 0
@@ -58647,7 +58647,7 @@ sub_802762C: ; 802762C
 	thumb_func_end sub_802762C
 
 	thumb_func_start sub_8027650
-sub_8027650: ; 8027650
+sub_8027650: @ 8027650
 	ldr r0, =0x02022c98
 	ldr r0, [r0]
 	adds r0, 0x24
@@ -58657,7 +58657,7 @@ sub_8027650: ; 8027650
 	thumb_func_end sub_8027650
 
 	thumb_func_start sub_8027660
-sub_8027660: ; 8027660
+sub_8027660: @ 8027660
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -58687,7 +58687,7 @@ _08027694:
 	thumb_func_end sub_8027660
 
 	thumb_func_start sub_80276A0
-sub_80276A0: ; 80276A0
+sub_80276A0: @ 80276A0
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -58706,7 +58706,7 @@ sub_80276A0: ; 80276A0
 	thumb_func_end sub_80276A0
 
 	thumb_func_start sub_80276C0
-sub_80276C0: ; 80276C0
+sub_80276C0: @ 80276C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -58777,7 +58777,7 @@ _08027736:
 	thumb_func_end sub_80276C0
 
 	thumb_func_start sub_8027748
-sub_8027748: ; 8027748
+sub_8027748: @ 8027748
 	push {r4-r6,lr}
 	ldr r0, =0x02022c98
 	ldr r0, [r0]
@@ -58812,7 +58812,7 @@ _08027776:
 	thumb_func_end sub_8027748
 
 	thumb_func_start sub_802778C
-sub_802778C: ; 802778C
+sub_802778C: @ 802778C
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r1, =0x02022c98
@@ -58852,7 +58852,7 @@ _080277C4:
 	thumb_func_end sub_802778C
 
 	thumb_func_start sub_80277D0
-sub_80277D0: ; 80277D0
+sub_80277D0: @ 80277D0
 	push {r4-r7,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -58922,7 +58922,7 @@ _08027838:
 	thumb_func_end sub_80277D0
 
 	thumb_func_start sub_802784C
-sub_802784C: ; 802784C
+sub_802784C: @ 802784C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -59041,7 +59041,7 @@ _08027916:
 	thumb_func_end sub_802784C
 
 	thumb_func_start sub_802793C
-sub_802793C: ; 802793C
+sub_802793C: @ 802793C
 	lsls r1, 24
 	ldr r2, =0x02022c98
 	ldr r2, [r2]
@@ -59058,7 +59058,7 @@ sub_802793C: ; 802793C
 	thumb_func_end sub_802793C
 
 	thumb_func_start sub_802795C
-sub_802795C: ; 802795C
+sub_802795C: @ 802795C
 	push {r4-r7,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -59117,7 +59117,7 @@ _080279B0:
 	thumb_func_end sub_802795C
 
 	thumb_func_start sub_80279C8
-sub_80279C8: ; 80279C8
+sub_80279C8: @ 80279C8
 	push {r4-r6,lr}
 	ldr r0, =0x02022c98
 	ldr r0, [r0]
@@ -59166,7 +59166,7 @@ _08027A22:
 	thumb_func_end sub_80279C8
 
 	thumb_func_start sub_8027A28
-sub_8027A28: ; 8027A28
+sub_8027A28: @ 8027A28
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -59179,7 +59179,7 @@ _08027A34:
 	thumb_func_end sub_8027A28
 
 	thumb_func_start sub_8027A38
-sub_8027A38: ; 8027A38
+sub_8027A38: @ 8027A38
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -59192,7 +59192,7 @@ _08027A44:
 	thumb_func_end sub_8027A38
 
 	thumb_func_start sub_8027A48
-sub_8027A48: ; 8027A48
+sub_8027A48: @ 8027A48
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02022c98
@@ -59205,7 +59205,7 @@ sub_8027A48: ; 8027A48
 	thumb_func_end sub_8027A48
 
 	thumb_func_start sub_8027A5C
-sub_8027A5C: ; 8027A5C
+sub_8027A5C: @ 8027A5C
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x020375f0
@@ -59244,7 +59244,7 @@ _08027AA0:
 	thumb_func_end sub_8027A5C
 
 	thumb_func_start sub_8027AAC
-sub_8027AAC: ; 8027AAC
+sub_8027AAC: @ 8027AAC
 	push {r4,lr}
 	ldr r4, =sub_8027ACC
 	adds r0, r4, 0
@@ -59260,7 +59260,7 @@ sub_8027AAC: ; 8027AAC
 	thumb_func_end sub_8027AAC
 
 	thumb_func_start sub_8027ACC
-sub_8027ACC: ; 8027ACC
+sub_8027ACC: @ 8027ACC
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -59395,7 +59395,7 @@ _08027BE2:
 	thumb_func_end sub_8027ACC
 
 	thumb_func_start sub_8027BEC
-sub_8027BEC: ; 8027BEC
+sub_8027BEC: @ 8027BEC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -59527,7 +59527,7 @@ _08027C76:
 	thumb_func_end sub_8027BEC
 
 	thumb_func_start sub_8027D20
-sub_8027D20: ; 8027D20
+sub_8027D20: @ 8027D20
 	push {lr}
 	bl sub_8009FCC
 	ldr r1, =0x02022c98
@@ -59540,7 +59540,7 @@ sub_8027D20: ; 8027D20
 	thumb_func_end sub_8027D20
 
 	thumb_func_start sub_8027D38
-sub_8027D38: ; 8027D38
+sub_8027D38: @ 8027D38
 	push {r4-r7,lr}
 	ldr r0, =0x02022c98
 	ldr r0, [r0]
@@ -59617,7 +59617,7 @@ _08027DB2:
 	thumb_func_end sub_8027D38
 
 	thumb_func_start sub_8027DD0
-sub_8027DD0: ; 8027DD0
+sub_8027DD0: @ 8027DD0
 	push {lr}
 	sub sp, 0x8
 	ldr r3, =0xffffff00
@@ -59641,7 +59641,7 @@ sub_8027DD0: ; 8027DD0
 	thumb_func_end sub_8027DD0
 
 	thumb_func_start sub_8027DFC
-sub_8027DFC: ; 8027DFC
+sub_8027DFC: @ 8027DFC
 	push {lr}
 	adds r2, r0, 0
 	ldr r3, =0x03003090
@@ -59671,7 +59671,7 @@ _08027E2A:
 	thumb_func_end sub_8027DFC
 
 	thumb_func_start sub_8027E30
-sub_8027E30: ; 8027E30
+sub_8027E30: @ 8027E30
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -60084,7 +60084,7 @@ sub_8027E30: ; 8027E30
 	thumb_func_end sub_8027E30
 
 	thumb_func_start sub_8028164
-sub_8028164: ; 8028164
+sub_8028164: @ 8028164
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -60285,7 +60285,7 @@ _080282DE:
 	thumb_func_end sub_8028164
 
 	thumb_func_start sub_80282EC
-sub_80282EC: ; 80282EC
+sub_80282EC: @ 80282EC
 	push {lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -60309,7 +60309,7 @@ sub_80282EC: ; 80282EC
 	thumb_func_end sub_80282EC
 
 	thumb_func_start sub_8028318
-sub_8028318: ; 8028318
+sub_8028318: @ 8028318
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -60343,7 +60343,7 @@ _0802834A:
 	thumb_func_end sub_8028318
 
 	thumb_func_start sub_8028350
-sub_8028350: ; 8028350
+sub_8028350: @ 8028350
 	push {lr}
 	sub sp, 0x8
 	ldr r2, =0xffffff00
@@ -60362,7 +60362,7 @@ sub_8028350: ; 8028350
 	thumb_func_end sub_8028350
 
 	thumb_func_start sub_8028374
-sub_8028374: ; 8028374
+sub_8028374: @ 8028374
 	push {lr}
 	adds r2, r0, 0
 	ldr r3, =0x03003090
@@ -60392,7 +60392,7 @@ _080283A2:
 	thumb_func_end sub_8028374
 
 	thumb_func_start sub_80283A8
-sub_80283A8: ; 80283A8
+sub_80283A8: @ 80283A8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	movs r5, 0xC0
@@ -60434,7 +60434,7 @@ _080283E8:
 	thumb_func_end sub_80283A8
 
 	thumb_func_start sub_8028408
-sub_8028408: ; 8028408
+sub_8028408: @ 8028408
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -60503,7 +60503,7 @@ sub_8028408: ; 8028408
 	thumb_func_end sub_8028408
 
 	thumb_func_start sub_80284A8
-sub_80284A8: ; 80284A8
+sub_80284A8: @ 80284A8
 	push {lr}
 	movs r2, 0x2E
 	ldrsh r1, [r0, r2]
@@ -60525,7 +60525,7 @@ _080284C6:
 	thumb_func_end sub_80284A8
 
 	thumb_func_start sub_80284CC
-sub_80284CC: ; 80284CC
+sub_80284CC: @ 80284CC
 	push {lr}
 	bl link_get_multiplayer_id
 	ldr r1, =0x02022c9c
@@ -60552,7 +60552,7 @@ sub_80284CC: ; 80284CC
 	thumb_func_end sub_80284CC
 
 	thumb_func_start sub_8028504
-sub_8028504: ; 8028504
+sub_8028504: @ 8028504
 	push {lr}
 	bl link_get_multiplayer_id
 	ldr r1, =0x02022c9c
@@ -60579,7 +60579,7 @@ sub_8028504: ; 8028504
 	thumb_func_end sub_8028504
 
 	thumb_func_start sub_802853C
-sub_802853C: ; 802853C
+sub_802853C: @ 802853C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -60641,7 +60641,7 @@ _080285A2:
 	thumb_func_end sub_802853C
 
 	thumb_func_start sub_80285AC
-sub_80285AC: ; 80285AC
+sub_80285AC: @ 80285AC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x30]
@@ -60695,7 +60695,7 @@ _080285FE:
 	thumb_func_end sub_80285AC
 
 	thumb_func_start sub_8028614
-sub_8028614: ; 8028614
+sub_8028614: @ 8028614
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -60730,7 +60730,7 @@ _08028646:
 	thumb_func_end sub_8028614
 
 	thumb_func_start sub_8028654
-sub_8028654: ; 8028654
+sub_8028654: @ 8028654
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -60759,7 +60759,7 @@ sub_8028654: ; 8028654
 	thumb_func_end sub_8028654
 
 	thumb_func_start sub_802868C
-sub_802868C: ; 802868C
+sub_802868C: @ 802868C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -60784,7 +60784,7 @@ _080286AE:
 	thumb_func_end sub_802868C
 
 	thumb_func_start sub_80286B4
-sub_80286B4: ; 80286B4
+sub_80286B4: @ 80286B4
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -60806,12 +60806,12 @@ sub_80286B4: ; 80286B4
 	thumb_func_end sub_80286B4
 
 	thumb_func_start nullsub_15
-nullsub_15: ; 80286E0
+nullsub_15: @ 80286E0
 	bx lr
 	thumb_func_end nullsub_15
 
 	thumb_func_start sub_80286E4
-sub_80286E4: ; 80286E4
+sub_80286E4: @ 80286E4
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r0, =0x02020630
@@ -60853,7 +60853,7 @@ _080286F0:
 	thumb_func_end sub_80286E4
 
 	thumb_func_start sub_8028734
-sub_8028734: ; 8028734
+sub_8028734: @ 8028734
 	push {r4-r6,lr}
 	sub sp, 0x28
 	movs r4, 0xC0
@@ -60932,7 +60932,7 @@ _080287C4:
 	thumb_func_end sub_8028734
 
 	thumb_func_start sub_80287E4
-sub_80287E4: ; 80287E4
+sub_80287E4: @ 80287E4
 	push {r4,r5,lr}
 	movs r4, 0
 _080287E8:
@@ -60967,7 +60967,7 @@ _08028806:
 	thumb_func_end sub_80287E4
 
 	thumb_func_start sub_8028828
-sub_8028828: ; 8028828
+sub_8028828: @ 8028828
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -61057,7 +61057,7 @@ _080288C6:
 	thumb_func_end sub_8028828
 
 	thumb_func_start sub_80288D4
-sub_80288D4: ; 80288D4
+sub_80288D4: @ 80288D4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -61190,7 +61190,7 @@ _080289DA:
 	thumb_func_end sub_80288D4
 
 	thumb_func_start sub_80289E8
-sub_80289E8: ; 80289E8
+sub_80289E8: @ 80289E8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -61230,7 +61230,7 @@ _080289FE:
 	thumb_func_end sub_80289E8
 
 	thumb_func_start sub_8028A34
-sub_8028A34: ; 8028A34
+sub_8028A34: @ 8028A34
 	push {r4,r5,lr}
 	sub sp, 0x10
 	movs r5, 0x90
@@ -61268,7 +61268,7 @@ _08028A6A:
 	thumb_func_end sub_8028A34
 
 	thumb_func_start sub_8028A88
-sub_8028A88: ; 8028A88
+sub_8028A88: @ 8028A88
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -61380,7 +61380,7 @@ _08028B40:
 	thumb_func_end sub_8028A88
 
 	thumb_func_start sub_8028B80
-sub_8028B80: ; 8028B80
+sub_8028B80: @ 8028B80
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x02022cb8
@@ -61439,7 +61439,7 @@ _08028BD2:
 	thumb_func_end sub_8028B80
 
 	thumb_func_start sub_8028BF8
-sub_8028BF8: ; 8028BF8
+sub_8028BF8: @ 8028BF8
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -61468,7 +61468,7 @@ sub_8028BF8: ; 8028BF8
 	thumb_func_end sub_8028BF8
 
 	thumb_func_start sub_8028C30
-sub_8028C30: ; 8028C30
+sub_8028C30: @ 8028C30
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -61507,7 +61507,7 @@ _08028C46:
 	thumb_func_end sub_8028C30
 
 	thumb_func_start sub_8028C7C
-sub_8028C7C: ; 8028C7C
+sub_8028C7C: @ 8028C7C
 	lsls r0, 24
 	lsls r1, 24
 	ldr r3, =0x02020630
@@ -61527,7 +61527,7 @@ sub_8028C7C: ; 8028C7C
 	thumb_func_end sub_8028C7C
 
 	thumb_func_start sub_8028CA4
-sub_8028CA4: ; 8028CA4
+sub_8028CA4: @ 8028CA4
 	push {lr}
 	lsls r0, 16
 	lsls r1, 24
@@ -61549,7 +61549,7 @@ sub_8028CA4: ; 8028CA4
 	thumb_func_end sub_8028CA4
 
 	thumb_func_start sub_8028CD0
-sub_8028CD0: ; 8028CD0
+sub_8028CD0: @ 8028CD0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02020630
@@ -61569,7 +61569,7 @@ sub_8028CD0: ; 8028CD0
 	thumb_func_end sub_8028CD0
 
 	thumb_func_start sub_8028CF4
-sub_8028CF4: ; 8028CF4
+sub_8028CF4: @ 8028CF4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r0, 0x42
@@ -61613,7 +61613,7 @@ _08028D36:
 	thumb_func_end sub_8028CF4
 
 	thumb_func_start sub_8028D44
-sub_8028D44: ; 8028D44
+sub_8028D44: @ 8028D44
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -61694,7 +61694,7 @@ _08028DD2:
 	thumb_func_end sub_8028D44
 
 	thumb_func_start sub_8028DFC
-sub_8028DFC: ; 8028DFC
+sub_8028DFC: @ 8028DFC
 	push {r4-r7,lr}
 	movs r3, 0
 	ldr r0, =0x02022cb0
@@ -61734,7 +61734,7 @@ _08028E0C:
 	thumb_func_end sub_8028DFC
 
 	thumb_func_start sub_8028E4C
-sub_8028E4C: ; 8028E4C
+sub_8028E4C: @ 8028E4C
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x02022cb0
@@ -61763,7 +61763,7 @@ _08028E56:
 	thumb_func_end sub_8028E4C
 
 	thumb_func_start sub_8028E84
-sub_8028E84: ; 8028E84
+sub_8028E84: @ 8028E84
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x02022cb0
@@ -61797,7 +61797,7 @@ _08028EA4:
 	thumb_func_end sub_8028E84
 
 	thumb_func_start sub_8028EC8
-sub_8028EC8: ; 8028EC8
+sub_8028EC8: @ 8028EC8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -61836,7 +61836,7 @@ _08028EDE:
 	thumb_func_end sub_8028EC8
 
 	thumb_func_start sub_8028F14
-sub_8028F14: ; 8028F14
+sub_8028F14: @ 8028F14
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -61940,7 +61940,7 @@ _08028FC6:
 	thumb_func_end sub_8028F14
 
 	thumb_func_start sub_8028FCC
-sub_8028FCC: ; 8028FCC
+sub_8028FCC: @ 8028FCC
 	push {r4,lr}
 	movs r4, 0
 _08028FD0:
@@ -61963,7 +61963,7 @@ _08028FD0:
 	thumb_func_end sub_8028FCC
 
 	thumb_func_start sub_8028FF8
-sub_8028FF8: ; 8028FF8
+sub_8028FF8: @ 8028FF8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -61988,7 +61988,7 @@ sub_8028FF8: ; 8028FF8
 	thumb_func_end sub_8028FF8
 
 	thumb_func_start sub_802902C
-sub_802902C: ; 802902C
+sub_802902C: @ 802902C
 	push {lr}
 	movs r0, 0
 	movs r1, 0xA
@@ -61999,7 +61999,7 @@ sub_802902C: ; 802902C
 	thumb_func_end sub_802902C
 
 	thumb_func_start sub_802903C
-sub_802903C: ; 802903C
+sub_802903C: @ 802903C
 	ldr r3, =0x02022cf8
 	ldr r0, [r3]
 	movs r2, 0xC0
@@ -62027,7 +62027,7 @@ sub_802903C: ; 802903C
 	thumb_func_end sub_802903C
 
 	thumb_func_start sub_8029074
-sub_8029074: ; 8029074
+sub_8029074: @ 8029074
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -62150,7 +62150,7 @@ sub_8029074: ; 8029074
 	thumb_func_end sub_8029074
 
 	thumb_func_start sub_8029174
-sub_8029174: ; 8029174
+sub_8029174: @ 8029174
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -62273,7 +62273,7 @@ sub_8029174: ; 8029174
 	thumb_func_end sub_8029174
 
 	thumb_func_start sub_8029274
-sub_8029274: ; 8029274
+sub_8029274: @ 8029274
 	push {r4,lr}
 	ldr r4, =0x02022cf8
 	str r0, [r4]
@@ -62312,7 +62312,7 @@ sub_8029274: ; 8029274
 	thumb_func_end sub_8029274
 
 	thumb_func_start sub_80292D4
-sub_80292D4: ; 80292D4
+sub_80292D4: @ 80292D4
 	push {lr}
 	bl FreeAllWindowBuffers
 	pop {r0}
@@ -62320,7 +62320,7 @@ sub_80292D4: ; 80292D4
 	thumb_func_end sub_80292D4
 
 	thumb_func_start sub_80292E0
-sub_80292E0: ; 80292E0
+sub_80292E0: @ 80292E0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -62349,7 +62349,7 @@ _080292FE:
 	thumb_func_end sub_80292E0
 
 	thumb_func_start sub_8029314
-sub_8029314: ; 8029314
+sub_8029314: @ 8029314
 	push {lr}
 	ldr r0, =0x02022cf8
 	ldr r0, [r0]
@@ -62368,7 +62368,7 @@ _0802932E:
 	thumb_func_end sub_8029314
 
 	thumb_func_start sub_8029338
-sub_8029338: ; 8029338
+sub_8029338: @ 8029338
 	push {lr}
 	ldr r0, =0x02022cf8
 	ldr r1, [r0]
@@ -62472,7 +62472,7 @@ _0802943A:
 	thumb_func_end sub_8029338
 
 	thumb_func_start sub_8029440
-sub_8029440: ; 8029440
+sub_8029440: @ 8029440
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -62744,7 +62744,7 @@ _0802968E:
 	thumb_func_end sub_8029440
 
 	thumb_func_start sub_80296A8
-sub_80296A8: ; 80296A8
+sub_80296A8: @ 80296A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -62978,7 +62978,7 @@ _08029860:
 	thumb_func_end sub_80296A8
 
 	thumb_func_start sub_802988C
-sub_802988C: ; 802988C
+sub_802988C: @ 802988C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -63733,7 +63733,7 @@ _08029FF8:
 	thumb_func_end sub_802988C
 
 	thumb_func_start sub_802A010
-sub_802A010: ; 802A010
+sub_802A010: @ 802A010
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -64104,7 +64104,7 @@ _0802A35E:
 	thumb_func_end sub_802A010
 
 	thumb_func_start sub_802A380
-sub_802A380: ; 802A380
+sub_802A380: @ 802A380
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r5, =0x02022cf8
@@ -64206,7 +64206,7 @@ _0802A448:
 	thumb_func_end sub_802A380
 
 	thumb_func_start sub_802A454
-sub_802A454: ; 802A454
+sub_802A454: @ 802A454
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r1, =0x02022cf8
@@ -64309,7 +64309,7 @@ _0802A52C:
 	thumb_func_end sub_802A454
 
 	thumb_func_start sub_802A534
-sub_802A534: ; 802A534
+sub_802A534: @ 802A534
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r5, =0x02022cf8
@@ -64347,7 +64347,7 @@ sub_802A534: ; 802A534
 	thumb_func_end sub_802A534
 
 	thumb_func_start sub_802A588
-sub_802A588: ; 802A588
+sub_802A588: @ 802A588
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r0, =0x02022cf8
@@ -64509,7 +64509,7 @@ _0802A6EA:
 	thumb_func_end sub_802A588
 
 	thumb_func_start unused_0
-unused_0: ; 802A6FC
+unused_0: @ 802A6FC
 	push {r4,lr}
 	ldr r4, =0x02022cf8
 	ldr r0, [r4]
@@ -64530,12 +64530,12 @@ unused_0: ; 802A6FC
 	thumb_func_end unused_0
 
 	thumb_func_start nullsub_16
-nullsub_16: ; 802A728
+nullsub_16: @ 802A728
 	bx lr
 	thumb_func_end nullsub_16
 
 	thumb_func_start sub_802A72C
-sub_802A72C: ; 802A72C
+sub_802A72C: @ 802A72C
 	push {r4,lr}
 	ldr r2, =0x02022cf8
 	ldr r1, [r2]
@@ -64558,7 +64558,7 @@ sub_802A72C: ; 802A72C
 	thumb_func_end sub_802A72C
 
 	thumb_func_start sub_802A75C
-sub_802A75C: ; 802A75C
+sub_802A75C: @ 802A75C
 	ldr r0, =0x02022cf8
 	ldr r0, [r0]
 	ldr r1, =0x00003028
@@ -64569,7 +64569,7 @@ sub_802A75C: ; 802A75C
 	thumb_func_end sub_802A75C
 
 	thumb_func_start sub_802A770
-sub_802A770: ; 802A770
+sub_802A770: @ 802A770
 	push {lr}
 	ldr r0, =0x02022cf8
 	ldr r0, [r0]
@@ -64590,7 +64590,7 @@ _0802A78E:
 	thumb_func_end sub_802A770
 
 	thumb_func_start sub_802A794
-sub_802A794: ; 802A794
+sub_802A794: @ 802A794
 	ldr r0, =0x02022cf8
 	ldr r0, [r0]
 	ldr r1, =0x00003024
@@ -64601,7 +64601,7 @@ sub_802A794: ; 802A794
 	thumb_func_end sub_802A794
 
 	thumb_func_start sub_802A7A8
-sub_802A7A8: ; 802A7A8
+sub_802A7A8: @ 802A7A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -64742,7 +64742,7 @@ _0802A7CE:
 	thumb_func_end sub_802A7A8
 
 	thumb_func_start sub_802A8E8
-sub_802A8E8: ; 802A8E8
+sub_802A8E8: @ 802A8E8
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x02022cf8
@@ -64831,7 +64831,7 @@ _0802A99A:
 	thumb_func_end sub_802A8E8
 
 	thumb_func_start sub_802A9A8
-sub_802A9A8: ; 802A9A8
+sub_802A9A8: @ 802A9A8
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -64894,7 +64894,7 @@ _0802AA42:
 	thumb_func_end sub_802A9A8
 
 	thumb_func_start sub_802AA48
-sub_802AA48: ; 802AA48
+sub_802AA48: @ 802AA48
 	push {lr}
 	bl sub_802D0AC
 	ldr r0, =0x02022cfc
@@ -64906,7 +64906,7 @@ sub_802AA48: ; 802AA48
 	thumb_func_end sub_802AA48
 
 	thumb_func_start sub_802AA60
-sub_802AA60: ; 802AA60
+sub_802AA60: @ 802AA60
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8009FCC
@@ -64933,7 +64933,7 @@ _0802AA8E:
 	thumb_func_end sub_802AA60
 
 	thumb_func_start sub_802AA94
-sub_802AA94: ; 802AA94
+sub_802AA94: @ 802AA94
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -65006,7 +65006,7 @@ _0802AB0C:
 	thumb_func_end sub_802AA94
 
 	thumb_func_start sub_802AB20
-sub_802AB20: ; 802AB20
+sub_802AB20: @ 802AB20
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -65058,7 +65058,7 @@ _0802AB32:
 	thumb_func_end sub_802AB20
 
 	thumb_func_start sub_802AB98
-sub_802AB98: ; 802AB98
+sub_802AB98: @ 802AB98
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r6, =0x02022cfc
@@ -65104,7 +65104,7 @@ _0802ABA2:
 	thumb_func_end sub_802AB98
 
 	thumb_func_start sub_802AC00
-sub_802AC00: ; 802AC00
+sub_802AC00: @ 802AC00
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -65131,7 +65131,7 @@ _0802AC28:
 	thumb_func_end sub_802AC00
 
 	thumb_func_start sub_802AC2C
-sub_802AC2C: ; 802AC2C
+sub_802AC2C: @ 802AC2C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -65153,7 +65153,7 @@ sub_802AC2C: ; 802AC2C
 	thumb_func_end sub_802AC2C
 
 	thumb_func_start sub_802AC58
-sub_802AC58: ; 802AC58
+sub_802AC58: @ 802AC58
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -65163,7 +65163,7 @@ sub_802AC58: ; 802AC58
 	thumb_func_end sub_802AC58
 
 	thumb_func_start sub_802AC6C
-sub_802AC6C: ; 802AC6C
+sub_802AC6C: @ 802AC6C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -65174,7 +65174,7 @@ sub_802AC6C: ; 802AC6C
 	thumb_func_end sub_802AC6C
 
 	thumb_func_start sub_802AC84
-sub_802AC84: ; 802AC84
+sub_802AC84: @ 802AC84
 	push {lr}
 	movs r1, 0x1
 	bl AddTask
@@ -65190,7 +65190,7 @@ sub_802AC84: ; 802AC84
 	thumb_func_end sub_802AC84
 
 	thumb_func_start sub_802ACA0
-sub_802ACA0: ; 802ACA0
+sub_802ACA0: @ 802ACA0
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -65342,7 +65342,7 @@ _0802AE08:
 	thumb_func_end sub_802ACA0
 
 	thumb_func_start sub_802AE14
-sub_802AE14: ; 802AE14
+sub_802AE14: @ 802AE14
 	push {lr}
 	adds r1, r0, 0
 	cmp r1, 0
@@ -65372,7 +65372,7 @@ _0802AE46:
 	thumb_func_end sub_802AE14
 
 	thumb_func_start sub_802AE50
-sub_802AE50: ; 802AE50
+sub_802AE50: @ 802AE50
 	push {r4-r6,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -65416,7 +65416,7 @@ _0802AE94:
 	thumb_func_end sub_802AE50
 
 	thumb_func_start sub_802AEA4
-sub_802AEA4: ; 802AEA4
+sub_802AEA4: @ 802AEA4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -65525,7 +65525,7 @@ _0802AF5C:
 	thumb_func_end sub_802AEA4
 
 	thumb_func_start sub_802AF80
-sub_802AF80: ; 802AF80
+sub_802AF80: @ 802AF80
 	push {r4,r5,lr}
 	bl sub_802AEA4
 	bl sub_802C43C
@@ -65587,7 +65587,7 @@ _0802AFEE:
 	thumb_func_end sub_802AF80
 
 	thumb_func_start sub_802B008
-sub_802B008: ; 802B008
+sub_802B008: @ 802B008
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -65616,7 +65616,7 @@ _0802B030:
 	thumb_func_end sub_802B008
 
 	thumb_func_start sub_802B044
-sub_802B044: ; 802B044
+sub_802B044: @ 802B044
 	ldr r2, =0x02022cfc
 	ldr r1, [r2]
 	adds r1, 0x70
@@ -65642,7 +65642,7 @@ sub_802B044: ; 802B044
 	thumb_func_end sub_802B044
 
 	thumb_func_start sub_802B078
-sub_802B078: ; 802B078
+sub_802B078: @ 802B078
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -65777,7 +65777,7 @@ _0802B176:
 	thumb_func_end sub_802B078
 
 	thumb_func_start sub_802B194
-sub_802B194: ; 802B194
+sub_802B194: @ 802B194
 	push {r4,lr}
 	bl sub_802B078
 	ldr r4, =0x02022cfc
@@ -65823,7 +65823,7 @@ _0802B1E0:
 	thumb_func_end sub_802B194
 
 	thumb_func_start sub_802B1FC
-sub_802B1FC: ; 802B1FC
+sub_802B1FC: @ 802B1FC
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r2, [r4]
@@ -65861,7 +65861,7 @@ _0802B236:
 	thumb_func_end sub_802B1FC
 
 	thumb_func_start sub_802B248
-sub_802B248: ; 802B248
+sub_802B248: @ 802B248
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -65906,7 +65906,7 @@ _0802B296:
 	thumb_func_end sub_802B248
 
 	thumb_func_start sub_802B29C
-sub_802B29C: ; 802B29C
+sub_802B29C: @ 802B29C
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -65938,7 +65938,7 @@ _0802B2CE:
 	thumb_func_end sub_802B29C
 
 	thumb_func_start sub_802B2D4
-sub_802B2D4: ; 802B2D4
+sub_802B2D4: @ 802B2D4
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -65978,7 +65978,7 @@ _0802B316:
 	thumb_func_end sub_802B2D4
 
 	thumb_func_start sub_802B31C
-sub_802B31C: ; 802B31C
+sub_802B31C: @ 802B31C
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66018,7 +66018,7 @@ _0802B360:
 	thumb_func_end sub_802B31C
 
 	thumb_func_start sub_802B368
-sub_802B368: ; 802B368
+sub_802B368: @ 802B368
 	push {lr}
 	bl sub_802B8CC
 	cmp r0, 0
@@ -66058,7 +66058,7 @@ _0802B3AC:
 	thumb_func_end sub_802B368
 
 	thumb_func_start sub_802B3B4
-sub_802B3B4: ; 802B3B4
+sub_802B3B4: @ 802B3B4
 	push {lr}
 	bl sub_802B8CC
 	cmp r0, 0
@@ -66078,7 +66078,7 @@ _0802B3D0:
 	thumb_func_end sub_802B3B4
 
 	thumb_func_start sub_802B3D4
-sub_802B3D4: ; 802B3D4
+sub_802B3D4: @ 802B3D4
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66161,7 +66161,7 @@ _0802B46A:
 	thumb_func_end sub_802B3D4
 
 	thumb_func_start sub_802B470
-sub_802B470: ; 802B470
+sub_802B470: @ 802B470
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66212,7 +66212,7 @@ _0802B4C6:
 	thumb_func_end sub_802B470
 
 	thumb_func_start sub_802B4CC
-sub_802B4CC: ; 802B4CC
+sub_802B4CC: @ 802B4CC
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66293,7 +66293,7 @@ _0802B562:
 	thumb_func_end sub_802B4CC
 
 	thumb_func_start sub_802B568
-sub_802B568: ; 802B568
+sub_802B568: @ 802B568
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66342,7 +66342,7 @@ _0802B5C2:
 	thumb_func_end sub_802B568
 
 	thumb_func_start sub_802B5C8
-sub_802B5C8: ; 802B5C8
+sub_802B5C8: @ 802B5C8
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -66392,7 +66392,7 @@ _0802B620:
 	thumb_func_end sub_802B5C8
 
 	thumb_func_start sub_802B628
-sub_802B628: ; 802B628
+sub_802B628: @ 802B628
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66425,7 +66425,7 @@ _0802B65C:
 	thumb_func_end sub_802B628
 
 	thumb_func_start sub_802B664
-sub_802B664: ; 802B664
+sub_802B664: @ 802B664
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -66470,7 +66470,7 @@ _0802B6B0:
 	thumb_func_end sub_802B664
 
 	thumb_func_start sub_802B6B8
-sub_802B6B8: ; 802B6B8
+sub_802B6B8: @ 802B6B8
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -66512,7 +66512,7 @@ _0802B6FE:
 	thumb_func_end sub_802B6B8
 
 	thumb_func_start sub_802B704
-sub_802B704: ; 802B704
+sub_802B704: @ 802B704
 	push {lr}
 	movs r0, 0
 	bl sub_802AE14
@@ -66529,7 +66529,7 @@ _0802B71A:
 	thumb_func_end sub_802B704
 
 	thumb_func_start sub_802B720
-sub_802B720: ; 802B720
+sub_802B720: @ 802B720
 	push {r4,lr}
 	ldr r1, =0x02022cfc
 	ldr r0, [r1]
@@ -66616,7 +66616,7 @@ _0802B7DA:
 	thumb_func_end sub_802B720
 
 	thumb_func_start sub_802B7E0
-sub_802B7E0: ; 802B7E0
+sub_802B7E0: @ 802B7E0
 	push {r4,r5,lr}
 	ldr r1, =0x02022cfc
 	ldr r0, [r1]
@@ -66722,7 +66722,7 @@ _0802B8C6:
 	thumb_func_end sub_802B7E0
 
 	thumb_func_start sub_802B8CC
-sub_802B8CC: ; 802B8CC
+sub_802B8CC: @ 802B8CC
 	push {r4,r5,lr}
 	bl sub_802BEE4
 	ldr r5, =0x02022cfc
@@ -66799,7 +66799,7 @@ _0802B95C:
 	thumb_func_end sub_802B8CC
 
 	thumb_func_start sub_802B964
-sub_802B964: ; 802B964
+sub_802B964: @ 802B964
 	push {r4-r6,lr}
 	ldr r1, =0x02022cfc
 	ldr r0, [r1]
@@ -66921,7 +66921,7 @@ _0802BA52:
 	thumb_func_end sub_802B964
 
 	thumb_func_start sub_802BA58
-sub_802BA58: ; 802BA58
+sub_802BA58: @ 802BA58
 	push {r4,lr}
 	ldr r1, =0x02022cfc
 	ldr r0, [r1]
@@ -67062,7 +67062,7 @@ _0802BB7E:
 	thumb_func_end sub_802BA58
 
 	thumb_func_start sub_802BB84
-sub_802BB84: ; 802BB84
+sub_802BB84: @ 802BB84
 	push {r4,lr}
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
@@ -67170,7 +67170,7 @@ _0802BC5A:
 	thumb_func_end sub_802BB84
 
 	thumb_func_start sub_802BC60
-sub_802BC60: ; 802BC60
+sub_802BC60: @ 802BC60
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x02022cfc
@@ -67267,7 +67267,7 @@ _0802BD26:
 	thumb_func_end sub_802BC60
 
 	thumb_func_start sub_802BD30
-sub_802BD30: ; 802BD30
+sub_802BD30: @ 802BD30
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r0, [r4]
@@ -67313,7 +67313,7 @@ _0802BD7C:
 	thumb_func_end sub_802BD30
 
 	thumb_func_start sub_802BD84
-sub_802BD84: ; 802BD84
+sub_802BD84: @ 802BD84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -67424,7 +67424,7 @@ _0802BE48:
 	thumb_func_end sub_802BD84
 
 	thumb_func_start sub_802BE60
-sub_802BE60: ; 802BE60
+sub_802BE60: @ 802BE60
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -67441,7 +67441,7 @@ sub_802BE60: ; 802BE60
 	thumb_func_end sub_802BE60
 
 	thumb_func_start sub_802BE80
-sub_802BE80: ; 802BE80
+sub_802BE80: @ 802BE80
 	ldr r0, =0x02022cfc
 	ldr r2, [r0]
 	adds r0, r2, 0
@@ -67459,7 +67459,7 @@ sub_802BE80: ; 802BE80
 	thumb_func_end sub_802BE80
 
 	thumb_func_start sub_802BEA0
-sub_802BEA0: ; 802BEA0
+sub_802BEA0: @ 802BEA0
 	push {r4,lr}
 	ldr r3, =0x02022cfc
 	ldr r0, [r3]
@@ -67493,7 +67493,7 @@ sub_802BEA0: ; 802BEA0
 	thumb_func_end sub_802BEA0
 
 	thumb_func_start sub_802BEE4
-sub_802BEE4: ; 802BEE4
+sub_802BEE4: @ 802BEE4
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -67541,7 +67541,7 @@ _0802BF34:
 	thumb_func_end sub_802BEE4
 
 	thumb_func_start sub_802BF48
-sub_802BF48: ; 802BF48
+sub_802BF48: @ 802BF48
 	push {lr}
 	ldr r0, =0x02022cfc
 	ldr r2, [r0]
@@ -67571,7 +67571,7 @@ _0802BF72:
 	thumb_func_end sub_802BF48
 
 	thumb_func_start sub_802BF7C
-sub_802BF7C: ; 802BF7C
+sub_802BF7C: @ 802BF7C
 	push {r4,lr}
 	ldr r4, =0x02022cfc
 	ldr r3, [r4]
@@ -67716,7 +67716,7 @@ _0802C08A:
 	thumb_func_end sub_802BF7C
 
 	thumb_func_start sub_802C098
-sub_802C098: ; 802C098
+sub_802C098: @ 802C098
 	ldr r0, =0x02022cfc
 	ldr r2, [r0]
 	ldr r1, [r2, 0x24]
@@ -67731,7 +67731,7 @@ sub_802C098: ; 802C098
 	thumb_func_end sub_802C098
 
 	thumb_func_start sub_802C0B8
-sub_802C0B8: ; 802C0B8
+sub_802C0B8: @ 802C0B8
 	push {lr}
 	ldr r0, =0x02022cfc
 	ldr r1, [r0]
@@ -67748,7 +67748,7 @@ sub_802C0B8: ; 802C0B8
 	thumb_func_end sub_802C0B8
 
 	thumb_func_start sub_802C0DC
-sub_802C0DC: ; 802C0DC
+sub_802C0DC: @ 802C0DC
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	ldr r0, [r0, 0x10]
@@ -67757,7 +67757,7 @@ sub_802C0DC: ; 802C0DC
 	thumb_func_end sub_802C0DC
 
 	thumb_func_start sub_802C0E8
-sub_802C0E8: ; 802C0E8
+sub_802C0E8: @ 802C0E8
 	push {r4,r5,lr}
 	ldr r5, =0x02022cfc
 	ldr r4, =0x000082f8
@@ -67780,7 +67780,7 @@ _0802C0F4:
 	thumb_func_end sub_802C0E8
 
 	thumb_func_start sub_802C114
-sub_802C114: ; 802C114
+sub_802C114: @ 802C114
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	ldr r1, =0x000083ac
@@ -67795,7 +67795,7 @@ sub_802C114: ; 802C114
 	thumb_func_end sub_802C114
 
 	thumb_func_start sub_802C130
-sub_802C130: ; 802C130
+sub_802C130: @ 802C130
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -67822,7 +67822,7 @@ _0802C15E:
 	thumb_func_end sub_802C130
 
 	thumb_func_start sub_802C164
-sub_802C164: ; 802C164
+sub_802C164: @ 802C164
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	ldr r1, =0x000083ac
@@ -67842,7 +67842,7 @@ sub_802C164: ; 802C164
 	thumb_func_end sub_802C164
 
 	thumb_func_start sub_802C18C
-sub_802C18C: ; 802C18C
+sub_802C18C: @ 802C18C
 	push {r4,lr}
 	ldr r0, =0x02022cfc
 	ldr r2, [r0]
@@ -67867,7 +67867,7 @@ sub_802C18C: ; 802C18C
 	thumb_func_end sub_802C18C
 
 	thumb_func_start sub_802C1BC
-sub_802C1BC: ; 802C1BC
+sub_802C1BC: @ 802C1BC
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	ldr r1, =0x000083ac
@@ -67883,7 +67883,7 @@ sub_802C1BC: ; 802C1BC
 	thumb_func_end sub_802C1BC
 
 	thumb_func_start sub_802C1DC
-sub_802C1DC: ; 802C1DC
+sub_802C1DC: @ 802C1DC
 	push {r4,r5,lr}
 	ldr r4, =0x02022cfc
 	ldr r1, [r4]
@@ -67928,7 +67928,7 @@ _0802C21C:
 	thumb_func_end sub_802C1DC
 
 	thumb_func_start sub_802C240
-sub_802C240: ; 802C240
+sub_802C240: @ 802C240
 	push {lr}
 	ldr r0, =0x02022cfc
 	ldr r1, [r0]
@@ -67946,7 +67946,7 @@ _0802C256:
 	thumb_func_end sub_802C240
 
 	thumb_func_start sub_802C260
-sub_802C260: ; 802C260
+sub_802C260: @ 802C260
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	adds r0, 0x46
@@ -67957,7 +67957,7 @@ sub_802C260: ; 802C260
 	thumb_func_end sub_802C260
 
 	thumb_func_start sub_802C270
-sub_802C270: ; 802C270
+sub_802C270: @ 802C270
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	adds r0, 0x46
@@ -67968,7 +67968,7 @@ sub_802C270: ; 802C270
 	thumb_func_end sub_802C270
 
 	thumb_func_start sub_802C280
-sub_802C280: ; 802C280
+sub_802C280: @ 802C280
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -68106,7 +68106,7 @@ _0802C386:
 	thumb_func_end sub_802C280
 
 	thumb_func_start sub_802C398
-sub_802C398: ; 802C398
+sub_802C398: @ 802C398
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =0x02022cfc
@@ -68184,7 +68184,7 @@ _0802C432:
 	thumb_func_end sub_802C398
 
 	thumb_func_start sub_802C43C
-sub_802C43C: ; 802C43C
+sub_802C43C: @ 802C43C
 	push {r4,r5,lr}
 	ldr r5, =0x02022cfc
 	ldr r1, [r5]
@@ -68305,7 +68305,7 @@ _0802C52A:
 	thumb_func_end sub_802C43C
 
 	thumb_func_start sub_802C538
-sub_802C538: ; 802C538
+sub_802C538: @ 802C538
 	push {r4,r5,lr}
 	ldr r5, =0x02022cfc
 	ldr r1, [r5]
@@ -68385,7 +68385,7 @@ _0802C5CA:
 	thumb_func_end sub_802C538
 
 	thumb_func_start sub_802C5DC
-sub_802C5DC: ; 802C5DC
+sub_802C5DC: @ 802C5DC
 	push {r4,lr}
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
@@ -68419,7 +68419,7 @@ _0802C608:
 	thumb_func_end sub_802C5DC
 
 	thumb_func_start sub_802C618
-sub_802C618: ; 802C618
+sub_802C618: @ 802C618
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x02022cfc
@@ -68451,7 +68451,7 @@ _0802C64A:
 	thumb_func_end sub_802C618
 
 	thumb_func_start sub_802C650
-sub_802C650: ; 802C650
+sub_802C650: @ 802C650
 	push {lr}
 	ldr r0, =0x02022cfc
 	ldr r1, [r0]
@@ -68487,7 +68487,7 @@ _0802C684:
 	thumb_func_end sub_802C650
 
 	thumb_func_start sub_802C688
-sub_802C688: ; 802C688
+sub_802C688: @ 802C688
 	push {lr}
 	ldr r1, =0x02022cfc
 	ldr r2, [r1]
@@ -68508,7 +68508,7 @@ _0802C6A2:
 	thumb_func_end sub_802C688
 
 	thumb_func_start sub_802C6B0
-sub_802C6B0: ; 802C6B0
+sub_802C6B0: @ 802C6B0
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r1, =0x02022cfc
@@ -68557,7 +68557,7 @@ _0802C702:
 	thumb_func_end sub_802C6B0
 
 	thumb_func_start sub_802C70C
-sub_802C70C: ; 802C70C
+sub_802C70C: @ 802C70C
 	push {lr}
 	movs r2, 0
 	ldr r1, =0x03005000
@@ -68580,7 +68580,7 @@ _0802C728:
 	thumb_func_end sub_802C70C
 
 	thumb_func_start sub_802C73C
-sub_802C73C: ; 802C73C
+sub_802C73C: @ 802C73C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -68619,7 +68619,7 @@ _0802C772:
 	thumb_func_end sub_802C73C
 
 	thumb_func_start sub_802C780
-sub_802C780: ; 802C780
+sub_802C780: @ 802C780
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	adds r0, 0x44
@@ -68630,7 +68630,7 @@ sub_802C780: ; 802C780
 	thumb_func_end sub_802C780
 
 	thumb_func_start sub_802C790
-sub_802C790: ; 802C790
+sub_802C790: @ 802C790
 	ldr r1, =gUnknown_082FB6EC
 	lsls r0, 2
 	adds r0, r1
@@ -68640,7 +68640,7 @@ sub_802C790: ; 802C790
 	thumb_func_end sub_802C790
 
 	thumb_func_start sub_802C7A0
-sub_802C7A0: ; 802C7A0
+sub_802C7A0: @ 802C7A0
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -68657,7 +68657,7 @@ _0802C7B2:
 	thumb_func_end sub_802C7A0
 
 	thumb_func_start sub_802C7BC
-sub_802C7BC: ; 802C7BC
+sub_802C7BC: @ 802C7BC
 	push {lr}
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
@@ -68677,7 +68677,7 @@ _0802C7DA:
 	thumb_func_end sub_802C7BC
 
 	thumb_func_start sub_802C7E0
-sub_802C7E0: ; 802C7E0
+sub_802C7E0: @ 802C7E0
 	push {r4,lr}
 	bl sub_802C818
 	adds r4, r0, 0
@@ -68698,7 +68698,7 @@ sub_802C7E0: ; 802C7E0
 	thumb_func_end sub_802C7E0
 
 	thumb_func_start sub_802C808
-sub_802C808: ; 802C808
+sub_802C808: @ 802C808
 	lsls r0, 16
 	lsrs r3, r0, 28
 	strh r3, [r2]
@@ -68709,7 +68709,7 @@ sub_802C808: ; 802C808
 	thumb_func_end sub_802C808
 
 	thumb_func_start sub_802C818
-sub_802C818: ; 802C818
+sub_802C818: @ 802C818
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -68726,7 +68726,7 @@ sub_802C818: ; 802C818
 	thumb_func_end sub_802C818
 
 	thumb_func_start sub_802C838
-sub_802C838: ; 802C838
+sub_802C838: @ 802C838
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r4, 0
@@ -68763,7 +68763,7 @@ _0802C874:
 	thumb_func_end sub_802C838
 
 	thumb_func_start sub_802C880
-sub_802C880: ; 802C880
+sub_802C880: @ 802C880
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -68791,7 +68791,7 @@ _0802C8A4:
 	thumb_func_end sub_802C880
 
 	thumb_func_start sub_802C8AC
-sub_802C8AC: ; 802C8AC
+sub_802C8AC: @ 802C8AC
 	push {lr}
 	bl sub_8009FCC
 	lsls r0, 24
@@ -68801,7 +68801,7 @@ sub_802C8AC: ; 802C8AC
 	thumb_func_end sub_802C8AC
 
 	thumb_func_start sub_802C8BC
-sub_802C8BC: ; 802C8BC
+sub_802C8BC: @ 802C8BC
 	ldr r0, =0x02022cfc
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x6]
@@ -68810,7 +68810,7 @@ sub_802C8BC: ; 802C8BC
 	thumb_func_end sub_802C8BC
 
 	thumb_func_start sub_802C8C8
-sub_802C8C8: ; 802C8C8
+sub_802C8C8: @ 802C8C8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02022cfc
@@ -68826,7 +68826,7 @@ sub_802C8C8: ; 802C8C8
 	thumb_func_end sub_802C8C8
 
 	thumb_func_start sub_802C8E8
-sub_802C8E8: ; 802C8E8
+sub_802C8E8: @ 802C8E8
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -68844,7 +68844,7 @@ sub_802C8E8: ; 802C8E8
 	thumb_func_end sub_802C8E8
 
 	thumb_func_start sub_802C908
-sub_802C908: ; 802C908
+sub_802C908: @ 802C908
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -68858,7 +68858,7 @@ sub_802C908: ; 802C908
 	thumb_func_end sub_802C908
 
 	thumb_func_start sub_802C920
-sub_802C920: ; 802C920
+sub_802C920: @ 802C920
 	push {r4,r5,lr}
 	movs r5, 0
 _0802C924:
@@ -68899,7 +68899,7 @@ _0802C966:
 	thumb_func_end sub_802C920
 
 	thumb_func_start sub_802C974
-sub_802C974: ; 802C974
+sub_802C974: @ 802C974
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r4, 0
@@ -68933,7 +68933,7 @@ _0802C98E:
 	thumb_func_end sub_802C974
 
 	thumb_func_start sub_802C9BC
-sub_802C9BC: ; 802C9BC
+sub_802C9BC: @ 802C9BC
 	push {lr}
 	movs r2, 0
 	movs r1, 0x7
@@ -68949,7 +68949,7 @@ _0802C9C4:
 	thumb_func_end sub_802C9BC
 
 	thumb_func_start sub_802C9D4
-sub_802C9D4: ; 802C9D4
+sub_802C9D4: @ 802C9D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -69094,7 +69094,7 @@ _0802CB00:
 	thumb_func_end sub_802C9D4
 
 	thumb_func_start sub_802CB14
-sub_802CB14: ; 802CB14
+sub_802CB14: @ 802CB14
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r6, r1, 2
@@ -69141,7 +69141,7 @@ sub_802CB14: ; 802CB14
 	thumb_func_end sub_802CB14
 
 	thumb_func_start sub_802CB7C
-sub_802CB7C: ; 802CB7C
+sub_802CB7C: @ 802CB7C
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -69207,7 +69207,7 @@ _0802CBE6:
 	thumb_func_end sub_802CB7C
 
 	thumb_func_start sub_802CBF0
-sub_802CBF0: ; 802CBF0
+sub_802CBF0: @ 802CBF0
 	push {lr}
 	lsls r1, 2
 	ldr r2, =0x000081a8
@@ -69226,7 +69226,7 @@ sub_802CBF0: ; 802CBF0
 	thumb_func_end sub_802CBF0
 
 	thumb_func_start sub_802CC18
-sub_802CC18: ; 802CC18
+sub_802CC18: @ 802CC18
 	push {lr}
 	movs r2, 0
 	lsls r1, 2
@@ -69247,7 +69247,7 @@ _0802CC30:
 	thumb_func_end sub_802CC18
 
 	thumb_func_start sub_802CC40
-sub_802CC40: ; 802CC40
+sub_802CC40: @ 802CC40
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -69288,7 +69288,7 @@ _0802CC7C:
 	thumb_func_end sub_802CC40
 
 	thumb_func_start sub_802CC88
-sub_802CC88: ; 802CC88
+sub_802CC88: @ 802CC88
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 2
@@ -69307,7 +69307,7 @@ sub_802CC88: ; 802CC88
 	thumb_func_end sub_802CC88
 
 	thumb_func_start sub_802CCB0
-sub_802CCB0: ; 802CCB0
+sub_802CCB0: @ 802CCB0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	bl sub_802C8AC
@@ -69351,7 +69351,7 @@ _0802CCF4:
 	thumb_func_end sub_802CCB0
 
 	thumb_func_start sub_802CD08
-sub_802CD08: ; 802CD08
+sub_802CD08: @ 802CD08
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -69381,7 +69381,7 @@ _0802CD36:
 	thumb_func_end sub_802CD08
 
 	thumb_func_start sub_802CD3C
-sub_802CD3C: ; 802CD3C
+sub_802CD3C: @ 802CD3C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_802C8AC
@@ -69411,7 +69411,7 @@ _0802CD66:
 	thumb_func_end sub_802CD3C
 
 	thumb_func_start sub_802CD70
-sub_802CD70: ; 802CD70
+sub_802CD70: @ 802CD70
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 2
@@ -69430,7 +69430,7 @@ sub_802CD70: ; 802CD70
 	thumb_func_end sub_802CD70
 
 	thumb_func_start sub_802CD98
-sub_802CD98: ; 802CD98
+sub_802CD98: @ 802CD98
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_802C8AC
@@ -69464,7 +69464,7 @@ _0802CDCE:
 	thumb_func_end sub_802CD98
 
 	thumb_func_start sub_802CDD4
-sub_802CDD4: ; 802CDD4
+sub_802CDD4: @ 802CDD4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x2E
@@ -69527,7 +69527,7 @@ _0802CE3C:
 	thumb_func_end sub_802CDD4
 
 	thumb_func_start sub_802CE48
-sub_802CE48: ; 802CE48
+sub_802CE48: @ 802CE48
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r3, 24
@@ -69567,7 +69567,7 @@ _0802CE88:
 	thumb_func_end sub_802CE48
 
 	thumb_func_start sub_802CE9C
-sub_802CE9C: ; 802CE9C
+sub_802CE9C: @ 802CE9C
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	movs r5, 0
@@ -69651,7 +69651,7 @@ _0802CEE8:
 	thumb_func_end sub_802CE9C
 
 	thumb_func_start sub_802CF50
-sub_802CF50: ; 802CF50
+sub_802CF50: @ 802CF50
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -69776,7 +69776,7 @@ _0802CFE8:
 	thumb_func_end sub_802CF50
 
 	thumb_func_start sub_802D044
-sub_802D044: ; 802D044
+sub_802D044: @ 802D044
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -69796,7 +69796,7 @@ sub_802D044: ; 802D044
 	thumb_func_end sub_802D044
 
 	thumb_func_start sub_802D068
-sub_802D068: ; 802D068
+sub_802D068: @ 802D068
 	push {lr}
 	bl sub_802EB84
 	pop {r1}
@@ -69804,7 +69804,7 @@ sub_802D068: ; 802D068
 	thumb_func_end sub_802D068
 
 	thumb_func_start sub_802D074
-sub_802D074: ; 802D074
+sub_802D074: @ 802D074
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	str r0, [r4]
@@ -69827,7 +69827,7 @@ sub_802D074: ; 802D074
 	thumb_func_end sub_802D074
 
 	thumb_func_start sub_802D0AC
-sub_802D0AC: ; 802D0AC
+sub_802D0AC: @ 802D0AC
 	push {lr}
 	bl FreeAllWindowBuffers
 	bl sub_8034CC8
@@ -69836,7 +69836,7 @@ sub_802D0AC: ; 802D0AC
 	thumb_func_end sub_802D0AC
 
 	thumb_func_start sub_802D0BC
-sub_802D0BC: ; 802D0BC
+sub_802D0BC: @ 802D0BC
 	movs r1, 0
 	strh r1, [r0, 0x4]
 	str r1, [r0]
@@ -69846,7 +69846,7 @@ sub_802D0BC: ; 802D0BC
 	thumb_func_end sub_802D0BC
 
 	thumb_func_start sub_802D0C8
-sub_802D0C8: ; 802D0C8
+sub_802D0C8: @ 802D0C8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -69869,7 +69869,7 @@ _0802D0DC:
 	thumb_func_end sub_802D0C8
 
 	thumb_func_start sub_802D0F0
-sub_802D0F0: ; 802D0F0
+sub_802D0F0: @ 802D0F0
 	ldr r0, =0x02022d00
 	ldr r0, [r0]
 	ldr r1, [r0]
@@ -69883,7 +69883,7 @@ sub_802D0F0: ; 802D0F0
 	thumb_func_end sub_802D0F0
 
 	thumb_func_start sub_802D108
-sub_802D108: ; 802D108
+sub_802D108: @ 802D108
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r4, =0x02022d00
@@ -69902,7 +69902,7 @@ sub_802D108: ; 802D108
 	thumb_func_end sub_802D108
 
 	thumb_func_start sub_802D12C
-sub_802D12C: ; 802D12C
+sub_802D12C: @ 802D12C
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -69922,7 +69922,7 @@ _0802D148:
 	thumb_func_end sub_802D12C
 
 	thumb_func_start sub_802D150
-sub_802D150: ; 802D150
+sub_802D150: @ 802D150
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r6, =0x02022d00
@@ -70076,7 +70076,7 @@ _0802D2DA:
 	thumb_func_end sub_802D150
 
 	thumb_func_start sub_802D2E4
-sub_802D2E4: ; 802D2E4
+sub_802D2E4: @ 802D2E4
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r0, [r4]
@@ -70133,7 +70133,7 @@ _0802D34A:
 	thumb_func_end sub_802D2E4
 
 	thumb_func_start sub_802D350
-sub_802D350: ; 802D350
+sub_802D350: @ 802D350
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r0, [r4]
@@ -70190,7 +70190,7 @@ _0802D3B6:
 	thumb_func_end sub_802D350
 
 	thumb_func_start sub_802D3BC
-sub_802D3BC: ; 802D3BC
+sub_802D3BC: @ 802D3BC
 	push {r4,r5,lr}
 	bl sub_802C8AC
 	lsls r0, 16
@@ -70261,7 +70261,7 @@ _0802D43E:
 	thumb_func_end sub_802D3BC
 
 	thumb_func_start sub_802D448
-sub_802D448: ; 802D448
+sub_802D448: @ 802D448
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x02022d00
@@ -70345,7 +70345,7 @@ _0802D4EC:
 	thumb_func_end sub_802D448
 
 	thumb_func_start sub_802D4F4
-sub_802D4F4: ; 802D4F4
+sub_802D4F4: @ 802D4F4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x02022d00
@@ -70425,7 +70425,7 @@ _0802D58E:
 	thumb_func_end sub_802D4F4
 
 	thumb_func_start sub_802D598
-sub_802D598: ; 802D598
+sub_802D598: @ 802D598
 	push {r4,r5,lr}
 	ldr r5, =0x02022d00
 	ldr r0, [r5]
@@ -70463,7 +70463,7 @@ _0802D5DE:
 	thumb_func_end sub_802D598
 
 	thumb_func_start sub_802D5E4
-sub_802D5E4: ; 802D5E4
+sub_802D5E4: @ 802D5E4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x02022d00
@@ -70543,7 +70543,7 @@ _0802D67E:
 	thumb_func_end sub_802D5E4
 
 	thumb_func_start sub_802D688
-sub_802D688: ; 802D688
+sub_802D688: @ 802D688
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x02022d00
@@ -70623,7 +70623,7 @@ _0802D722:
 	thumb_func_end sub_802D688
 
 	thumb_func_start sub_802D72C
-sub_802D72C: ; 802D72C
+sub_802D72C: @ 802D72C
 	push {r4,r5,lr}
 	ldr r5, =0x02022d00
 	ldr r0, [r5]
@@ -70654,7 +70654,7 @@ _0802D75E:
 	thumb_func_end sub_802D72C
 
 	thumb_func_start sub_802D764
-sub_802D764: ; 802D764
+sub_802D764: @ 802D764
 	push {lr}
 	ldr r1, =0x02022d00
 	ldr r0, [r1]
@@ -70674,7 +70674,7 @@ sub_802D764: ; 802D764
 	thumb_func_end sub_802D764
 
 	thumb_func_start sub_802D788
-sub_802D788: ; 802D788
+sub_802D788: @ 802D788
 	push {r4,lr}
 	ldr r0, =0x02022d00
 	ldr r2, [r0]
@@ -70728,7 +70728,7 @@ _0802D7E0:
 	thumb_func_end sub_802D788
 
 	thumb_func_start sub_802D7E8
-sub_802D7E8: ; 802D7E8
+sub_802D7E8: @ 802D7E8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -70795,7 +70795,7 @@ sub_802D7E8: ; 802D7E8
 	thumb_func_end sub_802D7E8
 
 	thumb_func_start sub_802D884
-sub_802D884: ; 802D884
+sub_802D884: @ 802D884
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 16
@@ -70848,7 +70848,7 @@ sub_802D884: ; 802D884
 	thumb_func_end sub_802D884
 
 	thumb_func_start sub_802D8FC
-sub_802D8FC: ; 802D8FC
+sub_802D8FC: @ 802D8FC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 16
@@ -70901,7 +70901,7 @@ sub_802D8FC: ; 802D8FC
 	thumb_func_end sub_802D8FC
 
 	thumb_func_start sub_802D974
-sub_802D974: ; 802D974
+sub_802D974: @ 802D974
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r0, [r4]
@@ -70983,7 +70983,7 @@ _0802DA0E:
 	thumb_func_end sub_802D974
 
 	thumb_func_start sub_802DA14
-sub_802DA14: ; 802DA14
+sub_802DA14: @ 802DA14
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r0, [r4]
@@ -71008,7 +71008,7 @@ _0802DA38:
 	thumb_func_end sub_802DA14
 
 	thumb_func_start sub_802DA44
-sub_802DA44: ; 802DA44
+sub_802DA44: @ 802DA44
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r1, [r4]
@@ -71049,7 +71049,7 @@ _0802DA84:
 	thumb_func_end sub_802DA44
 
 	thumb_func_start sub_802DA8C
-sub_802DA8C: ; 802DA8C
+sub_802DA8C: @ 802DA8C
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -71059,7 +71059,7 @@ sub_802DA8C: ; 802DA8C
 	thumb_func_end sub_802DA8C
 
 	thumb_func_start sub_802DA9C
-sub_802DA9C: ; 802DA9C
+sub_802DA9C: @ 802DA9C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r6, =0xffffff00
@@ -71113,7 +71113,7 @@ sub_802DA9C: ; 802DA9C
 	thumb_func_end sub_802DA9C
 
 	thumb_func_start sub_802DB18
-sub_802DB18: ; 802DB18
+sub_802DB18: @ 802DB18
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r3, r2, 0
@@ -71164,7 +71164,7 @@ sub_802DB18: ; 802DB18
 	thumb_func_end sub_802DB18
 
 	thumb_func_start sub_802DB8C
-sub_802DB8C: ; 802DB8C
+sub_802DB8C: @ 802DB8C
 	push {r4,lr}
 	sub sp, 0x10
 	ldr r1, =gUnknown_082FE1DC
@@ -71210,7 +71210,7 @@ sub_802DB8C: ; 802DB8C
 	thumb_func_end sub_802DB8C
 
 	thumb_func_start sub_802DBF8
-sub_802DBF8: ; 802DBF8
+sub_802DBF8: @ 802DBF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -71274,7 +71274,7 @@ _0802DC62:
 	thumb_func_end sub_802DBF8
 
 	thumb_func_start sub_802DC80
-sub_802DC80: ; 802DC80
+sub_802DC80: @ 802DC80
 	ldr r2, =0x02022d00
 	ldr r2, [r2]
 	lsls r0, 2
@@ -71288,7 +71288,7 @@ sub_802DC80: ; 802DC80
 	thumb_func_end sub_802DC80
 
 	thumb_func_start sub_802DC9C
-sub_802DC9C: ; 802DC9C
+sub_802DC9C: @ 802DC9C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02022d00
@@ -71311,7 +71311,7 @@ sub_802DC9C: ; 802DC9C
 	thumb_func_end sub_802DC9C
 
 	thumb_func_start sub_802DCCC
-sub_802DCCC: ; 802DCCC
+sub_802DCCC: @ 802DCCC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -71344,7 +71344,7 @@ _0802DCEA:
 	thumb_func_end sub_802DCCC
 
 	thumb_func_start sub_802DD08
-sub_802DD08: ; 802DD08
+sub_802DD08: @ 802DD08
 	push {r4,lr}
 	sub sp, 0x10
 	mov r1, sp
@@ -71387,7 +71387,7 @@ sub_802DD08: ; 802DD08
 	thumb_func_end sub_802DD08
 
 	thumb_func_start sub_802DD64
-sub_802DD64: ; 802DD64
+sub_802DD64: @ 802DD64
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0
@@ -71397,7 +71397,7 @@ sub_802DD64: ; 802DD64
 	thumb_func_end sub_802DD64
 
 	thumb_func_start sub_802DD74
-sub_802DD74: ; 802DD74
+sub_802DD74: @ 802DD74
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -71409,7 +71409,7 @@ sub_802DD74: ; 802DD74
 	thumb_func_end sub_802DD74
 
 	thumb_func_start sub_802DD88
-sub_802DD88: ; 802DD88
+sub_802DD88: @ 802DD88
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -71423,7 +71423,7 @@ sub_802DD88: ; 802DD88
 	thumb_func_end sub_802DD88
 
 	thumb_func_start sub_802DDA0
-sub_802DDA0: ; 802DDA0
+sub_802DDA0: @ 802DDA0
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -71437,7 +71437,7 @@ sub_802DDA0: ; 802DDA0
 	thumb_func_end sub_802DDA0
 
 	thumb_func_start sub_802DDB8
-sub_802DDB8: ; 802DDB8
+sub_802DDB8: @ 802DDB8
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02022d00
@@ -71449,7 +71449,7 @@ sub_802DDB8: ; 802DDB8
 	thumb_func_end sub_802DDB8
 
 	thumb_func_start sub_802DDCC
-sub_802DDCC: ; 802DDCC
+sub_802DDCC: @ 802DDCC
 	push {lr}
 	ldr r0, =0x02022d00
 	ldr r0, [r0]
@@ -71460,7 +71460,7 @@ sub_802DDCC: ; 802DDCC
 	thumb_func_end sub_802DDCC
 
 	thumb_func_start sub_802DDE0
-sub_802DDE0: ; 802DDE0
+sub_802DDE0: @ 802DDE0
 	push {lr}
 	ldr r0, =0x02022d00
 	ldr r0, [r0]
@@ -71471,7 +71471,7 @@ sub_802DDE0: ; 802DDE0
 	thumb_func_end sub_802DDE0
 
 	thumb_func_start sub_802DDF4
-sub_802DDF4: ; 802DDF4
+sub_802DDF4: @ 802DDF4
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02022d00
@@ -71483,7 +71483,7 @@ sub_802DDF4: ; 802DDF4
 	thumb_func_end sub_802DDF4
 
 	thumb_func_start sub_802DE08
-sub_802DE08: ; 802DE08
+sub_802DE08: @ 802DE08
 	push {lr}
 	ldr r0, =0x02022d00
 	ldr r0, [r0]
@@ -71494,7 +71494,7 @@ sub_802DE08: ; 802DE08
 	thumb_func_end sub_802DE08
 
 	thumb_func_start sub_802DE1C
-sub_802DE1C: ; 802DE1C
+sub_802DE1C: @ 802DE1C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	bl sub_802C8AC
@@ -71576,7 +71576,7 @@ _0802DEAC:
 	thumb_func_end sub_802DE1C
 
 	thumb_func_start sub_802DED8
-sub_802DED8: ; 802DED8
+sub_802DED8: @ 802DED8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -71648,7 +71648,7 @@ sub_802DED8: ; 802DED8
 	thumb_func_end sub_802DED8
 
 	thumb_func_start sub_802DF70
-sub_802DF70: ; 802DF70
+sub_802DF70: @ 802DF70
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl sub_802C8AC
@@ -71702,7 +71702,7 @@ _0802DFCC:
 	thumb_func_end sub_802DF70
 
 	thumb_func_start sub_802DFD4
-sub_802DFD4: ; 802DFD4
+sub_802DFD4: @ 802DFD4
 	push {r4,r5,lr}
 	bl sub_802C8AC
 	lsls r0, 16
@@ -71731,7 +71731,7 @@ _0802DFFA:
 	thumb_func_end sub_802DFD4
 
 	thumb_func_start sub_802E00C
-sub_802E00C: ; 802E00C
+sub_802E00C: @ 802E00C
 	push {r4,lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -71765,7 +71765,7 @@ sub_802E00C: ; 802E00C
 	thumb_func_end sub_802E00C
 
 	thumb_func_start sub_802E058
-sub_802E058: ; 802E058
+sub_802E058: @ 802E058
 	push {r4,lr}
 	ldr r4, =0x02022d00
 	ldr r0, [r4]
@@ -71797,7 +71797,7 @@ _0802E08A:
 	thumb_func_end sub_802E058
 
 	thumb_func_start sub_802E090
-sub_802E090: ; 802E090
+sub_802E090: @ 802E090
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -71813,7 +71813,7 @@ _0802E0A4:
 	thumb_func_end sub_802E090
 
 	thumb_func_start sub_802E0AC
-sub_802E0AC: ; 802E0AC
+sub_802E0AC: @ 802E0AC
 	push {lr}
 	sub sp, 0xC
 	mov r2, sp
@@ -71833,7 +71833,7 @@ sub_802E0AC: ; 802E0AC
 	thumb_func_end sub_802E0AC
 
 	thumb_func_start sub_802E0D0
-sub_802E0D0: ; 802E0D0
+sub_802E0D0: @ 802E0D0
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -71878,7 +71878,7 @@ _0802E118:
 	thumb_func_end sub_802E0D0
 
 	thumb_func_start sub_802E120
-sub_802E120: ; 802E120
+sub_802E120: @ 802E120
 	push {lr}
 	sub sp, 0xC
 	mov r2, sp
@@ -71893,7 +71893,7 @@ sub_802E120: ; 802E120
 	thumb_func_end sub_802E120
 
 	thumb_func_start sub_802E138
-sub_802E138: ; 802E138
+sub_802E138: @ 802E138
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -71959,7 +71959,7 @@ sub_802E138: ; 802E138
 	thumb_func_end sub_802E138
 
 	thumb_func_start sub_802E1BC
-sub_802E1BC: ; 802E1BC
+sub_802E1BC: @ 802E1BC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -72022,7 +72022,7 @@ _0802E22A:
 	thumb_func_end sub_802E1BC
 
 	thumb_func_start sub_802E234
-sub_802E234: ; 802E234
+sub_802E234: @ 802E234
 	push {r4,lr}
 	sub sp, 0xC
 	mov r4, sp
@@ -72048,7 +72048,7 @@ sub_802E234: ; 802E234
 	thumb_func_end sub_802E234
 
 	thumb_func_start sub_802E264
-sub_802E264: ; 802E264
+sub_802E264: @ 802E264
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -72105,7 +72105,7 @@ _0802E2C6:
 	thumb_func_end sub_802E264
 
 	thumb_func_start sub_802E2D0
-sub_802E2D0: ; 802E2D0
+sub_802E2D0: @ 802E2D0
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -72154,7 +72154,7 @@ _0802E322:
 	thumb_func_end sub_802E2D0
 
 	thumb_func_start sub_802E32C
-sub_802E32C: ; 802E32C
+sub_802E32C: @ 802E32C
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	movs r1, 0xFE
@@ -72165,7 +72165,7 @@ sub_802E32C: ; 802E32C
 	thumb_func_end sub_802E32C
 
 	thumb_func_start sub_802E33C
-sub_802E33C: ; 802E33C
+sub_802E33C: @ 802E33C
 	push {lr}
 	bl sub_802E32C
 	movs r1, 0
@@ -72180,7 +72180,7 @@ sub_802E33C: ; 802E33C
 	thumb_func_end sub_802E33C
 
 	thumb_func_start sub_802E354
-sub_802E354: ; 802E354
+sub_802E354: @ 802E354
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -72225,7 +72225,7 @@ _0802E398:
 	thumb_func_end sub_802E354
 
 	thumb_func_start sub_802E3A8
-sub_802E3A8: ; 802E3A8
+sub_802E3A8: @ 802E3A8
 	push {lr}
 	bl sub_802E32C
 	adds r2, r0, 0
@@ -72242,7 +72242,7 @@ _0802E3BC:
 	thumb_func_end sub_802E3A8
 
 	thumb_func_start sub_802E3C4
-sub_802E3C4: ; 802E3C4
+sub_802E3C4: @ 802E3C4
 	push {r4,lr}
 	ldr r4, =sub_802E3E4
 	adds r0, r4, 0
@@ -72258,7 +72258,7 @@ sub_802E3C4: ; 802E3C4
 	thumb_func_end sub_802E3C4
 
 	thumb_func_start sub_802E3E4
-sub_802E3E4: ; 802E3E4
+sub_802E3E4: @ 802E3E4
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -72392,7 +72392,7 @@ _0802E4F6:
 	thumb_func_end sub_802E3E4
 
 	thumb_func_start sub_802E500
-sub_802E500: ; 802E500
+sub_802E500: @ 802E500
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -72521,7 +72521,7 @@ _0802E58A:
 	thumb_func_end sub_802E500
 
 	thumb_func_start sub_802E620
-sub_802E620: ; 802E620
+sub_802E620: @ 802E620
 	push {lr}
 	adds r1, r0, 0
 	b _0802E628
@@ -72541,7 +72541,7 @@ _0802E636:
 	thumb_func_end sub_802E620
 
 	thumb_func_start sub_802E63C
-sub_802E63C: ; 802E63C
+sub_802E63C: @ 802E63C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -72575,7 +72575,7 @@ sub_802E63C: ; 802E63C
 	thumb_func_end sub_802E63C
 
 	thumb_func_start sub_802E688
-sub_802E688: ; 802E688
+sub_802E688: @ 802E688
 	push {lr}
 	ldr r0, =sub_802E6D0
 	bl get_task_id_by_function
@@ -72601,7 +72601,7 @@ _0802E6B6:
 	thumb_func_end sub_802E688
 
 	thumb_func_start sub_802E6BC
-sub_802E6BC: ; 802E6BC
+sub_802E6BC: @ 802E6BC
 	push {lr}
 	ldr r0, =sub_802E6D0
 	bl is_function_an_active_task
@@ -72613,7 +72613,7 @@ sub_802E6BC: ; 802E6BC
 	thumb_func_end sub_802E6BC
 
 	thumb_func_start sub_802E6D0
-sub_802E6D0: ; 802E6D0
+sub_802E6D0: @ 802E6D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -72682,7 +72682,7 @@ _0802E752:
 	thumb_func_end sub_802E6D0
 
 	thumb_func_start sub_802E75C
-sub_802E75C: ; 802E75C
+sub_802E75C: @ 802E75C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -72791,7 +72791,7 @@ _0802E820:
 	thumb_func_end sub_802E75C
 
 	thumb_func_start sub_802E83C
-sub_802E83C: ; 802E83C
+sub_802E83C: @ 802E83C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -72856,7 +72856,7 @@ sub_802E83C: ; 802E83C
 	thumb_func_end sub_802E83C
 
 	thumb_func_start sub_802E8C8
-sub_802E8C8: ; 802E8C8
+sub_802E8C8: @ 802E8C8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -72908,7 +72908,7 @@ _0802E8FC:
 	thumb_func_end sub_802E8C8
 
 	thumb_func_start sub_802E938
-sub_802E938: ; 802E938
+sub_802E938: @ 802E938
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r0, 0x34
@@ -73044,7 +73044,7 @@ _0802EA4A:
 	thumb_func_end sub_802E938
 
 	thumb_func_start sub_802EA50
-sub_802EA50: ; 802EA50
+sub_802EA50: @ 802EA50
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -73089,7 +73089,7 @@ sub_802EA50: ; 802EA50
 	thumb_func_end sub_802EA50
 
 	thumb_func_start sub_802EAB0
-sub_802EAB0: ; 802EAB0
+sub_802EAB0: @ 802EAB0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -73143,7 +73143,7 @@ _0802EB1A:
 	thumb_func_end sub_802EAB0
 
 	thumb_func_start sub_802EB24
-sub_802EB24: ; 802EB24
+sub_802EB24: @ 802EB24
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -73191,7 +73191,7 @@ sub_802EB24: ; 802EB24
 	thumb_func_end sub_802EB24
 
 	thumb_func_start sub_802EB84
-sub_802EB84: ; 802EB84
+sub_802EB84: @ 802EB84
 	push {lr}
 	ldr r0, =sub_802EB98
 	bl is_function_an_active_task
@@ -73203,7 +73203,7 @@ sub_802EB84: ; 802EB84
 	thumb_func_end sub_802EB84
 
 	thumb_func_start sub_802EB98
-sub_802EB98: ; 802EB98
+sub_802EB98: @ 802EB98
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -73323,7 +73323,7 @@ _0802EC8A:
 	thumb_func_end sub_802EB98
 
 	thumb_func_start sub_802EC98
-sub_802EC98: ; 802EC98
+sub_802EC98: @ 802EC98
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -73483,7 +73483,7 @@ _0802EDC6:
 	thumb_func_end sub_802EC98
 
 	thumb_func_start sub_802EDCC
-sub_802EDCC: ; 802EDCC
+sub_802EDCC: @ 802EDCC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -73532,7 +73532,7 @@ sub_802EDCC: ; 802EDCC
 	thumb_func_end sub_802EDCC
 
 	thumb_func_start sub_802EE30
-sub_802EE30: ; 802EE30
+sub_802EE30: @ 802EE30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -73556,7 +73556,7 @@ _0802EE4E:
 	thumb_func_end sub_802EE30
 
 	thumb_func_start sub_802EE5C
-sub_802EE5C: ; 802EE5C
+sub_802EE5C: @ 802EE5C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -73680,7 +73680,7 @@ _0802EF46:
 	thumb_func_end sub_802EE5C
 
 	thumb_func_start sub_802EF50
-sub_802EF50: ; 802EF50
+sub_802EF50: @ 802EF50
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r1, 16
@@ -73719,7 +73719,7 @@ sub_802EF50: ; 802EF50
 	thumb_func_end sub_802EF50
 
 	thumb_func_start sub_802EFA8
-sub_802EFA8: ; 802EFA8
+sub_802EFA8: @ 802EFA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -73763,7 +73763,7 @@ sub_802EFA8: ; 802EFA8
 	thumb_func_end sub_802EFA8
 
 	thumb_func_start sub_802EFFC
-sub_802EFFC: ; 802EFFC
+sub_802EFFC: @ 802EFFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -73866,7 +73866,7 @@ sub_802EFFC: ; 802EFFC
 	.include "asm/main_menu.s"
 
 	thumb_func_start battle_wireless_setup_if_required_maybe
-battle_wireless_setup_if_required_maybe: ; 8032654
+battle_wireless_setup_if_required_maybe: @ 8032654
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -73897,7 +73897,7 @@ _08032686:
 	thumb_func_end battle_wireless_setup_if_required_maybe
 
 	thumb_func_start sub_803269C
-sub_803269C: ; 803269C
+sub_803269C: @ 803269C
 	push {r4-r7,lr}
 	sub sp, 0x14
 	ldr r0, =0x03005d04
@@ -73975,7 +73975,7 @@ _08032728:
 	thumb_func_end sub_803269C
 
 	thumb_func_start sub_8032768
-sub_8032768: ; 8032768
+sub_8032768: @ 8032768
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -74068,7 +74068,7 @@ _08032804:
 	thumb_func_end sub_8032768
 
 	thumb_func_start b_setup_bx
-b_setup_bx: ; 8032824
+b_setup_bx: @ 8032824
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -74593,7 +74593,7 @@ _08032CB2:
 	thumb_func_end b_setup_bx
 
 	thumb_func_start b_setup_bx_link
-b_setup_bx_link: ; 8032CC0
+b_setup_bx_link: @ 8032CC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -74981,7 +74981,7 @@ _0803303C:
 	thumb_func_end b_setup_bx_link
 
 	thumb_func_start sub_8033050
-sub_8033050: ; 8033050
+sub_8033050: @ 8033050
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -75148,7 +75148,7 @@ _0803319C:
 	thumb_func_end sub_8033050
 
 	thumb_func_start dp01_prepare_buffer
-dp01_prepare_buffer: ; 80331B8
+dp01_prepare_buffer: @ 80331B8
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -75218,7 +75218,7 @@ _08033236:
 	thumb_func_end dp01_prepare_buffer
 
 	thumb_func_start sub_8033244
-sub_8033244: ; 8033244
+sub_8033244: @ 8033244
 	push {r4-r6,lr}
 	ldr r0, =task00_wireless_something
 	movs r1, 0
@@ -75296,7 +75296,7 @@ sub_8033244: ; 8033244
 	thumb_func_end sub_8033244
 
 	thumb_func_start dp01_prepare_buffer_wireless_probably
-dp01_prepare_buffer_wireless_probably: ; 80332F4
+dp01_prepare_buffer_wireless_probably: @ 80332F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -75480,7 +75480,7 @@ _08033434:
 	thumb_func_end dp01_prepare_buffer_wireless_probably
 
 	thumb_func_start task00_wireless_something
-task00_wireless_something: ; 8033474
+task00_wireless_something: @ 8033474
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -75711,7 +75711,7 @@ _08033640:
 	thumb_func_end task00_wireless_something
 
 	thumb_func_start sub_8033648
-sub_8033648: ; 8033648
+sub_8033648: @ 8033648
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -75840,7 +75840,7 @@ _08033738:
 	thumb_func_end sub_8033648
 
 	thumb_func_start sub_803375C
-sub_803375C: ; 803375C
+sub_803375C: @ 803375C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -75995,7 +75995,7 @@ _0803389C:
 	thumb_func_end sub_803375C
 
 	thumb_func_start dp01_build_cmdbuf_x00_a_b_0
-dp01_build_cmdbuf_x00_a_b_0: ; 80338B4
+dp01_build_cmdbuf_x00_a_b_0: @ 80338B4
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76015,7 +76015,7 @@ dp01_build_cmdbuf_x00_a_b_0: ; 80338B4
 	thumb_func_end dp01_build_cmdbuf_x00_a_b_0
 
 	thumb_func_start dp01_build_cmdbuf_x01_a_b_0
-dp01_build_cmdbuf_x01_a_b_0: ; 80338D8
+dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -76036,7 +76036,7 @@ dp01_build_cmdbuf_x01_a_b_0: ; 80338D8
 	thumb_func_end dp01_build_cmdbuf_x01_a_b_0
 
 	thumb_func_start dp01_build_cmdbuf_x02_a_b_varargs
-dp01_build_cmdbuf_x02_a_b_varargs: ; 8033900
+dp01_build_cmdbuf_x02_a_b_varargs: @ 8033900
 	push {r4-r6,lr}
 	ldr r4, [sp, 0x10]
 	lsls r0, 24
@@ -76072,7 +76072,7 @@ _0803392E:
 	thumb_func_end dp01_build_cmdbuf_x02_a_b_varargs
 
 	thumb_func_start sub_8033940
-sub_8033940: ; 8033940
+sub_8033940: @ 8033940
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -76108,7 +76108,7 @@ _0803396C:
 	thumb_func_end sub_8033940
 
 	thumb_func_start dp01_build_cmdbuf_x04_4_4_4
-dp01_build_cmdbuf_x04_4_4_4: ; 8033980
+dp01_build_cmdbuf_x04_4_4_4: @ 8033980
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76125,7 +76125,7 @@ dp01_build_cmdbuf_x04_4_4_4: ; 8033980
 	thumb_func_end dp01_build_cmdbuf_x04_4_4_4
 
 	thumb_func_start dp01_build_cmdbuf_x05_a_b_c
-dp01_build_cmdbuf_x05_a_b_c: ; 80339A0
+dp01_build_cmdbuf_x05_a_b_c: @ 80339A0
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76145,7 +76145,7 @@ dp01_build_cmdbuf_x05_a_b_c: ; 80339A0
 	thumb_func_end dp01_build_cmdbuf_x05_a_b_c
 
 	thumb_func_start dp01_build_cmdbuf_x06_a
-dp01_build_cmdbuf_x06_a: ; 80339C4
+dp01_build_cmdbuf_x06_a: @ 80339C4
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -76162,7 +76162,7 @@ dp01_build_cmdbuf_x06_a: ; 80339C4
 	thumb_func_end dp01_build_cmdbuf_x06_a
 
 	thumb_func_start dp01_build_cmdbuf_x07_7_7_7
-dp01_build_cmdbuf_x07_7_7_7: ; 80339E4
+dp01_build_cmdbuf_x07_7_7_7: @ 80339E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76180,7 +76180,7 @@ dp01_build_cmdbuf_x07_7_7_7: ; 80339E4
 	thumb_func_end dp01_build_cmdbuf_x07_7_7_7
 
 	thumb_func_start dp01_build_cmdbuf_x08_8_8_8
-dp01_build_cmdbuf_x08_8_8_8: ; 8033A04
+dp01_build_cmdbuf_x08_8_8_8: @ 8033A04
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76198,7 +76198,7 @@ dp01_build_cmdbuf_x08_8_8_8: ; 8033A04
 	thumb_func_end dp01_build_cmdbuf_x08_8_8_8
 
 	thumb_func_start dp01_build_cmdbuf_x09_9_9_9
-dp01_build_cmdbuf_x09_9_9_9: ; 8033A24
+dp01_build_cmdbuf_x09_9_9_9: @ 8033A24
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76216,7 +76216,7 @@ dp01_build_cmdbuf_x09_9_9_9: ; 8033A24
 	thumb_func_end dp01_build_cmdbuf_x09_9_9_9
 
 	thumb_func_start dp01_build_cmdbuf_x0A_A_A_A
-dp01_build_cmdbuf_x0A_A_A_A: ; 8033A44
+dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76234,7 +76234,7 @@ dp01_build_cmdbuf_x0A_A_A_A: ; 8033A44
 	thumb_func_end dp01_build_cmdbuf_x0A_A_A_A
 
 	thumb_func_start dp01_build_cmdbuf_x0B_B_B_B
-dp01_build_cmdbuf_x0B_B_B_B: ; 8033A64
+dp01_build_cmdbuf_x0B_B_B_B: @ 8033A64
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76252,7 +76252,7 @@ dp01_build_cmdbuf_x0B_B_B_B: ; 8033A64
 	thumb_func_end dp01_build_cmdbuf_x0B_B_B_B
 
 	thumb_func_start dp01_build_cmdbuf_x0C_C_C_C
-dp01_build_cmdbuf_x0C_C_C_C: ; 8033A84
+dp01_build_cmdbuf_x0C_C_C_C: @ 8033A84
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76270,7 +76270,7 @@ dp01_build_cmdbuf_x0C_C_C_C: ; 8033A84
 	thumb_func_end dp01_build_cmdbuf_x0C_C_C_C
 
 	thumb_func_start dp01_build_cmdbuf_x0D_a
-dp01_build_cmdbuf_x0D_a: ; 8033AA4
+dp01_build_cmdbuf_x0D_a: @ 8033AA4
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -76287,7 +76287,7 @@ dp01_build_cmdbuf_x0D_a: ; 8033AA4
 	thumb_func_end dp01_build_cmdbuf_x0D_a
 
 	thumb_func_start sub_8033AC4
-sub_8033AC4: ; 8033AC4
+sub_8033AC4: @ 8033AC4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -76326,7 +76326,7 @@ _08033AF2:
 	thumb_func_end sub_8033AC4
 
 	thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
-dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: ; 8033B0C
+dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -76431,7 +76431,7 @@ _08033BB6:
 	thumb_func_end dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
 
 	thumb_func_start dp01_build_cmdbuf_x10_TODO
-dp01_build_cmdbuf_x10_TODO: ; 8033BE4
+dp01_build_cmdbuf_x10_TODO: @ 8033BE4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -76548,7 +76548,7 @@ _08033C88:
 	thumb_func_end dp01_build_cmdbuf_x10_TODO
 
 	thumb_func_start dp01_build_cmdbuf_x11_TODO
-dp01_build_cmdbuf_x11_TODO: ; 8033CFC
+dp01_build_cmdbuf_x11_TODO: @ 8033CFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -76647,7 +76647,7 @@ _08033D7C:
 	thumb_func_end dp01_build_cmdbuf_x11_TODO
 
 	thumb_func_start dp01_build_cmdbuf_x12_a_bb
-dp01_build_cmdbuf_x12_a_bb: ; 8033DE4
+dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76670,7 +76670,7 @@ dp01_build_cmdbuf_x12_a_bb: ; 8033DE4
 	thumb_func_end dp01_build_cmdbuf_x12_a_bb
 
 	thumb_func_start sub_8033E10
-sub_8033E10: ; 8033E10
+sub_8033E10: @ 8033E10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76688,7 +76688,7 @@ sub_8033E10: ; 8033E10
 	thumb_func_end sub_8033E10
 
 	thumb_func_start sub_8033E30
-sub_8033E30: ; 8033E30
+sub_8033E30: @ 8033E30
 	push {r4-r6,lr}
 	adds r5, r3, 0
 	lsls r0, 24
@@ -76721,7 +76721,7 @@ _08033E4C:
 	thumb_func_end sub_8033E30
 
 	thumb_func_start sub_8033E6C
-sub_8033E6C: ; 8033E6C
+sub_8033E6C: @ 8033E6C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76749,7 +76749,7 @@ _08033E7E:
 	thumb_func_end sub_8033E6C
 
 	thumb_func_start dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
-dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f: ; 8033EA0
+dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f: @ 8033EA0
 	push {r4-r6,lr}
 	ldr r6, [sp, 0x10]
 	lsls r0, 24
@@ -76781,7 +76781,7 @@ _08033EBA:
 	thumb_func_end dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
 
 	thumb_func_start dp01_build_cmdbuf_x17_17_17_17
-dp01_build_cmdbuf_x17_17_17_17: ; 8033EDC
+dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76799,7 +76799,7 @@ dp01_build_cmdbuf_x17_17_17_17: ; 8033EDC
 	thumb_func_end dp01_build_cmdbuf_x17_17_17_17
 
 	thumb_func_start dp01_build_cmdbuf_x18_0_aa_health_bar_update
-dp01_build_cmdbuf_x18_0_aa_health_bar_update: ; 8033EFC
+dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -76828,7 +76828,7 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: ; 8033EFC
 	thumb_func_end dp01_build_cmdbuf_x18_0_aa_health_bar_update
 
 	thumb_func_start dp01_build_cmdbuf_x19_a_bb
-dp01_build_cmdbuf_x19_a_bb: ; 8033F34
+dp01_build_cmdbuf_x19_a_bb: @ 8033F34
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76856,7 +76856,7 @@ dp01_build_cmdbuf_x19_a_bb: ; 8033F34
 	thumb_func_end dp01_build_cmdbuf_x19_a_bb
 
 	thumb_func_start dp01_build_cmdbuf_x1A_aaaa_bbbb
-dp01_build_cmdbuf_x1A_aaaa_bbbb: ; 8033F68
+dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76899,7 +76899,7 @@ dp01_build_cmdbuf_x1A_aaaa_bbbb: ; 8033F68
 	thumb_func_end dp01_build_cmdbuf_x1A_aaaa_bbbb
 
 	thumb_func_start dp01_build_cmdbuf_x1B_aaaa_b
-dp01_build_cmdbuf_x1B_aaaa_b: ; 8033FBC
+dp01_build_cmdbuf_x1B_aaaa_b: @ 8033FBC
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -76930,7 +76930,7 @@ dp01_build_cmdbuf_x1B_aaaa_b: ; 8033FBC
 	thumb_func_end dp01_build_cmdbuf_x1B_aaaa_b
 
 	thumb_func_start dp01_build_cmdbuf_x1C_a
-dp01_build_cmdbuf_x1C_a: ; 8033FF8
+dp01_build_cmdbuf_x1C_a: @ 8033FF8
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -76947,7 +76947,7 @@ dp01_build_cmdbuf_x1C_a: ; 8033FF8
 	thumb_func_end dp01_build_cmdbuf_x1C_a
 
 	thumb_func_start dp01_build_cmdbuf_x1D_1D_numargs_varargs
-dp01_build_cmdbuf_x1D_1D_numargs_varargs: ; 8034018
+dp01_build_cmdbuf_x1D_1D_numargs_varargs: @ 8034018
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -76987,7 +76987,7 @@ _08034048:
 	thumb_func_end dp01_build_cmdbuf_x1D_1D_numargs_varargs
 
 	thumb_func_start sub_8034060
-sub_8034060: ; 8034060
+sub_8034060: @ 8034060
 	push {r4-r6,lr}
 	adds r4, r3, 0
 	lsls r0, 24
@@ -77042,7 +77042,7 @@ _080340B0:
 	thumb_func_end sub_8034060
 
 	thumb_func_start sub_80340C8
-sub_80340C8: ; 80340C8
+sub_80340C8: @ 80340C8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -77081,7 +77081,7 @@ _080340F6:
 	thumb_func_end sub_80340C8
 
 	thumb_func_start sub_8034110
-sub_8034110: ; 8034110
+sub_8034110: @ 8034110
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -77120,7 +77120,7 @@ _0803413E:
 	thumb_func_end sub_8034110
 
 	thumb_func_start dp01_build_cmdbuf_x21_a_bb
-dp01_build_cmdbuf_x21_a_bb: ; 8034158
+dp01_build_cmdbuf_x21_a_bb: @ 8034158
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -77143,7 +77143,7 @@ dp01_build_cmdbuf_x21_a_bb: ; 8034158
 	thumb_func_end dp01_build_cmdbuf_x21_a_bb
 
 	thumb_func_start dp01_build_cmdbuf_x22_a_three_bytes
-dp01_build_cmdbuf_x22_a_three_bytes: ; 8034184
+dp01_build_cmdbuf_x22_a_three_bytes: @ 8034184
 	push {r4,r5,lr}
 	adds r4, r2, 0
 	lsls r0, 24
@@ -77173,7 +77173,7 @@ _08034198:
 	thumb_func_end dp01_build_cmdbuf_x22_a_three_bytes
 
 	thumb_func_start dp01_build_cmdbuf_x23_aa_0
-dp01_build_cmdbuf_x23_aa_0: ; 80341BC
+dp01_build_cmdbuf_x23_aa_0: @ 80341BC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77197,7 +77197,7 @@ dp01_build_cmdbuf_x23_aa_0: ; 80341BC
 	thumb_func_end dp01_build_cmdbuf_x23_aa_0
 
 	thumb_func_start dp01_build_cmdbuf_x24_aa_0
-dp01_build_cmdbuf_x24_aa_0: ; 80341E8
+dp01_build_cmdbuf_x24_aa_0: @ 80341E8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77221,7 +77221,7 @@ dp01_build_cmdbuf_x24_aa_0: ; 80341E8
 	thumb_func_end dp01_build_cmdbuf_x24_aa_0
 
 	thumb_func_start dp01_build_cmdbuf_x25_25_25_25
-dp01_build_cmdbuf_x25_25_25_25: ; 8034214
+dp01_build_cmdbuf_x25_25_25_25: @ 8034214
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77239,7 +77239,7 @@ dp01_build_cmdbuf_x25_25_25_25: ; 8034214
 	thumb_func_end dp01_build_cmdbuf_x25_25_25_25
 
 	thumb_func_start dp01_build_cmdbuf_x26_a
-dp01_build_cmdbuf_x26_a: ; 8034234
+dp01_build_cmdbuf_x26_a: @ 8034234
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -77256,7 +77256,7 @@ dp01_build_cmdbuf_x26_a: ; 8034234
 	thumb_func_end dp01_build_cmdbuf_x26_a
 
 	thumb_func_start dp01_build_cmdbuf_x27_27_27_27
-dp01_build_cmdbuf_x27_27_27_27: ; 8034254
+dp01_build_cmdbuf_x27_27_27_27: @ 8034254
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77274,7 +77274,7 @@ dp01_build_cmdbuf_x27_27_27_27: ; 8034254
 	thumb_func_end dp01_build_cmdbuf_x27_27_27_27
 
 	thumb_func_start dp01_build_cmdbuf_x28_28_28_28
-dp01_build_cmdbuf_x28_28_28_28: ; 8034274
+dp01_build_cmdbuf_x28_28_28_28: @ 8034274
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77292,7 +77292,7 @@ dp01_build_cmdbuf_x28_28_28_28: ; 8034274
 	thumb_func_end dp01_build_cmdbuf_x28_28_28_28
 
 	thumb_func_start dp01_build_cmdbuf_x29_29_29_29
-dp01_build_cmdbuf_x29_29_29_29: ; 8034294
+dp01_build_cmdbuf_x29_29_29_29: @ 8034294
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77310,7 +77310,7 @@ dp01_build_cmdbuf_x29_29_29_29: ; 8034294
 	thumb_func_end dp01_build_cmdbuf_x29_29_29_29
 
 	thumb_func_start dp01_build_cmdbuf_x2A_2A_2A_2A
-dp01_build_cmdbuf_x2A_2A_2A_2A: ; 80342B4
+dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77328,7 +77328,7 @@ dp01_build_cmdbuf_x2A_2A_2A_2A: ; 80342B4
 	thumb_func_end dp01_build_cmdbuf_x2A_2A_2A_2A
 
 	thumb_func_start dp01_build_cmdbuf_x2B_aa_0
-dp01_build_cmdbuf_x2B_aa_0: ; 80342D4
+dp01_build_cmdbuf_x2B_aa_0: @ 80342D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77352,7 +77352,7 @@ dp01_build_cmdbuf_x2B_aa_0: ; 80342D4
 	thumb_func_end dp01_build_cmdbuf_x2B_aa_0
 
 	thumb_func_start sub_8034300
-sub_8034300: ; 8034300
+sub_8034300: @ 8034300
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77375,7 +77375,7 @@ sub_8034300: ; 8034300
 	thumb_func_end sub_8034300
 
 	thumb_func_start dp01_build_cmdbuf_x2D_2D_2D_2D
-dp01_build_cmdbuf_x2D_2D_2D_2D: ; 803432C
+dp01_build_cmdbuf_x2D_2D_2D_2D: @ 803432C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77393,7 +77393,7 @@ dp01_build_cmdbuf_x2D_2D_2D_2D: ; 803432C
 	thumb_func_end dp01_build_cmdbuf_x2D_2D_2D_2D
 
 	thumb_func_start dp01_build_cmdbuf_x2E_a
-dp01_build_cmdbuf_x2E_a: ; 803434C
+dp01_build_cmdbuf_x2E_a: @ 803434C
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -77410,7 +77410,7 @@ dp01_build_cmdbuf_x2E_a: ; 803434C
 	thumb_func_end dp01_build_cmdbuf_x2E_a
 
 	thumb_func_start dp01_build_cmdbuf_x2F_2F_2F_2F
-dp01_build_cmdbuf_x2F_2F_2F_2F: ; 803436C
+dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77428,7 +77428,7 @@ dp01_build_cmdbuf_x2F_2F_2F_2F: ; 803436C
 	thumb_func_end dp01_build_cmdbuf_x2F_2F_2F_2F
 
 	thumb_func_start dp01_build_cmdbuf_x30_TODO
-dp01_build_cmdbuf_x30_TODO: ; 803438C
+dp01_build_cmdbuf_x30_TODO: @ 803438C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -77467,7 +77467,7 @@ _080343B4:
 	thumb_func_end dp01_build_cmdbuf_x30_TODO
 
 	thumb_func_start dp01_build_cmdbuf_x31_31_31_31
-dp01_build_cmdbuf_x31_31_31_31: ; 80343D4
+dp01_build_cmdbuf_x31_31_31_31: @ 80343D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77485,7 +77485,7 @@ dp01_build_cmdbuf_x31_31_31_31: ; 80343D4
 	thumb_func_end dp01_build_cmdbuf_x31_31_31_31
 
 	thumb_func_start dp01_build_cmdbuf_x32_32_32_32
-dp01_build_cmdbuf_x32_32_32_32: ; 80343F4
+dp01_build_cmdbuf_x32_32_32_32: @ 80343F4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -77503,7 +77503,7 @@ dp01_build_cmdbuf_x32_32_32_32: ; 80343F4
 	thumb_func_end dp01_build_cmdbuf_x32_32_32_32
 
 	thumb_func_start dp01_build_cmdbuf_x33_a_33_33
-dp01_build_cmdbuf_x33_a_33_33: ; 8034414
+dp01_build_cmdbuf_x33_a_33_33: @ 8034414
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -77522,7 +77522,7 @@ dp01_build_cmdbuf_x33_a_33_33: ; 8034414
 	thumb_func_end dp01_build_cmdbuf_x33_a_33_33
 
 	thumb_func_start dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
-dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: ; 8034438
+dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -77545,7 +77545,7 @@ dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: ; 8034438
 	thumb_func_end dp01_build_cmdbuf_x34_a_bb_aka_battle_anim
 
 	thumb_func_start sub_8034464
-sub_8034464: ; 8034464
+sub_8034464: @ 8034464
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -77579,7 +77579,7 @@ _08034490:
 	thumb_func_end sub_8034464
 
 	thumb_func_start dp01_build_cmdbuf_x38_a
-dp01_build_cmdbuf_x38_a: ; 80344A8
+dp01_build_cmdbuf_x38_a: @ 80344A8
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -77596,7 +77596,7 @@ dp01_build_cmdbuf_x38_a: ; 80344A8
 	thumb_func_end dp01_build_cmdbuf_x38_a
 
 	thumb_func_start dp01_build_cmdbuf_x37_a
-dp01_build_cmdbuf_x37_a: ; 80344C8
+dp01_build_cmdbuf_x37_a: @ 80344C8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -77633,8 +77633,8 @@ dp01_build_cmdbuf_x37_a: ; 80344C8
 	thumb_func_end dp01_build_cmdbuf_x37_a
 
 	thumb_func_start LZDecompressWram
-; void LZDecompressWram(void *src, void *dest)
-LZDecompressWram: ; 8034518
+@ void LZDecompressWram(void *src, void *dest)
+LZDecompressWram: @ 8034518
 	push {lr}
 	bl LZ77UnCompWram
 	pop {r0}
@@ -77642,8 +77642,8 @@ LZDecompressWram: ; 8034518
 	thumb_func_end LZDecompressWram
 
 	thumb_func_start LZDecompressVram
-; void LZDecompressVram(void *src, void *dest)
-LZDecompressVram: ; 8034524
+@ void LZDecompressVram(void *src, void *dest)
+LZDecompressVram: @ 8034524
 	push {lr}
 	bl LZ77UnCompVram
 	pop {r0}
@@ -77651,8 +77651,8 @@ LZDecompressVram: ; 8034524
 	thumb_func_end LZDecompressVram
 
 	thumb_func_start LoadCompressedObjectPic
-; u16 LoadCompressedObjectPic(struct obj_tiles *pic)
-LoadCompressedObjectPic: ; 8034530
+@ u16 LoadCompressedObjectPic(struct obj_tiles *pic)
+LoadCompressedObjectPic: @ 8034530
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -77678,8 +77678,8 @@ LoadCompressedObjectPic: ; 8034530
 	thumb_func_end LoadCompressedObjectPic
 
 	thumb_func_start LoadCompressedObjectPicOverrideBuffer
-; void LoadCompressedObjectPicOverrideBuffer(struct obj_tiles *pic, void *tempBuffer)
-LoadCompressedObjectPicOverrideBuffer: ; 8034564
+@ void LoadCompressedObjectPicOverrideBuffer(struct obj_tiles *pic, void *tempBuffer)
+LoadCompressedObjectPicOverrideBuffer: @ 8034564
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -77701,8 +77701,8 @@ LoadCompressedObjectPicOverrideBuffer: ; 8034564
 	thumb_func_end LoadCompressedObjectPicOverrideBuffer
 
 	thumb_func_start LoadCompressedObjectPalette
-; void LoadCompressedObjectPalette(struct TaggedObjectPalette *palette)
-LoadCompressedObjectPalette: ; 803458C
+@ void LoadCompressedObjectPalette(struct TaggedObjectPalette *palette)
+LoadCompressedObjectPalette: @ 803458C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -77727,8 +77727,8 @@ LoadCompressedObjectPalette: ; 803458C
 	thumb_func_end LoadCompressedObjectPalette
 
 	thumb_func_start LoadCompressedObjectPaletteOverrideBuffer
-; void LoadCompressedObjectPaletteOverrideBuffer(struct TaggedObjectPalette *palette, void *tempBuffer)
-LoadCompressedObjectPaletteOverrideBuffer: ; 80345C0
+@ void LoadCompressedObjectPaletteOverrideBuffer(struct TaggedObjectPalette *palette, void *tempBuffer)
+LoadCompressedObjectPaletteOverrideBuffer: @ 80345C0
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -77752,8 +77752,8 @@ LoadCompressedObjectPaletteOverrideBuffer: ; 80345C0
 	thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
 
 	thumb_func_start DecompressPicFromTable
-; void DecompressPicFromTable(void **picTable, void *dest, u32 index)
-DecompressPicFromTable: ; 80345F0
+@ void DecompressPicFromTable(void **picTable, void *dest, u32 index)
+DecompressPicFromTable: @ 80345F0
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -77781,8 +77781,8 @@ _08034618:
 	thumb_func_end DecompressPicFromTable
 
 	thumb_func_start DecompressMonPic_DetectFrontOrBack
-; void DecompressMonPic_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality)
-DecompressMonPic_DetectFrontOrBack: ; 8034628
+@ void DecompressMonPic_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality)
+DecompressMonPic_DetectFrontOrBack: @ 8034628
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -77807,8 +77807,8 @@ _0803463E:
 	thumb_func_end DecompressMonPic_DetectFrontOrBack
 
 	thumb_func_start DecompressMonPic
-; void DecompressMonPic(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
-DecompressMonPic: ; 8034654
+@ void DecompressMonPic(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
+DecompressMonPic: @ 8034654
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -77904,8 +77904,8 @@ _080346F0:
 	thumb_func_end DecompressMonPic
 
 	thumb_func_start Unused_LZDecompressWramIndirect
-; void Unused_LZDecompressWramIndirect(void **src)
-Unused_LZDecompressWramIndirect: ; 8034710
+@ void Unused_LZDecompressWramIndirect(void **src)
+Unused_LZDecompressWramIndirect: @ 8034710
 	push {lr}
 	ldr r0, [r0]
 	bl LZ77UnCompWram
@@ -77914,7 +77914,7 @@ Unused_LZDecompressWramIndirect: ; 8034710
 	thumb_func_end Unused_LZDecompressWramIndirect
 
 	thumb_func_start sub_803471C
-sub_803471C: ; 803471C
+sub_803471C: @ 803471C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -78253,7 +78253,7 @@ _08034964:
 	thumb_func_end sub_803471C
 
 	thumb_func_start sub_8034974
-sub_8034974: ; 8034974
+sub_8034974: @ 8034974
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
 	lsls r0, 16
@@ -78266,8 +78266,8 @@ sub_8034974: ; 8034974
 	thumb_func_end sub_8034974
 
 	thumb_func_start LoadCompressedObjectPicUsingHeap
-; u32 LoadCompressedObjectPicUsingHeap(struct obj_tiles *pic)
-LoadCompressedObjectPicUsingHeap: ; 8034988
+@ u32 LoadCompressedObjectPicUsingHeap(struct obj_tiles *pic)
+LoadCompressedObjectPicUsingHeap: @ 8034988
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -78297,8 +78297,8 @@ LoadCompressedObjectPicUsingHeap: ; 8034988
 	thumb_func_end LoadCompressedObjectPicUsingHeap
 
 	thumb_func_start LoadCompressedObjectPaletteUsingHeap
-; u32 LoadCompressedObjectPaletteUsingHeap(struct TaggedObjectPalette *palette)
-LoadCompressedObjectPaletteUsingHeap: ; 80349C4
+@ u32 LoadCompressedObjectPaletteUsingHeap(struct TaggedObjectPalette *palette)
+LoadCompressedObjectPaletteUsingHeap: @ 80349C4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -78330,8 +78330,8 @@ LoadCompressedObjectPaletteUsingHeap: ; 80349C4
 	thumb_func_end LoadCompressedObjectPaletteUsingHeap
 
 	thumb_func_start DecompressPicFromTable_2
-; void DecompressPicFromTable_2(void **picTable, void *dest, u32 index)
-DecompressPicFromTable_2: ; 8034A08
+@ void DecompressPicFromTable_2(void **picTable, void *dest, u32 index)
+DecompressPicFromTable_2: @ 8034A08
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -78359,8 +78359,8 @@ _08034A30:
 	thumb_func_end DecompressPicFromTable_2
 
 	thumb_func_start DecompressMonPic_2
-; void DecompressMonPic_2(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
-DecompressMonPic_2: ; 8034A40
+@ void DecompressMonPic_2(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
+DecompressMonPic_2: @ 8034A40
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -78456,8 +78456,8 @@ _08034ADC:
 	thumb_func_end DecompressMonPic_2
 
 	thumb_func_start DecompressMonPic_DetectFrontOrBack_2
-; void DecompressMonPic_DetectFrontOrBack_2(void **picTable, void *dest, u32 speciesId, u32 personality)
-DecompressMonPic_DetectFrontOrBack_2: ; 8034AFC
+@ void DecompressMonPic_DetectFrontOrBack_2(void **picTable, void *dest, u32 speciesId, u32 personality)
+DecompressMonPic_DetectFrontOrBack_2: @ 8034AFC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -78482,7 +78482,7 @@ _08034B12:
 	thumb_func_end DecompressMonPic_DetectFrontOrBack_2
 
 	thumb_func_start sub_8034B28
-sub_8034B28: ; 8034B28
+sub_8034B28: @ 8034B28
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0xCE
@@ -78503,8 +78503,8 @@ _08034B4A:
 	thumb_func_end sub_8034B28
 
 	thumb_func_start DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
-; void DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality)
-DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack: ; 8034B50
+@ void DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack(void **picTable, void *dest, u32 speciesId, u32 personality)
+DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack: @ 8034B50
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -78529,8 +78529,8 @@ _08034B66:
 	thumb_func_end DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack
 
 	thumb_func_start DecompressMonPicWithoutDuplicatingDeoxysTiles
-; void DecompressMonPicWithoutDuplicatingDeoxysTiles(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
-DecompressMonPicWithoutDuplicatingDeoxysTiles: ; 8034B7C
+@ void DecompressMonPicWithoutDuplicatingDeoxysTiles(void **picTable, void *dest, u32 speciesId, u32 personality, bool8 isFrontPic)
+DecompressMonPicWithoutDuplicatingDeoxysTiles: @ 8034B7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -78623,8 +78623,8 @@ _08034C18:
 	thumb_func_end DecompressMonPicWithoutDuplicatingDeoxysTiles
 
 	thumb_func_start DuplicateDeoxysTiles
-; void DuplicateDeoxysTiles(void *pointer, u32 speciesId)
-DuplicateDeoxysTiles: ; 8034C30
+@ void DuplicateDeoxysTiles(void *pointer, u32 speciesId)
+DuplicateDeoxysTiles: @ 8034C30
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0xCD
@@ -78644,7 +78644,7 @@ _08034C4A:
 	thumb_func_end DuplicateDeoxysTiles
 
 	thumb_func_start sub_8034C54
-sub_8034C54: ; 8034C54
+sub_8034C54: @ 8034C54
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02022e10
@@ -78706,7 +78706,7 @@ _08034CC0:
 	thumb_func_end sub_8034C54
 
 	thumb_func_start sub_8034CC8
-sub_8034CC8: ; 8034CC8
+sub_8034CC8: @ 8034CC8
 	push {r4,r5,lr}
 	ldr r2, =0x02022e10
 	ldr r1, [r2]
@@ -78747,7 +78747,7 @@ _08034D08:
 	thumb_func_end sub_8034CC8
 
 	thumb_func_start sub_8034D14
-sub_8034D14: ; 8034D14
+sub_8034D14: @ 8034D14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -78986,7 +78986,7 @@ _08034EE8:
 	thumb_func_end sub_8034D14
 
 	thumb_func_start sub_8034EFC
-sub_8034EFC: ; 8034EFC
+sub_8034EFC: @ 8034EFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -79144,7 +79144,7 @@ _08034FCE:
 	thumb_func_end sub_8034EFC
 
 	thumb_func_start sub_8035044
-sub_8035044: ; 8035044
+sub_8035044: @ 8035044
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -79202,7 +79202,7 @@ _080350A8:
 	thumb_func_end sub_8035044
 
 	thumb_func_start sub_80350B0
-sub_80350B0: ; 80350B0
+sub_80350B0: @ 80350B0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -79292,7 +79292,7 @@ _08035154:
 	thumb_func_end sub_80350B0
 
 	thumb_func_start sub_8035164
-sub_8035164: ; 8035164
+sub_8035164: @ 8035164
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -79457,7 +79457,7 @@ _080352AE:
 	thumb_func_end sub_8035164
 
 	thumb_func_start sub_80352C0
-sub_80352C0: ; 80352C0
+sub_80352C0: @ 80352C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -79602,7 +79602,7 @@ _080353C6:
 	thumb_func_end sub_80352C0
 
 	thumb_func_start sub_80353DC
-sub_80353DC: ; 80353DC
+sub_80353DC: @ 80353DC
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02022e10
@@ -79684,7 +79684,7 @@ _0803546E:
 	thumb_func_end sub_80353DC
 
 	thumb_func_start sub_803547C
-sub_803547C: ; 803547C
+sub_803547C: @ 803547C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -79765,7 +79765,7 @@ _0803550C:
 	thumb_func_end sub_803547C
 
 	thumb_func_start sub_8035518
-sub_8035518: ; 8035518
+sub_8035518: @ 8035518
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -79818,7 +79818,7 @@ _0803556A:
 	thumb_func_end sub_8035518
 
 	thumb_func_start sub_8035570
-sub_8035570: ; 8035570
+sub_8035570: @ 8035570
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -79859,7 +79859,7 @@ _080355AE:
 	thumb_func_end sub_8035570
 
 	thumb_func_start sub_80355B4
-sub_80355B4: ; 80355B4
+sub_80355B4: @ 80355B4
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -79900,7 +79900,7 @@ _080355F2:
 	thumb_func_end sub_80355B4
 
 	thumb_func_start sub_80355F8
-sub_80355F8: ; 80355F8
+sub_80355F8: @ 80355F8
 	ldr r2, =gUnknown_082FF1C8
 	lsls r0, 2
 	adds r1, r0
@@ -79911,7 +79911,7 @@ sub_80355F8: ; 80355F8
 	thumb_func_end sub_80355F8
 
 	thumb_func_start sub_8035608
-sub_8035608: ; 8035608
+sub_8035608: @ 8035608
 	push {lr}
 	bl ResetAllObjectData
 	ldr r0, =gUnknown_0831AC88
@@ -79939,7 +79939,7 @@ sub_8035608: ; 8035608
 	thumb_func_end sub_8035608
 
 	thumb_func_start sub_8035648
-sub_8035648: ; 8035648
+sub_8035648: @ 8035648
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -79948,7 +79948,7 @@ sub_8035648: ; 8035648
 	thumb_func_end sub_8035648
 
 	thumb_func_start trs_config
-trs_config: ; 8035658
+trs_config: @ 8035658
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -79997,7 +79997,7 @@ _080356AA:
 	thumb_func_end trs_config
 
 	thumb_func_start c2_berry_program_update_menu
-c2_berry_program_update_menu: ; 80356D0
+c2_berry_program_update_menu: @ 80356D0
 	push {lr}
 	movs r0, 0x2
 	bl DisableInterrupts
@@ -80022,7 +80022,7 @@ c2_berry_program_update_menu: ; 80356D0
 	thumb_func_end c2_berry_program_update_menu
 
 	thumb_func_start sub_803570C
-sub_803570C: ; 803570C
+sub_803570C: @ 803570C
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0x12
@@ -80063,7 +80063,7 @@ _0803575A:
 	thumb_func_end sub_803570C
 
 	thumb_func_start load_battle_oval_graphics
-load_battle_oval_graphics: ; 8035770
+load_battle_oval_graphics: @ 8035770
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -80306,7 +80306,7 @@ _08035A8A:
 	thumb_func_end load_battle_oval_graphics
 
 	thumb_func_start sub_8035AA4
-sub_8035AA4: ; 8035AA4
+sub_8035AA4: @ 8035AA4
 	push {lr}
 	ldr r0, =gUnknown_08C00000
 	movs r1, 0xC0
@@ -80331,7 +80331,7 @@ sub_8035AA4: ; 8035AA4
 	thumb_func_end sub_8035AA4
 
 	thumb_func_start sub_8035AE4
-sub_8035AE4: ; 8035AE4
+sub_8035AE4: @ 8035AE4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -80518,7 +80518,7 @@ _08035C36:
 	thumb_func_end sub_8035AE4
 
 	thumb_func_start sub_8035C4C
-sub_8035C4C: ; 8035C4C
+sub_8035C4C: @ 8035C4C
 	push {lr}
 	ldr r0, =0x0202433a
 	ldrb r2, [r0]
@@ -80643,7 +80643,7 @@ _08035D68:
 	thumb_func_end sub_8035C4C
 
 	thumb_func_start task00_0800F6FC
-task00_0800F6FC: ; 8035D74
+task00_0800F6FC: @ 8035D74
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -81096,7 +81096,7 @@ _08036138:
 	thumb_func_end task00_0800F6FC
 
 	thumb_func_start sub_8036154
-sub_8036154: ; 8036154
+sub_8036154: @ 8036154
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -81309,7 +81309,7 @@ _080363AC:
 	thumb_func_end sub_8036154
 
 	thumb_func_start sub_80363C4
-sub_80363C4: ; 80363C4
+sub_80363C4: @ 80363C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -81701,7 +81701,7 @@ _08036758:
 	thumb_func_end sub_80363C4
 
 	thumb_func_start sub_8036760
-sub_8036760: ; 8036760
+sub_8036760: @ 8036760
 	push {lr}
 	bl saveblock_randomize_and_relocate
 	bl sub_8056F28
@@ -81750,7 +81750,7 @@ _080367D0:
 	thumb_func_end sub_8036760
 
 	thumb_func_start sub_80367D4
-sub_80367D4: ; 80367D4
+sub_80367D4: @ 80367D4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -81984,7 +81984,7 @@ _08036A10:
 	thumb_func_end sub_80367D4
 
 	thumb_func_start sub_8036A5C
-sub_8036A5C: ; 8036A5C
+sub_8036A5C: @ 8036A5C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -82097,7 +82097,7 @@ _08036AEE:
 	thumb_func_end sub_8036A5C
 
 	thumb_func_start sub_8036B44
-sub_8036B44: ; 8036B44
+sub_8036B44: @ 8036B44
 	push {r4-r7,lr}
 	ldr r0, =0x0202449c
 	ldr r5, [r0]
@@ -82193,7 +82193,7 @@ _08036C00:
 	thumb_func_end sub_8036B44
 
 	thumb_func_start berry_801017C
-berry_801017C: ; 8036C08
+berry_801017C: @ 8036C08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -82532,7 +82532,7 @@ _08036EA0:
 	thumb_func_end berry_801017C
 
 	thumb_func_start sub_8036EB8
-sub_8036EB8: ; 8036EB8
+sub_8036EB8: @ 8036EB8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -82664,7 +82664,7 @@ _08036FA0:
 	thumb_func_end sub_8036EB8
 
 	thumb_func_start sub_8036FAC
-sub_8036FAC: ; 8036FAC
+sub_8036FAC: @ 8036FAC
 	push {r4-r6,lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -83133,7 +83133,7 @@ _0803744C:
 	thumb_func_end sub_8036FAC
 
 	thumb_func_start sub_8037458
-sub_8037458: ; 8037458
+sub_8037458: @ 8037458
 	push {r4-r7,lr}
 	sub sp, 0x4
 	bl RunActiveTasks
@@ -83713,7 +83713,7 @@ _080379D6:
 	thumb_func_end sub_8037458
 
 	thumb_func_start sub_80379F8
-sub_80379F8: ; 80379F8
+sub_80379F8: @ 80379F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -83814,7 +83814,7 @@ _08037AA4:
 	thumb_func_end sub_80379F8
 
 	thumb_func_start sub_8037ADC
-sub_8037ADC: ; 8037ADC
+sub_8037ADC: @ 8037ADC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -84069,7 +84069,7 @@ _08037D0A:
 	thumb_func_end sub_8037ADC
 
 	thumb_func_start intro_end
-intro_end: ; 8037D2C
+intro_end: @ 8037D2C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -84147,7 +84147,7 @@ _08037DD6:
 	thumb_func_end intro_end
 
 	thumb_func_start sub_8037DF4
-sub_8037DF4: ; 8037DF4
+sub_8037DF4: @ 8037DF4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -84851,7 +84851,7 @@ _080383F8:
 	thumb_func_end sub_8037DF4
 
 	thumb_func_start sub_8038420
-sub_8038420: ; 8038420
+sub_8038420: @ 8038420
 	push {lr}
 	sub sp, 0x4
 	bl CallObjectCallbacks
@@ -84900,7 +84900,7 @@ _08038482:
 	thumb_func_end sub_8038420
 
 	thumb_func_start sub_803849C
-sub_803849C: ; 803849C
+sub_803849C: @ 803849C
 	push {lr}
 	ldr r1, =0x030022c0
 	ldr r0, =0x03005d00
@@ -84928,7 +84928,7 @@ sub_803849C: ; 803849C
 	thumb_func_end sub_803849C
 
 	thumb_func_start sub_80384E4
-sub_80384E4: ; 80384E4
+sub_80384E4: @ 80384E4
 	push {lr}
 	bl fade_and_return_progress_probably
 	ldr r0, =0x02037fd4
@@ -84953,7 +84953,7 @@ _08038512:
 	thumb_func_end sub_80384E4
 
 	thumb_func_start sub_8038528
-sub_8038528: ; 8038528
+sub_8038528: @ 8038528
 	movs r1, 0
 	strh r1, [r0, 0x2E]
 	ldr r1, =sub_8038538
@@ -84963,7 +84963,7 @@ sub_8038528: ; 8038528
 	thumb_func_end sub_8038528
 
 	thumb_func_start sub_8038538
-sub_8038538: ; 8038538
+sub_8038538: @ 8038538
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r5, =0x0201c000
@@ -85055,7 +85055,7 @@ _080385DC:
 	thumb_func_end sub_8038538
 
 	thumb_func_start LoadTrainerParty
-LoadTrainerParty: ; 80385E8
+LoadTrainerParty: @ 80385E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -85357,7 +85357,7 @@ _08038820:
 	lsls r2, r0, 1
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 ; PP offset
+	ldr r0, =gBattleMoves + 0x4 @ PP offset
 	adds r2, r0
 	adds r0, r5, 0
 	bl pokemon_setattr
@@ -85529,7 +85529,7 @@ _08038982:
 	lsls r2, r0, 1
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 ; PP offset
+	ldr r0, =gBattleMoves + 0x4 @ PP offset
 	adds r2, r0
 	adds r0, r5, 0
 	bl pokemon_setattr
@@ -85581,7 +85581,7 @@ _080389E2:
 	thumb_func_end LoadTrainerParty
 
 	thumb_func_start sub_8038A04
-sub_8038A04: ; 8038A04
+sub_8038A04: @ 8038A04
 	push {lr}
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -85601,7 +85601,7 @@ _08038A1E:
 	thumb_func_end sub_8038A04
 
 	thumb_func_start vblank_cb_08078BB4
-vblank_cb_08078BB4: ; 8038A28
+vblank_cb_08078BB4: @ 8038A28
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -85669,12 +85669,12 @@ _08038A3A:
 	thumb_func_end vblank_cb_08078BB4
 
 	thumb_func_start nullsub_17
-nullsub_17: ; 8038B00
+nullsub_17: @ 8038B00
 	bx lr
 	thumb_func_end nullsub_17
 
 	thumb_func_start sub_8038B04
-sub_8038B04: ; 8038B04
+sub_8038B04: @ 8038B04
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -85732,7 +85732,7 @@ _08038B6A:
 	thumb_func_end sub_8038B04
 
 	thumb_func_start sub_8038B74
-sub_8038B74: ; 8038B74
+sub_8038B74: @ 8038B74
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -85748,7 +85748,7 @@ sub_8038B74: ; 8038B74
 	thumb_func_end sub_8038B74
 
 	thumb_func_start sub_8038B94
-sub_8038B94: ; 8038B94
+sub_8038B94: @ 8038B94
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -85976,7 +85976,7 @@ _08038D2A:
 	thumb_func_end sub_8038B94
 
 	thumb_func_start sub_8038D64
-sub_8038D64: ; 8038D64
+sub_8038D64: @ 8038D64
 	push {r4,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -86126,7 +86126,7 @@ _08038EB6:
 	thumb_func_end sub_8038D64
 
 	thumb_func_start sub_8038F14
-sub_8038F14: ; 8038F14
+sub_8038F14: @ 8038F14
 	push {lr}
 	bl sub_8038F34
 	bl CallObjectCallbacks
@@ -86139,7 +86139,7 @@ sub_8038F14: ; 8038F14
 	thumb_func_end sub_8038F14
 
 	thumb_func_start sub_8038F34
-sub_8038F34: ; 8038F34
+sub_8038F34: @ 8038F34
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r0, =0x02024332
@@ -86425,7 +86425,7 @@ _080391C6:
 	thumb_func_end sub_8038F34
 
 	thumb_func_start sub_80391E0
-sub_80391E0: ; 80391E0
+sub_80391E0: @ 80391E0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -86517,7 +86517,7 @@ _080392A0:
 	thumb_func_end sub_80391E0
 
 	thumb_func_start sub_80392A8
-sub_80392A8: ; 80392A8
+sub_80392A8: @ 80392A8
 	push {r4,lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -86589,7 +86589,7 @@ _080392FE:
 	thumb_func_end sub_80392A8
 
 	thumb_func_start sub_803937C
-sub_803937C: ; 803937C
+sub_803937C: @ 803937C
 	push {lr}
 	bl sub_803939C
 	bl CallObjectCallbacks
@@ -86602,7 +86602,7 @@ sub_803937C: ; 803937C
 	thumb_func_end sub_803937C
 
 	thumb_func_start sub_803939C
-sub_803939C: ; 803939C
+sub_803939C: @ 803939C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024332
@@ -87008,7 +87008,7 @@ _0803975E:
 	thumb_func_end sub_803939C
 
 	thumb_func_start shedinja_something
-shedinja_something: ; 803976C
+shedinja_something: @ 803976C
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -87049,7 +87049,7 @@ _080397B4:
 	thumb_func_end shedinja_something
 
 	thumb_func_start sub_80397C4
-sub_80397C4: ; 80397C4
+sub_80397C4: @ 80397C4
 	ldr r2, =gUnknown_0831ABA0
 	lsls r0, 2
 	adds r0, r2
@@ -87063,7 +87063,7 @@ sub_80397C4: ; 80397C4
 	thumb_func_end sub_80397C4
 
 	thumb_func_start oac_poke_opponent
-oac_poke_opponent: ; 80397DC
+oac_poke_opponent: @ 80397DC
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =sub_803980C
@@ -87085,7 +87085,7 @@ oac_poke_opponent: ; 80397DC
 	thumb_func_end oac_poke_opponent
 
 	thumb_func_start sub_803980C
-sub_803980C: ; 803980C
+sub_803980C: @ 803980C
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x020243fc
@@ -87109,7 +87109,7 @@ _0803982C:
 	thumb_func_end sub_803980C
 
 	thumb_func_start sub_8039838
-sub_8039838: ; 8039838
+sub_8039838: @ 8039838
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -87151,7 +87151,7 @@ _08039880:
 	thumb_func_end sub_8039838
 
 	thumb_func_start sub_8039894
-sub_8039894: ; 8039894
+sub_8039894: @ 8039894
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -87172,12 +87172,12 @@ _080398B0:
 	thumb_func_end sub_8039894
 
 	thumb_func_start nullsub_18
-nullsub_18: ; 80398B8
+nullsub_18: @ 80398B8
 	bx lr
 	thumb_func_end nullsub_18
 
 	thumb_func_start sub_80398BC
-sub_80398BC: ; 80398BC
+sub_80398BC: @ 80398BC
 	movs r1, 0x6
 	strh r1, [r0, 0x34]
 	movs r1, 0x1
@@ -87189,7 +87189,7 @@ sub_80398BC: ; 80398BC
 	thumb_func_end sub_80398BC
 
 	thumb_func_start sub_80398D0
-sub_80398D0: ; 80398D0
+sub_80398D0: @ 80398D0
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x36]
@@ -87240,7 +87240,7 @@ _08039924:
 	thumb_func_end sub_80398D0
 
 	thumb_func_start sub_8039934
-sub_8039934: ; 8039934
+sub_8039934: @ 8039934
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -87372,7 +87372,7 @@ _08039A20:
 	thumb_func_end sub_8039934
 
 	thumb_func_start sub_8039A48
-sub_8039A48: ; 8039A48
+sub_8039A48: @ 8039A48
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x36]
@@ -87443,7 +87443,7 @@ _08039AC8:
 	thumb_func_end sub_8039A48
 
 	thumb_func_start sub_8039AD8
-sub_8039AD8: ; 8039AD8
+sub_8039AD8: @ 8039AD8
 	movs r1, 0x8
 	strh r1, [r0, 0x34]
 	adds r1, r0, 0
@@ -87459,7 +87459,7 @@ sub_8039AD8: ; 8039AD8
 	thumb_func_end sub_8039AD8
 
 	thumb_func_start sub_8039AF4
-sub_8039AF4: ; 8039AF4
+sub_8039AF4: @ 8039AF4
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x34]
@@ -87491,7 +87491,7 @@ _08039B26:
 	thumb_func_end sub_8039AF4
 
 	thumb_func_start sub_8039B2C
-sub_8039B2C: ; 8039B2C
+sub_8039B2C: @ 8039B2C
 	movs r1, 0x3E
 	adds r1, r0
 	mov r12, r1
@@ -87516,7 +87516,7 @@ sub_8039B2C: ; 8039B2C
 	thumb_func_end sub_8039B2C
 
 	thumb_func_start sub_8039B58
-sub_8039B58: ; 8039B58
+sub_8039B58: @ 8039B58
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -87560,7 +87560,7 @@ _08039BA0:
 	thumb_func_end sub_8039B58
 
 	thumb_func_start sub_8039BB4
-sub_8039BB4: ; 8039BB4
+sub_8039BB4: @ 8039BB4
 	ldr r1, =oac_poke_ally_
 	str r1, [r0, 0x1C]
 	bx lr
@@ -87568,7 +87568,7 @@ sub_8039BB4: ; 8039BB4
 	thumb_func_end sub_8039BB4
 
 	thumb_func_start oac_poke_ally_
-oac_poke_ally_: ; 8039BC0
+oac_poke_ally_: @ 8039BC0
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x020243fc
@@ -87594,7 +87594,7 @@ _08039BE4:
 	thumb_func_end oac_poke_ally_
 
 	thumb_func_start sub_8039BF0
-sub_8039BF0: ; 8039BF0
+sub_8039BF0: @ 8039BF0
 	ldr r1, =nullsub_19
 	str r1, [r0, 0x1C]
 	bx lr
@@ -87602,12 +87602,12 @@ sub_8039BF0: ; 8039BF0
 	thumb_func_end sub_8039BF0
 
 	thumb_func_start nullsub_19
-nullsub_19: ; 8039BFC
+nullsub_19: @ 8039BFC
 	bx lr
 	thumb_func_end nullsub_19
 
 	thumb_func_start sub_8039C00
-sub_8039C00: ; 8039C00
+sub_8039C00: @ 8039C00
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x020243fc
@@ -87631,7 +87631,7 @@ _08039C20:
 	thumb_func_end sub_8039C00
 
 	thumb_func_start dp11b_obj_instanciate
-dp11b_obj_instanciate: ; 8039C28
+dp11b_obj_instanciate: @ 8039C28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -87768,7 +87768,7 @@ _08039D2C:
 	thumb_func_end dp11b_obj_instanciate
 
 	thumb_func_start dp11b_obj_free
-dp11b_obj_free: ; 8039D48
+dp11b_obj_free: @ 8039D48
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -87854,7 +87854,7 @@ _08039DEA:
 	thumb_func_end dp11b_obj_free
 
 	thumb_func_start objc_dp11b_pingpong
-objc_dp11b_pingpong: ; 8039DF8
+objc_dp11b_pingpong: @ 8039DF8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -87895,7 +87895,7 @@ _08039E14:
 	thumb_func_end objc_dp11b_pingpong
 
 	thumb_func_start sub_8039E44
-sub_8039E44: ; 8039E44
+sub_8039E44: @ 8039E44
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -87913,7 +87913,7 @@ _08039E5C:
 	thumb_func_end sub_8039E44
 
 	thumb_func_start sub_8039E60
-sub_8039E60: ; 8039E60
+sub_8039E60: @ 8039E60
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8039E9C
@@ -87934,7 +87934,7 @@ _08039E7A:
 	thumb_func_end sub_8039E60
 
 	thumb_func_start sub_8039E84
-sub_8039E84: ; 8039E84
+sub_8039E84: @ 8039E84
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -87948,7 +87948,7 @@ sub_8039E84: ; 8039E84
 	thumb_func_end sub_8039E84
 
 	thumb_func_start sub_8039E9C
-sub_8039E9C: ; 8039E9C
+sub_8039E9C: @ 8039E9C
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x2C
@@ -87973,12 +87973,12 @@ _08039EBE:
 	thumb_func_end sub_8039E9C
 
 	thumb_func_start nullsub_20
-nullsub_20: ; 8039EC8
+nullsub_20: @ 8039EC8
 	bx lr
 	thumb_func_end nullsub_20
 
 	thumb_func_start sub_8039ECC
-sub_8039ECC: ; 8039ECC
+sub_8039ECC: @ 8039ECC
 	push {lr}
 	bl sub_8039F40
 	ldr r1, =0x02024332
@@ -87993,7 +87993,7 @@ sub_8039ECC: ; 8039ECC
 	thumb_func_end sub_8039ECC
 
 	thumb_func_start sub_8039EF0
-sub_8039EF0: ; 8039EF0
+sub_8039EF0: @ 8039EF0
 	push {r4,r5,lr}
 	ldr r0, =0x03005d04
 	ldr r0, [r0]
@@ -88030,7 +88030,7 @@ _08039F2A:
 	thumb_func_end sub_8039EF0
 
 	thumb_func_start sub_8039F40
-sub_8039F40: ; 8039F40
+sub_8039F40: @ 8039F40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -88373,7 +88373,7 @@ _0803A1E4:
 	thumb_func_end sub_8039F40
 
 	thumb_func_start sub_803A284
-sub_803A284: ; 803A284
+sub_803A284: @ 803A284
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -88951,7 +88951,7 @@ _0803A6B4:
 	thumb_func_end sub_803A284
 
 	thumb_func_start sub_803A75C
-sub_803A75C: ; 803A75C
+sub_803A75C: @ 803A75C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -89483,7 +89483,7 @@ _0803AB6C:
 	thumb_func_end sub_803A75C
 
 	thumb_func_start bc_8012FAC
-bc_8012FAC: ; 803ABC0
+bc_8012FAC: @ 803ABC0
 	push {r4,r5,lr}
 	ldr r5, =0x02024332
 	ldrb r0, [r5]
@@ -89536,7 +89536,7 @@ _0803AC2E:
 	thumb_func_end bc_8012FAC
 
 	thumb_func_start bc_load_battlefield
-bc_load_battlefield: ; 803AC34
+bc_load_battlefield: @ 803AC34
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r5, [r0]
@@ -89566,7 +89566,7 @@ _0803AC64:
 	thumb_func_end bc_load_battlefield
 
 	thumb_func_start sub_803AC84
-sub_803AC84: ; 803AC84
+sub_803AC84: @ 803AC84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -89904,7 +89904,7 @@ _0803AF4E:
 	thumb_func_end sub_803AC84
 
 	thumb_func_start bc_801333C
-bc_801333C: ; 803AF80
+bc_801333C: @ 803AF80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -90091,7 +90091,7 @@ _0803B10C:
 	thumb_func_end bc_801333C
 
 	thumb_func_start bc_battle_begin_message
-bc_battle_begin_message: ; 803B120
+bc_battle_begin_message: @ 803B120
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -90114,7 +90114,7 @@ _0803B142:
 	thumb_func_end bc_battle_begin_message
 
 	thumb_func_start bc_8013568
-bc_8013568: ; 803B158
+bc_8013568: @ 803B158
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -90133,7 +90133,7 @@ _0803B170:
 	thumb_func_end bc_8013568
 
 	thumb_func_start sub_803B180
-sub_803B180: ; 803B180
+sub_803B180: @ 803B180
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -90178,7 +90178,7 @@ _0803B1D0:
 	thumb_func_end sub_803B180
 
 	thumb_func_start sub_803B1DC
-sub_803B1DC: ; 803B1DC
+sub_803B1DC: @ 803B1DC
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -90238,7 +90238,7 @@ _0803B23A:
 	thumb_func_end sub_803B1DC
 
 	thumb_func_start sub_803B25C
-sub_803B25C: ; 803B25C
+sub_803B25C: @ 803B25C
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r2, [r0]
@@ -90321,7 +90321,7 @@ _0803B2F2:
 	thumb_func_end sub_803B25C
 
 	thumb_func_start bc_801362C
-bc_801362C: ; 803B314
+bc_801362C: @ 803B314
 	push {r4-r7,lr}
 	ldr r0, =0x02024068
 	ldr r1, [r0]
@@ -90386,7 +90386,7 @@ _0803B384:
 	thumb_func_end bc_801362C
 
 	thumb_func_start sub_803B3AC
-sub_803B3AC: ; 803B3AC
+sub_803B3AC: @ 803B3AC
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -90402,7 +90402,7 @@ _0803B3BC:
 	thumb_func_end sub_803B3AC
 
 	thumb_func_start sub_803B3CC
-sub_803B3CC: ; 803B3CC
+sub_803B3CC: @ 803B3CC
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -90449,7 +90449,7 @@ _0803B418:
 	thumb_func_end sub_803B3CC
 
 	thumb_func_start sub_803B42C
-sub_803B42C: ; 803B42C
+sub_803B42C: @ 803B42C
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -90522,7 +90522,7 @@ _0803B48A:
 	thumb_func_end sub_803B42C
 
 	thumb_func_start sub_803B4C8
-sub_803B4C8: ; 803B4C8
+sub_803B4C8: @ 803B4C8
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -90615,7 +90615,7 @@ _0803B574:
 	thumb_func_end sub_803B4C8
 
 	thumb_func_start sub_803B598
-sub_803B598: ; 803B598
+sub_803B598: @ 803B598
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r1, [r0]
@@ -90679,7 +90679,7 @@ _0803B606:
 	thumb_func_end sub_803B598
 
 	thumb_func_start sub_803B628
-sub_803B628: ; 803B628
+sub_803B628: @ 803B628
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -91015,7 +91015,7 @@ _0803B8B2:
 	thumb_func_end sub_803B628
 
 	thumb_func_start bc_8013B1C
-bc_8013B1C: ; 803B904
+bc_8013B1C: @ 803B904
 	push {r4-r6,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -91099,7 +91099,7 @@ _0803B994:
 	thumb_func_end bc_8013B1C
 
 	thumb_func_start sub_803B9BC
-sub_803B9BC: ; 803B9BC
+sub_803B9BC: @ 803B9BC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -91283,7 +91283,7 @@ _0803BB78:
 	thumb_func_end sub_803B9BC
 
 	thumb_func_start sub_803BB88
-sub_803BB88: ; 803BB88
+sub_803BB88: @ 803BB88
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x02024084
@@ -91527,7 +91527,7 @@ _0803BD92:
 	thumb_func_end sub_803BB88
 
 	thumb_func_start sub_803BDA0
-sub_803BDA0: ; 803BDA0
+sub_803BDA0: @ 803BDA0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -91631,7 +91631,7 @@ _0803BE66:
 	thumb_func_end sub_803BDA0
 
 	thumb_func_start sub_803BE74
-sub_803BE74: ; 803BE74
+sub_803BE74: @ 803BE74
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -93241,7 +93241,7 @@ _0803CD70:
 	thumb_func_end sub_803BE74
 
 	thumb_func_start sub_803CDB8
-sub_803CDB8: ; 803CDB8
+sub_803CDB8: @ 803CDB8
 	push {r4,r5,lr}
 	movs r3, 0
 	movs r1, 0
@@ -93278,7 +93278,7 @@ _0803CDF2:
 	thumb_func_end sub_803CDB8
 
 	thumb_func_start sub_803CDF8
-sub_803CDF8: ; 803CDF8
+sub_803CDF8: @ 803CDF8
 	push {r4-r7,lr}
 	ldr r7, =0x02024064
 	ldrb r0, [r7]
@@ -93389,7 +93389,7 @@ _0803CEC6:
 	thumb_func_end sub_803CDF8
 
 	thumb_func_start sub_803CEDC
-sub_803CEDC: ; 803CEDC
+sub_803CEDC: @ 803CEDC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -93416,7 +93416,7 @@ sub_803CEDC: ; 803CEDC
 	thumb_func_end sub_803CEDC
 
 	thumb_func_start b_first_side
-b_first_side: ; 803CF10
+b_first_side: @ 803CF10
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -93880,7 +93880,7 @@ _0803D2D6:
 	thumb_func_end b_first_side
 
 	thumb_func_start sub_803D2E8
-sub_803D2E8: ; 803D2E8
+sub_803D2E8: @ 803D2E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -94187,7 +94187,7 @@ _0803D554:
 	thumb_func_end sub_803D2E8
 
 	thumb_func_start sub_803D580
-sub_803D580: ; 803D580
+sub_803D580: @ 803D580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -94324,7 +94324,7 @@ _0803D678:
 	thumb_func_end sub_803D580
 
 	thumb_func_start sub_803D6A0
-sub_803D6A0: ; 803D6A0
+sub_803D6A0: @ 803D6A0
 	push {r4-r6,lr}
 	ldr r2, =0x02024064
 	movs r0, 0
@@ -94366,7 +94366,7 @@ _0803D6DE:
 	thumb_func_end sub_803D6A0
 
 	thumb_func_start bc_80154A0
-bc_80154A0: ; 803D6F0
+bc_80154A0: @ 803D6F0
 	push {r4-r7,lr}
 	ldr r0, =0x02024280
 	ldr r0, [r0]
@@ -94481,7 +94481,7 @@ _0803D7E8:
 	thumb_func_end bc_80154A0
 
 	thumb_func_start bc_bs_exec
-bc_bs_exec: ; 803D818
+bc_bs_exec: @ 803D818
 	push {r4-r6,lr}
 	ldr r6, =0x0202433a
 	ldrb r0, [r6]
@@ -94545,7 +94545,7 @@ _0803D8AC:
 	thumb_func_end bc_bs_exec
 
 	thumb_func_start sub_803D8C0
-sub_803D8C0: ; 803D8C0
+sub_803D8C0: @ 803D8C0
 	push {r4,lr}
 	ldr r1, =0x02024083
 	movs r0, 0
@@ -94717,7 +94717,7 @@ _0803DAA4:
 	thumb_func_end sub_803D8C0
 
 	thumb_func_start sub_803DAC0
-sub_803DAC0: ; 803DAC0
+sub_803DAC0: @ 803DAC0
 	push {r4,lr}
 	ldr r1, =0x02024083
 	movs r0, 0
@@ -94796,7 +94796,7 @@ _0803DB82:
 	thumb_func_end sub_803DAC0
 
 	thumb_func_start sub_803DBA0
-sub_803DBA0: ; 803DBA0
+sub_803DBA0: @ 803DBA0
 	push {lr}
 	ldr r1, =0x02024083
 	movs r0, 0
@@ -94879,7 +94879,7 @@ _0803DC6A:
 	thumb_func_end sub_803DBA0
 
 	thumb_func_start bc_80158BC
-bc_80158BC: ; 803DC84
+bc_80158BC: @ 803DC84
 	ldr r1, =0x02024083
 	movs r0, 0
 	strb r0, [r1]
@@ -94910,7 +94910,7 @@ bc_80158BC: ; 803DC84
 	thumb_func_end bc_80158BC
 
 	thumb_func_start sub_803DCD8
-sub_803DCD8: ; 803DCD8
+sub_803DCD8: @ 803DCD8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -95056,7 +95056,7 @@ _0803DE2A:
 	thumb_func_end sub_803DCD8
 
 	thumb_func_start sub_803DE40
-sub_803DE40: ; 803DE40
+sub_803DE40: @ 803DE40
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -95101,7 +95101,7 @@ _0803DEA2:
 	thumb_func_end sub_803DE40
 
 	thumb_func_start bc_evolution_cutscene
-bc_evolution_cutscene: ; 803DEB4
+bc_evolution_cutscene: @ 803DEB4
 	push {r4-r6,lr}
 	ldr r0, =0x03005d54
 	ldrb r1, [r0]
@@ -95166,7 +95166,7 @@ _0803DF34:
 	thumb_func_end bc_evolution_cutscene
 
 	thumb_func_start sub_803DF48
-sub_803DF48: ; 803DF48
+sub_803DF48: @ 803DF48
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x4]
@@ -95183,7 +95183,7 @@ _0803DF5A:
 	thumb_func_end sub_803DF48
 
 	thumb_func_start c4_overworld
-c4_overworld: ; 803DF70
+c4_overworld: @ 803DF70
 	push {r4-r6,lr}
 	ldr r6, =0x02022fec
 	ldr r0, [r6]
@@ -95252,7 +95252,7 @@ _0803DFEC:
 	thumb_func_end c4_overworld
 
 	thumb_func_start bc_move_exec_returning
-bc_move_exec_returning: ; 803E018
+bc_move_exec_returning: @ 803E018
 	push {lr}
 	ldr r0, =0x02024083
 	ldrb r0, [r0]
@@ -95304,7 +95304,7 @@ _0803E07A:
 	thumb_func_end bc_move_exec_returning
 
 	thumb_func_start sub_803E08C
-sub_803E08C: ; 803E08C
+sub_803E08C: @ 803E08C
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -95325,7 +95325,7 @@ _0803E0A8:
 	thumb_func_end sub_803E08C
 
 	thumb_func_start sub_803E0B8
-sub_803E0B8: ; 803E0B8
+sub_803E0B8: @ 803E0B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -96140,7 +96140,7 @@ _0803E83C:
 	thumb_func_end sub_803E0B8
 
 	thumb_func_start bs2_8016374
-bs2_8016374: ; 803E868
+bs2_8016374: @ 803E868
 	push {r4,lr}
 	ldr r3, =0x0202420b
 	ldr r1, =0x0202407e
@@ -96200,7 +96200,7 @@ _0803E8CE:
 	thumb_func_end bs2_8016374
 
 	thumb_func_start sub_803E90C
-sub_803E90C: ; 803E90C
+sub_803E90C: @ 803E90C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -96518,7 +96518,7 @@ _0803EBF6:
 	thumb_func_end sub_803E90C
 
 	thumb_func_start sub_803EC20
-sub_803EC20: ; 803EC20
+sub_803EC20: @ 803EC20
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -96766,7 +96766,7 @@ _0803EE24:
 	thumb_func_end sub_803EC20
 
 	thumb_func_start sub_803EE48
-sub_803EE48: ; 803EE48
+sub_803EE48: @ 803EE48
 	push {r4-r6,lr}
 	ldr r4, =0x0202420b
 	ldr r1, =0x0202407e
@@ -96905,7 +96905,7 @@ _0803EF98:
 	thumb_func_end sub_803EE48
 
 	thumb_func_start sub_803EFA8
-sub_803EFA8: ; 803EFA8
+sub_803EFA8: @ 803EFA8
 	ldr r2, =0x0202420b
 	ldr r1, =0x0202407e
 	ldr r0, =0x02024082
@@ -96930,7 +96930,7 @@ sub_803EFA8: ; 803EFA8
 	thumb_func_end sub_803EFA8
 
 	thumb_func_start bs5_8016AC0
-bs5_8016AC0: ; 803EFF0
+bs5_8016AC0: @ 803EFF0
 	ldr r2, =0x0202420b
 	ldr r1, =0x0202407e
 	ldr r0, =0x02024082
@@ -96962,7 +96962,7 @@ bs5_8016AC0: ; 803EFF0
 	thumb_func_end bs5_8016AC0
 
 	thumb_func_start sub_803F050
-sub_803F050: ; 803F050
+sub_803F050: @ 803F050
 	push {r4-r6,lr}
 	ldr r3, =0x0202420b
 	ldr r1, =0x0202407e
@@ -97049,7 +97049,7 @@ _0803F100:
 	thumb_func_end sub_803F050
 
 	thumb_func_start sub_803F120
-sub_803F120: ; 803F120
+sub_803F120: @ 803F120
 	push {r4,lr}
 	ldr r2, =0x0202420b
 	ldr r1, =0x0202407e
@@ -97135,7 +97135,7 @@ _0803F1CA:
 	thumb_func_end sub_803F120
 
 	thumb_func_start bs8_exit_by_flight
-bs8_exit_by_flight: ; 803F1F0
+bs8_exit_by_flight: @ 803F1F0
 	push {r4,lr}
 	ldr r2, =0x0202420b
 	ldr r1, =0x0202407e
@@ -97159,7 +97159,7 @@ bs8_exit_by_flight: ; 803F1F0
 	thumb_func_end bs8_exit_by_flight
 
 	thumb_func_start bs9_8016C9C
-bs9_8016C9C: ; 803F22C
+bs9_8016C9C: @ 803F22C
 	ldr r3, =0x0202420b
 	ldr r1, =0x0202407e
 	ldr r0, =0x02024082
@@ -97201,7 +97201,7 @@ bs9_8016C9C: ; 803F22C
 	thumb_func_end bs9_8016C9C
 
 	thumb_func_start bsB_exit_by_move
-bsB_exit_by_move: ; 803F2A4
+bsB_exit_by_move: @ 803F2A4
 	push {lr}
 	bl sub_8041728
 	lsls r0, 24
@@ -97222,7 +97222,7 @@ _0803F2C0:
 	thumb_func_end bsB_exit_by_move
 
 	thumb_func_start bsD_proceed
-bsD_proceed: ; 803F2CC
+bsD_proceed: @ 803F2CC
 	ldr r1, =0x02024082
 	ldrb r0, [r1]
 	adds r0, 0x1
@@ -97243,7 +97243,7 @@ bsD_proceed: ; 803F2CC
 	thumb_func_end bsD_proceed
 
 	thumb_func_start bsC_8016D70
-bsC_8016D70: ; 803F300
+bsC_8016D70: @ 803F300
 	push {r4-r6,lr}
 	ldr r1, =0x0202407e
 	ldr r2, =0x02024082
@@ -97314,7 +97314,7 @@ bsC_8016D70: ; 803F300
 	thumb_func_end bsC_8016D70
 
 	thumb_func_start get_battle_side_of_something
-get_battle_side_of_something: ; 803F3CC
+get_battle_side_of_something: @ 803F3CC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -97393,7 +97393,7 @@ _0803F47A:
 	thumb_func_end get_battle_side_of_something
 
 	thumb_func_start sub_803F480
-sub_803F480: ; 803F480
+sub_803F480: @ 803F480
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -97492,7 +97492,7 @@ _0803F532:
 	thumb_func_end sub_803F480
 
 	thumb_func_start sub_803F548
-sub_803F548: ; 803F548
+sub_803F548: @ 803F548
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -97643,7 +97643,7 @@ _0803F658:
 	thumb_func_end sub_803F548
 
 	thumb_func_start sub_803F67C
-sub_803F67C: ; 803F67C
+sub_803F67C: @ 803F67C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -97775,7 +97775,7 @@ _0803F762:
 	thumb_func_end sub_803F67C
 
 	thumb_func_start sub_803F790
-sub_803F790: ; 803F790
+sub_803F790: @ 803F790
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -97827,7 +97827,7 @@ _0803F7EE:
 	thumb_func_end sub_803F790
 
 	thumb_func_start dp01_battle_side_mark_buffer_for_execution
-dp01_battle_side_mark_buffer_for_execution: ; 803F800
+dp01_battle_side_mark_buffer_for_execution: @ 803F800
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -97864,7 +97864,7 @@ _0803F844:
 	thumb_func_end dp01_battle_side_mark_buffer_for_execution
 
 	thumb_func_start sub_803F850
-sub_803F850: ; 803F850
+sub_803F850: @ 803F850
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -97903,7 +97903,7 @@ _0803F87A:
 	thumb_func_end sub_803F850
 
 	thumb_func_start b_cancel_multi_turn_move_maybe
-b_cancel_multi_turn_move_maybe: ; 803F8A0
+b_cancel_multi_turn_move_maybe: @ 803F8A0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02024084
@@ -97947,7 +97947,7 @@ b_cancel_multi_turn_move_maybe: ; 803F8A0
 	thumb_func_end b_cancel_multi_turn_move_maybe
 
 	thumb_func_start sub_803F90C
-sub_803F90C: ; 803F90C
+sub_803F90C: @ 803F90C
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x0202433c
@@ -97995,7 +97995,7 @@ _0803F95E:
 	thumb_func_end sub_803F90C
 
 	thumb_func_start b_std_message
-b_std_message: ; 803F964
+b_std_message: @ 803F964
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r2, 16
@@ -98014,7 +98014,7 @@ b_std_message: ; 803F964
 	thumb_func_end b_std_message
 
 	thumb_func_start sub_803F988
-sub_803F988: ; 803F988
+sub_803F988: @ 803F988
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r0, =0x020243fe
@@ -98065,7 +98065,7 @@ _0803F9D6:
 	thumb_func_end sub_803F988
 
 	thumb_func_start sub_803F9EC
-sub_803F9EC: ; 803F9EC
+sub_803F9EC: @ 803F9EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -98128,7 +98128,7 @@ _0803FA50:
 	thumb_func_end sub_803F9EC
 
 	thumb_func_start sub_803FA70
-sub_803FA70: ; 803FA70
+sub_803FA70: @ 803FA70
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -98178,7 +98178,7 @@ _0803FAC2:
 	thumb_func_end sub_803FA70
 
 	thumb_func_start b_movescr_stack_push
-b_movescr_stack_push: ; 803FAD8
+b_movescr_stack_push: @ 803FAD8
 	push {r4,lr}
 	ldr r1, =0x020244a8
 	ldr r1, [r1]
@@ -98199,7 +98199,7 @@ b_movescr_stack_push: ; 803FAD8
 	thumb_func_end b_movescr_stack_push
 
 	thumb_func_start b_movescr_stack_push_cursor
-b_movescr_stack_push_cursor: ; 803FAFC
+b_movescr_stack_push_cursor: @ 803FAFC
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
@@ -98219,7 +98219,7 @@ b_movescr_stack_push_cursor: ; 803FAFC
 	thumb_func_end b_movescr_stack_push_cursor
 
 	thumb_func_start b_movescr_stack_pop_cursor
-b_movescr_stack_pop_cursor: ; 803FB24
+b_movescr_stack_pop_cursor: @ 803FB24
 	ldr r3, =0x02024214
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
@@ -98239,7 +98239,7 @@ b_movescr_stack_pop_cursor: ; 803FB24
 	thumb_func_end b_movescr_stack_pop_cursor
 
 	thumb_func_start sub_803FB4C
-sub_803FB4C: ; 803FB4C
+sub_803FB4C: @ 803FB4C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -98593,7 +98593,7 @@ _0803FEB8:
 	thumb_func_end sub_803FB4C
 
 	thumb_func_start sub_803FECC
-sub_803FECC: ; 803FECC
+sub_803FECC: @ 803FECC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -98840,7 +98840,7 @@ _08040096:
 	thumb_func_end sub_803FECC
 
 	thumb_func_start sub_80400C8
-sub_80400C8: ; 80400C8
+sub_80400C8: @ 80400C8
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -98890,7 +98890,7 @@ _08040126:
 	thumb_func_end sub_80400C8
 
 	thumb_func_start sub_8040130
-sub_8040130: ; 8040130
+sub_8040130: @ 8040130
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -98971,7 +98971,7 @@ _080401B4:
 	thumb_func_end sub_8040130
 
 	thumb_func_start sub_80401D0
-sub_80401D0: ; 80401D0
+sub_80401D0: @ 80401D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -99791,7 +99791,7 @@ _080408FE:
 	thumb_func_end sub_80401D0
 
 	thumb_func_start sub_8040924
-sub_8040924: ; 8040924
+sub_8040924: @ 8040924
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -100984,7 +100984,7 @@ _08041344:
 	thumb_func_end sub_8040924
 
 	thumb_func_start sub_8041364
-sub_8041364: ; 8041364
+sub_8041364: @ 8041364
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -101406,7 +101406,7 @@ _08041714:
 	thumb_func_end sub_8041364
 
 	thumb_func_start sub_8041728
-sub_8041728: ; 8041728
+sub_8041728: @ 8041728
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -101759,7 +101759,7 @@ _08041A0C:
 	thumb_func_end sub_8041728
 
 	thumb_func_start b_clear_atk_up_if_hit_flag_unless_enraged
-b_clear_atk_up_if_hit_flag_unless_enraged: ; 8041A1C
+b_clear_atk_up_if_hit_flag_unless_enraged: @ 8041A1C
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r0, =0x0202406c
@@ -101798,7 +101798,7 @@ _08041A54:
 	thumb_func_end b_clear_atk_up_if_hit_flag_unless_enraged
 
 	thumb_func_start sub_8041A6C
-sub_8041A6C: ; 8041A6C
+sub_8041A6C: @ 8041A6C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -102741,7 +102741,7 @@ _080423B4:
 	thumb_func_end sub_8041A6C
 
 	thumb_func_start sub_80423F4
-sub_80423F4: ; 80423F4
+sub_80423F4: @ 80423F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -103085,7 +103085,7 @@ _080426A0:
 	thumb_func_end sub_80423F4
 
 	thumb_func_start castform_switch
-castform_switch: ; 80426BC
+castform_switch: @ 80426BC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -103269,7 +103269,7 @@ _08042818:
 	thumb_func_end castform_switch
 
 	thumb_func_start ability_something
-ability_something: ; 8042828
+ability_something: @ 8042828
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -106296,7 +106296,7 @@ _0804443A:
 	thumb_func_end ability_something
 
 	thumb_func_start b_call_bc_move_exec
-b_call_bc_move_exec: ; 8044458
+b_call_bc_move_exec: @ 8044458
 	ldr r1, =0x02024214
 	str r0, [r1]
 	ldr r0, =0x020244a8
@@ -106323,7 +106323,7 @@ b_call_bc_move_exec: ; 8044458
 	thumb_func_end b_call_bc_move_exec
 
 	thumb_func_start b_push_move_exec
-b_push_move_exec: ; 8044498
+b_push_move_exec: @ 8044498
 	push {r4,lr}
 	adds r4, r0, 0
 	bl b_movescr_stack_push_cursor
@@ -106352,7 +106352,7 @@ b_push_move_exec: ; 8044498
 	thumb_func_end b_push_move_exec
 
 	thumb_func_start berry_effects_maybe
-berry_effects_maybe: ; 80444DC
+berry_effects_maybe: @ 80444DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -108526,7 +108526,7 @@ _0804582A:
 	thumb_func_end berry_effects_maybe
 
 	thumb_func_start sub_8045868
-sub_8045868: ; 8045868
+sub_8045868: @ 8045868
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020242bc
@@ -108558,7 +108558,7 @@ sub_8045868: ; 8045868
 	thumb_func_end sub_8045868
 
 	thumb_func_start sub_80458B4
-sub_80458B4: ; 80458B4
+sub_80458B4: @ 80458B4
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -108579,7 +108579,7 @@ _080458D0:
 	thumb_func_end sub_80458B4
 
 	thumb_func_start sub_80458E0
-sub_80458E0: ; 80458E0
+sub_80458E0: @ 80458E0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -108921,7 +108921,7 @@ _08045C20:
 	thumb_func_end sub_80458E0
 
 	thumb_func_start sub_8045C44
-sub_8045C44: ; 8045C44
+sub_8045C44: @ 8045C44
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -108977,7 +108977,7 @@ _08045CAE:
 	thumb_func_end sub_8045C44
 
 	thumb_func_start sub_8045CBC
-sub_8045CBC: ; 8045CBC
+sub_8045CBC: @ 8045CBC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -109334,7 +109334,7 @@ _08045FD0:
 	thumb_func_end sub_8045CBC
 
 	thumb_func_start atk00_attackcanceler
-atk00_attackcanceler: ; 8045FFC
+atk00_attackcanceler: @ 8045FFC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -109718,7 +109718,7 @@ _08046398:
 	thumb_func_end atk00_attackcanceler
 
 	thumb_func_start mcmd_jump_if_move_not_executed
-mcmd_jump_if_move_not_executed: ; 80463AC
+mcmd_jump_if_move_not_executed: @ 80463AC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -109782,7 +109782,7 @@ _0804642A:
 	thumb_func_end mcmd_jump_if_move_not_executed
 
 	thumb_func_start atk40_801DBA0
-atk40_801DBA0: ; 804643C
+atk40_801DBA0: @ 804643C
 	push {lr}
 	ldr r1, =0x0202433c
 	ldr r0, =0x0202420c
@@ -109830,7 +109830,7 @@ _080464A4:
 	thumb_func_end atk40_801DBA0
 
 	thumb_func_start sub_80464AC
-sub_80464AC: ; 80464AC
+sub_80464AC: @ 80464AC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -109877,7 +109877,7 @@ _080464F8:
 	thumb_func_end sub_80464AC
 
 	thumb_func_start sub_8046518
-sub_8046518: ; 8046518
+sub_8046518: @ 8046518
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -110029,7 +110029,7 @@ _08046656:
 	thumb_func_end sub_8046518
 
 	thumb_func_start atk01_accuracycheck
-atk01_accuracycheck: ; 8046660
+atk01_accuracycheck: @ 8046660
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -110440,7 +110440,7 @@ _080469D2:
 	thumb_func_end atk01_accuracycheck
 
 	thumb_func_start atk02_attackstring
-atk02_attackstring: ; 80469E8
+atk02_attackstring: @ 80469E8
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r5, [r0]
@@ -110477,7 +110477,7 @@ _08046A20:
 	thumb_func_end atk02_attackstring
 
 	thumb_func_start atk03_ppreduce
-atk03_ppreduce: ; 8046A3C
+atk03_ppreduce: @ 8046A3C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -110693,7 +110693,7 @@ _08046BEE:
 	thumb_func_end atk03_ppreduce
 
 	thumb_func_start atk04_critcalc
-atk04_critcalc: ; 8046C18
+atk04_critcalc: @ 8046C18
 	push {r4-r7,lr}
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
@@ -110865,7 +110865,7 @@ _08046D74:
 	thumb_func_end atk04_critcalc
 
 	thumb_func_start atk05_cmd5
-atk05_cmd5: ; 8046D8C
+atk05_cmd5: @ 8046D8C
 	push {r4-r7,lr}
 	sub sp, 0x10
 	ldr r4, =0x0202428e
@@ -110960,7 +110960,7 @@ _08046E32:
 	thumb_func_end atk05_cmd5
 
 	thumb_func_start sub_8046E7C
-sub_8046E7C: ; 8046E7C
+sub_8046E7C: @ 8046E7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -111056,7 +111056,7 @@ _08046F28:
 	thumb_func_end sub_8046E7C
 
 	thumb_func_start battle_attack_damage_modulate_by_effectivity
-battle_attack_damage_modulate_by_effectivity: ; 8046F60
+battle_attack_damage_modulate_by_effectivity: @ 8046F60
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -111162,7 +111162,7 @@ _08047032:
 	thumb_func_end battle_attack_damage_modulate_by_effectivity
 
 	thumb_func_start sub_8047038
-sub_8047038: ; 8047038
+sub_8047038: @ 8047038
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -111438,7 +111438,7 @@ _08047260:
 	thumb_func_end sub_8047038
 
 	thumb_func_start b_wonderguard_and_levitate
-b_wonderguard_and_levitate: ; 80472A8
+b_wonderguard_and_levitate: @ 80472A8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -111752,7 +111752,7 @@ _08047508:
 	thumb_func_end b_wonderguard_and_levitate
 
 	thumb_func_start b_attack_effectivity_adapt
-b_attack_effectivity_adapt: ; 804752C
+b_attack_effectivity_adapt: @ 804752C
 	push {r4-r7,lr}
 	adds r6, r2, 0
 	lsls r0, 24
@@ -111853,7 +111853,7 @@ _080475DE:
 	thumb_func_end b_attack_effectivity_adapt
 
 	thumb_func_start move_effectiveness_something
-move_effectiveness_something: ; 80475E4
+move_effectiveness_something: @ 80475E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -112090,7 +112090,7 @@ _0804779E:
 	thumb_func_end move_effectiveness_something
 
 	thumb_func_start ai_rate_move
-ai_rate_move: ; 80477BC
+ai_rate_move: @ 80477BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -112220,7 +112220,7 @@ _080478A0:
 	thumb_func_end ai_rate_move
 
 	thumb_func_start sub_80478B8
-sub_80478B8: ; 80478B8
+sub_80478B8: @ 80478B8
 	push {r4,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -112252,7 +112252,7 @@ _080478EA:
 	thumb_func_end sub_80478B8
 
 	thumb_func_start atk07_cmd7
-atk07_cmd7: ; 80478F4
+atk07_cmd7: @ 80478F4
 	push {r4-r7,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -112439,7 +112439,7 @@ _08047A84:
 	thumb_func_end atk07_cmd7
 
 	thumb_func_start atk08_cmd8
-atk08_cmd8: ; 8047AA4
+atk08_cmd8: @ 8047AA4
 	push {r4-r7,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -112612,7 +112612,7 @@ _08047C10:
 	thumb_func_end atk08_cmd8
 
 	thumb_func_start atk09_attackanimation
-atk09_attackanimation: ; 8047C30
+atk09_attackanimation: @ 8047C30
 	push {r4-r7,lr}
 	sub sp, 0x10
 	ldr r0, =0x02024068
@@ -112782,7 +112782,7 @@ _08047DB6:
 	thumb_func_end atk09_attackanimation
 
 	thumb_func_start sub_8047DC8
-sub_8047DC8: ; 8047DC8
+sub_8047DC8: @ 8047DC8
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -112799,7 +112799,7 @@ _08047DDA:
 	thumb_func_end sub_8047DC8
 
 	thumb_func_start atk0B_graphicalhpupdate
-atk0B_graphicalhpupdate: ; 8047DE8
+atk0B_graphicalhpupdate: @ 8047DE8
 	push {r4,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -112890,7 +112890,7 @@ _08047EAA:
 	thumb_func_end atk0B_graphicalhpupdate
 
 	thumb_func_start atk0C_datahpupdate
-atk0C_datahpupdate: ; 8047EC4
+atk0C_datahpupdate: @ 8047EC4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024068
@@ -113330,7 +113330,7 @@ _080482A2:
 	thumb_func_end atk0C_datahpupdate
 
 	thumb_func_start atk0D_critmessage
-atk0D_critmessage: ; 80482BC
+atk0D_critmessage: @ 80482BC
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -113365,7 +113365,7 @@ _080482F2:
 	thumb_func_end atk0D_critmessage
 
 	thumb_func_start atk0E_missmessage
-atk0E_missmessage: ; 8048310
+atk0E_missmessage: @ 8048310
 	push {r4,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -113466,7 +113466,7 @@ _080483D0:
 	thumb_func_end atk0E_missmessage
 
 	thumb_func_start atk0F_resultmessage
-atk0F_resultmessage: ; 80483E0
+atk0F_resultmessage: @ 80483E0
 	push {r4-r7,lr}
 	movs r3, 0
 	ldr r0, =0x02024068
@@ -113667,7 +113667,7 @@ _08048580:
 	thumb_func_end atk0F_resultmessage
 
 	thumb_func_start atk10_printstring
-atk10_printstring: ; 8048590
+atk10_printstring: @ 8048590
 	push {r4,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -113696,7 +113696,7 @@ _080485BA:
 	thumb_func_end atk10_printstring
 
 	thumb_func_start atk11_printstring2
-atk11_printstring2: ; 80485D0
+atk11_printstring2: @ 80485D0
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldr r0, =0x0202420b
@@ -113725,7 +113725,7 @@ atk11_printstring2: ; 80485D0
 	thumb_func_end atk11_printstring2
 
 	thumb_func_start atk12_waitmessage
-atk12_waitmessage: ; 8048614
+atk12_waitmessage: @ 8048614
 	push {r4-r6,lr}
 	ldr r0, =0x02024068
 	ldr r4, [r0]
@@ -113769,7 +113769,7 @@ _08048662:
 	thumb_func_end atk12_waitmessage
 
 	thumb_func_start atk13_printfromtable
-atk13_printfromtable: ; 8048670
+atk13_printfromtable: @ 8048670
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -113808,7 +113808,7 @@ _080486AE:
 	thumb_func_end atk13_printfromtable
 
 	thumb_func_start atk14_printfromtable2
-atk14_printfromtable2: ; 80486C4
+atk14_printfromtable2: @ 80486C4
 	push {r4-r6,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -113852,7 +113852,7 @@ _0804870E:
 	thumb_func_end atk14_printfromtable2
 
 	thumb_func_start sub_8048728
-sub_8048728: ; 8048728
+sub_8048728: @ 8048728
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -113883,7 +113883,7 @@ _0804874E:
 	thumb_func_end sub_8048728
 
 	thumb_func_start sub_8048760
-sub_8048760: ; 8048760
+sub_8048760: @ 8048760
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -115898,7 +115898,7 @@ _080499B8:
 	thumb_func_end sub_8048760
 
 	thumb_func_start atk15_seteffectwithchancetarget
-atk15_seteffectwithchancetarget: ; 80499D4
+atk15_seteffectwithchancetarget: @ 80499D4
 	push {r4,lr}
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420b
@@ -115999,7 +115999,7 @@ _08049AA2:
 	thumb_func_end atk15_seteffectwithchancetarget
 
 	thumb_func_start sub_8049AC0
-sub_8049AC0: ; 8049AC0
+sub_8049AC0: @ 8049AC0
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -116009,7 +116009,7 @@ sub_8049AC0: ; 8049AC0
 	thumb_func_end sub_8049AC0
 
 	thumb_func_start sub_8049AD0
-sub_8049AD0: ; 8049AD0
+sub_8049AD0: @ 8049AD0
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -116019,7 +116019,7 @@ sub_8049AD0: ; 8049AD0
 	thumb_func_end sub_8049AD0
 
 	thumb_func_start sub_8049AE0
-sub_8049AE0: ; 8049AE0
+sub_8049AE0: @ 8049AE0
 	push {lr}
 	ldr r0, =0x02024214
 	ldr r0, [r0]
@@ -116069,7 +116069,7 @@ _08049B1E:
 	thumb_func_end sub_8049AE0
 
 	thumb_func_start atk19_faintpokemon
-atk19_faintpokemon: ; 8049B5C
+atk19_faintpokemon: @ 8049B5C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -116378,7 +116378,7 @@ _08049E32:
 	thumb_func_end atk19_faintpokemon
 
 	thumb_func_start sub_8049E40
-sub_8049E40: ; 8049E40
+sub_8049E40: @ 8049E40
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -116405,7 +116405,7 @@ _08049E6A:
 	thumb_func_end sub_8049E40
 
 	thumb_func_start sub_8049E7C
-sub_8049E7C: ; 8049E7C
+sub_8049E7C: @ 8049E7C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024068
@@ -116467,7 +116467,7 @@ _08049EE8:
 	thumb_func_end sub_8049E7C
 
 	thumb_func_start atk1C_jumpifstatus
-atk1C_jumpifstatus: ; 8049F04
+atk1C_jumpifstatus: @ 8049F04
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -116526,7 +116526,7 @@ _08049F70:
 	thumb_func_end atk1C_jumpifstatus
 
 	thumb_func_start atk1D_jumpifsecondarystatus
-atk1D_jumpifsecondarystatus: ; 8049F7C
+atk1D_jumpifsecondarystatus: @ 8049F7C
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -116585,7 +116585,7 @@ _08049FE8:
 	thumb_func_end atk1D_jumpifsecondarystatus
 
 	thumb_func_start atk1E_jumpifability
-atk1E_jumpifability: ; 8049FF4
+atk1E_jumpifability: @ 8049FF4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -116690,7 +116690,7 @@ _0804A0CE:
 	thumb_func_end atk1E_jumpifability
 
 	thumb_func_start sub_804A0DC
-sub_804A0DC: ; 804A0DC
+sub_804A0DC: @ 804A0DC
 	push {r4-r6,lr}
 	ldr r0, =0x02024214
 	ldr r0, [r0]
@@ -116746,7 +116746,7 @@ _0804A14E:
 	thumb_func_end sub_804A0DC
 
 	thumb_func_start sub_804A154
-sub_804A154: ; 804A154
+sub_804A154: @ 804A154
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =0x02024214
@@ -116864,7 +116864,7 @@ _0804A240:
 	thumb_func_end sub_804A154
 
 	thumb_func_start atk21_jumpifspecialstatusflag
-atk21_jumpifspecialstatusflag: ; 804A24C
+atk21_jumpifspecialstatusflag: @ 804A24C
 	push {r4-r6,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -116930,7 +116930,7 @@ _0804A2CA:
 	thumb_func_end atk21_jumpifspecialstatusflag
 
 	thumb_func_start sub_804A2D0
-sub_804A2D0: ; 804A2D0
+sub_804A2D0: @ 804A2D0
 	push {r4-r6,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -116978,7 +116978,7 @@ _0804A324:
 	thumb_func_end sub_804A2D0
 
 	thumb_func_start sub_804A32C
-sub_804A32C: ; 804A32C
+sub_804A32C: @ 804A32C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -118026,7 +118026,7 @@ _0804ACB2:
 	thumb_func_end sub_804A32C
 
 	thumb_func_start sub_804ACD0
-sub_804ACD0: ; 804ACD0
+sub_804ACD0: @ 804ACD0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -118315,7 +118315,7 @@ _0804AF22:
 	thumb_func_end sub_804ACD0
 
 	thumb_func_start sub_804AF30
-sub_804AF30: ; 804AF30
+sub_804AF30: @ 804AF30
 	ldr r1, =0x0202427c
 	movs r0, 0
 	strb r0, [r1]
@@ -118340,7 +118340,7 @@ sub_804AF30: ; 804AF30
 	thumb_func_end sub_804AF30
 
 	thumb_func_start atk25_cmd25
-atk25_cmd25: ; 804AF70
+atk25_cmd25: @ 804AF70
 	push {lr}
 	bl sub_804AF30
 	ldr r1, =0x02024214
@@ -118353,7 +118353,7 @@ atk25_cmd25: ; 804AF70
 	thumb_func_end atk25_cmd25
 
 	thumb_func_start atk26_80225F0_storebyteforjump
-atk26_80225F0_storebyteforjump: ; 804AF88
+atk26_80225F0_storebyteforjump: @ 804AF88
 	ldr r3, =0x02024212
 	ldr r2, =0x02024214
 	ldr r0, [r2]
@@ -118366,7 +118366,7 @@ atk26_80225F0_storebyteforjump: ; 804AF88
 	thumb_func_end atk26_80225F0_storebyteforjump
 
 	thumb_func_start atk27_cmd27
-atk27_cmd27: ; 804AFA0
+atk27_cmd27: @ 804AFA0
 	push {lr}
 	ldr r1, =0x02024212
 	ldrb r0, [r1]
@@ -118402,7 +118402,7 @@ _0804AFDE:
 	thumb_func_end atk27_cmd27
 
 	thumb_func_start atk28_goto
-atk28_goto: ; 804AFE8
+atk28_goto: @ 804AFE8
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -118421,7 +118421,7 @@ atk28_goto: ; 804AFE8
 	thumb_func_end atk28_goto
 
 	thumb_func_start atk29_jumpifbyte
-atk29_jumpifbyte: ; 804B008
+atk29_jumpifbyte: @ 804B008
 	push {r4-r6,lr}
 	ldr r3, =0x02024214
 	ldr r1, [r3]
@@ -118505,7 +118505,7 @@ _0804B0A0:
 	thumb_func_end atk29_jumpifbyte
 
 	thumb_func_start sub_804B0A8
-sub_804B0A8: ; 804B0A8
+sub_804B0A8: @ 804B0A8
 	push {r4-r6,lr}
 	ldr r3, =0x02024214
 	ldr r1, [r3]
@@ -118592,7 +118592,7 @@ _0804B148:
 	thumb_func_end sub_804B0A8
 
 	thumb_func_start sub_804B150
-sub_804B150: ; 804B150
+sub_804B150: @ 804B150
 	push {r4-r6,lr}
 	ldr r3, =0x02024214
 	ldr r1, [r3]
@@ -118685,7 +118685,7 @@ _0804B1FC:
 	thumb_func_end sub_804B150
 
 	thumb_func_start sub_804B204
-sub_804B204: ; 804B204
+sub_804B204: @ 804B204
 	push {r4-r7,lr}
 	ldr r2, =0x02024214
 	ldr r3, [r2]
@@ -118759,7 +118759,7 @@ _0804B284:
 	thumb_func_end sub_804B204
 
 	thumb_func_start sub_804B28C
-sub_804B28C: ; 804B28C
+sub_804B28C: @ 804B28C
 	push {r4-r7,lr}
 	movs r7, 0
 	ldr r3, =0x02024214
@@ -118832,7 +118832,7 @@ _0804B308:
 	thumb_func_end sub_804B28C
 
 	thumb_func_start sub_804B310
-sub_804B310: ; 804B310
+sub_804B310: @ 804B310
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -118855,7 +118855,7 @@ sub_804B310: ; 804B310
 	thumb_func_end sub_804B310
 
 	thumb_func_start sub_804B338
-sub_804B338: ; 804B338
+sub_804B338: @ 804B338
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -118880,7 +118880,7 @@ sub_804B338: ; 804B338
 	thumb_func_end sub_804B338
 
 	thumb_func_start sub_804B364
-sub_804B364: ; 804B364
+sub_804B364: @ 804B364
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -118905,7 +118905,7 @@ sub_804B364: ; 804B364
 	thumb_func_end sub_804B364
 
 	thumb_func_start atk31_copyarray
-atk31_copyarray: ; 804B390
+atk31_copyarray: @ 804B390
 	push {r4-r6,lr}
 	ldr r3, =0x02024214
 	ldr r1, [r3]
@@ -118952,7 +118952,7 @@ _0804B3D4:
 	thumb_func_end atk31_copyarray
 
 	thumb_func_start atk32_memcpy_with_offset
-atk32_memcpy_with_offset: ; 804B3E4
+atk32_memcpy_with_offset: @ 804B3E4
 	push {r4-r7,lr}
 	ldr r3, =0x02024214
 	ldr r1, [r3]
@@ -119011,7 +119011,7 @@ _0804B440:
 	thumb_func_end atk32_memcpy_with_offset
 
 	thumb_func_start atk33_orbyte
-atk33_orbyte: ; 804B450
+atk33_orbyte: @ 804B450
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -119036,7 +119036,7 @@ atk33_orbyte: ; 804B450
 	thumb_func_end atk33_orbyte
 
 	thumb_func_start atk34_orhalfword
-atk34_orhalfword: ; 804B47C
+atk34_orhalfword: @ 804B47C
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r3, [r4]
@@ -119067,7 +119067,7 @@ atk34_orhalfword: ; 804B47C
 	thumb_func_end atk34_orhalfword
 
 	thumb_func_start atk35_orword
-atk35_orword: ; 804B4B4
+atk35_orword: @ 804B4B4
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r2, [r4]
@@ -119104,7 +119104,7 @@ atk35_orword: ; 804B4B4
 	thumb_func_end atk35_orword
 
 	thumb_func_start atk36_bicbyte
-atk36_bicbyte: ; 804B4F8
+atk36_bicbyte: @ 804B4F8
 	ldr r3, =0x02024214
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -119129,7 +119129,7 @@ atk36_bicbyte: ; 804B4F8
 	thumb_func_end atk36_bicbyte
 
 	thumb_func_start atk37_bichalfword
-atk37_bichalfword: ; 804B524
+atk37_bichalfword: @ 804B524
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r3, [r4]
@@ -119160,7 +119160,7 @@ atk37_bichalfword: ; 804B524
 	thumb_func_end atk37_bichalfword
 
 	thumb_func_start atk38_bicword
-atk38_bicword: ; 804B55C
+atk38_bicword: @ 804B55C
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r2, [r4]
@@ -119197,7 +119197,7 @@ atk38_bicword: ; 804B55C
 	thumb_func_end atk38_bicword
 
 	thumb_func_start atk39_pause
-atk39_pause: ; 804B5A0
+atk39_pause: @ 804B5A0
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r4, [r0]
@@ -119228,7 +119228,7 @@ _0804B5CC:
 	thumb_func_end atk39_pause
 
 	thumb_func_start sub_804B5E0
-sub_804B5E0: ; 804B5E0
+sub_804B5E0: @ 804B5E0
 	push {lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -119245,7 +119245,7 @@ _0804B5F2:
 	thumb_func_end sub_804B5E0
 
 	thumb_func_start atk3B_8022C68
-atk3B_8022C68: ; 804B600
+atk3B_8022C68: @ 804B600
 	push {lr}
 	ldr r0, =0x02024214
 	ldr r0, [r0]
@@ -119279,7 +119279,7 @@ _0804B624:
 	thumb_func_end atk3B_8022C68
 
 	thumb_func_start atk3C_return
-atk3C_return: ; 804B658
+atk3C_return: @ 804B658
 	push {lr}
 	bl b_movescr_stack_pop_cursor
 	pop {r0}
@@ -119287,7 +119287,7 @@ atk3C_return: ; 804B658
 	thumb_func_end atk3C_return
 
 	thumb_func_start sub_804B664
-sub_804B664: ; 804B664
+sub_804B664: @ 804B664
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -119314,7 +119314,7 @@ _0804B67C:
 	thumb_func_end sub_804B664
 
 	thumb_func_start atk3E_end2
-atk3E_end2: ; 804B6A4
+atk3E_end2: @ 804B6A4
 	ldr r1, =0x02024064
 	movs r0, 0
 	strb r0, [r1]
@@ -119326,7 +119326,7 @@ atk3E_end2: ; 804B6A4
 	thumb_func_end atk3E_end2
 
 	thumb_func_start atk3F_end3
-atk3F_end3: ; 804B6BC
+atk3F_end3: @ 804B6BC
 	push {lr}
 	bl b_movescr_stack_pop_cursor
 	ldr r3, =0x020244a8
@@ -119356,7 +119356,7 @@ _0804B6D6:
 	thumb_func_end atk3F_end3
 
 	thumb_func_start atk41_call
-atk41_call: ; 804B6F8
+atk41_call: @ 804B6F8
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -119381,7 +119381,7 @@ atk41_call: ; 804B6F8
 	thumb_func_end atk41_call
 
 	thumb_func_start atk42_jumpiftype2
-atk42_jumpiftype2: ; 804B728
+atk42_jumpiftype2: @ 804B728
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -119428,7 +119428,7 @@ _0804B77C:
 	thumb_func_end atk42_jumpiftype2
 
 	thumb_func_start sub_804B784
-sub_804B784: ; 804B784
+sub_804B784: @ 804B784
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02024214
@@ -119469,7 +119469,7 @@ _0804B7C6:
 	thumb_func_end sub_804B784
 
 	thumb_func_start sub_804B7D0
-sub_804B7D0: ; 804B7D0
+sub_804B7D0: @ 804B7D0
 	ldr r0, =0x0202420b
 	ldrb r0, [r0]
 	ldr r1, =0x0202449c
@@ -119483,7 +119483,7 @@ sub_804B7D0: ; 804B7D0
 	thumb_func_end sub_804B7D0
 
 	thumb_func_start atk46_cmd46
-atk46_cmd46: ; 804B7EC
+atk46_cmd46: @ 804B7EC
 	push {r4-r6,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -119574,7 +119574,7 @@ _0804B8AA:
 	thumb_func_end atk46_cmd46
 
 	thumb_func_start sub_804B8B0
-sub_804B8B0: ; 804B8B0
+sub_804B8B0: @ 804B8B0
 	push {r4-r7,lr}
 	ldr r6, =0x02024214
 	ldr r0, [r6]
@@ -119672,7 +119672,7 @@ _0804B976:
 	thumb_func_end sub_804B8B0
 
 	thumb_func_start sub_804B97C
-sub_804B97C: ; 804B97C
+sub_804B97C: @ 804B97C
 	push {r4,lr}
 	movs r3, 0
 	ldr r1, =0x02024474
@@ -119725,7 +119725,7 @@ _0804B9B4:
 	thumb_func_end sub_804B97C
 
 	thumb_func_start atk48_playstatchangeanimation
-atk48_playstatchangeanimation: ; 804B9D8
+atk48_playstatchangeanimation: @ 804B9D8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -119975,7 +119975,7 @@ _0804BBBA:
 	thumb_func_end atk48_playstatchangeanimation
 
 	thumb_func_start sub_804BBCC
-sub_804BBCC: ; 804BBCC
+sub_804BBCC: @ 804BBCC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -121098,7 +121098,7 @@ _0804C5BA:
 	thumb_func_end sub_804BBCC
 
 	thumb_func_start atk4A_damagecalc2
-atk4A_damagecalc2: ; 804C5F4
+atk4A_damagecalc2: @ 804C5F4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -121367,7 +121367,7 @@ _0804C804:
 	thumb_func_end atk4A_damagecalc2
 
 	thumb_func_start atk4B_cmd4b
-atk4B_cmd4b: ; 804C844
+atk4B_cmd4b: @ 804C844
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldr r0, =0x0202420b
@@ -121401,7 +121401,7 @@ _0804C872:
 	thumb_func_end atk4B_cmd4b
 
 	thumb_func_start atk4C_switch1
-atk4C_switch1: ; 804C894
+atk4C_switch1: @ 804C894
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -121447,7 +121447,7 @@ _0804C8E4:
 	thumb_func_end atk4C_switch1
 
 	thumb_func_start sub_804C904
-sub_804C904: ; 804C904
+sub_804C904: @ 804C904
 	push {r4-r7,lr}
 	sub sp, 0x58
 	ldr r0, =0x02024068
@@ -121666,7 +121666,7 @@ _0804CAA4:
 	thumb_func_end sub_804C904
 
 	thumb_func_start atk4E_switch3
-atk4E_switch3: ; 804CAE8
+atk4E_switch3: @ 804CAE8
 	push {r4-r6,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -121748,7 +121748,7 @@ _0804CB86:
 	thumb_func_end atk4E_switch3
 
 	thumb_func_start atk4F_jumpifcannotswitch
-atk4F_jumpifcannotswitch: ; 804CBB0
+atk4F_jumpifcannotswitch: @ 804CBB0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -122146,7 +122146,7 @@ _0804CF00:
 	thumb_func_end atk4F_jumpifcannotswitch
 
 	thumb_func_start sub_804CF10
-sub_804CF10: ; 804CF10
+sub_804CF10: @ 804CF10
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r2, r0, 0
@@ -122200,7 +122200,7 @@ sub_804CF10: ; 804CF10
 	thumb_func_end sub_804CF10
 
 	thumb_func_start atk50_openpartyscreen
-atk50_openpartyscreen: ; 804CF88
+atk50_openpartyscreen: @ 804CF88
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -123152,7 +123152,7 @@ _0804D804:
 	thumb_func_end atk50_openpartyscreen
 
 	thumb_func_start atk51_cmd51
-atk51_cmd51: ; 804D820
+atk51_cmd51: @ 804D820
 	push {r4-r7,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -123452,7 +123452,7 @@ _0804DA8A:
 	thumb_func_end atk51_cmd51
 
 	thumb_func_start atk52_cmd52
-atk52_cmd52: ; 804DAAC
+atk52_cmd52: @ 804DAAC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -123787,7 +123787,7 @@ _0804DD8E:
 	thumb_func_end atk52_cmd52
 
 	thumb_func_start sub_804DDA8
-sub_804DDA8: ; 804DDA8
+sub_804DDA8: @ 804DDA8
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -123809,7 +123809,7 @@ sub_804DDA8: ; 804DDA8
 	thumb_func_end sub_804DDA8
 
 	thumb_func_start atk54_802511C
-atk54_802511C: ; 804DDD8
+atk54_802511C: @ 804DDD8
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldr r0, =0x0202420b
@@ -123835,7 +123835,7 @@ atk54_802511C: ; 804DDD8
 	thumb_func_end atk54_802511C
 
 	thumb_func_start sub_804DE14
-sub_804DE14: ; 804DE14
+sub_804DE14: @ 804DE14
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldr r0, =0x0202420b
@@ -123862,7 +123862,7 @@ sub_804DE14: ; 804DE14
 	thumb_func_end sub_804DE14
 
 	thumb_func_start atk56_8025194
-atk56_8025194: ; 804DE50
+atk56_8025194: @ 804DE50
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -123884,7 +123884,7 @@ atk56_8025194: ; 804DE50
 	thumb_func_end atk56_8025194
 
 	thumb_func_start atk57_80251C4_flee
-atk57_80251C4_flee: ; 804DE80
+atk57_80251C4_flee: @ 804DE80
 	push {r4,lr}
 	movs r0, 0
 	bl battle_get_side_with_given_state
@@ -123907,7 +123907,7 @@ atk57_80251C4_flee: ; 804DE80
 	thumb_func_end atk57_80251C4_flee
 
 	thumb_func_start atk58_cmd58
-atk58_cmd58: ; 804DEB8
+atk58_cmd58: @ 804DEB8
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -123930,7 +123930,7 @@ atk58_cmd58: ; 804DEB8
 	thumb_func_end atk58_cmd58
 
 	thumb_func_start atk59_8025230
-atk59_8025230: ; 804DEEC
+atk59_8025230: @ 804DEEC
 	push {r4-r7,lr}
 	ldr r0, =0x02024214
 	ldr r2, [r0]
@@ -124079,7 +124079,7 @@ _0804E018:
 	thumb_func_end atk59_8025230
 
 	thumb_func_start sub_804E038
-sub_804E038: ; 804E038
+sub_804E038: @ 804E038
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -124463,7 +124463,7 @@ _0804E3B8:
 	thumb_func_end sub_804E038
 
 	thumb_func_start atk5B_80256E0
-atk5B_80256E0: ; 804E3C8
+atk5B_80256E0: @ 804E3C8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024474
@@ -124608,7 +124608,7 @@ _0804E4FA:
 	thumb_func_end atk5B_80256E0
 
 	thumb_func_start atk5C_cmd5c
-atk5C_cmd5c: ; 804E508
+atk5C_cmd5c: @ 804E508
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -124672,7 +124672,7 @@ _0804E592:
 	thumb_func_end atk5C_cmd5c
 
 	thumb_func_start sub_804E598
-sub_804E598: ; 804E598
+sub_804E598: @ 804E598
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -124838,7 +124838,7 @@ _0804E6CA:
 	thumb_func_end sub_804E598
 
 	thumb_func_start sub_804E6D8
-sub_804E6D8: ; 804E6D8
+sub_804E6D8: @ 804E6D8
 	push {r4,lr}
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
@@ -124898,7 +124898,7 @@ _0804E6FC:
 	thumb_func_end sub_804E6D8
 
 	thumb_func_start atk5E_8025A70
-atk5E_8025A70: ; 804E764
+atk5E_8025A70: @ 804E764
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -124982,7 +124982,7 @@ _0804E800:
 	thumb_func_end atk5E_8025A70
 
 	thumb_func_start atk5F_8025B24
-atk5F_8025B24: ; 804E818
+atk5F_8025B24: @ 804E818
 	push {lr}
 	ldr r0, =0x02024064
 	ldr r2, =0x0202420b
@@ -125018,7 +125018,7 @@ _0804E856:
 	thumb_func_end atk5F_8025B24
 
 	thumb_func_start atk60_cmd60
-atk60_cmd60: ; 804E868
+atk60_cmd60: @ 804E868
 	push {lr}
 	ldr r0, =0x0202420b
 	ldrb r0, [r0]
@@ -125041,7 +125041,7 @@ _0804E882:
 	thumb_func_end atk60_cmd60
 
 	thumb_func_start atk61_8025BA4
-atk61_8025BA4: ; 804E898
+atk61_8025BA4: @ 804E898
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -125129,7 +125129,7 @@ _0804E94C:
 	thumb_func_end atk61_8025BA4
 
 	thumb_func_start atk62_08025C6C
-atk62_08025C6C: ; 804E960
+atk62_08025C6C: @ 804E960
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -125151,7 +125151,7 @@ atk62_08025C6C: ; 804E960
 	thumb_func_end atk62_08025C6C
 
 	thumb_func_start atk63_jumptoattack
-atk63_jumptoattack: ; 804E990
+atk63_jumptoattack: @ 804E990
 	push {r4,lr}
 	ldr r0, =0x02024214
 	ldr r1, [r0]
@@ -125193,7 +125193,7 @@ _0804E9C2:
 	thumb_func_end atk63_jumptoattack
 
 	thumb_func_start atk64_statusanimation
-atk64_statusanimation: ; 804E9F4
+atk64_statusanimation: @ 804E9F4
 	push {r4,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -125252,7 +125252,7 @@ _0804EA5C:
 	thumb_func_end atk64_statusanimation
 
 	thumb_func_start atk65_8025D90
-atk65_8025D90: ; 804EA84
+atk65_8025D90: @ 804EA84
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -125323,7 +125323,7 @@ _0804EB04:
 	thumb_func_end atk65_8025D90
 
 	thumb_func_start atk66_8025E38
-atk66_8025E38: ; 804EB2C
+atk66_8025E38: @ 804EB2C
 	push {r4,r5,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -125387,7 +125387,7 @@ _0804EB9E:
 	thumb_func_end atk66_8025E38
 
 	thumb_func_start atk67_8025ECC
-atk67_8025ECC: ; 804EBC0
+atk67_8025ECC: @ 804EBC0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024332
@@ -125491,7 +125491,7 @@ _0804EC96:
 	thumb_func_end atk67_8025ECC
 
 	thumb_func_start sub_804ECA4
-sub_804ECA4: ; 804ECA4
+sub_804ECA4: @ 804ECA4
 	push {r4,r5,lr}
 	movs r1, 0
 	ldr r2, =0x0202406c
@@ -125519,7 +125519,7 @@ _0804ECC2:
 	thumb_func_end sub_804ECA4
 
 	thumb_func_start atk69_8025FE0
-atk69_8025FE0: ; 804ECDC
+atk69_8025FE0: @ 804ECDC
 	push {r4-r7,lr}
 	ldr r7, =0x02024084
 	ldr r6, =0x0202420c
@@ -125683,7 +125683,7 @@ _0804EE38:
 	thumb_func_end atk69_8025FE0
 
 	thumb_func_start atk6A_stash_item_for_side
-atk6A_stash_item_for_side: ; 804EE58
+atk6A_stash_item_for_side: @ 804EE58
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02024214
@@ -125733,7 +125733,7 @@ atk6A_stash_item_for_side: ; 804EE58
 	thumb_func_end atk6A_stash_item_for_side
 
 	thumb_func_start atk6B_end_battle_80261CC
-atk6B_end_battle_80261CC: ; 804EEC8
+atk6B_end_battle_80261CC: @ 804EEC8
 	ldr r1, =0x02022f58
 	movs r0, 0xFD
 	strb r0, [r1]
@@ -125759,7 +125759,7 @@ atk6B_end_battle_80261CC: ; 804EEC8
 	thumb_func_end atk6B_end_battle_80261CC
 
 	thumb_func_start atk6C_8026208
-atk6C_8026208: ; 804EF04
+atk6C_8026208: @ 804EF04
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024474
@@ -125971,7 +125971,7 @@ _0804F0F2:
 	thumb_func_end atk6C_8026208
 
 	thumb_func_start sub_804F100
-sub_804F100: ; 804F100
+sub_804F100: @ 804F100
 	push {lr}
 	sub sp, 0x14
 	ldr r0, =0x0202449c
@@ -126001,7 +126001,7 @@ sub_804F100: ; 804F100
 	thumb_func_end sub_804F100
 
 	thumb_func_start sub_804F144
-sub_804F144: ; 804F144
+sub_804F144: @ 804F144
 	push {lr}
 	sub sp, 0x10
 	ldr r0, =0x0202449c
@@ -126027,7 +126027,7 @@ sub_804F144: ; 804F144
 	thumb_func_end sub_804F144
 
 	thumb_func_start sub_804F17C
-sub_804F17C: ; 804F17C
+sub_804F17C: @ 804F17C
 	push {lr}
 	ldr r1, =0x02022e1e
 	movs r0, 0
@@ -126058,7 +126058,7 @@ sub_804F17C: ; 804F17C
 	thumb_func_end sub_804F17C
 
 	thumb_func_start sub_804F1CC
-sub_804F1CC: ; 804F1CC
+sub_804F1CC: @ 804F1CC
 	push {r4,r5,lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -126105,7 +126105,7 @@ _0804F216:
 	thumb_func_end sub_804F1CC
 
 	thumb_func_start sub_804F220
-sub_804F220: ; 804F220
+sub_804F220: @ 804F220
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -126240,7 +126240,7 @@ _0804F320:
 	thumb_func_end sub_804F220
 
 	thumb_func_start sub_804F344
-sub_804F344: ; 804F344
+sub_804F344: @ 804F344
 	push {lr}
 	ldr r0, =0x02022e1c
 	ldrh r1, [r0]
@@ -126278,7 +126278,7 @@ _0804F380:
 	thumb_func_end sub_804F344
 
 	thumb_func_start sub_804F384
-sub_804F384: ; 804F384
+sub_804F384: @ 804F384
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -126360,7 +126360,7 @@ sub_804F384: ; 804F384
 	thumb_func_end sub_804F384
 
 	thumb_func_start sub_804F450
-sub_804F450: ; 804F450
+sub_804F450: @ 804F450
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r0, =0x02022e1c
@@ -126395,7 +126395,7 @@ _0804F48C:
 	thumb_func_end sub_804F450
 
 	thumb_func_start sub_804F498
-sub_804F498: ; 804F498
+sub_804F498: @ 804F498
 	push {lr}
 	ldr r3, =0x0202406e
 	ldr r0, =0x0202449c
@@ -126425,7 +126425,7 @@ _0804F4CE:
 	thumb_func_end sub_804F498
 
 	thumb_func_start sub_804F4D4
-sub_804F4D4: ; 804F4D4
+sub_804F4D4: @ 804F4D4
 	push {lr}
 	bl sub_803F988
 	ldr r1, =0x02024214
@@ -126438,7 +126438,7 @@ sub_804F4D4: ; 804F4D4
 	thumb_func_end sub_804F4D4
 
 	thumb_func_start atk6E_state0_side_becomes_attacker
-atk6E_state0_side_becomes_attacker: ; 804F4EC
+atk6E_state0_side_becomes_attacker: @ 804F4EC
 	push {lr}
 	movs r0, 0
 	bl battle_get_side_with_given_state
@@ -126454,7 +126454,7 @@ atk6E_state0_side_becomes_attacker: ; 804F4EC
 	thumb_func_end atk6E_state0_side_becomes_attacker
 
 	thumb_func_start atk6F_8026810
-atk6F_8026810: ; 804F50C
+atk6F_8026810: @ 804F50C
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -126477,7 +126477,7 @@ atk6F_8026810: ; 804F50C
 	thumb_func_end atk6F_8026810
 
 	thumb_func_start atk70_record_ability_usage_of_side
-atk70_record_ability_usage_of_side: ; 804F540
+atk70_record_ability_usage_of_side: @ 804F540
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -126499,7 +126499,7 @@ atk70_record_ability_usage_of_side: ; 804F540
 	thumb_func_end atk70_record_ability_usage_of_side
 
 	thumb_func_start sub_804F574
-sub_804F574: ; 804F574
+sub_804F574: @ 804F574
 	ldr r2, =0x02022f68
 	movs r0, 0xFD
 	strb r0, [r2]
@@ -126520,7 +126520,7 @@ sub_804F574: ; 804F574
 	thumb_func_end sub_804F574
 
 	thumb_func_start atk71_80268A0
-atk71_80268A0: ; 804F59C
+atk71_80268A0: @ 804F59C
 	push {lr}
 	bl sub_804F574
 	ldr r1, =0x02024214
@@ -126533,7 +126533,7 @@ atk71_80268A0: ; 804F59C
 	thumb_func_end atk71_80268A0
 
 	thumb_func_start atk72_flee
-atk72_flee: ; 804F5B4
+atk72_flee: @ 804F5B4
 	push {lr}
 	ldr r0, =0x0202420d
 	ldrb r0, [r0]
@@ -126568,7 +126568,7 @@ _0804F5F0:
 	thumb_func_end atk72_flee
 
 	thumb_func_start atk73_cmd73
-atk73_cmd73: ; 804F5F8
+atk73_cmd73: @ 804F5F8
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r4, [r0]
@@ -126647,7 +126647,7 @@ _0804F68E:
 	thumb_func_end atk73_cmd73
 
 	thumb_func_start atk74_hp_tresholds_2
-atk74_hp_tresholds_2: ; 804F6A4
+atk74_hp_tresholds_2: @ 804F6A4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -126731,7 +126731,7 @@ _0804F73E:
 	thumb_func_end atk74_hp_tresholds_2
 
 	thumb_func_start atk75_8026A58
-atk75_8026A58: ; 804F754
+atk75_8026A58: @ 804F754
 	push {lr}
 	sub sp, 0x4
 	ldr r2, =0x020244b8
@@ -126766,7 +126766,7 @@ atk75_8026A58: ; 804F754
 	thumb_func_end atk75_8026A58
 
 	thumb_func_start sub_804F7AC
-sub_804F7AC: ; 804F7AC
+sub_804F7AC: @ 804F7AC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -127381,7 +127381,7 @@ _0804FD78:
 	thumb_func_end sub_804F7AC
 
 	thumb_func_start atk77_setprotect
-atk77_setprotect: ; 804FD8C
+atk77_setprotect: @ 804FD8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -127519,7 +127519,7 @@ _0804FEA2:
 	thumb_func_end atk77_setprotect
 
 	thumb_func_start atk78_faintifabilitynotdamp
-atk78_faintifabilitynotdamp: ; 804FEC8
+atk78_faintifabilitynotdamp: @ 804FEC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -127641,7 +127641,7 @@ _0804FFCC:
 	thumb_func_end atk78_faintifabilitynotdamp
 
 	thumb_func_start atk79_setuserhptozero
-atk79_setuserhptozero: ; 804FFE4
+atk79_setuserhptozero: @ 804FFE4
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024068
@@ -127683,7 +127683,7 @@ _08050028:
 	thumb_func_end atk79_setuserhptozero
 
 	thumb_func_start sub_8050044
-sub_8050044: ; 8050044
+sub_8050044: @ 8050044
 	push {r4-r7,lr}
 	ldr r3, =0x02024214
 	ldr r2, [r3]
@@ -127760,7 +127760,7 @@ _080500E0:
 	thumb_func_end sub_8050044
 
 	thumb_func_start sub_80500E8
-sub_80500E8: ; 80500E8
+sub_80500E8: @ 80500E8
 	push {r4-r6,lr}
 	ldr r4, =0x02024214
 	ldr r1, [r4]
@@ -127820,7 +127820,7 @@ _0805015E:
 	thumb_func_end sub_80500E8
 
 	thumb_func_start sub_8050164
-sub_8050164: ; 8050164
+sub_8050164: @ 8050164
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -127976,7 +127976,7 @@ _080502AE:
 	thumb_func_end sub_8050164
 
 	thumb_func_start sub_80502C8
-sub_80502C8: ; 80502C8
+sub_80502C8: @ 80502C8
 	push {lr}
 	ldr r2, =0x020243cc
 	ldrh r0, [r2]
@@ -128014,7 +128014,7 @@ _08050304:
 	thumb_func_end sub_80502C8
 
 	thumb_func_start atk7E_setreflect
-atk7E_setreflect: ; 805031C
+atk7E_setreflect: @ 805031C
 	push {r4-r6,lr}
 	ldr r6, =0x0202420b
 	ldrb r0, [r6]
@@ -128103,7 +128103,7 @@ _080503D2:
 	thumb_func_end atk7E_setreflect
 
 	thumb_func_start sub_80503E8
-sub_80503E8: ; 80503E8
+sub_80503E8: @ 80503E8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -128192,7 +128192,7 @@ _08050488:
 	thumb_func_end sub_80503E8
 
 	thumb_func_start atk80_manipulatedamage
-atk80_manipulatedamage: ; 80504A8
+atk80_manipulatedamage: @ 80504A8
 	push {r4,lr}
 	ldr r1, =0x02024214
 	ldr r0, [r1]
@@ -128258,7 +128258,7 @@ _08050518:
 	thumb_func_end atk80_manipulatedamage
 
 	thumb_func_start atk81_setrest
-atk81_setrest: ; 8050528
+atk81_setrest: @ 8050528
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024214
@@ -128353,7 +128353,7 @@ _080505E8:
 	thumb_func_end atk81_setrest
 
 	thumb_func_start atk82_jumpifnotfirstturn
-atk82_jumpifnotfirstturn: ; 80505F8
+atk82_jumpifnotfirstturn: @ 80505F8
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r4, [r5]
@@ -128390,7 +128390,7 @@ _0805063A:
 	thumb_func_end atk82_jumpifnotfirstturn
 
 	thumb_func_start sub_8050640
-sub_8050640: ; 8050640
+sub_8050640: @ 8050640
 	ldr r1, =0x02024214
 	ldr r0, [r1]
 	adds r0, 0x1
@@ -128400,7 +128400,7 @@ sub_8050640: ; 8050640
 	thumb_func_end sub_8050640
 
 	thumb_func_start sub_8050650
-sub_8050650: ; 8050650
+sub_8050650: @ 8050650
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -128478,7 +128478,7 @@ _080506E2:
 	thumb_func_end sub_8050650
 
 	thumb_func_start sub_80506EC
-sub_80506EC: ; 80506EC
+sub_80506EC: @ 80506EC
 	push {r4-r6,lr}
 	ldr r5, =0x02024214
 	ldr r1, [r5]
@@ -128537,7 +128537,7 @@ _08050762:
 	thumb_func_end sub_80506EC
 
 	thumb_func_start sub_8050768
-sub_8050768: ; 8050768
+sub_8050768: @ 8050768
 	push {r4,r5,lr}
 	ldr r5, =0x020242bc
 	ldr r4, =0x0202420b
@@ -128593,7 +128593,7 @@ _080507CA:
 	thumb_func_end sub_8050768
 
 	thumb_func_start atk86_stockpiletobasedamage
-atk86_stockpiletobasedamage: ; 80507E4
+atk86_stockpiletobasedamage: @ 80507E4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -128714,7 +128714,7 @@ _080508CA:
 	thumb_func_end atk86_stockpiletobasedamage
 
 	thumb_func_start atk87_stockpiletohprecovery
-atk87_stockpiletohprecovery: ; 8050904
+atk87_stockpiletohprecovery: @ 8050904
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -128816,7 +128816,7 @@ _080509D0:
 	thumb_func_end atk87_stockpiletohprecovery
 
 	thumb_func_start atk88_negativedamage
-atk88_negativedamage: ; 80509E8
+atk88_negativedamage: @ 80509E8
 	push {lr}
 	ldr r2, =0x020241f0
 	ldr r0, =0x020241f4
@@ -128842,7 +128842,7 @@ _08050A04:
 	thumb_func_end atk88_negativedamage
 
 	thumb_func_start sub_8050A1C
-sub_8050A1C: ; 8050A1C
+sub_8050A1C: @ 8050A1C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -129356,7 +129356,7 @@ _08050E80:
 	thumb_func_end sub_8050A1C
 
 	thumb_func_start atk89_statbuffchange
-atk89_statbuffchange: ; 8050EA0
+atk89_statbuffchange: @ 8050EA0
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r2, [r5]
@@ -129394,7 +129394,7 @@ _08050EDC:
 	thumb_func_end atk89_statbuffchange
 
 	thumb_func_start atk8A_normalisebuffs
-atk8A_normalisebuffs: ; 8050EEC
+atk8A_normalisebuffs: @ 8050EEC
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r0, =0x0202406c
@@ -129437,7 +129437,7 @@ _08050F24:
 	thumb_func_end atk8A_normalisebuffs
 
 	thumb_func_start atk8B_setbide
-atk8B_setbide: ; 8050F40
+atk8B_setbide: @ 8050F40
 	push {r4,r5,lr}
 	ldr r4, =0x02024084
 	ldr r3, =0x0202420b
@@ -129485,7 +129485,7 @@ atk8B_setbide: ; 8050F40
 	thumb_func_end atk8B_setbide
 
 	thumb_func_start atk8C_confuseifrepeatingattackends
-atk8C_confuseifrepeatingattackends: ; 8050FB0
+atk8C_confuseifrepeatingattackends: @ 8050FB0
 	push {lr}
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
@@ -129514,7 +129514,7 @@ _08050FD2:
 	thumb_func_end atk8C_confuseifrepeatingattackends
 
 	thumb_func_start atk8D_setloopcounter
-atk8D_setloopcounter: ; 8050FF0
+atk8D_setloopcounter: @ 8050FF0
 	push {r4,r5,lr}
 	ldr r0, =0x02024214
 	ldr r0, [r0]
@@ -129550,7 +129550,7 @@ _08051026:
 	thumb_func_end atk8D_setloopcounter
 
 	thumb_func_start atk8E_cmd8e
-atk8E_cmd8e: ; 805103C
+atk8E_cmd8e: @ 805103C
 	ldr r1, =0x02024474
 	movs r2, 0
 	movs r0, 0xFD
@@ -129571,7 +129571,7 @@ atk8E_cmd8e: ; 805103C
 	thumb_func_end atk8E_cmd8e
 
 	thumb_func_start sub_8051064
-sub_8051064: ; 8051064
+sub_8051064: @ 8051064
 	push {r4-r7,lr}
 	ldr r6, =0x02024084
 	ldr r7, =0x0202420b
@@ -129661,7 +129661,7 @@ _08051116:
 	thumb_func_end sub_8051064
 
 	thumb_func_start sub_805112C
-sub_805112C: ; 805112C
+sub_805112C: @ 805112C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -130022,7 +130022,7 @@ _08051414:
 	thumb_func_end sub_805112C
 
 	thumb_func_start sub_8051424
-sub_8051424: ; 8051424
+sub_8051424: @ 8051424
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -130233,7 +130233,7 @@ _080515B0:
 	thumb_func_end sub_8051424
 
 	thumb_func_start atk91_givemoney
-atk91_givemoney: ; 80515C8
+atk91_givemoney: @ 80515C8
 	push {r4,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -130297,7 +130297,7 @@ _08051658:
 	thumb_func_end atk91_givemoney
 
 	thumb_func_start atk92_setlightscreen
-atk92_setlightscreen: ; 8051664
+atk92_setlightscreen: @ 8051664
 	push {r4-r6,lr}
 	ldr r5, =0x0202420b
 	ldrb r0, [r5]
@@ -130385,7 +130385,7 @@ _08051718:
 	thumb_func_end atk92_setlightscreen
 
 	thumb_func_start atk93_ko_move
-atk93_ko_move: ; 8051730
+atk93_ko_move: @ 8051730
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -130753,7 +130753,7 @@ _08051A70:
 	thumb_func_end atk93_ko_move
 
 	thumb_func_start atk94_gethalfcurrentenemyhp
-atk94_gethalfcurrentenemyhp: ; 8051A84
+atk94_gethalfcurrentenemyhp: @ 8051A84
 	push {lr}
 	ldr r3, =0x020241f0
 	ldr r2, =0x02024084
@@ -130780,7 +130780,7 @@ _08051AA2:
 	thumb_func_end atk94_gethalfcurrentenemyhp
 
 	thumb_func_start sub_8051AC0
-sub_8051AC0: ; 8051AC0
+sub_8051AC0: @ 8051AC0
 	push {lr}
 	ldr r2, =0x020243cc
 	ldrh r1, [r2]
@@ -130819,7 +130819,7 @@ _08051AFE:
 	thumb_func_end sub_8051AC0
 
 	thumb_func_start sub_8051B18
-sub_8051B18: ; 8051B18
+sub_8051B18: @ 8051B18
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -130992,7 +130992,7 @@ _08051C6A:
 	thumb_func_end sub_8051B18
 
 	thumb_func_start atk97_tryinfatuatetarget
-atk97_tryinfatuatetarget: ; 8051C90
+atk97_tryinfatuatetarget: @ 8051C90
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -131176,7 +131176,7 @@ _08051E2C:
 	thumb_func_end atk97_tryinfatuatetarget
 
 	thumb_func_start sub_8051E48
-sub_8051E48: ; 8051E48
+sub_8051E48: @ 8051E48
 	push {r4-r7,lr}
 	ldr r0, =0x02024068
 	ldr r0, [r0]
@@ -131290,7 +131290,7 @@ _08051F34:
 	thumb_func_end sub_8051E48
 
 	thumb_func_start atk99_setmisteffect
-atk99_setmisteffect: ; 8051F58
+atk99_setmisteffect: @ 8051F58
 	push {r4-r6,lr}
 	ldr r6, =0x02024294
 	ldr r4, =0x0202420b
@@ -131364,7 +131364,7 @@ _08051FE6:
 	thumb_func_end atk99_setmisteffect
 
 	thumb_func_start atk9A_setincreasedcriticalchance
-atk9A_setincreasedcriticalchance: ; 8052000
+atk9A_setincreasedcriticalchance: @ 8052000
 	push {lr}
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
@@ -131406,7 +131406,7 @@ _08052048:
 	thumb_func_end atk9A_setincreasedcriticalchance
 
 	thumb_func_start atk9B_transformdataexecution
-atk9B_transformdataexecution: ; 805205C
+atk9B_transformdataexecution: @ 805205C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -131592,7 +131592,7 @@ _080521EC:
 	thumb_func_end atk9B_transformdataexecution
 
 	thumb_func_start sub_80521FC
-sub_80521FC: ; 80521FC
+sub_80521FC: @ 80521FC
 	push {r4-r7,lr}
 	ldr r7, =0x02024084
 	ldr r6, =0x0202420b
@@ -131674,7 +131674,7 @@ _08052290:
 	thumb_func_end sub_80521FC
 
 	thumb_func_start sub_80522B8
-sub_80522B8: ; 80522B8
+sub_80522B8: @ 80522B8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -131712,7 +131712,7 @@ _080522E0:
 	thumb_func_end sub_80522B8
 
 	thumb_func_start atk9D_copyattack
-atk9D_copyattack: ; 8052300
+atk9D_copyattack: @ 8052300
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -131930,7 +131930,7 @@ _080524CC:
 	thumb_func_end atk9D_copyattack
 
 	thumb_func_start sub_80524DC
-sub_80524DC: ; 80524DC
+sub_80524DC: @ 80524DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -132001,7 +132001,7 @@ _0805251C:
 	thumb_func_end sub_80524DC
 
 	thumb_func_start atk9F_nightshadedamageeffect
-atk9F_nightshadedamageeffect: ; 8052584
+atk9F_nightshadedamageeffect: @ 8052584
 	ldr r3, =0x020241f0
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420b
@@ -132021,7 +132021,7 @@ atk9F_nightshadedamageeffect: ; 8052584
 	thumb_func_end atk9F_nightshadedamageeffect
 
 	thumb_func_start atkA0_psywavedamageeffect
-atkA0_psywavedamageeffect: ; 80525B4
+atkA0_psywavedamageeffect: @ 80525B4
 	push {r4,lr}
 	movs r4, 0xF
 _080525B8:
@@ -132059,7 +132059,7 @@ _080525B8:
 	thumb_func_end atkA0_psywavedamageeffect
 
 	thumb_func_start atkA1_counterdamagecalculator
-atkA1_counterdamagecalculator: ; 8052608
+atkA1_counterdamagecalculator: @ 8052608
 	push {r4-r6,lr}
 	ldr r4, =0x0202420b
 	ldrb r0, [r4]
@@ -132163,7 +132163,7 @@ _080526EC:
 	thumb_func_end atkA1_counterdamagecalculator
 
 	thumb_func_start atkA2_mirrorcoatdamagecalculator
-atkA2_mirrorcoatdamagecalculator: ; 8052700
+atkA2_mirrorcoatdamagecalculator: @ 8052700
 	push {r4-r6,lr}
 	ldr r4, =0x0202420b
 	ldrb r0, [r4]
@@ -132268,7 +132268,7 @@ _080527E4:
 	thumb_func_end atkA2_mirrorcoatdamagecalculator
 
 	thumb_func_start atkA3_disablelastusedattack
-atkA3_disablelastusedattack: ; 80527F8
+atkA3_disablelastusedattack: @ 80527F8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -132424,7 +132424,7 @@ _0805292A:
 	thumb_func_end atkA3_disablelastusedattack
 
 	thumb_func_start atkA4_setencore
-atkA4_setencore: ; 805293C
+atkA4_setencore: @ 805293C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -132577,7 +132577,7 @@ _08052A5E:
 	thumb_func_end atkA4_setencore
 
 	thumb_func_start sub_8052A70
-sub_8052A70: ; 8052A70
+sub_8052A70: @ 8052A70
 	push {r4-r7,lr}
 	ldr r6, =0x02024084
 	ldr r0, =0x0202420c
@@ -132665,7 +132665,7 @@ _08052B2A:
 	thumb_func_end sub_8052A70
 
 	thumb_func_start atkA6_settypetorandomresistance
-atkA6_settypetorandomresistance: ; 8052B34
+atkA6_settypetorandomresistance: @ 8052B34
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -132901,7 +132901,7 @@ _08052D08:
 	thumb_func_end atkA6_settypetorandomresistance
 
 	thumb_func_start atkA7_setalwayshitflag
-atkA7_setalwayshitflag: ; 8052D34
+atkA7_setalwayshitflag: @ 8052D34
 	push {r4,lr}
 	ldr r4, =0x020242ac
 	ldr r3, =0x0202420c
@@ -132940,7 +132940,7 @@ atkA7_setalwayshitflag: ; 8052D34
 	thumb_func_end atkA7_setalwayshitflag
 
 	thumb_func_start atkA8_copymovepermanently
-atkA8_copymovepermanently: ; 8052D8C
+atkA8_copymovepermanently: @ 8052D8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -133153,7 +133153,7 @@ _08052F32:
 	thumb_func_end atkA8_copymovepermanently
 
 	thumb_func_start sub_8052F48
-sub_8052F48: ; 8052F48
+sub_8052F48: @ 8052F48
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -133187,7 +133187,7 @@ _08052F7E:
 	thumb_func_end sub_8052F48
 
 	thumb_func_start sub_8052F84
-sub_8052F84: ; 8052F84
+sub_8052F84: @ 8052F84
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -133214,7 +133214,7 @@ _08052FA8:
 	thumb_func_end sub_8052F84
 
 	thumb_func_start move_weather_interaction
-move_weather_interaction: ; 8052FAC
+move_weather_interaction: @ 8052FAC
 	push {lr}
 	lsls r1, 16
 	lsrs r2, r1, 16
@@ -133270,7 +133270,7 @@ _08053012:
 	thumb_func_end move_weather_interaction
 
 	thumb_func_start sub_8053018
-sub_8053018: ; 8053018
+sub_8053018: @ 8053018
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -133406,7 +133406,7 @@ _0805311C:
 	thumb_func_end sub_8053018
 
 	thumb_func_start atkAA_destinybondeffect
-atkAA_destinybondeffect: ; 8053150
+atkAA_destinybondeffect: @ 8053150
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
 	ldrb r2, [r0]
@@ -133428,7 +133428,7 @@ atkAA_destinybondeffect: ; 8053150
 	thumb_func_end atkAA_destinybondeffect
 
 	thumb_func_start b_feature_update_destiny_bond
-b_feature_update_destiny_bond: ; 8053180
+b_feature_update_destiny_bond: @ 8053180
 	push {r4,r5,lr}
 	ldr r0, =0x0202420b
 	ldrb r0, [r0]
@@ -133472,7 +133472,7 @@ _080531CA:
 	thumb_func_end b_feature_update_destiny_bond
 
 	thumb_func_start atkAB_802A458
-atkAB_802A458: ; 80531E0
+atkAB_802A458: @ 80531E0
 	push {lr}
 	bl b_feature_update_destiny_bond
 	ldr r1, =0x02024214
@@ -133485,7 +133485,7 @@ atkAB_802A458: ; 80531E0
 	thumb_func_end atkAB_802A458
 
 	thumb_func_start atkAC_remaininghptopower
-atkAC_remaininghptopower: ; 80531F8
+atkAC_remaininghptopower: @ 80531F8
 	push {lr}
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420b
@@ -133532,7 +133532,7 @@ _08053232:
 	thumb_func_end atkAC_remaininghptopower
 
 	thumb_func_start atkAD_reducepprandom
-atkAD_reducepprandom: ; 8053260
+atkAD_reducepprandom: @ 8053260
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -133755,7 +133755,7 @@ _08053422:
 	thumb_func_end atkAD_reducepprandom
 
 	thumb_func_start atkAE_clearstatusifnotsoundproofed
-atkAE_clearstatusifnotsoundproofed: ; 8053438
+atkAE_clearstatusifnotsoundproofed: @ 8053438
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -134070,7 +134070,7 @@ _080536DE:
 	thumb_func_end atkAE_clearstatusifnotsoundproofed
 
 	thumb_func_start atkAF_cursetarget
-atkAF_cursetarget: ; 805371C
+atkAF_cursetarget: @ 805371C
 	push {r4,r5,lr}
 	ldr r5, =0x02024084
 	ldr r0, =0x0202420c
@@ -134131,7 +134131,7 @@ _0805378C:
 	thumb_func_end atkAF_cursetarget
 
 	thumb_func_start atkB0_setspikes
-atkB0_setspikes: ; 80537A0
+atkB0_setspikes: @ 80537A0
 	push {r4,lr}
 	ldr r4, =0x0202420b
 	ldrb r0, [r4]
@@ -134195,7 +134195,7 @@ _0805381E:
 	thumb_func_end atkB0_setspikes
 
 	thumb_func_start atkB1_setforesight
-atkB1_setforesight: ; 805382C
+atkB1_setforesight: @ 805382C
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420c
 	ldrb r2, [r0]
@@ -134217,7 +134217,7 @@ atkB1_setforesight: ; 805382C
 	thumb_func_end atkB1_setforesight
 
 	thumb_func_start atkB2_setperishsong
-atkB2_setperishsong: ; 805385C
+atkB2_setperishsong: @ 805385C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -134306,7 +134306,7 @@ _08053904:
 	thumb_func_end atkB2_setperishsong
 
 	thumb_func_start atkB3_rolloutdamagecalculation
-atkB3_rolloutdamagecalculation: ; 8053914
+atkB3_rolloutdamagecalculation: @ 8053914
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -134482,7 +134482,7 @@ _08053A60:
 	thumb_func_end atkB3_rolloutdamagecalculation
 
 	thumb_func_start atkB4_jumpifconfusedandattackmaxed
-atkB4_jumpifconfusedandattackmaxed: ; 8053A90
+atkB4_jumpifconfusedandattackmaxed: @ 8053A90
 	push {r4,r5,lr}
 	ldr r5, =0x02024084
 	ldr r0, =0x0202420c
@@ -134534,7 +134534,7 @@ _08053AF2:
 	thumb_func_end atkB4_jumpifconfusedandattackmaxed
 
 	thumb_func_start sub_8053AF8
-sub_8053AF8: ; 8053AF8
+sub_8053AF8: @ 8053AF8
 	push {r4,r5,lr}
 	ldr r0, =0x0202427c
 	ldrb r1, [r0]
@@ -134612,7 +134612,7 @@ _08053B8C:
 	thumb_func_end sub_8053AF8
 
 	thumb_func_start atkB6_happinesstodamagecalculation
-atkB6_happinesstodamagecalculation: ; 8053BAC
+atkB6_happinesstodamagecalculation: @ 8053BAC
 	push {r4,lr}
 	ldr r2, =gBattleMoves
 	ldr r0, =0x020241ea
@@ -134665,7 +134665,7 @@ _08053C02:
 	thumb_func_end atkB6_happinesstodamagecalculation
 
 	thumb_func_start atkB7_presentdamagecalculation
-atkB7_presentdamagecalculation: ; 8053C30
+atkB7_presentdamagecalculation: @ 8053C30
 	push {r4,lr}
 	bl GenerateRandomNumber
 	movs r4, 0xFF
@@ -134751,7 +134751,7 @@ _08053CE6:
 	thumb_func_end atkB7_presentdamagecalculation
 
 	thumb_func_start atkB8_setsafeguard
-atkB8_setsafeguard: ; 8053CFC
+atkB8_setsafeguard: @ 8053CFC
 	push {r4-r7,lr}
 	ldr r7, =0x0202420b
 	ldrb r0, [r7]
@@ -134823,7 +134823,7 @@ _08053D88:
 	thumb_func_end atkB8_setsafeguard
 
 	thumb_func_start atkB9_magnitudedamagecalculation
-atkB9_magnitudedamagecalculation: ; 8053DA4
+atkB9_magnitudedamagecalculation: @ 8053DA4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -134953,7 +134953,7 @@ _08053E94:
 	thumb_func_end atkB9_magnitudedamagecalculation
 
 	thumb_func_start atkBA_802B140
-atkBA_802B140: ; 8053EC8
+atkBA_802B140: @ 8053EC8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -135127,7 +135127,7 @@ _0805404A:
 	thumb_func_end atkBA_802B140
 
 	thumb_func_start sub_805405C
-sub_805405C: ; 805405C
+sub_805405C: @ 805405C
 	push {lr}
 	ldr r2, =0x020243cc
 	ldrh r1, [r2]
@@ -135166,7 +135166,7 @@ _0805409A:
 	thumb_func_end sub_805405C
 
 	thumb_func_start atkBC_maxattackhalvehp
-atkBC_maxattackhalvehp: ; 80540B4
+atkBC_maxattackhalvehp: @ 80540B4
 	push {r4,r5,lr}
 	ldr r5, =0x02024084
 	ldr r4, =0x0202420b
@@ -135229,7 +135229,7 @@ _0805412A:
 	thumb_func_end atkBC_maxattackhalvehp
 
 	thumb_func_start atkBD_copyfoestats
-atkBD_copyfoestats: ; 8054134
+atkBD_copyfoestats: @ 8054134
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r7, =0x02024214
@@ -135262,7 +135262,7 @@ _08054142:
 	thumb_func_end atkBD_copyfoestats
 
 	thumb_func_start atkBE_breakfree
-atkBE_breakfree: ; 805417C
+atkBE_breakfree: @ 805417C
 	push {r4-r6,lr}
 	ldr r1, =0x02024084
 	ldr r5, =0x0202420b
@@ -135395,7 +135395,7 @@ _080542BA:
 	thumb_func_end atkBE_breakfree
 
 	thumb_func_start atkBF_setcurled
-atkBF_setcurled: ; 80542C8
+atkBF_setcurled: @ 80542C8
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
 	ldrb r2, [r0]
@@ -135417,7 +135417,7 @@ atkBF_setcurled: ; 80542C8
 	thumb_func_end atkBF_setcurled
 
 	thumb_func_start atkC0_recoverbasedonsunlight
-atkC0_recoverbasedonsunlight: ; 80542F8
+atkC0_recoverbasedonsunlight: @ 80542F8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x0202420c
@@ -135539,7 +135539,7 @@ _080543F2:
 	thumb_func_end atkC0_recoverbasedonsunlight
 
 	thumb_func_start sub_8054400
-sub_8054400: ; 8054400
+sub_8054400: @ 8054400
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -135679,7 +135679,7 @@ _080544F0:
 	thumb_func_end sub_8054400
 
 	thumb_func_start atkC2_selectnexttarget
-atkC2_selectnexttarget: ; 8054524
+atkC2_selectnexttarget: @ 8054524
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -135733,7 +135733,7 @@ _0805456E:
 	thumb_func_end atkC2_selectnexttarget
 
 	thumb_func_start atkC3_setfutureattack
-atkC3_setfutureattack: ; 8054598
+atkC3_setfutureattack: @ 8054598
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -135882,7 +135882,7 @@ _080546CC:
 	thumb_func_end atkC3_setfutureattack
 
 	thumb_func_start atkC4_802B910
-atkC4_802B910: ; 80546E4
+atkC4_802B910: @ 80546E4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -136113,7 +136113,7 @@ _080548E2:
 	thumb_func_end atkC4_802B910
 
 	thumb_func_start atkC5_hidepreattack
-atkC5_hidepreattack: ; 80548F4
+atkC5_hidepreattack: @ 80548F4
 	push {lr}
 	ldr r0, =0x020241ea
 	ldrh r1, [r0]
@@ -136175,7 +136175,7 @@ _08054960:
 	thumb_func_end atkC5_hidepreattack
 
 	thumb_func_start atkC6_unhidepostattack
-atkC6_unhidepostattack: ; 8054978
+atkC6_unhidepostattack: @ 8054978
 	push {lr}
 	ldr r0, =0x020241ea
 	ldrh r1, [r0]
@@ -136238,7 +136238,7 @@ _080549EA:
 	thumb_func_end atkC6_unhidepostattack
 
 	thumb_func_start atkC7_setminimize
-atkC7_setminimize: ; 8054A08
+atkC7_setminimize: @ 8054A08
 	push {lr}
 	ldr r0, =0x02024280
 	ldr r0, [r0]
@@ -136268,7 +136268,7 @@ _08054A2C:
 	thumb_func_end atkC7_setminimize
 
 	thumb_func_start sub_8054A48
-sub_8054A48: ; 8054A48
+sub_8054A48: @ 8054A48
 	push {lr}
 	ldr r3, =0x020243cc
 	ldrh r1, [r3]
@@ -136306,7 +136306,7 @@ _08054A86:
 	thumb_func_end sub_8054A48
 
 	thumb_func_start atkC9_jumpifattackandspecialattackcannotfall
-atkC9_jumpifattackandspecialattackcannotfall: ; 8054AA0
+atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0
 	push {r4,lr}
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420c
@@ -136371,7 +136371,7 @@ _08054B20:
 	thumb_func_end atkC9_jumpifattackandspecialattackcannotfall
 
 	thumb_func_start atkCA_setforcedtarget
-atkCA_setforcedtarget: ; 8054B3C
+atkCA_setforcedtarget: @ 8054B3C
 	push {r4,r5,lr}
 	ldr r4, =0x0202420b
 	ldrb r0, [r4]
@@ -136406,7 +136406,7 @@ atkCA_setforcedtarget: ; 8054B3C
 	thumb_func_end atkCA_setforcedtarget
 
 	thumb_func_start atkCB_setcharge
-atkCB_setcharge: ; 8054B88
+atkCB_setcharge: @ 8054B88
 	push {r4,lr}
 	ldr r0, =0x020242ac
 	ldr r3, =0x0202420b
@@ -136453,7 +136453,7 @@ atkCB_setcharge: ; 8054B88
 	thumb_func_end atkCB_setcharge
 
 	thumb_func_start atkCC_callterrainattack
-atkCC_callterrainattack: ; 8054BEC
+atkCC_callterrainattack: @ 8054BEC
 	push {r4,lr}
 	ldr r2, =0x02024280
 	ldr r0, [r2]
@@ -136496,7 +136496,7 @@ atkCC_callterrainattack: ; 8054BEC
 	thumb_func_end atkCC_callterrainattack
 
 	thumb_func_start atkCD_cureifburnedparalysedorpoisoned
-atkCD_cureifburnedparalysedorpoisoned: ; 8054C60
+atkCD_cureifburnedparalysedorpoisoned: @ 8054C60
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r1, =0x02024084
@@ -136557,7 +136557,7 @@ _08054CD6:
 	thumb_func_end atkCD_cureifburnedparalysedorpoisoned
 
 	thumb_func_start atkCE_settorment
-atkCE_settorment: ; 8054CE4
+atkCE_settorment: @ 8054CE4
 	push {lr}
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420c
@@ -136600,7 +136600,7 @@ _08054D34:
 	thumb_func_end atkCE_settorment
 
 	thumb_func_start atkCF_jumpifnodamage
-atkCF_jumpifnodamage: ; 8054D3C
+atkCF_jumpifnodamage: @ 8054D3C
 	push {lr}
 	ldr r2, =0x0202433c
 	ldr r0, =0x0202420b
@@ -136645,7 +136645,7 @@ _08054D8E:
 	thumb_func_end atkCF_jumpifnodamage
 
 	thumb_func_start atkD0_settaunt
-atkD0_settaunt: ; 8054D98
+atkD0_settaunt: @ 8054D98
 	push {r4,lr}
 	ldr r4, =0x020242bc
 	ldr r3, =0x0202420c
@@ -136703,7 +136703,7 @@ _08054E02:
 	thumb_func_end atkD0_settaunt
 
 	thumb_func_start atkD1_sethelpinghand
-atkD1_sethelpinghand: ; 8054E0C
+atkD1_sethelpinghand: @ 8054E0C
 	push {r4,lr}
 	ldr r4, =0x0202420b
 	ldrb r0, [r4]
@@ -136776,7 +136776,7 @@ _08054EAA:
 	thumb_func_end atkD1_sethelpinghand
 
 	thumb_func_start sub_8054EB4
-sub_8054EB4: ; 8054EB4
+sub_8054EB4: @ 8054EB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -137072,7 +137072,7 @@ _08055132:
 	thumb_func_end sub_8054EB4
 
 	thumb_func_start sub_8055148
-sub_8055148: ; 8055148
+sub_8055148: @ 8055148
 	push {r4,lr}
 	ldr r3, =0x02024084
 	ldr r4, =0x0202420c
@@ -137128,7 +137128,7 @@ _080551B6:
 	thumb_func_end sub_8055148
 
 	thumb_func_start atkD4_802C408
-atkD4_802C408: ; 80551C0
+atkD4_802C408: @ 80551C0
 	push {r4-r7,lr}
 	ldr r7, =0x02024214
 	ldr r2, [r7]
@@ -137228,7 +137228,7 @@ _0805528C:
 	thumb_func_end atkD4_802C408
 
 	thumb_func_start sub_8055294
-sub_8055294: ; 8055294
+sub_8055294: @ 8055294
 	push {lr}
 	ldr r1, =0x020242ac
 	ldr r0, =0x0202420b
@@ -137271,7 +137271,7 @@ _080552E4:
 	thumb_func_end sub_8055294
 
 	thumb_func_start atkD6_doubledamagedealtifdamaged
-atkD6_doubledamagedealtifdamaged: ; 80552EC
+atkD6_doubledamagedealtifdamaged: @ 80552EC
 	push {lr}
 	ldr r3, =0x0202433c
 	ldr r0, =0x0202420b
@@ -137316,7 +137316,7 @@ _0805532A:
 	thumb_func_end atkD6_doubledamagedealtifdamaged
 
 	thumb_func_start sub_805534C
-sub_805534C: ; 805534C
+sub_805534C: @ 805534C
 	push {r4,lr}
 	ldr r1, =0x020242ac
 	ldr r0, =0x0202420c
@@ -137370,7 +137370,7 @@ _080553B0:
 	thumb_func_end sub_805534C
 
 	thumb_func_start atkD8_setdamagetohealthdifference
-atkD8_setdamagetohealthdifference: ; 80553BC
+atkD8_setdamagetohealthdifference: @ 80553BC
 	push {lr}
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420c
@@ -137418,7 +137418,7 @@ _0805541A:
 	thumb_func_end atkD8_setdamagetohealthdifference
 
 	thumb_func_start atkD9_scaledamagebyhealthratio
-atkD9_scaledamagebyhealthratio: ; 8055428
+atkD9_scaledamagebyhealthratio: @ 8055428
 	push {r4,lr}
 	ldr r4, =0x02024400
 	ldrh r0, [r4]
@@ -137460,7 +137460,7 @@ _08055464:
 	thumb_func_end atkD9_scaledamagebyhealthratio
 
 	thumb_func_start atkDA_abilityswap
-atkDA_abilityswap: ; 805548C
+atkDA_abilityswap: @ 805548C
 	push {r4-r6,lr}
 	ldr r5, =0x02024084
 	ldr r0, =0x0202420b
@@ -137534,7 +137534,7 @@ _0805551A:
 	thumb_func_end atkDA_abilityswap
 
 	thumb_func_start atkDB_imprisoneffect
-atkDB_imprisoneffect: ; 8055524
+atkDB_imprisoneffect: @ 8055524
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -137666,7 +137666,7 @@ _08055610:
 	thumb_func_end atkDB_imprisoneffect
 
 	thumb_func_start atkDC_setgrudge
-atkDC_setgrudge: ; 805562C
+atkDC_setgrudge: @ 805562C
 	push {lr}
 	ldr r1, =0x020242ac
 	ldr r0, =0x0202420b
@@ -137709,7 +137709,7 @@ _0805567C:
 	thumb_func_end atkDC_setgrudge
 
 	thumb_func_start atkDD_weightdamagecalculation
-atkDD_weightdamagecalculation: ; 8055684
+atkDD_weightdamagecalculation: @ 8055684
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -137779,7 +137779,7 @@ _08055702:
 	thumb_func_end atkDD_weightdamagecalculation
 
 	thumb_func_start atkDE_asistattackselect
-atkDE_asistattackselect: ; 805571C
+atkDE_asistattackselect: @ 805571C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -137952,7 +137952,7 @@ _08055886:
 	thumb_func_end atkDE_asistattackselect
 
 	thumb_func_start atkDF_setmagiccoat
-atkDF_setmagiccoat: ; 805589C
+atkDF_setmagiccoat: @ 805589C
 	push {lr}
 	ldr r1, =0x0202420c
 	ldr r3, =0x0202420b
@@ -138010,7 +138010,7 @@ _08055914:
 	thumb_func_end atkDF_setmagiccoat
 
 	thumb_func_start atkE0_setstealstatchange
-atkE0_setstealstatchange: ; 8055920
+atkE0_setstealstatchange: @ 8055920
 	push {lr}
 	ldr r2, =0x0202437c
 	ldr r3, =0x0202420b
@@ -138064,7 +138064,7 @@ _0805598E:
 	thumb_func_end atkE0_setstealstatchange
 
 	thumb_func_start atkE1_802CBE4
-atkE1_802CBE4: ; 805599C
+atkE1_802CBE4: @ 805599C
 	push {r4-r6,lr}
 	ldr r4, =0x02024474
 	ldr r0, =0x0202449c
@@ -138162,7 +138162,7 @@ _08055A6C:
 	thumb_func_end atkE1_802CBE4
 
 	thumb_func_start atkE2_cmde2
-atkE2_cmde2: ; 8055A78
+atkE2_cmde2: @ 8055A78
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024214
@@ -138217,7 +138217,7 @@ _08055AD2:
 	thumb_func_end atkE2_cmde2
 
 	thumb_func_start atkE3_jumpiffainted
-atkE3_jumpiffainted: ; 8055AF4
+atkE3_jumpiffainted: @ 8055AF4
 	push {r4,lr}
 	ldr r4, =0x02024214
 	ldr r0, [r4]
@@ -138258,7 +138258,7 @@ _08055B42:
 	thumb_func_end atkE3_jumpiffainted
 
 	thumb_func_start sub_8055B48
-sub_8055B48: ; 8055B48
+sub_8055B48: @ 8055B48
 	push {lr}
 	ldr r0, =0x02022ff0
 	ldrb r0, [r0]
@@ -138335,7 +138335,7 @@ _08055BE8:
 	thumb_func_end sub_8055B48
 
 	thumb_func_start atkE5_pickupitemcalculation
-atkE5_pickupitemcalculation: ; 8055C00
+atkE5_pickupitemcalculation: @ 8055C00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -138570,7 +138570,7 @@ _08055DD8:
 	thumb_func_end atkE5_pickupitemcalculation
 
 	thumb_func_start atkE6_castform_transform
-atkE6_castform_transform: ; 8055DFC
+atkE6_castform_transform: @ 8055DFC
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldr r0, =0x02024474
@@ -138615,7 +138615,7 @@ _08055E2C:
 	thumb_func_end atkE6_castform_transform
 
 	thumb_func_start atkE7_castform_switch
-atkE7_castform_switch: ; 8055E64
+atkE7_castform_switch: @ 8055E64
 	push {r4,lr}
 	ldr r1, =0x02024214
 	ldr r0, [r1]
@@ -138643,7 +138643,7 @@ _08055E8E:
 	thumb_func_end atkE7_castform_switch
 
 	thumb_func_start atkE8_settypebasedhalvers
-atkE8_settypebasedhalvers: ; 8055EA4
+atkE8_settypebasedhalvers: @ 8055EA4
 	push {r4,lr}
 	movs r4, 0
 	ldr r2, =gBattleMoves
@@ -138725,7 +138725,7 @@ _08055F52:
 	thumb_func_end atkE8_settypebasedhalvers
 
 	thumb_func_start atkE9_seteffectbyweather
-atkE9_seteffectbyweather: ; 8055F5C
+atkE9_seteffectbyweather: @ 8055F5C
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -138814,7 +138814,7 @@ _08055FFC:
 	thumb_func_end atkE9_seteffectbyweather
 
 	thumb_func_start atkEA_recycleitem
-atkEA_recycleitem: ; 8056014
+atkEA_recycleitem: @ 8056014
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r7, =0x02024064
@@ -138888,7 +138888,7 @@ _080560AE:
 	thumb_func_end atkEA_recycleitem
 
 	thumb_func_start atkEB_settypetoterrain
-atkEB_settypetoterrain: ; 80560BC
+atkEB_settypetoterrain: @ 80560BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -138970,7 +138970,7 @@ _0805615E:
 	thumb_func_end atkEB_settypetoterrain
 
 	thumb_func_start atkEC_802D2A0
-atkEC_802D2A0: ; 805616C
+atkEC_802D2A0: @ 805616C
 	push {r4-r6,lr}
 	ldr r5, =0x0202420b
 	ldrb r0, [r5]
@@ -139050,7 +139050,7 @@ _08056226:
 	thumb_func_end atkEC_802D2A0
 
 	thumb_func_start atkED_802D364
-atkED_802D364: ; 8056230
+atkED_802D364: @ 8056230
 	push {r4,lr}
 	ldr r1, =0x0202420e
 	ldr r3, =0x0202420b
@@ -139087,7 +139087,7 @@ _0805626A:
 	thumb_func_end atkED_802D364
 
 	thumb_func_start atkEE_removereflectlightscreen
-atkEE_removereflectlightscreen: ; 8056284
+atkEE_removereflectlightscreen: @ 8056284
 	push {r4,lr}
 	ldr r0, =0x0202420b
 	ldrb r0, [r0]
@@ -139141,7 +139141,7 @@ _080562EA:
 	thumb_func_end atkEE_removereflectlightscreen
 
 	thumb_func_start sub_8056300
-sub_8056300: ; 8056300
+sub_8056300: @ 8056300
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r0, =0x02024068
@@ -139526,7 +139526,7 @@ _08056696:
 	thumb_func_end sub_8056300
 
 	thumb_func_start atkF0_catch_pokemon
-atkF0_catch_pokemon: ; 80566A8
+atkF0_catch_pokemon: @ 80566A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -139693,7 +139693,7 @@ _08056792:
 	thumb_func_end atkF0_catch_pokemon
 
 	thumb_func_start atkF1_802D95C
-atkF1_802D95C: ; 8056850
+atkF1_802D95C: @ 8056850
 	push {r4,r5,lr}
 	ldr r4, =0x02024744
 	adds r0, r4, 0
@@ -139751,7 +139751,7 @@ _080568C2:
 	thumb_func_end atkF1_802D95C
 
 	thumb_func_start sub_80568CC
-sub_80568CC: ; 80568CC
+sub_80568CC: @ 80568CC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024744
@@ -139903,7 +139903,7 @@ _08056A2C:
 	thumb_func_end sub_80568CC
 
 	thumb_func_start sub_8056A3C
-sub_8056A3C: ; 8056A3C
+sub_8056A3C: @ 8056A3C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -140061,7 +140061,7 @@ _08056B62:
 	thumb_func_end sub_8056A3C
 
 	thumb_func_start sub_8056B74
-sub_8056B74: ; 8056B74
+sub_8056B74: @ 8056B74
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -140091,7 +140091,7 @@ sub_8056B74: ; 8056B74
 	thumb_func_end sub_8056B74
 
 	thumb_func_start sub_8056BAC
-sub_8056BAC: ; 8056BAC
+sub_8056BAC: @ 8056BAC
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -140123,7 +140123,7 @@ sub_8056BAC: ; 8056BAC
 	thumb_func_end sub_8056BAC
 
 	thumb_func_start atkF3_receive_new_pokemon_maybe
-atkF3_receive_new_pokemon_maybe: ; 8056BEC
+atkF3_receive_new_pokemon_maybe: @ 8056BEC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -140400,7 +140400,7 @@ _08056E62:
 	thumb_func_end atkF3_receive_new_pokemon_maybe
 
 	thumb_func_start sub_8056E78
-sub_8056E78: ; 8056E78
+sub_8056E78: @ 8056E78
 	ldr r2, =0x02024084
 	ldr r0, =0x0202420b
 	ldrb r1, [r0]
@@ -140421,7 +140421,7 @@ sub_8056E78: ; 8056E78
 	thumb_func_end sub_8056E78
 
 	thumb_func_start atkF5_reset_attacker_bd_x4C
-atkF5_reset_attacker_bd_x4C: ; 8056EA8
+atkF5_reset_attacker_bd_x4C: @ 8056EA8
 	ldr r1, =0x02024084
 	ldr r0, =0x0202420b
 	ldrb r2, [r0]
@@ -140440,7 +140440,7 @@ atkF5_reset_attacker_bd_x4C: ; 8056EA8
 	thumb_func_end atkF5_reset_attacker_bd_x4C
 
 	thumb_func_start sub_8056ED0
-sub_8056ED0: ; 8056ED0
+sub_8056ED0: @ 8056ED0
 	ldr r1, =0x02024083
 	movs r0, 0xC
 	strb r0, [r1]
@@ -140449,7 +140449,7 @@ sub_8056ED0: ; 8056ED0
 	thumb_func_end sub_8056ED0
 
 	thumb_func_start sub_8056EDC
-sub_8056EDC: ; 8056EDC
+sub_8056EDC: @ 8056EDC
 	ldr r1, =0x02024083
 	movs r0, 0xC
 	strb r0, [r1]
@@ -140462,7 +140462,7 @@ sub_8056EDC: ; 8056EDC
 	thumb_func_end sub_8056EDC
 
 	thumb_func_start sub_8056EF8
-sub_8056EF8: ; 8056EF8
+sub_8056EF8: @ 8056EF8
 	push {r4,r5,lr}
 	ldr r5, =0x02024214
 	ldr r0, [r5]
@@ -140484,7 +140484,7 @@ sub_8056EF8: ; 8056EF8
 	thumb_func_end sub_8056EF8
 
 	thumb_func_start sub_8056F28
-sub_8056F28: ; 8056F28
+sub_8056F28: @ 8056F28
 	push {r4-r6,lr}
 	ldr r5, =0x020244a8
 	ldr r6, =0x02022fec
@@ -140582,7 +140582,7 @@ _08056FFA:
 	thumb_func_end sub_8056F28
 
 	thumb_func_start sub_8057028
-sub_8057028: ; 8057028
+sub_8057028: @ 8057028
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -140661,7 +140661,7 @@ _080570D0:
 	thumb_func_end sub_8057028
 
 	thumb_func_start sub_80570F4
-sub_80570F4: ; 80570F4
+sub_80570F4: @ 80570F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -140765,7 +140765,7 @@ _080571CE:
 	thumb_func_end sub_80570F4
 
 	thumb_func_start sub_80571DC
-sub_80571DC: ; 80571DC
+sub_80571DC: @ 80571DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -140826,7 +140826,7 @@ _08057248:
 	thumb_func_end sub_80571DC
 
 	thumb_func_start sub_805725C
-sub_805725C: ; 805725C
+sub_805725C: @ 805725C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -141056,12 +141056,12 @@ _08057430:
 	thumb_func_end sub_805725C
 
 	thumb_func_start nullsub_21
-nullsub_21: ; 8057458
+nullsub_21: @ 8057458
 	bx lr
 	thumb_func_end nullsub_21
 
 	thumb_func_start sub_805745C
-sub_805745C: ; 805745C
+sub_805745C: @ 805745C
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -141079,7 +141079,7 @@ sub_805745C: ; 805745C
 	thumb_func_end sub_805745C
 
 	thumb_func_start dp01_tbl1_exec_completed
-dp01_tbl1_exec_completed: ; 805748C
+dp01_tbl1_exec_completed: @ 805748C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -141129,7 +141129,7 @@ _080574F2:
 	thumb_func_end dp01_tbl1_exec_completed
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl1
-bx_exec_buffer_A_ch0_tbl1: ; 8057504
+bx_exec_buffer_A_ch0_tbl1: @ 8057504
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -141164,7 +141164,7 @@ _08057550:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl1
 
 	thumb_func_start bx_0802E404
-bx_0802E404: ; 8057554
+bx_0802E404: @ 8057554
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -141188,7 +141188,7 @@ _08057576:
 	thumb_func_end bx_0802E404
 
 	thumb_func_start sub_8057588
-sub_8057588: ; 8057588
+sub_8057588: @ 8057588
 	push {r4-r7,lr}
 	ldr r3, =0x02023064
 	ldr r4, =0x02024064
@@ -141461,7 +141461,7 @@ _080577E8:
 	thumb_func_end sub_8057588
 
 	thumb_func_start sub_80577F0
-sub_80577F0: ; 80577F0
+sub_80577F0: @ 80577F0
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -141483,7 +141483,7 @@ sub_80577F0: ; 80577F0
 	thumb_func_end sub_80577F0
 
 	thumb_func_start sub_8057824
-sub_8057824: ; 8057824
+sub_8057824: @ 8057824
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =gUnknown_0831C5F8
@@ -141897,7 +141897,7 @@ _08057BC8:
 	thumb_func_end sub_8057824
 
 	thumb_func_start sub_8057BFC
-sub_8057BFC: ; 8057BFC
+sub_8057BFC: @ 8057BFC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -142316,7 +142316,7 @@ _08057F9E:
 	thumb_func_end sub_8057BFC
 
 	thumb_func_start sub_8057FBC
-sub_8057FBC: ; 8057FBC
+sub_8057FBC: @ 8057FBC
 	push {r4-r7,lr}
 	movs r7, 0
 	ldr r4, =0x030022c0
@@ -142490,7 +142490,7 @@ _08058116:
 	thumb_func_end sub_8057FBC
 
 	thumb_func_start sub_8058138
-sub_8058138: ; 8058138
+sub_8058138: @ 8058138
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -143167,7 +143167,7 @@ _080586E8:
 	thumb_func_end sub_8058138
 
 	thumb_func_start sub_80586F8
-sub_80586F8: ; 80586F8
+sub_80586F8: @ 80586F8
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -143235,7 +143235,7 @@ _08058798:
 	thumb_func_end sub_80586F8
 
 	thumb_func_start sub_80587B0
-sub_80587B0: ; 80587B0
+sub_80587B0: @ 80587B0
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -143295,7 +143295,7 @@ _08058832:
 	thumb_func_end sub_80587B0
 
 	thumb_func_start sub_8058844
-sub_8058844: ; 8058844
+sub_8058844: @ 8058844
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -143320,7 +143320,7 @@ _08058868:
 	thumb_func_end sub_8058844
 
 	thumb_func_start sub_805887C
-sub_805887C: ; 805887C
+sub_805887C: @ 805887C
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -143345,7 +143345,7 @@ _080588A0:
 	thumb_func_end sub_805887C
 
 	thumb_func_start bx_802F7A0
-bx_802F7A0: ; 80588B4
+bx_802F7A0: @ 80588B4
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -143392,7 +143392,7 @@ _08058908:
 	thumb_func_end bx_802F7A0
 
 	thumb_func_start sub_8058924
-sub_8058924: ; 8058924
+sub_8058924: @ 8058924
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -143428,7 +143428,7 @@ _0805895C:
 	thumb_func_end sub_8058924
 
 	thumb_func_start sub_805896C
-sub_805896C: ; 805896C
+sub_805896C: @ 805896C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -143635,7 +143635,7 @@ _08058B08:
 	thumb_func_end sub_805896C
 
 	thumb_func_start sub_8058B40
-sub_8058B40: ; 8058B40
+sub_8058B40: @ 8058B40
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -144048,7 +144048,7 @@ _08058EAA:
 	thumb_func_end sub_8058B40
 
 	thumb_func_start sub_8058EDC
-sub_8058EDC: ; 8058EDC
+sub_8058EDC: @ 8058EDC
 	push {r4-r6,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -144146,7 +144146,7 @@ _08058F94:
 	thumb_func_end sub_8058EDC
 
 	thumb_func_start sub_8058FC0
-sub_8058FC0: ; 8058FC0
+sub_8058FC0: @ 8058FC0
 	push {r4,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -144190,7 +144190,7 @@ _0805900E:
 	thumb_func_end sub_8058FC0
 
 	thumb_func_start sub_805902C
-sub_805902C: ; 805902C
+sub_805902C: @ 805902C
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -144278,7 +144278,7 @@ _080590D2:
 	thumb_func_end sub_805902C
 
 	thumb_func_start c3_0802FDF4
-c3_0802FDF4: ; 8059100
+c3_0802FDF4: @ 8059100
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -144301,7 +144301,7 @@ _08059122:
 	thumb_func_end c3_0802FDF4
 
 	thumb_func_start bx_t1_healthbar_update
-bx_t1_healthbar_update: ; 8059130
+bx_t1_healthbar_update: @ 8059130
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -144351,7 +144351,7 @@ _08059192:
 	thumb_func_end bx_t1_healthbar_update
 
 	thumb_func_start sub_80591A0
-sub_80591A0: ; 80591A0
+sub_80591A0: @ 80591A0
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -144365,7 +144365,7 @@ _080591B2:
 	thumb_func_end sub_80591A0
 
 	thumb_func_start sub_80591B8
-sub_80591B8: ; 80591B8
+sub_80591B8: @ 80591B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -144533,7 +144533,7 @@ _0805931A:
 	thumb_func_end sub_80591B8
 
 	thumb_func_start sub_8059330
-sub_8059330: ; 8059330
+sub_8059330: @ 8059330
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -144625,7 +144625,7 @@ sub_8059330: ; 8059330
 	thumb_func_end sub_8059330
 
 	thumb_func_start sub_8059400
-sub_8059400: ; 8059400
+sub_8059400: @ 8059400
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -144768,7 +144768,7 @@ _0805952C:
 	thumb_func_end sub_8059400
 
 	thumb_func_start sub_8059544
-sub_8059544: ; 8059544
+sub_8059544: @ 8059544
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -144814,7 +144814,7 @@ _08059578:
 	thumb_func_end sub_8059544
 
 	thumb_func_start sub_80595A4
-sub_80595A4: ; 80595A4
+sub_80595A4: @ 80595A4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -144893,7 +144893,7 @@ _08059646:
 	thumb_func_end sub_80595A4
 
 	thumb_func_start sub_805965C
-sub_805965C: ; 805965C
+sub_805965C: @ 805965C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -144925,7 +144925,7 @@ sub_805965C: ; 805965C
 	thumb_func_end sub_805965C
 
 	thumb_func_start sub_80596A8
-sub_80596A8: ; 80596A8
+sub_80596A8: @ 80596A8
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -144990,7 +144990,7 @@ _08059724:
 	thumb_func_end sub_80596A8
 
 	thumb_func_start sub_8059744
-sub_8059744: ; 8059744
+sub_8059744: @ 8059744
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -145037,7 +145037,7 @@ _08059798:
 	thumb_func_end sub_8059744
 
 	thumb_func_start sub_80597B4
-sub_80597B4: ; 80597B4
+sub_80597B4: @ 80597B4
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -145051,7 +145051,7 @@ _080597C6:
 	thumb_func_end sub_80597B4
 
 	thumb_func_start sub_80597CC
-sub_80597CC: ; 80597CC
+sub_80597CC: @ 80597CC
 	push {r4,lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -145088,7 +145088,7 @@ _0805980A:
 	thumb_func_end sub_80597CC
 
 	thumb_func_start sub_8059828
-sub_8059828: ; 8059828
+sub_8059828: @ 8059828
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x4]
@@ -145139,7 +145139,7 @@ _08059898:
 	thumb_func_end sub_8059828
 
 	thumb_func_start sub_80598A4
-sub_80598A4: ; 80598A4
+sub_80598A4: @ 80598A4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -145164,7 +145164,7 @@ _080598CC:
 	thumb_func_end sub_80598A4
 
 	thumb_func_start sub_80598E0
-sub_80598E0: ; 80598E0
+sub_80598E0: @ 80598E0
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x4]
@@ -145189,7 +145189,7 @@ _08059906:
 	thumb_func_end sub_80598E0
 
 	thumb_func_start bx_wait_t1
-bx_wait_t1: ; 805991C
+bx_wait_t1: @ 805991C
 	push {lr}
 	ldr r0, =0x020244b9
 	ldrb r0, [r0]
@@ -145218,7 +145218,7 @@ _08059946:
 	thumb_func_end bx_wait_t1
 
 	thumb_func_start bx_blink_t1
-bx_blink_t1: ; 8059958
+bx_blink_t1: @ 8059958
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -145278,7 +145278,7 @@ _080599CE:
 	thumb_func_end bx_blink_t1
 
 	thumb_func_start sub_80599D4
-sub_80599D4: ; 80599D4
+sub_80599D4: @ 80599D4
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -145377,7 +145377,7 @@ _08059AA0:
 	thumb_func_end sub_80599D4
 
 	thumb_func_start sub_8059AAC
-sub_8059AAC: ; 8059AAC
+sub_8059AAC: @ 8059AAC
 	push {r4-r7,lr}
 	ldr r0, =0x02024064
 	ldrb r1, [r0]
@@ -145424,7 +145424,7 @@ _08059AF4:
 	thumb_func_end sub_8059AAC
 
 	thumb_func_start sub_8059B18
-sub_8059B18: ; 8059B18
+sub_8059B18: @ 8059B18
 	push {r4,lr}
 	ldr r4, =0x02022e2c
 	ldr r1, =gUnknown_085CCA6F
@@ -145440,7 +145440,7 @@ sub_8059B18: ; 8059B18
 	thumb_func_end sub_8059B18
 
 	thumb_func_start sub_8059B3C
-sub_8059B3C: ; 8059B3C
+sub_8059B3C: @ 8059B3C
 	push {r4-r7,lr}
 	ldr r5, =0x02023064
 	ldr r7, =0x02024064
@@ -145491,7 +145491,7 @@ _08059B98:
 	thumb_func_end sub_8059B3C
 
 	thumb_func_start sub_8059BB0
-sub_8059BB0: ; 8059BB0
+sub_8059BB0: @ 8059BB0
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r4, [r5]
@@ -145539,7 +145539,7 @@ sub_8059BB0: ; 8059BB0
 	thumb_func_end sub_8059BB0
 
 	thumb_func_start battle_menu_cursor_related_2
-battle_menu_cursor_related_2: ; 8059C28
+battle_menu_cursor_related_2: @ 8059C28
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -145577,7 +145577,7 @@ battle_menu_cursor_related_2: ; 8059C28
 	thumb_func_end battle_menu_cursor_related_2
 
 	thumb_func_start battle_menu_cursor_related
-battle_menu_cursor_related: ; 8059C70
+battle_menu_cursor_related: @ 8059C70
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -145612,7 +145612,7 @@ battle_menu_cursor_related: ; 8059C70
 	thumb_func_end battle_menu_cursor_related
 
 	thumb_func_start sub_8059CB4
-sub_8059CB4: ; 8059CB4
+sub_8059CB4: @ 8059CB4
 	push {r4,lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -145648,7 +145648,7 @@ sub_8059CB4: ; 8059CB4
 	thumb_func_end sub_8059CB4
 
 	thumb_func_start sub_8059CF8
-sub_8059CF8: ; 8059CF8
+sub_8059CF8: @ 8059CF8
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -145685,7 +145685,7 @@ sub_8059CF8: ; 8059CF8
 	thumb_func_end sub_8059CF8
 
 	thumb_func_start sub_8059D40
-sub_8059D40: ; 8059D40
+sub_8059D40: @ 8059D40
 	push {lr}
 	ldr r0, =sub_80A92F8
 	bl SetMainCallback2
@@ -145695,7 +145695,7 @@ sub_8059D40: ; 8059D40
 	thumb_func_end sub_8059D40
 
 	thumb_func_start sub_8059D50
-sub_8059D50: ; 8059D50
+sub_8059D50: @ 8059D50
 	push {lr}
 	ldr r0, =sub_80A92F8
 	bl SetMainCallback2
@@ -145705,7 +145705,7 @@ sub_8059D50: ; 8059D50
 	thumb_func_end sub_8059D50
 
 	thumb_func_start sub_8059D60
-sub_8059D60: ; 8059D60
+sub_8059D60: @ 8059D60
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -145729,7 +145729,7 @@ _08059D82:
 	thumb_func_end sub_8059D60
 
 	thumb_func_start bx_8030B2C
-bx_8030B2C: ; 8059D90
+bx_8030B2C: @ 8059D90
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -145753,7 +145753,7 @@ _08059DB2:
 	thumb_func_end bx_8030B2C
 
 	thumb_func_start b_link_standby_message
-b_link_standby_message: ; 8059DC0
+b_link_standby_message: @ 8059DC0
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -145776,7 +145776,7 @@ _08059DE0:
 	thumb_func_end b_link_standby_message
 
 	thumb_func_start dp01t_00_1_getattr
-dp01t_00_1_getattr: ; 8059DF4
+dp01t_00_1_getattr: @ 8059DF4
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -145831,7 +145831,7 @@ _08059E4E:
 	thumb_func_end dp01t_00_1_getattr
 
 	thumb_func_start dp01_getattr_by_ch1_for_player_pokemon_
-dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68
+dp01_getattr_by_ch1_for_player_pokemon_: @ 8059E68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -146709,7 +146709,7 @@ _0805A5FE:
 	thumb_func_end dp01_getattr_by_ch1_for_player_pokemon_
 
 	thumb_func_start sub_805A614
-sub_805A614: ; 805A614
+sub_805A614: @ 805A614
 	push {r4-r7,lr}
 	sub sp, 0x58
 	ldr r2, =0x0202406e
@@ -146773,7 +146773,7 @@ _0805A66A:
 	thumb_func_end sub_805A614
 
 	thumb_func_start dp01t_02_1_setattr
-dp01t_02_1_setattr: ; 805A69C
+dp01t_02_1_setattr: @ 805A69C
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -146816,7 +146816,7 @@ _0805A6EA:
 	thumb_func_end dp01t_02_1_setattr
 
 	thumb_func_start dp01_setattr_by_ch1_for_player_pokemon
-dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4
+dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -147849,7 +147849,7 @@ _0805B0BA:
 	thumb_func_end dp01_setattr_by_ch1_for_player_pokemon
 
 	thumb_func_start sub_805B0F0
-sub_805B0F0: ; 805B0F0
+sub_805B0F0: @ 805B0F0
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -147904,7 +147904,7 @@ _0805B148:
 	thumb_func_end sub_805B0F0
 
 	thumb_func_start sub_805B164
-sub_805B164: ; 805B164
+sub_805B164: @ 805B164
 	push {r4,lr}
 	ldr r2, =0x0202406e
 	ldr r4, =0x02024064
@@ -147945,7 +147945,7 @@ sub_805B164: ; 805B164
 	thumb_func_end sub_805B164
 
 	thumb_func_start sub_805B1CC
-sub_805B1CC: ; 805B1CC
+sub_805B1CC: @ 805B1CC
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -148000,7 +148000,7 @@ sub_805B1CC: ; 805B1CC
 	thumb_func_end sub_805B1CC
 
 	thumb_func_start sub_805B258
-sub_805B258: ; 805B258
+sub_805B258: @ 805B258
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -148163,7 +148163,7 @@ sub_805B258: ; 805B258
 	thumb_func_end sub_805B258
 
 	thumb_func_start sub_805B3D4
-sub_805B3D4: ; 805B3D4
+sub_805B3D4: @ 805B3D4
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -148222,7 +148222,7 @@ _0805B452:
 	thumb_func_end sub_805B3D4
 
 	thumb_func_start sub_805B464
-sub_805B464: ; 805B464
+sub_805B464: @ 805B464
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -148292,7 +148292,7 @@ _0805B4E2:
 	thumb_func_end sub_805B464
 
 	thumb_func_start sub_805B4F0
-sub_805B4F0: ; 805B4F0
+sub_805B4F0: @ 805B4F0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -148677,7 +148677,7 @@ _0805B82A:
 	thumb_func_end sub_805B4F0
 
 	thumb_func_start dp01t_08_1_8032428
-dp01t_08_1_8032428: ; 805B864
+dp01t_08_1_8032428: @ 805B864
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -148856,7 +148856,7 @@ _0805B926:
 	thumb_func_end dp01t_08_1_8032428
 
 	thumb_func_start sub_805B9F8
-sub_805B9F8: ; 805B9F8
+sub_805B9F8: @ 805B9F8
 	push {r4-r6,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -148938,7 +148938,7 @@ sub_805B9F8: ; 805B9F8
 	thumb_func_end sub_805B9F8
 
 	thumb_func_start sub_805BAB8
-sub_805BAB8: ; 805BAB8
+sub_805BAB8: @ 805BAB8
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -149043,7 +149043,7 @@ _0805BB82:
 	thumb_func_end sub_805BAB8
 
 	thumb_func_start sub_805BBA4
-sub_805BBA4: ; 805BBA4
+sub_805BBA4: @ 805BBA4
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -149061,7 +149061,7 @@ sub_805BBA4: ; 805BBA4
 	thumb_func_end sub_805BBA4
 
 	thumb_func_start sub_805BBC4
-sub_805BBC4: ; 805BBC4
+sub_805BBC4: @ 805BBC4
 	push {r4,r5,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -149095,7 +149095,7 @@ sub_805BBC4: ; 805BBC4
 	thumb_func_end sub_805BBC4
 
 	thumb_func_start sub_805BC18
-sub_805BC18: ; 805BC18
+sub_805BC18: @ 805BC18
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r5, =0x02024064
@@ -149134,7 +149134,7 @@ sub_805BC18: ; 805BC18
 	thumb_func_end sub_805BC18
 
 	thumb_func_start sub_805BC78
-sub_805BC78: ; 805BC78
+sub_805BC78: @ 805BC78
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -149159,7 +149159,7 @@ _0805BC96:
 	thumb_func_end sub_805BC78
 
 	thumb_func_start dp01t_0F_1_move_anim
-dp01t_0F_1_move_anim: ; 805BCA8
+dp01t_0F_1_move_anim: @ 805BCA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -149308,7 +149308,7 @@ _0805BDE4:
 	thumb_func_end dp01t_0F_1_move_anim
 
 	thumb_func_start bx_move_anim_1
-bx_move_anim_1: ; 805BDFC
+bx_move_anim_1: @ 805BDFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -149492,7 +149492,7 @@ _0805BF70:
 	thumb_func_end bx_move_anim_1
 
 	thumb_func_start sub_805BF80
-sub_805BF80: ; 805BF80
+sub_805BF80: @ 805BF80
 	push {r4,r5,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -149527,7 +149527,7 @@ sub_805BF80: ; 805BF80
 	thumb_func_end sub_805BF80
 
 	thumb_func_start dp01t_11_1_message_for_player_only
-dp01t_11_1_message_for_player_only: ; 805BFE0
+dp01t_11_1_message_for_player_only: @ 805BFE0
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -149546,7 +149546,7 @@ _0805C000:
 	thumb_func_end dp01t_11_1_message_for_player_only
 
 	thumb_func_start sub_805C004
-sub_805C004: ; 805C004
+sub_805C004: @ 805C004
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -149572,7 +149572,7 @@ _0805C02A:
 	thumb_func_end sub_805C004
 
 	thumb_func_start dp01t_12_6_battle_menu
-dp01t_12_6_battle_menu: ; 805C044
+dp01t_12_6_battle_menu: @ 805C044
 	push {r4,lr}
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
@@ -149612,7 +149612,7 @@ _0805C062:
 	thumb_func_end dp01t_12_6_battle_menu
 
 	thumb_func_start sub_805C0B0
-sub_805C0B0: ; 805C0B0
+sub_805C0B0: @ 805C0B0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02024064
@@ -149654,7 +149654,7 @@ _0805C10C:
 	thumb_func_end sub_805C0B0
 
 	thumb_func_start sub_805C114
-sub_805C114: ; 805C114
+sub_805C114: @ 805C114
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -149682,7 +149682,7 @@ _0805C13E:
 	thumb_func_end sub_805C114
 
 	thumb_func_start sub_805C158
-sub_805C158: ; 805C158
+sub_805C158: @ 805C158
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r1, [r0]
@@ -149717,7 +149717,7 @@ _0805C194:
 	thumb_func_end sub_805C158
 
 	thumb_func_start dp01t_14_5_move_menu_pokedude
-dp01t_14_5_move_menu_pokedude: ; 805C1A8
+dp01t_14_5_move_menu_pokedude: @ 805C1A8
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -149759,7 +149759,7 @@ _0805C1FC:
 	thumb_func_end dp01t_14_5_move_menu_pokedude
 
 	thumb_func_start sub_805C210
-sub_805C210: ; 805C210
+sub_805C210: @ 805C210
 	push {lr}
 	bl sub_8059AAC
 	ldr r1, =0x03005d74
@@ -149781,7 +149781,7 @@ sub_805C210: ; 805C210
 	thumb_func_end sub_805C210
 
 	thumb_func_start sub_805C248
-sub_805C248: ; 805C248
+sub_805C248: @ 805C248
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -149824,7 +149824,7 @@ _0805C276:
 	thumb_func_end sub_805C248
 
 	thumb_func_start sub_805C2AC
-sub_805C2AC: ; 805C2AC
+sub_805C2AC: @ 805C2AC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -149960,7 +149960,7 @@ _0805C3BC:
 	thumb_func_end sub_805C2AC
 
 	thumb_func_start sub_805C3EC
-sub_805C3EC: ; 805C3EC
+sub_805C3EC: @ 805C3EC
 	push {lr}
 	sub sp, 0x4
 	bl sub_805EA60
@@ -149979,7 +149979,7 @@ sub_805C3EC: ; 805C3EC
 	thumb_func_end sub_805C3EC
 
 	thumb_func_start sub_805C410
-sub_805C410: ; 805C410
+sub_805C410: @ 805C410
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -150093,7 +150093,7 @@ _0805C4F2:
 	thumb_func_end sub_805C410
 
 	thumb_func_start sub_805C528
-sub_805C528: ; 805C528
+sub_805C528: @ 805C528
 	push {r4-r7,lr}
 	ldr r5, =0x02023064
 	ldr r6, =0x02024064
@@ -150159,7 +150159,7 @@ _0805C5AC:
 	thumb_func_end sub_805C528
 
 	thumb_func_start sub_805C5C4
-sub_805C5C4: ; 805C5C4
+sub_805C5C4: @ 805C5C4
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -150208,7 +150208,7 @@ _0805C618:
 	thumb_func_end sub_805C5C4
 
 	thumb_func_start sub_805C63C
-sub_805C63C: ; 805C63C
+sub_805C63C: @ 805C63C
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -150255,7 +150255,7 @@ _0805C68C:
 	thumb_func_end sub_805C63C
 
 	thumb_func_start sub_805C6A4
-sub_805C6A4: ; 805C6A4
+sub_805C6A4: @ 805C6A4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -150302,7 +150302,7 @@ sub_805C6A4: ; 805C6A4
 	thumb_func_end sub_805C6A4
 
 	thumb_func_start sub_805C710
-sub_805C710: ; 805C710
+sub_805C710: @ 805C710
 	push {lr}
 	bl dp01_tbl1_exec_completed
 	pop {r0}
@@ -150310,7 +150310,7 @@ sub_805C710: ; 805C710
 	thumb_func_end sub_805C710
 
 	thumb_func_start sub_805C71C
-sub_805C71C: ; 805C71C
+sub_805C71C: @ 805C71C
 	push {r4,r5,lr}
 	ldr r3, =0x02023064
 	ldr r0, =0x02024064
@@ -150393,7 +150393,7 @@ _0805C7B8:
 	thumb_func_end sub_805C71C
 
 	thumb_func_start sub_805C7D0
-sub_805C7D0: ; 805C7D0
+sub_805C7D0: @ 805C7D0
 	push {lr}
 	ldr r2, =0x02023064
 	ldr r0, =0x02024064
@@ -150415,7 +150415,7 @@ sub_805C7D0: ; 805C7D0
 	thumb_func_end sub_805C7D0
 
 	thumb_func_start sub_805C800
-sub_805C800: ; 805C800
+sub_805C800: @ 805C800
 	push {lr}
 	bl dp01_tbl1_exec_completed
 	pop {r0}
@@ -150423,7 +150423,7 @@ sub_805C800: ; 805C800
 	thumb_func_end sub_805C800
 
 	thumb_func_start sub_805C80C
-sub_805C80C: ; 805C80C
+sub_805C80C: @ 805C80C
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -150435,7 +150435,7 @@ sub_805C80C: ; 805C80C
 	thumb_func_end sub_805C80C
 
 	thumb_func_start sub_805C820
-sub_805C820: ; 805C820
+sub_805C820: @ 805C820
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -150447,7 +150447,7 @@ sub_805C820: ; 805C820
 	thumb_func_end sub_805C820
 
 	thumb_func_start sub_805C834
-sub_805C834: ; 805C834
+sub_805C834: @ 805C834
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -150458,7 +150458,7 @@ sub_805C834: ; 805C834
 	thumb_func_end sub_805C834
 
 	thumb_func_start sub_805C848
-sub_805C848: ; 805C848
+sub_805C848: @ 805C848
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -150469,7 +150469,7 @@ sub_805C848: ; 805C848
 	thumb_func_end sub_805C848
 
 	thumb_func_start sub_805C85C
-sub_805C85C: ; 805C85C
+sub_805C85C: @ 805C85C
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -150484,7 +150484,7 @@ sub_805C85C: ; 805C85C
 	thumb_func_end sub_805C85C
 
 	thumb_func_start sub_805C878
-sub_805C878: ; 805C878
+sub_805C878: @ 805C878
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -150509,7 +150509,7 @@ sub_805C878: ; 805C878
 	thumb_func_end sub_805C878
 
 	thumb_func_start sub_805C8B0
-sub_805C8B0: ; 805C8B0
+sub_805C8B0: @ 805C8B0
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -150523,7 +150523,7 @@ sub_805C8B0: ; 805C8B0
 	thumb_func_end sub_805C8B0
 
 	thumb_func_start sub_805C8C8
-sub_805C8C8: ; 805C8C8
+sub_805C8C8: @ 805C8C8
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -150544,7 +150544,7 @@ sub_805C8C8: ; 805C8C8
 	thumb_func_end sub_805C8C8
 
 	thumb_func_start dp01t_29_1_blink
-dp01t_29_1_blink: ; 805C8F0
+dp01t_29_1_blink: @ 805C8F0
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -150593,7 +150593,7 @@ _0805C94E:
 	thumb_func_end dp01t_29_1_blink
 
 	thumb_func_start sub_805C960
-sub_805C960: ; 805C960
+sub_805C960: @ 805C960
 	push {lr}
 	bl dp01_tbl1_exec_completed
 	pop {r0}
@@ -150601,7 +150601,7 @@ sub_805C960: ; 805C960
 	thumb_func_end sub_805C960
 
 	thumb_func_start sub_805C96C
-sub_805C96C: ; 805C96C
+sub_805C96C: @ 805C96C
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -150634,7 +150634,7 @@ _0805C980:
 	thumb_func_end sub_805C96C
 
 	thumb_func_start sub_805C9B0
-sub_805C9B0: ; 805C9B0
+sub_805C9B0: @ 805C9B0
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -150677,7 +150677,7 @@ _0805CA00:
 	thumb_func_end sub_805C9B0
 
 	thumb_func_start sub_805CA0C
-sub_805CA0C: ; 805CA0C
+sub_805CA0C: @ 805CA0C
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -150704,7 +150704,7 @@ sub_805CA0C: ; 805CA0C
 	thumb_func_end sub_805CA0C
 
 	thumb_func_start dp01t_2E_1_battle_intro
-dp01t_2E_1_battle_intro: ; 805CA4C
+dp01t_2E_1_battle_intro: @ 805CA4C
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -150726,7 +150726,7 @@ dp01t_2E_1_battle_intro: ; 805CA4C
 	thumb_func_end dp01t_2E_1_battle_intro
 
 	thumb_func_start dp01t_2F_1_pokemon_enter
-dp01t_2F_1_pokemon_enter: ; 805CA80
+dp01t_2F_1_pokemon_enter: @ 805CA80
 	push {r4-r7,lr}
 	ldr r6, =0x020241e4
 	ldr r7, =0x02024064
@@ -150886,7 +150886,7 @@ _0805CBA2:
 	thumb_func_end dp01t_2F_1_pokemon_enter
 
 	thumb_func_start sub_805CC00
-sub_805CC00: ; 805CC00
+sub_805CC00: @ 805CC00
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r4, [r5, 0x38]
@@ -150928,7 +150928,7 @@ sub_805CC00: ; 805CC00
 	thumb_func_end sub_805CC00
 
 	thumb_func_start task05_08033660
-task05_08033660: ; 805CC68
+task05_08033660: @ 805CC68
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -151045,7 +151045,7 @@ _0805CD50:
 	thumb_func_end task05_08033660
 
 	thumb_func_start sub_805CD74
-sub_805CD74: ; 805CD74
+sub_805CD74: @ 805CD74
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -151131,7 +151131,7 @@ _0805CE18:
 	thumb_func_end sub_805CD74
 
 	thumb_func_start sub_805CE38
-sub_805CE38: ; 805CE38
+sub_805CE38: @ 805CE38
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -151167,7 +151167,7 @@ _0805CE70:
 	thumb_func_end sub_805CE38
 
 	thumb_func_start sub_805CE80
-sub_805CE80: ; 805CE80
+sub_805CE80: @ 805CE80
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -151201,7 +151201,7 @@ _0805CEB2:
 	thumb_func_end sub_805CE80
 
 	thumb_func_start sub_805CED0
-sub_805CED0: ; 805CED0
+sub_805CED0: @ 805CED0
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -151218,7 +151218,7 @@ sub_805CED0: ; 805CED0
 	thumb_func_end sub_805CED0
 
 	thumb_func_start dp01t_33_1_enemy_move
-dp01t_33_1_enemy_move: ; 805CEF4
+dp01t_33_1_enemy_move: @ 805CEF4
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -151261,7 +151261,7 @@ _0805CF3A:
 	thumb_func_end dp01t_33_1_enemy_move
 
 	thumb_func_start sub_805CF54
-sub_805CF54: ; 805CF54
+sub_805CF54: @ 805CF54
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024064
@@ -151314,7 +151314,7 @@ _0805CFB6:
 	thumb_func_end sub_805CF54
 
 	thumb_func_start dp01t_35_1_link_standby_message_and_free_vram
-dp01t_35_1_link_standby_message_and_free_vram: ; 805CFC8
+dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -151361,7 +151361,7 @@ _0805D020:
 	thumb_func_end dp01t_35_1_link_standby_message_and_free_vram
 
 	thumb_func_start sub_805D02C
-sub_805D02C: ; 805D02C
+sub_805D02C: @ 805D02C
 	push {r4,lr}
 	ldr r1, =0x02023064
 	ldr r4, =0x02024064
@@ -151411,7 +151411,7 @@ _0805D084:
 	thumb_func_end sub_805D02C
 
 	thumb_func_start sub_805D094
-sub_805D094: ; 805D094
+sub_805D094: @ 805D094
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -151462,12 +151462,12 @@ sub_805D094: ; 805D094
 	thumb_func_end sub_805D094
 
 	thumb_func_start nullsub_22
-nullsub_22: ; 805D114
+nullsub_22: @ 805D114
 	bx lr
 	thumb_func_end nullsub_22
 
 	thumb_func_start dp11_init
-dp11_init: ; 805D118
+dp11_init: @ 805D118
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	movs r0, 0x10
@@ -151496,7 +151496,7 @@ dp11_init: ; 805D118
 	thumb_func_end dp11_init
 
 	thumb_func_start dp11_free
-dp11_free: ; 805D158
+dp11_free: @ 805D158
 	push {r4,r5,lr}
 	ldr r5, =0x020244d0
 	ldr r0, [r5]
@@ -151529,7 +151529,7 @@ _0805D192:
 	thumb_func_end dp11_free
 
 	thumb_func_start sub_805D19C
-sub_805D19C: ; 805D19C
+sub_805D19C: @ 805D19C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -151912,7 +151912,7 @@ _0805D496:
 	thumb_func_end sub_805D19C
 
 	thumb_func_start sub_805D4A8
-sub_805D4A8: ; 805D4A8
+sub_805D4A8: @ 805D4A8
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -152022,7 +152022,7 @@ _0805D5F0:
 	thumb_func_end sub_805D4A8
 
 	thumb_func_start sub_805D5F4
-sub_805D5F4: ; 805D5F4
+sub_805D5F4: @ 805D5F4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -152163,7 +152163,7 @@ _0805D704:
 	thumb_func_end sub_805D5F4
 
 	thumb_func_start sub_805D714
-sub_805D714: ; 805D714
+sub_805D714: @ 805D714
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -152212,7 +152212,7 @@ _0805D766:
 	thumb_func_end sub_805D714
 
 	thumb_func_start sub_805D770
-sub_805D770: ; 805D770
+sub_805D770: @ 805D770
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -152244,7 +152244,7 @@ _0805D7A0:
 	thumb_func_end sub_805D770
 
 	thumb_func_start sub_805D7AC
-sub_805D7AC: ; 805D7AC
+sub_805D7AC: @ 805D7AC
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x020243fc
@@ -152278,7 +152278,7 @@ _0805D7E4:
 	thumb_func_end sub_805D7AC
 
 	thumb_func_start sub_805D7EC
-sub_805D7EC: ; 805D7EC
+sub_805D7EC: @ 805D7EC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x26]
@@ -152296,7 +152296,7 @@ _0805D800:
 	thumb_func_end sub_805D7EC
 
 	thumb_func_start move_anim_start_t2_for_situation
-move_anim_start_t2_for_situation: ; 805D808
+move_anim_start_t2_for_situation: @ 805D808
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -152426,7 +152426,7 @@ _0805D902:
 	thumb_func_end move_anim_start_t2_for_situation
 
 	thumb_func_start move_anim_start_t3
-move_anim_start_t3: ; 805D908
+move_anim_start_t3: @ 805D908
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -152569,7 +152569,7 @@ _0805DA1E:
 	thumb_func_end move_anim_start_t3
 
 	thumb_func_start task0A_0803415C
-task0A_0803415C: ; 805DA48
+task0A_0803415C: @ 805DA48
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -152609,7 +152609,7 @@ _0805DA8A:
 	thumb_func_end task0A_0803415C
 
 	thumb_func_start sub_805DAA0
-sub_805DAA0: ; 805DAA0
+sub_805DAA0: @ 805DAA0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -152634,7 +152634,7 @@ _0805DABE:
 	thumb_func_end sub_805DAA0
 
 	thumb_func_start move_anim_start_t4
-move_anim_start_t4: ; 805DAC4
+move_anim_start_t4: @ 805DAC4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -152680,7 +152680,7 @@ move_anim_start_t4: ; 805DAC4
 	thumb_func_end move_anim_start_t4
 
 	thumb_func_start task0A_08034248
-task0A_08034248: ; 805DB34
+task0A_08034248: @ 805DB34
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -152720,13 +152720,13 @@ _0805DB76:
 	thumb_func_end task0A_08034248
 
 	thumb_func_start sub_805DB8C
-sub_805DB8C: ; 805DB8C
+sub_805DB8C: @ 805DB8C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_805DB8C
 
 	thumb_func_start mplay_80342A4
-mplay_80342A4: ; 805DB90
+mplay_80342A4: @ 805DB90
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -152785,7 +152785,7 @@ _0805DC02:
 	thumb_func_end mplay_80342A4
 
 	thumb_func_start sub_805DC0C
-sub_805DC0C: ; 805DC0C
+sub_805DC0C: @ 805DC0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -152938,7 +152938,7 @@ _0805DD46:
 	thumb_func_end sub_805DC0C
 
 	thumb_func_start sub_805DD7C
-sub_805DD7C: ; 805DD7C
+sub_805DD7C: @ 805DD7C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -153122,17 +153122,17 @@ _0805DEFC:
 	thumb_func_end sub_805DD7C
 
 	thumb_func_start nullsub_23
-nullsub_23: ; 805DF30
+nullsub_23: @ 805DF30
 	bx lr
 	thumb_func_end nullsub_23
 
 	thumb_func_start nullsub_24
-nullsub_24: ; 805DF34
+nullsub_24: @ 805DF34
 	bx lr
 	thumb_func_end nullsub_24
 
 	thumb_func_start sub_805DF38
-sub_805DF38: ; 805DF38
+sub_805DF38: @ 805DF38
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -153165,7 +153165,7 @@ sub_805DF38: ; 805DF38
 	thumb_func_end sub_805DF38
 
 	thumb_func_start sub_805DF84
-sub_805DF84: ; 805DF84
+sub_805DF84: @ 805DF84
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -153206,12 +153206,12 @@ sub_805DF84: ; 805DF84
 	thumb_func_end sub_805DF84
 
 	thumb_func_start nullsub_25
-nullsub_25: ; 805DFE0
+nullsub_25: @ 805DFE0
 	bx lr
 	thumb_func_end nullsub_25
 
 	thumb_func_start sub_805DFE4
-sub_805DFE4: ; 805DFE4
+sub_805DFE4: @ 805DFE4
 	push {lr}
 	lsls r0, 16
 	ldr r1, =gTrainerFrontPicPaletteTable
@@ -153225,7 +153225,7 @@ sub_805DFE4: ; 805DFE4
 	thumb_func_end sub_805DFE4
 
 	thumb_func_start sub_805DFFC
-sub_805DFFC: ; 805DFFC
+sub_805DFFC: @ 805DFFC
 	push {r4-r7,lr}
 	ldr r4, =gUnknown_0832C128
 	adds r0, r4, 0
@@ -153283,7 +153283,7 @@ _0805E076:
 	thumb_func_end sub_805DFFC
 
 	thumb_func_start sub_805E08C
-sub_805E08C: ; 805E08C
+sub_805E08C: @ 805E08C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -153417,7 +153417,7 @@ _0805E1AE:
 	thumb_func_end sub_805E08C
 
 	thumb_func_start load_gfxc_health_bar
-load_gfxc_health_bar: ; 805E1B8
+load_gfxc_health_bar: @ 805E1B8
 	push {lr}
 	ldr r0, =gUnknown_08C093F0
 	ldr r1, =0x020244d4
@@ -153433,7 +153433,7 @@ load_gfxc_health_bar: ; 805E1B8
 	thumb_func_end load_gfxc_health_bar
 
 	thumb_func_start battle_load_something
-battle_load_something: ; 805E1D8
+battle_load_something: @ 805E1D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -153600,7 +153600,7 @@ _0805E346:
 	thumb_func_end battle_load_something
 
 	thumb_func_start sub_805E350
-sub_805E350: ; 805E350
+sub_805E350: @ 805E350
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -153620,7 +153620,7 @@ sub_805E350: ; 805E350
 	thumb_func_end sub_805E350
 
 	thumb_func_start sub_805E378
-sub_805E378: ; 805E378
+sub_805E378: @ 805E378
 	push {lr}
 	bl sub_805E350
 	ldr r0, =0x020244d0
@@ -153635,7 +153635,7 @@ sub_805E378: ; 805E378
 	thumb_func_end sub_805E378
 
 	thumb_func_start sub_805E394
-sub_805E394: ; 805E394
+sub_805E394: @ 805E394
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -153691,7 +153691,7 @@ _0805E3EA:
 	thumb_func_end sub_805E394
 
 	thumb_func_start sub_805E408
-sub_805E408: ; 805E408
+sub_805E408: @ 805E408
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x020244d0
@@ -153722,7 +153722,7 @@ sub_805E408: ; 805E408
 	thumb_func_end sub_805E408
 
 	thumb_func_start sub_805E448
-sub_805E448: ; 805E448
+sub_805E448: @ 805E448
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -154092,7 +154092,7 @@ _0805E77A:
 	thumb_func_end sub_805E448
 
 	thumb_func_start sub_805E7DC
-sub_805E7DC: ; 805E7DC
+sub_805E7DC: @ 805E7DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -154215,7 +154215,7 @@ _0805E8E6:
 	thumb_func_end sub_805E7DC
 
 	thumb_func_start refresh_graphics_maybe
-refresh_graphics_maybe: ; 805E8F4
+refresh_graphics_maybe: @ 805E8F4
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -154257,7 +154257,7 @@ _0805E93E:
 	thumb_func_end refresh_graphics_maybe
 
 	thumb_func_start sub_805E94C
-sub_805E94C: ; 805E94C
+sub_805E94C: @ 805E94C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -154281,7 +154281,7 @@ _0805E96C:
 	thumb_func_end sub_805E94C
 
 	thumb_func_start sub_805E974
-sub_805E974: ; 805E974
+sub_805E974: @ 805E974
 	lsls r0, 24
 	ldr r1, =0x020244d0
 	ldr r1, [r1]
@@ -154298,7 +154298,7 @@ sub_805E974: ; 805E974
 	thumb_func_end sub_805E974
 
 	thumb_func_start sub_805E990
-sub_805E990: ; 805E990
+sub_805E990: @ 805E990
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -154399,7 +154399,7 @@ _0805EA5A:
 	thumb_func_end sub_805E990
 
 	thumb_func_start sub_805EA60
-sub_805EA60: ; 805EA60
+sub_805EA60: @ 805EA60
 	push {r4-r6,lr}
 	movs r0, 0
 	bl battle_get_side_with_given_state
@@ -154441,7 +154441,7 @@ _0805EAA2:
 	thumb_func_end sub_805EA60
 
 	thumb_func_start sub_805EAB4
-sub_805EAB4: ; 805EAB4
+sub_805EAB4: @ 805EAB4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x39
@@ -154467,7 +154467,7 @@ sub_805EAB4: ; 805EAB4
 	thumb_func_end sub_805EAB4
 
 	thumb_func_start sub_805EAE8
-sub_805EAE8: ; 805EAE8
+sub_805EAE8: @ 805EAE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -154546,7 +154546,7 @@ _0805EB7E:
 	thumb_func_end sub_805EAE8
 
 	thumb_func_start sub_805EB9C
-sub_805EB9C: ; 805EB9C
+sub_805EB9C: @ 805EB9C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -154657,7 +154657,7 @@ _0805EC6C:
 	thumb_func_end sub_805EB9C
 
 	thumb_func_start sub_805EC84
-sub_805EC84: ; 805EC84
+sub_805EC84: @ 805EC84
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -154763,8 +154763,8 @@ _0805ED56:
 	thumb_func_end sub_805EC84
 
 	thumb_func_start sub_805ED70
-; int sub_805ED70(obj *a1)
-sub_805ED70: ; 805ED70
+@ int sub_805ED70(obj *a1)
+sub_805ED70: @ 805ED70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -154870,7 +154870,7 @@ _0805EE36:
 	thumb_func_end sub_805ED70
 
 	thumb_func_start sub_805EE48
-sub_805EE48: ; 805EE48
+sub_805EE48: @ 805EE48
 	adds r0, 0x3E
 	ldrb r1, [r0]
 	movs r2, 0x4
@@ -154880,7 +154880,7 @@ sub_805EE48: ; 805EE48
 	thumb_func_end sub_805EE48
 
 	thumb_func_start sub_805EE54
-sub_805EE54: ; 805EE54
+sub_805EE54: @ 805EE54
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -154946,7 +154946,7 @@ _0805EED0:
 	thumb_func_end sub_805EE54
 
 	thumb_func_start sub_805EEE0
-sub_805EEE0: ; 805EEE0
+sub_805EEE0: @ 805EEE0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02020630
@@ -154970,7 +154970,7 @@ sub_805EEE0: ; 805EEE0
 	thumb_func_end sub_805EEE0
 
 	thumb_func_start sub_805EF14
-sub_805EF14: ; 805EF14
+sub_805EF14: @ 805EF14
 	push {r4-r6,lr}
 	ldr r3, =0x06000240
 	movs r0, 0
@@ -155034,7 +155034,7 @@ _0805EF6A:
 	thumb_func_end sub_805EF14
 
 	thumb_func_start sub_805EF84
-sub_805EF84: ; 805EF84
+sub_805EF84: @ 805EF84
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -155062,7 +155062,7 @@ _0805EFAC:
 	thumb_func_end sub_805EF84
 
 	thumb_func_start init_uns_table_pokemon_copy
-init_uns_table_pokemon_copy: ; 805EFBC
+init_uns_table_pokemon_copy: @ 805EFBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -155170,7 +155170,7 @@ _0805F01A:
 	thumb_func_end init_uns_table_pokemon_copy
 
 	thumb_func_start sub_805F094
-sub_805F094: ; 805F094
+sub_805F094: @ 805F094
 	push {r4-r6,lr}
 	ldr r6, =0x020244d4
 	ldr r0, [r6]
@@ -155233,7 +155233,7 @@ _0805F106:
 	thumb_func_end sub_805F094
 
 	thumb_func_start sub_805F110
-sub_805F110: ; 805F110
+sub_805F110: @ 805F110
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x37
@@ -155274,12 +155274,12 @@ _0805F15A:
 	thumb_func_end sub_805F110
 
 	thumb_func_start nullsub_26
-nullsub_26: ; 805F160
+nullsub_26: @ 805F160
 	bx lr
 	thumb_func_end nullsub_26
 
 	thumb_func_start sub_805F164
-sub_805F164: ; 805F164
+sub_805F164: @ 805F164
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -155292,7 +155292,7 @@ sub_805F164: ; 805F164
 	thumb_func_end sub_805F164
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl7
-bx_exec_buffer_A_ch0_tbl7: ; 805F180
+bx_exec_buffer_A_ch0_tbl7: @ 805F180
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -155327,7 +155327,7 @@ _0805F1CC:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl7
 
 	thumb_func_start sub_805F1D0
-sub_805F1D0: ; 805F1D0
+sub_805F1D0: @ 805F1D0
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -155352,7 +155352,7 @@ _0805F1F4:
 	thumb_func_end sub_805F1D0
 
 	thumb_func_start sub_805F208
-sub_805F208: ; 805F208
+sub_805F208: @ 805F208
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -155377,7 +155377,7 @@ _0805F22C:
 	thumb_func_end sub_805F208
 
 	thumb_func_start sub_805F240
-sub_805F240: ; 805F240
+sub_805F240: @ 805F240
 	push {r4-r6,lr}
 	ldr r5, =0x02020630
 	ldr r6, =0x020241e4
@@ -155423,7 +155423,7 @@ _0805F292:
 	thumb_func_end sub_805F240
 
 	thumb_func_start sub_805F2A8
-sub_805F2A8: ; 805F2A8
+sub_805F2A8: @ 805F2A8
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -155459,7 +155459,7 @@ _0805F2E0:
 	thumb_func_end sub_805F2A8
 
 	thumb_func_start sub_805F2F0
-sub_805F2F0: ; 805F2F0
+sub_805F2F0: @ 805F2F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -155745,7 +155745,7 @@ _0805F53C:
 	thumb_func_end sub_805F2F0
 
 	thumb_func_start sub_805F560
-sub_805F560: ; 805F560
+sub_805F560: @ 805F560
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -156223,7 +156223,7 @@ _0805F958:
 	thumb_func_end sub_805F560
 
 	thumb_func_start sub_805F994
-sub_805F994: ; 805F994
+sub_805F994: @ 805F994
 	push {r4,r5,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x020241e4
@@ -156319,7 +156319,7 @@ _0805FA48:
 	thumb_func_end sub_805F994
 
 	thumb_func_start sub_805FA70
-sub_805FA70: ; 805FA70
+sub_805FA70: @ 805FA70
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -156358,7 +156358,7 @@ _0805FABC:
 	thumb_func_end sub_805FA70
 
 	thumb_func_start sub_805FAC4
-sub_805FAC4: ; 805FAC4
+sub_805FAC4: @ 805FAC4
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x020241e4
@@ -156387,7 +156387,7 @@ _0805FAF2:
 	thumb_func_end sub_805FAC4
 
 	thumb_func_start sub_805FB08
-sub_805FB08: ; 805FB08
+sub_805FB08: @ 805FB08
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -156436,7 +156436,7 @@ _0805FB62:
 	thumb_func_end sub_805FB08
 
 	thumb_func_start bx_t7_button_a
-bx_t7_button_a: ; 805FB7C
+bx_t7_button_a: @ 805FB7C
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -156450,7 +156450,7 @@ _0805FB8E:
 	thumb_func_end bx_t7_button_a
 
 	thumb_func_start bx_blink_t7
-bx_blink_t7: ; 805FB94
+bx_blink_t7: @ 805FB94
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -156510,7 +156510,7 @@ _0805FC0A:
 	thumb_func_end bx_blink_t7
 
 	thumb_func_start sub_805FC10
-sub_805FC10: ; 805FC10
+sub_805FC10: @ 805FC10
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -156557,7 +156557,7 @@ _0805FC5C:
 	thumb_func_end sub_805FC10
 
 	thumb_func_start bx_803AEDC
-bx_803AEDC: ; 805FC80
+bx_803AEDC: @ 805FC80
 	push {r4,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -156609,7 +156609,7 @@ _0805FCDA:
 	thumb_func_end bx_803AEDC
 
 	thumb_func_start sub_805FD00
-sub_805FD00: ; 805FD00
+sub_805FD00: @ 805FD00
 	push {r4-r7,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -156705,7 +156705,7 @@ _0805FDBC:
 	thumb_func_end sub_805FD00
 
 	thumb_func_start sub_805FDF0
-sub_805FDF0: ; 805FDF0
+sub_805FDF0: @ 805FDF0
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -156789,7 +156789,7 @@ _0805FE8C:
 	thumb_func_end sub_805FDF0
 
 	thumb_func_start sub_805FEB8
-sub_805FEB8: ; 805FEB8
+sub_805FEB8: @ 805FEB8
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -156813,7 +156813,7 @@ _0805FEDA:
 	thumb_func_end sub_805FEB8
 
 	thumb_func_start bx_803B0F4
-bx_803B0F4: ; 805FEE8
+bx_803B0F4: @ 805FEE8
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -156837,7 +156837,7 @@ _0805FF0A:
 	thumb_func_end bx_803B0F4
 
 	thumb_func_start dp01_tbl7_exec_completed
-dp01_tbl7_exec_completed: ; 805FF18
+dp01_tbl7_exec_completed: @ 805FF18
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -156887,7 +156887,7 @@ _0805FF7E:
 	thumb_func_end dp01_tbl7_exec_completed
 
 	thumb_func_start dp01t_00_7_getattr
-dp01t_00_7_getattr: ; 805FF90
+dp01t_00_7_getattr: @ 805FF90
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -156942,7 +156942,7 @@ _0805FFEA:
 	thumb_func_end dp01t_00_7_getattr
 
 	thumb_func_start sub_8060004
-sub_8060004: ; 8060004
+sub_8060004: @ 8060004
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -157820,7 +157820,7 @@ _0806079A:
 	thumb_func_end sub_8060004
 
 	thumb_func_start dp01t_01_2_read_pokmon_data_slice
-dp01t_01_2_read_pokmon_data_slice: ; 80607B0
+dp01t_01_2_read_pokmon_data_slice: @ 80607B0
 	push {r4-r7,lr}
 	sub sp, 0x58
 	ldr r2, =0x0202406e
@@ -157884,7 +157884,7 @@ _08060806:
 	thumb_func_end dp01t_01_2_read_pokmon_data_slice
 
 	thumb_func_start dp01t_02_7_setattr
-dp01t_02_7_setattr: ; 8060838
+dp01t_02_7_setattr: @ 8060838
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -157927,7 +157927,7 @@ _08060886:
 	thumb_func_end dp01t_02_7_setattr
 
 	thumb_func_start sub_8060890
-sub_8060890: ; 8060890
+sub_8060890: @ 8060890
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -158912,7 +158912,7 @@ _0806119C:
 	thumb_func_end sub_8060890
 
 	thumb_func_start sub_80611B0
-sub_80611B0: ; 80611B0
+sub_80611B0: @ 80611B0
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -158967,7 +158967,7 @@ _08061208:
 	thumb_func_end sub_80611B0
 
 	thumb_func_start sub_8061224
-sub_8061224: ; 8061224
+sub_8061224: @ 8061224
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -159113,7 +159113,7 @@ sub_8061224: ; 8061224
 	thumb_func_end sub_8061224
 
 	thumb_func_start sub_806137C
-sub_806137C: ; 806137C
+sub_806137C: @ 806137C
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -159152,7 +159152,7 @@ sub_806137C: ; 806137C
 	thumb_func_end sub_806137C
 
 	thumb_func_start sub_80613DC
-sub_80613DC: ; 80613DC
+sub_80613DC: @ 80613DC
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -159325,7 +159325,7 @@ sub_80613DC: ; 80613DC
 	thumb_func_end sub_80613DC
 
 	thumb_func_start sub_806156C
-sub_806156C: ; 806156C
+sub_806156C: @ 806156C
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -159386,7 +159386,7 @@ _080615F0:
 	thumb_func_end sub_806156C
 
 	thumb_func_start sub_8061604
-sub_8061604: ; 8061604
+sub_8061604: @ 8061604
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -159456,7 +159456,7 @@ _08061682:
 	thumb_func_end sub_8061604
 
 	thumb_func_start sub_8061690
-sub_8061690: ; 8061690
+sub_8061690: @ 8061690
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -159704,7 +159704,7 @@ _080617CA:
 	thumb_func_end sub_8061690
 
 	thumb_func_start sub_80618D8
-sub_80618D8: ; 80618D8
+sub_80618D8: @ 80618D8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -159932,7 +159932,7 @@ _080619DE:
 	thumb_func_end sub_80618D8
 
 	thumb_func_start sub_8061AF0
-sub_8061AF0: ; 8061AF0
+sub_8061AF0: @ 8061AF0
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -160006,7 +160006,7 @@ sub_8061AF0: ; 8061AF0
 	thumb_func_end sub_8061AF0
 
 	thumb_func_start sub_8061B9C
-sub_8061B9C: ; 8061B9C
+sub_8061B9C: @ 8061B9C
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -160083,7 +160083,7 @@ _08061C2C:
 	thumb_func_end sub_8061B9C
 
 	thumb_func_start sub_8061C48
-sub_8061C48: ; 8061C48
+sub_8061C48: @ 8061C48
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160091,7 +160091,7 @@ sub_8061C48: ; 8061C48
 	thumb_func_end sub_8061C48
 
 	thumb_func_start sub_8061C54
-sub_8061C54: ; 8061C54
+sub_8061C54: @ 8061C54
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160099,7 +160099,7 @@ sub_8061C54: ; 8061C54
 	thumb_func_end sub_8061C54
 
 	thumb_func_start sub_8061C60
-sub_8061C60: ; 8061C60
+sub_8061C60: @ 8061C60
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160107,7 +160107,7 @@ sub_8061C60: ; 8061C60
 	thumb_func_end sub_8061C60
 
 	thumb_func_start sub_8061C6C
-sub_8061C6C: ; 8061C6C
+sub_8061C6C: @ 8061C6C
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160115,7 +160115,7 @@ sub_8061C6C: ; 8061C6C
 	thumb_func_end sub_8061C6C
 
 	thumb_func_start sub_8061C78
-sub_8061C78: ; 8061C78
+sub_8061C78: @ 8061C78
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -160252,7 +160252,7 @@ _08061D9E:
 	thumb_func_end sub_8061C78
 
 	thumb_func_start bx_move_anim_7
-bx_move_anim_7: ; 8061DB0
+bx_move_anim_7: @ 8061DB0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -160436,7 +160436,7 @@ _08061F24:
 	thumb_func_end bx_move_anim_7
 
 	thumb_func_start sub_8061F34
-sub_8061F34: ; 8061F34
+sub_8061F34: @ 8061F34
 	push {r4,r5,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -160469,7 +160469,7 @@ sub_8061F34: ; 8061F34
 	thumb_func_end sub_8061F34
 
 	thumb_func_start sub_8061F90
-sub_8061F90: ; 8061F90
+sub_8061F90: @ 8061F90
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160477,7 +160477,7 @@ sub_8061F90: ; 8061F90
 	thumb_func_end sub_8061F90
 
 	thumb_func_start sub_8061F9C
-sub_8061F9C: ; 8061F9C
+sub_8061F9C: @ 8061F9C
 	push {lr}
 	bl sub_8063880
 	bl dp01_tbl7_exec_completed
@@ -160486,7 +160486,7 @@ sub_8061F9C: ; 8061F9C
 	thumb_func_end sub_8061F9C
 
 	thumb_func_start sub_8061FAC
-sub_8061FAC: ; 8061FAC
+sub_8061FAC: @ 8061FAC
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160494,7 +160494,7 @@ sub_8061FAC: ; 8061FAC
 	thumb_func_end sub_8061FAC
 
 	thumb_func_start sub_8061FB8
-sub_8061FB8: ; 8061FB8
+sub_8061FB8: @ 8061FB8
 	push {r4-r6,lr}
 	ldr r0, =0x02022fec
 	ldr r2, [r0]
@@ -160690,7 +160690,7 @@ _08062156:
 	thumb_func_end sub_8061FB8
 
 	thumb_func_start sub_806215C
-sub_806215C: ; 806215C
+sub_806215C: @ 806215C
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -160710,7 +160710,7 @@ sub_806215C: ; 806215C
 	thumb_func_end sub_806215C
 
 	thumb_func_start sub_8062188
-sub_8062188: ; 8062188
+sub_8062188: @ 8062188
 	push {r4-r7,lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -160826,7 +160826,7 @@ _0806225A:
 	thumb_func_end sub_8062188
 
 	thumb_func_start sub_8062288
-sub_8062288: ; 8062288
+sub_8062288: @ 8062288
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160834,7 +160834,7 @@ sub_8062288: ; 8062288
 	thumb_func_end sub_8062288
 
 	thumb_func_start sub_8062294
-sub_8062294: ; 8062294
+sub_8062294: @ 8062294
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -160930,7 +160930,7 @@ _0806234E:
 	thumb_func_end sub_8062294
 
 	thumb_func_start sub_8062384
-sub_8062384: ; 8062384
+sub_8062384: @ 8062384
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -160938,7 +160938,7 @@ sub_8062384: ; 8062384
 	thumb_func_end sub_8062384
 
 	thumb_func_start sub_8062390
-sub_8062390: ; 8062390
+sub_8062390: @ 8062390
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -160987,7 +160987,7 @@ _080623E4:
 	thumb_func_end sub_8062390
 
 	thumb_func_start sub_8062408
-sub_8062408: ; 8062408
+sub_8062408: @ 8062408
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -161034,7 +161034,7 @@ _08062458:
 	thumb_func_end sub_8062408
 
 	thumb_func_start sub_8062470
-sub_8062470: ; 8062470
+sub_8062470: @ 8062470
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161042,7 +161042,7 @@ sub_8062470: ; 8062470
 	thumb_func_end sub_8062470
 
 	thumb_func_start sub_806247C
-sub_806247C: ; 806247C
+sub_806247C: @ 806247C
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161050,7 +161050,7 @@ sub_806247C: ; 806247C
 	thumb_func_end sub_806247C
 
 	thumb_func_start sub_8062488
-sub_8062488: ; 8062488
+sub_8062488: @ 8062488
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161058,7 +161058,7 @@ sub_8062488: ; 8062488
 	thumb_func_end sub_8062488
 
 	thumb_func_start sub_8062494
-sub_8062494: ; 8062494
+sub_8062494: @ 8062494
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161066,7 +161066,7 @@ sub_8062494: ; 8062494
 	thumb_func_end sub_8062494
 
 	thumb_func_start sub_80624A0
-sub_80624A0: ; 80624A0
+sub_80624A0: @ 80624A0
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161074,7 +161074,7 @@ sub_80624A0: ; 80624A0
 	thumb_func_end sub_80624A0
 
 	thumb_func_start sub_80624AC
-sub_80624AC: ; 80624AC
+sub_80624AC: @ 80624AC
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161082,7 +161082,7 @@ sub_80624AC: ; 80624AC
 	thumb_func_end sub_80624AC
 
 	thumb_func_start sub_80624B8
-sub_80624B8: ; 80624B8
+sub_80624B8: @ 80624B8
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161090,7 +161090,7 @@ sub_80624B8: ; 80624B8
 	thumb_func_end sub_80624B8
 
 	thumb_func_start sub_80624C4
-sub_80624C4: ; 80624C4
+sub_80624C4: @ 80624C4
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161098,7 +161098,7 @@ sub_80624C4: ; 80624C4
 	thumb_func_end sub_80624C4
 
 	thumb_func_start sub_80624D0
-sub_80624D0: ; 80624D0
+sub_80624D0: @ 80624D0
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161106,7 +161106,7 @@ sub_80624D0: ; 80624D0
 	thumb_func_end sub_80624D0
 
 	thumb_func_start sub_80624DC
-sub_80624DC: ; 80624DC
+sub_80624DC: @ 80624DC
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -161121,7 +161121,7 @@ sub_80624DC: ; 80624DC
 	thumb_func_end sub_80624DC
 
 	thumb_func_start sub_80624F8
-sub_80624F8: ; 80624F8
+sub_80624F8: @ 80624F8
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -161146,7 +161146,7 @@ sub_80624F8: ; 80624F8
 	thumb_func_end sub_80624F8
 
 	thumb_func_start sub_8062530
-sub_8062530: ; 8062530
+sub_8062530: @ 8062530
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -161160,7 +161160,7 @@ sub_8062530: ; 8062530
 	thumb_func_end sub_8062530
 
 	thumb_func_start sub_8062548
-sub_8062548: ; 8062548
+sub_8062548: @ 8062548
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -161181,7 +161181,7 @@ sub_8062548: ; 8062548
 	thumb_func_end sub_8062548
 
 	thumb_func_start dp01t_29_7_blink
-dp01t_29_7_blink: ; 8062570
+dp01t_29_7_blink: @ 8062570
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -161230,7 +161230,7 @@ _080625CE:
 	thumb_func_end dp01t_29_7_blink
 
 	thumb_func_start sub_80625E0
-sub_80625E0: ; 80625E0
+sub_80625E0: @ 80625E0
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161238,7 +161238,7 @@ sub_80625E0: ; 80625E0
 	thumb_func_end sub_80625E0
 
 	thumb_func_start sub_80625EC
-sub_80625EC: ; 80625EC
+sub_80625EC: @ 80625EC
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -161271,7 +161271,7 @@ _08062600:
 	thumb_func_end sub_80625EC
 
 	thumb_func_start sub_8062630
-sub_8062630: ; 8062630
+sub_8062630: @ 8062630
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -161314,7 +161314,7 @@ _08062680:
 	thumb_func_end sub_8062630
 
 	thumb_func_start sub_806268C
-sub_806268C: ; 806268C
+sub_806268C: @ 806268C
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -161340,7 +161340,7 @@ sub_806268C: ; 806268C
 	thumb_func_end sub_806268C
 
 	thumb_func_start dp01t_2E_7_battle_intro
-dp01t_2E_7_battle_intro: ; 80626C8
+dp01t_2E_7_battle_intro: @ 80626C8
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -161362,7 +161362,7 @@ dp01t_2E_7_battle_intro: ; 80626C8
 	thumb_func_end dp01t_2E_7_battle_intro
 
 	thumb_func_start sub_80626FC
-sub_80626FC: ; 80626FC
+sub_80626FC: @ 80626FC
 	push {r4-r6,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -161477,7 +161477,7 @@ _080627BE:
 	thumb_func_end sub_80626FC
 
 	thumb_func_start sub_806280C
-sub_806280C: ; 806280C
+sub_806280C: @ 806280C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x6]
@@ -161492,7 +161492,7 @@ sub_806280C: ; 806280C
 	thumb_func_end sub_806280C
 
 	thumb_func_start sub_8062828
-sub_8062828: ; 8062828
+sub_8062828: @ 8062828
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -161595,7 +161595,7 @@ _080628E0:
 	thumb_func_end sub_8062828
 
 	thumb_func_start dp01t_30_7_0803D67C
-dp01t_30_7_0803D67C: ; 8062918
+dp01t_30_7_0803D67C: @ 8062918
 	push {r4-r7,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -161720,7 +161720,7 @@ _08062A12:
 	thumb_func_end dp01t_30_7_0803D67C
 
 	thumb_func_start bx_0803D790_t7
-bx_0803D790_t7: ; 8062A2C
+bx_0803D790_t7: @ 8062A2C
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -161756,7 +161756,7 @@ _08062A64:
 	thumb_func_end bx_0803D790_t7
 
 	thumb_func_start sub_8062A74
-sub_8062A74: ; 8062A74
+sub_8062A74: @ 8062A74
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -161790,7 +161790,7 @@ _08062AA6:
 	thumb_func_end sub_8062A74
 
 	thumb_func_start sub_8062AC4
-sub_8062AC4: ; 8062AC4
+sub_8062AC4: @ 8062AC4
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161798,7 +161798,7 @@ sub_8062AC4: ; 8062AC4
 	thumb_func_end sub_8062AC4
 
 	thumb_func_start sub_8062AD0
-sub_8062AD0: ; 8062AD0
+sub_8062AD0: @ 8062AD0
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -161841,7 +161841,7 @@ _08062B16:
 	thumb_func_end sub_8062AD0
 
 	thumb_func_start dp01t_34_7_move_anim_start_t3
-dp01t_34_7_move_anim_start_t3: ; 8062B30
+dp01t_34_7_move_anim_start_t3: @ 8062B30
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02024064
@@ -161890,7 +161890,7 @@ _08062B88:
 	thumb_func_end dp01t_34_7_move_anim_start_t3
 
 	thumb_func_start sub_8062B98
-sub_8062B98: ; 8062B98
+sub_8062B98: @ 8062B98
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161898,7 +161898,7 @@ sub_8062B98: ; 8062B98
 	thumb_func_end sub_8062B98
 
 	thumb_func_start sub_8062BA4
-sub_8062BA4: ; 8062BA4
+sub_8062BA4: @ 8062BA4
 	push {lr}
 	bl dp01_tbl7_exec_completed
 	pop {r0}
@@ -161906,7 +161906,7 @@ sub_8062BA4: ; 8062BA4
 	thumb_func_end sub_8062BA4
 
 	thumb_func_start sub_8062BB0
-sub_8062BB0: ; 8062BB0
+sub_8062BB0: @ 8062BB0
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -161935,12 +161935,12 @@ _08062BDA:
 	thumb_func_end sub_8062BB0
 
 	thumb_func_start nullsub_91
-nullsub_91: ; 8062BF4
+nullsub_91: @ 8062BF4
 	bx lr
 	thumb_func_end nullsub_91
 
 	thumb_func_start ai_switch_perish_song
-ai_switch_perish_song: ; 8062BF8
+ai_switch_perish_song: @ 8062BF8
 	push {lr}
 	ldr r1, =0x020242ac
 	ldr r0, =0x02024064
@@ -161984,7 +161984,7 @@ _08062C52:
 	thumb_func_end ai_switch_perish_song
 
 	thumb_func_start sub_8062C58
-sub_8062C58: ; 8062C58
+sub_8062C58: @ 8062C58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -162220,7 +162220,7 @@ _08062E2E:
 	thumb_func_end sub_8062C58
 
 	thumb_func_start sub_8062E54
-sub_8062E54: ; 8062E54
+sub_8062E54: @ 8062E54
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -162507,7 +162507,7 @@ _080630AE:
 	thumb_func_end sub_8062E54
 
 	thumb_func_start ai_switchout_natural_cure
-ai_switchout_natural_cure: ; 80630C0
+ai_switchout_natural_cure: @ 80630C0
 	push {r4,r5,lr}
 	ldr r3, =0x02024084
 	ldr r5, =0x02024064
@@ -162622,7 +162622,7 @@ _080631AC:
 	thumb_func_end ai_switchout_natural_cure
 
 	thumb_func_start ai_has_super_effective_move_on_field
-ai_has_super_effective_move_on_field: ; 80631BC
+ai_has_super_effective_move_on_field: @ 80631BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -162785,7 +162785,7 @@ _080632FC:
 	thumb_func_end ai_has_super_effective_move_on_field
 
 	thumb_func_start ai_is_too_invested_in_stat_buffs
-ai_is_too_invested_in_stat_buffs: ; 806331C
+ai_is_too_invested_in_stat_buffs: @ 806331C
 	push {r4,lr}
 	movs r4, 0
 	ldr r1, =0x02024084
@@ -162825,7 +162825,7 @@ _08063356:
 	thumb_func_end ai_is_too_invested_in_stat_buffs
 
 	thumb_func_start ai_switchout_something
-ai_switchout_something: ; 8063364
+ai_switchout_something: @ 8063364
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -163136,7 +163136,7 @@ _080635F0:
 	thumb_func_end ai_switchout_something
 
 	thumb_func_start sub_8063614
-sub_8063614: ; 8063614
+sub_8063614: @ 8063614
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -163421,7 +163421,7 @@ _0806386E:
 	thumb_func_end sub_8063614
 
 	thumb_func_start sub_8063880
-sub_8063880: ; 8063880
+sub_8063880: @ 8063880
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -163604,7 +163604,7 @@ _080639F8:
 	thumb_func_end sub_8063880
 
 	thumb_func_start sub_8063A08
-sub_8063A08: ; 8063A08
+sub_8063A08: @ 8063A08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -163676,7 +163676,7 @@ _08063A7A:
 	thumb_func_end sub_8063A08
 
 	thumb_func_start sub_8063A90
-sub_8063A90: ; 8063A90
+sub_8063A90: @ 8063A90
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -164142,7 +164142,7 @@ _08063E50:
 	thumb_func_end sub_8063A90
 
 	thumb_func_start ai_identify_item_effect
-ai_identify_item_effect: ; 8063E84
+ai_identify_item_effect: @ 8063E84
 	push {r4,lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -164199,7 +164199,7 @@ _08063EDA:
 	thumb_func_end ai_identify_item_effect
 
 	thumb_func_start sub_8063EE0
-sub_8063EE0: ; 8063EE0
+sub_8063EE0: @ 8063EE0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -164779,12 +164779,12 @@ _0806437E:
 	thumb_func_end sub_8063EE0
 
 	thumb_func_start nullsub_28
-nullsub_28: ; 8064390
+nullsub_28: @ 8064390
 	bx lr
 	thumb_func_end nullsub_28
 
 	thumb_func_start sub_8064394
-sub_8064394: ; 8064394
+sub_8064394: @ 8064394
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -164797,7 +164797,7 @@ sub_8064394: ; 8064394
 	thumb_func_end sub_8064394
 
 	thumb_func_start sub_80643B0
-sub_80643B0: ; 80643B0
+sub_80643B0: @ 80643B0
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -164832,7 +164832,7 @@ _080643FC:
 	thumb_func_end sub_80643B0
 
 	thumb_func_start sub_8064400
-sub_8064400: ; 8064400
+sub_8064400: @ 8064400
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -164857,7 +164857,7 @@ _08064424:
 	thumb_func_end sub_8064400
 
 	thumb_func_start sub_8064438
-sub_8064438: ; 8064438
+sub_8064438: @ 8064438
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -164882,7 +164882,7 @@ _0806445C:
 	thumb_func_end sub_8064438
 
 	thumb_func_start sub_8064470
-sub_8064470: ; 8064470
+sub_8064470: @ 8064470
 	push {r4-r6,lr}
 	ldr r5, =0x02020630
 	ldr r6, =0x020241e4
@@ -164928,7 +164928,7 @@ _080644C2:
 	thumb_func_end sub_8064470
 
 	thumb_func_start sub_80644D8
-sub_80644D8: ; 80644D8
+sub_80644D8: @ 80644D8
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -164964,7 +164964,7 @@ _08064510:
 	thumb_func_end sub_80644D8
 
 	thumb_func_start sub_8064520
-sub_8064520: ; 8064520
+sub_8064520: @ 8064520
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -165204,7 +165204,7 @@ _08064714:
 	thumb_func_end sub_8064520
 
 	thumb_func_start sub_8064734
-sub_8064734: ; 8064734
+sub_8064734: @ 8064734
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -165649,7 +165649,7 @@ _08064AC0:
 	thumb_func_end sub_8064734
 
 	thumb_func_start sub_8064B04
-sub_8064B04: ; 8064B04
+sub_8064B04: @ 8064B04
 	push {r4-r7,lr}
 	ldr r4, =0x02020630
 	ldr r0, =0x020241e4
@@ -165730,7 +165730,7 @@ _08064BB6:
 	thumb_func_end sub_8064B04
 
 	thumb_func_start sub_8064BC0
-sub_8064BC0: ; 8064BC0
+sub_8064BC0: @ 8064BC0
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -165769,7 +165769,7 @@ _08064C0C:
 	thumb_func_end sub_8064BC0
 
 	thumb_func_start sub_8064C14
-sub_8064C14: ; 8064C14
+sub_8064C14: @ 8064C14
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x020241e4
@@ -165798,7 +165798,7 @@ _08064C42:
 	thumb_func_end sub_8064C14
 
 	thumb_func_start sub_8064C58
-sub_8064C58: ; 8064C58
+sub_8064C58: @ 8064C58
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -165847,7 +165847,7 @@ _08064CB2:
 	thumb_func_end sub_8064C58
 
 	thumb_func_start sub_8064CCC
-sub_8064CCC: ; 8064CCC
+sub_8064CCC: @ 8064CCC
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -165861,7 +165861,7 @@ _08064CDE:
 	thumb_func_end sub_8064CCC
 
 	thumb_func_start sub_8064CE4
-sub_8064CE4: ; 8064CE4
+sub_8064CE4: @ 8064CE4
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -165921,7 +165921,7 @@ _08064D5A:
 	thumb_func_end sub_8064CE4
 
 	thumb_func_start sub_8064D60
-sub_8064D60: ; 8064D60
+sub_8064D60: @ 8064D60
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -165968,7 +165968,7 @@ _08064DAC:
 	thumb_func_end sub_8064D60
 
 	thumb_func_start sub_8064DD0
-sub_8064DD0: ; 8064DD0
+sub_8064DD0: @ 8064DD0
 	push {r4,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -166020,7 +166020,7 @@ _08064E2A:
 	thumb_func_end sub_8064DD0
 
 	thumb_func_start sub_8064E50
-sub_8064E50: ; 8064E50
+sub_8064E50: @ 8064E50
 	push {r4-r7,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -166116,7 +166116,7 @@ _08064F0C:
 	thumb_func_end sub_8064E50
 
 	thumb_func_start sub_8064F40
-sub_8064F40: ; 8064F40
+sub_8064F40: @ 8064F40
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -166200,7 +166200,7 @@ _08064FDC:
 	thumb_func_end sub_8064F40
 
 	thumb_func_start sub_8065008
-sub_8065008: ; 8065008
+sub_8065008: @ 8065008
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -166224,7 +166224,7 @@ _0806502A:
 	thumb_func_end sub_8065008
 
 	thumb_func_start sub_8065038
-sub_8065038: ; 8065038
+sub_8065038: @ 8065038
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -166248,7 +166248,7 @@ _0806505A:
 	thumb_func_end sub_8065038
 
 	thumb_func_start sub_8065068
-sub_8065068: ; 8065068
+sub_8065068: @ 8065068
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -166298,7 +166298,7 @@ _080650CE:
 	thumb_func_end sub_8065068
 
 	thumb_func_start dp01t_00_2_getattr
-dp01t_00_2_getattr: ; 80650E0
+dp01t_00_2_getattr: @ 80650E0
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -166353,7 +166353,7 @@ _0806513A:
 	thumb_func_end dp01t_00_2_getattr
 
 	thumb_func_start dp01_getattr_by_ch1_for_opponent_pokemon
-dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154
+dp01_getattr_by_ch1_for_opponent_pokemon: @ 8065154
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -167231,7 +167231,7 @@ _080658EA:
 	thumb_func_end dp01_getattr_by_ch1_for_opponent_pokemon
 
 	thumb_func_start sub_8065900
-sub_8065900: ; 8065900
+sub_8065900: @ 8065900
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -167239,7 +167239,7 @@ sub_8065900: ; 8065900
 	thumb_func_end sub_8065900
 
 	thumb_func_start sub_806590C
-sub_806590C: ; 806590C
+sub_806590C: @ 806590C
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -167282,7 +167282,7 @@ _0806595A:
 	thumb_func_end sub_806590C
 
 	thumb_func_start sub_8065964
-sub_8065964: ; 8065964
+sub_8065964: @ 8065964
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -168267,7 +168267,7 @@ _08066270:
 	thumb_func_end sub_8065964
 
 	thumb_func_start sub_8066284
-sub_8066284: ; 8066284
+sub_8066284: @ 8066284
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -168322,7 +168322,7 @@ _080662DC:
 	thumb_func_end sub_8066284
 
 	thumb_func_start sub_80662F8
-sub_80662F8: ; 80662F8
+sub_80662F8: @ 80662F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -168463,7 +168463,7 @@ sub_80662F8: ; 80662F8
 	thumb_func_end sub_80662F8
 
 	thumb_func_start sub_8066448
-sub_8066448: ; 8066448
+sub_8066448: @ 8066448
 	push {r4,lr}
 	ldr r1, =0x0202406e
 	ldr r4, =0x02024064
@@ -168495,7 +168495,7 @@ sub_8066448: ; 8066448
 	thumb_func_end sub_8066448
 
 	thumb_func_start sub_8066494
-sub_8066494: ; 8066494
+sub_8066494: @ 8066494
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -168668,7 +168668,7 @@ sub_8066494: ; 8066494
 	thumb_func_end sub_8066494
 
 	thumb_func_start sub_8066624
-sub_8066624: ; 8066624
+sub_8066624: @ 8066624
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -168729,7 +168729,7 @@ _080666A8:
 	thumb_func_end sub_8066624
 
 	thumb_func_start sub_80666BC
-sub_80666BC: ; 80666BC
+sub_80666BC: @ 80666BC
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -168799,7 +168799,7 @@ _0806673A:
 	thumb_func_end sub_80666BC
 
 	thumb_func_start sub_8066748
-sub_8066748: ; 8066748
+sub_8066748: @ 8066748
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -169153,7 +169153,7 @@ _0806694C:
 	thumb_func_end sub_8066748
 
 	thumb_func_start sub_8066A58
-sub_8066A58: ; 8066A58
+sub_8066A58: @ 8066A58
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -169285,7 +169285,7 @@ _08066A76:
 	thumb_func_end sub_8066A58
 
 	thumb_func_start sub_8066B94
-sub_8066B94: ; 8066B94
+sub_8066B94: @ 8066B94
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -169359,7 +169359,7 @@ sub_8066B94: ; 8066B94
 	thumb_func_end sub_8066B94
 
 	thumb_func_start sub_8066C40
-sub_8066C40: ; 8066C40
+sub_8066C40: @ 8066C40
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -169436,7 +169436,7 @@ _08066CD0:
 	thumb_func_end sub_8066C40
 
 	thumb_func_start sub_8066CEC
-sub_8066CEC: ; 8066CEC
+sub_8066CEC: @ 8066CEC
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169444,7 +169444,7 @@ sub_8066CEC: ; 8066CEC
 	thumb_func_end sub_8066CEC
 
 	thumb_func_start sub_8066CF8
-sub_8066CF8: ; 8066CF8
+sub_8066CF8: @ 8066CF8
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169452,7 +169452,7 @@ sub_8066CF8: ; 8066CF8
 	thumb_func_end sub_8066CF8
 
 	thumb_func_start sub_8066D04
-sub_8066D04: ; 8066D04
+sub_8066D04: @ 8066D04
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169460,7 +169460,7 @@ sub_8066D04: ; 8066D04
 	thumb_func_end sub_8066D04
 
 	thumb_func_start sub_8066D10
-sub_8066D10: ; 8066D10
+sub_8066D10: @ 8066D10
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169468,7 +169468,7 @@ sub_8066D10: ; 8066D10
 	thumb_func_end sub_8066D10
 
 	thumb_func_start sub_8066D1C
-sub_8066D1C: ; 8066D1C
+sub_8066D1C: @ 8066D1C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -169617,7 +169617,7 @@ _08066E58:
 	thumb_func_end sub_8066D1C
 
 	thumb_func_start sub_8066E70
-sub_8066E70: ; 8066E70
+sub_8066E70: @ 8066E70
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -169801,7 +169801,7 @@ _08066FE4:
 	thumb_func_end sub_8066E70
 
 	thumb_func_start sub_8066FF4
-sub_8066FF4: ; 8066FF4
+sub_8066FF4: @ 8066FF4
 	push {r4,r5,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -169833,7 +169833,7 @@ sub_8066FF4: ; 8066FF4
 	thumb_func_end sub_8066FF4
 
 	thumb_func_start sub_806704C
-sub_806704C: ; 806704C
+sub_806704C: @ 806704C
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169841,7 +169841,7 @@ sub_806704C: ; 806704C
 	thumb_func_end sub_806704C
 
 	thumb_func_start sub_8067058
-sub_8067058: ; 8067058
+sub_8067058: @ 8067058
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169849,7 +169849,7 @@ sub_8067058: ; 8067058
 	thumb_func_end sub_8067058
 
 	thumb_func_start sub_8067064
-sub_8067064: ; 8067064
+sub_8067064: @ 8067064
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169857,7 +169857,7 @@ sub_8067064: ; 8067064
 	thumb_func_end sub_8067064
 
 	thumb_func_start sub_8067070
-sub_8067070: ; 8067070
+sub_8067070: @ 8067070
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169865,7 +169865,7 @@ sub_8067070: ; 8067070
 	thumb_func_end sub_8067070
 
 	thumb_func_start sub_806707C
-sub_806707C: ; 806707C
+sub_806707C: @ 806707C
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169873,7 +169873,7 @@ sub_806707C: ; 806707C
 	thumb_func_end sub_806707C
 
 	thumb_func_start sub_8067088
-sub_8067088: ; 8067088
+sub_8067088: @ 8067088
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169881,7 +169881,7 @@ sub_8067088: ; 8067088
 	thumb_func_end sub_8067088
 
 	thumb_func_start sub_8067094
-sub_8067094: ; 8067094
+sub_8067094: @ 8067094
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169889,7 +169889,7 @@ sub_8067094: ; 8067094
 	thumb_func_end sub_8067094
 
 	thumb_func_start sub_80670A0
-sub_80670A0: ; 80670A0
+sub_80670A0: @ 80670A0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -169985,7 +169985,7 @@ _0806715A:
 	thumb_func_end sub_80670A0
 
 	thumb_func_start sub_8067190
-sub_8067190: ; 8067190
+sub_8067190: @ 8067190
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -169993,7 +169993,7 @@ sub_8067190: ; 8067190
 	thumb_func_end sub_8067190
 
 	thumb_func_start sub_806719C
-sub_806719C: ; 806719C
+sub_806719C: @ 806719C
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -170042,7 +170042,7 @@ _080671F0:
 	thumb_func_end sub_806719C
 
 	thumb_func_start sub_8067214
-sub_8067214: ; 8067214
+sub_8067214: @ 8067214
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -170089,7 +170089,7 @@ _08067264:
 	thumb_func_end sub_8067214
 
 	thumb_func_start sub_806727C
-sub_806727C: ; 806727C
+sub_806727C: @ 806727C
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170097,7 +170097,7 @@ sub_806727C: ; 806727C
 	thumb_func_end sub_806727C
 
 	thumb_func_start sub_8067288
-sub_8067288: ; 8067288
+sub_8067288: @ 8067288
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170105,7 +170105,7 @@ sub_8067288: ; 8067288
 	thumb_func_end sub_8067288
 
 	thumb_func_start sub_8067294
-sub_8067294: ; 8067294
+sub_8067294: @ 8067294
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170113,7 +170113,7 @@ sub_8067294: ; 8067294
 	thumb_func_end sub_8067294
 
 	thumb_func_start sub_80672A0
-sub_80672A0: ; 80672A0
+sub_80672A0: @ 80672A0
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170121,7 +170121,7 @@ sub_80672A0: ; 80672A0
 	thumb_func_end sub_80672A0
 
 	thumb_func_start sub_80672AC
-sub_80672AC: ; 80672AC
+sub_80672AC: @ 80672AC
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170129,7 +170129,7 @@ sub_80672AC: ; 80672AC
 	thumb_func_end sub_80672AC
 
 	thumb_func_start sub_80672B8
-sub_80672B8: ; 80672B8
+sub_80672B8: @ 80672B8
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170137,7 +170137,7 @@ sub_80672B8: ; 80672B8
 	thumb_func_end sub_80672B8
 
 	thumb_func_start sub_80672C4
-sub_80672C4: ; 80672C4
+sub_80672C4: @ 80672C4
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170145,7 +170145,7 @@ sub_80672C4: ; 80672C4
 	thumb_func_end sub_80672C4
 
 	thumb_func_start sub_80672D0
-sub_80672D0: ; 80672D0
+sub_80672D0: @ 80672D0
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170153,7 +170153,7 @@ sub_80672D0: ; 80672D0
 	thumb_func_end sub_80672D0
 
 	thumb_func_start sub_80672DC
-sub_80672DC: ; 80672DC
+sub_80672DC: @ 80672DC
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170161,7 +170161,7 @@ sub_80672DC: ; 80672DC
 	thumb_func_end sub_80672DC
 
 	thumb_func_start sub_80672E8
-sub_80672E8: ; 80672E8
+sub_80672E8: @ 80672E8
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -170176,7 +170176,7 @@ sub_80672E8: ; 80672E8
 	thumb_func_end sub_80672E8
 
 	thumb_func_start sub_8067304
-sub_8067304: ; 8067304
+sub_8067304: @ 8067304
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -170201,7 +170201,7 @@ sub_8067304: ; 8067304
 	thumb_func_end sub_8067304
 
 	thumb_func_start sub_806733C
-sub_806733C: ; 806733C
+sub_806733C: @ 806733C
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -170215,7 +170215,7 @@ sub_806733C: ; 806733C
 	thumb_func_end sub_806733C
 
 	thumb_func_start sub_8067354
-sub_8067354: ; 8067354
+sub_8067354: @ 8067354
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -170236,7 +170236,7 @@ sub_8067354: ; 8067354
 	thumb_func_end sub_8067354
 
 	thumb_func_start sub_806737C
-sub_806737C: ; 806737C
+sub_806737C: @ 806737C
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -170285,7 +170285,7 @@ _080673DA:
 	thumb_func_end sub_806737C
 
 	thumb_func_start sub_80673EC
-sub_80673EC: ; 80673EC
+sub_80673EC: @ 80673EC
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170293,7 +170293,7 @@ sub_80673EC: ; 80673EC
 	thumb_func_end sub_80673EC
 
 	thumb_func_start sub_80673F8
-sub_80673F8: ; 80673F8
+sub_80673F8: @ 80673F8
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -170326,7 +170326,7 @@ _0806740C:
 	thumb_func_end sub_80673F8
 
 	thumb_func_start sub_806743C
-sub_806743C: ; 806743C
+sub_806743C: @ 806743C
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -170369,7 +170369,7 @@ _0806748C:
 	thumb_func_end sub_806743C
 
 	thumb_func_start sub_8067498
-sub_8067498: ; 8067498
+sub_8067498: @ 8067498
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -170395,7 +170395,7 @@ sub_8067498: ; 8067498
 	thumb_func_end sub_8067498
 
 	thumb_func_start sub_80674D4
-sub_80674D4: ; 80674D4
+sub_80674D4: @ 80674D4
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -170417,7 +170417,7 @@ sub_80674D4: ; 80674D4
 	thumb_func_end sub_80674D4
 
 	thumb_func_start sub_8067508
-sub_8067508: ; 8067508
+sub_8067508: @ 8067508
 	push {r4-r6,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -170532,7 +170532,7 @@ _080675CA:
 	thumb_func_end sub_8067508
 
 	thumb_func_start c3_08038DC4
-c3_08038DC4: ; 8067618
+c3_08038DC4: @ 8067618
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -170630,7 +170630,7 @@ _080676C4:
 	thumb_func_end c3_08038DC4
 
 	thumb_func_start sub_80676FC
-sub_80676FC: ; 80676FC
+sub_80676FC: @ 80676FC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x6]
@@ -170645,7 +170645,7 @@ sub_80676FC: ; 80676FC
 	thumb_func_end sub_80676FC
 
 	thumb_func_start sub_8067718
-sub_8067718: ; 8067718
+sub_8067718: @ 8067718
 	push {r4-r7,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -170770,7 +170770,7 @@ _08067812:
 	thumb_func_end sub_8067718
 
 	thumb_func_start sub_806782C
-sub_806782C: ; 806782C
+sub_806782C: @ 806782C
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -170806,7 +170806,7 @@ _08067864:
 	thumb_func_end sub_806782C
 
 	thumb_func_start sub_8067874
-sub_8067874: ; 8067874
+sub_8067874: @ 8067874
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -170840,7 +170840,7 @@ _080678A6:
 	thumb_func_end sub_8067874
 
 	thumb_func_start sub_80678C4
-sub_80678C4: ; 80678C4
+sub_80678C4: @ 80678C4
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170848,7 +170848,7 @@ sub_80678C4: ; 80678C4
 	thumb_func_end sub_80678C4
 
 	thumb_func_start sub_80678D0
-sub_80678D0: ; 80678D0
+sub_80678D0: @ 80678D0
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -170891,7 +170891,7 @@ _08067916:
 	thumb_func_end sub_80678D0
 
 	thumb_func_start sub_8067930
-sub_8067930: ; 8067930
+sub_8067930: @ 8067930
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024064
@@ -170944,7 +170944,7 @@ _08067992:
 	thumb_func_end sub_8067930
 
 	thumb_func_start sub_80679A4
-sub_80679A4: ; 80679A4
+sub_80679A4: @ 80679A4
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -170959,7 +170959,7 @@ sub_80679A4: ; 80679A4
 	thumb_func_end sub_80679A4
 
 	thumb_func_start sub_80679C4
-sub_80679C4: ; 80679C4
+sub_80679C4: @ 80679C4
 	push {lr}
 	bl sub_8065068
 	pop {r0}
@@ -170967,7 +170967,7 @@ sub_80679C4: ; 80679C4
 	thumb_func_end sub_80679C4
 
 	thumb_func_start sub_80679D0
-sub_80679D0: ; 80679D0
+sub_80679D0: @ 80679D0
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -171030,13 +171030,13 @@ _08067A08:
 	thumb_func_end sub_80679D0
 
 	thumb_func_start nullsub_92
-nullsub_92: ; 8067A70
+nullsub_92: @ 8067A70
 	bx lr
 	thumb_func_end nullsub_92
 
 	thumb_func_start zero_pokemon_boxed_data
-; void zero_pokemon_boxed_data(pokemon *mon)
-zero_pokemon_boxed_data: ; 8067A74
+@ void zero_pokemon_boxed_data(pokemon *mon)
+zero_pokemon_boxed_data: @ 8067A74
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -171052,8 +171052,8 @@ _08067A7C:
 	thumb_func_end zero_pokemon_boxed_data
 
 	thumb_func_start zero_pokemon_struct
-; void zero_pokemon_struct(pokemon *mon)
-zero_pokemon_struct: ; 8067A8C
+@ void zero_pokemon_struct(pokemon *mon)
+zero_pokemon_struct: @ 8067A8C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -171109,8 +171109,8 @@ zero_pokemon_struct: ; 8067A8C
 	thumb_func_end zero_pokemon_struct
 
 	thumb_func_start zero_player_party_data
-; void zero_player_party_data()
-zero_player_party_data: ; 8067B0C
+@ void zero_player_party_data()
+zero_player_party_data: @ 8067B0C
 	push {r4,r5,lr}
 	ldr r4, =0x020244ec
 	movs r0, 0xFA
@@ -171129,7 +171129,7 @@ _08067B16:
 	thumb_func_end zero_player_party_data
 
 	thumb_func_start zero_enemy_party_data
-zero_enemy_party_data: ; 8067B2C
+zero_enemy_party_data: @ 8067B2C
 	push {r4,r5,lr}
 	ldr r4, =0x02024744
 	movs r0, 0xFA
@@ -171148,8 +171148,8 @@ _08067B36:
 	thumb_func_end zero_enemy_party_data
 
 	thumb_func_start create_pokemon_set_level
-; void create_pokemon_set_level(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id)
-create_pokemon_set_level: ; 8067B4C
+@ void create_pokemon_set_level(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id)
+create_pokemon_set_level: @ 8067B4C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -171204,8 +171204,8 @@ create_pokemon_set_level: ; 8067B4C
 	thumb_func_end create_pokemon_set_level
 
 	thumb_func_start create_pokemon
-; void create_pokemon(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id)
-create_pokemon: ; 8067BBC
+@ void create_pokemon(pokemon *mon, s16 species_num, u8 level, u8 forced_iv, char pokemon_id_is_nonrandom, int pokemon_id, u8 trainer_id_mode, int trainer_id)
+create_pokemon: @ 8067BBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -171528,7 +171528,7 @@ _08067E76:
 	thumb_func_end create_pokemon
 
 	thumb_func_start pokemon_make_with_nature
-pokemon_make_with_nature: ; 8067E90
+pokemon_make_with_nature: @ 8067E90
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -171580,7 +171580,7 @@ _08067EB0:
 	thumb_func_end pokemon_make_with_nature
 
 	thumb_func_start sub_8067EF8
-sub_8067EF8: ; 8067EF8
+sub_8067EF8: @ 8067EF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -171704,7 +171704,7 @@ _08067FCE:
 	thumb_func_end sub_8067EF8
 
 	thumb_func_start sub_8067FF8
-sub_8067FF8: ; 8067FF8
+sub_8067FF8: @ 8067FF8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -171754,7 +171754,7 @@ _0806800A:
 	thumb_func_end sub_8067FF8
 
 	thumb_func_start sub_8068060
-sub_8068060: ; 8068060
+sub_8068060: @ 8068060
 	push {r4,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -171786,7 +171786,7 @@ sub_8068060: ; 8068060
 	thumb_func_end sub_8068060
 
 	thumb_func_start sub_80680A0
-sub_80680A0: ; 80680A0
+sub_80680A0: @ 80680A0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -171839,7 +171839,7 @@ sub_80680A0: ; 80680A0
 	thumb_func_end sub_80680A0
 
 	thumb_func_start pokemon_make_ev_something
-pokemon_make_ev_something: ; 8068114
+pokemon_make_ev_something: @ 8068114
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -171911,7 +171911,7 @@ _08068180:
 	thumb_func_end pokemon_make_ev_something
 
 	thumb_func_start sub_806819C
-sub_806819C: ; 806819C
+sub_806819C: @ 806819C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -172099,7 +172099,7 @@ _08068236:
 	thumb_func_end sub_806819C
 
 	thumb_func_start sub_8068338
-sub_8068338: ; 8068338
+sub_8068338: @ 8068338
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -172327,7 +172327,7 @@ _08068430:
 	thumb_func_end sub_8068338
 
 	thumb_func_start sub_8068528
-sub_8068528: ; 8068528
+sub_8068528: @ 8068528
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -172457,7 +172457,7 @@ _080685E0:
 	thumb_func_end sub_8068528
 
 	thumb_func_start sub_8068634
-sub_8068634: ; 8068634
+sub_8068634: @ 8068634
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -172558,7 +172558,7 @@ _080686DA:
 	thumb_func_end sub_8068634
 
 	thumb_func_start sub_80686FC
-sub_80686FC: ; 80686FC
+sub_80686FC: @ 80686FC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -172750,7 +172750,7 @@ _08068738:
 	thumb_func_end sub_80686FC
 
 	thumb_func_start sub_80688A8
-sub_80688A8: ; 80688A8
+sub_80688A8: @ 80688A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -172791,7 +172791,7 @@ sub_80688A8: ; 80688A8
 	thumb_func_end sub_80688A8
 
 	thumb_func_start sub_80688F8
-sub_80688F8: ; 80688F8
+sub_80688F8: @ 80688F8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -172914,7 +172914,7 @@ _08068A02:
 	thumb_func_end sub_80688F8
 
 	thumb_func_start get_pokemon_data_3
-get_pokemon_data_3: ; 8068A10
+get_pokemon_data_3: @ 8068A10
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -172988,7 +172988,7 @@ _08068A9A:
 	thumb_func_end get_pokemon_data_3
 
 	thumb_func_start sub_8068AA4
-sub_8068AA4: ; 8068AA4
+sub_8068AA4: @ 8068AA4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r5, 0
@@ -173063,7 +173063,7 @@ _08068B34:
 	thumb_func_end sub_8068AA4
 
 	thumb_func_start sub_8068B48
-sub_8068B48: ; 8068B48
+sub_8068B48: @ 8068B48
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -173111,7 +173111,7 @@ _08068B78:
 	thumb_func_end sub_8068B48
 
 	thumb_func_start sub_8068BB0
-sub_8068BB0: ; 8068BB0
+sub_8068BB0: @ 8068BB0
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -173159,7 +173159,7 @@ _08068BE0:
 	thumb_func_end sub_8068BB0
 
 	thumb_func_start DoScriptedWildBattle
-DoScriptedWildBattle: ; 8068C18
+DoScriptedWildBattle: @ 8068C18
 	push {r4-r7,lr}
 	sub sp, 0x14
 	ldr r0, =0x020375e0
@@ -173202,8 +173202,8 @@ _08068C60:
 	thumb_func_end DoScriptedWildBattle
 
 	thumb_func_start pokemon_calc_checksum
-; int pokemon_calc_checksum(pokemon *mon)
-pokemon_calc_checksum: ; 8068C78
+@ int pokemon_calc_checksum(pokemon *mon)
+pokemon_calc_checksum: @ 8068C78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -173280,7 +173280,7 @@ _08068CEE:
 	thumb_func_end pokemon_calc_checksum
 
 	thumb_func_start pokemon_calc_effective_stats
-pokemon_calc_effective_stats: ; 8068D0C
+pokemon_calc_effective_stats: @ 8068D0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -173630,7 +173630,7 @@ _08068FF4:
 	thumb_func_end pokemon_calc_effective_stats
 
 	thumb_func_start sub_8069004
-sub_8069004: ; 8069004
+sub_8069004: @ 8069004
 	push {r4,lr}
 	sub sp, 0x4
 	adds r2, r0, 0
@@ -173668,7 +173668,7 @@ sub_8069004: ; 8069004
 	thumb_func_end sub_8069004
 
 	thumb_func_start level_by_exp
-level_by_exp: ; 8069054
+level_by_exp: @ 8069054
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0xB
@@ -173722,7 +173722,7 @@ _080690AA:
 	thumb_func_end level_by_exp
 
 	thumb_func_start sub_80690C0
-sub_80690C0: ; 80690C0
+sub_80690C0: @ 80690C0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0xB
@@ -173776,7 +173776,7 @@ _08069116:
 	thumb_func_end sub_80690C0
 
 	thumb_func_start pokemon_moveset_pad_
-pokemon_moveset_pad_: ; 806912C
+pokemon_moveset_pad_: @ 806912C
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -173788,7 +173788,7 @@ pokemon_moveset_pad_: ; 806912C
 	thumb_func_end pokemon_moveset_pad_
 
 	thumb_func_start pokemon_moveset_pad
-pokemon_moveset_pad: ; 8069140
+pokemon_moveset_pad: @ 8069140
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -173817,7 +173817,7 @@ _0806914E:
 	lsls r2, r0, 1
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 ; PP offset
+	ldr r0, =gBattleMoves + 0x4 @ PP offset
 	adds r2, r0
 	adds r0, r7, 0
 	bl pokemon_setattr_encrypted
@@ -173845,7 +173845,7 @@ _080691A4:
 	thumb_func_end pokemon_moveset_pad
 
 	thumb_func_start sub_80691B0
-sub_80691B0: ; 80691B0
+sub_80691B0: @ 80691B0
 	push {r4,r5,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -173884,7 +173884,7 @@ _080691EA:
 	thumb_func_end sub_80691B0
 
 	thumb_func_start sub_80691F4
-sub_80691F4: ; 80691F4
+sub_80691F4: @ 80691F4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -173904,7 +173904,7 @@ sub_80691F4: ; 80691F4
 	lsls r2, r0, 1
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 ; PP offset
+	ldr r0, =gBattleMoves + 0x4 @ PP offset
 	adds r2, r0
 	adds r0, r5, 0
 	adds r1, r4, 0
@@ -173917,7 +173917,7 @@ sub_80691F4: ; 80691F4
 	thumb_func_end sub_80691F4
 
 	thumb_func_start sub_8069234
-sub_8069234: ; 8069234
+sub_8069234: @ 8069234
 	push {r4,lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -173944,7 +173944,7 @@ sub_8069234: ; 8069234
 	thumb_func_end sub_8069234
 
 	thumb_func_start sub_8069264
-sub_8069264: ; 8069264
+sub_8069264: @ 8069264
 	push {lr}
 	bl sub_8069270
 	pop {r0}
@@ -173952,7 +173952,7 @@ sub_8069264: ; 8069264
 	thumb_func_end sub_8069264
 
 	thumb_func_start sub_8069270
-sub_8069270: ; 8069270
+sub_8069270: @ 8069270
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -174034,7 +174034,7 @@ _080692FC:
 	thumb_func_end sub_8069270
 
 	thumb_func_start sub_8069318
-sub_8069318: ; 8069318
+sub_8069318: @ 8069318
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -174163,7 +174163,7 @@ _08069404:
 	thumb_func_end sub_8069318
 
 	thumb_func_start sub_8069424
-sub_8069424: ; 8069424
+sub_8069424: @ 8069424
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -174248,7 +174248,7 @@ _08069494:
 	thumb_func_end sub_8069424
 
 	thumb_func_start sub_80694D0
-sub_80694D0: ; 80694D0
+sub_80694D0: @ 80694D0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -174333,7 +174333,7 @@ _08069540:
 	thumb_func_end sub_80694D0
 
 	thumb_func_start sub_806957C
-sub_806957C: ; 806957C
+sub_806957C: @ 806957C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -175370,7 +175370,7 @@ _08069DD4:
 	thumb_func_end sub_806957C
 
 	thumb_func_start sub_8069DEC
-sub_8069DEC: ; 8069DEC
+sub_8069DEC: @ 8069DEC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -175482,7 +175482,7 @@ _08069EC2:
 	thumb_func_end sub_8069DEC
 
 	thumb_func_start sub_8069ED8
-sub_8069ED8: ; 8069ED8
+sub_8069ED8: @ 8069ED8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -175529,7 +175529,7 @@ _08069F2E:
 	thumb_func_end sub_8069ED8
 
 	thumb_func_start sub_8069F34
-sub_8069F34: ; 8069F34
+sub_8069F34: @ 8069F34
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -175593,7 +175593,7 @@ _08069FA6:
 	thumb_func_end sub_8069F34
 
 	thumb_func_start pokemon_get_gender
-pokemon_get_gender: ; 8069FB4
+pokemon_get_gender: @ 8069FB4
 	push {lr}
 	bl pokemon_roll_gender
 	lsls r0, 24
@@ -175603,7 +175603,7 @@ pokemon_get_gender: ; 8069FB4
 	thumb_func_end pokemon_get_gender
 
 	thumb_func_start pokemon_roll_gender
-pokemon_roll_gender: ; 8069FC4
+pokemon_roll_gender: @ 8069FC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0xB
@@ -175653,7 +175653,7 @@ _0806A01A:
 	thumb_func_end pokemon_roll_gender
 
 	thumb_func_start pokemon_species_get_gender_info
-pokemon_species_get_gender_info: ; 806A020
+pokemon_species_get_gender_info: @ 806A020
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 16
@@ -175693,7 +175693,7 @@ _0806A062:
 	thumb_func_end pokemon_species_get_gender_info
 
 	thumb_func_start sub_806A068
-sub_806A068: ; 806A068
+sub_806A068: @ 806A068
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -175787,7 +175787,7 @@ _0806A122:
 	thumb_func_end sub_806A068
 
 	thumb_func_start template_build_for_pokemon_or_trainer
-template_build_for_pokemon_or_trainer: ; 806A12C
+template_build_for_pokemon_or_trainer: @ 806A12C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -175859,7 +175859,7 @@ _0806A1B0:
 	thumb_func_end template_build_for_pokemon_or_trainer
 
 	thumb_func_start sub_806A1C0
-sub_806A1C0: ; 806A1C0
+sub_806A1C0: @ 806A1C0
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -175909,8 +175909,8 @@ _0806A20A:
 	thumb_func_end sub_806A1C0
 
 	thumb_func_start pokemon_encrypt
-; void pokemon_encrypt(pokemon *mon)
-pokemon_encrypt: ; 806A228
+@ void pokemon_encrypt(pokemon *mon)
+pokemon_encrypt: @ 806A228
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r4, 0
@@ -175933,8 +175933,8 @@ _0806A232:
 	thumb_func_end pokemon_encrypt
 
 	thumb_func_start pokemon_decrypt
-; void pokemon_decrypt(pokemon *mon)
-pokemon_decrypt: ; 806A24C
+@ void pokemon_decrypt(pokemon *mon)
+pokemon_decrypt: @ 806A24C
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r4, 0
@@ -175957,8 +175957,8 @@ _0806A256:
 	thumb_func_end pokemon_decrypt
 
 	thumb_func_start pokemon_data_permutator
-; int pokemon_data_permutator(pokemon *mon, int a2, u8 a3)
-pokemon_data_permutator: ; 806A270
+@ int pokemon_data_permutator(pokemon *mon, int a2, u8 a3)
+pokemon_data_permutator: @ 806A270
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r0, r1, 0
@@ -176347,8 +176347,8 @@ _0806A510:
 	thumb_func_end pokemon_data_permutator
 
 	thumb_func_start pokemon_getattr
-; int pokemon_getattr(pokemon *mon, enum pokemon_data_request req, void *data)
-pokemon_getattr: ; 806A518
+@ int pokemon_getattr(pokemon *mon, enum pokemon_data_request req, void *data)
+pokemon_getattr: @ 806A518
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -176504,8 +176504,8 @@ _0806A66E:
 	thumb_func_end pokemon_getattr
 
 	thumb_func_start pokemon_getattr_encrypted
-; int pokemon_getattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
-pokemon_getattr_encrypted: ; 806A674
+@ int pokemon_getattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
+pokemon_getattr_encrypted: @ 806A674
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -177303,8 +177303,8 @@ _0806AC98:
 	thumb_func_end pokemon_getattr_encrypted
 
 	thumb_func_start pokemon_setattr
-; int pokemon_setattr(pokemon *mon, enum pokemon_data_request req, void *data)
-pokemon_setattr: ; 806ACAC
+@ int pokemon_setattr(pokemon *mon, enum pokemon_data_request req, void *data)
+pokemon_setattr: @ 806ACAC
 	push {lr}
 	adds r3, r0, 0
 	adds r0, r1, 0
@@ -177427,8 +177427,8 @@ _0806AD96:
 	thumb_func_end pokemon_setattr
 
 	thumb_func_start pokemon_setattr_encrypted
-; int pokemon_setattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
-pokemon_setattr_encrypted: ; 806AD9C
+@ int pokemon_setattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
+pokemon_setattr_encrypted: @ 806AD9C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -178230,8 +178230,8 @@ _0806B3EC:
 	thumb_func_end pokemon_setattr_encrypted
 
 	thumb_func_start memcpy_pokemon
-; void *memcpy_pokemon(void *dest, void *src, unsigned int size)
-memcpy_pokemon: ; 806B408
+@ void *memcpy_pokemon(void *dest, void *src, unsigned int size)
+memcpy_pokemon: @ 806B408
 	push {lr}
 	bl memcpy
 	pop {r0}
@@ -178239,8 +178239,8 @@ memcpy_pokemon: ; 806B408
 	thumb_func_end memcpy_pokemon
 
 	thumb_func_start pokemon_catch
-; int pokemon_catch(pokemon *mon)
-pokemon_catch: ; 806B414
+@ int pokemon_catch(pokemon *mon)
+pokemon_catch: @ 806B414
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r4, =0x03005d90
@@ -178298,8 +178298,8 @@ _0806B48A:
 	thumb_func_end pokemon_catch
 
 	thumb_func_start pokemon_add_to_pc
-; int pokemon_add_to_pc(pokemon *mon)
-pokemon_add_to_pc: ; 806B490
+@ int pokemon_add_to_pc(pokemon *mon)
+pokemon_add_to_pc: @ 806B490
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -178375,8 +178375,8 @@ _0806B530:
 	thumb_func_end pokemon_add_to_pc
 
 	thumb_func_start calc_player_party_count
-; u8 calc_player_party_count()
-calc_player_party_count: ; 806B53C
+@ u8 calc_player_party_count()
+calc_player_party_count: @ 806B53C
 	push {r4,lr}
 	ldr r0, =0x020244e9
 	movs r1, 0
@@ -178412,8 +178412,8 @@ _0806B572:
 	thumb_func_end calc_player_party_count
 
 	thumb_func_start calc_enemy_party_count
-; u8 calc_enemy_party_count()
-calc_enemy_party_count: ; 806B580
+@ u8 calc_enemy_party_count()
+calc_enemy_party_count: @ 806B580
 	push {r4,lr}
 	ldr r0, =0x020244ea
 	movs r1, 0
@@ -178449,7 +178449,7 @@ _0806B5B6:
 	thumb_func_end calc_enemy_party_count
 
 	thumb_func_start sub_806B5C4
-sub_806B5C4: ; 806B5C4
+sub_806B5C4: @ 806B5C4
 	push {r4-r6,lr}
 	movs r6, 0
 	bl calc_player_party_count
@@ -178507,8 +178507,8 @@ _0806B628:
 	thumb_func_end sub_806B5C4
 
 	thumb_func_start CheckPlayerPartySize
-; u8 CheckPlayerPartySize()
-CheckPlayerPartySize: ; 806B638
+@ u8 CheckPlayerPartySize()
+CheckPlayerPartySize: @ 806B638
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -178557,8 +178557,8 @@ _0806B68C:
 	thumb_func_end CheckPlayerPartySize
 
 	thumb_func_start sub_806B694
-; int sub_806B694(u16 a1, int a2)
-sub_806B694: ; 806B694
+@ int sub_806B694(u16 a1, int a2)
+sub_806B694: @ 806B694
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -178591,8 +178591,8 @@ _0806B6C6:
 	thumb_func_end sub_806B694
 
 	thumb_func_start GetMonAbility
-; u8 GetMonAbility(pokemon *mon)
-GetMonAbility: ; 806B6D8
+@ u8 GetMonAbility(pokemon *mon)
+GetMonAbility: @ 806B6D8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0xB
@@ -178618,7 +178618,7 @@ GetMonAbility: ; 806B6D8
 	thumb_func_end GetMonAbility
 
 	thumb_func_start create_enemy_party
-create_enemy_party: ; 806B70C
+create_enemy_party: @ 806B70C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -178733,7 +178733,7 @@ _0806B7CE:
 	lsls r2, r0, 1
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, =gBattleMoves + 0x4 ; PP offset
+	ldr r0, =gBattleMoves + 0x4 @ PP offset
 	adds r2, r0
 	adds r0, r7, 0
 	bl pokemon_setattr
@@ -178759,7 +178759,7 @@ _0806B80A:
 	thumb_func_end create_enemy_party
 
 	thumb_func_start sub_806B830
-sub_806B830: ; 806B830
+sub_806B830: @ 806B830
 	push {r4,r5,lr}
 	ldr r5, =gUnknown_08329EB8
 	ldr r0, =0x020244a8
@@ -178788,7 +178788,7 @@ sub_806B830: ; 806B830
 	thumb_func_end sub_806B830
 
 	thumb_func_start sub_806B870
-sub_806B870: ; 806B870
+sub_806B870: @ 806B870
 	push {r4,r5,lr}
 	ldr r5, =gUnknown_08329EB8
 	ldr r0, =0x020244a8
@@ -178817,7 +178817,7 @@ sub_806B870: ; 806B870
 	thumb_func_end sub_806B870
 
 	thumb_func_start sub_806B8B0
-sub_806B8B0: ; 806B8B0
+sub_806B8B0: @ 806B8B0
 	push {r4,lr}
 	movs r4, 0
 _0806B8B4:
@@ -178847,7 +178847,7 @@ _0806B8DE:
 	thumb_func_end sub_806B8B0
 
 	thumb_func_start sub_806B8E4
-sub_806B8E4: ; 806B8E4
+sub_806B8E4: @ 806B8E4
 	push {r4-r6,lr}
 	movs r6, 0
 _0806B8E8:
@@ -178878,8 +178878,8 @@ _0806B90E:
 	thumb_func_end sub_806B8E4
 
 	thumb_func_start GetSpeciesName
-; void GetSpeciesName(u8 *dest, u16 speciesId)
-GetSpeciesName: ; 806B914
+@ void GetSpeciesName(u8 *dest, u16 speciesId)
+GetSpeciesName: @ 806B914
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -178924,8 +178924,8 @@ _0806B954:
 	thumb_func_end GetSpeciesName
 
 	thumb_func_start CalcPPWithPPUps
-; u16 CalcPPWithPPUps(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
-CalcPPWithPPUps: ; 806B960
+@ u16 CalcPPWithPPUps(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
+CalcPPWithPPUps: @ 806B960
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -178960,7 +178960,7 @@ CalcPPWithPPUps: ; 806B960
 	thumb_func_end CalcPPWithPPUps
 
 	thumb_func_start sub_806B9A8
-sub_806B9A8: ; 806B9A8
+sub_806B9A8: @ 806B9A8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -178991,7 +178991,7 @@ sub_806B9A8: ; 806B9A8
 	thumb_func_end sub_806B9A8
 
 	thumb_func_start sub_806B9E4
-sub_806B9E4: ; 806B9E4
+sub_806B9E4: @ 806B9E4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, 0x3B
@@ -179006,7 +179006,7 @@ sub_806B9E4: ; 806B9E4
 	thumb_func_end sub_806B9E4
 
 	thumb_func_start battle_data_fill
-battle_data_fill: ; 806B9FC
+battle_data_fill: @ 806B9FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -179354,8 +179354,8 @@ _0806BCB2:
 	thumb_func_end battle_data_fill
 
 	thumb_func_start ExecuteTableBasedItemEffect_
-; bool8 ExecuteTableBasedItemEffect_(struct pokemon *mon, u16 itemId, u8 a3, u8 monMoveIndex)
-ExecuteTableBasedItemEffect_: ; 806BD04
+@ bool8 ExecuteTableBasedItemEffect_(struct pokemon *mon, u16 itemId, u8 a3, u8 monMoveIndex)
+ExecuteTableBasedItemEffect_: @ 806BD04
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r1, 16
@@ -179376,8 +179376,8 @@ ExecuteTableBasedItemEffect_: ; 806BD04
 	thumb_func_end ExecuteTableBasedItemEffect_
 
 	thumb_func_start ExecuteTableBasedItemEffect
-; bool8 ExecuteTableBasedItemEffect(struct pokemon *mon, u16 itemId, u8 a3, u8 monMoveIndex, u8 a5)
-ExecuteTableBasedItemEffect: ; 806BD28
+@ bool8 ExecuteTableBasedItemEffect(struct pokemon *mon, u16 itemId, u8 a3, u8 monMoveIndex, u8 a5)
+ExecuteTableBasedItemEffect: @ 806BD28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -181311,8 +181311,8 @@ _0806CD5C:
 	thumb_func_end ExecuteTableBasedItemEffect
 
 	thumb_func_start HealStatusConditions
-; bool8 HealStatusConditions(struct pokemon *a1, int a2, u32 healMask, u8 a4)
-HealStatusConditions: ; 806CD6C
+@ bool8 HealStatusConditions(struct pokemon *a1, int a2, u32 healMask, u8 a4)
+HealStatusConditions: @ 806CD6C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -181366,7 +181366,7 @@ _0806CDD2:
 	thumb_func_end HealStatusConditions
 
 	thumb_func_start sub_806CDDC
-sub_806CDDC: ; 806CDDC
+sub_806CDDC: @ 806CDDC
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -181545,7 +181545,7 @@ _0806CF1C:
 	thumb_func_end sub_806CDDC
 
 	thumb_func_start sub_806CF24
-sub_806CF24: ; 806CF24
+sub_806CF24: @ 806CF24
 	push {lr}
 	ldr r2, =0x0202420c
 	ldr r1, =0x020244b8
@@ -181572,7 +181572,7 @@ sub_806CF24: ; 806CF24
 	thumb_func_end sub_806CF24
 
 	thumb_func_start sub_806CF78
-sub_806CF78: ; 806CF78
+sub_806CF78: @ 806CF78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -181675,8 +181675,8 @@ _0806D04E:
 	thumb_func_end sub_806CF78
 
 	thumb_func_start GetNature
-; u8 GetNature(pokemon *mon)
-GetNature: ; 806D070
+@ u8 GetNature(pokemon *mon)
+GetNature: @ 806D070
 	push {lr}
 	movs r1, 0
 	movs r2, 0
@@ -181690,8 +181690,8 @@ GetNature: ; 806D070
 	thumb_func_end GetNature
 
 	thumb_func_start GetNatureFromPersonality
-; u8 GetNatureFromPersonality(u32 personality)
-GetNatureFromPersonality: ; 806D088
+@ u8 GetNatureFromPersonality(u32 personality)
+GetNatureFromPersonality: @ 806D088
 	push {lr}
 	movs r1, 0x19
 	bl __umodsi3
@@ -181702,7 +181702,7 @@ GetNatureFromPersonality: ; 806D088
 	thumb_func_end GetNatureFromPersonality
 
 	thumb_func_start GetEvolutionTargetSpecies
-GetEvolutionTargetSpecies: ; 806D098
+GetEvolutionTargetSpecies: @ 806D098
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -182105,7 +182105,7 @@ _0806D3B0:
 	thumb_func_end GetEvolutionTargetSpecies
 
 	thumb_func_start HoennPokedexNumToSpecies
-HoennPokedexNumToSpecies: ; 806D3C0
+HoennPokedexNumToSpecies: @ 806D3C0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -182147,7 +182147,7 @@ _0806D406:
 	thumb_func_end HoennPokedexNumToSpecies
 
 	thumb_func_start NationalPokedexNumToSpecies
-NationalPokedexNumToSpecies: ; 806D40C
+NationalPokedexNumToSpecies: @ 806D40C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -182189,7 +182189,7 @@ _0806D452:
 	thumb_func_end NationalPokedexNumToSpecies
 
 	thumb_func_start NationalToHoennOrder
-NationalToHoennOrder: ; 806D458
+NationalToHoennOrder: @ 806D458
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -182231,7 +182231,7 @@ _0806D49E:
 	thumb_func_end NationalToHoennOrder
 
 	thumb_func_start SpeciesToNationalPokedexNum
-SpeciesToNationalPokedexNum: ; 806D4A4
+SpeciesToNationalPokedexNum: @ 806D4A4
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -182252,7 +182252,7 @@ _0806D4C2:
 	thumb_func_end SpeciesToNationalPokedexNum
 
 	thumb_func_start SpeciesToHoennPokedexNum
-SpeciesToHoennPokedexNum: ; 806D4C8
+SpeciesToHoennPokedexNum: @ 806D4C8
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -182273,7 +182273,7 @@ _0806D4E6:
 	thumb_func_end SpeciesToHoennPokedexNum
 
 	thumb_func_start HoennToNationalOrder
-HoennToNationalOrder: ; 806D4EC
+HoennToNationalOrder: @ 806D4EC
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -182294,7 +182294,7 @@ _0806D50A:
 	thumb_func_end HoennToNationalOrder
 
 	thumb_func_start speciesid_conv
-speciesid_conv: ; 806D510
+speciesid_conv: @ 806D510
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -182320,7 +182320,7 @@ _0806D53E:
 	thumb_func_end speciesid_conv
 
 	thumb_func_start sub_806D544
-sub_806D544: ; 806D544
+sub_806D544: @ 806D544
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -182470,8 +182470,8 @@ _0806D652:
 	thumb_func_end sub_806D544
 
 	thumb_func_start DrawSpindaSpots
-; void DrawSpindaSpots(u16 species, u32 personality, u8 *pixels, u8 isFrontPic)
-DrawSpindaSpots: ; 806D664
+@ void DrawSpindaSpots(u16 species, u32 personality, u8 *pixels, u8 isFrontPic)
+DrawSpindaSpots: @ 806D664
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -182618,7 +182618,7 @@ _0806D766:
 	thumb_func_end DrawSpindaSpots
 
 	thumb_func_start sub_806D778
-sub_806D778: ; 806D778
+sub_806D778: @ 806D778
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -182673,7 +182673,7 @@ _0806D7D4:
 	thumb_func_end sub_806D778
 
 	thumb_func_start sub_806D7EC
-sub_806D7EC: ; 806D7EC
+sub_806D7EC: @ 806D7EC
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =0x020229e8
@@ -182709,7 +182709,7 @@ _0806D822:
 	thumb_func_end sub_806D7EC
 
 	thumb_func_start sub_806D82C
-sub_806D82C: ; 806D82C
+sub_806D82C: @ 806D82C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -182743,7 +182743,7 @@ _0806D85E:
 	thumb_func_end sub_806D82C
 
 	thumb_func_start sub_806D864
-sub_806D864: ; 806D864
+sub_806D864: @ 806D864
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -182767,8 +182767,8 @@ _0806D882:
 	thumb_func_end sub_806D864
 
 	thumb_func_start GetTrainerEncounterMusicId
-; u8 GetTrainerEncounterMusicId(u16 trainerOpponentId)
-GetTrainerEncounterMusicId: ; 806D888
+@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId)
+GetTrainerEncounterMusicId: @ 806D888
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -182808,7 +182808,7 @@ _0806D8CE:
 	thumb_func_end GetTrainerEncounterMusicId
 
 	thumb_func_start nature_stat_mod
-nature_stat_mod: ; 806D8D4
+nature_stat_mod: @ 806D8D4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -182863,7 +182863,7 @@ _0806D92E:
 	thumb_func_end nature_stat_mod
 
 	thumb_func_start happiness_algorithm
-happiness_algorithm: ; 806D934
+happiness_algorithm: @ 806D934
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -183068,7 +183068,7 @@ _0806DAC2:
 	thumb_func_end happiness_algorithm
 
 	thumb_func_start sub_806DADC
-sub_806DADC: ; 806DADC
+sub_806DADC: @ 806DADC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -183281,7 +183281,7 @@ _0806DC7A:
 	thumb_func_end sub_806DADC
 
 	thumb_func_start sub_806DC8C
-sub_806DC8C: ; 806DC8C
+sub_806DC8C: @ 806DC8C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -183305,7 +183305,7 @@ _0806DC94:
 	thumb_func_end sub_806DC8C
 
 	thumb_func_start sub_806DCB4
-sub_806DCB4: ; 806DCB4
+sub_806DCB4: @ 806DCB4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -183404,7 +183404,7 @@ _0806DD70:
 	thumb_func_end sub_806DCB4
 
 	thumb_func_start sub_806DD7C
-sub_806DD7C: ; 806DD7C
+sub_806DD7C: @ 806DD7C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -183461,7 +183461,7 @@ _0806DDD8:
 	thumb_func_end sub_806DD7C
 
 	thumb_func_start sub_806DDE4
-sub_806DDE4: ; 806DDE4
+sub_806DDE4: @ 806DDE4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -183514,7 +183514,7 @@ _0806DE38:
 	thumb_func_end sub_806DDE4
 
 	thumb_func_start sub_806DE44
-sub_806DE44: ; 806DE44
+sub_806DE44: @ 806DE44
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -183583,7 +183583,7 @@ _0806DEB2:
 	thumb_func_end sub_806DE44
 
 	thumb_func_start sub_806DEC4
-sub_806DEC4: ; 806DEC4
+sub_806DEC4: @ 806DEC4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -183670,7 +183670,7 @@ _0806DF6A:
 	thumb_func_end sub_806DEC4
 
 	thumb_func_start sub_806DF74
-sub_806DF74: ; 806DF74
+sub_806DF74: @ 806DF74
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -183745,7 +183745,7 @@ _0806E004:
 	thumb_func_end sub_806DF74
 
 	thumb_func_start sub_806E00C
-sub_806E00C: ; 806E00C
+sub_806E00C: @ 806E00C
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -183793,7 +183793,7 @@ _0806E05A:
 	thumb_func_end sub_806E00C
 
 	thumb_func_start sub_806E064
-sub_806E064: ; 806E064
+sub_806E064: @ 806E064
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -183838,7 +183838,7 @@ _0806E0AA:
 	thumb_func_end sub_806E064
 
 	thumb_func_start sub_806E0B4
-sub_806E0B4: ; 806E0B4
+sub_806E0B4: @ 806E0B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -184009,7 +184009,7 @@ _0806E1E4:
 	thumb_func_end sub_806E0B4
 
 	thumb_func_start sub_806E204
-sub_806E204: ; 806E204
+sub_806E204: @ 806E204
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -184054,7 +184054,7 @@ _0806E248:
 	thumb_func_end sub_806E204
 
 	thumb_func_start sub_806E25C
-sub_806E25C: ; 806E25C
+sub_806E25C: @ 806E25C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -184237,7 +184237,7 @@ _0806E3A2:
 	thumb_func_end sub_806E25C
 
 	thumb_func_start sub_806E3C0
-sub_806E3C0: ; 806E3C0
+sub_806E3C0: @ 806E3C0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -184267,7 +184267,7 @@ _0806E3F2:
 	thumb_func_end sub_806E3C0
 
 	thumb_func_start sub_806E3F8
-sub_806E3F8: ; 806E3F8
+sub_806E3F8: @ 806E3F8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -184286,7 +184286,7 @@ _0806E410:
 	thumb_func_end sub_806E3F8
 
 	thumb_func_start sub_806E414
-sub_806E414: ; 806E414
+sub_806E414: @ 806E414
 	push {lr}
 	ldr r1, =0x020244e4
 	movs r2, 0
@@ -184302,7 +184302,7 @@ _0806E41C:
 	thumb_func_end sub_806E414
 
 	thumb_func_start song_id_for_battle
-song_id_for_battle: ; 806E42C
+song_id_for_battle: @ 806E42C
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r1, [r0]
@@ -184474,7 +184474,7 @@ _0806E604:
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gTrainers + 0x4 ; name offset
+	ldr r1, =gTrainers + 0x4 @ name offset
 	adds r0, r1
 	ldr r1, =gUnknown_085CCB98
 	bl CompareString
@@ -184503,7 +184503,7 @@ _0806E646:
 	thumb_func_end song_id_for_battle
 
 	thumb_func_start sub_806E64C
-sub_806E64C: ; 806E64C
+sub_806E64C: @ 806E64C
 	push {lr}
 	bl map_music_set_to_zero
 	bl m4aMPlayAllStop
@@ -184516,7 +184516,7 @@ sub_806E64C: ; 806E64C
 	thumb_func_end sub_806E64C
 
 	thumb_func_start current_map_music_set__default_for_battle
-current_map_music_set__default_for_battle: ; 806E668
+current_map_music_set__default_for_battle: @ 806E668
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -184539,7 +184539,7 @@ _0806E68E:
 	thumb_func_end current_map_music_set__default_for_battle
 
 	thumb_func_start sub_806E694
-sub_806E694: ; 806E694
+sub_806E694: @ 806E694
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -184564,7 +184564,7 @@ sub_806E694: ; 806E694
 	thumb_func_end sub_806E694
 
 	thumb_func_start sub_806E6CC
-sub_806E6CC: ; 806E6CC
+sub_806E6CC: @ 806E6CC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -184595,7 +184595,7 @@ _0806E6FC:
 	thumb_func_end sub_806E6CC
 
 	thumb_func_start pokemon_get_pal
-pokemon_get_pal: ; 806E708
+pokemon_get_pal: @ 806E708
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x41
@@ -184623,7 +184623,7 @@ pokemon_get_pal: ; 806E708
 	thumb_func_end pokemon_get_pal
 
 	thumb_func_start species_and_otid_get_pal
-species_and_otid_get_pal: ; 806E740
+species_and_otid_get_pal: @ 806E740
 	push {r4,r5,lr}
 	adds r3, r2, 0
 	lsls r0, 16
@@ -184666,7 +184666,7 @@ _0806E788:
 	thumb_func_end species_and_otid_get_pal
 
 	thumb_func_start sub_806E794
-sub_806E794: ; 806E794
+sub_806E794: @ 806E794
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x41
@@ -184694,7 +184694,7 @@ sub_806E794: ; 806E794
 	thumb_func_end sub_806E794
 
 	thumb_func_start sub_806E7CC
-sub_806E7CC: ; 806E7CC
+sub_806E7CC: @ 806E7CC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -184724,7 +184724,7 @@ _0806E7F8:
 	thumb_func_end sub_806E7CC
 
 	thumb_func_start sub_806E804
-sub_806E804: ; 806E804
+sub_806E804: @ 806E804
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -184757,7 +184757,7 @@ _0806E838:
 	thumb_func_end sub_806E804
 
 	thumb_func_start sub_806E840
-sub_806E840: ; 806E840
+sub_806E840: @ 806E840
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r2, =gBaseStats
@@ -184772,7 +184772,7 @@ sub_806E840: ; 806E840
 	thumb_func_end sub_806E840
 
 	thumb_func_start sub_806E858
-sub_806E858: ; 806E858
+sub_806E858: @ 806E858
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
@@ -184793,7 +184793,7 @@ sub_806E858: ; 806E858
 	thumb_func_end sub_806E858
 
 	thumb_func_start sub_806E880
-sub_806E880: ; 806E880
+sub_806E880: @ 806E880
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
@@ -184814,7 +184814,7 @@ sub_806E880: ; 806E880
 	thumb_func_end sub_806E880
 
 	thumb_func_start sub_806E8A8
-sub_806E8A8: ; 806E8A8
+sub_806E8A8: @ 806E8A8
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -184836,7 +184836,7 @@ sub_806E8A8: ; 806E8A8
 	thumb_func_end sub_806E8A8
 
 	thumb_func_start sub_806E8D4
-sub_806E8D4: ; 806E8D4
+sub_806E8D4: @ 806E8D4
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r1, =0x03005d90
@@ -184882,7 +184882,7 @@ _0806E91E:
 	thumb_func_end sub_806E8D4
 
 	thumb_func_start sub_806E924
-sub_806E924: ; 806E924
+sub_806E924: @ 806E924
 	push {lr}
 	bl pokemon_restore_pp
 	pop {r0}
@@ -184890,7 +184890,7 @@ sub_806E924: ; 806E924
 	thumb_func_end sub_806E924
 
 	thumb_func_start pokemon_restore_pp
-pokemon_restore_pp: ; 806E930
+pokemon_restore_pp: @ 806E930
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -184940,7 +184940,7 @@ _0806E984:
 	thumb_func_end pokemon_restore_pp
 
 	thumb_func_start sub_806E994
-sub_806E994: ; 806E994
+sub_806E994: @ 806E994
 	push {r4,r5,lr}
 	ldr r2, =0x0202420a
 	ldr r5, =0x0202449c
@@ -185011,7 +185011,7 @@ _0806E9F6:
 	thumb_func_end sub_806E994
 
 	thumb_func_start sub_806EA40
-sub_806EA40: ; 806EA40
+sub_806EA40: @ 806EA40
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -185036,7 +185036,7 @@ _0806EA62:
 	thumb_func_end sub_806EA40
 
 	thumb_func_start sub_806EA68
-sub_806EA68: ; 806EA68
+sub_806EA68: @ 806EA68
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -185113,7 +185113,7 @@ _0806EB18:
 	lsls r2, r4, 3
 	subs r2, r4
 	lsls r2, 2
-	ldr r1, =gBaseStats + 0xe ; item 2 offset
+	ldr r1, =gBaseStats + 0xe @ item 2 offset
 	b _0806EB6C
 	.pool
 _0806EB2C:
@@ -185146,7 +185146,7 @@ _0806EB5C:
 _0806EB66:
 	subs r2, r4
 	lsls r2, 2
-	ldr r1, =gBaseStats + 0xc ; item 1 offset
+	ldr r1, =gBaseStats + 0xc @ item 1 offset
 _0806EB6C:
 	adds r2, r1
 _0806EB6E:
@@ -185158,7 +185158,7 @@ _0806EB80:
 	ldr r0, =0x02024744
 	subs r2, r4
 	lsls r2, 2
-	ldr r1, =gBaseStats + 0xe ; item 2 offset
+	ldr r1, =gBaseStats + 0xe @ item 2 offset
 	adds r2, r1
 	movs r1, 0xC
 	bl pokemon_setattr
@@ -185172,7 +185172,7 @@ _0806EB90:
 	thumb_func_end sub_806EA68
 
 	thumb_func_start sub_806EBA4
-sub_806EBA4: ; 806EBA4
+sub_806EBA4: @ 806EBA4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -185194,7 +185194,7 @@ sub_806EBA4: ; 806EBA4
 	thumb_func_end sub_806EBA4
 
 	thumb_func_start sub_806EBD0
-sub_806EBD0: ; 806EBD0
+sub_806EBD0: @ 806EBD0
 	push {r4,lr}
 	movs r4, 0
 	lsrs r2, r0, 16
@@ -185217,7 +185217,7 @@ _0806EBEA:
 	thumb_func_end sub_806EBD0
 
 	thumb_func_start sub_806EBF8
-sub_806EBF8: ; 806EBF8
+sub_806EBF8: @ 806EBF8
 	push {r4,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -185231,7 +185231,7 @@ sub_806EBF8: ; 806EBF8
 	ldr r0, =0x00000c03
 	cmp r1, r0
 	bne _0806EC28
-	ldr r0, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
+	ldr r0, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
 	b _0806EC64
 	.pool
 _0806EC28:
@@ -185269,7 +185269,7 @@ _0806EC64:
 	thumb_func_end sub_806EBF8
 
 	thumb_func_start sub_806EC70
-sub_806EC70: ; 806EC70
+sub_806EC70: @ 806EC70
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -185300,7 +185300,7 @@ _0806ECA0:
 	thumb_func_end sub_806EC70
 
 	thumb_func_start sub_806ECAC
-sub_806ECAC: ; 806ECAC
+sub_806ECAC: @ 806ECAC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -185333,7 +185333,7 @@ _0806ECE2:
 	thumb_func_end sub_806ECAC
 
 	thumb_func_start sub_806ECEC
-sub_806ECEC: ; 806ECEC
+sub_806ECEC: @ 806ECEC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -185372,7 +185372,7 @@ _0806ED38:
 	thumb_func_end sub_806ECEC
 
 	thumb_func_start sub_806ED40
-sub_806ED40: ; 806ED40
+sub_806ED40: @ 806ED40
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -185469,7 +185469,7 @@ _0806EDFA:
 	thumb_func_end sub_806ED40
 
 	thumb_func_start sub_806EE0C
-sub_806EE0C: ; 806EE0C
+sub_806EE0C: @ 806EE0C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -185530,7 +185530,7 @@ _0806EE8C:
 	thumb_func_end sub_806EE0C
 
 	thumb_func_start sub_806EE98
-sub_806EE98: ; 806EE98
+sub_806EE98: @ 806EE98
 	push {lr}
 	ldr r0, =sub_806ECAC
 	bl get_task_id_by_function
@@ -185546,7 +185546,7 @@ _0806EEAC:
 	thumb_func_end sub_806EE98
 
 	thumb_func_start sub_806EEB4
-sub_806EEB4: ; 806EEB4
+sub_806EEB4: @ 806EEB4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -185584,7 +185584,7 @@ _0806EEFC:
 	thumb_func_end sub_806EEB4
 
 	thumb_func_start sub_806EF08
-sub_806EF08: ; 806EF08
+sub_806EF08: @ 806EF08
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -185651,7 +185651,7 @@ _0806EF74:
 	thumb_func_end sub_806EF08
 
 	thumb_func_start sub_806EF84
-sub_806EF84: ; 806EF84
+sub_806EF84: @ 806EF84
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -185713,8 +185713,8 @@ _0806EFE6:
 	thumb_func_end sub_806EF84
 
 	thumb_func_start TrainerClassToTrainerPic
-; u8 TrainerClassToTrainerPic(u16 trainerClassId)
-TrainerClassToTrainerPic: ; 806EFF0
+@ u8 TrainerClassToTrainerPic(u16 trainerClassId)
+TrainerClassToTrainerPic: @ 806EFF0
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =gTrainerPicIndices
@@ -185725,7 +185725,7 @@ TrainerClassToTrainerPic: ; 806EFF0
 	thumb_func_end TrainerClassToTrainerPic
 
 	thumb_func_start sub_806F000
-sub_806F000: ; 806F000
+sub_806F000: @ 806F000
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -185743,8 +185743,8 @@ _0806F00E:
 	thumb_func_end sub_806F000
 
 	thumb_func_start SetPokedexFlag
-; void SetPokedexFlag(u16 nationalPokedexNum, u8 op, u32 personality)
-SetPokedexFlag: ; 806F01C
+@ void SetPokedexFlag(u16 nationalPokedexNum, u8 op, u32 personality)
+SetPokedexFlag: @ 806F01C
 	push {r4-r7,lr}
 	adds r7, r2, 0
 	lsls r0, 16
@@ -185793,7 +185793,7 @@ _0806F072:
 	thumb_func_end SetPokedexFlag
 
 	thumb_func_start sub_806F07C
-sub_806F07C: ; 806F07C
+sub_806F07C: @ 806F07C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -185818,7 +185818,7 @@ _0806F08A:
 	thumb_func_end sub_806F07C
 
 	thumb_func_start sub_806F0B0
-sub_806F0B0: ; 806F0B0
+sub_806F0B0: @ 806F0B0
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -185830,7 +185830,7 @@ _0806F0BE:
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gTrainers + 0x4 ; name offset
+	ldr r1, =gTrainers + 0x4 @ name offset
 	adds r0, r1
 	pop {r1}
 	bx r1
@@ -185838,7 +185838,7 @@ _0806F0BE:
 	thumb_func_end sub_806F0B0
 
 	thumb_func_start sub_806F0D4
-sub_806F0D4: ; 806F0D4
+sub_806F0D4: @ 806F0D4
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -185865,7 +185865,7 @@ _0806F0F8:
 	thumb_func_end sub_806F0D4
 
 	thumb_func_start sub_806F104
-sub_806F104: ; 806F104
+sub_806F104: @ 806F104
 	push {lr}
 	ldr r2, =0x030022c0
 	ldr r1, =0x00000439
@@ -185909,7 +185909,7 @@ _0806F15A:
 	thumb_func_end sub_806F104
 
 	thumb_func_start sub_806F160
-sub_806F160: ; 806F160
+sub_806F160: @ 806F160
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -185994,7 +185994,7 @@ _0806F1EA:
 	thumb_func_end sub_806F160
 
 	thumb_func_start sub_806F1FC
-sub_806F1FC: ; 806F1FC
+sub_806F1FC: @ 806F1FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -186087,7 +186087,7 @@ _0806F296:
 	thumb_func_end sub_806F1FC
 
 	thumb_func_start sub_806F2AC
-sub_806F2AC: ; 806F2AC
+sub_806F2AC: @ 806F2AC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -186329,7 +186329,7 @@ _0806F46E:
 	thumb_func_end sub_806F2AC
 
 	thumb_func_start sub_806F47C
-sub_806F47C: ; 806F47C
+sub_806F47C: @ 806F47C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -186392,7 +186392,7 @@ _0806F4F0:
 	thumb_func_end sub_806F47C
 
 	thumb_func_start sub_806F4F8
-sub_806F4F8: ; 806F4F8
+sub_806F4F8: @ 806F4F8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -186428,8 +186428,8 @@ _0806F530:
 	thumb_func_end sub_806F4F8
 
 	thumb_func_start sine
-; s16 sine(s16 t, s16 amplitude)
-sine: ; 806F534
+@ s16 sine(s16 t, s16 amplitude)
+sine: @ 806F534
 	lsls r1, 16
 	asrs r1, 16
 	ldr r2, =gUnknown_08329F40
@@ -186446,8 +186446,8 @@ sine: ; 806F534
 	thumb_func_end sine
 
 	thumb_func_start cosine
-; s16 cosine(s16 t, s16 amplitude)
-cosine: ; 806F550
+@ s16 cosine(s16 t, s16 amplitude)
+cosine: @ 806F550
 	lsls r1, 16
 	asrs r1, 16
 	ldr r2, =gUnknown_08329F40
@@ -186465,8 +186465,8 @@ cosine: ; 806F550
 	thumb_func_end cosine
 
 	thumb_func_start sine2
-; s16 sine2(u16 angle)
-sine2: ; 806F570
+@ s16 sine2(u16 angle)
+sine2: @ 806F570
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 16
@@ -186502,8 +186502,8 @@ _0806F5AC:
 	thumb_func_end sine2
 
 	thumb_func_start cosine2
-; s16 cosine2(u16 angle)
-cosine2: ; 806F5B4
+@ s16 cosine2(u16 angle)
+cosine2: @ 806F5B4
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xB4
@@ -186518,8 +186518,8 @@ cosine2: ; 806F5B4
 	thumb_func_end cosine2
 
 	thumb_func_start GenerateRandomNumber
-; u16 GenerateRandomNumber()
-GenerateRandomNumber: ; 806F5CC
+@ u16 GenerateRandomNumber()
+GenerateRandomNumber: @ 806F5CC
 	ldr r2, =0x03005d80
 	ldr r1, [r2]
 	ldr r0, =0x41c64e6d
@@ -186537,8 +186537,8 @@ GenerateRandomNumber: ; 806F5CC
 	thumb_func_end GenerateRandomNumber
 
 	thumb_func_start SeedRng
-; void SeedRng(u16 seed)
-SeedRng: ; 806F5F8
+@ void SeedRng(u16 seed)
+SeedRng: @ 806F5F8
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =0x03005d80
@@ -186551,7 +186551,7 @@ SeedRng: ; 806F5F8
 	thumb_func_end SeedRng
 
 	thumb_func_start SeedRng2
-SeedRng2: ; 806F610
+SeedRng2: @ 806F610
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =0x03005d84
@@ -186561,7 +186561,7 @@ SeedRng2: ; 806F610
 	thumb_func_end SeedRng2
 
 	thumb_func_start GenerateRandomNumber2
-GenerateRandomNumber2: ; 806F620
+GenerateRandomNumber2: @ 806F620
 	ldr r2, =0x03005d84
 	ldr r1, [r2]
 	ldr r0, =0x41c64e6d
@@ -186575,7 +186575,7 @@ GenerateRandomNumber2: ; 806F620
 	thumb_func_end GenerateRandomNumber2
 
 	thumb_func_start object_new_hidden_with_callback
-object_new_hidden_with_callback: ; 806F640
+object_new_hidden_with_callback: @ 806F640
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =gUnknown_0832A3A8
@@ -186605,7 +186605,7 @@ object_new_hidden_with_callback: ; 806F640
 	thumb_func_end object_new_hidden_with_callback
 
 	thumb_func_start sub_806F67C
-sub_806F67C: ; 806F67C
+sub_806F67C: @ 806F67C
 	strh r1, [r0]
 	lsrs r1, 16
 	strh r1, [r0, 0x2]
@@ -186613,7 +186613,7 @@ sub_806F67C: ; 806F67C
 	thumb_func_end sub_806F67C
 
 	thumb_func_start sub_806F684
-sub_806F684: ; 806F684
+sub_806F684: @ 806F684
 	ldrh r2, [r0]
 	movs r3, 0x2
 	ldrsh r0, [r0, r3]
@@ -186624,7 +186624,7 @@ sub_806F684: ; 806F684
 	thumb_func_end sub_806F684
 
 	thumb_func_start sub_806F694
-sub_806F694: ; 806F694
+sub_806F694: @ 806F694
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -186649,7 +186649,7 @@ sub_806F694: ; 806F694
 	thumb_func_end sub_806F694
 
 	thumb_func_start sub_806F6C0
-sub_806F6C0: ; 806F6C0
+sub_806F6C0: @ 806F6C0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -186688,7 +186688,7 @@ sub_806F6C0: ; 806F6C0
 	thumb_func_end sub_806F6C0
 
 	thumb_func_start rfu_MBOOT_CHILD_inheritanceLinkStatus
-rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C
+rfu_MBOOT_CHILD_inheritanceLinkStatus: @ 806F70C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -186899,7 +186899,7 @@ _0806F894:
 	thumb_func_end rfu_MBOOT_CHILD_inheritanceLinkStatus
 
 	thumb_func_start sub_806F8A8
-sub_806F8A8: ; 806F8A8
+sub_806F8A8: @ 806F8A8
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -186925,7 +186925,7 @@ _0806F8CA:
 	thumb_func_end sub_806F8A8
 
 	thumb_func_start sub_806F8D0
-sub_806F8D0: ; 806F8D0
+sub_806F8D0: @ 806F8D0
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	adds r4, r1, 0
@@ -186975,7 +186975,7 @@ _0806F91C:
 	thumb_func_end sub_806F8D0
 
 	thumb_func_start sub_806F928
-sub_806F928: ; 806F928
+sub_806F928: @ 806F928
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -187011,7 +187011,7 @@ _0806F956:
 	thumb_func_end sub_806F928
 
 	thumb_func_start sub_806F96C
-sub_806F96C: ; 806F96C
+sub_806F96C: @ 806F96C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r3, 0
@@ -187033,7 +187033,7 @@ _0806F984:
 	thumb_func_end sub_806F96C
 
 	thumb_func_start pal_fade_1
-pal_fade_1: ; 806F98C
+pal_fade_1: @ 806F98C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -187115,7 +187115,7 @@ _0806FA12:
 	thumb_func_end pal_fade_1
 
 	thumb_func_start pokemon_get_nick
-pokemon_get_nick: ; 806FA2C
+pokemon_get_nick: @ 806FA2C
 	push {r4,lr}
 	sub sp, 0x14
 	adds r4, r1, 0
@@ -187132,7 +187132,7 @@ pokemon_get_nick: ; 806FA2C
 	thumb_func_end pokemon_get_nick
 
 	thumb_func_start pokemon_get_nick_
-pokemon_get_nick_: ; 806FA4C
+pokemon_get_nick_: @ 806FA4C
 	push {r4,lr}
 	sub sp, 0x14
 	adds r4, r1, 0
@@ -187149,7 +187149,7 @@ pokemon_get_nick_: ; 806FA4C
 	thumb_func_end pokemon_get_nick_
 
 	thumb_func_start daycare_count_pokemon
-daycare_count_pokemon: ; 806FA6C
+daycare_count_pokemon: @ 806FA6C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -187178,7 +187178,7 @@ _0806FA8A:
 	thumb_func_end daycare_count_pokemon
 
 	thumb_func_start sub_806FA9C
-sub_806FA9C: ; 806FA9C
+sub_806FA9C: @ 806FA9C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -187237,8 +187237,8 @@ _0806FAEA:
 	thumb_func_end sub_806FA9C
 
 	thumb_func_start daycare_empty_slot
-; u8 daycare_empty_slot(struct daycare_mon *dayCareMons)
-daycare_empty_slot: ; 806FB08
+@ u8 daycare_empty_slot(struct daycare_mon *dayCareMons)
+daycare_empty_slot: @ 806FB08
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -187268,8 +187268,8 @@ _0806FB32:
 	thumb_func_end daycare_empty_slot
 
 	thumb_func_start sub_806FB38
-; void sub_806FB38(struct pokemon *mon, struct daycare_mon *dayCareMon)
-sub_806FB38: ; 806FB38
+@ void sub_806FB38(struct pokemon *mon, struct daycare_mon *dayCareMon)
+sub_806FB38: @ 806FB38
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -187351,8 +187351,8 @@ _0806FBBC:
 	thumb_func_end sub_806FB38
 
 	thumb_func_start daycare_send
-; void daycare_send(struct pokemon *mon, struct daycare_mon *dayCareMons)
-daycare_send: ; 806FBF4
+@ void daycare_send(struct pokemon *mon, struct daycare_mon *dayCareMons)
+daycare_send: @ 806FBF4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -187372,7 +187372,7 @@ daycare_send: ; 806FBF4
 	thumb_func_end daycare_send
 
 	thumb_func_start daycare_send_selected_pokemon
-daycare_send_selected_pokemon: ; 806FC18
+daycare_send_selected_pokemon: @ 806FC18
 	push {lr}
 	bl brm_get_pokemon_selection
 	lsls r0, 24
@@ -187392,7 +187392,7 @@ daycare_send_selected_pokemon: ; 806FC18
 	thumb_func_end daycare_send_selected_pokemon
 
 	thumb_func_start sub_806FC48
-sub_806FC48: ; 806FC48
+sub_806FC48: @ 806FC48
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -187437,7 +187437,7 @@ _0806FC9E:
 	thumb_func_end sub_806FC48
 
 	thumb_func_start sub_806FCA4
-sub_806FCA4: ; 806FCA4
+sub_806FCA4: @ 806FCA4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -187480,7 +187480,7 @@ _0806FCE8:
 	thumb_func_end sub_806FCA4
 
 	thumb_func_start sub_806FCF8
-sub_806FCF8: ; 806FCF8
+sub_806FCF8: @ 806FCF8
 	push {r4-r7,lr}
 	sub sp, 0x68
 	adds r5, r0, 0
@@ -187552,7 +187552,7 @@ _0806FD74:
 	thumb_func_end sub_806FCF8
 
 	thumb_func_start sub_806FD9C
-sub_806FD9C: ; 806FD9C
+sub_806FD9C: @ 806FD9C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -187573,7 +187573,7 @@ sub_806FD9C: ; 806FD9C
 	thumb_func_end sub_806FD9C
 
 	thumb_func_start sub_806FDC4
-sub_806FDC4: ; 806FDC4
+sub_806FDC4: @ 806FDC4
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -187590,7 +187590,7 @@ sub_806FDC4: ; 806FDC4
 	thumb_func_end sub_806FDC4
 
 	thumb_func_start sub_806FDEC
-sub_806FDEC: ; 806FDEC
+sub_806FDEC: @ 806FDEC
 	push {r4,r5,lr}
 	sub sp, 0x54
 	adds r4, r0, 0
@@ -187619,7 +187619,7 @@ sub_806FDEC: ; 806FDEC
 	thumb_func_end sub_806FDEC
 
 	thumb_func_start sub_806FE28
-sub_806FE28: ; 806FE28
+sub_806FE28: @ 806FE28
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_80690C0
@@ -187642,7 +187642,7 @@ sub_806FE28: ; 806FE28
 	thumb_func_end sub_806FE28
 
 	thumb_func_start sub_806FE54
-sub_806FE54: ; 806FE54
+sub_806FE54: @ 806FE54
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_806FE28
@@ -187665,7 +187665,7 @@ sub_806FE54: ; 806FE54
 	thumb_func_end sub_806FE54
 
 	thumb_func_start sub_806FE88
-sub_806FE88: ; 806FE88
+sub_806FE88: @ 806FE88
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_806FE28
@@ -187691,7 +187691,7 @@ sub_806FE88: ; 806FE88
 	thumb_func_end sub_806FE88
 
 	thumb_func_start sub_806FEC0
-sub_806FEC0: ; 806FEC0
+sub_806FEC0: @ 806FEC0
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -187706,7 +187706,7 @@ sub_806FEC0: ; 806FEC0
 	thumb_func_end sub_806FEC0
 
 	thumb_func_start sub_806FED8
-sub_806FED8: ; 806FED8
+sub_806FED8: @ 806FED8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -187723,7 +187723,7 @@ sub_806FED8: ; 806FED8
 	thumb_func_end sub_806FED8
 
 	thumb_func_start sub_806FF04
-sub_806FF04: ; 806FF04
+sub_806FF04: @ 806FF04
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =0x03005d8c
@@ -187743,7 +187743,7 @@ sub_806FF04: ; 806FF04
 	thumb_func_end sub_806FF04
 
 	thumb_func_start sub_806FF30
-sub_806FF30: ; 806FF30
+sub_806FF30: @ 806FF30
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r5, =0x020375e0
@@ -187781,7 +187781,7 @@ _0806FF76:
 	thumb_func_end sub_806FF30
 
 	thumb_func_start sub_806FF80
-sub_806FF80: ; 806FF80
+sub_806FF80: @ 806FF80
 	push {lr}
 	movs r3, 0
 	movs r2, 0x7
@@ -187809,7 +187809,7 @@ _0806FF9E:
 	thumb_func_end sub_806FF80
 
 	thumb_func_start sub_806FFB0
-sub_806FFB0: ; 806FFB0
+sub_806FFB0: @ 806FFB0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl zero_pokemon_boxed_data
@@ -187826,7 +187826,7 @@ sub_806FFB0: ; 806FFB0
 	thumb_func_end sub_806FFB0
 
 	thumb_func_start sub_806FFD0
-sub_806FFD0: ; 806FFD0
+sub_806FFD0: @ 806FFD0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -187856,7 +187856,7 @@ _0806FFD8:
 	thumb_func_end sub_806FFD0
 
 	thumb_func_start sub_8070004
-sub_8070004: ; 8070004
+sub_8070004: @ 8070004
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -187927,7 +187927,7 @@ _08070072:
 	thumb_func_end sub_8070004
 
 	thumb_func_start sub_8070084
-sub_8070084: ; 8070084
+sub_8070084: @ 8070084
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -188004,7 +188004,7 @@ _0807010A:
 	thumb_func_end sub_8070084
 
 	thumb_func_start sub_8070114
-sub_8070114: ; 8070114
+sub_8070114: @ 8070114
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -188080,7 +188080,7 @@ _080701AC:
 	thumb_func_end sub_8070114
 
 	thumb_func_start sub_80701B8
-sub_80701B8: ; 80701B8
+sub_80701B8: @ 80701B8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GenerateRandomNumber
@@ -188102,7 +188102,7 @@ sub_80701B8: ; 80701B8
 	thumb_func_end sub_80701B8
 
 	thumb_func_start sub_80701E0
-sub_80701E0: ; 80701E0
+sub_80701E0: @ 80701E0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -188115,7 +188115,7 @@ sub_80701E0: ; 80701E0
 	thumb_func_end sub_80701E0
 
 	thumb_func_start sub_80701FC
-sub_80701FC: ; 80701FC
+sub_80701FC: @ 80701FC
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -188128,7 +188128,7 @@ sub_80701FC: ; 80701FC
 	thumb_func_end sub_80701FC
 
 	thumb_func_start sub_8070218
-sub_8070218: ; 8070218
+sub_8070218: @ 8070218
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -188170,7 +188170,7 @@ _08070250:
 	thumb_func_end sub_8070218
 
 	thumb_func_start sub_8070260
-sub_8070260: ; 8070260
+sub_8070260: @ 8070260
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -188346,7 +188346,7 @@ _080703AE:
 	thumb_func_end sub_8070260
 
 	thumb_func_start pokemon_get_eggmoves
-pokemon_get_eggmoves: ; 80703C8
+pokemon_get_eggmoves: @ 80703C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -188429,7 +188429,7 @@ _08070456:
 	thumb_func_end pokemon_get_eggmoves
 
 	thumb_func_start daycare_build_child_moveset
-daycare_build_child_moveset: ; 8070470
+daycare_build_child_moveset: @ 8070470
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -188754,7 +188754,7 @@ _080706FC:
 	thumb_func_end daycare_build_child_moveset
 
 	thumb_func_start sub_8070710
-sub_8070710: ; 8070710
+sub_8070710: @ 8070710
 	adds r2, r0, 0
 	movs r1, 0x8C
 	lsls r1, 1
@@ -188769,7 +188769,7 @@ sub_8070710: ; 8070710
 	thumb_func_end sub_8070710
 
 	thumb_func_start sub_8070728
-sub_8070728: ; 8070728
+sub_8070728: @ 8070728
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -188782,7 +188782,7 @@ sub_8070728: ; 8070728
 	thumb_func_end sub_8070728
 
 	thumb_func_start incense_effects
-incense_effects: ; 8070744
+incense_effects: @ 8070744
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -188835,7 +188835,7 @@ _0807079E:
 	thumb_func_end incense_effects
 
 	thumb_func_start sub_80707A4
-sub_80707A4: ; 80707A4
+sub_80707A4: @ 80707A4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -188872,7 +188872,7 @@ _080707E2:
 	thumb_func_end sub_80707A4
 
 	thumb_func_start sub_80707EC
-sub_80707EC: ; 80707EC
+sub_80707EC: @ 80707EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -188986,7 +188986,7 @@ _080708B4:
 	thumb_func_end sub_80707EC
 
 	thumb_func_start sub_80708C8
-sub_80708C8: ; 80708C8
+sub_80708C8: @ 80708C8
 	push {r4-r6,lr}
 	sub sp, 0x6C
 	adds r6, r0, 0
@@ -189048,7 +189048,7 @@ _08070918:
 	thumb_func_end sub_80708C8
 
 	thumb_func_start sub_8070954
-sub_8070954: ; 8070954
+sub_8070954: @ 8070954
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -189094,7 +189094,7 @@ sub_8070954: ; 8070954
 	lsls r2, r5, 3
 	subs r2, r5
 	lsls r2, 2
-	ldr r0, =gBaseStats + 0x11 ; egg cycles offset
+	ldr r0, =gBaseStats + 0x11 @ egg cycles offset
 	adds r2, r0
 	adds r0, r7, 0
 	movs r1, 0x20
@@ -189134,7 +189134,7 @@ _080709E6:
 	thumb_func_end sub_8070954
 
 	thumb_func_start sub_8070A0C
-sub_8070A0C: ; 8070A0C
+sub_8070A0C: @ 8070A0C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -189182,7 +189182,7 @@ sub_8070A0C: ; 8070A0C
 	lsls r2, r5, 3
 	subs r2, r5
 	lsls r2, 2
-	ldr r0, =gBaseStats + 0x11 ; egg cycles offset
+	ldr r0, =gBaseStats + 0x11 @ egg cycles offset
 	adds r2, r0
 	adds r0, r6, 0
 	movs r1, 0x20
@@ -189206,7 +189206,7 @@ sub_8070A0C: ; 8070A0C
 	thumb_func_end sub_8070A0C
 
 	thumb_func_start sp0B8_daycare
-sp0B8_daycare: ; 8070AA8
+sp0B8_daycare: @ 8070AA8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -189219,7 +189219,7 @@ sp0B8_daycare: ; 8070AA8
 	thumb_func_end sp0B8_daycare
 
 	thumb_func_start sub_8070AC4
-sub_8070AC4: ; 8070AC4
+sub_8070AC4: @ 8070AC4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -189349,7 +189349,7 @@ _08070BC2:
 	thumb_func_end sub_8070AC4
 
 	thumb_func_start sub_8070BD0
-sub_8070BD0: ; 8070BD0
+sub_8070BD0: @ 8070BD0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -189364,7 +189364,7 @@ sub_8070BD0: ; 8070BD0
 	thumb_func_end sub_8070BD0
 
 	thumb_func_start sub_8070BF0
-sub_8070BF0: ; 8070BF0
+sub_8070BF0: @ 8070BF0
 	push {lr}
 	movs r1, 0x8C
 	lsls r1, 1
@@ -189379,7 +189379,7 @@ _08070C00:
 	thumb_func_end sub_8070BF0
 
 	thumb_func_start sub_8070C04
-sub_8070C04: ; 8070C04
+sub_8070C04: @ 8070C04
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -189416,7 +189416,7 @@ _08070C44:
 	thumb_func_end sub_8070C04
 
 	thumb_func_start sub_8070C58
-sub_8070C58: ; 8070C58
+sub_8070C58: @ 8070C58
 	push {r4,r5,lr}
 	bl brm_get_pokemon_selection
 	lsls r0, 24
@@ -189443,7 +189443,7 @@ sub_8070C58: ; 8070C58
 	thumb_func_end sub_8070C58
 
 	thumb_func_start sp0B5_daycare
-sp0B5_daycare: ; 8070C94
+sp0B5_daycare: @ 8070C94
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -189456,7 +189456,7 @@ sp0B5_daycare: ; 8070C94
 	thumb_func_end sp0B5_daycare
 
 	thumb_func_start sp0B6_daycare
-sp0B6_daycare: ; 8070CB0
+sp0B6_daycare: @ 8070CB0
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -189492,7 +189492,7 @@ _08070CF2:
 	thumb_func_end sp0B6_daycare
 
 	thumb_func_start sub_8070CF8
-sub_8070CF8: ; 8070CF8
+sub_8070CF8: @ 8070CF8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -189511,7 +189511,7 @@ _08070D10:
 	thumb_func_end sub_8070CF8
 
 	thumb_func_start sub_8070D1C
-sub_8070D1C: ; 8070D1C
+sub_8070D1C: @ 8070D1C
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	movs r4, 0
@@ -189543,7 +189543,7 @@ _08070D46:
 	thumb_func_end sub_8070D1C
 
 	thumb_func_start daycare_relationship_score
-daycare_relationship_score: ; 8070D4C
+daycare_relationship_score: @ 8070D4C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -189694,7 +189694,7 @@ _08070E5C:
 	thumb_func_end daycare_relationship_score
 
 	thumb_func_start daycare_relationship_score_from_savegame
-daycare_relationship_score_from_savegame: ; 8070E6C
+daycare_relationship_score_from_savegame: @ 8070E6C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -189709,7 +189709,7 @@ daycare_relationship_score_from_savegame: ; 8070E6C
 	thumb_func_end daycare_relationship_score_from_savegame
 
 	thumb_func_start sp0B9_daycare_relationship_comment
-sp0B9_daycare_relationship_comment: ; 8070E8C
+sp0B9_daycare_relationship_comment: @ 8070E8C
 	push {lr}
 	bl daycare_relationship_score_from_savegame
 	lsls r0, 24
@@ -189744,7 +189744,7 @@ _08070EB2:
 	thumb_func_end sp0B9_daycare_relationship_comment
 
 	thumb_func_start sub_8070ECC
-sub_8070ECC: ; 8070ECC
+sub_8070ECC: @ 8070ECC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -189817,7 +189817,7 @@ _08070F3E:
 	thumb_func_end sub_8070ECC
 
 	thumb_func_start sub_8070F48
-sub_8070F48: ; 8070F48
+sub_8070F48: @ 8070F48
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -189856,7 +189856,7 @@ _08070F86:
 	thumb_func_end sub_8070F48
 
 	thumb_func_start sub_8070F98
-sub_8070F98: ; 8070F98
+sub_8070F98: @ 8070F98
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -189872,7 +189872,7 @@ sub_8070F98: ; 8070F98
 	thumb_func_end sub_8070F98
 
 	thumb_func_start sub_8070FB4
-sub_8070FB4: ; 8070FB4
+sub_8070FB4: @ 8070FB4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -189933,7 +189933,7 @@ _08070FCC:
 	thumb_func_end sub_8070FB4
 
 	thumb_func_start sub_8071038
-sub_8071038: ; 8071038
+sub_8071038: @ 8071038
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r6, r0, 0
@@ -189980,7 +189980,7 @@ _08071046:
 	thumb_func_end sub_8071038
 
 	thumb_func_start sub_807109C
-sub_807109C: ; 807109C
+sub_807109C: @ 807109C
 	push {r4-r6,lr}
 	sub sp, 0x10
 	str r1, [sp]
@@ -190040,7 +190040,7 @@ sub_807109C: ; 807109C
 	thumb_func_end sub_807109C
 
 	thumb_func_start sub_8071110
-sub_8071110: ; 8071110
+sub_8071110: @ 8071110
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r5, r0, 0
@@ -190069,7 +190069,7 @@ sub_8071110: ; 8071110
 	thumb_func_end sub_8071110
 
 	thumb_func_start sub_8071148
-sub_8071148: ; 8071148
+sub_8071148: @ 8071148
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -190121,7 +190121,7 @@ sub_8071148: ; 8071148
 	thumb_func_end sub_8071148
 
 	thumb_func_start sub_80711B8
-sub_80711B8: ; 80711B8
+sub_80711B8: @ 80711B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -190158,7 +190158,7 @@ _080711F0:
 	thumb_func_end sub_80711B8
 
 	thumb_func_start c3_080469FC
-c3_080469FC: ; 8071204
+c3_080469FC: @ 8071204
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -190240,7 +190240,7 @@ _080712B4:
 	thumb_func_end c3_080469FC
 
 	thumb_func_start sub_80712C0
-sub_80712C0: ; 80712C0
+sub_80712C0: @ 80712C0
 	push {r4,r5,lr}
 	sub sp, 0x18
 	ldr r0, =gUnknown_0832B6C0
@@ -190288,7 +190288,7 @@ sub_80712C0: ; 80712C0
 	thumb_func_end sub_80712C0
 
 	thumb_func_start sub_8071330
-sub_8071330: ; 8071330
+sub_8071330: @ 8071330
 	push {lr}
 	bl sub_81B9328
 	ldr r1, =0x030022c0
@@ -190300,7 +190300,7 @@ sub_8071330: ; 8071330
 	thumb_func_end sub_8071330
 
 	thumb_func_start sub_8071348
-sub_8071348: ; 8071348
+sub_8071348: @ 8071348
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -190472,7 +190472,7 @@ _0807143C:
 	thumb_func_end sub_8071348
 
 	thumb_func_start sub_80714B8
-sub_80714B8: ; 80714B8
+sub_80714B8: @ 80714B8
 	push {r4,r5,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -190551,7 +190551,7 @@ sub_80714B8: ; 80714B8
 	thumb_func_end sub_80714B8
 
 	thumb_func_start sub_8071578
-sub_8071578: ; 8071578
+sub_8071578: @ 8071578
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrb r0, [r0]
@@ -190562,7 +190562,7 @@ sub_8071578: ; 8071578
 	thumb_func_end sub_8071578
 
 	thumb_func_start sub_807158C
-sub_807158C: ; 807158C
+sub_807158C: @ 807158C
 	push {r4-r6,lr}
 	sub sp, 0x20
 	lsls r1, 24
@@ -190622,7 +190622,7 @@ _0807160A:
 	thumb_func_end sub_807158C
 
 	thumb_func_start sub_8071614
-sub_8071614: ; 8071614
+sub_8071614: @ 8071614
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -190639,7 +190639,7 @@ sub_8071614: ; 8071614
 	thumb_func_end sub_8071614
 
 	thumb_func_start sub_807163C
-sub_807163C: ; 807163C
+sub_807163C: @ 807163C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -190750,7 +190750,7 @@ _08071712:
 	thumb_func_end sub_807163C
 
 	thumb_func_start sub_807172C
-sub_807172C: ; 807172C
+sub_807172C: @ 807172C
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -190760,7 +190760,7 @@ sub_807172C: ; 807172C
 	thumb_func_end sub_807172C
 
 	thumb_func_start sub_8071740
-sub_8071740: ; 8071740
+sub_8071740: @ 8071740
 	push {lr}
 	bl script_env_2_enable
 	ldr r0, =sub_8071760
@@ -190775,7 +190775,7 @@ sub_8071740: ; 8071740
 	thumb_func_end sub_8071740
 
 	thumb_func_start sub_8071760
-sub_8071760: ; 8071760
+sub_8071760: @ 8071760
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -190801,7 +190801,7 @@ _08071788:
 	thumb_func_end sub_8071760
 
 	thumb_func_start c1_hatching_egg
-c1_hatching_egg: ; 80717A0
+c1_hatching_egg: @ 80717A0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -191020,7 +191020,7 @@ _080719D6:
 	thumb_func_end c1_hatching_egg
 
 	thumb_func_start sub_80719FC
-sub_80719FC: ; 80719FC
+sub_80719FC: @ 80719FC
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -191043,7 +191043,7 @@ sub_80719FC: ; 80719FC
 	thumb_func_end sub_80719FC
 
 	thumb_func_start c3_080472E4
-c3_080472E4: ; 8071A3C
+c3_080472E4: @ 8071A3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -191086,7 +191086,7 @@ _08071A80:
 	thumb_func_end c3_080472E4
 
 	thumb_func_start sub_8071A94
-sub_8071A94: ; 8071A94
+sub_8071A94: @ 8071A94
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -191474,7 +191474,7 @@ _08071E06:
 	thumb_func_end sub_8071A94
 
 	thumb_func_start sub_8071E34
-sub_8071E34: ; 8071E34
+sub_8071E34: @ 8071E34
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -191518,7 +191518,7 @@ _08071E84:
 	thumb_func_end sub_8071E34
 
 	thumb_func_start sub_8071E8C
-sub_8071E8C: ; 8071E8C
+sub_8071E8C: @ 8071E8C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x32]
@@ -191569,7 +191569,7 @@ _08071EE8:
 	thumb_func_end sub_8071E8C
 
 	thumb_func_start sub_8071EF0
-sub_8071EF0: ; 8071EF0
+sub_8071EF0: @ 8071EF0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x32]
@@ -191651,7 +191651,7 @@ _08071F9E:
 	thumb_func_end sub_8071EF0
 
 	thumb_func_start sub_8071FA4
-sub_8071FA4: ; 8071FA4
+sub_8071FA4: @ 8071FA4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -191672,7 +191672,7 @@ _08071FBE:
 	thumb_func_end sub_8071FA4
 
 	thumb_func_start sub_8071FC8
-sub_8071FC8: ; 8071FC8
+sub_8071FC8: @ 8071FC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -191735,7 +191735,7 @@ _08072032:
 	thumb_func_end sub_8071FC8
 
 	thumb_func_start sub_8072048
-sub_8072048: ; 8072048
+sub_8072048: @ 8072048
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -191813,7 +191813,7 @@ _080720CA:
 	thumb_func_end sub_8072048
 
 	thumb_func_start sub_80720E8
-sub_80720E8: ; 80720E8
+sub_80720E8: @ 80720E8
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -191863,7 +191863,7 @@ _0807213A:
 	thumb_func_end sub_80720E8
 
 	thumb_func_start sub_8072140
-sub_8072140: ; 8072140
+sub_8072140: @ 8072140
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r2, =gUnknown_0832C084
@@ -191904,7 +191904,7 @@ sub_8072140: ; 8072140
 	thumb_func_end sub_8072140
 
 	thumb_func_start sub_8072194
-sub_8072194: ; 8072194
+sub_8072194: @ 8072194
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -191967,7 +191967,7 @@ sub_8072194: ; 8072194
 	thumb_func_end sub_8072194
 
 	thumb_func_start sub_8072214
-sub_8072214: ; 8072214
+sub_8072214: @ 8072214
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -192027,7 +192027,7 @@ sub_8072214: ; 8072214
 	thumb_func_end sub_8072214
 
 	thumb_func_start sub_807228C
-sub_807228C: ; 807228C
+sub_807228C: @ 807228C
 	push {r4-r6,lr}
 	bl calc_player_party_count
 	lsls r0, 24
@@ -192073,7 +192073,7 @@ _080722D8:
 	thumb_func_end sub_807228C
 
 	thumb_func_start sub_80722E0
-sub_80722E0: ; 80722E0
+sub_80722E0: @ 80722E0
 	push {r4,lr}
 	bl sub_80D22D0
 	adds r4, r0, 0
@@ -192093,13 +192093,13 @@ sub_80722E0: ; 80722E0
 	thumb_func_end sub_80722E0
 
 	thumb_func_start sub_8072304
-sub_8072304: ; 8072304
+sub_8072304: @ 8072304
 	movs r0, 0x9
 	bx lr
 	thumb_func_end sub_8072304
 
 	thumb_func_start sub_8072308
-sub_8072308: ; 8072308
+sub_8072308: @ 8072308
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -192322,7 +192322,7 @@ _08072496:
 	thumb_func_end sub_8072308
 
 	thumb_func_start sub_80724A8
-sub_80724A8: ; 80724A8
+sub_80724A8: @ 80724A8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -192349,7 +192349,7 @@ sub_80724A8: ; 80724A8
 	thumb_func_end sub_80724A8
 
 	thumb_func_start battle_make_oam_normal_battle
-battle_make_oam_normal_battle: ; 80724DC
+battle_make_oam_normal_battle: @ 80724DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -192698,7 +192698,7 @@ _08072718:
 	thumb_func_end battle_make_oam_normal_battle
 
 	thumb_func_start battle_make_oam_safari_battle
-battle_make_oam_safari_battle: ; 8072804
+battle_make_oam_safari_battle: @ 8072804
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -192770,7 +192770,7 @@ battle_make_oam_safari_battle: ; 8072804
 	thumb_func_end battle_make_oam_safari_battle
 
 	thumb_func_start sub_80728A4
-sub_80728A4: ; 80728A4
+sub_80728A4: @ 80728A4
 	lsls r0, 24
 	lsrs r0, 19
 	ldr r1, =gUnknown_08C11BDC
@@ -192780,7 +192780,7 @@ sub_80728A4: ; 80728A4
 	thumb_func_end sub_80728A4
 
 	thumb_func_start sub_80728B4
-sub_80728B4: ; 80728B4
+sub_80728B4: @ 80728B4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -192839,7 +192839,7 @@ _08072906:
 	thumb_func_end sub_80728B4
 
 	thumb_func_start sub_8072924
-sub_8072924: ; 8072924
+sub_8072924: @ 8072924
 	ldrh r1, [r0, 0x38]
 	lsls r1, 24
 	lsrs r1, 24
@@ -192862,7 +192862,7 @@ sub_8072924: ; 8072924
 	thumb_func_end sub_8072924
 
 	thumb_func_start sub_807294C
-sub_807294C: ; 807294C
+sub_807294C: @ 807294C
 	push {r4-r7,lr}
 	ldr r7, [sp, 0x14]
 	lsls r0, 24
@@ -192890,7 +192890,7 @@ sub_807294C: ; 807294C
 	thumb_func_end sub_807294C
 
 	thumb_func_start sub_8072984
-sub_8072984: ; 8072984
+sub_8072984: @ 8072984
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -192931,7 +192931,7 @@ sub_8072984: ; 8072984
 	thumb_func_end sub_8072984
 
 	thumb_func_start sub_80729D0
-sub_80729D0: ; 80729D0
+sub_80729D0: @ 80729D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -192975,7 +192975,7 @@ sub_80729D0: ; 80729D0
 	thumb_func_end sub_80729D0
 
 	thumb_func_start sub_8072A24
-sub_8072A24: ; 8072A24
+sub_8072A24: @ 8072A24
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -192993,7 +192993,7 @@ sub_8072A24: ; 8072A24
 	thumb_func_end sub_8072A24
 
 	thumb_func_start sub_8072A44
-sub_8072A44: ; 8072A44
+sub_8072A44: @ 8072A44
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -193024,12 +193024,12 @@ sub_8072A44: ; 8072A44
 	thumb_func_end sub_8072A44
 
 	thumb_func_start nullsub_30
-nullsub_30: ; 8072A84
+nullsub_30: @ 8072A84
 	bx lr
 	thumb_func_end nullsub_30
 
 	thumb_func_start sub_8072A88
-sub_8072A88: ; 8072A88
+sub_8072A88: @ 8072A88
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -193102,7 +193102,7 @@ _08072B00:
 	thumb_func_end sub_8072A88
 
 	thumb_func_start sub_8072B18
-sub_8072B18: ; 8072B18
+sub_8072B18: @ 8072B18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -193171,7 +193171,7 @@ _08072B7C:
 	thumb_func_end sub_8072B18
 
 	thumb_func_start healthbar_draw_level
-healthbar_draw_level: ; 8072B94
+healthbar_draw_level: @ 8072B94
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -193247,7 +193247,7 @@ _08072C1C:
 	thumb_func_end healthbar_draw_level
 
 	thumb_func_start heathbar_draw_hp
-heathbar_draw_hp: ; 8072C38
+heathbar_draw_hp: @ 8072C38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -193457,7 +193457,7 @@ _08072DEA:
 	thumb_func_end heathbar_draw_hp
 
 	thumb_func_start sub_8072E0C
-sub_8072E0C: ; 8072E0C
+sub_8072E0C: @ 8072E0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -193764,7 +193764,7 @@ _080730B8:
 	thumb_func_end sub_8072E0C
 
 	thumb_func_start sub_80730D4
-sub_80730D4: ; 80730D4
+sub_80730D4: @ 80730D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -194033,7 +194033,7 @@ _080732F4:
 	thumb_func_end sub_80730D4
 
 	thumb_func_start sub_8073314
-sub_8073314: ; 8073314
+sub_8073314: @ 8073314
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -194345,7 +194345,7 @@ _080735BA:
 	thumb_func_end sub_8073314
 
 	thumb_func_start sub_80735DC
-sub_80735DC: ; 80735DC
+sub_80735DC: @ 80735DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -195107,7 +195107,7 @@ _08073C0A:
 	thumb_func_end sub_80735DC
 
 	thumb_func_start sub_8073C30
-sub_8073C30: ; 8073C30
+sub_8073C30: @ 8073C30
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -195329,7 +195329,7 @@ _08073DEE:
 	thumb_func_end sub_8073C30
 
 	thumb_func_start task_battle_throw_own_ball
-task_battle_throw_own_ball: ; 8073E08
+task_battle_throw_own_ball: @ 8073E08
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -195376,7 +195376,7 @@ _08073E54:
 	thumb_func_end task_battle_throw_own_ball
 
 	thumb_func_start sub_8073E64
-sub_8073E64: ; 8073E64
+sub_8073E64: @ 8073E64
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -195522,7 +195522,7 @@ _08073F8A:
 	thumb_func_end sub_8073E64
 
 	thumb_func_start sub_8073F98
-sub_8073F98: ; 8073F98
+sub_8073F98: @ 8073F98
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -195632,7 +195632,7 @@ _0807406A:
 	thumb_func_end sub_8073F98
 
 	thumb_func_start sub_8074078
-sub_8074078: ; 8074078
+sub_8074078: @ 8074078
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x24]
@@ -195649,7 +195649,7 @@ _0807408C:
 	thumb_func_end sub_8074078
 
 	thumb_func_start sub_8074090
-sub_8074090: ; 8074090
+sub_8074090: @ 8074090
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -195681,7 +195681,7 @@ _080740B6:
 	thumb_func_end sub_8074090
 
 	thumb_func_start sub_80740C4
-sub_80740C4: ; 80740C4
+sub_80740C4: @ 80740C4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -195761,7 +195761,7 @@ _0807414E:
 	thumb_func_end sub_80740C4
 
 	thumb_func_start sub_8074158
-sub_8074158: ; 8074158
+sub_8074158: @ 8074158
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x30]
@@ -195822,7 +195822,7 @@ _080741BC:
 	thumb_func_end sub_8074158
 
 	thumb_func_start sub_80741C8
-sub_80741C8: ; 80741C8
+sub_80741C8: @ 80741C8
 	ldrh r2, [r0, 0x2E]
 	lsls r2, 24
 	lsrs r2, 24
@@ -195840,7 +195840,7 @@ sub_80741C8: ; 80741C8
 	thumb_func_end sub_80741C8
 
 	thumb_func_start sub_80741E8
-sub_80741E8: ; 80741E8
+sub_80741E8: @ 80741E8
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r4, r1, 0
@@ -195962,7 +195962,7 @@ _080742FC:
 	thumb_func_end sub_80741E8
 
 	thumb_func_start sub_8074310
-sub_8074310: ; 8074310
+sub_8074310: @ 8074310
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -196062,7 +196062,7 @@ _080743E6:
 	thumb_func_end sub_8074310
 
 	thumb_func_start draw_status_ailment_maybe
-draw_status_ailment_maybe: ; 80743F8
+draw_status_ailment_maybe: @ 80743F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -196359,7 +196359,7 @@ _0807467A:
 	thumb_func_end draw_status_ailment_maybe
 
 	thumb_func_start sub_80746A8
-sub_80746A8: ; 80746A8
+sub_80746A8: @ 80746A8
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -196456,7 +196456,7 @@ _08074768:
 	thumb_func_end sub_80746A8
 
 	thumb_func_start sub_8074770
-sub_8074770: ; 8074770
+sub_8074770: @ 8074770
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -196500,7 +196500,7 @@ sub_8074770: ; 8074770
 	thumb_func_end sub_8074770
 
 	thumb_func_start sub_80747D8
-sub_80747D8: ; 80747D8
+sub_80747D8: @ 80747D8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -196556,7 +196556,7 @@ sub_80747D8: ; 80747D8
 	thumb_func_end sub_80747D8
 
 	thumb_func_start healthbar_draw_field_maybe
-healthbar_draw_field_maybe: ; 8074860
+healthbar_draw_field_maybe: @ 8074860
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -196832,7 +196832,7 @@ _08074A8E:
 	thumb_func_end healthbar_draw_field_maybe
 
 	thumb_func_start sub_8074AA0
-sub_8074AA0: ; 8074AA0
+sub_8074AA0: @ 8074AA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -196961,7 +196961,7 @@ _08074B86:
 	thumb_func_end sub_8074AA0
 
 	thumb_func_start sub_8074B9C
-sub_8074B9C: ; 8074B9C
+sub_8074B9C: @ 8074B9C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -197209,7 +197209,7 @@ _08074D9E:
 	thumb_func_end sub_8074B9C
 
 	thumb_func_start sub_8074DB8
-sub_8074DB8: ; 8074DB8
+sub_8074DB8: @ 8074DB8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -197331,7 +197331,7 @@ _08074E80:
 	thumb_func_end sub_8074DB8
 
 	thumb_func_start sub_8074E8C
-sub_8074E8C: ; 8074E8C
+sub_8074E8C: @ 8074E8C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	mov r12, r3
@@ -197420,7 +197420,7 @@ _08074F1E:
 	thumb_func_end sub_8074E8C
 
 	thumb_func_start sub_8074F28
-sub_8074F28: ; 8074F28
+sub_8074F28: @ 8074F28
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -197471,7 +197471,7 @@ _08074F6A:
 	thumb_func_end sub_8074F28
 
 	thumb_func_start sub_8074F88
-sub_8074F88: ; 8074F88
+sub_8074F88: @ 8074F88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -197522,7 +197522,7 @@ _08074FB4:
 	thumb_func_end sub_8074F88
 
 	thumb_func_start sub_8074FE8
-sub_8074FE8: ; 8074FE8
+sub_8074FE8: @ 8074FE8
 	push {r4-r7,lr}
 	adds r6, r2, 0
 	lsls r3, 27
@@ -197564,7 +197564,7 @@ _08075028:
 	thumb_func_end sub_8074FE8
 
 	thumb_func_start sub_8075034
-sub_8075034: ; 8075034
+sub_8075034: @ 8075034
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -197589,7 +197589,7 @@ _08075058:
 	thumb_func_end sub_8075034
 
 	thumb_func_start sub_8075060
-sub_8075060: ; 8075060
+sub_8075060: @ 8075060
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -197619,7 +197619,7 @@ _0807508E:
 	thumb_func_end sub_8075060
 
 	thumb_func_start write_to_rbox
-write_to_rbox: ; 8075094
+write_to_rbox: @ 8075094
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -197694,7 +197694,7 @@ write_to_rbox: ; 8075094
 	thumb_func_end write_to_rbox
 
 	thumb_func_start sub_807512C
-sub_807512C: ; 807512C
+sub_807512C: @ 807512C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -197704,7 +197704,7 @@ sub_807512C: ; 807512C
 	thumb_func_end sub_807512C
 
 	thumb_func_start sub_807513C
-sub_807513C: ; 807513C
+sub_807513C: @ 807513C
 	push {lr}
 	sub sp, 0x4
 	adds r3, r0, 0
@@ -197731,7 +197731,7 @@ sub_807513C: ; 807513C
 	thumb_func_end sub_807513C
 
 	thumb_func_start sub_8075170
-sub_8075170: ; 8075170
+sub_8075170: @ 8075170
 	push {lr}
 	adds r3, r0, 0
 	adds r0, r1, 0
@@ -197752,7 +197752,7 @@ sub_8075170: ; 8075170
 	thumb_func_end sub_8075170
 
 	thumb_func_start sub_8075198
-sub_8075198: ; 8075198
+sub_8075198: @ 8075198
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -197790,7 +197790,7 @@ _080751D4:
 	thumb_func_end sub_8075198
 
 	thumb_func_start sub_80751E4
-sub_80751E4: ; 80751E4
+sub_80751E4: @ 80751E4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -197819,7 +197819,7 @@ sub_80751E4: ; 80751E4
 	thumb_func_end sub_80751E4
 
 	thumb_func_start sub_807521C
-sub_807521C: ; 807521C
+sub_807521C: @ 807521C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -197965,7 +197965,7 @@ _0807524E:
 	thumb_func_end sub_807521C
 
 	thumb_func_start sub_8075370
-sub_8075370: ; 8075370
+sub_8075370: @ 8075370
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -197997,7 +197997,7 @@ _080753A8:
 	thumb_func_end sub_8075370
 
 	thumb_func_start sub_80753B4
-sub_80753B4: ; 80753B4
+sub_80753B4: @ 80753B4
 	push {lr}
 	adds r3, r0, 0
 	adds r0, 0x3F
@@ -198025,7 +198025,7 @@ _080753DE:
 	thumb_func_end sub_80753B4
 
 	thumb_func_start sub_80753E8
-sub_80753E8: ; 80753E8
+sub_80753E8: @ 80753E8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -198071,7 +198071,7 @@ sub_80753E8: ; 80753E8
 	thumb_func_end sub_80753E8
 
 	thumb_func_start sub_8075450
-sub_8075450: ; 8075450
+sub_8075450: @ 8075450
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -198272,7 +198272,7 @@ _08075602:
 	thumb_func_end sub_8075450
 
 	thumb_func_start objc_0804ABD4
-objc_0804ABD4: ; 8075620
+objc_0804ABD4: @ 8075620
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -198357,7 +198357,7 @@ _080756C0:
 	thumb_func_end objc_0804ABD4
 
 	thumb_func_start sub_80756D4
-sub_80756D4: ; 80756D4
+sub_80756D4: @ 80756D4
 	ldr r1, =sub_80756E0
 	str r1, [r0, 0x1C]
 	bx lr
@@ -198365,7 +198365,7 @@ sub_80756D4: ; 80756D4
 	thumb_func_end sub_80756D4
 
 	thumb_func_start sub_80756E0
-sub_80756E0: ; 80756E0
+sub_80756E0: @ 80756E0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldrh r0, [r6, 0x38]
@@ -198417,7 +198417,7 @@ _0807573A:
 	thumb_func_end sub_80756E0
 
 	thumb_func_start sub_807574C
-sub_807574C: ; 807574C
+sub_807574C: @ 807574C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -198492,7 +198492,7 @@ _080757DC:
 	thumb_func_end sub_807574C
 
 	thumb_func_start sub_80757E4
-sub_80757E4: ; 80757E4
+sub_80757E4: @ 80757E4
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -198535,7 +198535,7 @@ _0807582C:
 	thumb_func_end sub_80757E4
 
 	thumb_func_start sub_8075838
-sub_8075838: ; 8075838
+sub_8075838: @ 8075838
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -198662,7 +198662,7 @@ _08075926:
 	thumb_func_end sub_8075838
 
 	thumb_func_start sub_8075930
-sub_8075930: ; 8075930
+sub_8075930: @ 8075930
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -198695,7 +198695,7 @@ _08075964:
 	thumb_func_end sub_8075930
 
 	thumb_func_start sub_8075970
-sub_8075970: ; 8075970
+sub_8075970: @ 8075970
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -198863,7 +198863,7 @@ _08075AB6:
 	thumb_func_end sub_8075970
 
 	thumb_func_start c3_0804B070
-c3_0804B070: ; 8075ABC
+c3_0804B070: @ 8075ABC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -199126,7 +199126,7 @@ _08075D04:
 	thumb_func_end c3_0804B070
 
 	thumb_func_start sub_8075D14
-sub_8075D14: ; 8075D14
+sub_8075D14: @ 8075D14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -199419,7 +199419,7 @@ _08075F66:
 	thumb_func_end sub_8075D14
 
 	thumb_func_start sub_8075FB4
-sub_8075FB4: ; 8075FB4
+sub_8075FB4: @ 8075FB4
 	adds r3, r0, 0
 	adds r3, 0x2C
 	ldrb r1, [r3]
@@ -199437,7 +199437,7 @@ sub_8075FB4: ; 8075FB4
 	thumb_func_end sub_8075FB4
 
 	thumb_func_start sub_8075FD4
-sub_8075FD4: ; 8075FD4
+sub_8075FD4: @ 8075FD4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r7, 0
@@ -199578,7 +199578,7 @@ _080760DE:
 	thumb_func_end sub_8075FD4
 
 	thumb_func_start sub_80760F8
-sub_80760F8: ; 80760F8
+sub_80760F8: @ 80760F8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldrh r0, [r6, 0x3A]
@@ -199658,7 +199658,7 @@ _08076196:
 	thumb_func_end sub_80760F8
 
 	thumb_func_start sub_80761B4
-sub_80761B4: ; 80761B4
+sub_80761B4: @ 80761B4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x19
@@ -199695,7 +199695,7 @@ sub_80761B4: ; 80761B4
 	thumb_func_end sub_80761B4
 
 	thumb_func_start sub_8076204
-sub_8076204: ; 8076204
+sub_8076204: @ 8076204
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -199874,7 +199874,7 @@ _08076364:
 	thumb_func_end sub_8076204
 
 	thumb_func_start sub_8076374
-sub_8076374: ; 8076374
+sub_8076374: @ 8076374
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -199895,7 +199895,7 @@ _0807638E:
 	thumb_func_end sub_8076374
 
 	thumb_func_start sub_8076398
-sub_8076398: ; 8076398
+sub_8076398: @ 8076398
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x2E]
@@ -199942,7 +199942,7 @@ _080763EC:
 	thumb_func_end sub_8076398
 
 	thumb_func_start sub_80763F8
-sub_80763F8: ; 80763F8
+sub_80763F8: @ 80763F8
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -199965,7 +199965,7 @@ sub_80763F8: ; 80763F8
 	thumb_func_end sub_80763F8
 
 	thumb_func_start sub_8076420
-sub_8076420: ; 8076420
+sub_8076420: @ 8076420
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -199980,7 +199980,7 @@ sub_8076420: ; 8076420
 	thumb_func_end sub_8076420
 
 	thumb_func_start sub_8076438
-sub_8076438: ; 8076438
+sub_8076438: @ 8076438
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -200089,7 +200089,7 @@ sub_8076438: ; 8076438
 	thumb_func_end sub_8076438
 
 	thumb_func_start sub_8076524
-sub_8076524: ; 8076524
+sub_8076524: @ 8076524
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -200182,7 +200182,7 @@ _080765D4:
 	thumb_func_end sub_8076524
 
 	thumb_func_start sub_80765E0
-sub_80765E0: ; 80765E0
+sub_80765E0: @ 80765E0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -200343,7 +200343,7 @@ _0807670E:
 	thumb_func_end sub_80765E0
 
 	thumb_func_start sub_807671C
-sub_807671C: ; 807671C
+sub_807671C: @ 807671C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -200427,7 +200427,7 @@ sub_807671C: ; 807671C
 	thumb_func_end sub_807671C
 
 	thumb_func_start sub_80767D4
-sub_80767D4: ; 80767D4
+sub_80767D4: @ 80767D4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -200510,7 +200510,7 @@ _08076870:
 	thumb_func_end sub_80767D4
 
 	thumb_func_start sub_807687C
-sub_807687C: ; 807687C
+sub_807687C: @ 807687C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x38]
@@ -200568,7 +200568,7 @@ _080768E8:
 	thumb_func_end sub_807687C
 
 	thumb_func_start sub_80768F0
-sub_80768F0: ; 80768F0
+sub_80768F0: @ 80768F0
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -200586,7 +200586,7 @@ _08076904:
 	thumb_func_end sub_80768F0
 
 	thumb_func_start obj_delete_and_free_associated_resources_
-obj_delete_and_free_associated_resources_: ; 807690C
+obj_delete_and_free_associated_resources_: @ 807690C
 	push {lr}
 	bl RemoveObjectAndFreeResources
 	pop {r0}
@@ -200594,7 +200594,7 @@ obj_delete_and_free_associated_resources_: ; 807690C
 	thumb_func_end obj_delete_and_free_associated_resources_
 
 	thumb_func_start sub_8076918
-sub_8076918: ; 8076918
+sub_8076918: @ 8076918
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -200661,7 +200661,7 @@ _08076990:
 	thumb_func_end sub_8076918
 
 	thumb_func_start sub_80769A8
-sub_80769A8: ; 80769A8
+sub_80769A8: @ 80769A8
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -200682,7 +200682,7 @@ _080769C2:
 	thumb_func_end sub_80769A8
 
 	thumb_func_start sub_80769CC
-sub_80769CC: ; 80769CC
+sub_80769CC: @ 80769CC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x24]
@@ -200705,7 +200705,7 @@ _080769EA:
 	thumb_func_end sub_80769CC
 
 	thumb_func_start sub_80769F4
-sub_80769F4: ; 80769F4
+sub_80769F4: @ 80769F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -200736,7 +200736,7 @@ sub_80769F4: ; 80769F4
 	thumb_func_end sub_80769F4
 
 	thumb_func_start oamc_804BEB4
-oamc_804BEB4: ; 8076A38
+oamc_804BEB4: @ 8076A38
 	push {lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x30]
@@ -200771,7 +200771,7 @@ _08076A70:
 	thumb_func_end oamc_804BEB4
 
 	thumb_func_start sub_8076A78
-sub_8076A78: ; 8076A78
+sub_8076A78: @ 8076A78
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -200819,7 +200819,7 @@ _08076ACC:
 	thumb_func_end sub_8076A78
 
 	thumb_func_start sub_8076AE8
-sub_8076AE8: ; 8076AE8
+sub_8076AE8: @ 8076AE8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -200839,7 +200839,7 @@ sub_8076AE8: ; 8076AE8
 	thumb_func_end sub_8076AE8
 
 	thumb_func_start sub_8076B14
-sub_8076B14: ; 8076B14
+sub_8076B14: @ 8076B14
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -200878,8 +200878,8 @@ _08076B4E:
 	thumb_func_end sub_8076B14
 
 	thumb_func_start CheckForFlashMemory
-; void CheckForFlashMemory()
-CheckForFlashMemory: ; 8076B68
+@ void CheckForFlashMemory()
+CheckForFlashMemory: @ 8076B68
 	push {lr}
 	bl IdentifyFlash
 	lsls r0, 16
@@ -200902,7 +200902,7 @@ _08076B8A:
 	thumb_func_end CheckForFlashMemory
 
 	thumb_func_start memclr_stdsav2
-memclr_stdsav2: ; 8076B94
+memclr_stdsav2: @ 8076B94
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -200919,7 +200919,7 @@ memclr_stdsav2: ; 8076B94
 	thumb_func_end memclr_stdsav2
 
 	thumb_func_start clear_sav1
-clear_sav1: ; 8076BB8
+clear_sav1: @ 8076BB8
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -200936,8 +200936,8 @@ clear_sav1: ; 8076BB8
 	thumb_func_end clear_sav1
 
 	thumb_func_start InitSaveBlockPointersWithRandomOffset
-; void InitSaveBlockPointersWithRandomOffset(u8 offset)
-InitSaveBlockPointersWithRandomOffset: ; 8076BDC
+@ void InitSaveBlockPointersWithRandomOffset(u8 offset)
+InitSaveBlockPointersWithRandomOffset: @ 8076BDC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -200967,7 +200967,7 @@ InitSaveBlockPointersWithRandomOffset: ; 8076BDC
 	thumb_func_end InitSaveBlockPointersWithRandomOffset
 
 	thumb_func_start saveblock_randomize_and_relocate
-saveblock_randomize_and_relocate: ; 8076C2C
+saveblock_randomize_and_relocate: @ 8076C2C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -201062,7 +201062,7 @@ saveblock_randomize_and_relocate: ; 8076C2C
 	thumb_func_end saveblock_randomize_and_relocate
 
 	thumb_func_start sav2_x1_query_bit1
-sav2_x1_query_bit1: ; 8076D24
+sav2_x1_query_bit1: @ 8076D24
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldrb r1, [r0, 0x9]
@@ -201073,7 +201073,7 @@ sav2_x1_query_bit1: ; 8076D24
 	thumb_func_end sav2_x1_query_bit1
 
 	thumb_func_start sav2_x9_clear_bit1
-sav2_x9_clear_bit1: ; 8076D34
+sav2_x9_clear_bit1: @ 8076D34
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
@@ -201085,7 +201085,7 @@ sav2_x9_clear_bit1: ; 8076D34
 	thumb_func_end sav2_x9_clear_bit1
 
 	thumb_func_start sub_8076D48
-sub_8076D48: ; 8076D48
+sub_8076D48: @ 8076D48
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
@@ -201097,7 +201097,7 @@ sub_8076D48: ; 8076D48
 	thumb_func_end sub_8076D48
 
 	thumb_func_start sub_8076D5C
-sub_8076D5C: ; 8076D5C
+sub_8076D5C: @ 8076D5C
 	push {lr}
 	movs r0, 0
 	bl sub_8084FAC
@@ -201113,7 +201113,7 @@ sub_8076D5C: ; 8076D5C
 	thumb_func_end sub_8076D5C
 
 	thumb_func_start sav2_gender2_inplace_and_xFE
-sav2_gender2_inplace_and_xFE: ; 8076D78
+sav2_gender2_inplace_and_xFE: @ 8076D78
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
@@ -201125,8 +201125,8 @@ sav2_gender2_inplace_and_xFE: ; 8076D78
 	thumb_func_end sav2_gender2_inplace_and_xFE
 
 	thumb_func_start copy_player_party_to_sav1
-; void copy_player_party_to_sav1()
-copy_player_party_to_sav1: ; 8076D8C
+@ void copy_player_party_to_sav1()
+copy_player_party_to_sav1: @ 8076D8C
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -201160,7 +201160,7 @@ _08076DA0:
 	thumb_func_end copy_player_party_to_sav1
 
 	thumb_func_start copy_player_party_from_sav1
-copy_player_party_from_sav1: ; 8076DD4
+copy_player_party_from_sav1: @ 8076DD4
 	push {r4,r5,lr}
 	ldr r1, =0x020244e9
 	ldr r0, =0x03005d8c
@@ -201195,7 +201195,7 @@ _08076DEA:
 	thumb_func_end copy_player_party_from_sav1
 
 	thumb_func_start save_serialize_npcs
-save_serialize_npcs: ; 8076E1C
+save_serialize_npcs: @ 8076E1C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -201233,7 +201233,7 @@ _08076E32:
 	thumb_func_end save_serialize_npcs
 
 	thumb_func_start save_deserialize_npcs
-save_deserialize_npcs: ; 8076E64
+save_deserialize_npcs: @ 8076E64
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -201271,7 +201271,7 @@ _08076E7A:
 	thumb_func_end save_deserialize_npcs
 
 	thumb_func_start save_serialize_game
-save_serialize_game: ; 8076EAC
+save_serialize_game: @ 8076EAC
 	push {lr}
 	bl copy_player_party_to_sav1
 	bl save_serialize_npcs
@@ -201280,7 +201280,7 @@ save_serialize_game: ; 8076EAC
 	thumb_func_end save_serialize_game
 
 	thumb_func_start save_deserialize_game
-save_deserialize_game: ; 8076EBC
+save_deserialize_game: @ 8076EBC
 	push {lr}
 	bl copy_player_party_from_sav1
 	bl save_deserialize_npcs
@@ -201289,7 +201289,7 @@ save_deserialize_game: ; 8076EBC
 	thumb_func_end save_deserialize_game
 
 	thumb_func_start copy_bags_and_unk_data_from_save_blocks
-copy_bags_and_unk_data_from_save_blocks: ; 8076ECC
+copy_bags_and_unk_data_from_save_blocks: @ 8076ECC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -201428,7 +201428,7 @@ _08076F92:
 	thumb_func_end copy_bags_and_unk_data_from_save_blocks
 
 	thumb_func_start copy_bags_and_unk_data_to_save_blocks
-copy_bags_and_unk_data_to_save_blocks: ; 8076FE0
+copy_bags_and_unk_data_to_save_blocks: @ 8076FE0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -201572,7 +201572,7 @@ _080770A0:
 	thumb_func_end copy_bags_and_unk_data_to_save_blocks
 
 	thumb_func_start apply_u16_xor_crypto
-apply_u16_xor_crypto: ; 8077100
+apply_u16_xor_crypto: @ 8077100
 	ldr r2, =0x03005d90
 	ldr r2, [r2]
 	adds r2, 0xAC
@@ -201586,7 +201586,7 @@ apply_u16_xor_crypto: ; 8077100
 	thumb_func_end apply_u16_xor_crypto
 
 	thumb_func_start apply_u32_xor_crypto
-apply_u32_xor_crypto: ; 8077118
+apply_u32_xor_crypto: @ 8077118
 	ldr r2, =0x03005d90
 	ldr r3, [r2]
 	adds r3, 0xAC
@@ -201600,7 +201600,7 @@ apply_u32_xor_crypto: ; 8077118
 	thumb_func_end apply_u32_xor_crypto
 
 	thumb_func_start saveblock_apply_crypto
-saveblock_apply_crypto: ; 8077130
+saveblock_apply_crypto: @ 8077130
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_8084864
@@ -201627,7 +201627,7 @@ saveblock_apply_crypto: ; 8077130
 	thumb_func_end saveblock_apply_crypto
 
 	thumb_func_start sub_8077170
-sub_8077170: ; 8077170
+sub_8077170: @ 8077170
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -201659,7 +201659,7 @@ _080771A2:
 	thumb_func_end sub_8077170
 
 	thumb_func_start sub_80771AC
-sub_80771AC: ; 80771AC
+sub_80771AC: @ 80771AC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -201669,7 +201669,7 @@ sub_80771AC: ; 80771AC
 	thumb_func_end sub_80771AC
 
 	thumb_func_start sub_80771BC
-sub_80771BC: ; 80771BC
+sub_80771BC: @ 80771BC
 	push {r4,lr}
 	ldr r0, =0x02022c2c
 	ldrb r0, [r0]
@@ -201702,7 +201702,7 @@ _080771F8:
 	thumb_func_end sub_80771BC
 
 	thumb_func_start sub_8077200
-sub_8077200: ; 8077200
+sub_8077200: @ 8077200
 	push {lr}
 	bl sub_800A550
 	lsls r0, 24
@@ -201712,7 +201712,7 @@ sub_8077200: ; 8077200
 	thumb_func_end sub_8077200
 
 	thumb_func_start sub_8077210
-sub_8077210: ; 8077210
+sub_8077210: @ 8077210
 	push {lr}
 	bl sub_8077260
 	cmp r0, 0
@@ -201731,7 +201731,7 @@ _08077230:
 	thumb_func_end sub_8077210
 
 	thumb_func_start sub_8077234
-sub_8077234: ; 8077234
+sub_8077234: @ 8077234
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8077260
@@ -201754,7 +201754,7 @@ _08077258:
 	thumb_func_end sub_8077234
 
 	thumb_func_start sub_8077260
-sub_8077260: ; 8077260
+sub_8077260: @ 8077260
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -201775,7 +201775,7 @@ _08077282:
 	thumb_func_end sub_8077260
 
 	thumb_func_start sub_8077288
-sub_8077288: ; 8077288
+sub_8077288: @ 8077288
 	push {lr}
 	bl sub_800ADF8
 	pop {r0}
@@ -201783,7 +201783,7 @@ sub_8077288: ; 8077288
 	thumb_func_end sub_8077288
 
 	thumb_func_start sub_8077294
-sub_8077294: ; 8077294
+sub_8077294: @ 8077294
 	push {lr}
 	bl sub_800A520
 	lsls r0, 24
@@ -201793,7 +201793,7 @@ sub_8077294: ; 8077294
 	thumb_func_end sub_8077294
 
 	thumb_func_start sub_80772A4
-sub_80772A4: ; 80772A4
+sub_80772A4: @ 80772A4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	bl ResetAllObjectData
@@ -201902,7 +201902,7 @@ _0807738C:
 	thumb_func_end sub_80772A4
 
 	thumb_func_start sub_80773AC
-sub_80773AC: ; 80773AC
+sub_80773AC: @ 80773AC
 	push {lr}
 	ldr r0, =sub_80773D0
 	bl SetMainCallback2
@@ -201917,7 +201917,7 @@ sub_80773AC: ; 80773AC
 	thumb_func_end sub_80773AC
 
 	thumb_func_start sub_80773D0
-sub_80773D0: ; 80773D0
+sub_80773D0: @ 80773D0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -202725,7 +202725,7 @@ _08077B46:
 	thumb_func_end sub_80773D0
 
 	thumb_func_start sub_8077B74
-sub_8077B74: ; 8077B74
+sub_8077B74: @ 8077B74
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -203339,7 +203339,7 @@ _080780F6:
 	thumb_func_end sub_8077B74
 
 	thumb_func_start sub_807811C
-sub_807811C: ; 807811C
+sub_807811C: @ 807811C
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -203349,7 +203349,7 @@ sub_807811C: ; 807811C
 	thumb_func_end sub_807811C
 
 	thumb_func_start sub_8078130
-sub_8078130: ; 8078130
+sub_8078130: @ 8078130
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203229c
@@ -203382,7 +203382,7 @@ _08078160:
 	thumb_func_end sub_8078130
 
 	thumb_func_start sub_807816C
-sub_807816C: ; 807816C
+sub_807816C: @ 807816C
 	push {r4,lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -203425,7 +203425,7 @@ _080781C2:
 	thumb_func_end sub_807816C
 
 	thumb_func_start sub_80781C8
-sub_80781C8: ; 80781C8
+sub_80781C8: @ 80781C8
 	push {r4,r5,lr}
 	ldr r5, =0x030022c0
 	ldr r0, =sub_80773AC
@@ -203475,7 +203475,7 @@ _08078244:
 	thumb_func_end sub_80781C8
 
 	thumb_func_start sub_807825C
-sub_807825C: ; 807825C
+sub_807825C: @ 807825C
 	push {r4,lr}
 	bl sub_80795AC
 	bl sub_807A0C4
@@ -203513,7 +203513,7 @@ sub_807825C: ; 807825C
 	thumb_func_end sub_807825C
 
 	thumb_func_start sub_80782B8
-sub_80782B8: ; 80782B8
+sub_80782B8: @ 80782B8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -203603,7 +203603,7 @@ _0807837E:
 	thumb_func_end sub_80782B8
 
 	thumb_func_start sub_8078388
-sub_8078388: ; 8078388
+sub_8078388: @ 8078388
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -203696,7 +203696,7 @@ _0807841C:
 	thumb_func_end sub_8078388
 
 	thumb_func_start sub_8078438
-sub_8078438: ; 8078438
+sub_8078438: @ 8078438
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -203718,7 +203718,7 @@ _08078452:
 	thumb_func_end sub_8078438
 
 	thumb_func_start shedinja_maker_maybe
-shedinja_maker_maybe: ; 8078458
+shedinja_maker_maybe: @ 8078458
 	push {r4-r6,lr}
 	sub sp, 0xC
 	bl link_get_multiplayer_id
@@ -204061,7 +204061,7 @@ _080787AC:
 	thumb_func_end shedinja_maker_maybe
 
 	thumb_func_start sub_80787B8
-sub_80787B8: ; 80787B8
+sub_80787B8: @ 80787B8
 	push {lr}
 	ldr r0, =gUnknown_0832DAE5
 	ldr r1, =0x0203229c
@@ -204079,7 +204079,7 @@ sub_80787B8: ; 80787B8
 	thumb_func_end sub_80787B8
 
 	thumb_func_start sub_80787E0
-sub_80787E0: ; 80787E0
+sub_80787E0: @ 80787E0
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -204209,7 +204209,7 @@ _080788F6:
 	thumb_func_end sub_80787E0
 
 	thumb_func_start sub_8078900
-sub_8078900: ; 8078900
+sub_8078900: @ 8078900
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r1, 24
@@ -204326,7 +204326,7 @@ _080789F0:
 	thumb_func_end sub_8078900
 
 	thumb_func_start sub_80789FC
-sub_80789FC: ; 80789FC
+sub_80789FC: @ 80789FC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x0203229c
@@ -204565,7 +204565,7 @@ _08078BDC:
 	thumb_func_end sub_80789FC
 
 	thumb_func_start sub_8078BFC
-sub_8078BFC: ; 8078BFC
+sub_8078BFC: @ 8078BFC
 	push {lr}
 	strh r1, [r0]
 	strh r2, [r0, 0x2]
@@ -204577,7 +204577,7 @@ sub_8078BFC: ; 8078BFC
 	thumb_func_end sub_8078BFC
 
 	thumb_func_start sub_8078C10
-sub_8078C10: ; 8078C10
+sub_8078C10: @ 8078C10
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -204596,7 +204596,7 @@ sub_8078C10: ; 8078C10
 	thumb_func_end sub_8078C10
 
 	thumb_func_start sub_8078C34
-sub_8078C34: ; 8078C34
+sub_8078C34: @ 8078C34
 	push {r4,lr}
 	bl link_get_multiplayer_id
 	lsls r0, 24
@@ -204625,7 +204625,7 @@ _08078C64:
 	thumb_func_end sub_8078C34
 
 	thumb_func_start sub_8078C6C
-sub_8078C6C: ; 8078C6C
+sub_8078C6C: @ 8078C6C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -204667,7 +204667,7 @@ _08078CB0:
 	thumb_func_end sub_8078C6C
 
 	thumb_func_start sub_8078CB8
-sub_8078CB8: ; 8078CB8
+sub_8078CB8: @ 8078CB8
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	lsls r1, 24
@@ -204758,7 +204758,7 @@ _08078D64:
 	thumb_func_end sub_8078CB8
 
 	thumb_func_start sub_8078D78
-sub_8078D78: ; 8078D78
+sub_8078D78: @ 8078D78
 	push {r4,lr}
 	movs r0, 0
 	bl sub_807A19C
@@ -204791,7 +204791,7 @@ _08078DB4:
 	thumb_func_end sub_8078D78
 
 	thumb_func_start sub_8078DBC
-sub_8078DBC: ; 8078DBC
+sub_8078DBC: @ 8078DBC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -204928,7 +204928,7 @@ _08078EE4:
 	thumb_func_end sub_8078DBC
 
 	thumb_func_start sub_8078EF8
-sub_8078EF8: ; 8078EF8
+sub_8078EF8: @ 8078EF8
 	push {lr}
 	bl sub_8079F74
 	ldr r3, =0x0203229c
@@ -204966,7 +204966,7 @@ sub_8078EF8: ; 8078EF8
 	thumb_func_end sub_8078EF8
 
 	thumb_func_start sub_8078F50
-sub_8078F50: ; 8078F50
+sub_8078F50: @ 8078F50
 	push {lr}
 	sub sp, 0x4
 	bl ProcessMenuInputNoWrapAround
@@ -205070,7 +205070,7 @@ _0807902A:
 	thumb_func_end sub_8078F50
 
 	thumb_func_start sub_8079034
-sub_8079034: ; 8079034
+sub_8079034: @ 8079034
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -205093,7 +205093,7 @@ _08079054:
 	thumb_func_end sub_8079034
 
 	thumb_func_start sub_807905C
-sub_807905C: ; 807905C
+sub_807905C: @ 807905C
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x02037fd4
@@ -205146,7 +205146,7 @@ _080790C4:
 	thumb_func_end sub_807905C
 
 	thumb_func_start sub_80790D4
-sub_80790D4: ; 80790D4
+sub_80790D4: @ 80790D4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -205230,7 +205230,7 @@ _0807916C:
 	thumb_func_end sub_80790D4
 
 	thumb_func_start sub_8079174
-sub_8079174: ; 8079174
+sub_8079174: @ 8079174
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r2, 0
@@ -205313,7 +205313,7 @@ _0807920E:
 	thumb_func_end sub_8079174
 
 	thumb_func_start sub_8079218
-sub_8079218: ; 8079218
+sub_8079218: @ 8079218
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -205377,7 +205377,7 @@ _08079290:
 	thumb_func_end sub_8079218
 
 	thumb_func_start sub_807929C
-sub_807929C: ; 807929C
+sub_807929C: @ 807929C
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r0, =0x0203229c
@@ -205415,7 +205415,7 @@ _080792D8:
 	thumb_func_end sub_807929C
 
 	thumb_func_start sub_80792E4
-sub_80792E4: ; 80792E4
+sub_80792E4: @ 80792E4
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -205470,7 +205470,7 @@ _08079356:
 	thumb_func_end sub_80792E4
 
 	thumb_func_start sub_807935C
-sub_807935C: ; 807935C
+sub_807935C: @ 807935C
 	push {r4,lr}
 	bl link_get_multiplayer_id
 	lsls r0, 24
@@ -205500,7 +205500,7 @@ _08079384:
 	thumb_func_end sub_807935C
 
 	thumb_func_start sub_8079398
-sub_8079398: ; 8079398
+sub_8079398: @ 8079398
 	push {r4,lr}
 	ldr r4, =0x0203229c
 	ldr r0, [r4]
@@ -205522,7 +205522,7 @@ _080793B4:
 	thumb_func_end sub_8079398
 
 	thumb_func_start sub_80793C4
-sub_80793C4: ; 80793C4
+sub_80793C4: @ 80793C4
 	push {r4,lr}
 	ldr r4, =0x0203229c
 	ldr r1, [r4]
@@ -205556,7 +205556,7 @@ _080793F8:
 	thumb_func_end sub_80793C4
 
 	thumb_func_start sub_8079408
-sub_8079408: ; 8079408
+sub_8079408: @ 8079408
 	push {r4-r6,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -205617,7 +205617,7 @@ _0807947C:
 	thumb_func_end sub_8079408
 
 	thumb_func_start sub_8079490
-sub_8079490: ; 8079490
+sub_8079490: @ 8079490
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -205648,7 +205648,7 @@ _080794C4:
 	thumb_func_end sub_8079490
 
 	thumb_func_start sub_80794CC
-sub_80794CC: ; 80794CC
+sub_80794CC: @ 80794CC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -205693,7 +205693,7 @@ _0807953A:
 	thumb_func_end sub_80794CC
 
 	thumb_func_start sub_8079550
-sub_8079550: ; 8079550
+sub_8079550: @ 8079550
 	push {lr}
 	movs r0, 0
 	bl sub_801048C
@@ -205716,7 +205716,7 @@ _08079574:
 	thumb_func_end sub_8079550
 
 	thumb_func_start sub_807957C
-sub_807957C: ; 807957C
+sub_807957C: @ 807957C
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -205739,7 +205739,7 @@ _0807959C:
 	thumb_func_end sub_807957C
 
 	thumb_func_start sub_80795AC
-sub_80795AC: ; 80795AC
+sub_80795AC: @ 80795AC
 	push {lr}
 	ldr r0, =0x0203229c
 	ldr r0, [r0]
@@ -205829,7 +205829,7 @@ _08079678:
 	thumb_func_end sub_80795AC
 
 	thumb_func_start sub_807967C
-sub_807967C: ; 807967C
+sub_807967C: @ 807967C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -205859,7 +205859,7 @@ _080796A8:
 	thumb_func_end sub_807967C
 
 	thumb_func_start sub_80796B4
-sub_80796B4: ; 80796B4
+sub_80796B4: @ 80796B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -206285,7 +206285,7 @@ _08079A24:
 	thumb_func_end sub_80796B4
 
 	thumb_func_start sub_8079A3C
-sub_8079A3C: ; 8079A3C
+sub_8079A3C: @ 8079A3C
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -206334,7 +206334,7 @@ _08079A74:
 	thumb_func_end sub_8079A3C
 
 	thumb_func_start sub_8079AA4
-sub_8079AA4: ; 8079AA4
+sub_8079AA4: @ 8079AA4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -206436,7 +206436,7 @@ _08079B6C:
 	thumb_func_end sub_8079AA4
 
 	thumb_func_start sub_8079B84
-sub_8079B84: ; 8079B84
+sub_8079B84: @ 8079B84
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -206481,7 +206481,7 @@ sub_8079B84: ; 8079B84
 	thumb_func_end sub_8079B84
 
 	thumb_func_start sub_8079BE0
-sub_8079BE0: ; 8079BE0
+sub_8079BE0: @ 8079BE0
 	push {r4-r7,lr}
 	sub sp, 0x34
 	lsls r0, 24
@@ -206533,7 +206533,7 @@ _08079C36:
 	thumb_func_end sub_8079BE0
 
 	thumb_func_start sub_8079C4C
-sub_8079C4C: ; 8079C4C
+sub_8079C4C: @ 8079C4C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -206775,7 +206775,7 @@ _08079E16:
 	thumb_func_end sub_8079C4C
 
 	thumb_func_start sub_8079E44
-sub_8079E44: ; 8079E44
+sub_8079E44: @ 8079E44
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -206825,7 +206825,7 @@ _08079E94:
 	thumb_func_end sub_8079E44
 
 	thumb_func_start sub_8079EA8
-sub_8079EA8: ; 8079EA8
+sub_8079EA8: @ 8079EA8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -206928,7 +206928,7 @@ _08079F5A:
 	thumb_func_end sub_8079EA8
 
 	thumb_func_start sub_8079F74
-sub_8079F74: ; 8079F74
+sub_8079F74: @ 8079F74
 	push {lr}
 	movs r0, 0x1
 	bl rbox_fill_rectangle
@@ -206939,7 +206939,7 @@ sub_8079F74: ; 8079F74
 	thumb_func_end sub_8079F74
 
 	thumb_func_start sub_8079F88
-sub_8079F88: ; 8079F88
+sub_8079F88: @ 8079F88
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -206990,7 +206990,7 @@ sub_8079F88: ; 8079F88
 	thumb_func_end sub_8079F88
 
 	thumb_func_start sub_807A000
-sub_807A000: ; 807A000
+sub_807A000: @ 807A000
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0x1E
@@ -207010,7 +207010,7 @@ sub_807A000: ; 807A000
 	thumb_func_end sub_807A000
 
 	thumb_func_start sub_807A024
-sub_807A024: ; 807A024
+sub_807A024: @ 807A024
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0x1E
@@ -207030,7 +207030,7 @@ sub_807A024: ; 807A024
 	thumb_func_end sub_807A024
 
 	thumb_func_start sub_807A048
-sub_807A048: ; 807A048
+sub_807A048: @ 807A048
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -207076,7 +207076,7 @@ _0807A096:
 	thumb_func_end sub_807A048
 
 	thumb_func_start sub_807A09C
-sub_807A09C: ; 807A09C
+sub_807A09C: @ 807A09C
 	push {lr}
 	movs r3, 0
 	ldr r0, =0x0203229c
@@ -207099,7 +207099,7 @@ _0807A0AC:
 	thumb_func_end sub_807A09C
 
 	thumb_func_start sub_807A0C4
-sub_807A0C4: ; 807A0C4
+sub_807A0C4: @ 807A0C4
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r3, =0x0203229c
@@ -207198,7 +207198,7 @@ _0807A18C:
 	thumb_func_end sub_807A0C4
 
 	thumb_func_start sub_807A19C
-sub_807A19C: ; 807A19C
+sub_807A19C: @ 807A19C
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -207237,7 +207237,7 @@ sub_807A19C: ; 807A19C
 	thumb_func_end sub_807A19C
 
 	thumb_func_start sub_807A1F0
-sub_807A1F0: ; 807A1F0
+sub_807A1F0: @ 807A1F0
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203229c
@@ -207357,7 +207357,7 @@ _0807A2FE:
 	thumb_func_end sub_807A1F0
 
 	thumb_func_start sub_807A308
-sub_807A308: ; 807A308
+sub_807A308: @ 807A308
 	push {lr}
 	sub sp, 0x4
 	movs r2, 0x6
@@ -207371,7 +207371,7 @@ sub_807A308: ; 807A308
 	thumb_func_end sub_807A308
 
 	thumb_func_start sub_807A320
-sub_807A320: ; 807A320
+sub_807A320: @ 807A320
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -207538,7 +207538,7 @@ _0807A458:
 	thumb_func_end sub_807A320
 
 	thumb_func_start sub_807A468
-sub_807A468: ; 807A468
+sub_807A468: @ 807A468
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -207639,7 +207639,7 @@ _0807A52C:
 	thumb_func_end sub_807A468
 
 	thumb_func_start sub_807A53C
-sub_807A53C: ; 807A53C
+sub_807A53C: @ 807A53C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -207699,7 +207699,7 @@ _0807A596:
 	thumb_func_end sub_807A53C
 
 	thumb_func_start sub_807A5B0
-sub_807A5B0: ; 807A5B0
+sub_807A5B0: @ 807A5B0
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r5, =0x03005d8c
@@ -207733,7 +207733,7 @@ _0807A5DA:
 	thumb_func_end sub_807A5B0
 
 	thumb_func_start sub_807A5F4
-sub_807A5F4: ; 807A5F4
+sub_807A5F4: @ 807A5F4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -207898,7 +207898,7 @@ _0807A718:
 	thumb_func_end sub_807A5F4
 
 	thumb_func_start sub_807A728
-sub_807A728: ; 807A728
+sub_807A728: @ 807A728
 	push {r4-r7,lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -207973,7 +207973,7 @@ _0807A7B6:
 	thumb_func_end sub_807A728
 
 	thumb_func_start sub_807A7BC
-sub_807A7BC: ; 807A7BC
+sub_807A7BC: @ 807A7BC
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -207998,7 +207998,7 @@ _0807A7DC:
 	thumb_func_end sub_807A7BC
 
 	thumb_func_start sub_807A7E0
-sub_807A7E0: ; 807A7E0
+sub_807A7E0: @ 807A7E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -208127,7 +208127,7 @@ _0807A8C0:
 	thumb_func_end sub_807A7E0
 
 	thumb_func_start sub_807A8D0
-sub_807A8D0: ; 807A8D0
+sub_807A8D0: @ 807A8D0
 	push {r4-r6,lr}
 	lsls r1, 16
 	lsrs r5, r1, 16
@@ -208168,7 +208168,7 @@ _0807A910:
 	thumb_func_end sub_807A8D0
 
 	thumb_func_start sub_807A918
-sub_807A918: ; 807A918
+sub_807A918: @ 807A918
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -208314,7 +208314,7 @@ _0807AA1A:
 	thumb_func_end sub_807A918
 
 	thumb_func_start sub_807AA28
-sub_807AA28: ; 807AA28
+sub_807AA28: @ 807AA28
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -208335,7 +208335,7 @@ _0807AA44:
 	thumb_func_end sub_807AA28
 
 	thumb_func_start sub_807AA4C
-sub_807AA4C: ; 807AA4C
+sub_807AA4C: @ 807AA4C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, 0x3E
@@ -208363,7 +208363,7 @@ _0807AA76:
 	thumb_func_end sub_807AA4C
 
 	thumb_func_start sub_807AA7C
-sub_807AA7C: ; 807AA7C
+sub_807AA7C: @ 807AA7C
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x30
@@ -208398,7 +208398,7 @@ _0807AAB2:
 	thumb_func_end sub_807AA7C
 
 	thumb_func_start sub_807AABC
-sub_807AABC: ; 807AABC
+sub_807AABC: @ 807AABC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2E]
@@ -208419,7 +208419,7 @@ _0807AADA:
 	thumb_func_end sub_807AABC
 
 	thumb_func_start sub_807AAE0
-sub_807AAE0: ; 807AAE0
+sub_807AAE0: @ 807AAE0
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2E]
@@ -208440,7 +208440,7 @@ _0807AAFE:
 	thumb_func_end sub_807AAE0
 
 	thumb_func_start sub_807AB04
-sub_807AB04: ; 807AB04
+sub_807AB04: @ 807AB04
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -208461,7 +208461,7 @@ _0807AB20:
 	thumb_func_end sub_807AB04
 
 	thumb_func_start sub_807AB28
-sub_807AB28: ; 807AB28
+sub_807AB28: @ 807AB28
 	push {r4,r5,lr}
 	sub sp, 0x20
 	ldr r0, =0x020322a0
@@ -208536,7 +208536,7 @@ sub_807AB28: ; 807AB28
 	thumb_func_end sub_807AB28
 
 	thumb_func_start sub_807ABCC
-sub_807ABCC: ; 807ABCC
+sub_807ABCC: @ 807ABCC
 	push {r4,lr}
 	ldr r4, =0x020322a0
 	ldr r0, [r4]
@@ -208578,7 +208578,7 @@ _0807AC1C:
 	thumb_func_end sub_807ABCC
 
 	thumb_func_start sub_807AC24
-sub_807AC24: ; 807AC24
+sub_807AC24: @ 807AC24
 	push {lr}
 	bl sub_807ABCC
 	bl LoadOamFromSprites
@@ -208589,7 +208589,7 @@ sub_807AC24: ; 807AC24
 	thumb_func_end sub_807AC24
 
 	thumb_func_start sub_807AC3C
-sub_807AC3C: ; 807AC3C
+sub_807AC3C: @ 807AC3C
 	push {r4,lr}
 	ldr r3, =0x020322a0
 	ldr r1, [r3]
@@ -208612,7 +208612,7 @@ sub_807AC3C: ; 807AC3C
 	thumb_func_end sub_807AC3C
 
 	thumb_func_start sub_807AC64
-sub_807AC64: ; 807AC64
+sub_807AC64: @ 807AC64
 	push {r4,r5,lr}
 	ldr r0, =0x020322a0
 	ldr r2, [r0]
@@ -208673,7 +208673,7 @@ _0807ACC4:
 	thumb_func_end sub_807AC64
 
 	thumb_func_start sub_807ACDC
-sub_807ACDC: ; 807ACDC
+sub_807ACDC: @ 807ACDC
 	push {lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -208692,7 +208692,7 @@ _0807ACF8:
 	thumb_func_end sub_807ACDC
 
 	thumb_func_start sub_807ACFC
-sub_807ACFC: ; 807ACFC
+sub_807ACFC: @ 807ACFC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -208840,7 +208840,7 @@ _0807AE36:
 	thumb_func_end sub_807ACFC
 
 	thumb_func_start sub_807AE50
-sub_807AE50: ; 807AE50
+sub_807AE50: @ 807AE50
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -209153,7 +209153,7 @@ _0807B116:
 	thumb_func_end sub_807AE50
 
 	thumb_func_start sub_807B140
-sub_807B140: ; 807B140
+sub_807B140: @ 807B140
 	push {lr}
 	movs r0, 0x5
 	bl sub_807B62C
@@ -209164,7 +209164,7 @@ sub_807B140: ; 807B140
 	thumb_func_end sub_807B140
 
 	thumb_func_start sub_807B154
-sub_807B154: ; 807B154
+sub_807B154: @ 807B154
 	push {lr}
 	movs r0, 0
 	movs r1, 0xFF
@@ -209179,7 +209179,7 @@ sub_807B154: ; 807B154
 	thumb_func_end sub_807B154
 
 	thumb_func_start sub_807B170
-sub_807B170: ; 807B170
+sub_807B170: @ 807B170
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -209278,7 +209278,7 @@ sub_807B170: ; 807B170
 	thumb_func_end sub_807B170
 
 	thumb_func_start sub_807B270
-sub_807B270: ; 807B270
+sub_807B270: @ 807B270
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -209474,7 +209474,7 @@ _0807B43E:
 	thumb_func_end sub_807B270
 
 	thumb_func_start sub_807B464
-sub_807B464: ; 807B464
+sub_807B464: @ 807B464
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -209519,7 +209519,7 @@ _0807B4B8:
 	thumb_func_end sub_807B464
 
 	thumb_func_start sub_807B4C4
-sub_807B4C4: ; 807B4C4
+sub_807B4C4: @ 807B4C4
 	push {lr}
 	bl link_get_multiplayer_id
 	pop {r0}
@@ -209527,7 +209527,7 @@ sub_807B4C4: ; 807B4C4
 	thumb_func_end sub_807B4C4
 
 	thumb_func_start sub_807B4D0
-sub_807B4D0: ; 807B4D0
+sub_807B4D0: @ 807B4D0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -209627,7 +209627,7 @@ _0807B58E:
 	thumb_func_end sub_807B4D0
 
 	thumb_func_start sub_807B5B8
-sub_807B5B8: ; 807B5B8
+sub_807B5B8: @ 807B5B8
 	push {r4,lr}
 	ldr r4, =0x020322a0
 	ldr r0, [r4]
@@ -209670,7 +209670,7 @@ _0807B600:
 	thumb_func_end sub_807B5B8
 
 	thumb_func_start sub_807B60C
-sub_807B60C: ; 807B60C
+sub_807B60C: @ 807B60C
 	push {lr}
 	bl sub_807BBC8
 	bl RunActiveTasks
@@ -209683,7 +209683,7 @@ sub_807B60C: ; 807B60C
 	thumb_func_end sub_807B60C
 
 	thumb_func_start sub_807B62C
-sub_807B62C: ; 807B62C
+sub_807B62C: @ 807B62C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -210113,7 +210113,7 @@ _0807BA68:
 	thumb_func_end sub_807B62C
 
 	thumb_func_start sub_807BA94
-sub_807BA94: ; 807BA94
+sub_807BA94: @ 807BA94
 	push {lr}
 	ldr r0, =gUnknown_08338D70
 	bl LoadObjectPic
@@ -210133,7 +210133,7 @@ sub_807BA94: ; 807BA94
 	thumb_func_end sub_807BA94
 
 	thumb_func_start sub_807BAD8
-sub_807BAD8: ; 807BAD8
+sub_807BAD8: @ 807BAD8
 	push {r4,r5,lr}
 	sub sp, 0x14
 	ldr r0, =0x020322a0
@@ -210220,7 +210220,7 @@ _0807BBA4:
 	thumb_func_end sub_807BAD8
 
 	thumb_func_start sub_807BBC8
-sub_807BBC8: ; 807BBC8
+sub_807BBC8: @ 807BBC8
 	push {lr}
 	ldr r0, =0x020322a0
 	ldr r0, [r0]
@@ -210241,7 +210241,7 @@ _0807BBE4:
 	thumb_func_end sub_807BBC8
 
 	thumb_func_start sub_807BBEC
-sub_807BBEC: ; 807BBEC
+sub_807BBEC: @ 807BBEC
 	push {r4-r7,lr}
 	sub sp, 0x14
 	ldr r0, =0x020322a0
@@ -212303,7 +212303,7 @@ _0807CFB6:
 	thumb_func_end sub_807BBEC
 
 	thumb_func_start sub_807CFC8
-sub_807CFC8: ; 807CFC8
+sub_807CFC8: @ 807CFC8
 	push {r4-r7,lr}
 	sub sp, 0x14
 	ldr r0, =0x020322a0
@@ -214408,7 +214408,7 @@ _0807E402:
 	thumb_func_end sub_807CFC8
 
 	thumb_func_start c2_08053788
-c2_08053788: ; 807E414
+c2_08053788: @ 807E414
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -214495,7 +214495,7 @@ _0807E4C2:
 	thumb_func_end c2_08053788
 
 	thumb_func_start sub_807E4DC
-sub_807E4DC: ; 807E4DC
+sub_807E4DC: @ 807E4DC
 	push {r4-r6,lr}
 	bl sub_807ACDC
 	bl sub_800A550
@@ -214554,7 +214554,7 @@ _0807E542:
 	thumb_func_end sub_807E4DC
 
 	thumb_func_start sub_807E55C
-sub_807E55C: ; 807E55C
+sub_807E55C: @ 807E55C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -214619,7 +214619,7 @@ _0807E5CE:
 	thumb_func_end sub_807E55C
 
 	thumb_func_start sub_807E5D8
-sub_807E5D8: ; 807E5D8
+sub_807E5D8: @ 807E5D8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -214674,7 +214674,7 @@ _0807E636:
 	thumb_func_end sub_807E5D8
 
 	thumb_func_start sub_807E64C
-sub_807E64C: ; 807E64C
+sub_807E64C: @ 807E64C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -214723,7 +214723,7 @@ _0807E69E:
 	thumb_func_end sub_807E64C
 
 	thumb_func_start sub_807E6AC
-sub_807E6AC: ; 807E6AC
+sub_807E6AC: @ 807E6AC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x32]
@@ -214796,7 +214796,7 @@ _0807E72C:
 	thumb_func_end sub_807E6AC
 
 	thumb_func_start sub_807E73C
-sub_807E73C: ; 807E73C
+sub_807E73C: @ 807E73C
 	push {r4-r6,lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -214825,7 +214825,7 @@ sub_807E73C: ; 807E73C
 	thumb_func_end sub_807E73C
 
 	thumb_func_start sub_807E784
-sub_807E784: ; 807E784
+sub_807E784: @ 807E784
 	push {r4,lr}
 	sub sp, 0x20
 	ldr r0, =0x020375e0
@@ -214862,7 +214862,7 @@ sub_807E784: ; 807E784
 	thumb_func_end sub_807E784
 
 	thumb_func_start sub_807E7E8
-sub_807E7E8: ; 807E7E8
+sub_807E7E8: @ 807E7E8
 	push {r4-r7,lr}
 	sub sp, 0x38
 	lsls r0, 24
@@ -215031,7 +215031,7 @@ _0807E960:
 	thumb_func_end sub_807E7E8
 
 	thumb_func_start sub_807E974
-sub_807E974: ; 807E974
+sub_807E974: @ 807E974
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -215081,7 +215081,7 @@ _0807E98E:
 	thumb_func_end sub_807E974
 
 	thumb_func_start sub_807E9D4
-sub_807E9D4: ; 807E9D4
+sub_807E9D4: @ 807E9D4
 	push {r4-r6,lr}
 	ldr r6, =0x020375e2
 	ldrh r0, [r6]
@@ -215111,7 +215111,7 @@ _0807EA0A:
 	thumb_func_end sub_807E9D4
 
 	thumb_func_start sub_807EA10
-sub_807EA10: ; 807EA10
+sub_807EA10: @ 807EA10
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrb r0, [r0]
@@ -215124,7 +215124,7 @@ sub_807EA10: ; 807EA10
 	thumb_func_end sub_807EA10
 
 	thumb_func_start sub_807EA2C
-sub_807EA2C: ; 807EA2C
+sub_807EA2C: @ 807EA2C
 	push {r4-r6,lr}
 	bl sub_807BBC8
 	lsls r0, 24
@@ -215187,7 +215187,7 @@ _0807EA96:
 	thumb_func_end sub_807EA2C
 
 	thumb_func_start sub_807EACC
-sub_807EACC: ; 807EACC
+sub_807EACC: @ 807EACC
 	push {r4,lr}
 	bl sub_807ACDC
 	lsls r0, 24
@@ -215241,7 +215241,7 @@ _0807EB2C:
 	thumb_func_end sub_807EACC
 
 	thumb_func_start sub_807EB50
-sub_807EB50: ; 807EB50
+sub_807EB50: @ 807EB50
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -215737,7 +215737,7 @@ _0807F048:
 	thumb_func_end sub_807EB50
 
 	thumb_func_start c2_080543C4
-c2_080543C4: ; 807F068
+c2_080543C4: @ 807F068
 	push {r4,r5,lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -215783,7 +215783,7 @@ _0807F0BE:
 	thumb_func_end c2_080543C4
 
 	thumb_func_start sub_807F0E4
-sub_807F0E4: ; 807F0E4
+sub_807F0E4: @ 807F0E4
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -215804,7 +215804,7 @@ sub_807F0E4: ; 807F0E4
 	thumb_func_end sub_807F0E4
 
 	thumb_func_start sub_807F110
-sub_807F110: ; 807F110
+sub_807F110: @ 807F110
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -215829,7 +215829,7 @@ _0807F134:
 	thumb_func_end sub_807F110
 
 	thumb_func_start sub_807F14C
-sub_807F14C: ; 807F14C
+sub_807F14C: @ 807F14C
 	push {r4,r5,lr}
 	movs r5, 0
 	movs r4, 0
@@ -215867,7 +215867,7 @@ _0807F18A:
 	thumb_func_end sub_807F14C
 
 	thumb_func_start sub_807F19C
-sub_807F19C: ; 807F19C
+sub_807F19C: @ 807F19C
 	push {lr}
 	bl sub_807B170
 	pop {r0}
@@ -215875,7 +215875,7 @@ sub_807F19C: ; 807F19C
 	thumb_func_end sub_807F19C
 
 	thumb_func_start sub_807F1A8
-sub_807F1A8: ; 807F1A8
+sub_807F1A8: @ 807F1A8
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r5, r0, 0
@@ -215927,7 +215927,7 @@ sub_807F1A8: ; 807F1A8
 	thumb_func_end sub_807F1A8
 
 	thumb_func_start c3_08054588
-c3_08054588: ; 807F210
+c3_08054588: @ 807F210
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -216031,7 +216031,7 @@ _0807F2DE:
 	thumb_func_end c3_08054588
 
 	thumb_func_start c3_0805465C
-c3_0805465C: ; 807F2E4
+c3_0805465C: @ 807F2E4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -216120,7 +216120,7 @@ _0807F38E:
 	thumb_func_end c3_0805465C
 
 	thumb_func_start sub_807F39C
-sub_807F39C: ; 807F39C
+sub_807F39C: @ 807F39C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -216214,7 +216214,7 @@ _0807F45C:
 	thumb_func_end sub_807F39C
 
 	thumb_func_start sub_807F464
-sub_807F464: ; 807F464
+sub_807F464: @ 807F464
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -216521,7 +216521,7 @@ _0807F71A:
 	thumb_func_end sub_807F464
 
 	thumb_func_start sub_807F738
-sub_807F738: ; 807F738
+sub_807F738: @ 807F738
 	push {lr}
 	ldr r0, =0x03007630
 	ldr r1, =0x0000ffff
@@ -216540,7 +216540,7 @@ sub_807F738: ; 807F738
 	thumb_func_end sub_807F738
 
 	thumb_func_start sub_807F764
-sub_807F764: ; 807F764
+sub_807F764: @ 807F764
 	push {r4,lr}
 	sub sp, 0x10
 	bl sub_8082DF4
@@ -216596,7 +216596,7 @@ sub_807F764: ; 807F764
 	thumb_func_end sub_807F764
 
 	thumb_func_start sub_807F7D8
-sub_807F7D8: ; 807F7D8
+sub_807F7D8: @ 807F7D8
 	push {r4,r5,lr}
 	ldr r1, =0x020322a4
 	ldr r0, [r1]
@@ -216783,7 +216783,7 @@ _0807F9CA:
 	thumb_func_end sub_807F7D8
 
 	thumb_func_start sub_807F9D0
-sub_807F9D0: ; 807F9D0
+sub_807F9D0: @ 807F9D0
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0x1E
@@ -216827,7 +216827,7 @@ sub_807F9D0: ; 807F9D0
 	thumb_func_end sub_807F9D0
 
 	thumb_func_start sub_807FA34
-sub_807FA34: ; 807FA34
+sub_807FA34: @ 807FA34
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_08339980
@@ -216865,7 +216865,7 @@ _0807FA74:
 	thumb_func_end sub_807FA34
 
 	thumb_func_start sub_807FA80
-sub_807FA80: ; 807FA80
+sub_807FA80: @ 807FA80
 	push {r4,lr}
 	ldr r4, =0x020322a4
 	ldr r0, [r4]
@@ -216897,7 +216897,7 @@ _0807FA94:
 	thumb_func_end sub_807FA80
 
 	thumb_func_start sub_807FAC8
-sub_807FAC8: ; 807FAC8
+sub_807FAC8: @ 807FAC8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r1, =0x020322a4
@@ -217132,7 +217132,7 @@ _0807FCE2:
 	thumb_func_end sub_807FAC8
 
 	thumb_func_start sub_807FD08
-sub_807FD08: ; 807FD08
+sub_807FD08: @ 807FD08
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3A]
@@ -217182,7 +217182,7 @@ _0807FD56:
 	thumb_func_end sub_807FD08
 
 	thumb_func_start sub_807FD64
-sub_807FD64: ; 807FD64
+sub_807FD64: @ 807FD64
 	push {r4-r6,lr}
 	ldr r5, [sp, 0x10]
 	ldr r6, [sp, 0x14]
@@ -217207,7 +217207,7 @@ sub_807FD64: ; 807FD64
 	thumb_func_end sub_807FD64
 
 	thumb_func_start sub_807FD90
-sub_807FD90: ; 807FD90
+sub_807FD90: @ 807FD90
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -217272,7 +217272,7 @@ sub_807FD90: ; 807FD90
 	thumb_func_end sub_807FD90
 
 	thumb_func_start sub_807FE14
-sub_807FE14: ; 807FE14
+sub_807FE14: @ 807FE14
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r5, r1, 16
@@ -217305,7 +217305,7 @@ sub_807FE14: ; 807FE14
 	thumb_func_end sub_807FE14
 
 	thumb_func_start sub_807FE54
-sub_807FE54: ; 807FE54
+sub_807FE54: @ 807FE54
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -217439,7 +217439,7 @@ _0807FF88:
 	thumb_func_end sub_807FE54
 
 	thumb_func_start sub_807FFA4
-sub_807FFA4: ; 807FFA4
+sub_807FFA4: @ 807FFA4
 	push {r4,r5,lr}
 	movs r0, 0
 	movs r1, 0
@@ -217493,7 +217493,7 @@ _0808000E:
 	thumb_func_end sub_807FFA4
 
 	thumb_func_start sub_8080018
-sub_8080018: ; 8080018
+sub_8080018: @ 8080018
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x020322a4
@@ -218106,7 +218106,7 @@ _08080546:
 	thumb_func_end sub_8080018
 
 	thumb_func_start sub_8080588
-sub_8080588: ; 8080588
+sub_8080588: @ 8080588
 	push {r4,lr}
 	movs r0, 0
 	movs r1, 0
@@ -218168,7 +218168,7 @@ sub_8080588: ; 8080588
 	thumb_func_end sub_8080588
 
 	thumb_func_start task_tutorial_oak_boy_girl
-task_tutorial_oak_boy_girl: ; 8080624
+task_tutorial_oak_boy_girl: @ 8080624
 	push {lr}
 	lsls r0, 16
 	lsls r1, 24
@@ -218210,7 +218210,7 @@ _0808066E:
 	thumb_func_end task_tutorial_oak_boy_girl
 
 	thumb_func_start sub_8080674
-sub_8080674: ; 8080674
+sub_8080674: @ 8080674
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -218321,7 +218321,7 @@ _08080734:
 	thumb_func_end sub_8080674
 
 	thumb_func_start sub_808074C
-sub_808074C: ; 808074C
+sub_808074C: @ 808074C
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r7, =0x020322a4
@@ -218382,7 +218382,7 @@ _080807A2:
 	thumb_func_end sub_808074C
 
 	thumb_func_start sub_80807BC
-sub_80807BC: ; 80807BC
+sub_80807BC: @ 80807BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -218514,7 +218514,7 @@ _080808B6:
 	thumb_func_end sub_80807BC
 
 	thumb_func_start sub_80808D4
-sub_80808D4: ; 80808D4
+sub_80808D4: @ 80808D4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x020322a4
@@ -219084,7 +219084,7 @@ _08080DAE:
 	thumb_func_end sub_80808D4
 
 	thumb_func_start sub_8080DF8
-sub_8080DF8: ; 8080DF8
+sub_8080DF8: @ 8080DF8
 	push {lr}
 	ldr r3, =0x03003110
 	movs r0, 0
@@ -219105,7 +219105,7 @@ _08080E02:
 	thumb_func_end sub_8080DF8
 
 	thumb_func_start sub_8080E20
-sub_8080E20: ; 8080E20
+sub_8080E20: @ 8080E20
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -219141,7 +219141,7 @@ _08080E58:
 	thumb_func_end sub_8080E20
 
 	thumb_func_start sub_8080E6C
-sub_8080E6C: ; 8080E6C
+sub_8080E6C: @ 8080E6C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -219168,7 +219168,7 @@ sub_8080E6C: ; 8080E6C
 	thumb_func_end sub_8080E6C
 
 	thumb_func_start sub_8080EA4
-sub_8080EA4: ; 8080EA4
+sub_8080EA4: @ 8080EA4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -219302,7 +219302,7 @@ _08080FC6:
 	thumb_func_end sub_8080EA4
 
 	thumb_func_start sub_8080FD0
-sub_8080FD0: ; 8080FD0
+sub_8080FD0: @ 8080FD0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -219428,7 +219428,7 @@ _080810EE:
 	thumb_func_end sub_8080FD0
 
 	thumb_func_start sub_80810F8
-sub_80810F8: ; 80810F8
+sub_80810F8: @ 80810F8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -219555,7 +219555,7 @@ _0808121A:
 	thumb_func_end sub_80810F8
 
 	thumb_func_start sub_8081224
-sub_8081224: ; 8081224
+sub_8081224: @ 8081224
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -219601,7 +219601,7 @@ _0808127E:
 	thumb_func_end sub_8081224
 
 	thumb_func_start sub_8081288
-sub_8081288: ; 8081288
+sub_8081288: @ 8081288
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -219696,7 +219696,7 @@ _08081358:
 	thumb_func_end sub_8081288
 
 	thumb_func_start sub_8081370
-sub_8081370: ; 8081370
+sub_8081370: @ 8081370
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -219837,7 +219837,7 @@ _080814A0:
 	thumb_func_end sub_8081370
 
 	thumb_func_start sub_80814B0
-sub_80814B0: ; 80814B0
+sub_80814B0: @ 80814B0
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -219874,7 +219874,7 @@ _080814EE:
 	thumb_func_end sub_80814B0
 
 	thumb_func_start sub_80814F4
-sub_80814F4: ; 80814F4
+sub_80814F4: @ 80814F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -220144,7 +220144,7 @@ _08081722:
 	thumb_func_end sub_80814F4
 
 	thumb_func_start sub_8081744
-sub_8081744: ; 8081744
+sub_8081744: @ 8081744
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r6, 0
@@ -220295,7 +220295,7 @@ _0808187E:
 	thumb_func_end sub_8081744
 
 	thumb_func_start sub_8081898
-sub_8081898: ; 8081898
+sub_8081898: @ 8081898
 	push {r4-r6,lr}
 	bl sub_8082D28
 	ldr r4, =0x020322a4
@@ -220379,12 +220379,12 @@ _0808191A:
 	thumb_func_end sub_8081898
 
 	thumb_func_start nullsub_31
-nullsub_31: ; 8081960
+nullsub_31: @ 8081960
 	bx lr
 	thumb_func_end nullsub_31
 
 	thumb_func_start help_system_is_not_first_time
-help_system_is_not_first_time: ; 8081964
+help_system_is_not_first_time: @ 8081964
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsls r2, 24
@@ -220428,7 +220428,7 @@ _080819B2:
 	thumb_func_end help_system_is_not_first_time
 
 	thumb_func_start sub_80819B8
-sub_80819B8: ; 80819B8
+sub_80819B8: @ 80819B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -220719,7 +220719,7 @@ _08081B9E:
 	thumb_func_end sub_80819B8
 
 	thumb_func_start sub_8081BB0
-sub_8081BB0: ; 8081BB0
+sub_8081BB0: @ 8081BB0
 	ldr r1, =0x03000e04
 	strh r0, [r1]
 	bx lr
@@ -220727,7 +220727,7 @@ sub_8081BB0: ; 8081BB0
 	thumb_func_end sub_8081BB0
 
 	thumb_func_start sub_8081BBC
-sub_8081BBC: ; 8081BBC
+sub_8081BBC: @ 8081BBC
 	ldr r0, =0x03000e04
 	movs r1, 0
 	ldrsh r0, [r0, r1]
@@ -220736,7 +220736,7 @@ sub_8081BBC: ; 8081BBC
 	thumb_func_end sub_8081BBC
 
 	thumb_func_start sub_8081BC8
-sub_8081BC8: ; 8081BC8
+sub_8081BC8: @ 8081BC8
 	ldr r1, =0x03000e06
 	strh r0, [r1]
 	bx lr
@@ -220744,7 +220744,7 @@ sub_8081BC8: ; 8081BC8
 	thumb_func_end sub_8081BC8
 
 	thumb_func_start sub_8081BD4
-sub_8081BD4: ; 8081BD4
+sub_8081BD4: @ 8081BD4
 	ldr r0, =0x03000e06
 	movs r1, 0
 	ldrsh r0, [r0, r1]
@@ -220753,7 +220753,7 @@ sub_8081BD4: ; 8081BD4
 	thumb_func_end sub_8081BD4
 
 	thumb_func_start sub_8081BE0
-sub_8081BE0: ; 8081BE0
+sub_8081BE0: @ 8081BE0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -221029,7 +221029,7 @@ _08081DDE:
 	thumb_func_end sub_8081BE0
 
 	thumb_func_start sub_8081E04
-sub_8081E04: ; 8081E04
+sub_8081E04: @ 8081E04
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0xC]
@@ -221046,7 +221046,7 @@ sub_8081E04: ; 8081E04
 	thumb_func_end sub_8081E04
 
 	thumb_func_start sub_8081E20
-sub_8081E20: ; 8081E20
+sub_8081E20: @ 8081E20
 	push {r4-r6,lr}
 	ldr r0, =0x020322a4
 	ldr r0, [r0]
@@ -221214,7 +221214,7 @@ _08081F7C:
 	thumb_func_end sub_8081E20
 
 	thumb_func_start sub_8081F94
-sub_8081F94: ; 8081F94
+sub_8081F94: @ 8081F94
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03003124
@@ -221240,7 +221240,7 @@ _08081FBA:
 	thumb_func_end sub_8081F94
 
 	thumb_func_start sub_8081FC8
-sub_8081FC8: ; 8081FC8
+sub_8081FC8: @ 8081FC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -221831,7 +221831,7 @@ _0808249E:
 	thumb_func_end sub_8081FC8
 
 	thumb_func_start sub_80824FC
-sub_80824FC: ; 80824FC
+sub_80824FC: @ 80824FC
 	push {r4,lr}
 	ldr r1, =0x020322a4
 	ldr r0, [r1]
@@ -221986,7 +221986,7 @@ _0808263E:
 	thumb_func_end sub_80824FC
 
 	thumb_func_start sub_8082644
-sub_8082644: ; 8082644
+sub_8082644: @ 8082644
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r1, =0x020322a4
@@ -222300,7 +222300,7 @@ _080828DC:
 	thumb_func_end sub_8082644
 
 	thumb_func_start sub_8082924
-sub_8082924: ; 8082924
+sub_8082924: @ 8082924
 	push {r4-r6,lr}
 	ldr r1, =0x020322a4
 	ldr r0, [r1]
@@ -222479,7 +222479,7 @@ _08082A92:
 	thumb_func_end sub_8082924
 
 	thumb_func_start sub_8082AD4
-sub_8082AD4: ; 8082AD4
+sub_8082AD4: @ 8082AD4
 	push {r4-r7,lr}
 	ldr r0, =0x03003124
 	ldrb r0, [r0]
@@ -222692,7 +222692,7 @@ _08082CA4:
 	thumb_func_end sub_8082AD4
 
 	thumb_func_start sub_8082CB4
-sub_8082CB4: ; 8082CB4
+sub_8082CB4: @ 8082CB4
 	push {r4,lr}
 	sub sp, 0x14
 	movs r1, 0xF0
@@ -222744,7 +222744,7 @@ sub_8082CB4: ; 8082CB4
 	thumb_func_end sub_8082CB4
 
 	thumb_func_start sub_8082D18
-sub_8082D18: ; 8082D18
+sub_8082D18: @ 8082D18
 	ldr r0, =0x020322a4
 	ldr r0, [r0]
 	adds r0, 0x4A
@@ -222754,7 +222754,7 @@ sub_8082D18: ; 8082D18
 	thumb_func_end sub_8082D18
 
 	thumb_func_start sub_8082D28
-sub_8082D28: ; 8082D28
+sub_8082D28: @ 8082D28
 	push {r4,lr}
 	movs r1, 0
 	ldr r4, =0x03003124
@@ -222848,7 +222848,7 @@ _08082DEA:
 	thumb_func_end sub_8082D28
 
 	thumb_func_start sub_8082DF4
-sub_8082DF4: ; 8082DF4
+sub_8082DF4: @ 8082DF4
 	push {r4-r6,lr}
 	ldr r4, =0x020322a4
 	ldr r0, [r4]
@@ -222882,7 +222882,7 @@ sub_8082DF4: ; 8082DF4
 	thumb_func_end sub_8082DF4
 
 	thumb_func_start sub_8082E3C
-sub_8082E3C: ; 8082E3C
+sub_8082E3C: @ 8082E3C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -222924,7 +222924,7 @@ _08082E80:
 	thumb_func_end sub_8082E3C
 
 	thumb_func_start sub_8082E84
-sub_8082E84: ; 8082E84
+sub_8082E84: @ 8082E84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -223028,7 +223028,7 @@ _08082F40:
 	thumb_func_end sub_8082E84
 
 	thumb_func_start sub_8082F68
-sub_8082F68: ; 8082F68
+sub_8082F68: @ 8082F68
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -223056,7 +223056,7 @@ _08082F94:
 	thumb_func_end sub_8082F68
 
 	thumb_func_start sub_8082F9C
-sub_8082F9C: ; 8082F9C
+sub_8082F9C: @ 8082F9C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -223092,7 +223092,7 @@ _08082FD4:
 	thumb_func_end sub_8082F9C
 
 	thumb_func_start sub_8082FDC
-sub_8082FDC: ; 8082FDC
+sub_8082FDC: @ 8082FDC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -223119,7 +223119,7 @@ sub_8082FDC: ; 8082FDC
 	thumb_func_end sub_8082FDC
 
 	thumb_func_start sub_8083010
-sub_8083010: ; 8083010
+sub_8083010: @ 8083010
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -223210,7 +223210,7 @@ _080830B2:
 	thumb_func_end sub_8083010
 
 	thumb_func_start sub_80830C0
-sub_80830C0: ; 80830C0
+sub_80830C0: @ 80830C0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -223279,7 +223279,7 @@ _08083130:
 	thumb_func_end sub_80830C0
 
 	thumb_func_start sub_8083140
-sub_8083140: ; 8083140
+sub_8083140: @ 8083140
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -223305,7 +223305,7 @@ _08083166:
 	thumb_func_end sub_8083140
 
 	thumb_func_start sub_8083170
-sub_8083170: ; 8083170
+sub_8083170: @ 8083170
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsls r1, 16
@@ -223388,7 +223388,7 @@ _080831FA:
 	thumb_func_end sub_8083170
 
 	thumb_func_start sub_8083210
-sub_8083210: ; 8083210
+sub_8083210: @ 8083210
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -223406,7 +223406,7 @@ _08083222:
 	thumb_func_end sub_8083210
 
 	thumb_func_start sub_8083230
-sub_8083230: ; 8083230
+sub_8083230: @ 8083230
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -223474,7 +223474,7 @@ _08083250:
 	thumb_func_end sub_8083230
 
 	thumb_func_start sub_80832BC
-sub_80832BC: ; 80832BC
+sub_80832BC: @ 80832BC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r4, r1, 16
@@ -223498,7 +223498,7 @@ _080832E0:
 	thumb_func_end sub_80832BC
 
 	thumb_func_start sub_80832E8
-sub_80832E8: ; 80832E8
+sub_80832E8: @ 80832E8
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1]
@@ -223522,7 +223522,7 @@ _08083308:
 	thumb_func_end sub_80832E8
 
 	thumb_func_start sub_808330C
-sub_808330C: ; 808330C
+sub_808330C: @ 808330C
 	push {r4,lr}
 	ldr r4, =0x020322a4
 	ldr r0, [r4]
@@ -223542,7 +223542,7 @@ sub_808330C: ; 808330C
 	thumb_func_end sub_808330C
 
 	thumb_func_start sub_8083334
-sub_8083334: ; 8083334
+sub_8083334: @ 8083334
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -223586,7 +223586,7 @@ _08083378:
 	thumb_func_end sub_8083334
 
 	thumb_func_start sub_8083380
-sub_8083380: ; 8083380
+sub_8083380: @ 8083380
 	push {r4,r5,lr}
 	ldr r5, =0x020322a4
 	ldr r2, [r5]
@@ -223648,7 +223648,7 @@ _080833F0:
 	thumb_func_end sub_8083380
 
 	thumb_func_start sub_80833F8
-sub_80833F8: ; 80833F8
+sub_80833F8: @ 80833F8
 	ldr r1, =0x020322a4
 	ldr r2, [r1]
 	movs r3, 0x8E
@@ -223667,8 +223667,8 @@ sub_80833F8: ; 80833F8
 	thumb_func_end sub_80833F8
 
 	thumb_func_start UpdateBerryBlenderRecord
-; void UpdateBerryBlenderRecord()
-UpdateBerryBlenderRecord: ; 8083418
+@ void UpdateBerryBlenderRecord()
+UpdateBerryBlenderRecord: @ 8083418
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -223695,7 +223695,7 @@ _0808343E:
 	thumb_func_end UpdateBerryBlenderRecord
 
 	thumb_func_start berry_blender_related
-berry_blender_related: ; 8083450
+berry_blender_related: @ 8083450
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -224183,7 +224183,7 @@ _0808389A:
 	thumb_func_end berry_blender_related
 
 	thumb_func_start sub_80838AC
-sub_80838AC: ; 80838AC
+sub_80838AC: @ 80838AC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -224249,7 +224249,7 @@ sub_80838AC: ; 80838AC
 	thumb_func_end sub_80838AC
 
 	thumb_func_start sub_808395C
-sub_808395C: ; 808395C
+sub_808395C: @ 808395C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -224302,7 +224302,7 @@ _080839A8:
 	thumb_func_end sub_808395C
 
 	thumb_func_start sub_80839B4
-sub_80839B4: ; 80839B4
+sub_80839B4: @ 80839B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -224478,7 +224478,7 @@ _08083AF2:
 	thumb_func_end sub_80839B4
 
 	thumb_func_start sub_8083B08
-sub_8083B08: ; 8083B08
+sub_8083B08: @ 8083B08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -224847,7 +224847,7 @@ _08083E14:
 	thumb_func_end sub_8083B08
 
 	thumb_func_start ShowBerryBlenderRecordWindow
-ShowBerryBlenderRecordWindow: ; 8083E24
+ShowBerryBlenderRecordWindow: @ 8083E24
 	push {r4-r7,lr}
 	sub sp, 0x34
 	ldr r0, =gUnknown_08339D14
@@ -224960,7 +224960,7 @@ _08083E8A:
 	thumb_func_end ShowBerryBlenderRecordWindow
 
 	thumb_func_start sub_8083F3C
-sub_8083F3C: ; 8083F3C
+sub_8083F3C: @ 8083F3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -225001,7 +225001,7 @@ _08083F82:
 	thumb_func_end sub_8083F3C
 
 	thumb_func_start sub_8083F94
-sub_8083F94: ; 8083F94
+sub_8083F94: @ 8083F94
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -225153,7 +225153,7 @@ _080840C6:
 	thumb_func_end sub_8083F94
 
 	thumb_func_start sub_80840D4
-sub_80840D4: ; 80840D4
+sub_80840D4: @ 80840D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -225246,7 +225246,7 @@ _08084148:
 	thumb_func_end sub_80840D4
 
 	thumb_func_start sub_808417C
-sub_808417C: ; 808417C
+sub_808417C: @ 808417C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -225301,7 +225301,7 @@ _080841DC:
 	thumb_func_end sub_808417C
 
 	thumb_func_start reset_playtime
-reset_playtime: ; 80841E4
+reset_playtime: @ 80841E4
 	ldr r1, =0x03000e08
 	movs r0, 0
 	strb r0, [r1]
@@ -225320,7 +225320,7 @@ reset_playtime: ; 80841E4
 	thumb_func_end reset_playtime
 
 	thumb_func_start set_max_playtime_if_appropriate
-set_max_playtime_if_appropriate: ; 8084208
+set_max_playtime_if_appropriate: @ 8084208
 	push {lr}
 	ldr r1, =0x03000e08
 	movs r0, 0x1
@@ -225339,7 +225339,7 @@ _08084220:
 	thumb_func_end set_max_playtime_if_appropriate
 
 	thumb_func_start sub_8084230
-sub_8084230: ; 8084230
+sub_8084230: @ 8084230
 	ldr r1, =0x03000e08
 	movs r0, 0
 	strb r0, [r1]
@@ -225348,7 +225348,7 @@ sub_8084230: ; 8084230
 	thumb_func_end sub_8084230
 
 	thumb_func_start gametime_increment
-gametime_increment: ; 808423C
+gametime_increment: @ 808423C
 	push {lr}
 	ldr r0, =0x03000e08
 	ldrb r0, [r0]
@@ -225399,7 +225399,7 @@ _08084294:
 	thumb_func_end gametime_increment
 
 	thumb_func_start set_max_playtime
-set_max_playtime: ; 80842A4
+set_max_playtime: @ 80842A4
 	ldr r1, =0x03000e08
 	movs r0, 0x2
 	strb r0, [r1]
@@ -225418,8 +225418,8 @@ set_max_playtime: ; 80842A4
 	thumb_func_end set_max_playtime
 
 	thumb_func_start write_word_to_mem
-; void write_word_to_mem(int value, int *mem)
-write_word_to_mem: ; 80842CC
+@ void write_word_to_mem(int value, int *mem)
+write_word_to_mem: @ 80842CC
 	strb r0, [r1]
 	lsrs r2, r0, 8
 	strb r2, [r1, 0x1]
@@ -225431,7 +225431,7 @@ write_word_to_mem: ; 80842CC
 	thumb_func_end write_word_to_mem
 
 	thumb_func_start sub_80842DC
-sub_80842DC: ; 80842DC
+sub_80842DC: @ 80842DC
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
 	lsls r0, 24
@@ -225447,7 +225447,7 @@ sub_80842DC: ; 80842DC
 	thumb_func_end sub_80842DC
 
 	thumb_func_start sub_80842F4
-sub_80842F4: ; 80842F4
+sub_80842F4: @ 80842F4
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -225466,7 +225466,7 @@ _080842FC:
 	thumb_func_end sub_80842F4
 
 	thumb_func_start set_player_trainer_id
-set_player_trainer_id: ; 8084310
+set_player_trainer_id: @ 8084310
 	push {r4,lr}
 	bl GenerateRandomNumber
 	adds r4, r0, 0
@@ -225487,7 +225487,7 @@ set_player_trainer_id: ; 8084310
 	thumb_func_end set_player_trainer_id
 
 	thumb_func_start init_options
-init_options: ; 808433C
+init_options: @ 808433C
 	ldr r3, =0x03005d90
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x14]
@@ -225531,7 +225531,7 @@ init_options: ; 808433C
 	thumb_func_end init_options
 
 	thumb_func_start sub_8084390
-sub_8084390: ; 8084390
+sub_8084390: @ 8084390
 	push {r4,lr}
 	ldr r1, =0x030060b0
 	movs r0, 0
@@ -225554,7 +225554,7 @@ sub_8084390: ; 8084390
 	thumb_func_end sub_8084390
 
 	thumb_func_start sub_80843C0
-sub_80843C0: ; 80843C0
+sub_80843C0: @ 80843C0
 	push {r4-r7,lr}
 	bl sub_80DF040
 	movs r2, 0x8
@@ -225585,7 +225585,7 @@ _080843D0:
 	thumb_func_end sub_80843C0
 
 	thumb_func_start sub_8084400
-sub_8084400: ; 8084400
+sub_8084400: @ 8084400
 	push {r4,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -225616,7 +225616,7 @@ sub_8084400: ; 8084400
 	thumb_func_end sub_8084400
 
 	thumb_func_start sub_808444C
-sub_808444C: ; 808444C
+sub_808444C: @ 808444C
 	push {lr}
 	sub sp, 0x4
 	movs r3, 0x1
@@ -225633,7 +225633,7 @@ sub_808444C: ; 808444C
 	thumb_func_end sub_808444C
 
 	thumb_func_start init_sav2
-init_sav2: ; 808446C
+init_sav2: @ 808446C
 	push {lr}
 	bl memclr_stdsav2
 	bl init_options
@@ -225642,7 +225642,7 @@ init_sav2: ; 808446C
 	thumb_func_end init_sav2
 
 	thumb_func_start sub_808447C
-sub_808447C: ; 808447C
+sub_808447C: @ 808447C
 	push {lr}
 	ldr r1, =0x020322d4
 	movs r0, 0
@@ -225658,8 +225658,8 @@ sub_808447C: ; 808447C
 	thumb_func_end sub_808447C
 
 	thumb_func_start NewGameInitData
-; void NewGameInitData()
-NewGameInitData: ; 80844A0
+@ void NewGameInitData()
+NewGameInitData: @ 80844A0
 	push {r4,r5,lr}
 	ldr r0, =0x03006210
 	ldrh r0, [r0]
@@ -225751,7 +225751,7 @@ _080844B2:
 	thumb_func_end NewGameInitData
 
 	thumb_func_start sub_80845CC
-sub_80845CC: ; 80845CC
+sub_80845CC: @ 80845CC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	mov r0, sp
@@ -225790,7 +225790,7 @@ sub_80845CC: ; 80845CC
 	thumb_func_end sub_80845CC
 
 	thumb_func_start sub_8084620
-sub_8084620: ; 8084620
+sub_8084620: @ 8084620
 	push {r4,lr}
 	ldr r0, =gUnknown_08271857
 	bl script_env_2_execute_new_script
@@ -225816,7 +225816,7 @@ sub_8084620: ; 8084620
 	thumb_func_end sub_8084620
 
 	thumb_func_start flag_var_implications_of_teleport_
-flag_var_implications_of_teleport_: ; 8084660
+flag_var_implications_of_teleport_: @ 8084660
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
@@ -225835,7 +225835,7 @@ flag_var_implications_of_teleport_: ; 8084660
 	thumb_func_end flag_var_implications_of_teleport_
 
 	thumb_func_start sub_808469C
-sub_808469C: ; 808469C
+sub_808469C: @ 808469C
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
@@ -225856,7 +225856,7 @@ sub_808469C: ; 808469C
 	thumb_func_end sub_808469C
 
 	thumb_func_start flagmods_08054D70
-flagmods_08054D70: ; 80846E4
+flagmods_08054D70: @ 80846E4
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
@@ -225875,7 +225875,7 @@ flagmods_08054D70: ; 80846E4
 	thumb_func_end flagmods_08054D70
 
 	thumb_func_start sub_8084720
-sub_8084720: ; 8084720
+sub_8084720: @ 8084720
 	push {r4,lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
@@ -225909,7 +225909,7 @@ _08084764:
 	thumb_func_end sub_8084720
 
 	thumb_func_start sub_8084788
-sub_8084788: ; 8084788
+sub_8084788: @ 8084788
 	push {lr}
 	ldr r0, =0x0000088c
 	bl FlagReset
@@ -225923,7 +225923,7 @@ sub_8084788: ; 8084788
 	thumb_func_end sub_8084788
 
 	thumb_func_start sub_80847A8
-sub_80847A8: ; 80847A8
+sub_80847A8: @ 80847A8
 	push {r4,lr}
 	movs r4, 0
 _080847AC:
@@ -225940,8 +225940,8 @@ _080847AC:
 	thumb_func_end sub_80847A8
 
 	thumb_func_start sav12_xor_increment
-; void sav12_xor_increment(u8 a1)
-sav12_xor_increment: ; 80847C4
+@ void sav12_xor_increment(u8 a1)
+sav12_xor_increment: @ 80847C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -225969,7 +225969,7 @@ _080847EC:
 	thumb_func_end sav12_xor_increment
 
 	thumb_func_start sub_80847F8
-sub_80847F8: ; 80847F8
+sub_80847F8: @ 80847F8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -225997,7 +225997,7 @@ _0808482A:
 	thumb_func_end sub_80847F8
 
 	thumb_func_start sav12_xor_set
-sav12_xor_set: ; 8084830
+sav12_xor_set: @ 8084830
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -226023,7 +226023,7 @@ _08084854:
 	thumb_func_end sav12_xor_set
 
 	thumb_func_start sub_8084864
-sub_8084864: ; 8084864
+sub_8084864: @ 8084864
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -226048,8 +226048,8 @@ _0808486C:
 	thumb_func_end sub_8084864
 
 	thumb_func_start CopyFieldObjectTemplatesToSav1
-; void CopyFieldObjectTemplatesToSav1()
-CopyFieldObjectTemplatesToSav1: ; 8084894
+@ void CopyFieldObjectTemplatesToSav1()
+CopyFieldObjectTemplatesToSav1: @ 8084894
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -226083,8 +226083,8 @@ CopyFieldObjectTemplatesToSav1: ; 8084894
 	thumb_func_end CopyFieldObjectTemplatesToSav1
 
 	thumb_func_start CopyFieldObjectTemplateCoordsToSav1
-; void CopyFieldObjectTemplateCoordsToSav1()
-CopyFieldObjectTemplateCoordsToSav1: ; 80848E0
+@ void CopyFieldObjectTemplateCoordsToSav1()
+CopyFieldObjectTemplateCoordsToSav1: @ 80848E0
 	push {lr}
 	ldr r0, =0x02037318
 	ldr r1, [r0, 0x4]
@@ -226109,7 +226109,7 @@ _080848F4:
 	thumb_func_end CopyFieldObjectTemplateCoordsToSav1
 
 	thumb_func_start update_saveblock1_field_object_coords
-update_saveblock1_field_object_coords: ; 8084910
+update_saveblock1_field_object_coords: @ 8084910
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -226143,7 +226143,7 @@ _08084944:
 	thumb_func_end update_saveblock1_field_object_coords
 
 	thumb_func_start update_saveblock1_field_object_movement_behavior
-update_saveblock1_field_object_movement_behavior: ; 808494C
+update_saveblock1_field_object_movement_behavior: @ 808494C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -226174,7 +226174,7 @@ _08084978:
 	thumb_func_end update_saveblock1_field_object_movement_behavior
 
 	thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
-mapdata_load_assets_to_gpu_and_full_redraw: ; 8084980
+mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
 	push {r4,lr}
 	bl move_tilemap_camera_to_upper_left_corner
 	ldr r4, =0x02037318
@@ -226191,8 +226191,8 @@ mapdata_load_assets_to_gpu_and_full_redraw: ; 8084980
 	thumb_func_end mapdata_load_assets_to_gpu_and_full_redraw
 
 	thumb_func_start get_mapdata_header
-; mapdata_header *get_mapdata_header()
-get_mapdata_header: ; 80849A8
+@ mapdata_header *get_mapdata_header()
+get_mapdata_header: @ 80849A8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -226215,8 +226215,8 @@ _080849C6:
 	thumb_func_end get_mapdata_header
 
 	thumb_func_start warp_shift
-; void warp_shift()
-warp_shift: ; 80849D0
+@ void warp_shift()
+warp_shift: @ 80849D0
 	ldr r3, =0x020322dc
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -226243,8 +226243,8 @@ warp_shift: ; 80849D0
 	thumb_func_end warp_shift
 
 	thumb_func_start set_warp2_warp3_to_neg_1
-; void set_warp2_warp3_to_neg_1()
-set_warp2_warp3_to_neg_1: ; 8084A14
+@ void set_warp2_warp3_to_neg_1()
+set_warp2_warp3_to_neg_1: @ 8084A14
 	ldr r2, =0x020322ec
 	ldr r0, =gUnknown_08339D3C
 	ldr r1, [r0, 0x4]
@@ -226259,8 +226259,8 @@ set_warp2_warp3_to_neg_1: ; 8084A14
 	thumb_func_end set_warp2_warp3_to_neg_1
 
 	thumb_func_start warp_set
-; void warp_set(warpdata *warp, char bank, char map, char warpid, char enter_x, char enter_y)
-warp_set: ; 8084A34
+@ void warp_set(warpdata *warp, char bank, char map, char warpid, char enter_x, char enter_y)
+warp_set: @ 8084A34
 	push {r4,r5,lr}
 	ldr r4, [sp, 0xC]
 	ldr r5, [sp, 0x10]
@@ -226279,8 +226279,8 @@ warp_set: ; 8084A34
 	thumb_func_end warp_set
 
 	thumb_func_start warp_data_is_not_neg_1
-; int warp_data_is_not_neg_1(warpdata *warp)
-warp_data_is_not_neg_1: ; 8084A54
+@ int warp_data_is_not_neg_1(warpdata *warp)
+warp_data_is_not_neg_1: @ 8084A54
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0
@@ -226315,8 +226315,8 @@ _08084A8A:
 	thumb_func_end warp_data_is_not_neg_1
 
 	thumb_func_start get_mapheader_by_bank_and_number
-; struct mapheader *get_mapheader_by_bank_and_number(unsigned int bank, unsigned int num)
-get_mapheader_by_bank_and_number: ; 8084A90
+@ struct mapheader *get_mapheader_by_bank_and_number(unsigned int bank, unsigned int num)
+get_mapheader_by_bank_and_number: @ 8084A90
 	lsls r0, 16
 	lsls r1, 16
 	ldr r2, =gUnknown_08486578
@@ -226331,8 +226331,8 @@ get_mapheader_by_bank_and_number: ; 8084A90
 	thumb_func_end get_mapheader_by_bank_and_number
 
 	thumb_func_start warp1_get_mapheader
-; struct mapheader *warp1_get_mapheader()
-warp1_get_mapheader: ; 8084AA8
+@ struct mapheader *warp1_get_mapheader()
+warp1_get_mapheader: @ 8084AA8
 	push {lr}
 	ldr r1, =0x020322e4
 	movs r0, 0
@@ -226351,8 +226351,8 @@ warp1_get_mapheader: ; 8084AA8
 	thumb_func_end warp1_get_mapheader
 
 	thumb_func_start set_current_map_header_from_sav1_save_old_name
-; void set_current_map_header_from_sav1_save_old_name()
-set_current_map_header_from_sav1_save_old_name: ; 8084ACC
+@ void set_current_map_header_from_sav1_save_old_name()
+set_current_map_header_from_sav1_save_old_name: @ 8084ACC
 	push {r4-r6,lr}
 	ldr r1, =0x020322fc
 	ldr r4, =0x02037318
@@ -226389,7 +226389,7 @@ set_current_map_header_from_sav1_save_old_name: ; 8084ACC
 	thumb_func_end set_current_map_header_from_sav1_save_old_name
 
 	thumb_func_start set_current_map_header_from_sav1
-set_current_map_header_from_sav1: ; 8084B1C
+set_current_map_header_from_sav1: @ 8084B1C
 	push {r4,r5,lr}
 	ldr r4, =0x02037318
 	ldr r0, =0x03005d8c
@@ -226420,8 +226420,8 @@ set_current_map_header_from_sav1: ; 8084B1C
 	thumb_func_end set_current_map_header_from_sav1
 
 	thumb_func_start update_camera_pos_from_warpid
-; void update_camera_pos_from_warpid()
-update_camera_pos_from_warpid: ; 8084B5C
+@ void update_camera_pos_from_warpid()
+update_camera_pos_from_warpid: @ 8084B5C
 	push {r4,r5,lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -226485,7 +226485,7 @@ _08084BCC:
 	thumb_func_end update_camera_pos_from_warpid
 
 	thumb_func_start warp_in
-warp_in: ; 8084BD8
+warp_in: @ 8084BD8
 	push {lr}
 	bl warp_shift
 	bl set_current_map_header_from_sav1_save_old_name
@@ -226495,8 +226495,8 @@ warp_in: ; 8084BD8
 	thumb_func_end warp_in
 
 	thumb_func_start warp1_set
-; void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y)
-warp1_set: ; 8084BEC
+@ void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y)
+warp1_set: @ 8084BEC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -226528,8 +226528,8 @@ warp1_set: ; 8084BEC
 	thumb_func_end warp1_set
 
 	thumb_func_start warp1_set_2
-; void warp1_set_2(char bank, char map, char warpid)
-warp1_set_2: ; 8084C28
+@ void warp1_set_2(char bank, char map, char warpid)
+warp1_set_2: @ 8084C28
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -226548,8 +226548,8 @@ warp1_set_2: ; 8084C28
 	thumb_func_end warp1_set_2
 
 	thumb_func_start saved_warp2_set
-; void saved_warp2_set(char bank, char map, char warpid)
-saved_warp2_set: ; 8084C48
+@ void saved_warp2_set(char bank, char map, char warpid)
+saved_warp2_set: @ 8084C48
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d8c
@@ -226577,7 +226577,7 @@ saved_warp2_set: ; 8084C48
 	thumb_func_end saved_warp2_set
 
 	thumb_func_start saved_warp2_set_2
-saved_warp2_set_2: ; 8084C7C
+saved_warp2_set_2: @ 8084C7C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r4, [sp, 0x14]
@@ -226606,7 +226606,7 @@ saved_warp2_set_2: ; 8084C7C
 	thumb_func_end saved_warp2_set_2
 
 	thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
-copy_saved_warp2_bank_and_enter_x_to_warp1: ; 8084CB4
+copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8084CB4
 	ldr r2, =0x020322e4
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -226619,8 +226619,8 @@ copy_saved_warp2_bank_and_enter_x_to_warp1: ; 8084CB4
 	thumb_func_end copy_saved_warp2_bank_and_enter_x_to_warp1
 
 	thumb_func_start sub_8084CCC
-; void sub_8084CCC(int a1)
-sub_8084CCC: ; 8084CCC
+@ void sub_8084CCC(int a1)
+sub_8084CCC: @ 8084CCC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -226650,8 +226650,8 @@ _08084CFA:
 	thumb_func_end sub_8084CCC
 
 	thumb_func_start copy_saved_warp3_bank_and_enter_x_to_warp1
-; void copy_saved_warp3_bank_and_enter_x_to_warp1()
-copy_saved_warp3_bank_and_enter_x_to_warp1: ; 8084D04
+@ void copy_saved_warp3_bank_and_enter_x_to_warp1()
+copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
 	ldr r2, =0x020322e4
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -226664,7 +226664,7 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: ; 8084D04
 	thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
 
 	thumb_func_start sub_8084D1C
-sub_8084D1C: ; 8084D1C
+sub_8084D1C: @ 8084D1C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -226698,7 +226698,7 @@ _08084D50:
 	thumb_func_end sub_8084D1C
 
 	thumb_func_start sub_8084D5C
-sub_8084D5C: ; 8084D5C
+sub_8084D5C: @ 8084D5C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -226755,7 +226755,7 @@ _08084DC4:
 	thumb_func_end sub_8084D5C
 
 	thumb_func_start sub_8084DD4
-sub_8084DD4: ; 8084DD4
+sub_8084DD4: @ 8084DD4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -226789,7 +226789,7 @@ sub_8084DD4: ; 8084DD4
 	thumb_func_end sub_8084DD4
 
 	thumb_func_start sub_8084E14
-sub_8084E14: ; 8084E14
+sub_8084E14: @ 8084E14
 	ldr r2, =0x020322e4
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -226802,7 +226802,7 @@ sub_8084E14: ; 8084E14
 	thumb_func_end sub_8084E14
 
 	thumb_func_start sub_8084E2C
-sub_8084E2C: ; 8084E2C
+sub_8084E2C: @ 8084E2C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -226834,7 +226834,7 @@ sub_8084E2C: ; 8084E2C
 	thumb_func_end sub_8084E2C
 
 	thumb_func_start warp1_set_to_warp2
-warp1_set_to_warp2: ; 8084E68
+warp1_set_to_warp2: @ 8084E68
 	ldr r2, =0x020322e4
 	ldr r0, =0x020322ec
 	ldr r1, [r0, 0x4]
@@ -226846,7 +226846,7 @@ warp1_set_to_warp2: ; 8084E68
 	thumb_func_end warp1_set_to_warp2
 
 	thumb_func_start sub_8084E80
-sub_8084E80: ; 8084E80
+sub_8084E80: @ 8084E80
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -226878,7 +226878,7 @@ sub_8084E80: ; 8084E80
 	thumb_func_end sub_8084E80
 
 	thumb_func_start sub_8084EBC
-sub_8084EBC: ; 8084EBC
+sub_8084EBC: @ 8084EBC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -226919,7 +226919,7 @@ _08084F0A:
 	thumb_func_end sub_8084EBC
 
 	thumb_func_start warp1_set_to_sav1w
-warp1_set_to_sav1w: ; 8084F14
+warp1_set_to_sav1w: @ 8084F14
 	ldr r2, =0x020322e4
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -226932,7 +226932,7 @@ warp1_set_to_sav1w: ; 8084F14
 	thumb_func_end warp1_set_to_sav1w
 
 	thumb_func_start sub_8084F2C
-sub_8084F2C: ; 8084F2C
+sub_8084F2C: @ 8084F2C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -226966,7 +226966,7 @@ sub_8084F2C: ; 8084F2C
 	thumb_func_end sub_8084F2C
 
 	thumb_func_start sub_8084F6C
-sub_8084F6C: ; 8084F6C
+sub_8084F6C: @ 8084F6C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -227000,7 +227000,7 @@ _08084FA0:
 	thumb_func_end sub_8084F6C
 
 	thumb_func_start sub_8084FAC
-sub_8084FAC: ; 8084FAC
+sub_8084FAC: @ 8084FAC
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
 	ldr r0, [r2, 0x14]
@@ -227012,7 +227012,7 @@ sub_8084FAC: ; 8084FAC
 	thumb_func_end sub_8084FAC
 
 	thumb_func_start sub_8084FC0
-sub_8084FC0: ; 8084FC0
+sub_8084FC0: @ 8084FC0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -227048,7 +227048,7 @@ _08084FF2:
 	thumb_func_end sub_8084FC0
 
 	thumb_func_start sub_8084FF8
-sub_8084FF8: ; 8084FF8
+sub_8084FF8: @ 8084FF8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -227096,7 +227096,7 @@ _0808504E:
 	thumb_func_end sub_8084FF8
 
 	thumb_func_start sub_8085058
-sub_8085058: ; 8085058
+sub_8085058: @ 8085058
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -227114,7 +227114,7 @@ sub_8085058: ; 8085058
 	thumb_func_end sub_8085058
 
 	thumb_func_start sub_8085078
-sub_8085078: ; 8085078
+sub_8085078: @ 8085078
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -227132,7 +227132,7 @@ sub_8085078: ; 8085078
 	thumb_func_end sub_8085078
 
 	thumb_func_start mliX_load_map
-mliX_load_map: ; 8085098
+mliX_load_map: @ 8085098
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -227210,7 +227210,7 @@ _08085150:
 	thumb_func_end mliX_load_map
 
 	thumb_func_start mli0_load_map
-mli0_load_map: ; 8085160
+mli0_load_map: @ 8085160
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	bl set_current_map_header_from_sav1_save_old_name
@@ -227314,7 +227314,7 @@ _0808525E:
 	thumb_func_end mli0_load_map
 
 	thumb_func_start player_avatar_init_params_reset
-player_avatar_init_params_reset: ; 8085268
+player_avatar_init_params_reset: @ 8085268
 	ldr r1, =0x02032300
 	movs r0, 0x1
 	strb r0, [r1, 0x1]
@@ -227324,7 +227324,7 @@ player_avatar_init_params_reset: ; 8085268
 	thumb_func_end player_avatar_init_params_reset
 
 	thumb_func_start walkrun_find_lowest_active_bit_in_bitfield
-walkrun_find_lowest_active_bit_in_bitfield: ; 8085278
+walkrun_find_lowest_active_bit_in_bitfield: @ 8085278
 	push {r4,lr}
 	bl player_get_direction_lower_nybble
 	ldr r4, =0x02032300
@@ -227371,7 +227371,7 @@ _080852CA:
 	thumb_func_end walkrun_find_lowest_active_bit_in_bitfield
 
 	thumb_func_start sub_80852D4
-sub_80852D4: ; 80852D4
+sub_80852D4: @ 80852D4
 	push {r4-r7,lr}
 	bl sav1_map_get_light_level
 	adds r5, r0, 0
@@ -227410,7 +227410,7 @@ sub_80852D4: ; 80852D4
 	thumb_func_end sub_80852D4
 
 	thumb_func_start sub_808532C
-sub_808532C: ; 808532C
+sub_808532C: @ 808532C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -227463,7 +227463,7 @@ _08085384:
 	thumb_func_end sub_808532C
 
 	thumb_func_start sub_808538C
-sub_808538C: ; 808538C
+sub_808538C: @ 808538C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -227565,7 +227565,7 @@ _08085448:
 	thumb_func_end sub_808538C
 
 	thumb_func_start cur_mapdata_block_role_at_screen_center_acc_to_sav1
-cur_mapdata_block_role_at_screen_center_acc_to_sav1: ; 8085450
+cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -227584,7 +227584,7 @@ cur_mapdata_block_role_at_screen_center_acc_to_sav1: ; 8085450
 	thumb_func_end cur_mapdata_block_role_at_screen_center_acc_to_sav1
 
 	thumb_func_start sav1_map_is_biking_allowed
-sav1_map_is_biking_allowed: ; 8085474
+sav1_map_is_biking_allowed: @ 8085474
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r1, [r0, 0x1A]
@@ -227603,7 +227603,7 @@ _0808548E:
 	thumb_func_end sav1_map_is_biking_allowed
 
 	thumb_func_start update_sav1_flash_used_on_map
-update_sav1_flash_used_on_map: ; 8085494
+update_sav1_flash_used_on_map: @ 8085494
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r1, [r0, 0x15]
@@ -227643,7 +227643,7 @@ _080854DE:
 	thumb_func_end update_sav1_flash_used_on_map
 
 	thumb_func_start sub_80854EC
-sub_80854EC: ; 80854EC
+sub_80854EC: @ 80854EC
 	push {lr}
 	adds r1, r0, 0
 	cmp r1, 0
@@ -227665,7 +227665,7 @@ _080854FE:
 	thumb_func_end sub_80854EC
 
 	thumb_func_start sav1_get_flash_used_on_map
-sav1_get_flash_used_on_map: ; 8085514
+sav1_get_flash_used_on_map: @ 8085514
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	adds r0, 0x30
@@ -227675,7 +227675,7 @@ sav1_get_flash_used_on_map: ; 8085514
 	thumb_func_end sav1_get_flash_used_on_map
 
 	thumb_func_start sub_8085524
-sub_8085524: ; 8085524
+sub_8085524: @ 8085524
 	push {lr}
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
@@ -227689,7 +227689,7 @@ sub_8085524: ; 8085524
 	thumb_func_end sub_8085524
 
 	thumb_func_start sub_8085540
-sub_8085540: ; 8085540
+sub_8085540: @ 8085540
 	ldr r1, =0x020322d8
 	strb r0, [r1]
 	bx lr
@@ -227697,7 +227697,7 @@ sub_8085540: ; 8085540
 	thumb_func_end sub_8085540
 
 	thumb_func_start sub_808554C
-sub_808554C: ; 808554C
+sub_808554C: @ 808554C
 	ldr r0, =0x020322d8
 	ldrb r0, [r0]
 	bx lr
@@ -227705,7 +227705,7 @@ sub_808554C: ; 808554C
 	thumb_func_end sub_808554C
 
 	thumb_func_start sub_8085558
-sub_8085558: ; 8085558
+sub_8085558: @ 8085558
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0000088a
@@ -227753,7 +227753,7 @@ _080855AE:
 	thumb_func_end sub_8085558
 
 	thumb_func_start sub_80855B4
-sub_80855B4: ; 80855B4
+sub_80855B4: @ 80855B4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x000040ca
@@ -227783,7 +227783,7 @@ _080855E2:
 	thumb_func_end sub_80855B4
 
 	thumb_func_start sub_80855E8
-sub_80855E8: ; 80855E8
+sub_80855E8: @ 80855E8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x000040b3
@@ -227811,7 +227811,7 @@ _08085612:
 	thumb_func_end sub_80855E8
 
 	thumb_func_start sub_8085618
-sub_8085618: ; 8085618
+sub_8085618: @ 8085618
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0000405d
@@ -227849,7 +227849,7 @@ _08085656:
 	thumb_func_end sub_8085618
 
 	thumb_func_start warp_target_get_music
-warp_target_get_music: ; 808565C
+warp_target_get_music: @ 808565C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80855B4
@@ -227908,7 +227908,7 @@ _080856CE:
 	thumb_func_end warp_target_get_music
 
 	thumb_func_start sav1_map_get_music
-sav1_map_get_music: ; 80856D4
+sav1_map_get_music: @ 80856D4
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -227957,7 +227957,7 @@ _08085730:
 	thumb_func_end sav1_map_get_music
 
 	thumb_func_start warp1_target_get_music
-warp1_target_get_music: ; 8085738
+warp1_target_get_music: @ 8085738
 	push {lr}
 	ldr r0, =0x020322e4
 	bl warp_target_get_music
@@ -227989,7 +227989,7 @@ _08085774:
 	thumb_func_end warp1_target_get_music
 
 	thumb_func_start call_map_music_set_to_zero
-call_map_music_set_to_zero: ; 8085778
+call_map_music_set_to_zero: @ 8085778
 	push {lr}
 	bl map_music_set_to_zero
 	pop {r0}
@@ -227997,7 +227997,7 @@ call_map_music_set_to_zero: ; 8085778
 	thumb_func_end call_map_music_set_to_zero
 
 	thumb_func_start sub_8085784
-sub_8085784: ; 8085784
+sub_8085784: @ 8085784
 	push {r4,lr}
 	bl sav1_map_get_music
 	lsls r0, 16
@@ -228048,7 +228048,7 @@ _080857E8:
 	thumb_func_end sub_8085784
 
 	thumb_func_start sav1_set_battle_music_maybe
-sav1_set_battle_music_maybe: ; 80857F4
+sav1_set_battle_music_maybe: @ 80857F4
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
 	strh r0, [r1, 0x2C]
@@ -228057,7 +228057,7 @@ sav1_set_battle_music_maybe: ; 80857F4
 	thumb_func_end sav1_set_battle_music_maybe
 
 	thumb_func_start sav1_reset_battle_music_maybe
-sav1_reset_battle_music_maybe: ; 8085800
+sav1_reset_battle_music_maybe: @ 8085800
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	movs r0, 0
@@ -228067,7 +228067,7 @@ sav1_reset_battle_music_maybe: ; 8085800
 	thumb_func_end sav1_reset_battle_music_maybe
 
 	thumb_func_start sub_8085810
-sub_8085810: ; 8085810
+sub_8085810: @ 8085810
 	push {r4-r6,lr}
 	ldr r0, =0x00004001
 	bl FlagGet
@@ -228124,7 +228124,7 @@ _08085890:
 	thumb_func_end sub_8085810
 
 	thumb_func_start sub_8085898
-sub_8085898: ; 8085898
+sub_8085898: @ 8085898
 	push {r4,lr}
 	bl current_map_music_get
 	adds r4, r0, 0
@@ -228147,7 +228147,7 @@ _080858BE:
 	thumb_func_end sub_8085898
 
 	thumb_func_start sub_80858C4
-sub_80858C4: ; 80858C4
+sub_80858C4: @ 80858C4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -228170,7 +228170,7 @@ _080858E4:
 	thumb_func_end sub_80858C4
 
 	thumb_func_start is_warp1_light_level_8_or_9
-is_warp1_light_level_8_or_9: ; 80858F0
+is_warp1_light_level_8_or_9: @ 80858F0
 	push {lr}
 	bl warp1_get_mapheader
 	ldrb r0, [r0, 0x17]
@@ -228189,7 +228189,7 @@ _0808590A:
 	thumb_func_end is_warp1_light_level_8_or_9
 
 	thumb_func_start music_something
-music_something: ; 8085910
+music_something: @ 8085910
 	push {r4,r5,lr}
 	bl current_map_music_get
 	lsls r0, 16
@@ -228247,7 +228247,7 @@ _0808597E:
 	thumb_func_end music_something
 
 	thumb_func_start sub_80859A0
-sub_80859A0: ; 80859A0
+sub_80859A0: @ 80859A0
 	push {lr}
 	bl sub_80A303C
 	lsls r0, 24
@@ -228257,7 +228257,7 @@ sub_80859A0: ; 80859A0
 	thumb_func_end sub_80859A0
 
 	thumb_func_start sub_80859B0
-sub_80859B0: ; 80859B0
+sub_80859B0: @ 80859B0
 	push {lr}
 	movs r0, 0x4
 	bl sub_80A2F50
@@ -228266,7 +228266,7 @@ sub_80859B0: ; 80859B0
 	thumb_func_end sub_80859B0
 
 	thumb_func_start sub_80859BC
-sub_80859BC: ; 80859BC
+sub_80859BC: @ 80859BC
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -228325,7 +228325,7 @@ _08085A2C:
 	thumb_func_end sub_80859BC
 
 	thumb_func_start wild_encounter_related
-wild_encounter_related: ; 8085A3C
+wild_encounter_related: @ 8085A3C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -228443,7 +228443,7 @@ _08085B20:
 	thumb_func_end wild_encounter_related
 
 	thumb_func_start sub_8085B2C
-sub_8085B2C: ; 8085B2C
+sub_8085B2C: @ 8085B2C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -228474,8 +228474,8 @@ _08085B62:
 	thumb_func_end sub_8085B2C
 
 	thumb_func_start get_map_light_level_by_bank_and_number
-; int get_map_light_level_by_bank_and_number(int bank, int number)
-get_map_light_level_by_bank_and_number: ; 8085B74
+@ int get_map_light_level_by_bank_and_number(int bank, int number)
+get_map_light_level_by_bank_and_number: @ 8085B74
 	push {lr}
 	lsls r0, 24
 	asrs r0, 8
@@ -228490,8 +228490,8 @@ get_map_light_level_by_bank_and_number: ; 8085B74
 	thumb_func_end get_map_light_level_by_bank_and_number
 
 	thumb_func_start get_map_light_level_from_warp
-; int get_map_light_level_from_warp(warpdata *warp)
-get_map_light_level_from_warp: ; 8085B8C
+@ int get_map_light_level_from_warp(warpdata *warp)
+get_map_light_level_from_warp: @ 8085B8C
 	push {lr}
 	movs r2, 0
 	ldrsb r2, [r0, r2]
@@ -228506,7 +228506,7 @@ get_map_light_level_from_warp: ; 8085B8C
 	thumb_func_end get_map_light_level_from_warp
 
 	thumb_func_start sav1_map_get_light_level
-sav1_map_get_light_level: ; 8085BA4
+sav1_map_get_light_level: @ 8085BA4
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -228520,7 +228520,7 @@ sav1_map_get_light_level: ; 8085BA4
 	thumb_func_end sav1_map_get_light_level
 
 	thumb_func_start get_map_light_from_warp0
-get_map_light_from_warp0: ; 8085BBC
+get_map_light_from_warp0: @ 8085BBC
 	push {lr}
 	ldr r0, =0x020322dc
 	bl get_map_light_level_from_warp
@@ -228532,7 +228532,7 @@ get_map_light_from_warp0: ; 8085BBC
 	thumb_func_end get_map_light_from_warp0
 
 	thumb_func_start is_light_level_1_2_3_5_or_6
-is_light_level_1_2_3_5_or_6: ; 8085BD0
+is_light_level_1_2_3_5_or_6: @ 8085BD0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -228557,7 +228557,7 @@ _08085BF0:
 	thumb_func_end is_light_level_1_2_3_5_or_6
 
 	thumb_func_start is_light_level_1_2_3_or_6
-is_light_level_1_2_3_or_6: ; 8085BF4
+is_light_level_1_2_3_or_6: @ 8085BF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -228580,7 +228580,7 @@ _08085C10:
 	thumb_func_end is_light_level_1_2_3_or_6
 
 	thumb_func_start is_light_level_8_or_9
-is_light_level_8_or_9: ; 8085C14
+is_light_level_8_or_9: @ 8085C14
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xF8
@@ -228599,7 +228599,7 @@ _08085C2A:
 	thumb_func_end is_light_level_8_or_9
 
 	thumb_func_start sav1_saved_warp2_map_get_name
-sav1_saved_warp2_map_get_name: ; 8085C30
+sav1_saved_warp2_map_get_name: @ 8085C30
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -228620,7 +228620,7 @@ sav1_saved_warp2_map_get_name: ; 8085C30
 	thumb_func_end sav1_saved_warp2_map_get_name
 
 	thumb_func_start sav1_map_get_name
-sav1_map_get_name: ; 8085C58
+sav1_map_get_name: @ 8085C58
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -228641,7 +228641,7 @@ sav1_map_get_name: ; 8085C58
 	thumb_func_end sav1_map_get_name
 
 	thumb_func_start sav1_map_get_battletype
-sav1_map_get_battletype: ; 8085C80
+sav1_map_get_battletype: @ 8085C80
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -228662,8 +228662,8 @@ sav1_map_get_battletype: ; 8085C80
 	thumb_func_end sav1_map_get_battletype
 
 	thumb_func_start overworld_bg_setup
-; void overworld_bg_setup()
-overworld_bg_setup: ; 8085CA8
+@ void overworld_bg_setup()
+overworld_bg_setup: @ 8085CA8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -228719,7 +228719,7 @@ overworld_bg_setup: ; 8085CA8
 	thumb_func_end overworld_bg_setup
 
 	thumb_func_start overworld_free_bg_tilemaps
-overworld_free_bg_tilemaps: ; 8085D34
+overworld_free_bg_tilemaps: @ 8085D34
 	push {r4,lr}
 	bl sub_81BE72C
 	bl sub_81971F4
@@ -228754,7 +228754,7 @@ _08085D6E:
 	thumb_func_end overworld_free_bg_tilemaps
 
 	thumb_func_start ResetSafariZoneFlag_
-ResetSafariZoneFlag_: ; 8085D80
+ResetSafariZoneFlag_: @ 8085D80
 	push {lr}
 	bl ResetSafariZoneFlag
 	pop {r0}
@@ -228762,8 +228762,8 @@ ResetSafariZoneFlag_: ; 8085D80
 	thumb_func_end ResetSafariZoneFlag_
 
 	thumb_func_start is_c1_link_related_active
-; _BOOL4 is_c1_link_related_active()
-is_c1_link_related_active: ; 8085D8C
+@ _BOOL4 is_c1_link_related_active()
+is_c1_link_related_active: @ 8085D8C
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0]
@@ -228781,8 +228781,8 @@ _08085DA6:
 	thumb_func_end is_c1_link_related_active
 
 	thumb_func_start c1_overworld_normal
-; void c1_overworld_normal(int buttons_new, int buttons_held)
-c1_overworld_normal: ; 8085DAC
+@ void c1_overworld_normal(int buttons_new, int buttons_held)
+c1_overworld_normal: @ 8085DAC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -228823,7 +228823,7 @@ _08085DFA:
 	thumb_func_end c1_overworld_normal
 
 	thumb_func_start c1_overworld
-c1_overworld: ; 8085E04
+c1_overworld: @ 8085E04
 	push {lr}
 	ldr r2, =0x030022c0
 	ldr r1, [r2, 0x4]
@@ -228840,8 +228840,8 @@ _08085E18:
 	thumb_func_end c1_overworld
 
 	thumb_func_start c2_overworld_basic
-; void c2_overworld_basic()
-c2_overworld_basic: ; 8085E24
+@ void c2_overworld_basic()
+c2_overworld_basic: @ 8085E24
 	push {lr}
 	bl script_env_2_run_current_script
 	bl RunActiveTasks
@@ -228857,7 +228857,7 @@ c2_overworld_basic: ; 8085E24
 	thumb_func_end c2_overworld_basic
 
 	thumb_func_start sub_8085E50
-sub_8085E50: ; 8085E50
+sub_8085E50: @ 8085E50
 	push {lr}
 	bl c2_overworld_basic
 	pop {r0}
@@ -228865,7 +228865,7 @@ sub_8085E50: ; 8085E50
 	thumb_func_end sub_8085E50
 
 	thumb_func_start c2_overworld
-c2_overworld: ; 8085E5C
+c2_overworld: @ 8085E5C
 	push {r4,lr}
 	ldr r0, =0x02037fd4
 	ldrb r0, [r0, 0x7]
@@ -228888,7 +228888,7 @@ _08085E7C:
 	thumb_func_end c2_overworld
 
 	thumb_func_start set_callback1
-set_callback1: ; 8085E88
+set_callback1: @ 8085E88
 	ldr r1, =0x030022c0
 	str r0, [r1]
 	bx lr
@@ -228896,7 +228896,7 @@ set_callback1: ; 8085E88
 	thumb_func_end set_callback1
 
 	thumb_func_start sub_8085E94
-sub_8085E94: ; 8085E94
+sub_8085E94: @ 8085E94
 	ldr r1, =0x03000e0c
 	str r0, [r1]
 	bx lr
@@ -228904,7 +228904,7 @@ sub_8085E94: ; 8085E94
 	thumb_func_end sub_8085E94
 
 	thumb_func_start map_post_load_hook_exec
-map_post_load_hook_exec: ; 8085EA0
+map_post_load_hook_exec: @ 8085EA0
 	push {r4,lr}
 	ldr r4, =0x03005db0
 	ldr r0, [r4]
@@ -228948,7 +228948,7 @@ _08085EEC:
 	thumb_func_end map_post_load_hook_exec
 
 	thumb_func_start CB2_NewGame
-CB2_NewGame: ; 8085EF8
+CB2_NewGame: @ 8085EF8
 	push {lr}
 	bl sub_808631C
 	bl sub_80A2F30
@@ -228977,7 +228977,7 @@ CB2_NewGame: ; 8085EF8
 	thumb_func_end CB2_NewGame
 
 	thumb_func_start c2_whiteout
-c2_whiteout: ; 8085F58
+c2_whiteout: @ 8085F58
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -229019,7 +229019,7 @@ _08085FB0:
 	thumb_func_end c2_whiteout
 
 	thumb_func_start c2_load_new_map
-c2_load_new_map: ; 8085FCC
+c2_load_new_map: @ 8085FCC
 	push {lr}
 	bl sub_808631C
 	bl script_env_1_init
@@ -229037,7 +229037,7 @@ c2_load_new_map: ; 8085FCC
 	thumb_func_end c2_load_new_map
 
 	thumb_func_start c2_load_new_map_2
-c2_load_new_map_2: ; 8085FFC
+c2_load_new_map_2: @ 8085FFC
 	push {lr}
 	ldr r0, =0x030026f8
 	bl do_load_map_stuff_loop
@@ -229052,7 +229052,7 @@ c2_load_new_map_2: ; 8085FFC
 	thumb_func_end c2_load_new_map_2
 
 	thumb_func_start sub_8086024
-sub_8086024: ; 8086024
+sub_8086024: @ 8086024
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -229085,7 +229085,7 @@ _08086062:
 	thumb_func_end sub_8086024
 
 	thumb_func_start sub_8086074
-sub_8086074: ; 8086074
+sub_8086074: @ 8086074
 	push {lr}
 	bl sub_808631C
 	ldr r0, =0x03005dac
@@ -229099,7 +229099,7 @@ sub_8086074: ; 8086074
 	thumb_func_end sub_8086074
 
 	thumb_func_start c2_80567AC
-c2_80567AC: ; 8086098
+c2_80567AC: @ 8086098
 	push {lr}
 	ldr r0, =0x030026f8
 	bl map_loading_iteration_3
@@ -229118,7 +229118,7 @@ _080860B8:
 	thumb_func_end c2_80567AC
 
 	thumb_func_start c2_exit_to_overworld_2_switch
-c2_exit_to_overworld_2_switch: ; 80860C8
+c2_exit_to_overworld_2_switch: @ 80860C8
 	push {lr}
 	bl is_c1_link_related_active
 	cmp r0, 0x1
@@ -229138,7 +229138,7 @@ _080860EA:
 	thumb_func_end c2_exit_to_overworld_2_switch
 
 	thumb_func_start c2_exit_to_overworld_2_local
-c2_exit_to_overworld_2_local: ; 80860F4
+c2_exit_to_overworld_2_local: @ 80860F4
 	push {lr}
 	ldr r0, =0x030026f8
 	bl sub_8086638
@@ -229154,7 +229154,7 @@ _0808610A:
 	thumb_func_end c2_exit_to_overworld_2_local
 
 	thumb_func_start c2_exit_to_overworld_2_link
-c2_exit_to_overworld_2_link: ; 8086118
+c2_exit_to_overworld_2_link: @ 8086118
 	push {lr}
 	bl sub_8087598
 	cmp r0, 0
@@ -229172,7 +229172,7 @@ _08086132:
 	thumb_func_end c2_exit_to_overworld_2_link
 
 	thumb_func_start c2_8056854
-c2_8056854: ; 8086140
+c2_8056854: @ 8086140
 	push {lr}
 	bl sub_808631C
 	bl sub_80A2F30
@@ -229201,7 +229201,7 @@ _08086178:
 	thumb_func_end c2_8056854
 
 	thumb_func_start sub_8086194
-sub_8086194: ; 8086194
+sub_8086194: @ 8086194
 	push {lr}
 	bl sub_808631C
 	ldr r1, =0x03005db0
@@ -229214,7 +229214,7 @@ sub_8086194: ; 8086194
 	thumb_func_end sub_8086194
 
 	thumb_func_start sub_80861B0
-sub_80861B0: ; 80861B0
+sub_80861B0: @ 80861B0
 	push {lr}
 	bl sub_808631C
 	ldr r1, =0x03005dac
@@ -229227,7 +229227,7 @@ sub_80861B0: ; 80861B0
 	thumb_func_end sub_80861B0
 
 	thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music
-c2_exit_to_overworld_1_continue_scripts_restart_music: ; 80861CC
+c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC
 	push {lr}
 	bl sub_808631C
 	ldr r1, =0x03005dac
@@ -229240,7 +229240,7 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: ; 80861CC
 	thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
 
 	thumb_func_start sub_80861E8
-sub_80861E8: ; 80861E8
+sub_80861E8: @ 80861E8
 	push {lr}
 	bl sub_808631C
 	ldr r1, =0x03005dac
@@ -229253,7 +229253,7 @@ sub_80861E8: ; 80861E8
 	thumb_func_end sub_80861E8
 
 	thumb_func_start sub_8086204
-sub_8086204: ; 8086204
+sub_8086204: @ 8086204
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r1, [r0, 0x1A]
@@ -229275,7 +229275,7 @@ _08086222:
 	thumb_func_end sub_8086204
 
 	thumb_func_start sub_8086230
-sub_8086230: ; 8086230
+sub_8086230: @ 8086230
 	push {r4,lr}
 	bl sub_808631C
 	bl sub_80A2F30
@@ -229360,8 +229360,8 @@ _08086308:
 	thumb_func_end sub_8086230
 
 	thumb_func_start sub_808631C
-; void sub_808631C()
-sub_808631C: ; 808631C
+@ void sub_808631C()
+sub_808631C: @ 808631C
 	push {r4,lr}
 	bl warp0_in_pokecenter
 	lsls r0, 24
@@ -229406,8 +229406,8 @@ _08086362:
 	thumb_func_end sub_808631C
 
 	thumb_func_start SetFieldVBlankCallback
-; void SetFieldVBlankCallback()
-SetFieldVBlankCallback: ; 8086380
+@ void SetFieldVBlankCallback()
+SetFieldVBlankCallback: @ 8086380
 	push {lr}
 	ldr r0, =VBlankCB_Field
 	bl SetVBlankCallback
@@ -229417,7 +229417,7 @@ SetFieldVBlankCallback: ; 8086380
 	thumb_func_end SetFieldVBlankCallback
 
 	thumb_func_start VBlankCB_Field
-VBlankCB_Field: ; 8086390
+VBlankCB_Field: @ 8086390
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -229430,7 +229430,7 @@ VBlankCB_Field: ; 8086390
 	thumb_func_end VBlankCB_Field
 
 	thumb_func_start sub_80863B0
-sub_80863B0: ; 80863B0
+sub_80863B0: @ 80863B0
 	push {lr}
 	bl sub_81A9E6C
 	lsls r0, 24
@@ -229463,7 +229463,7 @@ _080863F0:
 	thumb_func_end sub_80863B0
 
 	thumb_func_start map_loading_iteration_3
-map_loading_iteration_3: ; 80863F8
+map_loading_iteration_3: @ 80863F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -229584,8 +229584,8 @@ _08086514:
 	thumb_func_end map_loading_iteration_3
 
 	thumb_func_start load_map_stuff
-; int load_map_stuff(u8 *a1, int a2)
-load_map_stuff: ; 808651C
+@ int load_map_stuff(u8 *a1, int a2)
+load_map_stuff: @ 808651C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -229707,7 +229707,7 @@ _08086630:
 	thumb_func_end load_map_stuff
 
 	thumb_func_start sub_8086638
-sub_8086638: ; 8086638
+sub_8086638: @ 8086638
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -229758,7 +229758,7 @@ _08086690:
 	thumb_func_end sub_8086638
 
 	thumb_func_start map_loading_iteration_2_link
-map_loading_iteration_2_link: ; 8086698
+map_loading_iteration_2_link: @ 8086698
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -229876,7 +229876,7 @@ _080867AA:
 	thumb_func_end map_loading_iteration_2_link
 
 	thumb_func_start do_load_map_stuff_loop
-do_load_map_stuff_loop: ; 80867B0
+do_load_map_stuff_loop: @ 80867B0
 	push {r4,lr}
 	adds r4, r0, 0
 _080867B4:
@@ -229891,7 +229891,7 @@ _080867B4:
 	thumb_func_end do_load_map_stuff_loop
 
 	thumb_func_start saveblock_randomize_and_relocate_
-saveblock_randomize_and_relocate_: ; 80867C8
+saveblock_randomize_and_relocate_: @ 80867C8
 	push {lr}
 	bl sub_81BE6AC
 	bl saveblock_randomize_and_relocate
@@ -229900,7 +229900,7 @@ saveblock_randomize_and_relocate_: ; 80867C8
 	thumb_func_end saveblock_randomize_and_relocate_
 
 	thumb_func_start sub_80867D8
-sub_80867D8: ; 80867D8
+sub_80867D8: @ 80867D8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -229962,7 +229962,7 @@ _08086816:
 	thumb_func_end sub_80867D8
 
 	thumb_func_start sub_8086860
-sub_8086860: ; 8086860
+sub_8086860: @ 8086860
 	push {lr}
 	bl sub_80863B0
 	bl map_loading_lcd_reset
@@ -229973,7 +229973,7 @@ sub_8086860: ; 8086860
 	thumb_func_end sub_8086860
 
 	thumb_func_start map_loading_lcd_reset
-map_loading_lcd_reset: ; 8086878
+map_loading_lcd_reset: @ 8086878
 	push {r4,lr}
 	bl clear_scheduled_bg_copies_to_vram
 	bl reset_temp_tile_data_buffers
@@ -230072,7 +230072,7 @@ map_loading_lcd_reset: ; 8086878
 	thumb_func_end map_loading_lcd_reset
 
 	thumb_func_start sub_8086988
-sub_8086988: ; 8086988
+sub_8086988: @ 8086988
 	push {r4,lr}
 	adds r4, r0, 0
 	bl clear_tasks
@@ -230106,7 +230106,7 @@ _080869CE:
 	thumb_func_end sub_8086988
 
 	thumb_func_start sub_80869DC
-sub_80869DC: ; 80869DC
+sub_80869DC: @ 80869DC
 	push {lr}
 	ldr r0, =0x03005dec
 	movs r1, 0
@@ -230124,7 +230124,7 @@ sub_80869DC: ; 80869DC
 	thumb_func_end sub_80869DC
 
 	thumb_func_start mli4_mapscripts_and_other
-mli4_mapscripts_and_other: ; 8086A04
+mli4_mapscripts_and_other: @ 8086A04
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =0x03005dec
@@ -230165,7 +230165,7 @@ mli4_mapscripts_and_other: ; 8086A04
 	thumb_func_end mli4_mapscripts_and_other
 
 	thumb_func_start sub_8086A68
-sub_8086A68: ; 8086A68
+sub_8086A68: @ 8086A68
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -230177,7 +230177,7 @@ sub_8086A68: ; 8086A68
 	thumb_func_end sub_8086A68
 
 	thumb_func_start sub_8086A80
-sub_8086A80: ; 8086A80
+sub_8086A80: @ 8086A80
 	push {lr}
 	ldr r2, =0x02037350
 	ldr r3, =0x02037590
@@ -230198,7 +230198,7 @@ sub_8086A80: ; 8086A80
 	thumb_func_end sub_8086A80
 
 	thumb_func_start sub_8086AAC
-sub_8086AAC: ; 8086AAC
+sub_8086AAC: @ 8086AAC
 	push {lr}
 	ldr r0, =0x03005db4
 	ldrb r0, [r0]
@@ -230212,7 +230212,7 @@ sub_8086AAC: ; 8086AAC
 	thumb_func_end sub_8086AAC
 
 	thumb_func_start sub_8086AC8
-sub_8086AC8: ; 8086AC8
+sub_8086AC8: @ 8086AC8
 	push {lr}
 	ldr r0, =0x03005db4
 	ldrb r0, [r0]
@@ -230226,7 +230226,7 @@ sub_8086AC8: ; 8086AC8
 	thumb_func_end sub_8086AC8
 
 	thumb_func_start sub_8086AE4
-sub_8086AE4: ; 8086AE4
+sub_8086AE4: @ 8086AE4
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -230251,7 +230251,7 @@ sub_8086AE4: ; 8086AE4
 	thumb_func_end sub_8086AE4
 
 	thumb_func_start sub_8086B14
-sub_8086B14: ; 8086B14
+sub_8086B14: @ 8086B14
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -230315,7 +230315,7 @@ _08086B7E:
 	thumb_func_end sub_8086B14
 
 	thumb_func_start sub_8086B9C
-sub_8086B9C: ; 8086B9C
+sub_8086B9C: @ 8086B9C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r0, =0x03005db8
@@ -230347,7 +230347,7 @@ _08086BCA:
 	thumb_func_end sub_8086B9C
 
 	thumb_func_start c1_link_related
-c1_link_related: ; 8086BD8
+c1_link_related: @ 8086BD8
 	push {r4,lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -230381,7 +230381,7 @@ _08086C14:
 	thumb_func_end c1_link_related
 
 	thumb_func_start sub_8086C2C
-sub_8086C2C: ; 8086C2C
+sub_8086C2C: @ 8086C2C
 	push {lr}
 	bl sub_8086C90
 	ldr r0, =sub_80870B0
@@ -230392,7 +230392,7 @@ sub_8086C2C: ; 8086C2C
 	thumb_func_end sub_8086C2C
 
 	thumb_func_start sub_8086C40
-sub_8086C40: ; 8086C40
+sub_8086C40: @ 8086C40
 	push {lr}
 	ldr r0, =0x03003020
 	bl sub_808709C
@@ -230402,7 +230402,7 @@ sub_8086C40: ; 8086C40
 	thumb_func_end sub_8086C40
 
 	thumb_func_start c1_link_related_func_set
-c1_link_related_func_set: ; 8086C50
+c1_link_related_func_set: @ 8086C50
 	ldr r2, =0x03000e19
 	movs r1, 0
 	strb r1, [r2]
@@ -230413,7 +230413,7 @@ c1_link_related_func_set: ; 8086C50
 	thumb_func_end c1_link_related_func_set
 
 	thumb_func_start sub_8086C64
-sub_8086C64: ; 8086C64
+sub_8086C64: @ 8086C64
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -230435,7 +230435,7 @@ _08086C82:
 	thumb_func_end sub_8086C64
 
 	thumb_func_start sub_8086C90
-sub_8086C90: ; 8086C90
+sub_8086C90: @ 8086C90
 	push {lr}
 	ldr r1, =0x03000e10
 	movs r2, 0x80
@@ -230451,7 +230451,7 @@ _08086C98:
 	thumb_func_end sub_8086C90
 
 	thumb_func_start sub_8086CA8
-sub_8086CA8: ; 8086CA8
+sub_8086CA8: @ 8086CA8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -230482,7 +230482,7 @@ _08086CD8:
 	thumb_func_end sub_8086CA8
 
 	thumb_func_start sub_8086CE0
-sub_8086CE0: ; 8086CE0
+sub_8086CE0: @ 8086CE0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -230513,7 +230513,7 @@ _08086D10:
 	thumb_func_end sub_8086CE0
 
 	thumb_func_start sub_8086D18
-sub_8086D18: ; 8086D18
+sub_8086D18: @ 8086D18
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -230742,7 +230742,7 @@ _08086F26:
 	thumb_func_end sub_8086D18
 
 	thumb_func_start sub_8086F38
-sub_8086F38: ; 8086F38
+sub_8086F38: @ 8086F38
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -230795,7 +230795,7 @@ _08086F7C:
 	thumb_func_end sub_8086F38
 
 	thumb_func_start sub_8086FA0
-sub_8086FA0: ; 8086FA0
+sub_8086FA0: @ 8086FA0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -230846,7 +230846,7 @@ _08086FFC:
 	thumb_func_end sub_8086FA0
 
 	thumb_func_start sub_808700C
-sub_808700C: ; 808700C
+sub_808700C: @ 808700C
 	push {lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x2C]
@@ -230901,7 +230901,7 @@ _08087064:
 	thumb_func_end sub_808700C
 
 	thumb_func_start sub_8087068
-sub_8087068: ; 8087068
+sub_8087068: @ 8087068
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -230937,7 +230937,7 @@ _08087098:
 	thumb_func_end sub_8087068
 
 	thumb_func_start sub_808709C
-sub_808709C: ; 808709C
+sub_808709C: @ 808709C
 	push {lr}
 	movs r2, 0x11
 	adds r1, r0, 0x6
@@ -230951,7 +230951,7 @@ _080870A2:
 	thumb_func_end sub_808709C
 
 	thumb_func_start sub_80870B0
-sub_80870B0: ; 80870B0
+sub_80870B0: @ 80870B0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_is_enabled
@@ -230985,7 +230985,7 @@ _080870E6:
 	thumb_func_end sub_80870B0
 
 	thumb_func_start sub_80870EC
-sub_80870EC: ; 80870EC
+sub_80870EC: @ 80870EC
 	push {lr}
 	bl sub_8086C64
 	movs r0, 0x11
@@ -230994,7 +230994,7 @@ sub_80870EC: ; 80870EC
 	thumb_func_end sub_80870EC
 
 	thumb_func_start sub_80870F8
-sub_80870F8: ; 80870F8
+sub_80870F8: @ 80870F8
 	push {r4,lr}
 	bl script_env_2_is_enabled
 	lsls r0, 24
@@ -231014,7 +231014,7 @@ _08087110:
 	thumb_func_end sub_80870F8
 
 	thumb_func_start sub_808711C
-sub_808711C: ; 808711C
+sub_808711C: @ 808711C
 	push {r4,lr}
 	bl sub_800B4DC
 	movs r4, 0x11
@@ -231033,7 +231033,7 @@ _08087134:
 	thumb_func_end sub_808711C
 
 	thumb_func_start sub_8087140
-sub_8087140: ; 8087140
+sub_8087140: @ 8087140
 	push {r4,lr}
 	bl sub_8087690
 	movs r4, 0x11
@@ -231052,7 +231052,7 @@ _08087158:
 	thumb_func_end sub_8087140
 
 	thumb_func_start sub_8087164
-sub_8087164: ; 8087164
+sub_8087164: @ 8087164
 	push {lr}
 	bl sub_8086C64
 	movs r0, 0x11
@@ -231061,7 +231061,7 @@ sub_8087164: ; 8087164
 	thumb_func_end sub_8087164
 
 	thumb_func_start sub_8087170
-sub_8087170: ; 8087170
+sub_8087170: @ 8087170
 	push {lr}
 	ldr r1, =0x03000e10
 	adds r0, r1
@@ -231089,7 +231089,7 @@ _080871A6:
 	thumb_func_end sub_8087170
 
 	thumb_func_start sub_80871AC
-sub_80871AC: ; 80871AC
+sub_80871AC: @ 80871AC
 	push {lr}
 	ldr r0, =sub_8087170
 	bl c1_link_related_func_set
@@ -231100,13 +231100,13 @@ sub_80871AC: ; 80871AC
 	thumb_func_end sub_80871AC
 
 	thumb_func_start sub_80871C0
-sub_80871C0: ; 80871C0
+sub_80871C0: @ 80871C0
 	movs r0, 0x11
 	bx lr
 	thumb_func_end sub_80871C0
 
 	thumb_func_start sub_80871C4
-sub_80871C4: ; 80871C4
+sub_80871C4: @ 80871C4
 	push {lr}
 	ldr r1, =0x03000e10
 	adds r0, r1
@@ -231131,7 +231131,7 @@ _080871EA:
 	thumb_func_end sub_80871C4
 
 	thumb_func_start sub_80871FC
-sub_80871FC: ; 80871FC
+sub_80871FC: @ 80871FC
 	push {lr}
 	ldr r0, =sub_80871C4
 	bl c1_link_related_func_set
@@ -231142,13 +231142,13 @@ sub_80871FC: ; 80871FC
 	thumb_func_end sub_80871FC
 
 	thumb_func_start sub_8087210
-sub_8087210: ; 8087210
+sub_8087210: @ 8087210
 	movs r0, 0x11
 	bx lr
 	thumb_func_end sub_8087210
 
 	thumb_func_start sub_8087214
-sub_8087214: ; 8087214
+sub_8087214: @ 8087214
 	push {lr}
 	movs r0, 0x83
 	bl sub_8086CE0
@@ -231199,7 +231199,7 @@ _08087278:
 	thumb_func_end sub_8087214
 
 	thumb_func_start sub_808727C
-sub_808727C: ; 808727C
+sub_808727C: @ 808727C
 	push {lr}
 	movs r0, 0x83
 	bl sub_8086CE0
@@ -231208,7 +231208,7 @@ sub_808727C: ; 808727C
 	thumb_func_end sub_808727C
 
 	thumb_func_start sub_8087288
-sub_8087288: ; 8087288
+sub_8087288: @ 8087288
 	push {lr}
 	ldr r0, =sub_80871AC
 	bl c1_link_related_func_set
@@ -231219,7 +231219,7 @@ sub_8087288: ; 8087288
 	thumb_func_end sub_8087288
 
 	thumb_func_start sub_808729C
-sub_808729C: ; 808729C
+sub_808729C: @ 808729C
 	push {lr}
 	ldr r0, =sub_80870F8
 	bl c1_link_related_func_set
@@ -231230,7 +231230,7 @@ sub_808729C: ; 808729C
 	thumb_func_end sub_808729C
 
 	thumb_func_start sub_80872B0
-sub_80872B0: ; 80872B0
+sub_80872B0: @ 80872B0
 	push {lr}
 	ldr r0, =sub_80871FC
 	bl c1_link_related_func_set
@@ -231241,7 +231241,7 @@ sub_80872B0: ; 80872B0
 	thumb_func_end sub_80872B0
 
 	thumb_func_start sub_80872C4
-sub_80872C4: ; 80872C4
+sub_80872C4: @ 80872C4
 	push {lr}
 	ldr r0, =sub_8087210
 	bl c1_link_related_func_set
@@ -231252,7 +231252,7 @@ sub_80872C4: ; 80872C4
 	thumb_func_end sub_80872C4
 
 	thumb_func_start sub_80872D8
-sub_80872D8: ; 80872D8
+sub_80872D8: @ 80872D8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -231303,7 +231303,7 @@ _080872EA:
 	thumb_func_end sub_80872D8
 
 	thumb_func_start sub_8087340
-sub_8087340: ; 8087340
+sub_8087340: @ 8087340
 	push {lr}
 	ldrb r0, [r0, 0x2]
 	cmp r0, 0x2
@@ -231321,7 +231321,7 @@ _08087352:
 	thumb_func_end sub_8087340
 
 	thumb_func_start sub_8087358
-sub_8087358: ; 8087358
+sub_8087358: @ 8087358
 	push {lr}
 	ldrb r0, [r0, 0x2]
 	cmp r0, 0x2
@@ -231339,7 +231339,7 @@ _0808736A:
 	thumb_func_end sub_8087358
 
 	thumb_func_start sub_8087370
-sub_8087370: ; 8087370
+sub_8087370: @ 8087370
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1, 0x2]
@@ -231356,7 +231356,7 @@ _08087384:
 	thumb_func_end sub_8087370
 
 	thumb_func_start sub_8087388
-sub_8087388: ; 8087388
+sub_8087388: @ 8087388
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x2]
@@ -231384,7 +231384,7 @@ _080873AE:
 	thumb_func_end sub_8087388
 
 	thumb_func_start sub_80873B4
-sub_80873B4: ; 80873B4
+sub_80873B4: @ 80873B4
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -231478,7 +231478,7 @@ _08087476:
 	thumb_func_end sub_80873B4
 
 	thumb_func_start sub_8087480
-sub_8087480: ; 8087480
+sub_8087480: @ 8087480
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =gUnknown_08277388
@@ -231533,7 +231533,7 @@ _0808750A:
 	thumb_func_end sub_8087480
 
 	thumb_func_start sub_8087510
-sub_8087510: ; 8087510
+sub_8087510: @ 8087510
 	push {lr}
 	bl script_env_2_enable
 	pop {r0}
@@ -231541,7 +231541,7 @@ sub_8087510: ; 8087510
 	thumb_func_end sub_8087510
 
 	thumb_func_start sub_808751C
-sub_808751C: ; 808751C
+sub_808751C: @ 808751C
 	push {lr}
 	movs r0, 0x6
 	bl audio_play
@@ -231552,7 +231552,7 @@ sub_808751C: ; 808751C
 	thumb_func_end sub_808751C
 
 	thumb_func_start sub_8087530
-sub_8087530: ; 8087530
+sub_8087530: @ 8087530
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -231566,7 +231566,7 @@ sub_8087530: ; 8087530
 	thumb_func_end sub_8087530
 
 	thumb_func_start sub_808754C
-sub_808754C: ; 808754C
+sub_808754C: @ 808754C
 	push {lr}
 	movs r0, 0x6
 	bl audio_play
@@ -231579,7 +231579,7 @@ sub_808754C: ; 808754C
 	thumb_func_end sub_808754C
 
 	thumb_func_start sub_8087568
-sub_8087568: ; 8087568
+sub_8087568: @ 8087568
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -231593,7 +231593,7 @@ sub_8087568: ; 8087568
 	thumb_func_end sub_8087568
 
 	thumb_func_start sub_8087584
-sub_8087584: ; 8087584
+sub_8087584: @ 8087584
 	push {lr}
 	ldr r0, =gUnknown_08277509
 	bl script_env_1_execute_new_script
@@ -231604,7 +231604,7 @@ sub_8087584: ; 8087584
 	thumb_func_end sub_8087584
 
 	thumb_func_start sub_8087598
-sub_8087598: ; 8087598
+sub_8087598: @ 8087598
 	push {lr}
 	bl is_c1_link_related_active
 	cmp r0, 0
@@ -231632,7 +231632,7 @@ _080875C0:
 	thumb_func_end sub_8087598
 
 	thumb_func_start sub_80875C8
-sub_80875C8: ; 80875C8
+sub_80875C8: @ 80875C8
 	push {lr}
 	bl sub_800B4DC
 	cmp r0, 0x1
@@ -231680,7 +231680,7 @@ _0808762E:
 	thumb_func_end sub_80875C8
 
 	thumb_func_start sub_8087634
-sub_8087634: ; 8087634
+sub_8087634: @ 8087634
 	push {lr}
 	bl sub_8087690
 	cmp r0, 0x1
@@ -231708,7 +231708,7 @@ _08087666:
 	thumb_func_end sub_8087634
 
 	thumb_func_start sub_808766C
-sub_808766C: ; 808766C
+sub_808766C: @ 808766C
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -231728,7 +231728,7 @@ _0808768A:
 	thumb_func_end sub_808766C
 
 	thumb_func_start sub_8087690
-sub_8087690: ; 8087690
+sub_8087690: @ 8087690
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -231752,14 +231752,14 @@ _080876B8:
 	thumb_func_end sub_8087690
 
 	thumb_func_start sub_80876C4
-sub_80876C4: ; 80876C4
+sub_80876C4: @ 80876C4
 	movs r1, 0
 	str r1, [r0]
 	bx lr
 	thumb_func_end sub_80876C4
 
 	thumb_func_start strange_npc_table_clear
-strange_npc_table_clear: ; 80876CC
+strange_npc_table_clear: @ 80876CC
 	push {lr}
 	ldr r0, =0x02032308
 	movs r1, 0
@@ -231771,7 +231771,7 @@ strange_npc_table_clear: ; 80876CC
 	thumb_func_end strange_npc_table_clear
 
 	thumb_func_start sub_80876E0
-sub_80876E0: ; 80876E0
+sub_80876E0: @ 80876E0
 	push {lr}
 	movs r1, 0
 	movs r2, 0x24
@@ -231781,7 +231781,7 @@ sub_80876E0: ; 80876E0
 	thumb_func_end sub_80876E0
 
 	thumb_func_start sub_80876F0
-sub_80876F0: ; 80876F0
+sub_80876F0: @ 80876F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -231864,7 +231864,7 @@ sub_80876F0: ; 80876F0
 	thumb_func_end sub_80876F0
 
 	thumb_func_start sub_808779C
-sub_808779C: ; 808779C
+sub_808779C: @ 808779C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -231897,7 +231897,7 @@ sub_808779C: ; 808779C
 	thumb_func_end sub_808779C
 
 	thumb_func_start sub_80877DC
-sub_80877DC: ; 80877DC
+sub_80877DC: @ 80877DC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -231922,7 +231922,7 @@ _080877FE:
 	thumb_func_end sub_80877DC
 
 	thumb_func_start sub_808780C
-sub_808780C: ; 808780C
+sub_808780C: @ 808780C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 22
@@ -231958,7 +231958,7 @@ _08087838:
 	thumb_func_end sub_808780C
 
 	thumb_func_start sub_8087858
-sub_8087858: ; 8087858
+sub_8087858: @ 8087858
 	lsls r0, 24
 	ldr r1, =0x02032308
 	lsrs r0, 22
@@ -231975,7 +231975,7 @@ sub_8087858: ; 8087858
 	thumb_func_end sub_8087858
 
 	thumb_func_start sub_8087878
-sub_8087878: ; 8087878
+sub_8087878: @ 8087878
 	lsls r0, 24
 	ldr r3, =0x02032308
 	lsrs r0, 22
@@ -231995,7 +231995,7 @@ sub_8087878: ; 8087878
 	thumb_func_end sub_8087878
 
 	thumb_func_start sub_80878A0
-sub_80878A0: ; 80878A0
+sub_80878A0: @ 80878A0
 	lsls r0, 24
 	ldr r1, =0x02032308
 	lsrs r0, 22
@@ -232012,7 +232012,7 @@ sub_80878A0: ; 80878A0
 	thumb_func_end sub_80878A0
 
 	thumb_func_start sub_80878C0
-sub_80878C0: ; 80878C0
+sub_80878C0: @ 80878C0
 	lsls r0, 24
 	ldr r1, =0x02032308
 	lsrs r0, 22
@@ -232031,7 +232031,7 @@ sub_80878C0: ; 80878C0
 	thumb_func_end sub_80878C0
 
 	thumb_func_start sub_80878E4
-sub_80878E4: ; 80878E4
+sub_80878E4: @ 80878E4
 	lsls r0, 24
 	ldr r1, =0x02032308
 	lsrs r0, 22
@@ -232052,7 +232052,7 @@ sub_80878E4: ; 80878E4
 	thumb_func_end sub_80878E4
 
 	thumb_func_start sub_808790C
-sub_808790C: ; 808790C
+sub_808790C: @ 808790C
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r5, =0x02032308
@@ -232103,7 +232103,7 @@ _08087964:
 	thumb_func_end sub_808790C
 
 	thumb_func_start sub_808796C
-sub_808796C: ; 808796C
+sub_808796C: @ 808796C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -232154,7 +232154,7 @@ _080879C8:
 	thumb_func_end sub_808796C
 
 	thumb_func_start sub_80879D8
-sub_80879D8: ; 80879D8
+sub_80879D8: @ 80879D8
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -232172,13 +232172,13 @@ sub_80879D8: ; 80879D8
 	thumb_func_end sub_80879D8
 
 	thumb_func_start sub_80879F8
-sub_80879F8: ; 80879F8
+sub_80879F8: @ 80879F8
 	movs r0, 0x1
 	bx lr
 	thumb_func_end sub_80879F8
 
 	thumb_func_start sub_80879FC
-sub_80879FC: ; 80879FC
+sub_80879FC: @ 80879FC
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -232196,13 +232196,13 @@ sub_80879FC: ; 80879FC
 	thumb_func_end sub_80879FC
 
 	thumb_func_start sub_8087A1C
-sub_8087A1C: ; 8087A1C
+sub_8087A1C: @ 8087A1C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_8087A1C
 
 	thumb_func_start sub_8087A20
-sub_8087A20: ; 8087A20
+sub_8087A20: @ 8087A20
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -232255,7 +232255,7 @@ _08087A80:
 	thumb_func_end sub_8087A20
 
 	thumb_func_start sub_8087A88
-sub_8087A88: ; 8087A88
+sub_8087A88: @ 8087A88
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, r2, 24
@@ -232270,14 +232270,14 @@ sub_8087A88: ; 8087A88
 	thumb_func_end sub_8087A88
 
 	thumb_func_start sub_8087AA0
-sub_8087AA0: ; 8087AA0
+sub_8087AA0: @ 8087AA0
 	movs r1, 0
 	strb r1, [r0, 0x3]
 	bx lr
 	thumb_func_end sub_8087AA0
 
 	thumb_func_start sub_8087AA8
-sub_8087AA8: ; 8087AA8
+sub_8087AA8: @ 8087AA8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -232307,7 +232307,7 @@ _08087AD8:
 	thumb_func_end sub_8087AA8
 
 	thumb_func_start npc_something3
-npc_something3: ; 8087AE0
+npc_something3: @ 8087AE0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -232354,7 +232354,7 @@ _08087B3A:
 	thumb_func_end npc_something3
 
 	thumb_func_start npc_080587EC
-npc_080587EC: ; 8087B40
+npc_080587EC: @ 8087B40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -232430,7 +232430,7 @@ _08087BBE:
 	thumb_func_end npc_080587EC
 
 	thumb_func_start sub_8087BCC
-sub_8087BCC: ; 8087BCC
+sub_8087BCC: @ 8087BCC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -232520,7 +232520,7 @@ _08087C7A:
 	thumb_func_end sub_8087BCC
 
 	thumb_func_start sub_8087C8C
-sub_8087C8C: ; 8087C8C
+sub_8087C8C: @ 8087C8C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x2E
@@ -232607,7 +232607,7 @@ _08087D3C:
 	thumb_func_end sub_8087C8C
 
 	thumb_func_start mapconnection_get_mapheader
-mapconnection_get_mapheader: ; 8087D44
+mapconnection_get_mapheader: @ 8087D44
 	push {lr}
 	ldrb r2, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -232618,7 +232618,7 @@ mapconnection_get_mapheader: ; 8087D44
 	thumb_func_end mapconnection_get_mapheader
 
 	thumb_func_start not_trainer_hill_battle_pyramid
-not_trainer_hill_battle_pyramid: ; 8087D54
+not_trainer_hill_battle_pyramid: @ 8087D54
 	push {r4,lr}
 	ldr r4, =0x02037318
 	adds r0, r4, 0
@@ -232633,7 +232633,7 @@ not_trainer_hill_battle_pyramid: ; 8087D54
 	thumb_func_end not_trainer_hill_battle_pyramid
 
 	thumb_func_start sub_8087D74
-sub_8087D74: ; 8087D74
+sub_8087D74: @ 8087D74
 	push {r4,lr}
 	ldr r4, =0x02037318
 	adds r0, r4, 0
@@ -232655,7 +232655,7 @@ sub_8087D74: ; 8087D74
 	thumb_func_end sub_8087D74
 
 	thumb_func_start battle_pyramid_map_load_related
-battle_pyramid_map_load_related: ; 8087DAC
+battle_pyramid_map_load_related: @ 8087DAC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -232679,7 +232679,7 @@ battle_pyramid_map_load_related: ; 8087DAC
 	thumb_func_end battle_pyramid_map_load_related
 
 	thumb_func_start trainer_hill_map_load_related
-trainer_hill_map_load_related: ; 8087DE4
+trainer_hill_map_load_related: @ 8087DE4
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x03ff03ff
@@ -232699,8 +232699,8 @@ trainer_hill_map_load_related: ; 8087DE4
 	thumb_func_end trainer_hill_map_load_related
 
 	thumb_func_start mapheader_copy_mapdata_with_padding
-; void mapheader_copy_mapdata_with_padding(struct mapheader *mapHeader)
-mapheader_copy_mapdata_with_padding: ; 8087E14
+@ void mapheader_copy_mapdata_with_padding(struct mapheader *mapHeader)
+mapheader_copy_mapdata_with_padding: @ 8087E14
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -232740,8 +232740,8 @@ _08087E56:
 	thumb_func_end mapheader_copy_mapdata_with_padding
 
 	thumb_func_start map_copy_with_padding
-; int map_copy_with_padding(void *src)
-map_copy_with_padding: ; 8087E70
+@ int map_copy_with_padding(void *src)
+map_copy_with_padding: @ 8087E70
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -232789,8 +232789,8 @@ _08087EB8:
 	thumb_func_end map_copy_with_padding
 
 	thumb_func_start mapheader_copy_mapdata_of_adjacent_maps
-; void mapheader_copy_mapdata_of_adjacent_maps(struct mapheader *mapHeader)
-mapheader_copy_mapdata_of_adjacent_maps: ; 8087EC8
+@ void mapheader_copy_mapdata_of_adjacent_maps(struct mapheader *mapHeader)
+mapheader_copy_mapdata_of_adjacent_maps: @ 8087EC8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r0, [r6, 0xC]
@@ -232864,7 +232864,7 @@ _08087F4C:
 	thumb_func_end mapheader_copy_mapdata_of_adjacent_maps
 
 	thumb_func_start sub_8087F54
-sub_8087F54: ; 8087F54
+sub_8087F54: @ 8087F54
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -232916,7 +232916,7 @@ _08087FA6:
 	thumb_func_end sub_8087F54
 
 	thumb_func_start sub_8087FB8
-sub_8087FB8: ; 8087FB8
+sub_8087FB8: @ 8087FB8
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r3, r0, 0
@@ -232971,7 +232971,7 @@ _08088012:
 	thumb_func_end sub_8087FB8
 
 	thumb_func_start sub_8088020
-sub_8088020: ; 8088020
+sub_8088020: @ 8088020
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r5, r1, 0
@@ -233023,7 +233023,7 @@ _08088074:
 	thumb_func_end sub_8088020
 
 	thumb_func_start sub_8088080
-sub_8088080: ; 8088080
+sub_8088080: @ 8088080
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r5, r1, 0
@@ -233075,7 +233075,7 @@ _080880D4:
 	thumb_func_end sub_8088080
 
 	thumb_func_start sub_80880E0
-sub_80880E0: ; 80880E0
+sub_80880E0: @ 80880E0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r3, r0, 0
@@ -233129,8 +233129,8 @@ _08088138:
 	thumb_func_end sub_80880E0
 
 	thumb_func_start MapGridGetZCoordAt
-; u8 MapGridGetZCoordAt(s32 x, s32 y)
-MapGridGetZCoordAt: ; 8088144
+@ u8 MapGridGetZCoordAt(s32 x, s32 y)
+MapGridGetZCoordAt: @ 8088144
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -233188,8 +233188,8 @@ _080881AA:
 	thumb_func_end MapGridGetZCoordAt
 
 	thumb_func_start MapGridIsImpassableAt
-; u8 MapGridIsImpassableAt(s32 x, s32 y)
-MapGridIsImpassableAt: ; 80881B0
+@ u8 MapGridIsImpassableAt(s32 x, s32 y)
+MapGridIsImpassableAt: @ 80881B0
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -233250,8 +233250,8 @@ _0808821E:
 	thumb_func_end MapGridIsImpassableAt
 
 	thumb_func_start MapGridGetMetatileIdAt
-; u16 MapGridGetMetatileIdAt(s32 x, s32 y)
-MapGridGetMetatileIdAt: ; 8088224
+@ u16 MapGridGetMetatileIdAt(s32 x, s32 y)
+MapGridGetMetatileIdAt: @ 8088224
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -233329,8 +233329,8 @@ _080882B0:
 	thumb_func_end MapGridGetMetatileIdAt
 
 	thumb_func_start MapGridGetMetatileBehaviorAt
-; u8 MapGridGetMetatileBehaviorAt(s32 x, s32 y)
-MapGridGetMetatileBehaviorAt: ; 80882BC
+@ u8 MapGridGetMetatileBehaviorAt(s32 x, s32 y)
+MapGridGetMetatileBehaviorAt: @ 80882BC
 	push {lr}
 	bl MapGridGetMetatileIdAt
 	lsls r0, 16
@@ -233344,8 +233344,8 @@ MapGridGetMetatileBehaviorAt: ; 80882BC
 	thumb_func_end MapGridGetMetatileBehaviorAt
 
 	thumb_func_start MapGridGetMetatileLayerTypeAt
-; u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y)
-MapGridGetMetatileLayerTypeAt: ; 80882D4
+@ u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y)
+MapGridGetMetatileLayerTypeAt: @ 80882D4
 	push {lr}
 	bl MapGridGetMetatileIdAt
 	lsls r0, 16
@@ -233361,8 +233361,8 @@ MapGridGetMetatileLayerTypeAt: ; 80882D4
 	thumb_func_end MapGridGetMetatileLayerTypeAt
 
 	thumb_func_start MapGridSetMetatileIdAt
-; void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId)
-MapGridSetMetatileIdAt: ; 80882F0
+@ void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId)
+MapGridSetMetatileIdAt: @ 80882F0
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	lsls r2, 16
@@ -233399,8 +233399,8 @@ _08088328:
 	thumb_func_end MapGridSetMetatileIdAt
 
 	thumb_func_start MapGridSetMetatileEntryAt
-; void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatileEntry)
-MapGridSetMetatileEntryAt: ; 8088338
+@ void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatileEntry)
+MapGridSetMetatileEntryAt: @ 8088338
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	lsls r2, 16
@@ -233431,8 +233431,8 @@ _08088364:
 	thumb_func_end MapGridSetMetatileEntryAt
 
 	thumb_func_start GetBehaviorByMetatileId
-; u16 GetBehaviorByMetatileId(u16 metatileId)
-GetBehaviorByMetatileId: ; 8088370
+@ u16 GetBehaviorByMetatileId(u16 metatileId)
+GetBehaviorByMetatileId: @ 8088370
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -233472,7 +233472,7 @@ _080883B6:
 	thumb_func_end GetBehaviorByMetatileId
 
 	thumb_func_start save_serialize_map
-save_serialize_map: ; 80883C4
+save_serialize_map: @ 80883C4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -233533,7 +233533,7 @@ _08088420:
 	thumb_func_end save_serialize_map
 
 	thumb_func_start sub_8088438
-sub_8088438: ; 8088438
+sub_8088438: @ 8088438
 	push {r4,lr}
 	movs r2, 0
 	movs r1, 0
@@ -233566,7 +233566,7 @@ _0808846E:
 	thumb_func_end sub_8088438
 
 	thumb_func_start sav2_mapdata_clear
-sav2_mapdata_clear: ; 8088474
+sav2_mapdata_clear: @ 8088474
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -233585,7 +233585,7 @@ sav2_mapdata_clear: ; 8088474
 	thumb_func_end sav2_mapdata_clear
 
 	thumb_func_start mapdata_from_sav2
-mapdata_from_sav2: ; 808849C
+mapdata_from_sav2: @ 808849C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -233738,7 +233738,7 @@ _080885AC:
 	thumb_func_end mapdata_from_sav2
 
 	thumb_func_start sub_80885C4
-sub_80885C4: ; 80885C4
+sub_80885C4: @ 80885C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -233854,8 +233854,8 @@ _08088682:
 	thumb_func_end sub_80885C4
 
 	thumb_func_start GetMapBorderIdAt
-; u32 GetMapBorderIdAt(s32 x, s32 y)
-GetMapBorderIdAt: ; 808869C
+@ u32 GetMapBorderIdAt(s32 x, s32 y)
+GetMapBorderIdAt: @ 808869C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -233970,8 +233970,8 @@ _08088782:
 	thumb_func_end GetMapBorderIdAt
 
 	thumb_func_start GetPostCameraMoveMapBorderId
-; u32 GetPostCameraMoveMapBorderId(s32 deltaX, s32 deltaY)
-GetPostCameraMoveMapBorderId: ; 8088788
+@ u32 GetPostCameraMoveMapBorderId(s32 deltaX, s32 deltaY)
+GetPostCameraMoveMapBorderId: @ 8088788
 	push {r4,lr}
 	adds r3, r1, 0
 	ldr r1, =0x03005d8c
@@ -233993,8 +233993,8 @@ GetPostCameraMoveMapBorderId: ; 8088788
 	thumb_func_end GetPostCameraMoveMapBorderId
 
 	thumb_func_start CanCameraMoveInDirection
-; bool32 CanCameraMoveInDirection(u8 direction)
-CanCameraMoveInDirection: ; 80887B0
+@ bool32 CanCameraMoveInDirection(u8 direction)
+CanCameraMoveInDirection: @ 80887B0
 	push {r4,r5,lr}
 	ldr r1, =0x03005d8c
 	ldr r4, [r1]
@@ -234031,7 +234031,7 @@ _080887F2:
 	thumb_func_end CanCameraMoveInDirection
 
 	thumb_func_start sub_80887F8
-sub_80887F8: ; 80887F8
+sub_80887F8: @ 80887F8
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -234100,8 +234100,8 @@ _08088872:
 	thumb_func_end sub_80887F8
 
 	thumb_func_start CameraMove
-; u8 CameraMove(s32 deltaX, s32 deltaY)
-CameraMove: ; 808887C
+@ u8 CameraMove(s32 deltaX, s32 deltaY)
+CameraMove: @ 808887C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -234199,7 +234199,7 @@ _08088932:
 	thumb_func_end CameraMove
 
 	thumb_func_start sub_8088950
-sub_8088950: ; 8088950
+sub_8088950: @ 8088950
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -234248,7 +234248,7 @@ _0808899A:
 	thumb_func_end sub_8088950
 
 	thumb_func_start sub_80889A8
-sub_80889A8: ; 80889A8
+sub_80889A8: @ 80889A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -234301,7 +234301,7 @@ _08088A02:
 	thumb_func_end sub_80889A8
 
 	thumb_func_start sub_8088A0C
-sub_8088A0C: ; 8088A0C
+sub_8088A0C: @ 8088A0C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r2, 0
@@ -234330,7 +234330,7 @@ _08088A30:
 	thumb_func_end sub_8088A0C
 
 	thumb_func_start sub_8088A38
-sub_8088A38: ; 8088A38
+sub_8088A38: @ 8088A38
 	push {lr}
 	cmp r0, 0
 	blt _08088A46
@@ -234346,7 +234346,7 @@ _08088A48:
 	thumb_func_end sub_8088A38
 
 	thumb_func_start sub_8088A4C
-sub_8088A4C: ; 8088A4C
+sub_8088A4C: @ 8088A4C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -234382,7 +234382,7 @@ _08088A86:
 	thumb_func_end sub_8088A4C
 
 	thumb_func_start sub_8088A8C
-sub_8088A8C: ; 8088A8C
+sub_8088A8C: @ 8088A8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -234480,7 +234480,7 @@ _08088B2C:
 	thumb_func_end sub_8088A8C
 
 	thumb_func_start sub_8088B3C
-sub_8088B3C: ; 8088B3C
+sub_8088B3C: @ 8088B3C
 	lsls r0, 16
 	lsrs r0, 16
 	lsls r1, 16
@@ -234496,7 +234496,7 @@ sub_8088B3C: ; 8088B3C
 	thumb_func_end sub_8088B3C
 
 	thumb_func_start sav1_camera_get_focus_coords
-sav1_camera_get_focus_coords: ; 8088B58
+sav1_camera_get_focus_coords: @ 8088B58
 	ldr r2, =0x03005d8c
 	ldr r3, [r2]
 	ldrh r2, [r3]
@@ -234510,8 +234510,8 @@ sav1_camera_get_focus_coords: ; 8088B58
 	thumb_func_end sav1_camera_get_focus_coords
 
 	thumb_func_start SetCameraCoords
-; void SetCameraCoords(u16 x, u16 y)
-SetCameraCoords: ; 8088B70
+@ void SetCameraCoords(u16 x, u16 y)
+SetCameraCoords: @ 8088B70
 	ldr r2, =0x03005d8c
 	ldr r2, [r2]
 	strh r0, [r2]
@@ -234521,8 +234521,8 @@ SetCameraCoords: ; 8088B70
 	thumb_func_end SetCameraCoords
 
 	thumb_func_start GetCameraCoords
-; void GetCameraCoords(u16 *x, u16 *y)
-GetCameraCoords: ; 8088B80
+@ void GetCameraCoords(u16 *x, u16 *y)
+GetCameraCoords: @ 8088B80
 	ldr r2, =0x03005d8c
 	ldr r3, [r2]
 	ldrh r2, [r3]
@@ -234534,7 +234534,7 @@ GetCameraCoords: ; 8088B80
 	thumb_func_end GetCameraCoords
 
 	thumb_func_start sub_8088B94
-sub_8088B94: ; 8088B94
+sub_8088B94: @ 8088B94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -234584,7 +234584,7 @@ _08088BE6:
 	thumb_func_end sub_8088B94
 
 	thumb_func_start sub_8088BF0
-sub_8088BF0: ; 8088BF0
+sub_8088BF0: @ 8088BF0
 	push {lr}
 	adds r3, r0, 0
 	lsls r1, 16
@@ -234624,8 +234624,8 @@ _08088C2E:
 	thumb_func_end sub_8088BF0
 
 	thumb_func_start copy_tileset_patterns_to_vram
-; void copy_tileset_patterns_to_vram(tileset *tileset, int num_tiles, int offset)
-copy_tileset_patterns_to_vram: ; 8088C34
+@ void copy_tileset_patterns_to_vram(tileset *tileset, int num_tiles, int offset)
+copy_tileset_patterns_to_vram: @ 8088C34
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r3, r0, 0
@@ -234663,8 +234663,8 @@ _08088C70:
 	thumb_func_end copy_tileset_patterns_to_vram
 
 	thumb_func_start copy_tileset_patterns_to_vram2
-; void copy_tileset_patterns_to_vram2(tileset *tileset, int num_tiles, int offset)
-copy_tileset_patterns_to_vram2: ; 8088C78
+@ void copy_tileset_patterns_to_vram2(tileset *tileset, int num_tiles, int offset)
+copy_tileset_patterns_to_vram2: @ 8088C78
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r3, r0, 0
@@ -234702,18 +234702,18 @@ _08088CB4:
 	thumb_func_end copy_tileset_patterns_to_vram2
 
 	thumb_func_start nullsub_3
-nullsub_3: ; 8088CBC
+nullsub_3: @ 8088CBC
 	bx lr
 	thumb_func_end nullsub_3
 
 	thumb_func_start nullsub_90
-nullsub_90: ; 8088CC0
+nullsub_90: @ 8088CC0
 	bx lr
 	thumb_func_end nullsub_90
 
 	thumb_func_start apply_map_tileset_palette
-; void apply_map_tileset_palette(tileset *tileset, int dest_offset, int size)
-apply_map_tileset_palette: ; 8088CC4
+@ void apply_map_tileset_palette(tileset *tileset, int dest_offset, int size)
+apply_map_tileset_palette: @ 8088CC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -234782,8 +234782,8 @@ _08088D42:
 	thumb_func_end apply_map_tileset_palette
 
 	thumb_func_start copy_map_tileset1_to_vram
-; void copy_map_tileset1_to_vram(mapdata_header *a1)
-copy_map_tileset1_to_vram: ; 8088D50
+@ void copy_map_tileset1_to_vram(mapdata_header *a1)
+copy_map_tileset1_to_vram: @ 8088D50
 	push {lr}
 	ldr r0, [r0, 0x10]
 	movs r1, 0x80
@@ -234795,8 +234795,8 @@ copy_map_tileset1_to_vram: ; 8088D50
 	thumb_func_end copy_map_tileset1_to_vram
 
 	thumb_func_start copy_map_tileset2_to_vram
-; void copy_map_tileset2_to_vram(mapdata_header *a1)
-copy_map_tileset2_to_vram: ; 8088D64
+@ void copy_map_tileset2_to_vram(mapdata_header *a1)
+copy_map_tileset2_to_vram: @ 8088D64
 	push {lr}
 	ldr r0, [r0, 0x14]
 	movs r2, 0x80
@@ -234808,8 +234808,8 @@ copy_map_tileset2_to_vram: ; 8088D64
 	thumb_func_end copy_map_tileset2_to_vram
 
 	thumb_func_start copy_map_tileset2_to_vram_2
-; void copy_map_tileset2_to_vram_2(mapdata_header *a1)
-copy_map_tileset2_to_vram_2: ; 8088D78
+@ void copy_map_tileset2_to_vram_2(mapdata_header *a1)
+copy_map_tileset2_to_vram_2: @ 8088D78
 	push {lr}
 	ldr r0, [r0, 0x14]
 	movs r2, 0x80
@@ -234821,8 +234821,8 @@ copy_map_tileset2_to_vram_2: ; 8088D78
 	thumb_func_end copy_map_tileset2_to_vram_2
 
 	thumb_func_start apply_map_tileset1_palette
-; void apply_map_tileset1_palette(mapdata_header *a1)
-apply_map_tileset1_palette: ; 8088D8C
+@ void apply_map_tileset1_palette(mapdata_header *a1)
+apply_map_tileset1_palette: @ 8088D8C
 	push {lr}
 	ldr r0, [r0, 0x10]
 	movs r1, 0
@@ -234833,8 +234833,8 @@ apply_map_tileset1_palette: ; 8088D8C
 	thumb_func_end apply_map_tileset1_palette
 
 	thumb_func_start apply_map_tileset2_palette
-; void apply_map_tileset2_palette(mapdata_header *a1)
-apply_map_tileset2_palette: ; 8088D9C
+@ void apply_map_tileset2_palette(mapdata_header *a1)
+apply_map_tileset2_palette: @ 8088D9C
 	push {lr}
 	ldr r0, [r0, 0x14]
 	movs r1, 0x60
@@ -234845,8 +234845,8 @@ apply_map_tileset2_palette: ; 8088D9C
 	thumb_func_end apply_map_tileset2_palette
 
 	thumb_func_start copy_map_tileset1_tileset2_to_vram
-; void copy_map_tileset1_tileset2_to_vram(mapdata_header *a1)
-copy_map_tileset1_tileset2_to_vram: ; 8088DAC
+@ void copy_map_tileset1_tileset2_to_vram(mapdata_header *a1)
+copy_map_tileset1_tileset2_to_vram: @ 8088DAC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	cmp r5, 0
@@ -234868,8 +234868,8 @@ _08088DCC:
 	thumb_func_end copy_map_tileset1_tileset2_to_vram
 
 	thumb_func_start apply_map_tileset1_tileset2_palette
-; void apply_map_tileset1_tileset2_palette(mapdata_header *a1)
-apply_map_tileset1_tileset2_palette: ; 8088DD4
+@ void apply_map_tileset1_tileset2_palette(mapdata_header *a1)
+apply_map_tileset1_tileset2_palette: @ 8088DD4
 	push {r4,lr}
 	adds r4, r0, 0
 	cmp r4, 0
@@ -234884,13 +234884,13 @@ _08088DE6:
 	thumb_func_end apply_map_tileset1_tileset2_palette
 
 	thumb_func_start ShouldDoJumpLandingDustEffect
-ShouldDoJumpLandingDustEffect: ; 8088DEC
+ShouldDoJumpLandingDustEffect: @ 8088DEC
 	movs r0, 0x1
 	bx lr
 	thumb_func_end ShouldDoJumpLandingDustEffect
 
 	thumb_func_start sub_8088DF0
-sub_8088DF0: ; 8088DF0
+sub_8088DF0: @ 8088DF0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -234912,7 +234912,7 @@ _08088E0E:
 	thumb_func_end sub_8088DF0
 
 	thumb_func_start MetatileBehavior_IsJumpEast
-MetatileBehavior_IsJumpEast: ; 8088E14
+MetatileBehavior_IsJumpEast: @ 8088E14
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -234928,7 +234928,7 @@ _08088E24:
 	thumb_func_end MetatileBehavior_IsJumpEast
 
 	thumb_func_start MetatileBehavior_IsJumpWest
-MetatileBehavior_IsJumpWest: ; 8088E28
+MetatileBehavior_IsJumpWest: @ 8088E28
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -234944,7 +234944,7 @@ _08088E38:
 	thumb_func_end MetatileBehavior_IsJumpWest
 
 	thumb_func_start MetatileBehavior_IsJumpNorth
-MetatileBehavior_IsJumpNorth: ; 8088E3C
+MetatileBehavior_IsJumpNorth: @ 8088E3C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -234960,7 +234960,7 @@ _08088E4C:
 	thumb_func_end MetatileBehavior_IsJumpNorth
 
 	thumb_func_start MetatileBehavior_IsJumpSouth
-MetatileBehavior_IsJumpSouth: ; 8088E50
+MetatileBehavior_IsJumpSouth: @ 8088E50
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -234976,7 +234976,7 @@ _08088E60:
 	thumb_func_end MetatileBehavior_IsJumpSouth
 
 	thumb_func_start sub_8088E64
-sub_8088E64: ; 8088E64
+sub_8088E64: @ 8088E64
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xFE
@@ -234995,7 +234995,7 @@ _08088E7A:
 	thumb_func_end sub_8088E64
 
 	thumb_func_start MetatileBehavior_IsSandOrDeepSand
-MetatileBehavior_IsSandOrDeepSand: ; 8088E80
+MetatileBehavior_IsSandOrDeepSand: @ 8088E80
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235014,7 +235014,7 @@ _08088E94:
 	thumb_func_end MetatileBehavior_IsSandOrDeepSand
 
 	thumb_func_start MetatileBehavior_IsDeepSand
-MetatileBehavior_IsDeepSand: ; 8088E98
+MetatileBehavior_IsDeepSand: @ 8088E98
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235030,7 +235030,7 @@ _08088EA8:
 	thumb_func_end MetatileBehavior_IsDeepSand
 
 	thumb_func_start MetatileBehavior_IsReflective
-MetatileBehavior_IsReflective: ; 8088EAC
+MetatileBehavior_IsReflective: @ 8088EAC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235057,7 +235057,7 @@ _08088ED0:
 	thumb_func_end MetatileBehavior_IsReflective
 
 	thumb_func_start MetatileBehavior_IsIce
-MetatileBehavior_IsIce: ; 8088ED4
+MetatileBehavior_IsIce: @ 8088ED4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235073,7 +235073,7 @@ _08088EE4:
 	thumb_func_end MetatileBehavior_IsIce
 
 	thumb_func_start is_tile_x69_2_warp_door
-is_tile_x69_2_warp_door: ; 8088EE8
+is_tile_x69_2_warp_door: @ 8088EE8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235089,7 +235089,7 @@ _08088EF8:
 	thumb_func_end is_tile_x69_2_warp_door
 
 	thumb_func_start sub_8088EFC
-sub_8088EFC: ; 8088EFC
+sub_8088EFC: @ 8088EFC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235108,7 +235108,7 @@ _08088F10:
 	thumb_func_end sub_8088EFC
 
 	thumb_func_start MetatileBehavior_IsEscalator
-MetatileBehavior_IsEscalator: ; 8088F14
+MetatileBehavior_IsEscalator: @ 8088F14
 	push {lr}
 	lsls r0, 24
 	movs r1, 0x96
@@ -235127,7 +235127,7 @@ _08088F2A:
 	thumb_func_end MetatileBehavior_IsEscalator
 
 	thumb_func_start sub_8088F30
-sub_8088F30: ; 8088F30
+sub_8088F30: @ 8088F30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235143,7 +235143,7 @@ _08088F40:
 	thumb_func_end sub_8088F30
 
 	thumb_func_start MetatileBehavior_IsLadder
-MetatileBehavior_IsLadder: ; 8088F44
+MetatileBehavior_IsLadder: @ 8088F44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235159,7 +235159,7 @@ _08088F54:
 	thumb_func_end MetatileBehavior_IsLadder
 
 	thumb_func_start sub_8088F58
-sub_8088F58: ; 8088F58
+sub_8088F58: @ 8088F58
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235180,7 +235180,7 @@ _08088F70:
 	thumb_func_end sub_8088F58
 
 	thumb_func_start sub_8088F74
-sub_8088F74: ; 8088F74
+sub_8088F74: @ 8088F74
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235196,7 +235196,7 @@ _08088F84:
 	thumb_func_end sub_8088F74
 
 	thumb_func_start MetatileBehavior_IsSurfableWaterOrUnderwater
-MetatileBehavior_IsSurfableWaterOrUnderwater: ; 8088F88
+MetatileBehavior_IsSurfableWaterOrUnderwater: @ 8088F88
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235218,7 +235218,7 @@ _08088FA6:
 	thumb_func_end MetatileBehavior_IsSurfableWaterOrUnderwater
 
 	thumb_func_start MetatileBehavior_IsEastArrowWarp
-MetatileBehavior_IsEastArrowWarp: ; 8088FAC
+MetatileBehavior_IsEastArrowWarp: @ 8088FAC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235234,7 +235234,7 @@ _08088FBC:
 	thumb_func_end MetatileBehavior_IsEastArrowWarp
 
 	thumb_func_start MetatileBehavior_IsWestArrowWarp
-MetatileBehavior_IsWestArrowWarp: ; 8088FC0
+MetatileBehavior_IsWestArrowWarp: @ 8088FC0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235250,7 +235250,7 @@ _08088FD0:
 	thumb_func_end MetatileBehavior_IsWestArrowWarp
 
 	thumb_func_start MetatileBehavior_IsNorthArrowWarp
-MetatileBehavior_IsNorthArrowWarp: ; 8088FD4
+MetatileBehavior_IsNorthArrowWarp: @ 8088FD4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235269,7 +235269,7 @@ _08088FE8:
 	thumb_func_end MetatileBehavior_IsNorthArrowWarp
 
 	thumb_func_start MetatileBehavior_IsSouthArrowWarp
-MetatileBehavior_IsSouthArrowWarp: ; 8088FEC
+MetatileBehavior_IsSouthArrowWarp: @ 8088FEC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235290,7 +235290,7 @@ _08089004:
 	thumb_func_end MetatileBehavior_IsSouthArrowWarp
 
 	thumb_func_start sub_8089008
-sub_8089008: ; 8089008
+sub_8089008: @ 8089008
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -235325,7 +235325,7 @@ _08089042:
 	thumb_func_end sub_8089008
 
 	thumb_func_start sub_808904C
-sub_808904C: ; 808904C
+sub_808904C: @ 808904C
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -235364,8 +235364,8 @@ _08089088:
 	thumb_func_end sub_808904C
 
 	thumb_func_start MetatileBehavior_IsIce_2
-; bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior)
-MetatileBehavior_IsIce_2: ; 808908C
+@ bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior)
+MetatileBehavior_IsIce_2: @ 808908C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235381,8 +235381,8 @@ _0808909C:
 	thumb_func_end MetatileBehavior_IsIce_2
 
 	thumb_func_start MetatileBehavior_IsTrickHouseSlipperyFloor
-; bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior)
-MetatileBehavior_IsTrickHouseSlipperyFloor: ; 80890A0
+@ bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior)
+MetatileBehavior_IsTrickHouseSlipperyFloor: @ 80890A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235398,7 +235398,7 @@ _080890B0:
 	thumb_func_end MetatileBehavior_IsTrickHouseSlipperyFloor
 
 	thumb_func_start MetatileBehavior_0x05
-MetatileBehavior_0x05: ; 80890B4
+MetatileBehavior_0x05: @ 80890B4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235414,8 +235414,8 @@ _080890C4:
 	thumb_func_end MetatileBehavior_0x05
 
 	thumb_func_start MetatileBehavior_IsWalkNorth
-; bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior)
-MetatileBehavior_IsWalkNorth: ; 80890C8
+@ bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior)
+MetatileBehavior_IsWalkNorth: @ 80890C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235431,8 +235431,8 @@ _080890D8:
 	thumb_func_end MetatileBehavior_IsWalkNorth
 
 	thumb_func_start MetatileBehavior_IsWalkSouth
-; bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior)
-MetatileBehavior_IsWalkSouth: ; 80890DC
+@ bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior)
+MetatileBehavior_IsWalkSouth: @ 80890DC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235448,8 +235448,8 @@ _080890EC:
 	thumb_func_end MetatileBehavior_IsWalkSouth
 
 	thumb_func_start MetatileBehavior_IsWalkWest
-; bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior)
-MetatileBehavior_IsWalkWest: ; 80890F0
+@ bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior)
+MetatileBehavior_IsWalkWest: @ 80890F0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235465,8 +235465,8 @@ _08089100:
 	thumb_func_end MetatileBehavior_IsWalkWest
 
 	thumb_func_start MetatileBehavior_IsWalkEast
-; bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior)
-MetatileBehavior_IsWalkEast: ; 8089104
+@ bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior)
+MetatileBehavior_IsWalkEast: @ 8089104
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235482,8 +235482,8 @@ _08089114:
 	thumb_func_end MetatileBehavior_IsWalkEast
 
 	thumb_func_start MetatileBehavior_IsNorthwardCurrent
-; bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior)
-MetatileBehavior_IsNorthwardCurrent: ; 8089118
+@ bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior)
+MetatileBehavior_IsNorthwardCurrent: @ 8089118
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235499,8 +235499,8 @@ _08089128:
 	thumb_func_end MetatileBehavior_IsNorthwardCurrent
 
 	thumb_func_start MetatileBehavior_IsSouthwardCurrent
-; bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior)
-MetatileBehavior_IsSouthwardCurrent: ; 808912C
+@ bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior)
+MetatileBehavior_IsSouthwardCurrent: @ 808912C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235516,8 +235516,8 @@ _0808913C:
 	thumb_func_end MetatileBehavior_IsSouthwardCurrent
 
 	thumb_func_start MetatileBehavior_IsWestwardCurrent
-; bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior)
-MetatileBehavior_IsWestwardCurrent: ; 8089140
+@ bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior)
+MetatileBehavior_IsWestwardCurrent: @ 8089140
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235533,8 +235533,8 @@ _08089150:
 	thumb_func_end MetatileBehavior_IsWestwardCurrent
 
 	thumb_func_start MetatileBehavior_IsEastwardCurrent
-; bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior)
-MetatileBehavior_IsEastwardCurrent: ; 8089154
+@ bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior)
+MetatileBehavior_IsEastwardCurrent: @ 8089154
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235550,8 +235550,8 @@ _08089164:
 	thumb_func_end MetatileBehavior_IsEastwardCurrent
 
 	thumb_func_start MetatileBehavior_IsSlideNorth
-; bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior)
-MetatileBehavior_IsSlideNorth: ; 8089168
+@ bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior)
+MetatileBehavior_IsSlideNorth: @ 8089168
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235567,8 +235567,8 @@ _08089178:
 	thumb_func_end MetatileBehavior_IsSlideNorth
 
 	thumb_func_start MetatileBehavior_IsSlideSouth
-; bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior)
-MetatileBehavior_IsSlideSouth: ; 808917C
+@ bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior)
+MetatileBehavior_IsSlideSouth: @ 808917C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235584,8 +235584,8 @@ _0808918C:
 	thumb_func_end MetatileBehavior_IsSlideSouth
 
 	thumb_func_start MetatileBehavior_IsSlideWest
-; bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior)
-MetatileBehavior_IsSlideWest: ; 8089190
+@ bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior)
+MetatileBehavior_IsSlideWest: @ 8089190
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235601,8 +235601,8 @@ _080891A0:
 	thumb_func_end MetatileBehavior_IsSlideWest
 
 	thumb_func_start MetatileBehavior_IsSlideEast
-; bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior)
-MetatileBehavior_IsSlideEast: ; 80891A4
+@ bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior)
+MetatileBehavior_IsSlideEast: @ 80891A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235618,7 +235618,7 @@ _080891B4:
 	thumb_func_end MetatileBehavior_IsSlideEast
 
 	thumb_func_start MetatileBehavior_IsCounter
-MetatileBehavior_IsCounter: ; 80891B8
+MetatileBehavior_IsCounter: @ 80891B8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235634,8 +235634,8 @@ _080891C8:
 	thumb_func_end MetatileBehavior_IsCounter
 
 	thumb_func_start MetatileBehavior_IsPlayerFacingTVScreen
-; bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 behavior, u8 direction)
-MetatileBehavior_IsPlayerFacingTVScreen: ; 80891CC
+@ bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 behavior, u8 direction)
+MetatileBehavior_IsPlayerFacingTVScreen: @ 80891CC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235656,7 +235656,7 @@ _080891E4:
 	thumb_func_end MetatileBehavior_IsPlayerFacingTVScreen
 
 	thumb_func_start MetatileBehavior_IsPC
-MetatileBehavior_IsPC: ; 80891E8
+MetatileBehavior_IsPC: @ 80891E8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235672,7 +235672,7 @@ _080891F8:
 	thumb_func_end MetatileBehavior_IsPC
 
 	thumb_func_start is_tile_x84
-is_tile_x84: ; 80891FC
+is_tile_x84: @ 80891FC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235688,7 +235688,7 @@ _0808920C:
 	thumb_func_end is_tile_x84
 
 	thumb_func_start sub_8089210
-sub_8089210: ; 8089210
+sub_8089210: @ 8089210
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235717,7 +235717,7 @@ _08089238:
 	thumb_func_end sub_8089210
 
 	thumb_func_start sub_808923C
-sub_808923C: ; 808923C
+sub_808923C: @ 808923C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235740,7 +235740,7 @@ _08089258:
 	thumb_func_end sub_808923C
 
 	thumb_func_start sub_808925C
-sub_808925C: ; 808925C
+sub_808925C: @ 808925C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235759,7 +235759,7 @@ _08089270:
 	thumb_func_end sub_808925C
 
 	thumb_func_start is_tile_x98
-is_tile_x98: ; 8089274
+is_tile_x98: @ 8089274
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235775,7 +235775,7 @@ _08089284:
 	thumb_func_end is_tile_x98
 
 	thumb_func_start sub_8089288
-sub_8089288: ; 8089288
+sub_8089288: @ 8089288
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235791,7 +235791,7 @@ _08089298:
 	thumb_func_end sub_8089288
 
 	thumb_func_start sub_808929C
-sub_808929C: ; 808929C
+sub_808929C: @ 808929C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235807,7 +235807,7 @@ _080892AC:
 	thumb_func_end sub_808929C
 
 	thumb_func_start sub_80892B0
-sub_80892B0: ; 80892B0
+sub_80892B0: @ 80892B0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235823,7 +235823,7 @@ _080892C0:
 	thumb_func_end sub_80892B0
 
 	thumb_func_start sub_80892C4
-sub_80892C4: ; 80892C4
+sub_80892C4: @ 80892C4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235839,7 +235839,7 @@ _080892D4:
 	thumb_func_end sub_80892C4
 
 	thumb_func_start sub_80892D8
-sub_80892D8: ; 80892D8
+sub_80892D8: @ 80892D8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235855,7 +235855,7 @@ _080892E8:
 	thumb_func_end sub_80892D8
 
 	thumb_func_start sub_80892EC
-sub_80892EC: ; 80892EC
+sub_80892EC: @ 80892EC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235871,7 +235871,7 @@ _080892FC:
 	thumb_func_end sub_80892EC
 
 	thumb_func_start sub_8089300
-sub_8089300: ; 8089300
+sub_8089300: @ 8089300
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235887,7 +235887,7 @@ _08089310:
 	thumb_func_end sub_8089300
 
 	thumb_func_start sub_8089314
-sub_8089314: ; 8089314
+sub_8089314: @ 8089314
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -235902,7 +235902,7 @@ _08089322:
 	thumb_func_end sub_8089314
 
 	thumb_func_start sub_8089328
-sub_8089328: ; 8089328
+sub_8089328: @ 8089328
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235918,7 +235918,7 @@ _08089338:
 	thumb_func_end sub_8089328
 
 	thumb_func_start sub_808933C
-sub_808933C: ; 808933C
+sub_808933C: @ 808933C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235934,7 +235934,7 @@ _0808934C:
 	thumb_func_end sub_808933C
 
 	thumb_func_start sub_8089350
-sub_8089350: ; 8089350
+sub_8089350: @ 8089350
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235950,7 +235950,7 @@ _08089360:
 	thumb_func_end sub_8089350
 
 	thumb_func_start sub_8089364
-sub_8089364: ; 8089364
+sub_8089364: @ 8089364
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235966,7 +235966,7 @@ _08089374:
 	thumb_func_end sub_8089364
 
 	thumb_func_start sub_8089378
-sub_8089378: ; 8089378
+sub_8089378: @ 8089378
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235982,7 +235982,7 @@ _08089388:
 	thumb_func_end sub_8089378
 
 	thumb_func_start sub_808938C
-sub_808938C: ; 808938C
+sub_808938C: @ 808938C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -235998,7 +235998,7 @@ _0808939C:
 	thumb_func_end sub_808938C
 
 	thumb_func_start sub_80893A0
-sub_80893A0: ; 80893A0
+sub_80893A0: @ 80893A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236014,7 +236014,7 @@ _080893B0:
 	thumb_func_end sub_80893A0
 
 	thumb_func_start sub_80893B4
-sub_80893B4: ; 80893B4
+sub_80893B4: @ 80893B4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236030,7 +236030,7 @@ _080893C4:
 	thumb_func_end sub_80893B4
 
 	thumb_func_start sub_80893C8
-sub_80893C8: ; 80893C8
+sub_80893C8: @ 80893C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236046,7 +236046,7 @@ _080893D8:
 	thumb_func_end sub_80893C8
 
 	thumb_func_start sub_80893DC
-sub_80893DC: ; 80893DC
+sub_80893DC: @ 80893DC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236062,7 +236062,7 @@ _080893EC:
 	thumb_func_end sub_80893DC
 
 	thumb_func_start sub_80893F0
-sub_80893F0: ; 80893F0
+sub_80893F0: @ 80893F0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236078,7 +236078,7 @@ _08089400:
 	thumb_func_end sub_80893F0
 
 	thumb_func_start sub_8089404
-sub_8089404: ; 8089404
+sub_8089404: @ 8089404
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236094,7 +236094,7 @@ _08089414:
 	thumb_func_end sub_8089404
 
 	thumb_func_start MetatileBehavior_HasRipples
-MetatileBehavior_HasRipples: ; 8089418
+MetatileBehavior_HasRipples: @ 8089418
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236115,7 +236115,7 @@ _08089430:
 	thumb_func_end MetatileBehavior_HasRipples
 
 	thumb_func_start MetatileBehavior_IsPuddle
-MetatileBehavior_IsPuddle: ; 8089434
+MetatileBehavior_IsPuddle: @ 8089434
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236131,7 +236131,7 @@ _08089444:
 	thumb_func_end MetatileBehavior_IsPuddle
 
 	thumb_func_start MetatileBehavior_IsTallGrass
-MetatileBehavior_IsTallGrass: ; 8089448
+MetatileBehavior_IsTallGrass: @ 8089448
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236147,7 +236147,7 @@ _08089458:
 	thumb_func_end MetatileBehavior_IsTallGrass
 
 	thumb_func_start MetatileBehavior_IsLongGrass
-MetatileBehavior_IsLongGrass: ; 808945C
+MetatileBehavior_IsLongGrass: @ 808945C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236163,7 +236163,7 @@ _0808946C:
 	thumb_func_end MetatileBehavior_IsLongGrass
 
 	thumb_func_start MetatileBehavior_IsBerryTreeSoil
-MetatileBehavior_IsBerryTreeSoil: ; 8089470
+MetatileBehavior_IsBerryTreeSoil: @ 8089470
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236179,7 +236179,7 @@ _08089480:
 	thumb_func_end MetatileBehavior_IsBerryTreeSoil
 
 	thumb_func_start MetatileBehavior_IsAsh
-MetatileBehavior_IsAsh: ; 8089484
+MetatileBehavior_IsAsh: @ 8089484
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236195,7 +236195,7 @@ _08089494:
 	thumb_func_end MetatileBehavior_IsAsh
 
 	thumb_func_start MetatileBehavior_IsUnusedFootprintMetatile
-MetatileBehavior_IsUnusedFootprintMetatile: ; 8089498
+MetatileBehavior_IsUnusedFootprintMetatile: @ 8089498
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236211,7 +236211,7 @@ _080894A8:
 	thumb_func_end MetatileBehavior_IsUnusedFootprintMetatile
 
 	thumb_func_start sub_80894AC
-sub_80894AC: ; 80894AC
+sub_80894AC: @ 80894AC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -236238,7 +236238,7 @@ _080894D0:
 	thumb_func_end sub_80894AC
 
 	thumb_func_start sub_80894D4
-sub_80894D4: ; 80894D4
+sub_80894D4: @ 80894D4
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -236274,7 +236274,7 @@ _0808950A:
 	thumb_func_end sub_80894D4
 
 	thumb_func_start sub_8089510
-sub_8089510: ; 8089510
+sub_8089510: @ 8089510
 	push {lr}
 	lsls r0, 24
 	movs r1, 0x90
@@ -236293,7 +236293,7 @@ _08089526:
 	thumb_func_end sub_8089510
 
 	thumb_func_start sub_808952C
-sub_808952C: ; 808952C
+sub_808952C: @ 808952C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -236319,7 +236319,7 @@ _08089552:
 	thumb_func_end sub_808952C
 
 	thumb_func_start sub_8089558
-sub_8089558: ; 8089558
+sub_8089558: @ 8089558
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -236346,7 +236346,7 @@ _08089580:
 	thumb_func_end sub_8089558
 
 	thumb_func_start sub_8089588
-sub_8089588: ; 8089588
+sub_8089588: @ 8089588
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236362,7 +236362,7 @@ _08089598:
 	thumb_func_end sub_8089588
 
 	thumb_func_start sub_808959C
-sub_808959C: ; 808959C
+sub_808959C: @ 808959C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236378,7 +236378,7 @@ _080895AC:
 	thumb_func_end sub_808959C
 
 	thumb_func_start sub_80895B0
-sub_80895B0: ; 80895B0
+sub_80895B0: @ 80895B0
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -236401,7 +236401,7 @@ _080895CC:
 	thumb_func_end sub_80895B0
 
 	thumb_func_start sub_80895D0
-sub_80895D0: ; 80895D0
+sub_80895D0: @ 80895D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236420,7 +236420,7 @@ _080895E4:
 	thumb_func_end sub_80895D0
 
 	thumb_func_start MetatileBehavior_IsShallowFlowingWater
-MetatileBehavior_IsShallowFlowingWater: ; 80895E8
+MetatileBehavior_IsShallowFlowingWater: @ 80895E8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236441,7 +236441,7 @@ _08089600:
 	thumb_func_end MetatileBehavior_IsShallowFlowingWater
 
 	thumb_func_start sub_8089604
-sub_8089604: ; 8089604
+sub_8089604: @ 8089604
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236457,7 +236457,7 @@ _08089614:
 	thumb_func_end sub_8089604
 
 	thumb_func_start sub_8089618
-sub_8089618: ; 8089618
+sub_8089618: @ 8089618
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236473,7 +236473,7 @@ _08089628:
 	thumb_func_end sub_8089618
 
 	thumb_func_start sub_808962C
-sub_808962C: ; 808962C
+sub_808962C: @ 808962C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236494,7 +236494,7 @@ _08089644:
 	thumb_func_end sub_808962C
 
 	thumb_func_start sub_8089648
-sub_8089648: ; 8089648
+sub_8089648: @ 8089648
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236513,7 +236513,7 @@ _0808965C:
 	thumb_func_end sub_8089648
 
 	thumb_func_start sub_8089660
-sub_8089660: ; 8089660
+sub_8089660: @ 8089660
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -236538,7 +236538,7 @@ _08089684:
 	thumb_func_end sub_8089660
 
 	thumb_func_start MetatileBehavior_IsEastBlocked
-MetatileBehavior_IsEastBlocked: ; 808968C
+MetatileBehavior_IsEastBlocked: @ 808968C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236563,7 +236563,7 @@ _080896AC:
 	thumb_func_end MetatileBehavior_IsEastBlocked
 
 	thumb_func_start MetatileBehavior_IsWestBlocked
-MetatileBehavior_IsWestBlocked: ; 80896B0
+MetatileBehavior_IsWestBlocked: @ 80896B0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236588,7 +236588,7 @@ _080896D0:
 	thumb_func_end MetatileBehavior_IsWestBlocked
 
 	thumb_func_start MetatileBehavior_IsNorthBlocked
-MetatileBehavior_IsNorthBlocked: ; 80896D4
+MetatileBehavior_IsNorthBlocked: @ 80896D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236611,7 +236611,7 @@ _080896F0:
 	thumb_func_end MetatileBehavior_IsNorthBlocked
 
 	thumb_func_start MetatileBehavior_IsSouthBlocked
-MetatileBehavior_IsSouthBlocked: ; 80896F4
+MetatileBehavior_IsSouthBlocked: @ 80896F4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236634,7 +236634,7 @@ _08089710:
 	thumb_func_end MetatileBehavior_IsSouthBlocked
 
 	thumb_func_start MetatileBehavior_IsShortGrass
-MetatileBehavior_IsShortGrass: ; 8089714
+MetatileBehavior_IsShortGrass: @ 8089714
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236650,7 +236650,7 @@ _08089724:
 	thumb_func_end MetatileBehavior_IsShortGrass
 
 	thumb_func_start MetatileBehavior_IsHotSprings
-MetatileBehavior_IsHotSprings: ; 8089728
+MetatileBehavior_IsHotSprings: @ 8089728
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236666,8 +236666,8 @@ _08089738:
 	thumb_func_end MetatileBehavior_IsHotSprings
 
 	thumb_func_start MetatileBehavior_IsWaterfall
-; bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior)
-MetatileBehavior_IsWaterfall: ; 808973C
+@ bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior)
+MetatileBehavior_IsWaterfall: @ 808973C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236683,7 +236683,7 @@ _0808974C:
 	thumb_func_end MetatileBehavior_IsWaterfall
 
 	thumb_func_start MetatileBehavior_IsFortreeBridge
-MetatileBehavior_IsFortreeBridge: ; 8089750
+MetatileBehavior_IsFortreeBridge: @ 8089750
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236699,7 +236699,7 @@ _08089760:
 	thumb_func_end MetatileBehavior_IsFortreeBridge
 
 	thumb_func_start sub_8089764
-sub_8089764: ; 8089764
+sub_8089764: @ 8089764
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236715,7 +236715,7 @@ _08089774:
 	thumb_func_end sub_8089764
 
 	thumb_func_start sub_8089778
-sub_8089778: ; 8089778
+sub_8089778: @ 8089778
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236731,7 +236731,7 @@ _08089788:
 	thumb_func_end sub_8089778
 
 	thumb_func_start sub_808978C
-sub_808978C: ; 808978C
+sub_808978C: @ 808978C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236747,7 +236747,7 @@ _0808979C:
 	thumb_func_end sub_808978C
 
 	thumb_func_start sub_80897A0
-sub_80897A0: ; 80897A0
+sub_80897A0: @ 80897A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236763,7 +236763,7 @@ _080897B0:
 	thumb_func_end sub_80897A0
 
 	thumb_func_start MetatileBehavior_IsPacifidlogLog
-MetatileBehavior_IsPacifidlogLog: ; 80897B4
+MetatileBehavior_IsPacifidlogLog: @ 80897B4
 	push {lr}
 	lsls r0, 24
 	movs r1, 0x8C
@@ -236782,7 +236782,7 @@ _080897CA:
 	thumb_func_end MetatileBehavior_IsPacifidlogLog
 
 	thumb_func_start is_tile_x8C
-is_tile_x8C: ; 80897D0
+is_tile_x8C: @ 80897D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236798,7 +236798,7 @@ _080897E0:
 	thumb_func_end is_tile_x8C
 
 	thumb_func_start is_tile_x85
-is_tile_x85: ; 80897E4
+is_tile_x85: @ 80897E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236814,7 +236814,7 @@ _080897F4:
 	thumb_func_end is_tile_x85
 
 	thumb_func_start is_tile_x8B
-is_tile_x8B: ; 80897F8
+is_tile_x8B: @ 80897F8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236830,7 +236830,7 @@ _08089808:
 	thumb_func_end is_tile_x8B
 
 	thumb_func_start is_tile_xEA
-is_tile_xEA: ; 808980C
+is_tile_xEA: @ 808980C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236846,7 +236846,7 @@ _0808981C:
 	thumb_func_end is_tile_xEA
 
 	thumb_func_start is_tile_x8A
-is_tile_x8A: ; 8089820
+is_tile_x8A: @ 8089820
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236862,7 +236862,7 @@ _08089830:
 	thumb_func_end is_tile_x8A
 
 	thumb_func_start is_tile_x87
-is_tile_x87: ; 8089834
+is_tile_x87: @ 8089834
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236878,8 +236878,8 @@ _08089844:
 	thumb_func_end is_tile_x87
 
 	thumb_func_start MetatileBehavior_0xBB
-; bool8 MetatileBehavior_0xBB(u8 metatileBehavior)
-MetatileBehavior_0xBB: ; 8089848
+@ bool8 MetatileBehavior_0xBB(u8 metatileBehavior)
+MetatileBehavior_0xBB: @ 8089848
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236895,8 +236895,8 @@ _08089858:
 	thumb_func_end MetatileBehavior_0xBB
 
 	thumb_func_start MetatileBehavior_0xBC
-; bool8 MetatileBehavior_0xBC(u8 metatileBehavior)
-MetatileBehavior_0xBC: ; 808985C
+@ bool8 MetatileBehavior_0xBC(u8 metatileBehavior)
+MetatileBehavior_0xBC: @ 808985C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236912,7 +236912,7 @@ _0808986C:
 	thumb_func_end MetatileBehavior_0xBC
 
 	thumb_func_start sub_8089870
-sub_8089870: ; 8089870
+sub_8089870: @ 8089870
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236928,7 +236928,7 @@ _08089880:
 	thumb_func_end sub_8089870
 
 	thumb_func_start is_role_x68
-is_role_x68: ; 8089884
+is_role_x68: @ 8089884
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236944,7 +236944,7 @@ _08089894:
 	thumb_func_end is_role_x68
 
 	thumb_func_start MetatileBehavior_IsAquaHideoutWarp
-MetatileBehavior_IsAquaHideoutWarp: ; 8089898
+MetatileBehavior_IsAquaHideoutWarp: @ 8089898
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236960,7 +236960,7 @@ _080898A8:
 	thumb_func_end MetatileBehavior_IsAquaHideoutWarp
 
 	thumb_func_start sub_80898AC
-sub_80898AC: ; 80898AC
+sub_80898AC: @ 80898AC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236976,7 +236976,7 @@ _080898BC:
 	thumb_func_end sub_80898AC
 
 	thumb_func_start sub_80898C0
-sub_80898C0: ; 80898C0
+sub_80898C0: @ 80898C0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236992,7 +236992,7 @@ _080898D0:
 	thumb_func_end sub_80898C0
 
 	thumb_func_start MetatileBehavior_IsSurfableFishableWater
-MetatileBehavior_IsSurfableFishableWater: ; 80898D4
+MetatileBehavior_IsSurfableFishableWater: @ 80898D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237022,7 +237022,7 @@ _080898FE:
 	thumb_func_end MetatileBehavior_IsSurfableFishableWater
 
 	thumb_func_start sub_8089904
-sub_8089904: ; 8089904
+sub_8089904: @ 8089904
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237038,7 +237038,7 @@ _08089914:
 	thumb_func_end sub_8089904
 
 	thumb_func_start sub_8089918
-sub_8089918: ; 8089918
+sub_8089918: @ 8089918
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237054,7 +237054,7 @@ _08089928:
 	thumb_func_end sub_8089918
 
 	thumb_func_start sub_808992C
-sub_808992C: ; 808992C
+sub_808992C: @ 808992C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237070,8 +237070,8 @@ _0808993C:
 	thumb_func_end sub_808992C
 
 	thumb_func_start MetatileBehavior_IsMuddySlope
-; bool8 MetatileBehavior_IsMuddySlope(u8 metatileBehavior)
-MetatileBehavior_IsMuddySlope: ; 8089940
+@ bool8 MetatileBehavior_IsMuddySlope(u8 metatileBehavior)
+MetatileBehavior_IsMuddySlope: @ 8089940
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237087,7 +237087,7 @@ _08089950:
 	thumb_func_end MetatileBehavior_IsMuddySlope
 
 	thumb_func_start MetatileBehavior_IsBumpySlope
-MetatileBehavior_IsBumpySlope: ; 8089954
+MetatileBehavior_IsBumpySlope: @ 8089954
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237103,7 +237103,7 @@ _08089964:
 	thumb_func_end MetatileBehavior_IsBumpySlope
 
 	thumb_func_start MetatileBehavior_IsIsolatedVerticalRail
-MetatileBehavior_IsIsolatedVerticalRail: ; 8089968
+MetatileBehavior_IsIsolatedVerticalRail: @ 8089968
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237119,7 +237119,7 @@ _08089978:
 	thumb_func_end MetatileBehavior_IsIsolatedVerticalRail
 
 	thumb_func_start MetatileBehavior_IsIsolatedHorizontalRail
-MetatileBehavior_IsIsolatedHorizontalRail: ; 808997C
+MetatileBehavior_IsIsolatedHorizontalRail: @ 808997C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237135,7 +237135,7 @@ _0808998C:
 	thumb_func_end MetatileBehavior_IsIsolatedHorizontalRail
 
 	thumb_func_start MetatileBehavior_IsVerticalRail
-MetatileBehavior_IsVerticalRail: ; 8089990
+MetatileBehavior_IsVerticalRail: @ 8089990
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237151,7 +237151,7 @@ _080899A0:
 	thumb_func_end MetatileBehavior_IsVerticalRail
 
 	thumb_func_start MetatileBehavior_IsHorizontalRail
-MetatileBehavior_IsHorizontalRail: ; 80899A4
+MetatileBehavior_IsHorizontalRail: @ 80899A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237167,7 +237167,7 @@ _080899B4:
 	thumb_func_end MetatileBehavior_IsHorizontalRail
 
 	thumb_func_start MetatileBehavior_IsSeaweed
-MetatileBehavior_IsSeaweed: ; 80899B8
+MetatileBehavior_IsSeaweed: @ 80899B8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237186,7 +237186,7 @@ _080899CC:
 	thumb_func_end MetatileBehavior_IsSeaweed
 
 	thumb_func_start MetatileBehavior_IsRunningDisallowed
-MetatileBehavior_IsRunningDisallowed: ; 80899D0
+MetatileBehavior_IsRunningDisallowed: @ 80899D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237211,7 +237211,7 @@ _080899F2:
 	thumb_func_end MetatileBehavior_IsRunningDisallowed
 
 	thumb_func_start sub_80899F8
-sub_80899F8: ; 80899F8
+sub_80899F8: @ 80899F8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -237236,7 +237236,7 @@ _08089A18:
 	thumb_func_end sub_80899F8
 
 	thumb_func_start sub_8089A1C
-sub_8089A1C: ; 8089A1C
+sub_8089A1C: @ 8089A1C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237252,7 +237252,7 @@ _08089A2C:
 	thumb_func_end sub_8089A1C
 
 	thumb_func_start sub_8089A30
-sub_8089A30: ; 8089A30
+sub_8089A30: @ 8089A30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237268,7 +237268,7 @@ _08089A40:
 	thumb_func_end sub_8089A30
 
 	thumb_func_start sub_8089A44
-sub_8089A44: ; 8089A44
+sub_8089A44: @ 8089A44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237284,7 +237284,7 @@ _08089A54:
 	thumb_func_end sub_8089A44
 
 	thumb_func_start sub_8089A58
-sub_8089A58: ; 8089A58
+sub_8089A58: @ 8089A58
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237300,7 +237300,7 @@ _08089A68:
 	thumb_func_end sub_8089A58
 
 	thumb_func_start sub_8089A6C
-sub_8089A6C: ; 8089A6C
+sub_8089A6C: @ 8089A6C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237316,7 +237316,7 @@ _08089A7C:
 	thumb_func_end sub_8089A6C
 
 	thumb_func_start sub_8089A80
-sub_8089A80: ; 8089A80
+sub_8089A80: @ 8089A80
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237332,7 +237332,7 @@ _08089A90:
 	thumb_func_end sub_8089A80
 
 	thumb_func_start sub_8089A94
-sub_8089A94: ; 8089A94
+sub_8089A94: @ 8089A94
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237348,7 +237348,7 @@ _08089AA4:
 	thumb_func_end sub_8089A94
 
 	thumb_func_start sub_8089AA8
-sub_8089AA8: ; 8089AA8
+sub_8089AA8: @ 8089AA8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237364,7 +237364,7 @@ _08089AB8:
 	thumb_func_end sub_8089AA8
 
 	thumb_func_start sub_8089ABC
-sub_8089ABC: ; 8089ABC
+sub_8089ABC: @ 8089ABC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237380,7 +237380,7 @@ _08089ACC:
 	thumb_func_end sub_8089ABC
 
 	thumb_func_start sub_8089AD0
-sub_8089AD0: ; 8089AD0
+sub_8089AD0: @ 8089AD0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237401,7 +237401,7 @@ _08089AE8:
 	thumb_func_end sub_8089AD0
 
 	thumb_func_start sub_8089AEC
-sub_8089AEC: ; 8089AEC
+sub_8089AEC: @ 8089AEC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237422,7 +237422,7 @@ _08089B04:
 	thumb_func_end sub_8089AEC
 
 	thumb_func_start MetatileBehavior_IsQuestionnaire
-MetatileBehavior_IsQuestionnaire: ; 8089B08
+MetatileBehavior_IsQuestionnaire: @ 8089B08
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237438,7 +237438,7 @@ _08089B18:
 	thumb_func_end MetatileBehavior_IsQuestionnaire
 
 	thumb_func_start MetatileBehavior_IsLongGrass2
-MetatileBehavior_IsLongGrass2: ; 8089B1C
+MetatileBehavior_IsLongGrass2: @ 8089B1C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237454,7 +237454,7 @@ _08089B2C:
 	thumb_func_end MetatileBehavior_IsLongGrass2
 
 	thumb_func_start MetatileBehavior_IsLongGrassSouthEdge
-MetatileBehavior_IsLongGrassSouthEdge: ; 8089B30
+MetatileBehavior_IsLongGrassSouthEdge: @ 8089B30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237470,7 +237470,7 @@ _08089B40:
 	thumb_func_end MetatileBehavior_IsLongGrassSouthEdge
 
 	thumb_func_start MetatileBehavior_IsTrainerHillTimer
-MetatileBehavior_IsTrainerHillTimer: ; 8089B44
+MetatileBehavior_IsTrainerHillTimer: @ 8089B44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -237486,8 +237486,8 @@ _08089B54:
 	thumb_func_end MetatileBehavior_IsTrainerHillTimer
 
 	thumb_func_start move_tilemap_camera_to_upper_left_corner_
-; void move_tilemap_camera_to_upper_left_corner_(struc_28 *a1)
-move_tilemap_camera_to_upper_left_corner_: ; 8089B58
+@ void move_tilemap_camera_to_upper_left_corner_(struc_28 *a1)
+move_tilemap_camera_to_upper_left_corner_: @ 8089B58
 	movs r1, 0
 	strb r1, [r0, 0x2]
 	strb r1, [r0, 0x3]
@@ -237499,8 +237499,8 @@ move_tilemap_camera_to_upper_left_corner_: ; 8089B58
 	thumb_func_end move_tilemap_camera_to_upper_left_corner_
 
 	thumb_func_start tilemap_move_something
-; void tilemap_move_something(struct struc_28 *, u8 deltaX, u8 deltaY)
-tilemap_move_something: ; 8089B68
+@ void tilemap_move_something(struct struc_28 *, u8 deltaX, u8 deltaY)
+tilemap_move_something: @ 8089B68
 	ldrb r3, [r0, 0x2]
 	adds r3, r1
 	strb r3, [r0, 0x2]
@@ -237518,8 +237518,8 @@ tilemap_move_something: ; 8089B68
 	thumb_func_end tilemap_move_something
 
 	thumb_func_start coords8_add
-; void coords8_add(struct coords8 *coords, u8 x, u8 y)
-coords8_add: ; 8089B84
+@ void coords8_add(struct coords8 *coords, u8 x, u8 y)
+coords8_add: @ 8089B84
 	ldrb r3, [r0]
 	adds r3, r1
 	strb r3, [r0]
@@ -237530,8 +237530,8 @@ coords8_add: ; 8089B84
 	thumb_func_end coords8_add
 
 	thumb_func_start move_tilemap_camera_to_upper_left_corner
-; void move_tilemap_camera_to_upper_left_corner()
-move_tilemap_camera_to_upper_left_corner: ; 8089B94
+@ void move_tilemap_camera_to_upper_left_corner()
+move_tilemap_camera_to_upper_left_corner: @ 8089B94
 	push {lr}
 	ldr r0, =0x03000e20
 	bl move_tilemap_camera_to_upper_left_corner_
@@ -237541,8 +237541,8 @@ move_tilemap_camera_to_upper_left_corner: ; 8089B94
 	thumb_func_end move_tilemap_camera_to_upper_left_corner
 
 	thumb_func_start FieldUpdateBgTilemapScroll
-; void FieldUpdateBgTilemapScroll()
-FieldUpdateBgTilemapScroll: ; 8089BA4
+@ void FieldUpdateBgTilemapScroll()
+FieldUpdateBgTilemapScroll: @ 8089BA4
 	push {r4,r5,lr}
 	ldr r1, =0x03000e20
 	ldr r0, =0x03000e28
@@ -237585,7 +237585,7 @@ FieldUpdateBgTilemapScroll: ; 8089BA4
 	thumb_func_end FieldUpdateBgTilemapScroll
 
 	thumb_func_start sub_8089C08
-sub_8089C08: ; 8089C08
+sub_8089C08: @ 8089C08
 	push {r4,lr}
 	ldr r3, =0x03000e20
 	ldr r2, =0x03000e28
@@ -237606,8 +237606,8 @@ sub_8089C08: ; 8089C08
 	thumb_func_end sub_8089C08
 
 	thumb_func_start DrawWholeMapView
-; void DrawWholeMapView()
-DrawWholeMapView: ; 8089C34
+@ void DrawWholeMapView()
+DrawWholeMapView: @ 8089C34
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -237627,8 +237627,8 @@ DrawWholeMapView: ; 8089C34
 	thumb_func_end DrawWholeMapView
 
 	thumb_func_start DrawWholeMapViewInternal
-; void DrawWholeMapViewInternal(s32 x, s32 y, struct mapdata_header *mapGrid)
-DrawWholeMapViewInternal: ; 8089C60
+@ void DrawWholeMapViewInternal(s32 x, s32 y, struct mapdata_header *mapGrid)
+DrawWholeMapViewInternal: @ 8089C60
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -237699,8 +237699,8 @@ _08089CA6:
 	thumb_func_end DrawWholeMapViewInternal
 
 	thumb_func_start RedrawMapSlicesForCameraUpdate
-; void RedrawMapSlicesForCameraUpdate(struct struc_28 *, u8 deltaX, u8 deltaY)
-RedrawMapSlicesForCameraUpdate: ; 8089CE4
+@ void RedrawMapSlicesForCameraUpdate(struct struc_28 *, u8 deltaX, u8 deltaY)
+RedrawMapSlicesForCameraUpdate: @ 8089CE4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -237740,8 +237740,8 @@ _08089D20:
 	thumb_func_end RedrawMapSlicesForCameraUpdate
 
 	thumb_func_start RedrawMapSliceNorth
-; void RedrawMapSliceNorth(struct struc_28 *, struct mapdata_header *mapGrid)
-RedrawMapSliceNorth: ; 8089D30
+@ void RedrawMapSliceNorth(struct struc_28 *, struct mapdata_header *mapGrid)
+RedrawMapSliceNorth: @ 8089D30
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -237794,8 +237794,8 @@ _08089D5E:
 	thumb_func_end RedrawMapSliceNorth
 
 	thumb_func_start RedrawMapSliceSouth
-; void RedrawMapSliceSouth(struct struc_28 *, struct mapdata_header *mapGrid)
-RedrawMapSliceSouth: ; 8089D90
+@ void RedrawMapSliceSouth(struct struc_28 *, struct mapdata_header *mapGrid)
+RedrawMapSliceSouth: @ 8089D90
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -237836,8 +237836,8 @@ _08089DAE:
 	thumb_func_end RedrawMapSliceSouth
 
 	thumb_func_start RedrawMapSliceEast
-; void RedrawMapSliceEast(struct struc_28 *, struct mapdata_header *mapGrid)
-RedrawMapSliceEast: ; 8089DDC
+@ void RedrawMapSliceEast(struct struc_28 *, struct mapdata_header *mapGrid)
+RedrawMapSliceEast: @ 8089DDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -237884,8 +237884,8 @@ _08089DFC:
 	thumb_func_end RedrawMapSliceEast
 
 	thumb_func_start RedrawMapSliceWest
-; void RedrawMapSliceWest(struct struc_28 *, struct mapdata_header *mapGrid)
-RedrawMapSliceWest: ; 8089E34
+@ void RedrawMapSliceWest(struct struc_28 *, struct mapdata_header *mapGrid)
+RedrawMapSliceWest: @ 8089E34
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -237943,8 +237943,8 @@ _08089E66:
 	thumb_func_end RedrawMapSliceWest
 
 	thumb_func_start CurrentMapDrawMetatileAt
-; void CurrentMapDrawMetatileAt(u32 x, u32 y)
-CurrentMapDrawMetatileAt: ; 8089EA0
+@ void CurrentMapDrawMetatileAt(u32 x, u32 y)
+CurrentMapDrawMetatileAt: @ 8089EA0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -237973,8 +237973,8 @@ _08089ECC:
 	thumb_func_end CurrentMapDrawMetatileAt
 
 	thumb_func_start DrawDoorMetatileAt
-; void DrawDoorMetatileAt(u32 x, u32 y, u16 *metatile)
-DrawDoorMetatileAt: ; 8089EDC
+@ void DrawDoorMetatileAt(u32 x, u32 y, u16 *metatile)
+DrawDoorMetatileAt: @ 8089EDC
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -238001,8 +238001,8 @@ _08089F04:
 	thumb_func_end DrawDoorMetatileAt
 
 	thumb_func_start DrawMetatileAt
-; void DrawMetatileAt(struct mapdata_header *mapGrid, u16 offset, s32 x, s32 y)
-DrawMetatileAt: ; 8089F10
+@ void DrawMetatileAt(struct mapdata_header *mapGrid, u16 offset, s32 x, s32 y)
+DrawMetatileAt: @ 8089F10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -238056,8 +238056,8 @@ _08089F54:
 	thumb_func_end DrawMetatileAt
 
 	thumb_func_start DrawMetatile
-; void DrawMetatile(u32 layerType, u16 *metatile, u16 offset)
-DrawMetatile: ; 8089F78
+@ void DrawMetatile(u32 layerType, u16 *metatile, u16 offset)
+DrawMetatile: @ 8089F78
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r2, 16
@@ -238200,8 +238200,8 @@ _0808A082:
 	thumb_func_end DrawMetatile
 
 	thumb_func_start MapPosToBgTilemapOffset
-; u32 MapPosToBgTilemapOffset(struct struc_28 *, u32 x, u32 y)
-MapPosToBgTilemapOffset: ; 808A0AC
+@ u32 MapPosToBgTilemapOffset(struct struc_28 *, u32 x, u32 y)
+MapPosToBgTilemapOffset: @ 808A0AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x03005d8c
@@ -238245,8 +238245,8 @@ _0808A0EE:
 	thumb_func_end MapPosToBgTilemapOffset
 
 	thumb_func_start CameraUpdateCallback
-; void CameraUpdateCallback(struct CameraUpdateInfo *info)
-CameraUpdateCallback: ; 808A0F4
+@ void CameraUpdateCallback(struct CameraUpdateInfo *info)
+CameraUpdateCallback: @ 808A0F4
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, [r3, 0x4]
@@ -238270,8 +238270,8 @@ _0808A114:
 	thumb_func_end CameraUpdateCallback
 
 	thumb_func_start ResetCameraUpdateInfo
-; void ResetCameraUpdateInfo()
-ResetCameraUpdateInfo: ; 808A11C
+@ void ResetCameraUpdateInfo()
+ResetCameraUpdateInfo: @ 808A11C
 	ldr r1, =0x03005dd0
 	movs r0, 0
 	str r0, [r1, 0x8]
@@ -238285,8 +238285,8 @@ ResetCameraUpdateInfo: ; 808A11C
 	thumb_func_end ResetCameraUpdateInfo
 
 	thumb_func_start InitCameraUpdateCallback
-; u8 InitCameraUpdateCallback(u8 followedObjectId)
-InitCameraUpdateCallback: ; 808A134
+@ u8 InitCameraUpdateCallback(u8 followedObjectId)
+InitCameraUpdateCallback: @ 808A134
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -238316,8 +238316,8 @@ _0808A150:
 	thumb_func_end InitCameraUpdateCallback
 
 	thumb_func_start CameraUpdate
-; void CameraUpdate()
-CameraUpdate: ; 808A174
+@ void CameraUpdate()
+CameraUpdate: @ 808A174
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -238451,7 +238451,7 @@ _0808A24E:
 	thumb_func_end CameraUpdate
 
 	thumb_func_start sub_808A284
-sub_808A284: ; 808A284
+sub_808A284: @ 808A284
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -238479,8 +238479,8 @@ sub_808A284: ; 808A284
 	thumb_func_end sub_808A284
 
 	thumb_func_start SetCameraPanningCallback
-; void SetCameraPanningCallback(void ( *callback)())
-SetCameraPanningCallback: ; 808A2C0
+@ void SetCameraPanningCallback(void ( *callback)())
+SetCameraPanningCallback: @ 808A2C0
 	ldr r1, =0x03000e30
 	str r0, [r1]
 	bx lr
@@ -238488,8 +238488,8 @@ SetCameraPanningCallback: ; 808A2C0
 	thumb_func_end SetCameraPanningCallback
 
 	thumb_func_start SetCameraPanning
-; void SetCameraPanning(s16 x, s16 y)
-SetCameraPanning: ; 808A2CC
+@ void SetCameraPanning(s16 x, s16 y)
+SetCameraPanning: @ 808A2CC
 	ldr r2, =0x03000e28
 	strh r0, [r2]
 	ldr r0, =0x03000e2a
@@ -238502,8 +238502,8 @@ SetCameraPanning: ; 808A2CC
 	thumb_func_end SetCameraPanning
 
 	thumb_func_start InstallCameraPanAheadCallback
-; void InstallCameraPanAheadCallback()
-InstallCameraPanAheadCallback: ; 808A2E4
+@ void InstallCameraPanAheadCallback()
+InstallCameraPanAheadCallback: @ 808A2E4
 	ldr r1, =0x03000e30
 	ldr r0, =CameraPanningCB_PanAhead
 	str r0, [r1]
@@ -238521,8 +238521,8 @@ InstallCameraPanAheadCallback: ; 808A2E4
 	thumb_func_end InstallCameraPanAheadCallback
 
 	thumb_func_start UpdateCameraPanning
-; void UpdateCameraPanning()
-UpdateCameraPanning: ; 808A314
+@ void UpdateCameraPanning()
+UpdateCameraPanning: @ 808A314
 	push {lr}
 	ldr r0, =0x03000e30
 	ldr r0, [r0]
@@ -238551,8 +238551,8 @@ _0808A322:
 	thumb_func_end UpdateCameraPanning
 
 	thumb_func_start CameraPanningCB_PanAhead
-; void CameraPanningCB_PanAhead()
-CameraPanningCB_PanAhead: ; 808A360
+@ void CameraPanningCB_PanAhead()
+CameraPanningCB_PanAhead: @ 808A360
 	push {lr}
 	ldr r0, =0x02037348
 	ldrb r0, [r0]
@@ -238631,7 +238631,7 @@ _0808A3FC:
 	thumb_func_end CameraPanningCB_PanAhead
 
 	thumb_func_start sub_808A400
-sub_808A400: ; 808A400
+sub_808A400: @ 808A400
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
@@ -238659,7 +238659,7 @@ _0808A42E:
 	thumb_func_end sub_808A400
 
 	thumb_func_start door_build_blockdef
-door_build_blockdef: ; 808A438
+door_build_blockdef: @ 808A438
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -238698,7 +238698,7 @@ _0808A472:
 	thumb_func_end door_build_blockdef
 
 	thumb_func_start door_patch_tilemap
-door_patch_tilemap: ; 808A478
+door_patch_tilemap: @ 808A478
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -238784,7 +238784,7 @@ _0808A522:
 	thumb_func_end door_patch_tilemap
 
 	thumb_func_start sub_808A530
-sub_808A530: ; 808A530
+sub_808A530: @ 808A530
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -238813,7 +238813,7 @@ _0808A562:
 	thumb_func_end sub_808A530
 
 	thumb_func_start sub_808A568
-sub_808A568: ; 808A568
+sub_808A568: @ 808A568
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -238871,7 +238871,7 @@ _0808A5E2:
 	thumb_func_end sub_808A568
 
 	thumb_func_start sub_808A5F0
-sub_808A5F0: ; 808A5F0
+sub_808A5F0: @ 808A5F0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -238927,7 +238927,7 @@ _0808A64C:
 	thumb_func_end sub_808A5F0
 
 	thumb_func_start task50_overworld_door
-task50_overworld_door: ; 808A654
+task50_overworld_door: @ 808A654
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -238957,7 +238957,7 @@ _0808A682:
 	thumb_func_end task50_overworld_door
 
 	thumb_func_start door_frame_last
-door_frame_last: ; 808A68C
+door_frame_last: @ 808A68C
 	push {lr}
 	adds r1, r0, 0
 	b _0808A694
@@ -238973,7 +238973,7 @@ _0808A694:
 	thumb_func_end door_frame_last
 
 	thumb_func_start door_find
-door_find: ; 808A6A0
+door_find: @ 808A6A0
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -238998,7 +238998,7 @@ _0808A6BE:
 	thumb_func_end door_find
 
 	thumb_func_start task_overworld_door_add_if_inactive
-task_overworld_door_add_if_inactive: ; 808A6C4
+task_overworld_door_add_if_inactive: @ 808A6C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -239048,7 +239048,7 @@ _0808A71C:
 	thumb_func_end task_overworld_door_add_if_inactive
 
 	thumb_func_start sub_808A728
-sub_808A728: ; 808A728
+sub_808A728: @ 808A728
 	push {lr}
 	bl sub_808A530
 	pop {r0}
@@ -239056,7 +239056,7 @@ sub_808A728: ; 808A728
 	thumb_func_end sub_808A728
 
 	thumb_func_start sub_808A734
-sub_808A734: ; 808A734
+sub_808A734: @ 808A734
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239088,8 +239088,8 @@ _0808A76A:
 	thumb_func_end sub_808A734
 
 	thumb_func_start task_overworld_door_add_for_opening_door_at
-; s32 task_overworld_door_add_for_opening_door_at(void *a1, s32 x, s32 y)
-task_overworld_door_add_for_opening_door_at: ; 808A774
+@ s32 task_overworld_door_add_for_opening_door_at(void *a1, s32 x, s32 y)
+task_overworld_door_add_for_opening_door_at: @ 808A774
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239134,7 +239134,7 @@ _0808A7C0:
 	thumb_func_end task_overworld_door_add_for_opening_door_at
 
 	thumb_func_start sub_808A7CC
-sub_808A7CC: ; 808A7CC
+sub_808A7CC: @ 808A7CC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239167,7 +239167,7 @@ _0808A804:
 	thumb_func_end sub_808A7CC
 
 	thumb_func_start cur_mapdata_get_door_x2_at
-cur_mapdata_get_door_x2_at: ; 808A80C
+cur_mapdata_get_door_x2_at: @ 808A80C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -239194,7 +239194,7 @@ _0808A834:
 	thumb_func_end cur_mapdata_get_door_x2_at
 
 	thumb_func_start sub_808A83C
-sub_808A83C: ; 808A83C
+sub_808A83C: @ 808A83C
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -239207,7 +239207,7 @@ sub_808A83C: ; 808A83C
 	thumb_func_end sub_808A83C
 
 	thumb_func_start sub_808A854
-sub_808A854: ; 808A854
+sub_808A854: @ 808A854
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239230,7 +239230,7 @@ _0808A876:
 	thumb_func_end sub_808A854
 
 	thumb_func_start sub_808A880
-sub_808A880: ; 808A880
+sub_808A880: @ 808A880
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239253,7 +239253,7 @@ _0808A8A2:
 	thumb_func_end sub_808A880
 
 	thumb_func_start sub_808A8AC
-sub_808A8AC: ; 808A8AC
+sub_808A8AC: @ 808A8AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239282,7 +239282,7 @@ _0808A8DC:
 	thumb_func_end sub_808A8AC
 
 	thumb_func_start task_overworld_door_add_if_role_69_for_opening_door_at
-task_overworld_door_add_if_role_69_for_opening_door_at: ; 808A8E4
+task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -239311,7 +239311,7 @@ _0808A914:
 	thumb_func_end task_overworld_door_add_if_role_69_for_opening_door_at
 
 	thumb_func_start sub_808A91C
-sub_808A91C: ; 808A91C
+sub_808A91C: @ 808A91C
 	push {lr}
 	ldr r0, =task50_overworld_door
 	bl is_function_an_active_task
@@ -239323,7 +239323,7 @@ sub_808A91C: ; 808A91C
 	thumb_func_end sub_808A91C
 
 	thumb_func_start cur_mapdata_get_door_sound_at
-cur_mapdata_get_door_sound_at: ; 808A930
+cur_mapdata_get_door_sound_at: @ 808A930
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -239353,7 +239353,7 @@ _0808A95E:
 	thumb_func_end cur_mapdata_get_door_sound_at
 
 	thumb_func_start sub_808A964
-sub_808A964: ; 808A964
+sub_808A964: @ 808A964
 	push {lr}
 	ldr r0, =0x00004002
 	bl FlagGet
@@ -239377,8 +239377,8 @@ _0808A992:
 	thumb_func_end sub_808A964
 
 	thumb_func_start FieldObjectCB_NoMovement2
-; void FieldObjectCB_NoMovement2(struct obj *object)
-FieldObjectCB_NoMovement2: ; 808A998
+@ void FieldObjectCB_NoMovement2(struct obj *object)
+FieldObjectCB_NoMovement2: @ 808A998
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -239396,14 +239396,14 @@ FieldObjectCB_NoMovement2: ; 808A998
 	thumb_func_end FieldObjectCB_NoMovement2
 
 	thumb_func_start FieldObjectCB2_NoMovement2
-FieldObjectCB2_NoMovement2: ; 808A9BC
+FieldObjectCB2_NoMovement2: @ 808A9BC
 	movs r0, 0
 	bx lr
 	thumb_func_end FieldObjectCB2_NoMovement2
 
 	thumb_func_start player_step
-; void player_step(int dpad_direction, int buttons_new, int buttons_held)
-player_step: ; 808A9C0
+@ void player_step(int dpad_direction, int buttons_new, int buttons_held)
+player_step: @ 808A9C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -239457,8 +239457,8 @@ _0808AA26:
 	thumb_func_end player_step
 
 	thumb_func_start TryInterruptFieldObjectSpecialAnim
-; bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction)
-TryInterruptFieldObjectSpecialAnim: ; 808AA38
+@ bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction)
+TryInterruptFieldObjectSpecialAnim: @ 808AA38
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -239512,8 +239512,8 @@ _0808AA94:
 	thumb_func_end TryInterruptFieldObjectSpecialAnim
 
 	thumb_func_start npc_clear_strange_bits
-; void npc_clear_strange_bits(struct npc_state *fieldObject)
-npc_clear_strange_bits: ; 808AA9C
+@ void npc_clear_strange_bits(struct npc_state *fieldObject)
+npc_clear_strange_bits: @ 808AA9C
 	ldrb r2, [r0, 0x1]
 	movs r1, 0x11
 	negs r1, r1
@@ -239534,8 +239534,8 @@ npc_clear_strange_bits: ; 808AA9C
 	thumb_func_end npc_clear_strange_bits
 
 	thumb_func_start MovePlayerAvatarUsingKeypadInput
-; void MovePlayerAvatarUsingKeypadInput(int dpad_direction, int buttons_new, int buttons_held)
-MovePlayerAvatarUsingKeypadInput: ; 808AAC0
+@ void MovePlayerAvatarUsingKeypadInput(int dpad_direction, int buttons_new, int buttons_held)
+MovePlayerAvatarUsingKeypadInput: @ 808AAC0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -239565,8 +239565,8 @@ _0808AAF0:
 	thumb_func_end MovePlayerAvatarUsingKeypadInput
 
 	thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection
-; void PlayerAllowForcedMovementIfMovingSameDirection()
-PlayerAllowForcedMovementIfMovingSameDirection: ; 808AAF8
+@ void PlayerAllowForcedMovementIfMovingSameDirection()
+PlayerAllowForcedMovementIfMovingSameDirection: @ 808AAF8
 	push {lr}
 	ldr r2, =0x02037590
 	ldrb r0, [r2, 0x2]
@@ -239583,8 +239583,8 @@ _0808AB0A:
 	thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection
 
 	thumb_func_start TryDoMetatileBehaviorForcedMovment
-; bool8 TryDoMetatileBehaviorForcedMovment()
-TryDoMetatileBehaviorForcedMovment: ; 808AB14
+@ bool8 TryDoMetatileBehaviorForcedMovment()
+TryDoMetatileBehaviorForcedMovment: @ 808AB14
 	push {r4,lr}
 	ldr r4, =gUnknown_08497444
 	bl GetForcedMovementByMetatileBehavior
@@ -239602,8 +239602,8 @@ TryDoMetatileBehaviorForcedMovment: ; 808AB14
 	thumb_func_end TryDoMetatileBehaviorForcedMovment
 
 	thumb_func_start GetForcedMovementByMetatileBehavior
-; u8 GetForcedMovementByMetatileBehavior()
-GetForcedMovementByMetatileBehavior: ; 808AB38
+@ u8 GetForcedMovementByMetatileBehavior()
+GetForcedMovementByMetatileBehavior: @ 808AB38
 	push {r4-r6,lr}
 	ldr r3, =0x02037590
 	ldrb r1, [r3]
@@ -239649,7 +239649,7 @@ _0808AB8C:
 	thumb_func_end GetForcedMovementByMetatileBehavior
 
 	thumb_func_start ForcedMovement_None
-ForcedMovement_None: ; 808AB94
+ForcedMovement_None: @ 808AB94
 	push {r4,lr}
 	ldr r4, =0x02037590
 	ldrb r1, [r4]
@@ -239687,7 +239687,7 @@ _0808ABCE:
 	thumb_func_end ForcedMovement_None
 
 	thumb_func_start DoForcedMovement
-DoForcedMovement: ; 808ABE0
+DoForcedMovement: @ 808ABE0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -239749,7 +239749,7 @@ _0808AC48:
 	thumb_func_end DoForcedMovement
 
 	thumb_func_start DoForcedMovementInCurrentDirection
-DoForcedMovementInCurrentDirection: ; 808AC58
+DoForcedMovementInCurrentDirection: @ 808AC58
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02037590
@@ -239774,7 +239774,7 @@ DoForcedMovementInCurrentDirection: ; 808AC58
 	thumb_func_end DoForcedMovementInCurrentDirection
 
 	thumb_func_start ForcedMovement_Slip
-ForcedMovement_Slip: ; 808AC8C
+ForcedMovement_Slip: @ 808AC8C
 	push {lr}
 	ldr r0, =PlayerGoSpeed1
 	bl DoForcedMovementInCurrentDirection
@@ -239786,7 +239786,7 @@ ForcedMovement_Slip: ; 808AC8C
 	thumb_func_end ForcedMovement_Slip
 
 	thumb_func_start ForcedMovement_WalkSouth
-ForcedMovement_WalkSouth: ; 808ACA0
+ForcedMovement_WalkSouth: @ 808ACA0
 	push {lr}
 	ldr r1, =PlayerGoSpeed0
 	movs r0, 0x1
@@ -239799,7 +239799,7 @@ ForcedMovement_WalkSouth: ; 808ACA0
 	thumb_func_end ForcedMovement_WalkSouth
 
 	thumb_func_start ForcedMovement_WalkNorth
-ForcedMovement_WalkNorth: ; 808ACB8
+ForcedMovement_WalkNorth: @ 808ACB8
 	push {lr}
 	ldr r1, =PlayerGoSpeed0
 	movs r0, 0x2
@@ -239812,7 +239812,7 @@ ForcedMovement_WalkNorth: ; 808ACB8
 	thumb_func_end ForcedMovement_WalkNorth
 
 	thumb_func_start ForcedMovement_WalkWest
-ForcedMovement_WalkWest: ; 808ACD0
+ForcedMovement_WalkWest: @ 808ACD0
 	push {lr}
 	ldr r1, =PlayerGoSpeed0
 	movs r0, 0x3
@@ -239825,7 +239825,7 @@ ForcedMovement_WalkWest: ; 808ACD0
 	thumb_func_end ForcedMovement_WalkWest
 
 	thumb_func_start ForcedMovement_WalkEast
-ForcedMovement_WalkEast: ; 808ACE8
+ForcedMovement_WalkEast: @ 808ACE8
 	push {lr}
 	ldr r1, =PlayerGoSpeed0
 	movs r0, 0x4
@@ -239838,7 +239838,7 @@ ForcedMovement_WalkEast: ; 808ACE8
 	thumb_func_end ForcedMovement_WalkEast
 
 	thumb_func_start ForcedMovement_PushedSouthByCurrent
-ForcedMovement_PushedSouthByCurrent: ; 808AD00
+ForcedMovement_PushedSouthByCurrent: @ 808AD00
 	push {lr}
 	ldr r1, =PlayerGoSpeed2
 	movs r0, 0x1
@@ -239851,7 +239851,7 @@ ForcedMovement_PushedSouthByCurrent: ; 808AD00
 	thumb_func_end ForcedMovement_PushedSouthByCurrent
 
 	thumb_func_start ForcedMovement_PushedNorthByCurrent
-ForcedMovement_PushedNorthByCurrent: ; 808AD18
+ForcedMovement_PushedNorthByCurrent: @ 808AD18
 	push {lr}
 	ldr r1, =PlayerGoSpeed2
 	movs r0, 0x2
@@ -239864,7 +239864,7 @@ ForcedMovement_PushedNorthByCurrent: ; 808AD18
 	thumb_func_end ForcedMovement_PushedNorthByCurrent
 
 	thumb_func_start ForcedMovement_PushedWestByCurrent
-ForcedMovement_PushedWestByCurrent: ; 808AD30
+ForcedMovement_PushedWestByCurrent: @ 808AD30
 	push {lr}
 	ldr r1, =PlayerGoSpeed2
 	movs r0, 0x3
@@ -239877,7 +239877,7 @@ ForcedMovement_PushedWestByCurrent: ; 808AD30
 	thumb_func_end ForcedMovement_PushedWestByCurrent
 
 	thumb_func_start ForcedMovement_PushedEastByCurrent
-ForcedMovement_PushedEastByCurrent: ; 808AD48
+ForcedMovement_PushedEastByCurrent: @ 808AD48
 	push {lr}
 	ldr r1, =PlayerGoSpeed2
 	movs r0, 0x4
@@ -239890,7 +239890,7 @@ ForcedMovement_PushedEastByCurrent: ; 808AD48
 	thumb_func_end ForcedMovement_PushedEastByCurrent
 
 	thumb_func_start ForcedMovement_Slide
-ForcedMovement_Slide: ; 808AD60
+ForcedMovement_Slide: @ 808AD60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -239917,7 +239917,7 @@ ForcedMovement_Slide: ; 808AD60
 	thumb_func_end ForcedMovement_Slide
 
 	thumb_func_start ForcedMovement_SlideSouth
-ForcedMovement_SlideSouth: ; 808AD98
+ForcedMovement_SlideSouth: @ 808AD98
 	push {lr}
 	ldr r1, =PlayerGoSpeed1
 	movs r0, 0x1
@@ -239930,7 +239930,7 @@ ForcedMovement_SlideSouth: ; 808AD98
 	thumb_func_end ForcedMovement_SlideSouth
 
 	thumb_func_start ForcedMovement_SlideNorth
-ForcedMovement_SlideNorth: ; 808ADB0
+ForcedMovement_SlideNorth: @ 808ADB0
 	push {lr}
 	ldr r1, =PlayerGoSpeed1
 	movs r0, 0x2
@@ -239943,7 +239943,7 @@ ForcedMovement_SlideNorth: ; 808ADB0
 	thumb_func_end ForcedMovement_SlideNorth
 
 	thumb_func_start ForcedMovement_SlideWest
-ForcedMovement_SlideWest: ; 808ADC8
+ForcedMovement_SlideWest: @ 808ADC8
 	push {lr}
 	ldr r1, =PlayerGoSpeed1
 	movs r0, 0x3
@@ -239956,7 +239956,7 @@ ForcedMovement_SlideWest: ; 808ADC8
 	thumb_func_end ForcedMovement_SlideWest
 
 	thumb_func_start ForcedMovement_SlideEast
-ForcedMovement_SlideEast: ; 808ADE0
+ForcedMovement_SlideEast: @ 808ADE0
 	push {lr}
 	ldr r1, =PlayerGoSpeed1
 	movs r0, 0x4
@@ -239969,7 +239969,7 @@ ForcedMovement_SlideEast: ; 808ADE0
 	thumb_func_end ForcedMovement_SlideEast
 
 	thumb_func_start ForcedMovement_0xBB
-ForcedMovement_0xBB: ; 808ADF8
+ForcedMovement_0xBB: @ 808ADF8
 	push {lr}
 	bl sub_808C4D8
 	movs r0, 0x1
@@ -239978,7 +239978,7 @@ ForcedMovement_0xBB: ; 808ADF8
 	thumb_func_end ForcedMovement_0xBB
 
 	thumb_func_start ForcedMovement_0xBC
-ForcedMovement_0xBC: ; 808AE04
+ForcedMovement_0xBC: @ 808AE04
 	push {lr}
 	bl sub_808C5B0
 	movs r0, 0x1
@@ -239987,7 +239987,7 @@ ForcedMovement_0xBC: ; 808AE04
 	thumb_func_end ForcedMovement_0xBC
 
 	thumb_func_start ForcedMovement_MuddySlope
-ForcedMovement_MuddySlope: ; 808AE10
+ForcedMovement_MuddySlope: @ 808AE10
 	push {r4,lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -240029,8 +240029,8 @@ _0808AE62:
 	thumb_func_end ForcedMovement_MuddySlope
 
 	thumb_func_start MovePlayerNotOnBike
-; void MovePlayerNotOnBike(u8 direction, u8 heldKeys)
-MovePlayerNotOnBike: ; 808AE68
+@ void MovePlayerNotOnBike(u8 direction, u8 heldKeys)
+MovePlayerNotOnBike: @ 808AE68
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -240055,8 +240055,8 @@ MovePlayerNotOnBike: ; 808AE68
 	thumb_func_end MovePlayerNotOnBike
 
 	thumb_func_start CheckMovementInputNotOnBike
-; u8 CheckMovementInputNotOnBike(u8 direction)
-CheckMovementInputNotOnBike: ; 808AE98
+@ u8 CheckMovementInputNotOnBike(u8 direction)
+CheckMovementInputNotOnBike: @ 808AE98
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -240093,8 +240093,8 @@ _0808AED2:
 	thumb_func_end CheckMovementInputNotOnBike
 
 	thumb_func_start PlayerNotOnBikeNotMoving
-; void PlayerNotOnBikeNotMoving(u8 direction, u8 heldKeys)
-PlayerNotOnBikeNotMoving: ; 808AEDC
+@ void PlayerNotOnBikeNotMoving(u8 direction, u8 heldKeys)
+PlayerNotOnBikeNotMoving: @ 808AEDC
 	push {lr}
 	bl player_get_direction_lower_nybble
 	lsls r0, 24
@@ -240105,8 +240105,8 @@ PlayerNotOnBikeNotMoving: ; 808AEDC
 	thumb_func_end PlayerNotOnBikeNotMoving
 
 	thumb_func_start PlayerNotOnBikeTurningInPlace
-; void PlayerNotOnBikeTurningInPlace(u8 direction, u8 heldKeys)
-PlayerNotOnBikeTurningInPlace: ; 808AEF0
+@ void PlayerNotOnBikeTurningInPlace(u8 direction, u8 heldKeys)
+PlayerNotOnBikeTurningInPlace: @ 808AEF0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -240116,8 +240116,8 @@ PlayerNotOnBikeTurningInPlace: ; 808AEF0
 	thumb_func_end PlayerNotOnBikeTurningInPlace
 
 	thumb_func_start PlayerNotOnBikeMoving
-; void PlayerNotOnBikeMoving(u8 direction, u8 heldKeys)
-PlayerNotOnBikeMoving: ; 808AF00
+@ void PlayerNotOnBikeMoving(u8 direction, u8 heldKeys)
+PlayerNotOnBikeMoving: @ 808AF00
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -240208,7 +240208,7 @@ _0808AFB6:
 	thumb_func_end PlayerNotOnBikeMoving
 
 	thumb_func_start CheckForPlayerAvatarCollision
-CheckForPlayerAvatarCollision: ; 808AFBC
+CheckForPlayerAvatarCollision: @ 808AFBC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -240259,7 +240259,7 @@ CheckForPlayerAvatarCollision: ; 808AFBC
 	thumb_func_end CheckForPlayerAvatarCollision
 
 	thumb_func_start sub_808B028
-sub_808B028: ; 808B028
+sub_808B028: @ 808B028
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -240310,8 +240310,8 @@ sub_808B028: ; 808B028
 	thumb_func_end sub_808B028
 
 	thumb_func_start CheckForFieldObjectCollision
-; u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
-CheckForFieldObjectCollision: ; 808B094
+@ u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
+CheckForFieldObjectCollision: @ 808B094
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -240417,7 +240417,7 @@ _0808B152:
 	thumb_func_end CheckForFieldObjectCollision
 
 	thumb_func_start sub_808B164
-sub_808B164: ; 808B164
+sub_808B164: @ 808B164
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0x18]
@@ -240464,8 +240464,8 @@ _0808B1B2:
 	thumb_func_end sub_808B164
 
 	thumb_func_start sub_808B1BC
-; bool8 sub_808B1BC(u16 x, u16 y, u8 direction)
-sub_808B1BC: ; 808B1BC
+@ bool8 sub_808B1BC(u16 x, u16 y, u8 direction)
+sub_808B1BC: @ 808B1BC
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -240510,8 +240510,8 @@ _0808B20E:
 	thumb_func_end sub_808B1BC
 
 	thumb_func_start ShouldJumpLedge
-; bool8 ShouldJumpLedge(s16 x, s16 y, u8 direction)
-ShouldJumpLedge: ; 808B214
+@ bool8 ShouldJumpLedge(s16 x, s16 y, u8 direction)
+ShouldJumpLedge: @ 808B214
 	push {lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -240533,7 +240533,7 @@ _0808B232:
 	thumb_func_end ShouldJumpLedge
 
 	thumb_func_start sub_808B238
-sub_808B238: ; 808B238
+sub_808B238: @ 808B238
 	push {r4-r7,lr}
 	sub sp, 0x4
 	mov r3, sp
@@ -240614,8 +240614,8 @@ _0808B2DA:
 	thumb_func_end sub_808B238
 
 	thumb_func_start check_acro_bike_metatile
-; void check_acro_bike_metatile(s16 x, s16 y, u8 metatileBehavior, u8 *returnValue)
-check_acro_bike_metatile: ; 808B2E4
+@ void check_acro_bike_metatile(s16 x, s16 y, u8 metatileBehavior, u8 *returnValue)
+check_acro_bike_metatile: @ 808B2E4
 	push {r4-r7,lr}
 	adds r6, r3, 0
 	lsls r2, 24
@@ -240650,8 +240650,8 @@ _0808B31E:
 	thumb_func_end check_acro_bike_metatile
 
 	thumb_func_start IsPlayerCollidingWithFarawayIslandMew
-; bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
-IsPlayerCollidingWithFarawayIslandMew: ; 808B324
+@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
+IsPlayerCollidingWithFarawayIslandMew: @ 808B324
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -240735,8 +240735,8 @@ _0808B3C2:
 	thumb_func_end IsPlayerCollidingWithFarawayIslandMew
 
 	thumb_func_start SetPlayerAvatarTransitionFlags
-; void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
-SetPlayerAvatarTransitionFlags: ; 808B3CC
+@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
+SetPlayerAvatarTransitionFlags: @ 808B3CC
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -240751,8 +240751,8 @@ SetPlayerAvatarTransitionFlags: ; 808B3CC
 	thumb_func_end SetPlayerAvatarTransitionFlags
 
 	thumb_func_start DoPlayerAvatarTransition
-; void DoPlayerAvatarTransition()
-DoPlayerAvatarTransition: ; 808B3E8
+@ void DoPlayerAvatarTransition()
+DoPlayerAvatarTransition: @ 808B3E8
 	push {r4,r5,lr}
 	ldr r0, =0x02037590
 	ldrb r4, [r0, 0x1]
@@ -240794,14 +240794,14 @@ _0808B428:
 	thumb_func_end DoPlayerAvatarTransition
 
 	thumb_func_start PlayerAvatarTransition_Dummy
-; void PlayerAvatarTransition_Dummy(struct npc_state *fieldObject)
-PlayerAvatarTransition_Dummy: ; 808B43C
+@ void PlayerAvatarTransition_Dummy(struct npc_state *fieldObject)
+PlayerAvatarTransition_Dummy: @ 808B43C
 	bx lr
 	thumb_func_end PlayerAvatarTransition_Dummy
 
 	thumb_func_start PlayerAvatarTransition_Normal
-; void PlayerAvatarTransition_Normal(struct npc_state *fieldObject)
-PlayerAvatarTransition_Normal: ; 808B440
+@ void PlayerAvatarTransition_Normal(struct npc_state *fieldObject)
+PlayerAvatarTransition_Normal: @ 808B440
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -240823,8 +240823,8 @@ PlayerAvatarTransition_Normal: ; 808B440
 	thumb_func_end PlayerAvatarTransition_Normal
 
 	thumb_func_start PlayerAvatarTransition_MachBike
-; void PlayerAvatarTransition_MachBike(struct npc_state *fieldObject)
-PlayerAvatarTransition_MachBike: ; 808B46C
+@ void PlayerAvatarTransition_MachBike(struct npc_state *fieldObject)
+PlayerAvatarTransition_MachBike: @ 808B46C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -240849,8 +240849,8 @@ PlayerAvatarTransition_MachBike: ; 808B46C
 	thumb_func_end PlayerAvatarTransition_MachBike
 
 	thumb_func_start PlayerAvatarTransition_AcroBike
-; void PlayerAvatarTransition_AcroBike(struct npc_state *fieldObject)
-PlayerAvatarTransition_AcroBike: ; 808B4A0
+@ void PlayerAvatarTransition_AcroBike(struct npc_state *fieldObject)
+PlayerAvatarTransition_AcroBike: @ 808B4A0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -240876,8 +240876,8 @@ PlayerAvatarTransition_AcroBike: ; 808B4A0
 	thumb_func_end PlayerAvatarTransition_AcroBike
 
 	thumb_func_start PlayerAvatarTransition_Surfing
-; void PlayerAvatarTransition_Surfing(struct npc_state *fieldObject)
-PlayerAvatarTransition_Surfing: ; 808B4D8
+@ void PlayerAvatarTransition_Surfing(struct npc_state *fieldObject)
+PlayerAvatarTransition_Surfing: @ 808B4D8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3
@@ -240917,8 +240917,8 @@ PlayerAvatarTransition_Surfing: ; 808B4D8
 	thumb_func_end PlayerAvatarTransition_Surfing
 
 	thumb_func_start PlayerAvatarTransition_Underwater
-; void PlayerAvatarTransition_Underwater(struct npc_state *fieldObject)
-PlayerAvatarTransition_Underwater: ; 808B534
+@ void PlayerAvatarTransition_Underwater(struct npc_state *fieldObject)
+PlayerAvatarTransition_Underwater: @ 808B534
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -240943,8 +240943,8 @@ PlayerAvatarTransition_Underwater: ; 808B534
 	thumb_func_end PlayerAvatarTransition_Underwater
 
 	thumb_func_start PlayerAvatarTransition_ReturnToField
-; void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
-PlayerAvatarTransition_ReturnToField: ; 808B568
+@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
+PlayerAvatarTransition_ReturnToField: @ 808B568
 	ldr r2, =0x02037590
 	ldrb r1, [r2]
 	movs r0, 0x20
@@ -240955,7 +240955,7 @@ PlayerAvatarTransition_ReturnToField: ; 808B568
 	thumb_func_end PlayerAvatarTransition_ReturnToField
 
 	thumb_func_start sub_808B578
-sub_808B578: ; 808B578
+sub_808B578: @ 808B578
 	push {r4,lr}
 	ldr r4, =0x02037590
 	movs r0, 0
@@ -240990,7 +240990,7 @@ _0808B5B6:
 	thumb_func_end sub_808B578
 
 	thumb_func_start player_is_anim_in_certain_ranges
-player_is_anim_in_certain_ranges: ; 808B5BC
+player_is_anim_in_certain_ranges: @ 808B5BC
 	push {lr}
 	ldr r2, =0x02037350
 	ldr r0, =0x02037590
@@ -241038,7 +241038,7 @@ _0808B612:
 	thumb_func_end player_is_anim_in_certain_ranges
 
 	thumb_func_start sub_808B618
-sub_808B618: ; 808B618
+sub_808B618: @ 808B618
 	push {lr}
 	bl player_is_anim_in_certain_ranges
 	lsls r0, 24
@@ -241059,8 +241059,8 @@ _0808B636:
 	thumb_func_end sub_808B618
 
 	thumb_func_start PlayerIsAnimActive
-; bool8 PlayerIsAnimActive()
-PlayerIsAnimActive: ; 808B63C
+@ bool8 PlayerIsAnimActive()
+PlayerIsAnimActive: @ 808B63C
 	push {lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241078,8 +241078,8 @@ PlayerIsAnimActive: ; 808B63C
 	thumb_func_end PlayerIsAnimActive
 
 	thumb_func_start PlayerCheckIfAnimFinishedOrInactive
-; bool8 PlayerCheckIfAnimFinishedOrInactive()
-PlayerCheckIfAnimFinishedOrInactive: ; 808B660
+@ bool8 PlayerCheckIfAnimFinishedOrInactive()
+PlayerCheckIfAnimFinishedOrInactive: @ 808B660
 	push {lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241097,7 +241097,7 @@ PlayerCheckIfAnimFinishedOrInactive: ; 808B660
 	thumb_func_end PlayerCheckIfAnimFinishedOrInactive
 
 	thumb_func_start player_set_x22
-player_set_x22: ; 808B684
+player_set_x22: @ 808B684
 	ldr r3, =0x02037350
 	ldr r1, =0x02037590
 	ldrb r2, [r1, 0x5]
@@ -241112,7 +241112,7 @@ player_set_x22: ; 808B684
 	thumb_func_end player_set_x22
 
 	thumb_func_start player_get_x22
-player_get_x22: ; 808B6A0
+player_get_x22: @ 808B6A0
 	ldr r2, =0x02037350
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241127,7 +241127,7 @@ player_get_x22: ; 808B6A0
 	thumb_func_end player_get_x22
 
 	thumb_func_start sub_808B6BC
-sub_808B6BC: ; 808B6BC
+sub_808B6BC: @ 808B6BC
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -241146,8 +241146,8 @@ sub_808B6BC: ; 808B6BC
 	thumb_func_end sub_808B6BC
 
 	thumb_func_start player_npc_set_state_and_x22_etc
-; void player_npc_set_state_and_x22_etc(u8 animState, u8 a2)
-player_npc_set_state_and_x22_etc: ; 808B6E4
+@ void player_npc_set_state_and_x22_etc(u8 animState, u8 a2)
+player_npc_set_state_and_x22_etc: @ 808B6E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -241176,8 +241176,8 @@ _0808B712:
 	thumb_func_end player_npc_set_state_and_x22_etc
 
 	thumb_func_start PlayerGoSpeed0
-; void PlayerGoSpeed0(u8 direction)
-PlayerGoSpeed0: ; 808B720
+@ void PlayerGoSpeed0(u8 direction)
+PlayerGoSpeed0: @ 808B720
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241191,8 +241191,8 @@ PlayerGoSpeed0: ; 808B720
 	thumb_func_end PlayerGoSpeed0
 
 	thumb_func_start PlayerGoSpeed1
-; void PlayerGoSpeed1(u8 direction)
-PlayerGoSpeed1: ; 808B738
+@ void PlayerGoSpeed1(u8 direction)
+PlayerGoSpeed1: @ 808B738
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241206,8 +241206,8 @@ PlayerGoSpeed1: ; 808B738
 	thumb_func_end PlayerGoSpeed1
 
 	thumb_func_start PlayerGoSpeed2
-; void PlayerGoSpeed2(u8 direction)
-PlayerGoSpeed2: ; 808B750
+@ void PlayerGoSpeed2(u8 direction)
+PlayerGoSpeed2: @ 808B750
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241221,8 +241221,8 @@ PlayerGoSpeed2: ; 808B750
 	thumb_func_end PlayerGoSpeed2
 
 	thumb_func_start PlayerGoSpeed3
-; void PlayerGoSpeed3(u8 direction)
-PlayerGoSpeed3: ; 808B768
+@ void PlayerGoSpeed3(u8 direction)
+PlayerGoSpeed3: @ 808B768
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241236,8 +241236,8 @@ PlayerGoSpeed3: ; 808B768
 	thumb_func_end PlayerGoSpeed3
 
 	thumb_func_start PlayerRun
-; void PlayerRun(u8 direction)
-PlayerRun: ; 808B780
+@ void PlayerRun(u8 direction)
+PlayerRun: @ 808B780
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241251,8 +241251,8 @@ PlayerRun: ; 808B780
 	thumb_func_end PlayerRun
 
 	thumb_func_start PlayerOnBikeCollide
-; void PlayerOnBikeCollide(u8 direction)
-PlayerOnBikeCollide: ; 808B798
+@ void PlayerOnBikeCollide(u8 direction)
+PlayerOnBikeCollide: @ 808B798
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241271,8 +241271,8 @@ PlayerOnBikeCollide: ; 808B798
 	thumb_func_end PlayerOnBikeCollide
 
 	thumb_func_start PlayerOnBikeCollideWithFarawayIslandMew
-; void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction)
-PlayerOnBikeCollideWithFarawayIslandMew: ; 808B7BC
+@ void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction)
+PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241286,8 +241286,8 @@ PlayerOnBikeCollideWithFarawayIslandMew: ; 808B7BC
 	thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew
 
 	thumb_func_start PlayerNotOnBikeCollide
-; void PlayerNotOnBikeCollide(u8 direction)
-PlayerNotOnBikeCollide: ; 808B7D4
+@ void PlayerNotOnBikeCollide(u8 direction)
+PlayerNotOnBikeCollide: @ 808B7D4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241306,8 +241306,8 @@ PlayerNotOnBikeCollide: ; 808B7D4
 	thumb_func_end PlayerNotOnBikeCollide
 
 	thumb_func_start PlayerNotOnBikeCollideWithFarawayIslandMew
-; void PlayerNotOnBikeCollideWithFarawayIslandMew(u8 direction)
-PlayerNotOnBikeCollideWithFarawayIslandMew: ; 808B7F8
+@ void PlayerNotOnBikeCollideWithFarawayIslandMew(u8 direction)
+PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241321,8 +241321,8 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: ; 808B7F8
 	thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew
 
 	thumb_func_start PlayerFaceDirection
-; void PlayerFaceDirection(u8 direction)
-PlayerFaceDirection: ; 808B810
+@ void PlayerFaceDirection(u8 direction)
+PlayerFaceDirection: @ 808B810
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241336,8 +241336,8 @@ PlayerFaceDirection: ; 808B810
 	thumb_func_end PlayerFaceDirection
 
 	thumb_func_start PlayerTurnInPlace
-; void PlayerTurnInPlace(u8 direction)
-PlayerTurnInPlace: ; 808B828
+@ void PlayerTurnInPlace(u8 direction)
+PlayerTurnInPlace: @ 808B828
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241351,8 +241351,8 @@ PlayerTurnInPlace: ; 808B828
 	thumb_func_end PlayerTurnInPlace
 
 	thumb_func_start PlayerJumpLedge
-; void PlayerJumpLedge(u8 direction)
-PlayerJumpLedge: ; 808B840
+@ void PlayerJumpLedge(u8 direction)
+PlayerJumpLedge: @ 808B840
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241371,7 +241371,7 @@ PlayerJumpLedge: ; 808B840
 	thumb_func_end PlayerJumpLedge
 
 	thumb_func_start sub_808B864
-sub_808B864: ; 808B864
+sub_808B864: @ 808B864
 	push {r4,lr}
 	ldr r4, =0x02037590
 	ldrb r0, [r4, 0x3]
@@ -241405,7 +241405,7 @@ _0808B89A:
 	thumb_func_end sub_808B864
 
 	thumb_func_start sub_808B8A8
-sub_808B8A8: ; 808B8A8
+sub_808B8A8: @ 808B8A8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241419,7 +241419,7 @@ sub_808B8A8: ; 808B8A8
 	thumb_func_end sub_808B8A8
 
 	thumb_func_start sub_808B8C0
-sub_808B8C0: ; 808B8C0
+sub_808B8C0: @ 808B8C0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241433,7 +241433,7 @@ sub_808B8C0: ; 808B8C0
 	thumb_func_end sub_808B8C0
 
 	thumb_func_start sub_808B8D8
-sub_808B8D8: ; 808B8D8
+sub_808B8D8: @ 808B8D8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241447,7 +241447,7 @@ sub_808B8D8: ; 808B8D8
 	thumb_func_end sub_808B8D8
 
 	thumb_func_start sub_808B8F0
-sub_808B8F0: ; 808B8F0
+sub_808B8F0: @ 808B8F0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241466,7 +241466,7 @@ sub_808B8F0: ; 808B8F0
 	thumb_func_end sub_808B8F0
 
 	thumb_func_start sub_808B914
-sub_808B914: ; 808B914
+sub_808B914: @ 808B914
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241485,7 +241485,7 @@ sub_808B914: ; 808B914
 	thumb_func_end sub_808B914
 
 	thumb_func_start sub_808B938
-sub_808B938: ; 808B938
+sub_808B938: @ 808B938
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241504,7 +241504,7 @@ sub_808B938: ; 808B938
 	thumb_func_end sub_808B938
 
 	thumb_func_start sub_808B95C
-sub_808B95C: ; 808B95C
+sub_808B95C: @ 808B95C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241523,7 +241523,7 @@ sub_808B95C: ; 808B95C
 	thumb_func_end sub_808B95C
 
 	thumb_func_start sub_808B980
-sub_808B980: ; 808B980
+sub_808B980: @ 808B980
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -241542,7 +241542,7 @@ sub_808B980: ; 808B980
 	thumb_func_end sub_808B980
 
 	thumb_func_start sub_808B9A4
-sub_808B9A4: ; 808B9A4
+sub_808B9A4: @ 808B9A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241556,7 +241556,7 @@ sub_808B9A4: ; 808B9A4
 	thumb_func_end sub_808B9A4
 
 	thumb_func_start sub_808B9BC
-sub_808B9BC: ; 808B9BC
+sub_808B9BC: @ 808B9BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241570,7 +241570,7 @@ sub_808B9BC: ; 808B9BC
 	thumb_func_end sub_808B9BC
 
 	thumb_func_start npc_use_some_d2s
-npc_use_some_d2s: ; 808B9D4
+npc_use_some_d2s: @ 808B9D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -241584,8 +241584,8 @@ npc_use_some_d2s: ; 808B9D4
 	thumb_func_end npc_use_some_d2s
 
 	thumb_func_start PlayCollisionSoundIfNotFacingWarp
-; void PlayCollisionSoundIfNotFacingWarp(u8 direction)
-PlayCollisionSoundIfNotFacingWarp: ; 808B9EC
+@ void PlayCollisionSoundIfNotFacingWarp(u8 direction)
+PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -241642,7 +241642,7 @@ _0808BA54:
 	thumb_func_end PlayCollisionSoundIfNotFacingWarp
 
 	thumb_func_start GetXYCoordsOneStepInFrontOfPlayer
-GetXYCoordsOneStepInFrontOfPlayer: ; 808BA68
+GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -241675,8 +241675,8 @@ GetXYCoordsOneStepInFrontOfPlayer: ; 808BA68
 	thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
 
 	thumb_func_start PlayerGetDestCoords
-; void PlayerGetDestCoords(u16 *x, u16 *y)
-PlayerGetDestCoords: ; 808BAAC
+@ void PlayerGetDestCoords(u16 *x, u16 *y)
+PlayerGetDestCoords: @ 808BAAC
 	push {r4,r5,lr}
 	ldr r5, =0x02037350
 	ldr r4, =0x02037590
@@ -241701,7 +241701,7 @@ PlayerGetDestCoords: ; 808BAAC
 	thumb_func_end PlayerGetDestCoords
 
 	thumb_func_start plaer_get_pos_including_state_based_drift
-plaer_get_pos_including_state_based_drift: ; 808BADC
+plaer_get_pos_including_state_based_drift: @ 808BADC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -241834,8 +241834,8 @@ _0808BC30:
 	thumb_func_end plaer_get_pos_including_state_based_drift
 
 	thumb_func_start player_get_direction_lower_nybble
-; u8 player_get_direction_lower_nybble()
-player_get_direction_lower_nybble: ; 808BC38
+@ u8 player_get_direction_lower_nybble()
+player_get_direction_lower_nybble: @ 808BC38
 	ldr r2, =0x02037350
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241851,8 +241851,8 @@ player_get_direction_lower_nybble: ; 808BC38
 	thumb_func_end player_get_direction_lower_nybble
 
 	thumb_func_start player_get_direction_upper_nybble
-; u8 player_get_direction_upper_nybble()
-player_get_direction_upper_nybble: ; 808BC58
+@ u8 player_get_direction_upper_nybble()
+player_get_direction_upper_nybble: @ 808BC58
 	ldr r2, =0x02037350
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241867,8 +241867,8 @@ player_get_direction_upper_nybble: ; 808BC58
 	thumb_func_end player_get_direction_upper_nybble
 
 	thumb_func_start PlayerGetZCoord
-; u8 PlayerGetZCoord()
-PlayerGetZCoord: ; 808BC74
+@ u8 PlayerGetZCoord()
+PlayerGetZCoord: @ 808BC74
 	ldr r2, =0x02037350
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -241883,7 +241883,7 @@ PlayerGetZCoord: ; 808BC74
 	thumb_func_end PlayerGetZCoord
 
 	thumb_func_start sub_808BC90
-sub_808BC90: ; 808BC90
+sub_808BC90: @ 808BC90
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -241906,8 +241906,8 @@ sub_808BC90: ; 808BC90
 	thumb_func_end sub_808BC90
 
 	thumb_func_start TestPlayerAvatarFlags
-; u32 TestPlayerAvatarFlags(u32 mask)
-TestPlayerAvatarFlags: ; 808BCC0
+@ u32 TestPlayerAvatarFlags(u32 mask)
+TestPlayerAvatarFlags: @ 808BCC0
 	ldr r1, =0x02037590
 	ldrb r1, [r1]
 	ands r1, r0
@@ -241917,7 +241917,7 @@ TestPlayerAvatarFlags: ; 808BCC0
 	thumb_func_end TestPlayerAvatarFlags
 
 	thumb_func_start sub_808BCD0
-sub_808BCD0: ; 808BCD0
+sub_808BCD0: @ 808BCD0
 	ldr r0, =0x02037590
 	ldrb r0, [r0]
 	bx lr
@@ -241925,8 +241925,8 @@ sub_808BCD0: ; 808BCD0
 	thumb_func_end sub_808BCD0
 
 	thumb_func_start GetPlayerAvatarObjectId
-; u8 GetPlayerAvatarObjectId()
-GetPlayerAvatarObjectId: ; 808BCDC
+@ u8 GetPlayerAvatarObjectId()
+GetPlayerAvatarObjectId: @ 808BCDC
 	ldr r0, =0x02037590
 	ldrb r0, [r0, 0x4]
 	bx lr
@@ -241934,7 +241934,7 @@ GetPlayerAvatarObjectId: ; 808BCDC
 	thumb_func_end GetPlayerAvatarObjectId
 
 	thumb_func_start sub_808BCE8
-sub_808BCE8: ; 808BCE8
+sub_808BCE8: @ 808BCE8
 	push {lr}
 	bl ForcedMovement_None
 	pop {r0}
@@ -241942,7 +241942,7 @@ sub_808BCE8: ; 808BCE8
 	thumb_func_end sub_808BCE8
 
 	thumb_func_start sub_808BCF4
-sub_808BCF4: ; 808BCF4
+sub_808BCF4: @ 808BCF4
 	push {r4,lr}
 	ldr r0, =0x02037590
 	ldrb r0, [r0, 0x5]
@@ -241974,7 +241974,7 @@ _0808BD2C:
 	thumb_func_end sub_808BCF4
 
 	thumb_func_start sub_808BD3C
-sub_808BD3C: ; 808BD3C
+sub_808BD3C: @ 808BD3C
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -241988,8 +241988,8 @@ sub_808BD3C: ; 808BD3C
 	thumb_func_end sub_808BD3C
 
 	thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
-; u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
-GetPlayerAvatarGraphicsIdByStateIdAndGender: ; 808BD54
+@ u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
+GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 808BD54
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -242003,7 +242003,7 @@ GetPlayerAvatarGraphicsIdByStateIdAndGender: ; 808BD54
 	thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender
 
 	thumb_func_start sub_808BD6C
-sub_808BD6C: ; 808BD6C
+sub_808BD6C: @ 808BD6C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_08497508
@@ -242014,7 +242014,7 @@ sub_808BD6C: ; 808BD6C
 	thumb_func_end sub_808BD6C
 
 	thumb_func_start sub_808BD7C
-sub_808BD7C: ; 808BD7C
+sub_808BD7C: @ 808BD7C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0849750A
@@ -242025,8 +242025,8 @@ sub_808BD7C: ; 808BD7C
 	thumb_func_end sub_808BD7C
 
 	thumb_func_start GetPlayerAvatarGraphicsIdByStateId
-; u8 GetPlayerAvatarGraphicsIdByStateId(u8 stateId)
-GetPlayerAvatarGraphicsIdByStateId: ; 808BD8C
+@ u8 GetPlayerAvatarGraphicsIdByStateId(u8 stateId)
+GetPlayerAvatarGraphicsIdByStateId: @ 808BD8C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -242041,7 +242041,7 @@ GetPlayerAvatarGraphicsIdByStateId: ; 808BD8C
 	thumb_func_end GetPlayerAvatarGraphicsIdByStateId
 
 	thumb_func_start sub_808BDA8
-sub_808BDA8: ; 808BDA8
+sub_808BDA8: @ 808BDA8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -242071,8 +242071,8 @@ _0808BDD0:
 	thumb_func_end sub_808BDA8
 
 	thumb_func_start GetPlayerAvatarGenderByGraphicsId
-; u8 GetPlayerAvatarGenderByGraphicsId(u8 graphicsId)
-GetPlayerAvatarGenderByGraphicsId: ; 808BDD4
+@ u8 GetPlayerAvatarGenderByGraphicsId(u8 graphicsId)
+GetPlayerAvatarGenderByGraphicsId: @ 808BDD4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -242102,8 +242102,8 @@ _0808BDFC:
 	thumb_func_end GetPlayerAvatarGenderByGraphicsId
 
 	thumb_func_start PartyHasMonWithSurf
-; bool8 PartyHasMonWithSurf()
-PartyHasMonWithSurf: ; 808BE00
+@ bool8 PartyHasMonWithSurf()
+PartyHasMonWithSurf: @ 808BE00
 	push {r4,r5,lr}
 	movs r0, 0x8
 	bl TestPlayerAvatarFlags
@@ -242148,8 +242148,8 @@ _0808BE46:
 	thumb_func_end PartyHasMonWithSurf
 
 	thumb_func_start IsPlayerSurfingNorth
-; bool8 IsPlayerSurfingNorth()
-IsPlayerSurfingNorth: ; 808BE50
+@ bool8 IsPlayerSurfingNorth()
+IsPlayerSurfingNorth: @ 808BE50
 	push {lr}
 	bl player_get_direction_upper_nybble
 	lsls r0, 24
@@ -242171,8 +242171,8 @@ _0808BE70:
 	thumb_func_end IsPlayerSurfingNorth
 
 	thumb_func_start IsPlayerFacingSurfableFishableWater
-; bool8 IsPlayerFacingSurfableFishableWater()
-IsPlayerFacingSurfableFishableWater: ; 808BE74
+@ bool8 IsPlayerFacingSurfableFishableWater()
+IsPlayerFacingSurfableFishableWater: @ 808BE74
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =0x02037590
@@ -242239,8 +242239,8 @@ _0808BEF6:
 	thumb_func_end IsPlayerFacingSurfableFishableWater
 
 	thumb_func_start ClearPlayerAvatarInfo
-; void ClearPlayerAvatarInfo()
-ClearPlayerAvatarInfo: ; 808BF00
+@ void ClearPlayerAvatarInfo()
+ClearPlayerAvatarInfo: @ 808BF00
 	push {lr}
 	ldr r0, =0x02037590
 	movs r1, 0
@@ -242252,8 +242252,8 @@ ClearPlayerAvatarInfo: ; 808BF00
 	thumb_func_end ClearPlayerAvatarInfo
 
 	thumb_func_start SetPlayerAvatarStateMask
-; void SetPlayerAvatarStateMask(u8 stateMask)
-SetPlayerAvatarStateMask: ; 808BF14
+@ void SetPlayerAvatarStateMask(u8 stateMask)
+SetPlayerAvatarStateMask: @ 808BF14
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x02037590
@@ -242267,8 +242267,8 @@ SetPlayerAvatarStateMask: ; 808BF14
 	thumb_func_end SetPlayerAvatarStateMask
 
 	thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId
-; u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
-GetPlayerAvatarStateTransitionByGraphicsId: ; 808BF2C
+@ u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
+GetPlayerAvatarStateTransitionByGraphicsId: @ 808BF2C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -242305,8 +242305,8 @@ _0808BF64:
 	thumb_func_end GetPlayerAvatarStateTransitionByGraphicsId
 
 	thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState
-; u8 GetPlayerAvatarGraphicsIdByCurrentState()
-GetPlayerAvatarGraphicsIdByCurrentState: ; 808BF6C
+@ u8 GetPlayerAvatarGraphicsIdByCurrentState()
+GetPlayerAvatarGraphicsIdByCurrentState: @ 808BF6C
 	push {r4-r6,lr}
 	ldr r0, =0x02037590
 	ldrb r5, [r0]
@@ -242343,8 +242343,8 @@ _0808BFA8:
 	thumb_func_end GetPlayerAvatarGraphicsIdByCurrentState
 
 	thumb_func_start SetPlayerAvatarExtraStateTransition
-; void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 state)
-SetPlayerAvatarExtraStateTransition: ; 808BFB0
+@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 state)
+SetPlayerAvatarExtraStateTransition: @ 808BFB0
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -242368,8 +242368,8 @@ SetPlayerAvatarExtraStateTransition: ; 808BFB0
 	thumb_func_end SetPlayerAvatarExtraStateTransition
 
 	thumb_func_start InitPlayerAvatar
-; void InitPlayerAvatar(u16 x, u16 y, u8 direction, u8 gender)
-InitPlayerAvatar: ; 808BFE0
+@ void InitPlayerAvatar(u16 x, u16 y, u8 direction, u8 gender)
+InitPlayerAvatar: @ 808BFE0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -242464,7 +242464,7 @@ InitPlayerAvatar: ; 808BFE0
 	thumb_func_end InitPlayerAvatar
 
 	thumb_func_start sub_808C0A8
-sub_808C0A8: ; 808C0A8
+sub_808C0A8: @ 808C0A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -242516,7 +242516,7 @@ _0808C100:
 	thumb_func_end sub_808C0A8
 
 	thumb_func_start sub_808C114
-sub_808C114: ; 808C114
+sub_808C114: @ 808C114
 	push {r4,r5,lr}
 	ldr r5, =0x02037590
 	ldrb r0, [r5, 0x5]
@@ -242547,7 +242547,7 @@ sub_808C114: ; 808C114
 	thumb_func_end sub_808C114
 
 	thumb_func_start sub_808C15C
-sub_808C15C: ; 808C15C
+sub_808C15C: @ 808C15C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -242586,7 +242586,7 @@ sub_808C15C: ; 808C15C
 	thumb_func_end sub_808C15C
 
 	thumb_func_start sub_808C1B4
-sub_808C1B4: ; 808C1B4
+sub_808C1B4: @ 808C1B4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -242637,7 +242637,7 @@ sub_808C1B4: ; 808C1B4
 	thumb_func_end sub_808C1B4
 
 	thumb_func_start sub_808C228
-sub_808C228: ; 808C228
+sub_808C228: @ 808C228
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -242676,7 +242676,7 @@ sub_808C228: ; 808C228
 	thumb_func_end sub_808C228
 
 	thumb_func_start sub_808C280
-sub_808C280: ; 808C280
+sub_808C280: @ 808C280
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -242750,7 +242750,7 @@ _0808C302:
 	thumb_func_end sub_808C280
 
 	thumb_func_start task_add_bump_boulder
-task_add_bump_boulder: ; 808C310
+task_add_bump_boulder: @ 808C310
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -242779,7 +242779,7 @@ task_add_bump_boulder: ; 808C310
 	thumb_func_end task_add_bump_boulder
 
 	thumb_func_start taskFF_bump_boulder
-taskFF_bump_boulder: ; 808C34C
+taskFF_bump_boulder: @ 808C34C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -242820,7 +242820,7 @@ _0808C360:
 	thumb_func_end taskFF_bump_boulder
 
 	thumb_func_start sub_808C3A4
-sub_808C3A4: ; 808C3A4
+sub_808C3A4: @ 808C3A4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_enable
@@ -242838,8 +242838,8 @@ sub_808C3A4: ; 808C3A4
 	thumb_func_end sub_808C3A4
 
 	thumb_func_start do_boulder_dust
-; int do_boulder_dust(int a1, struct npc_state *a2, struct npc_state *a3)
-do_boulder_dust: ; 808C3C4
+@ int do_boulder_dust(int a1, struct npc_state *a2, struct npc_state *a3)
+do_boulder_dust: @ 808C3C4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -242924,7 +242924,7 @@ _0808C472:
 	thumb_func_end do_boulder_dust
 
 	thumb_func_start sub_808C484
-sub_808C484: ; 808C484
+sub_808C484: @ 808C484
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -242960,7 +242960,7 @@ _0808C4C6:
 	thumb_func_end sub_808C484
 
 	thumb_func_start sub_808C4D8
-sub_808C4D8: ; 808C4D8
+sub_808C4D8: @ 808C4D8
 	push {r4,lr}
 	ldr r4, =sub_808C4F8
 	adds r0, r4, 0
@@ -242976,7 +242976,7 @@ sub_808C4D8: ; 808C4D8
 	thumb_func_end sub_808C4D8
 
 	thumb_func_start sub_808C4F8
-sub_808C4F8: ; 808C4F8
+sub_808C4F8: @ 808C4F8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -243011,7 +243011,7 @@ _0808C50A:
 	thumb_func_end sub_808C4F8
 
 	thumb_func_start sub_808C544
-sub_808C544: ; 808C544
+sub_808C544: @ 808C544
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -243061,7 +243061,7 @@ _0808C5A0:
 	thumb_func_end sub_808C544
 
 	thumb_func_start sub_808C5B0
-sub_808C5B0: ; 808C5B0
+sub_808C5B0: @ 808C5B0
 	push {r4,lr}
 	ldr r4, =sub_808C5D0
 	adds r0, r4, 0
@@ -243077,7 +243077,7 @@ sub_808C5B0: ; 808C5B0
 	thumb_func_end sub_808C5B0
 
 	thumb_func_start sub_808C5D0
-sub_808C5D0: ; 808C5D0
+sub_808C5D0: @ 808C5D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -243112,7 +243112,7 @@ _0808C5E2:
 	thumb_func_end sub_808C5D0
 
 	thumb_func_start sub_808C61C
-sub_808C61C: ; 808C61C
+sub_808C61C: @ 808C61C
 	push {lr}
 	ldrh r2, [r0, 0x8]
 	adds r2, 0x1
@@ -243133,7 +243133,7 @@ sub_808C61C: ; 808C61C
 	thumb_func_end sub_808C61C
 
 	thumb_func_start sub_808C644
-sub_808C644: ; 808C644
+sub_808C644: @ 808C644
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -243192,7 +243192,7 @@ _0808C6AC:
 	thumb_func_end sub_808C644
 
 	thumb_func_start sub_808C6BC
-sub_808C6BC: ; 808C6BC
+sub_808C6BC: @ 808C6BC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -243224,7 +243224,7 @@ _0808C6EC:
 	thumb_func_end sub_808C6BC
 
 	thumb_func_start sub_808C6FC
-sub_808C6FC: ; 808C6FC
+sub_808C6FC: @ 808C6FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -243261,7 +243261,7 @@ _0808C740:
 	thumb_func_end sub_808C6FC
 
 	thumb_func_start sub_808C750
-sub_808C750: ; 808C750
+sub_808C750: @ 808C750
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -243298,7 +243298,7 @@ sub_808C750: ; 808C750
 	thumb_func_end sub_808C750
 
 	thumb_func_start taskFF_0805D1D4
-taskFF_0805D1D4: ; 808C7A8
+taskFF_0805D1D4: @ 808C7A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -243345,7 +243345,7 @@ _0808C7FC:
 	thumb_func_end taskFF_0805D1D4
 
 	thumb_func_start sub_808C814
-sub_808C814: ; 808C814
+sub_808C814: @ 808C814
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -243397,7 +243397,7 @@ _0808C87A:
 	thumb_func_end sub_808C814
 
 	thumb_func_start StartFishing
-StartFishing: ; 808C88C
+StartFishing: @ 808C88C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -243422,7 +243422,7 @@ StartFishing: ; 808C88C
 	thumb_func_end StartFishing
 
 	thumb_func_start Task_Fish
-Task_Fish: ; 808C8C0
+Task_Fish: @ 808C8C0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -243450,7 +243450,7 @@ _0808C8D2:
 	thumb_func_end Task_Fish
 
 	thumb_func_start fish0
-fish0: ; 808C8F8
+fish0: @ 808C8F8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_enable
@@ -243468,7 +243468,7 @@ fish0: ; 808C8F8
 	thumb_func_end fish0
 
 	thumb_func_start fish1
-fish1: ; 808C918
+fish1: @ 808C918
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -243534,7 +243534,7 @@ fish1: ; 808C918
 	thumb_func_end fish1
 
 	thumb_func_start fish2
-fish2: ; 808C9B0
+fish2: @ 808C9B0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_808CF78
@@ -243556,7 +243556,7 @@ _0808C9CC:
 	thumb_func_end fish2
 
 	thumb_func_start fish3
-fish3: ; 808C9D4
+fish3: @ 808C9D4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -243597,7 +243597,7 @@ _0808CA18:
 	thumb_func_end fish3
 
 	thumb_func_start fish4
-fish4: ; 808CA20
+fish4: @ 808CA20
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -243679,7 +243679,7 @@ _0808CAB4:
 	thumb_func_end fish4
 
 	thumb_func_start fish5
-fish5: ; 808CABC
+fish5: @ 808CABC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	bl sub_808CF78
@@ -243762,7 +243762,7 @@ _0808CB5C:
 	thumb_func_end fish5
 
 	thumb_func_start fish6
-fish6: ; 808CB6C
+fish6: @ 808CB6C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -243790,7 +243790,7 @@ fish6: ; 808CB6C
 	thumb_func_end fish6
 
 	thumb_func_start fish7
-fish7: ; 808CBA4
+fish7: @ 808CBA4
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -243836,7 +243836,7 @@ _0808CBEE:
 	thumb_func_end fish7
 
 	thumb_func_start fish8
-fish8: ; 808CBFC
+fish8: @ 808CBFC
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -243889,7 +243889,7 @@ _0808CC56:
 	thumb_func_end fish8
 
 	thumb_func_start fish9
-fish9: ; 808CC64
+fish9: @ 808CC64
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -243923,7 +243923,7 @@ fish9: ; 808CC64
 	thumb_func_end fish9
 
 	thumb_func_start fishA_wait_for_a_pressed
-fishA_wait_for_a_pressed: ; 808CCA8
+fishA_wait_for_a_pressed: @ 808CCA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -244030,7 +244030,7 @@ _0808CD80:
 	thumb_func_end fishA_wait_for_a_pressed
 
 	thumb_func_start fishB
-fishB: ; 808CD94
+fishB: @ 808CD94
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -244078,7 +244078,7 @@ fishB: ; 808CD94
 	thumb_func_end fishB
 
 	thumb_func_start fishC
-fishC: ; 808CE04
+fishC: @ 808CE04
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -244127,7 +244127,7 @@ fishC: ; 808CE04
 	thumb_func_end fishC
 
 	thumb_func_start fishD
-fishD: ; 808CE74
+fishD: @ 808CE74
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_808CF78
@@ -244141,7 +244141,7 @@ fishD: ; 808CE74
 	thumb_func_end fishD
 
 	thumb_func_start fishE
-fishE: ; 808CE8C
+fishE: @ 808CE8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -244217,7 +244217,7 @@ _0808CF12:
 	thumb_func_end fishE
 
 	thumb_func_start fishF
-fishF: ; 808CF2C
+fishF: @ 808CF2C
 	push {lr}
 	bl RunTextPrinters
 	movs r0, 0
@@ -244248,7 +244248,7 @@ _0808CF68:
 	thumb_func_end fishF
 
 	thumb_func_start sub_808CF78
-sub_808CF78: ; 808CF78
+sub_808CF78: @ 808CF78
 	push {r4-r7,lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x4]
@@ -244374,7 +244374,7 @@ _0808D05E:
 	thumb_func_end sub_808CF78
 
 	thumb_func_start sub_808D074
-sub_808D074: ; 808D074
+sub_808D074: @ 808D074
 	ldr r1, =0x0203734c
 	strb r0, [r1]
 	bx lr
@@ -244382,7 +244382,7 @@ sub_808D074: ; 808D074
 	thumb_func_end sub_808D074
 
 	thumb_func_start sub_808D080
-sub_808D080: ; 808D080
+sub_808D080: @ 808D080
 	push {lr}
 	ldr r1, =0x0203734c
 	ldrb r0, [r1]
@@ -244396,7 +244396,7 @@ _0808D08C:
 	thumb_func_end sub_808D080
 
 	thumb_func_start sub_808D094
-sub_808D094: ; 808D094
+sub_808D094: @ 808D094
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -244519,7 +244519,7 @@ _0808D18A:
 	thumb_func_end sub_808D094
 
 	thumb_func_start sub_808D194
-sub_808D194: ; 808D194
+sub_808D194: @ 808D194
 	push {r4,lr}
 	ldr r4, =sub_808D1FC
 	adds r0, r4, 0
@@ -244535,7 +244535,7 @@ sub_808D194: ; 808D194
 	thumb_func_end sub_808D194
 
 	thumb_func_start sub_808D1B4
-sub_808D1B4: ; 808D1B4
+sub_808D1B4: @ 808D1B4
 	push {lr}
 	ldr r0, =sub_808D1FC
 	bl is_function_an_active_task
@@ -244547,7 +244547,7 @@ sub_808D1B4: ; 808D1B4
 	thumb_func_end sub_808D1B4
 
 	thumb_func_start sub_808D1C8
-sub_808D1C8: ; 808D1C8
+sub_808D1C8: @ 808D1C8
 	push {r4,lr}
 	ldr r4, =sub_808D094
 	adds r0, r4, 0
@@ -244563,7 +244563,7 @@ sub_808D1C8: ; 808D1C8
 	thumb_func_end sub_808D1C8
 
 	thumb_func_start sub_808D1E8
-sub_808D1E8: ; 808D1E8
+sub_808D1E8: @ 808D1E8
 	push {lr}
 	ldr r0, =sub_808D094
 	bl is_function_an_active_task
@@ -244575,7 +244575,7 @@ sub_808D1E8: ; 808D1E8
 	thumb_func_end sub_808D1E8
 
 	thumb_func_start sub_808D1FC
-sub_808D1FC: ; 808D1FC
+sub_808D1FC: @ 808D1FC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -244768,7 +244768,7 @@ _0808D37E:
 	thumb_func_end sub_808D1FC
 
 	thumb_func_start sub_808D38C
-sub_808D38C: ; 808D38C
+sub_808D38C: @ 808D38C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -244821,7 +244821,7 @@ _0808D3EA:
 	thumb_func_end sub_808D38C
 
 	thumb_func_start npc_clear_ids_and_state
-npc_clear_ids_and_state: ; 808D3F0
+npc_clear_ids_and_state: @ 808D3F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -244840,7 +244840,7 @@ npc_clear_ids_and_state: ; 808D3F0
 	thumb_func_end npc_clear_ids_and_state
 
 	thumb_func_start npcs_clear_ids_and_state
-npcs_clear_ids_and_state: ; 808D410
+npcs_clear_ids_and_state: @ 808D410
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02037350
@@ -244862,7 +244862,7 @@ _0808D416:
 	thumb_func_end npcs_clear_ids_and_state
 
 	thumb_func_start sub_808D438
-sub_808D438: ; 808D438
+sub_808D438: @ 808D438
 	push {lr}
 	bl strange_npc_table_clear
 	bl npcs_clear_ids_and_state
@@ -244873,7 +244873,7 @@ sub_808D438: ; 808D438
 	thumb_func_end sub_808D438
 
 	thumb_func_start sub_808D450
-sub_808D450: ; 808D450
+sub_808D450: @ 808D450
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -244950,7 +244950,7 @@ sub_808D450: ; 808D450
 	thumb_func_end sub_808D450
 
 	thumb_func_start sub_808D4F4
-sub_808D4F4: ; 808D4F4
+sub_808D4F4: @ 808D4F4
 	push {lr}
 	movs r1, 0
 	ldr r2, =0x02037350
@@ -244979,8 +244979,8 @@ _0808D51E:
 	thumb_func_end sub_808D4F4
 
 	thumb_func_start GetFieldObjectIdByLocalIdAndMap
-; u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectIdByLocalIdAndMap: ; 808D524
+@ u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+GetFieldObjectIdByLocalIdAndMap: @ 808D524
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -245002,8 +245002,8 @@ _0808D540:
 	thumb_func_end GetFieldObjectIdByLocalIdAndMap
 
 	thumb_func_start TryGetFieldObjectIdByLocalIdAndMap
-; bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
-TryGetFieldObjectIdByLocalIdAndMap: ; 808D548
+@ bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
+TryGetFieldObjectIdByLocalIdAndMap: @ 808D548
 	push {r4,lr}
 	adds r4, r3, 0
 	lsls r0, 24
@@ -245029,8 +245029,8 @@ _0808D56C:
 	thumb_func_end TryGetFieldObjectIdByLocalIdAndMap
 
 	thumb_func_start GetFieldObjectIdByXY
-; u8 GetFieldObjectIdByXY(s16 x, s16 y)
-GetFieldObjectIdByXY: ; 808D574
+@ u8 GetFieldObjectIdByXY(s16 x, s16 y)
+GetFieldObjectIdByXY: @ 808D574
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r5, =0x02037350
@@ -245070,8 +245070,8 @@ _0808D5AC:
 	thumb_func_end GetFieldObjectIdByXY
 
 	thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal
-; u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectIdByLocalIdAndMapInternal: ; 808D5B8
+@ u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
+GetFieldObjectIdByLocalIdAndMapInternal: @ 808D5B8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -245116,8 +245116,8 @@ _0808D600:
 	thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal
 
 	thumb_func_start GetFieldObjectIdByLocalId
-; u8 GetFieldObjectIdByLocalId(u8 localId)
-GetFieldObjectIdByLocalId: ; 808D608
+@ u8 GetFieldObjectIdByLocalId(u8 localId)
+GetFieldObjectIdByLocalId: @ 808D608
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -245152,8 +245152,8 @@ _0808D63C:
 	thumb_func_end GetFieldObjectIdByLocalId
 
 	thumb_func_start InitFieldObjectStateFromTemplate
-; u8 InitFieldObjectStateFromTemplate(struct FieldObjectTemplate *fieldObjectTemplate, u8 mapId, u8 mapGroupId)
-InitFieldObjectStateFromTemplate: ; 808D644
+@ u8 InitFieldObjectStateFromTemplate(struct FieldObjectTemplate *fieldObjectTemplate, u8 mapId, u8 mapGroupId)
+InitFieldObjectStateFromTemplate: @ 808D644
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -245308,7 +245308,7 @@ _0808D762:
 	thumb_func_end InitFieldObjectStateFromTemplate
 
 	thumb_func_start sub_808D77C
-sub_808D77C: ; 808D77C
+sub_808D77C: @ 808D77C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -245386,8 +245386,8 @@ _0808D800:
 	thumb_func_end sub_808D77C
 
 	thumb_func_start GetAvailableFieldObjectSlot
-; bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
-GetAvailableFieldObjectSlot: ; 808D810
+@ bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
+GetAvailableFieldObjectSlot: @ 808D810
 	push {r4-r7,lr}
 	mov r12, r3
 	lsls r0, 16
@@ -245476,8 +245476,8 @@ _0808D8A4:
 	thumb_func_end GetAvailableFieldObjectSlot
 
 	thumb_func_start RemoveFieldObject
-; void RemoveFieldObject(npc_state *fieldObject)
-RemoveFieldObject: ; 808D8B0
+@ void RemoveFieldObject(npc_state *fieldObject)
+RemoveFieldObject: @ 808D8B0
 	push {lr}
 	ldrb r2, [r0]
 	movs r1, 0x2
@@ -245490,8 +245490,8 @@ RemoveFieldObject: ; 808D8B0
 	thumb_func_end RemoveFieldObject
 
 	thumb_func_start RemoveFieldObjectByLocalIdAndMap
-; void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapBank)
-RemoveFieldObjectByLocalIdAndMap: ; 808D8C4
+@ void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapBank)
+RemoveFieldObjectByLocalIdAndMap: @ 808D8C4
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -245527,8 +245527,8 @@ _0808D902:
 	thumb_func_end RemoveFieldObjectByLocalIdAndMap
 
 	thumb_func_start RemoveFieldObjectInternal
-; void RemoveFieldObjectInternal(npc_state *fieldObject)
-RemoveFieldObjectInternal: ; 808D90C
+@ void RemoveFieldObjectInternal(npc_state *fieldObject)
+RemoveFieldObjectInternal: @ 808D90C
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -245564,7 +245564,7 @@ RemoveFieldObjectInternal: ; 808D90C
 	thumb_func_end RemoveFieldObjectInternal
 
 	thumb_func_start sub_808D958
-sub_808D958: ; 808D958
+sub_808D958: @ 808D958
 	push {r4,lr}
 	movs r4, 0
 _0808D95C:
@@ -245591,8 +245591,8 @@ _0808D972:
 	thumb_func_end sub_808D958
 
 	thumb_func_start SpawnFieldObjectInternal
-; u8 SpawnFieldObjectInternal(struct FieldObjectTemplate *romFieldObject, struct objtemplate *template, int mapId, int mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-SpawnFieldObjectInternal: ; 808D98C
+@ u8 SpawnFieldObjectInternal(struct FieldObjectTemplate *romFieldObject, struct objtemplate *template, int mapId, int mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
+SpawnFieldObjectInternal: @ 808D98C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -245805,8 +245805,8 @@ _0808DB2C:
 	thumb_func_end SpawnFieldObjectInternal
 
 	thumb_func_start SpawnFieldObject
-; u8 SpawnFieldObject(struct FieldObjectTemplate *romNpc, u8 mapId, u8 mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-SpawnFieldObject: ; 808DB40
+@ u8 SpawnFieldObject(struct FieldObjectTemplate *romNpc, u8 mapId, u8 mapGroupId, u16 movingCameraOffsetX, u16 movingCameraOffsetY)
+SpawnFieldObject: @ 808DB40
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -245904,8 +245904,8 @@ _0808DBF2:
 	thumb_func_end SpawnFieldObject
 
 	thumb_func_start SpawnSpecialFieldObject
-; u8 SpawnSpecialFieldObject(struct FieldObjectTemplate *romFieldObject)
-SpawnSpecialFieldObject: ; 808DC08
+@ u8 SpawnSpecialFieldObject(struct FieldObjectTemplate *romFieldObject)
+SpawnSpecialFieldObject: @ 808DC08
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -245936,8 +245936,8 @@ SpawnSpecialFieldObject: ; 808DC08
 	thumb_func_end SpawnSpecialFieldObject
 
 	thumb_func_start SpawnSpecialFieldObjectParametrized
-; u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, u16 x, u16 y, u8 z)
-SpawnSpecialFieldObjectParametrized: ; 808DC44
+@ u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, u16 x, u16 y, u8 z)
+SpawnSpecialFieldObjectParametrized: @ 808DC44
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -245990,7 +245990,7 @@ SpawnSpecialFieldObjectParametrized: ; 808DC44
 	thumb_func_end SpawnSpecialFieldObjectParametrized
 
 	thumb_func_start show_sprite
-show_sprite: ; 808DCAC
+show_sprite: @ 808DCAC
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -246033,8 +246033,8 @@ _0808DCF4:
 	thumb_func_end show_sprite
 
 	thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfo
-; void MakeObjectTemplateFromFieldObjectGraphicsInfo(u8 graphicsId, void ( *callback)(), struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
-MakeObjectTemplateFromFieldObjectGraphicsInfo: ; 808DCFC
+@ void MakeObjectTemplateFromFieldObjectGraphicsInfo(u8 graphicsId, void ( *callback)(), struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
+MakeObjectTemplateFromFieldObjectGraphicsInfo: @ 808DCFC
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -246063,8 +246063,8 @@ MakeObjectTemplateFromFieldObjectGraphicsInfo: ; 808DCFC
 	thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfo
 
 	thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
-; void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
-MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: ; 808DD30
+@ void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
+MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 808DD30
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -246081,8 +246081,8 @@ MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: ; 808DD30
 	thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
 
 	thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
-; void MakeObjectTemplateFromFieldObjectTemplate(struct FieldObjectTemplate *fieldObjectTemplate, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
-MakeObjectTemplateFromFieldObjectTemplate: ; 808DD50
+@ void MakeObjectTemplateFromFieldObjectTemplate(struct FieldObjectTemplate *fieldObjectTemplate, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
+MakeObjectTemplateFromFieldObjectTemplate: @ 808DD50
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -246097,8 +246097,8 @@ MakeObjectTemplateFromFieldObjectTemplate: ; 808DD50
 	thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
 
 	thumb_func_start AddPseudoFieldObject
-; void AddPseudoFieldObject(u8 graphicsId, void ( *callback)(), u16 x, u16 y, u8 subpriority)
-AddPseudoFieldObject: ; 808DD68
+@ void AddPseudoFieldObject(u8 graphicsId, void ( *callback)(), u16 x, u16 y, u8 subpriority)
+AddPseudoFieldObject: @ 808DD68
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -246176,7 +246176,7 @@ _0808DDF2:
 	thumb_func_end AddPseudoFieldObject
 
 	thumb_func_start sprite_new
-sprite_new: ; 808DE0C
+sprite_new: @ 808DE0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -246354,8 +246354,8 @@ _0808DF6C:
 	thumb_func_end sprite_new
 
 	thumb_func_start SpawnFieldObjectsInView
-; void SpawnFieldObjectsInView(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-SpawnFieldObjectsInView: ; 808DF80
+@ void SpawnFieldObjectsInView(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
+SpawnFieldObjectsInView: @ 808DF80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -246489,8 +246489,8 @@ _0808E078:
 	thumb_func_end SpawnFieldObjectsInView
 
 	thumb_func_start RemoveFieldObjectsOutsideView
-; void RemoveFieldObjectsOutsideView()
-RemoveFieldObjectsOutsideView: ; 808E08C
+@ void RemoveFieldObjectsOutsideView()
+RemoveFieldObjectsOutsideView: @ 808E08C
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r6, =0x02032308
@@ -246540,8 +246540,8 @@ _0808E0D2:
 	thumb_func_end RemoveFieldObjectsOutsideView
 
 	thumb_func_start RemoveFieldObjectIfOutsideView
-; void RemoveFieldObjectIfOutsideView(npc_state *fieldObject)
-RemoveFieldObjectIfOutsideView: ; 808E0EC
+@ void RemoveFieldObjectIfOutsideView(npc_state *fieldObject)
+RemoveFieldObjectIfOutsideView: @ 808E0EC
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldr r0, =0x03005d8c
@@ -246609,7 +246609,7 @@ _0808E160:
 	thumb_func_end RemoveFieldObjectIfOutsideView
 
 	thumb_func_start sub_808E16C
-sub_808E16C: ; 808E16C
+sub_808E16C: @ 808E16C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -246649,7 +246649,7 @@ _0808E1A0:
 	thumb_func_end sub_808E16C
 
 	thumb_func_start sub_808E1B8
-sub_808E1B8: ; 808E1B8
+sub_808E1B8: @ 808E1B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -246872,8 +246872,8 @@ _0808E374:
 	thumb_func_end sub_808E1B8
 
 	thumb_func_start sub_808E38C
-; void sub_808E38C(struct npc_state *fieldObject)
-sub_808E38C: ; 808E38C
+@ void sub_808E38C(struct npc_state *fieldObject)
+sub_808E38C: @ 808E38C
 	push {lr}
 	ldrb r2, [r0]
 	movs r3, 0x3
@@ -246904,8 +246904,8 @@ sub_808E38C: ; 808E38C
 	thumb_func_end sub_808E38C
 
 	thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId
-; void SetPlayerAvatarFieldObjectIdAndObjectId(u8 fieldObjectId, u8 objectId)
-SetPlayerAvatarFieldObjectIdAndObjectId: ; 808E3C4
+@ void SetPlayerAvatarFieldObjectIdAndObjectId(u8 fieldObjectId, u8 objectId)
+SetPlayerAvatarFieldObjectIdAndObjectId: @ 808E3C4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -246930,8 +246930,8 @@ SetPlayerAvatarFieldObjectIdAndObjectId: ; 808E3C4
 	thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
 
 	thumb_func_start FieldObjectSetGraphicsId
-; void FieldObjectSetGraphicsId(npc_state *npcState, u8 graphicsId)
-FieldObjectSetGraphicsId: ; 808E3F8
+@ void FieldObjectSetGraphicsId(npc_state *npcState, u8 graphicsId)
+FieldObjectSetGraphicsId: @ 808E3F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -247064,7 +247064,7 @@ _0808E4F8:
 	thumb_func_end FieldObjectSetGraphicsId
 
 	thumb_func_start sub_808E504
-sub_808E504: ; 808E504
+sub_808E504: @ 808E504
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -247098,8 +247098,8 @@ _0808E538:
 	thumb_func_end sub_808E504
 
 	thumb_func_start FieldObjectTurn
-; void FieldObjectTurn(struct npc_state *fieldObject, u8 direction)
-FieldObjectTurn: ; 808E544
+@ void FieldObjectTurn(struct npc_state *fieldObject, u8 direction)
+FieldObjectTurn: @ 808E544
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -247139,8 +247139,8 @@ _0808E58A:
 	thumb_func_end FieldObjectTurn
 
 	thumb_func_start FieldObjectTurnByLocalIdAndMap
-; void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-FieldObjectTurnByLocalIdAndMap: ; 808E594
+@ void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+FieldObjectTurnByLocalIdAndMap: @ 808E594
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -247174,7 +247174,7 @@ _0808E5C8:
 	thumb_func_end FieldObjectTurnByLocalIdAndMap
 
 	thumb_func_start sub_808E5D4
-sub_808E5D4: ; 808E5D4
+sub_808E5D4: @ 808E5D4
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -247191,8 +247191,8 @@ sub_808E5D4: ; 808E5D4
 	thumb_func_end sub_808E5D4
 
 	thumb_func_start get_berry_tree_graphics
-; void get_berry_tree_graphics(npc_state *npcState, struct obj *obj)
-get_berry_tree_graphics: ; 808E5F4
+@ void get_berry_tree_graphics(npc_state *npcState, struct obj *obj)
+get_berry_tree_graphics: @ 808E5F4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -247268,8 +247268,8 @@ _0808E680:
 	thumb_func_end get_berry_tree_graphics
 
 	thumb_func_start GetFieldObjectGraphicsInfo
-; FieldObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
-GetFieldObjectGraphicsInfo: ; 808E694
+@ FieldObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
+GetFieldObjectGraphicsInfo: @ 808E694
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -247308,8 +247308,8 @@ _0808E6D2:
 	thumb_func_end GetFieldObjectGraphicsInfo
 
 	thumb_func_start FieldObjectHandleDynamicGraphicsId
-; void FieldObjectHandleDynamicGraphicsId(struct npc_state *fieldObject)
-FieldObjectHandleDynamicGraphicsId: ; 808E6DC
+@ void FieldObjectHandleDynamicGraphicsId(struct npc_state *fieldObject)
+FieldObjectHandleDynamicGraphicsId: @ 808E6DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x5]
@@ -247327,7 +247327,7 @@ _0808E6F2:
 	thumb_func_end FieldObjectHandleDynamicGraphicsId
 
 	thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20
-npc_by_local_id_and_map_set_field_1_bit_x20: ; 808E6F8
+npc_by_local_id_and_map_set_field_1_bit_x20: @ 808E6F8
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -247369,8 +247369,8 @@ _0808E73A:
 	thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20
 
 	thumb_func_start FieldObjectGetLocalIdAndMap
-; void FieldObjectGetLocalIdAndMap(struct npc_state *fieldObject, u8 *localId, u8 *mapId, u8 *mapGroupId)
-FieldObjectGetLocalIdAndMap: ; 808E748
+@ void FieldObjectGetLocalIdAndMap(struct npc_state *fieldObject, u8 *localId, u8 *mapId, u8 *mapGroupId)
+FieldObjectGetLocalIdAndMap: @ 808E748
 	push {r4,lr}
 	ldrb r4, [r0, 0x8]
 	strb r4, [r1]
@@ -247384,7 +247384,7 @@ FieldObjectGetLocalIdAndMap: ; 808E748
 	thumb_func_end FieldObjectGetLocalIdAndMap
 
 	thumb_func_start sub_808E75C
-sub_808E75C: ; 808E75C
+sub_808E75C: @ 808E75C
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -247411,7 +247411,7 @@ _0808E784:
 	thumb_func_end sub_808E75C
 
 	thumb_func_start sub_808E78C
-sub_808E78C: ; 808E78C
+sub_808E78C: @ 808E78C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -247455,7 +247455,7 @@ _0808E7D2:
 	thumb_func_end sub_808E78C
 
 	thumb_func_start sub_808E7E4
-sub_808E7E4: ; 808E7E4
+sub_808E7E4: @ 808E7E4
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -247493,7 +247493,7 @@ _0808E820:
 	thumb_func_end sub_808E7E4
 
 	thumb_func_start sub_808E82C
-sub_808E82C: ; 808E82C
+sub_808E82C: @ 808E82C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0x10]
@@ -247536,7 +247536,7 @@ _0808E870:
 	thumb_func_end sub_808E82C
 
 	thumb_func_start gpu_pal_allocator_reset__manage_upper_four
-gpu_pal_allocator_reset__manage_upper_four: ; 808E880
+gpu_pal_allocator_reset__manage_upper_four: @ 808E880
 	push {lr}
 	bl ResetObjectPaletteAllocator
 	ldr r1, =0x0300301c
@@ -247548,7 +247548,7 @@ gpu_pal_allocator_reset__manage_upper_four: ; 808E880
 	thumb_func_end gpu_pal_allocator_reset__manage_upper_four
 
 	thumb_func_start sub_808E894
-sub_808E894: ; 808E894
+sub_808E894: @ 808E894
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -247569,7 +247569,7 @@ _0808E8B2:
 	thumb_func_end sub_808E894
 
 	thumb_func_start sub_808E8C0
-sub_808E8C0: ; 808E8C0
+sub_808E8C0: @ 808E8C0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -247599,8 +247599,8 @@ _0808E8EA:
 	thumb_func_end sub_808E8C0
 
 	thumb_func_start sub_808E8F4
-; u8 sub_808E8F4(struct TaggedObjectPalette *taggedPalette)
-sub_808E8F4: ; 808E8F4
+@ u8 sub_808E8F4(struct TaggedObjectPalette *taggedPalette)
+sub_808E8F4: @ 808E8F4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x4]
@@ -247623,8 +247623,8 @@ _0808E914:
 	thumb_func_end sub_808E8F4
 
 	thumb_func_start pal_patch_for_npc
-; void pal_patch_for_npc(u16 tag, u8 slot)
-pal_patch_for_npc: ; 808E91C
+@ void pal_patch_for_npc(u16 tag, u8 slot)
+pal_patch_for_npc: @ 808E91C
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -247652,8 +247652,8 @@ pal_patch_for_npc: ; 808E91C
 	thumb_func_end pal_patch_for_npc
 
 	thumb_func_start pal_patch_for_npc_range
-; void pal_patch_for_npc_range(u16 *tags, u8 minSlot, u8 maxSlot)
-pal_patch_for_npc_range: ; 808E954
+@ void pal_patch_for_npc_range(u16 *tags, u8 minSlot, u8 maxSlot)
+pal_patch_for_npc_range: @ 808E954
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -247679,8 +247679,8 @@ _0808E978:
 	thumb_func_end pal_patch_for_npc_range
 
 	thumb_func_start FindFieldObjectPaletteIndexByTag
-; u8 FindFieldObjectPaletteIndexByTag(u16 tag)
-FindFieldObjectPaletteIndexByTag: ; 808E980
+@ u8 FindFieldObjectPaletteIndexByTag(u16 tag)
+FindFieldObjectPaletteIndexByTag: @ 808E980
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -247720,8 +247720,8 @@ _0808E9C2:
 	thumb_func_end FindFieldObjectPaletteIndexByTag
 
 	thumb_func_start npc_load_two_palettes__no_record
-; void npc_load_two_palettes__no_record(u16 tag, u8 slot)
-npc_load_two_palettes__no_record: ; 808E9C8
+@ void npc_load_two_palettes__no_record(u16 tag, u8 slot)
+npc_load_two_palettes__no_record: @ 808E9C8
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -247773,8 +247773,8 @@ _0808EA30:
 	thumb_func_end npc_load_two_palettes__no_record
 
 	thumb_func_start npc_load_two_palettes__and_record
-; void npc_load_two_palettes__and_record(u16 tag, u8 slot)
-npc_load_two_palettes__and_record: ; 808EA38
+@ void npc_load_two_palettes__and_record(u16 tag, u8 slot)
+npc_load_two_palettes__and_record: @ 808EA38
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -247828,7 +247828,7 @@ _0808EAA8:
 	thumb_func_end npc_load_two_palettes__and_record
 
 	thumb_func_start sub_808EAB0
-sub_808EAB0: ; 808EAB0
+sub_808EAB0: @ 808EAB0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -247840,7 +247840,7 @@ sub_808EAB0: ; 808EAB0
 	thumb_func_end sub_808EAB0
 
 	thumb_func_start sub_808EAC4
-sub_808EAC4: ; 808EAC4
+sub_808EAC4: @ 808EAC4
 	push {r4,lr}
 	ldrh r3, [r0, 0x10]
 	strh r3, [r0, 0x14]
@@ -247860,8 +247860,8 @@ sub_808EAC4: ; 808EAC4
 	thumb_func_end sub_808EAC4
 
 	thumb_func_start npc_coords_shift
-; void npc_coords_shift(struct npc_state *fieldObject, u16 x, u16 y)
-npc_coords_shift: ; 808EAE4
+@ void npc_coords_shift(struct npc_state *fieldObject, u16 x, u16 y)
+npc_coords_shift: @ 808EAE4
 	ldrh r3, [r0, 0x10]
 	strh r3, [r0, 0x14]
 	ldrh r3, [r0, 0x12]
@@ -247872,8 +247872,8 @@ npc_coords_shift: ; 808EAE4
 	thumb_func_end npc_coords_shift
 
 	thumb_func_start npc_coords_set
-; void npc_coords_set(struct npc_state *fieldObject, u16 x, u16 y)
-npc_coords_set: ; 808EAF4
+@ void npc_coords_set(struct npc_state *fieldObject, u16 x, u16 y)
+npc_coords_set: @ 808EAF4
 	lsls r1, 16
 	lsrs r1, 16
 	lsls r2, 16
@@ -247886,7 +247886,7 @@ npc_coords_set: ; 808EAF4
 	thumb_func_end npc_coords_set
 
 	thumb_func_start sub_808EB08
-sub_808EB08: ; 808EB08
+sub_808EB08: @ 808EB08
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -247965,7 +247965,7 @@ _0808EB9A:
 	thumb_func_end sub_808EB08
 
 	thumb_func_start sub_808EBA8
-sub_808EBA8: ; 808EBA8
+sub_808EBA8: @ 808EBA8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0x10]
@@ -248009,8 +248009,8 @@ _0808EBF0:
 	thumb_func_end sub_808EBA8
 
 	thumb_func_start npc_coords_shift_still
-; void npc_coords_shift_still(struct npc_state *fieldObject)
-npc_coords_shift_still: ; 808EBFC
+@ void npc_coords_shift_still(struct npc_state *fieldObject)
+npc_coords_shift_still: @ 808EBFC
 	push {lr}
 	movs r2, 0x10
 	ldrsh r1, [r0, r2]
@@ -248022,8 +248022,8 @@ npc_coords_shift_still: ; 808EBFC
 	thumb_func_end npc_coords_shift_still
 
 	thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
-; void UpdateFieldObjectCoordsForCameraUpdate()
-UpdateFieldObjectCoordsForCameraUpdate: ; 808EC10
+@ void UpdateFieldObjectCoordsForCameraUpdate()
+UpdateFieldObjectCoordsForCameraUpdate: @ 808EC10
 	push {r4,r5,lr}
 	ldr r2, =0x02037334
 	ldrb r1, [r2]
@@ -248078,8 +248078,8 @@ _0808EC68:
 	thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
 
 	thumb_func_start GetFieldObjectIdByXYZ
-; u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z)
-GetFieldObjectIdByXYZ: ; 808EC78
+@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z)
+GetFieldObjectIdByXYZ: @ 808EC78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -248135,8 +248135,8 @@ _0808ECD4:
 	thumb_func_end GetFieldObjectIdByXYZ
 
 	thumb_func_start FieldObjectDoesZCoordMatch
-; bool8 FieldObjectDoesZCoordMatch(struct npc_state *fieldObject)
-FieldObjectDoesZCoordMatch: ; 808ECE0
+@ bool8 FieldObjectDoesZCoordMatch(struct npc_state *fieldObject)
+FieldObjectDoesZCoordMatch: @ 808ECE0
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -248161,8 +248161,8 @@ _0808ED02:
 	thumb_func_end FieldObjectDoesZCoordMatch
 
 	thumb_func_start UpdateFieldObjectsForCameraUpdate
-; void UpdateFieldObjectsForCameraUpdate(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-UpdateFieldObjectsForCameraUpdate: ; 808ED08
+@ void UpdateFieldObjectsForCameraUpdate(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
+UpdateFieldObjectsForCameraUpdate: @ 808ED08
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -248185,8 +248185,8 @@ UpdateFieldObjectsForCameraUpdate: ; 808ED08
 	thumb_func_end UpdateFieldObjectsForCameraUpdate
 
 	thumb_func_start AddCameraObject
-; u8 AddCameraObject(u8 followedObjectId)
-AddCameraObject: ; 808ED34
+@ u8 AddCameraObject(u8 followedObjectId)
+AddCameraObject: @ 808ED34
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -248219,8 +248219,8 @@ AddCameraObject: ; 808ED34
 	thumb_func_end AddCameraObject
 
 	thumb_func_start ObjectCB_CameraObject
-; void ObjectCB_CameraObject(struct obj *object)
-ObjectCB_CameraObject: ; 808ED78
+@ void ObjectCB_CameraObject(struct obj *object)
+ObjectCB_CameraObject: @ 808ED78
 	push {r4,r5,lr}
 	sub sp, 0xC
 	mov r2, sp
@@ -248241,8 +248241,8 @@ ObjectCB_CameraObject: ; 808ED78
 	thumb_func_end ObjectCB_CameraObject
 
 	thumb_func_start CameraObject_0
-; void CameraObject_0(struct obj *object)
-CameraObject_0: ; 808EDA0
+@ void CameraObject_0(struct obj *object)
+CameraObject_0: @ 808EDA0
 	push {lr}
 	ldr r3, =0x02020630
 	movs r1, 0x2E
@@ -248274,8 +248274,8 @@ CameraObject_0: ; 808EDA0
 	thumb_func_end CameraObject_0
 
 	thumb_func_start CameraObject_1
-; void CameraObject_1(struct obj *object)
-CameraObject_1: ; 808EDDC
+@ void CameraObject_1(struct obj *object)
+CameraObject_1: @ 808EDDC
 	push {r4,r5,lr}
 	ldr r3, =0x02020630
 	movs r1, 0x2E
@@ -248305,8 +248305,8 @@ CameraObject_1: ; 808EDDC
 	thumb_func_end CameraObject_1
 
 	thumb_func_start CameraObject_2
-; void CameraObject_2(struct obj *object)
-CameraObject_2: ; 808EE14
+@ void CameraObject_2(struct obj *object)
+CameraObject_2: @ 808EE14
 	push {r4,lr}
 	ldr r4, =0x02020630
 	movs r1, 0x2E
@@ -248333,8 +248333,8 @@ CameraObject_2: ; 808EE14
 	thumb_func_end CameraObject_2
 
 	thumb_func_start FindCameraObject
-; struct obj *FindCameraObject()
-FindCameraObject: ; 808EE44
+@ struct obj *FindCameraObject()
+FindCameraObject: @ 808EE44
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r4, =0x02020630
@@ -248373,8 +248373,8 @@ _0808EE84:
 	thumb_func_end FindCameraObject
 
 	thumb_func_start CameraObjectReset1
-; void CameraObjectReset1()
-CameraObjectReset1: ; 808EE8C
+@ void CameraObjectReset1()
+CameraObjectReset1: @ 808EE8C
 	push {lr}
 	bl FindCameraObject
 	adds r2, r0, 0
@@ -248391,8 +248391,8 @@ _0808EEA4:
 	thumb_func_end CameraObjectReset1
 
 	thumb_func_start CameraObjectSetFollowedObjectId
-; void CameraObjectSetFollowedObjectId(u8 objectId)
-CameraObjectSetFollowedObjectId: ; 808EEA8
+@ void CameraObjectSetFollowedObjectId(u8 objectId)
+CameraObjectSetFollowedObjectId: @ 808EEA8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -248408,8 +248408,8 @@ _0808EEBC:
 	thumb_func_end CameraObjectSetFollowedObjectId
 
 	thumb_func_start CameraObjectGetFollowedObjectId
-; u8 CameraObjectGetFollowedObjectId()
-CameraObjectGetFollowedObjectId: ; 808EEC4
+@ u8 CameraObjectGetFollowedObjectId()
+CameraObjectGetFollowedObjectId: @ 808EEC4
 	push {lr}
 	bl FindCameraObject
 	cmp r0, 0
@@ -248426,8 +248426,8 @@ _0808EED8:
 	thumb_func_end CameraObjectGetFollowedObjectId
 
 	thumb_func_start CameraObjectReset2
-; void CameraObjectReset2()
-CameraObjectReset2: ; 808EEDC
+@ void CameraObjectReset2()
+CameraObjectReset2: @ 808EEDC
 	push {lr}
 	bl FindCameraObject
 	movs r1, 0x2
@@ -248437,7 +248437,7 @@ CameraObjectReset2: ; 808EEDC
 	thumb_func_end CameraObjectReset2
 
 	thumb_func_start sub_808EEEC
-sub_808EEEC: ; 808EEEC
+sub_808EEEC: @ 808EEEC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -248490,7 +248490,7 @@ _0808EF42:
 	thumb_func_end sub_808EEEC
 
 	thumb_func_start obj_unfreeze
-obj_unfreeze: ; 808EF50
+obj_unfreeze: @ 808EF50
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -248550,8 +248550,8 @@ _0808EFB6:
 	thumb_func_end obj_unfreeze
 
 	thumb_func_start FieldObjectSetDirection
-; void FieldObjectSetDirection(struct npc_state *fieldObject, u8 direction)
-FieldObjectSetDirection: ; 808EFC0
+@ void FieldObjectSetDirection(struct npc_state *fieldObject, u8 direction)
+FieldObjectSetDirection: @ 808EFC0
 	push {r4,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -248589,8 +248589,8 @@ _0808EFF0:
 	thumb_func_end FieldObjectSetDirection
 
 	thumb_func_start GetFieldObjectScriptPointerByLocalIdAndMap
-; u32 GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectScriptPointerByLocalIdAndMap: ; 808F004
+@ u32 GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+GetFieldObjectScriptPointerByLocalIdAndMap: @ 808F004
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -248605,8 +248605,8 @@ GetFieldObjectScriptPointerByLocalIdAndMap: ; 808F004
 	thumb_func_end GetFieldObjectScriptPointerByLocalIdAndMap
 
 	thumb_func_start GetFieldObjectScriptPointerByFieldObjectId
-; u32 GetFieldObjectScriptPointerByFieldObjectId(u8 fieldObjectId)
-GetFieldObjectScriptPointerByFieldObjectId: ; 808F01C
+@ u32 GetFieldObjectScriptPointerByFieldObjectId(u8 fieldObjectId)
+GetFieldObjectScriptPointerByFieldObjectId: @ 808F01C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -248625,8 +248625,8 @@ GetFieldObjectScriptPointerByFieldObjectId: ; 808F01C
 	thumb_func_end GetFieldObjectScriptPointerByFieldObjectId
 
 	thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap
-; u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectFlagIdByLocalIdAndMap: ; 808F040
+@ u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+GetFieldObjectFlagIdByLocalIdAndMap: @ 808F040
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -248641,8 +248641,8 @@ GetFieldObjectFlagIdByLocalIdAndMap: ; 808F040
 	thumb_func_end GetFieldObjectFlagIdByLocalIdAndMap
 
 	thumb_func_start GetFieldObjectFlagIdByFieldObjectId
-; u16 GetFieldObjectFlagIdByFieldObjectId(u8 fieldObjectId)
-GetFieldObjectFlagIdByFieldObjectId: ; 808F058
+@ u16 GetFieldObjectFlagIdByFieldObjectId(u8 fieldObjectId)
+GetFieldObjectFlagIdByFieldObjectId: @ 808F058
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -248663,7 +248663,7 @@ GetFieldObjectFlagIdByFieldObjectId: ; 808F058
 	thumb_func_end GetFieldObjectFlagIdByFieldObjectId
 
 	thumb_func_start sub_808F080
-sub_808F080: ; 808F080
+sub_808F080: @ 808F080
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -248696,7 +248696,7 @@ _0808F0B6:
 	thumb_func_end sub_808F080
 
 	thumb_func_start sub_808F0BC
-sub_808F0BC: ; 808F0BC
+sub_808F0BC: @ 808F0BC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02037350
@@ -248710,7 +248710,7 @@ sub_808F0BC: ; 808F0BC
 	thumb_func_end sub_808F0BC
 
 	thumb_func_start sub_808F0D4
-sub_808F0D4: ; 808F0D4
+sub_808F0D4: @ 808F0D4
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -248743,8 +248743,8 @@ _0808F10A:
 	thumb_func_end sub_808F0D4
 
 	thumb_func_start FieldObjectGetBerryTreeId
-; u8 FieldObjectGetBerryTreeId(u8 fieldObjectId)
-FieldObjectGetBerryTreeId: ; 808F110
+@ u8 FieldObjectGetBerryTreeId(u8 fieldObjectId)
+FieldObjectGetBerryTreeId: @ 808F110
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02037350
@@ -248758,8 +248758,8 @@ FieldObjectGetBerryTreeId: ; 808F110
 	thumb_func_end FieldObjectGetBerryTreeId
 
 	thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
-; struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-GetFieldObjectTemplateByLocalIdAndMap: ; 808F128
+@ struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+GetFieldObjectTemplateByLocalIdAndMap: @ 808F128
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -248800,8 +248800,8 @@ _0808F16C:
 	thumb_func_end GetFieldObjectTemplateByLocalIdAndMap
 
 	thumb_func_start FindFieldObjectTemplateInArrayByLocalId
-; struct FieldObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct FieldObjectTemplate *templates, u8 numTemplates)
-FindFieldObjectTemplateInArrayByLocalId: ; 808F17C
+@ struct FieldObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct FieldObjectTemplate *templates, u8 numTemplates)
+FindFieldObjectTemplateInArrayByLocalId: @ 808F17C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -248836,8 +248836,8 @@ _0808F1AC:
 	thumb_func_end FindFieldObjectTemplateInArrayByLocalId
 
 	thumb_func_start sub_808F1B4
-; int sub_808F1B4(struct npc_state *fieldObject)
-sub_808F1B4: ; 808F1B4
+@ int sub_808F1B4(struct npc_state *fieldObject)
+sub_808F1B4: @ 808F1B4
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldrb r0, [r3, 0x9]
@@ -248886,8 +248886,8 @@ _0808F202:
 	thumb_func_end sub_808F1B4
 
 	thumb_func_start sub_808F208
-; void sub_808F208(struct npc_state *fieldObject)
-sub_808F208: ; 808F208
+@ void sub_808F208(struct npc_state *fieldObject)
+sub_808F208: @ 808F208
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_808F1B4
@@ -248907,7 +248907,7 @@ _0808F222:
 	thumb_func_end sub_808F208
 
 	thumb_func_start sub_808F228
-sub_808F228: ; 808F228
+sub_808F228: @ 808F228
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_808F1B4
@@ -248921,7 +248921,7 @@ _0808F236:
 	thumb_func_end sub_808F228
 
 	thumb_func_start sub_808F23C
-sub_808F23C: ; 808F23C
+sub_808F23C: @ 808F23C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -248936,8 +248936,8 @@ _0808F24C:
 	thumb_func_end sub_808F23C
 
 	thumb_func_start sub_808F254
-; void sub_808F254(u8 localId, u8 mapId, u8 mapGroupId)
-sub_808F254: ; 808F254
+@ void sub_808F254(u8 localId, u8 mapId, u8 mapGroupId)
+sub_808F254: @ 808F254
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -248967,7 +248967,7 @@ _0808F282:
 	thumb_func_end sub_808F254
 
 	thumb_func_start sub_808F28C
-sub_808F28C: ; 808F28C
+sub_808F28C: @ 808F28C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -249019,7 +249019,7 @@ _0808F2E8:
 	thumb_func_end sub_808F28C
 
 	thumb_func_start npc_paltag_set_load
-npc_paltag_set_load: ; 808F2F8
+npc_paltag_set_load: @ 808F2F8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -249063,7 +249063,7 @@ _0808F356:
 	thumb_func_end npc_paltag_set_load
 
 	thumb_func_start npc_paltag_by_palslot
-npc_paltag_by_palslot: ; 808F360
+npc_paltag_by_palslot: @ 808F360
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -249126,7 +249126,7 @@ _0808F3CE:
 	thumb_func_end npc_paltag_by_palslot
 
 	thumb_func_start FieldObjectCB_NoMovement1
-FieldObjectCB_NoMovement1: ; 808F3E0
+FieldObjectCB_NoMovement1: @ 808F3E0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -249144,13 +249144,13 @@ FieldObjectCB_NoMovement1: ; 808F3E0
 	thumb_func_end FieldObjectCB_NoMovement1
 
 	thumb_func_start FieldObjectCB2_NoMovement1
-FieldObjectCB2_NoMovement1: ; 808F404
+FieldObjectCB2_NoMovement1: @ 808F404
 	movs r0, 0
 	bx lr
 	thumb_func_end FieldObjectCB2_NoMovement1
 
 	thumb_func_start FieldObjectCB_GoRandomDirections
-FieldObjectCB_GoRandomDirections: ; 808F408
+FieldObjectCB_GoRandomDirections: @ 808F408
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -249168,7 +249168,7 @@ FieldObjectCB_GoRandomDirections: ; 808F408
 	thumb_func_end FieldObjectCB_GoRandomDirections
 
 	thumb_func_start FieldObjectCB2_GoRandomDirections
-FieldObjectCB2_GoRandomDirections: ; 808F42C
+FieldObjectCB2_GoRandomDirections: @ 808F42C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D6F4
 	movs r4, 0x30
@@ -249186,7 +249186,7 @@ FieldObjectCB2_GoRandomDirections: ; 808F42C
 	thumb_func_end FieldObjectCB2_GoRandomDirections
 
 	thumb_func_start sub_808F44C
-sub_808F44C: ; 808F44C
+sub_808F44C: @ 808F44C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -249198,7 +249198,7 @@ sub_808F44C: ; 808F44C
 	thumb_func_end sub_808F44C
 
 	thumb_func_start sub_808F460
-sub_808F460: ; 808F460
+sub_808F460: @ 808F460
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -249221,7 +249221,7 @@ sub_808F460: ; 808F460
 	thumb_func_end sub_808F460
 
 	thumb_func_start sub_808F48C
-sub_808F48C: ; 808F48C
+sub_808F48C: @ 808F48C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -249252,7 +249252,7 @@ _0808F4C2:
 	thumb_func_end sub_808F48C
 
 	thumb_func_start sub_808F4C8
-sub_808F4C8: ; 808F4C8
+sub_808F4C8: @ 808F4C8
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -249273,7 +249273,7 @@ _0808F4E2:
 	thumb_func_end sub_808F4C8
 
 	thumb_func_start sub_808F4E8
-sub_808F4E8: ; 808F4E8
+sub_808F4E8: @ 808F4E8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -249311,7 +249311,7 @@ _0808F526:
 	thumb_func_end sub_808F4E8
 
 	thumb_func_start sub_808F534
-sub_808F534: ; 808F534
+sub_808F534: @ 808F534
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -249337,7 +249337,7 @@ sub_808F534: ; 808F534
 	thumb_func_end sub_808F534
 
 	thumb_func_start sub_808F564
-sub_808F564: ; 808F564
+sub_808F564: @ 808F564
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -249360,8 +249360,8 @@ _0808F582:
 	thumb_func_end sub_808F564
 
 	thumb_func_start FieldObjectIsTrainerAndCloseToPlayer
-; bool8 FieldObjectIsTrainerAndCloseToPlayer(struct npc_state *fieldObject)
-FieldObjectIsTrainerAndCloseToPlayer: ; 808F58C
+@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct npc_state *fieldObject)
+FieldObjectIsTrainerAndCloseToPlayer: @ 808F58C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -249428,7 +249428,7 @@ _0808F5FE:
 	thumb_func_end FieldObjectIsTrainerAndCloseToPlayer
 
 	thumb_func_start sub_808F608
-sub_808F608: ; 808F608
+sub_808F608: @ 808F608
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -249458,7 +249458,7 @@ _0808F630:
 	thumb_func_end sub_808F608
 
 	thumb_func_start sub_808F638
-sub_808F638: ; 808F638
+sub_808F638: @ 808F638
 	push {lr}
 	movs r0, 0x1
 	lsls r1, 16
@@ -249471,7 +249471,7 @@ _0808F644:
 	thumb_func_end sub_808F638
 
 	thumb_func_start sub_808F648
-sub_808F648: ; 808F648
+sub_808F648: @ 808F648
 	push {lr}
 	movs r1, 0x4
 	lsls r0, 16
@@ -249485,7 +249485,7 @@ _0808F654:
 	thumb_func_end sub_808F648
 
 	thumb_func_start sub_808F65C
-sub_808F65C: ; 808F65C
+sub_808F65C: @ 808F65C
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r4, r0, 16
@@ -249535,7 +249535,7 @@ _0808F6B2:
 	thumb_func_end sub_808F65C
 
 	thumb_func_start sub_808F6B8
-sub_808F6B8: ; 808F6B8
+sub_808F6B8: @ 808F6B8
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r4, r0, 16
@@ -249585,7 +249585,7 @@ _0808F70E:
 	thumb_func_end sub_808F6B8
 
 	thumb_func_start sub_808F714
-sub_808F714: ; 808F714
+sub_808F714: @ 808F714
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r4, r0, 16
@@ -249635,7 +249635,7 @@ _0808F76A:
 	thumb_func_end sub_808F714
 
 	thumb_func_start sub_808F770
-sub_808F770: ; 808F770
+sub_808F770: @ 808F770
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r4, r0, 16
@@ -249685,7 +249685,7 @@ _0808F7C6:
 	thumb_func_end sub_808F770
 
 	thumb_func_start sub_808F7CC
-sub_808F7CC: ; 808F7CC
+sub_808F7CC: @ 808F7CC
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r7, r0, 16
@@ -249718,7 +249718,7 @@ _0808F802:
 	thumb_func_end sub_808F7CC
 
 	thumb_func_start sub_808F808
-sub_808F808: ; 808F808
+sub_808F808: @ 808F808
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r7, r0, 16
@@ -249751,7 +249751,7 @@ _0808F83E:
 	thumb_func_end sub_808F808
 
 	thumb_func_start sub_808F844
-sub_808F844: ; 808F844
+sub_808F844: @ 808F844
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r7, r0, 16
@@ -249784,7 +249784,7 @@ _0808F87A:
 	thumb_func_end sub_808F844
 
 	thumb_func_start sub_808F880
-sub_808F880: ; 808F880
+sub_808F880: @ 808F880
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r7, r0, 16
@@ -249817,7 +249817,7 @@ _0808F8B6:
 	thumb_func_end sub_808F880
 
 	thumb_func_start sub_808F8BC
-sub_808F8BC: ; 808F8BC
+sub_808F8BC: @ 808F8BC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -249889,7 +249889,7 @@ _0808F938:
 	thumb_func_end sub_808F8BC
 
 	thumb_func_start FieldObjectCB_LookRandomDirections
-FieldObjectCB_LookRandomDirections: ; 808F944
+FieldObjectCB_LookRandomDirections: @ 808F944
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -249907,8 +249907,8 @@ FieldObjectCB_LookRandomDirections: ; 808F944
 	thumb_func_end FieldObjectCB_LookRandomDirections
 
 	thumb_func_start FieldObjectCB2_LookRandomDirections
-; bool8 FieldObjectCB2_LookRandomDirections(struct npc_state *fieldObject, struct obj *object)
-FieldObjectCB2_LookRandomDirections: ; 808F968
+@ bool8 FieldObjectCB2_LookRandomDirections(struct npc_state *fieldObject, struct obj *object)
+FieldObjectCB2_LookRandomDirections: @ 808F968
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D740
 	movs r4, 0x30
@@ -249926,8 +249926,8 @@ FieldObjectCB2_LookRandomDirections: ; 808F968
 	thumb_func_end FieldObjectCB2_LookRandomDirections
 
 	thumb_func_start sub_808F988
-; bool8 sub_808F988(struct npc_state *fieldObject, struct obj *object)
-sub_808F988: ; 808F988
+@ bool8 sub_808F988(struct npc_state *fieldObject, struct obj *object)
+sub_808F988: @ 808F988
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -249939,8 +249939,8 @@ sub_808F988: ; 808F988
 	thumb_func_end sub_808F988
 
 	thumb_func_start sub_808F99C
-; bool8 sub_808F99C(struct npc_state *fieldObject, struct obj *object)
-sub_808F99C: ; 808F99C
+@ bool8 sub_808F99C(struct npc_state *fieldObject, struct obj *object)
+sub_808F99C: @ 808F99C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -249963,8 +249963,8 @@ sub_808F99C: ; 808F99C
 	thumb_func_end sub_808F99C
 
 	thumb_func_start sub_808F9C8
-; bool8 sub_808F9C8(struct npc_state *fieldObject, struct obj *object)
-sub_808F9C8: ; 808F9C8
+@ bool8 sub_808F9C8(struct npc_state *fieldObject, struct obj *object)
+sub_808F9C8: @ 808F9C8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -249998,8 +249998,8 @@ _0808F9FE:
 	thumb_func_end sub_808F9C8
 
 	thumb_func_start sub_808FA0C
-; bool8 sub_808FA0C(struct npc_state *fieldObject, struct obj *object)
-sub_808FA0C: ; 808FA0C
+@ bool8 sub_808FA0C(struct npc_state *fieldObject, struct obj *object)
+sub_808FA0C: @ 808FA0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250027,8 +250027,8 @@ _0808FA34:
 	thumb_func_end sub_808FA0C
 
 	thumb_func_start sub_808FA3C
-; bool8 sub_808FA3C(struct npc_state *fieldObject, struct obj *object)
-sub_808FA3C: ; 808FA3C
+@ bool8 sub_808FA3C(struct npc_state *fieldObject, struct obj *object)
+sub_808FA3C: @ 808FA3C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -250063,7 +250063,7 @@ _0808FA6C:
 	thumb_func_end sub_808FA3C
 
 	thumb_func_start FieldObjectCB_RandomlyGoNorthOrSouth
-FieldObjectCB_RandomlyGoNorthOrSouth: ; 808FA84
+FieldObjectCB_RandomlyGoNorthOrSouth: @ 808FA84
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -250081,7 +250081,7 @@ FieldObjectCB_RandomlyGoNorthOrSouth: ; 808FA84
 	thumb_func_end FieldObjectCB_RandomlyGoNorthOrSouth
 
 	thumb_func_start FieldObjectCB2_RandomlyGoNorthOrSouth
-FieldObjectCB2_RandomlyGoNorthOrSouth: ; 808FAA8
+FieldObjectCB2_RandomlyGoNorthOrSouth: @ 808FAA8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D754
 	movs r4, 0x30
@@ -250099,7 +250099,7 @@ FieldObjectCB2_RandomlyGoNorthOrSouth: ; 808FAA8
 	thumb_func_end FieldObjectCB2_RandomlyGoNorthOrSouth
 
 	thumb_func_start sub_808FAC8
-sub_808FAC8: ; 808FAC8
+sub_808FAC8: @ 808FAC8
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -250111,7 +250111,7 @@ sub_808FAC8: ; 808FAC8
 	thumb_func_end sub_808FAC8
 
 	thumb_func_start sub_808FADC
-sub_808FADC: ; 808FADC
+sub_808FADC: @ 808FADC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250134,8 +250134,8 @@ sub_808FADC: ; 808FADC
 	thumb_func_end sub_808FADC
 
 	thumb_func_start sub_808FB08
-; bool8 sub_808FB08(struct npc_state *fieldObject, struct obj *object)
-sub_808FB08: ; 808FB08
+@ bool8 sub_808FB08(struct npc_state *fieldObject, struct obj *object)
+sub_808FB08: @ 808FB08
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -250166,8 +250166,8 @@ _0808FB3E:
 	thumb_func_end sub_808FB08
 
 	thumb_func_start sub_808FB44
-; bool8 sub_808FB44(struct npc_state *fieldObject, struct obj *object)
-sub_808FB44: ; 808FB44
+@ bool8 sub_808FB44(struct npc_state *fieldObject, struct obj *object)
+sub_808FB44: @ 808FB44
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -250188,8 +250188,8 @@ _0808FB5E:
 	thumb_func_end sub_808FB44
 
 	thumb_func_start sub_808FB64
-; bool8 sub_808FB64(struct npc_state *fieldObject, struct obj *object)
-sub_808FB64: ; 808FB64
+@ bool8 sub_808FB64(struct npc_state *fieldObject, struct obj *object)
+sub_808FB64: @ 808FB64
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -250227,7 +250227,7 @@ _0808FBA2:
 	thumb_func_end sub_808FB64
 
 	thumb_func_start sub_808FBB0
-sub_808FBB0: ; 808FBB0
+sub_808FBB0: @ 808FBB0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250253,7 +250253,7 @@ sub_808FBB0: ; 808FBB0
 	thumb_func_end sub_808FBB0
 
 	thumb_func_start sub_808FBE0
-sub_808FBE0: ; 808FBE0
+sub_808FBE0: @ 808FBE0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250276,7 +250276,7 @@ _0808FBFE:
 	thumb_func_end sub_808FBE0
 
 	thumb_func_start FieldObjectCB_RandomlyGoEastOrWest
-FieldObjectCB_RandomlyGoEastOrWest: ; 808FC08
+FieldObjectCB_RandomlyGoEastOrWest: @ 808FC08
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -250294,7 +250294,7 @@ FieldObjectCB_RandomlyGoEastOrWest: ; 808FC08
 	thumb_func_end FieldObjectCB_RandomlyGoEastOrWest
 
 	thumb_func_start FieldObjectCB2_RandomlyGoEastOrWest
-FieldObjectCB2_RandomlyGoEastOrWest: ; 808FC2C
+FieldObjectCB2_RandomlyGoEastOrWest: @ 808FC2C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D774
 	movs r4, 0x30
@@ -250312,7 +250312,7 @@ FieldObjectCB2_RandomlyGoEastOrWest: ; 808FC2C
 	thumb_func_end FieldObjectCB2_RandomlyGoEastOrWest
 
 	thumb_func_start sub_808FC4C
-sub_808FC4C: ; 808FC4C
+sub_808FC4C: @ 808FC4C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -250324,7 +250324,7 @@ sub_808FC4C: ; 808FC4C
 	thumb_func_end sub_808FC4C
 
 	thumb_func_start sub_808FC60
-sub_808FC60: ; 808FC60
+sub_808FC60: @ 808FC60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250347,7 +250347,7 @@ sub_808FC60: ; 808FC60
 	thumb_func_end sub_808FC60
 
 	thumb_func_start sub_808FC8C
-sub_808FC8C: ; 808FC8C
+sub_808FC8C: @ 808FC8C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -250378,7 +250378,7 @@ _0808FCC2:
 	thumb_func_end sub_808FC8C
 
 	thumb_func_start sub_808FCC8
-sub_808FCC8: ; 808FCC8
+sub_808FCC8: @ 808FCC8
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -250399,7 +250399,7 @@ _0808FCE2:
 	thumb_func_end sub_808FCC8
 
 	thumb_func_start sub_808FCE8
-sub_808FCE8: ; 808FCE8
+sub_808FCE8: @ 808FCE8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -250437,7 +250437,7 @@ _0808FD26:
 	thumb_func_end sub_808FCE8
 
 	thumb_func_start sub_808FD34
-sub_808FD34: ; 808FD34
+sub_808FD34: @ 808FD34
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250463,7 +250463,7 @@ sub_808FD34: ; 808FD34
 	thumb_func_end sub_808FD34
 
 	thumb_func_start sub_808FD64
-sub_808FD64: ; 808FD64
+sub_808FD64: @ 808FD64
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250486,7 +250486,7 @@ _0808FD82:
 	thumb_func_end sub_808FD64
 
 	thumb_func_start FieldObjectCB_FaceFixedDirection
-FieldObjectCB_FaceFixedDirection: ; 808FD8C
+FieldObjectCB_FaceFixedDirection: @ 808FD8C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -250504,8 +250504,8 @@ FieldObjectCB_FaceFixedDirection: ; 808FD8C
 	thumb_func_end FieldObjectCB_FaceFixedDirection
 
 	thumb_func_start FieldObjectCB2_FaceFixedDirection
-; bool8 FieldObjectCB2_FaceFixedDirection(struct npc_state *fieldObject, struct obj *object)
-FieldObjectCB2_FaceFixedDirection: ; 808FDB0
+@ bool8 FieldObjectCB2_FaceFixedDirection(struct npc_state *fieldObject, struct obj *object)
+FieldObjectCB2_FaceFixedDirection: @ 808FDB0
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D794
 	movs r4, 0x30
@@ -250523,8 +250523,8 @@ FieldObjectCB2_FaceFixedDirection: ; 808FDB0
 	thumb_func_end FieldObjectCB2_FaceFixedDirection
 
 	thumb_func_start sub_808FDD0
-; bool8 sub_808FDD0(struct npc_state *fieldObject, struct obj *object)
-sub_808FDD0: ; 808FDD0
+@ bool8 sub_808FDD0(struct npc_state *fieldObject, struct obj *object)
+sub_808FDD0: @ 808FDD0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250547,8 +250547,8 @@ sub_808FDD0: ; 808FDD0
 	thumb_func_end sub_808FDD0
 
 	thumb_func_start sub_808FDFC
-; bool8 sub_808FDFC(struct npc_state *fieldObject, struct obj *object)
-sub_808FDFC: ; 808FDFC
+@ bool8 sub_808FDFC(struct npc_state *fieldObject, struct obj *object)
+sub_808FDFC: @ 808FDFC
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -250568,8 +250568,8 @@ _0808FE14:
 	thumb_func_end sub_808FDFC
 
 	thumb_func_start sub_808FE1C
-; bool8 sub_808FE1C(struct npc_state *fieldObject, struct obj *object)
-sub_808FE1C: ; 808FE1C
+@ bool8 sub_808FE1C(struct npc_state *fieldObject, struct obj *object)
+sub_808FE1C: @ 808FE1C
 	ldrb r2, [r0]
 	movs r1, 0x3
 	negs r1, r1
@@ -250580,7 +250580,7 @@ sub_808FE1C: ; 808FE1C
 	thumb_func_end sub_808FE1C
 
 	thumb_func_start FieldObjectCB_BerryTree
-FieldObjectCB_BerryTree: ; 808FE2C
+FieldObjectCB_BerryTree: @ 808FE2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -250614,7 +250614,7 @@ _0808FE58:
 	thumb_func_end FieldObjectCB_BerryTree
 
 	thumb_func_start FieldObjectCB2_BerryTree
-FieldObjectCB2_BerryTree: ; 808FE70
+FieldObjectCB2_BerryTree: @ 808FE70
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D7A0
 	movs r4, 0x30
@@ -250632,8 +250632,8 @@ FieldObjectCB2_BerryTree: ; 808FE70
 	thumb_func_end FieldObjectCB2_BerryTree
 
 	thumb_func_start do_berry_tree_growth_sparkle_1
-; bool8 do_berry_tree_growth_sparkle_1(struct npc_state *fieldObject, struct obj *object)
-do_berry_tree_growth_sparkle_1: ; 808FE90
+@ bool8 do_berry_tree_growth_sparkle_1(struct npc_state *fieldObject, struct obj *object)
+do_berry_tree_growth_sparkle_1: @ 808FE90
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250726,8 +250726,8 @@ _0808FF42:
 	thumb_func_end do_berry_tree_growth_sparkle_1
 
 	thumb_func_start sub_808FF48
-; bool8 sub_808FF48(struct npc_state *fieldObject, struct obj *object)
-sub_808FF48: ; 808FF48
+@ bool8 sub_808FF48(struct npc_state *fieldObject, struct obj *object)
+sub_808FF48: @ 808FF48
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -250747,8 +250747,8 @@ _0808FF60:
 	thumb_func_end sub_808FF48
 
 	thumb_func_start do_berry_tree_growth_sparkle_2
-; bool8 do_berry_tree_growth_sparkle_2(struct npc_state *fieldObject, struct obj *object)
-do_berry_tree_growth_sparkle_2: ; 808FF68
+@ bool8 do_berry_tree_growth_sparkle_2(struct npc_state *fieldObject, struct obj *object)
+do_berry_tree_growth_sparkle_2: @ 808FF68
 	push {r4,lr}
 	ldrb r2, [r0]
 	movs r3, 0x2
@@ -250788,8 +250788,8 @@ do_berry_tree_growth_sparkle_2: ; 808FF68
 	thumb_func_end do_berry_tree_growth_sparkle_2
 
 	thumb_func_start sub_808FFB4
-; bool8 sub_808FFB4(struct npc_state *fieldObject, struct obj *object)
-sub_808FFB4: ; 808FFB4
+@ bool8 sub_808FFB4(struct npc_state *fieldObject, struct obj *object)
+sub_808FFB4: @ 808FFB4
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -250834,8 +250834,8 @@ _0808FFFE:
 	thumb_func_end sub_808FFB4
 
 	thumb_func_start sub_8090004
-; bool8 sub_8090004(struct npc_state *fieldObject, struct obj *object)
-sub_8090004: ; 8090004
+@ bool8 sub_8090004(struct npc_state *fieldObject, struct obj *object)
+sub_8090004: @ 8090004
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrh r2, [r4, 0x32]
@@ -250878,7 +250878,7 @@ _08090048:
 	thumb_func_end sub_8090004
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrSouth
-FieldObjectCB_RandomlyLookNorthOrSouth: ; 8090050
+FieldObjectCB_RandomlyLookNorthOrSouth: @ 8090050
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -250896,7 +250896,7 @@ FieldObjectCB_RandomlyLookNorthOrSouth: ; 8090050
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrSouth
 
 	thumb_func_start FieldObjectCB2_RandomlyLookNorthOrSouth
-FieldObjectCB2_RandomlyLookNorthOrSouth: ; 8090074
+FieldObjectCB2_RandomlyLookNorthOrSouth: @ 8090074
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D7B4
 	movs r4, 0x30
@@ -250914,7 +250914,7 @@ FieldObjectCB2_RandomlyLookNorthOrSouth: ; 8090074
 	thumb_func_end FieldObjectCB2_RandomlyLookNorthOrSouth
 
 	thumb_func_start sub_8090094
-sub_8090094: ; 8090094
+sub_8090094: @ 8090094
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -250926,7 +250926,7 @@ sub_8090094: ; 8090094
 	thumb_func_end sub_8090094
 
 	thumb_func_start sub_80900A8
-sub_80900A8: ; 80900A8
+sub_80900A8: @ 80900A8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -250949,7 +250949,7 @@ sub_80900A8: ; 80900A8
 	thumb_func_end sub_80900A8
 
 	thumb_func_start sub_80900D4
-sub_80900D4: ; 80900D4
+sub_80900D4: @ 80900D4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -250983,7 +250983,7 @@ _0809010A:
 	thumb_func_end sub_80900D4
 
 	thumb_func_start sub_8090118
-sub_8090118: ; 8090118
+sub_8090118: @ 8090118
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251011,7 +251011,7 @@ _08090140:
 	thumb_func_end sub_8090118
 
 	thumb_func_start sub_8090148
-sub_8090148: ; 8090148
+sub_8090148: @ 8090148
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251046,7 +251046,7 @@ _08090178:
 	thumb_func_end sub_8090148
 
 	thumb_func_start FieldObjectCB_RandomlyLookEastOrWest
-FieldObjectCB_RandomlyLookEastOrWest: ; 8090190
+FieldObjectCB_RandomlyLookEastOrWest: @ 8090190
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251064,7 +251064,7 @@ FieldObjectCB_RandomlyLookEastOrWest: ; 8090190
 	thumb_func_end FieldObjectCB_RandomlyLookEastOrWest
 
 	thumb_func_start FieldObjectCB2_RandomlyLookEastOrWest
-FieldObjectCB2_RandomlyLookEastOrWest: ; 80901B4
+FieldObjectCB2_RandomlyLookEastOrWest: @ 80901B4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D7C8
 	movs r4, 0x30
@@ -251082,7 +251082,7 @@ FieldObjectCB2_RandomlyLookEastOrWest: ; 80901B4
 	thumb_func_end FieldObjectCB2_RandomlyLookEastOrWest
 
 	thumb_func_start sub_80901D4
-sub_80901D4: ; 80901D4
+sub_80901D4: @ 80901D4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251094,7 +251094,7 @@ sub_80901D4: ; 80901D4
 	thumb_func_end sub_80901D4
 
 	thumb_func_start sub_80901E8
-sub_80901E8: ; 80901E8
+sub_80901E8: @ 80901E8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251117,7 +251117,7 @@ sub_80901E8: ; 80901E8
 	thumb_func_end sub_80901E8
 
 	thumb_func_start sub_8090214
-sub_8090214: ; 8090214
+sub_8090214: @ 8090214
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251151,7 +251151,7 @@ _0809024A:
 	thumb_func_end sub_8090214
 
 	thumb_func_start sub_8090258
-sub_8090258: ; 8090258
+sub_8090258: @ 8090258
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251179,7 +251179,7 @@ _08090280:
 	thumb_func_end sub_8090258
 
 	thumb_func_start sub_8090288
-sub_8090288: ; 8090288
+sub_8090288: @ 8090288
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251214,7 +251214,7 @@ _080902B8:
 	thumb_func_end sub_8090288
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrWest
-FieldObjectCB_RandomlyLookNorthOrWest: ; 80902D0
+FieldObjectCB_RandomlyLookNorthOrWest: @ 80902D0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251232,7 +251232,7 @@ FieldObjectCB_RandomlyLookNorthOrWest: ; 80902D0
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrWest
 
 	thumb_func_start FieldObjectCB2_RandomlyLookNorthOrWest
-FieldObjectCB2_RandomlyLookNorthOrWest: ; 80902F4
+FieldObjectCB2_RandomlyLookNorthOrWest: @ 80902F4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D7DC
 	movs r4, 0x30
@@ -251250,7 +251250,7 @@ FieldObjectCB2_RandomlyLookNorthOrWest: ; 80902F4
 	thumb_func_end FieldObjectCB2_RandomlyLookNorthOrWest
 
 	thumb_func_start sub_8090314
-sub_8090314: ; 8090314
+sub_8090314: @ 8090314
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251262,7 +251262,7 @@ sub_8090314: ; 8090314
 	thumb_func_end sub_8090314
 
 	thumb_func_start sub_8090328
-sub_8090328: ; 8090328
+sub_8090328: @ 8090328
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251285,7 +251285,7 @@ sub_8090328: ; 8090328
 	thumb_func_end sub_8090328
 
 	thumb_func_start sub_8090354
-sub_8090354: ; 8090354
+sub_8090354: @ 8090354
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251319,7 +251319,7 @@ _0809038A:
 	thumb_func_end sub_8090354
 
 	thumb_func_start sub_8090398
-sub_8090398: ; 8090398
+sub_8090398: @ 8090398
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251347,7 +251347,7 @@ _080903C0:
 	thumb_func_end sub_8090398
 
 	thumb_func_start sub_80903C8
-sub_80903C8: ; 80903C8
+sub_80903C8: @ 80903C8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251382,7 +251382,7 @@ _080903F8:
 	thumb_func_end sub_80903C8
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrEast
-FieldObjectCB_RandomlyLookNorthOrEast: ; 8090410
+FieldObjectCB_RandomlyLookNorthOrEast: @ 8090410
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251400,7 +251400,7 @@ FieldObjectCB_RandomlyLookNorthOrEast: ; 8090410
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrEast
 
 	thumb_func_start sub_8090434
-sub_8090434: ; 8090434
+sub_8090434: @ 8090434
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D7F4
 	movs r4, 0x30
@@ -251418,7 +251418,7 @@ sub_8090434: ; 8090434
 	thumb_func_end sub_8090434
 
 	thumb_func_start sub_8090454
-sub_8090454: ; 8090454
+sub_8090454: @ 8090454
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251430,7 +251430,7 @@ sub_8090454: ; 8090454
 	thumb_func_end sub_8090454
 
 	thumb_func_start sub_8090468
-sub_8090468: ; 8090468
+sub_8090468: @ 8090468
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251453,7 +251453,7 @@ sub_8090468: ; 8090468
 	thumb_func_end sub_8090468
 
 	thumb_func_start sub_8090494
-sub_8090494: ; 8090494
+sub_8090494: @ 8090494
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251487,7 +251487,7 @@ _080904CA:
 	thumb_func_end sub_8090494
 
 	thumb_func_start sub_80904D8
-sub_80904D8: ; 80904D8
+sub_80904D8: @ 80904D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251515,7 +251515,7 @@ _08090500:
 	thumb_func_end sub_80904D8
 
 	thumb_func_start sub_8090508
-sub_8090508: ; 8090508
+sub_8090508: @ 8090508
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251550,7 +251550,7 @@ _08090538:
 	thumb_func_end sub_8090508
 
 	thumb_func_start FieldObjectCB_RandomlyLookSouthOrWest
-FieldObjectCB_RandomlyLookSouthOrWest: ; 8090550
+FieldObjectCB_RandomlyLookSouthOrWest: @ 8090550
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251568,7 +251568,7 @@ FieldObjectCB_RandomlyLookSouthOrWest: ; 8090550
 	thumb_func_end FieldObjectCB_RandomlyLookSouthOrWest
 
 	thumb_func_start sub_8090574
-sub_8090574: ; 8090574
+sub_8090574: @ 8090574
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D80C
 	movs r4, 0x30
@@ -251586,7 +251586,7 @@ sub_8090574: ; 8090574
 	thumb_func_end sub_8090574
 
 	thumb_func_start sub_8090594
-sub_8090594: ; 8090594
+sub_8090594: @ 8090594
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251598,7 +251598,7 @@ sub_8090594: ; 8090594
 	thumb_func_end sub_8090594
 
 	thumb_func_start sub_80905A8
-sub_80905A8: ; 80905A8
+sub_80905A8: @ 80905A8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251621,7 +251621,7 @@ sub_80905A8: ; 80905A8
 	thumb_func_end sub_80905A8
 
 	thumb_func_start sub_80905D4
-sub_80905D4: ; 80905D4
+sub_80905D4: @ 80905D4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251655,7 +251655,7 @@ _0809060A:
 	thumb_func_end sub_80905D4
 
 	thumb_func_start sub_8090618
-sub_8090618: ; 8090618
+sub_8090618: @ 8090618
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251683,7 +251683,7 @@ _08090640:
 	thumb_func_end sub_8090618
 
 	thumb_func_start sub_8090648
-sub_8090648: ; 8090648
+sub_8090648: @ 8090648
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251718,7 +251718,7 @@ _08090678:
 	thumb_func_end sub_8090648
 
 	thumb_func_start FieldObjectCB_RandomlyLookSouthOrEast
-FieldObjectCB_RandomlyLookSouthOrEast: ; 8090690
+FieldObjectCB_RandomlyLookSouthOrEast: @ 8090690
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251736,7 +251736,7 @@ FieldObjectCB_RandomlyLookSouthOrEast: ; 8090690
 	thumb_func_end FieldObjectCB_RandomlyLookSouthOrEast
 
 	thumb_func_start sub_80906B4
-sub_80906B4: ; 80906B4
+sub_80906B4: @ 80906B4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D824
 	movs r4, 0x30
@@ -251754,7 +251754,7 @@ sub_80906B4: ; 80906B4
 	thumb_func_end sub_80906B4
 
 	thumb_func_start sub_80906D4
-sub_80906D4: ; 80906D4
+sub_80906D4: @ 80906D4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251766,7 +251766,7 @@ sub_80906D4: ; 80906D4
 	thumb_func_end sub_80906D4
 
 	thumb_func_start sub_80906E8
-sub_80906E8: ; 80906E8
+sub_80906E8: @ 80906E8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251789,7 +251789,7 @@ sub_80906E8: ; 80906E8
 	thumb_func_end sub_80906E8
 
 	thumb_func_start sub_8090714
-sub_8090714: ; 8090714
+sub_8090714: @ 8090714
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251823,7 +251823,7 @@ _0809074A:
 	thumb_func_end sub_8090714
 
 	thumb_func_start sub_8090758
-sub_8090758: ; 8090758
+sub_8090758: @ 8090758
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251851,7 +251851,7 @@ _08090780:
 	thumb_func_end sub_8090758
 
 	thumb_func_start sub_8090788
-sub_8090788: ; 8090788
+sub_8090788: @ 8090788
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -251886,7 +251886,7 @@ _080907B8:
 	thumb_func_end sub_8090788
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrSouthOrWest
-FieldObjectCB_RandomlyLookNorthOrSouthOrWest: ; 80907D0
+FieldObjectCB_RandomlyLookNorthOrSouthOrWest: @ 80907D0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -251904,7 +251904,7 @@ FieldObjectCB_RandomlyLookNorthOrSouthOrWest: ; 80907D0
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrSouthOrWest
 
 	thumb_func_start sub_80907F4
-sub_80907F4: ; 80907F4
+sub_80907F4: @ 80907F4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D83C
 	movs r4, 0x30
@@ -251922,7 +251922,7 @@ sub_80907F4: ; 80907F4
 	thumb_func_end sub_80907F4
 
 	thumb_func_start sub_8090814
-sub_8090814: ; 8090814
+sub_8090814: @ 8090814
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -251934,7 +251934,7 @@ sub_8090814: ; 8090814
 	thumb_func_end sub_8090814
 
 	thumb_func_start sub_8090828
-sub_8090828: ; 8090828
+sub_8090828: @ 8090828
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -251957,7 +251957,7 @@ sub_8090828: ; 8090828
 	thumb_func_end sub_8090828
 
 	thumb_func_start sub_8090854
-sub_8090854: ; 8090854
+sub_8090854: @ 8090854
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -251991,7 +251991,7 @@ _0809088A:
 	thumb_func_end sub_8090854
 
 	thumb_func_start sub_8090898
-sub_8090898: ; 8090898
+sub_8090898: @ 8090898
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252019,7 +252019,7 @@ _080908C0:
 	thumb_func_end sub_8090898
 
 	thumb_func_start sub_80908C8
-sub_80908C8: ; 80908C8
+sub_80908C8: @ 80908C8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -252054,7 +252054,7 @@ _080908F8:
 	thumb_func_end sub_80908C8
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrSouthOrEast
-FieldObjectCB_RandomlyLookNorthOrSouthOrEast: ; 8090910
+FieldObjectCB_RandomlyLookNorthOrSouthOrEast: @ 8090910
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252072,7 +252072,7 @@ FieldObjectCB_RandomlyLookNorthOrSouthOrEast: ; 8090910
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrSouthOrEast
 
 	thumb_func_start sub_8090934
-sub_8090934: ; 8090934
+sub_8090934: @ 8090934
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D854
 	movs r4, 0x30
@@ -252090,7 +252090,7 @@ sub_8090934: ; 8090934
 	thumb_func_end sub_8090934
 
 	thumb_func_start sub_8090954
-sub_8090954: ; 8090954
+sub_8090954: @ 8090954
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -252102,7 +252102,7 @@ sub_8090954: ; 8090954
 	thumb_func_end sub_8090954
 
 	thumb_func_start sub_8090968
-sub_8090968: ; 8090968
+sub_8090968: @ 8090968
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252125,7 +252125,7 @@ sub_8090968: ; 8090968
 	thumb_func_end sub_8090968
 
 	thumb_func_start sub_8090994
-sub_8090994: ; 8090994
+sub_8090994: @ 8090994
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -252159,7 +252159,7 @@ _080909CA:
 	thumb_func_end sub_8090994
 
 	thumb_func_start sub_80909D8
-sub_80909D8: ; 80909D8
+sub_80909D8: @ 80909D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252187,7 +252187,7 @@ _08090A00:
 	thumb_func_end sub_80909D8
 
 	thumb_func_start sub_8090A08
-sub_8090A08: ; 8090A08
+sub_8090A08: @ 8090A08
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -252222,7 +252222,7 @@ _08090A38:
 	thumb_func_end sub_8090A08
 
 	thumb_func_start FieldObjectCB_RandomlyLookNorthOrEastOrWest
-FieldObjectCB_RandomlyLookNorthOrEastOrWest: ; 8090A50
+FieldObjectCB_RandomlyLookNorthOrEastOrWest: @ 8090A50
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252240,7 +252240,7 @@ FieldObjectCB_RandomlyLookNorthOrEastOrWest: ; 8090A50
 	thumb_func_end FieldObjectCB_RandomlyLookNorthOrEastOrWest
 
 	thumb_func_start sub_8090A74
-sub_8090A74: ; 8090A74
+sub_8090A74: @ 8090A74
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D86C
 	movs r4, 0x30
@@ -252258,7 +252258,7 @@ sub_8090A74: ; 8090A74
 	thumb_func_end sub_8090A74
 
 	thumb_func_start sub_8090A94
-sub_8090A94: ; 8090A94
+sub_8090A94: @ 8090A94
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -252270,7 +252270,7 @@ sub_8090A94: ; 8090A94
 	thumb_func_end sub_8090A94
 
 	thumb_func_start sub_8090AA8
-sub_8090AA8: ; 8090AA8
+sub_8090AA8: @ 8090AA8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252293,7 +252293,7 @@ sub_8090AA8: ; 8090AA8
 	thumb_func_end sub_8090AA8
 
 	thumb_func_start sub_8090AD4
-sub_8090AD4: ; 8090AD4
+sub_8090AD4: @ 8090AD4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -252327,7 +252327,7 @@ _08090B0A:
 	thumb_func_end sub_8090AD4
 
 	thumb_func_start sub_8090B18
-sub_8090B18: ; 8090B18
+sub_8090B18: @ 8090B18
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252355,7 +252355,7 @@ _08090B40:
 	thumb_func_end sub_8090B18
 
 	thumb_func_start sub_8090B48
-sub_8090B48: ; 8090B48
+sub_8090B48: @ 8090B48
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -252390,7 +252390,7 @@ _08090B78:
 	thumb_func_end sub_8090B48
 
 	thumb_func_start FieldObjectCB_RandomlyLookSouthOrEastOrWest
-FieldObjectCB_RandomlyLookSouthOrEastOrWest: ; 8090B90
+FieldObjectCB_RandomlyLookSouthOrEastOrWest: @ 8090B90
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252408,7 +252408,7 @@ FieldObjectCB_RandomlyLookSouthOrEastOrWest: ; 8090B90
 	thumb_func_end FieldObjectCB_RandomlyLookSouthOrEastOrWest
 
 	thumb_func_start sub_8090BB4
-sub_8090BB4: ; 8090BB4
+sub_8090BB4: @ 8090BB4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D884
 	movs r4, 0x30
@@ -252426,7 +252426,7 @@ sub_8090BB4: ; 8090BB4
 	thumb_func_end sub_8090BB4
 
 	thumb_func_start sub_8090BD4
-sub_8090BD4: ; 8090BD4
+sub_8090BD4: @ 8090BD4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -252438,7 +252438,7 @@ sub_8090BD4: ; 8090BD4
 	thumb_func_end sub_8090BD4
 
 	thumb_func_start sub_8090BE8
-sub_8090BE8: ; 8090BE8
+sub_8090BE8: @ 8090BE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252461,7 +252461,7 @@ sub_8090BE8: ; 8090BE8
 	thumb_func_end sub_8090BE8
 
 	thumb_func_start sub_8090C14
-sub_8090C14: ; 8090C14
+sub_8090C14: @ 8090C14
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -252495,7 +252495,7 @@ _08090C4A:
 	thumb_func_end sub_8090C14
 
 	thumb_func_start sub_8090C58
-sub_8090C58: ; 8090C58
+sub_8090C58: @ 8090C58
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252523,7 +252523,7 @@ _08090C80:
 	thumb_func_end sub_8090C58
 
 	thumb_func_start sub_8090C88
-sub_8090C88: ; 8090C88
+sub_8090C88: @ 8090C88
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -252558,7 +252558,7 @@ _08090CB8:
 	thumb_func_end sub_8090C88
 
 	thumb_func_start FieldObjectCB_LookAroundCounterclockwise
-FieldObjectCB_LookAroundCounterclockwise: ; 8090CD0
+FieldObjectCB_LookAroundCounterclockwise: @ 8090CD0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252576,7 +252576,7 @@ FieldObjectCB_LookAroundCounterclockwise: ; 8090CD0
 	thumb_func_end FieldObjectCB_LookAroundCounterclockwise
 
 	thumb_func_start sub_8090CF4
-sub_8090CF4: ; 8090CF4
+sub_8090CF4: @ 8090CF4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D89C
 	movs r4, 0x30
@@ -252594,7 +252594,7 @@ sub_8090CF4: ; 8090CF4
 	thumb_func_end sub_8090CF4
 
 	thumb_func_start sub_8090D14
-sub_8090D14: ; 8090D14
+sub_8090D14: @ 8090D14
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252617,7 +252617,7 @@ sub_8090D14: ; 8090D14
 	thumb_func_end sub_8090D14
 
 	thumb_func_start sub_8090D40
-sub_8090D40: ; 8090D40
+sub_8090D40: @ 8090D40
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -252637,7 +252637,7 @@ _08090D5A:
 	thumb_func_end sub_8090D40
 
 	thumb_func_start sub_8090D64
-sub_8090D64: ; 8090D64
+sub_8090D64: @ 8090D64
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252662,8 +252662,8 @@ _08090D86:
 	thumb_func_end sub_8090D64
 
 	thumb_func_start sub_8090D90
-; bool8 sub_8090D90(struct npc_state *fieldObject, struct obj *object)
-sub_8090D90: ; 8090D90
+@ bool8 sub_8090D90(struct npc_state *fieldObject, struct obj *object)
+sub_8090D90: @ 8090D90
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -252698,7 +252698,7 @@ _08090DBC:
 	thumb_func_end sub_8090D90
 
 	thumb_func_start FieldObjectCB_LookAroundClockwise
-FieldObjectCB_LookAroundClockwise: ; 8090DD4
+FieldObjectCB_LookAroundClockwise: @ 8090DD4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252716,7 +252716,7 @@ FieldObjectCB_LookAroundClockwise: ; 8090DD4
 	thumb_func_end FieldObjectCB_LookAroundClockwise
 
 	thumb_func_start sub_8090DF8
-sub_8090DF8: ; 8090DF8
+sub_8090DF8: @ 8090DF8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D8B4
 	movs r4, 0x30
@@ -252734,7 +252734,7 @@ sub_8090DF8: ; 8090DF8
 	thumb_func_end sub_8090DF8
 
 	thumb_func_start sub_8090E18
-sub_8090E18: ; 8090E18
+sub_8090E18: @ 8090E18
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252757,7 +252757,7 @@ sub_8090E18: ; 8090E18
 	thumb_func_end sub_8090E18
 
 	thumb_func_start sub_8090E44
-sub_8090E44: ; 8090E44
+sub_8090E44: @ 8090E44
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -252777,7 +252777,7 @@ _08090E5E:
 	thumb_func_end sub_8090E44
 
 	thumb_func_start sub_8090E68
-sub_8090E68: ; 8090E68
+sub_8090E68: @ 8090E68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252802,7 +252802,7 @@ _08090E8A:
 	thumb_func_end sub_8090E68
 
 	thumb_func_start sub_8090E94
-sub_8090E94: ; 8090E94
+sub_8090E94: @ 8090E94
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -252837,7 +252837,7 @@ _08090EC0:
 	thumb_func_end sub_8090E94
 
 	thumb_func_start FieldObjectCB_AlternatelyGoInOppositeDirections
-FieldObjectCB_AlternatelyGoInOppositeDirections: ; 8090ED8
+FieldObjectCB_AlternatelyGoInOppositeDirections: @ 8090ED8
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -252855,7 +252855,7 @@ FieldObjectCB_AlternatelyGoInOppositeDirections: ; 8090ED8
 	thumb_func_end FieldObjectCB_AlternatelyGoInOppositeDirections
 
 	thumb_func_start sub_8090EFC
-sub_8090EFC: ; 8090EFC
+sub_8090EFC: @ 8090EFC
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D8CC
 	movs r4, 0x30
@@ -252873,7 +252873,7 @@ sub_8090EFC: ; 8090EFC
 	thumb_func_end sub_8090EFC
 
 	thumb_func_start sub_8090F1C
-sub_8090F1C: ; 8090F1C
+sub_8090F1C: @ 8090F1C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -252885,8 +252885,8 @@ sub_8090F1C: ; 8090F1C
 	thumb_func_end sub_8090F1C
 
 	thumb_func_start sub_8090F30
-; bool8 sub_8090F30(struct npc_state *fieldObject, struct obj *object)
-sub_8090F30: ; 8090F30
+@ bool8 sub_8090F30(struct npc_state *fieldObject, struct obj *object)
+sub_8090F30: @ 8090F30
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -252916,8 +252916,8 @@ _08090F52:
 	thumb_func_end sub_8090F30
 
 	thumb_func_start sub_8090F68
-; bool8 sub_8090F68(struct npc_state *fieldObject, struct obj *object)
-sub_8090F68: ; 8090F68
+@ bool8 sub_8090F68(struct npc_state *fieldObject, struct obj *object)
+sub_8090F68: @ 8090F68
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r7, r1, 0
@@ -253005,8 +253005,8 @@ _08091000:
 	thumb_func_end sub_8090F68
 
 	thumb_func_start sub_8091020
-; bool8 sub_8091020(struct npc_state *fieldObject, struct obj *object)
-sub_8091020: ; 8091020
+@ bool8 sub_8091020(struct npc_state *fieldObject, struct obj *object)
+sub_8091020: @ 8091020
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -253029,8 +253029,8 @@ _0809103E:
 	thumb_func_end sub_8091020
 
 	thumb_func_start sub_8091048
-; bool8 sub_8091048(struct npc_state *fieldObject, struct obj *object)
-sub_8091048: ; 8091048
+@ bool8 sub_8091048(struct npc_state *fieldObject, struct obj *object)
+sub_8091048: @ 8091048
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_reset
@@ -253042,8 +253042,8 @@ sub_8091048: ; 8091048
 	thumb_func_end sub_8091048
 
 	thumb_func_start MoveFieldObjectInNextDirectionInSequence
-; bool8 MoveFieldObjectInNextDirectionInSequence(struct npc_state *fieldObject, struct obj *object, u8 *directions)
-MoveFieldObjectInNextDirectionInSequence: ; 809105C
+@ bool8 MoveFieldObjectInNextDirectionInSequence(struct npc_state *fieldObject, struct obj *object, u8 *directions)
+MoveFieldObjectInNextDirectionInSequence: @ 809105C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -253131,8 +253131,8 @@ _080910EA:
 	thumb_func_end MoveFieldObjectInNextDirectionInSequence
 
 	thumb_func_start sub_8091110
-; bool8 sub_8091110(struct npc_state *fieldObject, struct obj *object)
-sub_8091110: ; 8091110
+@ bool8 sub_8091110(struct npc_state *fieldObject, struct obj *object)
+sub_8091110: @ 8091110
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -253155,7 +253155,7 @@ _0809112E:
 	thumb_func_end sub_8091110
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence1
-FieldObjectCB_GoInDirectionSequence1: ; 8091138
+FieldObjectCB_GoInDirectionSequence1: @ 8091138
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253173,7 +253173,7 @@ FieldObjectCB_GoInDirectionSequence1: ; 8091138
 	thumb_func_end FieldObjectCB_GoInDirectionSequence1
 
 	thumb_func_start sub_809115C
-sub_809115C: ; 809115C
+sub_809115C: @ 809115C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D8DC
 	movs r4, 0x30
@@ -253191,7 +253191,7 @@ sub_809115C: ; 809115C
 	thumb_func_end sub_809115C
 
 	thumb_func_start sub_809117C
-sub_809117C: ; 809117C
+sub_809117C: @ 809117C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253228,7 +253228,7 @@ _080911A8:
 	thumb_func_end sub_809117C
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence2
-FieldObjectCB_GoInDirectionSequence2: ; 80911C4
+FieldObjectCB_GoInDirectionSequence2: @ 80911C4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253246,7 +253246,7 @@ FieldObjectCB_GoInDirectionSequence2: ; 80911C4
 	thumb_func_end FieldObjectCB_GoInDirectionSequence2
 
 	thumb_func_start sub_80911E8
-sub_80911E8: ; 80911E8
+sub_80911E8: @ 80911E8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D8EC
 	movs r4, 0x30
@@ -253264,7 +253264,7 @@ sub_80911E8: ; 80911E8
 	thumb_func_end sub_80911E8
 
 	thumb_func_start sub_8091208
-sub_8091208: ; 8091208
+sub_8091208: @ 8091208
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253301,7 +253301,7 @@ _08091234:
 	thumb_func_end sub_8091208
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence3
-FieldObjectCB_GoInDirectionSequence3: ; 8091250
+FieldObjectCB_GoInDirectionSequence3: @ 8091250
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253319,7 +253319,7 @@ FieldObjectCB_GoInDirectionSequence3: ; 8091250
 	thumb_func_end FieldObjectCB_GoInDirectionSequence3
 
 	thumb_func_start sub_8091274
-sub_8091274: ; 8091274
+sub_8091274: @ 8091274
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D8FC
 	movs r4, 0x30
@@ -253337,7 +253337,7 @@ sub_8091274: ; 8091274
 	thumb_func_end sub_8091274
 
 	thumb_func_start sub_8091294
-sub_8091294: ; 8091294
+sub_8091294: @ 8091294
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253374,7 +253374,7 @@ _080912C0:
 	thumb_func_end sub_8091294
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence4
-FieldObjectCB_GoInDirectionSequence4: ; 80912DC
+FieldObjectCB_GoInDirectionSequence4: @ 80912DC
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253392,7 +253392,7 @@ FieldObjectCB_GoInDirectionSequence4: ; 80912DC
 	thumb_func_end FieldObjectCB_GoInDirectionSequence4
 
 	thumb_func_start sub_8091300
-sub_8091300: ; 8091300
+sub_8091300: @ 8091300
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D90C
 	movs r4, 0x30
@@ -253410,7 +253410,7 @@ sub_8091300: ; 8091300
 	thumb_func_end sub_8091300
 
 	thumb_func_start sub_8091320
-sub_8091320: ; 8091320
+sub_8091320: @ 8091320
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253447,7 +253447,7 @@ _0809134C:
 	thumb_func_end sub_8091320
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence5
-FieldObjectCB_GoInDirectionSequence5: ; 8091368
+FieldObjectCB_GoInDirectionSequence5: @ 8091368
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253465,7 +253465,7 @@ FieldObjectCB_GoInDirectionSequence5: ; 8091368
 	thumb_func_end FieldObjectCB_GoInDirectionSequence5
 
 	thumb_func_start sub_809138C
-sub_809138C: ; 809138C
+sub_809138C: @ 809138C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D91C
 	movs r4, 0x30
@@ -253483,8 +253483,8 @@ sub_809138C: ; 809138C
 	thumb_func_end sub_809138C
 
 	thumb_func_start sub_80913AC
-; bool8 sub_80913AC(struct npc_state *fieldObject, struct obj *object)
-sub_80913AC: ; 80913AC
+@ bool8 sub_80913AC(struct npc_state *fieldObject, struct obj *object)
+sub_80913AC: @ 80913AC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253521,7 +253521,7 @@ _080913D8:
 	thumb_func_end sub_80913AC
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence6
-FieldObjectCB_GoInDirectionSequence6: ; 80913F4
+FieldObjectCB_GoInDirectionSequence6: @ 80913F4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253539,7 +253539,7 @@ FieldObjectCB_GoInDirectionSequence6: ; 80913F4
 	thumb_func_end FieldObjectCB_GoInDirectionSequence6
 
 	thumb_func_start sub_8091418
-sub_8091418: ; 8091418
+sub_8091418: @ 8091418
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D92C
 	movs r4, 0x30
@@ -253557,7 +253557,7 @@ sub_8091418: ; 8091418
 	thumb_func_end sub_8091418
 
 	thumb_func_start sub_8091438
-sub_8091438: ; 8091438
+sub_8091438: @ 8091438
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253594,7 +253594,7 @@ _08091464:
 	thumb_func_end sub_8091438
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence7
-FieldObjectCB_GoInDirectionSequence7: ; 8091480
+FieldObjectCB_GoInDirectionSequence7: @ 8091480
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253612,7 +253612,7 @@ FieldObjectCB_GoInDirectionSequence7: ; 8091480
 	thumb_func_end FieldObjectCB_GoInDirectionSequence7
 
 	thumb_func_start sub_80914A4
-sub_80914A4: ; 80914A4
+sub_80914A4: @ 80914A4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D93C
 	movs r4, 0x30
@@ -253630,7 +253630,7 @@ sub_80914A4: ; 80914A4
 	thumb_func_end sub_80914A4
 
 	thumb_func_start sub_80914C4
-sub_80914C4: ; 80914C4
+sub_80914C4: @ 80914C4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253667,7 +253667,7 @@ _080914F0:
 	thumb_func_end sub_80914C4
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence8
-FieldObjectCB_GoInDirectionSequence8: ; 809150C
+FieldObjectCB_GoInDirectionSequence8: @ 809150C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253685,7 +253685,7 @@ FieldObjectCB_GoInDirectionSequence8: ; 809150C
 	thumb_func_end FieldObjectCB_GoInDirectionSequence8
 
 	thumb_func_start sub_8091530
-sub_8091530: ; 8091530
+sub_8091530: @ 8091530
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D948
 	movs r4, 0x30
@@ -253703,7 +253703,7 @@ sub_8091530: ; 8091530
 	thumb_func_end sub_8091530
 
 	thumb_func_start sub_8091550
-sub_8091550: ; 8091550
+sub_8091550: @ 8091550
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253740,7 +253740,7 @@ _0809157C:
 	thumb_func_end sub_8091550
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence9
-FieldObjectCB_GoInDirectionSequence9: ; 8091598
+FieldObjectCB_GoInDirectionSequence9: @ 8091598
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253758,7 +253758,7 @@ FieldObjectCB_GoInDirectionSequence9: ; 8091598
 	thumb_func_end FieldObjectCB_GoInDirectionSequence9
 
 	thumb_func_start sub_80915BC
-sub_80915BC: ; 80915BC
+sub_80915BC: @ 80915BC
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D958
 	movs r4, 0x30
@@ -253776,7 +253776,7 @@ sub_80915BC: ; 80915BC
 	thumb_func_end sub_80915BC
 
 	thumb_func_start sub_80915DC
-sub_80915DC: ; 80915DC
+sub_80915DC: @ 80915DC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253813,7 +253813,7 @@ _08091608:
 	thumb_func_end sub_80915DC
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence10
-FieldObjectCB_GoInDirectionSequence10: ; 8091624
+FieldObjectCB_GoInDirectionSequence10: @ 8091624
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253831,7 +253831,7 @@ FieldObjectCB_GoInDirectionSequence10: ; 8091624
 	thumb_func_end FieldObjectCB_GoInDirectionSequence10
 
 	thumb_func_start sub_8091648
-sub_8091648: ; 8091648
+sub_8091648: @ 8091648
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D968
 	movs r4, 0x30
@@ -253849,7 +253849,7 @@ sub_8091648: ; 8091648
 	thumb_func_end sub_8091648
 
 	thumb_func_start sub_8091668
-sub_8091668: ; 8091668
+sub_8091668: @ 8091668
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253886,7 +253886,7 @@ _08091694:
 	thumb_func_end sub_8091668
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence11
-FieldObjectCB_GoInDirectionSequence11: ; 80916B0
+FieldObjectCB_GoInDirectionSequence11: @ 80916B0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253904,7 +253904,7 @@ FieldObjectCB_GoInDirectionSequence11: ; 80916B0
 	thumb_func_end FieldObjectCB_GoInDirectionSequence11
 
 	thumb_func_start sub_80916D4
-sub_80916D4: ; 80916D4
+sub_80916D4: @ 80916D4
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D978
 	movs r4, 0x30
@@ -253922,7 +253922,7 @@ sub_80916D4: ; 80916D4
 	thumb_func_end sub_80916D4
 
 	thumb_func_start sub_80916F4
-sub_80916F4: ; 80916F4
+sub_80916F4: @ 80916F4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -253959,7 +253959,7 @@ _08091720:
 	thumb_func_end sub_80916F4
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence12
-FieldObjectCB_GoInDirectionSequence12: ; 809173C
+FieldObjectCB_GoInDirectionSequence12: @ 809173C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -253977,7 +253977,7 @@ FieldObjectCB_GoInDirectionSequence12: ; 809173C
 	thumb_func_end FieldObjectCB_GoInDirectionSequence12
 
 	thumb_func_start sub_8091760
-sub_8091760: ; 8091760
+sub_8091760: @ 8091760
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D988
 	movs r4, 0x30
@@ -253995,7 +253995,7 @@ sub_8091760: ; 8091760
 	thumb_func_end sub_8091760
 
 	thumb_func_start sub_8091780
-sub_8091780: ; 8091780
+sub_8091780: @ 8091780
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254032,7 +254032,7 @@ _080917AC:
 	thumb_func_end sub_8091780
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence13
-FieldObjectCB_GoInDirectionSequence13: ; 80917C8
+FieldObjectCB_GoInDirectionSequence13: @ 80917C8
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254050,7 +254050,7 @@ FieldObjectCB_GoInDirectionSequence13: ; 80917C8
 	thumb_func_end FieldObjectCB_GoInDirectionSequence13
 
 	thumb_func_start sub_80917EC
-sub_80917EC: ; 80917EC
+sub_80917EC: @ 80917EC
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D998
 	movs r4, 0x30
@@ -254068,7 +254068,7 @@ sub_80917EC: ; 80917EC
 	thumb_func_end sub_80917EC
 
 	thumb_func_start sub_809180C
-sub_809180C: ; 809180C
+sub_809180C: @ 809180C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254105,7 +254105,7 @@ _08091838:
 	thumb_func_end sub_809180C
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence14
-FieldObjectCB_GoInDirectionSequence14: ; 8091854
+FieldObjectCB_GoInDirectionSequence14: @ 8091854
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254123,7 +254123,7 @@ FieldObjectCB_GoInDirectionSequence14: ; 8091854
 	thumb_func_end FieldObjectCB_GoInDirectionSequence14
 
 	thumb_func_start sub_8091878
-sub_8091878: ; 8091878
+sub_8091878: @ 8091878
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9A8
 	movs r4, 0x30
@@ -254141,7 +254141,7 @@ sub_8091878: ; 8091878
 	thumb_func_end sub_8091878
 
 	thumb_func_start sub_8091898
-sub_8091898: ; 8091898
+sub_8091898: @ 8091898
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254178,7 +254178,7 @@ _080918C4:
 	thumb_func_end sub_8091898
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence15
-FieldObjectCB_GoInDirectionSequence15: ; 80918E0
+FieldObjectCB_GoInDirectionSequence15: @ 80918E0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254196,7 +254196,7 @@ FieldObjectCB_GoInDirectionSequence15: ; 80918E0
 	thumb_func_end FieldObjectCB_GoInDirectionSequence15
 
 	thumb_func_start sub_8091904
-sub_8091904: ; 8091904
+sub_8091904: @ 8091904
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9B8
 	movs r4, 0x30
@@ -254214,7 +254214,7 @@ sub_8091904: ; 8091904
 	thumb_func_end sub_8091904
 
 	thumb_func_start sub_8091924
-sub_8091924: ; 8091924
+sub_8091924: @ 8091924
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254251,7 +254251,7 @@ _08091950:
 	thumb_func_end sub_8091924
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence16
-FieldObjectCB_GoInDirectionSequence16: ; 809196C
+FieldObjectCB_GoInDirectionSequence16: @ 809196C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254269,7 +254269,7 @@ FieldObjectCB_GoInDirectionSequence16: ; 809196C
 	thumb_func_end FieldObjectCB_GoInDirectionSequence16
 
 	thumb_func_start sub_8091990
-sub_8091990: ; 8091990
+sub_8091990: @ 8091990
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9C8
 	movs r4, 0x30
@@ -254287,7 +254287,7 @@ sub_8091990: ; 8091990
 	thumb_func_end sub_8091990
 
 	thumb_func_start sub_80919B0
-sub_80919B0: ; 80919B0
+sub_80919B0: @ 80919B0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254324,7 +254324,7 @@ _080919DC:
 	thumb_func_end sub_80919B0
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence17
-FieldObjectCB_GoInDirectionSequence17: ; 80919F8
+FieldObjectCB_GoInDirectionSequence17: @ 80919F8
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254342,7 +254342,7 @@ FieldObjectCB_GoInDirectionSequence17: ; 80919F8
 	thumb_func_end FieldObjectCB_GoInDirectionSequence17
 
 	thumb_func_start sub_8091A1C
-sub_8091A1C: ; 8091A1C
+sub_8091A1C: @ 8091A1C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9D8
 	movs r4, 0x30
@@ -254360,7 +254360,7 @@ sub_8091A1C: ; 8091A1C
 	thumb_func_end sub_8091A1C
 
 	thumb_func_start sub_8091A3C
-sub_8091A3C: ; 8091A3C
+sub_8091A3C: @ 8091A3C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254397,7 +254397,7 @@ _08091A68:
 	thumb_func_end sub_8091A3C
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence18
-FieldObjectCB_GoInDirectionSequence18: ; 8091A84
+FieldObjectCB_GoInDirectionSequence18: @ 8091A84
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254415,7 +254415,7 @@ FieldObjectCB_GoInDirectionSequence18: ; 8091A84
 	thumb_func_end FieldObjectCB_GoInDirectionSequence18
 
 	thumb_func_start sub_8091AA8
-sub_8091AA8: ; 8091AA8
+sub_8091AA8: @ 8091AA8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9E8
 	movs r4, 0x30
@@ -254433,7 +254433,7 @@ sub_8091AA8: ; 8091AA8
 	thumb_func_end sub_8091AA8
 
 	thumb_func_start sub_8091AC8
-sub_8091AC8: ; 8091AC8
+sub_8091AC8: @ 8091AC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254470,7 +254470,7 @@ _08091AF4:
 	thumb_func_end sub_8091AC8
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence19
-FieldObjectCB_GoInDirectionSequence19: ; 8091B10
+FieldObjectCB_GoInDirectionSequence19: @ 8091B10
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254488,7 +254488,7 @@ FieldObjectCB_GoInDirectionSequence19: ; 8091B10
 	thumb_func_end FieldObjectCB_GoInDirectionSequence19
 
 	thumb_func_start sub_8091B34
-sub_8091B34: ; 8091B34
+sub_8091B34: @ 8091B34
 	push {r4,lr}
 	ldr r3, =gUnknown_0850D9F8
 	movs r4, 0x30
@@ -254506,7 +254506,7 @@ sub_8091B34: ; 8091B34
 	thumb_func_end sub_8091B34
 
 	thumb_func_start sub_8091B54
-sub_8091B54: ; 8091B54
+sub_8091B54: @ 8091B54
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254543,7 +254543,7 @@ _08091B80:
 	thumb_func_end sub_8091B54
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence20
-FieldObjectCB_GoInDirectionSequence20: ; 8091B9C
+FieldObjectCB_GoInDirectionSequence20: @ 8091B9C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254561,7 +254561,7 @@ FieldObjectCB_GoInDirectionSequence20: ; 8091B9C
 	thumb_func_end FieldObjectCB_GoInDirectionSequence20
 
 	thumb_func_start sub_8091BC0
-sub_8091BC0: ; 8091BC0
+sub_8091BC0: @ 8091BC0
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA08
 	movs r4, 0x30
@@ -254579,7 +254579,7 @@ sub_8091BC0: ; 8091BC0
 	thumb_func_end sub_8091BC0
 
 	thumb_func_start sub_8091BE0
-sub_8091BE0: ; 8091BE0
+sub_8091BE0: @ 8091BE0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254616,7 +254616,7 @@ _08091C0C:
 	thumb_func_end sub_8091BE0
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence21
-FieldObjectCB_GoInDirectionSequence21: ; 8091C28
+FieldObjectCB_GoInDirectionSequence21: @ 8091C28
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254634,7 +254634,7 @@ FieldObjectCB_GoInDirectionSequence21: ; 8091C28
 	thumb_func_end FieldObjectCB_GoInDirectionSequence21
 
 	thumb_func_start sub_8091C4C
-sub_8091C4C: ; 8091C4C
+sub_8091C4C: @ 8091C4C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA18
 	movs r4, 0x30
@@ -254652,7 +254652,7 @@ sub_8091C4C: ; 8091C4C
 	thumb_func_end sub_8091C4C
 
 	thumb_func_start sub_8091C6C
-sub_8091C6C: ; 8091C6C
+sub_8091C6C: @ 8091C6C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254689,7 +254689,7 @@ _08091C98:
 	thumb_func_end sub_8091C6C
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence22
-FieldObjectCB_GoInDirectionSequence22: ; 8091CB4
+FieldObjectCB_GoInDirectionSequence22: @ 8091CB4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254707,7 +254707,7 @@ FieldObjectCB_GoInDirectionSequence22: ; 8091CB4
 	thumb_func_end FieldObjectCB_GoInDirectionSequence22
 
 	thumb_func_start sub_8091CD8
-sub_8091CD8: ; 8091CD8
+sub_8091CD8: @ 8091CD8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA28
 	movs r4, 0x30
@@ -254725,7 +254725,7 @@ sub_8091CD8: ; 8091CD8
 	thumb_func_end sub_8091CD8
 
 	thumb_func_start sub_8091CF8
-sub_8091CF8: ; 8091CF8
+sub_8091CF8: @ 8091CF8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254762,7 +254762,7 @@ _08091D24:
 	thumb_func_end sub_8091CF8
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence23
-FieldObjectCB_GoInDirectionSequence23: ; 8091D40
+FieldObjectCB_GoInDirectionSequence23: @ 8091D40
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254780,7 +254780,7 @@ FieldObjectCB_GoInDirectionSequence23: ; 8091D40
 	thumb_func_end FieldObjectCB_GoInDirectionSequence23
 
 	thumb_func_start sub_8091D64
-sub_8091D64: ; 8091D64
+sub_8091D64: @ 8091D64
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA38
 	movs r4, 0x30
@@ -254798,7 +254798,7 @@ sub_8091D64: ; 8091D64
 	thumb_func_end sub_8091D64
 
 	thumb_func_start sub_8091D84
-sub_8091D84: ; 8091D84
+sub_8091D84: @ 8091D84
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254835,7 +254835,7 @@ _08091DB0:
 	thumb_func_end sub_8091D84
 
 	thumb_func_start FieldObjectCB_GoInDirectionSequence24
-FieldObjectCB_GoInDirectionSequence24: ; 8091DCC
+FieldObjectCB_GoInDirectionSequence24: @ 8091DCC
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254853,7 +254853,7 @@ FieldObjectCB_GoInDirectionSequence24: ; 8091DCC
 	thumb_func_end FieldObjectCB_GoInDirectionSequence24
 
 	thumb_func_start sub_8091DF0
-sub_8091DF0: ; 8091DF0
+sub_8091DF0: @ 8091DF0
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA48
 	movs r4, 0x30
@@ -254871,7 +254871,7 @@ sub_8091DF0: ; 8091DF0
 	thumb_func_end sub_8091DF0
 
 	thumb_func_start sub_8091E10
-sub_8091E10: ; 8091E10
+sub_8091E10: @ 8091E10
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -254908,7 +254908,7 @@ _08091E3C:
 	thumb_func_end sub_8091E10
 
 	thumb_func_start FieldObjectCB_CopyPlayer1
-FieldObjectCB_CopyPlayer1: ; 8091E58
+FieldObjectCB_CopyPlayer1: @ 8091E58
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -254926,7 +254926,7 @@ FieldObjectCB_CopyPlayer1: ; 8091E58
 	thumb_func_end FieldObjectCB_CopyPlayer1
 
 	thumb_func_start sub_8091E7C
-sub_8091E7C: ; 8091E7C
+sub_8091E7C: @ 8091E7C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA58
 	movs r4, 0x30
@@ -254944,8 +254944,8 @@ sub_8091E7C: ; 8091E7C
 	thumb_func_end sub_8091E7C
 
 	thumb_func_start mss_npc_reset_oampriv3_1_unk2_unk3
-; bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct npc_state *fieldObject, struct obj *object)
-mss_npc_reset_oampriv3_1_unk2_unk3: ; 8091E9C
+@ bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct npc_state *fieldObject, struct obj *object)
+mss_npc_reset_oampriv3_1_unk2_unk3: @ 8091E9C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -254965,8 +254965,8 @@ _08091EB4:
 	thumb_func_end mss_npc_reset_oampriv3_1_unk2_unk3
 
 	thumb_func_start sub_8091EC0
-; bool8 sub_8091EC0(struct npc_state *fieldObject, struct obj *object)
-sub_8091EC0: ; 8091EC0
+@ bool8 sub_8091EC0(struct npc_state *fieldObject, struct obj *object)
+sub_8091EC0: @ 8091EC0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -255013,7 +255013,7 @@ _08091F14:
 	thumb_func_end sub_8091EC0
 
 	thumb_func_start sub_8091F20
-sub_8091F20: ; 8091F20
+sub_8091F20: @ 8091F20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -255036,13 +255036,13 @@ _08091F3E:
 	thumb_func_end sub_8091F20
 
 	thumb_func_start sub_8091F48
-sub_8091F48: ; 8091F48
+sub_8091F48: @ 8091F48
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_8091F48
 
 	thumb_func_start sub_8091F4C
-sub_8091F4C: ; 8091F4C
+sub_8091F4C: @ 8091F4C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -255077,7 +255077,7 @@ sub_8091F4C: ; 8091F4C
 	thumb_func_end sub_8091F4C
 
 	thumb_func_start sub_8091F94
-sub_8091F94: ; 8091F94
+sub_8091F94: @ 8091F94
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255203,7 +255203,7 @@ _08092084:
 	thumb_func_end sub_8091F94
 
 	thumb_func_start sub_80920A4
-sub_80920A4: ; 80920A4
+sub_80920A4: @ 80920A4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255291,7 +255291,7 @@ _0809213E:
 	thumb_func_end sub_80920A4
 
 	thumb_func_start sub_809215C
-sub_809215C: ; 809215C
+sub_809215C: @ 809215C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255379,7 +255379,7 @@ _080921F6:
 	thumb_func_end sub_809215C
 
 	thumb_func_start sub_8092214
-sub_8092214: ; 8092214
+sub_8092214: @ 8092214
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255467,7 +255467,7 @@ _080922AE:
 	thumb_func_end sub_8092214
 
 	thumb_func_start cph_IM_DIFFERENT
-cph_IM_DIFFERENT: ; 80922CC
+cph_IM_DIFFERENT: @ 80922CC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -255502,7 +255502,7 @@ cph_IM_DIFFERENT: ; 80922CC
 	thumb_func_end cph_IM_DIFFERENT
 
 	thumb_func_start sub_8092314
-sub_8092314: ; 8092314
+sub_8092314: @ 8092314
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255590,7 +255590,7 @@ _080923AE:
 	thumb_func_end sub_8092314
 
 	thumb_func_start oac_hopping
-oac_hopping: ; 80923CC
+oac_hopping: @ 80923CC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -255685,7 +255685,7 @@ _08092474:
 	thumb_func_end oac_hopping
 
 	thumb_func_start FieldObjectCB_CopyPlayer2
-FieldObjectCB_CopyPlayer2: ; 8092494
+FieldObjectCB_CopyPlayer2: @ 8092494
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -255703,7 +255703,7 @@ FieldObjectCB_CopyPlayer2: ; 8092494
 	thumb_func_end FieldObjectCB_CopyPlayer2
 
 	thumb_func_start sub_80924B8
-sub_80924B8: ; 80924B8
+sub_80924B8: @ 80924B8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA90
 	movs r4, 0x30
@@ -255721,7 +255721,7 @@ sub_80924B8: ; 80924B8
 	thumb_func_end sub_80924B8
 
 	thumb_func_start mss_08062EA4
-mss_08062EA4: ; 80924D8
+mss_08062EA4: @ 80924D8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -255768,8 +255768,8 @@ _0809252C:
 	thumb_func_end mss_08062EA4
 
 	thumb_func_start FieldObjectCB_TreeDisguise
-; void FieldObjectCB_TreeDisguise(struct obj *object)
-FieldObjectCB_TreeDisguise: ; 809253C
+@ void FieldObjectCB_TreeDisguise(struct obj *object)
+FieldObjectCB_TreeDisguise: @ 809253C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -255823,7 +255823,7 @@ _08092584:
 	thumb_func_end FieldObjectCB_TreeDisguise
 
 	thumb_func_start sub_80925AC
-sub_80925AC: ; 80925AC
+sub_80925AC: @ 80925AC
 	push {lr}
 	bl npc_reset
 	movs r0, 0
@@ -255832,7 +255832,7 @@ sub_80925AC: ; 80925AC
 	thumb_func_end sub_80925AC
 
 	thumb_func_start FieldObjectCB_MountainDisguise
-FieldObjectCB_MountainDisguise: ; 80925B8
+FieldObjectCB_MountainDisguise: @ 80925B8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -255886,8 +255886,8 @@ _08092600:
 	thumb_func_end FieldObjectCB_MountainDisguise
 
 	thumb_func_start FieldObjectCB_Hidden1
-; void FieldObjectCB_Hidden1(struct obj *object)
-FieldObjectCB_Hidden1: ; 8092628
+@ void FieldObjectCB_Hidden1(struct obj *object)
+FieldObjectCB_Hidden1: @ 8092628
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r1, 0x3C
@@ -255937,7 +255937,7 @@ _08092668:
 	thumb_func_end FieldObjectCB_Hidden1
 
 	thumb_func_start sub_809268C
-sub_809268C: ; 809268C
+sub_809268C: @ 809268C
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DA9C
 	movs r4, 0x30
@@ -255955,7 +255955,7 @@ sub_809268C: ; 809268C
 	thumb_func_end sub_809268C
 
 	thumb_func_start sub_80926AC
-sub_80926AC: ; 80926AC
+sub_80926AC: @ 80926AC
 	push {lr}
 	bl npc_reset
 	movs r0, 0
@@ -255964,8 +255964,8 @@ sub_80926AC: ; 80926AC
 	thumb_func_end sub_80926AC
 
 	thumb_func_start sub_80926B8
-; bool8 sub_80926B8(struct npc_state *fieldObject, struct obj *object)
-sub_80926B8: ; 80926B8
+@ bool8 sub_80926B8(struct npc_state *fieldObject, struct obj *object)
+sub_80926B8: @ 80926B8
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -255982,7 +255982,7 @@ _080926CA:
 	thumb_func_end sub_80926B8
 
 	thumb_func_start FieldObjectCB_WalkInPlace1
-FieldObjectCB_WalkInPlace1: ; 80926D4
+FieldObjectCB_WalkInPlace1: @ 80926D4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -256000,7 +256000,7 @@ FieldObjectCB_WalkInPlace1: ; 80926D4
 	thumb_func_end FieldObjectCB_WalkInPlace1
 
 	thumb_func_start sub_80926F8
-sub_80926F8: ; 80926F8
+sub_80926F8: @ 80926F8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DAA0
 	movs r4, 0x30
@@ -256018,7 +256018,7 @@ sub_80926F8: ; 80926F8
 	thumb_func_end sub_80926F8
 
 	thumb_func_start sub_8092718
-sub_8092718: ; 8092718
+sub_8092718: @ 8092718
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -256041,7 +256041,7 @@ sub_8092718: ; 8092718
 	thumb_func_end sub_8092718
 
 	thumb_func_start FieldObjectCB_WalkInPlace4
-FieldObjectCB_WalkInPlace4: ; 8092744
+FieldObjectCB_WalkInPlace4: @ 8092744
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -256059,7 +256059,7 @@ FieldObjectCB_WalkInPlace4: ; 8092744
 	thumb_func_end FieldObjectCB_WalkInPlace4
 
 	thumb_func_start sub_8092768
-sub_8092768: ; 8092768
+sub_8092768: @ 8092768
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DAA8
 	movs r4, 0x30
@@ -256077,7 +256077,7 @@ sub_8092768: ; 8092768
 	thumb_func_end sub_8092768
 
 	thumb_func_start sub_8092788
-sub_8092788: ; 8092788
+sub_8092788: @ 8092788
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -256100,7 +256100,7 @@ sub_8092788: ; 8092788
 	thumb_func_end sub_8092788
 
 	thumb_func_start FieldObjectCB_WalkInPlace2
-FieldObjectCB_WalkInPlace2: ; 80927B4
+FieldObjectCB_WalkInPlace2: @ 80927B4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -256118,7 +256118,7 @@ FieldObjectCB_WalkInPlace2: ; 80927B4
 	thumb_func_end FieldObjectCB_WalkInPlace2
 
 	thumb_func_start sub_80927D8
-sub_80927D8: ; 80927D8
+sub_80927D8: @ 80927D8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DAB0
 	movs r4, 0x30
@@ -256136,8 +256136,8 @@ sub_80927D8: ; 80927D8
 	thumb_func_end sub_80927D8
 
 	thumb_func_start sub_80927F8
-; bool8 sub_80927F8(struct npc_state *fieldObject, struct obj *object)
-sub_80927F8: ; 80927F8
+@ bool8 sub_80927F8(struct npc_state *fieldObject, struct obj *object)
+sub_80927F8: @ 80927F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -256160,7 +256160,7 @@ sub_80927F8: ; 80927F8
 	thumb_func_end sub_80927F8
 
 	thumb_func_start FieldObjectCB_WalkInPlace3
-FieldObjectCB_WalkInPlace3: ; 8092824
+FieldObjectCB_WalkInPlace3: @ 8092824
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -256178,7 +256178,7 @@ FieldObjectCB_WalkInPlace3: ; 8092824
 	thumb_func_end FieldObjectCB_WalkInPlace3
 
 	thumb_func_start sub_8092848
-sub_8092848: ; 8092848
+sub_8092848: @ 8092848
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DAB8
 	movs r4, 0x30
@@ -256196,7 +256196,7 @@ sub_8092848: ; 8092848
 	thumb_func_end sub_8092848
 
 	thumb_func_start sub_8092868
-sub_8092868: ; 8092868
+sub_8092868: @ 8092868
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -256219,7 +256219,7 @@ sub_8092868: ; 8092868
 	thumb_func_end sub_8092868
 
 	thumb_func_start FieldObjectCB_Hidden2
-FieldObjectCB_Hidden2: ; 8092894
+FieldObjectCB_Hidden2: @ 8092894
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -256237,7 +256237,7 @@ FieldObjectCB_Hidden2: ; 8092894
 	thumb_func_end FieldObjectCB_Hidden2
 
 	thumb_func_start sub_80928B8
-sub_80928B8: ; 80928B8
+sub_80928B8: @ 80928B8
 	push {r4,lr}
 	ldr r3, =gUnknown_0850DAC0
 	movs r4, 0x30
@@ -256255,7 +256255,7 @@ sub_80928B8: ; 80928B8
 	thumb_func_end sub_80928B8
 
 	thumb_func_start sub_80928D8
-sub_80928D8: ; 80928D8
+sub_80928D8: @ 80928D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -256282,7 +256282,7 @@ sub_80928D8: ; 80928D8
 	thumb_func_end sub_80928D8
 
 	thumb_func_start sub_809290C
-sub_809290C: ; 809290C
+sub_809290C: @ 809290C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl FieldObjectExecRegularAnim
@@ -256302,7 +256302,7 @@ _08092924:
 	thumb_func_end sub_809290C
 
 	thumb_func_start sub_809292C
-sub_809292C: ; 809292C
+sub_809292C: @ 809292C
 	ldrb r2, [r0]
 	movs r1, 0x3
 	negs r1, r1
@@ -256313,8 +256313,8 @@ sub_809292C: ; 809292C
 	thumb_func_end sub_809292C
 
 	thumb_func_start npc_reset
-; void npc_reset(struct npc_state *fieldObject, struct obj *object)
-npc_reset: ; 809293C
+@ void npc_reset(struct npc_state *fieldObject, struct obj *object)
+npc_reset: @ 809293C
 	ldrb r3, [r0]
 	movs r2, 0x3
 	negs r2, r2
@@ -256333,8 +256333,8 @@ npc_reset: ; 809293C
 	thumb_func_end npc_reset
 
 	thumb_func_start FieldObjectDirectionToImageAnimId
-; u8 FieldObjectDirectionToImageAnimId(u8 direction)
-FieldObjectDirectionToImageAnimId: ; 809295C
+@ u8 FieldObjectDirectionToImageAnimId(u8 direction)
+FieldObjectDirectionToImageAnimId: @ 809295C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DACC
@@ -256345,7 +256345,7 @@ FieldObjectDirectionToImageAnimId: ; 809295C
 	thumb_func_end FieldObjectDirectionToImageAnimId
 
 	thumb_func_start get_go_image_anim_num
-get_go_image_anim_num: ; 809296C
+get_go_image_anim_num: @ 809296C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DAD5
@@ -256356,7 +256356,7 @@ get_go_image_anim_num: ; 809296C
 	thumb_func_end get_go_image_anim_num
 
 	thumb_func_start get_go_fast_image_anim_num
-get_go_fast_image_anim_num: ; 809297C
+get_go_fast_image_anim_num: @ 809297C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DADE
@@ -256367,7 +256367,7 @@ get_go_fast_image_anim_num: ; 809297C
 	thumb_func_end get_go_fast_image_anim_num
 
 	thumb_func_start get_go_faster_image_anim_num
-get_go_faster_image_anim_num: ; 809298C
+get_go_faster_image_anim_num: @ 809298C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DAE7
@@ -256378,7 +256378,7 @@ get_go_faster_image_anim_num: ; 809298C
 	thumb_func_end get_go_faster_image_anim_num
 
 	thumb_func_start get_go_fastest_image_anim_num
-get_go_fastest_image_anim_num: ; 809299C
+get_go_fastest_image_anim_num: @ 809299C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DAF0
@@ -256389,7 +256389,7 @@ get_go_fastest_image_anim_num: ; 809299C
 	thumb_func_end get_go_fastest_image_anim_num
 
 	thumb_func_start sub_80929AC
-sub_80929AC: ; 80929AC
+sub_80929AC: @ 80929AC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DAF9
@@ -256400,7 +256400,7 @@ sub_80929AC: ; 80929AC
 	thumb_func_end sub_80929AC
 
 	thumb_func_start sub_80929BC
-sub_80929BC: ; 80929BC
+sub_80929BC: @ 80929BC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB02
@@ -256411,7 +256411,7 @@ sub_80929BC: ; 80929BC
 	thumb_func_end sub_80929BC
 
 	thumb_func_start sub_80929CC
-sub_80929CC: ; 80929CC
+sub_80929CC: @ 80929CC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB0B
@@ -256422,7 +256422,7 @@ sub_80929CC: ; 80929CC
 	thumb_func_end sub_80929CC
 
 	thumb_func_start sub_80929DC
-sub_80929DC: ; 80929DC
+sub_80929DC: @ 80929DC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB14
@@ -256433,7 +256433,7 @@ sub_80929DC: ; 80929DC
 	thumb_func_end sub_80929DC
 
 	thumb_func_start sub_80929EC
-sub_80929EC: ; 80929EC
+sub_80929EC: @ 80929EC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB1D
@@ -256444,7 +256444,7 @@ sub_80929EC: ; 80929EC
 	thumb_func_end sub_80929EC
 
 	thumb_func_start sub_80929FC
-sub_80929FC: ; 80929FC
+sub_80929FC: @ 80929FC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB26
@@ -256455,7 +256455,7 @@ sub_80929FC: ; 80929FC
 	thumb_func_end sub_80929FC
 
 	thumb_func_start sub_8092A0C
-sub_8092A0C: ; 8092A0C
+sub_8092A0C: @ 8092A0C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB2F
@@ -256466,7 +256466,7 @@ sub_8092A0C: ; 8092A0C
 	thumb_func_end sub_8092A0C
 
 	thumb_func_start sub_8092A1C
-sub_8092A1C: ; 8092A1C
+sub_8092A1C: @ 8092A1C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB38
@@ -256477,7 +256477,7 @@ sub_8092A1C: ; 8092A1C
 	thumb_func_end sub_8092A1C
 
 	thumb_func_start sub_8092A2C
-sub_8092A2C: ; 8092A2C
+sub_8092A2C: @ 8092A2C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB41
@@ -256488,7 +256488,7 @@ sub_8092A2C: ; 8092A2C
 	thumb_func_end sub_8092A2C
 
 	thumb_func_start get_run_image_anim_num
-get_run_image_anim_num: ; 8092A3C
+get_run_image_anim_num: @ 8092A3C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB4A
@@ -256499,7 +256499,7 @@ get_run_image_anim_num: ; 8092A3C
 	thumb_func_end get_run_image_anim_num
 
 	thumb_func_start sub_8092A4C
-sub_8092A4C: ; 8092A4C
+sub_8092A4C: @ 8092A4C
 	push {lr}
 	adds r2, r0, 0
 	ldr r1, =gUnknown_085094AC
@@ -256524,8 +256524,8 @@ _08092A6C:
 	thumb_func_end sub_8092A4C
 
 	thumb_func_start npc_apply_anim_looping
-; void npc_apply_anim_looping(struct npc_state *fieldObject, struct obj *object, u8 anim)
-npc_apply_anim_looping: ; 8092A70
+@ void npc_apply_anim_looping(struct npc_state *fieldObject, struct obj *object, u8 anim)
+npc_apply_anim_looping: @ 8092A70
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r2, 24
@@ -256567,8 +256567,8 @@ _08092AB2:
 	thumb_func_end npc_apply_anim_looping
 
 	thumb_func_start obj_npc_animation_step
-; void obj_npc_animation_step(struct npc_state *fieldObject, struct obj *object, u8 anim)
-obj_npc_animation_step: ; 8092AB8
+@ void obj_npc_animation_step(struct npc_state *fieldObject, struct obj *object, u8 anim)
+obj_npc_animation_step: @ 8092AB8
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r2, 24
@@ -256603,7 +256603,7 @@ _08092AF0:
 	thumb_func_end obj_npc_animation_step
 
 	thumb_func_start sub_8092AF8
-sub_8092AF8: ; 8092AF8
+sub_8092AF8: @ 8092AF8
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -256637,7 +256637,7 @@ _08092B28:
 	thumb_func_end sub_8092AF8
 
 	thumb_func_start npc_set_running_behaviour_etc
-npc_set_running_behaviour_etc: ; 8092B2C
+npc_set_running_behaviour_etc: @ 8092B2C
 	push {r4,lr}
 	mov r12, r0
 	lsls r1, 24
@@ -256676,7 +256676,7 @@ npc_set_running_behaviour_etc: ; 8092B2C
 	thumb_func_end npc_set_running_behaviour_etc
 
 	thumb_func_start npc_running_behaviour_by_direction
-npc_running_behaviour_by_direction: ; 8092B78
+npc_running_behaviour_by_direction: @ 8092B78
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850DB53
@@ -256687,7 +256687,7 @@ npc_running_behaviour_by_direction: ; 8092B78
 	thumb_func_end npc_running_behaviour_by_direction
 
 	thumb_func_start sub_8092B88
-sub_8092B88: ; 8092B88
+sub_8092B88: @ 8092B88
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -256721,8 +256721,8 @@ sub_8092B88: ; 8092B88
 	thumb_func_end sub_8092B88
 
 	thumb_func_start npc_block_way
-; u8 npc_block_way(struct npc_state *fieldObject, u16 x, u16 y, u8 direction)
-npc_block_way: ; 8092BC8
+@ u8 npc_block_way(struct npc_state *fieldObject, u16 x, u16 y, u8 direction)
+npc_block_way: @ 8092BC8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -256823,7 +256823,7 @@ _08092C7E:
 	thumb_func_end npc_block_way
 
 	thumb_func_start sub_8092C8C
-sub_8092C8C: ; 8092C8C
+sub_8092C8C: @ 8092C8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -256926,8 +256926,8 @@ _08092D48:
 	thumb_func_end sub_8092C8C
 
 	thumb_func_start IsCoordOutsideFieldObjectMovementRect
-; bool8 IsCoordOutsideFieldObjectMovementRect(struct npc_state *fieldObject, u16 x, u16 y)
-IsCoordOutsideFieldObjectMovementRect: ; 8092D58
+@ bool8 IsCoordOutsideFieldObjectMovementRect(struct npc_state *fieldObject, u16 x, u16 y)
+IsCoordOutsideFieldObjectMovementRect: @ 8092D58
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -256991,8 +256991,8 @@ _08092DC2:
 	thumb_func_end IsCoordOutsideFieldObjectMovementRect
 
 	thumb_func_start IsMetatileDirectionallyImpassable
-; bool8 IsMetatileDirectionallyImpassable(struct npc_state *fieldObject, u16 x, u16 y, u8 direction)
-IsMetatileDirectionallyImpassable: ; 8092DC8
+@ bool8 IsMetatileDirectionallyImpassable(struct npc_state *fieldObject, u16 x, u16 y, u8 direction)
+IsMetatileDirectionallyImpassable: @ 8092DC8
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r6, r1, 16
@@ -257036,8 +257036,8 @@ _08092E1A:
 	thumb_func_end IsMetatileDirectionallyImpassable
 
 	thumb_func_start CheckForCollisionBetweenFieldObjects
-; bool8 CheckForCollisionBetweenFieldObjects(struct npc_state *fieldObject, u16 x, u16 y)
-CheckForCollisionBetweenFieldObjects: ; 8092E20
+@ bool8 CheckForCollisionBetweenFieldObjects(struct npc_state *fieldObject, u16 x, u16 y)
+CheckForCollisionBetweenFieldObjects: @ 8092E20
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -257104,7 +257104,7 @@ _08092E94:
 	thumb_func_end CheckForCollisionBetweenFieldObjects
 
 	thumb_func_start sub_8092E9C
-sub_8092E9C: ; 8092E9C
+sub_8092E9C: @ 8092E9C
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -257148,7 +257148,7 @@ _08092EEA:
 	thumb_func_end sub_8092E9C
 
 	thumb_func_start sub_8092EF0
-sub_8092EF0: ; 8092EF0
+sub_8092EF0: @ 8092EF0
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -257187,8 +257187,8 @@ _08092F2E:
 	thumb_func_end sub_8092EF0
 
 	thumb_func_start MoveCoords
-; void MoveCoords(u8 direction, u16 *x, u16 *y)
-MoveCoords: ; 8092F3C
+@ void MoveCoords(u8 direction, u16 *x, u16 *y)
+MoveCoords: @ 8092F3C
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =gUnknown_0850DB7C
@@ -257209,7 +257209,7 @@ MoveCoords: ; 8092F3C
 	thumb_func_end MoveCoords
 
 	thumb_func_start sub_8092F60
-sub_8092F60: ; 8092F60
+sub_8092F60: @ 8092F60
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =gUnknown_0850DB7C
@@ -257232,7 +257232,7 @@ sub_8092F60: ; 8092F60
 	thumb_func_end sub_8092F60
 
 	thumb_func_start sub_8092F88
-sub_8092F88: ; 8092F88
+sub_8092F88: @ 8092F88
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	ldr r1, [sp, 0x14]
@@ -257290,7 +257290,7 @@ _08092FE4:
 	thumb_func_end sub_8092F88
 
 	thumb_func_start sub_8092FF0
-sub_8092FF0: ; 8092FF0
+sub_8092FF0: @ 8092FF0
 	push {r4,r5,lr}
 	ldr r5, =0x03005d8c
 	ldr r4, [r5]
@@ -257324,7 +257324,7 @@ sub_8092FF0: ; 8092FF0
 	thumb_func_end sub_8092FF0
 
 	thumb_func_start sub_8093038
-sub_8093038: ; 8093038
+sub_8093038: @ 8093038
 	push {r4-r7,lr}
 	adds r7, r2, 0
 	mov r12, r3
@@ -257406,7 +257406,7 @@ _08093098:
 	thumb_func_end sub_8093038
 
 	thumb_func_start sub_80930E0
-sub_80930E0: ; 80930E0
+sub_80930E0: @ 80930E0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -257446,8 +257446,8 @@ sub_80930E0: ; 80930E0
 	thumb_func_end sub_80930E0
 
 	thumb_func_start GetFieldObjectMovingCameraOffset
-; void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
-GetFieldObjectMovingCameraOffset: ; 809312C
+@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
+GetFieldObjectMovingCameraOffset: @ 809312C
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0
@@ -257486,8 +257486,8 @@ _08093164:
 	thumb_func_end GetFieldObjectMovingCameraOffset
 
 	thumb_func_start FieldObjectMoveDestCoords
-; void FieldObjectMoveDestCoords(struct npc_state *fieldObject, u8 direction)
-FieldObjectMoveDestCoords: ; 809316C
+@ void FieldObjectMoveDestCoords(struct npc_state *fieldObject, u8 direction)
+FieldObjectMoveDestCoords: @ 809316C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -257505,8 +257505,8 @@ FieldObjectMoveDestCoords: ; 809316C
 	thumb_func_end FieldObjectMoveDestCoords
 
 	thumb_func_start FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-; bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct npc_state *fieldObject)
-FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: ; 809318C
+@ bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct npc_state *fieldObject)
+FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: @ 809318C
 	push {lr}
 	ldrb r1, [r0]
 	movs r0, 0x42
@@ -257523,8 +257523,8 @@ _0809319E:
 	thumb_func_end FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
 
 	thumb_func_start FieldObjectIsSpecialAnimActive
-; bool8 FieldObjectIsSpecialAnimActive(struct npc_state *fieldObject)
-FieldObjectIsSpecialAnimActive: ; 80931A4
+@ bool8 FieldObjectIsSpecialAnimActive(struct npc_state *fieldObject)
+FieldObjectIsSpecialAnimActive: @ 80931A4
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -257544,8 +257544,8 @@ _080931BC:
 	thumb_func_end FieldObjectIsSpecialAnimActive
 
 	thumb_func_start FieldObjectSetSpecialAnim
-; bool8 FieldObjectSetSpecialAnim(struct npc_state *fieldObject, u8 animId)
-FieldObjectSetSpecialAnim: ; 80931C0
+@ bool8 FieldObjectSetSpecialAnim(struct npc_state *fieldObject, u8 animId)
+FieldObjectSetSpecialAnim: @ 80931C0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -257583,8 +257583,8 @@ _08093202:
 	thumb_func_end FieldObjectSetSpecialAnim
 
 	thumb_func_start FieldObjectForceSetSpecialAnim
-; void FieldObjectForceSetSpecialAnim(struct npc_state *fieldObject, u8 animId)
-FieldObjectForceSetSpecialAnim: ; 8093208
+@ void FieldObjectForceSetSpecialAnim(struct npc_state *fieldObject, u8 animId)
+FieldObjectForceSetSpecialAnim: @ 8093208
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -257599,8 +257599,8 @@ FieldObjectForceSetSpecialAnim: ; 8093208
 	thumb_func_end FieldObjectForceSetSpecialAnim
 
 	thumb_func_start FieldObjectClearAnimIfSpecialAnimActive
-; void FieldObjectClearAnimIfSpecialAnimActive(struct npc_state *fieldObject)
-FieldObjectClearAnimIfSpecialAnimActive: ; 8093224
+@ void FieldObjectClearAnimIfSpecialAnimActive(struct npc_state *fieldObject)
+FieldObjectClearAnimIfSpecialAnimActive: @ 8093224
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -257615,8 +257615,8 @@ _08093236:
 	thumb_func_end FieldObjectClearAnimIfSpecialAnimActive
 
 	thumb_func_start FieldObjectClearAnim
-; void FieldObjectClearAnim(struct npc_state *fieldObject)
-FieldObjectClearAnim: ; 809323C
+@ void FieldObjectClearAnim(struct npc_state *fieldObject)
+FieldObjectClearAnim: @ 809323C
 	movs r1, 0xFF
 	strb r1, [r0, 0x1C]
 	ldrb r2, [r0]
@@ -257645,8 +257645,8 @@ FieldObjectClearAnim: ; 809323C
 	thumb_func_end FieldObjectClearAnim
 
 	thumb_func_start FieldObjectCheckIfSpecialAnimFinishedOrInactive
-; u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct npc_state *fieldObject)
-FieldObjectCheckIfSpecialAnimFinishedOrInactive: ; 8093270
+@ u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct npc_state *fieldObject)
+FieldObjectCheckIfSpecialAnimFinishedOrInactive: @ 8093270
 	push {lr}
 	ldrb r1, [r0]
 	lsls r0, r1, 25
@@ -257662,8 +257662,8 @@ _08093280:
 	thumb_func_end FieldObjectCheckIfSpecialAnimFinishedOrInactive
 
 	thumb_func_start FieldObjectClearAnimIfSpecialAnimFinished
-; u8 FieldObjectClearAnimIfSpecialAnimFinished(struct npc_state *fieldObject)
-FieldObjectClearAnimIfSpecialAnimFinished: ; 8093284
+@ u8 FieldObjectClearAnimIfSpecialAnimFinished(struct npc_state *fieldObject)
+FieldObjectClearAnimIfSpecialAnimFinished: @ 8093284
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
@@ -257683,8 +257683,8 @@ _0809329E:
 	thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
 
 	thumb_func_start FieldObjectGetSpecialAnim
-; u8 FieldObjectGetSpecialAnim(struct npc_state *fieldObject)
-FieldObjectGetSpecialAnim: ; 80932A8
+@ u8 FieldObjectGetSpecialAnim(struct npc_state *fieldObject)
+FieldObjectGetSpecialAnim: @ 80932A8
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -257701,8 +257701,8 @@ _080932BA:
 	thumb_func_end FieldObjectGetSpecialAnim
 
 	thumb_func_start FieldObjectStep
-; void FieldObjectStep(struct npc_state *fieldObject, struct obj *object, bool8 ( *callback)(struct npc_state *fieldObject, struct obj *object))
-FieldObjectStep: ; 80932C0
+@ void FieldObjectStep(struct npc_state *fieldObject, struct obj *object, bool8 ( *callback)(struct npc_state *fieldObject, struct obj *object))
+FieldObjectStep: @ 80932C0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -257754,8 +257754,8 @@ _08093300:
 	thumb_func_end FieldObjectStep
 
 	thumb_func_start GetFaceDirectionAnimId
-; u8 GetFaceDirectionAnimId(u8 direction)
-GetFaceDirectionAnimId: ; 8093330
+@ u8 GetFaceDirectionAnimId(u8 direction)
+GetFaceDirectionAnimId: @ 8093330
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257779,8 +257779,8 @@ _08093348:
 	thumb_func_end GetFaceDirectionAnimId
 
 	thumb_func_start GetSimpleGoAnimId
-; u8 GetSimpleGoAnimId(u8 direction)
-GetSimpleGoAnimId: ; 809335C
+@ u8 GetSimpleGoAnimId(u8 direction)
+GetSimpleGoAnimId: @ 809335C
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257804,8 +257804,8 @@ _08093374:
 	thumb_func_end GetSimpleGoAnimId
 
 	thumb_func_start GetGoSpeed0AnimId
-; u8 GetGoSpeed0AnimId(u8 direction)
-GetGoSpeed0AnimId: ; 8093388
+@ u8 GetGoSpeed0AnimId(u8 direction)
+GetGoSpeed0AnimId: @ 8093388
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257829,8 +257829,8 @@ _080933A0:
 	thumb_func_end GetGoSpeed0AnimId
 
 	thumb_func_start GetGoSpeed1AnimId
-; u8 GetGoSpeed1AnimId(u8 direction)
-GetGoSpeed1AnimId: ; 80933B4
+@ u8 GetGoSpeed1AnimId(u8 direction)
+GetGoSpeed1AnimId: @ 80933B4
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257854,8 +257854,8 @@ _080933CC:
 	thumb_func_end GetGoSpeed1AnimId
 
 	thumb_func_start GetGoSpeed2AnimId
-; u8 GetGoSpeed2AnimId(u8 direction)
-GetGoSpeed2AnimId: ; 80933E0
+@ u8 GetGoSpeed2AnimId(u8 direction)
+GetGoSpeed2AnimId: @ 80933E0
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257879,8 +257879,8 @@ _080933F8:
 	thumb_func_end GetGoSpeed2AnimId
 
 	thumb_func_start GetGoSpeed3AnimId
-; u8 GetGoSpeed3AnimId(u8 direction)
-GetGoSpeed3AnimId: ; 809340C
+@ u8 GetGoSpeed3AnimId(u8 direction)
+GetGoSpeed3AnimId: @ 809340C
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257904,8 +257904,8 @@ _08093424:
 	thumb_func_end GetGoSpeed3AnimId
 
 	thumb_func_start sub_8093438
-; u8 sub_8093438(u8 direction)
-sub_8093438: ; 8093438
+@ u8 sub_8093438(u8 direction)
+sub_8093438: @ 8093438
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257929,8 +257929,8 @@ _08093450:
 	thumb_func_end sub_8093438
 
 	thumb_func_start GetRunAnimId
-; u8 GetRunAnimId(u8 direction)
-GetRunAnimId: ; 8093464
+@ u8 GetRunAnimId(u8 direction)
+GetRunAnimId: @ 8093464
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257954,8 +257954,8 @@ _0809347C:
 	thumb_func_end GetRunAnimId
 
 	thumb_func_start GetJumpLedgeAnimId
-; u8 GetJumpLedgeAnimId(u8 direction)
-GetJumpLedgeAnimId: ; 8093490
+@ u8 GetJumpLedgeAnimId(u8 direction)
+GetJumpLedgeAnimId: @ 8093490
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -257979,8 +257979,8 @@ _080934A8:
 	thumb_func_end GetJumpLedgeAnimId
 
 	thumb_func_start sub_80934BC
-; u8 sub_80934BC(u8 direction)
-sub_80934BC: ; 80934BC
+@ u8 sub_80934BC(u8 direction)
+sub_80934BC: @ 80934BC
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258004,8 +258004,8 @@ _080934D4:
 	thumb_func_end sub_80934BC
 
 	thumb_func_start sub_80934E8
-; u8 sub_80934E8(u8 direction)
-sub_80934E8: ; 80934E8
+@ u8 sub_80934E8(u8 direction)
+sub_80934E8: @ 80934E8
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258029,8 +258029,8 @@ _08093500:
 	thumb_func_end sub_80934E8
 
 	thumb_func_start sub_8093514
-; u8 sub_8093514(u8 direction)
-sub_8093514: ; 8093514
+@ u8 sub_8093514(u8 direction)
+sub_8093514: @ 8093514
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258054,8 +258054,8 @@ _0809352C:
 	thumb_func_end sub_8093514
 
 	thumb_func_start sub_8093540
-; u8 sub_8093540(u8 direction)
-sub_8093540: ; 8093540
+@ u8 sub_8093540(u8 direction)
+sub_8093540: @ 8093540
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258079,8 +258079,8 @@ _08093558:
 	thumb_func_end sub_8093540
 
 	thumb_func_start GetStepInPlaceDelay32AnimId
-; u8 GetStepInPlaceDelay32AnimId(u8 direction)
-GetStepInPlaceDelay32AnimId: ; 809356C
+@ u8 GetStepInPlaceDelay32AnimId(u8 direction)
+GetStepInPlaceDelay32AnimId: @ 809356C
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258104,8 +258104,8 @@ _08093584:
 	thumb_func_end GetStepInPlaceDelay32AnimId
 
 	thumb_func_start GetStepInPlaceDelay16AnimId
-; u8 GetStepInPlaceDelay16AnimId(u8 direction)
-GetStepInPlaceDelay16AnimId: ; 8093598
+@ u8 GetStepInPlaceDelay16AnimId(u8 direction)
+GetStepInPlaceDelay16AnimId: @ 8093598
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258129,8 +258129,8 @@ _080935B0:
 	thumb_func_end GetStepInPlaceDelay16AnimId
 
 	thumb_func_start GetStepInPlaceDelay8AnimId
-; u8 GetStepInPlaceDelay8AnimId(u8 direction)
-GetStepInPlaceDelay8AnimId: ; 80935C4
+@ u8 GetStepInPlaceDelay8AnimId(u8 direction)
+GetStepInPlaceDelay8AnimId: @ 80935C4
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258154,8 +258154,8 @@ _080935DC:
 	thumb_func_end GetStepInPlaceDelay8AnimId
 
 	thumb_func_start GetStepInPlaceDelay4AnimId
-; u8 GetStepInPlaceDelay4AnimId(u8 direction)
-GetStepInPlaceDelay4AnimId: ; 80935F0
+@ u8 GetStepInPlaceDelay4AnimId(u8 direction)
+GetStepInPlaceDelay4AnimId: @ 80935F0
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258179,8 +258179,8 @@ _08093608:
 	thumb_func_end GetStepInPlaceDelay4AnimId
 
 	thumb_func_start FieldObjectFaceOppositeDirection
-; bool8 FieldObjectFaceOppositeDirection(struct npc_state *fieldObject, u8 direction)
-FieldObjectFaceOppositeDirection: ; 809361C
+@ bool8 FieldObjectFaceOppositeDirection(struct npc_state *fieldObject, u8 direction)
+FieldObjectFaceOppositeDirection: @ 809361C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r0, r1, 24
@@ -258202,7 +258202,7 @@ FieldObjectFaceOppositeDirection: ; 809361C
 	thumb_func_end FieldObjectFaceOppositeDirection
 
 	thumb_func_start sub_8093648
-sub_8093648: ; 8093648
+sub_8093648: @ 8093648
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258226,7 +258226,7 @@ _08093660:
 	thumb_func_end sub_8093648
 
 	thumb_func_start sub_8093674
-sub_8093674: ; 8093674
+sub_8093674: @ 8093674
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258250,7 +258250,7 @@ _0809368C:
 	thumb_func_end sub_8093674
 
 	thumb_func_start sub_80936A0
-sub_80936A0: ; 80936A0
+sub_80936A0: @ 80936A0
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258274,7 +258274,7 @@ _080936B8:
 	thumb_func_end sub_80936A0
 
 	thumb_func_start sub_80936CC
-sub_80936CC: ; 80936CC
+sub_80936CC: @ 80936CC
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258298,7 +258298,7 @@ _080936E4:
 	thumb_func_end sub_80936CC
 
 	thumb_func_start sub_80936F8
-sub_80936F8: ; 80936F8
+sub_80936F8: @ 80936F8
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258322,7 +258322,7 @@ _08093710:
 	thumb_func_end sub_80936F8
 
 	thumb_func_start sub_8093724
-sub_8093724: ; 8093724
+sub_8093724: @ 8093724
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258346,7 +258346,7 @@ _0809373C:
 	thumb_func_end sub_8093724
 
 	thumb_func_start sub_8093750
-sub_8093750: ; 8093750
+sub_8093750: @ 8093750
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258370,7 +258370,7 @@ _08093768:
 	thumb_func_end sub_8093750
 
 	thumb_func_start sub_809377C
-sub_809377C: ; 809377C
+sub_809377C: @ 809377C
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258394,7 +258394,7 @@ _08093794:
 	thumb_func_end sub_809377C
 
 	thumb_func_start sub_80937A8
-sub_80937A8: ; 80937A8
+sub_80937A8: @ 80937A8
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258418,7 +258418,7 @@ _080937C0:
 	thumb_func_end sub_80937A8
 
 	thumb_func_start d2s_08064034
-d2s_08064034: ; 80937D4
+d2s_08064034: @ 80937D4
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258442,8 +258442,8 @@ _080937EC:
 	thumb_func_end d2s_08064034
 
 	thumb_func_start GetOppositeDirection
-; u8 GetOppositeDirection(u8 direction)
-GetOppositeDirection: ; 8093800
+@ u8 GetOppositeDirection(u8 direction)
+GetOppositeDirection: @ 8093800
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -258472,7 +258472,7 @@ _0809382A:
 	thumb_func_end GetOppositeDirection
 
 	thumb_func_start zffu_offset_calc
-zffu_offset_calc: ; 8093834
+zffu_offset_calc: @ 8093834
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -258487,7 +258487,7 @@ zffu_offset_calc: ; 8093834
 	thumb_func_end zffu_offset_calc
 
 	thumb_func_start state_to_direction
-state_to_direction: ; 809384C
+state_to_direction: @ 809384C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -258524,8 +258524,8 @@ _08093882:
 	thumb_func_end state_to_direction
 
 	thumb_func_start FieldObjectExecSpecialAnim
-; void FieldObjectExecSpecialAnim(struct npc_state *fieldObject, struct obj *object)
-FieldObjectExecSpecialAnim: ; 809388C
+@ void FieldObjectExecSpecialAnim(struct npc_state *fieldObject, struct obj *object)
+FieldObjectExecSpecialAnim: @ 809388C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =gUnknown_0850DC50
@@ -258555,8 +258555,8 @@ _080938B8:
 	thumb_func_end FieldObjectExecSpecialAnim
 
 	thumb_func_start FieldObjectExecRegularAnim
-; bool8 FieldObjectExecRegularAnim(struct npc_state *fieldObject, struct obj *object)
-FieldObjectExecRegularAnim: ; 80938C4
+@ bool8 FieldObjectExecRegularAnim(struct npc_state *fieldObject, struct obj *object)
+FieldObjectExecRegularAnim: @ 80938C4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258592,8 +258592,8 @@ _080938FE:
 	thumb_func_end FieldObjectExecRegularAnim
 
 	thumb_func_start FieldObjectSetRegularAnim
-; void FieldObjectSetRegularAnim(struct npc_state *fieldObject, struct obj *object, u8 animState)
-FieldObjectSetRegularAnim: ; 8093904
+@ void FieldObjectSetRegularAnim(struct npc_state *fieldObject, struct obj *object, u8 animState)
+FieldObjectSetRegularAnim: @ 8093904
 	movs r3, 0
 	strb r2, [r0, 0x1C]
 	strh r3, [r1, 0x32]
@@ -258601,8 +258601,8 @@ FieldObjectSetRegularAnim: ; 8093904
 	thumb_func_end FieldObjectSetRegularAnim
 
 	thumb_func_start an_look_any
-; void an_look_any(struct npc_state *fieldObject, struct obj *object, u8 direction)
-an_look_any: ; 809390C
+@ void an_look_any(struct npc_state *fieldObject, struct obj *object, u8 direction)
+an_look_any: @ 809390C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258635,7 +258635,7 @@ an_look_any: ; 809390C
 	thumb_func_end an_look_any
 
 	thumb_func_start sub_8093950
-sub_8093950: ; 8093950
+sub_8093950: @ 8093950
 	push {lr}
 	movs r2, 0x1
 	bl an_look_any
@@ -258645,7 +258645,7 @@ sub_8093950: ; 8093950
 	thumb_func_end sub_8093950
 
 	thumb_func_start sub_8093960
-sub_8093960: ; 8093960
+sub_8093960: @ 8093960
 	push {lr}
 	movs r2, 0x2
 	bl an_look_any
@@ -258655,7 +258655,7 @@ sub_8093960: ; 8093960
 	thumb_func_end sub_8093960
 
 	thumb_func_start sub_8093970
-sub_8093970: ; 8093970
+sub_8093970: @ 8093970
 	push {lr}
 	movs r2, 0x3
 	bl an_look_any
@@ -258665,7 +258665,7 @@ sub_8093970: ; 8093970
 	thumb_func_end sub_8093970
 
 	thumb_func_start sub_8093980
-sub_8093980: ; 8093980
+sub_8093980: @ 8093980
 	push {lr}
 	movs r2, 0x4
 	bl an_look_any
@@ -258675,8 +258675,8 @@ sub_8093980: ; 8093980
 	thumb_func_end sub_8093980
 
 	thumb_func_start npc_apply_direction
-; void npc_apply_direction(struct npc_state *fieldObject, struct obj *object, u8 direction, u8 speed)
-npc_apply_direction: ; 8093990
+@ void npc_apply_direction(struct npc_state *fieldObject, struct obj *object, u8 direction, u8 speed)
+npc_apply_direction: @ 8093990
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -258753,8 +258753,8 @@ _08093A0E:
 	thumb_func_end npc_apply_direction
 
 	thumb_func_start do_go_anim
-; void do_go_anim(struct npc_state *fieldObject, struct obj *object, u8 direction, u8 speed)
-do_go_anim: ; 8093A2C
+@ void do_go_anim(struct npc_state *fieldObject, struct obj *object, u8 direction, u8 speed)
+do_go_anim: @ 8093A2C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -258800,8 +258800,8 @@ do_go_anim: ; 8093A2C
 	thumb_func_end do_go_anim
 
 	thumb_func_start do_run_anim
-; void do_run_anim(struct npc_state *fieldObject, struct obj *object, u8 direction)
-do_run_anim: ; 8093A88
+@ void do_run_anim(struct npc_state *fieldObject, struct obj *object, u8 direction)
+do_run_anim: @ 8093A88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258825,8 +258825,8 @@ do_run_anim: ; 8093A88
 	thumb_func_end do_run_anim
 
 	thumb_func_start npc_obj_ministep_stop_on_arrival
-; bool8 npc_obj_ministep_stop_on_arrival(struct npc_state *fieldObject, struct obj *object)
-npc_obj_ministep_stop_on_arrival: ; 8093AB8
+@ bool8 npc_obj_ministep_stop_on_arrival(struct npc_state *fieldObject, struct obj *object)
+npc_obj_ministep_stop_on_arrival: @ 8093AB8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258858,8 +258858,8 @@ _08093AEA:
 	thumb_func_end npc_obj_ministep_stop_on_arrival
 
 	thumb_func_start sub_8093AF0
-; void sub_8093AF0(struct npc_state *fieldObject, struct obj *object, u8 direction)
-sub_8093AF0: ; 8093AF0
+@ void sub_8093AF0(struct npc_state *fieldObject, struct obj *object, u8 direction)
+sub_8093AF0: @ 8093AF0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -258915,8 +258915,8 @@ sub_8093AF0: ; 8093AF0
 	thumb_func_end sub_8093AF0
 
 	thumb_func_start sub_8093B60
-; void sub_8093B60(struct npc_state *fieldObject, struct obj *object, u8 direction)
-sub_8093B60: ; 8093B60
+@ void sub_8093B60(struct npc_state *fieldObject, struct obj *object, u8 direction)
+sub_8093B60: @ 8093B60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258939,8 +258939,8 @@ sub_8093B60: ; 8093B60
 	thumb_func_end sub_8093B60
 
 	thumb_func_start an_walk_any_2
-; bool8 an_walk_any_2(struct npc_state *fieldObject, struct obj *object)
-an_walk_any_2: ; 8093B8C
+@ bool8 an_walk_any_2(struct npc_state *fieldObject, struct obj *object)
+an_walk_any_2: @ 8093B8C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258972,7 +258972,7 @@ _08093BBE:
 	thumb_func_end an_walk_any_2
 
 	thumb_func_start sub_8093BC4
-sub_8093BC4: ; 8093BC4
+sub_8093BC4: @ 8093BC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -258989,7 +258989,7 @@ sub_8093BC4: ; 8093BC4
 	thumb_func_end sub_8093BC4
 
 	thumb_func_start sub_8093BE4
-sub_8093BE4: ; 8093BE4
+sub_8093BE4: @ 8093BE4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259009,7 +259009,7 @@ _08093BFC:
 	thumb_func_end sub_8093BE4
 
 	thumb_func_start sub_8093C04
-sub_8093C04: ; 8093C04
+sub_8093C04: @ 8093C04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259026,7 +259026,7 @@ sub_8093C04: ; 8093C04
 	thumb_func_end sub_8093C04
 
 	thumb_func_start sub_8093C24
-sub_8093C24: ; 8093C24
+sub_8093C24: @ 8093C24
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259046,7 +259046,7 @@ _08093C3C:
 	thumb_func_end sub_8093C24
 
 	thumb_func_start sub_8093C44
-sub_8093C44: ; 8093C44
+sub_8093C44: @ 8093C44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259063,7 +259063,7 @@ sub_8093C44: ; 8093C44
 	thumb_func_end sub_8093C44
 
 	thumb_func_start sub_8093C64
-sub_8093C64: ; 8093C64
+sub_8093C64: @ 8093C64
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259083,7 +259083,7 @@ _08093C7C:
 	thumb_func_end sub_8093C64
 
 	thumb_func_start sub_8093C84
-sub_8093C84: ; 8093C84
+sub_8093C84: @ 8093C84
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259100,7 +259100,7 @@ sub_8093C84: ; 8093C84
 	thumb_func_end sub_8093C84
 
 	thumb_func_start sub_8093CA4
-sub_8093CA4: ; 8093CA4
+sub_8093CA4: @ 8093CA4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259120,8 +259120,8 @@ _08093CBC:
 	thumb_func_end sub_8093CA4
 
 	thumb_func_start sub_8093CC4
-; bool8 sub_8093CC4(struct npc_state *fieldObject, struct obj *object)
-sub_8093CC4: ; 8093CC4
+@ bool8 sub_8093CC4(struct npc_state *fieldObject, struct obj *object)
+sub_8093CC4: @ 8093CC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259138,8 +259138,8 @@ sub_8093CC4: ; 8093CC4
 	thumb_func_end sub_8093CC4
 
 	thumb_func_start sub_8093CE4
-; bool8 sub_8093CE4(struct npc_state *fieldObject, struct obj *object)
-sub_8093CE4: ; 8093CE4
+@ bool8 sub_8093CE4(struct npc_state *fieldObject, struct obj *object)
+sub_8093CE4: @ 8093CE4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259159,7 +259159,7 @@ _08093CFC:
 	thumb_func_end sub_8093CE4
 
 	thumb_func_start sub_8093D04
-sub_8093D04: ; 8093D04
+sub_8093D04: @ 8093D04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259176,7 +259176,7 @@ sub_8093D04: ; 8093D04
 	thumb_func_end sub_8093D04
 
 	thumb_func_start sub_8093D24
-sub_8093D24: ; 8093D24
+sub_8093D24: @ 8093D24
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259196,7 +259196,7 @@ _08093D3C:
 	thumb_func_end sub_8093D24
 
 	thumb_func_start sub_8093D44
-sub_8093D44: ; 8093D44
+sub_8093D44: @ 8093D44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259213,7 +259213,7 @@ sub_8093D44: ; 8093D44
 	thumb_func_end sub_8093D44
 
 	thumb_func_start sub_8093D64
-sub_8093D64: ; 8093D64
+sub_8093D64: @ 8093D64
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259233,7 +259233,7 @@ _08093D7C:
 	thumb_func_end sub_8093D64
 
 	thumb_func_start sub_8093D84
-sub_8093D84: ; 8093D84
+sub_8093D84: @ 8093D84
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259250,7 +259250,7 @@ sub_8093D84: ; 8093D84
 	thumb_func_end sub_8093D84
 
 	thumb_func_start sub_8093DA4
-sub_8093DA4: ; 8093DA4
+sub_8093DA4: @ 8093DA4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -259270,7 +259270,7 @@ _08093DBC:
 	thumb_func_end sub_8093DA4
 
 	thumb_func_start sub_8093DC4
-sub_8093DC4: ; 8093DC4
+sub_8093DC4: @ 8093DC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259288,8 +259288,8 @@ sub_8093DC4: ; 8093DC4
 	thumb_func_end sub_8093DC4
 
 	thumb_func_start sub_8093DE4
-; bool8 sub_8093DE4(struct npc_state *fieldObject, struct obj *object)
-sub_8093DE4: ; 8093DE4
+@ bool8 sub_8093DE4(struct npc_state *fieldObject, struct obj *object)
+sub_8093DE4: @ 8093DE4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259309,7 +259309,7 @@ _08093DFC:
 	thumb_func_end sub_8093DE4
 
 	thumb_func_start sub_8093E04
-sub_8093E04: ; 8093E04
+sub_8093E04: @ 8093E04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259327,7 +259327,7 @@ sub_8093E04: ; 8093E04
 	thumb_func_end sub_8093E04
 
 	thumb_func_start sub_8093E24
-sub_8093E24: ; 8093E24
+sub_8093E24: @ 8093E24
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259347,7 +259347,7 @@ _08093E3C:
 	thumb_func_end sub_8093E24
 
 	thumb_func_start sub_8093E44
-sub_8093E44: ; 8093E44
+sub_8093E44: @ 8093E44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259365,7 +259365,7 @@ sub_8093E44: ; 8093E44
 	thumb_func_end sub_8093E44
 
 	thumb_func_start sub_8093E64
-sub_8093E64: ; 8093E64
+sub_8093E64: @ 8093E64
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259385,7 +259385,7 @@ _08093E7C:
 	thumb_func_end sub_8093E64
 
 	thumb_func_start sub_8093E84
-sub_8093E84: ; 8093E84
+sub_8093E84: @ 8093E84
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259403,7 +259403,7 @@ sub_8093E84: ; 8093E84
 	thumb_func_end sub_8093E84
 
 	thumb_func_start sub_8093EA4
-sub_8093EA4: ; 8093EA4
+sub_8093EA4: @ 8093EA4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259423,7 +259423,7 @@ _08093EBC:
 	thumb_func_end sub_8093EA4
 
 	thumb_func_start sub_8093EC4
-sub_8093EC4: ; 8093EC4
+sub_8093EC4: @ 8093EC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259441,7 +259441,7 @@ sub_8093EC4: ; 8093EC4
 	thumb_func_end sub_8093EC4
 
 	thumb_func_start sub_8093EE4
-sub_8093EE4: ; 8093EE4
+sub_8093EE4: @ 8093EE4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259461,7 +259461,7 @@ _08093EFC:
 	thumb_func_end sub_8093EE4
 
 	thumb_func_start sub_8093F04
-sub_8093F04: ; 8093F04
+sub_8093F04: @ 8093F04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259479,7 +259479,7 @@ sub_8093F04: ; 8093F04
 	thumb_func_end sub_8093F04
 
 	thumb_func_start sub_8093F24
-sub_8093F24: ; 8093F24
+sub_8093F24: @ 8093F24
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259499,7 +259499,7 @@ _08093F3C:
 	thumb_func_end sub_8093F24
 
 	thumb_func_start sub_8093F44
-sub_8093F44: ; 8093F44
+sub_8093F44: @ 8093F44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259517,7 +259517,7 @@ sub_8093F44: ; 8093F44
 	thumb_func_end sub_8093F44
 
 	thumb_func_start sub_8093F64
-sub_8093F64: ; 8093F64
+sub_8093F64: @ 8093F64
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259537,7 +259537,7 @@ _08093F7C:
 	thumb_func_end sub_8093F64
 
 	thumb_func_start sub_8093F84
-sub_8093F84: ; 8093F84
+sub_8093F84: @ 8093F84
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259555,7 +259555,7 @@ sub_8093F84: ; 8093F84
 	thumb_func_end sub_8093F84
 
 	thumb_func_start sub_8093FA4
-sub_8093FA4: ; 8093FA4
+sub_8093FA4: @ 8093FA4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -259575,7 +259575,7 @@ _08093FBC:
 	thumb_func_end sub_8093FA4
 
 	thumb_func_start sub_8093FC4
-sub_8093FC4: ; 8093FC4
+sub_8093FC4: @ 8093FC4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -259667,7 +259667,7 @@ sub_8093FC4: ; 8093FC4
 	thumb_func_end sub_8093FC4
 
 	thumb_func_start maybe_shadow_1
-maybe_shadow_1: ; 8094080
+maybe_shadow_1: @ 8094080
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -259701,8 +259701,8 @@ maybe_shadow_1: ; 8094080
 	thumb_func_end maybe_shadow_1
 
 	thumb_func_start sub_80940C4
-; int sub_80940C4(int a1, int a2, int a3)
-sub_80940C4: ; 80940C4
+@ int sub_80940C4(int a1, int a2, int a3)
+sub_80940C4: @ 80940C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -259798,7 +259798,7 @@ _08094178:
 	thumb_func_end sub_80940C4
 
 	thumb_func_start sub_8094188
-sub_8094188: ; 8094188
+sub_8094188: @ 8094188
 	push {lr}
 	ldr r2, =sub_809785C
 	bl sub_80940C4
@@ -259810,7 +259810,7 @@ sub_8094188: ; 8094188
 	thumb_func_end sub_8094188
 
 	thumb_func_start sub_809419C
-sub_809419C: ; 809419C
+sub_809419C: @ 809419C
 	push {lr}
 	ldr r2, =sub_80978E4
 	bl sub_80940C4
@@ -259822,7 +259822,7 @@ sub_809419C: ; 809419C
 	thumb_func_end sub_809419C
 
 	thumb_func_start sub_80941B0
-sub_80941B0: ; 80941B0
+sub_80941B0: @ 80941B0
 	push {lr}
 	bl sub_8094188
 	lsls r0, 24
@@ -259839,7 +259839,7 @@ _080941C4:
 	thumb_func_end sub_80941B0
 
 	thumb_func_start sub_80941C8
-sub_80941C8: ; 80941C8
+sub_80941C8: @ 80941C8
 	push {lr}
 	bl sub_809419C
 	lsls r0, 24
@@ -259856,7 +259856,7 @@ _080941DC:
 	thumb_func_end sub_80941C8
 
 	thumb_func_start sub_80941E0
-sub_80941E0: ; 80941E0
+sub_80941E0: @ 80941E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259897,7 +259897,7 @@ _08094228:
 	thumb_func_end sub_80941E0
 
 	thumb_func_start sub_8094230
-sub_8094230: ; 8094230
+sub_8094230: @ 8094230
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -259920,7 +259920,7 @@ sub_8094230: ; 8094230
 	thumb_func_end sub_8094230
 
 	thumb_func_start sub_809425C
-sub_809425C: ; 809425C
+sub_809425C: @ 809425C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259946,7 +259946,7 @@ _08094280:
 	thumb_func_end sub_809425C
 
 	thumb_func_start sub_8094288
-sub_8094288: ; 8094288
+sub_8094288: @ 8094288
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -259969,7 +259969,7 @@ sub_8094288: ; 8094288
 	thumb_func_end sub_8094288
 
 	thumb_func_start sub_80942B4
-sub_80942B4: ; 80942B4
+sub_80942B4: @ 80942B4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -259995,7 +259995,7 @@ _080942D8:
 	thumb_func_end sub_80942B4
 
 	thumb_func_start sub_80942E0
-sub_80942E0: ; 80942E0
+sub_80942E0: @ 80942E0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260018,7 +260018,7 @@ sub_80942E0: ; 80942E0
 	thumb_func_end sub_80942E0
 
 	thumb_func_start sub_809430C
-sub_809430C: ; 809430C
+sub_809430C: @ 809430C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260044,7 +260044,7 @@ _08094330:
 	thumb_func_end sub_809430C
 
 	thumb_func_start sub_8094338
-sub_8094338: ; 8094338
+sub_8094338: @ 8094338
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260067,7 +260067,7 @@ sub_8094338: ; 8094338
 	thumb_func_end sub_8094338
 
 	thumb_func_start sub_8094364
-sub_8094364: ; 8094364
+sub_8094364: @ 8094364
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260093,7 +260093,7 @@ _08094388:
 	thumb_func_end sub_8094364
 
 	thumb_func_start sub_8094390
-sub_8094390: ; 8094390
+sub_8094390: @ 8094390
 	movs r2, 0x1
 	strh r2, [r0, 0x32]
 	strh r1, [r0, 0x34]
@@ -260101,7 +260101,7 @@ sub_8094390: ; 8094390
 	thumb_func_end sub_8094390
 
 	thumb_func_start sub_8094398
-sub_8094398: ; 8094398
+sub_8094398: @ 8094398
 	push {lr}
 	ldrh r0, [r1, 0x34]
 	subs r0, 0x1
@@ -260121,7 +260121,7 @@ _080943B0:
 	thumb_func_end sub_8094398
 
 	thumb_func_start sub_80943B4
-sub_80943B4: ; 80943B4
+sub_80943B4: @ 80943B4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260139,7 +260139,7 @@ sub_80943B4: ; 80943B4
 	thumb_func_end sub_80943B4
 
 	thumb_func_start sub_80943D4
-sub_80943D4: ; 80943D4
+sub_80943D4: @ 80943D4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260157,7 +260157,7 @@ sub_80943D4: ; 80943D4
 	thumb_func_end sub_80943D4
 
 	thumb_func_start sub_80943F4
-sub_80943F4: ; 80943F4
+sub_80943F4: @ 80943F4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260175,7 +260175,7 @@ sub_80943F4: ; 80943F4
 	thumb_func_end sub_80943F4
 
 	thumb_func_start sub_8094414
-sub_8094414: ; 8094414
+sub_8094414: @ 8094414
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260193,7 +260193,7 @@ sub_8094414: ; 8094414
 	thumb_func_end sub_8094414
 
 	thumb_func_start sub_8094434
-sub_8094434: ; 8094434
+sub_8094434: @ 8094434
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260211,7 +260211,7 @@ sub_8094434: ; 8094434
 	thumb_func_end sub_8094434
 
 	thumb_func_start sub_8094454
-sub_8094454: ; 8094454
+sub_8094454: @ 8094454
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260229,7 +260229,7 @@ sub_8094454: ; 8094454
 	thumb_func_end sub_8094454
 
 	thumb_func_start sub_8094474
-sub_8094474: ; 8094474
+sub_8094474: @ 8094474
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260249,7 +260249,7 @@ _0809448C:
 	thumb_func_end sub_8094474
 
 	thumb_func_start sub_8094494
-sub_8094494: ; 8094494
+sub_8094494: @ 8094494
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260267,7 +260267,7 @@ sub_8094494: ; 8094494
 	thumb_func_end sub_8094494
 
 	thumb_func_start sub_80944B4
-sub_80944B4: ; 80944B4
+sub_80944B4: @ 80944B4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260287,7 +260287,7 @@ _080944CC:
 	thumb_func_end sub_80944B4
 
 	thumb_func_start sub_80944D4
-sub_80944D4: ; 80944D4
+sub_80944D4: @ 80944D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260305,7 +260305,7 @@ sub_80944D4: ; 80944D4
 	thumb_func_end sub_80944D4
 
 	thumb_func_start sub_80944F4
-sub_80944F4: ; 80944F4
+sub_80944F4: @ 80944F4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260325,7 +260325,7 @@ _0809450C:
 	thumb_func_end sub_80944F4
 
 	thumb_func_start sub_8094514
-sub_8094514: ; 8094514
+sub_8094514: @ 8094514
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260343,7 +260343,7 @@ sub_8094514: ; 8094514
 	thumb_func_end sub_8094514
 
 	thumb_func_start sub_8094534
-sub_8094534: ; 8094534
+sub_8094534: @ 8094534
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260363,7 +260363,7 @@ _0809454C:
 	thumb_func_end sub_8094534
 
 	thumb_func_start sub_8094554
-sub_8094554: ; 8094554
+sub_8094554: @ 8094554
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -260401,8 +260401,8 @@ sub_8094554: ; 8094554
 	thumb_func_end sub_8094554
 
 	thumb_func_start sub_809459C
-; signed int sub_809459C(int a1, obj *a2)
-sub_809459C: ; 809459C
+@ signed int sub_809459C(int a1, obj *a2)
+sub_809459C: @ 809459C
 	push {lr}
 	ldrh r0, [r1, 0x34]
 	subs r0, 0x1
@@ -260428,8 +260428,8 @@ _080945C0:
 	thumb_func_end sub_809459C
 
 	thumb_func_start sub_80945C4
-; int sub_80945C4(int a1, obj *a2)
-sub_80945C4: ; 80945C4
+@ int sub_80945C4(int a1, obj *a2)
+sub_80945C4: @ 80945C4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -260463,7 +260463,7 @@ _080945EE:
 	thumb_func_end sub_80945C4
 
 	thumb_func_start sub_8094600
-sub_8094600: ; 8094600
+sub_8094600: @ 8094600
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260491,7 +260491,7 @@ sub_8094600: ; 8094600
 	thumb_func_end sub_8094600
 
 	thumb_func_start sub_8094638
-sub_8094638: ; 8094638
+sub_8094638: @ 8094638
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260519,7 +260519,7 @@ sub_8094638: ; 8094638
 	thumb_func_end sub_8094638
 
 	thumb_func_start sub_8094670
-sub_8094670: ; 8094670
+sub_8094670: @ 8094670
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260547,7 +260547,7 @@ sub_8094670: ; 8094670
 	thumb_func_end sub_8094670
 
 	thumb_func_start sub_80946A8
-sub_80946A8: ; 80946A8
+sub_80946A8: @ 80946A8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260575,7 +260575,7 @@ sub_80946A8: ; 80946A8
 	thumb_func_end sub_80946A8
 
 	thumb_func_start sub_80946E0
-sub_80946E0: ; 80946E0
+sub_80946E0: @ 80946E0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260603,7 +260603,7 @@ sub_80946E0: ; 80946E0
 	thumb_func_end sub_80946E0
 
 	thumb_func_start sub_8094718
-sub_8094718: ; 8094718
+sub_8094718: @ 8094718
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260631,7 +260631,7 @@ sub_8094718: ; 8094718
 	thumb_func_end sub_8094718
 
 	thumb_func_start sub_8094750
-sub_8094750: ; 8094750
+sub_8094750: @ 8094750
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260659,7 +260659,7 @@ sub_8094750: ; 8094750
 	thumb_func_end sub_8094750
 
 	thumb_func_start sub_8094788
-sub_8094788: ; 8094788
+sub_8094788: @ 8094788
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260687,7 +260687,7 @@ sub_8094788: ; 8094788
 	thumb_func_end sub_8094788
 
 	thumb_func_start sub_80947C0
-sub_80947C0: ; 80947C0
+sub_80947C0: @ 80947C0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260715,7 +260715,7 @@ sub_80947C0: ; 80947C0
 	thumb_func_end sub_80947C0
 
 	thumb_func_start sub_80947F8
-sub_80947F8: ; 80947F8
+sub_80947F8: @ 80947F8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260743,7 +260743,7 @@ sub_80947F8: ; 80947F8
 	thumb_func_end sub_80947F8
 
 	thumb_func_start sub_8094830
-sub_8094830: ; 8094830
+sub_8094830: @ 8094830
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260771,7 +260771,7 @@ sub_8094830: ; 8094830
 	thumb_func_end sub_8094830
 
 	thumb_func_start sub_8094868
-sub_8094868: ; 8094868
+sub_8094868: @ 8094868
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260799,7 +260799,7 @@ sub_8094868: ; 8094868
 	thumb_func_end sub_8094868
 
 	thumb_func_start sub_80948A0
-sub_80948A0: ; 80948A0
+sub_80948A0: @ 80948A0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260827,7 +260827,7 @@ sub_80948A0: ; 80948A0
 	thumb_func_end sub_80948A0
 
 	thumb_func_start sub_80948D8
-sub_80948D8: ; 80948D8
+sub_80948D8: @ 80948D8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260855,7 +260855,7 @@ sub_80948D8: ; 80948D8
 	thumb_func_end sub_80948D8
 
 	thumb_func_start sub_8094910
-sub_8094910: ; 8094910
+sub_8094910: @ 8094910
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260883,7 +260883,7 @@ sub_8094910: ; 8094910
 	thumb_func_end sub_8094910
 
 	thumb_func_start sub_8094948
-sub_8094948: ; 8094948
+sub_8094948: @ 8094948
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -260911,7 +260911,7 @@ sub_8094948: ; 8094948
 	thumb_func_end sub_8094948
 
 	thumb_func_start sub_8094980
-sub_8094980: ; 8094980
+sub_8094980: @ 8094980
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260929,7 +260929,7 @@ sub_8094980: ; 8094980
 	thumb_func_end sub_8094980
 
 	thumb_func_start sub_80949A0
-sub_80949A0: ; 80949A0
+sub_80949A0: @ 80949A0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260949,7 +260949,7 @@ _080949B8:
 	thumb_func_end sub_80949A0
 
 	thumb_func_start sub_80949C0
-sub_80949C0: ; 80949C0
+sub_80949C0: @ 80949C0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -260967,7 +260967,7 @@ sub_80949C0: ; 80949C0
 	thumb_func_end sub_80949C0
 
 	thumb_func_start sub_80949E0
-sub_80949E0: ; 80949E0
+sub_80949E0: @ 80949E0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -260987,7 +260987,7 @@ _080949F8:
 	thumb_func_end sub_80949E0
 
 	thumb_func_start sub_8094A00
-sub_8094A00: ; 8094A00
+sub_8094A00: @ 8094A00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261005,7 +261005,7 @@ sub_8094A00: ; 8094A00
 	thumb_func_end sub_8094A00
 
 	thumb_func_start sub_8094A20
-sub_8094A20: ; 8094A20
+sub_8094A20: @ 8094A20
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261025,7 +261025,7 @@ _08094A38:
 	thumb_func_end sub_8094A20
 
 	thumb_func_start sub_8094A40
-sub_8094A40: ; 8094A40
+sub_8094A40: @ 8094A40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261043,7 +261043,7 @@ sub_8094A40: ; 8094A40
 	thumb_func_end sub_8094A40
 
 	thumb_func_start sub_8094A60
-sub_8094A60: ; 8094A60
+sub_8094A60: @ 8094A60
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261063,7 +261063,7 @@ _08094A78:
 	thumb_func_end sub_8094A60
 
 	thumb_func_start sub_8094A80
-sub_8094A80: ; 8094A80
+sub_8094A80: @ 8094A80
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261081,7 +261081,7 @@ sub_8094A80: ; 8094A80
 	thumb_func_end sub_8094A80
 
 	thumb_func_start sub_8094AA0
-sub_8094AA0: ; 8094AA0
+sub_8094AA0: @ 8094AA0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261101,7 +261101,7 @@ _08094AB8:
 	thumb_func_end sub_8094AA0
 
 	thumb_func_start sub_8094AC0
-sub_8094AC0: ; 8094AC0
+sub_8094AC0: @ 8094AC0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261119,7 +261119,7 @@ sub_8094AC0: ; 8094AC0
 	thumb_func_end sub_8094AC0
 
 	thumb_func_start sub_8094AE0
-sub_8094AE0: ; 8094AE0
+sub_8094AE0: @ 8094AE0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261139,7 +261139,7 @@ _08094AF8:
 	thumb_func_end sub_8094AE0
 
 	thumb_func_start sub_8094B00
-sub_8094B00: ; 8094B00
+sub_8094B00: @ 8094B00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261157,7 +261157,7 @@ sub_8094B00: ; 8094B00
 	thumb_func_end sub_8094B00
 
 	thumb_func_start sub_8094B20
-sub_8094B20: ; 8094B20
+sub_8094B20: @ 8094B20
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261177,7 +261177,7 @@ _08094B38:
 	thumb_func_end sub_8094B20
 
 	thumb_func_start sub_8094B40
-sub_8094B40: ; 8094B40
+sub_8094B40: @ 8094B40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261195,7 +261195,7 @@ sub_8094B40: ; 8094B40
 	thumb_func_end sub_8094B40
 
 	thumb_func_start sub_8094B60
-sub_8094B60: ; 8094B60
+sub_8094B60: @ 8094B60
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261215,7 +261215,7 @@ _08094B78:
 	thumb_func_end sub_8094B60
 
 	thumb_func_start sub_8094B80
-sub_8094B80: ; 8094B80
+sub_8094B80: @ 8094B80
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261233,7 +261233,7 @@ sub_8094B80: ; 8094B80
 	thumb_func_end sub_8094B80
 
 	thumb_func_start sub_8094BA0
-sub_8094BA0: ; 8094BA0
+sub_8094BA0: @ 8094BA0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261253,7 +261253,7 @@ _08094BB8:
 	thumb_func_end sub_8094BA0
 
 	thumb_func_start sub_8094BC0
-sub_8094BC0: ; 8094BC0
+sub_8094BC0: @ 8094BC0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261271,7 +261271,7 @@ sub_8094BC0: ; 8094BC0
 	thumb_func_end sub_8094BC0
 
 	thumb_func_start sub_8094BE0
-sub_8094BE0: ; 8094BE0
+sub_8094BE0: @ 8094BE0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261291,7 +261291,7 @@ _08094BF8:
 	thumb_func_end sub_8094BE0
 
 	thumb_func_start sub_8094C00
-sub_8094C00: ; 8094C00
+sub_8094C00: @ 8094C00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261309,7 +261309,7 @@ sub_8094C00: ; 8094C00
 	thumb_func_end sub_8094C00
 
 	thumb_func_start sub_8094C20
-sub_8094C20: ; 8094C20
+sub_8094C20: @ 8094C20
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261329,7 +261329,7 @@ _08094C38:
 	thumb_func_end sub_8094C20
 
 	thumb_func_start sub_8094C40
-sub_8094C40: ; 8094C40
+sub_8094C40: @ 8094C40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261347,7 +261347,7 @@ sub_8094C40: ; 8094C40
 	thumb_func_end sub_8094C40
 
 	thumb_func_start sub_8094C60
-sub_8094C60: ; 8094C60
+sub_8094C60: @ 8094C60
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261367,8 +261367,8 @@ _08094C78:
 	thumb_func_end sub_8094C60
 
 	thumb_func_start do_run_south_anim
-; bool8 do_run_south_anim(struct npc_state *fieldObject, struct obj *object)
-do_run_south_anim: ; 8094C80
+@ bool8 do_run_south_anim(struct npc_state *fieldObject, struct obj *object)
+do_run_south_anim: @ 8094C80
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261385,8 +261385,8 @@ do_run_south_anim: ; 8094C80
 	thumb_func_end do_run_south_anim
 
 	thumb_func_start sub_8094CA0
-; bool8 sub_8094CA0(struct npc_state *fieldObject, struct obj *object)
-sub_8094CA0: ; 8094CA0
+@ bool8 sub_8094CA0(struct npc_state *fieldObject, struct obj *object)
+sub_8094CA0: @ 8094CA0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261406,7 +261406,7 @@ _08094CB8:
 	thumb_func_end sub_8094CA0
 
 	thumb_func_start do_run_north_anim
-do_run_north_anim: ; 8094CC0
+do_run_north_anim: @ 8094CC0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261423,7 +261423,7 @@ do_run_north_anim: ; 8094CC0
 	thumb_func_end do_run_north_anim
 
 	thumb_func_start sub_8094CE0
-sub_8094CE0: ; 8094CE0
+sub_8094CE0: @ 8094CE0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261443,7 +261443,7 @@ _08094CF8:
 	thumb_func_end sub_8094CE0
 
 	thumb_func_start do_run_west_anim
-do_run_west_anim: ; 8094D00
+do_run_west_anim: @ 8094D00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261460,7 +261460,7 @@ do_run_west_anim: ; 8094D00
 	thumb_func_end do_run_west_anim
 
 	thumb_func_start sub_8094D20
-sub_8094D20: ; 8094D20
+sub_8094D20: @ 8094D20
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261480,7 +261480,7 @@ _08094D38:
 	thumb_func_end sub_8094D20
 
 	thumb_func_start do_run_east_anim
-do_run_east_anim: ; 8094D40
+do_run_east_anim: @ 8094D40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261497,7 +261497,7 @@ do_run_east_anim: ; 8094D40
 	thumb_func_end do_run_east_anim
 
 	thumb_func_start sub_8094D60
-sub_8094D60: ; 8094D60
+sub_8094D60: @ 8094D60
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -261517,7 +261517,7 @@ _08094D78:
 	thumb_func_end sub_8094D60
 
 	thumb_func_start npc_set_direction_and_anim__an_proceed
-npc_set_direction_and_anim__an_proceed: ; 8094D80
+npc_set_direction_and_anim__an_proceed: @ 8094D80
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -261541,7 +261541,7 @@ npc_set_direction_and_anim__an_proceed: ; 8094D80
 	thumb_func_end npc_set_direction_and_anim__an_proceed
 
 	thumb_func_start sub_8094DAC
-sub_8094DAC: ; 8094DAC
+sub_8094DAC: @ 8094DAC
 	push {lr}
 	ldrb r2, [r0, 0x18]
 	lsrs r2, 4
@@ -261555,7 +261555,7 @@ sub_8094DAC: ; 8094DAC
 	thumb_func_end sub_8094DAC
 
 	thumb_func_start sub_8094DC4
-sub_8094DC4: ; 8094DC4
+sub_8094DC4: @ 8094DC4
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -261576,7 +261576,7 @@ _08094DDE:
 	thumb_func_end sub_8094DC4
 
 	thumb_func_start sub_8094DE4
-sub_8094DE4: ; 8094DE4
+sub_8094DE4: @ 8094DE4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -261602,7 +261602,7 @@ sub_8094DE4: ; 8094DE4
 	thumb_func_end sub_8094DE4
 
 	thumb_func_start sub_8094E18
-sub_8094E18: ; 8094E18
+sub_8094E18: @ 8094E18
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261619,7 +261619,7 @@ sub_8094E18: ; 8094E18
 	thumb_func_end sub_8094E18
 
 	thumb_func_start sub_8094E38
-sub_8094E38: ; 8094E38
+sub_8094E38: @ 8094E38
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261644,7 +261644,7 @@ _08094E5A:
 	thumb_func_end sub_8094E38
 
 	thumb_func_start sub_8094E60
-sub_8094E60: ; 8094E60
+sub_8094E60: @ 8094E60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261661,7 +261661,7 @@ sub_8094E60: ; 8094E60
 	thumb_func_end sub_8094E60
 
 	thumb_func_start sub_8094E80
-sub_8094E80: ; 8094E80
+sub_8094E80: @ 8094E80
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261686,7 +261686,7 @@ _08094EA2:
 	thumb_func_end sub_8094E80
 
 	thumb_func_start sub_8094EA8
-sub_8094EA8: ; 8094EA8
+sub_8094EA8: @ 8094EA8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261703,7 +261703,7 @@ sub_8094EA8: ; 8094EA8
 	thumb_func_end sub_8094EA8
 
 	thumb_func_start sub_8094EC8
-sub_8094EC8: ; 8094EC8
+sub_8094EC8: @ 8094EC8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261728,7 +261728,7 @@ _08094EEA:
 	thumb_func_end sub_8094EC8
 
 	thumb_func_start sub_8094EF0
-sub_8094EF0: ; 8094EF0
+sub_8094EF0: @ 8094EF0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261745,7 +261745,7 @@ sub_8094EF0: ; 8094EF0
 	thumb_func_end sub_8094EF0
 
 	thumb_func_start sub_8094F10
-sub_8094F10: ; 8094F10
+sub_8094F10: @ 8094F10
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261770,7 +261770,7 @@ _08094F32:
 	thumb_func_end sub_8094F10
 
 	thumb_func_start sub_8094F38
-sub_8094F38: ; 8094F38
+sub_8094F38: @ 8094F38
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -261816,7 +261816,7 @@ _08094F82:
 	thumb_func_end sub_8094F38
 
 	thumb_func_start sub_8094F94
-sub_8094F94: ; 8094F94
+sub_8094F94: @ 8094F94
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -261865,7 +261865,7 @@ _08094FE6:
 	thumb_func_end sub_8094F94
 
 	thumb_func_start sub_8094FF8
-sub_8094FF8: ; 8094FF8
+sub_8094FF8: @ 8094FF8
 	ldrb r2, [r0, 0x1]
 	movs r3, 0x2
 	orrs r2, r3
@@ -261876,7 +261876,7 @@ sub_8094FF8: ; 8094FF8
 	thumb_func_end sub_8094FF8
 
 	thumb_func_start sub_8095008
-sub_8095008: ; 8095008
+sub_8095008: @ 8095008
 	ldrb r3, [r0, 0x1]
 	movs r2, 0x3
 	negs r2, r2
@@ -261888,7 +261888,7 @@ sub_8095008: ; 8095008
 	thumb_func_end sub_8095008
 
 	thumb_func_start sub_8095018
-sub_8095018: ; 8095018
+sub_8095018: @ 8095018
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -261911,7 +261911,7 @@ sub_8095018: ; 8095018
 	thumb_func_end sub_8095018
 
 	thumb_func_start sub_8095044
-sub_8095044: ; 8095044
+sub_8095044: @ 8095044
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261937,7 +261937,7 @@ _08095068:
 	thumb_func_end sub_8095044
 
 	thumb_func_start sub_8095070
-sub_8095070: ; 8095070
+sub_8095070: @ 8095070
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -261960,7 +261960,7 @@ sub_8095070: ; 8095070
 	thumb_func_end sub_8095070
 
 	thumb_func_start sub_809509C
-sub_809509C: ; 809509C
+sub_809509C: @ 809509C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -261986,7 +261986,7 @@ _080950C0:
 	thumb_func_end sub_809509C
 
 	thumb_func_start sub_80950C8
-sub_80950C8: ; 80950C8
+sub_80950C8: @ 80950C8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262009,7 +262009,7 @@ sub_80950C8: ; 80950C8
 	thumb_func_end sub_80950C8
 
 	thumb_func_start sub_80950F4
-sub_80950F4: ; 80950F4
+sub_80950F4: @ 80950F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262035,7 +262035,7 @@ _08095118:
 	thumb_func_end sub_80950F4
 
 	thumb_func_start sub_8095120
-sub_8095120: ; 8095120
+sub_8095120: @ 8095120
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262058,7 +262058,7 @@ sub_8095120: ; 8095120
 	thumb_func_end sub_8095120
 
 	thumb_func_start sub_809514C
-sub_809514C: ; 809514C
+sub_809514C: @ 809514C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262084,7 +262084,7 @@ _08095170:
 	thumb_func_end sub_809514C
 
 	thumb_func_start sub_8095178
-sub_8095178: ; 8095178
+sub_8095178: @ 8095178
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262107,7 +262107,7 @@ sub_8095178: ; 8095178
 	thumb_func_end sub_8095178
 
 	thumb_func_start sub_80951A4
-sub_80951A4: ; 80951A4
+sub_80951A4: @ 80951A4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262133,7 +262133,7 @@ _080951C8:
 	thumb_func_end sub_80951A4
 
 	thumb_func_start sub_80951D0
-sub_80951D0: ; 80951D0
+sub_80951D0: @ 80951D0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262156,7 +262156,7 @@ sub_80951D0: ; 80951D0
 	thumb_func_end sub_80951D0
 
 	thumb_func_start sub_80951FC
-sub_80951FC: ; 80951FC
+sub_80951FC: @ 80951FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262182,7 +262182,7 @@ _08095220:
 	thumb_func_end sub_80951FC
 
 	thumb_func_start sub_8095228
-sub_8095228: ; 8095228
+sub_8095228: @ 8095228
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262205,7 +262205,7 @@ sub_8095228: ; 8095228
 	thumb_func_end sub_8095228
 
 	thumb_func_start sub_8095254
-sub_8095254: ; 8095254
+sub_8095254: @ 8095254
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262231,7 +262231,7 @@ _08095278:
 	thumb_func_end sub_8095254
 
 	thumb_func_start sub_8095280
-sub_8095280: ; 8095280
+sub_8095280: @ 8095280
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262254,7 +262254,7 @@ sub_8095280: ; 8095280
 	thumb_func_end sub_8095280
 
 	thumb_func_start sub_80952AC
-sub_80952AC: ; 80952AC
+sub_80952AC: @ 80952AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262280,7 +262280,7 @@ _080952D0:
 	thumb_func_end sub_80952AC
 
 	thumb_func_start sub_80952D8
-sub_80952D8: ; 80952D8
+sub_80952D8: @ 80952D8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262303,7 +262303,7 @@ sub_80952D8: ; 80952D8
 	thumb_func_end sub_80952D8
 
 	thumb_func_start sub_8095304
-sub_8095304: ; 8095304
+sub_8095304: @ 8095304
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262329,7 +262329,7 @@ _08095328:
 	thumb_func_end sub_8095304
 
 	thumb_func_start sub_8095330
-sub_8095330: ; 8095330
+sub_8095330: @ 8095330
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262352,7 +262352,7 @@ sub_8095330: ; 8095330
 	thumb_func_end sub_8095330
 
 	thumb_func_start sub_809535C
-sub_809535C: ; 809535C
+sub_809535C: @ 809535C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262378,7 +262378,7 @@ _08095380:
 	thumb_func_end sub_809535C
 
 	thumb_func_start sub_8095388
-sub_8095388: ; 8095388
+sub_8095388: @ 8095388
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262401,7 +262401,7 @@ sub_8095388: ; 8095388
 	thumb_func_end sub_8095388
 
 	thumb_func_start sub_80953B4
-sub_80953B4: ; 80953B4
+sub_80953B4: @ 80953B4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262427,7 +262427,7 @@ _080953D8:
 	thumb_func_end sub_80953B4
 
 	thumb_func_start sub_80953E0
-sub_80953E0: ; 80953E0
+sub_80953E0: @ 80953E0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -262450,7 +262450,7 @@ sub_80953E0: ; 80953E0
 	thumb_func_end sub_80953E0
 
 	thumb_func_start sub_809540C
-sub_809540C: ; 809540C
+sub_809540C: @ 809540C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262476,7 +262476,7 @@ _08095430:
 	thumb_func_end sub_809540C
 
 	thumb_func_start sub_8095438
-sub_8095438: ; 8095438
+sub_8095438: @ 8095438
 	push {lr}
 	ldr r3, =gUnknown_085055CD
 	ldrb r2, [r0, 0x6]
@@ -262490,7 +262490,7 @@ sub_8095438: ; 8095438
 	thumb_func_end sub_8095438
 
 	thumb_func_start sub_8095450
-sub_8095450: ; 8095450
+sub_8095450: @ 8095450
 	push {lr}
 	movs r2, 0x1
 	movs r3, 0x14
@@ -262501,7 +262501,7 @@ sub_8095450: ; 8095450
 	thumb_func_end sub_8095450
 
 	thumb_func_start sub_8095460
-sub_8095460: ; 8095460
+sub_8095460: @ 8095460
 	ldrb r3, [r0, 0x3]
 	movs r2, 0x3
 	negs r2, r2
@@ -262513,7 +262513,7 @@ sub_8095460: ; 8095460
 	thumb_func_end sub_8095460
 
 	thumb_func_start sub_8095470
-sub_8095470: ; 8095470
+sub_8095470: @ 8095470
 	ldrb r2, [r0, 0x3]
 	movs r3, 0x2
 	orrs r2, r3
@@ -262524,7 +262524,7 @@ sub_8095470: ; 8095470
 	thumb_func_end sub_8095470
 
 	thumb_func_start sub_8095480
-sub_8095480: ; 8095480
+sub_8095480: @ 8095480
 	ldrb r2, [r0, 0x1]
 	movs r3, 0x10
 	orrs r2, r3
@@ -262535,8 +262535,8 @@ sub_8095480: ; 8095480
 	thumb_func_end sub_8095480
 
 	thumb_func_start sub_8095490
-; int sub_8095490(npc_state *npcState, int a2)
-sub_8095490: ; 8095490
+@ int sub_8095490(npc_state *npcState, int a2)
+sub_8095490: @ 8095490
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262560,7 +262560,7 @@ sub_8095490: ; 8095490
 	thumb_func_end sub_8095490
 
 	thumb_func_start sub_80954BC
-sub_80954BC: ; 80954BC
+sub_80954BC: @ 80954BC
 	ldrb r2, [r0, 0x1]
 	movs r3, 0x20
 	orrs r2, r3
@@ -262571,7 +262571,7 @@ sub_80954BC: ; 80954BC
 	thumb_func_end sub_80954BC
 
 	thumb_func_start sub_80954CC
-sub_80954CC: ; 80954CC
+sub_80954CC: @ 80954CC
 	ldrb r3, [r0, 0x1]
 	movs r2, 0x21
 	negs r2, r2
@@ -262583,7 +262583,7 @@ sub_80954CC: ; 80954CC
 	thumb_func_end sub_80954CC
 
 	thumb_func_start do_exclamation_mark_bubble_1
-do_exclamation_mark_bubble_1: ; 80954DC
+do_exclamation_mark_bubble_1: @ 80954DC
 	push {r4,lr}
 	adds r4, r1, 0
 	ldr r1, =0x02038c08
@@ -262602,7 +262602,7 @@ do_exclamation_mark_bubble_1: ; 80954DC
 	thumb_func_end do_exclamation_mark_bubble_1
 
 	thumb_func_start do_exclamation_mark_bubble_2
-do_exclamation_mark_bubble_2: ; 8095500
+do_exclamation_mark_bubble_2: @ 8095500
 	push {r4,lr}
 	adds r4, r1, 0
 	ldr r1, =0x02038c08
@@ -262621,7 +262621,7 @@ do_exclamation_mark_bubble_2: ; 8095500
 	thumb_func_end do_exclamation_mark_bubble_2
 
 	thumb_func_start do_heart_bubble
-do_heart_bubble: ; 8095524
+do_heart_bubble: @ 8095524
 	push {r4,lr}
 	adds r4, r1, 0
 	ldr r1, =0x02038c08
@@ -262640,7 +262640,7 @@ do_heart_bubble: ; 8095524
 	thumb_func_end do_heart_bubble
 
 	thumb_func_start sub_8095548
-sub_8095548: ; 8095548
+sub_8095548: @ 8095548
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262678,7 +262678,7 @@ _08095586:
 	thumb_func_end sub_8095548
 
 	thumb_func_start sub_809558C
-sub_809558C: ; 809558C
+sub_809558C: @ 809558C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_8155DA0
@@ -262698,7 +262698,7 @@ _080955A4:
 	thumb_func_end sub_809558C
 
 	thumb_func_start sub_80955AC
-sub_80955AC: ; 80955AC
+sub_80955AC: @ 80955AC
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -262714,7 +262714,7 @@ sub_80955AC: ; 80955AC
 	thumb_func_end sub_80955AC
 
 	thumb_func_start sub_80955C8
-sub_80955C8: ; 80955C8
+sub_80955C8: @ 80955C8
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -262735,7 +262735,7 @@ _080955E4:
 	thumb_func_end sub_80955C8
 
 	thumb_func_start sub_80955EC
-sub_80955EC: ; 80955EC
+sub_80955EC: @ 80955EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262768,7 +262768,7 @@ _0809561E:
 	thumb_func_end sub_80955EC
 
 	thumb_func_start sub_8095628
-sub_8095628: ; 8095628
+sub_8095628: @ 8095628
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -262784,7 +262784,7 @@ sub_8095628: ; 8095628
 	thumb_func_end sub_8095628
 
 	thumb_func_start sub_8095644
-sub_8095644: ; 8095644
+sub_8095644: @ 8095644
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -262805,7 +262805,7 @@ _08095660:
 	thumb_func_end sub_8095644
 
 	thumb_func_start sub_8095668
-sub_8095668: ; 8095668
+sub_8095668: @ 8095668
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -262838,7 +262838,7 @@ _0809569A:
 	thumb_func_end sub_8095668
 
 	thumb_func_start sub_80956A4
-sub_80956A4: ; 80956A4
+sub_80956A4: @ 80956A4
 	ldrb r2, [r0, 0x3]
 	movs r3, 0x4
 	orrs r2, r3
@@ -262849,7 +262849,7 @@ sub_80956A4: ; 80956A4
 	thumb_func_end sub_80956A4
 
 	thumb_func_start sub_80956B4
-sub_80956B4: ; 80956B4
+sub_80956B4: @ 80956B4
 	ldrb r3, [r0, 0x3]
 	movs r2, 0x5
 	negs r2, r2
@@ -262861,7 +262861,7 @@ sub_80956B4: ; 80956B4
 	thumb_func_end sub_80956B4
 
 	thumb_func_start sub_80956C4
-sub_80956C4: ; 80956C4
+sub_80956C4: @ 80956C4
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r4, 0x1]
@@ -262888,7 +262888,7 @@ sub_80956C4: ; 80956C4
 	thumb_func_end sub_80956C4
 
 	thumb_func_start sub_80956F4
-sub_80956F4: ; 80956F4
+sub_80956F4: @ 80956F4
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r4, 0x3]
@@ -262913,7 +262913,7 @@ sub_80956F4: ; 80956F4
 	thumb_func_end sub_80956F4
 
 	thumb_func_start sub_8095724
-sub_8095724: ; 8095724
+sub_8095724: @ 8095724
 	ldrb r1, [r0, 0x3]
 	movs r2, 0x8
 	orrs r1, r2
@@ -262923,7 +262923,7 @@ sub_8095724: ; 8095724
 	thumb_func_end sub_8095724
 
 	thumb_func_start sub_8095730
-sub_8095730: ; 8095730
+sub_8095730: @ 8095730
 	ldrb r2, [r0, 0x3]
 	movs r1, 0x9
 	negs r1, r1
@@ -262934,7 +262934,7 @@ sub_8095730: ; 8095730
 	thumb_func_end sub_8095730
 
 	thumb_func_start sub_8095740
-sub_8095740: ; 8095740
+sub_8095740: @ 8095740
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -262960,7 +262960,7 @@ sub_8095740: ; 8095740
 	thumb_func_end sub_8095740
 
 	thumb_func_start sub_8095774
-sub_8095774: ; 8095774
+sub_8095774: @ 8095774
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -262986,7 +262986,7 @@ _08095798:
 	thumb_func_end sub_8095774
 
 	thumb_func_start sub_80957A0
-sub_80957A0: ; 80957A0
+sub_80957A0: @ 80957A0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -263012,7 +263012,7 @@ sub_80957A0: ; 80957A0
 	thumb_func_end sub_80957A0
 
 	thumb_func_start sub_80957D4
-sub_80957D4: ; 80957D4
+sub_80957D4: @ 80957D4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl an_walk_any_2
@@ -263038,7 +263038,7 @@ _080957F8:
 	thumb_func_end sub_80957D4
 
 	thumb_func_start sub_8095800
-sub_8095800: ; 8095800
+sub_8095800: @ 8095800
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -263065,7 +263065,7 @@ sub_8095800: ; 8095800
 	thumb_func_end sub_8095800
 
 	thumb_func_start sub_8095834
-sub_8095834: ; 8095834
+sub_8095834: @ 8095834
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -263091,7 +263091,7 @@ _08095858:
 	thumb_func_end sub_8095834
 
 	thumb_func_start sub_8095860
-sub_8095860: ; 8095860
+sub_8095860: @ 8095860
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -263118,7 +263118,7 @@ sub_8095860: ; 8095860
 	thumb_func_end sub_8095860
 
 	thumb_func_start sub_8095894
-sub_8095894: ; 8095894
+sub_8095894: @ 8095894
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -263144,7 +263144,7 @@ _080958B8:
 	thumb_func_end sub_8095894
 
 	thumb_func_start sub_80958C0
-sub_80958C0: ; 80958C0
+sub_80958C0: @ 80958C0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -263176,7 +263176,7 @@ sub_80958C0: ; 80958C0
 	thumb_func_end sub_80958C0
 
 	thumb_func_start sub_8095900
-sub_8095900: ; 8095900
+sub_8095900: @ 8095900
 	push {lr}
 	movs r2, 0x1
 	bl sub_80958C0
@@ -263186,7 +263186,7 @@ sub_8095900: ; 8095900
 	thumb_func_end sub_8095900
 
 	thumb_func_start sub_8095910
-sub_8095910: ; 8095910
+sub_8095910: @ 8095910
 	push {lr}
 	movs r2, 0x2
 	bl sub_80958C0
@@ -263196,7 +263196,7 @@ sub_8095910: ; 8095910
 	thumb_func_end sub_8095910
 
 	thumb_func_start sub_8095920
-sub_8095920: ; 8095920
+sub_8095920: @ 8095920
 	push {lr}
 	movs r2, 0x3
 	bl sub_80958C0
@@ -263206,7 +263206,7 @@ sub_8095920: ; 8095920
 	thumb_func_end sub_8095920
 
 	thumb_func_start sub_8095930
-sub_8095930: ; 8095930
+sub_8095930: @ 8095930
 	push {lr}
 	movs r2, 0x4
 	bl sub_80958C0
@@ -263216,7 +263216,7 @@ sub_8095930: ; 8095930
 	thumb_func_end sub_8095930
 
 	thumb_func_start sub_8095940
-sub_8095940: ; 8095940
+sub_8095940: @ 8095940
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263236,7 +263236,7 @@ sub_8095940: ; 8095940
 	thumb_func_end sub_8095940
 
 	thumb_func_start sub_8095964
-sub_8095964: ; 8095964
+sub_8095964: @ 8095964
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263256,7 +263256,7 @@ sub_8095964: ; 8095964
 	thumb_func_end sub_8095964
 
 	thumb_func_start sub_8095988
-sub_8095988: ; 8095988
+sub_8095988: @ 8095988
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263276,7 +263276,7 @@ sub_8095988: ; 8095988
 	thumb_func_end sub_8095988
 
 	thumb_func_start sub_80959AC
-sub_80959AC: ; 80959AC
+sub_80959AC: @ 80959AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263296,7 +263296,7 @@ sub_80959AC: ; 80959AC
 	thumb_func_end sub_80959AC
 
 	thumb_func_start sub_80959D0
-sub_80959D0: ; 80959D0
+sub_80959D0: @ 80959D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263316,7 +263316,7 @@ sub_80959D0: ; 80959D0
 	thumb_func_end sub_80959D0
 
 	thumb_func_start sub_80959F4
-sub_80959F4: ; 80959F4
+sub_80959F4: @ 80959F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263336,7 +263336,7 @@ sub_80959F4: ; 80959F4
 	thumb_func_end sub_80959F4
 
 	thumb_func_start sub_8095A18
-sub_8095A18: ; 8095A18
+sub_8095A18: @ 8095A18
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263356,7 +263356,7 @@ sub_8095A18: ; 8095A18
 	thumb_func_end sub_8095A18
 
 	thumb_func_start sub_8095A3C
-sub_8095A3C: ; 8095A3C
+sub_8095A3C: @ 8095A3C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263376,7 +263376,7 @@ sub_8095A3C: ; 8095A3C
 	thumb_func_end sub_8095A3C
 
 	thumb_func_start sub_8095A60
-sub_8095A60: ; 8095A60
+sub_8095A60: @ 8095A60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263396,7 +263396,7 @@ sub_8095A60: ; 8095A60
 	thumb_func_end sub_8095A60
 
 	thumb_func_start sub_8095A84
-sub_8095A84: ; 8095A84
+sub_8095A84: @ 8095A84
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263416,7 +263416,7 @@ sub_8095A84: ; 8095A84
 	thumb_func_end sub_8095A84
 
 	thumb_func_start sub_8095AA8
-sub_8095AA8: ; 8095AA8
+sub_8095AA8: @ 8095AA8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263436,7 +263436,7 @@ sub_8095AA8: ; 8095AA8
 	thumb_func_end sub_8095AA8
 
 	thumb_func_start sub_8095ACC
-sub_8095ACC: ; 8095ACC
+sub_8095ACC: @ 8095ACC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263456,7 +263456,7 @@ sub_8095ACC: ; 8095ACC
 	thumb_func_end sub_8095ACC
 
 	thumb_func_start sub_8095AF0
-sub_8095AF0: ; 8095AF0
+sub_8095AF0: @ 8095AF0
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
@@ -263473,7 +263473,7 @@ sub_8095AF0: ; 8095AF0
 	thumb_func_end sub_8095AF0
 
 	thumb_func_start sub_8095B0C
-sub_8095B0C: ; 8095B0C
+sub_8095B0C: @ 8095B0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263505,7 +263505,7 @@ _08095B3E:
 	thumb_func_end sub_8095B0C
 
 	thumb_func_start sub_8095B44
-sub_8095B44: ; 8095B44
+sub_8095B44: @ 8095B44
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -263523,7 +263523,7 @@ sub_8095B44: ; 8095B44
 	thumb_func_end sub_8095B44
 
 	thumb_func_start sub_8095B64
-sub_8095B64: ; 8095B64
+sub_8095B64: @ 8095B64
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_8095B0C
@@ -263543,7 +263543,7 @@ _08095B7C:
 	thumb_func_end sub_8095B64
 
 	thumb_func_start sub_8095B84
-sub_8095B84: ; 8095B84
+sub_8095B84: @ 8095B84
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -263576,7 +263576,7 @@ sub_8095B84: ; 8095B84
 	thumb_func_end sub_8095B84
 
 	thumb_func_start sub_8095BC8
-sub_8095BC8: ; 8095BC8
+sub_8095BC8: @ 8095BC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263599,7 +263599,7 @@ sub_8095BC8: ; 8095BC8
 	thumb_func_end sub_8095BC8
 
 	thumb_func_start sub_8095BF4
-sub_8095BF4: ; 8095BF4
+sub_8095BF4: @ 8095BF4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263625,7 +263625,7 @@ _08095C18:
 	thumb_func_end sub_8095BF4
 
 	thumb_func_start sub_8095C20
-sub_8095C20: ; 8095C20
+sub_8095C20: @ 8095C20
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263648,7 +263648,7 @@ sub_8095C20: ; 8095C20
 	thumb_func_end sub_8095C20
 
 	thumb_func_start sub_8095C4C
-sub_8095C4C: ; 8095C4C
+sub_8095C4C: @ 8095C4C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263674,7 +263674,7 @@ _08095C70:
 	thumb_func_end sub_8095C4C
 
 	thumb_func_start sub_8095C78
-sub_8095C78: ; 8095C78
+sub_8095C78: @ 8095C78
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263697,7 +263697,7 @@ sub_8095C78: ; 8095C78
 	thumb_func_end sub_8095C78
 
 	thumb_func_start sub_8095CA4
-sub_8095CA4: ; 8095CA4
+sub_8095CA4: @ 8095CA4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263723,7 +263723,7 @@ _08095CC8:
 	thumb_func_end sub_8095CA4
 
 	thumb_func_start sub_8095CD0
-sub_8095CD0: ; 8095CD0
+sub_8095CD0: @ 8095CD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263746,7 +263746,7 @@ sub_8095CD0: ; 8095CD0
 	thumb_func_end sub_8095CD0
 
 	thumb_func_start sub_8095CFC
-sub_8095CFC: ; 8095CFC
+sub_8095CFC: @ 8095CFC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263772,7 +263772,7 @@ _08095D20:
 	thumb_func_end sub_8095CFC
 
 	thumb_func_start sub_8095D28
-sub_8095D28: ; 8095D28
+sub_8095D28: @ 8095D28
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263795,7 +263795,7 @@ sub_8095D28: ; 8095D28
 	thumb_func_end sub_8095D28
 
 	thumb_func_start sub_8095D54
-sub_8095D54: ; 8095D54
+sub_8095D54: @ 8095D54
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263821,7 +263821,7 @@ _08095D78:
 	thumb_func_end sub_8095D54
 
 	thumb_func_start sub_8095D80
-sub_8095D80: ; 8095D80
+sub_8095D80: @ 8095D80
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263844,7 +263844,7 @@ sub_8095D80: ; 8095D80
 	thumb_func_end sub_8095D80
 
 	thumb_func_start sub_8095DAC
-sub_8095DAC: ; 8095DAC
+sub_8095DAC: @ 8095DAC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263870,7 +263870,7 @@ _08095DD0:
 	thumb_func_end sub_8095DAC
 
 	thumb_func_start sub_8095DD8
-sub_8095DD8: ; 8095DD8
+sub_8095DD8: @ 8095DD8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263893,7 +263893,7 @@ sub_8095DD8: ; 8095DD8
 	thumb_func_end sub_8095DD8
 
 	thumb_func_start sub_8095E04
-sub_8095E04: ; 8095E04
+sub_8095E04: @ 8095E04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263919,7 +263919,7 @@ _08095E28:
 	thumb_func_end sub_8095E04
 
 	thumb_func_start sub_8095E30
-sub_8095E30: ; 8095E30
+sub_8095E30: @ 8095E30
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263942,7 +263942,7 @@ sub_8095E30: ; 8095E30
 	thumb_func_end sub_8095E30
 
 	thumb_func_start sub_8095E5C
-sub_8095E5C: ; 8095E5C
+sub_8095E5C: @ 8095E5C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -263968,7 +263968,7 @@ _08095E80:
 	thumb_func_end sub_8095E5C
 
 	thumb_func_start sub_8095E88
-sub_8095E88: ; 8095E88
+sub_8095E88: @ 8095E88
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -263991,7 +263991,7 @@ sub_8095E88: ; 8095E88
 	thumb_func_end sub_8095E88
 
 	thumb_func_start sub_8095EB4
-sub_8095EB4: ; 8095EB4
+sub_8095EB4: @ 8095EB4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264017,7 +264017,7 @@ _08095ED8:
 	thumb_func_end sub_8095EB4
 
 	thumb_func_start sub_8095EE0
-sub_8095EE0: ; 8095EE0
+sub_8095EE0: @ 8095EE0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264040,7 +264040,7 @@ sub_8095EE0: ; 8095EE0
 	thumb_func_end sub_8095EE0
 
 	thumb_func_start sub_8095F0C
-sub_8095F0C: ; 8095F0C
+sub_8095F0C: @ 8095F0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264066,7 +264066,7 @@ _08095F30:
 	thumb_func_end sub_8095F0C
 
 	thumb_func_start sub_8095F38
-sub_8095F38: ; 8095F38
+sub_8095F38: @ 8095F38
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264089,7 +264089,7 @@ sub_8095F38: ; 8095F38
 	thumb_func_end sub_8095F38
 
 	thumb_func_start sub_8095F64
-sub_8095F64: ; 8095F64
+sub_8095F64: @ 8095F64
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264115,7 +264115,7 @@ _08095F88:
 	thumb_func_end sub_8095F64
 
 	thumb_func_start sub_8095F90
-sub_8095F90: ; 8095F90
+sub_8095F90: @ 8095F90
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264138,7 +264138,7 @@ sub_8095F90: ; 8095F90
 	thumb_func_end sub_8095F90
 
 	thumb_func_start sub_8095FBC
-sub_8095FBC: ; 8095FBC
+sub_8095FBC: @ 8095FBC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264164,7 +264164,7 @@ _08095FE0:
 	thumb_func_end sub_8095FBC
 
 	thumb_func_start sub_8095FE8
-sub_8095FE8: ; 8095FE8
+sub_8095FE8: @ 8095FE8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264192,7 +264192,7 @@ sub_8095FE8: ; 8095FE8
 	thumb_func_end sub_8095FE8
 
 	thumb_func_start sub_8096020
-sub_8096020: ; 8096020
+sub_8096020: @ 8096020
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264220,7 +264220,7 @@ sub_8096020: ; 8096020
 	thumb_func_end sub_8096020
 
 	thumb_func_start sub_8096058
-sub_8096058: ; 8096058
+sub_8096058: @ 8096058
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264248,7 +264248,7 @@ sub_8096058: ; 8096058
 	thumb_func_end sub_8096058
 
 	thumb_func_start sub_8096090
-sub_8096090: ; 8096090
+sub_8096090: @ 8096090
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -264276,7 +264276,7 @@ sub_8096090: ; 8096090
 	thumb_func_end sub_8096090
 
 	thumb_func_start sub_80960C8
-sub_80960C8: ; 80960C8
+sub_80960C8: @ 80960C8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -264303,7 +264303,7 @@ sub_80960C8: ; 80960C8
 	thumb_func_end sub_80960C8
 
 	thumb_func_start sub_8096100
-sub_8096100: ; 8096100
+sub_8096100: @ 8096100
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264321,7 +264321,7 @@ sub_8096100: ; 8096100
 	thumb_func_end sub_8096100
 
 	thumb_func_start sub_8096120
-sub_8096120: ; 8096120
+sub_8096120: @ 8096120
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264341,7 +264341,7 @@ _08096138:
 	thumb_func_end sub_8096120
 
 	thumb_func_start sub_8096140
-sub_8096140: ; 8096140
+sub_8096140: @ 8096140
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264359,7 +264359,7 @@ sub_8096140: ; 8096140
 	thumb_func_end sub_8096140
 
 	thumb_func_start sub_8096160
-sub_8096160: ; 8096160
+sub_8096160: @ 8096160
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264379,7 +264379,7 @@ _08096178:
 	thumb_func_end sub_8096160
 
 	thumb_func_start sub_8096180
-sub_8096180: ; 8096180
+sub_8096180: @ 8096180
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264397,7 +264397,7 @@ sub_8096180: ; 8096180
 	thumb_func_end sub_8096180
 
 	thumb_func_start sub_80961A0
-sub_80961A0: ; 80961A0
+sub_80961A0: @ 80961A0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264417,7 +264417,7 @@ _080961B8:
 	thumb_func_end sub_80961A0
 
 	thumb_func_start sub_80961C0
-sub_80961C0: ; 80961C0
+sub_80961C0: @ 80961C0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264435,7 +264435,7 @@ sub_80961C0: ; 80961C0
 	thumb_func_end sub_80961C0
 
 	thumb_func_start sub_80961E0
-sub_80961E0: ; 80961E0
+sub_80961E0: @ 80961E0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264455,7 +264455,7 @@ _080961F8:
 	thumb_func_end sub_80961E0
 
 	thumb_func_start sub_8096200
-sub_8096200: ; 8096200
+sub_8096200: @ 8096200
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264480,7 +264480,7 @@ sub_8096200: ; 8096200
 	thumb_func_end sub_8096200
 
 	thumb_func_start sub_8096230
-sub_8096230: ; 8096230
+sub_8096230: @ 8096230
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264498,7 +264498,7 @@ sub_8096230: ; 8096230
 	thumb_func_end sub_8096230
 
 	thumb_func_start sub_8096250
-sub_8096250: ; 8096250
+sub_8096250: @ 8096250
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264518,7 +264518,7 @@ _08096268:
 	thumb_func_end sub_8096250
 
 	thumb_func_start sub_8096270
-sub_8096270: ; 8096270
+sub_8096270: @ 8096270
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264536,7 +264536,7 @@ sub_8096270: ; 8096270
 	thumb_func_end sub_8096270
 
 	thumb_func_start sub_8096290
-sub_8096290: ; 8096290
+sub_8096290: @ 8096290
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264556,7 +264556,7 @@ _080962A8:
 	thumb_func_end sub_8096290
 
 	thumb_func_start sub_80962B0
-sub_80962B0: ; 80962B0
+sub_80962B0: @ 80962B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264574,7 +264574,7 @@ sub_80962B0: ; 80962B0
 	thumb_func_end sub_80962B0
 
 	thumb_func_start sub_80962D0
-sub_80962D0: ; 80962D0
+sub_80962D0: @ 80962D0
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264594,7 +264594,7 @@ _080962E8:
 	thumb_func_end sub_80962D0
 
 	thumb_func_start sub_80962F0
-sub_80962F0: ; 80962F0
+sub_80962F0: @ 80962F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264612,7 +264612,7 @@ sub_80962F0: ; 80962F0
 	thumb_func_end sub_80962F0
 
 	thumb_func_start sub_8096310
-sub_8096310: ; 8096310
+sub_8096310: @ 8096310
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264632,7 +264632,7 @@ _08096328:
 	thumb_func_end sub_8096310
 
 	thumb_func_start sub_8096330
-sub_8096330: ; 8096330
+sub_8096330: @ 8096330
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -264659,7 +264659,7 @@ sub_8096330: ; 8096330
 	thumb_func_end sub_8096330
 
 	thumb_func_start sub_8096368
-sub_8096368: ; 8096368
+sub_8096368: @ 8096368
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264677,7 +264677,7 @@ sub_8096368: ; 8096368
 	thumb_func_end sub_8096368
 
 	thumb_func_start sub_8096388
-sub_8096388: ; 8096388
+sub_8096388: @ 8096388
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264697,7 +264697,7 @@ _080963A0:
 	thumb_func_end sub_8096388
 
 	thumb_func_start sub_80963A8
-sub_80963A8: ; 80963A8
+sub_80963A8: @ 80963A8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264715,7 +264715,7 @@ sub_80963A8: ; 80963A8
 	thumb_func_end sub_80963A8
 
 	thumb_func_start sub_80963C8
-sub_80963C8: ; 80963C8
+sub_80963C8: @ 80963C8
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264735,7 +264735,7 @@ _080963E0:
 	thumb_func_end sub_80963C8
 
 	thumb_func_start sub_80963E8
-sub_80963E8: ; 80963E8
+sub_80963E8: @ 80963E8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264753,7 +264753,7 @@ sub_80963E8: ; 80963E8
 	thumb_func_end sub_80963E8
 
 	thumb_func_start sub_8096408
-sub_8096408: ; 8096408
+sub_8096408: @ 8096408
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264773,7 +264773,7 @@ _08096420:
 	thumb_func_end sub_8096408
 
 	thumb_func_start sub_8096428
-sub_8096428: ; 8096428
+sub_8096428: @ 8096428
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264791,7 +264791,7 @@ sub_8096428: ; 8096428
 	thumb_func_end sub_8096428
 
 	thumb_func_start sub_8096448
-sub_8096448: ; 8096448
+sub_8096448: @ 8096448
 	push {r4,lr}
 	adds r4, r1, 0
 	bl npc_obj_ministep_stop_on_arrival
@@ -264811,7 +264811,7 @@ _08096460:
 	thumb_func_end sub_8096448
 
 	thumb_func_start sub_8096468
-sub_8096468: ; 8096468
+sub_8096468: @ 8096468
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_8097FA4
@@ -264823,7 +264823,7 @@ sub_8096468: ; 8096468
 	thumb_func_end sub_8096468
 
 	thumb_func_start sub_809647C
-sub_809647C: ; 809647C
+sub_809647C: @ 809647C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1B]
@@ -264838,7 +264838,7 @@ sub_809647C: ; 809647C
 	thumb_func_end sub_809647C
 
 	thumb_func_start sub_8096494
-sub_8096494: ; 8096494
+sub_8096494: @ 8096494
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -264860,14 +264860,14 @@ _080964B0:
 	thumb_func_end sub_8096494
 
 	thumb_func_start sub_80964B8
-sub_80964B8: ; 80964B8
+sub_80964B8: @ 80964B8
 	movs r0, 0x1
 	bx lr
 	thumb_func_end sub_80964B8
 
 	thumb_func_start sub_80964BC
-; bool8 sub_80964BC(struct npc_state *fieldObject, struct obj *object)
-sub_80964BC: ; 80964BC
+@ bool8 sub_80964BC(struct npc_state *fieldObject, struct obj *object)
+sub_80964BC: @ 80964BC
 	adds r1, 0x2C
 	ldrb r0, [r1]
 	movs r2, 0x40
@@ -264878,8 +264878,8 @@ sub_80964BC: ; 80964BC
 	thumb_func_end sub_80964BC
 
 	thumb_func_start npc_obj_transfer_image_anim_pause_flag
-; void npc_obj_transfer_image_anim_pause_flag(struct npc_state *fieldObject, struct obj *object)
-npc_obj_transfer_image_anim_pause_flag: ; 80964CC
+@ void npc_obj_transfer_image_anim_pause_flag(struct npc_state *fieldObject, struct obj *object)
+npc_obj_transfer_image_anim_pause_flag: @ 80964CC
 	push {lr}
 	ldrb r0, [r0, 0x1]
 	lsls r0, 29
@@ -264897,8 +264897,8 @@ _080964E2:
 	thumb_func_end npc_obj_transfer_image_anim_pause_flag
 
 	thumb_func_start sub_80964E8
-; void sub_80964E8(struct npc_state *fieldObject, struct obj *object)
-sub_80964E8: ; 80964E8
+@ void sub_80964E8(struct npc_state *fieldObject, struct obj *object)
+sub_80964E8: @ 80964E8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r3, [r4, 0x1]
@@ -264926,8 +264926,8 @@ _08096510:
 	thumb_func_end sub_80964E8
 
 	thumb_func_start sub_8096518
-; void sub_8096518(struct npc_state *fieldObject, struct obj *object)
-sub_8096518: ; 8096518
+@ void sub_8096518(struct npc_state *fieldObject, struct obj *object)
+sub_8096518: @ 8096518
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -264941,7 +264941,7 @@ sub_8096518: ; 8096518
 	thumb_func_end sub_8096518
 
 	thumb_func_start sub_8096530
-sub_8096530: ; 8096530
+sub_8096530: @ 8096530
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -265058,8 +265058,8 @@ _08096608:
 	thumb_func_end sub_8096530
 
 	thumb_func_start npc_update_obj_anim_flag
-; void npc_update_obj_anim_flag(struct npc_state *fieldObject, struct obj *object)
-npc_update_obj_anim_flag: ; 8096610
+@ void npc_update_obj_anim_flag(struct npc_state *fieldObject, struct obj *object)
+npc_update_obj_anim_flag: @ 8096610
 	push {lr}
 	adds r2, r1, 0
 	adds r2, 0x3E
@@ -265083,8 +265083,8 @@ _08096632:
 	thumb_func_end npc_update_obj_anim_flag
 
 	thumb_func_start GetAllGroundEffectFlags_OnSpawn
-; void GetAllGroundEffectFlags_OnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnSpawn: ; 8096638
+@ void GetAllGroundEffectFlags_OnSpawn(struct npc_state *fieldObject, u32 *flags)
+GetAllGroundEffectFlags_OnSpawn: @ 8096638
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265116,8 +265116,8 @@ GetAllGroundEffectFlags_OnSpawn: ; 8096638
 	thumb_func_end GetAllGroundEffectFlags_OnSpawn
 
 	thumb_func_start GetAllGroundEffectFlags_OnBeginStep
-; void GetAllGroundEffectFlags_OnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnBeginStep: ; 8096680
+@ void GetAllGroundEffectFlags_OnBeginStep(struct npc_state *fieldObject, u32 *flags)
+GetAllGroundEffectFlags_OnBeginStep: @ 8096680
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265155,8 +265155,8 @@ GetAllGroundEffectFlags_OnBeginStep: ; 8096680
 	thumb_func_end GetAllGroundEffectFlags_OnBeginStep
 
 	thumb_func_start GetAllGroundEffectFlags_OnFinishStep
-; void GetAllGroundEffectFlags_OnFinishStep(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnFinishStep: ; 80966D8
+@ void GetAllGroundEffectFlags_OnFinishStep(struct npc_state *fieldObject, u32 *flags)
+GetAllGroundEffectFlags_OnFinishStep: @ 80966D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265191,8 +265191,8 @@ GetAllGroundEffectFlags_OnFinishStep: ; 80966D8
 	thumb_func_end GetAllGroundEffectFlags_OnFinishStep
 
 	thumb_func_start FieldObjectUpdateMetatileBehaviors
-; void FieldObjectUpdateMetatileBehaviors(struct npc_state *fieldObject)
-FieldObjectUpdateMetatileBehaviors: ; 8096728
+@ void FieldObjectUpdateMetatileBehaviors(struct npc_state *fieldObject)
+FieldObjectUpdateMetatileBehaviors: @ 8096728
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x14
@@ -265213,8 +265213,8 @@ FieldObjectUpdateMetatileBehaviors: ; 8096728
 	thumb_func_end FieldObjectUpdateMetatileBehaviors
 
 	thumb_func_start GetGroundEffectFlags_Reflection
-; void GetGroundEffectFlags_Reflection(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Reflection: ; 8096750
+@ void GetGroundEffectFlags_Reflection(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_Reflection: @ 8096750
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -265263,8 +265263,8 @@ _080967A2:
 	thumb_func_end GetGroundEffectFlags_Reflection
 
 	thumb_func_start GetGroundEffectFlags_TallGrassOnSpawn
-; void GetGroundEffectFlags_TallGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_TallGrassOnSpawn: ; 80967AC
+@ void GetGroundEffectFlags_TallGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_TallGrassOnSpawn: @ 80967AC
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265283,8 +265283,8 @@ _080967C4:
 	thumb_func_end GetGroundEffectFlags_TallGrassOnSpawn
 
 	thumb_func_start GetGroundEffectFlags_TallGrassOnBeginStep
-; void GetGroundEffectFlags_TallGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_TallGrassOnBeginStep: ; 80967CC
+@ void GetGroundEffectFlags_TallGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_TallGrassOnBeginStep: @ 80967CC
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265303,8 +265303,8 @@ _080967E4:
 	thumb_func_end GetGroundEffectFlags_TallGrassOnBeginStep
 
 	thumb_func_start GetGroundEffectFlags_LongGrassOnSpawn
-; void GetGroundEffectFlags_LongGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_LongGrassOnSpawn: ; 80967EC
+@ void GetGroundEffectFlags_LongGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_LongGrassOnSpawn: @ 80967EC
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265323,8 +265323,8 @@ _08096804:
 	thumb_func_end GetGroundEffectFlags_LongGrassOnSpawn
 
 	thumb_func_start GetGroundEffectFlags_LongGrassOnBeginStep
-; void GetGroundEffectFlags_LongGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_LongGrassOnBeginStep: ; 809680C
+@ void GetGroundEffectFlags_LongGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_LongGrassOnBeginStep: @ 809680C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265343,8 +265343,8 @@ _08096824:
 	thumb_func_end GetGroundEffectFlags_LongGrassOnBeginStep
 
 	thumb_func_start GetGroundEffectFlags_Tracks
-; void GetGroundEffectFlags_Tracks(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Tracks: ; 809682C
+@ void GetGroundEffectFlags_Tracks(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_Tracks: @ 809682C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265381,8 +265381,8 @@ _08096866:
 	thumb_func_end GetGroundEffectFlags_Tracks
 
 	thumb_func_start GetGroundEffectFlags_SandHeap
-; void GetGroundEffectFlags_SandHeap(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_SandHeap: ; 809686C
+@ void GetGroundEffectFlags_SandHeap(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_SandHeap: @ 809686C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265425,8 +265425,8 @@ _080968B4:
 	thumb_func_end GetGroundEffectFlags_SandHeap
 
 	thumb_func_start GetGroundEffectFlags_ShallowFlowingWater
-; void GetGroundEffectFlags_ShallowFlowingWater(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_ShallowFlowingWater: ; 80968BC
+@ void GetGroundEffectFlags_ShallowFlowingWater(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_ShallowFlowingWater: @ 80968BC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265480,8 +265480,8 @@ _0809691A:
 	thumb_func_end GetGroundEffectFlags_ShallowFlowingWater
 
 	thumb_func_start GetGroundEffectFlags_Puddle
-; void GetGroundEffectFlags_Puddle(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Puddle: ; 8096920
+@ void GetGroundEffectFlags_Puddle(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_Puddle: @ 8096920
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265507,8 +265507,8 @@ _08096948:
 	thumb_func_end GetGroundEffectFlags_Puddle
 
 	thumb_func_start GetGroundEffectFlags_Ripple
-; void GetGroundEffectFlags_Ripple(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Ripple: ; 8096950
+@ void GetGroundEffectFlags_Ripple(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_Ripple: @ 8096950
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265528,8 +265528,8 @@ _0809696A:
 	thumb_func_end GetGroundEffectFlags_Ripple
 
 	thumb_func_start GetGroundEffectFlags_ShortGrass
-; void GetGroundEffectFlags_ShortGrass(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_ShortGrass: ; 8096970
+@ void GetGroundEffectFlags_ShortGrass(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_ShortGrass: @ 8096970
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265572,8 +265572,8 @@ _080969B8:
 	thumb_func_end GetGroundEffectFlags_ShortGrass
 
 	thumb_func_start GetGroundEffectFlags_HotSprings
-; void GetGroundEffectFlags_HotSprings(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_HotSprings: ; 80969C0
+@ void GetGroundEffectFlags_HotSprings(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_HotSprings: @ 80969C0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -265616,8 +265616,8 @@ _08096A08:
 	thumb_func_end GetGroundEffectFlags_HotSprings
 
 	thumb_func_start GetGroundEffectFlags_Seaweed
-; void GetGroundEffectFlags_Seaweed(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Seaweed: ; 8096A10
+@ void GetGroundEffectFlags_Seaweed(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_Seaweed: @ 8096A10
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
@@ -265637,8 +265637,8 @@ _08096A2A:
 	thumb_func_end GetGroundEffectFlags_Seaweed
 
 	thumb_func_start GetGroundEffectFlags_JumpLanding
-; void GetGroundEffectFlags_JumpLanding(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_JumpLanding: ; 8096A30
+@ void GetGroundEffectFlags_JumpLanding(struct npc_state *fieldObject, u32 *flags)
+GetGroundEffectFlags_JumpLanding: @ 8096A30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -265685,8 +265685,8 @@ _08096A82:
 	thumb_func_end GetGroundEffectFlags_JumpLanding
 
 	thumb_func_start FieldObjectCheckForReflectiveSurface
-; u8 FieldObjectCheckForReflectiveSurface(struct npc_state *fieldObject)
-FieldObjectCheckForReflectiveSurface: ; 8096A8C
+@ u8 FieldObjectCheckForReflectiveSurface(struct npc_state *fieldObject)
+FieldObjectCheckForReflectiveSurface: @ 8096A8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -265850,8 +265850,8 @@ _08096BCA:
 	thumb_func_end FieldObjectCheckForReflectiveSurface
 
 	thumb_func_start GetReflectionTypeByMetatileBehavior
-; u8 GetReflectionTypeByMetatileBehavior(u8 metatileBehavior)
-GetReflectionTypeByMetatileBehavior: ; 8096BDC
+@ u8 GetReflectionTypeByMetatileBehavior(u8 metatileBehavior)
+GetReflectionTypeByMetatileBehavior: @ 8096BDC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -265879,8 +265879,8 @@ _08096C04:
 	thumb_func_end GetReflectionTypeByMetatileBehavior
 
 	thumb_func_start GetLedgeJumpDirection
-; u8 GetLedgeJumpDirection(u16 x, u16 y, u8 direction)
-GetLedgeJumpDirection: ; 8096C0C
+@ u8 GetLedgeJumpDirection(u16 x, u16 y, u8 direction)
+GetLedgeJumpDirection: @ 8096C0C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -265930,8 +265930,8 @@ _08096C62:
 	thumb_func_end GetLedgeJumpDirection
 
 	thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
-; void FieldObjectSetSpriteOamTableForLongGrass(struct npc_state *fieldObject, struct obj *object)
-FieldObjectSetSpriteOamTableForLongGrass: ; 8096C68
+@ void FieldObjectSetSpriteOamTableForLongGrass(struct npc_state *fieldObject, struct obj *object)
+FieldObjectSetSpriteOamTableForLongGrass: @ 8096C68
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -265978,8 +265978,8 @@ _08096CBC:
 	thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
 
 	thumb_func_start IsZCoordMismatchAt
-; bool8 IsZCoordMismatchAt(u8 z, u16 x, u16 y)
-IsZCoordMismatchAt: ; 8096CC4
+@ bool8 IsZCoordMismatchAt(u8 z, u16 x, u16 y)
+IsZCoordMismatchAt: @ 8096CC4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -266014,8 +266014,8 @@ _08096CF8:
 	thumb_func_end IsZCoordMismatchAt
 
 	thumb_func_start FieldObjectUpdateZCoordAndPriority
-; void FieldObjectUpdateZCoordAndPriority(struct npc_state *fieldObject, struct obj *object)
-FieldObjectUpdateZCoordAndPriority: ; 8096D00
+@ void FieldObjectUpdateZCoordAndPriority(struct npc_state *fieldObject, struct obj *object)
+FieldObjectUpdateZCoordAndPriority: @ 8096D00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -266062,8 +266062,8 @@ _08096D4E:
 	thumb_func_end FieldObjectUpdateZCoordAndPriority
 
 	thumb_func_start InitObjectPriorityByZCoord
-; void InitObjectPriorityByZCoord(struct obj *object, u8 z)
-InitObjectPriorityByZCoord: ; 8096D5C
+@ void InitObjectPriorityByZCoord(struct obj *object, u8 z)
+InitObjectPriorityByZCoord: @ 8096D5C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -266102,8 +266102,8 @@ InitObjectPriorityByZCoord: ; 8096D5C
 	thumb_func_end InitObjectPriorityByZCoord
 
 	thumb_func_start ZCoordToPriority
-; u8 ZCoordToPriority(u8 z)
-ZCoordToPriority: ; 8096DA8
+@ u8 ZCoordToPriority(u8 z)
+ZCoordToPriority: @ 8096DA8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0850E634
@@ -266114,8 +266114,8 @@ ZCoordToPriority: ; 8096DA8
 	thumb_func_end ZCoordToPriority
 
 	thumb_func_start FieldObjectUpdateZCoord
-; void FieldObjectUpdateZCoord(struct npc_state *fieldObject)
-FieldObjectUpdateZCoord: ; 8096DB8
+@ void FieldObjectUpdateZCoord(struct npc_state *fieldObject)
+FieldObjectUpdateZCoord: @ 8096DB8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x10
@@ -266160,8 +266160,8 @@ _08096E06:
 	thumb_func_end FieldObjectUpdateZCoord
 
 	thumb_func_start SetObjectSubpriorityByZCoord
-; void SetObjectSubpriorityByZCoord(u8 z, struct obj *object, u8 offset)
-SetObjectSubpriorityByZCoord: ; 8096E0C
+@ void SetObjectSubpriorityByZCoord(u8 z, struct obj *object, u8 offset)
+SetObjectSubpriorityByZCoord: @ 8096E0C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -266198,8 +266198,8 @@ SetObjectSubpriorityByZCoord: ; 8096E0C
 	thumb_func_end SetObjectSubpriorityByZCoord
 
 	thumb_func_start FieldObjectUpdateSubpriority
-; void FieldObjectUpdateSubpriority(struct npc_state *fieldObject, struct obj *object)
-FieldObjectUpdateSubpriority: ; 8096E54
+@ void FieldObjectUpdateSubpriority(struct npc_state *fieldObject, struct obj *object)
+FieldObjectUpdateSubpriority: @ 8096E54
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
@@ -266216,8 +266216,8 @@ _08096E6A:
 	thumb_func_end FieldObjectUpdateSubpriority
 
 	thumb_func_start AreZCoordsCompatible
-; bool8 AreZCoordsCompatible(u8 z1, u8 z2)
-AreZCoordsCompatible: ; 8096E70
+@ bool8 AreZCoordsCompatible(u8 z1, u8 z2)
+AreZCoordsCompatible: @ 8096E70
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -266240,8 +266240,8 @@ _08096E8C:
 	thumb_func_end AreZCoordsCompatible
 
 	thumb_func_start GroundEffect_SpawnOnTallGrass
-; void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SpawnOnTallGrass: ; 8096E90
+@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_SpawnOnTallGrass: @ 8096E90
 	push {lr}
 	ldr r3, =0x02038c08
 	movs r2, 0x10
@@ -266279,8 +266279,8 @@ GroundEffect_SpawnOnTallGrass: ; 8096E90
 	thumb_func_end GroundEffect_SpawnOnTallGrass
 
 	thumb_func_start GroundEffect_StepOnTallGrass
-; void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnTallGrass: ; 8096EDC
+@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_StepOnTallGrass: @ 8096EDC
 	push {lr}
 	ldr r3, =0x02038c08
 	movs r2, 0x10
@@ -266318,8 +266318,8 @@ GroundEffect_StepOnTallGrass: ; 8096EDC
 	thumb_func_end GroundEffect_StepOnTallGrass
 
 	thumb_func_start GroundEffect_SpawnOnLongGrass
-; void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SpawnOnLongGrass: ; 8096F28
+@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_SpawnOnLongGrass: @ 8096F28
 	push {lr}
 	ldr r3, =0x02038c08
 	movs r2, 0x10
@@ -266357,8 +266357,8 @@ GroundEffect_SpawnOnLongGrass: ; 8096F28
 	thumb_func_end GroundEffect_SpawnOnLongGrass
 
 	thumb_func_start GroundEffect_StepOnLongGrass
-; void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnLongGrass: ; 8096F74
+@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_StepOnLongGrass: @ 8096F74
 	push {lr}
 	ldr r3, =0x02038c08
 	movs r2, 0x10
@@ -266396,8 +266396,8 @@ GroundEffect_StepOnLongGrass: ; 8096F74
 	thumb_func_end GroundEffect_StepOnLongGrass
 
 	thumb_func_start GroundEffect_WaterReflection
-; void GroundEffect_WaterReflection(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_WaterReflection: ; 8096FC0
+@ void GroundEffect_WaterReflection(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_WaterReflection: @ 8096FC0
 	push {lr}
 	movs r2, 0
 	bl SetUpReflection
@@ -266406,8 +266406,8 @@ GroundEffect_WaterReflection: ; 8096FC0
 	thumb_func_end GroundEffect_WaterReflection
 
 	thumb_func_start GroundEffect_IceReflection
-; void GroundEffect_IceReflection(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_IceReflection: ; 8096FCC
+@ void GroundEffect_IceReflection(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_IceReflection: @ 8096FCC
 	push {lr}
 	movs r2, 0x1
 	bl SetUpReflection
@@ -266416,8 +266416,8 @@ GroundEffect_IceReflection: ; 8096FCC
 	thumb_func_end GroundEffect_IceReflection
 
 	thumb_func_start GroundEffect_FlowingWater
-; void GroundEffect_FlowingWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_FlowingWater: ; 8096FD8
+@ void GroundEffect_FlowingWater(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_FlowingWater: @ 8096FD8
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x22
@@ -266427,8 +266427,8 @@ GroundEffect_FlowingWater: ; 8096FD8
 	thumb_func_end GroundEffect_FlowingWater
 
 	thumb_func_start GroundEffect_SandTracks
-; void GroundEffect_SandTracks(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SandTracks: ; 8096FE8
+@ void GroundEffect_SandTracks(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_SandTracks: @ 8096FE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -266450,8 +266450,8 @@ GroundEffect_SandTracks: ; 8096FE8
 	thumb_func_end GroundEffect_SandTracks
 
 	thumb_func_start GroundEffect_DeepSandTracks
-; void GroundEffect_DeepSandTracks(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_DeepSandTracks: ; 8097014
+@ void GroundEffect_DeepSandTracks(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_DeepSandTracks: @ 8097014
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -266473,14 +266473,14 @@ GroundEffect_DeepSandTracks: ; 8097014
 	thumb_func_end GroundEffect_DeepSandTracks
 
 	thumb_func_start DoTracksGroundEffect_None
-; void DoTracksGroundEffect_None(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_None: ; 8097040
+@ void DoTracksGroundEffect_None(struct npc_state *fieldObject, struct obj *object)
+DoTracksGroundEffect_None: @ 8097040
 	bx lr
 	thumb_func_end DoTracksGroundEffect_None
 
 	thumb_func_start DoTracksGroundEffect_Footprints
-; void DoTracksGroundEffect_Footprints(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_Footprints: ; 8097044
+@ void DoTracksGroundEffect_Footprints(struct npc_state *fieldObject, struct obj *object)
+DoTracksGroundEffect_Footprints: @ 8097044
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -266518,8 +266518,8 @@ DoTracksGroundEffect_Footprints: ; 8097044
 	thumb_func_end DoTracksGroundEffect_Footprints
 
 	thumb_func_start DoTracksGroundEffect_BikeTireTracks
-; void DoTracksGroundEffect_BikeTireTracks(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_BikeTireTracks: ; 8097094
+@ void DoTracksGroundEffect_BikeTireTracks(struct npc_state *fieldObject, struct obj *object)
+DoTracksGroundEffect_BikeTireTracks: @ 8097094
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, [r4, 0x10]
@@ -266560,8 +266560,8 @@ _080970D6:
 	thumb_func_end DoTracksGroundEffect_BikeTireTracks
 
 	thumb_func_start GroundEffect_Ripple
-; void GroundEffect_Ripple(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_Ripple: ; 80970E4
+@ void GroundEffect_Ripple(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_Ripple: @ 80970E4
 	push {lr}
 	bl DoRippleFieldEffect
 	pop {r0}
@@ -266569,8 +266569,8 @@ GroundEffect_Ripple: ; 80970E4
 	thumb_func_end GroundEffect_Ripple
 
 	thumb_func_start GroundEffect_StepOnPuddle
-; void GroundEffect_StepOnPuddle(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnPuddle: ; 80970F0
+@ void GroundEffect_StepOnPuddle(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_StepOnPuddle: @ 80970F0
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0xF
@@ -266580,8 +266580,8 @@ GroundEffect_StepOnPuddle: ; 80970F0
 	thumb_func_end GroundEffect_StepOnPuddle
 
 	thumb_func_start GroundEffect_SandHeap
-; void GroundEffect_SandHeap(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SandHeap: ; 8097100
+@ void GroundEffect_SandHeap(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_SandHeap: @ 8097100
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x27
@@ -266591,8 +266591,8 @@ GroundEffect_SandHeap: ; 8097100
 	thumb_func_end GroundEffect_SandHeap
 
 	thumb_func_start GroundEffect_JumpOnTallGrass
-; void GroundEffect_JumpOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnTallGrass: ; 8097110
+@ void GroundEffect_JumpOnTallGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_JumpOnTallGrass: @ 8097110
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -266636,8 +266636,8 @@ _0809715A:
 	thumb_func_end GroundEffect_JumpOnTallGrass
 
 	thumb_func_start GroundEffect_JumpOnLongGrass
-; void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnLongGrass: ; 8097168
+@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_JumpOnLongGrass: @ 8097168
 	push {lr}
 	ldr r2, =0x02038c08
 	movs r3, 0x10
@@ -266659,8 +266659,8 @@ GroundEffect_JumpOnLongGrass: ; 8097168
 	thumb_func_end GroundEffect_JumpOnLongGrass
 
 	thumb_func_start GroundEffect_JumpOnShallowWater
-; void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnShallowWater: ; 8097190
+@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_JumpOnShallowWater: @ 8097190
 	push {r4,lr}
 	ldr r3, =0x02038c08
 	movs r4, 0x10
@@ -266685,8 +266685,8 @@ GroundEffect_JumpOnShallowWater: ; 8097190
 	thumb_func_end GroundEffect_JumpOnShallowWater
 
 	thumb_func_start GroundEffect_JumpOnWater
-; void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnWater: ; 80971C0
+@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_JumpOnWater: @ 80971C0
 	push {r4,lr}
 	ldr r3, =0x02038c08
 	movs r4, 0x10
@@ -266711,8 +266711,8 @@ GroundEffect_JumpOnWater: ; 80971C0
 	thumb_func_end GroundEffect_JumpOnWater
 
 	thumb_func_start GroundEffect_JumpLandingDust
-; void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpLandingDust: ; 80971F0
+@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_JumpLandingDust: @ 80971F0
 	push {r4,lr}
 	ldr r3, =0x02038c08
 	movs r4, 0x10
@@ -266737,8 +266737,8 @@ GroundEffect_JumpLandingDust: ; 80971F0
 	thumb_func_end GroundEffect_JumpLandingDust
 
 	thumb_func_start GroundEffect_ShortGrass
-; void GroundEffect_ShortGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_ShortGrass: ; 8097220
+@ void GroundEffect_ShortGrass(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_ShortGrass: @ 8097220
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x29
@@ -266748,8 +266748,8 @@ GroundEffect_ShortGrass: ; 8097220
 	thumb_func_end GroundEffect_ShortGrass
 
 	thumb_func_start GroundEffect_HotSprings
-; void GroundEffect_HotSprings(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_HotSprings: ; 8097230
+@ void GroundEffect_HotSprings(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_HotSprings: @ 8097230
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2A
@@ -266759,8 +266759,8 @@ GroundEffect_HotSprings: ; 8097230
 	thumb_func_end GroundEffect_HotSprings
 
 	thumb_func_start GroundEffect_Seaweed
-; void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_Seaweed: ; 8097240
+@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
+GroundEffect_Seaweed: @ 8097240
 	push {lr}
 	ldr r2, =0x02038c08
 	movs r3, 0x10
@@ -266777,8 +266777,8 @@ GroundEffect_Seaweed: ; 8097240
 	thumb_func_end GroundEffect_Seaweed
 
 	thumb_func_start DoFlaggedGroundEffects
-; void DoFlaggedGroundEffects(struct npc_state *fieldObject, struct obj *object, u32 flags)
-DoFlaggedGroundEffects: ; 8097260
+@ void DoFlaggedGroundEffects(struct npc_state *fieldObject, struct obj *object, u32 flags)
+DoFlaggedGroundEffects: @ 8097260
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -266827,8 +266827,8 @@ _080972AC:
 	thumb_func_end DoFlaggedGroundEffects
 
 	thumb_func_start filters_out_some_ground_effects
-; void filters_out_some_ground_effects(struct npc_state *fieldObject, u32 *flags)
-filters_out_some_ground_effects: ; 80972BC
+@ void filters_out_some_ground_effects(struct npc_state *fieldObject, u32 *flags)
+filters_out_some_ground_effects: @ 80972BC
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r1, 0
@@ -266859,8 +266859,8 @@ _080972EA:
 	thumb_func_end filters_out_some_ground_effects
 
 	thumb_func_start FilterOutStepOnPuddleGroundEffectIfJumping
-; void FilterOutStepOnPuddleGroundEffectIfJumping(struct npc_state *fieldObject, u32 *flags)
-FilterOutStepOnPuddleGroundEffectIfJumping: ; 80972F4
+@ void FilterOutStepOnPuddleGroundEffectIfJumping(struct npc_state *fieldObject, u32 *flags)
+FilterOutStepOnPuddleGroundEffectIfJumping: @ 80972F4
 	push {lr}
 	adds r2, r1, 0
 	ldrb r0, [r0]
@@ -266878,8 +266878,8 @@ _08097308:
 	thumb_func_end FilterOutStepOnPuddleGroundEffectIfJumping
 
 	thumb_func_start DoGroundEffects_OnSpawn
-; void DoGroundEffects_OnSpawn(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnSpawn: ; 8097310
+@ void DoGroundEffects_OnSpawn(struct npc_state *fieldObject, struct obj *object)
+DoGroundEffects_OnSpawn: @ 8097310
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -266918,8 +266918,8 @@ _08097354:
 	thumb_func_end DoGroundEffects_OnSpawn
 
 	thumb_func_start DoGroundEffects_OnBeginStep
-; void DoGroundEffects_OnBeginStep(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnBeginStep: ; 809735C
+@ void DoGroundEffects_OnBeginStep(struct npc_state *fieldObject, struct obj *object)
+DoGroundEffects_OnBeginStep: @ 809735C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -266961,8 +266961,8 @@ _080973A8:
 	thumb_func_end DoGroundEffects_OnBeginStep
 
 	thumb_func_start DoGroundEffects_OnFinishStep
-; void DoGroundEffects_OnFinishStep(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnFinishStep: ; 80973B0
+@ void DoGroundEffects_OnFinishStep(struct npc_state *fieldObject, struct obj *object)
+DoGroundEffects_OnFinishStep: @ 80973B0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -267004,8 +267004,8 @@ _080973FC:
 	thumb_func_end DoGroundEffects_OnFinishStep
 
 	thumb_func_start sub_8097404
-; bool8 sub_8097404(struct npc_state *fieldObject)
-sub_8097404: ; 8097404
+@ bool8 sub_8097404(struct npc_state *fieldObject)
+sub_8097404: @ 8097404
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5]
@@ -267081,8 +267081,8 @@ _0809748E:
 	thumb_func_end sub_8097404
 
 	thumb_func_start player_bitmagic
-; void player_bitmagic()
-player_bitmagic: ; 8097494
+@ void player_bitmagic()
+player_bitmagic: @ 8097494
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02037350
@@ -267114,7 +267114,7 @@ _080974B8:
 	thumb_func_end player_bitmagic
 
 	thumb_func_start sub_80974D0
-sub_80974D0: ; 80974D0
+sub_80974D0: @ 80974D0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -267150,8 +267150,8 @@ _080974FC:
 	thumb_func_end sub_80974D0
 
 	thumb_func_start npc_sync_anim_pause_bits
-; void npc_sync_anim_pause_bits(struct npc_state *fieldObject)
-npc_sync_anim_pause_bits: ; 8097514
+@ void npc_sync_anim_pause_bits(struct npc_state *fieldObject)
+npc_sync_anim_pause_bits: @ 8097514
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r2, [r5]
@@ -267204,7 +267204,7 @@ _0809756C:
 	thumb_func_end npc_sync_anim_pause_bits
 
 	thumb_func_start sub_809757C
-sub_809757C: ; 809757C
+sub_809757C: @ 809757C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02037350
@@ -267232,8 +267232,8 @@ _08097598:
 	thumb_func_end sub_809757C
 
 	thumb_func_start little_step
-; void little_step(struct obj *object, u8 direction)
-little_step: ; 80975AC
+@ void little_step(struct obj *object, u8 direction)
+little_step: @ 80975AC
 	lsls r1, 24
 	ldr r2, =gUnknown_0850DB7C
 	lsrs r1, 22
@@ -267251,7 +267251,7 @@ little_step: ; 80975AC
 	thumb_func_end little_step
 
 	thumb_func_start double_little_steps
-double_little_steps: ; 80975CC
+double_little_steps: @ 80975CC
 	lsls r1, 24
 	ldr r2, =gUnknown_0850DB7C
 	lsrs r1, 22
@@ -267271,7 +267271,7 @@ double_little_steps: ; 80975CC
 	thumb_func_end double_little_steps
 
 	thumb_func_start triple_little_steps
-triple_little_steps: ; 80975F0
+triple_little_steps: @ 80975F0
 	lsls r1, 24
 	ldr r2, =gUnknown_0850DB7C
 	lsrs r1, 22
@@ -267293,7 +267293,7 @@ triple_little_steps: ; 80975F0
 	thumb_func_end triple_little_steps
 
 	thumb_func_start quad_little_steps
-quad_little_steps: ; 8097618
+quad_little_steps: @ 8097618
 	lsls r1, 24
 	ldr r2, =gUnknown_0850DB7C
 	lsrs r1, 22
@@ -267313,8 +267313,8 @@ quad_little_steps: ; 8097618
 	thumb_func_end quad_little_steps
 
 	thumb_func_start oct_little_steps
-; void oct_little_steps(struct obj *object, u8 direction)
-oct_little_steps: ; 809763C
+@ void oct_little_steps(struct obj *object, u8 direction)
+oct_little_steps: @ 809763C
 	lsls r1, 24
 	ldr r2, =gUnknown_0850DB7C
 	lsrs r1, 22
@@ -267334,8 +267334,8 @@ oct_little_steps: ; 809763C
 	thumb_func_end oct_little_steps
 
 	thumb_func_start oamt_npc_ministep_reset
-; void oamt_npc_ministep_reset(struct obj *object, u8 direction, u8 speed)
-oamt_npc_ministep_reset: ; 8097660
+@ void oamt_npc_ministep_reset(struct obj *object, u8 direction, u8 speed)
+oamt_npc_ministep_reset: @ 8097660
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r2, 24
@@ -267348,8 +267348,8 @@ oamt_npc_ministep_reset: ; 8097660
 	thumb_func_end oamt_npc_ministep_reset
 
 	thumb_func_start obj_npc_ministep
-; bool8 obj_npc_ministep(struct obj *object)
-obj_npc_ministep: ; 8097674
+@ bool8 obj_npc_ministep(struct obj *object)
+obj_npc_ministep: @ 8097674
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =gUnknown_0850E768
@@ -267402,8 +267402,8 @@ _080976D6:
 	thumb_func_end obj_npc_ministep
 
 	thumb_func_start sub_80976DC
-; void sub_80976DC(struct obj *object, u8 direction)
-sub_80976DC: ; 80976DC
+@ void sub_80976DC(struct obj *object, u8 direction)
+sub_80976DC: @ 80976DC
 	lsls r1, 24
 	lsrs r1, 24
 	movs r2, 0
@@ -267414,8 +267414,8 @@ sub_80976DC: ; 80976DC
 	thumb_func_end sub_80976DC
 
 	thumb_func_start sub_80976EC
-; bool8 sub_80976EC(struct obj *object)
-sub_80976EC: ; 80976EC
+@ bool8 sub_80976EC(struct obj *object)
+sub_80976EC: @ 80976EC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x36]
@@ -267450,7 +267450,7 @@ _08097720:
 	thumb_func_end sub_80976EC
 
 	thumb_func_start sub_8097728
-sub_8097728: ; 8097728
+sub_8097728: @ 8097728
 	ldr r1, =gUnknown_0850E7BA
 	lsls r0, 16
 	asrs r0, 16
@@ -267463,7 +267463,7 @@ sub_8097728: ; 8097728
 	thumb_func_end sub_8097728
 
 	thumb_func_start sub_809773C
-sub_809773C: ; 809773C
+sub_809773C: @ 809773C
 	ldr r1, =gUnknown_0850E772
 	lsls r0, 16
 	asrs r0, 16
@@ -267476,7 +267476,7 @@ sub_809773C: ; 809773C
 	thumb_func_end sub_809773C
 
 	thumb_func_start sub_8097750
-sub_8097750: ; 8097750
+sub_8097750: @ 8097750
 	movs r1, 0
 	strh r1, [r0, 0x3A]
 	strh r1, [r0, 0x3C]
@@ -267484,7 +267484,7 @@ sub_8097750: ; 8097750
 	thumb_func_end sub_8097750
 
 	thumb_func_start sub_8097758
-sub_8097758: ; 8097758
+sub_8097758: @ 8097758
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -267592,7 +267592,7 @@ _08097818:
 	thumb_func_end sub_8097758
 
 	thumb_func_start sub_8097820
-sub_8097820: ; 8097820
+sub_8097820: @ 8097820
 	lsls r1, 24
 	ldr r2, =gUnknown_0850E834
 	lsrs r1, 22
@@ -267608,7 +267608,7 @@ sub_8097820: ; 8097820
 	thumb_func_end sub_8097820
 
 	thumb_func_start sub_809783C
-sub_809783C: ; 809783C
+sub_809783C: @ 809783C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -267627,7 +267627,7 @@ sub_809783C: ; 809783C
 	thumb_func_end sub_809783C
 
 	thumb_func_start sub_809785C
-sub_809785C: ; 809785C
+sub_809785C: @ 809785C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -267695,7 +267695,7 @@ _080978D2:
 	thumb_func_end sub_809785C
 
 	thumb_func_start sub_80978E4
-sub_80978E4: ; 80978E4
+sub_80978E4: @ 80978E4
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -267768,15 +267768,15 @@ _08097964:
 	thumb_func_end sub_80978E4
 
 	thumb_func_start sub_8097978
-; void sub_8097978(struct obj *object, u16 a2)
-sub_8097978: ; 8097978
+@ void sub_8097978(struct obj *object, u16 a2)
+sub_8097978: @ 8097978
 	strh r1, [r0, 0x34]
 	bx lr
 	thumb_func_end sub_8097978
 
 	thumb_func_start sub_809797C
-; bool8 sub_809797C(struct obj *object)
-sub_809797C: ; 809797C
+@ bool8 sub_809797C(struct obj *object)
+sub_809797C: @ 809797C
 	push {lr}
 	ldrh r1, [r0, 0x34]
 	subs r1, 0x1
@@ -267794,7 +267794,7 @@ _08097990:
 	thumb_func_end sub_809797C
 
 	thumb_func_start obj_anim_image_set_and_seek
-obj_anim_image_set_and_seek: ; 8097994
+obj_anim_image_set_and_seek: @ 8097994
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -267816,7 +267816,7 @@ obj_anim_image_set_and_seek: ; 8097994
 	thumb_func_end obj_anim_image_set_and_seek
 
 	thumb_func_start sub_80979BC
-sub_80979BC: ; 80979BC
+sub_80979BC: @ 80979BC
 	push {lr}
 	adds r0, 0x3F
 	ldrb r1, [r0]
@@ -267834,7 +267834,7 @@ _080979D0:
 	thumb_func_end sub_80979BC
 
 	thumb_func_start sub_80979D4
-sub_80979D4: ; 80979D4
+sub_80979D4: @ 80979D4
 	push {r4-r6,lr}
 	mov r12, r0
 	lsls r1, 24
@@ -267963,7 +267963,7 @@ _08097AC2:
 	thumb_func_end sub_80979D4
 
 	thumb_func_start sub_8097AC8
-sub_8097AC8: ; 8097AC8
+sub_8097AC8: @ 8097AC8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8097D68
@@ -267984,7 +267984,7 @@ sub_8097AC8: ; 8097AC8
 	thumb_func_end sub_8097AC8
 
 	thumb_func_start sub_8097AF0
-sub_8097AF0: ; 8097AF0
+sub_8097AF0: @ 8097AF0
 	push {r4,r5,lr}
 	movs r5, 0
 	movs r4, 0x3F
@@ -268016,7 +268016,7 @@ _08097B16:
 	thumb_func_end sub_8097AF0
 
 	thumb_func_start sub_8097B2C
-sub_8097B2C: ; 8097B2C
+sub_8097B2C: @ 8097B2C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -268057,7 +268057,7 @@ _08097B72:
 	thumb_func_end sub_8097B2C
 
 	thumb_func_start sub_8097B78
-sub_8097B78: ; 8097B78
+sub_8097B78: @ 8097B78
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -268088,7 +268088,7 @@ _08097BAA:
 	thumb_func_end sub_8097B78
 
 	thumb_func_start sub_8097BB4
-sub_8097BB4: ; 8097BB4
+sub_8097BB4: @ 8097BB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -268159,7 +268159,7 @@ _08097C3E:
 	thumb_func_end sub_8097BB4
 
 	thumb_func_start sub_8097C44
-sub_8097C44: ; 8097C44
+sub_8097C44: @ 8097C44
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -268196,7 +268196,7 @@ _08097C80:
 	thumb_func_end sub_8097C44
 
 	thumb_func_start sub_8097C8C
-sub_8097C8C: ; 8097C8C
+sub_8097C8C: @ 8097C8C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -268228,7 +268228,7 @@ _08097CBA:
 	thumb_func_end sub_8097C8C
 
 	thumb_func_start sub_8097CC4
-sub_8097CC4: ; 8097CC4
+sub_8097CC4: @ 8097CC4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -268255,7 +268255,7 @@ _08097CEA:
 	thumb_func_end sub_8097CC4
 
 	thumb_func_start sub_8097CF4
-sub_8097CF4: ; 8097CF4
+sub_8097CF4: @ 8097CF4
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x36
@@ -268292,7 +268292,7 @@ _08097D2C:
 	thumb_func_end sub_8097CF4
 
 	thumb_func_start sub_8097D30
-sub_8097D30: ; 8097D30
+sub_8097D30: @ 8097D30
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x36
@@ -268325,7 +268325,7 @@ _08097D5E:
 	thumb_func_end sub_8097D30
 
 	thumb_func_start sub_8097D68
-sub_8097D68: ; 8097D68
+sub_8097D68: @ 8097D68
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x34
@@ -268358,7 +268358,7 @@ _08097D98:
 	thumb_func_end sub_8097D68
 
 	thumb_func_start sub_8097D9C
-sub_8097D9C: ; 8097D9C
+sub_8097D9C: @ 8097D9C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -268388,7 +268388,7 @@ _08097DCA:
 	thumb_func_end sub_8097D9C
 
 	thumb_func_start oe_exec_and_other_stuff
-oe_exec_and_other_stuff: ; 8097DD0
+oe_exec_and_other_stuff: @ 8097DD0
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -268408,7 +268408,7 @@ oe_exec_and_other_stuff: ; 8097DD0
 	thumb_func_end oe_exec_and_other_stuff
 
 	thumb_func_start DoShadowFieldEffect
-DoShadowFieldEffect: ; 8097DF8
+DoShadowFieldEffect: @ 8097DF8
 	push {lr}
 	adds r1, r0, 0
 	ldrb r2, [r1, 0x2]
@@ -268426,8 +268426,8 @@ _08097E10:
 	thumb_func_end DoShadowFieldEffect
 
 	thumb_func_start DoRippleFieldEffect
-; void DoRippleFieldEffect(struct npc_state *fieldObject, struct obj *object)
-DoRippleFieldEffect: ; 8097E14
+@ void DoRippleFieldEffect(struct npc_state *fieldObject, struct obj *object)
+DoRippleFieldEffect: @ 8097E14
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x5]
@@ -268457,7 +268457,7 @@ DoRippleFieldEffect: ; 8097E14
 	thumb_func_end DoRippleFieldEffect
 
 	thumb_func_start sub_8097E50
-sub_8097E50: ; 8097E50
+sub_8097E50: @ 8097E50
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -268547,7 +268547,7 @@ _08097EE0:
 	thumb_func_end sub_8097E50
 
 	thumb_func_start sub_8097EF0
-sub_8097EF0: ; 8097EF0
+sub_8097EF0: @ 8097EF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -268618,8 +268618,8 @@ _08097F68:
 	thumb_func_end sub_8097EF0
 
 	thumb_func_start sub_8097F78
-; signed int sub_8097F78(npc_state *a1)
-sub_8097F78: ; 8097F78
+@ signed int sub_8097F78(npc_state *a1)
+sub_8097F78: @ 8097F78
 	push {lr}
 	movs r2, 0
 	ldr r1, =0x020375b8
@@ -268646,7 +268646,7 @@ _08097FA0:
 	thumb_func_end sub_8097F78
 
 	thumb_func_start sub_8097FA4
-sub_8097FA4: ; 8097FA4
+sub_8097FA4: @ 8097FA4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =sub_8097FE4
@@ -268674,7 +268674,7 @@ sub_8097FA4: ; 8097FA4
 	thumb_func_end sub_8097FA4
 
 	thumb_func_start sub_8097FE4
-sub_8097FE4: ; 8097FE4
+sub_8097FE4: @ 8097FE4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -268724,7 +268724,7 @@ _08098030:
 	thumb_func_end sub_8097FE4
 
 	thumb_func_start sub_8098044
-sub_8098044: ; 8098044
+sub_8098044: @ 8098044
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -268748,7 +268748,7 @@ sub_8098044: ; 8098044
 	thumb_func_end sub_8098044
 
 	thumb_func_start sub_8098074
-sub_8098074: ; 8098074
+sub_8098074: @ 8098074
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -268788,7 +268788,7 @@ _080980A8:
 	thumb_func_end sub_8098074
 
 	thumb_func_start sub_80980C0
-sub_80980C0: ; 80980C0
+sub_80980C0: @ 80980C0
 	movs r0, 0
 	strh r0, [r1, 0x26]
 	ldrh r0, [r1, 0x32]
@@ -268799,7 +268799,7 @@ sub_80980C0: ; 80980C0
 	thumb_func_end sub_80980C0
 
 	thumb_func_start sub_80980D0
-sub_80980D0: ; 80980D0
+sub_80980D0: @ 80980D0
 	push {lr}
 	adds r2, r1, 0
 	ldrh r0, [r2, 0x26]
@@ -268821,7 +268821,7 @@ _080980EC:
 	thumb_func_end sub_80980D0
 
 	thumb_func_start sub_80980F4
-sub_80980F4: ; 80980F4
+sub_80980F4: @ 80980F4
 	ldr r0, =0x0000ff60
 	strh r0, [r1, 0x26]
 	ldrh r0, [r1, 0x32]
@@ -268833,7 +268833,7 @@ sub_80980F4: ; 80980F4
 	thumb_func_end sub_80980F4
 
 	thumb_func_start sub_8098108
-sub_8098108: ; 8098108
+sub_8098108: @ 8098108
 	push {lr}
 	ldrh r0, [r1, 0x26]
 	adds r0, 0x8
@@ -268851,13 +268851,13 @@ _0809811C:
 	thumb_func_end sub_8098108
 
 	thumb_func_start sub_8098124
-sub_8098124: ; 8098124
+sub_8098124: @ 8098124
 	movs r0, 0x1
 	bx lr
 	thumb_func_end sub_8098124
 
 	thumb_func_start sub_8098128
-sub_8098128: ; 8098128
+sub_8098128: @ 8098128
 	ldr r1, =0x020375bc
 	movs r0, 0
 	strb r0, [r1]
@@ -268879,7 +268879,7 @@ sub_8098128: ; 8098128
 	thumb_func_end sub_8098128
 
 	thumb_func_start sub_8098154
-sub_8098154: ; 8098154
+sub_8098154: @ 8098154
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -268933,7 +268933,7 @@ _080981B0:
 	thumb_func_end sub_8098154
 
 	thumb_func_start task_add_textbox
-task_add_textbox: ; 80981BC
+task_add_textbox: @ 80981BC
 	push {lr}
 	ldr r0, =sub_8098154
 	movs r1, 0x50
@@ -268944,7 +268944,7 @@ task_add_textbox: ; 80981BC
 	thumb_func_end task_add_textbox
 
 	thumb_func_start task_del_textbox
-task_del_textbox: ; 80981D0
+task_del_textbox: @ 80981D0
 	push {lr}
 	ldr r0, =sub_8098154
 	bl get_task_id_by_function
@@ -268960,7 +268960,7 @@ _080981E4:
 	thumb_func_end task_del_textbox
 
 	thumb_func_start box_related_two__2
-box_related_two__2: ; 80981EC
+box_related_two__2: @ 80981EC
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r4, =0x020375bc
@@ -268984,7 +268984,7 @@ _0809820E:
 	thumb_func_end box_related_two__2
 
 	thumb_func_start sub_8098214
-sub_8098214: ; 8098214
+sub_8098214: @ 8098214
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -269004,7 +269004,7 @@ _0809822E:
 	thumb_func_end sub_8098214
 
 	thumb_func_start sub_8098238
-sub_8098238: ; 8098238
+sub_8098238: @ 8098238
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x020375bc
@@ -269033,7 +269033,7 @@ _08098272:
 	thumb_func_end sub_8098238
 
 	thumb_func_start box_related_two__3
-box_related_two__3: ; 8098278
+box_related_two__3: @ 8098278
 	push {lr}
 	adds r1, r0, 0
 	ldr r2, =0x020375bc
@@ -269056,7 +269056,7 @@ _0809829A:
 	thumb_func_end box_related_two__3
 
 	thumb_func_start sub_80982A0
-sub_80982A0: ; 80982A0
+sub_80982A0: @ 80982A0
 	push {lr}
 	ldr r2, =0x020375bc
 	movs r1, 0x3
@@ -269070,7 +269070,7 @@ sub_80982A0: ; 80982A0
 	thumb_func_end sub_80982A0
 
 	thumb_func_start sub_80982B8
-sub_80982B8: ; 80982B8
+sub_80982B8: @ 80982B8
 	push {lr}
 	ldr r1, =0x020375bc
 	ldrb r0, [r1]
@@ -269090,7 +269090,7 @@ _080982D6:
 	thumb_func_end sub_80982B8
 
 	thumb_func_start textbox_fdecode_auto_and_task_add
-textbox_fdecode_auto_and_task_add: ; 80982DC
+textbox_fdecode_auto_and_task_add: @ 80982DC
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -269109,7 +269109,7 @@ textbox_fdecode_auto_and_task_add: ; 80982DC
 	thumb_func_end textbox_fdecode_auto_and_task_add
 
 	thumb_func_start textbox_auto_and_task_add
-textbox_auto_and_task_add: ; 8098304
+textbox_auto_and_task_add: @ 8098304
 	push {lr}
 	movs r0, 0x1
 	bl AddTextPrinterForMessage
@@ -269119,7 +269119,7 @@ textbox_auto_and_task_add: ; 8098304
 	thumb_func_end textbox_auto_and_task_add
 
 	thumb_func_start textbox_close
-textbox_close: ; 8098314
+textbox_close: @ 8098314
 	push {lr}
 	bl task_del_textbox
 	movs r0, 0
@@ -269134,7 +269134,7 @@ textbox_close: ; 8098314
 	thumb_func_end textbox_close
 
 	thumb_func_start textbox_any_visible
-textbox_any_visible: ; 8098330
+textbox_any_visible: @ 8098330
 	ldr r0, =0x020375bc
 	ldrb r0, [r0]
 	bx lr
@@ -269142,7 +269142,7 @@ textbox_any_visible: ; 8098330
 	thumb_func_end textbox_any_visible
 
 	thumb_func_start sub_809833C
-sub_809833C: ; 809833C
+sub_809833C: @ 809833C
 	push {lr}
 	ldr r0, =0x020375bc
 	ldrb r0, [r0]
@@ -269159,7 +269159,7 @@ _08098352:
 	thumb_func_end sub_809833C
 
 	thumb_func_start sub_8098358
-sub_8098358: ; 8098358
+sub_8098358: @ 8098358
 	push {lr}
 	bl task_del_textbox
 	movs r0, 0
@@ -269174,7 +269174,7 @@ sub_8098358: ; 8098358
 	thumb_func_end sub_8098358
 
 	thumb_func_start sub_8098374
-sub_8098374: ; 8098374
+sub_8098374: @ 8098374
 	push {lr}
 	bl task_del_textbox
 	ldr r1, =0x020375bc
@@ -269186,7 +269186,7 @@ sub_8098374: ; 8098374
 	thumb_func_end sub_8098374
 
 	thumb_func_start walkrun_is_standing_still
-walkrun_is_standing_still: ; 8098388
+walkrun_is_standing_still: @ 8098388
 	push {lr}
 	ldr r0, =0x02037590
 	ldrb r0, [r0, 0x3]
@@ -269203,7 +269203,7 @@ _0809839E:
 	thumb_func_end walkrun_is_standing_still
 
 	thumb_func_start sub_80983A4
-sub_80983A4: ; 80983A4
+sub_80983A4: @ 80983A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -269221,7 +269221,7 @@ _080983BE:
 	thumb_func_end sub_80983A4
 
 	thumb_func_start sub_80983C4
-sub_80983C4: ; 80983C4
+sub_80983C4: @ 80983C4
 	push {lr}
 	ldr r0, =sub_80983A4
 	bl is_function_an_active_task
@@ -269240,7 +269240,7 @@ _080983E2:
 	thumb_func_end sub_80983C4
 
 	thumb_func_start sub_80983E8
-sub_80983E8: ; 80983E8
+sub_80983E8: @ 80983E8
 	push {lr}
 	bl player_bitmagic
 	ldr r0, =sub_80983A4
@@ -269252,7 +269252,7 @@ sub_80983E8: ; 80983E8
 	thumb_func_end sub_80983E8
 
 	thumb_func_start sub_8098400
-sub_8098400: ; 8098400
+sub_8098400: @ 8098400
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -269311,7 +269311,7 @@ _08098468:
 	thumb_func_end sub_8098400
 
 	thumb_func_start sub_809847C
-sub_809847C: ; 809847C
+sub_809847C: @ 809847C
 	push {lr}
 	ldr r0, =sub_8098400
 	bl is_function_an_active_task
@@ -269330,7 +269330,7 @@ _0809849A:
 	thumb_func_end sub_809847C
 
 	thumb_func_start sub_80984A0
-sub_80984A0: ; 80984A0
+sub_80984A0: @ 80984A0
 	push {r4,r5,lr}
 	ldr r4, =0x03005df0
 	ldrb r0, [r4]
@@ -269367,7 +269367,7 @@ _080984DE:
 	thumb_func_end sub_80984A0
 
 	thumb_func_start sub_80984F4
-sub_80984F4: ; 80984F4
+sub_80984F4: @ 80984F4
 	push {lr}
 	movs r0, 0xFF
 	movs r1, 0
@@ -269390,7 +269390,7 @@ sub_80984F4: ; 80984F4
 	thumb_func_end sub_80984F4
 
 	thumb_func_start sub_8098524
-sub_8098524: ; 8098524
+sub_8098524: @ 8098524
 	push {r4,lr}
 	ldr r4, =0x02037350
 	ldr r0, =0x03005df0
@@ -269427,7 +269427,7 @@ _08098542:
 	thumb_func_end sub_8098524
 
 	thumb_func_start sub_8098574
-sub_8098574: ; 8098574
+sub_8098574: @ 8098574
 	push {lr}
 	ldr r0, =0x03005df0
 	ldrb r1, [r0]
@@ -269445,7 +269445,7 @@ sub_8098574: ; 8098574
 	thumb_func_end sub_8098574
 
 	thumb_func_start sub_809859C
-sub_809859C: ; 809859C
+sub_809859C: @ 809859C
 	push {lr}
 	ldr r0, =0x03005df0
 	ldrb r1, [r0]
@@ -269461,7 +269461,7 @@ sub_809859C: ; 809859C
 	thumb_func_end sub_809859C
 
 	thumb_func_start sub_80985BC
-sub_80985BC: ; 80985BC
+sub_80985BC: @ 80985BC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -269519,7 +269519,7 @@ _08098622:
 	thumb_func_end sub_80985BC
 
 	thumb_func_start sub_8098630
-sub_8098630: ; 8098630
+sub_8098630: @ 8098630
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -269633,7 +269633,7 @@ _0809871A:
 	thumb_func_end sub_8098630
 
 	thumb_func_start sub_8098734
-sub_8098734: ; 8098734
+sub_8098734: @ 8098734
 	push {lr}
 	ldr r0, =sub_80985BC
 	bl is_function_an_active_task
@@ -269652,7 +269652,7 @@ _08098752:
 	thumb_func_end sub_8098734
 
 	thumb_func_start sub_8098758
-sub_8098758: ; 8098758
+sub_8098758: @ 8098758
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -269672,8 +269672,8 @@ _08098772:
 	thumb_func_end sub_8098758
 
 	thumb_func_start copy_textbox_border_tile_patterns_to_vram
-; void copy_textbox_border_tile_patterns_to_vram(u8 rbox_id, u16 tile_pattern_dest_offset, u8 pal_dest_offset)
-copy_textbox_border_tile_patterns_to_vram: ; 809877C
+@ void copy_textbox_border_tile_patterns_to_vram(u8 rbox_id, u16 tile_pattern_dest_offset, u8 pal_dest_offset)
+copy_textbox_border_tile_patterns_to_vram: @ 809877C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -269703,7 +269703,7 @@ copy_textbox_border_tile_patterns_to_vram: ; 809877C
 	thumb_func_end copy_textbox_border_tile_patterns_to_vram
 
 	thumb_func_start box_border_load_tiles_and_pal
-box_border_load_tiles_and_pal: ; 80987BC
+box_border_load_tiles_and_pal: @ 80987BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -269717,7 +269717,7 @@ box_border_load_tiles_and_pal: ; 80987BC
 	thumb_func_end box_border_load_tiles_and_pal
 
 	thumb_func_start sub_80987D4
-sub_80987D4: ; 80987D4
+sub_80987D4: @ 80987D4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -269761,7 +269761,7 @@ sub_80987D4: ; 80987D4
 	thumb_func_end sub_80987D4
 
 	thumb_func_start sub_809882C
-sub_809882C: ; 809882C
+sub_809882C: @ 809882C
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r3, r2, 0
@@ -269784,7 +269784,7 @@ sub_809882C: ; 809882C
 	thumb_func_end sub_809882C
 
 	thumb_func_start sub_8098858
-sub_8098858: ; 8098858
+sub_8098858: @ 8098858
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -269971,7 +269971,7 @@ sub_8098858: ; 8098858
 	thumb_func_end sub_8098858
 
 	thumb_func_start sub_80989E0
-sub_80989E0: ; 80989E0
+sub_80989E0: @ 80989E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -270168,7 +270168,7 @@ sub_80989E0: ; 80989E0
 	thumb_func_end sub_80989E0
 
 	thumb_func_start rbox_fill_rectangle
-rbox_fill_rectangle: ; 8098B7C
+rbox_fill_rectangle: @ 8098B7C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -270244,7 +270244,7 @@ rbox_fill_rectangle: ; 8098B7C
 	thumb_func_end rbox_fill_rectangle
 
 	thumb_func_start stdpal_get
-stdpal_get: ; 8098C18
+stdpal_get: @ 8098C18
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -270287,14 +270287,14 @@ _08098C56:
 	thumb_func_end stdpal_get
 
 	thumb_func_start sub_8098C64
-sub_8098C64: ; 8098C64
+sub_8098C64: @ 8098C64
 	ldr r0, =gUnknown_08DDD728
 	bx lr
 	.pool
 	thumb_func_end sub_8098C64
 
 	thumb_func_start sub_8098C6C
-sub_8098C6C: ; 8098C6C
+sub_8098C6C: @ 8098C6C
 	push {r4,r5,lr}
 	adds r3, r1, 0
 	adds r4, r2, 0
@@ -270330,8 +270330,8 @@ sub_8098C6C: ; 8098C6C
 	thumb_func_end sub_8098C6C
 
 	thumb_func_start script_env_init
-; void script_env_init(script_env *env, int a2, int a3)
-script_env_init: ; 8098CB8
+@ void script_env_init(script_env *env, int a2, int a3)
+script_env_init: @ 8098CB8
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0
@@ -270366,8 +270366,8 @@ _08098CE6:
 	thumb_func_end script_env_init
 
 	thumb_func_start script_setup_bytecode_script
-; int script_setup_bytecode_script(script_env *env, void *script_ptr)
-script_setup_bytecode_script: ; 8098CF4
+@ int script_setup_bytecode_script(script_env *env, void *script_ptr)
+script_setup_bytecode_script: @ 8098CF4
 	str r1, [r0, 0x8]
 	movs r1, 0x1
 	strb r1, [r0, 0x1]
@@ -270376,7 +270376,7 @@ script_setup_bytecode_script: ; 8098CF4
 	thumb_func_end script_setup_bytecode_script
 
 	thumb_func_start script_setup_asm_script
-script_setup_asm_script: ; 8098D00
+script_setup_asm_script: @ 8098D00
 	movs r2, 0x2
 	strb r2, [r0, 0x1]
 	str r1, [r0, 0x4]
@@ -270384,8 +270384,8 @@ script_setup_asm_script: ; 8098D00
 	thumb_func_end script_setup_asm_script
 
 	thumb_func_start script_stop
-; void script_stop(script_env *env)
-script_stop: ; 8098D08
+@ void script_stop(script_env *env)
+script_stop: @ 8098D08
 	movs r1, 0
 	strb r1, [r0, 0x1]
 	str r1, [r0, 0x8]
@@ -270393,8 +270393,8 @@ script_stop: ; 8098D08
 	thumb_func_end script_stop
 
 	thumb_func_start script_main_handler
-; int script_main_handler(script_env *env)
-script_main_handler: ; 8098D10
+@ int script_main_handler(script_env *env)
+script_main_handler: @ 8098D10
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -270473,8 +270473,8 @@ _08098D90:
 	thumb_func_end script_main_handler
 
 	thumb_func_start script_stack_push
-; int script_stack_push(script_env *env, int value)
-script_stack_push: ; 8098D98
+@ int script_stack_push(script_env *env, int value)
+script_stack_push: @ 8098D98
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r1, 0
@@ -270500,8 +270500,8 @@ _08098DBC:
 	thumb_func_end script_stack_push
 
 	thumb_func_start script_stack_pop
-; int script_stack_pop(script_env *env)
-script_stack_pop: ; 8098DC0
+@ int script_stack_pop(script_env *env)
+script_stack_pop: @ 8098DC0
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2]
@@ -270524,15 +270524,15 @@ _08098DDE:
 	thumb_func_end script_stack_pop
 
 	thumb_func_start script_jump
-; void script_jump(script_env *env, int address)
-script_jump: ; 8098DE4
+@ void script_jump(script_env *env, int address)
+script_jump: @ 8098DE4
 	str r1, [r0, 0x8]
 	bx lr
 	thumb_func_end script_jump
 
 	thumb_func_start script_call
-; void script_call(script_env *env, int address)
-script_call: ; 8098DE8
+@ void script_call(script_env *env, int address)
+script_call: @ 8098DE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -270545,8 +270545,8 @@ script_call: ; 8098DE8
 	thumb_func_end script_call
 
 	thumb_func_start script_return
-; void script_return(script_env *env)
-script_return: ; 8098DFC
+@ void script_return(script_env *env)
+script_return: @ 8098DFC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_stack_pop
@@ -270557,8 +270557,8 @@ script_return: ; 8098DFC
 	thumb_func_end script_return
 
 	thumb_func_start script_read_halfword
-; int script_read_halfword(script_env *env)
-script_read_halfword: ; 8098E0C
+@ int script_read_halfword(script_env *env)
+script_read_halfword: @ 8098E0C
 	adds r3, r0, 0
 	ldr r2, [r3, 0x8]
 	ldrb r0, [r2]
@@ -270573,8 +270573,8 @@ script_read_halfword: ; 8098E0C
 	thumb_func_end script_read_halfword
 
 	thumb_func_start script_read_word
-; int script_read_word(script_env *env)
-script_read_word: ; 8098E24
+@ int script_read_word(script_env *env)
+script_read_word: @ 8098E24
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	ldr r0, [r3, 0x8]
@@ -270602,7 +270602,7 @@ script_read_word: ; 8098E24
 	thumb_func_end script_read_word
 
 	thumb_func_start script_env_2_enable
-script_env_2_enable: ; 8098E54
+script_env_2_enable: @ 8098E54
 	ldr r1, =0x03000f2c
 	movs r0, 0x1
 	strb r0, [r1]
@@ -270611,8 +270611,8 @@ script_env_2_enable: ; 8098E54
 	thumb_func_end script_env_2_enable
 
 	thumb_func_start script_env_2_disable
-; void script_env_2_disable()
-script_env_2_disable: ; 8098E60
+@ void script_env_2_disable()
+script_env_2_disable: @ 8098E60
 	ldr r1, =0x03000f2c
 	movs r0, 0
 	strb r0, [r1]
@@ -270621,8 +270621,8 @@ script_env_2_disable: ; 8098E60
 	thumb_func_end script_env_2_disable
 
 	thumb_func_start script_env_2_is_enabled
-; int script_env_2_is_enabled()
-script_env_2_is_enabled: ; 8098E6C
+@ int script_env_2_is_enabled()
+script_env_2_is_enabled: @ 8098E6C
 	ldr r0, =0x03000f2c
 	ldrb r0, [r0]
 	bx lr
@@ -270630,8 +270630,8 @@ script_env_2_is_enabled: ; 8098E6C
 	thumb_func_end script_env_2_is_enabled
 
 	thumb_func_start script_env_context_is_running
-; int script_env_context_is_running()
-script_env_context_is_running: ; 8098E78
+@ int script_env_context_is_running()
+script_env_context_is_running: @ 8098E78
 	push {lr}
 	ldr r0, =0x03000e38
 	ldrb r0, [r0]
@@ -270648,7 +270648,7 @@ _08098E8E:
 	thumb_func_end script_env_context_is_running
 
 	thumb_func_start script_env_1_init
-script_env_1_init: ; 8098E94
+script_env_1_init: @ 8098E94
 	push {lr}
 	ldr r0, =0x03000e40
 	ldr r1, =gEventScriptCommandFunctionTable
@@ -270663,7 +270663,7 @@ script_env_1_init: ; 8098E94
 	thumb_func_end script_env_1_init
 
 	thumb_func_start script_env_2_run_current_script
-script_env_2_run_current_script: ; 8098EBC
+script_env_2_run_current_script: @ 8098EBC
 	push {r4,lr}
 	ldr r4, =0x03000e38
 	ldrb r0, [r4]
@@ -270693,7 +270693,7 @@ _08098EF2:
 	thumb_func_end script_env_2_run_current_script
 
 	thumb_func_start script_env_1_execute_new_script
-script_env_1_execute_new_script: ; 8098EF8
+script_env_1_execute_new_script: @ 8098EF8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x03000e40
@@ -270715,7 +270715,7 @@ script_env_1_execute_new_script: ; 8098EF8
 	thumb_func_end script_env_1_execute_new_script
 
 	thumb_func_start script_env_2_set_ctx_paused
-script_env_2_set_ctx_paused: ; 8098F30
+script_env_2_set_ctx_paused: @ 8098F30
 	ldr r1, =0x03000e38
 	movs r0, 0x1
 	strb r0, [r1]
@@ -270724,7 +270724,7 @@ script_env_2_set_ctx_paused: ; 8098F30
 	thumb_func_end script_env_2_set_ctx_paused
 
 	thumb_func_start script_env_2_enable_and_set_ctx_running
-script_env_2_enable_and_set_ctx_running: ; 8098F3C
+script_env_2_enable_and_set_ctx_running: @ 8098F3C
 	push {lr}
 	ldr r1, =0x03000e38
 	movs r0, 0
@@ -270736,8 +270736,8 @@ script_env_2_enable_and_set_ctx_running: ; 8098F3C
 	thumb_func_end script_env_2_enable_and_set_ctx_running
 
 	thumb_func_start script_env_2_execute_new_script
-; void script_env_2_execute_new_script(void *script_ptr)
-script_env_2_execute_new_script: ; 8098F50
+@ void script_env_2_execute_new_script(void *script_ptr)
+script_env_2_execute_new_script: @ 8098F50
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x03000eb8
@@ -270762,7 +270762,7 @@ _08098F68:
 	thumb_func_end script_env_2_execute_new_script
 
 	thumb_func_start mapheader_get_tagged_pointer
-mapheader_get_tagged_pointer: ; 8098F88
+mapheader_get_tagged_pointer: @ 8098F88
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -270801,7 +270801,7 @@ _08098FC2:
 	thumb_func_end mapheader_get_tagged_pointer
 
 	thumb_func_start mapheader_run_script_by_tag
-mapheader_run_script_by_tag: ; 8098FC8
+mapheader_run_script_by_tag: @ 8098FC8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -270815,8 +270815,8 @@ _08098FDA:
 	thumb_func_end mapheader_run_script_by_tag
 
 	thumb_func_start mapheader_get_first_match_from_tagged_ptr_list
-; int mapheader_get_first_match_from_tagged_ptr_list(int tag)
-mapheader_get_first_match_from_tagged_ptr_list: ; 8098FE0
+@ int mapheader_get_first_match_from_tagged_ptr_list(int tag)
+mapheader_get_first_match_from_tagged_ptr_list: @ 8098FE0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -270870,7 +270870,7 @@ _0809903A:
 	thumb_func_end mapheader_get_first_match_from_tagged_ptr_list
 
 	thumb_func_start mapheader_run_script_with_tag_x1
-mapheader_run_script_with_tag_x1: ; 8099040
+mapheader_run_script_with_tag_x1: @ 8099040
 	push {lr}
 	movs r0, 0x1
 	bl mapheader_run_script_by_tag
@@ -270879,7 +270879,7 @@ mapheader_run_script_with_tag_x1: ; 8099040
 	thumb_func_end mapheader_run_script_with_tag_x1
 
 	thumb_func_start mapheader_run_script_with_tag_x3
-mapheader_run_script_with_tag_x3: ; 809904C
+mapheader_run_script_with_tag_x3: @ 809904C
 	push {lr}
 	movs r0, 0x3
 	bl mapheader_run_script_by_tag
@@ -270888,7 +270888,7 @@ mapheader_run_script_with_tag_x3: ; 809904C
 	thumb_func_end mapheader_run_script_with_tag_x3
 
 	thumb_func_start mapheader_run_script_with_tag_x5
-mapheader_run_script_with_tag_x5: ; 8099058
+mapheader_run_script_with_tag_x5: @ 8099058
 	push {lr}
 	movs r0, 0x5
 	bl mapheader_run_script_by_tag
@@ -270897,7 +270897,7 @@ mapheader_run_script_with_tag_x5: ; 8099058
 	thumb_func_end mapheader_run_script_with_tag_x5
 
 	thumb_func_start mapheader_run_script_with_tag_x7
-mapheader_run_script_with_tag_x7: ; 8099064
+mapheader_run_script_with_tag_x7: @ 8099064
 	push {lr}
 	movs r0, 0x7
 	bl mapheader_run_script_by_tag
@@ -270906,7 +270906,7 @@ mapheader_run_script_with_tag_x7: ; 8099064
 	thumb_func_end mapheader_run_script_with_tag_x7
 
 	thumb_func_start mapheader_run_script_with_tag_x6
-mapheader_run_script_with_tag_x6: ; 8099070
+mapheader_run_script_with_tag_x6: @ 8099070
 	push {lr}
 	movs r0, 0x6
 	bl mapheader_run_script_by_tag
@@ -270915,8 +270915,8 @@ mapheader_run_script_with_tag_x6: ; 8099070
 	thumb_func_end mapheader_run_script_with_tag_x6
 
 	thumb_func_start mapheader_run_first_tag2_script_list_match
-; int mapheader_run_first_tag2_script_list_match()
-mapheader_run_first_tag2_script_list_match: ; 809907C
+@ int mapheader_run_first_tag2_script_list_match()
+mapheader_run_first_tag2_script_list_match: @ 809907C
 	push {lr}
 	movs r0, 0x2
 	bl mapheader_get_first_match_from_tagged_ptr_list
@@ -270933,8 +270933,8 @@ _08099092:
 	thumb_func_end mapheader_run_first_tag2_script_list_match
 
 	thumb_func_start mapheader_run_first_tag4_script_list_match
-; void mapheader_run_first_tag4_script_list_match()
-mapheader_run_first_tag4_script_list_match: ; 8099098
+@ void mapheader_run_first_tag4_script_list_match()
+mapheader_run_first_tag4_script_list_match: @ 8099098
 	push {lr}
 	movs r0, 0x4
 	bl mapheader_get_first_match_from_tagged_ptr_list
@@ -270947,7 +270947,7 @@ _080990A8:
 	thumb_func_end mapheader_run_first_tag4_script_list_match
 
 	thumb_func_start sub_80990AC
-sub_80990AC: ; 80990AC
+sub_80990AC: @ 80990AC
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -270964,7 +270964,7 @@ sub_80990AC: ; 80990AC
 	thumb_func_end sub_80990AC
 
 	thumb_func_start killram
-killram: ; 80990D0
+killram: @ 80990D0
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -270983,7 +270983,7 @@ killram: ; 80990D0
 	thumb_func_end killram
 
 	thumb_func_start sub_80990FC
-sub_80990FC: ; 80990FC
+sub_80990FC: @ 80990FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -271045,8 +271045,8 @@ _08099176:
 	thumb_func_end sub_80990FC
 
 	thumb_func_start sub_8099188
-; u32 sub_8099188(u8 a1, u32 script)
-sub_8099188: ; 8099188
+@ u32 sub_8099188(u8 a1, u32 script)
+sub_8099188: @ 8099188
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -271097,7 +271097,7 @@ _080991F2:
 	thumb_func_end sub_8099188
 
 	thumb_func_start sub_80991F8
-sub_80991F8: ; 80991F8
+sub_80991F8: @ 80991F8
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -271134,7 +271134,7 @@ _0809923E:
 	thumb_func_end sub_80991F8
 
 	thumb_func_start sub_8099244
-sub_8099244: ; 8099244
+sub_8099244: @ 8099244
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r5, [r6]
@@ -271177,7 +271177,7 @@ _0809929A:
 	thumb_func_end sub_8099244
 
 	thumb_func_start sub_80992A0
-sub_80992A0: ; 80992A0
+sub_80992A0: @ 80992A0
 	push {lr}
 	sub sp, 0x4
 	adds r2, r0, 0
@@ -271201,19 +271201,19 @@ _080992B2:
 	thumb_func_end sub_80992A0
 
 	thumb_func_start s00_nop
-s00_nop: ; 80992CC
+s00_nop: @ 80992CC
 	movs r0, 0
 	bx lr
 	thumb_func_end s00_nop
 
 	thumb_func_start s01_nop
-s01_nop: ; 80992D0
+s01_nop: @ 80992D0
 	movs r0, 0
 	bx lr
 	thumb_func_end s01_nop
 
 	thumb_func_start s02_end
-s02_end: ; 80992D4
+s02_end: @ 80992D4
 	push {lr}
 	bl script_stop
 	movs r0, 0
@@ -271222,7 +271222,7 @@ s02_end: ; 80992D4
 	thumb_func_end s02_end
 
 	thumb_func_start s24_execute_ASM_2
-s24_execute_ASM_2: ; 80992E0
+s24_execute_ASM_2: @ 80992E0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271236,7 +271236,7 @@ s24_execute_ASM_2: ; 80992E0
 	thumb_func_end s24_execute_ASM_2
 
 	thumb_func_start s25_extended_cmd
-s25_extended_cmd: ; 80992F8
+s25_extended_cmd: @ 80992F8
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -271252,7 +271252,7 @@ s25_extended_cmd: ; 80992F8
 	thumb_func_end s25_extended_cmd
 
 	thumb_func_start s26_extended_cmd_setvar
-s26_extended_cmd_setvar: ; 8099318
+s26_extended_cmd_setvar: @ 8099318
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -271277,7 +271277,7 @@ s26_extended_cmd_setvar: ; 8099318
 	thumb_func_end s26_extended_cmd_setvar
 
 	thumb_func_start s23_execute_ASM
-s23_execute_ASM: ; 809934C
+s23_execute_ASM: @ 809934C
 	push {lr}
 	bl script_read_word
 	bl _call_via_r0
@@ -271287,7 +271287,7 @@ s23_execute_ASM: ; 809934C
 	thumb_func_end s23_execute_ASM
 
 	thumb_func_start s27_set_to_waitstate
-s27_set_to_waitstate: ; 809935C
+s27_set_to_waitstate: @ 809935C
 	push {lr}
 	bl script_env_2_set_ctx_paused
 	movs r0, 0x1
@@ -271296,7 +271296,7 @@ s27_set_to_waitstate: ; 809935C
 	thumb_func_end s27_set_to_waitstate
 
 	thumb_func_start s05_goto
-s05_goto: ; 8099368
+s05_goto: @ 8099368
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271310,7 +271310,7 @@ s05_goto: ; 8099368
 	thumb_func_end s05_goto
 
 	thumb_func_start s03_return
-s03_return: ; 8099380
+s03_return: @ 8099380
 	push {lr}
 	bl script_return
 	movs r0, 0
@@ -271319,7 +271319,7 @@ s03_return: ; 8099380
 	thumb_func_end s03_return
 
 	thumb_func_start s04_call
-s04_call: ; 809938C
+s04_call: @ 809938C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271333,8 +271333,8 @@ s04_call: ; 809938C
 	thumb_func_end s04_call
 
 	thumb_func_start s06_if_jump
-; int s06_if_jump(script_env *env)
-s06_if_jump: ; 80993A4
+@ int s06_if_jump(script_env *env)
+s06_if_jump: @ 80993A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -271365,7 +271365,7 @@ _080993D2:
 	thumb_func_end s06_if_jump
 
 	thumb_func_start s07_if_call
-s07_if_call: ; 80993E0
+s07_if_call: @ 80993E0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -271396,8 +271396,8 @@ _0809940E:
 	thumb_func_end s07_if_call
 
 	thumb_func_start sB8_set_virtual_address
-; int sB8_set_virtual_address(script_env *env)
-sB8_set_virtual_address: ; 809941C
+@ int sB8_set_virtual_address(script_env *env)
+sB8_set_virtual_address: @ 809941C
 	push {r4,lr}
 	ldr r4, [r0, 0x8]
 	subs r4, 0x1
@@ -271413,8 +271413,8 @@ sB8_set_virtual_address: ; 809941C
 	thumb_func_end sB8_set_virtual_address
 
 	thumb_func_start sB9_virtual_jump
-; int sB9_virtual_jump(script_env *env)
-sB9_virtual_jump: ; 8099438
+@ int sB9_virtual_jump(script_env *env)
+sB9_virtual_jump: @ 8099438
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271432,7 +271432,7 @@ sB9_virtual_jump: ; 8099438
 	thumb_func_end sB9_virtual_jump
 
 	thumb_func_start sBA_virtual_call
-sBA_virtual_call: ; 809945C
+sBA_virtual_call: @ 809945C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271450,7 +271450,7 @@ sBA_virtual_call: ; 809945C
 	thumb_func_end sBA_virtual_call
 
 	thumb_func_start sBB_virtual_if_jump
-sBB_virtual_if_jump: ; 8099480
+sBB_virtual_if_jump: @ 8099480
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -271483,7 +271483,7 @@ _080994B2:
 	thumb_func_end sBB_virtual_if_jump
 
 	thumb_func_start sBC_virtual_if_call
-sBC_virtual_if_call: ; 80994C4
+sBC_virtual_if_call: @ 80994C4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -271516,7 +271516,7 @@ _080994F6:
 	thumb_func_end sBC_virtual_if_call
 
 	thumb_func_start s08_jumpstd
-s08_jumpstd: ; 8099508
+s08_jumpstd: @ 8099508
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, [r2, 0x8]
@@ -271540,7 +271540,7 @@ _08099528:
 	thumb_func_end s08_jumpstd
 
 	thumb_func_start s09_callstd
-s09_callstd: ; 8099538
+s09_callstd: @ 8099538
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, [r2, 0x8]
@@ -271564,7 +271564,7 @@ _08099558:
 	thumb_func_end s09_callstd
 
 	thumb_func_start s0A_jumpstd_if
-s0A_jumpstd_if: ; 8099568
+s0A_jumpstd_if: @ 8099568
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, [r3, 0x8]
@@ -271601,7 +271601,7 @@ _080995A0:
 	thumb_func_end s0A_jumpstd_if
 
 	thumb_func_start s0B_callstd_if
-s0B_callstd_if: ; 80995B4
+s0B_callstd_if: @ 80995B4
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, [r3, 0x8]
@@ -271638,7 +271638,7 @@ _080995EC:
 	thumb_func_end s0B_callstd_if
 
 	thumb_func_start s0C_restore_execution_after_sCF
-s0C_restore_execution_after_sCF: ; 8099600
+s0C_restore_execution_after_sCF: @ 8099600
 	push {lr}
 	ldr r1, =0x020375c0
 	ldr r1, [r1]
@@ -271650,7 +271650,7 @@ s0C_restore_execution_after_sCF: ; 8099600
 	thumb_func_end s0C_restore_execution_after_sCF
 
 	thumb_func_start s0D_endscript_killram
-s0D_endscript_killram: ; 8099614
+s0D_endscript_killram: @ 8099614
 	push {r4,lr}
 	adds r4, r0, 0
 	bl killram
@@ -271663,7 +271663,7 @@ s0D_endscript_killram: ; 8099614
 	thumb_func_end s0D_endscript_killram
 
 	thumb_func_start s0E_set_byte
-s0E_set_byte: ; 809962C
+s0E_set_byte: @ 809962C
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -271677,8 +271677,8 @@ s0E_set_byte: ; 809962C
 	thumb_func_end s0E_set_byte
 
 	thumb_func_start s0F_u32_var_to_const
-; int s0F_u32_var_to_const(script_env *env)
-s0F_u32_var_to_const: ; 8099644
+@ int s0F_u32_var_to_const(script_env *env)
+s0F_u32_var_to_const: @ 8099644
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -271698,8 +271698,8 @@ s0F_u32_var_to_const: ; 8099644
 	thumb_func_end s0F_u32_var_to_const
 
 	thumb_func_start s12_u32_var_to_ptr
-; int s12_u32_var_to_ptr(script_env *env)
-s12_u32_var_to_ptr: ; 8099668
+@ int s12_u32_var_to_ptr(script_env *env)
+s12_u32_var_to_ptr: @ 8099668
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -271720,8 +271720,8 @@ s12_u32_var_to_ptr: ; 8099668
 	thumb_func_end s12_u32_var_to_ptr
 
 	thumb_func_start s11_u8_ptr_to_const
-; int s11_u8_ptr_to_const(script_env *env)
-s11_u8_ptr_to_const: ; 809968C
+@ int s11_u8_ptr_to_const(script_env *env)
+s11_u8_ptr_to_const: @ 809968C
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -271736,8 +271736,8 @@ s11_u8_ptr_to_const: ; 809968C
 	thumb_func_end s11_u8_ptr_to_const
 
 	thumb_func_start s10_u8_var_to_const
-; int s10_u8_var_to_const(script_env *env)
-s10_u8_var_to_const: ; 80996A4
+@ int s10_u8_var_to_const(script_env *env)
+s10_u8_var_to_const: @ 80996A4
 	ldr r1, [r0, 0x8]
 	ldrb r3, [r1]
 	adds r1, 0x1
@@ -271755,8 +271755,8 @@ s10_u8_var_to_const: ; 80996A4
 	thumb_func_end s10_u8_var_to_const
 
 	thumb_func_start s13_u8_var_to_ptr
-; int s13_u8_var_to_ptr(script_env *env)
-s13_u8_var_to_ptr: ; 80996C0
+@ int s13_u8_var_to_ptr(script_env *env)
+s13_u8_var_to_ptr: @ 80996C0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -271777,7 +271777,7 @@ s13_u8_var_to_ptr: ; 80996C0
 	thumb_func_end s13_u8_var_to_ptr
 
 	thumb_func_start s14_u32_var_to_var
-s14_u32_var_to_var: ; 80996E4
+s14_u32_var_to_var: @ 80996E4
 	ldr r1, [r0, 0x8]
 	ldrb r3, [r1]
 	adds r1, 0x1
@@ -271797,7 +271797,7 @@ s14_u32_var_to_var: ; 80996E4
 	thumb_func_end s14_u32_var_to_var
 
 	thumb_func_start s15_u8_ptr_to_ptr
-s15_u8_ptr_to_ptr: ; 8099704
+s15_u8_ptr_to_ptr: @ 8099704
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271813,7 +271813,7 @@ s15_u8_ptr_to_ptr: ; 8099704
 	thumb_func_end s15_u8_ptr_to_ptr
 
 	thumb_func_start s16_u16_gvar_to_const
-s16_u16_gvar_to_const: ; 8099720
+s16_u16_gvar_to_const: @ 8099720
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -271831,7 +271831,7 @@ s16_u16_gvar_to_const: ; 8099720
 	thumb_func_end s16_u16_gvar_to_const
 
 	thumb_func_start s19_u16_gvar_gvar
-s19_u16_gvar_gvar: ; 8099744
+s19_u16_gvar_gvar: @ 8099744
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -271853,7 +271853,7 @@ s19_u16_gvar_gvar: ; 8099744
 	thumb_func_end s19_u16_gvar_gvar
 
 	thumb_func_start s1A_u16_gvar_gvar
-s1A_u16_gvar_gvar: ; 8099770
+s1A_u16_gvar_gvar: @ 8099770
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -271874,7 +271874,7 @@ s1A_u16_gvar_gvar: ; 8099770
 	thumb_func_end s1A_u16_gvar_gvar
 
 	thumb_func_start compare_012
-compare_012: ; 809979C
+compare_012: @ 809979C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -271897,7 +271897,7 @@ _080997B8:
 	thumb_func_end compare_012
 
 	thumb_func_start s1B_cmp_u8_var_var
-s1B_cmp_u8_var_var: ; 80997BC
+s1B_cmp_u8_var_var: @ 80997BC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, [r4, 0x8]
@@ -271924,7 +271924,7 @@ s1B_cmp_u8_var_var: ; 80997BC
 	thumb_func_end s1B_cmp_u8_var_var
 
 	thumb_func_start s1C_cmp_u8_var_const
-s1C_cmp_u8_var_const: ; 80997EC
+s1C_cmp_u8_var_const: @ 80997EC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, [r4, 0x8]
@@ -271947,7 +271947,7 @@ s1C_cmp_u8_var_const: ; 80997EC
 	thumb_func_end s1C_cmp_u8_var_const
 
 	thumb_func_start s1D_cmp_u8_var_ptr
-s1D_cmp_u8_var_ptr: ; 8099814
+s1D_cmp_u8_var_ptr: @ 8099814
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, [r4, 0x8]
@@ -271971,7 +271971,7 @@ s1D_cmp_u8_var_ptr: ; 8099814
 	thumb_func_end s1D_cmp_u8_var_ptr
 
 	thumb_func_start s1E_cmp_u8_ptr_var
-s1E_cmp_u8_ptr_var: ; 8099840
+s1E_cmp_u8_ptr_var: @ 8099840
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -271994,7 +271994,7 @@ s1E_cmp_u8_ptr_var: ; 8099840
 	thumb_func_end s1E_cmp_u8_ptr_var
 
 	thumb_func_start s1F_cmp_u8_ptr_const
-s1F_cmp_u8_ptr_const: ; 809986C
+s1F_cmp_u8_ptr_const: @ 809986C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -272012,7 +272012,7 @@ s1F_cmp_u8_ptr_const: ; 809986C
 	thumb_func_end s1F_cmp_u8_ptr_const
 
 	thumb_func_start s20_cmp_u8_ptr_ptr
-s20_cmp_u8_ptr_ptr: ; 809988C
+s20_cmp_u8_ptr_ptr: @ 809988C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -272030,7 +272030,7 @@ s20_cmp_u8_ptr_ptr: ; 809988C
 	thumb_func_end s20_cmp_u8_ptr_ptr
 
 	thumb_func_start s21_cmp_u16_gvar_const
-s21_cmp_u16_gvar_const: ; 80998B0
+s21_cmp_u16_gvar_const: @ 80998B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -272053,7 +272053,7 @@ s21_cmp_u16_gvar_const: ; 80998B0
 	thumb_func_end s21_cmp_u16_gvar_const
 
 	thumb_func_start s22_cmp_u16_gvar_gvar
-s22_cmp_u16_gvar_gvar: ; 80998E0
+s22_cmp_u16_gvar_gvar: @ 80998E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -272078,7 +272078,7 @@ s22_cmp_u16_gvar_gvar: ; 80998E0
 	thumb_func_end s22_cmp_u16_gvar_gvar
 
 	thumb_func_start s17_u16_gvar_add_const
-s17_u16_gvar_add_const: ; 8099914
+s17_u16_gvar_add_const: @ 8099914
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272098,7 +272098,7 @@ s17_u16_gvar_add_const: ; 8099914
 	thumb_func_end s17_u16_gvar_add_const
 
 	thumb_func_start sub_809993C
-sub_809993C: ; 809993C
+sub_809993C: @ 809993C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -272121,7 +272121,7 @@ sub_809993C: ; 809993C
 	thumb_func_end sub_809993C
 
 	thumb_func_start s8F_get_random_val
-s8F_get_random_val: ; 809996C
+s8F_get_random_val: @ 809996C
 	push {r4,r5,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272145,7 +272145,7 @@ s8F_get_random_val: ; 809996C
 	thumb_func_end s8F_get_random_val
 
 	thumb_func_start sub_80999A0
-sub_80999A0: ; 80999A0
+sub_80999A0: @ 80999A0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272177,7 +272177,7 @@ sub_80999A0: ; 80999A0
 	thumb_func_end sub_80999A0
 
 	thumb_func_start sub_80999E4
-sub_80999E4: ; 80999E4
+sub_80999E4: @ 80999E4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272209,7 +272209,7 @@ sub_80999E4: ; 80999E4
 	thumb_func_end sub_80999E4
 
 	thumb_func_start sub_8099A28
-sub_8099A28: ; 8099A28
+sub_8099A28: @ 8099A28
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272241,7 +272241,7 @@ sub_8099A28: ; 8099A28
 	thumb_func_end sub_8099A28
 
 	thumb_func_start sub_8099A6C
-sub_8099A6C: ; 8099A6C
+sub_8099A6C: @ 8099A6C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272273,7 +272273,7 @@ sub_8099A6C: ; 8099A6C
 	thumb_func_end sub_8099A6C
 
 	thumb_func_start s48_get_item_type
-s48_get_item_type: ; 8099AB0
+s48_get_item_type: @ 8099AB0
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272294,7 +272294,7 @@ s48_get_item_type: ; 8099AB0
 	thumb_func_end s48_get_item_type
 
 	thumb_func_start sub_8099ADC
-sub_8099ADC: ; 8099ADC
+sub_8099ADC: @ 8099ADC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272326,7 +272326,7 @@ sub_8099ADC: ; 8099ADC
 	thumb_func_end sub_8099ADC
 
 	thumb_func_start sub_8099B20
-sub_8099B20: ; 8099B20
+sub_8099B20: @ 8099B20
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272358,7 +272358,7 @@ sub_8099B20: ; 8099B20
 	thumb_func_end sub_8099B20
 
 	thumb_func_start sub_8099B64
-sub_8099B64: ; 8099B64
+sub_8099B64: @ 8099B64
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272379,7 +272379,7 @@ sub_8099B64: ; 8099B64
 	thumb_func_end sub_8099B64
 
 	thumb_func_start sub_8099B90
-sub_8099B90: ; 8099B90
+sub_8099B90: @ 8099B90
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272400,7 +272400,7 @@ sub_8099B90: ; 8099B90
 	thumb_func_end sub_8099B90
 
 	thumb_func_start sub_8099BBC
-sub_8099BBC: ; 8099BBC
+sub_8099BBC: @ 8099BBC
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272421,7 +272421,7 @@ sub_8099BBC: ; 8099BBC
 	thumb_func_end sub_8099BBC
 
 	thumb_func_start sub_8099BE8
-sub_8099BE8: ; 8099BE8
+sub_8099BE8: @ 8099BE8
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272442,8 +272442,8 @@ sub_8099BE8: ; 8099BE8
 	thumb_func_end sub_8099BE8
 
 	thumb_func_start s29_flag_set
-; int s29_flag_set(script_env *env)
-s29_flag_set: ; 8099C14
+@ int s29_flag_set(script_env *env)
+s29_flag_set: @ 8099C14
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272455,8 +272455,8 @@ s29_flag_set: ; 8099C14
 	thumb_func_end s29_flag_set
 
 	thumb_func_start s2A_flag_clear
-; int s2A_flag_clear(script_env *env)
-s2A_flag_clear: ; 8099C28
+@ int s2A_flag_clear(script_env *env)
+s2A_flag_clear: @ 8099C28
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272468,8 +272468,8 @@ s2A_flag_clear: ; 8099C28
 	thumb_func_end s2A_flag_clear
 
 	thumb_func_start s2B_flag_check
-; int s2B_flag_check(script_env *env)
-s2B_flag_check: ; 8099C3C
+@ int s2B_flag_check(script_env *env)
+s2B_flag_check: @ 8099C3C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -272484,8 +272484,8 @@ s2B_flag_check: ; 8099C3C
 	thumb_func_end s2B_flag_check
 
 	thumb_func_start sC3_unknown
-; int sC3_unknown(script_env *env)
-sC3_unknown: ; 8099C58
+@ int sC3_unknown(script_env *env)
+sC3_unknown: @ 8099C58
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -272499,8 +272499,8 @@ sC3_unknown: ; 8099C58
 	thumb_func_end sC3_unknown
 
 	thumb_func_start s9A_unknown
-; int s9A_unknown(script_env *env)
-s9A_unknown: ; 8099C70
+@ int s9A_unknown(script_env *env)
+s9A_unknown: @ 8099C70
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -272515,8 +272515,8 @@ s9A_unknown: ; 8099C70
 	thumb_func_end s9A_unknown
 
 	thumb_func_start s99_unknown
-; int s99_unknown(script_env *env)
-s99_unknown: ; 8099C8C
+@ int s99_unknown(script_env *env)
+s99_unknown: @ 8099C8C
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272531,7 +272531,7 @@ s99_unknown: ; 8099C8C
 	thumb_func_end s99_unknown
 
 	thumb_func_start sub_8099CA8
-sub_8099CA8: ; 8099CA8
+sub_8099CA8: @ 8099CA8
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -272550,8 +272550,8 @@ _08099CC2:
 	thumb_func_end sub_8099CA8
 
 	thumb_func_start s97_screen_special_effect
-; int s97_screen_special_effect(script_env *env)
-s97_screen_special_effect: ; 8099CC8
+@ int s97_screen_special_effect(script_env *env)
+s97_screen_special_effect: @ 8099CC8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, [r4, 0x8]
@@ -272571,8 +272571,8 @@ s97_screen_special_effect: ; 8099CC8
 	thumb_func_end s97_screen_special_effect
 
 	thumb_func_start s98_refade_with_timer
-; int s98_refade_with_timer(script_env *env)
-s98_refade_with_timer: ; 8099CF0
+@ int s98_refade_with_timer(script_env *env)
+s98_refade_with_timer: @ 8099CF0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, [r4, 0x8]
@@ -272596,8 +272596,8 @@ s98_refade_with_timer: ; 8099CF0
 	thumb_func_end s98_refade_with_timer
 
 	thumb_func_start sub_8099D20
-; int sub_8099D20(script_env *env)
-sub_8099D20: ; 8099D20
+@ int sub_8099D20(script_env *env)
+sub_8099D20: @ 8099D20
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -272644,7 +272644,7 @@ _08099D72:
 	thumb_func_end sub_8099D20
 
 	thumb_func_start s28_pause_asm
-s28_pause_asm: ; 8099D94
+s28_pause_asm: @ 8099D94
 	push {lr}
 	ldr r1, =0x020375c8
 	ldrh r0, [r1]
@@ -272664,8 +272664,8 @@ _08099DAE:
 	thumb_func_end s28_pause_asm
 
 	thumb_func_start s28_pause
-; int s28_pause(script_env *env)
-s28_pause: ; 8099DB4
+@ int s28_pause(script_env *env)
+s28_pause: @ 8099DB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -272682,8 +272682,8 @@ s28_pause: ; 8099DB4
 	thumb_func_end s28_pause
 
 	thumb_func_start s2C_unknown
-; int s2C_unknown(script_env *env)
-s2C_unknown: ; 8099DD8
+@ int s2C_unknown(script_env *env)
+s2C_unknown: @ 8099DD8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -272710,8 +272710,8 @@ s2C_unknown: ; 8099DD8
 	thumb_func_end s2C_unknown
 
 	thumb_func_start s2D_unknown
-; int s2D_unknown(script_env *env)
-s2D_unknown: ; 8099E10
+@ int s2D_unknown(script_env *env)
+s2D_unknown: @ 8099E10
 	push {lr}
 	bl sub_809E7B0
 	movs r0, 0
@@ -272720,8 +272720,8 @@ s2D_unknown: ; 8099E10
 	thumb_func_end s2D_unknown
 
 	thumb_func_start s2E_unknown
-; int s2E_unknown(script_env *env)
-s2E_unknown: ; 8099E1C
+@ int s2E_unknown(script_env *env)
+s2E_unknown: @ 8099E1C
 	push {lr}
 	bl GameFreakRTC_CalcLocalDateTime
 	ldr r2, =0x020375d8
@@ -272744,8 +272744,8 @@ s2E_unknown: ; 8099E1C
 	thumb_func_end s2E_unknown
 
 	thumb_func_start sA4_set_weather_data
-; int sA4_set_weather_data(script_env *env)
-sA4_set_weather_data: ; 8099E54
+@ int sA4_set_weather_data(script_env *env)
+sA4_set_weather_data: @ 8099E54
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272760,8 +272760,8 @@ sA4_set_weather_data: ; 8099E54
 	thumb_func_end sA4_set_weather_data
 
 	thumb_func_start sA3_set_standard_weather_data
-; int sA3_set_standard_weather_data(script_env *env)
-sA3_set_standard_weather_data: ; 8099E70
+@ int sA3_set_standard_weather_data(script_env *env)
+sA3_set_standard_weather_data: @ 8099E70
 	push {lr}
 	bl sub_80AEDBC
 	movs r0, 0
@@ -272770,8 +272770,8 @@ sA3_set_standard_weather_data: ; 8099E70
 	thumb_func_end sA3_set_standard_weather_data
 
 	thumb_func_start sub_8099E7C
-; int sub_8099E7C(script_env *env)
-sub_8099E7C: ; 8099E7C
+@ int sub_8099E7C(script_env *env)
+sub_8099E7C: @ 8099E7C
 	push {lr}
 	bl sub_80AEE20
 	movs r0, 0
@@ -272780,8 +272780,8 @@ sub_8099E7C: ; 8099E7C
 	thumb_func_end sub_8099E7C
 
 	thumb_func_start sA6_activate_per_step_callback_eg_ash
-; int sA6_activate_per_step_callback_eg_ash(script_env *env)
-sA6_activate_per_step_callback_eg_ash: ; 8099E88
+@ int sA6_activate_per_step_callback_eg_ash(script_env *env)
+sA6_activate_per_step_callback_eg_ash: @ 8099E88
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -272795,8 +272795,8 @@ sA6_activate_per_step_callback_eg_ash: ; 8099E88
 	thumb_func_end sA6_activate_per_step_callback_eg_ash
 
 	thumb_func_start sA7_set_new_map_footer
-; int sA7_set_new_map_footer(script_env *env)
-sA7_set_new_map_footer: ; 8099EA0
+@ int sA7_set_new_map_footer(script_env *env)
+sA7_set_new_map_footer: @ 8099EA0
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -272811,8 +272811,8 @@ sA7_set_new_map_footer: ; 8099EA0
 	thumb_func_end sA7_set_new_map_footer
 
 	thumb_func_start s39_warp_sfx
-; int s39_warp_sfx(script_env *env)
-s39_warp_sfx: ; 8099EBC
+@ int s39_warp_sfx(script_env *env)
+s39_warp_sfx: @ 8099EBC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -272876,8 +272876,8 @@ s39_warp_sfx: ; 8099EBC
 	thumb_func_end s39_warp_sfx
 
 	thumb_func_start s3A_warp_new_music
-; int s3A_warp_new_music(script_env *env)
-s3A_warp_new_music: ; 8099F44
+@ int s3A_warp_new_music(script_env *env)
+s3A_warp_new_music: @ 8099F44
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -272941,8 +272941,8 @@ s3A_warp_new_music: ; 8099F44
 	thumb_func_end s3A_warp_new_music
 
 	thumb_func_start s3B_warp_keep_music
-; int s3B_warp_keep_music(script_env *env)
-s3B_warp_keep_music: ; 8099FCC
+@ int s3B_warp_keep_music(script_env *env)
+s3B_warp_keep_music: @ 8099FCC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273006,7 +273006,7 @@ s3B_warp_keep_music: ; 8099FCC
 	thumb_func_end s3B_warp_keep_music
 
 	thumb_func_start sub_809A054
-sub_809A054: ; 809A054
+sub_809A054: @ 809A054
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r1, [r0, 0x8]
@@ -273065,7 +273065,7 @@ _0809A0B6:
 	thumb_func_end sub_809A054
 
 	thumb_func_start s3D_warp_v4
-s3D_warp_v4: ; 809A0C8
+s3D_warp_v4: @ 809A0C8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273129,7 +273129,7 @@ s3D_warp_v4: ; 809A0C8
 	thumb_func_end s3D_warp_v4
 
 	thumb_func_start sub_809A150
-sub_809A150: ; 809A150
+sub_809A150: @ 809A150
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273193,7 +273193,7 @@ sub_809A150: ; 809A150
 	thumb_func_end sub_809A150
 
 	thumb_func_start s3E_set_new_map
-s3E_set_new_map: ; 809A1D8
+s3E_set_new_map: @ 809A1D8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273255,7 +273255,7 @@ s3E_set_new_map: ; 809A1D8
 	thumb_func_end s3E_set_new_map
 
 	thumb_func_start s3F_set_new_map_DMA
-s3F_set_new_map_DMA: ; 809A258
+s3F_set_new_map_DMA: @ 809A258
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273319,7 +273319,7 @@ s3F_set_new_map_DMA: ; 809A258
 	thumb_func_end s3F_set_new_map_DMA
 
 	thumb_func_start sub_809A2DC
-sub_809A2DC: ; 809A2DC
+sub_809A2DC: @ 809A2DC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273381,7 +273381,7 @@ sub_809A2DC: ; 809A2DC
 	thumb_func_end sub_809A2DC
 
 	thumb_func_start sub_809A35C
-sub_809A35C: ; 809A35C
+sub_809A35C: @ 809A35C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273443,7 +273443,7 @@ sub_809A35C: ; 809A35C
 	thumb_func_end sub_809A35C
 
 	thumb_func_start sC4_unknown
-sC4_unknown: ; 809A3DC
+sC4_unknown: @ 809A3DC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -273505,8 +273505,8 @@ sC4_unknown: ; 809A3DC
 	thumb_func_end sC4_unknown
 
 	thumb_func_start s42_get_map_camera_pos
-; int s42_get_map_camera_pos(script_env *env)
-s42_get_map_camera_pos: ; 809A45C
+@ int s42_get_map_camera_pos(script_env *env)
+s42_get_map_camera_pos: @ 809A45C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273534,7 +273534,7 @@ s42_get_map_camera_pos: ; 809A45C
 	thumb_func_end s42_get_map_camera_pos
 
 	thumb_func_start s43_get_player_party_count
-s43_get_player_party_count: ; 809A498
+s43_get_player_party_count: @ 809A498
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl calc_player_party_count
@@ -273549,7 +273549,7 @@ s43_get_player_party_count: ; 809A498
 	thumb_func_end s43_get_player_party_count
 
 	thumb_func_start s2F_music_play
-s2F_music_play: ; 809A4B4
+s2F_music_play: @ 809A4B4
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273561,7 +273561,7 @@ s2F_music_play: ; 809A4B4
 	thumb_func_end s2F_music_play
 
 	thumb_func_start s30_music_check_asm
-s30_music_check_asm: ; 809A4C8
+s30_music_check_asm: @ 809A4C8
 	push {lr}
 	bl mplay_has_finished_maybe
 	lsls r0, 24
@@ -273577,7 +273577,7 @@ _0809A4DA:
 	thumb_func_end s30_music_check_asm
 
 	thumb_func_start s30_music_check
-s30_music_check: ; 809A4E0
+s30_music_check: @ 809A4E0
 	push {lr}
 	ldr r1, =s30_music_check_asm
 	bl script_setup_asm_script
@@ -273588,7 +273588,7 @@ s30_music_check: ; 809A4E0
 	thumb_func_end s30_music_check
 
 	thumb_func_start s31_fanfare_play
-s31_fanfare_play: ; 809A4F4
+s31_fanfare_play: @ 809A4F4
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273600,7 +273600,7 @@ s31_fanfare_play: ; 809A4F4
 	thumb_func_end s31_fanfare_play
 
 	thumb_func_start s32_fanfare_wait_asm
-s32_fanfare_wait_asm: ; 809A508
+s32_fanfare_wait_asm: @ 809A508
 	push {lr}
 	bl task_is_not_running_overworld_fanfare
 	lsls r0, 24
@@ -273610,7 +273610,7 @@ s32_fanfare_wait_asm: ; 809A508
 	thumb_func_end s32_fanfare_wait_asm
 
 	thumb_func_start s32_fanfare_wait
-s32_fanfare_wait: ; 809A518
+s32_fanfare_wait: @ 809A518
 	push {lr}
 	ldr r1, =s32_fanfare_wait_asm
 	bl script_setup_asm_script
@@ -273621,8 +273621,8 @@ s32_fanfare_wait: ; 809A518
 	thumb_func_end s32_fanfare_wait
 
 	thumb_func_start s33_play_music
-; int s33_play_music(script_env *env)
-s33_play_music: ; 809A52C
+@ int s33_play_music(script_env *env)
+s33_play_music: @ 809A52C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273647,7 +273647,7 @@ _0809A54C:
 	thumb_func_end s33_play_music
 
 	thumb_func_start s34_unknown
-s34_unknown: ; 809A55C
+s34_unknown: @ 809A55C
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273659,7 +273659,7 @@ s34_unknown: ; 809A55C
 	thumb_func_end s34_unknown
 
 	thumb_func_start s35_fade_to_default
-s35_fade_to_default: ; 809A570
+s35_fade_to_default: @ 809A570
 	push {lr}
 	bl sub_8085898
 	movs r0, 0
@@ -273668,7 +273668,7 @@ s35_fade_to_default: ; 809A570
 	thumb_func_end s35_fade_to_default
 
 	thumb_func_start s36_fade_to_music
-s36_fade_to_music: ; 809A57C
+s36_fade_to_music: @ 809A57C
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273680,7 +273680,7 @@ s36_fade_to_music: ; 809A57C
 	thumb_func_end s36_fade_to_music
 
 	thumb_func_start s37_fadeout
-s37_fadeout: ; 809A590
+s37_fadeout: @ 809A590
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -273708,7 +273708,7 @@ _0809A5B0:
 	thumb_func_end s37_fadeout
 
 	thumb_func_start s38_fadein
-s38_fadein: ; 809A5C4
+s38_fadein: @ 809A5C4
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -273730,7 +273730,7 @@ _0809A5E2:
 	thumb_func_end s38_fadein
 
 	thumb_func_start s4F_execute_movement
-s4F_execute_movement: ; 809A5E8
+s4F_execute_movement: @ 809A5E8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -273760,7 +273760,7 @@ s4F_execute_movement: ; 809A5E8
 	thumb_func_end s4F_execute_movement
 
 	thumb_func_start s50_execute_movement_remote
-s50_execute_movement_remote: ; 809A62C
+s50_execute_movement_remote: @ 809A62C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -273793,7 +273793,7 @@ s50_execute_movement_remote: ; 809A62C
 	thumb_func_end s50_execute_movement_remote
 
 	thumb_func_start s51a_0806B288
-s51a_0806B288: ; 809A670
+s51a_0806B288: @ 809A670
 	push {lr}
 	ldr r0, =0x020375ca
 	ldrb r0, [r0]
@@ -273810,7 +273810,7 @@ s51a_0806B288: ; 809A670
 	thumb_func_end s51a_0806B288
 
 	thumb_func_start s51_waitmove
-s51_waitmove: ; 809A698
+s51_waitmove: @ 809A698
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273845,7 +273845,7 @@ _0809A6B4:
 	thumb_func_end s51_waitmove
 
 	thumb_func_start s52_waitmove_remote
-s52_waitmove_remote: ; 809A6EC
+s52_waitmove_remote: @ 809A6EC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273881,7 +273881,7 @@ _0809A708:
 	thumb_func_end s52_waitmove_remote
 
 	thumb_func_start s53_hide_sprite
-s53_hide_sprite: ; 809A740
+s53_hide_sprite: @ 809A740
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273901,7 +273901,7 @@ s53_hide_sprite: ; 809A740
 	thumb_func_end s53_hide_sprite
 
 	thumb_func_start s54_hide_sprite_set_coords
-s54_hide_sprite_set_coords: ; 809A768
+s54_hide_sprite_set_coords: @ 809A768
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273925,7 +273925,7 @@ s54_hide_sprite_set_coords: ; 809A768
 	thumb_func_end s54_hide_sprite_set_coords
 
 	thumb_func_start s55_show_sprite
-s55_show_sprite: ; 809A798
+s55_show_sprite: @ 809A798
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -273945,7 +273945,7 @@ s55_show_sprite: ; 809A798
 	thumb_func_end s55_show_sprite
 
 	thumb_func_start s56_show_sprite_set_coords
-s56_show_sprite_set_coords: ; 809A7C0
+s56_show_sprite_set_coords: @ 809A7C0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -273969,7 +273969,7 @@ s56_show_sprite_set_coords: ; 809A7C0
 	thumb_func_end s56_show_sprite_set_coords
 
 	thumb_func_start s57_move_sprites
-s57_move_sprites: ; 809A7F0
+s57_move_sprites: @ 809A7F0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -274016,7 +274016,7 @@ s57_move_sprites: ; 809A7F0
 	thumb_func_end s57_move_sprites
 
 	thumb_func_start s63_new_sprite_location_permanent
-s63_new_sprite_location_permanent: ; 809A858
+s63_new_sprite_location_permanent: @ 809A858
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl script_read_halfword
@@ -274056,7 +274056,7 @@ s63_new_sprite_location_permanent: ; 809A858
 	thumb_func_end s63_new_sprite_location_permanent
 
 	thumb_func_start s64_set_sprite_top_left_corner
-s64_set_sprite_top_left_corner: ; 809A8B0
+s64_set_sprite_top_left_corner: @ 809A8B0
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -274076,7 +274076,7 @@ s64_set_sprite_top_left_corner: ; 809A8B0
 	thumb_func_end s64_set_sprite_top_left_corner
 
 	thumb_func_start s58_npc_f1_clear_x20
-s58_npc_f1_clear_x20: ; 809A8D8
+s58_npc_f1_clear_x20: @ 809A8D8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274101,7 +274101,7 @@ s58_npc_f1_clear_x20: ; 809A8D8
 	thumb_func_end s58_npc_f1_clear_x20
 
 	thumb_func_start s59_npc_f1_set_x20
-s59_npc_f1_set_x20: ; 809A908
+s59_npc_f1_set_x20: @ 809A908
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274126,7 +274126,7 @@ s59_npc_f1_set_x20: ; 809A908
 	thumb_func_end s59_npc_f1_set_x20
 
 	thumb_func_start sA8_unknown
-sA8_unknown: ; 809A938
+sA8_unknown: @ 809A938
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -274156,7 +274156,7 @@ sA8_unknown: ; 809A938
 	thumb_func_end sA8_unknown
 
 	thumb_func_start sA9_unknown
-sA9_unknown: ; 809A974
+sA9_unknown: @ 809A974
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274180,7 +274180,7 @@ sA9_unknown: ; 809A974
 	thumb_func_end sA9_unknown
 
 	thumb_func_start s5A_face_player
-s5A_face_player: ; 809A9A4
+s5A_face_player: @ 809A9A4
 	push {r4,lr}
 	ldr r2, =0x02037350
 	ldr r0, =0x03005df0
@@ -274208,7 +274208,7 @@ _0809A9CC:
 	thumb_func_end s5A_face_player
 
 	thumb_func_start s5B_npc_set_direction
-s5B_npc_set_direction: ; 809A9DC
+s5B_npc_set_direction: @ 809A9DC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274234,7 +274234,7 @@ s5B_npc_set_direction: ; 809A9DC
 	thumb_func_end s5B_npc_set_direction
 
 	thumb_func_start s65_set_sprite_behaviour
-s65_set_sprite_behaviour: ; 809AA10
+s65_set_sprite_behaviour: @ 809AA10
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274255,7 +274255,7 @@ s65_set_sprite_behaviour: ; 809AA10
 	thumb_func_end s65_set_sprite_behaviour
 
 	thumb_func_start sAA_create_new_sprite
-sAA_create_new_sprite: ; 809AA38
+sAA_create_new_sprite: @ 809AA38
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -274310,7 +274310,7 @@ sAA_create_new_sprite: ; 809AA38
 	thumb_func_end sAA_create_new_sprite
 
 	thumb_func_start sAB_unknown
-sAB_unknown: ; 809AAA8
+sAB_unknown: @ 809AAA8
 	push {lr}
 	ldr r2, [r0, 0x8]
 	ldrb r3, [r2]
@@ -274327,7 +274327,7 @@ sAB_unknown: ; 809AAA8
 	thumb_func_end sAB_unknown
 
 	thumb_func_start sub_809AAC4
-sub_809AAC4: ; 809AAC4
+sub_809AAC4: @ 809AAC4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl is_c1_link_related_active
@@ -274349,7 +274349,7 @@ _0809AAE6:
 	thumb_func_end sub_809AAC4
 
 	thumb_func_start sub_809AAEC
-sub_809AAEC: ; 809AAEC
+sub_809AAEC: @ 809AAEC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl is_c1_link_related_active
@@ -274390,7 +274390,7 @@ _0809AB3A:
 	thumb_func_end sub_809AAEC
 
 	thumb_func_start s6B_release
-s6B_release: ; 809AB44
+s6B_release: @ 809AB44
 	push {lr}
 	bl textbox_close
 	movs r0, 0xFF
@@ -274415,7 +274415,7 @@ s6B_release: ; 809AB44
 	thumb_func_end s6B_release
 
 	thumb_func_start s6C_release_2
-s6C_release_2: ; 809AB7C
+s6C_release_2: @ 809AB7C
 	push {r4,lr}
 	bl textbox_close
 	ldr r4, =0x02037350
@@ -274454,7 +274454,7 @@ _0809AB9E:
 	thumb_func_end s6C_release_2
 
 	thumb_func_start s67_execute_box
-s67_execute_box: ; 809ABD4
+s67_execute_box: @ 809ABD4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -274470,7 +274470,7 @@ _0809ABE2:
 	thumb_func_end s67_execute_box
 
 	thumb_func_start sub_809ABF0
-sub_809ABF0: ; 809ABF0
+sub_809ABF0: @ 809ABF0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -274486,7 +274486,7 @@ _0809ABFE:
 	thumb_func_end sub_809ABF0
 
 	thumb_func_start s9B_unknown
-s9B_unknown: ; 809AC0C
+s9B_unknown: @ 809AC0C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -274512,7 +274512,7 @@ _0809AC1C:
 	thumb_func_end s9B_unknown
 
 	thumb_func_start sub_809AC3C
-sub_809AC3C: ; 809AC3C
+sub_809AC3C: @ 809AC3C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -274543,7 +274543,7 @@ _0809AC4E:
 	thumb_func_end sub_809AC3C
 
 	thumb_func_start sub_809AC78
-sub_809AC78: ; 809AC78
+sub_809AC78: @ 809AC78
 	push {lr}
 	ldr r1, =sub_809833C
 	bl script_setup_asm_script
@@ -274554,7 +274554,7 @@ sub_809AC78: ; 809AC78
 	thumb_func_end sub_809AC78
 
 	thumb_func_start s68_close_box
-s68_close_box: ; 809AC8C
+s68_close_box: @ 809AC8C
 	push {lr}
 	bl textbox_close
 	movs r0, 0
@@ -274563,7 +274563,7 @@ s68_close_box: ; 809AC8C
 	thumb_func_end s68_close_box
 
 	thumb_func_start sub_809AC98
-sub_809AC98: ; 809AC98
+sub_809AC98: @ 809AC98
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -274586,7 +274586,7 @@ _0809ACBA:
 	thumb_func_end sub_809AC98
 
 	thumb_func_start sub_809ACC0
-sub_809ACC0: ; 809ACC0
+sub_809ACC0: @ 809ACC0
 	push {lr}
 	ldr r1, =sub_809AC98
 	bl script_setup_asm_script
@@ -274597,7 +274597,7 @@ sub_809ACC0: ; 809ACC0
 	thumb_func_end sub_809ACC0
 
 	thumb_func_start s6E_yes_no
-s6E_yes_no: ; 809ACD4
+s6E_yes_no: @ 809ACD4
 	push {lr}
 	ldr r2, [r0, 0x8]
 	ldrb r3, [r2]
@@ -274623,7 +274623,7 @@ _0809ACFC:
 	thumb_func_end s6E_yes_no
 
 	thumb_func_start s6F_multichoice
-s6F_multichoice: ; 809AD00
+s6F_multichoice: @ 809AD00
 	push {r4,r5,lr}
 	ldr r2, [r0, 0x8]
 	ldrb r5, [r2]
@@ -274656,7 +274656,7 @@ _0809AD34:
 	thumb_func_end s6F_multichoice
 
 	thumb_func_start sub_809AD3C
-sub_809AD3C: ; 809AD3C
+sub_809AD3C: @ 809AD3C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -274700,13 +274700,13 @@ _0809AD80:
 	thumb_func_end sub_809AD3C
 
 	thumb_func_start sub_809AD8C
-sub_809AD8C: ; 809AD8C
+sub_809AD8C: @ 809AD8C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_809AD8C
 
 	thumb_func_start sub_809AD90
-sub_809AD90: ; 809AD90
+sub_809AD90: @ 809AD90
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -274750,7 +274750,7 @@ _0809ADD4:
 	thumb_func_end sub_809AD90
 
 	thumb_func_start s73_nop_skip_word
-s73_nop_skip_word: ; 809ADE0
+s73_nop_skip_word: @ 809ADE0
 	ldr r1, [r0, 0x8]
 	adds r1, 0x4
 	str r1, [r0, 0x8]
@@ -274759,7 +274759,7 @@ s73_nop_skip_word: ; 809ADE0
 	thumb_func_end s73_nop_skip_word
 
 	thumb_func_start sub_809ADEC
-sub_809ADEC: ; 809ADEC
+sub_809ADEC: @ 809ADEC
 	ldr r1, [r0, 0x8]
 	adds r1, 0x4
 	str r1, [r0, 0x8]
@@ -274768,7 +274768,7 @@ sub_809ADEC: ; 809ADEC
 	thumb_func_end sub_809ADEC
 
 	thumb_func_start sub_809ADF8
-sub_809ADF8: ; 809ADF8
+sub_809ADF8: @ 809ADF8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -274792,7 +274792,7 @@ sub_809ADF8: ; 809ADF8
 	thumb_func_end sub_809ADF8
 
 	thumb_func_start s76_close_picture_box
-s76_close_picture_box: ; 809AE28
+s76_close_picture_box: @ 809AE28
 	push {r4,lr}
 	adds r4, r0, 0
 	bl picbox_close
@@ -274812,7 +274812,7 @@ _0809AE42:
 	thumb_func_end s76_close_picture_box
 
 	thumb_func_start sub_809AE48
-sub_809AE48: ; 809AE48
+sub_809AE48: @ 809AE48
 	push {lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -274831,7 +274831,7 @@ _0809AE5C:
 	thumb_func_end sub_809AE48
 
 	thumb_func_start sub_809AE6C
-sub_809AE6C: ; 809AE6C
+sub_809AE6C: @ 809AE6C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -274973,7 +274973,7 @@ _0809AEC6:
 	thumb_func_end sub_809AE6C
 
 	thumb_func_start sub_809AF94
-sub_809AF94: ; 809AF94
+sub_809AF94: @ 809AF94
 	push {lr}
 	bl sub_809BDB4
 	movs r0, 0
@@ -274982,7 +274982,7 @@ sub_809AF94: ; 809AF94
 	thumb_func_end sub_809AF94
 
 	thumb_func_start sBD_virtual_message
-sBD_virtual_message: ; 809AFA0
+sBD_virtual_message: @ 809AFA0
 	push {lr}
 	bl script_read_word
 	ldr r1, =0x020375c4
@@ -274996,7 +274996,7 @@ sBD_virtual_message: ; 809AFA0
 	thumb_func_end sBD_virtual_message
 
 	thumb_func_start s7D_load_pokename
-s7D_load_pokename: ; 809AFBC
+s7D_load_pokename: @ 809AFBC
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275026,7 +275026,7 @@ s7D_load_pokename: ; 809AFBC
 	thumb_func_end s7D_load_pokename
 
 	thumb_func_start s7E_load_first_pokenames
-s7E_load_first_pokenames: ; 809AFFC
+s7E_load_first_pokenames: @ 809AFFC
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
@@ -275060,7 +275060,7 @@ s7E_load_first_pokenames: ; 809AFFC
 	thumb_func_end s7E_load_first_pokenames
 
 	thumb_func_start s7F_load_pokename_team
-s7F_load_pokename_team: ; 809B048
+s7F_load_pokename_team: @ 809B048
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275093,7 +275093,7 @@ s7F_load_pokename_team: ; 809B048
 	thumb_func_end s7F_load_pokename_team
 
 	thumb_func_start s80_load_item_name
-s80_load_item_name: ; 809B090
+s80_load_item_name: @ 809B090
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275118,7 +275118,7 @@ s80_load_item_name: ; 809B090
 	thumb_func_end s80_load_item_name
 
 	thumb_func_start sub_809B0C4
-sub_809B0C4: ; 809B0C4
+sub_809B0C4: @ 809B0C4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, [r5, 0x8]
@@ -275155,7 +275155,7 @@ sub_809B0C4: ; 809B0C4
 	thumb_func_end sub_809B0C4
 
 	thumb_func_start sub_809B114
-sub_809B114: ; 809B114
+sub_809B114: @ 809B114
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275183,7 +275183,7 @@ sub_809B114: ; 809B114
 	thumb_func_end sub_809B114
 
 	thumb_func_start s82_load_item_name
-s82_load_item_name: ; 809B150
+s82_load_item_name: @ 809B150
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275213,7 +275213,7 @@ s82_load_item_name: ; 809B150
 	thumb_func_end s82_load_item_name
 
 	thumb_func_start s83_load_textvar_var
-s83_load_textvar_var: ; 809B190
+s83_load_textvar_var: @ 809B190
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -275246,7 +275246,7 @@ s83_load_textvar_var: ; 809B190
 	thumb_func_end s83_load_textvar_var
 
 	thumb_func_start s84_load_textvar_std_expression
-s84_load_textvar_std_expression: ; 809B1D4
+s84_load_textvar_std_expression: @ 809B1D4
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275275,7 +275275,7 @@ s84_load_textvar_std_expression: ; 809B1D4
 	thumb_func_end s84_load_textvar_std_expression
 
 	thumb_func_start sub_809B214
-sub_809B214: ; 809B214
+sub_809B214: @ 809B214
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275301,7 +275301,7 @@ sub_809B214: ; 809B214
 	thumb_func_end sub_809B214
 
 	thumb_func_start s85_load_textvar_pointer
-s85_load_textvar_pointer: ; 809B248
+s85_load_textvar_pointer: @ 809B248
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275322,7 +275322,7 @@ s85_load_textvar_pointer: ; 809B248
 	thumb_func_end s85_load_textvar_pointer
 
 	thumb_func_start sBE_virtual_load_text
-sBE_virtual_load_text: ; 809B270
+sBE_virtual_load_text: @ 809B270
 	push {lr}
 	bl script_read_word
 	adds r1, r0, 0
@@ -275338,7 +275338,7 @@ sBE_virtual_load_text: ; 809B270
 	thumb_func_end sBE_virtual_load_text
 
 	thumb_func_start sBF_virtual_load_textbuffer
-sBF_virtual_load_textbuffer: ; 809B294
+sBF_virtual_load_textbuffer: @ 809B294
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275362,7 +275362,7 @@ sBF_virtual_load_textbuffer: ; 809B294
 	thumb_func_end sBF_virtual_load_textbuffer
 
 	thumb_func_start sC6_load_textvar_box_label
-sC6_load_textvar_box_label: ; 809B2C8
+sC6_load_textvar_box_label: @ 809B2C8
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -275390,7 +275390,7 @@ sC6_load_textvar_box_label: ; 809B2C8
 	thumb_func_end sC6_load_textvar_box_label
 
 	thumb_func_start s79_give_pokemon
-s79_give_pokemon: ; 809B304
+s79_give_pokemon: @ 809B304
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -275449,7 +275449,7 @@ s79_give_pokemon: ; 809B304
 	thumb_func_end s79_give_pokemon
 
 	thumb_func_start s7A_create_egg
-s7A_create_egg: ; 809B384
+s7A_create_egg: @ 809B384
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275470,7 +275470,7 @@ s7A_create_egg: ; 809B384
 	thumb_func_end s7A_create_egg
 
 	thumb_func_start s7B_change_pokedata_AP
-s7B_change_pokedata_AP: ; 809B3B0
+s7B_change_pokedata_AP: @ 809B3B0
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -275493,7 +275493,7 @@ s7B_change_pokedata_AP: ; 809B3B0
 	thumb_func_end s7B_change_pokedata_AP
 
 	thumb_func_start sub_809B3DC
-sub_809B3DC: ; 809B3DC
+sub_809B3DC: @ 809B3DC
 	push {r4-r7,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275552,8 +275552,8 @@ _0809B44A:
 	thumb_func_end sub_809B3DC
 
 	thumb_func_start s90_add_money
-; int s90_add_money(script_env *env)
-s90_add_money: ; 809B458
+@ int s90_add_money(script_env *env)
+s90_add_money: @ 809B458
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -275580,8 +275580,8 @@ _0809B47E:
 	thumb_func_end s90_add_money
 
 	thumb_func_start s91_subtract_money
-; int s91_subtract_money(script_env *env)
-s91_subtract_money: ; 809B48C
+@ int s91_subtract_money(script_env *env)
+s91_subtract_money: @ 809B48C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -275608,8 +275608,8 @@ _0809B4B2:
 	thumb_func_end s91_subtract_money
 
 	thumb_func_start s92_check_money
-; int s92_check_money(script_env *env)
-s92_check_money: ; 809B4C0
+@ int s92_check_money(script_env *env)
+s92_check_money: @ 809B4C0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -275640,8 +275640,8 @@ _0809B4EE:
 	thumb_func_end s92_check_money
 
 	thumb_func_start s93_display_money
-; int s93_display_money(script_env *env)
-s93_display_money: ; 809B500
+@ int s93_display_money(script_env *env)
+s93_display_money: @ 809B500
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -275673,7 +275673,7 @@ _0809B530:
 	thumb_func_end s93_display_money
 
 	thumb_func_start s94_hide_money
-s94_hide_money: ; 809B53C
+s94_hide_money: @ 809B53C
 	push {lr}
 	bl sub_80E5384
 	movs r0, 0
@@ -275682,8 +275682,8 @@ s94_hide_money: ; 809B53C
 	thumb_func_end s94_hide_money
 
 	thumb_func_start s95_update_money
-; int s95_update_money(script_env *env)
-s95_update_money: ; 809B548
+@ int s95_update_money(script_env *env)
+s95_update_money: @ 809B548
 	push {lr}
 	ldr r1, [r0, 0x8]
 	adds r1, 0x1
@@ -275709,7 +275709,7 @@ _0809B56E:
 	thumb_func_end s95_update_money
 
 	thumb_func_start sub_809B578
-sub_809B578: ; 809B578
+sub_809B578: @ 809B578
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -275731,7 +275731,7 @@ sub_809B578: ; 809B578
 	thumb_func_end sub_809B578
 
 	thumb_func_start sC1_hide_coins
-sC1_hide_coins: ; 809B5A0
+sC1_hide_coins: @ 809B5A0
 	push {lr}
 	ldr r1, [r0, 0x8]
 	adds r1, 0x2
@@ -275743,7 +275743,7 @@ sC1_hide_coins: ; 809B5A0
 	thumb_func_end sC1_hide_coins
 
 	thumb_func_start sC2_update_coins
-sC2_update_coins: ; 809B5B4
+sC2_update_coins: @ 809B5B4
 	push {lr}
 	ldr r1, [r0, 0x8]
 	adds r1, 0x2
@@ -275758,7 +275758,7 @@ sC2_update_coins: ; 809B5B4
 	thumb_func_end sC2_update_coins
 
 	thumb_func_start s5C_trainer_battle_configure_and_start
-s5C_trainer_battle_configure_and_start: ; 809B5D0
+s5C_trainer_battle_configure_and_start: @ 809B5D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -275771,7 +275771,7 @@ s5C_trainer_battle_configure_and_start: ; 809B5D0
 	thumb_func_end s5C_trainer_battle_configure_and_start
 
 	thumb_func_start sub_809B5E4
-sub_809B5E4: ; 809B5E4
+sub_809B5E4: @ 809B5E4
 	push {lr}
 	bl sub_80B17E0
 	movs r0, 0x1
@@ -275780,7 +275780,7 @@ sub_809B5E4: ; 809B5E4
 	thumb_func_end sub_809B5E4
 
 	thumb_func_start sub_809B5F0
-sub_809B5F0: ; 809B5F0
+sub_809B5F0: @ 809B5F0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B1AF8
@@ -275792,8 +275792,8 @@ sub_809B5F0: ; 809B5F0
 	thumb_func_end sub_809B5F0
 
 	thumb_func_start sub_809B604
-; bool8 sub_809B604(struct script_env *env)
-sub_809B604: ; 809B604
+@ bool8 sub_809B604(struct script_env *env)
+sub_809B604: @ 809B604
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B1B10
@@ -275805,7 +275805,7 @@ sub_809B604: ; 809B604
 	thumb_func_end sub_809B604
 
 	thumb_func_start s60_check_trainer_flag
-s60_check_trainer_flag: ; 809B618
+s60_check_trainer_flag: @ 809B618
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -275823,7 +275823,7 @@ s60_check_trainer_flag: ; 809B618
 	thumb_func_end s60_check_trainer_flag
 
 	thumb_func_start s61_set_trainer_flag
-s61_set_trainer_flag: ; 809B63C
+s61_set_trainer_flag: @ 809B63C
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275838,7 +275838,7 @@ s61_set_trainer_flag: ; 809B63C
 	thumb_func_end s61_set_trainer_flag
 
 	thumb_func_start s62_unset_trainer_flag
-s62_unset_trainer_flag: ; 809B658
+s62_unset_trainer_flag: @ 809B658
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275853,7 +275853,7 @@ s62_unset_trainer_flag: ; 809B658
 	thumb_func_end s62_unset_trainer_flag
 
 	thumb_func_start sB6_load_battle
-sB6_load_battle: ; 809B674
+sB6_load_battle: @ 809B674
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -275879,7 +275879,7 @@ sB6_load_battle: ; 809B674
 	thumb_func_end sB6_load_battle
 
 	thumb_func_start sub_809B6A8
-sub_809B6A8: ; 809B6A8
+sub_809B6A8: @ 809B6A8
 	push {lr}
 	bl sub_80B08A8
 	bl script_env_2_set_ctx_paused
@@ -275889,7 +275889,7 @@ sub_809B6A8: ; 809B6A8
 	thumb_func_end sub_809B6A8
 
 	thumb_func_start s86_pokemart
-s86_pokemart: ; 809B6B8
+s86_pokemart: @ 809B6B8
 	push {lr}
 	bl script_read_word
 	bl CreatePokemartMenu
@@ -275900,7 +275900,7 @@ s86_pokemart: ; 809B6B8
 	thumb_func_end s86_pokemart
 
 	thumb_func_start s87_pokemartdecor
-s87_pokemartdecor: ; 809B6CC
+s87_pokemartdecor: @ 809B6CC
 	push {lr}
 	bl script_read_word
 	bl CreateDecorationShop1Menu
@@ -275911,7 +275911,7 @@ s87_pokemartdecor: ; 809B6CC
 	thumb_func_end s87_pokemartdecor
 
 	thumb_func_start s88_pokemartbp
-s88_pokemartbp: ; 809B6E0
+s88_pokemartbp: @ 809B6E0
 	push {lr}
 	bl script_read_word
 	bl CreateDecorationShop2Menu
@@ -275922,7 +275922,7 @@ s88_pokemartbp: ; 809B6E0
 	thumb_func_end s88_pokemartbp
 
 	thumb_func_start s89_open_casino_game1
-s89_open_casino_game1: ; 809B6F4
+s89_open_casino_game1: @ 809B6F4
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275940,8 +275940,8 @@ s89_open_casino_game1: ; 809B6F4
 	thumb_func_end s89_open_casino_game1
 
 	thumb_func_start berry_script_cmd
-; bool8 berry_script_cmd(struct script_env *env)
-berry_script_cmd: ; 809B71C
+@ bool8 berry_script_cmd(struct script_env *env)
+berry_script_cmd: @ 809B71C
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -275975,7 +275975,7 @@ _0809B750:
 	thumb_func_end berry_script_cmd
 
 	thumb_func_start sub_809B758
-sub_809B758: ; 809B758
+sub_809B758: @ 809B758
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -275996,7 +275996,7 @@ sub_809B758: ; 809B758
 	thumb_func_end sub_809B758
 
 	thumb_func_start sub_809B784
-sub_809B784: ; 809B784
+sub_809B784: @ 809B784
 	push {lr}
 	bl sub_81B9404
 	bl script_env_2_set_ctx_paused
@@ -276006,7 +276006,7 @@ sub_809B784: ; 809B784
 	thumb_func_end sub_809B784
 
 	thumb_func_start sub_809B794
-sub_809B794: ; 809B794
+sub_809B794: @ 809B794
 	push {lr}
 	bl sub_80F840C
 	bl script_env_2_set_ctx_paused
@@ -276016,7 +276016,7 @@ sub_809B794: ; 809B794
 	thumb_func_end sub_809B794
 
 	thumb_func_start sub_809B7A4
-sub_809B7A4: ; 809B7A4
+sub_809B7A4: @ 809B7A4
 	push {lr}
 	bl sub_80F8484
 	bl script_env_2_set_ctx_paused
@@ -276026,7 +276026,7 @@ sub_809B7A4: ; 809B7A4
 	thumb_func_end sub_809B7A4
 
 	thumb_func_start sub_809B7B4
-sub_809B7B4: ; 809B7B4
+sub_809B7B4: @ 809B7B4
 	push {lr}
 	ldr r0, =0x02039f2c
 	ldrb r0, [r0]
@@ -276039,7 +276039,7 @@ sub_809B7B4: ; 809B7B4
 	thumb_func_end sub_809B7B4
 
 	thumb_func_start s9C_execute_HM
-s9C_execute_HM: ; 809B7CC
+s9C_execute_HM: @ 809B7CC
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276059,7 +276059,7 @@ s9C_execute_HM: ; 809B7CC
 	thumb_func_end s9C_execute_HM
 
 	thumb_func_start s9D_set_HM_animation_data
-s9D_set_HM_animation_data: ; 809B7F4
+s9D_set_HM_animation_data: @ 809B7F4
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -276083,7 +276083,7 @@ s9D_set_HM_animation_data: ; 809B7F4
 	thumb_func_end s9D_set_HM_animation_data
 
 	thumb_func_start sub_809B824
-sub_809B824: ; 809B824
+sub_809B824: @ 809B824
 	push {lr}
 	ldr r0, =0x020375d0
 	ldrb r0, [r0]
@@ -276102,7 +276102,7 @@ _0809B83E:
 	thumb_func_end sub_809B824
 
 	thumb_func_start s9E_checkarray_HM_animation
-s9E_checkarray_HM_animation: ; 809B844
+s9E_checkarray_HM_animation: @ 809B844
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -276122,7 +276122,7 @@ s9E_checkarray_HM_animation: ; 809B844
 	thumb_func_end s9E_checkarray_HM_animation
 
 	thumb_func_start s9F_changeposition_fly
-s9F_changeposition_fly: ; 809B870
+s9F_changeposition_fly: @ 809B870
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276137,7 +276137,7 @@ s9F_changeposition_fly: ; 809B870
 	thumb_func_end s9F_changeposition_fly
 
 	thumb_func_start sA0_check_gender
-sA0_check_gender: ; 809B88C
+sA0_check_gender: @ 809B88C
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -276149,7 +276149,7 @@ sA0_check_gender: ; 809B88C
 	thumb_func_end sA0_check_gender
 
 	thumb_func_start sA1_play_cry
-sA1_play_cry: ; 809B8A4
+sA1_play_cry: @ 809B8A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -276176,7 +276176,7 @@ sA1_play_cry: ; 809B8A4
 	thumb_func_end sA1_play_cry
 
 	thumb_func_start sub_809B8DC
-sub_809B8DC: ; 809B8DC
+sub_809B8DC: @ 809B8DC
 	push {lr}
 	ldr r1, =sub_80A3678
 	bl script_setup_asm_script
@@ -276187,7 +276187,7 @@ sub_809B8DC: ; 809B8DC
 	thumb_func_end sub_809B8DC
 
 	thumb_func_start sA2_setmaptile
-sA2_setmaptile: ; 809B8F0
+sA2_setmaptile: @ 809B8F0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -276246,7 +276246,7 @@ _0809B966:
 	thumb_func_end sA2_setmaptile
 
 	thumb_func_start sAC_open_door
-sAC_open_door: ; 809B970
+sAC_open_door: @ 809B970
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl script_read_halfword
@@ -276286,7 +276286,7 @@ sAC_open_door: ; 809B970
 	thumb_func_end sAC_open_door
 
 	thumb_func_start sub_809B9C8
-sub_809B9C8: ; 809B9C8
+sub_809B9C8: @ 809B9C8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -276319,7 +276319,7 @@ sub_809B9C8: ; 809B9C8
 	thumb_func_end sub_809B9C8
 
 	thumb_func_start sub_809BA0C
-sub_809BA0C: ; 809BA0C
+sub_809BA0C: @ 809BA0C
 	push {lr}
 	bl sub_808A91C
 	lsls r0, 24
@@ -276335,7 +276335,7 @@ _0809BA1E:
 	thumb_func_end sub_809BA0C
 
 	thumb_func_start sub_809BA24
-sub_809BA24: ; 809BA24
+sub_809BA24: @ 809BA24
 	push {lr}
 	ldr r1, =sub_809BA0C
 	bl script_setup_asm_script
@@ -276346,7 +276346,7 @@ sub_809BA24: ; 809BA24
 	thumb_func_end sub_809BA24
 
 	thumb_func_start sub_809BA38
-sub_809BA38: ; 809BA38
+sub_809BA38: @ 809BA38
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -276379,7 +276379,7 @@ sub_809BA38: ; 809BA38
 	thumb_func_end sub_809BA38
 
 	thumb_func_start sub_809BA7C
-sub_809BA7C: ; 809BA7C
+sub_809BA7C: @ 809BA7C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl script_read_halfword
@@ -276412,7 +276412,7 @@ sub_809BA7C: ; 809BA7C
 	thumb_func_end sub_809BA7C
 
 	thumb_func_start sub_809BAC0
-sub_809BAC0: ; 809BAC0
+sub_809BAC0: @ 809BAC0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -276440,13 +276440,13 @@ sub_809BAC0: ; 809BAC0
 	thumb_func_end sub_809BAC0
 
 	thumb_func_start sub_809BAFC
-sub_809BAFC: ; 809BAFC
+sub_809BAFC: @ 809BAFC
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_809BAFC
 
 	thumb_func_start sB3_get_coin_amount
-sB3_get_coin_amount: ; 809BB00
+sB3_get_coin_amount: @ 809BB00
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276462,7 +276462,7 @@ sB3_get_coin_amount: ; 809BB00
 	thumb_func_end sB3_get_coin_amount
 
 	thumb_func_start sub_809BB20
-sub_809BB20: ; 809BB20
+sub_809BB20: @ 809BB20
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276491,7 +276491,7 @@ _0809BB4C:
 	thumb_func_end sub_809BB20
 
 	thumb_func_start sub_809BB58
-sub_809BB58: ; 809BB58
+sub_809BB58: @ 809BB58
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276520,7 +276520,7 @@ _0809BB84:
 	thumb_func_end sub_809BB58
 
 	thumb_func_start sub_809BB90
-sub_809BB90: ; 809BB90
+sub_809BB90: @ 809BB90
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276538,7 +276538,7 @@ sub_809BB90: ; 809BB90
 	thumb_func_end sub_809BB90
 
 	thumb_func_start sub_809BBB4
-sub_809BBB4: ; 809BBB4
+sub_809BBB4: @ 809BBB4
 	push {lr}
 	bl sub_81A8AF8
 	movs r0, 0
@@ -276547,7 +276547,7 @@ sub_809BBB4: ; 809BBB4
 	thumb_func_end sub_809BBB4
 
 	thumb_func_start ScrCmd_MossdeepGymSwitch
-ScrCmd_MossdeepGymSwitch: ; 809BBC0
+ScrCmd_MossdeepGymSwitch: @ 809BBC0
 	push {lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276562,7 +276562,7 @@ ScrCmd_MossdeepGymSwitch: ; 809BBC0
 	thumb_func_end ScrCmd_MossdeepGymSwitch
 
 	thumb_func_start sub_809BBDC
-sub_809BBDC: ; 809BBDC
+sub_809BBDC: @ 809BBDC
 	push {lr}
 	bl sub_81A895C
 	movs r0, 0
@@ -276571,7 +276571,7 @@ sub_809BBDC: ; 809BBDC
 	thumb_func_end sub_809BBDC
 
 	thumb_func_start sub_809BBE8
-sub_809BBE8: ; 809BBE8
+sub_809BBE8: @ 809BBE8
 	push {lr}
 	bl sub_80B47BC
 	ldr r1, =0x03005df0
@@ -276583,7 +276583,7 @@ sub_809BBE8: ; 809BBE8
 	thumb_func_end sub_809BBE8
 
 	thumb_func_start sub_809BBFC
-sub_809BBFC: ; 809BBFC
+sub_809BBFC: @ 809BBFC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl is_c1_link_related_active
@@ -276617,7 +276617,7 @@ _0809BC30:
 	thumb_func_end sub_809BBFC
 
 	thumb_func_start sCD_set_obedient_bit
-sCD_set_obedient_bit: ; 809BC44
+sCD_set_obedient_bit: @ 809BC44
 	push {lr}
 	sub sp, 0x4
 	movs r2, 0x1
@@ -276644,7 +276644,7 @@ sCD_set_obedient_bit: ; 809BC44
 	thumb_func_end sCD_set_obedient_bit
 
 	thumb_func_start sCE_check_obedient_bit
-sCE_check_obedient_bit: ; 809BC7C
+sCE_check_obedient_bit: @ 809BC7C
 	push {r4,lr}
 	bl script_read_halfword
 	lsls r0, 16
@@ -276669,7 +276669,7 @@ sCE_check_obedient_bit: ; 809BC7C
 	thumb_func_end sCE_check_obedient_bit
 
 	thumb_func_start sCF_execute_RAM_script_DMA
-sCF_execute_RAM_script_DMA: ; 809BCB4
+sCF_execute_RAM_script_DMA: @ 809BCB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8099244
@@ -276691,7 +276691,7 @@ _0809BCD0:
 	thumb_func_end sCF_execute_RAM_script_DMA
 
 	thumb_func_start sD1_warp_v5
-sD1_warp_v5: ; 809BCDC
+sD1_warp_v5: @ 809BCDC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -276759,7 +276759,7 @@ sD1_warp_v5: ; 809BCDC
 	thumb_func_end sD1_warp_v5
 
 	thumb_func_start sub_809BD70
-sub_809BD70: ; 809BD70
+sub_809BD70: @ 809BD70
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -276794,7 +276794,7 @@ _0809BDA6:
 	thumb_func_end sub_809BD70
 
 	thumb_func_start sub_809BDB4
-sub_809BDB4: ; 809BDB4
+sub_809BDB4: @ 809BDB4
 	push {r4,lr}
 	ldr r4, =0x03000f30
 	ldrb r0, [r4]
@@ -276809,7 +276809,7 @@ sub_809BDB4: ; 809BDB4
 	thumb_func_end sub_809BDB4
 
 	thumb_func_start sub_809BDD0
-sub_809BDD0: ; 809BDD0
+sub_809BDD0: @ 809BDD0
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -276837,7 +276837,7 @@ sub_809BDD0: ; 809BDD0
 	thumb_func_end sub_809BDD0
 
 	thumb_func_start sub_809BE0C
-sub_809BE0C: ; 809BE0C
+sub_809BE0C: @ 809BE0C
 	push {r4,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1]
@@ -276865,7 +276865,7 @@ sub_809BE0C: ; 809BE0C
 	thumb_func_end sub_809BE0C
 
 	thumb_func_start sub_809BE48
-sub_809BE48: ; 809BE48
+sub_809BE48: @ 809BE48
 	ldr r1, =0x020375ca
 	strh r0, [r1]
 	bx lr
@@ -276873,7 +276873,7 @@ sub_809BE48: ; 809BE48
 	thumb_func_end sub_809BE48
 
 	thumb_func_start sub_809BE54
-sub_809BE54: ; 809BE54
+sub_809BE54: @ 809BE54
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -276937,7 +276937,7 @@ sub_809BE54: ; 809BE54
 	thumb_func_end sub_809BE54
 
 	thumb_func_start sub_809BEDC
-sub_809BEDC: ; 809BEDC
+sub_809BEDC: @ 809BEDC
 	push {r4,r5,lr}
 	movs r1, 0x2
 	negs r1, r1
@@ -276963,8 +276963,8 @@ sub_809BEDC: ; 809BEDC
 	thumb_func_end sub_809BEDC
 
 	thumb_func_start process_overworld_input
-; void process_overworld_input(overworld_input_data *input_data, char buttons_new, char buttons_held)
-process_overworld_input: ; 809BF08
+@ void process_overworld_input(overworld_input_data *input_data, char buttons_new, char buttons_held)
+process_overworld_input: @ 809BF08
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -277110,8 +277110,8 @@ _0809C006:
 	thumb_func_end process_overworld_input
 
 	thumb_func_start sub_809C014
-; int sub_809C014(overworld_input_data *input_data)
-sub_809C014: ; 809C014
+@ int sub_809C014(overworld_input_data *input_data)
+sub_809C014: @ 809C014
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -277282,7 +277282,7 @@ _0809C172:
 	thumb_func_end sub_809C014
 
 	thumb_func_start player_get_pos_to_and_height
-player_get_pos_to_and_height: ; 809C17C
+player_get_pos_to_and_height: @ 809C17C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r1, r4, 0x2
@@ -277295,7 +277295,7 @@ player_get_pos_to_and_height: ; 809C17C
 	thumb_func_end player_get_pos_to_and_height
 
 	thumb_func_start player_get_next_pos_and_height
-player_get_next_pos_and_height: ; 809C194
+player_get_next_pos_and_height: @ 809C194
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -277326,7 +277326,7 @@ _0809C1C6:
 	thumb_func_end player_get_next_pos_and_height
 
 	thumb_func_start cur_mapdata_block_role_at_player_pos
-cur_mapdata_block_role_at_player_pos: ; 809C1D0
+cur_mapdata_block_role_at_player_pos: @ 809C1D0
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -277349,7 +277349,7 @@ cur_mapdata_block_role_at_player_pos: ; 809C1D0
 	thumb_func_end cur_mapdata_block_role_at_player_pos
 
 	thumb_func_start sub_809C1FC
-sub_809C1FC: ; 809C1FC
+sub_809C1FC: @ 809C1FC
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -277397,7 +277397,7 @@ _0809C24C:
 	thumb_func_end sub_809C1FC
 
 	thumb_func_start TryGetScriptOnPressingA
-TryGetScriptOnPressingA: ; 809C270
+TryGetScriptOnPressingA: @ 809C270
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -277441,7 +277441,7 @@ _0809C2BC:
 	thumb_func_end TryGetScriptOnPressingA
 
 	thumb_func_start sub_809C2C8
-sub_809C2C8: ; 809C2C8
+sub_809C2C8: @ 809C2C8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r2, 24
@@ -277531,7 +277531,7 @@ _0809C36E:
 	thumb_func_end sub_809C2C8
 
 	thumb_func_start TryGetMapObjectScript
-TryGetMapObjectScript: ; 809C384
+TryGetMapObjectScript: @ 809C384
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -277630,8 +277630,8 @@ _0809C44E:
 	thumb_func_end TryGetMapObjectScript
 
 	thumb_func_start TryGetInvisibleMapObjectScript
-; signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
-TryGetInvisibleMapObjectScript: ; 809C458
+@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
+TryGetInvisibleMapObjectScript: @ 809C458
 	push {r4,r5,lr}
 	lsls r2, 24
 	lsrs r5, r2, 24
@@ -277733,7 +277733,7 @@ _0809C532:
 	thumb_func_end TryGetInvisibleMapObjectScript
 
 	thumb_func_start TryGetMetatileBehaviorScript
-TryGetMetatileBehaviorScript: ; 809C538
+TryGetMetatileBehaviorScript: @ 809C538
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -278036,7 +278036,7 @@ _0809C7E4:
 	thumb_func_end TryGetMetatileBehaviorScript
 
 	thumb_func_start TryGetFieldMoveScript
-TryGetFieldMoveScript: ; 809C7EC
+TryGetFieldMoveScript: @ 809C7EC
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -278093,7 +278093,7 @@ _0809C862:
 	thumb_func_end TryGetFieldMoveScript
 
 	thumb_func_start sub_809C868
-sub_809C868: ; 809C868
+sub_809C868: @ 809C868
 	push {lr}
 	ldr r0, =0x0000086d
 	bl FlagGet
@@ -278118,7 +278118,7 @@ _0809C896:
 	thumb_func_end sub_809C868
 
 	thumb_func_start sub_809C89C
-sub_809C89C: ; 809C89C
+sub_809C89C: @ 809C89C
 	push {lr}
 	ldr r0, =0x0000086d
 	bl FlagGet
@@ -278147,7 +278147,7 @@ _0809C8D6:
 	thumb_func_end sub_809C89C
 
 	thumb_func_start sub_809C8DC
-sub_809C8DC: ; 809C8DC
+sub_809C8DC: @ 809C8DC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -278193,7 +278193,7 @@ _0809C930:
 	thumb_func_end sub_809C8DC
 
 	thumb_func_start mapheader_trigger_activate_at__run_now
-mapheader_trigger_activate_at__run_now: ; 809C938
+mapheader_trigger_activate_at__run_now: @ 809C938
 	push {r4,lr}
 	ldr r4, =0x02037318
 	ldrh r1, [r0]
@@ -278222,7 +278222,7 @@ _0809C966:
 	thumb_func_end mapheader_trigger_activate_at__run_now
 
 	thumb_func_start sub_809C96C
-sub_809C96C: ; 809C96C
+sub_809C96C: @ 809C96C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -278287,7 +278287,7 @@ _0809C9EA:
 	thumb_func_end sub_809C96C
 
 	thumb_func_start per_step_scripts
-per_step_scripts: ; 809C9F4
+per_step_scripts: @ 809C9F4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -278421,7 +278421,7 @@ _0809CB2A:
 	thumb_func_end per_step_scripts
 
 	thumb_func_start sub_809CB30
-sub_809CB30: ; 809CB30
+sub_809CB30: @ 809CB30
 	push {lr}
 	ldr r0, =0x0000402a
 	movs r1, 0
@@ -278432,7 +278432,7 @@ sub_809CB30: ; 809CB30
 	thumb_func_end sub_809CB30
 
 	thumb_func_start happiness_algorithm_step
-happiness_algorithm_step: ; 809CB44
+happiness_algorithm_step: @ 809CB44
 	push {r4,r5,lr}
 	ldr r0, =0x0000402a
 	bl GetVarPointer
@@ -278463,7 +278463,7 @@ _0809CB72:
 	thumb_func_end happiness_algorithm_step
 
 	thumb_func_start overworld_poison_timer_set
-overworld_poison_timer_set: ; 809CB80
+overworld_poison_timer_set: @ 809CB80
 	push {lr}
 	ldr r0, =0x0000402b
 	movs r1, 0
@@ -278474,7 +278474,7 @@ overworld_poison_timer_set: ; 809CB80
 	thumb_func_end overworld_poison_timer_set
 
 	thumb_func_start overworld_poison_step
-overworld_poison_step: ; 809CB94
+overworld_poison_step: @ 809CB94
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r0, [r0, 0x17]
@@ -278509,7 +278509,7 @@ _0809CBD6:
 	thumb_func_end overworld_poison_step
 
 	thumb_func_start prev_quest_postbuffer_cursor_backup_reset
-prev_quest_postbuffer_cursor_backup_reset: ; 809CBDC
+prev_quest_postbuffer_cursor_backup_reset: @ 809CBDC
 	ldr r1, =0x020375d4
 	movs r0, 0
 	strb r0, [r1]
@@ -278518,7 +278518,7 @@ prev_quest_postbuffer_cursor_backup_reset: ; 809CBDC
 	thumb_func_end prev_quest_postbuffer_cursor_backup_reset
 
 	thumb_func_start is_it_battle_time_3
-is_it_battle_time_3: ; 809CBE8
+is_it_battle_time_3: @ 809CBE8
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -278559,7 +278559,7 @@ _0809CC30:
 	thumb_func_end is_it_battle_time_3
 
 	thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
-mapheader_run_first_tag2_script_list_match_conditionally: ; 809CC38
+mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -278609,7 +278609,7 @@ _0809CC92:
 	thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally
 
 	thumb_func_start sub_809CC9C
-sub_809CC9C: ; 809CC9C
+sub_809CC9C: @ 809CC9C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -278723,7 +278723,7 @@ _0809CD8C:
 	thumb_func_end sub_809CC9C
 
 	thumb_func_start is_warp_tile
-is_warp_tile: ; 809CD94
+is_warp_tile: @ 809CD94
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -278798,7 +278798,7 @@ _0809CE2C:
 	thumb_func_end is_warp_tile
 
 	thumb_func_start is_non_stair_warp_tile
-is_non_stair_warp_tile: ; 809CE34
+is_non_stair_warp_tile: @ 809CE34
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -278849,7 +278849,7 @@ _0809CE86:
 	thumb_func_end is_non_stair_warp_tile
 
 	thumb_func_start map_warp_check_packed
-map_warp_check_packed: ; 809CE8C
+map_warp_check_packed: @ 809CE8C
 	push {lr}
 	adds r3, r1, 0
 	ldrh r1, [r3]
@@ -278869,7 +278869,7 @@ map_warp_check_packed: ; 809CE8C
 	thumb_func_end map_warp_check_packed
 
 	thumb_func_start sub_809CEB0
-sub_809CEB0: ; 809CEB0
+sub_809CEB0: @ 809CEB0
 	push {r4-r7,lr}
 	adds r7, r2, 0
 	lsls r1, 24
@@ -278966,7 +278966,7 @@ _0809CF6E:
 	thumb_func_end sub_809CEB0
 
 	thumb_func_start map_warp_consider_2_to_inside
-map_warp_consider_2_to_inside: ; 809CF78
+map_warp_consider_2_to_inside: @ 809CF78
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -279032,7 +279032,7 @@ _0809CFFE:
 	thumb_func_end map_warp_consider_2_to_inside
 
 	thumb_func_start map_warp_check
-map_warp_check: ; 809D004
+map_warp_check: @ 809D004
 	push {r4-r6,lr}
 	lsls r1, 16
 	lsrs r6, r1, 16
@@ -279077,7 +279077,7 @@ _0809D046:
 	thumb_func_end map_warp_check
 
 	thumb_func_start trigger_activate
-trigger_activate: ; 809D04C
+trigger_activate: @ 809D04C
 	push {r4,lr}
 	adds r4, r0, 0
 	cmp r4, 0
@@ -279113,7 +279113,7 @@ _0809D084:
 	thumb_func_end trigger_activate
 
 	thumb_func_start mapheader_trigger_activate_at
-mapheader_trigger_activate_at: ; 809D08C
+mapheader_trigger_activate_at: @ 809D08C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -279172,7 +279172,7 @@ _0809D0E4:
 	thumb_func_end mapheader_trigger_activate_at
 
 	thumb_func_start sub_809D0F4
-sub_809D0F4: ; 809D0F4
+sub_809D0F4: @ 809D0F4
 	push {r4,lr}
 	ldr r4, =0x02037318
 	ldrh r1, [r0]
@@ -279193,8 +279193,8 @@ sub_809D0F4: ; 809D0F4
 	thumb_func_end sub_809D0F4
 
 	thumb_func_start FindInvisibleMapObjectByPosition
-; int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
-FindInvisibleMapObjectByPosition: ; 809D11C
+@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
+FindInvisibleMapObjectByPosition: @ 809D11C
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r7, r1, 16
@@ -279242,7 +279242,7 @@ _0809D164:
 	thumb_func_end FindInvisibleMapObjectByPosition
 
 	thumb_func_start dive_warp
-dive_warp: ; 809D16C
+dive_warp: @ 809D16C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -279304,7 +279304,7 @@ _0809D1E2:
 	thumb_func_end dive_warp
 
 	thumb_func_start sub_809D1E8
-sub_809D1E8: ; 809D1E8
+sub_809D1E8: @ 809D1E8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -279379,8 +279379,8 @@ _0809D276:
 	thumb_func_end sub_809D1E8
 
 	thumb_func_start GetFieldObjectScriptPointerForComparison
-; u8 *GetFieldObjectScriptPointerForComparison()
-GetFieldObjectScriptPointerForComparison: ; 809D280
+@ u8 *GetFieldObjectScriptPointerForComparison()
+GetFieldObjectScriptPointerForComparison: @ 809D280
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl player_get_direction_upper_nybble
@@ -279409,7 +279409,7 @@ GetFieldObjectScriptPointerForComparison: ; 809D280
 	thumb_func_end GetFieldObjectScriptPointerForComparison
 
 	thumb_func_start sub_809D2BC
-sub_809D2BC: ; 809D2BC
+sub_809D2BC: @ 809D2BC
 	push {r4,lr}
 	sub sp, 0x8
 	bl player_get_direction_upper_nybble
@@ -279441,7 +279441,7 @@ sub_809D2BC: ; 809D2BC
 	thumb_func_end sub_809D2BC
 
 	thumb_func_start sub_809D300
-sub_809D300: ; 809D300
+sub_809D300: @ 809D300
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -279469,7 +279469,7 @@ sub_809D300: ; 809D300
 	thumb_func_end sub_809D300
 
 	thumb_func_start sub_809D344
-sub_809D344: ; 809D344
+sub_809D344: @ 809D344
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -279499,7 +279499,7 @@ sub_809D344: ; 809D344
 	thumb_func_end sub_809D344
 
 	thumb_func_start sub_809D3A0
-sub_809D3A0: ; 809D3A0
+sub_809D3A0: @ 809D3A0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -279514,7 +279514,7 @@ sub_809D3A0: ; 809D3A0
 	thumb_func_end sub_809D3A0
 
 	thumb_func_start sub_809D3C0
-sub_809D3C0: ; 809D3C0
+sub_809D3C0: @ 809D3C0
 	push {lr}
 	ldr r0, =0x00004046
 	bl GetVarPointer
@@ -279531,7 +279531,7 @@ sub_809D3C0: ; 809D3C0
 	thumb_func_end sub_809D3C0
 
 	thumb_func_start sub_809D3E8
-sub_809D3E8: ; 809D3E8
+sub_809D3E8: @ 809D3E8
 	push {r4,r5,lr}
 	ldr r0, =0x00004046
 	bl GetVarPointer
@@ -279558,7 +279558,7 @@ sub_809D3E8: ; 809D3E8
 	thumb_func_end sub_809D3E8
 
 	thumb_func_start sub_809D42C
-sub_809D42C: ; 809D42C
+sub_809D42C: @ 809D42C
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -279587,7 +279587,7 @@ _0809D46A:
 	thumb_func_end sub_809D42C
 
 	thumb_func_start sub_809D470
-sub_809D470: ; 809D470
+sub_809D470: @ 809D470
 	push {lr}
 	ldr r0, =0x000008ac
 	bl FlagReset
@@ -279597,7 +279597,7 @@ sub_809D470: ; 809D470
 	thumb_func_end sub_809D470
 
 	thumb_func_start sub_809D480
-sub_809D480: ; 809D480
+sub_809D480: @ 809D480
 	push {lr}
 	ldr r0, =0x000008ac
 	bl FlagSet
@@ -279607,7 +279607,7 @@ sub_809D480: ; 809D480
 	thumb_func_end sub_809D480
 
 	thumb_func_start sub_809D490
-sub_809D490: ; 809D490
+sub_809D490: @ 809D490
 	push {lr}
 	ldr r0, =0x000008ac
 	bl FlagGet
@@ -279619,7 +279619,7 @@ sub_809D490: ; 809D490
 	thumb_func_end sub_809D490
 
 	thumb_func_start sub_809D4A4
-sub_809D4A4: ; 809D4A4
+sub_809D4A4: @ 809D4A4
 	push {lr}
 	ldr r0, =0x000008db
 	bl FlagReset
@@ -279629,7 +279629,7 @@ sub_809D4A4: ; 809D4A4
 	thumb_func_end sub_809D4A4
 
 	thumb_func_start sub_809D4B4
-sub_809D4B4: ; 809D4B4
+sub_809D4B4: @ 809D4B4
 	push {lr}
 	ldr r0, =0x000008db
 	bl FlagSet
@@ -279639,7 +279639,7 @@ sub_809D4B4: ; 809D4B4
 	thumb_func_end sub_809D4B4
 
 	thumb_func_start sub_809D4C4
-sub_809D4C4: ; 809D4C4
+sub_809D4C4: @ 809D4C4
 	push {lr}
 	ldr r0, =0x000008db
 	bl FlagGet
@@ -279651,7 +279651,7 @@ sub_809D4C4: ; 809D4C4
 	thumb_func_end sub_809D4C4
 
 	thumb_func_start sub_809D4D8
-sub_809D4D8: ; 809D4D8
+sub_809D4D8: @ 809D4D8
 	push {lr}
 	movs r0, 0xF2
 	lsls r0, 1
@@ -279699,7 +279699,7 @@ sub_809D4D8: ; 809D4D8
 	thumb_func_end sub_809D4D8
 
 	thumb_func_start sub_809D570
-sub_809D570: ; 809D570
+sub_809D570: @ 809D570
 	push {lr}
 	ldr r0, =0x000040dd
 	movs r1, 0
@@ -279731,7 +279731,7 @@ sub_809D570: ; 809D570
 	thumb_func_end sub_809D570
 
 	thumb_func_start sub_809D5D8
-sub_809D5D8: ; 809D5D8
+sub_809D5D8: @ 809D5D8
 	push {lr}
 	ldr r0, =0x0000402c
 	movs r1, 0
@@ -279744,7 +279744,7 @@ sub_809D5D8: ; 809D5D8
 	thumb_func_end sub_809D5D8
 
 	thumb_func_start sub_809D5F4
-sub_809D5F4: ; 809D5F4
+sub_809D5F4: @ 809D5F4
 	push {lr}
 	ldr r0, =0x0000402c
 	movs r1, 0x92
@@ -279758,7 +279758,7 @@ sub_809D5F4: ; 809D5F4
 	thumb_func_end sub_809D5F4
 
 	thumb_func_start sub_809D614
-sub_809D614: ; 809D614
+sub_809D614: @ 809D614
 	push {lr}
 	ldr r0, =0x000008c2
 	bl FlagGet
@@ -279783,8 +279783,8 @@ _0809D642:
 	thumb_func_end sub_809D614
 
 	thumb_func_start GetVarPointer
-; u16 *GetVarPointer(u16 varId)
-GetVarPointer: ; 809D648
+@ u16 *GetVarPointer(u16 varId)
+GetVarPointer: @ 809D648
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -279821,8 +279821,8 @@ _0809D688:
 	thumb_func_end GetVarPointer
 
 	thumb_func_start VarGet
-; u16 VarGet(u16 varId)
-VarGet: ; 809D694
+@ u16 VarGet(u16 varId)
+VarGet: @ 809D694
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -279841,8 +279841,8 @@ _0809D6AA:
 	thumb_func_end VarGet
 
 	thumb_func_start VarSet
-; bool8 VarSet(u16 varId, u16 value)
-VarSet: ; 809D6B0
+@ bool8 VarSet(u16 varId, u16 value)
+VarSet: @ 809D6B0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -279863,8 +279863,8 @@ _0809D6CA:
 	thumb_func_end VarSet
 
 	thumb_func_start VarGetFieldObjectGraphicsId
-; u8 VarGetFieldObjectGraphicsId(u8 index)
-VarGetFieldObjectGraphicsId: ; 809D6D0
+@ u8 VarGetFieldObjectGraphicsId(u8 index)
+VarGetFieldObjectGraphicsId: @ 809D6D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 8
@@ -279880,8 +279880,8 @@ VarGetFieldObjectGraphicsId: ; 809D6D0
 	thumb_func_end VarGetFieldObjectGraphicsId
 
 	thumb_func_start GetFlagPointer
-; u8 *GetFlagPointer(u16 flagId)
-GetFlagPointer: ; 809D6EC
+@ u8 *GetFlagPointer(u16 flagId)
+GetFlagPointer: @ 809D6EC
 	push {lr}
 	lsls r1, r0, 16
 	lsrs r2, r1, 16
@@ -279920,8 +279920,8 @@ _0809D72E:
 	thumb_func_end GetFlagPointer
 
 	thumb_func_start FlagSet
-; bool8 FlagSet(u16 flagId)
-FlagSet: ; 809D740
+@ bool8 FlagSet(u16 flagId)
+FlagSet: @ 809D740
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -279945,8 +279945,8 @@ _0809D760:
 	thumb_func_end FlagSet
 
 	thumb_func_start FlagReset
-; bool8 FlagReset(u16 flagId)
-FlagReset: ; 809D768
+@ bool8 FlagReset(u16 flagId)
+FlagReset: @ 809D768
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -279970,8 +279970,8 @@ _0809D788:
 	thumb_func_end FlagReset
 
 	thumb_func_start FlagGet
-; bool8 FlagGet(u16 flagId)
-FlagGet: ; 809D790
+@ bool8 FlagGet(u16 flagId)
+FlagGet: @ 809D790
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -279998,7 +279998,7 @@ _0809D7B6:
 	thumb_func_end FlagGet
 
 	thumb_func_start sub_809D7BC
-sub_809D7BC: ; 809D7BC
+sub_809D7BC: @ 809D7BC
 	push {lr}
 	movs r0, 0x1
 	bl sub_80AEDF0
@@ -280007,7 +280007,7 @@ sub_809D7BC: ; 809D7BC
 	thumb_func_end sub_809D7BC
 
 	thumb_func_start sub_809D7C8
-sub_809D7C8: ; 809D7C8
+sub_809D7C8: @ 809D7C8
 	push {lr}
 	movs r0, 0x2
 	bl sub_80AEDF0
@@ -280016,7 +280016,7 @@ sub_809D7C8: ; 809D7C8
 	thumb_func_end sub_809D7C8
 
 	thumb_func_start sub_809D7D4
-sub_809D7D4: ; 809D7D4
+sub_809D7D4: @ 809D7D4
 	push {lr}
 	movs r0, 0x3
 	bl sub_80AEDF0
@@ -280025,7 +280025,7 @@ sub_809D7D4: ; 809D7D4
 	thumb_func_end sub_809D7D4
 
 	thumb_func_start sub_809D7E0
-sub_809D7E0: ; 809D7E0
+sub_809D7E0: @ 809D7E0
 	push {lr}
 	movs r0, 0x4
 	bl sub_80AEDF0
@@ -280034,7 +280034,7 @@ sub_809D7E0: ; 809D7E0
 	thumb_func_end sub_809D7E0
 
 	thumb_func_start sub_809D7EC
-sub_809D7EC: ; 809D7EC
+sub_809D7EC: @ 809D7EC
 	push {lr}
 	movs r0, 0x5
 	bl sub_80AEDF0
@@ -280043,7 +280043,7 @@ sub_809D7EC: ; 809D7EC
 	thumb_func_end sub_809D7EC
 
 	thumb_func_start sub_809D7F8
-sub_809D7F8: ; 809D7F8
+sub_809D7F8: @ 809D7F8
 	push {lr}
 	movs r0, 0x6
 	bl sub_80AEDF0
@@ -280052,7 +280052,7 @@ sub_809D7F8: ; 809D7F8
 	thumb_func_end sub_809D7F8
 
 	thumb_func_start sub_809D804
-sub_809D804: ; 809D804
+sub_809D804: @ 809D804
 	push {lr}
 	movs r0, 0x9
 	bl sub_80AEDF0
@@ -280061,7 +280061,7 @@ sub_809D804: ; 809D804
 	thumb_func_end sub_809D804
 
 	thumb_func_start sub_809D810
-sub_809D810: ; 809D810
+sub_809D810: @ 809D810
 	push {lr}
 	movs r0, 0x7
 	bl sub_80AEDF0
@@ -280070,7 +280070,7 @@ sub_809D810: ; 809D810
 	thumb_func_end sub_809D810
 
 	thumb_func_start sub_809D81C
-sub_809D81C: ; 809D81C
+sub_809D81C: @ 809D81C
 	push {lr}
 	movs r0, 0x8
 	bl sub_80AEDF0
@@ -280079,7 +280079,7 @@ sub_809D81C: ; 809D81C
 	thumb_func_end sub_809D81C
 
 	thumb_func_start sub_809D828
-sub_809D828: ; 809D828
+sub_809D828: @ 809D828
 	push {lr}
 	movs r0, 0xB
 	bl sub_80AEDF0
@@ -280088,7 +280088,7 @@ sub_809D828: ; 809D828
 	thumb_func_end sub_809D828
 
 	thumb_func_start sub_809D834
-sub_809D834: ; 809D834
+sub_809D834: @ 809D834
 	push {lr}
 	movs r0, 0xC
 	bl sub_80AEDF0
@@ -280097,7 +280097,7 @@ sub_809D834: ; 809D834
 	thumb_func_end sub_809D834
 
 	thumb_func_start sub_809D840
-sub_809D840: ; 809D840
+sub_809D840: @ 809D840
 	push {lr}
 	movs r0, 0x14
 	bl sub_80AEDF0
@@ -280106,7 +280106,7 @@ sub_809D840: ; 809D840
 	thumb_func_end sub_809D840
 
 	thumb_func_start sub_809D84C
-sub_809D84C: ; 809D84C
+sub_809D84C: @ 809D84C
 	push {lr}
 	movs r0, 0x15
 	bl sub_80AEDF0
@@ -280115,7 +280115,7 @@ sub_809D84C: ; 809D84C
 	thumb_func_end sub_809D84C
 
 	thumb_func_start trigger_activate_weather
-trigger_activate_weather: ; 809D858
+trigger_activate_weather: @ 809D858
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -280146,7 +280146,7 @@ _0809D886:
 	thumb_func_end trigger_activate_weather
 
 	thumb_func_start task_per_step_callback_manager
-task_per_step_callback_manager: ; 809D88C
+task_per_step_callback_manager: @ 809D88C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -280168,7 +280168,7 @@ task_per_step_callback_manager: ; 809D88C
 	thumb_func_end task_per_step_callback_manager
 
 	thumb_func_start sub_809D8B8
-sub_809D8B8: ; 809D8B8
+sub_809D8B8: @ 809D8B8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -280211,7 +280211,7 @@ _0809D8FC:
 	thumb_func_end sub_809D8B8
 
 	thumb_func_start sub_809D908
-sub_809D908: ; 809D908
+sub_809D908: @ 809D908
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -280237,7 +280237,7 @@ _0809D930:
 	thumb_func_end sub_809D908
 
 	thumb_func_start overworld_ensure_per_step_coros_running
-overworld_ensure_per_step_coros_running: ; 809D93C
+overworld_ensure_per_step_coros_running: @ 809D93C
 	push {r4,r5,lr}
 	ldr r5, =task_per_step_callback_manager
 	adds r0, r5, 0
@@ -280285,7 +280285,7 @@ _0809D992:
 	thumb_func_end overworld_ensure_per_step_coros_running
 
 	thumb_func_start activate_per_step_callback
-activate_per_step_callback: ; 809D9A8
+activate_per_step_callback: @ 809D9A8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -280323,7 +280323,7 @@ _0809D9EA:
 	thumb_func_end activate_per_step_callback
 
 	thumb_func_start wild_encounter_reset_coro_args
-wild_encounter_reset_coro_args: ; 809D9F0
+wild_encounter_reset_coro_args: @ 809D9F0
 	push {lr}
 	ldr r0, =task_per_step_callback_manager
 	bl get_task_id_by_function
@@ -280350,12 +280350,12 @@ _0809DA1A:
 	thumb_func_end wild_encounter_reset_coro_args
 
 	thumb_func_start nullsub_34
-nullsub_34: ; 809DA2C
+nullsub_34: @ 809DA2C
 	bx lr
 	thumb_func_end nullsub_34
 
 	thumb_func_start sub_809DA30
-sub_809DA30: ; 809DA30
+sub_809DA30: @ 809DA30
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -280403,7 +280403,7 @@ _0809DA80:
 	thumb_func_end sub_809DA30
 
 	thumb_func_start sub_809DA88
-sub_809DA88: ; 809DA88
+sub_809DA88: @ 809DA88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -280471,7 +280471,7 @@ _0809DB06:
 	thumb_func_end sub_809DA88
 
 	thumb_func_start sub_809DB10
-sub_809DB10: ; 809DB10
+sub_809DB10: @ 809DB10
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -280491,7 +280491,7 @@ sub_809DB10: ; 809DB10
 	thumb_func_end sub_809DB10
 
 	thumb_func_start sub_809DB34
-sub_809DB34: ; 809DB34
+sub_809DB34: @ 809DB34
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -280511,7 +280511,7 @@ sub_809DB34: ; 809DB34
 	thumb_func_end sub_809DB34
 
 	thumb_func_start sub_809DB58
-sub_809DB58: ; 809DB58
+sub_809DB58: @ 809DB58
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -280531,7 +280531,7 @@ sub_809DB58: ; 809DB58
 	thumb_func_end sub_809DB58
 
 	thumb_func_start sub_809DB7C
-sub_809DB7C: ; 809DB7C
+sub_809DB7C: @ 809DB7C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -280613,7 +280613,7 @@ _0809DC08:
 	thumb_func_end sub_809DB7C
 
 	thumb_func_start sub_809DC18
-sub_809DC18: ; 809DC18
+sub_809DC18: @ 809DC18
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -280695,7 +280695,7 @@ _0809DCA4:
 	thumb_func_end sub_809DC18
 
 	thumb_func_start sub_809DCB4
-sub_809DCB4: ; 809DCB4
+sub_809DCB4: @ 809DCB4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -280880,7 +280880,7 @@ _0809DE1E:
 	thumb_func_end sub_809DCB4
 
 	thumb_func_start sub_809DE28
-sub_809DE28: ; 809DE28
+sub_809DE28: @ 809DE28
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -280929,7 +280929,7 @@ _0809DE82:
 	thumb_func_end sub_809DE28
 
 	thumb_func_start sub_809DE8C
-sub_809DE8C: ; 809DE8C
+sub_809DE8C: @ 809DE8C
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -280978,7 +280978,7 @@ _0809DEE6:
 	thumb_func_end sub_809DE8C
 
 	thumb_func_start sub_809DEF0
-sub_809DEF0: ; 809DEF0
+sub_809DEF0: @ 809DEF0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -281235,7 +281235,7 @@ _0809E0F6:
 	thumb_func_end sub_809DEF0
 
 	thumb_func_start sub_809E108
-sub_809E108: ; 809E108
+sub_809E108: @ 809E108
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -281269,7 +281269,7 @@ _0809E146:
 	thumb_func_end sub_809E108
 
 	thumb_func_start sub_809E14C
-sub_809E14C: ; 809E14C
+sub_809E14C: @ 809E14C
 	push {r4,r5,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -281299,7 +281299,7 @@ _0809E17A:
 	thumb_func_end sub_809E14C
 
 	thumb_func_start sub_809E184
-sub_809E184: ; 809E184
+sub_809E184: @ 809E184
 	push {r4,r5,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -281336,7 +281336,7 @@ _0809E1C2:
 	thumb_func_end sub_809E184
 
 	thumb_func_start sub_809E1C8
-sub_809E1C8: ; 809E1C8
+sub_809E1C8: @ 809E1C8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -281386,7 +281386,7 @@ _0809E210:
 	thumb_func_end sub_809E1C8
 
 	thumb_func_start sub_809E224
-sub_809E224: ; 809E224
+sub_809E224: @ 809E224
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -281584,7 +281584,7 @@ _0809E3A6:
 	thumb_func_end sub_809E224
 
 	thumb_func_start sub_809E3B4
-sub_809E3B4: ; 809E3B4
+sub_809E3B4: @ 809E3B4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -281683,7 +281683,7 @@ _0809E47A:
 	thumb_func_end sub_809E3B4
 
 	thumb_func_start sub_809E490
-sub_809E490: ; 809E490
+sub_809E490: @ 809E490
 	push {r4,r5,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -281711,7 +281711,7 @@ _0809E4AC:
 	thumb_func_end sub_809E490
 
 	thumb_func_start sub_809E4CC
-sub_809E4CC: ; 809E4CC
+sub_809E4CC: @ 809E4CC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -281844,7 +281844,7 @@ _0809E5D2:
 	thumb_func_end sub_809E4CC
 
 	thumb_func_start sub_809E5DC
-sub_809E5DC: ; 809E5DC
+sub_809E5DC: @ 809E5DC
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	lsls r1, 16
@@ -281893,7 +281893,7 @@ _0809E60C:
 	thumb_func_end sub_809E5DC
 
 	thumb_func_start sub_809E638
-sub_809E638: ; 809E638
+sub_809E638: @ 809E638
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -282059,7 +282059,7 @@ _0809E762:
 	thumb_func_end sub_809E638
 
 	thumb_func_start sub_809E778
-sub_809E778: ; 809E778
+sub_809E778: @ 809E778
 	push {lr}
 	ldr r0, =0x00000895
 	bl FlagSet
@@ -282081,7 +282081,7 @@ sub_809E778: ; 809E778
 	thumb_func_end sub_809E778
 
 	thumb_func_start sub_809E7B0
-sub_809E7B0: ; 809E7B0
+sub_809E7B0: @ 809E7B0
 	push {r4,lr}
 	ldr r0, =0x00000895
 	bl FlagGet
@@ -282106,7 +282106,7 @@ _0809E7DA:
 	thumb_func_end sub_809E7B0
 
 	thumb_func_start sub_809E7E8
-sub_809E7E8: ; 809E7E8
+sub_809E7E8: @ 809E7E8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x00004040
@@ -282154,7 +282154,7 @@ _0809E84E:
 	thumb_func_end sub_809E7E8
 
 	thumb_func_start sub_809E858
-sub_809E858: ; 809E858
+sub_809E858: @ 809E858
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -282202,7 +282202,7 @@ _0809E8A8:
 	thumb_func_end sub_809E858
 
 	thumb_func_start sub_809E8B4
-sub_809E8B4: ; 809E8B4
+sub_809E8B4: @ 809E8B4
 	push {lr}
 	bl sub_809E778
 	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -282213,7 +282213,7 @@ sub_809E8B4: ; 809E8B4
 	thumb_func_end sub_809E8B4
 
 	thumb_func_start Special_StartWallClock
-Special_StartWallClock: ; 809E8C8
+Special_StartWallClock: @ 809E8C8
 	push {lr}
 	ldr r0, =Cb2_StartWallClock
 	bl SetMainCallback2
@@ -282226,7 +282226,7 @@ Special_StartWallClock: ; 809E8C8
 	thumb_func_end Special_StartWallClock
 
 	thumb_func_start sub_809E8E8
-sub_809E8E8: ; 809E8E8
+sub_809E8E8: @ 809E8E8
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -282371,7 +282371,7 @@ _0809E9FE:
 	thumb_func_end sub_809E8E8
 
 	thumb_func_start sub_809EA04
-sub_809EA04: ; 809EA04
+sub_809EA04: @ 809EA04
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -282502,7 +282502,7 @@ _0809EAFE:
 	thumb_func_end sub_809EA04
 
 	thumb_func_start sub_809EB04
-sub_809EB04: ; 809EB04
+sub_809EB04: @ 809EB04
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -282559,7 +282559,7 @@ sub_809EB04: ; 809EB04
 	thumb_func_end sub_809EB04
 
 	thumb_func_start sub_809EB8C
-sub_809EB8C: ; 809EB8C
+sub_809EB8C: @ 809EB8C
 	push {lr}
 	ldr r0, =gUnknown_085104C4
 	ldrh r0, [r0, 0x4]
@@ -282570,7 +282570,7 @@ sub_809EB8C: ; 809EB8C
 	thumb_func_end sub_809EB8C
 
 	thumb_func_start sub_809EBA0
-sub_809EBA0: ; 809EBA0
+sub_809EBA0: @ 809EBA0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -282588,7 +282588,7 @@ sub_809EBA0: ; 809EBA0
 	thumb_func_end sub_809EBA0
 
 	thumb_func_start sub_809EBC4
-sub_809EBC4: ; 809EBC4
+sub_809EBC4: @ 809EBC4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -282693,7 +282693,7 @@ sub_809EBC4: ; 809EBC4
 	thumb_func_end sub_809EBC4
 
 	thumb_func_start sub_809ECB4
-sub_809ECB4: ; 809ECB4
+sub_809ECB4: @ 809ECB4
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -282757,7 +282757,7 @@ sub_809ECB4: ; 809ECB4
 	thumb_func_end sub_809ECB4
 
 	thumb_func_start sub_809ED38
-sub_809ED38: ; 809ED38
+sub_809ED38: @ 809ED38
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -282820,7 +282820,7 @@ _0809ED98:
 	thumb_func_end sub_809ED38
 
 	thumb_func_start sub_809EDA0
-sub_809EDA0: ; 809EDA0
+sub_809EDA0: @ 809EDA0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -282835,7 +282835,7 @@ sub_809EDA0: ; 809EDA0
 	thumb_func_end sub_809EDA0
 
 	thumb_func_start sub_809EDB8
-sub_809EDB8: ; 809EDB8
+sub_809EDB8: @ 809EDB8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -282858,7 +282858,7 @@ sub_809EDB8: ; 809EDB8
 	thumb_func_end sub_809EDB8
 
 	thumb_func_start sub_809EDE8
-sub_809EDE8: ; 809EDE8
+sub_809EDE8: @ 809EDE8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -282989,7 +282989,7 @@ _0809EEF4:
 	thumb_func_end sub_809EDE8
 
 	thumb_func_start sub_809EF00
-sub_809EF00: ; 809EF00
+sub_809EF00: @ 809EF00
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -283051,7 +283051,7 @@ sub_809EF00: ; 809EF00
 	thumb_func_end sub_809EF00
 
 	thumb_func_start sub_809EF88
-sub_809EF88: ; 809EF88
+sub_809EF88: @ 809EF88
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -283128,7 +283128,7 @@ _0809EFCA:
 	thumb_func_end sub_809EF88
 
 	thumb_func_start sub_809F048
-sub_809F048: ; 809F048
+sub_809F048: @ 809F048
 	push {lr}
 	bl clear_scheduled_bg_copies_to_vram
 	movs r0, 0
@@ -283155,7 +283155,7 @@ sub_809F048: ; 809F048
 	thumb_func_end sub_809F048
 
 	thumb_func_start sub_809F090
-sub_809F090: ; 809F090
+sub_809F090: @ 809F090
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -283167,7 +283167,7 @@ sub_809F090: ; 809F090
 	thumb_func_end sub_809F090
 
 	thumb_func_start sub_809F0AC
-sub_809F0AC: ; 809F0AC
+sub_809F0AC: @ 809F0AC
 	push {lr}
 	bl ProcessObjectCopyRequests
 	bl LoadOamFromSprites
@@ -283177,7 +283177,7 @@ sub_809F0AC: ; 809F0AC
 	thumb_func_end sub_809F0AC
 
 	thumb_func_start sub_809F0C0
-sub_809F0C0: ; 809F0C0
+sub_809F0C0: @ 809F0C0
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -283206,7 +283206,7 @@ sub_809F0C0: ; 809F0C0
 	thumb_func_end sub_809F0C0
 
 	thumb_func_start sub_809F0F8
-sub_809F0F8: ; 809F0F8
+sub_809F0F8: @ 809F0F8
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -283321,7 +283321,7 @@ _0809F1F8:
 	thumb_func_end sub_809F0F8
 
 	thumb_func_start sub_809F200
-sub_809F200: ; 809F200
+sub_809F200: @ 809F200
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -283545,7 +283545,7 @@ _0809F404:
 	thumb_func_end sub_809F200
 
 	thumb_func_start sub_809F41C
-sub_809F41C: ; 809F41C
+sub_809F41C: @ 809F41C
 	push {lr}
 	ldr r0, =0x00000861
 	bl FlagSet
@@ -283560,7 +283560,7 @@ sub_809F41C: ; 809F41C
 	thumb_func_end sub_809F41C
 
 	thumb_func_start BuildStartMenuActions
-BuildStartMenuActions: ; 809F440
+BuildStartMenuActions: @ 809F440
 	push {lr}
 	ldr r0, =0x0203760f
 	movs r1, 0
@@ -283612,8 +283612,8 @@ _0809F4AC:
 	thumb_func_end BuildStartMenuActions
 
 	thumb_func_start AddStartMenuAction
-; void AddStartMenuAction(u8 entry)
-AddStartMenuAction: ; 809F4B0
+@ void AddStartMenuAction(u8 entry)
+AddStartMenuAction: @ 809F4B0
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -283627,7 +283627,7 @@ AddStartMenuAction: ; 809F4B0
 	thumb_func_end AddStartMenuAction
 
 	thumb_func_start BuildStartMenuActions_Normal
-BuildStartMenuActions_Normal: ; 809F4CC
+BuildStartMenuActions_Normal: @ 809F4CC
 	push {lr}
 	ldr r0, =0x00000861
 	bl FlagGet
@@ -283673,7 +283673,7 @@ _0809F512:
 	thumb_func_end BuildStartMenuActions_Normal
 
 	thumb_func_start BuildStartMenuActions_SafariZone
-BuildStartMenuActions_SafariZone: ; 809F538
+BuildStartMenuActions_SafariZone: @ 809F538
 	push {lr}
 	movs r0, 0x8
 	bl AddStartMenuAction
@@ -283694,7 +283694,7 @@ BuildStartMenuActions_SafariZone: ; 809F538
 	thumb_func_end BuildStartMenuActions_SafariZone
 
 	thumb_func_start BuildStartMenuActions_LinkMode
-BuildStartMenuActions_LinkMode: ; 809F568
+BuildStartMenuActions_LinkMode: @ 809F568
 	push {lr}
 	movs r0, 0x1
 	bl AddStartMenuAction
@@ -283721,7 +283721,7 @@ _0809F58A:
 	thumb_func_end BuildStartMenuActions_LinkMode
 
 	thumb_func_start BuildStartMenuActions_UnionRoom
-BuildStartMenuActions_UnionRoom: ; 809F5A4
+BuildStartMenuActions_UnionRoom: @ 809F5A4
 	push {lr}
 	movs r0, 0x1
 	bl AddStartMenuAction
@@ -283748,7 +283748,7 @@ _0809F5C6:
 	thumb_func_end BuildStartMenuActions_UnionRoom
 
 	thumb_func_start BuildStartMenuActions_BattlePike
-BuildStartMenuActions_BattlePike: ; 809F5E0
+BuildStartMenuActions_BattlePike: @ 809F5E0
 	push {lr}
 	movs r0, 0
 	bl AddStartMenuAction
@@ -283765,7 +283765,7 @@ BuildStartMenuActions_BattlePike: ; 809F5E0
 	thumb_func_end BuildStartMenuActions_BattlePike
 
 	thumb_func_start BuildStartMenuActions_BattlePyramid
-BuildStartMenuActions_BattlePyramid: ; 809F604
+BuildStartMenuActions_BattlePyramid: @ 809F604
 	push {lr}
 	movs r0, 0x1
 	bl AddStartMenuAction
@@ -283786,7 +283786,7 @@ BuildStartMenuActions_BattlePyramid: ; 809F604
 	thumb_func_end BuildStartMenuActions_BattlePyramid
 
 	thumb_func_start BuildStartMenuActions_MultiBattleRoom
-BuildStartMenuActions_MultiBattleRoom: ; 809F634
+BuildStartMenuActions_MultiBattleRoom: @ 809F634
 	push {lr}
 	movs r0, 0x1
 	bl AddStartMenuAction
@@ -283801,7 +283801,7 @@ BuildStartMenuActions_MultiBattleRoom: ; 809F634
 	thumb_func_end BuildStartMenuActions_MultiBattleRoom
 
 	thumb_func_start sub_809F654
-sub_809F654: ; 809F654
+sub_809F654: @ 809F654
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r4, =0x0203760c
@@ -283845,7 +283845,7 @@ sub_809F654: ; 809F654
 	thumb_func_end sub_809F654
 
 	thumb_func_start sub_809F6C8
-sub_809F6C8: ; 809F6C8
+sub_809F6C8: @ 809F6C8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x03005d90
@@ -283908,7 +283908,7 @@ _0809F6F4:
 	thumb_func_end sub_809F6C8
 
 	thumb_func_start RemoveExtraStartMenuWindows
-RemoveExtraStartMenuWindows: ; 809F774
+RemoveExtraStartMenuWindows: @ 809F774
 	push {r4,lr}
 	bl GetSafariZoneFlag
 	cmp r0, 0
@@ -283941,7 +283941,7 @@ _0809F7B0:
 	thumb_func_end RemoveExtraStartMenuWindows
 
 	thumb_func_start PrintStartMenuActions
-PrintStartMenuActions: ; 809F7C0
+PrintStartMenuActions: @ 809F7C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -284041,7 +284041,7 @@ _0809F882:
 	thumb_func_end PrintStartMenuActions
 
 	thumb_func_start sub_809F894
-sub_809F894: ; 809F894
+sub_809F894: @ 809F894
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x02037619
@@ -284152,7 +284152,7 @@ _0809F98E:
 	thumb_func_end sub_809F894
 
 	thumb_func_start sub_809F998
-sub_809F998: ; 809F998
+sub_809F998: @ 809F998
 	push {lr}
 	ldr r1, =0x02037619
 	movs r0, 0
@@ -284168,7 +284168,7 @@ _0809F9A2:
 	thumb_func_end sub_809F998
 
 	thumb_func_start task50_startmenu
-task50_startmenu: ; 809F9B4
+task50_startmenu: @ 809F9B4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -284184,7 +284184,7 @@ _0809F9C8:
 	thumb_func_end task50_startmenu
 
 	thumb_func_start sub_809F9D0
-sub_809F9D0: ; 809F9D0
+sub_809F9D0: @ 809F9D0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r1, =0x02037619
@@ -284207,7 +284207,7 @@ sub_809F9D0: ; 809F9D0
 	thumb_func_end sub_809F9D0
 
 	thumb_func_start sub_809FA00
-sub_809FA00: ; 809FA00
+sub_809FA00: @ 809FA00
 	push {lr}
 	bl sub_809F894
 	cmp r0, 0
@@ -284223,7 +284223,7 @@ _0809FA14:
 	thumb_func_end sub_809FA00
 
 	thumb_func_start sub_809FA18
-sub_809FA18: ; 809FA18
+sub_809FA18: @ 809FA18
 	ldr r1, =0x02037619
 	movs r0, 0
 	strb r0, [r1]
@@ -284236,7 +284236,7 @@ sub_809FA18: ; 809FA18
 	thumb_func_end sub_809FA18
 
 	thumb_func_start sub_809FA34
-sub_809FA34: ; 809FA34
+sub_809FA34: @ 809FA34
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -284285,7 +284285,7 @@ _0809FA92:
 	thumb_func_end sub_809FA34
 
 	thumb_func_start sub_809FA9C
-sub_809FA9C: ; 809FA9C
+sub_809FA9C: @ 809FA9C
 	push {lr}
 	bl is_c1_link_related_active
 	cmp r0, 0
@@ -284303,7 +284303,7 @@ _0809FAB2:
 	thumb_func_end sub_809FA9C
 
 	thumb_func_start HandleStartMenuInput
-HandleStartMenuInput: ; 809FAC4
+HandleStartMenuInput: @ 809FAC4
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldrh r1, [r4, 0x2E]
@@ -284405,7 +284405,7 @@ _0809FBAE:
 	thumb_func_end HandleStartMenuInput
 
 	thumb_func_start StartMenu_Pokedex
-StartMenu_Pokedex: ; 809FBB4
+StartMenu_Pokedex: @ 809FBB4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284432,7 +284432,7 @@ _0809FBE6:
 	thumb_func_end StartMenu_Pokedex
 
 	thumb_func_start StartMenu_Pokemon
-StartMenu_Pokemon: ; 809FBF0
+StartMenu_Pokemon: @ 809FBF0
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284457,7 +284457,7 @@ _0809FC1C:
 	thumb_func_end StartMenu_Pokemon
 
 	thumb_func_start StartMenu_Bag
-StartMenu_Bag: ; 809FC24
+StartMenu_Bag: @ 809FC24
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284482,7 +284482,7 @@ _0809FC50:
 	thumb_func_end StartMenu_Bag
 
 	thumb_func_start StartMenu_PokeNav
-StartMenu_PokeNav: ; 809FC58
+StartMenu_PokeNav: @ 809FC58
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284507,7 +284507,7 @@ _0809FC84:
 	thumb_func_end StartMenu_PokeNav
 
 	thumb_func_start StartMenu_PlayerName
-StartMenu_PlayerName: ; 809FC8C
+StartMenu_PlayerName: @ 809FC8C
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284554,7 +284554,7 @@ _0809FCF6:
 	thumb_func_end StartMenu_PlayerName
 
 	thumb_func_start StartMenu_Save
-StartMenu_Save: ; 809FCFC
+StartMenu_Save: @ 809FCFC
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -284572,7 +284572,7 @@ _0809FD0C:
 	thumb_func_end StartMenu_Save
 
 	thumb_func_start StartMenu_Option
-StartMenu_Option: ; 809FD20
+StartMenu_Option: @ 809FD20
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284600,7 +284600,7 @@ _0809FD52:
 	thumb_func_end StartMenu_Option
 
 	thumb_func_start StartMenu_Exit
-StartMenu_Exit: ; 809FD64
+StartMenu_Exit: @ 809FD64
 	push {lr}
 	bl RemoveExtraStartMenuWindows
 	bl sub_80A0934
@@ -284610,7 +284610,7 @@ StartMenu_Exit: ; 809FD64
 	thumb_func_end StartMenu_Exit
 
 	thumb_func_start StartMenu_SafariZoneRetire
-StartMenu_SafariZoneRetire: ; 809FD74
+StartMenu_SafariZoneRetire: @ 809FD74
 	push {lr}
 	bl RemoveExtraStartMenuWindows
 	bl sub_80A0934
@@ -284621,7 +284621,7 @@ StartMenu_SafariZoneRetire: ; 809FD74
 	thumb_func_end StartMenu_SafariZoneRetire
 
 	thumb_func_start StartMenu_LinkModePlayerName
-StartMenu_LinkModePlayerName: ; 809FD88
+StartMenu_LinkModePlayerName: @ 809FD88
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284647,7 +284647,7 @@ _0809FDB4:
 	thumb_func_end StartMenu_LinkModePlayerName
 
 	thumb_func_start StartMenu_BattlePyramidRetire
-StartMenu_BattlePyramidRetire: ; 809FDC0
+StartMenu_BattlePyramidRetire: @ 809FDC0
 	ldr r1, =0x03005df4
 	ldr r0, =sub_809FE9C
 	str r0, [r1]
@@ -284657,7 +284657,7 @@ StartMenu_BattlePyramidRetire: ; 809FDC0
 	thumb_func_end StartMenu_BattlePyramidRetire
 
 	thumb_func_start sub_809FDD4
-sub_809FDD4: ; 809FDD4
+sub_809FDD4: @ 809FDD4
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -284672,7 +284672,7 @@ sub_809FDD4: ; 809FDD4
 	thumb_func_end sub_809FDD4
 
 	thumb_func_start StartMenu_BattlePyramidBag
-StartMenu_BattlePyramidBag: ; 809FDF4
+StartMenu_BattlePyramidBag: @ 809FDF4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -284697,7 +284697,7 @@ _0809FE20:
 	thumb_func_end StartMenu_BattlePyramidBag
 
 	thumb_func_start sub_809FE28
-sub_809FE28: ; 809FE28
+sub_809FE28: @ 809FE28
 	push {lr}
 	bl sub_809FF28
 	ldr r1, =0x03005df4
@@ -284710,7 +284710,7 @@ sub_809FE28: ; 809FE28
 	thumb_func_end sub_809FE28
 
 	thumb_func_start sub_809FE44
-sub_809FE44: ; 809FE44
+sub_809FE44: @ 809FE44
 	push {lr}
 	bl sub_809FF4C
 	lsls r0, 24
@@ -284751,7 +284751,7 @@ _0809FE96:
 	thumb_func_end sub_809FE44
 
 	thumb_func_start sub_809FE9C
-sub_809FE9C: ; 809FE9C
+sub_809FE9C: @ 809FE9C
 	push {lr}
 	bl sub_80A0340
 	ldr r1, =0x03005df4
@@ -284764,7 +284764,7 @@ sub_809FE9C: ; 809FE9C
 	thumb_func_end sub_809FE9C
 
 	thumb_func_start sub_809FEB8
-sub_809FEB8: ; 809FEB8
+sub_809FEB8: @ 809FEB8
 	push {lr}
 	bl sub_809F998
 	ldr r1, =0x03005df4
@@ -284777,7 +284777,7 @@ sub_809FEB8: ; 809FEB8
 	thumb_func_end sub_809FEB8
 
 	thumb_func_start sub_809FED4
-sub_809FED4: ; 809FED4
+sub_809FED4: @ 809FED4
 	push {lr}
 	bl sub_809FF4C
 	lsls r0, 24
@@ -284815,7 +284815,7 @@ _0809FF22:
 	thumb_func_end sub_809FED4
 
 	thumb_func_start sub_809FF28
-sub_809FF28: ; 809FF28
+sub_809FF28: @ 809FF28
 	push {lr}
 	bl save_serialize_map
 	ldr r1, =0x0203761c
@@ -284830,7 +284830,7 @@ sub_809FF28: ; 809FF28
 	thumb_func_end sub_809FF28
 
 	thumb_func_start sub_809FF4C
-sub_809FF4C: ; 809FF4C
+sub_809FF4C: @ 809FF4C
 	push {lr}
 	bl sub_8197224
 	lsls r0, 16
@@ -284855,7 +284855,7 @@ _0809FF7A:
 	thumb_func_end sub_809FF4C
 
 	thumb_func_start sub_809FF80
-sub_809FF80: ; 809FF80
+sub_809FF80: @ 809FF80
 	push {lr}
 	bl sub_809FF28
 	ldr r0, =task50_save_game
@@ -284867,7 +284867,7 @@ sub_809FF80: ; 809FF80
 	thumb_func_end sub_809FF80
 
 	thumb_func_start sub_809FF98
-sub_809FF98: ; 809FF98
+sub_809FF98: @ 809FF98
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -284891,7 +284891,7 @@ sub_809FF98: ; 809FF98
 	thumb_func_end sub_809FF98
 
 	thumb_func_start task50_save_game
-task50_save_game: ; 809FFD0
+task50_save_game: @ 809FFD0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -284928,7 +284928,7 @@ _080A000A:
 	thumb_func_end task50_save_game
 
 	thumb_func_start sub_80A0014
-sub_80A0014: ; 80A0014
+sub_80A0014: @ 80A0014
 	push {lr}
 	movs r0, 0
 	movs r1, 0x1
@@ -284938,7 +284938,7 @@ sub_80A0014: ; 80A0014
 	thumb_func_end sub_80A0014
 
 	thumb_func_start sub_80A0024
-sub_80A0024: ; 80A0024
+sub_80A0024: @ 80A0024
 	push {lr}
 	bl sub_80A0888
 	pop {r0}
@@ -284946,7 +284946,7 @@ sub_80A0024: ; 80A0024
 	thumb_func_end sub_80A0024
 
 	thumb_func_start sub_80A0030
-sub_80A0030: ; 80A0030
+sub_80A0030: @ 80A0030
 	ldr r1, =0x02037620
 	movs r0, 0x3C
 	strb r0, [r1]
@@ -284955,7 +284955,7 @@ sub_80A0030: ; 80A0030
 	thumb_func_end sub_80A0030
 
 	thumb_func_start sub_80A003C
-sub_80A003C: ; 80A003C
+sub_80A003C: @ 80A003C
 	push {lr}
 	ldr r1, =0x02037620
 	ldrb r0, [r1]
@@ -284984,7 +284984,7 @@ _080A006C:
 	thumb_func_end sub_80A003C
 
 	thumb_func_start sub_80A0070
-sub_80A0070: ; 80A0070
+sub_80A0070: @ 80A0070
 	push {lr}
 	ldr r1, =0x02037620
 	ldrb r0, [r1]
@@ -285010,7 +285010,7 @@ _080A009A:
 	thumb_func_end sub_80A0070
 
 	thumb_func_start sub_80A00A0
-sub_80A00A0: ; 80A00A0
+sub_80A00A0: @ 80A00A0
 	push {lr}
 	bl get_start_menu_window_id_maybe
 	lsls r0, 24
@@ -285040,7 +285040,7 @@ _080A00DC:
 	thumb_func_end sub_80A00A0
 
 	thumb_func_start sub_80A00EC
-sub_80A00EC: ; 80A00EC
+sub_80A00EC: @ 80A00EC
 	push {lr}
 	bl sub_8197930
 	ldr r1, =0x0203761c
@@ -285053,7 +285053,7 @@ sub_80A00EC: ; 80A00EC
 	thumb_func_end sub_80A00EC
 
 	thumb_func_start sub_80A0108
-sub_80A0108: ; 80A0108
+sub_80A0108: @ 80A0108
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -285108,7 +285108,7 @@ _080A0176:
 	thumb_func_end sub_80A0108
 
 	thumb_func_start sub_80A017C
-sub_80A017C: ; 80A017C
+sub_80A017C: @ 80A017C
 	push {lr}
 	ldr r0, =0x020322d4
 	ldrb r0, [r0]
@@ -285131,7 +285131,7 @@ _080A01A4:
 	thumb_func_end sub_80A017C
 
 	thumb_func_start sub_80A01B4
-sub_80A01B4: ; 80A01B4
+sub_80A01B4: @ 80A01B4
 	push {lr}
 	movs r0, 0x1
 	bl sub_8197948
@@ -285145,7 +285145,7 @@ sub_80A01B4: ; 80A01B4
 	thumb_func_end sub_80A01B4
 
 	thumb_func_start sub_80A01D0
-sub_80A01D0: ; 80A01D0
+sub_80A01D0: @ 80A01D0
 	push {lr}
 	bl sub_8197930
 	ldr r1, =0x0203761c
@@ -285158,7 +285158,7 @@ sub_80A01D0: ; 80A01D0
 	thumb_func_end sub_80A01D0
 
 	thumb_func_start sub_80A01EC
-sub_80A01EC: ; 80A01EC
+sub_80A01EC: @ 80A01EC
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -285195,7 +285195,7 @@ _080A022E:
 	thumb_func_end sub_80A01EC
 
 	thumb_func_start sub_80A0234
-sub_80A0234: ; 80A0234
+sub_80A0234: @ 80A0234
 	push {lr}
 	ldr r0, =gUnknown_082C8810
 	ldr r1, =sub_80A024C
@@ -285207,7 +285207,7 @@ sub_80A0234: ; 80A0234
 	thumb_func_end sub_80A0234
 
 	thumb_func_start sub_80A024C
-sub_80A024C: ; 80A024C
+sub_80A024C: @ 80A024C
 	push {r4,lr}
 	movs r0, 0
 	bl sav12_xor_increment
@@ -285251,7 +285251,7 @@ _080A029C:
 	thumb_func_end sub_80A024C
 
 	thumb_func_start sub_80A02B0
-sub_80A02B0: ; 80A02B0
+sub_80A02B0: @ 80A02B0
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -285271,7 +285271,7 @@ _080A02CA:
 	thumb_func_end sub_80A02B0
 
 	thumb_func_start sub_80A02D8
-sub_80A02D8: ; 80A02D8
+sub_80A02D8: @ 80A02D8
 	push {lr}
 	bl mplay_has_finished_maybe
 	lsls r0, 24
@@ -285292,7 +285292,7 @@ _080A02F8:
 	thumb_func_end sub_80A02D8
 
 	thumb_func_start sub_80A02FC
-sub_80A02FC: ; 80A02FC
+sub_80A02FC: @ 80A02FC
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -285312,7 +285312,7 @@ _080A0316:
 	thumb_func_end sub_80A02FC
 
 	thumb_func_start sub_80A0324
-sub_80A0324: ; 80A0324
+sub_80A0324: @ 80A0324
 	push {lr}
 	bl sub_80A0070
 	lsls r0, 24
@@ -285329,7 +285329,7 @@ _080A033A:
 	thumb_func_end sub_80A0324
 
 	thumb_func_start sub_80A0340
-sub_80A0340: ; 80A0340
+sub_80A0340: @ 80A0340
 	ldr r1, =0x0203761c
 	ldr r0, =sub_80A035C
 	str r0, [r1]
@@ -285341,7 +285341,7 @@ sub_80A0340: ; 80A0340
 	thumb_func_end sub_80A0340
 
 	thumb_func_start sub_80A035C
-sub_80A035C: ; 80A035C
+sub_80A035C: @ 80A035C
 	push {lr}
 	bl get_start_menu_window_id_maybe
 	lsls r0, 24
@@ -285359,7 +285359,7 @@ sub_80A035C: ; 80A035C
 	thumb_func_end sub_80A035C
 
 	thumb_func_start sub_80A0388
-sub_80A0388: ; 80A0388
+sub_80A0388: @ 80A0388
 	push {lr}
 	movs r0, 0x1
 	bl sub_8197948
@@ -285373,7 +285373,7 @@ sub_80A0388: ; 80A0388
 	thumb_func_end sub_80A0388
 
 	thumb_func_start sub_80A03A4
-sub_80A03A4: ; 80A03A4
+sub_80A03A4: @ 80A03A4
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -285406,7 +285406,7 @@ _080A03D4:
 	thumb_func_end sub_80A03A4
 
 	thumb_func_start sub_80A03D8
-sub_80A03D8: ; 80A03D8
+sub_80A03D8: @ 80A03D8
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	pop {r0}
@@ -285414,7 +285414,7 @@ sub_80A03D8: ; 80A03D8
 	thumb_func_end sub_80A03D8
 
 	thumb_func_start sub_80A03E4
-sub_80A03E4: ; 80A03E4
+sub_80A03E4: @ 80A03E4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -285547,7 +285547,7 @@ _080A0506:
 	thumb_func_end sub_80A03E4
 
 	thumb_func_start sub_80A0514
-sub_80A0514: ; 80A0514
+sub_80A0514: @ 80A0514
 	push {lr}
 	ldr r0, =0x030026f8
 	bl sub_80A03E4
@@ -285565,7 +285565,7 @@ _080A052E:
 	thumb_func_end sub_80A0514
 
 	thumb_func_start sub_80A0540
-sub_80A0540: ; 80A0540
+sub_80A0540: @ 80A0540
 	push {lr}
 	bl RunActiveTasks
 	bl fade_and_return_progress_probably
@@ -285574,7 +285574,7 @@ sub_80A0540: ; 80A0540
 	thumb_func_end sub_80A0540
 
 	thumb_func_start sub_80A0550
-sub_80A0550: ; 80A0550
+sub_80A0550: @ 80A0550
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -285731,7 +285731,7 @@ _080A06A8:
 	thumb_func_end sub_80A0550
 
 	thumb_func_start sub_80A06B4
-sub_80A06B4: ; 80A06B4
+sub_80A06B4: @ 80A06B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -285930,7 +285930,7 @@ _080A0802:
 	thumb_func_end sub_80A06B4
 
 	thumb_func_start sub_80A0888
-sub_80A0888: ; 80A0888
+sub_80A0888: @ 80A0888
 	push {r4,lr}
 	ldr r4, =0x02037622
 	ldrb r0, [r4]
@@ -285945,7 +285945,7 @@ sub_80A0888: ; 80A0888
 	thumb_func_end sub_80A0888
 
 	thumb_func_start sub_80A08A4
-sub_80A08A4: ; 80A08A4
+sub_80A08A4: @ 80A08A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -285965,7 +285965,7 @@ _080A08C0:
 	thumb_func_end sub_80A08A4
 
 	thumb_func_start sub_80A08CC
-sub_80A08CC: ; 80A08CC
+sub_80A08CC: @ 80A08CC
 	push {r4,r5,lr}
 	ldr r0, =sub_8153688
 	movs r1, 0x5
@@ -285997,7 +285997,7 @@ sub_80A08CC: ; 80A08CC
 	thumb_func_end sub_80A08CC
 
 	thumb_func_start sub_80A0914
-sub_80A0914: ; 80A0914
+sub_80A0914: @ 80A0914
 	push {lr}
 	bl get_start_menu_window_id_maybe
 	lsls r0, 24
@@ -286012,7 +286012,7 @@ sub_80A0914: ; 80A0914
 	thumb_func_end sub_80A0914
 
 	thumb_func_start sub_80A0934
-sub_80A0934: ; 80A0934
+sub_80A0934: @ 80A0934
 	push {lr}
 	movs r0, 0x5
 	bl audio_play
@@ -286022,7 +286022,7 @@ sub_80A0934: ; 80A0934
 	thumb_func_end sub_80A0934
 
 	thumb_func_start append_byte
-append_byte: ; 80A0944
+append_byte: @ 80A0944
 	ldrb r3, [r1]
 	adds r0, r3
 	strb r2, [r0]
@@ -286035,8 +286035,8 @@ append_byte: ; 80A0944
 	.include "asm/tileset_animation.s"
 
 	thumb_func_start decompress_palette
-; void decompress_palette(void *src, u16 offset, u16 size)
-decompress_palette: ; 80A18F4
+@ void decompress_palette(void *src, u16 offset, u16 size)
+decompress_palette: @ 80A18F4
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -286066,8 +286066,8 @@ decompress_palette: ; 80A18F4
 	thumb_func_end decompress_palette
 
 	thumb_func_start gpu_pal_apply
-; void gpu_pal_apply(void *src, int dest_offset, int mode)
-gpu_pal_apply: ; 80A1938
+@ void gpu_pal_apply(void *src, int dest_offset, int mode)
+gpu_pal_apply: @ 80A1938
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -286093,7 +286093,7 @@ gpu_pal_apply: ; 80A1938
 	thumb_func_end gpu_pal_apply
 
 	thumb_func_start rboxid_80040B8
-rboxid_80040B8: ; 80A1970
+rboxid_80040B8: @ 80A1970
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -286131,8 +286131,8 @@ rboxid_80040B8: ; 80A1970
 	thumb_func_end rboxid_80040B8
 
 	thumb_func_start copy_pal_bg_faded_to_pal_ram
-; void copy_pal_bg_faded_to_pal_ram()
-copy_pal_bg_faded_to_pal_ram: ; 80A19C0
+@ void copy_pal_bg_faded_to_pal_ram()
+copy_pal_bg_faded_to_pal_ram: @ 80A19C0
 	push {r4,r5,lr}
 	ldr r4, =0x02037fd4
 	ldrb r1, [r4, 0x8]
@@ -286173,8 +286173,8 @@ _080A1A02:
 	thumb_func_end copy_pal_bg_faded_to_pal_ram
 
 	thumb_func_start fade_and_return_progress_probably
-; int fade_and_return_progress_probably()
-fade_and_return_progress_probably: ; 80A1A1C
+@ int fade_and_return_progress_probably()
+fade_and_return_progress_probably: @ 80A1A1C
 	push {lr}
 	ldr r0, =0x02037fe4
 	ldr r0, [r0]
@@ -286217,7 +286217,7 @@ _080A1A68:
 	thumb_func_end fade_and_return_progress_probably
 
 	thumb_func_start sub_80A1A74
-sub_80A1A74: ; 80A1A74
+sub_80A1A74: @ 80A1A74
 	push {r4,lr}
 	movs r4, 0
 _080A1A78:
@@ -286235,7 +286235,7 @@ _080A1A78:
 	thumb_func_end sub_80A1A74
 
 	thumb_func_start sub_80A1A94
-sub_80A1A94: ; 80A1A94
+sub_80A1A94: @ 80A1A94
 	push {r4-r7,lr}
 	movs r0, 0xA0
 	lsls r0, 19
@@ -286266,7 +286266,7 @@ _080A1AA4:
 	thumb_func_end sub_80A1A94
 
 	thumb_func_start pal_fade_maybe
-pal_fade_maybe: ; 80A1AD4
+pal_fade_maybe: @ 80A1AD4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -286421,7 +286421,7 @@ _080A1C00:
 	thumb_func_end pal_fade_maybe
 
 	thumb_func_start sub_80A1C1C
-sub_80A1C1C: ; 80A1C1C
+sub_80A1C1C: @ 80A1C1C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -286459,7 +286459,7 @@ sub_80A1C1C: ; 80A1C1C
 	thumb_func_end sub_80A1C1C
 
 	thumb_func_start sub_80A1C64
-sub_80A1C64: ; 80A1C64
+sub_80A1C64: @ 80A1C64
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -286523,7 +286523,7 @@ _080A1CCC:
 	thumb_func_end sub_80A1C64
 
 	thumb_func_start sub_80A1CDC
-sub_80A1CDC: ; 80A1CDC
+sub_80A1CDC: @ 80A1CDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -286697,7 +286697,7 @@ _080A1E14:
 	thumb_func_end sub_80A1CDC
 
 	thumb_func_start sub_80A1E40
-sub_80A1E40: ; 80A1E40
+sub_80A1E40: @ 80A1E40
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r3, =0x02037fd4
@@ -286796,7 +286796,7 @@ _080A1EF4:
 	thumb_func_end sub_80A1E40
 
 	thumb_func_start sub_80A1F00
-sub_80A1F00: ; 80A1F00
+sub_80A1F00: @ 80A1F00
 	push {lr}
 	adds r3, r0, 0
 	ldrb r0, [r3, 0x9]
@@ -286843,7 +286843,7 @@ _080A1F54:
 	thumb_func_end sub_80A1F00
 
 	thumb_func_start sub_80A1F58
-sub_80A1F58: ; 80A1F58
+sub_80A1F58: @ 80A1F58
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -286859,7 +286859,7 @@ _080A1F6E:
 	thumb_func_end sub_80A1F58
 
 	thumb_func_start palslot_dead_struct_update
-palslot_dead_struct_update: ; 80A1F74
+palslot_dead_struct_update: @ 80A1F74
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02037f14
@@ -286899,7 +286899,7 @@ palslot_dead_struct_update: ; 80A1F74
 	thumb_func_end palslot_dead_struct_update
 
 	thumb_func_start pal_fade_control_reset_maybe
-pal_fade_control_reset_maybe: ; 80A1FD0
+pal_fade_control_reset_maybe: @ 80A1FD0
 	ldr r2, =0x02037fd4
 	movs r0, 0
 	str r0, [r2]
@@ -286956,7 +286956,7 @@ pal_fade_control_reset_maybe: ; 80A1FD0
 	thumb_func_end pal_fade_control_reset_maybe
 
 	thumb_func_start sub_80A2048
-sub_80A2048: ; 80A2048
+sub_80A2048: @ 80A2048
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -286981,7 +286981,7 @@ _080A206C:
 	thumb_func_end sub_80A2048
 
 	thumb_func_start sub_80A2074
-sub_80A2074: ; 80A2074
+sub_80A2074: @ 80A2074
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -287007,7 +287007,7 @@ _080A209A:
 	thumb_func_end sub_80A2074
 
 	thumb_func_start sub_80A20A4
-sub_80A20A4: ; 80A20A4
+sub_80A20A4: @ 80A20A4
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -287038,7 +287038,7 @@ _080A20D4:
 	thumb_func_end sub_80A20A4
 
 	thumb_func_start pal_fade__0
-pal_fade__0: ; 80A20D8
+pal_fade__0: @ 80A20D8
 	push {r4-r7,lr}
 	ldr r4, =0x02037fd4
 	ldrb r1, [r4, 0x7]
@@ -287208,7 +287208,7 @@ _080A220C:
 	thumb_func_end pal_fade__0
 
 	thumb_func_start sub_80A2218
-sub_80A2218: ; 80A2218
+sub_80A2218: @ 80A2218
 	push {r4-r7,lr}
 	adds r1, r0, 0
 	movs r3, 0
@@ -287251,7 +287251,7 @@ _080A2256:
 	thumb_func_end sub_80A2218
 
 	thumb_func_start sub_80A2260
-sub_80A2260: ; 80A2260
+sub_80A2260: @ 80A2260
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -287362,7 +287362,7 @@ _080A231C:
 	thumb_func_end sub_80A2260
 
 	thumb_func_start sub_80A2334
-sub_80A2334: ; 80A2334
+sub_80A2334: @ 80A2334
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -287413,7 +287413,7 @@ _080A237E:
 	thumb_func_end sub_80A2334
 
 	thumb_func_start sub_80A2390
-sub_80A2390: ; 80A2390
+sub_80A2390: @ 80A2390
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -287432,7 +287432,7 @@ sub_80A2390: ; 80A2390
 	thumb_func_end sub_80A2390
 
 	thumb_func_start sub_80A23B4
-sub_80A23B4: ; 80A23B4
+sub_80A23B4: @ 80A23B4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -287494,7 +287494,7 @@ _080A241C:
 	thumb_func_end sub_80A23B4
 
 	thumb_func_start pal_fade__1
-pal_fade__1: ; 80A2438
+pal_fade__1: @ 80A2438
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -287939,7 +287939,7 @@ _080A2792:
 	thumb_func_end pal_fade__1
 
 	thumb_func_start sub_80A27B0
-sub_80A27B0: ; 80A27B0
+sub_80A27B0: @ 80A27B0
 	push {r4-r7,lr}
 	ldr r5, [sp, 0x14]
 	lsls r0, 24
@@ -288019,7 +288019,7 @@ _080A2844:
 	thumb_func_end sub_80A27B0
 
 	thumb_func_start pal_fade__2
-pal_fade__2: ; 80A284C
+pal_fade__2: @ 80A284C
 	push {r4-r7,lr}
 	ldr r2, =0x02037fd4
 	ldrb r1, [r2, 0x7]
@@ -288168,7 +288168,7 @@ _080A295C:
 	thumb_func_end pal_fade__2
 
 	thumb_func_start sub_80A2968
-sub_80A2968: ; 80A2968
+sub_80A2968: @ 80A2968
 	push {r4,lr}
 	ldr r4, =0x02037fd4
 	ldrh r1, [r4]
@@ -288209,7 +288209,7 @@ _080A29AC:
 	thumb_func_end sub_80A2968
 
 	thumb_func_start sub_80A29BC
-sub_80A29BC: ; 80A29BC
+sub_80A29BC: @ 80A29BC
 	push {r4,lr}
 	ldr r3, =0x02037fd4
 	ldrb r4, [r3, 0xA]
@@ -288263,7 +288263,7 @@ _080A2A1A:
 	thumb_func_end sub_80A29BC
 
 	thumb_func_start sub_80A2A20
-sub_80A2A20: ; 80A2A20
+sub_80A2A20: @ 80A2A20
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -288298,7 +288298,7 @@ _080A2A54:
 	thumb_func_end sub_80A2A20
 
 	thumb_func_start sub_80A2A5C
-sub_80A2A5C: ; 80A2A5C
+sub_80A2A5C: @ 80A2A5C
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -288320,7 +288320,7 @@ sub_80A2A5C: ; 80A2A5C
 	thumb_func_end sub_80A2A5C
 
 	thumb_func_start TintPalette_GrayScale
-TintPalette_GrayScale: ; 80A2A90
+TintPalette_GrayScale: @ 80A2A90
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -288365,7 +288365,7 @@ _080A2AD8:
 	thumb_func_end TintPalette_GrayScale
 
 	thumb_func_start sub_80A2AE0
-sub_80A2AE0: ; 80A2AE0
+sub_80A2AE0: @ 80A2AE0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -288418,7 +288418,7 @@ _080A2B34:
 	thumb_func_end sub_80A2AE0
 
 	thumb_func_start TintPalette_SepiaTone
-TintPalette_SepiaTone: ; 80A2B40
+TintPalette_SepiaTone: @ 80A2B40
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -288478,7 +288478,7 @@ _080A2BA2:
 	thumb_func_end TintPalette_SepiaTone
 
 	thumb_func_start sub_80A2BAC
-sub_80A2BAC: ; 80A2BAC
+sub_80A2BAC: @ 80A2BAC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -288563,7 +288563,7 @@ _080A2C38:
 	thumb_func_end sub_80A2BAC
 
 	thumb_func_start sub_80A2C44
-sub_80A2C44: ; 80A2C44
+sub_80A2C44: @ 80A2C44
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -288652,7 +288652,7 @@ _080A2CC4:
 	thumb_func_end sub_80A2C44
 
 	thumb_func_start sub_80A2CF8
-sub_80A2CF8: ; 80A2CF8
+sub_80A2CF8: @ 80A2CF8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -288686,7 +288686,7 @@ _080A2D2E:
 	thumb_func_end sub_80A2CF8
 
 	thumb_func_start sub_80A2D34
-sub_80A2D34: ; 80A2D34
+sub_80A2D34: @ 80A2D34
 	push {lr}
 	b _080A2D3C
 _080A2D38:
@@ -288704,7 +288704,7 @@ _080A2D3C:
 	thumb_func_end sub_80A2D34
 
 	thumb_func_start sub_80A2D54
-sub_80A2D54: ; 80A2D54
+sub_80A2D54: @ 80A2D54
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -288770,7 +288770,7 @@ _080A2DCC:
 	thumb_func_end sub_80A2D54
 
 	thumb_func_start sound_sources_off
-sound_sources_off: ; 80A2DD4
+sound_sources_off: @ 80A2DD4
 	push {lr}
 	ldr r1, =0x03005df8
 	movs r0, 0
@@ -288782,7 +288782,7 @@ sound_sources_off: ; 80A2DD4
 	thumb_func_end sound_sources_off
 
 	thumb_func_start sound_something
-sound_something: ; 80A2DE8
+sound_something: @ 80A2DE8
 	push {r4,r5,lr}
 	ldr r0, =0x03000f4c
 	ldrb r1, [r0]
@@ -288878,7 +288878,7 @@ _080A2ECA:
 	thumb_func_end sound_something
 
 	thumb_func_start map_music_set_to_zero
-map_music_set_to_zero: ; 80A2EE0
+map_music_set_to_zero: @ 80A2EE0
 	ldr r0, =0x03000f48
 	movs r1, 0
 	strh r1, [r0]
@@ -288893,7 +288893,7 @@ map_music_set_to_zero: ; 80A2EE0
 	thumb_func_end map_music_set_to_zero
 
 	thumb_func_start current_map_music_get
-current_map_music_get: ; 80A2F04
+current_map_music_get: @ 80A2F04
 	ldr r0, =0x03000f48
 	ldrh r0, [r0]
 	bx lr
@@ -288901,7 +288901,7 @@ current_map_music_get: ; 80A2F04
 	thumb_func_end current_map_music_get
 
 	thumb_func_start current_map_music_set
-current_map_music_set: ; 80A2F10
+current_map_music_set: @ 80A2F10
 	ldr r1, =0x03000f48
 	strh r0, [r1]
 	ldr r1, =0x03000f4a
@@ -288915,7 +288915,7 @@ current_map_music_set: ; 80A2F10
 	thumb_func_end current_map_music_set
 
 	thumb_func_start sub_80A2F30
-sub_80A2F30: ; 80A2F30
+sub_80A2F30: @ 80A2F30
 	ldr r0, =0x03000f48
 	movs r1, 0
 	strh r1, [r0]
@@ -288929,7 +288929,7 @@ sub_80A2F30: ; 80A2F30
 	thumb_func_end sub_80A2F30
 
 	thumb_func_start sub_80A2F50
-sub_80A2F50: ; 80A2F50
+sub_80A2F50: @ 80A2F50
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -288955,7 +288955,7 @@ _080A2F66:
 	thumb_func_end sub_80A2F50
 
 	thumb_func_start sub_80A2F88
-sub_80A2F88: ; 80A2F88
+sub_80A2F88: @ 80A2F88
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -288979,7 +288979,7 @@ sub_80A2F88: ; 80A2F88
 	thumb_func_end sub_80A2F88
 
 	thumb_func_start sub_80A2FBC
-sub_80A2FBC: ; 80A2FBC
+sub_80A2FBC: @ 80A2FBC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -289008,7 +289008,7 @@ sub_80A2FBC: ; 80A2FBC
 	thumb_func_end sub_80A2FBC
 
 	thumb_func_start sub_80A3000
-sub_80A3000: ; 80A3000
+sub_80A3000: @ 80A3000
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -289034,7 +289034,7 @@ sub_80A3000: ; 80A3000
 	thumb_func_end sub_80A3000
 
 	thumb_func_start sub_80A303C
-sub_80A303C: ; 80A303C
+sub_80A303C: @ 80A303C
 	push {lr}
 	ldr r0, =0x03000f4c
 	ldrb r0, [r0]
@@ -289055,8 +289055,8 @@ _080A305A:
 	thumb_func_end sub_80A303C
 
 	thumb_func_start pause_music_for_sound_maybe
-; void pause_music_for_sound_maybe(u8 a1)
-pause_music_for_sound_maybe: ; 80A3060
+@ void pause_music_for_sound_maybe(u8 a1)
+pause_music_for_sound_maybe: @ 80A3060
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -289078,7 +289078,7 @@ pause_music_for_sound_maybe: ; 80A3060
 	thumb_func_end pause_music_for_sound_maybe
 
 	thumb_func_start ducking_tick
-ducking_tick: ; 80A3094
+ducking_tick: @ 80A3094
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -289109,7 +289109,7 @@ _080A30C8:
 	thumb_func_end ducking_tick
 
 	thumb_func_start sub_80A30CC
-sub_80A30CC: ; 80A30CC
+sub_80A30CC: @ 80A30CC
 	push {lr}
 	lsls r0, 24
 	ldr r1, =gUnknown_085248BC
@@ -289123,8 +289123,8 @@ sub_80A30CC: ; 80A30CC
 	thumb_func_end sub_80A30CC
 
 	thumb_func_start fanfare_play
-; void fanfare_play(u16 a1)
-fanfare_play: ; 80A30E4
+@ void fanfare_play(u16 a1)
+fanfare_play: @ 80A30E4
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -289154,7 +289154,7 @@ _080A311A:
 	thumb_func_end fanfare_play
 
 	thumb_func_start task_is_not_running_overworld_fanfare
-task_is_not_running_overworld_fanfare: ; 80A3120
+task_is_not_running_overworld_fanfare: @ 80A3120
 	push {lr}
 	ldr r0, =task50_overworld_fanfare
 	bl is_function_an_active_task
@@ -289173,7 +289173,7 @@ _080A313A:
 	thumb_func_end task_is_not_running_overworld_fanfare
 
 	thumb_func_start task50_overworld_fanfare
-task50_overworld_fanfare: ; 80A3140
+task50_overworld_fanfare: @ 80A3140
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -289198,8 +289198,8 @@ _080A3164:
 	thumb_func_end task50_overworld_fanfare
 
 	thumb_func_start task_add_50_overworld_fanfare_if_not_running
-; void task_add_50_overworld_fanfare_if_not_running()
-task_add_50_overworld_fanfare_if_not_running: ; 80A3170
+@ void task_add_50_overworld_fanfare_if_not_running()
+task_add_50_overworld_fanfare_if_not_running: @ 80A3170
 	push {r4,lr}
 	ldr r4, =task50_overworld_fanfare
 	adds r0, r4, 0
@@ -289219,7 +289219,7 @@ _080A318A:
 	thumb_func_end task_add_50_overworld_fanfare_if_not_running
 
 	thumb_func_start sub_80A3194
-sub_80A3194: ; 80A3194
+sub_80A3194: @ 80A3194
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -289257,7 +289257,7 @@ _080A31B0:
 	thumb_func_end sub_80A3194
 
 	thumb_func_start sub_80A31E8
-sub_80A31E8: ; 80A31E8
+sub_80A31E8: @ 80A31E8
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -289270,7 +289270,7 @@ sub_80A31E8: ; 80A31E8
 	thumb_func_end sub_80A31E8
 
 	thumb_func_start sub_80A3200
-sub_80A3200: ; 80A3200
+sub_80A3200: @ 80A3200
 	push {lr}
 	ldr r0, =0x03007420
 	ldr r1, [r0, 0x4]
@@ -289291,7 +289291,7 @@ _080A3222:
 	thumb_func_end sub_80A3200
 
 	thumb_func_start sub_80A3228
-sub_80A3228: ; 80A3228
+sub_80A3228: @ 80A3228
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -289304,8 +289304,8 @@ sub_80A3228: ; 80A3228
 	thumb_func_end sub_80A3228
 
 	thumb_func_start play_sound_effect
-; void play_sound_effect(u8 a1)
-play_sound_effect: ; 80A3240
+@ void play_sound_effect(u8 a1)
+play_sound_effect: @ 80A3240
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -289318,7 +289318,7 @@ play_sound_effect: ; 80A3240
 	thumb_func_end play_sound_effect
 
 	thumb_func_start sub_80A3258
-sub_80A3258: ; 80A3258
+sub_80A3258: @ 80A3258
 	push {lr}
 	ldr r0, =0x03007420
 	ldrh r0, [r0, 0x4]
@@ -289335,7 +289335,7 @@ _080A326E:
 	thumb_func_end sub_80A3258
 
 	thumb_func_start cry_related
-cry_related: ; 80A3274
+cry_related: @ 80A3274
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -289369,7 +289369,7 @@ cry_related: ; 80A3274
 	thumb_func_end cry_related
 
 	thumb_func_start sub_80A32C0
-sub_80A32C0: ; 80A32C0
+sub_80A32C0: @ 80A32C0
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -289390,7 +289390,7 @@ sub_80A32C0: ; 80A32C0
 	thumb_func_end sub_80A32C0
 
 	thumb_func_start sub_80A32E4
-sub_80A32E4: ; 80A32E4
+sub_80A32E4: @ 80A32E4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -289434,7 +289434,7 @@ _080A332E:
 	thumb_func_end sub_80A32E4
 
 	thumb_func_start sub_80A3344
-sub_80A3344: ; 80A3344
+sub_80A3344: @ 80A3344
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -289483,7 +289483,7 @@ _080A3394:
 	thumb_func_end sub_80A3344
 
 	thumb_func_start play_cry_maybe
-play_cry_maybe: ; 80A33A8
+play_cry_maybe: @ 80A33A8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -289526,7 +289526,7 @@ _080A33EE:
 	thumb_func_end play_cry_maybe
 
 	thumb_func_start sub_80A3404
-sub_80A3404: ; 80A3404
+sub_80A3404: @ 80A3404
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -289557,7 +289557,7 @@ sub_80A3404: ; 80A3404
 	thumb_func_end sub_80A3404
 
 	thumb_func_start sub_80A344C
-sub_80A344C: ; 80A344C
+sub_80A344C: @ 80A344C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -289812,7 +289812,7 @@ _080A365E:
 	thumb_func_end sub_80A344C
 
 	thumb_func_start sub_80A3678
-sub_80A3678: ; 80A3678
+sub_80A3678: @ 80A3678
 	push {lr}
 	ldr r0, =sub_80A370C
 	bl is_function_an_active_task
@@ -289832,7 +289832,7 @@ _080A3696:
 	thumb_func_end sub_80A3678
 
 	thumb_func_start sub_80A369C
-sub_80A369C: ; 80A369C
+sub_80A369C: @ 80A369C
 	push {lr}
 	ldr r0, =0x020383e8
 	ldr r0, [r0]
@@ -289844,7 +289844,7 @@ sub_80A369C: ; 80A369C
 	thumb_func_end sub_80A369C
 
 	thumb_func_start sub_80A36B4
-sub_80A36B4: ; 80A36B4
+sub_80A36B4: @ 80A36B4
 	push {lr}
 	ldr r0, =0x020383e8
 	ldr r0, [r0]
@@ -289855,7 +289855,7 @@ sub_80A36B4: ; 80A36B4
 	thumb_func_end sub_80A36B4
 
 	thumb_func_start sub_80A36C8
-sub_80A36C8: ; 80A36C8
+sub_80A36C8: @ 80A36C8
 	push {lr}
 	ldr r0, =0x020383e8
 	ldr r0, [r0]
@@ -289874,7 +289874,7 @@ _080A36E6:
 	thumb_func_end sub_80A36C8
 
 	thumb_func_start sub_80A36EC
-sub_80A36EC: ; 80A36EC
+sub_80A36EC: @ 80A36EC
 	push {lr}
 	ldr r0, =0x020383e8
 	ldr r0, [r0]
@@ -289892,7 +289892,7 @@ _080A3706:
 	thumb_func_end sub_80A36EC
 
 	thumb_func_start sub_80A370C
-sub_80A370C: ; 80A370C
+sub_80A370C: @ 80A370C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -289925,7 +289925,7 @@ _080A3742:
 	thumb_func_end sub_80A370C
 
 	thumb_func_start sub_80A3754
-sub_80A3754: ; 80A3754
+sub_80A3754: @ 80A3754
 	push {r4,lr}
 	ldr r4, =sub_80A370C
 	adds r0, r4, 0
@@ -289945,7 +289945,7 @@ _080A376E:
 	thumb_func_end sub_80A3754
 
 	thumb_func_start song_play_for_text
-song_play_for_text: ; 80A3778
+song_play_for_text: @ 80A3778
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -289968,7 +289968,7 @@ _080A3790:
 	thumb_func_end song_play_for_text
 
 	thumb_func_start audio_play
-audio_play: ; 80A37A4
+audio_play: @ 80A37A4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -289978,7 +289978,7 @@ audio_play: ; 80A37A4
 	thumb_func_end audio_play
 
 	thumb_func_start audio_play_and_stuff
-audio_play_and_stuff: ; 80A37B4
+audio_play_and_stuff: @ 80A37B4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -290014,7 +290014,7 @@ audio_play_and_stuff: ; 80A37B4
 	thumb_func_end audio_play_and_stuff
 
 	thumb_func_start sub_80A3808
-sub_80A3808: ; 80A3808
+sub_80A3808: @ 80A3808
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -290038,7 +290038,7 @@ sub_80A3808: ; 80A3808
 	thumb_func_end sub_80A3808
 
 	thumb_func_start sub_80A383C
-sub_80A383C: ; 80A383C
+sub_80A383C: @ 80A383C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -290062,7 +290062,7 @@ sub_80A383C: ; 80A383C
 	thumb_func_end sub_80A383C
 
 	thumb_func_start sub_80A3870
-sub_80A3870: ; 80A3870
+sub_80A3870: @ 80A3870
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030075f0
@@ -290083,7 +290083,7 @@ sub_80A3870: ; 80A3870
 	thumb_func_end sub_80A3870
 
 	thumb_func_start mplay_has_finished_maybe
-mplay_has_finished_maybe: ; 80A38A0
+mplay_has_finished_maybe: @ 80A38A0
 	push {lr}
 	ldr r0, =0x030075f0
 	ldr r1, [r0, 0x4]
@@ -290119,7 +290119,7 @@ _080A38DE:
 	thumb_func_end mplay_has_finished_maybe
 
 	thumb_func_start sub_80A38E4
-sub_80A38E4: ; 80A38E4
+sub_80A38E4: @ 80A38E4
 	push {lr}
 	ldr r0, =0x03007420
 	ldr r1, [r0, 0x4]
@@ -290140,7 +290140,7 @@ _080A3906:
 	thumb_func_end sub_80A38E4
 
 	thumb_func_start sub_80A390C
-sub_80A390C: ; 80A390C
+sub_80A390C: @ 80A390C
 	push {lr}
 	ldr r0, =0x03007800
 	ldr r1, [r0, 0x4]
@@ -290161,7 +290161,7 @@ _080A392E:
 	thumb_func_end sub_80A390C
 
 	thumb_func_start sub_80A3934
-sub_80A3934: ; 80A3934
+sub_80A3934: @ 80A3934
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -290242,7 +290242,7 @@ _080A3994:
 	thumb_func_end sub_80A3934
 
 	thumb_func_start move_anim_start_t1
-move_anim_start_t1: ; 80A3A10
+move_anim_start_t1: @ 80A3A10
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -290264,7 +290264,7 @@ move_anim_start_t1: ; 80A3A10
 	thumb_func_end move_anim_start_t1
 
 	thumb_func_start move_something
-move_something: ; 80A3A48
+move_something: @ 80A3A48
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -290440,7 +290440,7 @@ _080A3BC2:
 	thumb_func_end move_something
 
 	thumb_func_start move_anim_8072740
-move_anim_8072740: ; 80A3BFC
+move_anim_8072740: @ 80A3BFC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl obj_free_rotscale_entry
@@ -290457,7 +290457,7 @@ move_anim_8072740: ; 80A3BFC
 	thumb_func_end move_anim_8072740
 
 	thumb_func_start move_anim_task_del
-move_anim_task_del: ; 80A3C1C
+move_anim_task_del: @ 80A3C1C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -290472,7 +290472,7 @@ move_anim_task_del: ; 80A3C1C
 	thumb_func_end move_anim_task_del
 
 	thumb_func_start move_anim_related_task_del
-move_anim_related_task_del: ; 80A3C38
+move_anim_related_task_del: @ 80A3C38
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -290487,7 +290487,7 @@ move_anim_related_task_del: ; 80A3C38
 	thumb_func_end move_anim_related_task_del
 
 	thumb_func_start sub_80A3C54
-sub_80A3C54: ; 80A3C54
+sub_80A3C54: @ 80A3C54
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -290513,7 +290513,7 @@ _080A3C7C:
 	thumb_func_end sub_80A3C54
 
 	thumb_func_start sub_80A3C84
-sub_80A3C84: ; 80A3C84
+sub_80A3C84: @ 80A3C84
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -290541,7 +290541,7 @@ _080A3CB0:
 	thumb_func_end sub_80A3C84
 
 	thumb_func_start move_anim_waiter
-move_anim_waiter: ; 80A3CB8
+move_anim_waiter: @ 80A3CB8
 	push {lr}
 	ldr r2, =0x020383fc
 	ldrb r1, [r2]
@@ -290564,7 +290564,7 @@ _080A3CDE:
 	thumb_func_end move_anim_waiter
 
 	thumb_func_start move_anim_execute
-move_anim_execute: ; 80A3CE4
+move_anim_execute: @ 80A3CE4
 	push {r4,lr}
 	ldr r4, =gUnknown_08525E98
 _080A3CE8:
@@ -290593,7 +290593,7 @@ _080A3D0C:
 	thumb_func_end move_anim_execute
 
 	thumb_func_start ma00_load_graphics
-ma00_load_graphics: ; 80A3D24
+ma00_load_graphics: @ 80A3D24
 	push {r4-r6,lr}
 	ldr r6, =0x020383f0
 	ldr r0, [r6]
@@ -290633,8 +290633,8 @@ ma00_load_graphics: ; 80A3D24
 	thumb_func_end ma00_load_graphics
 
 	thumb_func_start ma01_080728D0
-; void ma01_080728D0()
-ma01_080728D0: ; 80A3D8C
+@ void ma01_080728D0()
+ma01_080728D0: @ 80A3D8C
 	push {r4-r6,lr}
 	ldr r6, =0x020383f0
 	ldr r0, [r6]
@@ -290668,7 +290668,7 @@ ma01_080728D0: ; 80A3D8C
 	thumb_func_end ma01_080728D0
 
 	thumb_func_start ma02_instanciate_template
-ma02_instanciate_template: ; 80A3DD8
+ma02_instanciate_template: @ 80A3DD8
 	push {r4-r7,lr}
 	ldr r5, =0x020383f0
 	ldr r1, [r5]
@@ -290788,7 +290788,7 @@ _080A3E88:
 	thumb_func_end ma02_instanciate_template
 
 	thumb_func_start sub_80A3ECC
-sub_80A3ECC: ; 80A3ECC
+sub_80A3ECC: @ 80A3ECC
 	push {r4-r7,lr}
 	ldr r4, =0x020383f0
 	ldr r1, [r4]
@@ -290848,7 +290848,7 @@ _080A3F1C:
 	thumb_func_end sub_80A3ECC
 
 	thumb_func_start ma04_wait_countdown
-ma04_wait_countdown: ; 80A3F48
+ma04_wait_countdown: @ 80A3F48
 	push {r4,lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -290877,7 +290877,7 @@ _080A3F66:
 	thumb_func_end ma04_wait_countdown
 
 	thumb_func_start sub_80A3F88
-sub_80A3F88: ; 80A3F88
+sub_80A3F88: @ 80A3F88
 	push {lr}
 	ldr r0, =0x020383fe
 	ldrb r2, [r0]
@@ -290902,17 +290902,17 @@ _080A3FB2:
 	thumb_func_end sub_80A3F88
 
 	thumb_func_start nullsub_6
-nullsub_6: ; 80A3FBC
+nullsub_6: @ 80A3FBC
 	bx lr
 	thumb_func_end nullsub_6
 
 	thumb_func_start nullsub_7
-nullsub_7: ; 80A3FC0
+nullsub_7: @ 80A3FC0
 	bx lr
 	thumb_func_end nullsub_7
 
 	thumb_func_start sub_80A3FC4
-sub_80A3FC4: ; 80A3FC4
+sub_80A3FC4: @ 80A3FC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -291022,7 +291022,7 @@ _080A40A2:
 	thumb_func_end sub_80A3FC4
 
 	thumb_func_start ma09_play_sound
-ma09_play_sound: ; 80A40CC
+ma09_play_sound: @ 80A40CC
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r0, [r4]
@@ -291043,7 +291043,7 @@ ma09_play_sound: ; 80A40CC
 	thumb_func_end ma09_play_sound
 
 	thumb_func_start sub_80A40F4
-sub_80A40F4: ; 80A40F4
+sub_80A40F4: @ 80A40F4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -291144,7 +291144,7 @@ _080A41BE:
 	thumb_func_end sub_80A40F4
 
 	thumb_func_start sub_80A41D8
-sub_80A41D8: ; 80A41D8
+sub_80A41D8: @ 80A41D8
 	push {r4,r5,lr}
 	ldr r1, =0x020383f0
 	ldr r2, [r1]
@@ -291280,7 +291280,7 @@ _080A42D8:
 	thumb_func_end sub_80A41D8
 
 	thumb_func_start b_side_obj__get_some_boolean
-b_side_obj__get_some_boolean: ; 80A4310
+b_side_obj__get_some_boolean: @ 80A4310
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -291341,7 +291341,7 @@ _080A4386:
 	thumb_func_end b_side_obj__get_some_boolean
 
 	thumb_func_start sub_80A438C
-sub_80A438C: ; 80A438C
+sub_80A438C: @ 80A438C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -291669,7 +291669,7 @@ _080A4666:
 	thumb_func_end sub_80A438C
 
 	thumb_func_start sub_80A46A0
-sub_80A46A0: ; 80A46A0
+sub_80A46A0: @ 80A46A0
 	push {r4-r7,lr}
 	sub sp, 0x10
 	ldr r0, =0x02039f34
@@ -291738,7 +291738,7 @@ _080A4712:
 	thumb_func_end sub_80A46A0
 
 	thumb_func_start sub_80A4720
-sub_80A4720: ; 80A4720
+sub_80A4720: @ 80A4720
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -291790,7 +291790,7 @@ _080A476C:
 	thumb_func_end sub_80A4720
 
 	thumb_func_start sub_80A477C
-sub_80A477C: ; 80A477C
+sub_80A477C: @ 80A477C
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -291831,8 +291831,8 @@ _080A47C6:
 	thumb_func_end sub_80A477C
 
 	thumb_func_start task_pA_ma0A_obj_to_bg_pal
-; void task_pA_ma0A_obj_to_bg_pal(int task_id)
-task_pA_ma0A_obj_to_bg_pal: ; 80A47D8
+@ void task_pA_ma0A_obj_to_bg_pal(int task_id)
+task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -291922,7 +291922,7 @@ _080A4896:
 	thumb_func_end task_pA_ma0A_obj_to_bg_pal
 
 	thumb_func_start ma0B_0807324C
-ma0B_0807324C: ; 80A48B0
+ma0B_0807324C: @ 80A48B0
 	push {r4,r5,lr}
 	ldr r0, =0x020383f0
 	ldr r2, [r0]
@@ -292021,7 +292021,7 @@ _080A494A:
 	thumb_func_end ma0B_0807324C
 
 	thumb_func_start sub_80A4980
-sub_80A4980: ; 80A4980
+sub_80A4980: @ 80A4980
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -292096,7 +292096,7 @@ _080A4A0A:
 	thumb_func_end sub_80A4980
 
 	thumb_func_start sub_80A4A18
-sub_80A4A18: ; 80A4A18
+sub_80A4A18: @ 80A4A18
 	push {r4,r5,lr}
 	ldr r0, =0x020383f0
 	ldr r2, [r0]
@@ -292198,7 +292198,7 @@ _080A4ACA:
 	thumb_func_end sub_80A4A18
 
 	thumb_func_start ma23_8073484
-ma23_8073484: ; 80A4ADC
+ma23_8073484: @ 80A4ADC
 	push {r4-r6,lr}
 	ldr r0, =0x020383f0
 	ldr r2, [r0]
@@ -292300,7 +292300,7 @@ _080A4B7A:
 	thumb_func_end ma23_8073484
 
 	thumb_func_start sub_80A4BB0
-sub_80A4BB0: ; 80A4BB0
+sub_80A4BB0: @ 80A4BB0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -292376,7 +292376,7 @@ _080A4C3E:
 	thumb_func_end sub_80A4BB0
 
 	thumb_func_start ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
-ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument: ; 80A4C48
+ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument: @ 80A4C48
 	push {r4,r5,lr}
 	ldr r2, =0x020383f0
 	ldr r0, [r2]
@@ -292404,7 +292404,7 @@ ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument: ; 80A4C48
 	thumb_func_end ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
 
 	thumb_func_start ma1E_set_BLDCNT
-ma1E_set_BLDCNT: ; 80A4C80
+ma1E_set_BLDCNT: @ 80A4C80
 	push {lr}
 	ldr r3, =0x020383f0
 	ldr r0, [r3]
@@ -292426,7 +292426,7 @@ ma1E_set_BLDCNT: ; 80A4C80
 	thumb_func_end ma1E_set_BLDCNT
 
 	thumb_func_start ma0D_reset_BLDCNT_and_BLDALPHA
-ma0D_reset_BLDCNT_and_BLDALPHA: ; 80A4CA8
+ma0D_reset_BLDCNT_and_BLDALPHA: @ 80A4CA8
 	push {lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -292444,7 +292444,7 @@ ma0D_reset_BLDCNT_and_BLDALPHA: ; 80A4CA8
 	thumb_func_end ma0D_reset_BLDCNT_and_BLDALPHA
 
 	thumb_func_start ma0E_call
-ma0E_call: ; 80A4CCC
+ma0E_call: @ 80A4CCC
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r1, [r4]
@@ -292471,7 +292471,7 @@ ma0E_call: ; 80A4CCC
 	thumb_func_end ma0E_call
 
 	thumb_func_start sub_80A4D00
-sub_80A4D00: ; 80A4D00
+sub_80A4D00: @ 80A4D00
 	ldr r0, =0x020383f0
 	ldr r1, =0x020383f4
 	ldr r1, [r1]
@@ -292481,7 +292481,7 @@ sub_80A4D00: ; 80A4D00
 	thumb_func_end sub_80A4D00
 
 	thumb_func_start ma10_080736AC
-ma10_080736AC: ; 80A4D14
+ma10_080736AC: @ 80A4D14
 	push {r4,r5,lr}
 	ldr r5, =0x020383f0
 	ldr r1, [r5]
@@ -292507,7 +292507,7 @@ ma10_080736AC: ; 80A4D14
 	thumb_func_end ma10_080736AC
 
 	thumb_func_start ma11_if_else
-ma11_if_else: ; 80A4D48
+ma11_if_else: @ 80A4D48
 	push {lr}
 	ldr r3, =0x020383f0
 	ldr r2, [r3]
@@ -292540,7 +292540,7 @@ _080A4D62:
 	thumb_func_end ma11_if_else
 
 	thumb_func_start ma12_cond_if
-ma12_cond_if: ; 80A4D88
+ma12_cond_if: @ 80A4D88
 	push {r4,r5,lr}
 	ldr r5, =0x020383f0
 	ldr r4, [r5]
@@ -292576,7 +292576,7 @@ _080A4DC4:
 	thumb_func_end ma12_cond_if
 
 	thumb_func_start ma13_goto
-ma13_goto: ; 80A4DCC
+ma13_goto: @ 80A4DCC
 	ldr r3, =0x020383f0
 	ldr r0, [r3]
 	adds r2, r0, 0x1
@@ -292597,7 +292597,7 @@ ma13_goto: ; 80A4DCC
 	thumb_func_end ma13_goto
 
 	thumb_func_start sub_80A4DF0
-sub_80A4DF0: ; 80A4DF0
+sub_80A4DF0: @ 80A4DF0
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, =0x00000439
@@ -292618,7 +292618,7 @@ _080A4E12:
 	thumb_func_end sub_80A4DF0
 
 	thumb_func_start ma14_load_background
-ma14_load_background: ; 80A4E18
+ma14_load_background: @ 80A4E18
 	push {r4,lr}
 	ldr r1, =0x020383f0
 	ldr r2, [r1]
@@ -292648,7 +292648,7 @@ ma14_load_background: ; 80A4E18
 	thumb_func_end ma14_load_background
 
 	thumb_func_start sub_80A4E5C
-sub_80A4E5C: ; 80A4E5C
+sub_80A4E5C: @ 80A4E5C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -292716,7 +292716,7 @@ _080A4EDA:
 	thumb_func_end sub_80A4E5C
 
 	thumb_func_start task_p5_load_battle_screen_elements
-task_p5_load_battle_screen_elements: ; 80A4EF4
+task_p5_load_battle_screen_elements: @ 80A4EF4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -292821,7 +292821,7 @@ _080A4FBC:
 	thumb_func_end task_p5_load_battle_screen_elements
 
 	thumb_func_start sub_80A4FC8
-sub_80A4FC8: ; 80A4FC8
+sub_80A4FC8: @ 80A4FC8
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r7, r0, 16
@@ -292900,7 +292900,7 @@ _080A507E:
 	thumb_func_end sub_80A4FC8
 
 	thumb_func_start dp01t_11_3_message_for_player_only
-dp01t_11_3_message_for_player_only: ; 80A5090
+dp01t_11_3_message_for_player_only: @ 80A5090
 	push {lr}
 	bl sub_80A4DF0
 	lsls r0, 24
@@ -292916,7 +292916,7 @@ _080A50A6:
 	thumb_func_end dp01t_11_3_message_for_player_only
 
 	thumb_func_start ma15_load_battle_screen_elements
-ma15_load_battle_screen_elements: ; 80A50AC
+ma15_load_battle_screen_elements: @ 80A50AC
 	push {lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -292943,7 +292943,7 @@ ma15_load_battle_screen_elements: ; 80A50AC
 	thumb_func_end ma15_load_battle_screen_elements
 
 	thumb_func_start ma16_wait_for_battle_screen_elements_s2
-ma16_wait_for_battle_screen_elements_s2: ; 80A50F0
+ma16_wait_for_battle_screen_elements_s2: @ 80A50F0
 	push {lr}
 	ldr r0, =0x02038433
 	ldrb r0, [r0]
@@ -292968,7 +292968,7 @@ _080A5118:
 	thumb_func_end ma16_wait_for_battle_screen_elements_s2
 
 	thumb_func_start sub_80A5124
-sub_80A5124: ; 80A5124
+sub_80A5124: @ 80A5124
 	push {lr}
 	ldr r0, =0x02038433
 	ldrb r2, [r0]
@@ -292993,7 +292993,7 @@ _080A514E:
 	thumb_func_end sub_80A5124
 
 	thumb_func_start ma18_load_background_probably
-ma18_load_background_probably: ; 80A5158
+ma18_load_background_probably: @ 80A5158
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r1, [r4]
@@ -293011,7 +293011,7 @@ ma18_load_background_probably: ; 80A5158
 	thumb_func_end ma18_load_background_probably
 
 	thumb_func_start sub_80A5178
-sub_80A5178: ; 80A5178
+sub_80A5178: @ 80A5178
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -293133,7 +293133,7 @@ _080A526C:
 	thumb_func_end sub_80A5178
 
 	thumb_func_start sub_80A5278
-sub_80A5278: ; 80A5278
+sub_80A5278: @ 80A5278
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -293189,7 +293189,7 @@ _080A52DE:
 	thumb_func_end sub_80A5278
 
 	thumb_func_start sub_80A52EC
-sub_80A52EC: ; 80A52EC
+sub_80A52EC: @ 80A52EC
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -293213,7 +293213,7 @@ _080A5306:
 	thumb_func_end sub_80A52EC
 
 	thumb_func_start sub_80A5314
-sub_80A5314: ; 80A5314
+sub_80A5314: @ 80A5314
 	push {lr}
 	lsls r2, 16
 	lsrs r2, 16
@@ -293253,7 +293253,7 @@ _080A534A:
 	thumb_func_end sub_80A5314
 
 	thumb_func_start ma19_08073BC8
-ma19_08073BC8: ; 80A5354
+ma19_08073BC8: @ 80A5354
 	push {r4,r5,lr}
 	ldr r5, =0x020383f0
 	ldr r0, [r5]
@@ -293281,7 +293281,7 @@ ma19_08073BC8: ; 80A5354
 	thumb_func_end ma19_08073BC8
 
 	thumb_func_start ma1A_8073C00
-ma1A_8073C00: ; 80A538C
+ma1A_8073C00: @ 80A538C
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r1, [r4]
@@ -293303,7 +293303,7 @@ ma1A_8073C00: ; 80A538C
 	thumb_func_end ma1A_8073C00
 
 	thumb_func_start ma1B_8073C2C
-ma1B_8073C2C: ; 80A53B8
+ma1B_8073C2C: @ 80A53B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -293391,7 +293391,7 @@ ma1B_8073C2C: ; 80A53B8
 	thumb_func_end ma1B_8073C2C
 
 	thumb_func_start c3_08073CEC
-c3_08073CEC: ; 80A5478
+c3_08073CEC: @ 80A5478
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -293467,7 +293467,7 @@ _080A54FC:
 	thumb_func_end c3_08073CEC
 
 	thumb_func_start sub_80A5508
-sub_80A5508: ; 80A5508
+sub_80A5508: @ 80A5508
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -293535,7 +293535,7 @@ sub_80A5508: ; 80A5508
 	thumb_func_end sub_80A5508
 
 	thumb_func_start sub_80A559C
-sub_80A559C: ; 80A559C
+sub_80A559C: @ 80A559C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -293623,7 +293623,7 @@ sub_80A559C: ; 80A559C
 	thumb_func_end sub_80A559C
 
 	thumb_func_start ma1C_8073ED0
-ma1C_8073ED0: ; 80A565C
+ma1C_8073ED0: @ 80A565C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -293685,7 +293685,7 @@ ma1C_8073ED0: ; 80A565C
 	thumb_func_end ma1C_8073ED0
 
 	thumb_func_start sub_80A56E4
-sub_80A56E4: ; 80A56E4
+sub_80A56E4: @ 80A56E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -293731,7 +293731,7 @@ _080A5732:
 	thumb_func_end sub_80A56E4
 
 	thumb_func_start ma1D_08073FB4
-ma1D_08073FB4: ; 80A5740
+ma1D_08073FB4: @ 80A5740
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -293783,7 +293783,7 @@ ma1D_08073FB4: ; 80A5740
 	thumb_func_end ma1D_08073FB4
 
 	thumb_func_start sub_80A57B4
-sub_80A57B4: ; 80A57B4
+sub_80A57B4: @ 80A57B4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -293816,7 +293816,7 @@ _080A57E8:
 	thumb_func_end sub_80A57B4
 
 	thumb_func_start sub_80A57F8
-sub_80A57F8: ; 80A57F8
+sub_80A57F8: @ 80A57F8
 	push {r4-r6,lr}
 	ldr r4, =0x020383f0
 	ldr r1, [r4]
@@ -293873,7 +293873,7 @@ _080A5842:
 	thumb_func_end sub_80A57F8
 
 	thumb_func_start ma20_wait_for_something
-ma20_wait_for_something: ; 80A586C
+ma20_wait_for_something: @ 80A586C
 	push {r4,r5,lr}
 	ldr r0, =0x020383ff
 	ldrb r5, [r0]
@@ -293927,7 +293927,7 @@ _080A58DE:
 	thumb_func_end ma20_wait_for_something
 
 	thumb_func_start ma21_08074164
-ma21_08074164: ; 80A58F0
+ma21_08074164: @ 80A58F0
 	push {r4-r6,lr}
 	ldr r5, =0x020383f0
 	ldr r4, [r5]
@@ -293971,7 +293971,7 @@ _080A593E:
 	thumb_func_end ma21_08074164
 
 	thumb_func_start sub_80A5944
-sub_80A5944: ; 80A5944
+sub_80A5944: @ 80A5944
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r0, [r4]
@@ -294006,7 +294006,7 @@ _080A597E:
 	thumb_func_end sub_80A5944
 
 	thumb_func_start sub_80A5984
-sub_80A5984: ; 80A5984
+sub_80A5984: @ 80A5984
 	push {r4,lr}
 	ldr r0, =0x020383f0
 	ldr r1, [r0]
@@ -294050,7 +294050,7 @@ _080A59D2:
 	thumb_func_end sub_80A5984
 
 	thumb_func_start sub_80A59DC
-sub_80A59DC: ; 80A59DC
+sub_80A59DC: @ 80A59DC
 	push {lr}
 	ldr r0, =0x020383f0
 	ldr r1, [r0]
@@ -294075,7 +294075,7 @@ _080A5A04:
 	thumb_func_end sub_80A59DC
 
 	thumb_func_start sub_80A5A0C
-sub_80A5A0C: ; 80A5A0C
+sub_80A5A0C: @ 80A5A0C
 	push {r4-r7,lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -294128,7 +294128,7 @@ _080A5A78:
 	thumb_func_end sub_80A5A0C
 
 	thumb_func_start ma2B_make_side_invisible
-ma2B_make_side_invisible: ; 80A5A80
+ma2B_make_side_invisible: @ 80A5A80
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r0, [r4]
@@ -294159,7 +294159,7 @@ _080A5AA8:
 	thumb_func_end ma2B_make_side_invisible
 
 	thumb_func_start ma2C_make_side_visible
-ma2C_make_side_visible: ; 80A5ABC
+ma2C_make_side_visible: @ 80A5ABC
 	push {r4,lr}
 	ldr r4, =0x020383f0
 	ldr r0, [r4]
@@ -294191,7 +294191,7 @@ _080A5AE6:
 	thumb_func_end ma2C_make_side_visible
 
 	thumb_func_start sub_80A5AFC
-sub_80A5AFC: ; 80A5AFC
+sub_80A5AFC: @ 80A5AFC
 	push {r4-r7,lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -294273,7 +294273,7 @@ _080A5BA6:
 	thumb_func_end sub_80A5AFC
 
 	thumb_func_start sub_80A5BAC
-sub_80A5BAC: ; 80A5BAC
+sub_80A5BAC: @ 80A5BAC
 	push {r4-r7,lr}
 	ldr r1, =0x020383f0
 	ldr r0, [r1]
@@ -294342,7 +294342,7 @@ _080A5C38:
 	thumb_func_end sub_80A5BAC
 
 	thumb_func_start ma2F_stop_music
-ma2F_stop_music: ; 80A5C44
+ma2F_stop_music: @ 80A5C44
 	push {lr}
 	ldr r0, =0x030075f0
 	bl MPlayStop_rev01
@@ -294358,7 +294358,7 @@ ma2F_stop_music: ; 80A5C44
 	thumb_func_end ma2F_stop_music
 
 	thumb_func_start sub_80A5C6C
-sub_80A5C6C: ; 80A5C6C
+sub_80A5C6C: @ 80A5C6C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -294509,7 +294509,7 @@ _080A5DB0:
 	thumb_func_end sub_80A5C6C
 
 	thumb_func_start sub_80A5DB8
-sub_80A5DB8: ; 80A5DB8
+sub_80A5DB8: @ 80A5DB8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -294737,7 +294737,7 @@ _080A5F94:
 	thumb_func_end sub_80A5DB8
 
 	thumb_func_start sub_80A5FA0
-sub_80A5FA0: ; 80A5FA0
+sub_80A5FA0: @ 80A5FA0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -294788,7 +294788,7 @@ _080A5FFE:
 	thumb_func_end sub_80A5FA0
 
 	thumb_func_start sub_80A600C
-sub_80A600C: ; 80A600C
+sub_80A600C: @ 80A600C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -294867,7 +294867,7 @@ _080A609C:
 	thumb_func_end sub_80A600C
 
 	thumb_func_start sub_80A60AC
-sub_80A60AC: ; 80A60AC
+sub_80A60AC: @ 80A60AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -294939,7 +294939,7 @@ _080A612E:
 	thumb_func_end sub_80A60AC
 
 	thumb_func_start sub_80A6138
-sub_80A6138: ; 80A6138
+sub_80A6138: @ 80A6138
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -294952,7 +294952,7 @@ sub_80A6138: ; 80A6138
 	thumb_func_end sub_80A6138
 
 	thumb_func_start sub_80A614C
-sub_80A614C: ; 80A614C
+sub_80A614C: @ 80A614C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -294988,7 +294988,7 @@ _080A6180:
 	thumb_func_end sub_80A614C
 
 	thumb_func_start sub_80A6190
-sub_80A6190: ; 80A6190
+sub_80A6190: @ 80A6190
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -295069,7 +295069,7 @@ _080A6238:
 	thumb_func_end sub_80A6190
 
 	thumb_func_start obj_id_for_side_relative_to_move
-obj_id_for_side_relative_to_move: ; 80A6240
+obj_id_for_side_relative_to_move: @ 80A6240
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -295140,7 +295140,7 @@ _080A62CA:
 	thumb_func_end obj_id_for_side_relative_to_move
 
 	thumb_func_start oamt_set_x3A_32
-oamt_set_x3A_32: ; 80A62D4
+oamt_set_x3A_32: @ 80A62D4
 	strh r1, [r0, 0x3A]
 	lsrs r1, 16
 	strh r1, [r0, 0x3C]
@@ -295148,7 +295148,7 @@ oamt_set_x3A_32: ; 80A62D4
 	thumb_func_end oamt_set_x3A_32
 
 	thumb_func_start sub_80A62DC
-sub_80A62DC: ; 80A62DC
+sub_80A62DC: @ 80A62DC
 	ldrh r2, [r0, 0x3A]
 	movs r3, 0x3C
 	ldrsh r1, [r0, r3]
@@ -295159,7 +295159,7 @@ sub_80A62DC: ; 80A62DC
 	thumb_func_end sub_80A62DC
 
 	thumb_func_start sub_80A62EC
-sub_80A62EC: ; 80A62EC
+sub_80A62EC: @ 80A62EC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -295212,7 +295212,7 @@ _080A6346:
 	thumb_func_end sub_80A62EC
 
 	thumb_func_start sub_80A634C
-sub_80A634C: ; 80A634C
+sub_80A634C: @ 80A634C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -295279,7 +295279,7 @@ _080A63C2:
 	thumb_func_end sub_80A634C
 
 	thumb_func_start sub_80A63C8
-sub_80A63C8: ; 80A63C8
+sub_80A63C8: @ 80A63C8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -295353,7 +295353,7 @@ _080A644A:
 	thumb_func_end sub_80A63C8
 
 	thumb_func_start sub_80A6450
-sub_80A6450: ; 80A6450
+sub_80A6450: @ 80A6450
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -295406,7 +295406,7 @@ _080A64AA:
 	thumb_func_end sub_80A6450
 
 	thumb_func_start sub_80A64B0
-sub_80A64B0: ; 80A64B0
+sub_80A64B0: @ 80A64B0
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x2E]
@@ -295426,7 +295426,7 @@ _080A64CA:
 	thumb_func_end sub_80A64B0
 
 	thumb_func_start sub_80A64D0
-sub_80A64D0: ; 80A64D0
+sub_80A64D0: @ 80A64D0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A64EC
@@ -295441,7 +295441,7 @@ sub_80A64D0: ; 80A64D0
 	thumb_func_end sub_80A64D0
 
 	thumb_func_start sub_80A64EC
-sub_80A64EC: ; 80A64EC
+sub_80A64EC: @ 80A64EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x30
@@ -295484,7 +295484,7 @@ _080A651C:
 	thumb_func_end sub_80A64EC
 
 	thumb_func_start sub_80A653C
-sub_80A653C: ; 80A653C
+sub_80A653C: @ 80A653C
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x2E]
@@ -295512,7 +295512,7 @@ _080A6566:
 	thumb_func_end sub_80A653C
 
 	thumb_func_start sub_80A656C
-sub_80A656C: ; 80A656C
+sub_80A656C: @ 80A656C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2E]
@@ -295546,7 +295546,7 @@ _080A65A2:
 	thumb_func_end sub_80A656C
 
 	thumb_func_start sub_80A65A8
-sub_80A65A8: ; 80A65A8
+sub_80A65A8: @ 80A65A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -295583,7 +295583,7 @@ _080A65DE:
 	thumb_func_end sub_80A65A8
 
 	thumb_func_start sub_80A65EC
-sub_80A65EC: ; 80A65EC
+sub_80A65EC: @ 80A65EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x24]
@@ -295616,7 +295616,7 @@ sub_80A65EC: ; 80A65EC
 	thumb_func_end sub_80A65EC
 
 	thumb_func_start sub_80A6630
-sub_80A6630: ; 80A6630
+sub_80A6630: @ 80A6630
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x2E]
@@ -295659,7 +295659,7 @@ _080A667A:
 	thumb_func_end sub_80A6630
 
 	thumb_func_start sub_80A6680
-sub_80A6680: ; 80A6680
+sub_80A6680: @ 80A6680
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -295709,7 +295709,7 @@ _080A66D6:
 	thumb_func_end sub_80A6680
 
 	thumb_func_start sub_80A66DC
-sub_80A66DC: ; 80A66DC
+sub_80A66DC: @ 80A66DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -295768,7 +295768,7 @@ _080A6744:
 	thumb_func_end sub_80A66DC
 
 	thumb_func_start move_anim_8074EE0
-move_anim_8074EE0: ; 80A674C
+move_anim_8074EE0: @ 80A674C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl obj_free_rotscale_entry
@@ -295780,7 +295780,7 @@ move_anim_8074EE0: ; 80A674C
 	thumb_func_end move_anim_8074EE0
 
 	thumb_func_start sub_80A6760
-sub_80A6760: ; 80A6760
+sub_80A6760: @ 80A6760
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x24]
@@ -295813,7 +295813,7 @@ sub_80A6760: ; 80A6760
 	thumb_func_end sub_80A6760
 
 	thumb_func_start sub_80A67A4
-sub_80A67A4: ; 80A67A4
+sub_80A67A4: @ 80A67A4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -295826,7 +295826,7 @@ sub_80A67A4: ; 80A67A4
 	thumb_func_end sub_80A67A4
 
 	thumb_func_start sub_80A67BC
-sub_80A67BC: ; 80A67BC
+sub_80A67BC: @ 80A67BC
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -295843,7 +295843,7 @@ _080A67D2:
 	thumb_func_end sub_80A67BC
 
 	thumb_func_start sub_80A67D8
-sub_80A67D8: ; 80A67D8
+sub_80A67D8: @ 80A67D8
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -295860,7 +295860,7 @@ _080A67EE:
 	thumb_func_end sub_80A67D8
 
 	thumb_func_start sub_80A67F4
-sub_80A67F4: ; 80A67F4
+sub_80A67F4: @ 80A67F4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -295877,7 +295877,7 @@ sub_80A67F4: ; 80A67F4
 	thumb_func_end sub_80A67F4
 
 	thumb_func_start sub_80A6814
-sub_80A6814: ; 80A6814
+sub_80A6814: @ 80A6814
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -295896,7 +295896,7 @@ sub_80A6814: ; 80A6814
 	thumb_func_end sub_80A6814
 
 	thumb_func_start sub_80A6838
-sub_80A6838: ; 80A6838
+sub_80A6838: @ 80A6838
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -295919,7 +295919,7 @@ sub_80A6838: ; 80A6838
 	thumb_func_end sub_80A6838
 
 	thumb_func_start sub_80A6864
-sub_80A6864: ; 80A6864
+sub_80A6864: @ 80A6864
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -295976,7 +295976,7 @@ _080A68C8:
 	thumb_func_end sub_80A6864
 
 	thumb_func_start sub_80A68D4
-sub_80A68D4: ; 80A68D4
+sub_80A68D4: @ 80A68D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -295999,7 +295999,7 @@ sub_80A68D4: ; 80A68D4
 	thumb_func_end sub_80A68D4
 
 	thumb_func_start sub_80A6900
-sub_80A6900: ; 80A6900
+sub_80A6900: @ 80A6900
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -296029,7 +296029,7 @@ _080A692E:
 	thumb_func_end sub_80A6900
 
 	thumb_func_start sub_80A6934
-sub_80A6934: ; 80A6934
+sub_80A6934: @ 80A6934
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -296059,7 +296059,7 @@ _080A6962:
 	thumb_func_end sub_80A6934
 
 	thumb_func_start oamt_add_pos2_onto_pos1
-oamt_add_pos2_onto_pos1: ; 80A6968
+oamt_add_pos2_onto_pos1: @ 80A6968
 	ldrh r1, [r0, 0x24]
 	ldrh r2, [r0, 0x20]
 	adds r1, r2
@@ -296075,7 +296075,7 @@ oamt_add_pos2_onto_pos1: ; 80A6968
 	thumb_func_end oamt_add_pos2_onto_pos1
 
 	thumb_func_start sub_80A6980
-sub_80A6980: ; 80A6980
+sub_80A6980: @ 80A6980
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -296111,7 +296111,7 @@ _080A69A8:
 	thumb_func_end sub_80A6980
 
 	thumb_func_start sub_80A69CC
-sub_80A69CC: ; 80A69CC
+sub_80A69CC: @ 80A69CC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -296159,7 +296159,7 @@ _080A6A04:
 	thumb_func_end sub_80A69CC
 
 	thumb_func_start battle_side_get_owner
-battle_side_get_owner: ; 80A6A30
+battle_side_get_owner: @ 80A6A30
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02024076
@@ -296172,7 +296172,7 @@ battle_side_get_owner: ; 80A6A30
 	thumb_func_end battle_side_get_owner
 
 	thumb_func_start battle_get_per_side_status
-battle_get_per_side_status: ; 80A6A44
+battle_get_per_side_status: @ 80A6A44
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02024076
@@ -296183,7 +296183,7 @@ battle_get_per_side_status: ; 80A6A44
 	thumb_func_end battle_get_per_side_status
 
 	thumb_func_start battle_get_side_with_given_state
-battle_get_side_with_given_state: ; 80A6A54
+battle_get_side_with_given_state: @ 80A6A54
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -296215,7 +296215,7 @@ _080A6A7E:
 	thumb_func_end battle_get_side_with_given_state
 
 	thumb_func_start sub_80A6A90
-sub_80A6A90: ; 80A6A90
+sub_80A6A90: @ 80A6A90
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -296281,7 +296281,7 @@ _080A6B1A:
 	thumb_func_end sub_80A6A90
 
 	thumb_func_start battle_type_is_double
-battle_type_is_double: ; 80A6B20
+battle_type_is_double: @ 80A6B20
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
 	movs r1, 0x1
@@ -296291,7 +296291,7 @@ battle_type_is_double: ; 80A6B20
 	thumb_func_end battle_type_is_double
 
 	thumb_func_start sub_80A6B30
-sub_80A6B30: ; 80A6B30
+sub_80A6B30: @ 80A6B30
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A4DF0
@@ -296336,7 +296336,7 @@ _080A6B7E:
 	thumb_func_end sub_80A6B30
 
 	thumb_func_start sub_80A6B90
-sub_80A6B90: ; 80A6B90
+sub_80A6B90: @ 80A6B90
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -296389,7 +296389,7 @@ _080A6BEC:
 	thumb_func_end sub_80A6B90
 
 	thumb_func_start sub_80A6BFC
-sub_80A6BFC: ; 80A6BFC
+sub_80A6BFC: @ 80A6BFC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0202305c
@@ -296444,7 +296444,7 @@ _080A6C60:
 	thumb_func_end sub_80A6BFC
 
 	thumb_func_start sub_80A6C68
-sub_80A6C68: ; 80A6C68
+sub_80A6C68: @ 80A6C68
 	push {lr}
 	sub sp, 0x20
 	adds r1, r0, 0
@@ -296486,7 +296486,7 @@ sub_80A6C68: ; 80A6C68
 	thumb_func_end sub_80A6C68
 
 	thumb_func_start sub_80A6CC0
-sub_80A6CC0: ; 80A6CC0
+sub_80A6CC0: @ 80A6CC0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -296524,7 +296524,7 @@ sub_80A6CC0: ; 80A6CC0
 	thumb_func_end sub_80A6CC0
 
 	thumb_func_start sub_80A6D10
-sub_80A6D10: ; 80A6D10
+sub_80A6D10: @ 80A6D10
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -296554,7 +296554,7 @@ sub_80A6D10: ; 80A6D10
 	thumb_func_end sub_80A6D10
 
 	thumb_func_start sub_80A6D48
-sub_80A6D48: ; 80A6D48
+sub_80A6D48: @ 80A6D48
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6D10
@@ -296568,7 +296568,7 @@ sub_80A6D48: ; 80A6D48
 	thumb_func_end sub_80A6D48
 
 	thumb_func_start sub_80A6D60
-sub_80A6D60: ; 80A6D60
+sub_80A6D60: @ 80A6D60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r2, 0
@@ -296594,7 +296594,7 @@ _080A6D86:
 	thumb_func_end sub_80A6D60
 
 	thumb_func_start sub_80A6D94
-sub_80A6D94: ; 80A6D94
+sub_80A6D94: @ 80A6D94
 	push {lr}
 	bl sub_80A4DF0
 	lsls r0, 24
@@ -296610,7 +296610,7 @@ _080A6DA6:
 	thumb_func_end sub_80A6D94
 
 	thumb_func_start sub_80A6DAC
-sub_80A6DAC: ; 80A6DAC
+sub_80A6DAC: @ 80A6DAC
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -296644,7 +296644,7 @@ _080A6DE8:
 	thumb_func_end sub_80A6DAC
 
 	thumb_func_start sub_80A6DEC
-sub_80A6DEC: ; 80A6DEC
+sub_80A6DEC: @ 80A6DEC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -296664,7 +296664,7 @@ sub_80A6DEC: ; 80A6DEC
 	thumb_func_end sub_80A6DEC
 
 	thumb_func_start sub_80A6E14
-sub_80A6E14: ; 80A6E14
+sub_80A6E14: @ 80A6E14
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x32]
@@ -296697,7 +296697,7 @@ sub_80A6E14: ; 80A6E14
 	thumb_func_end sub_80A6E14
 
 	thumb_func_start obj_translate_based_on_private_1_2_3_4
-obj_translate_based_on_private_1_2_3_4: ; 80A6E54
+obj_translate_based_on_private_1_2_3_4: @ 80A6E54
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -296778,7 +296778,7 @@ _080A6ED0:
 	thumb_func_end obj_translate_based_on_private_1_2_3_4
 
 	thumb_func_start sub_80A6EEC
-sub_80A6EEC: ; 80A6EEC
+sub_80A6EEC: @ 80A6EEC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -296798,7 +296798,7 @@ sub_80A6EEC: ; 80A6EEC
 	thumb_func_end sub_80A6EEC
 
 	thumb_func_start sub_80A6F14
-sub_80A6F14: ; 80A6F14
+sub_80A6F14: @ 80A6F14
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -296818,7 +296818,7 @@ sub_80A6F14: ; 80A6F14
 	thumb_func_end sub_80A6F14
 
 	thumb_func_start sub_80A6F3C
-sub_80A6F3C: ; 80A6F3C
+sub_80A6F3C: @ 80A6F3C
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -296873,7 +296873,7 @@ _080A6F90:
 	thumb_func_end sub_80A6F3C
 
 	thumb_func_start sub_80A6F98
-sub_80A6F98: ; 80A6F98
+sub_80A6F98: @ 80A6F98
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -296889,7 +296889,7 @@ _080A6FAC:
 	thumb_func_end sub_80A6F98
 
 	thumb_func_start sub_80A6FB4
-sub_80A6FB4: ; 80A6FB4
+sub_80A6FB4: @ 80A6FB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8039E9C
@@ -296907,7 +296907,7 @@ _080A6FCE:
 	thumb_func_end sub_80A6FB4
 
 	thumb_func_start sub_80A6FD4
-sub_80A6FD4: ; 80A6FD4
+sub_80A6FD4: @ 80A6FD4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -296932,7 +296932,7 @@ _080A6FE8:
 	thumb_func_end sub_80A6FD4
 
 	thumb_func_start sub_80A7000
-sub_80A7000: ; 80A7000
+sub_80A7000: @ 80A7000
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -296952,7 +296952,7 @@ sub_80A7000: ; 80A7000
 	thumb_func_end sub_80A7000
 
 	thumb_func_start sub_80A7028
-sub_80A7028: ; 80A7028
+sub_80A7028: @ 80A7028
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -297033,7 +297033,7 @@ _080A70A4:
 	thumb_func_end sub_80A7028
 
 	thumb_func_start sub_80A70C0
-sub_80A70C0: ; 80A70C0
+sub_80A70C0: @ 80A70C0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -297053,7 +297053,7 @@ sub_80A70C0: ; 80A70C0
 	thumb_func_end sub_80A70C0
 
 	thumb_func_start sub_80A70E8
-sub_80A70E8: ; 80A70E8
+sub_80A70E8: @ 80A70E8
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -297108,7 +297108,7 @@ _080A713C:
 	thumb_func_end sub_80A70E8
 
 	thumb_func_start sub_80A7144
-sub_80A7144: ; 80A7144
+sub_80A7144: @ 80A7144
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A70E8
@@ -297124,7 +297124,7 @@ _080A7158:
 	thumb_func_end sub_80A7144
 
 	thumb_func_start sub_80A7160
-sub_80A7160: ; 80A7160
+sub_80A7160: @ 80A7160
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -297149,7 +297149,7 @@ _080A7174:
 	thumb_func_end sub_80A7160
 
 	thumb_func_start sub_80A718C
-sub_80A718C: ; 80A718C
+sub_80A718C: @ 80A718C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -297169,7 +297169,7 @@ sub_80A718C: ; 80A718C
 	thumb_func_end sub_80A718C
 
 	thumb_func_start obj_id_set_rotscale
-obj_id_set_rotscale: ; 80A71B4
+obj_id_set_rotscale: @ 80A71B4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -297233,7 +297233,7 @@ _080A71F0:
 	thumb_func_end obj_id_set_rotscale
 
 	thumb_func_start sub_80A7238
-sub_80A7238: ; 80A7238
+sub_80A7238: @ 80A7238
 	push {r4,lr}
 	bl sub_80A4DF0
 	lsls r0, 24
@@ -297264,7 +297264,7 @@ _080A726A:
 	thumb_func_end sub_80A7238
 
 	thumb_func_start sub_80A7270
-sub_80A7270: ; 80A7270
+sub_80A7270: @ 80A7270
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -297369,7 +297369,7 @@ _080A7312:
 	thumb_func_end sub_80A7270
 
 	thumb_func_start sub_80A7344
-sub_80A7344: ; 80A7344
+sub_80A7344: @ 80A7344
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -297415,7 +297415,7 @@ sub_80A7344: ; 80A7344
 	thumb_func_end sub_80A7344
 
 	thumb_func_start sub_80A73A0
-sub_80A73A0: ; 80A73A0
+sub_80A73A0: @ 80A73A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -297448,7 +297448,7 @@ _080A73CC:
 	thumb_func_end sub_80A73A0
 
 	thumb_func_start sub_80A73E0
-sub_80A73E0: ; 80A73E0
+sub_80A73E0: @ 80A73E0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -297542,7 +297542,7 @@ _080A7486:
 	thumb_func_end sub_80A73E0
 
 	thumb_func_start sub_80A749C
-sub_80A749C: ; 80A749C
+sub_80A749C: @ 80A749C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -297575,7 +297575,7 @@ sub_80A749C: ; 80A749C
 	thumb_func_end sub_80A749C
 
 	thumb_func_start sub_80A74DC
-sub_80A74DC: ; 80A74DC
+sub_80A74DC: @ 80A74DC
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -297589,7 +297589,7 @@ sub_80A74DC: ; 80A74DC
 	thumb_func_end sub_80A74DC
 
 	thumb_func_start sub_80A74F4
-sub_80A74F4: ; 80A74F4
+sub_80A74F4: @ 80A74F4
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -297604,7 +297604,7 @@ sub_80A74F4: ; 80A74F4
 	thumb_func_end sub_80A74F4
 
 	thumb_func_start sub_80A750C
-sub_80A750C: ; 80A750C
+sub_80A750C: @ 80A750C
 	push {r4-r7,lr}
 	lsls r1, 24
 	lsls r0, 20
@@ -297678,7 +297678,7 @@ _080A7598:
 	thumb_func_end sub_80A750C
 
 	thumb_func_start sub_80A75AC
-sub_80A75AC: ; 80A75AC
+sub_80A75AC: @ 80A75AC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -297821,7 +297821,7 @@ _080A76B0:
 	thumb_func_end sub_80A75AC
 
 	thumb_func_start sub_80A76C4
-sub_80A76C4: ; 80A76C4
+sub_80A76C4: @ 80A76C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -297933,14 +297933,14 @@ _080A77A0:
 	thumb_func_end sub_80A76C4
 
 	thumb_func_start sub_80A77AC
-sub_80A77AC: ; 80A77AC
+sub_80A77AC: @ 80A77AC
 	lsls r0, 24
 	lsrs r0, 24
 	bx lr
 	thumb_func_end sub_80A77AC
 
 	thumb_func_start sub_80A77B4
-sub_80A77B4: ; 80A77B4
+sub_80A77B4: @ 80A77B4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -297952,7 +297952,7 @@ sub_80A77B4: ; 80A77B4
 	thumb_func_end sub_80A77B4
 
 	thumb_func_start sub_80A77C8
-sub_80A77C8: ; 80A77C8
+sub_80A77C8: @ 80A77C8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -298000,7 +298000,7 @@ _080A781A:
 	thumb_func_end sub_80A77C8
 
 	thumb_func_start sub_80A7820
-sub_80A7820: ; 80A7820
+sub_80A7820: @ 80A7820
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -298063,7 +298063,7 @@ _080A785C:
 	thumb_func_end sub_80A7820
 
 	thumb_func_start sub_80A78AC
-sub_80A78AC: ; 80A78AC
+sub_80A78AC: @ 80A78AC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -298112,7 +298112,7 @@ _080A78CC:
 	thumb_func_end sub_80A78AC
 
 	thumb_func_start sub_80A791C
-sub_80A791C: ; 80A791C
+sub_80A791C: @ 80A791C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -298128,7 +298128,7 @@ _080A7930:
 	thumb_func_end sub_80A791C
 
 	thumb_func_start sub_80A7938
-sub_80A7938: ; 80A7938
+sub_80A7938: @ 80A7938
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -298206,7 +298206,7 @@ _080A798E:
 	thumb_func_end sub_80A7938
 
 	thumb_func_start duplicate_obj_of_side_rel2move_in_transparent_mode
-duplicate_obj_of_side_rel2move_in_transparent_mode: ; 80A79E8
+duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -298268,7 +298268,7 @@ _080A7A56:
 	thumb_func_end duplicate_obj_of_side_rel2move_in_transparent_mode
 
 	thumb_func_start obj_delete_but_dont_free_vram
-obj_delete_but_dont_free_vram: ; 80A7A5C
+obj_delete_but_dont_free_vram: @ 80A7A5C
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x3F
@@ -298282,7 +298282,7 @@ obj_delete_but_dont_free_vram: ; 80A7A5C
 	thumb_func_end obj_delete_but_dont_free_vram
 
 	thumb_func_start sub_80A7A74
-sub_80A7A74: ; 80A7A74
+sub_80A7A74: @ 80A7A74
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -298350,7 +298350,7 @@ _080A7AA8:
 	thumb_func_end sub_80A7A74
 
 	thumb_func_start sub_80A7AFC
-sub_80A7AFC: ; 80A7AFC
+sub_80A7AFC: @ 80A7AFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -298430,7 +298430,7 @@ _080A7B90:
 	thumb_func_end sub_80A7AFC
 
 	thumb_func_start sub_80A7B98
-sub_80A7B98: ; 80A7B98
+sub_80A7B98: @ 80A7B98
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -298472,7 +298472,7 @@ _080A7BE2:
 	thumb_func_end sub_80A7B98
 
 	thumb_func_start sub_80A7BF4
-sub_80A7BF4: ; 80A7BF4
+sub_80A7BF4: @ 80A7BF4
 	ldr r3, =0x0203841e
 	ldrh r1, [r3, 0x2]
 	movs r2, 0
@@ -298493,7 +298493,7 @@ sub_80A7BF4: ; 80A7BF4
 	thumb_func_end sub_80A7BF4
 
 	thumb_func_start sub_80A7C1C
-sub_80A7C1C: ; 80A7C1C
+sub_80A7C1C: @ 80A7C1C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -298570,7 +298570,7 @@ _080A7CAC:
 	thumb_func_end sub_80A7C1C
 
 	thumb_func_start sub_80A7CB4
-sub_80A7CB4: ; 80A7CB4
+sub_80A7CB4: @ 80A7CB4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -298604,7 +298604,7 @@ _080A7CEE:
 	thumb_func_end sub_80A7CB4
 
 	thumb_func_start sub_80A7CFC
-sub_80A7CFC: ; 80A7CFC
+sub_80A7CFC: @ 80A7CFC
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -298634,7 +298634,7 @@ sub_80A7CFC: ; 80A7CFC
 	thumb_func_end sub_80A7CFC
 
 	thumb_func_start sub_80A7D34
-sub_80A7D34: ; 80A7D34
+sub_80A7D34: @ 80A7D34
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038444
@@ -298792,7 +298792,7 @@ _080A7E64:
 	thumb_func_end sub_80A7D34
 
 	thumb_func_start sub_80A7E6C
-sub_80A7E6C: ; 80A7E6C
+sub_80A7E6C: @ 80A7E6C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -298834,7 +298834,7 @@ _080A7EA8:
 	thumb_func_end sub_80A7E6C
 
 	thumb_func_start sub_80A7EC0
-sub_80A7EC0: ; 80A7EC0
+sub_80A7EC0: @ 80A7EC0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -298878,7 +298878,7 @@ _080A7F00:
 	thumb_func_end sub_80A7EC0
 
 	thumb_func_start sub_80A7F18
-sub_80A7F18: ; 80A7F18
+sub_80A7F18: @ 80A7F18
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -299016,7 +299016,7 @@ _080A8042:
 	thumb_func_end sub_80A7F18
 
 	thumb_func_start sub_80A8048
-sub_80A8048: ; 80A8048
+sub_80A8048: @ 80A8048
 	strh r2, [r0]
 	asrs r2, 16
 	strh r2, [r1]
@@ -299024,7 +299024,7 @@ sub_80A8048: ; 80A8048
 	thumb_func_end sub_80A8048
 
 	thumb_func_start sub_80A8050
-sub_80A8050: ; 80A8050
+sub_80A8050: @ 80A8050
 	lsls r0, 16
 	lsrs r0, 16
 	lsls r1, 16
@@ -299033,7 +299033,7 @@ sub_80A8050: ; 80A8050
 	thumb_func_end sub_80A8050
 
 	thumb_func_start sub_80A805C
-sub_80A805C: ; 80A805C
+sub_80A805C: @ 80A805C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -299088,7 +299088,7 @@ sub_80A805C: ; 80A805C
 	thumb_func_end sub_80A805C
 
 	thumb_func_start sub_80A80C8
-sub_80A80C8: ; 80A80C8
+sub_80A80C8: @ 80A80C8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x18]
@@ -299155,7 +299155,7 @@ _080A8136:
 	thumb_func_end sub_80A80C8
 
 	thumb_func_start sub_80A8140
-sub_80A8140: ; 80A8140
+sub_80A8140: @ 80A8140
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -299182,7 +299182,7 @@ _080A815E:
 	thumb_func_end sub_80A8140
 
 	thumb_func_start sub_80A8174
-sub_80A8174: ; 80A8174
+sub_80A8174: @ 80A8174
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -299308,7 +299308,7 @@ _080A825C:
 	thumb_func_end sub_80A8174
 
 	thumb_func_start sub_80A8278
-sub_80A8278: ; 80A8278
+sub_80A8278: @ 80A8278
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r0, =0x0202406c
@@ -299362,7 +299362,7 @@ _080A82D2:
 	thumb_func_end sub_80A8278
 
 	thumb_func_start sub_80A82E4
-sub_80A82E4: ; 80A82E4
+sub_80A82E4: @ 80A82E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -299401,7 +299401,7 @@ _080A8320:
 	thumb_func_end sub_80A82E4
 
 	thumb_func_start sub_80A8328
-sub_80A8328: ; 80A8328
+sub_80A8328: @ 80A8328
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -299436,7 +299436,7 @@ _080A835C:
 	thumb_func_end sub_80A8328
 
 	thumb_func_start battle_get_per_side_status_permutated
-battle_get_per_side_status_permutated: ; 80A8364
+battle_get_per_side_status_permutated: @ 80A8364
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -299464,7 +299464,7 @@ _080A838C:
 	thumb_func_end battle_get_per_side_status_permutated
 
 	thumb_func_start sub_80A8394
-sub_80A8394: ; 80A8394
+sub_80A8394: @ 80A8394
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -299745,7 +299745,7 @@ _080A85EE:
 	thumb_func_end sub_80A8394
 
 	thumb_func_start sub_80A8610
-sub_80A8610: ; 80A8610
+sub_80A8610: @ 80A8610
 	push {lr}
 	bl RemoveObjectAndFreeResources
 	pop {r0}
@@ -299753,7 +299753,7 @@ sub_80A8610: ; 80A8610
 	thumb_func_end sub_80A8610
 
 	thumb_func_start sub_80A861C
-sub_80A861C: ; 80A861C
+sub_80A861C: @ 80A861C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -300128,7 +300128,7 @@ _080A8918:
 	thumb_func_end sub_80A861C
 
 	thumb_func_start sub_80A8924
-sub_80A8924: ; 80A8924
+sub_80A8924: @ 80A8924
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -300211,7 +300211,7 @@ _080A89A4:
 	thumb_func_end sub_80A8924
 
 	thumb_func_start sub_80A89C8
-sub_80A89C8: ; 80A89C8
+sub_80A89C8: @ 80A89C8
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -300289,7 +300289,7 @@ sub_80A89C8: ; 80A89C8
 	thumb_func_end sub_80A89C8
 
 	thumb_func_start sub_80A8A6C
-sub_80A8A6C: ; 80A8A6C
+sub_80A8A6C: @ 80A8A6C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -300347,7 +300347,7 @@ _080A8AB6:
 	thumb_func_end sub_80A8A6C
 
 	thumb_func_start sub_80A8AEC
-sub_80A8AEC: ; 80A8AEC
+sub_80A8AEC: @ 80A8AEC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -300402,7 +300402,7 @@ _080A8B26:
 	thumb_func_end sub_80A8AEC
 
 	thumb_func_start sub_80A8B64
-sub_80A8B64: ; 80A8B64
+sub_80A8B64: @ 80A8B64
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -300443,7 +300443,7 @@ _080A8B9C:
 	thumb_func_end sub_80A8B64
 
 	thumb_func_start sub_80A8BC4
-sub_80A8BC4: ; 80A8BC4
+sub_80A8BC4: @ 80A8BC4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -300544,7 +300544,7 @@ _080A8C6A:
 	thumb_func_end sub_80A8BC4
 
 	thumb_func_start sub_80A8CAC
-sub_80A8CAC: ; 80A8CAC
+sub_80A8CAC: @ 80A8CAC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -300644,7 +300644,7 @@ _080A8D6C:
 	thumb_func_end sub_80A8CAC
 
 	thumb_func_start sub_80A8D78
-sub_80A8D78: ; 80A8D78
+sub_80A8D78: @ 80A8D78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -300710,7 +300710,7 @@ _080A8DE8:
 	thumb_func_end sub_80A8D78
 
 	thumb_func_start sub_80A8DFC
-sub_80A8DFC: ; 80A8DFC
+sub_80A8DFC: @ 80A8DFC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -300738,7 +300738,7 @@ _080A8E26:
 	thumb_func_end sub_80A8DFC
 
 	thumb_func_start sub_80A8E30
-sub_80A8E30: ; 80A8E30
+sub_80A8E30: @ 80A8E30
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -300777,7 +300777,7 @@ _080A8E6A:
 	thumb_func_end sub_80A8E30
 
 	thumb_func_start sub_80A8E88
-sub_80A8E88: ; 80A8E88
+sub_80A8E88: @ 80A8E88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -300825,7 +300825,7 @@ _080A8EDC:
 	thumb_func_end sub_80A8E88
 
 	thumb_func_start sub_80A8EE4
-sub_80A8EE4: ; 80A8EE4
+sub_80A8EE4: @ 80A8EE4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -300878,12 +300878,12 @@ _080A8F32:
 	.include "asm/task.s"
 
 	thumb_func_start nullsub_35
-nullsub_35: ; 80A92F4
+nullsub_35: @ 80A92F4
 	bx lr
 	thumb_func_end nullsub_35
 
 	thumb_func_start sub_80A92F8
-sub_80A92F8: ; 80A92F8
+sub_80A92F8: @ 80A92F8
 	push {lr}
 	ldr r2, =0x02037fd4
 	ldrb r0, [r2, 0x8]
@@ -300912,7 +300912,7 @@ sub_80A92F8: ; 80A92F8
 	thumb_func_end sub_80A92F8
 
 	thumb_func_start c2_80777E8
-c2_80777E8: ; 80A933C
+c2_80777E8: @ 80A933C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r0, =0x02024474
@@ -301190,7 +301190,7 @@ _080A95D2:
 	thumb_func_end c2_80777E8
 
 	thumb_func_start sub_80A95F4
-sub_80A95F4: ; 80A95F4
+sub_80A95F4: @ 80A95F4
 	ldr r3, =0x0400000a
 	ldrb r2, [r3]
 	movs r1, 0xD
@@ -301207,7 +301207,7 @@ sub_80A95F4: ; 80A95F4
 	thumb_func_end sub_80A95F4
 
 	thumb_func_start sub_80A9614
-sub_80A9614: ; 80A9614
+sub_80A9614: @ 80A9614
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -301316,7 +301316,7 @@ _080A96FC:
 	thumb_func_end sub_80A9614
 
 	thumb_func_start sub_80A9708
-sub_80A9708: ; 80A9708
+sub_80A9708: @ 80A9708
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -301740,7 +301740,7 @@ _080A9AA0:
 	thumb_func_end sub_80A9708
 
 	thumb_func_start sub_80A9ADC
-sub_80A9ADC: ; 80A9ADC
+sub_80A9ADC: @ 80A9ADC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -301910,7 +301910,7 @@ _080A9C5E:
 	thumb_func_end sub_80A9ADC
 
 	thumb_func_start sub_80A9C70
-sub_80A9C70: ; 80A9C70
+sub_80A9C70: @ 80A9C70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -302060,7 +302060,7 @@ _080A9D90:
 	thumb_func_end sub_80A9C70
 
 	thumb_func_start sub_80A9DB4
-sub_80A9DB4: ; 80A9DB4
+sub_80A9DB4: @ 80A9DB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -302135,7 +302135,7 @@ _080A9E3E:
 	thumb_func_end sub_80A9DB4
 
 	thumb_func_start sub_80A9E44
-sub_80A9E44: ; 80A9E44
+sub_80A9E44: @ 80A9E44
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x3A]
@@ -302165,7 +302165,7 @@ _080A9E74:
 	thumb_func_end sub_80A9E44
 
 	thumb_func_start sub_80A9E78
-sub_80A9E78: ; 80A9E78
+sub_80A9E78: @ 80A9E78
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -302230,7 +302230,7 @@ _080A9EEC:
 	thumb_func_end sub_80A9E78
 
 	thumb_func_start sub_80A9EF4
-sub_80A9EF4: ; 80A9EF4
+sub_80A9EF4: @ 80A9EF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -302316,7 +302316,7 @@ _080A9F7C:
 	thumb_func_end sub_80A9EF4
 
 	thumb_func_start sub_80A9FD0
-sub_80A9FD0: ; 80A9FD0
+sub_80A9FD0: @ 80A9FD0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -302356,7 +302356,7 @@ _080AA01A:
 	thumb_func_end sub_80A9FD0
 
 	thumb_func_start sub_80AA020
-sub_80AA020: ; 80AA020
+sub_80AA020: @ 80AA020
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -302436,7 +302436,7 @@ _080AA0B0:
 	thumb_func_end sub_80AA020
 
 	thumb_func_start sub_80AA0D0
-sub_80AA0D0: ; 80AA0D0
+sub_80AA0D0: @ 80AA0D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -302478,7 +302478,7 @@ _080AA11E:
 	thumb_func_end sub_80AA0D0
 
 	thumb_func_start sub_80AA124
-sub_80AA124: ; 80AA124
+sub_80AA124: @ 80AA124
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -302527,7 +302527,7 @@ _080AA186:
 	thumb_func_end sub_80AA124
 
 	thumb_func_start sub_80AA18C
-sub_80AA18C: ; 80AA18C
+sub_80AA18C: @ 80AA18C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -302759,7 +302759,7 @@ _080AA352:
 	thumb_func_end sub_80AA18C
 
 	thumb_func_start move_anim_start_t2
-move_anim_start_t2: ; 80AA364
+move_anim_start_t2: @ 80AA364
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -302791,7 +302791,7 @@ move_anim_start_t2: ; 80AA364
 	thumb_func_end move_anim_start_t2
 
 	thumb_func_start task0A_80788BC
-task0A_80788BC: ; 80AA3B4
+task0A_80788BC: @ 80AA3B4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -302831,7 +302831,7 @@ _080AA3F6:
 	thumb_func_end task0A_80788BC
 
 	thumb_func_start sub_80AA40C
-sub_80AA40C: ; 80AA40C
+sub_80AA40C: @ 80AA40C
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -302886,7 +302886,7 @@ _080AA46A:
 	thumb_func_end sub_80AA40C
 
 	thumb_func_start sub_80AA474
-sub_80AA474: ; 80AA474
+sub_80AA474: @ 80AA474
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -302923,7 +302923,7 @@ _080AA4AE:
 	thumb_func_end sub_80AA474
 
 	thumb_func_start sub_80AA4B4
-sub_80AA4B4: ; 80AA4B4
+sub_80AA4B4: @ 80AA4B4
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -302957,7 +302957,7 @@ _080AA4E8:
 	thumb_func_end sub_80AA4B4
 
 	thumb_func_start sub_80AA4EC
-sub_80AA4EC: ; 80AA4EC
+sub_80AA4EC: @ 80AA4EC
 	push {r4-r7,lr}
 	lsls r0, 16
 	ldr r2, =0xffc00000
@@ -303000,7 +303000,7 @@ _080AA4FA:
 	thumb_func_end sub_80AA4EC
 
 	thumb_func_start sub_80AA548
-sub_80AA548: ; 80AA548
+sub_80AA548: @ 80AA548
 	push {r4-r6,lr}
 	lsls r0, 16
 	ldr r2, =0xffc00000
@@ -303043,8 +303043,8 @@ _080AA556:
 	thumb_func_end sub_80AA548
 
 	thumb_func_start title_screen_logo_shine_obj_callback_type1
-; void title_screen_logo_shine_obj_callback_type1(struct obj *obj)
-title_screen_logo_shine_obj_callback_type1: ; 80AA5A4
+@ void title_screen_logo_shine_obj_callback_type1(struct obj *obj)
+title_screen_logo_shine_obj_callback_type1: @ 80AA5A4
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x20]
@@ -303135,8 +303135,8 @@ _080AA648:
 	thumb_func_end title_screen_logo_shine_obj_callback_type1
 
 	thumb_func_start title_screen_logo_shine_obj_callback_type2
-; void title_screen_logo_shine_obj_callback_type2(struct obj *obj)
-title_screen_logo_shine_obj_callback_type2: ; 80AA654
+@ void title_screen_logo_shine_obj_callback_type2(struct obj *obj)
+title_screen_logo_shine_obj_callback_type2: @ 80AA654
 	push {lr}
 	adds r2, r0, 0
 	ldrh r3, [r2, 0x20]
@@ -303159,8 +303159,8 @@ _080AA676:
 	thumb_func_end title_screen_logo_shine_obj_callback_type2
 
 	thumb_func_start title_screen_add_logo_shine_obj
-; void title_screen_add_logo_shine_obj(int a1)
-title_screen_add_logo_shine_obj: ; 80AA67C
+@ void title_screen_add_logo_shine_obj(int a1)
+title_screen_add_logo_shine_obj: @ 80AA67C
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -303286,8 +303286,8 @@ _080AA766:
 	thumb_func_end title_screen_add_logo_shine_obj
 
 	thumb_func_start title_screen_vblank_callback
-; void title_screen_vblank_callback()
-title_screen_vblank_callback: ; 80AA780
+@ void title_screen_vblank_callback()
+title_screen_vblank_callback: @ 80AA780
 	push {lr}
 	bl sub_80BA0A8
 	bl LoadOamFromSprites
@@ -303303,8 +303303,8 @@ title_screen_vblank_callback: ; 80AA780
 	thumb_func_end title_screen_vblank_callback
 
 	thumb_func_start c2_title_screen_1
-; void c2_title_screen_1()
-c2_title_screen_1: ; 80AA7A4
+@ void c2_title_screen_1()
+c2_title_screen_1: @ 80AA7A4
 	push {r4,lr}
 	sub sp, 0x14
 	ldr r0, =0x030022c0
@@ -303616,8 +303616,8 @@ _080AAB1E:
 	thumb_func_end c2_title_screen_1
 
 	thumb_func_start c2_title_screen_2
-; void c2_title_screen_2()
-c2_title_screen_2: ; 80AAB2C
+@ void c2_title_screen_2()
+c2_title_screen_2: @ 80AAB2C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -303628,8 +303628,8 @@ c2_title_screen_2: ; 80AAB2C
 	thumb_func_end c2_title_screen_2
 
 	thumb_func_start task_title_screen_1
-; void task_title_screen_1(int task_id)
-task_title_screen_1: ; 80AAB44
+@ void task_title_screen_1(int task_id)
+task_title_screen_1: @ 80AAB44
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -303747,8 +303747,8 @@ _080AAC32:
 	thumb_func_end task_title_screen_1
 
 	thumb_func_start task_title_screen_2
-; void task_title_screen_2(int task_id)
-task_title_screen_2: ; 80AAC50
+@ void task_title_screen_2(int task_id)
+task_title_screen_2: @ 80AAC50
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -303875,8 +303875,8 @@ _080AAD20:
 	thumb_func_end task_title_screen_2
 
 	thumb_func_start task_title_screen_3
-; void task_title_screen_3(int task_id)
-task_title_screen_3: ; 80AAD64
+@ void task_title_screen_3(int task_id)
+task_title_screen_3: @ 80AAD64
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -304017,7 +304017,7 @@ _080AAE98:
 	thumb_func_end task_title_screen_3
 
 	thumb_func_start Cb2_GoToMainMenu
-Cb2_GoToMainMenu: ; 80AAEB8
+Cb2_GoToMainMenu: @ 80AAEB8
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -304032,7 +304032,7 @@ _080AAECA:
 	thumb_func_end Cb2_GoToMainMenu
 
 	thumb_func_start c2_show_copyright_and_intro_again_1
-c2_show_copyright_and_intro_again_1: ; 80AAED4
+c2_show_copyright_and_intro_again_1: @ 80AAED4
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -304047,7 +304047,7 @@ _080AAEE6:
 	thumb_func_end c2_show_copyright_and_intro_again_1
 
 	thumb_func_start c2_clear_save_data_screen_1
-c2_clear_save_data_screen_1: ; 80AAEF0
+c2_clear_save_data_screen_1: @ 80AAEF0
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -304062,7 +304062,7 @@ _080AAF02:
 	thumb_func_end c2_clear_save_data_screen_1
 
 	thumb_func_start c2_reset_rtc_screen_1
-c2_reset_rtc_screen_1: ; 80AAF0C
+c2_reset_rtc_screen_1: @ 80AAF0C
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -304077,7 +304077,7 @@ _080AAF1E:
 	thumb_func_end c2_reset_rtc_screen_1
 
 	thumb_func_start c2_berry_program_update_screen_1
-c2_berry_program_update_screen_1: ; 80AAF28
+c2_berry_program_update_screen_1: @ 80AAF28
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -304093,8 +304093,8 @@ _080AAF3E:
 	thumb_func_end c2_berry_program_update_screen_1
 
 	thumb_func_start title_screen_update_rayquaza_ring_palette
-; void title_screen_update_rayquaza_ring_palette(u8 a1)
-title_screen_update_rayquaza_ring_palette: ; 80AAF48
+@ void title_screen_update_rayquaza_ring_palette(u8 a1)
+title_screen_update_rayquaza_ring_palette: @ 80AAF48
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -304144,8 +304144,8 @@ _080AAF9C:
 	thumb_func_end title_screen_update_rayquaza_ring_palette
 
 	thumb_func_start sub_80AAFA4
-; void sub_80AAFA4()
-sub_80AAFA4: ; 80AAFA4
+@ void sub_80AAFA4()
+sub_80AAFA4: @ 80AAFA4
 	push {r4-r6,lr}
 	ldr r0, =sub_80AB1B0
 	bl is_function_an_active_task
@@ -304241,7 +304241,7 @@ _080AB060:
 	thumb_func_end sub_80AAFA4
 
 	thumb_func_start weather_set
-weather_set: ; 80AB098
+weather_set: @ 80AB098
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -304289,7 +304289,7 @@ _080AB0D2:
 	thumb_func_end weather_set
 
 	thumb_func_start sub_80AB104
-sub_80AB104: ; 80AB104
+sub_80AB104: @ 80AB104
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -304310,7 +304310,7 @@ sub_80AB104: ; 80AB104
 	thumb_func_end sub_80AB104
 
 	thumb_func_start sub_80AB130
-sub_80AB130: ; 80AB130
+sub_80AB130: @ 80AB130
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -304336,7 +304336,7 @@ sub_80AB130: ; 80AB130
 	thumb_func_end sub_80AB130
 
 	thumb_func_start sub_80AB160
-sub_80AB160: ; 80AB160
+sub_80AB160: @ 80AB160
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -304372,7 +304372,7 @@ _080AB198:
 	thumb_func_end sub_80AB160
 
 	thumb_func_start sub_80AB1B0
-sub_80AB1B0: ; 80AB1B0
+sub_80AB1B0: @ 80AB1B0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -304452,7 +304452,7 @@ _080AB23C:
 	thumb_func_end sub_80AB1B0
 
 	thumb_func_start sub_80AB26C
-sub_80AB26C: ; 80AB26C
+sub_80AB26C: @ 80AB26C
 	ldr r0, =0x02038454
 	ldr r2, =0x000006c1
 	adds r1, r0, r2
@@ -304466,18 +304466,18 @@ sub_80AB26C: ; 80AB26C
 	thumb_func_end sub_80AB26C
 
 	thumb_func_start nullsub_36
-nullsub_36: ; 80AB28C
+nullsub_36: @ 80AB28C
 	bx lr
 	thumb_func_end nullsub_36
 
 	thumb_func_start sub_80AB290
-sub_80AB290: ; 80AB290
+sub_80AB290: @ 80AB290
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80AB290
 
 	thumb_func_start sub_80AB294
-sub_80AB294: ; 80AB294
+sub_80AB294: @ 80AB294
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -304626,7 +304626,7 @@ _080AB384:
 	thumb_func_end sub_80AB294
 
 	thumb_func_start sub_80AB3A8
-sub_80AB3A8: ; 80AB3A8
+sub_80AB3A8: @ 80AB3A8
 	push {r4-r7,lr}
 	ldr r0, =0x02038454
 	ldr r1, =0x000006c6
@@ -304693,7 +304693,7 @@ _080AB42C:
 	thumb_func_end sub_80AB3A8
 
 	thumb_func_start sub_80AB434
-sub_80AB434: ; 80AB434
+sub_80AB434: @ 80AB434
 	push {lr}
 	ldr r2, =0x02038454
 	ldr r0, =0x000006cb
@@ -304809,7 +304809,7 @@ _080AB53C:
 	thumb_func_end sub_80AB434
 
 	thumb_func_start sub_80AB54C
-sub_80AB54C: ; 80AB54C
+sub_80AB54C: @ 80AB54C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r2, =0x02038454
@@ -304856,7 +304856,7 @@ _080AB5A4:
 	thumb_func_end sub_80AB54C
 
 	thumb_func_start sub_80AB5AC
-sub_80AB5AC: ; 80AB5AC
+sub_80AB5AC: @ 80AB5AC
 	push {r4,lr}
 	ldr r2, =0x02038454
 	ldr r0, =0x000006c7
@@ -304900,7 +304900,7 @@ _080AB5FE:
 	thumb_func_end sub_80AB5AC
 
 	thumb_func_start sub_80AB604
-sub_80AB604: ; 80AB604
+sub_80AB604: @ 80AB604
 	push {lr}
 	ldr r2, =0x02038454
 	ldr r1, =0x000006c7
@@ -304929,12 +304929,12 @@ _080AB63A:
 	thumb_func_end sub_80AB604
 
 	thumb_func_start nullsub_94
-nullsub_94: ; 80AB640
+nullsub_94: @ 80AB640
 	bx lr
 	thumb_func_end nullsub_94
 
 	thumb_func_start pal_fade_2
-pal_fade_2: ; 80AB644
+pal_fade_2: @ 80AB644
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -305180,7 +305180,7 @@ _080AB82E:
 	thumb_func_end pal_fade_2
 
 	thumb_func_start sub_80AB848
-sub_80AB848: ; 80AB848
+sub_80AB848: @ 80AB848
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -305346,7 +305346,7 @@ _080AB974:
 	thumb_func_end sub_80AB848
 
 	thumb_func_start sub_80AB990
-sub_80AB990: ; 80AB990
+sub_80AB990: @ 80AB990
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -305491,7 +305491,7 @@ _080ABA8A:
 	thumb_func_end sub_80AB990
 
 	thumb_func_start sub_80ABAB0
-sub_80ABAB0: ; 80ABAB0
+sub_80ABAB0: @ 80ABAB0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -305634,7 +305634,7 @@ _080ABBB0:
 	thumb_func_end sub_80ABAB0
 
 	thumb_func_start sub_80ABBCC
-sub_80ABBCC: ; 80ABBCC
+sub_80ABBCC: @ 80ABBCC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -305660,7 +305660,7 @@ _080ABBEE:
 	thumb_func_end sub_80ABBCC
 
 	thumb_func_start sub_80ABC00
-sub_80ABC00: ; 80ABC00
+sub_80ABC00: @ 80ABC00
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -305697,7 +305697,7 @@ _080ABC40:
 	thumb_func_end sub_80ABC00
 
 	thumb_func_start sub_80ABC48
-sub_80ABC48: ; 80ABC48
+sub_80ABC48: @ 80ABC48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -305724,7 +305724,7 @@ _080ABC6E:
 	thumb_func_end sub_80ABC48
 
 	thumb_func_start sub_80ABC7C
-sub_80ABC7C: ; 80ABC7C
+sub_80ABC7C: @ 80ABC7C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -305764,7 +305764,7 @@ _080ABCBC:
 	thumb_func_end sub_80ABC7C
 
 	thumb_func_start fade_screen
-fade_screen: ; 80ABCD0
+fade_screen: @ 80ABCD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -305903,7 +305903,7 @@ _080ABDE4:
 	thumb_func_end fade_screen
 
 	thumb_func_start sub_80ABDFC
-sub_80ABDFC: ; 80ABDFC
+sub_80ABDFC: @ 80ABDFC
 	ldr r0, =0x02038454
 	ldr r1, =0x000006c6
 	adds r0, r1
@@ -305918,8 +305918,8 @@ sub_80ABDFC: ; 80ABDFC
 	thumb_func_end sub_80ABDFC
 
 	thumb_func_start sub_80ABE18
-; void sub_80ABE18(u8 a1)
-sub_80ABE18: ; 80ABE18
+@ void sub_80ABE18(u8 a1)
+sub_80ABE18: @ 80ABE18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 8
@@ -306023,7 +306023,7 @@ _080ABEF4:
 	thumb_func_end sub_80ABE18
 
 	thumb_func_start sub_80ABF00
-sub_80ABF00: ; 80ABF00
+sub_80ABF00: @ 80ABF00
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -306041,7 +306041,7 @@ sub_80ABF00: ; 80ABF00
 	thumb_func_end sub_80ABF00
 
 	thumb_func_start sub_80ABF20
-sub_80ABF20: ; 80ABF20
+sub_80ABF20: @ 80ABF20
 	push {lr}
 	ldr r1, =0x02038454
 	ldr r2, =0x000006c6
@@ -306063,7 +306063,7 @@ _080ABF42:
 	thumb_func_end sub_80ABF20
 
 	thumb_func_start sub_80ABF4C
-sub_80ABF4C: ; 80ABF4C
+sub_80ABF4C: @ 80ABF4C
 	push {r4,lr}
 	ldr r4, =0x02038454
 	ldr r1, =0x000006d4
@@ -306085,7 +306085,7 @@ sub_80ABF4C: ; 80ABF4C
 	thumb_func_end sub_80ABF4C
 
 	thumb_func_start sub_80ABF7C
-sub_80ABF7C: ; 80ABF7C
+sub_80ABF7C: @ 80ABF7C
 	movs r2, 0x20
 	strb r2, [r0]
 	strb r2, [r1]
@@ -306093,7 +306093,7 @@ sub_80ABF7C: ; 80ABF7C
 	thumb_func_end sub_80ABF7C
 
 	thumb_func_start sub_80ABF84
-sub_80ABF84: ; 80ABF84
+sub_80ABF84: @ 80ABF84
 	ldr r0, =0x02038454
 	ldr r2, =0x0000074d
 	adds r1, r0, r2
@@ -306107,7 +306107,7 @@ sub_80ABF84: ; 80ABF84
 	thumb_func_end sub_80ABF84
 
 	thumb_func_start sub_80ABFA4
-sub_80ABFA4: ; 80ABFA4
+sub_80ABFA4: @ 80ABFA4
 	push {r4,lr}
 	ldr r1, =0x02038454
 	ldr r0, =0x0000074d
@@ -306136,7 +306136,7 @@ _080ABFDA:
 	thumb_func_end sub_80ABFA4
 
 	thumb_func_start sub_80ABFE0
-sub_80ABFE0: ; 80ABFE0
+sub_80ABFE0: @ 80ABFE0
 	push {lr}
 	lsls r0, 24
 	asrs r0, 24
@@ -306147,7 +306147,7 @@ sub_80ABFE0: ; 80ABFE0
 	thumb_func_end sub_80ABFE0
 
 	thumb_func_start sub_80ABFF0
-sub_80ABFF0: ; 80ABFF0
+sub_80ABFF0: @ 80ABFF0
 	ldr r1, =0x02038454
 	ldr r2, =0x0000073c
 	adds r0, r1, r2
@@ -306168,7 +306168,7 @@ sub_80ABFF0: ; 80ABFF0
 	thumb_func_end sub_80ABFF0
 
 	thumb_func_start sub_80AC01C
-sub_80AC01C: ; 80AC01C
+sub_80AC01C: @ 80AC01C
 	push {r4-r7,lr}
 	ldr r5, =0x02038454
 	ldr r0, =0x00000742
@@ -306292,7 +306292,7 @@ _080AC118:
 	thumb_func_end sub_80AC01C
 
 	thumb_func_start sub_80AC124
-sub_80AC124: ; 80AC124
+sub_80AC124: @ 80AC124
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -306323,7 +306323,7 @@ sub_80AC124: ; 80AC124
 	thumb_func_end sub_80AC124
 
 	thumb_func_start sub_80AC164
-sub_80AC164: ; 80AC164
+sub_80AC164: @ 80AC164
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -306354,7 +306354,7 @@ sub_80AC164: ; 80AC164
 	thumb_func_end sub_80AC164
 
 	thumb_func_start sub_80AC1A8
-sub_80AC1A8: ; 80AC1A8
+sub_80AC1A8: @ 80AC1A8
 	push {r4-r6,lr}
 	ldr r0, =0x02038454
 	movs r1, 0xE6
@@ -306450,7 +306450,7 @@ _080AC26E:
 	thumb_func_end sub_80AC1A8
 
 	thumb_func_start sub_80AC274
-sub_80AC274: ; 80AC274
+sub_80AC274: @ 80AC274
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -306520,7 +306520,7 @@ _080AC306:
 	thumb_func_end sub_80AC274
 
 	thumb_func_start weather_get_current
-weather_get_current: ; 80AC30C
+weather_get_current: @ 80AC30C
 	ldr r0, =0x02038454
 	movs r1, 0xDA
 	lsls r1, 3
@@ -306531,7 +306531,7 @@ weather_get_current: ; 80AC30C
 	thumb_func_end weather_get_current
 
 	thumb_func_start sub_80AC31C
-sub_80AC31C: ; 80AC31C
+sub_80AC31C: @ 80AC31C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -306578,7 +306578,7 @@ _080AC36E:
 	thumb_func_end sub_80AC31C
 
 	thumb_func_start play_some_sound
-play_some_sound: ; 80AC378
+play_some_sound: @ 80AC378
 	push {lr}
 	bl sub_80A390C
 	lsls r0, 24
@@ -306611,7 +306611,7 @@ _080AC3B6:
 	thumb_func_end play_some_sound
 
 	thumb_func_start sub_80AC3BC
-sub_80AC3BC: ; 80AC3BC
+sub_80AC3BC: @ 80AC3BC
 	ldr r0, =0x02038454
 	ldr r1, =0x000006d3
 	adds r0, r1
@@ -306621,7 +306621,7 @@ sub_80AC3BC: ; 80AC3BC
 	thumb_func_end sub_80AC3BC
 
 	thumb_func_start sub_80AC3D0
-sub_80AC3D0: ; 80AC3D0
+sub_80AC3D0: @ 80AC3D0
 	ldr r0, =0x02038454
 	ldr r1, =0x000006c6
 	adds r0, r1
@@ -306632,7 +306632,7 @@ sub_80AC3D0: ; 80AC3D0
 	thumb_func_end sub_80AC3D0
 
 	thumb_func_start sub_80AC3E4
-sub_80AC3E4: ; 80AC3E4
+sub_80AC3E4: @ 80AC3E4
 	ldr r0, =0x02038454
 	ldr r1, =0x000006c6
 	adds r0, r1
@@ -306643,7 +306643,7 @@ sub_80AC3E4: ; 80AC3E4
 	thumb_func_end sub_80AC3E4
 
 	thumb_func_start sub_80AC3F8
-sub_80AC3F8: ; 80AC3F8
+sub_80AC3F8: @ 80AC3F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -306665,7 +306665,7 @@ sub_80AC3F8: ; 80AC3F8
 	thumb_func_end sub_80AC3F8
 
 	thumb_func_start sub_80AC428
-sub_80AC428: ; 80AC428
+sub_80AC428: @ 80AC428
 	ldr r1, =0x03000f50
 	ldr r0, =gUnknown_0854C250
 	str r0, [r1]
@@ -306674,7 +306674,7 @@ sub_80AC428: ; 80AC428
 	thumb_func_end sub_80AC428
 
 	thumb_func_start sub_80AC438
-sub_80AC438: ; 80AC438
+sub_80AC438: @ 80AC438
 	push {lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -306707,7 +306707,7 @@ _080AC46C:
 	thumb_func_end sub_80AC438
 
 	thumb_func_start sub_80AC484
-sub_80AC484: ; 80AC484
+sub_80AC484: @ 80AC484
 	push {r4,lr}
 	bl sub_80AC438
 	ldr r0, =gUnknown_0854C14C
@@ -306731,7 +306731,7 @@ _080AC4A4:
 	thumb_func_end sub_80AC484
 
 	thumb_func_start sub_80AC4B4
-sub_80AC4B4: ; 80AC4B4
+sub_80AC4B4: @ 80AC4B4
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r5, [r0]
@@ -306780,7 +306780,7 @@ _080AC508:
 	thumb_func_end sub_80AC4B4
 
 	thumb_func_start sub_80AC514
-sub_80AC514: ; 80AC514
+sub_80AC514: @ 80AC514
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -306819,7 +306819,7 @@ _080AC556:
 	thumb_func_end sub_80AC514
 
 	thumb_func_start sub_80AC55C
-sub_80AC55C: ; 80AC55C
+sub_80AC55C: @ 80AC55C
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
 	ldr r0, =0x000006c1
@@ -306835,7 +306835,7 @@ sub_80AC55C: ; 80AC55C
 	thumb_func_end sub_80AC55C
 
 	thumb_func_start sub_80AC580
-sub_80AC580: ; 80AC580
+sub_80AC580: @ 80AC580
 	push {lr}
 	bl sub_80AC55C
 	pop {r0}
@@ -306843,18 +306843,18 @@ sub_80AC580: ; 80AC580
 	thumb_func_end sub_80AC580
 
 	thumb_func_start nullsub_95
-nullsub_95: ; 80AC58C
+nullsub_95: @ 80AC58C
 	bx lr
 	thumb_func_end nullsub_95
 
 	thumb_func_start sub_80AC590
-sub_80AC590: ; 80AC590
+sub_80AC590: @ 80AC590
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80AC590
 
 	thumb_func_start sub_80AC594
-sub_80AC594: ; 80AC594
+sub_80AC594: @ 80AC594
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -306943,7 +306943,7 @@ _080AC650:
 	thumb_func_end sub_80AC594
 
 	thumb_func_start sub_80AC660
-sub_80AC660: ; 80AC660
+sub_80AC660: @ 80AC660
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -306986,7 +306986,7 @@ _080AC6A4:
 	thumb_func_end sub_80AC660
 
 	thumb_func_start sub_80AC6B4
-sub_80AC6B4: ; 80AC6B4
+sub_80AC6B4: @ 80AC6B4
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -307005,7 +307005,7 @@ _080AC6CC:
 	thumb_func_end sub_80AC6B4
 
 	thumb_func_start sub_80AC6D0
-sub_80AC6D0: ; 80AC6D0
+sub_80AC6D0: @ 80AC6D0
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
 	ldr r0, =0x000006cc
@@ -307027,7 +307027,7 @@ sub_80AC6D0: ; 80AC6D0
 	thumb_func_end sub_80AC6D0
 
 	thumb_func_start sub_80AC704
-sub_80AC704: ; 80AC704
+sub_80AC704: @ 80AC704
 	push {r4,lr}
 	bl sub_80AC6D0
 	ldr r0, =gUnknown_0854C14C
@@ -307051,7 +307051,7 @@ _080AC724:
 	thumb_func_end sub_80AC704
 
 	thumb_func_start sub_80AC734
-sub_80AC734: ; 80AC734
+sub_80AC734: @ 80AC734
 	push {lr}
 	ldr r1, =gUnknown_0854C14C
 	ldr r0, [r1]
@@ -307142,13 +307142,13 @@ _080AC814:
 	thumb_func_end sub_80AC734
 
 	thumb_func_start sub_80AC818
-sub_80AC818: ; 80AC818
+sub_80AC818: @ 80AC818
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80AC818
 
 	thumb_func_start sub_80AC81C
-sub_80AC81C: ; 80AC81C
+sub_80AC81C: @ 80AC81C
 	push {lr}
 	ldr r0, =task50_0807B6D4
 	movs r1, 0x50
@@ -307159,7 +307159,7 @@ sub_80AC81C: ; 80AC81C
 	thumb_func_end sub_80AC81C
 
 	thumb_func_start task50_0807B6D4
-task50_0807B6D4: ; 80AC830
+task50_0807B6D4: @ 80AC830
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -307275,7 +307275,7 @@ _080AC922:
 	thumb_func_end task50_0807B6D4
 
 	thumb_func_start sub_80AC928
-sub_80AC928: ; 80AC928
+sub_80AC928: @ 80AC928
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -307318,7 +307318,7 @@ sub_80AC928: ; 80AC928
 	thumb_func_end sub_80AC928
 
 	thumb_func_start sub_80AC994
-sub_80AC994: ; 80AC994
+sub_80AC994: @ 80AC994
 	push {r4,lr}
 	bl sub_80AC928
 	ldr r0, =gUnknown_0854C14C
@@ -307342,7 +307342,7 @@ _080AC9B4:
 	thumb_func_end sub_80AC994
 
 	thumb_func_start sub_80AC9C4
-sub_80AC9C4: ; 80AC9C4
+sub_80AC9C4: @ 80AC9C4
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r5, [r0]
@@ -307391,7 +307391,7 @@ _080ACA18:
 	thumb_func_end sub_80AC9C4
 
 	thumb_func_start sub_80ACA24
-sub_80ACA24: ; 80ACA24
+sub_80ACA24: @ 80ACA24
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r2, [r0]
@@ -307457,7 +307457,7 @@ _080ACAAA:
 	thumb_func_end sub_80ACA24
 
 	thumb_func_start sub_80ACAB0
-sub_80ACAB0: ; 80ACAB0
+sub_80ACAB0: @ 80ACAB0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -307550,7 +307550,7 @@ _080ACAC4:
 	thumb_func_end sub_80ACAB0
 
 	thumb_func_start sub_80ACB84
-sub_80ACB84: ; 80ACB84
+sub_80ACB84: @ 80ACB84
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x36
@@ -307675,7 +307675,7 @@ _080ACC80:
 	thumb_func_end sub_80ACB84
 
 	thumb_func_start sub_80ACC88
-sub_80ACC88: ; 80ACC88
+sub_80ACC88: @ 80ACC88
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -307699,7 +307699,7 @@ _080ACCAC:
 	thumb_func_end sub_80ACC88
 
 	thumb_func_start sub_80ACCB4
-sub_80ACCB4: ; 80ACCB4
+sub_80ACCB4: @ 80ACCB4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -307788,7 +307788,7 @@ _080ACD5C:
 	thumb_func_end sub_80ACCB4
 
 	thumb_func_start sub_80ACD68
-sub_80ACD68: ; 80ACD68
+sub_80ACD68: @ 80ACD68
 	push {lr}
 	ldr r0, =gUnknown_0854FC54
 	bl LoadObjectPic
@@ -307798,7 +307798,7 @@ sub_80ACD68: ; 80ACD68
 	thumb_func_end sub_80ACD68
 
 	thumb_func_start sub_80ACD78
-sub_80ACD78: ; 80ACD78
+sub_80ACD78: @ 80ACD78
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -307943,7 +307943,7 @@ _080ACE9E:
 	thumb_func_end sub_80ACD78
 
 	thumb_func_start sub_80ACEAC
-sub_80ACEAC: ; 80ACEAC
+sub_80ACEAC: @ 80ACEAC
 	push {r4-r7,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r3, [r0]
@@ -308014,7 +308014,7 @@ _080ACF32:
 	thumb_func_end sub_80ACEAC
 
 	thumb_func_start sub_80ACF38
-sub_80ACF38: ; 80ACF38
+sub_80ACF38: @ 80ACF38
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r0, =gUnknown_0854C14C
@@ -308056,7 +308056,7 @@ _080ACF6A:
 	thumb_func_end sub_80ACF38
 
 	thumb_func_start sub_80ACF8C
-sub_80ACF8C: ; 80ACF8C
+sub_80ACF8C: @ 80ACF8C
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -308091,7 +308091,7 @@ sub_80ACF8C: ; 80ACF8C
 	thumb_func_end sub_80ACF8C
 
 	thumb_func_start sub_80ACFDC
-sub_80ACFDC: ; 80ACFDC
+sub_80ACFDC: @ 80ACFDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -308145,7 +308145,7 @@ _080AD032:
 	thumb_func_end sub_80ACFDC
 
 	thumb_func_start snowflakes_progress2
-snowflakes_progress2: ; 80AD048
+snowflakes_progress2: @ 80AD048
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r5, [r0]
@@ -308173,7 +308173,7 @@ _080AD070:
 	thumb_func_end snowflakes_progress2
 
 	thumb_func_start sub_80AD084
-sub_80AD084: ; 80AD084
+sub_80AD084: @ 80AD084
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r2, [r0]
@@ -308221,7 +308221,7 @@ _080AD0E2:
 	thumb_func_end sub_80AD084
 
 	thumb_func_start snowflakes_progress
-snowflakes_progress: ; 80AD0E8
+snowflakes_progress: @ 80AD0E8
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -308278,7 +308278,7 @@ _080AD152:
 	thumb_func_end snowflakes_progress
 
 	thumb_func_start snowflake_add
-snowflake_add: ; 80AD164
+snowflake_add: @ 80AD164
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_0854FC8C
 	movs r1, 0
@@ -308328,7 +308328,7 @@ _080AD1CA:
 	thumb_func_end snowflake_add
 
 	thumb_func_start snowflake_remove
-snowflake_remove: ; 80AD1D0
+snowflake_remove: @ 80AD1D0
 	push {lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -308356,7 +308356,7 @@ _080AD200:
 	thumb_func_end snowflake_remove
 
 	thumb_func_start sub_80AD204
-sub_80AD204: ; 80AD204
+sub_80AD204: @ 80AD204
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	bl GenerateRandomNumber
@@ -308439,7 +308439,7 @@ _080AD294:
 	thumb_func_end sub_80AD204
 
 	thumb_func_start sub_80AD2B0
-sub_80AD2B0: ; 80AD2B0
+sub_80AD2B0: @ 80AD2B0
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =gUnknown_0854C14C
@@ -308483,7 +308483,7 @@ _080AD2F6:
 	thumb_func_end sub_80AD2B0
 
 	thumb_func_start sub_80AD30C
-sub_80AD30C: ; 80AD30C
+sub_80AD30C: @ 80AD30C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -308639,7 +308639,7 @@ _080AD438:
 	thumb_func_end sub_80AD30C
 
 	thumb_func_start sub_80AD444
-sub_80AD444: ; 80AD444
+sub_80AD444: @ 80AD444
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -308686,7 +308686,7 @@ sub_80AD444: ; 80AD444
 	thumb_func_end sub_80AD444
 
 	thumb_func_start sub_80AD4B8
-sub_80AD4B8: ; 80AD4B8
+sub_80AD4B8: @ 80AD4B8
 	push {r4,lr}
 	bl sub_80AD444
 	ldr r0, =gUnknown_0854C14C
@@ -308710,7 +308710,7 @@ _080AD4D8:
 	thumb_func_end sub_80AD4B8
 
 	thumb_func_start sub_80AD4E8
-sub_80AD4E8: ; 80AD4E8
+sub_80AD4E8: @ 80AD4E8
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -308755,7 +308755,7 @@ sub_80AD4E8: ; 80AD4E8
 	thumb_func_end sub_80AD4E8
 
 	thumb_func_start sub_80AD554
-sub_80AD554: ; 80AD554
+sub_80AD554: @ 80AD554
 	push {r4,lr}
 	bl sub_80AD4E8
 	ldr r0, =gUnknown_0854C14C
@@ -308779,7 +308779,7 @@ _080AD574:
 	thumb_func_end sub_80AD554
 
 	thumb_func_start sub_80AD584
-sub_80AD584: ; 80AD584
+sub_80AD584: @ 80AD584
 	push {r4,r5,lr}
 	bl sub_80AD9F8
 	ldr r0, =gUnknown_0854C14C
@@ -309146,7 +309146,7 @@ _080AD8FA:
 	thumb_func_end sub_80AD584
 
 	thumb_func_start sub_80AD910
-sub_80AD910: ; 80AD910
+sub_80AD910: @ 80AD910
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r6, [r0]
@@ -309227,7 +309227,7 @@ _080AD9B6:
 	thumb_func_end sub_80AD910
 
 	thumb_func_start sub_80AD9BC
-sub_80AD9BC: ; 80AD9BC
+sub_80AD9BC: @ 80AD9BC
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -309257,7 +309257,7 @@ _080AD9EA:
 	thumb_func_end sub_80AD9BC
 
 	thumb_func_start sub_80AD9F8
-sub_80AD9F8: ; 80AD9F8
+sub_80AD9F8: @ 80AD9F8
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -309306,7 +309306,7 @@ _080ADA58:
 	thumb_func_end sub_80AD9F8
 
 	thumb_func_start sub_80ADA60
-sub_80ADA60: ; 80ADA60
+sub_80ADA60: @ 80ADA60
 	push {lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r3, [r0]
@@ -309349,7 +309349,7 @@ _080ADAA8:
 	thumb_func_end sub_80ADA60
 
 	thumb_func_start sub_80ADAC0
-sub_80ADAC0: ; 80ADAC0
+sub_80ADAC0: @ 80ADAC0
 	push {r4,lr}
 	bl sub_80ADA60
 	ldr r0, =gUnknown_0854C14C
@@ -309373,7 +309373,7 @@ _080ADAE0:
 	thumb_func_end sub_80ADAC0
 
 	thumb_func_start sub_80ADAF0
-sub_80ADAF0: ; 80ADAF0
+sub_80ADAF0: @ 80ADAF0
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r6, [r0]
@@ -309460,7 +309460,7 @@ _080ADBA6:
 	thumb_func_end sub_80ADAF0
 
 	thumb_func_start sub_80ADBB0
-sub_80ADBB0: ; 80ADBB0
+sub_80ADBB0: @ 80ADBB0
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r2, [r0]
@@ -309537,7 +309537,7 @@ _080ADC44:
 	thumb_func_end sub_80ADBB0
 
 	thumb_func_start sub_80ADC4C
-sub_80ADC4C: ; 80ADC4C
+sub_80ADC4C: @ 80ADC4C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =0x02021bbe
@@ -309580,7 +309580,7 @@ _080ADC90:
 	thumb_func_end sub_80ADC4C
 
 	thumb_func_start sub_80ADCAC
-sub_80ADCAC: ; 80ADCAC
+sub_80ADCAC: @ 80ADCAC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0854C14C
@@ -309664,7 +309664,7 @@ _080ADD56:
 	thumb_func_end sub_80ADCAC
 
 	thumb_func_start sub_80ADD68
-sub_80ADD68: ; 80ADD68
+sub_80ADD68: @ 80ADD68
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -309705,7 +309705,7 @@ _080ADDA8:
 	thumb_func_end sub_80ADD68
 
 	thumb_func_start sub_80ADDBC
-sub_80ADDBC: ; 80ADDBC
+sub_80ADDBC: @ 80ADDBC
 	push {lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -309747,7 +309747,7 @@ _080ADE04:
 	thumb_func_end sub_80ADDBC
 
 	thumb_func_start sub_80ADE18
-sub_80ADE18: ; 80ADE18
+sub_80ADE18: @ 80ADE18
 	push {r4,lr}
 	bl sub_80ADDBC
 	ldr r0, =gUnknown_0854C14C
@@ -309771,7 +309771,7 @@ _080ADE38:
 	thumb_func_end sub_80ADE18
 
 	thumb_func_start sub_80ADE48
-sub_80ADE48: ; 80ADE48
+sub_80ADE48: @ 80ADE48
 	push {r4,r5,lr}
 	ldr r2, =gUnknown_0854C14C
 	ldr r1, [r2]
@@ -309853,7 +309853,7 @@ _080ADEEC:
 	thumb_func_end sub_80ADE48
 
 	thumb_func_start sub_80ADEF4
-sub_80ADEF4: ; 80ADEF4
+sub_80ADEF4: @ 80ADEF4
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -309908,7 +309908,7 @@ _080ADF54:
 	thumb_func_end sub_80ADEF4
 
 	thumb_func_start sub_80ADF5C
-sub_80ADF5C: ; 80ADF5C
+sub_80ADF5C: @ 80ADF5C
 	push {lr}
 	ldr r0, =gUnknown_0854FD38
 	bl LoadObjectPic
@@ -309918,7 +309918,7 @@ sub_80ADF5C: ; 80ADF5C
 	thumb_func_end sub_80ADF5C
 
 	thumb_func_start sub_80ADF6C
-sub_80ADF6C: ; 80ADF6C
+sub_80ADF6C: @ 80ADF6C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -309999,7 +309999,7 @@ _080AE008:
 	thumb_func_end sub_80ADF6C
 
 	thumb_func_start sub_80AE014
-sub_80AE014: ; 80AE014
+sub_80AE014: @ 80AE014
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -310042,7 +310042,7 @@ _080AE058:
 	thumb_func_end sub_80AE014
 
 	thumb_func_start sub_80AE068
-sub_80AE068: ; 80AE068
+sub_80AE068: @ 80AE068
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x30]
@@ -310100,7 +310100,7 @@ _080AE0C8:
 	thumb_func_end sub_80AE068
 
 	thumb_func_start sub_80AE0E4
-sub_80AE0E4: ; 80AE0E4
+sub_80AE0E4: @ 80AE0E4
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r3, [r0]
@@ -310161,7 +310161,7 @@ _080AE14E:
 	thumb_func_end sub_80AE0E4
 
 	thumb_func_start sub_80AE168
-sub_80AE168: ; 80AE168
+sub_80AE168: @ 80AE168
 	push {r4,lr}
 	bl sub_80AE0E4
 	ldr r0, =gUnknown_0854C14C
@@ -310185,7 +310185,7 @@ _080AE188:
 	thumb_func_end sub_80AE168
 
 	thumb_func_start sub_80AE198
-sub_80AE198: ; 80AE198
+sub_80AE198: @ 80AE198
 	push {r4,r5,lr}
 	bl sub_80AE25C
 	ldr r0, =gUnknown_0854C14C
@@ -310235,7 +310235,7 @@ _080AE1F0:
 	thumb_func_end sub_80AE198
 
 	thumb_func_start sub_80AE1FC
-sub_80AE1FC: ; 80AE1FC
+sub_80AE1FC: @ 80AE1FC
 	push {r4,lr}
 	bl sub_80AE25C
 	ldr r0, =gUnknown_0854C14C
@@ -310286,7 +310286,7 @@ _080AE254:
 	thumb_func_end sub_80AE1FC
 
 	thumb_func_start sub_80AE25C
-sub_80AE25C: ; 80AE25C
+sub_80AE25C: @ 80AE25C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r3, [r0]
@@ -310353,7 +310353,7 @@ _080AE2A4:
 	thumb_func_end sub_80AE25C
 
 	thumb_func_start sub_80AE2F0
-sub_80AE2F0: ; 80AE2F0
+sub_80AE2F0: @ 80AE2F0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0854C14C
@@ -310436,7 +310436,7 @@ _080AE396:
 	thumb_func_end sub_80AE2F0
 
 	thumb_func_start sub_80AE3A8
-sub_80AE3A8: ; 80AE3A8
+sub_80AE3A8: @ 80AE3A8
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -310478,7 +310478,7 @@ _080AE3EA:
 	thumb_func_end sub_80AE3A8
 
 	thumb_func_start sub_80AE3FC
-sub_80AE3FC: ; 80AE3FC
+sub_80AE3FC: @ 80AE3FC
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =gUnknown_0854C14C
@@ -310523,7 +310523,7 @@ _080AE444:
 	thumb_func_end sub_80AE3FC
 
 	thumb_func_start sub_80AE45C
-sub_80AE45C: ; 80AE45C
+sub_80AE45C: @ 80AE45C
 	push {r4,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r3, [r0]
@@ -310578,7 +310578,7 @@ _080AE4B8:
 	thumb_func_end sub_80AE45C
 
 	thumb_func_start sub_80AE4DC
-sub_80AE4DC: ; 80AE4DC
+sub_80AE4DC: @ 80AE4DC
 	push {r4,lr}
 	bl sub_80AE45C
 	ldr r0, =gUnknown_0854C14C
@@ -310602,7 +310602,7 @@ _080AE4FC:
 	thumb_func_end sub_80AE4DC
 
 	thumb_func_start sub_80AE50C
-sub_80AE50C: ; 80AE50C
+sub_80AE50C: @ 80AE50C
 	push {r4,r5,lr}
 	bl sub_80AE624
 	bl sub_80AE5EC
@@ -310662,7 +310662,7 @@ _080AE57C:
 	thumb_func_end sub_80AE50C
 
 	thumb_func_start sub_80AE588
-sub_80AE588: ; 80AE588
+sub_80AE588: @ 80AE588
 	push {r4,lr}
 	bl sub_80AE624
 	bl sub_80AE5EC
@@ -310714,7 +310714,7 @@ _080AE5E4:
 	thumb_func_end sub_80AE588
 
 	thumb_func_start sub_80AE5EC
-sub_80AE5EC: ; 80AE5EC
+sub_80AE5EC: @ 80AE5EC
 	push {lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r2, [r0]
@@ -310741,7 +310741,7 @@ _080AE612:
 	thumb_func_end sub_80AE5EC
 
 	thumb_func_start sub_80AE624
-sub_80AE624: ; 80AE624
+sub_80AE624: @ 80AE624
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r2, [r0]
@@ -310796,7 +310796,7 @@ sub_80AE624: ; 80AE624
 	thumb_func_end sub_80AE624
 
 	thumb_func_start sub_80AE6A4
-sub_80AE6A4: ; 80AE6A4
+sub_80AE6A4: @ 80AE6A4
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
@@ -310869,7 +310869,7 @@ _080AE720:
 	thumb_func_end sub_80AE6A4
 
 	thumb_func_start sub_80AE738
-sub_80AE738: ; 80AE738
+sub_80AE738: @ 80AE738
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =gUnknown_0854C14C
@@ -310952,7 +310952,7 @@ _080AE7E6:
 	thumb_func_end sub_80AE738
 
 	thumb_func_start sub_80AE7F8
-sub_80AE7F8: ; 80AE7F8
+sub_80AE7F8: @ 80AE7F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -311069,7 +311069,7 @@ _080AE8E4:
 	thumb_func_end sub_80AE7F8
 
 	thumb_func_start sub_80AE8F8
-sub_80AE8F8: ; 80AE8F8
+sub_80AE8F8: @ 80AE8F8
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =gUnknown_0854C14C
@@ -311114,7 +311114,7 @@ _080AE940:
 	thumb_func_end sub_80AE8F8
 
 	thumb_func_start sub_80AE958
-sub_80AE958: ; 80AE958
+sub_80AE958: @ 80AE958
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x34]
@@ -311135,7 +311135,7 @@ _080AE972:
 	thumb_func_end sub_80AE958
 
 	thumb_func_start sub_80AE97C
-sub_80AE97C: ; 80AE97C
+sub_80AE97C: @ 80AE97C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x22]
@@ -311198,7 +311198,7 @@ _080AE9E6:
 	thumb_func_end sub_80AE97C
 
 	thumb_func_start sub_80AE9F0
-sub_80AE9F0: ; 80AE9F0
+sub_80AE9F0: @ 80AE9F0
 	ldr r0, =gUnknown_0854C14C
 	ldr r1, [r0]
 	ldr r0, =0x000006cc
@@ -311218,7 +311218,7 @@ sub_80AE9F0: ; 80AE9F0
 	thumb_func_end sub_80AE9F0
 
 	thumb_func_start sub_80AEA20
-sub_80AEA20: ; 80AEA20
+sub_80AEA20: @ 80AEA20
 	push {lr}
 	bl sub_80AE9F0
 	pop {r0}
@@ -311226,18 +311226,18 @@ sub_80AEA20: ; 80AEA20
 	thumb_func_end sub_80AEA20
 
 	thumb_func_start nullsub_96
-nullsub_96: ; 80AEA2C
+nullsub_96: @ 80AEA2C
 	bx lr
 	thumb_func_end nullsub_96
 
 	thumb_func_start sub_80AEA30
-sub_80AEA30: ; 80AEA30
+sub_80AEA30: @ 80AEA30
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80AEA30
 
 	thumb_func_start sub_80AEA34
-sub_80AEA34: ; 80AEA34
+sub_80AEA34: @ 80AEA34
 	push {r4,r5,lr}
 	bl sub_80ADA60
 	ldr r0, =gUnknown_0854C14C
@@ -311272,7 +311272,7 @@ _080AEA6C:
 	thumb_func_end sub_80AEA34
 
 	thumb_func_start sub_80AEA88
-sub_80AEA88: ; 80AEA88
+sub_80AEA88: @ 80AEA88
 	push {r4,lr}
 	bl sub_80AEA34
 	ldr r0, =gUnknown_0854C14C
@@ -311296,7 +311296,7 @@ _080AEAA8:
 	thumb_func_end sub_80AEA88
 
 	thumb_func_start sub_80AEAB8
-sub_80AEAB8: ; 80AEAB8
+sub_80AEAB8: @ 80AEAB8
 	push {r4-r7,lr}
 	bl sub_80ADAF0
 	ldr r0, =gUnknown_0854C14C
@@ -311348,7 +311348,7 @@ _080AEB10:
 	thumb_func_end sub_80AEAB8
 
 	thumb_func_start sub_80AEB2C
-sub_80AEB2C: ; 80AEB2C
+sub_80AEB2C: @ 80AEB2C
 	push {lr}
 	bl sub_80ADBB0
 	lsls r0, 24
@@ -311365,7 +311365,7 @@ _080AEB42:
 	thumb_func_end sub_80AEB2C
 
 	thumb_func_start sub_80AEB48
-sub_80AEB48: ; 80AEB48
+sub_80AEB48: @ 80AEB48
 	push {r4,lr}
 	lsls r0, 16
 	ldr r1, =gUnknown_0854FE00
@@ -311425,7 +311425,7 @@ _080AEBB0:
 	thumb_func_end sub_80AEB48
 
 	thumb_func_start sub_80AEBD0
-sub_80AEBD0: ; 80AEBD0
+sub_80AEBD0: @ 80AEBD0
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0854C14C
 	ldr r0, [r0]
@@ -311471,7 +311471,7 @@ _080AEC1A:
 	thumb_func_end sub_80AEBD0
 
 	thumb_func_start unc_0807DAB4
-unc_0807DAB4: ; 80AEC34
+unc_0807DAB4: @ 80AEC34
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -311524,7 +311524,7 @@ _080AEC8E:
 	thumb_func_end unc_0807DAB4
 
 	thumb_func_start sub_80AEC94
-sub_80AEC94: ; 80AEC94
+sub_80AEC94: @ 80AEC94
 	ldr r2, =0x02038bc4
 	strb r0, [r2]
 	ldr r0, =0x02038bc6
@@ -311534,7 +311534,7 @@ sub_80AEC94: ; 80AEC94
 	thumb_func_end sub_80AEC94
 
 	thumb_func_start sub_80AECA8
-sub_80AECA8: ; 80AECA8
+sub_80AECA8: @ 80AECA8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -311598,7 +311598,7 @@ _080AED1C:
 	thumb_func_end sub_80AECA8
 
 	thumb_func_start bag_add_task0_by_acit
-bag_add_task0_by_acit: ; 80AED28
+bag_add_task0_by_acit: @ 80AED28
 	push {lr}
 	ldr r0, =sub_80AECA8
 	movs r1, 0
@@ -311642,7 +311642,7 @@ _080AED78:
 	thumb_func_end bag_add_task0_by_acit
 
 	thumb_func_start sub_80AED7C
-sub_80AED7C: ; 80AED7C
+sub_80AED7C: @ 80AED7C
 	push {r4,r5,lr}
 	ldr r4, =0x03005d8c
 	ldr r1, [r4]
@@ -311666,7 +311666,7 @@ sub_80AED7C: ; 80AED7C
 	thumb_func_end sub_80AED7C
 
 	thumb_func_start sav1_get_weather_probably
-sav1_get_weather_probably: ; 80AEDAC
+sav1_get_weather_probably: @ 80AEDAC
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	adds r0, 0x2E
@@ -311676,7 +311676,7 @@ sav1_get_weather_probably: ; 80AEDAC
 	thumb_func_end sav1_get_weather_probably
 
 	thumb_func_start sub_80AEDBC
-sub_80AEDBC: ; 80AEDBC
+sub_80AEDBC: @ 80AEDBC
 	push {r4,r5,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -311700,7 +311700,7 @@ sub_80AEDBC: ; 80AEDBC
 	thumb_func_end sub_80AEDBC
 
 	thumb_func_start sub_80AEDF0
-sub_80AEDF0: ; 80AEDF0
+sub_80AEDF0: @ 80AEDF0
 	push {lr}
 	bl sub_80AED7C
 	bl sav1_get_weather_probably
@@ -311712,7 +311712,7 @@ sub_80AEDF0: ; 80AEDF0
 	thumb_func_end sub_80AEDF0
 
 	thumb_func_start sub_80AEE08
-sub_80AEE08: ; 80AEE08
+sub_80AEE08: @ 80AEE08
 	push {lr}
 	bl sub_80AED7C
 	bl sav1_get_weather_probably
@@ -311724,7 +311724,7 @@ sub_80AEE08: ; 80AEE08
 	thumb_func_end sub_80AEE08
 
 	thumb_func_start sub_80AEE20
-sub_80AEE20: ; 80AEE20
+sub_80AEE20: @ 80AEE20
 	push {r4,r5,lr}
 	bl sav1_get_weather_probably
 	lsls r0, 24
@@ -311768,7 +311768,7 @@ _080AEE6E:
 	thumb_func_end sub_80AEE20
 
 	thumb_func_start sub_80AEE84
-sub_80AEE84: ; 80AEE84
+sub_80AEE84: @ 80AEE84
 	push {r4,r5,lr}
 	bl sav1_get_weather_probably
 	lsls r0, 24
@@ -311812,7 +311812,7 @@ _080AEED2:
 	thumb_func_end sub_80AEE84
 
 	thumb_func_start sub_80AEEE8
-sub_80AEEE8: ; 80AEEE8
+sub_80AEEE8: @ 80AEEE8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -311916,7 +311916,7 @@ _080AEFB6:
 	thumb_func_end sub_80AEEE8
 
 	thumb_func_start sub_80AEFBC
-sub_80AEFBC: ; 80AEFBC
+sub_80AEFBC: @ 80AEFBC
 	lsls r0, 16
 	ldr r1, =0x03005d8c
 	ldr r2, [r1]
@@ -311935,7 +311935,7 @@ sub_80AEFBC: ; 80AEFBC
 	thumb_func_end sub_80AEFBC
 
 	thumb_func_start sub_80AEFDC
-sub_80AEFDC: ; 80AEFDC
+sub_80AEFDC: @ 80AEFDC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -311955,7 +311955,7 @@ _080AEFF6:
 	thumb_func_end sub_80AEFDC
 
 	thumb_func_start palette_bg_faded_fill_white
-palette_bg_faded_fill_white: ; 80AEFFC
+palette_bg_faded_fill_white: @ 80AEFFC
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x7fff7fff
@@ -311971,7 +311971,7 @@ palette_bg_faded_fill_white: ; 80AEFFC
 	thumb_func_end palette_bg_faded_fill_white
 
 	thumb_func_start palette_bg_faded_fill_black
-palette_bg_faded_fill_black: ; 80AF020
+palette_bg_faded_fill_black: @ 80AF020
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -311987,7 +311987,7 @@ palette_bg_faded_fill_black: ; 80AF020
 	thumb_func_end palette_bg_faded_fill_black
 
 	thumb_func_start pal_fill_for_maplights
-pal_fill_for_maplights: ; 80AF040
+pal_fill_for_maplights: @ 80AF040
 	push {r4,lr}
 	bl get_map_light_from_warp0
 	adds r4, r0, 0
@@ -312024,7 +312024,7 @@ _080AF084:
 	thumb_func_end pal_fill_for_maplights
 
 	thumb_func_start sub_80AF08C
-sub_80AF08C: ; 80AF08C
+sub_80AF08C: @ 80AF08C
 	push {lr}
 	bl palette_bg_faded_fill_white
 	movs r0, 0x2
@@ -312035,7 +312035,7 @@ sub_80AF08C: ; 80AF08C
 	thumb_func_end sub_80AF08C
 
 	thumb_func_start pal_fill_black
-pal_fill_black: ; 80AF0A0
+pal_fill_black: @ 80AF0A0
 	push {lr}
 	bl palette_bg_faded_fill_black
 	movs r0, 0
@@ -312046,7 +312046,7 @@ pal_fill_black: ; 80AF0A0
 	thumb_func_end pal_fill_black
 
 	thumb_func_start sub_80AF0B4
-sub_80AF0B4: ; 80AF0B4
+sub_80AF0B4: @ 80AF0B4
 	push {r4,lr}
 	bl sav1_map_get_light_level
 	adds r4, r0, 0
@@ -312079,7 +312079,7 @@ _080AF0EC:
 	thumb_func_end sub_80AF0B4
 
 	thumb_func_start sub_80AF0F4
-sub_80AF0F4: ; 80AF0F4
+sub_80AF0F4: @ 80AF0F4
 	push {lr}
 	lsls r0, 24
 	movs r1, 0
@@ -312094,7 +312094,7 @@ _080AF100:
 	thumb_func_end sub_80AF0F4
 
 	thumb_func_start task0A_nop_for_a_while
-task0A_nop_for_a_while: ; 80AF10C
+task0A_nop_for_a_while: @ 80AF10C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312110,7 +312110,7 @@ _080AF120:
 	thumb_func_end task0A_nop_for_a_while
 
 	thumb_func_start sub_80AF128
-sub_80AF128: ; 80AF128
+sub_80AF128: @ 80AF128
 	push {lr}
 	bl script_env_2_enable
 	bl sub_8085784
@@ -312124,7 +312124,7 @@ sub_80AF128: ; 80AF128
 	thumb_func_end sub_80AF128
 
 	thumb_func_start task0A_asap_script_env_2_enable_and_set_ctx_running
-task0A_asap_script_env_2_enable_and_set_ctx_running: ; 80AF148
+task0A_asap_script_env_2_enable_and_set_ctx_running: @ 80AF148
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312141,7 +312141,7 @@ _080AF160:
 	thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running
 
 	thumb_func_start sub_80AF168
-sub_80AF168: ; 80AF168
+sub_80AF168: @ 80AF168
 	push {lr}
 	bl script_env_2_enable
 	bl sub_8085784
@@ -312155,7 +312155,7 @@ sub_80AF168: ; 80AF168
 	thumb_func_end sub_80AF168
 
 	thumb_func_start sub_80AF188
-sub_80AF188: ; 80AF188
+sub_80AF188: @ 80AF188
 	push {lr}
 	bl script_env_2_enable
 	bl pal_fill_black
@@ -312168,7 +312168,7 @@ sub_80AF188: ; 80AF188
 	thumb_func_end sub_80AF188
 
 	thumb_func_start task_mpl_807DD60
-task_mpl_807DD60: ; 80AF1A4
+task_mpl_807DD60: @ 80AF1A4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -312227,7 +312227,7 @@ _080AF20E:
 	thumb_func_end task_mpl_807DD60
 
 	thumb_func_start sub_80AF214
-sub_80AF214: ; 80AF214
+sub_80AF214: @ 80AF214
 	push {lr}
 	bl script_env_2_enable
 	bl sub_8085784
@@ -312241,7 +312241,7 @@ sub_80AF214: ; 80AF214
 	thumb_func_end sub_80AF214
 
 	thumb_func_start sub_80AF234
-sub_80AF234: ; 80AF234
+sub_80AF234: @ 80AF234
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -312306,7 +312306,7 @@ _080AF2AE:
 	thumb_func_end sub_80AF234
 
 	thumb_func_start sub_80AF2B4
-sub_80AF2B4: ; 80AF2B4
+sub_80AF2B4: @ 80AF2B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -312355,7 +312355,7 @@ _080AF30C:
 	thumb_func_end sub_80AF2B4
 
 	thumb_func_start sub_80AF314
-sub_80AF314: ; 80AF314
+sub_80AF314: @ 80AF314
 	push {lr}
 	bl script_env_2_enable
 	bl sub_8085784
@@ -312369,7 +312369,7 @@ sub_80AF314: ; 80AF314
 	thumb_func_end sub_80AF314
 
 	thumb_func_start sub_80AF334
-sub_80AF334: ; 80AF334
+sub_80AF334: @ 80AF334
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -312415,7 +312415,7 @@ _080AF37E:
 	thumb_func_end sub_80AF334
 
 	thumb_func_start mapldr_default
-mapldr_default: ; 80AF398
+mapldr_default: @ 80AF398
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -312426,7 +312426,7 @@ mapldr_default: ; 80AF398
 	thumb_func_end mapldr_default
 
 	thumb_func_start sub_80AF3B0
-sub_80AF3B0: ; 80AF3B0
+sub_80AF3B0: @ 80AF3B0
 	push {lr}
 	bl sub_8085784
 	bl sub_80AF08C
@@ -312437,7 +312437,7 @@ sub_80AF3B0: ; 80AF3B0
 	thumb_func_end sub_80AF3B0
 
 	thumb_func_start sub_80AF3C8
-sub_80AF3C8: ; 80AF3C8
+sub_80AF3C8: @ 80AF3C8
 	push {lr}
 	bl sub_81D6534
 	cmp r0, 0
@@ -312452,7 +312452,7 @@ _080AF3D6:
 	thumb_func_end sub_80AF3C8
 
 	thumb_func_start sub_80AF3E8
-sub_80AF3E8: ; 80AF3E8
+sub_80AF3E8: @ 80AF3E8
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -312468,7 +312468,7 @@ sub_80AF3E8: ; 80AF3E8
 	thumb_func_end sub_80AF3E8
 
 	thumb_func_start sub_80AF40C
-sub_80AF40C: ; 80AF40C
+sub_80AF40C: @ 80AF40C
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -312486,7 +312486,7 @@ sub_80AF40C: ; 80AF40C
 	thumb_func_end sub_80AF40C
 
 	thumb_func_start sub_80AF438
-sub_80AF438: ; 80AF438
+sub_80AF438: @ 80AF438
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312614,7 +312614,7 @@ _080AF54A:
 	thumb_func_end sub_80AF438
 
 	thumb_func_start task_map_chg_seq_0807E20C
-task_map_chg_seq_0807E20C: ; 80AF550
+task_map_chg_seq_0807E20C: @ 80AF550
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312703,7 +312703,7 @@ _080AF60A:
 	thumb_func_end task_map_chg_seq_0807E20C
 
 	thumb_func_start task_map_chg_seq_0807E2CC
-task_map_chg_seq_0807E2CC: ; 80AF610
+task_map_chg_seq_0807E2CC: @ 80AF610
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -312742,7 +312742,7 @@ _080AF65A:
 	thumb_func_end task_map_chg_seq_0807E2CC
 
 	thumb_func_start sub_80AF660
-sub_80AF660: ; 80AF660
+sub_80AF660: @ 80AF660
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312762,7 +312762,7 @@ _080AF67C:
 	thumb_func_end sub_80AF660
 
 	thumb_func_start sub_80AF688
-sub_80AF688: ; 80AF688
+sub_80AF688: @ 80AF688
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =sub_80AF660
@@ -312775,7 +312775,7 @@ sub_80AF688: ; 80AF688
 	thumb_func_end sub_80AF688
 
 	thumb_func_start sub_80AF6A4
-sub_80AF6A4: ; 80AF6A4
+sub_80AF6A4: @ 80AF6A4
 	push {lr}
 	bl sub_809FA18
 	movs r0, 0
@@ -312784,7 +312784,7 @@ sub_80AF6A4: ; 80AF6A4
 	thumb_func_end sub_80AF6A4
 
 	thumb_func_start task_mpl_807E3C8
-task_mpl_807E3C8: ; 80AF6B0
+task_mpl_807E3C8: @ 80AF6B0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -312802,7 +312802,7 @@ _080AF6CC:
 	thumb_func_end task_mpl_807E3C8
 
 	thumb_func_start sub_80AF6D4
-sub_80AF6D4: ; 80AF6D4
+sub_80AF6D4: @ 80AF6D4
 	push {lr}
 	bl script_env_2_enable
 	bl pal_fill_black
@@ -312815,7 +312815,7 @@ sub_80AF6D4: ; 80AF6D4
 	thumb_func_end sub_80AF6D4
 
 	thumb_func_start sub_80AF6F0
-sub_80AF6F0: ; 80AF6F0
+sub_80AF6F0: @ 80AF6F0
 	push {lr}
 	bl script_env_2_enable
 	bl sub_8085784
@@ -312829,7 +312829,7 @@ sub_80AF6F0: ; 80AF6F0
 	thumb_func_end sub_80AF6F0
 
 	thumb_func_start sub_80AF710
-sub_80AF710: ; 80AF710
+sub_80AF710: @ 80AF710
 	ldr r0, =0x02037fd4
 	ldrb r0, [r0, 0x7]
 	lsrs r0, 7
@@ -312838,7 +312838,7 @@ sub_80AF710: ; 80AF710
 	thumb_func_end sub_80AF710
 
 	thumb_func_start sub_80AF71C
-sub_80AF71C: ; 80AF71C
+sub_80AF71C: @ 80AF71C
 	push {lr}
 	bl sub_80ABDFC
 	lsls r0, 24
@@ -312855,7 +312855,7 @@ _080AF730:
 	thumb_func_end sub_80AF71C
 
 	thumb_func_start sub_80AF734
-sub_80AF734: ; 80AF734
+sub_80AF734: @ 80AF734
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -312875,7 +312875,7 @@ sub_80AF734: ; 80AF734
 	thumb_func_end sub_80AF734
 
 	thumb_func_start sp13E_warp_to_last_warp
-sp13E_warp_to_last_warp: ; 80AF76C
+sp13E_warp_to_last_warp: @ 80AF76C
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -312893,7 +312893,7 @@ sp13E_warp_to_last_warp: ; 80AF76C
 	thumb_func_end sp13E_warp_to_last_warp
 
 	thumb_func_start sub_80AF79C
-sub_80AF79C: ; 80AF79C
+sub_80AF79C: @ 80AF79C
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -312913,7 +312913,7 @@ sub_80AF79C: ; 80AF79C
 	thumb_func_end sub_80AF79C
 
 	thumb_func_start sub_80AF7D0
-sub_80AF7D0: ; 80AF7D0
+sub_80AF7D0: @ 80AF7D0
 	push {lr}
 	bl script_env_2_enable
 	ldr r0, =0x03005dac
@@ -312928,7 +312928,7 @@ sub_80AF7D0: ; 80AF7D0
 	thumb_func_end sub_80AF7D0
 
 	thumb_func_start sp13F_fall_to_last_warp
-sp13F_fall_to_last_warp: ; 80AF7F4
+sp13F_fall_to_last_warp: @ 80AF7F4
 	push {lr}
 	bl sp13E_warp_to_last_warp
 	ldr r1, =0x03005dac
@@ -312940,7 +312940,7 @@ sp13F_fall_to_last_warp: ; 80AF7F4
 	thumb_func_end sp13F_fall_to_last_warp
 
 	thumb_func_start sub_80AF80C
-sub_80AF80C: ; 80AF80C
+sub_80AF80C: @ 80AF80C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -312955,7 +312955,7 @@ sub_80AF80C: ; 80AF80C
 	thumb_func_end sub_80AF80C
 
 	thumb_func_start sub_80AF828
-sub_80AF828: ; 80AF828
+sub_80AF828: @ 80AF828
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0xA
@@ -312965,7 +312965,7 @@ sub_80AF828: ; 80AF828
 	thumb_func_end sub_80AF828
 
 	thumb_func_start sub_80AF838
-sub_80AF838: ; 80AF838
+sub_80AF838: @ 80AF838
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0xA
@@ -312975,7 +312975,7 @@ sub_80AF838: ; 80AF838
 	thumb_func_end sub_80AF838
 
 	thumb_func_start sub_80AF848
-sub_80AF848: ; 80AF848
+sub_80AF848: @ 80AF848
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -312994,7 +312994,7 @@ sub_80AF848: ; 80AF848
 	thumb_func_end sub_80AF848
 
 	thumb_func_start sub_80AF87C
-sub_80AF87C: ; 80AF87C
+sub_80AF87C: @ 80AF87C
 	push {lr}
 	movs r0, 0x1
 	bl sub_8085540
@@ -313016,7 +313016,7 @@ sub_80AF87C: ; 80AF87C
 	thumb_func_end sub_80AF87C
 
 	thumb_func_start sub_80AF8B8
-sub_80AF8B8: ; 80AF8B8
+sub_80AF8B8: @ 80AF8B8
 	push {lr}
 	bl script_env_2_enable
 	bl sub_80AF0B4
@@ -313032,7 +313032,7 @@ sub_80AF8B8: ; 80AF8B8
 	thumb_func_end sub_80AF8B8
 
 	thumb_func_start sub_80AF8E0
-sub_80AF8E0: ; 80AF8E0
+sub_80AF8E0: @ 80AF8E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -313085,7 +313085,7 @@ _080AF93E:
 	thumb_func_end sub_80AF8E0
 
 	thumb_func_start sub_80AF948
-sub_80AF948: ; 80AF948
+sub_80AF948: @ 80AF948
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -313101,7 +313101,7 @@ sub_80AF948: ; 80AF948
 	thumb_func_end sub_80AF948
 
 	thumb_func_start sub_80AF96C
-sub_80AF96C: ; 80AF96C
+sub_80AF96C: @ 80AF96C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -313165,7 +313165,7 @@ _080AF9E8:
 	thumb_func_end sub_80AF96C
 
 	thumb_func_start sub_80AF9F8
-sub_80AF9F8: ; 80AF9F8
+sub_80AF9F8: @ 80AF9F8
 	push {lr}
 	ldr r0, =sub_80AF96C
 	movs r1, 0xA
@@ -313176,7 +313176,7 @@ sub_80AF9F8: ; 80AF9F8
 	thumb_func_end sub_80AF9F8
 
 	thumb_func_start sub_80AFA0C
-sub_80AFA0C: ; 80AFA0C
+sub_80AFA0C: @ 80AFA0C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -313237,7 +313237,7 @@ _080AFA7C:
 	thumb_func_end sub_80AFA0C
 
 	thumb_func_start sub_80AFA88
-sub_80AFA88: ; 80AFA88
+sub_80AFA88: @ 80AFA88
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -313404,7 +313404,7 @@ _080AFBE8:
 	thumb_func_end sub_80AFA88
 
 	thumb_func_start task0A_fade_n_map_maybe
-task0A_fade_n_map_maybe: ; 80AFBF4
+task0A_fade_n_map_maybe: @ 80AFBF4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -313458,7 +313458,7 @@ _080AFC56:
 	thumb_func_end task0A_fade_n_map_maybe
 
 	thumb_func_start sub_80AFC60
-sub_80AFC60: ; 80AFC60
+sub_80AFC60: @ 80AFC60
 	push {lr}
 	bl script_env_2_enable
 	bl music_something
@@ -313478,7 +313478,7 @@ sub_80AFC60: ; 80AFC60
 	thumb_func_end sub_80AFC60
 
 	thumb_func_start sub_80AFC98
-sub_80AFC98: ; 80AFC98
+sub_80AFC98: @ 80AFC98
 	push {lr}
 	cmp r1, 0xA0
 	bhi _080AFCC0
@@ -313509,7 +313509,7 @@ _080AFCC0:
 	thumb_func_end sub_80AFC98
 
 	thumb_func_start sub_80AFCC4
-sub_80AFCC4: ; 80AFCC4
+sub_80AFCC4: @ 80AFCC4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -313582,7 +313582,7 @@ _080AFD40:
 	thumb_func_end sub_80AFCC4
 
 	thumb_func_start sub_80AFD50
-sub_80AFD50: ; 80AFD50
+sub_80AFD50: @ 80AFD50
 	push {lr}
 	cmp r1, 0xA0
 	bhi _080AFD78
@@ -313613,7 +313613,7 @@ _080AFD78:
 	thumb_func_end sub_80AFD50
 
 	thumb_func_start sub_80AFD7C
-sub_80AFD7C: ; 80AFD7C
+sub_80AFD7C: @ 80AFD7C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -313686,7 +313686,7 @@ _080AFDF8:
 	thumb_func_end sub_80AFD7C
 
 	thumb_func_start sub_80AFE08
-sub_80AFE08: ; 80AFE08
+sub_80AFE08: @ 80AFE08
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -313779,7 +313779,7 @@ _080AFEC6:
 	thumb_func_end sub_80AFE08
 
 	thumb_func_start sub_80AFECC
-sub_80AFECC: ; 80AFECC
+sub_80AFECC: @ 80AFECC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -313872,7 +313872,7 @@ _080AFF8A:
 	thumb_func_end sub_80AFECC
 
 	thumb_func_start sub_80AFF90
-sub_80AFF90: ; 80AFF90
+sub_80AFF90: @ 80AFF90
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -313892,7 +313892,7 @@ _080AFFAC:
 	thumb_func_end sub_80AFF90
 
 	thumb_func_start sub_80AFFB8
-sub_80AFFB8: ; 80AFFB8
+sub_80AFFB8: @ 80AFFB8
 	push {r4,lr}
 	ldr r4, =sub_80AFF90
 	adds r0, r4, 0
@@ -313911,7 +313911,7 @@ _080AFFD0:
 	thumb_func_end sub_80AFFB8
 
 	thumb_func_start sub_80AFFDC
-sub_80AFFDC: ; 80AFFDC
+sub_80AFFDC: @ 80AFFDC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -313960,7 +313960,7 @@ _080B002C:
 	thumb_func_end sub_80AFFDC
 
 	thumb_func_start sub_80B003C
-sub_80B003C: ; 80B003C
+sub_80B003C: @ 80B003C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -314009,7 +314009,7 @@ _080B008C:
 	thumb_func_end sub_80B003C
 
 	thumb_func_start sub_80B009C
-sub_80B009C: ; 80B009C
+sub_80B009C: @ 80B009C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -314046,7 +314046,7 @@ _080B00B6:
 	thumb_func_end sub_80B009C
 
 	thumb_func_start sub_80B00E8
-sub_80B00E8: ; 80B00E8
+sub_80B00E8: @ 80B00E8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -314076,7 +314076,7 @@ _080B0116:
 	thumb_func_end sub_80B00E8
 
 	thumb_func_start door_upload_tiles
-door_upload_tiles: ; 80B0124
+door_upload_tiles: @ 80B0124
 	push {r4,lr}
 	ldr r4, =0x02038c28
 	ldr r0, =0x03005d90
@@ -314102,7 +314102,7 @@ door_upload_tiles: ; 80B0124
 	thumb_func_end door_upload_tiles
 
 	thumb_func_start task0A_mpl_807E31C
-task0A_mpl_807E31C: ; 80B0160
+task0A_mpl_807E31C: @ 80B0160
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -314145,7 +314145,7 @@ _080B01B6:
 	thumb_func_end task0A_mpl_807E31C
 
 	thumb_func_start sub_80B01BC
-sub_80B01BC: ; 80B01BC
+sub_80B01BC: @ 80B01BC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -314210,7 +314210,7 @@ _080B023A:
 	thumb_func_end sub_80B01BC
 
 	thumb_func_start sub_80B0244
-sub_80B0244: ; 80B0244
+sub_80B0244: @ 80B0244
 	push {lr}
 	bl script_env_2_enable
 	ldr r0, =sub_80AFA0C
@@ -314225,7 +314225,7 @@ sub_80B0244: ; 80B0244
 	thumb_func_end sub_80B0244
 
 	thumb_func_start sub_80B0268
-sub_80B0268: ; 80B0268
+sub_80B0268: @ 80B0268
 	push {lr}
 	bl script_env_2_enable
 	ldr r0, =0x03005dac
@@ -314240,7 +314240,7 @@ sub_80B0268: ; 80B0268
 	thumb_func_end sub_80B0268
 
 	thumb_func_start sub_80B028C
-sub_80B028C: ; 80B028C
+sub_80B028C: @ 80B028C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -314276,7 +314276,7 @@ _080B02AA:
 	thumb_func_end sub_80B028C
 
 	thumb_func_start sub_80B02C8
-sub_80B02C8: ; 80B02C8
+sub_80B02C8: @ 80B02C8
 	push {r4,r5,lr}
 	lsls r0, 16
 	ldr r2, =0x04000052
@@ -314322,7 +314322,7 @@ _080B0312:
 	thumb_func_end sub_80B02C8
 
 	thumb_func_start sub_80B0318
-sub_80B0318: ; 80B0318
+sub_80B0318: @ 80B0318
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -314550,7 +314550,7 @@ _080B052C:
 	thumb_func_end sub_80B0318
 
 	thumb_func_start sub_80B0534
-sub_80B0534: ; 80B0534
+sub_80B0534: @ 80B0534
 	push {lr}
 	ldr r0, =sub_80B0318
 	movs r1, 0x50
@@ -314595,7 +314595,7 @@ _080B0580:
 	thumb_func_end sub_80B0534
 
 	thumb_func_start sub_80B058C
-sub_80B058C: ; 80B058C
+sub_80B058C: @ 80B058C
 	push {lr}
 	ldr r0, =sub_80B0318
 	bl get_task_id_by_function
@@ -314614,7 +314614,7 @@ sub_80B058C: ; 80B058C
 	thumb_func_end sub_80B058C
 
 	thumb_func_start sub_80B05B4
-sub_80B05B4: ; 80B05B4
+sub_80B05B4: @ 80B05B4
 	push {lr}
 	bl sub_80859B0
 	ldr r0, =task50_0807F0C8
@@ -314626,7 +314626,7 @@ sub_80B05B4: ; 80B05B4
 	thumb_func_end sub_80B05B4
 
 	thumb_func_start task50_0807F0C8
-task50_0807F0C8: ; 80B05CC
+task50_0807F0C8: @ 80B05CC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -314645,7 +314645,7 @@ _080B05E8:
 	thumb_func_end task50_0807F0C8
 
 	thumb_func_start task01_battle_start
-task01_battle_start: ; 80B05F0
+task01_battle_start: @ 80B05F0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -314694,7 +314694,7 @@ _080B0652:
 	thumb_func_end task01_battle_start
 
 	thumb_func_start task_add_01_battle_start
-task_add_01_battle_start: ; 80B065C
+task_add_01_battle_start: @ 80B065C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -314722,7 +314722,7 @@ task_add_01_battle_start: ; 80B065C
 	thumb_func_end task_add_01_battle_start
 
 	thumb_func_start sub_80B0698
-sub_80B0698: ; 80B0698
+sub_80B0698: @ 80B0698
 	push {lr}
 	bl GetSafariZoneFlag
 	cmp r0, 0
@@ -314737,7 +314737,7 @@ _080B06AC:
 	thumb_func_end sub_80B0698
 
 	thumb_func_start sub_80B06B0
-sub_80B06B0: ; 80B06B0
+sub_80B06B0: @ 80B06B0
 	push {lr}
 	bl sub_80B07B4
 	pop {r0}
@@ -314745,7 +314745,7 @@ sub_80B06B0: ; 80B06B0
 	thumb_func_end sub_80B06B0
 
 	thumb_func_start sub_80B06BC
-sub_80B06BC: ; 80B06BC
+sub_80B06BC: @ 80B06BC
 	push {r4,lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -314787,7 +314787,7 @@ _080B06F2:
 	thumb_func_end sub_80B06BC
 
 	thumb_func_start sub_80B072C
-sub_80B072C: ; 80B072C
+sub_80B072C: @ 80B072C
 	push {lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -314816,7 +314816,7 @@ sub_80B072C: ; 80B072C
 	thumb_func_end sub_80B072C
 
 	thumb_func_start sub_80B077C
-sub_80B077C: ; 80B077C
+sub_80B077C: @ 80B077C
 	push {lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -314838,7 +314838,7 @@ sub_80B077C: ; 80B077C
 	thumb_func_end sub_80B077C
 
 	thumb_func_start sub_80B07B4
-sub_80B07B4: ; 80B07B4
+sub_80B07B4: @ 80B07B4
 	push {lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -314867,7 +314867,7 @@ sub_80B07B4: ; 80B07B4
 	thumb_func_end sub_80B07B4
 
 	thumb_func_start task_add_01_battle_start_with_music_and_stats
-task_add_01_battle_start_with_music_and_stats: ; 80B0804
+task_add_01_battle_start_with_music_and_stats: @ 80B0804
 	push {lr}
 	bl reads_trainer_data_byte1_byte0x18
 	lsls r0, 24
@@ -314884,7 +314884,7 @@ task_add_01_battle_start_with_music_and_stats: ; 80B0804
 	thumb_func_end task_add_01_battle_start_with_music_and_stats
 
 	thumb_func_start sub_80B0828
-sub_80B0828: ; 80B0828
+sub_80B0828: @ 80B0828
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -314915,7 +314915,7 @@ _080B0856:
 	thumb_func_end sub_80B0828
 
 	thumb_func_start sub_80B086C
-sub_80B086C: ; 80B086C
+sub_80B086C: @ 80B086C
 	push {lr}
 	ldr r0, =0x02024744
 	movs r1, 0xC4
@@ -314939,7 +314939,7 @@ sub_80B086C: ; 80B086C
 	thumb_func_end sub_80B086C
 
 	thumb_func_start sub_80B08A8
-sub_80B08A8: ; 80B08A8
+sub_80B08A8: @ 80B08A8
 	push {lr}
 	bl script_env_2_enable
 	ldr r1, =0x030022c0
@@ -314965,7 +314965,7 @@ sub_80B08A8: ; 80B08A8
 	thumb_func_end sub_80B08A8
 
 	thumb_func_start sub_80B08EC
-sub_80B08EC: ; 80B08EC
+sub_80B08EC: @ 80B08EC
 	push {lr}
 	bl script_env_2_enable
 	ldr r1, =0x030022c0
@@ -314992,7 +314992,7 @@ sub_80B08EC: ; 80B08EC
 	thumb_func_end sub_80B08EC
 
 	thumb_func_start sub_80B0934
-sub_80B0934: ; 80B0934
+sub_80B0934: @ 80B0934
 	push {r4,lr}
 	bl script_env_2_enable
 	ldr r1, =0x030022c0
@@ -315094,7 +315094,7 @@ _080B09FE:
 	thumb_func_end sub_80B0934
 
 	thumb_func_start sub_80B0A18
-sub_80B0A18: ; 80B0A18
+sub_80B0A18: @ 80B0A18
 	push {lr}
 	bl script_env_2_enable
 	ldr r1, =0x030022c0
@@ -315131,7 +315131,7 @@ _080B0A5A:
 	thumb_func_end sub_80B0A18
 
 	thumb_func_start sub_80B0A74
-sub_80B0A74: ; 80B0A74
+sub_80B0A74: @ 80B0A74
 	push {lr}
 	bl script_env_2_enable
 	ldr r1, =0x030022c0
@@ -315190,7 +315190,7 @@ _080B0AD6:
 	thumb_func_end sub_80B0A74
 
 	thumb_func_start sub_80B0AF8
-sub_80B0AF8: ; 80B0AF8
+sub_80B0AF8: @ 80B0AF8
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -315235,7 +315235,7 @@ _080B0B58:
 	thumb_func_end sub_80B0AF8
 
 	thumb_func_start sub_80B0B6C
-sub_80B0B6C: ; 80B0B6C
+sub_80B0B6C: @ 80B0B6C
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -315278,7 +315278,7 @@ _080B0BC6:
 	thumb_func_end sub_80B0B6C
 
 	thumb_func_start sub_80B0BD0
-sub_80B0BD0: ; 80B0BD0
+sub_80B0BD0: @ 80B0BD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -315440,7 +315440,7 @@ _080B0D1A:
 	thumb_func_end sub_80B0BD0
 
 	thumb_func_start sub_80B0D24
-sub_80B0D24: ; 80B0D24
+sub_80B0D24: @ 80B0D24
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -315491,7 +315491,7 @@ _080B0D7E:
 	thumb_func_end sub_80B0D24
 
 	thumb_func_start sub_80B0D88
-sub_80B0D88: ; 80B0D88
+sub_80B0D88: @ 80B0D88
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -315542,7 +315542,7 @@ _080B0DDC:
 	thumb_func_end sub_80B0D88
 
 	thumb_func_start reads_trainer_data_byte0
-reads_trainer_data_byte0: ; 80B0DE8
+reads_trainer_data_byte0: @ 80B0DE8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -315667,7 +315667,7 @@ _080B0EC0:
 	thumb_func_end reads_trainer_data_byte0
 
 	thumb_func_start sub_80B0EC8
-sub_80B0EC8: ; 80B0EC8
+sub_80B0EC8: @ 80B0EC8
 	push {r4-r6,lr}
 	bl sub_80B0D24
 	lsls r0, 24
@@ -315719,7 +315719,7 @@ _080B0F2E:
 	thumb_func_end sub_80B0EC8
 
 	thumb_func_start reads_trainer_data_byte1_byte0x18
-reads_trainer_data_byte1_byte0x18: ; 80B0F34
+reads_trainer_data_byte1_byte0x18: @ 80B0F34
 	push {r4-r6,lr}
 	ldr r4, =0x02038bca
 	ldrh r1, [r4]
@@ -315831,7 +315831,7 @@ _080B1000:
 	thumb_func_end reads_trainer_data_byte1_byte0x18
 
 	thumb_func_start sub_80B100C
-sub_80B100C: ; 80B100C
+sub_80B100C: @ 80B100C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02024744
@@ -315965,7 +315965,7 @@ _080B1120:
 	thumb_func_end sub_80B100C
 
 	thumb_func_start sub_80B1138
-sub_80B1138: ; 80B1138
+sub_80B1138: @ 80B1138
 	push {lr}
 	ldr r0, =set_256color_bg_bg0
 	bl SetMainCallback2
@@ -315978,7 +315978,7 @@ sub_80B1138: ; 80B1138
 	thumb_func_end sub_80B1138
 
 	thumb_func_start sub_80B1158
-sub_80B1158: ; 80B1158
+sub_80B1158: @ 80B1158
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x00004023
@@ -316010,7 +316010,7 @@ sub_80B1158: ; 80B1158
 	thumb_func_end sub_80B1158
 
 	thumb_func_start sub_80B11A8
-sub_80B11A8: ; 80B11A8
+sub_80B11A8: @ 80B11A8
 	push {lr}
 	bl fade_and_return_progress_probably
 	bl RunActiveTasks
@@ -316043,7 +316043,7 @@ _080B11F0:
 	thumb_func_end sub_80B11A8
 
 	thumb_func_start sub_80B1204
-sub_80B1204: ; 80B1204
+sub_80B1204: @ 80B1204
 	push {lr}
 	bl sav1_reset_battle_music_maybe
 	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -316054,7 +316054,7 @@ sub_80B1204: ; 80B1204
 	thumb_func_end sub_80B1204
 
 	thumb_func_start sub_80B1218
-sub_80B1218: ; 80B1218
+sub_80B1218: @ 80B1218
 	push {lr}
 	movs r0, 0x8
 	bl sub_80847F8
@@ -316069,7 +316069,7 @@ _080B122E:
 	thumb_func_end sub_80B1218
 
 	thumb_func_start sub_80B1234
-sub_80B1234: ; 80B1234
+sub_80B1234: @ 80B1234
 	push {lr}
 	movs r0, 0x9
 	bl sub_80847F8
@@ -316084,8 +316084,8 @@ _080B124A:
 	thumb_func_end sub_80B1234
 
 	thumb_func_start TrainerBattleLoadArg32
-; u32 TrainerBattleLoadArg32(u8 *arg)
-TrainerBattleLoadArg32: ; 80B1250
+@ u32 TrainerBattleLoadArg32(u8 *arg)
+TrainerBattleLoadArg32: @ 80B1250
 	adds r2, r0, 0
 	ldrb r0, [r2]
 	ldrb r1, [r2, 0x1]
@@ -316101,8 +316101,8 @@ TrainerBattleLoadArg32: ; 80B1250
 	thumb_func_end TrainerBattleLoadArg32
 
 	thumb_func_start TrainerBattleLoadArg16
-; u16 TrainerBattleLoadArg16(u8 *arg)
-TrainerBattleLoadArg16: ; 80B1268
+@ u16 TrainerBattleLoadArg16(u8 *arg)
+TrainerBattleLoadArg16: @ 80B1268
 	adds r1, r0, 0
 	ldrb r0, [r1]
 	ldrb r1, [r1, 0x1]
@@ -316112,14 +316112,14 @@ TrainerBattleLoadArg16: ; 80B1268
 	thumb_func_end TrainerBattleLoadArg16
 
 	thumb_func_start TrainerBattleLoadArg8
-; u8 TrainerBattleLoadArg8(u8 *arg)
-TrainerBattleLoadArg8: ; 80B1274
+@ u8 TrainerBattleLoadArg8(u8 *arg)
+TrainerBattleLoadArg8: @ 80B1274
 	ldrb r0, [r0]
 	bx lr
 	thumb_func_end TrainerBattleLoadArg8
 
 	thumb_func_start trainerflag_opponent
-trainerflag_opponent: ; 80B1278
+trainerflag_opponent: @ 80B1278
 	ldr r1, =0x02038bca
 	movs r2, 0xA0
 	lsls r2, 3
@@ -316133,7 +316133,7 @@ trainerflag_opponent: ; 80B1278
 	thumb_func_end trainerflag_opponent
 
 	thumb_func_start sub_80B1290
-sub_80B1290: ; 80B1290
+sub_80B1290: @ 80B1290
 	ldr r1, =0x02038bcc
 	movs r2, 0xA0
 	lsls r2, 3
@@ -316147,7 +316147,7 @@ sub_80B1290: ; 80B1290
 	thumb_func_end sub_80B1290
 
 	thumb_func_start battle_exit_is_player_defeat
-battle_exit_is_player_defeat: ; 80B12A8
+battle_exit_is_player_defeat: @ 80B12A8
 	push {lr}
 	subs r0, 0x1
 	cmp r0, 0x6
@@ -316178,7 +316178,7 @@ _080B12E2:
 	thumb_func_end battle_exit_is_player_defeat
 
 	thumb_func_start ResetTrainerOpponentIds
-ResetTrainerOpponentIds: ; 80B12E8
+ResetTrainerOpponentIds: @ 80B12E8
 	ldr r0, =0x02038bca
 	movs r1, 0
 	strh r1, [r0]
@@ -316189,8 +316189,8 @@ ResetTrainerOpponentIds: ; 80B12E8
 	thumb_func_end ResetTrainerOpponentIds
 
 	thumb_func_start InitTrainerBattleVariables
-; void InitTrainerBattleVariables()
-InitTrainerBattleVariables: ; 80B12FC
+@ void InitTrainerBattleVariables()
+InitTrainerBattleVariables: @ 80B12FC
 	push {lr}
 	ldr r0, =0x02038bc8
 	movs r1, 0
@@ -316231,8 +316231,8 @@ _080B1338:
 	thumb_func_end InitTrainerBattleVariables
 
 	thumb_func_start TrainerBattleLoadArgs
-; void TrainerBattleLoadArgs(struct TrainerBattleArgSpec *argSpecs, u8 *args)
-TrainerBattleLoadArgs: ; 80B1370
+@ void TrainerBattleLoadArgs(struct TrainerBattleArgSpec *argSpecs, u8 *args)
+TrainerBattleLoadArgs: @ 80B1370
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -316302,7 +316302,7 @@ _080B13EC:
 	thumb_func_end TrainerBattleLoadArgs
 
 	thumb_func_start battle_80801F0
-battle_80801F0: ; 80B13F8
+battle_80801F0: @ 80B13F8
 	push {lr}
 	ldr r0, =0x02038bd0
 	ldrh r1, [r0]
@@ -316326,8 +316326,8 @@ _080B141A:
 	thumb_func_end battle_80801F0
 
 	thumb_func_start TrainerBattleConfigure
-; u8 *TrainerBattleConfigure(u8 *args)
-TrainerBattleConfigure: ; 80B1430
+@ u8 *TrainerBattleConfigure(u8 *args)
+TrainerBattleConfigure: @ 80B1430
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl InitTrainerBattleVariables
@@ -316514,8 +316514,8 @@ _080B161E:
 	thumb_func_end TrainerBattleConfigure
 
 	thumb_func_start SingleTrainerWantsBattle
-; void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
-SingleTrainerWantsBattle: ; 80B162C
+@ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
+SingleTrainerWantsBattle: @ 80B162C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -316542,8 +316542,8 @@ SingleTrainerWantsBattle: ; 80B162C
 	thumb_func_end SingleTrainerWantsBattle
 
 	thumb_func_start TwoTrainersWantBattle
-; void TwoTrainersWantBattle(u8 trainerFieldObjectId, u8 *trainerScript)
-TwoTrainersWantBattle: ; 80B1670
+@ void TwoTrainersWantBattle(u8 trainerFieldObjectId, u8 *trainerScript)
+TwoTrainersWantBattle: @ 80B1670
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -316567,8 +316567,8 @@ TwoTrainersWantBattle: ; 80B1670
 	thumb_func_end TwoTrainersWantBattle
 
 	thumb_func_start TwoTrainersWantBattleExecuteScript
-; void TwoTrainersWantBattleExecuteScript()
-TwoTrainersWantBattleExecuteScript: ; 80B16A4
+@ void TwoTrainersWantBattleExecuteScript()
+TwoTrainersWantBattleExecuteScript: @ 80B16A4
 	push {lr}
 	ldr r0, =gUnknown_08271354
 	bl script_env_1_execute_new_script
@@ -316579,8 +316579,8 @@ TwoTrainersWantBattleExecuteScript: ; 80B16A4
 	thumb_func_end TwoTrainersWantBattleExecuteScript
 
 	thumb_func_start GetTrainerFlagFromScriptPointer
-; u8 GetTrainerFlagFromScriptPointer(u8 *scriptPointer)
-GetTrainerFlagFromScriptPointer: ; 80B16B8
+@ u8 GetTrainerFlagFromScriptPointer(u8 *scriptPointer)
+GetTrainerFlagFromScriptPointer: @ 80B16B8
 	push {lr}
 	adds r0, 0x2
 	bl TrainerBattleLoadArg16
@@ -316597,7 +316597,7 @@ GetTrainerFlagFromScriptPointer: ; 80B16B8
 	thumb_func_end GetTrainerFlagFromScriptPointer
 
 	thumb_func_start sub_80B16D8
-sub_80B16D8: ; 80B16D8
+sub_80B16D8: @ 80B16D8
 	push {r4,lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -316622,7 +316622,7 @@ sub_80B16D8: ; 80B16D8
 	thumb_func_end sub_80B16D8
 
 	thumb_func_start sub_80B170C
-sub_80B170C: ; 80B170C
+sub_80B170C: @ 80B170C
 	ldr r0, =0x02038bc8
 	ldrb r0, [r0]
 	bx lr
@@ -316630,8 +316630,8 @@ sub_80B170C: ; 80B170C
 	thumb_func_end sub_80B170C
 
 	thumb_func_start check_trainer_flag
-; pokescrcmd
-check_trainer_flag: ; 80B1718
+@ pokescrcmd
+check_trainer_flag: @ 80B1718
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -316664,7 +316664,7 @@ _080B1752:
 	thumb_func_end check_trainer_flag
 
 	thumb_func_start rom_npc_set_flag_for_script_id
-rom_npc_set_flag_for_script_id: ; 80B1760
+rom_npc_set_flag_for_script_id: @ 80B1760
 	push {lr}
 	ldr r0, =0x02038bcc
 	ldrh r0, [r0]
@@ -316685,7 +316685,7 @@ _080B1776:
 	thumb_func_end rom_npc_set_flag_for_script_id
 
 	thumb_func_start sub_80B178C
-sub_80B178C: ; 80B178C
+sub_80B178C: @ 80B178C
 	push {lr}
 	bl trainerflag_opponent
 	lsls r0, 16
@@ -316696,7 +316696,7 @@ sub_80B178C: ; 80B178C
 	thumb_func_end sub_80B178C
 
 	thumb_func_start trainer_flag_check
-trainer_flag_check: ; 80B17A0
+trainer_flag_check: @ 80B17A0
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -316711,7 +316711,7 @@ trainer_flag_check: ; 80B17A0
 	thumb_func_end trainer_flag_check
 
 	thumb_func_start trainer_flag_set
-trainer_flag_set: ; 80B17B8
+trainer_flag_set: @ 80B17B8
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -316724,7 +316724,7 @@ trainer_flag_set: ; 80B17B8
 	thumb_func_end trainer_flag_set
 
 	thumb_func_start trainer_flag_clear
-trainer_flag_clear: ; 80B17CC
+trainer_flag_clear: @ 80B17CC
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -316737,7 +316737,7 @@ trainer_flag_clear: ; 80B17CC
 	thumb_func_end trainer_flag_clear
 
 	thumb_func_start sub_80B17E0
-sub_80B17E0: ; 80B17E0
+sub_80B17E0: @ 80B17E0
 	push {r4,lr}
 	ldr r0, =0x030060a8
 	ldrb r0, [r0]
@@ -316859,7 +316859,7 @@ _080B190C:
 	thumb_func_end sub_80B17E0
 
 	thumb_func_start sub_80B1918
-sub_80B1918: ; 80B1918
+sub_80B1918: @ 80B1918
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
@@ -316910,7 +316910,7 @@ _080B198A:
 	thumb_func_end sub_80B1918
 
 	thumb_func_start sub_80B1994
-sub_80B1994: ; 80B1994
+sub_80B1994: @ 80B1994
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
@@ -316945,7 +316945,7 @@ _080B19E2:
 	thumb_func_end sub_80B1994
 
 	thumb_func_start sub_80B19EC
-sub_80B19EC: ; 80B19EC
+sub_80B19EC: @ 80B19EC
 	push {lr}
 	ldr r1, =0x02022fec
 	movs r0, 0x8
@@ -316961,7 +316961,7 @@ sub_80B19EC: ; 80B19EC
 	thumb_func_end sub_80B19EC
 
 	thumb_func_start sub_80B1A14
-sub_80B1A14: ; 80B1A14
+sub_80B1A14: @ 80B1A14
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -317053,7 +317053,7 @@ _080B1AF4:
 	thumb_func_end sub_80B1A14
 
 	thumb_func_start sub_80B1AF8
-sub_80B1AF8: ; 80B1AF8
+sub_80B1AF8: @ 80B1AF8
 	push {lr}
 	ldr r0, =0x02038bec
 	ldr r0, [r0]
@@ -317067,7 +317067,7 @@ _080B1B04:
 	thumb_func_end sub_80B1AF8
 
 	thumb_func_start sub_80B1B10
-sub_80B1B10: ; 80B1B10
+sub_80B1B10: @ 80B1B10
 	push {lr}
 	ldr r1, =0x02038bf8
 	ldrb r2, [r1]
@@ -317104,7 +317104,7 @@ _080B1B56:
 	thumb_func_end sub_80B1B10
 
 	thumb_func_start special_trainer_unable_to_battle
-special_trainer_unable_to_battle: ; 80B1B60
+special_trainer_unable_to_battle: @ 80B1B60
 	push {lr}
 	bl sub_80B1D18
 	bl box_related_two__2
@@ -317113,8 +317113,8 @@ special_trainer_unable_to_battle: ; 80B1B60
 	thumb_func_end special_trainer_unable_to_battle
 
 	thumb_func_start SetUpTrainerEncounterMusic
-; void SetUpTrainerEncounterMusic()
-SetUpTrainerEncounterMusic: ; 80B1B70
+@ void SetUpTrainerEncounterMusic()
+SetUpTrainerEncounterMusic: @ 80B1B70
 	push {lr}
 	ldr r0, =0x02038bfc
 	ldrb r0, [r0]
@@ -317224,8 +317224,8 @@ _080B1C62:
 	thumb_func_end SetUpTrainerEncounterMusic
 
 	thumb_func_start ReturnEmptyStringIfNull
-; u8 *ReturnEmptyStringIfNull(u8 *str)
-ReturnEmptyStringIfNull: ; 80B1C6C
+@ u8 *ReturnEmptyStringIfNull(u8 *str)
+ReturnEmptyStringIfNull: @ 80B1C6C
 	push {lr}
 	cmp r0, 0
 	bne _080B1C74
@@ -317237,7 +317237,7 @@ _080B1C74:
 	thumb_func_end ReturnEmptyStringIfNull
 
 	thumb_func_start sub_80B1C7C
-sub_80B1C7C: ; 80B1C7C
+sub_80B1C7C: @ 80B1C7C
 	push {lr}
 	ldr r0, =0x02038bfc
 	ldrb r0, [r0]
@@ -317257,7 +317257,7 @@ _080B1C96:
 	thumb_func_end sub_80B1C7C
 
 	thumb_func_start sub_80B1CA4
-sub_80B1CA4: ; 80B1CA4
+sub_80B1CA4: @ 80B1CA4
 	push {r4,lr}
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
@@ -317285,7 +317285,7 @@ _080B1CC0:
 	thumb_func_end sub_80B1CA4
 
 	thumb_func_start sub_80B1CE0
-sub_80B1CE0: ; 80B1CE0
+sub_80B1CE0: @ 80B1CE0
 	push {r4,lr}
 	ldr r4, =0x02021fc4
 	ldr r0, =0x02038be0
@@ -317302,7 +317302,7 @@ sub_80B1CE0: ; 80B1CE0
 	thumb_func_end sub_80B1CE0
 
 	thumb_func_start sub_80B1D04
-sub_80B1D04: ; 80B1D04
+sub_80B1D04: @ 80B1D04
 	push {lr}
 	ldr r0, =0x02038be4
 	ldr r0, [r0]
@@ -317313,7 +317313,7 @@ sub_80B1D04: ; 80B1D04
 	thumb_func_end sub_80B1D04
 
 	thumb_func_start sub_80B1D18
-sub_80B1D18: ; 80B1D18
+sub_80B1D18: @ 80B1D18
 	push {lr}
 	ldr r0, =0x02038be8
 	ldr r0, [r0]
@@ -317324,7 +317324,7 @@ sub_80B1D18: ; 80B1D18
 	thumb_func_end sub_80B1D18
 
 	thumb_func_start sub_80B1D2C
-sub_80B1D2C: ; 80B1D2C
+sub_80B1D2C: @ 80B1D2C
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -317349,7 +317349,7 @@ _080B1D4C:
 	thumb_func_end sub_80B1D2C
 
 	thumb_func_start sub_80B1D50
-sub_80B1D50: ; 80B1D50
+sub_80B1D50: @ 80B1D50
 	push {r4,r5,lr}
 	lsls r1, 16
 	lsrs r5, r1, 16
@@ -317391,7 +317391,7 @@ _080B1D8C:
 	thumb_func_end sub_80B1D50
 
 	thumb_func_start sub_80B1D94
-sub_80B1D94: ; 80B1D94
+sub_80B1D94: @ 80B1D94
 	push {lr}
 	cmp r0, 0x48
 	ble _080B1D9E
@@ -317418,7 +317418,7 @@ _080B1DB8:
 	thumb_func_end sub_80B1D94
 
 	thumb_func_start sub_80B1DBC
-sub_80B1DBC: ; 80B1DBC
+sub_80B1DBC: @ 80B1DBC
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	movs r5, 0x1
@@ -317453,7 +317453,7 @@ _080B1DE2:
 	thumb_func_end sub_80B1DBC
 
 	thumb_func_start sub_80B1DFC
-sub_80B1DFC: ; 80B1DFC
+sub_80B1DFC: @ 80B1DFC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -317527,7 +317527,7 @@ _080B1E74:
 	thumb_func_end sub_80B1DFC
 
 	thumb_func_start sub_80B1E94
-sub_80B1E94: ; 80B1E94
+sub_80B1E94: @ 80B1E94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =gUnknown_085500A4
@@ -317550,7 +317550,7 @@ _080B1EB4:
 	thumb_func_end sub_80B1E94
 
 	thumb_func_start sub_80B1EC0
-sub_80B1EC0: ; 80B1EC0
+sub_80B1EC0: @ 80B1EC0
 	push {r4-r6,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -317590,7 +317590,7 @@ _080B1F02:
 	thumb_func_end sub_80B1EC0
 
 	thumb_func_start sub_80B1F08
-sub_80B1F08: ; 80B1F08
+sub_80B1F08: @ 80B1F08
 	push {r4,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -317621,7 +317621,7 @@ _080B1F32:
 	thumb_func_end sub_80B1F08
 
 	thumb_func_start sub_80B1F38
-sub_80B1F38: ; 80B1F38
+sub_80B1F38: @ 80B1F38
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -317652,7 +317652,7 @@ _080B1F6E:
 	thumb_func_end sub_80B1F38
 
 	thumb_func_start sub_80B1F74
-sub_80B1F74: ; 80B1F74
+sub_80B1F74: @ 80B1F74
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -317683,7 +317683,7 @@ _080B1FAA:
 	thumb_func_end sub_80B1F74
 
 	thumb_func_start sub_80B1FB0
-sub_80B1FB0: ; 80B1FB0
+sub_80B1FB0: @ 80B1FB0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -317732,7 +317732,7 @@ _080B1FFE:
 	thumb_func_end sub_80B1FB0
 
 	thumb_func_start sub_80B2004
-sub_80B2004: ; 80B2004
+sub_80B2004: @ 80B2004
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -317782,7 +317782,7 @@ _080B2054:
 	thumb_func_end sub_80B2004
 
 	thumb_func_start sub_80B205C
-sub_80B205C: ; 80B205C
+sub_80B205C: @ 80B205C
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -317806,7 +317806,7 @@ _080B207E:
 	thumb_func_end sub_80B205C
 
 	thumb_func_start sub_80B208C
-sub_80B208C: ; 80B208C
+sub_80B208C: @ 80B208C
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r1, 0
@@ -317834,7 +317834,7 @@ _080B20B2:
 	thumb_func_end sub_80B208C
 
 	thumb_func_start sub_80B20BC
-sub_80B20BC: ; 80B20BC
+sub_80B20BC: @ 80B20BC
 	push {lr}
 	ldr r0, =0x0000012f
 	bl FlagGet
@@ -317858,7 +317858,7 @@ _080B20E2:
 	thumb_func_end sub_80B20BC
 
 	thumb_func_start sub_80B20F4
-sub_80B20F4: ; 80B20F4
+sub_80B20F4: @ 80B20F4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -317887,7 +317887,7 @@ _080B2120:
 	thumb_func_end sub_80B20F4
 
 	thumb_func_start sub_80B2128
-sub_80B2128: ; 80B2128
+sub_80B2128: @ 80B2128
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -317918,7 +317918,7 @@ _080B2156:
 	thumb_func_end sub_80B2128
 
 	thumb_func_start sub_80B215C
-sub_80B215C: ; 80B215C
+sub_80B215C: @ 80B215C
 	push {lr}
 	bl sub_80B2128
 	cmp r0, 0
@@ -317943,7 +317943,7 @@ _080B2184:
 	thumb_func_end sub_80B215C
 
 	thumb_func_start sub_80B2188
-sub_80B2188: ; 80B2188
+sub_80B2188: @ 80B2188
 	push {lr}
 	bl sub_80B2128
 	cmp r0, 0
@@ -317966,7 +317966,7 @@ _080B21AE:
 	thumb_func_end sub_80B2188
 
 	thumb_func_start sub_80B21B4
-sub_80B21B4: ; 80B21B4
+sub_80B21B4: @ 80B21B4
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -317995,7 +317995,7 @@ _080B21E0:
 	thumb_func_end sub_80B21B4
 
 	thumb_func_start sub_80B21F4
-sub_80B21F4: ; 80B21F4
+sub_80B21F4: @ 80B21F4
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -318012,7 +318012,7 @@ sub_80B21F4: ; 80B21F4
 	thumb_func_end sub_80B21F4
 
 	thumb_func_start sub_80B2214
-sub_80B2214: ; 80B2214
+sub_80B2214: @ 80B2214
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -318029,7 +318029,7 @@ sub_80B2214: ; 80B2214
 	thumb_func_end sub_80B2214
 
 	thumb_func_start sub_80B2234
-sub_80B2234: ; 80B2234
+sub_80B2234: @ 80B2234
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -318044,7 +318044,7 @@ sub_80B2234: ; 80B2234
 	thumb_func_end sub_80B2234
 
 	thumb_func_start sub_80B2250
-sub_80B2250: ; 80B2250
+sub_80B2250: @ 80B2250
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -318059,7 +318059,7 @@ sub_80B2250: ; 80B2250
 	thumb_func_end sub_80B2250
 
 	thumb_func_start sub_80B226C
-sub_80B226C: ; 80B226C
+sub_80B226C: @ 80B226C
 	push {r4,r5,lr}
 	ldr r5, =gUnknown_085500A4
 	ldr r4, =0x02038bca
@@ -318085,7 +318085,7 @@ _080B229A:
 	thumb_func_end sub_80B226C
 
 	thumb_func_start sub_80B22A0
-sub_80B22A0: ; 80B22A0
+sub_80B22A0: @ 80B22A0
 	push {lr}
 	ldr r0, =gUnknown_085500A4
 	ldr r1, =0x02038bca
@@ -318099,7 +318099,7 @@ sub_80B22A0: ; 80B22A0
 	thumb_func_end sub_80B22A0
 
 	thumb_func_start sub_80B22BC
-sub_80B22BC: ; 80B22BC
+sub_80B22BC: @ 80B22BC
 	push {lr}
 	ldr r0, =gUnknown_085500A4
 	ldr r1, =0x02038bca
@@ -318112,7 +318112,7 @@ sub_80B22BC: ; 80B22BC
 	thumb_func_end sub_80B22BC
 
 	thumb_func_start CheckIfMultipleTrainersWantBattle
-CheckIfMultipleTrainersWantBattle: ; 80B22D8
+CheckIfMultipleTrainersWantBattle: @ 80B22D8
 	push {lr}
 	ldr r1, =0x02038bf9
 	ldrb r0, [r1]
@@ -318141,7 +318141,7 @@ _080B230A:
 	thumb_func_end CheckIfMultipleTrainersWantBattle
 
 	thumb_func_start sub_80B2318
-sub_80B2318: ; 80B2318
+sub_80B2318: @ 80B2318
 	push {r4-r7,lr}
 	lsls r0, 16
 	ldr r7, =gUnknown_085500A4
@@ -318187,7 +318187,7 @@ _080B2364:
 	thumb_func_end sub_80B2318
 
 	thumb_func_start sub_80B236C
-sub_80B236C: ; 80B236C
+sub_80B236C: @ 80B236C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -318220,7 +318220,7 @@ _080B23A0:
 	thumb_func_end sub_80B236C
 
 	thumb_func_start sub_80B23B0
-sub_80B23B0: ; 80B23B0
+sub_80B23B0: @ 80B23B0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -318267,7 +318267,7 @@ sub_80B23B0: ; 80B23B0
 	thumb_func_end sub_80B23B0
 
 	thumb_func_start sub_80B241C
-sub_80B241C: ; 80B241C
+sub_80B241C: @ 80B241C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -318284,7 +318284,7 @@ sub_80B241C: ; 80B241C
 	thumb_func_end sub_80B241C
 
 	thumb_func_start sub_80B243C
-sub_80B243C: ; 80B243C
+sub_80B243C: @ 80B243C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -318318,7 +318318,7 @@ _080B2472:
 	thumb_func_end sub_80B243C
 
 	thumb_func_start sub_80B2478
-sub_80B2478: ; 80B2478
+sub_80B2478: @ 80B2478
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -318382,7 +318382,7 @@ _080B24F2:
 	thumb_func_end sub_80B2478
 
 	thumb_func_start sub_80B24F8
-sub_80B24F8: ; 80B24F8
+sub_80B24F8: @ 80B24F8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318410,7 +318410,7 @@ _080B251E:
 	thumb_func_end sub_80B24F8
 
 	thumb_func_start sub_80B252C
-sub_80B252C: ; 80B252C
+sub_80B252C: @ 80B252C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318446,7 +318446,7 @@ _080B2572:
 	thumb_func_end sub_80B252C
 
 	thumb_func_start sub_80B2578
-sub_80B2578: ; 80B2578
+sub_80B2578: @ 80B2578
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318486,7 +318486,7 @@ _080B25BA:
 	thumb_func_end sub_80B2578
 
 	thumb_func_start sub_80B25CC
-sub_80B25CC: ; 80B25CC
+sub_80B25CC: @ 80B25CC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318514,7 +318514,7 @@ _080B25F2:
 	thumb_func_end sub_80B25CC
 
 	thumb_func_start sub_80B2600
-sub_80B2600: ; 80B2600
+sub_80B2600: @ 80B2600
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318542,7 +318542,7 @@ _080B262A:
 	thumb_func_end sub_80B2600
 
 	thumb_func_start sub_80B2634
-sub_80B2634: ; 80B2634
+sub_80B2634: @ 80B2634
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -318581,7 +318581,7 @@ _080B2678:
 	thumb_func_end sub_80B2634
 
 	thumb_func_start sub_80B2688
-sub_80B2688: ; 80B2688
+sub_80B2688: @ 80B2688
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318635,7 +318635,7 @@ _080B26FC:
 	thumb_func_end sub_80B2688
 
 	thumb_func_start sub_80B270C
-sub_80B270C: ; 80B270C
+sub_80B270C: @ 80B270C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318672,7 +318672,7 @@ _080B274C:
 	thumb_func_end sub_80B270C
 
 	thumb_func_start sub_80B275C
-sub_80B275C: ; 80B275C
+sub_80B275C: @ 80B275C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -318743,7 +318743,7 @@ _080B27E4:
 	thumb_func_end sub_80B275C
 
 	thumb_func_start sub_80B2804
-sub_80B2804: ; 80B2804
+sub_80B2804: @ 80B2804
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -318812,7 +318812,7 @@ _080B2898:
 	thumb_func_end sub_80B2804
 
 	thumb_func_start sub_80B28A8
-sub_80B28A8: ; 80B28A8
+sub_80B28A8: @ 80B28A8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -318863,7 +318863,7 @@ _080B290A:
 	thumb_func_end sub_80B28A8
 
 	thumb_func_start sub_80B2918
-sub_80B2918: ; 80B2918
+sub_80B2918: @ 80B2918
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -318962,7 +318962,7 @@ _080B29E6:
 	thumb_func_end sub_80B2918
 
 	thumb_func_start sub_80B2A08
-sub_80B2A08: ; 80B2A08
+sub_80B2A08: @ 80B2A08
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -319058,7 +319058,7 @@ _080B2ACE:
 	thumb_func_end sub_80B2A08
 
 	thumb_func_start sub_80B2AF4
-sub_80B2AF4: ; 80B2AF4
+sub_80B2AF4: @ 80B2AF4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -319137,7 +319137,7 @@ _080B2B5E:
 	thumb_func_end sub_80B2AF4
 
 	thumb_func_start task_map_chg_seq_0807EC34
-task_map_chg_seq_0807EC34: ; 80B2B94
+task_map_chg_seq_0807EC34: @ 80B2B94
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -319203,7 +319203,7 @@ _080B2C22:
 	thumb_func_end task_map_chg_seq_0807EC34
 
 	thumb_func_start sub_80B2C30
-sub_80B2C30: ; 80B2C30
+sub_80B2C30: @ 80B2C30
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -319259,7 +319259,7 @@ _080B2C9C:
 	thumb_func_end sub_80B2C30
 
 	thumb_func_start sub_80B2CB0
-sub_80B2CB0: ; 80B2CB0
+sub_80B2CB0: @ 80B2CB0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -319287,7 +319287,7 @@ _080B2CDE:
 	thumb_func_end sub_80B2CB0
 
 	thumb_func_start sub_80B2CEC
-sub_80B2CEC: ; 80B2CEC
+sub_80B2CEC: @ 80B2CEC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -319315,7 +319315,7 @@ sub_80B2CEC: ; 80B2CEC
 	thumb_func_end sub_80B2CEC
 
 	thumb_func_start sub_80B2D2C
-sub_80B2D2C: ; 80B2D2C
+sub_80B2D2C: @ 80B2D2C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -319343,7 +319343,7 @@ sub_80B2D2C: ; 80B2D2C
 	thumb_func_end sub_80B2D2C
 
 	thumb_func_start sub_80B2D6C
-sub_80B2D6C: ; 80B2D6C
+sub_80B2D6C: @ 80B2D6C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -319374,7 +319374,7 @@ _080B2D9A:
 	thumb_func_end sub_80B2D6C
 
 	thumb_func_start sub_80B2DA4
-sub_80B2DA4: ; 80B2DA4
+sub_80B2DA4: @ 80B2DA4
 	push {r4,lr}
 	movs r3, 0x2
 	movs r2, 0x2
@@ -319445,7 +319445,7 @@ _080B2E34:
 	thumb_func_end sub_80B2DA4
 
 	thumb_func_start sub_80B2E4C
-sub_80B2E4C: ; 80B2E4C
+sub_80B2E4C: @ 80B2E4C
 	push {lr}
 	ldr r1, =0x020229c6
 	ldr r2, =0x00001133
@@ -319463,7 +319463,7 @@ sub_80B2E4C: ; 80B2E4C
 	thumb_func_end sub_80B2E4C
 
 	thumb_func_start sub_80B2E74
-sub_80B2E74: ; 80B2E74
+sub_80B2E74: @ 80B2E74
 	push {lr}
 	ldr r1, =0x020375f0
 	movs r0, 0
@@ -319484,7 +319484,7 @@ sub_80B2E74: ; 80B2E74
 	thumb_func_end sub_80B2E74
 
 	thumb_func_start sub_80B2EA8
-sub_80B2EA8: ; 80B2EA8
+sub_80B2EA8: @ 80B2EA8
 	push {r4,lr}
 	ldr r4, =sub_80B2EE4
 	adds r0, r4, 0
@@ -319513,7 +319513,7 @@ _080B2ED4:
 	thumb_func_end sub_80B2EA8
 
 	thumb_func_start sub_80B2EE4
-sub_80B2EE4: ; 80B2EE4
+sub_80B2EE4: @ 80B2EE4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -319633,7 +319633,7 @@ _080B2FC6:
 	thumb_func_end sub_80B2EE4
 
 	thumb_func_start sub_80B2FD8
-sub_80B2FD8: ; 80B2FD8
+sub_80B2FD8: @ 80B2FD8
 	push {lr}
 	ldr r1, =0x020229c6
 	ldr r2, =0x00004411
@@ -319651,7 +319651,7 @@ sub_80B2FD8: ; 80B2FD8
 	thumb_func_end sub_80B2FD8
 
 	thumb_func_start sub_80B3000
-sub_80B3000: ; 80B3000
+sub_80B3000: @ 80B3000
 	push {lr}
 	ldr r1, =0x020229c6
 	ldr r2, =0x00006601
@@ -319669,7 +319669,7 @@ sub_80B3000: ; 80B3000
 	thumb_func_end sub_80B3000
 
 	thumb_func_start sub_80B3028
-sub_80B3028: ; 80B3028
+sub_80B3028: @ 80B3028
 	push {lr}
 	ldr r1, =0x020229c6
 	ldr r2, =0x00006602
@@ -319687,7 +319687,7 @@ sub_80B3028: ; 80B3028
 	thumb_func_end sub_80B3028
 
 	thumb_func_start sub_80B3050
-sub_80B3050: ; 80B3050
+sub_80B3050: @ 80B3050
 	push {lr}
 	ldr r0, =sub_80B3144
 	bl is_function_an_active_task
@@ -319778,7 +319778,7 @@ _080B3134:
 	thumb_func_end sub_80B3050
 
 	thumb_func_start sub_80B3144
-sub_80B3144: ; 80B3144
+sub_80B3144: @ 80B3144
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -319816,7 +319816,7 @@ _080B3184:
 	thumb_func_end sub_80B3144
 
 	thumb_func_start sub_80B3194
-sub_80B3194: ; 80B3194
+sub_80B3194: @ 80B3194
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -319856,7 +319856,7 @@ _080B31DA:
 	thumb_func_end sub_80B3194
 
 	thumb_func_start sub_80B31E8
-sub_80B31E8: ; 80B31E8
+sub_80B31E8: @ 80B31E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -319883,7 +319883,7 @@ _080B3212:
 	thumb_func_end sub_80B31E8
 
 	thumb_func_start sub_80B3220
-sub_80B3220: ; 80B3220
+sub_80B3220: @ 80B3220
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -319908,7 +319908,7 @@ _080B3248:
 	thumb_func_end sub_80B3220
 
 	thumb_func_start sub_80B3254
-sub_80B3254: ; 80B3254
+sub_80B3254: @ 80B3254
 	push {lr}
 	bl sub_809FF80
 	pop {r0}
@@ -319916,7 +319916,7 @@ sub_80B3254: ; 80B3254
 	thumb_func_end sub_80B3254
 
 	thumb_func_start sub_80B3260
-sub_80B3260: ; 80B3260
+sub_80B3260: @ 80B3260
 	push {lr}
 	cmp r0, 0x2
 	beq _080B3284
@@ -319959,7 +319959,7 @@ _080B32A6:
 	thumb_func_end sub_80B3260
 
 	thumb_func_start sub_80B32B4
-sub_80B32B4: ; 80B32B4
+sub_80B32B4: @ 80B32B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -320068,7 +320068,7 @@ _080B33A0:
 	thumb_func_end sub_80B32B4
 
 	thumb_func_start sub_80B33BC
-sub_80B33BC: ; 80B33BC
+sub_80B33BC: @ 80B33BC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -320241,7 +320241,7 @@ _080B3532:
 	thumb_func_end sub_80B33BC
 
 	thumb_func_start sub_80B3554
-sub_80B3554: ; 80B3554
+sub_80B3554: @ 80B3554
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -320329,7 +320329,7 @@ _080B35FE:
 	thumb_func_end sub_80B3554
 
 	thumb_func_start sub_80B360C
-sub_80B360C: ; 80B360C
+sub_80B360C: @ 80B360C
 	push {r4,r5,lr}
 	ldr r2, =0x02022fec
 	ldr r0, [r2]
@@ -320417,7 +320417,7 @@ _080B36D0:
 	thumb_func_end sub_80B360C
 
 	thumb_func_start sub_80B36EC
-sub_80B36EC: ; 80B36EC
+sub_80B36EC: @ 80B36EC
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -320443,7 +320443,7 @@ _080B370E:
 	thumb_func_end sub_80B36EC
 
 	thumb_func_start sub_80B371C
-sub_80B371C: ; 80B371C
+sub_80B371C: @ 80B371C
 	push {lr}
 	bl sub_80872B0
 	pop {r0}
@@ -320451,7 +320451,7 @@ sub_80B371C: ; 80B371C
 	thumb_func_end sub_80B371C
 
 	thumb_func_start sub_80B3728
-sub_80B3728: ; 80B3728
+sub_80B3728: @ 80B3728
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -320531,7 +320531,7 @@ _080B37CC:
 	thumb_func_end sub_80B3728
 
 	thumb_func_start sub_80B37D4
-sub_80B37D4: ; 80B37D4
+sub_80B37D4: @ 80B37D4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =sub_80B3728
@@ -320551,7 +320551,7 @@ sub_80B37D4: ; 80B37D4
 	thumb_func_end sub_80B37D4
 
 	thumb_func_start sub_80B37FC
-sub_80B37FC: ; 80B37FC
+sub_80B37FC: @ 80B37FC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -320622,7 +320622,7 @@ _080B3884:
 	thumb_func_end sub_80B37FC
 
 	thumb_func_start sub_80B3894
-sub_80B3894: ; 80B3894
+sub_80B3894: @ 80B3894
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -320691,7 +320691,7 @@ _080B391C:
 	thumb_func_end sub_80B3894
 
 	thumb_func_start sub_80B3924
-sub_80B3924: ; 80B3924
+sub_80B3924: @ 80B3924
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -320711,7 +320711,7 @@ _080B3946:
 	thumb_func_end sub_80B3924
 
 	thumb_func_start sub_80B3950
-sub_80B3950: ; 80B3950
+sub_80B3950: @ 80B3950
 	push {lr}
 	ldr r0, =sub_80B37FC
 	movs r1, 0x50
@@ -320722,12 +320722,12 @@ sub_80B3950: ; 80B3950
 	thumb_func_end sub_80B3950
 
 	thumb_func_start nullsub_37
-nullsub_37: ; 80B3964
+nullsub_37: @ 80B3964
 	bx lr
 	thumb_func_end nullsub_37
 
 	thumb_func_start sub_80B3968
-sub_80B3968: ; 80B3968
+sub_80B3968: @ 80B3968
 	push {lr}
 	ldr r1, =0x020229c6
 	ldr r2, =0x00002211
@@ -320751,7 +320751,7 @@ _080B399A:
 	thumb_func_end sub_80B3968
 
 	thumb_func_start sub_80B39A4
-sub_80B39A4: ; 80B39A4
+sub_80B39A4: @ 80B39A4
 	push {lr}
 	ldr r0, =sub_80B3728
 	movs r1, 0x50
@@ -320763,7 +320763,7 @@ sub_80B39A4: ; 80B39A4
 	thumb_func_end sub_80B39A4
 
 	thumb_func_start sp02A_crash_sound
-sp02A_crash_sound: ; 80B39BC
+sp02A_crash_sound: @ 80B39BC
 	push {lr}
 	ldr r0, =0x020375e4
 	ldrb r0, [r0]
@@ -320775,7 +320775,7 @@ sp02A_crash_sound: ; 80B39BC
 	thumb_func_end sp02A_crash_sound
 
 	thumb_func_start sub_80B39D4
-sub_80B39D4: ; 80B39D4
+sub_80B39D4: @ 80B39D4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -320814,7 +320814,7 @@ _080B3A2A:
 	thumb_func_end sub_80B39D4
 
 	thumb_func_start task00_08081A90
-task00_08081A90: ; 80B3A30
+task00_08081A90: @ 80B3A30
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -320868,7 +320868,7 @@ _080B3AA6:
 	thumb_func_end task00_08081A90
 
 	thumb_func_start sub_80B3AAC
-sub_80B3AAC: ; 80B3AAC
+sub_80B3AAC: @ 80B3AAC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -320887,7 +320887,7 @@ _080B3AC4:
 	thumb_func_end sub_80B3AAC
 
 	thumb_func_start sub_80B3AD0
-sub_80B3AD0: ; 80B3AD0
+sub_80B3AD0: @ 80B3AD0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -320907,7 +320907,7 @@ sub_80B3AD0: ; 80B3AD0
 	thumb_func_end sub_80B3AD0
 
 	thumb_func_start sub_80B3AF8
-sub_80B3AF8: ; 80B3AF8
+sub_80B3AF8: @ 80B3AF8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -321004,7 +321004,7 @@ _080B3BB8:
 	thumb_func_end sub_80B3AF8
 
 	thumb_func_start sub_80B3BC4
-sub_80B3BC4: ; 80B3BC4
+sub_80B3BC4: @ 80B3BC4
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -321021,8 +321021,8 @@ _080B3BD6:
 	thumb_func_end sub_80B3BC4
 
 	thumb_func_start CheckForTrainersWantingBattle
-; bool8 CheckForTrainersWantingBattle()
-CheckForTrainersWantingBattle: ; 80B3BE8
+@ bool8 CheckForTrainersWantingBattle()
+CheckForTrainersWantingBattle: @ 80B3BE8
 	push {r4-r7,lr}
 	ldr r0, =0x030060a8
 	movs r1, 0
@@ -321148,8 +321148,8 @@ _080B3CF4:
 	thumb_func_end CheckForTrainersWantingBattle
 
 	thumb_func_start CheckIfTrainerWantsBattle
-; u8 CheckIfTrainerWantsBattle(u8 trainerFieldObjectId)
-CheckIfTrainerWantsBattle: ; 80B3D00
+@ u8 CheckIfTrainerWantsBattle(u8 trainerFieldObjectId)
+CheckIfTrainerWantsBattle: @ 80B3D00
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -321266,8 +321266,8 @@ _080B3DE2:
 	thumb_func_end CheckIfTrainerWantsBattle
 
 	thumb_func_start CheckIfTrainerCanApproachPlayer
-; u8 CheckIfTrainerCanApproachPlayer(struct npc_state *trainerFieldObject)
-CheckIfTrainerCanApproachPlayer: ; 80B3DF0
+@ u8 CheckIfTrainerCanApproachPlayer(struct npc_state *trainerFieldObject)
+CheckIfTrainerCanApproachPlayer: @ 80B3DF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -321355,8 +321355,8 @@ _080B3E90:
 	thumb_func_end CheckIfTrainerCanApproachPlayer
 
 	thumb_func_start IsTrainerInRangeSouth
-; u8 IsTrainerInRangeSouth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-IsTrainerInRangeSouth: ; 80B3EA0
+@ u8 IsTrainerInRangeSouth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
+IsTrainerInRangeSouth: @ 80B3EA0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -321395,8 +321395,8 @@ _080B3EDC:
 	thumb_func_end IsTrainerInRangeSouth
 
 	thumb_func_start IsTrainerInRangeNorth
-; u8 IsTrainerInRangeNorth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-IsTrainerInRangeNorth: ; 80B3EE4
+@ u8 IsTrainerInRangeNorth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
+IsTrainerInRangeNorth: @ 80B3EE4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -321435,8 +321435,8 @@ _080B3F20:
 	thumb_func_end IsTrainerInRangeNorth
 
 	thumb_func_start IsTrainerInRangeWest
-; u8 IsTrainerInRangeWest(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-IsTrainerInRangeWest: ; 80B3F28
+@ u8 IsTrainerInRangeWest(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
+IsTrainerInRangeWest: @ 80B3F28
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -321475,8 +321475,8 @@ _080B3F64:
 	thumb_func_end IsTrainerInRangeWest
 
 	thumb_func_start IsTrainerInRangeEast
-; u8 IsTrainerInRangeEast(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-IsTrainerInRangeEast: ; 80B3F6C
+@ u8 IsTrainerInRangeEast(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
+IsTrainerInRangeEast: @ 80B3F6C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -321515,8 +321515,8 @@ _080B3FA8:
 	thumb_func_end IsTrainerInRangeEast
 
 	thumb_func_start CheckPathBetweenTrainerAndPlayer
-; u8 CheckPathBetweenTrainerAndPlayer(struct npc_state *fieldObject, u8 a2, u8 direction)
-CheckPathBetweenTrainerAndPlayer: ; 80B3FB0
+@ u8 CheckPathBetweenTrainerAndPlayer(struct npc_state *fieldObject, u8 a2, u8 direction)
+CheckPathBetweenTrainerAndPlayer: @ 80B3FB0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -321615,8 +321615,8 @@ _080B405C:
 	thumb_func_end CheckPathBetweenTrainerAndPlayer
 
 	thumb_func_start TrainerApproachPlayer
-; void TrainerApproachPlayer(struct npc_state *trainerFieldObject, u8 distance)
-TrainerApproachPlayer: ; 80B406C
+@ void TrainerApproachPlayer(struct npc_state *trainerFieldObject, u8 distance)
+TrainerApproachPlayer: @ 80B406C
 	push {r4,r5,lr}
 	lsls r5, r1, 24
 	lsrs r5, 24
@@ -321657,7 +321657,7 @@ TrainerApproachPlayer: ; 80B406C
 	thumb_func_end TrainerApproachPlayer
 
 	thumb_func_start sub_80B40C8
-sub_80B40C8: ; 80B40C8
+sub_80B40C8: @ 80B40C8
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	ldr r0, =0x02038bfc
@@ -321692,7 +321692,7 @@ _080B40E8:
 	thumb_func_end sub_80B40C8
 
 	thumb_func_start c3_8081EDC
-c3_8081EDC: ; 80B4118
+c3_8081EDC: @ 80B4118
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -321739,13 +321739,13 @@ _080B416C:
 	thumb_func_end c3_8081EDC
 
 	thumb_func_start sub_80B4178
-sub_80B4178: ; 80B4178
+sub_80B4178: @ 80B4178
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80B4178
 
 	thumb_func_start sub_80B417C
-sub_80B417C: ; 80B417C
+sub_80B417C: @ 80B417C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -321777,7 +321777,7 @@ sub_80B417C: ; 80B417C
 	thumb_func_end sub_80B417C
 
 	thumb_func_start sub_80B41C0
-sub_80B41C0: ; 80B41C0
+sub_80B41C0: @ 80B41C0
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -321815,7 +321815,7 @@ _080B41F8:
 	thumb_func_end sub_80B41C0
 
 	thumb_func_start sub_80B4200
-sub_80B4200: ; 80B4200
+sub_80B4200: @ 80B4200
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -321862,7 +321862,7 @@ _080B4252:
 	thumb_func_end sub_80B4200
 
 	thumb_func_start sub_80B425C
-sub_80B425C: ; 80B425C
+sub_80B425C: @ 80B425C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	adds r5, r2, 0
@@ -321947,7 +321947,7 @@ _080B4308:
 	thumb_func_end sub_80B425C
 
 	thumb_func_start sub_80B4318
-sub_80B4318: ; 80B4318
+sub_80B4318: @ 80B4318
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -321980,7 +321980,7 @@ _080B434A:
 	thumb_func_end sub_80B4318
 
 	thumb_func_start sub_80B435C
-sub_80B435C: ; 80B435C
+sub_80B435C: @ 80B435C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -322009,7 +322009,7 @@ _080B4388:
 	thumb_func_end sub_80B435C
 
 	thumb_func_start sub_80B4390
-sub_80B4390: ; 80B4390
+sub_80B4390: @ 80B4390
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r2, 0
@@ -322027,7 +322027,7 @@ _080B43A4:
 	thumb_func_end sub_80B4390
 
 	thumb_func_start sub_80B43AC
-sub_80B43AC: ; 80B43AC
+sub_80B43AC: @ 80B43AC
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -322056,7 +322056,7 @@ _080B43D8:
 	thumb_func_end sub_80B43AC
 
 	thumb_func_start sub_80B43E0
-sub_80B43E0: ; 80B43E0
+sub_80B43E0: @ 80B43E0
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -322099,7 +322099,7 @@ _080B4426:
 	thumb_func_end sub_80B43E0
 
 	thumb_func_start sub_80B4438
-sub_80B4438: ; 80B4438
+sub_80B4438: @ 80B4438
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -322158,7 +322158,7 @@ _080B44A0:
 	thumb_func_end sub_80B4438
 
 	thumb_func_start sub_80B44AC
-sub_80B44AC: ; 80B44AC
+sub_80B44AC: @ 80B44AC
 	push {r4,lr}
 	adds r4, r1, 0
 	movs r0, 0x31
@@ -322176,7 +322176,7 @@ _080B44C0:
 	thumb_func_end sub_80B44AC
 
 	thumb_func_start sub_80B44C8
-sub_80B44C8: ; 80B44C8
+sub_80B44C8: @ 80B44C8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -322258,7 +322258,7 @@ _080B456E:
 	thumb_func_end sub_80B44C8
 
 	thumb_func_start sub_80B4578
-sub_80B4578: ; 80B4578
+sub_80B4578: @ 80B4578
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_80B44C8
@@ -322282,7 +322282,7 @@ sub_80B4578: ; 80B4578
 	thumb_func_end sub_80B4578
 
 	thumb_func_start sub_80B45AC
-sub_80B45AC: ; 80B45AC
+sub_80B45AC: @ 80B45AC
 	push {lr}
 	ldr r0, =sub_80B45BC
 	bl sub_80B40C8
@@ -322292,7 +322292,7 @@ sub_80B45AC: ; 80B45AC
 	thumb_func_end sub_80B45AC
 
 	thumb_func_start sub_80B45BC
-sub_80B45BC: ; 80B45BC
+sub_80B45BC: @ 80B45BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -322303,7 +322303,7 @@ sub_80B45BC: ; 80B45BC
 	thumb_func_end sub_80B45BC
 
 	thumb_func_start sub_80B45D0
-sub_80B45D0: ; 80B45D0
+sub_80B45D0: @ 80B45D0
 	push {lr}
 	ldr r0, =0x030060a8
 	ldrb r0, [r0]
@@ -322338,7 +322338,7 @@ _080B4616:
 	thumb_func_end sub_80B45D0
 
 	thumb_func_start oei_exclamation_mark
-oei_exclamation_mark: ; 80B4620
+oei_exclamation_mark: @ 80B4620
 	push {lr}
 	ldr r0, =gUnknown_085507B4
 	movs r1, 0
@@ -322365,7 +322365,7 @@ _080B4648:
 	thumb_func_end oei_exclamation_mark
 
 	thumb_func_start sub_80B4658
-sub_80B4658: ; 80B4658
+sub_80B4658: @ 80B4658
 	push {lr}
 	ldr r0, =gUnknown_085507B4
 	movs r1, 0
@@ -322392,7 +322392,7 @@ _080B4680:
 	thumb_func_end sub_80B4658
 
 	thumb_func_start sub_80B4690
-sub_80B4690: ; 80B4690
+sub_80B4690: @ 80B4690
 	push {r4,lr}
 	ldr r0, =gUnknown_085507CC
 	movs r1, 0
@@ -322427,8 +322427,8 @@ _080B46C6:
 	thumb_func_end sub_80B4690
 
 	thumb_func_start sub_80B46D8
-; void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
-sub_80B46D8: ; 80B46D8
+@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
+sub_80B46D8: @ 80B46D8
 	push {r4,lr}
 	lsls r2, 24
 	lsrs r2, 24
@@ -322466,7 +322466,7 @@ sub_80B46D8: ; 80B46D8
 	thumb_func_end sub_80B46D8
 
 	thumb_func_start objc_exclamation_mark_probably
-objc_exclamation_mark_probably: ; 80B4724
+objc_exclamation_mark_probably: @ 80B4724
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -322544,7 +322544,7 @@ _080B47B2:
 	thumb_func_end objc_exclamation_mark_probably
 
 	thumb_func_start sub_80B47BC
-sub_80B47BC: ; 80B47BC
+sub_80B47BC: @ 80B47BC
 	push {lr}
 	ldr r0, =0x02038bfc
 	ldrb r0, [r0]
@@ -322564,7 +322564,7 @@ _080B47D8:
 	thumb_func_end sub_80B47BC
 
 	thumb_func_start sub_80B47E0
-sub_80B47E0: ; 80B47E0
+sub_80B47E0: @ 80B47E0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -322589,7 +322589,7 @@ _080B4800:
 	thumb_func_end sub_80B47E0
 
 	thumb_func_start sub_80B4808
-sub_80B4808: ; 80B4808
+sub_80B4808: @ 80B4808
 	push {lr}
 	ldr r0, =0x030060ac
 	ldrb r0, [r0]
@@ -322658,7 +322658,7 @@ _080B489E:
 	thumb_func_end sub_80B4808
 
 	thumb_func_start sub_80B48B8
-sub_80B48B8: ; 80B48B8
+sub_80B48B8: @ 80B48B8
 	ldr r1, =0x02038c00
 	strb r0, [r1]
 	bx lr
@@ -322666,7 +322666,7 @@ sub_80B48B8: ; 80B48B8
 	thumb_func_end sub_80B48B8
 
 	thumb_func_start sub_80B48C4
-sub_80B48C4: ; 80B48C4
+sub_80B48C4: @ 80B48C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -322766,7 +322766,7 @@ _080B4974:
 	thumb_func_end sub_80B48C4
 
 	thumb_func_start sub_80B4984
-sub_80B4984: ; 80B4984
+sub_80B4984: @ 80B4984
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -322902,7 +322902,7 @@ _080B4A7C:
 	thumb_func_end sub_80B4984
 
 	thumb_func_start sub_80B4A98
-sub_80B4A98: ; 80B4A98
+sub_80B4A98: @ 80B4A98
 	ldr r2, =0x02038c04
 	ldr r1, [r2]
 	ldr r0, =0x41c64e6d
@@ -322916,7 +322916,7 @@ sub_80B4A98: ; 80B4A98
 	thumb_func_end sub_80B4A98
 
 	thumb_func_start sub_80B4AB8
-sub_80B4AB8: ; 80B4AB8
+sub_80B4AB8: @ 80B4AB8
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =0x02038c04
@@ -322926,7 +322926,7 @@ sub_80B4AB8: ; 80B4AB8
 	thumb_func_end sub_80B4AB8
 
 	thumb_func_start wild_pokemon_rand_grass
-wild_pokemon_rand_grass: ; 80B4AC8
+wild_pokemon_rand_grass: @ 80B4AC8
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -323033,7 +323033,7 @@ _080B4B7E:
 	thumb_func_end wild_pokemon_rand_grass
 
 	thumb_func_start wild_pokemon_rand_water
-wild_pokemon_rand_water: ; 80B4B84
+wild_pokemon_rand_water: @ 80B4B84
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -323082,7 +323082,7 @@ _080B4BD4:
 	thumb_func_end wild_pokemon_rand_water
 
 	thumb_func_start sub_80B4BD8
-sub_80B4BD8: ; 80B4BD8
+sub_80B4BD8: @ 80B4BD8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -323173,7 +323173,7 @@ _080B4C6C:
 	thumb_func_end sub_80B4BD8
 
 	thumb_func_start sub_80B4C74
-sub_80B4C74: ; 80B4C74
+sub_80B4C74: @ 80B4C74
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -323242,7 +323242,7 @@ _080B4CF0:
 	thumb_func_end sub_80B4C74
 
 	thumb_func_start get_wild_data_index_for_map
-get_wild_data_index_for_map: ; 80B4CF8
+get_wild_data_index_for_map: @ 80B4CF8
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r0, =gWildMonHeaders
@@ -323307,7 +323307,7 @@ _080B4D6E:
 	thumb_func_end get_wild_data_index_for_map
 
 	thumb_func_start sub_80B4D78
-sub_80B4D78: ; 80B4D78
+sub_80B4D78: @ 80B4D78
 	push {r4-r7,lr}
 	sub sp, 0x1C
 	bl GetSafariZoneFlag
@@ -323428,7 +323428,7 @@ _080B4E5E:
 	thumb_func_end sub_80B4D78
 
 	thumb_func_start sub_80B4E68
-sub_80B4E68: ; 80B4E68
+sub_80B4E68: @ 80B4E68
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 16
@@ -323533,7 +323533,7 @@ _080B4F40:
 	thumb_func_end sub_80B4E68
 
 	thumb_func_start sub_80B4F4C
-sub_80B4F4C: ; 80B4F4C
+sub_80B4F4C: @ 80B4F4C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -323645,7 +323645,7 @@ _080B501C:
 	thumb_func_end sub_80B4F4C
 
 	thumb_func_start sub_80B5024
-sub_80B5024: ; 80B5024
+sub_80B5024: @ 80B5024
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r0, r1, 24
@@ -323673,7 +323673,7 @@ sub_80B5024: ; 80B5024
 	thumb_func_end sub_80B5024
 
 	thumb_func_start SetUpMassOutbreakEncounter
-SetUpMassOutbreakEncounter: ; 80B505C
+SetUpMassOutbreakEncounter: @ 80B505C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -323730,7 +323730,7 @@ _080B50C6:
 	thumb_func_end SetUpMassOutbreakEncounter
 
 	thumb_func_start DoMassOutbreakEncounterTest
-DoMassOutbreakEncounterTest: ; 80B50DC
+DoMassOutbreakEncounterTest: @ 80B50DC
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r2, [r4]
@@ -323778,7 +323778,7 @@ _080B513E:
 	thumb_func_end DoMassOutbreakEncounterTest
 
 	thumb_func_start DoWildEncounterRateDiceRoll
-DoWildEncounterRateDiceRoll: ; 80B5144
+DoWildEncounterRateDiceRoll: @ 80B5144
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -323804,7 +323804,7 @@ _080B516A:
 	thumb_func_end DoWildEncounterRateDiceRoll
 
 	thumb_func_start DoWildEncounterRateTest
-DoWildEncounterRateTest: ; 80B5170
+DoWildEncounterRateTest: @ 80B5170
 	push {r4,lr}
 	sub sp, 0x4
 	str r0, [sp]
@@ -323904,7 +323904,7 @@ _080B5222:
 	thumb_func_end DoWildEncounterRateTest
 
 	thumb_func_start DoGlobalWildEncounterDiceRoll
-DoGlobalWildEncounterDiceRoll: ; 80B523C
+DoGlobalWildEncounterDiceRoll: @ 80B523C
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -323925,7 +323925,7 @@ _080B525A:
 	thumb_func_end DoGlobalWildEncounterDiceRoll
 
 	thumb_func_start sub_80B5260
-sub_80B5260: ; 80B5260
+sub_80B5260: @ 80B5260
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -323948,7 +323948,7 @@ _080B5282:
 	thumb_func_end sub_80B5260
 
 	thumb_func_start is_it_battle_time_2
-is_it_battle_time_2: ; 80B5288
+is_it_battle_time_2: @ 80B5288
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -324246,7 +324246,7 @@ _080B5500:
 	thumb_func_end is_it_battle_time_2
 
 	thumb_func_start rock_smash_wild_pokemon_encounter
-rock_smash_wild_pokemon_encounter: ; 80B550C
+rock_smash_wild_pokemon_encounter: @ 80B550C
 	push {r4,lr}
 	bl get_wild_data_index_for_map
 	lsls r0, 16
@@ -324296,7 +324296,7 @@ _080B556E:
 	thumb_func_end rock_smash_wild_pokemon_encounter
 
 	thumb_func_start sub_80B5578
-sub_80B5578: ; 80B5578
+sub_80B5578: @ 80B5578
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r5, sp
@@ -324469,7 +324469,7 @@ _080B56F4:
 	thumb_func_end sub_80B5578
 
 	thumb_func_start GetFishingWildMonListHeader
-GetFishingWildMonListHeader: ; 80B56FC
+GetFishingWildMonListHeader: @ 80B56FC
 	push {lr}
 	bl get_wild_data_index_for_map
 	lsls r0, 16
@@ -324497,7 +324497,7 @@ _080B572E:
 	thumb_func_end GetFishingWildMonListHeader
 
 	thumb_func_start sub_80B5734
-sub_80B5734: ; 80B5734
+sub_80B5734: @ 80B5734
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -324545,7 +324545,7 @@ _080B5784:
 	thumb_func_end sub_80B5734
 
 	thumb_func_start wild_pokemon_rand_for_map
-wild_pokemon_rand_for_map: ; 80B57A0
+wild_pokemon_rand_for_map: @ 80B57A0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r0, 0
@@ -324616,7 +324616,7 @@ _080B5826:
 	thumb_func_end wild_pokemon_rand_for_map
 
 	thumb_func_start sub_80B582C
-sub_80B582C: ; 80B582C
+sub_80B582C: @ 80B582C
 	push {r4,lr}
 	bl get_wild_data_index_for_map
 	lsls r0, 16
@@ -324650,7 +324650,7 @@ _080B586A:
 	thumb_func_end sub_80B582C
 
 	thumb_func_start sub_80B5870
-sub_80B5870: ; 80B5870
+sub_80B5870: @ 80B5870
 	push {r4,r5,lr}
 	bl InBattlePike
 	lsls r0, 24
@@ -324692,7 +324692,7 @@ _080B58C6:
 	thumb_func_end sub_80B5870
 
 	thumb_func_start sub_80B58CC
-sub_80B58CC: ; 80B58CC
+sub_80B58CC: @ 80B58CC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -324744,8 +324744,8 @@ _080B592C:
 	thumb_func_end sub_80B58CC
 
 	thumb_func_start DoKeenEyeIntimidateWildEncounterTest
-; _BOOL1 DoKeenEyeIntimidateWildEncounterTest(u8 wildMonLevel)
-DoKeenEyeIntimidateWildEncounterTest: ; 80B5934
+@ _BOOL1 DoKeenEyeIntimidateWildEncounterTest(u8 wildMonLevel)
+DoKeenEyeIntimidateWildEncounterTest: @ 80B5934
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -324793,8 +324793,8 @@ _080B598A:
 	thumb_func_end DoKeenEyeIntimidateWildEncounterTest
 
 	thumb_func_start TryGetRandomWildMonIndexByType
-; _BOOL1 TryGetRandomWildMonIndexByType(WildMonEntry *mons, u8 type, u8 numMons, u8 *monIndex)
-TryGetRandomWildMonIndexByType: ; 80B5990
+@ _BOOL1 TryGetRandomWildMonIndexByType(WildMonEntry *mons, u8 type, u8 numMons, u8 *monIndex)
+TryGetRandomWildMonIndexByType: @ 80B5990
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -324898,8 +324898,8 @@ _080B5A3C:
 	thumb_func_end TryGetRandomWildMonIndexByType
 
 	thumb_func_start TryGetAbilityInfluencedWildMonIndex
-; _BOOL1 TryGetAbilityInfluencedWildMonIndex(WildMonEntry *mons, u8 type, u8 abilityId, u8 *monIndex)
-TryGetAbilityInfluencedWildMonIndex: ; 80B5A50
+@ _BOOL1 TryGetAbilityInfluencedWildMonIndex(WildMonEntry *mons, u8 type, u8 abilityId, u8 *monIndex)
+TryGetAbilityInfluencedWildMonIndex: @ 80B5A50
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -324948,8 +324948,8 @@ _080B5AA6:
 	thumb_func_end TryGetAbilityInfluencedWildMonIndex
 
 	thumb_func_start affects_encounter_rate_based_on_flags
-; void affects_encounter_rate_based_on_flags(u32 *val)
-affects_encounter_rate_based_on_flags: ; 80B5AB0
+@ void affects_encounter_rate_based_on_flags(u32 *val)
+affects_encounter_rate_based_on_flags: @ 80B5AB0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x000008ad
@@ -324982,7 +324982,7 @@ _080B5AE4:
 	thumb_func_end affects_encounter_rate_based_on_flags
 
 	thumb_func_start ApplyCleanseTagWildEncounterRateReduction
-ApplyCleanseTagWildEncounterRateReduction: ; 80B5AF0
+ApplyCleanseTagWildEncounterRateReduction: @ 80B5AF0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x020244ec
@@ -325003,8 +325003,8 @@ _080B5B0C:
 	thumb_func_end ApplyCleanseTagWildEncounterRateReduction
 
 	thumb_func_start FieldEffectStart
-; u8 FieldEffectStart(u8 id)
-FieldEffectStart: ; 80B5B18
+@ u8 FieldEffectStart(u8 id)
+FieldEffectStart: @ 80B5B18
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -325040,8 +325040,8 @@ _080B5B36:
 	thumb_func_end FieldEffectStart
 
 	thumb_func_start FieldEffectCmd_loadtiles
-; bool8 FieldEffectCmd_loadtiles(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadtiles: ; 80B5B60
+@ bool8 FieldEffectCmd_loadtiles(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadtiles: @ 80B5B60
 	push {lr}
 	ldr r1, [r0]
 	adds r1, 0x1
@@ -325053,8 +325053,8 @@ FieldEffectCmd_loadtiles: ; 80B5B60
 	thumb_func_end FieldEffectCmd_loadtiles
 
 	thumb_func_start FieldEffectCmd_loadfadedpal
-; bool8 FieldEffectCmd_loadfadedpal(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadfadedpal: ; 80B5B74
+@ bool8 FieldEffectCmd_loadfadedpal(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadfadedpal: @ 80B5B74
 	push {lr}
 	ldr r1, [r0]
 	adds r1, 0x1
@@ -325066,8 +325066,8 @@ FieldEffectCmd_loadfadedpal: ; 80B5B74
 	thumb_func_end FieldEffectCmd_loadfadedpal
 
 	thumb_func_start FieldEffectCmd_loadpal
-; bool8 FieldEffectCmd_loadpal(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadpal: ; 80B5B88
+@ bool8 FieldEffectCmd_loadpal(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadpal: @ 80B5B88
 	push {lr}
 	ldr r1, [r0]
 	adds r1, 0x1
@@ -325079,8 +325079,8 @@ FieldEffectCmd_loadpal: ; 80B5B88
 	thumb_func_end FieldEffectCmd_loadpal
 
 	thumb_func_start FieldEffectCmd_callnative
-; bool8 FieldEffectCmd_callnative(u8 **script, u8 *returnValue)
-FieldEffectCmd_callnative: ; 80B5B9C
+@ bool8 FieldEffectCmd_callnative(u8 **script, u8 *returnValue)
+FieldEffectCmd_callnative: @ 80B5B9C
 	push {lr}
 	ldr r2, [r0]
 	adds r2, 0x1
@@ -325092,15 +325092,15 @@ FieldEffectCmd_callnative: ; 80B5B9C
 	thumb_func_end FieldEffectCmd_callnative
 
 	thumb_func_start FieldEffectCmd_end
-; bool8 FieldEffectCmd_end(u8 **script, u8 *returnValue)
-FieldEffectCmd_end: ; 80B5BB0
+@ bool8 FieldEffectCmd_end(u8 **script, u8 *returnValue)
+FieldEffectCmd_end: @ 80B5BB0
 	movs r0, 0
 	bx lr
 	thumb_func_end FieldEffectCmd_end
 
 	thumb_func_start FieldEffectCmd_loadgfx_callnative
-; bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadgfx_callnative: ; 80B5BB4
+@ bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadgfx_callnative: @ 80B5BB4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325121,8 +325121,8 @@ FieldEffectCmd_loadgfx_callnative: ; 80B5BB4
 	thumb_func_end FieldEffectCmd_loadgfx_callnative
 
 	thumb_func_start FieldEffectCmd_loadtiles_callnative
-; bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadtiles_callnative: ; 80B5BDC
+@ bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadtiles_callnative: @ 80B5BDC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325141,8 +325141,8 @@ FieldEffectCmd_loadtiles_callnative: ; 80B5BDC
 	thumb_func_end FieldEffectCmd_loadtiles_callnative
 
 	thumb_func_start FieldEffectCmd_loadfadedpal_callnative
-; bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u8 *returnValue)
-FieldEffectCmd_loadfadedpal_callnative: ; 80B5C00
+@ bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u8 *returnValue)
+FieldEffectCmd_loadfadedpal_callnative: @ 80B5C00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325161,8 +325161,8 @@ FieldEffectCmd_loadfadedpal_callnative: ; 80B5C00
 	thumb_func_end FieldEffectCmd_loadfadedpal_callnative
 
 	thumb_func_start FieldEffectScript_ReadWord
-; u32 FieldEffectScript_ReadWord(u8 **script)
-FieldEffectScript_ReadWord: ; 80B5C24
+@ u32 FieldEffectScript_ReadWord(u8 **script)
+FieldEffectScript_ReadWord: @ 80B5C24
 	ldr r2, [r0]
 	ldrb r0, [r2]
 	ldrb r1, [r2, 0x1]
@@ -325178,8 +325178,8 @@ FieldEffectScript_ReadWord: ; 80B5C24
 	thumb_func_end FieldEffectScript_ReadWord
 
 	thumb_func_start FieldEffectScript_LoadTiles
-; void FieldEffectScript_LoadTiles(u8 **script)
-FieldEffectScript_LoadTiles: ; 80B5C3C
+@ void FieldEffectScript_LoadTiles(u8 **script)
+FieldEffectScript_LoadTiles: @ 80B5C3C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl FieldEffectScript_ReadWord
@@ -325203,8 +325203,8 @@ _080B5C5A:
 	thumb_func_end FieldEffectScript_LoadTiles
 
 	thumb_func_start FieldEffectScript_LoadFadedPalette
-; void FieldEffectScript_LoadFadedPalette(u8 **script)
-FieldEffectScript_LoadFadedPalette: ; 80B5C6C
+@ void FieldEffectScript_LoadFadedPalette(u8 **script)
+FieldEffectScript_LoadFadedPalette: @ 80B5C6C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl FieldEffectScript_ReadWord
@@ -325224,8 +325224,8 @@ FieldEffectScript_LoadFadedPalette: ; 80B5C6C
 	thumb_func_end FieldEffectScript_LoadFadedPalette
 
 	thumb_func_start FieldEffectScript_LoadPalette
-; void FieldEffectScript_LoadPalette(u8 **script)
-FieldEffectScript_LoadPalette: ; 80B5C94
+@ void FieldEffectScript_LoadPalette(u8 **script)
+FieldEffectScript_LoadPalette: @ 80B5C94
 	push {r4,lr}
 	adds r4, r0, 0
 	bl FieldEffectScript_ReadWord
@@ -325239,8 +325239,8 @@ FieldEffectScript_LoadPalette: ; 80B5C94
 	thumb_func_end FieldEffectScript_LoadPalette
 
 	thumb_func_start FieldEffectScript_CallNative
-; void FieldEffectScript_CallNative(u8 **script, u8 *returnValue)
-FieldEffectScript_CallNative: ; 80B5CAC
+@ void FieldEffectScript_CallNative(u8 **script, u8 *returnValue)
+FieldEffectScript_CallNative: @ 80B5CAC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325256,8 +325256,8 @@ FieldEffectScript_CallNative: ; 80B5CAC
 	thumb_func_end FieldEffectScript_CallNative
 
 	thumb_func_start FieldEffectFreeGraphicsResources
-; void FieldEffectFreeGraphicsResources(struct obj *object)
-FieldEffectFreeGraphicsResources: ; 80B5CC8
+@ void FieldEffectFreeGraphicsResources(struct obj *object)
+FieldEffectFreeGraphicsResources: @ 80B5CC8
 	push {r4,r5,lr}
 	adds r1, r0, 0
 	adds r1, 0x40
@@ -325275,8 +325275,8 @@ FieldEffectFreeGraphicsResources: ; 80B5CC8
 	thumb_func_end FieldEffectFreeGraphicsResources
 
 	thumb_func_start FieldEffectStop
-; void FieldEffectStop(struct obj *object, u8 id)
-FieldEffectStop: ; 80B5CEC
+@ void FieldEffectStop(struct obj *object, u8 id)
+FieldEffectStop: @ 80B5CEC
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
@@ -325289,8 +325289,8 @@ FieldEffectStop: ; 80B5CEC
 	thumb_func_end FieldEffectStop
 
 	thumb_func_start FieldEffectFreeTilesIfUnused
-; void FieldEffectFreeTilesIfUnused(u16 tileRangeStart)
-FieldEffectFreeTilesIfUnused: ; 80B5D04
+@ void FieldEffectFreeTilesIfUnused(u16 tileRangeStart)
+FieldEffectFreeTilesIfUnused: @ 80B5D04
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -325341,8 +325341,8 @@ _080B5D58:
 	thumb_func_end FieldEffectFreeTilesIfUnused
 
 	thumb_func_start FieldEffectFreePaletteIfUnused
-; void FieldEffectFreePaletteIfUnused(u8 paletteSlot)
-FieldEffectFreePaletteIfUnused: ; 80B5D68
+@ void FieldEffectFreePaletteIfUnused(u8 paletteSlot)
+FieldEffectFreePaletteIfUnused: @ 80B5D68
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -325387,8 +325387,8 @@ _080B5DB0:
 	thumb_func_end FieldEffectFreePaletteIfUnused
 
 	thumb_func_start FieldEffectActiveListClear
-; void FieldEffectActiveListClear()
-FieldEffectActiveListClear: ; 80B5DC0
+@ void FieldEffectActiveListClear()
+FieldEffectActiveListClear: @ 80B5DC0
 	push {r4,lr}
 	movs r2, 0
 	ldr r4, =0x03000f58
@@ -325410,8 +325410,8 @@ _080B5DC8:
 	thumb_func_end FieldEffectActiveListClear
 
 	thumb_func_start FieldEffectActiveListAdd
-; void FieldEffectActiveListAdd(u8 id)
-FieldEffectActiveListAdd: ; 80B5DE4
+@ void FieldEffectActiveListAdd(u8 id)
+FieldEffectActiveListAdd: @ 80B5DE4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -325438,8 +325438,8 @@ _080B5E0A:
 	thumb_func_end FieldEffectActiveListAdd
 
 	thumb_func_start FieldEffectActiveListRemove
-; void FieldEffectActiveListRemove(u8 id)
-FieldEffectActiveListRemove: ; 80B5E10
+@ void FieldEffectActiveListRemove(u8 id)
+FieldEffectActiveListRemove: @ 80B5E10
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -325468,8 +325468,8 @@ _080B5E3A:
 	thumb_func_end FieldEffectActiveListRemove
 
 	thumb_func_start FieldEffectActiveListContains
-; void FieldEffectActiveListContains(u8 id)
-FieldEffectActiveListContains: ; 80B5E40
+@ void FieldEffectActiveListContains(u8 id)
+FieldEffectActiveListContains: @ 80B5E40
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -325496,7 +325496,7 @@ _080B5E68:
 	thumb_func_end FieldEffectActiveListContains
 
 	thumb_func_start sub_80B5E6C
-sub_80B5E6C: ; 80B5E6C
+sub_80B5E6C: @ 80B5E6C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -325566,7 +325566,7 @@ sub_80B5E6C: ; 80B5E6C
 	thumb_func_end sub_80B5E6C
 
 	thumb_func_start sub_80B5F0C
-sub_80B5F0C: ; 80B5F0C
+sub_80B5F0C: @ 80B5F0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325592,7 +325592,7 @@ sub_80B5F0C: ; 80B5F0C
 	thumb_func_end sub_80B5F0C
 
 	thumb_func_start AddNewGameBirchObject
-AddNewGameBirchObject: ; 80B5F44
+AddNewGameBirchObject: @ 80B5F44
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -325623,7 +325623,7 @@ AddNewGameBirchObject: ; 80B5F44
 	thumb_func_end AddNewGameBirchObject
 
 	thumb_func_start sub_80B5F84
-sub_80B5F84: ; 80B5F84
+sub_80B5F84: @ 80B5F84
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -325672,7 +325672,7 @@ _080B5FDE:
 	thumb_func_end sub_80B5F84
 
 	thumb_func_start sub_80B5FE8
-sub_80B5FE8: ; 80B5FE8
+sub_80B5FE8: @ 80B5FE8
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -325739,7 +325739,7 @@ _080B605E:
 	thumb_func_end sub_80B5FE8
 
 	thumb_func_start sub_80B6070
-sub_80B6070: ; 80B6070
+sub_80B6070: @ 80B6070
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -325762,7 +325762,7 @@ _080B608E:
 	thumb_func_end sub_80B6070
 
 	thumb_func_start sub_80B609C
-sub_80B609C: ; 80B609C
+sub_80B609C: @ 80B609C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -325832,7 +325832,7 @@ sub_80B609C: ; 80B609C
 	thumb_func_end sub_80B609C
 
 	thumb_func_start sub_80B6128
-sub_80B6128: ; 80B6128
+sub_80B6128: @ 80B6128
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -325892,7 +325892,7 @@ sub_80B6128: ; 80B6128
 	thumb_func_end sub_80B6128
 
 	thumb_func_start sub_80B61A0
-sub_80B61A0: ; 80B61A0
+sub_80B61A0: @ 80B61A0
 	push {r4,lr}
 	bl calc_player_party_count
 	adds r4, r0, 0
@@ -325925,7 +325925,7 @@ sub_80B61A0: ; 80B61A0
 	thumb_func_end sub_80B61A0
 
 	thumb_func_start sub_80B61E4
-sub_80B61E4: ; 80B61E4
+sub_80B61E4: @ 80B61E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -325948,7 +325948,7 @@ sub_80B61E4: ; 80B61E4
 	thumb_func_end sub_80B61E4
 
 	thumb_func_start sub_80B6214
-sub_80B6214: ; 80B6214
+sub_80B6214: @ 80B6214
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x8]
@@ -325979,7 +325979,7 @@ sub_80B6214: ; 80B6214
 	thumb_func_end sub_80B6214
 
 	thumb_func_start sub_80B6250
-sub_80B6250: ; 80B6250
+sub_80B6250: @ 80B6250
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r3, =0x02020630
@@ -326013,7 +326013,7 @@ _080B6282:
 	thumb_func_end sub_80B6250
 
 	thumb_func_start sub_80B628C
-sub_80B628C: ; 80B628C
+sub_80B628C: @ 80B628C
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -326037,7 +326037,7 @@ _080B62AC:
 	thumb_func_end sub_80B628C
 
 	thumb_func_start sub_80B62B4
-sub_80B62B4: ; 80B62B4
+sub_80B62B4: @ 80B62B4
 	push {lr}
 	ldr r2, =0x02020630
 	movs r3, 0x14
@@ -326066,7 +326066,7 @@ _080B62E6:
 	thumb_func_end sub_80B62B4
 
 	thumb_func_start sub_80B62F4
-sub_80B62F4: ; 80B62F4
+sub_80B62F4: @ 80B62F4
 	push {r4,lr}
 	bl calc_player_party_count
 	adds r4, r0, 0
@@ -326095,7 +326095,7 @@ sub_80B62F4: ; 80B62F4
 	thumb_func_end sub_80B62F4
 
 	thumb_func_start sub_80B6330
-sub_80B6330: ; 80B6330
+sub_80B6330: @ 80B6330
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -326118,7 +326118,7 @@ sub_80B6330: ; 80B6330
 	thumb_func_end sub_80B6330
 
 	thumb_func_start sub_80B6360
-sub_80B6360: ; 80B6360
+sub_80B6360: @ 80B6360
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x8]
@@ -326172,7 +326172,7 @@ sub_80B6360: ; 80B6360
 	thumb_func_end sub_80B6360
 
 	thumb_func_start sub_80B63D4
-sub_80B63D4: ; 80B63D4
+sub_80B63D4: @ 80B63D4
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -326199,7 +326199,7 @@ _080B63FA:
 	thumb_func_end sub_80B63D4
 
 	thumb_func_start sub_80B6404
-sub_80B6404: ; 80B6404
+sub_80B6404: @ 80B6404
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -326223,7 +326223,7 @@ _080B6424:
 	thumb_func_end sub_80B6404
 
 	thumb_func_start sub_80B642C
-sub_80B642C: ; 80B642C
+sub_80B642C: @ 80B642C
 	push {lr}
 	ldr r2, =0x02020630
 	movs r3, 0x14
@@ -326252,7 +326252,7 @@ _080B645E:
 	thumb_func_end sub_80B642C
 
 	thumb_func_start sub_80B646C
-sub_80B646C: ; 80B646C
+sub_80B646C: @ 80B646C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -326293,7 +326293,7 @@ sub_80B646C: ; 80B646C
 	thumb_func_end sub_80B646C
 
 	thumb_func_start sub_80B64C0
-sub_80B64C0: ; 80B64C0
+sub_80B64C0: @ 80B64C0
 	push {lr}
 	ldr r2, =gUnknown_0855C384
 	movs r3, 0x2E
@@ -326308,7 +326308,7 @@ sub_80B64C0: ; 80B64C0
 	thumb_func_end sub_80B64C0
 
 	thumb_func_start sub_80B64DC
-sub_80B64DC: ; 80B64DC
+sub_80B64DC: @ 80B64DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -326384,7 +326384,7 @@ _080B6562:
 	thumb_func_end sub_80B64DC
 
 	thumb_func_start sub_80B6574
-sub_80B6574: ; 80B6574
+sub_80B6574: @ 80B6574
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -326414,7 +326414,7 @@ _080B65A4:
 	thumb_func_end sub_80B6574
 
 	thumb_func_start sub_80B65A8
-sub_80B65A8: ; 80B65A8
+sub_80B65A8: @ 80B65A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -326559,7 +326559,7 @@ _080B66C2:
 	thumb_func_end sub_80B65A8
 
 	thumb_func_start sub_80B66E8
-sub_80B66E8: ; 80B66E8
+sub_80B66E8: @ 80B66E8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -326665,7 +326665,7 @@ _080B6718:
 	thumb_func_end sub_80B66E8
 
 	thumb_func_start sub_80B67DC
-sub_80B67DC: ; 80B67DC
+sub_80B67DC: @ 80B67DC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -326683,7 +326683,7 @@ _080B67F2:
 	thumb_func_end sub_80B67DC
 
 	thumb_func_start sub_80B67F8
-sub_80B67F8: ; 80B67F8
+sub_80B67F8: @ 80B67F8
 	ldrh r1, [r0, 0x2E]
 	adds r1, 0x1
 	strh r1, [r0, 0x2E]
@@ -326691,7 +326691,7 @@ sub_80B67F8: ; 80B67F8
 	thumb_func_end sub_80B67F8
 
 	thumb_func_start sub_80B6800
-sub_80B6800: ; 80B6800
+sub_80B6800: @ 80B6800
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x38
@@ -326713,12 +326713,12 @@ _080B681C:
 	thumb_func_end sub_80B6800
 
 	thumb_func_start nullsub_97
-nullsub_97: ; 80B6824
+nullsub_97: @ 80B6824
 	bx lr
 	thumb_func_end nullsub_97
 
 	thumb_func_start sub_80B6828
-sub_80B6828: ; 80B6828
+sub_80B6828: @ 80B6828
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -326741,7 +326741,7 @@ _080B6848:
 	thumb_func_end sub_80B6828
 
 	thumb_func_start sub_80B6850
-sub_80B6850: ; 80B6850
+sub_80B6850: @ 80B6850
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -326784,7 +326784,7 @@ sub_80B6850: ; 80B6850
 	thumb_func_end sub_80B6850
 
 	thumb_func_start sub_80B68AC
-sub_80B68AC: ; 80B68AC
+sub_80B68AC: @ 80B68AC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -326819,7 +326819,7 @@ _080B68E4:
 	thumb_func_end sub_80B68AC
 
 	thumb_func_start sub_80B68EC
-sub_80B68EC: ; 80B68EC
+sub_80B68EC: @ 80B68EC
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -326878,7 +326878,7 @@ _080B6948:
 	thumb_func_end sub_80B68EC
 
 	thumb_func_start sub_80B6970
-sub_80B6970: ; 80B6970
+sub_80B6970: @ 80B6970
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -326938,7 +326938,7 @@ _080B69D4:
 	thumb_func_end sub_80B6970
 
 	thumb_func_start sub_80B69DC
-sub_80B69DC: ; 80B69DC
+sub_80B69DC: @ 80B69DC
 	push {lr}
 	ldr r0, =c2_exit_to_overworld_2_switch
 	bl SetMainCallback2
@@ -326951,7 +326951,7 @@ sub_80B69DC: ; 80B69DC
 	thumb_func_end sub_80B69DC
 
 	thumb_func_start mapldr_080842E8
-mapldr_080842E8: ; 80B69FC
+mapldr_080842E8: @ 80B69FC
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =task00_8084310
@@ -326968,7 +326968,7 @@ mapldr_080842E8: ; 80B69FC
 	thumb_func_end mapldr_080842E8
 
 	thumb_func_start task00_8084310
-task00_8084310: ; 80B6A24
+task00_8084310: @ 80B6A24
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -327022,7 +327022,7 @@ _080B6A8A:
 	thumb_func_end task00_8084310
 
 	thumb_func_start mapldr_08084390
-mapldr_08084390: ; 80B6AA4
+mapldr_08084390: @ 80B6AA4
 	push {r4,lr}
 	bl sub_8085784
 	bl pal_fill_black
@@ -327065,7 +327065,7 @@ _080B6AE6:
 	thumb_func_end mapldr_08084390
 
 	thumb_func_start c3_080843F8
-c3_080843F8: ; 80B6B0C
+c3_080843F8: @ 80B6B0C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -327108,7 +327108,7 @@ _080B6B58:
 	thumb_func_end c3_080843F8
 
 	thumb_func_start sub_80B6B68
-sub_80B6B68: ; 80B6B68
+sub_80B6B68: @ 80B6B68
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -327126,7 +327126,7 @@ sub_80B6B68: ; 80B6B68
 	thumb_func_end sub_80B6B68
 
 	thumb_func_start sub_80B6B94
-sub_80B6B94: ; 80B6B94
+sub_80B6B94: @ 80B6B94
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -327154,7 +327154,7 @@ _080B6BA6:
 	thumb_func_end sub_80B6B94
 
 	thumb_func_start sub_80B6BCC
-sub_80B6BCC: ; 80B6BCC
+sub_80B6BCC: @ 80B6BCC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -327232,7 +327232,7 @@ sub_80B6BCC: ; 80B6BCC
 	thumb_func_end sub_80B6BCC
 
 	thumb_func_start sub_80B6C74
-sub_80B6C74: ; 80B6C74
+sub_80B6C74: @ 80B6C74
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80ABDFC
@@ -327250,7 +327250,7 @@ _080B6C88:
 	thumb_func_end sub_80B6C74
 
 	thumb_func_start sub_80B6C90
-sub_80B6C90: ; 80B6C90
+sub_80B6C90: @ 80B6C90
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x02037590
@@ -327303,7 +327303,7 @@ sub_80B6C90: ; 80B6C90
 	thumb_func_end sub_80B6C90
 
 	thumb_func_start sub_80B6D04
-sub_80B6D04: ; 80B6D04
+sub_80B6D04: @ 80B6D04
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r2, =0x02037590
@@ -327396,7 +327396,7 @@ _080B6DA8:
 	thumb_func_end sub_80B6D04
 
 	thumb_func_start sub_80B6DBC
-sub_80B6DBC: ; 80B6DBC
+sub_80B6DBC: @ 80B6DBC
 	push {lr}
 	ldrh r1, [r0, 0x8]
 	adds r1, 0x1
@@ -327413,7 +327413,7 @@ sub_80B6DBC: ; 80B6DBC
 	thumb_func_end sub_80B6DBC
 
 	thumb_func_start sub_80B6DD8
-sub_80B6DD8: ; 80B6DD8
+sub_80B6DD8: @ 80B6DD8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -327449,7 +327449,7 @@ _080B6E0E:
 	thumb_func_end sub_80B6DD8
 
 	thumb_func_start sub_80B6E18
-sub_80B6E18: ; 80B6E18
+sub_80B6E18: @ 80B6E18
 	push {lr}
 	ldr r1, =0x02037590
 	movs r0, 0
@@ -327470,7 +327470,7 @@ sub_80B6E18: ; 80B6E18
 	thumb_func_end sub_80B6E18
 
 	thumb_func_start sub_80B6E4C
-sub_80B6E4C: ; 80B6E4C
+sub_80B6E4C: @ 80B6E4C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -327500,7 +327500,7 @@ _080B6E78:
 	thumb_func_end sub_80B6E4C
 
 	thumb_func_start sub_80B6E88
-sub_80B6E88: ; 80B6E88
+sub_80B6E88: @ 80B6E88
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -327528,7 +327528,7 @@ _080B6E9A:
 	thumb_func_end sub_80B6E88
 
 	thumb_func_start sub_80B6EC0
-sub_80B6EC0: ; 80B6EC0
+sub_80B6EC0: @ 80B6EC0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl player_bitmagic
@@ -327545,7 +327545,7 @@ sub_80B6EC0: ; 80B6EC0
 	thumb_func_end sub_80B6EC0
 
 	thumb_func_start sub_80B6EE0
-sub_80B6EE0: ; 80B6EE0
+sub_80B6EE0: @ 80B6EE0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -327598,7 +327598,7 @@ _080B6F3E:
 	thumb_func_end sub_80B6EE0
 
 	thumb_func_start sub_80B6F50
-sub_80B6F50: ; 80B6F50
+sub_80B6F50: @ 80B6F50
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B6FB8
@@ -327618,7 +327618,7 @@ _080B6F6A:
 	thumb_func_end sub_80B6F50
 
 	thumb_func_start sub_80B6F74
-sub_80B6F74: ; 80B6F74
+sub_80B6F74: @ 80B6F74
 	push {lr}
 	bl sub_80B6FB8
 	bl sub_80B7060
@@ -327628,7 +327628,7 @@ sub_80B6F74: ; 80B6F74
 	thumb_func_end sub_80B6F74
 
 	thumb_func_start sub_80B6F84
-sub_80B6F84: ; 80B6F84
+sub_80B6F84: @ 80B6F84
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B7004
@@ -327648,7 +327648,7 @@ _080B6F9E:
 	thumb_func_end sub_80B6F84
 
 	thumb_func_start sub_80B6FA8
-sub_80B6FA8: ; 80B6FA8
+sub_80B6FA8: @ 80B6FA8
 	push {lr}
 	bl sub_80B7004
 	bl sub_80B7060
@@ -327658,7 +327658,7 @@ sub_80B6FA8: ; 80B6FA8
 	thumb_func_end sub_80B6FA8
 
 	thumb_func_start sub_80B6FB8
-sub_80B6FB8: ; 80B6FB8
+sub_80B6FB8: @ 80B6FB8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -327696,7 +327696,7 @@ _080B6FF6:
 	thumb_func_end sub_80B6FB8
 
 	thumb_func_start sub_80B7004
-sub_80B7004: ; 80B7004
+sub_80B7004: @ 80B7004
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -327734,7 +327734,7 @@ _080B7042:
 	thumb_func_end sub_80B7004
 
 	thumb_func_start sub_80B7050
-sub_80B7050: ; 80B7050
+sub_80B7050: @ 80B7050
 	push {lr}
 	bl music_something
 	bl sub_80AF0B4
@@ -327743,7 +327743,7 @@ sub_80B7050: ; 80B7050
 	thumb_func_end sub_80B7050
 
 	thumb_func_start sub_80B7060
-sub_80B7060: ; 80B7060
+sub_80B7060: @ 80B7060
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -327775,7 +327775,7 @@ _080B709C:
 	thumb_func_end sub_80B7060
 
 	thumb_func_start sub_80B70B4
-sub_80B70B4: ; 80B70B4
+sub_80B70B4: @ 80B70B4
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -327792,7 +327792,7 @@ sub_80B70B4: ; 80B70B4
 	thumb_func_end sub_80B70B4
 
 	thumb_func_start sub_80B70DC
-sub_80B70DC: ; 80B70DC
+sub_80B70DC: @ 80B70DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -327820,7 +327820,7 @@ _080B70EE:
 	thumb_func_end sub_80B70DC
 
 	thumb_func_start sub_80B7114
-sub_80B7114: ; 80B7114
+sub_80B7114: @ 80B7114
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -327877,7 +327877,7 @@ _080B717E:
 	thumb_func_end sub_80B7114
 
 	thumb_func_start sub_80B7190
-sub_80B7190: ; 80B7190
+sub_80B7190: @ 80B7190
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -327908,7 +327908,7 @@ sub_80B7190: ; 80B7190
 	thumb_func_end sub_80B7190
 
 	thumb_func_start sub_80B71D0
-sub_80B71D0: ; 80B71D0
+sub_80B71D0: @ 80B71D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -327956,7 +327956,7 @@ _080B721E:
 	thumb_func_end sub_80B71D0
 
 	thumb_func_start sub_80B7230
-sub_80B7230: ; 80B7230
+sub_80B7230: @ 80B7230
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -327987,7 +327987,7 @@ sub_80B7230: ; 80B7230
 	thumb_func_end sub_80B7230
 
 	thumb_func_start sub_80B7270
-sub_80B7270: ; 80B7270
+sub_80B7270: @ 80B7270
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -328036,7 +328036,7 @@ _080B72C0:
 	thumb_func_end sub_80B7270
 
 	thumb_func_start sub_80B72D0
-sub_80B72D0: ; 80B72D0
+sub_80B72D0: @ 80B72D0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80E1584
@@ -328058,7 +328058,7 @@ _080B72EE:
 	thumb_func_end sub_80B72D0
 
 	thumb_func_start sub_80B72F4
-sub_80B72F4: ; 80B72F4
+sub_80B72F4: @ 80B72F4
 	push {r4,lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0, 0x5]
@@ -328095,7 +328095,7 @@ _080B7338:
 	thumb_func_end sub_80B72F4
 
 	thumb_func_start oei_waterfall
-oei_waterfall: ; 80B734C
+oei_waterfall: @ 80B734C
 	push {r4,lr}
 	ldr r4, =sub_80B7384
 	adds r0, r4, 0
@@ -328120,7 +328120,7 @@ oei_waterfall: ; 80B734C
 	thumb_func_end oei_waterfall
 
 	thumb_func_start sub_80B7384
-sub_80B7384: ; 80B7384
+sub_80B7384: @ 80B7384
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -328155,7 +328155,7 @@ _080B7396:
 	thumb_func_end sub_80B7384
 
 	thumb_func_start sub_80B73D0
-sub_80B73D0: ; 80B73D0
+sub_80B73D0: @ 80B73D0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_enable
@@ -328173,7 +328173,7 @@ sub_80B73D0: ; 80B73D0
 	thumb_func_end sub_80B73D0
 
 	thumb_func_start waterfall_1_do_anim_probably
-waterfall_1_do_anim_probably: ; 80B73F0
+waterfall_1_do_anim_probably: @ 80B73F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -328203,7 +328203,7 @@ _080B7420:
 	thumb_func_end waterfall_1_do_anim_probably
 
 	thumb_func_start waterfall_2_wait_anim_finish_probably
-waterfall_2_wait_anim_finish_probably: ; 80B742C
+waterfall_2_wait_anim_finish_probably: @ 80B742C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -328225,7 +328225,7 @@ _080B7448:
 	thumb_func_end waterfall_2_wait_anim_finish_probably
 
 	thumb_func_start sub_80B7450
-sub_80B7450: ; 80B7450
+sub_80B7450: @ 80B7450
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -328246,7 +328246,7 @@ sub_80B7450: ; 80B7450
 	thumb_func_end sub_80B7450
 
 	thumb_func_start sub_80B7478
-sub_80B7478: ; 80B7478
+sub_80B7478: @ 80B7478
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -328288,7 +328288,7 @@ _080B74CA:
 	thumb_func_end sub_80B7478
 
 	thumb_func_start sub_80B74D0
-sub_80B74D0: ; 80B74D0
+sub_80B74D0: @ 80B74D0
 	push {r4,lr}
 	ldr r4, =sub_80B750C
 	adds r0, r4, 0
@@ -328315,7 +328315,7 @@ sub_80B74D0: ; 80B74D0
 	thumb_func_end sub_80B74D0
 
 	thumb_func_start sub_80B750C
-sub_80B750C: ; 80B750C
+sub_80B750C: @ 80B750C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -328343,7 +328343,7 @@ _080B751E:
 	thumb_func_end sub_80B750C
 
 	thumb_func_start dive_1_lock
-dive_1_lock: ; 80B7544
+dive_1_lock: @ 80B7544
 	ldr r2, =0x02037590
 	movs r1, 0x1
 	strb r1, [r2, 0x6]
@@ -328356,7 +328356,7 @@ dive_1_lock: ; 80B7544
 	thumb_func_end dive_1_lock
 
 	thumb_func_start dive_2_unknown
-dive_2_unknown: ; 80B7558
+dive_2_unknown: @ 80B7558
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_enable
@@ -328377,7 +328377,7 @@ dive_2_unknown: ; 80B7558
 	thumb_func_end dive_2_unknown
 
 	thumb_func_start dive_3_unknown
-dive_3_unknown: ; 80B7580
+dive_3_unknown: @ 80B7580
 	push {lr}
 	sub sp, 0x8
 	mov r1, sp
@@ -328415,7 +328415,7 @@ _080B75C4:
 	thumb_func_end dive_3_unknown
 
 	thumb_func_start sub_80B75D8
-sub_80B75D8: ; 80B75D8
+sub_80B75D8: @ 80B75D8
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -328428,7 +328428,7 @@ sub_80B75D8: ; 80B75D8
 	thumb_func_end sub_80B75D8
 
 	thumb_func_start sub_80B75F0
-sub_80B75F0: ; 80B75F0
+sub_80B75F0: @ 80B75F0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -328469,7 +328469,7 @@ _080B7604:
 	thumb_func_end sub_80B75F0
 
 	thumb_func_start sub_80B764C
-sub_80B764C: ; 80B764C
+sub_80B764C: @ 80B764C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -328496,7 +328496,7 @@ sub_80B764C: ; 80B764C
 	thumb_func_end sub_80B764C
 
 	thumb_func_start sub_80B7684
-sub_80B7684: ; 80B7684
+sub_80B7684: @ 80B7684
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -328526,7 +328526,7 @@ _080B76B0:
 	thumb_func_end sub_80B7684
 
 	thumb_func_start sub_80B76B8
-sub_80B76B8: ; 80B76B8
+sub_80B76B8: @ 80B76B8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -328564,7 +328564,7 @@ sub_80B76B8: ; 80B76B8
 	thumb_func_end sub_80B76B8
 
 	thumb_func_start sub_80B7704
-sub_80B7704: ; 80B7704
+sub_80B7704: @ 80B7704
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -328695,7 +328695,7 @@ _080B77F0:
 	thumb_func_end sub_80B7704
 
 	thumb_func_start sub_80B77F8
-sub_80B77F8: ; 80B77F8
+sub_80B77F8: @ 80B77F8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl music_something
@@ -328710,7 +328710,7 @@ sub_80B77F8: ; 80B77F8
 	thumb_func_end sub_80B77F8
 
 	thumb_func_start sub_80B7814
-sub_80B7814: ; 80B7814
+sub_80B7814: @ 80B7814
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -328742,7 +328742,7 @@ _080B784C:
 	thumb_func_end sub_80B7814
 
 	thumb_func_start mapldr_080851BC
-mapldr_080851BC: ; 80B7868
+mapldr_080851BC: @ 80B7868
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -328758,7 +328758,7 @@ mapldr_080851BC: ; 80B7868
 	thumb_func_end mapldr_080851BC
 
 	thumb_func_start sub_80B7890
-sub_80B7890: ; 80B7890
+sub_80B7890: @ 80B7890
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -328799,7 +328799,7 @@ _080B78A4:
 	thumb_func_end sub_80B7890
 
 	thumb_func_start sub_80B78EC
-sub_80B78EC: ; 80B78EC
+sub_80B78EC: @ 80B78EC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -328823,7 +328823,7 @@ sub_80B78EC: ; 80B78EC
 	thumb_func_end sub_80B78EC
 
 	thumb_func_start sub_80B791C
-sub_80B791C: ; 80B791C
+sub_80B791C: @ 80B791C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -328863,7 +328863,7 @@ _080B795C:
 	thumb_func_end sub_80B791C
 
 	thumb_func_start sub_80B7968
-sub_80B7968: ; 80B7968
+sub_80B7968: @ 80B7968
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -328905,7 +328905,7 @@ _080B79B0:
 	thumb_func_end sub_80B7968
 
 	thumb_func_start sub_80B79BC
-sub_80B79BC: ; 80B79BC
+sub_80B79BC: @ 80B79BC
 	push {lr}
 	adds r0, r1, 0
 	bl FieldObjectClearAnimIfSpecialAnimFinished
@@ -328930,7 +328930,7 @@ _080B79E6:
 	thumb_func_end sub_80B79BC
 
 	thumb_func_start sub_80B79F4
-sub_80B79F4: ; 80B79F4
+sub_80B79F4: @ 80B79F4
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -328976,7 +328976,7 @@ sub_80B79F4: ; 80B79F4
 	thumb_func_end sub_80B79F4
 
 	thumb_func_start sub_80B7A58
-sub_80B7A58: ; 80B7A58
+sub_80B7A58: @ 80B7A58
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -328994,7 +328994,7 @@ _080B7A70:
 	thumb_func_end sub_80B7A58
 
 	thumb_func_start sub_80B7A74
-sub_80B7A74: ; 80B7A74
+sub_80B7A74: @ 80B7A74
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -329007,7 +329007,7 @@ sub_80B7A74: ; 80B7A74
 	thumb_func_end sub_80B7A74
 
 	thumb_func_start sub_80B7A8C
-sub_80B7A8C: ; 80B7A8C
+sub_80B7A8C: @ 80B7A8C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -329048,7 +329048,7 @@ _080B7AA0:
 	thumb_func_end sub_80B7A8C
 
 	thumb_func_start sub_80B7AE8
-sub_80B7AE8: ; 80B7AE8
+sub_80B7AE8: @ 80B7AE8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -329072,7 +329072,7 @@ sub_80B7AE8: ; 80B7AE8
 	thumb_func_end sub_80B7AE8
 
 	thumb_func_start sub_80B7B18
-sub_80B7B18: ; 80B7B18
+sub_80B7B18: @ 80B7B18
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -329133,7 +329133,7 @@ _080B7B8C:
 	thumb_func_end sub_80B7B18
 
 	thumb_func_start sub_80B7B94
-sub_80B7B94: ; 80B7B94
+sub_80B7B94: @ 80B7B94
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -329164,7 +329164,7 @@ _080B7BBE:
 	thumb_func_end sub_80B7B94
 
 	thumb_func_start sub_80B7BCC
-sub_80B7BCC: ; 80B7BCC
+sub_80B7BCC: @ 80B7BCC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x31
@@ -329185,7 +329185,7 @@ _080B7BEA:
 	thumb_func_end sub_80B7BCC
 
 	thumb_func_start sub_80B7BF4
-sub_80B7BF4: ; 80B7BF4
+sub_80B7BF4: @ 80B7BF4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -329217,7 +329217,7 @@ _080B7C2C:
 	thumb_func_end sub_80B7BF4
 
 	thumb_func_start sub_80B7C48
-sub_80B7C48: ; 80B7C48
+sub_80B7C48: @ 80B7C48
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -329263,7 +329263,7 @@ sub_80B7C48: ; 80B7C48
 	thumb_func_end sub_80B7C48
 
 	thumb_func_start sub_80B7CAC
-sub_80B7CAC: ; 80B7CAC
+sub_80B7CAC: @ 80B7CAC
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -329281,7 +329281,7 @@ _080B7CC4:
 	thumb_func_end sub_80B7CAC
 
 	thumb_func_start sub_80B7CC8
-sub_80B7CC8: ; 80B7CC8
+sub_80B7CC8: @ 80B7CC8
 	push {lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -329294,7 +329294,7 @@ sub_80B7CC8: ; 80B7CC8
 	thumb_func_end sub_80B7CC8
 
 	thumb_func_start sub_80B7CE4
-sub_80B7CE4: ; 80B7CE4
+sub_80B7CE4: @ 80B7CE4
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -329317,7 +329317,7 @@ sub_80B7CE4: ; 80B7CE4
 	thumb_func_end sub_80B7CE4
 
 	thumb_func_start sub_80B7D14
-sub_80B7D14: ; 80B7D14
+sub_80B7D14: @ 80B7D14
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x8]
@@ -329335,7 +329335,7 @@ sub_80B7D14: ; 80B7D14
 	thumb_func_end sub_80B7D14
 
 	thumb_func_start sub_80B7D34
-sub_80B7D34: ; 80B7D34
+sub_80B7D34: @ 80B7D34
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -329453,7 +329453,7 @@ _080B7E40:
 	thumb_func_end sub_80B7D34
 
 	thumb_func_start mapldr_080859D4
-mapldr_080859D4: ; 80B7E48
+mapldr_080859D4: @ 80B7E48
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -329482,7 +329482,7 @@ mapldr_080859D4: ; 80B7E48
 	thumb_func_end mapldr_080859D4
 
 	thumb_func_start sub_80B7E94
-sub_80B7E94: ; 80B7E94
+sub_80B7E94: @ 80B7E94
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -329505,7 +329505,7 @@ sub_80B7E94: ; 80B7E94
 	thumb_func_end sub_80B7E94
 
 	thumb_func_start sub_80B7EC4
-sub_80B7EC4: ; 80B7EC4
+sub_80B7EC4: @ 80B7EC4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80ABDFC
@@ -329526,7 +329526,7 @@ _080B7EE2:
 	thumb_func_end sub_80B7EC4
 
 	thumb_func_start sub_80B7EE8
-sub_80B7EE8: ; 80B7EE8
+sub_80B7EE8: @ 80B7EE8
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -329631,7 +329631,7 @@ _080B7FC0:
 	thumb_func_end sub_80B7EE8
 
 	thumb_func_start sub_80B7FC8
-sub_80B7FC8: ; 80B7FC8
+sub_80B7FC8: @ 80B7FC8
 	push {lr}
 	ldr r0, =sub_80B7FDC
 	movs r1, 0
@@ -329642,7 +329642,7 @@ sub_80B7FC8: ; 80B7FC8
 	thumb_func_end sub_80B7FC8
 
 	thumb_func_start sub_80B7FDC
-sub_80B7FDC: ; 80B7FDC
+sub_80B7FDC: @ 80B7FDC
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -329665,7 +329665,7 @@ sub_80B7FDC: ; 80B7FDC
 	thumb_func_end sub_80B7FDC
 
 	thumb_func_start sub_80B800C
-sub_80B800C: ; 80B800C
+sub_80B800C: @ 80B800C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_env_2_enable
@@ -329684,7 +329684,7 @@ sub_80B800C: ; 80B800C
 	thumb_func_end sub_80B800C
 
 	thumb_func_start sub_80B8034
-sub_80B8034: ; 80B8034
+sub_80B8034: @ 80B8034
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -329754,7 +329754,7 @@ _080B80AE:
 	thumb_func_end sub_80B8034
 
 	thumb_func_start sub_80B80C4
-sub_80B80C4: ; 80B80C4
+sub_80B80C4: @ 80B80C4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -329856,7 +329856,7 @@ _080B817E:
 	thumb_func_end sub_80B80C4
 
 	thumb_func_start sub_80B8198
-sub_80B8198: ; 80B8198
+sub_80B8198: @ 80B8198
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037fd4
@@ -329898,7 +329898,7 @@ _080B81E6:
 	thumb_func_end sub_80B8198
 
 	thumb_func_start mapldr_08085D88
-mapldr_08085D88: ; 80B8200
+mapldr_08085D88: @ 80B8200
 	push {lr}
 	bl sub_8085784
 	bl pal_fill_for_maplights
@@ -329928,7 +329928,7 @@ mapldr_08085D88: ; 80B8200
 	thumb_func_end mapldr_08085D88
 
 	thumb_func_start sub_80B8250
-sub_80B8250: ; 80B8250
+sub_80B8250: @ 80B8250
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -329951,7 +329951,7 @@ sub_80B8250: ; 80B8250
 	thumb_func_end sub_80B8250
 
 	thumb_func_start sub_80B8280
-sub_80B8280: ; 80B8280
+sub_80B8280: @ 80B8280
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80ABDFC
@@ -330016,7 +330016,7 @@ _080B82F6:
 	thumb_func_end sub_80B8280
 
 	thumb_func_start sub_80B830C
-sub_80B830C: ; 80B830C
+sub_80B830C: @ 80B830C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -330145,7 +330145,7 @@ _080B8406:
 	thumb_func_end sub_80B830C
 
 	thumb_func_start sub_80B8410
-sub_80B8410: ; 80B8410
+sub_80B8410: @ 80B8410
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -330206,7 +330206,7 @@ _080B8484:
 	thumb_func_end sub_80B8410
 
 	thumb_func_start sub_80B849C
-sub_80B849C: ; 80B849C
+sub_80B849C: @ 80B849C
 	push {r4,lr}
 	bl sav1_map_get_light_level
 	lsls r0, 24
@@ -330247,7 +330247,7 @@ _080B84BE:
 	thumb_func_end sub_80B849C
 
 	thumb_func_start sub_80B84F8
-sub_80B84F8: ; 80B84F8
+sub_80B84F8: @ 80B84F8
 	push {r4-r6,lr}
 	ldr r5, =0x02038c08
 	ldr r0, [r5]
@@ -330288,7 +330288,7 @@ sub_80B84F8: ; 80B84F8
 	thumb_func_end sub_80B84F8
 
 	thumb_func_start sub_80B8554
-sub_80B8554: ; 80B8554
+sub_80B8554: @ 80B8554
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -330311,7 +330311,7 @@ sub_80B8554: ; 80B8554
 	thumb_func_end sub_80B8554
 
 	thumb_func_start sub_80B8584
-sub_80B8584: ; 80B8584
+sub_80B8584: @ 80B8584
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x04000048
@@ -330356,7 +330356,7 @@ sub_80B8584: ; 80B8584
 	thumb_func_end sub_80B8584
 
 	thumb_func_start sub_80B85F8
-sub_80B85F8: ; 80B85F8
+sub_80B85F8: @ 80B85F8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -330400,7 +330400,7 @@ sub_80B85F8: ; 80B85F8
 	thumb_func_end sub_80B85F8
 
 	thumb_func_start sub_80B8660
-sub_80B8660: ; 80B8660
+sub_80B8660: @ 80B8660
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x12]
@@ -330474,7 +330474,7 @@ _080B86DC:
 	thumb_func_end sub_80B8660
 
 	thumb_func_start sub_80B86EC
-sub_80B86EC: ; 80B86EC
+sub_80B86EC: @ 80B86EC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x12]
@@ -330501,7 +330501,7 @@ _080B8712:
 	thumb_func_end sub_80B86EC
 
 	thumb_func_start sub_80B871C
-sub_80B871C: ; 80B871C
+sub_80B871C: @ 80B871C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x12]
@@ -330550,7 +330550,7 @@ _080B876A:
 	thumb_func_end sub_80B871C
 
 	thumb_func_start sub_80B8770
-sub_80B8770: ; 80B8770
+sub_80B8770: @ 80B8770
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -330586,7 +330586,7 @@ sub_80B8770: ; 80B8770
 	thumb_func_end sub_80B8770
 
 	thumb_func_start overworld_bg_setup_2
-overworld_bg_setup_2: ; 80B87B8
+overworld_bg_setup_2: @ 80B87B8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -330622,7 +330622,7 @@ overworld_bg_setup_2: ; 80B87B8
 	thumb_func_end overworld_bg_setup_2
 
 	thumb_func_start sub_80B880C
-sub_80B880C: ; 80B880C
+sub_80B880C: @ 80B880C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =sub_80B8554
@@ -330666,7 +330666,7 @@ sub_80B880C: ; 80B880C
 	thumb_func_end sub_80B880C
 
 	thumb_func_start sub_80B8874
-sub_80B8874: ; 80B8874
+sub_80B8874: @ 80B8874
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -330697,7 +330697,7 @@ _080B888A:
 	thumb_func_end sub_80B8874
 
 	thumb_func_start sub_80B88B4
-sub_80B88B4: ; 80B88B4
+sub_80B88B4: @ 80B88B4
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -330720,7 +330720,7 @@ sub_80B88B4: ; 80B88B4
 	thumb_func_end sub_80B88B4
 
 	thumb_func_start sub_80B88E4
-sub_80B88E4: ; 80B88E4
+sub_80B88E4: @ 80B88E4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0xA]
@@ -330746,7 +330746,7 @@ sub_80B88E4: ; 80B88E4
 	thumb_func_end sub_80B88E4
 
 	thumb_func_start sub_80B8920
-sub_80B8920: ; 80B8920
+sub_80B8920: @ 80B8920
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -330794,7 +330794,7 @@ sub_80B8920: ; 80B8920
 	thumb_func_end sub_80B8920
 
 	thumb_func_start sub_80B898C
-sub_80B898C: ; 80B898C
+sub_80B898C: @ 80B898C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B8B38
@@ -330830,7 +330830,7 @@ _080B89C4:
 	thumb_func_end sub_80B898C
 
 	thumb_func_start sub_80B89DC
-sub_80B89DC: ; 80B89DC
+sub_80B89DC: @ 80B89DC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B8B28
@@ -330856,7 +330856,7 @@ _080B8A00:
 	thumb_func_end sub_80B89DC
 
 	thumb_func_start sub_80B8A0C
-sub_80B8A0C: ; 80B8A0C
+sub_80B8A0C: @ 80B8A0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_80B8B28
@@ -330883,7 +330883,7 @@ sub_80B8A0C: ; 80B8A0C
 	thumb_func_end sub_80B8A0C
 
 	thumb_func_start sub_80B8A44
-sub_80B8A44: ; 80B8A44
+sub_80B8A44: @ 80B8A44
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80B8B28
@@ -330902,7 +330902,7 @@ _080B8A5E:
 	thumb_func_end sub_80B8A44
 
 	thumb_func_start sub_80B8A64
-sub_80B8A64: ; 80B8A64
+sub_80B8A64: @ 80B8A64
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -330952,7 +330952,7 @@ sub_80B8A64: ; 80B8A64
 	thumb_func_end sub_80B8A64
 
 	thumb_func_start sub_80B8AE0
-sub_80B8AE0: ; 80B8AE0
+sub_80B8AE0: @ 80B8AE0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =sub_80B88B4
@@ -330984,7 +330984,7 @@ sub_80B8AE0: ; 80B8AE0
 	thumb_func_end sub_80B8AE0
 
 	thumb_func_start sub_80B8B28
-sub_80B8B28: ; 80B8B28
+sub_80B8B28: @ 80B8B28
 	ldrh r1, [r0, 0xA]
 	subs r1, 0x10
 	strh r1, [r0, 0xA]
@@ -330995,7 +330995,7 @@ sub_80B8B28: ; 80B8B28
 	thumb_func_end sub_80B8B28
 
 	thumb_func_start sub_80B8B38
-sub_80B8B38: ; 80B8B38
+sub_80B8B38: @ 80B8B38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -331092,7 +331092,7 @@ _080B8BD8:
 	thumb_func_end sub_80B8B38
 
 	thumb_func_start sub_80B8BF0
-sub_80B8BF0: ; 80B8BF0
+sub_80B8BF0: @ 80B8BF0
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r1, 0x10
@@ -331154,7 +331154,7 @@ _080B8C54:
 	thumb_func_end sub_80B8BF0
 
 	thumb_func_start sub_80B8C60
-sub_80B8C60: ; 80B8C60
+sub_80B8C60: @ 80B8C60
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -331199,7 +331199,7 @@ sub_80B8C60: ; 80B8C60
 	thumb_func_end sub_80B8C60
 
 	thumb_func_start sub_80B8CC0
-sub_80B8CC0: ; 80B8CC0
+sub_80B8CC0: @ 80B8CC0
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x20]
@@ -331236,7 +331236,7 @@ _080B8D00:
 	thumb_func_end sub_80B8CC0
 
 	thumb_func_start sub_80B8D04
-sub_80B8D04: ; 80B8D04
+sub_80B8D04: @ 80B8D04
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -331254,7 +331254,7 @@ _080B8D18:
 	thumb_func_end sub_80B8D04
 
 	thumb_func_start sub_80B8D20
-sub_80B8D20: ; 80B8D20
+sub_80B8D20: @ 80B8D20
 	push {lr}
 	adds r2, r0, 0
 	ldrh r3, [r2, 0x20]
@@ -331277,7 +331277,7 @@ _080B8D3E:
 	thumb_func_end sub_80B8D20
 
 	thumb_func_start sub_80B8D44
-sub_80B8D44: ; 80B8D44
+sub_80B8D44: @ 80B8D44
 	push {lr}
 	ldr r0, =sub_80B8D84
 	movs r1, 0xFF
@@ -331302,7 +331302,7 @@ sub_80B8D44: ; 80B8D44
 	thumb_func_end sub_80B8D44
 
 	thumb_func_start sub_80B8D84
-sub_80B8D84: ; 80B8D84
+sub_80B8D84: @ 80B8D84
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -331325,7 +331325,7 @@ sub_80B8D84: ; 80B8D84
 	thumb_func_end sub_80B8D84
 
 	thumb_func_start sub_80B8DB4
-sub_80B8DB4: ; 80B8DB4
+sub_80B8DB4: @ 80B8DB4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -331368,7 +331368,7 @@ sub_80B8DB4: ; 80B8DB4
 	thumb_func_end sub_80B8DB4
 
 	thumb_func_start sub_80B8E14
-sub_80B8E14: ; 80B8E14
+sub_80B8E14: @ 80B8E14
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02037590
@@ -331404,7 +331404,7 @@ _080B8E50:
 	thumb_func_end sub_80B8E14
 
 	thumb_func_start sub_80B8E60
-sub_80B8E60: ; 80B8E60
+sub_80B8E60: @ 80B8E60
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -331438,7 +331438,7 @@ _080B8E96:
 	thumb_func_end sub_80B8E60
 
 	thumb_func_start sub_80B8EA8
-sub_80B8EA8: ; 80B8EA8
+sub_80B8EA8: @ 80B8EA8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r0, 0x6
@@ -331493,7 +331493,7 @@ _080B8F12:
 	thumb_func_end sub_80B8EA8
 
 	thumb_func_start sub_80B8F24
-sub_80B8F24: ; 80B8F24
+sub_80B8F24: @ 80B8F24
 	push {r4,r5,lr}
 	ldr r5, =0x02037590
 	ldrb r1, [r5, 0x5]
@@ -331541,7 +331541,7 @@ _080B8F84:
 	thumb_func_end sub_80B8F24
 
 	thumb_func_start sub_80B8F98
-sub_80B8F98: ; 80B8F98
+sub_80B8F98: @ 80B8F98
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -331674,7 +331674,7 @@ _080B9050:
 	thumb_func_end sub_80B8F98
 
 	thumb_func_start sub_80B90CC
-sub_80B90CC: ; 80B90CC
+sub_80B90CC: @ 80B90CC
 	push {r4,lr}
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x68]
@@ -331714,7 +331714,7 @@ sub_80B90CC: ; 80B90CC
 	thumb_func_end sub_80B90CC
 
 	thumb_func_start sub_80B9128
-sub_80B9128: ; 80B9128
+sub_80B9128: @ 80B9128
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -331778,7 +331778,7 @@ _080B919A:
 	thumb_func_end sub_80B9128
 
 	thumb_func_start sub_80B91A4
-sub_80B91A4: ; 80B91A4
+sub_80B91A4: @ 80B91A4
 	push {lr}
 	ldr r0, =sub_80B91D4
 	movs r1, 0xFE
@@ -331800,7 +331800,7 @@ sub_80B91A4: ; 80B91A4
 	thumb_func_end sub_80B91A4
 
 	thumb_func_start sub_80B91D4
-sub_80B91D4: ; 80B91D4
+sub_80B91D4: @ 80B91D4
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -331823,7 +331823,7 @@ sub_80B91D4: ; 80B91D4
 	thumb_func_end sub_80B91D4
 
 	thumb_func_start sub_80B9204
-sub_80B9204: ; 80B9204
+sub_80B9204: @ 80B9204
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x02037590
@@ -331864,7 +331864,7 @@ _080B924C:
 	thumb_func_end sub_80B9204
 
 	thumb_func_start sub_80B925C
-sub_80B925C: ; 80B925C
+sub_80B925C: @ 80B925C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -331895,7 +331895,7 @@ _080B928C:
 	thumb_func_end sub_80B925C
 
 	thumb_func_start sub_80B92A0
-sub_80B92A0: ; 80B92A0
+sub_80B92A0: @ 80B92A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -331937,7 +331937,7 @@ _080B92E8:
 	thumb_func_end sub_80B92A0
 
 	thumb_func_start sub_80B92F8
-sub_80B92F8: ; 80B92F8
+sub_80B92F8: @ 80B92F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xA]
@@ -331969,7 +331969,7 @@ _080B932C:
 	thumb_func_end sub_80B92F8
 
 	thumb_func_start sub_80B933C
-sub_80B933C: ; 80B933C
+sub_80B933C: @ 80B933C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -332010,7 +332010,7 @@ _080B9380:
 	thumb_func_end sub_80B933C
 
 	thumb_func_start sub_80B9390
-sub_80B9390: ; 80B9390
+sub_80B9390: @ 80B9390
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0xC]
@@ -332074,7 +332074,7 @@ _080B9406:
 	thumb_func_end sub_80B9390
 
 	thumb_func_start sub_80B9418
-sub_80B9418: ; 80B9418
+sub_80B9418: @ 80B9418
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0xC]
@@ -332118,7 +332118,7 @@ _080B9464:
 	thumb_func_end sub_80B9418
 
 	thumb_func_start sub_80B9474
-sub_80B9474: ; 80B9474
+sub_80B9474: @ 80B9474
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xA]
@@ -332137,7 +332137,7 @@ _080B948E:
 	thumb_func_end sub_80B9474
 
 	thumb_func_start sub_80B9494
-sub_80B9494: ; 80B9494
+sub_80B9494: @ 80B9494
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -332159,7 +332159,7 @@ _080B94B6:
 	thumb_func_end sub_80B9494
 
 	thumb_func_start sub_80B94C4
-sub_80B94C4: ; 80B94C4
+sub_80B94C4: @ 80B94C4
 	push {lr}
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x68]
@@ -332191,7 +332191,7 @@ sub_80B94C4: ; 80B94C4
 	thumb_func_end sub_80B94C4
 
 	thumb_func_start sub_80B9508
-sub_80B9508: ; 80B9508
+sub_80B9508: @ 80B9508
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02020630
@@ -332207,7 +332207,7 @@ sub_80B9508: ; 80B9508
 	thumb_func_end sub_80B9508
 
 	thumb_func_start sub_80B9524
-sub_80B9524: ; 80B9524
+sub_80B9524: @ 80B9524
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -332237,7 +332237,7 @@ sub_80B9524: ; 80B9524
 	thumb_func_end sub_80B9524
 
 	thumb_func_start sub_80B9560
-sub_80B9560: ; 80B9560
+sub_80B9560: @ 80B9560
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -332253,7 +332253,7 @@ sub_80B9560: ; 80B9560
 	thumb_func_end sub_80B9560
 
 	thumb_func_start sub_80B957C
-sub_80B957C: ; 80B957C
+sub_80B957C: @ 80B957C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -332344,7 +332344,7 @@ _080B9628:
 	thumb_func_end sub_80B957C
 
 	thumb_func_start sub_80B963C
-sub_80B963C: ; 80B963C
+sub_80B963C: @ 80B963C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -332405,7 +332405,7 @@ _080B96A6:
 	thumb_func_end sub_80B963C
 
 	thumb_func_start sub_80B96B0
-sub_80B96B0: ; 80B96B0
+sub_80B96B0: @ 80B96B0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -332519,7 +332519,7 @@ _080B9784:
 	thumb_func_end sub_80B96B0
 
 	thumb_func_start sub_80B9794
-sub_80B9794: ; 80B9794
+sub_80B9794: @ 80B9794
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -332541,7 +332541,7 @@ sub_80B9794: ; 80B9794
 	thumb_func_end sub_80B9794
 
 	thumb_func_start sub_80B97C0
-sub_80B97C0: ; 80B97C0
+sub_80B97C0: @ 80B97C0
 	push {lr}
 	ldr r0, =sub_80B97D4
 	movs r1, 0xFE
@@ -332553,7 +332553,7 @@ sub_80B97C0: ; 80B97C0
 	thumb_func_end sub_80B97C0
 
 	thumb_func_start sub_80B97D4
-sub_80B97D4: ; 80B97D4
+sub_80B97D4: @ 80B97D4
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -332576,7 +332576,7 @@ sub_80B97D4: ; 80B97D4
 	thumb_func_end sub_80B97D4
 
 	thumb_func_start sub_80B9804
-sub_80B9804: ; 80B9804
+sub_80B9804: @ 80B9804
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x02037590
@@ -332656,7 +332656,7 @@ _080B98A6:
 	thumb_func_end sub_80B9804
 
 	thumb_func_start sub_80B98B8
-sub_80B98B8: ; 80B98B8
+sub_80B98B8: @ 80B98B8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0xC]
@@ -332709,7 +332709,7 @@ _080B9910:
 	thumb_func_end sub_80B98B8
 
 	thumb_func_start sub_80B9924
-sub_80B9924: ; 80B9924
+sub_80B9924: @ 80B9924
 	push {r4,lr}
 	sub sp, 0x24
 	adds r4, r0, 0
@@ -332749,7 +332749,7 @@ _080B9962:
 	thumb_func_end sub_80B9924
 
 	thumb_func_start sub_80B9978
-sub_80B9978: ; 80B9978
+sub_80B9978: @ 80B9978
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldrb r0, [r6, 0xA]
@@ -332804,7 +332804,7 @@ _080B99DC:
 	thumb_func_end sub_80B9978
 
 	thumb_func_start sub_80B99F0
-sub_80B99F0: ; 80B99F0
+sub_80B99F0: @ 80B99F0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037590
@@ -332831,7 +332831,7 @@ _080B9A18:
 	thumb_func_end sub_80B99F0
 
 	thumb_func_start sub_80B9A28
-sub_80B9A28: ; 80B9A28
+sub_80B9A28: @ 80B9A28
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xA]
@@ -332860,7 +332860,7 @@ _080B9A54:
 	thumb_func_end sub_80B9A28
 
 	thumb_func_start sub_80B9A60
-sub_80B9A60: ; 80B9A60
+sub_80B9A60: @ 80B9A60
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0xA]
@@ -332916,7 +332916,7 @@ _080B9ACA:
 	thumb_func_end sub_80B9A60
 
 	thumb_func_start sub_80B9ADC
-sub_80B9ADC: ; 80B9ADC
+sub_80B9ADC: @ 80B9ADC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02038c08
@@ -332961,7 +332961,7 @@ _080B9B32:
 	thumb_func_end sub_80B9ADC
 
 	thumb_func_start sub_80B9B3C
-sub_80B9B3C: ; 80B9B3C
+sub_80B9B3C: @ 80B9B3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -333039,7 +333039,7 @@ _080B9BC8:
 	thumb_func_end sub_80B9B3C
 
 	thumb_func_start sub_80B9BD0
-sub_80B9BD0: ; 80B9BD0
+sub_80B9BD0: @ 80B9BD0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -333054,7 +333054,7 @@ sub_80B9BD0: ; 80B9BD0
 	thumb_func_end sub_80B9BD0
 
 	thumb_func_start sub_80B9BE8
-sub_80B9BE8: ; 80B9BE8
+sub_80B9BE8: @ 80B9BE8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -333083,7 +333083,7 @@ sub_80B9BE8: ; 80B9BE8
 	thumb_func_end sub_80B9BE8
 
 	thumb_func_start sub_80B9C28
-sub_80B9C28: ; 80B9C28
+sub_80B9C28: @ 80B9C28
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =sub_80B9B3C
@@ -333105,7 +333105,7 @@ sub_80B9C28: ; 80B9C28
 	thumb_func_end sub_80B9C28
 
 	thumb_func_start sub_80B9C54
-sub_80B9C54: ; 80B9C54
+sub_80B9C54: @ 80B9C54
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -333165,7 +333165,7 @@ _080B9CC2:
 	thumb_func_end sub_80B9C54
 
 	thumb_func_start sub_80B9CDC
-sub_80B9CDC: ; 80B9CDC
+sub_80B9CDC: @ 80B9CDC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -333198,7 +333198,7 @@ _080B9D16:
 	thumb_func_end sub_80B9CDC
 
 	thumb_func_start sub_80B9D24
-sub_80B9D24: ; 80B9D24
+sub_80B9D24: @ 80B9D24
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -333268,7 +333268,7 @@ _080B9D96:
 	thumb_func_end sub_80B9D24
 
 	thumb_func_start sub_80B9DB8
-sub_80B9DB8: ; 80B9DB8
+sub_80B9DB8: @ 80B9DB8
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -333337,7 +333337,7 @@ _080B9E24:
 	thumb_func_end sub_80B9DB8
 
 	thumb_func_start sub_80B9E28
-sub_80B9E28: ; 80B9E28
+sub_80B9E28: @ 80B9E28
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r7, =0x02038c08
@@ -333420,7 +333420,7 @@ _080B9EBE:
 	thumb_func_end sub_80B9E28
 
 	thumb_func_start sub_80B9EDC
-sub_80B9EDC: ; 80B9EDC
+sub_80B9EDC: @ 80B9EDC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -333528,7 +333528,7 @@ _080B9FAC:
 	thumb_func_end sub_80B9EDC
 
 	thumb_func_start remove_some_task
-remove_some_task: ; 80B9FB8
+remove_some_task: @ 80B9FB8
 	push {r4,lr}
 	ldr r4, =0x02039b28
 	movs r0, 0
@@ -333557,7 +333557,7 @@ _080B9FE2:
 	thumb_func_end remove_some_task
 
 	thumb_func_start dp12_8087EA4
-dp12_8087EA4: ; 80B9FF8
+dp12_8087EA4: @ 80B9FF8
 	push {r4,lr}
 	sub sp, 0x4
 	mov r0, sp
@@ -333586,7 +333586,7 @@ dp12_8087EA4: ; 80B9FF8
 	thumb_func_end dp12_8087EA4
 
 	thumb_func_start sub_80BA038
-sub_80BA038: ; 80BA038
+sub_80BA038: @ 80BA038
 	push {lr}
 	sub sp, 0xC
 	str r0, [sp]
@@ -333635,7 +333635,7 @@ _080BA07C:
 	thumb_func_end sub_80BA038
 
 	thumb_func_start sub_80BA0A8
-sub_80BA0A8: ; 80BA0A8
+sub_80BA0A8: @ 80BA0A8
 	push {r4,lr}
 	ldr r4, =0x02039b28
 	ldrb r0, [r4, 0x15]
@@ -333695,7 +333695,7 @@ _080BA122:
 	thumb_func_end sub_80BA0A8
 
 	thumb_func_start sub_80BA134
-sub_80BA134: ; 80BA134
+sub_80BA134: @ 80BA134
 	ldr r0, =0x02039b28
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r0, 0x14]
@@ -333711,7 +333711,7 @@ sub_80BA134: ; 80BA134
 	thumb_func_end sub_80BA134
 
 	thumb_func_start sub_80BA154
-sub_80BA154: ; 80BA154
+sub_80BA154: @ 80BA154
 	ldr r0, =0x02039b28
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r0, 0x14]
@@ -333727,7 +333727,7 @@ sub_80BA154: ; 80BA154
 	thumb_func_end sub_80BA154
 
 	thumb_func_start task00_for_dp12
-task00_for_dp12: ; 80BA174
+task00_for_dp12: @ 80BA174
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -333937,7 +333937,7 @@ _080BA324:
 	thumb_func_end task00_for_dp12
 
 	thumb_func_start sub_80BA33C
-sub_80BA33C: ; 80BA33C
+sub_80BA33C: @ 80BA33C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -333977,7 +333977,7 @@ _080BA364:
 	thumb_func_end sub_80BA33C
 
 	thumb_func_start sub_80BA384
-sub_80BA384: ; 80BA384
+sub_80BA384: @ 80BA384
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -334113,7 +334113,7 @@ _080BA47E:
 	thumb_func_end sub_80BA384
 
 	thumb_func_start sub_80BA4B0
-sub_80BA4B0: ; 80BA4B0
+sub_80BA4B0: @ 80BA4B0
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -334124,7 +334124,7 @@ sub_80BA4B0: ; 80BA4B0
 	thumb_func_end sub_80BA4B0
 
 	thumb_func_start sub_80BA4C8
-sub_80BA4C8: ; 80BA4C8
+sub_80BA4C8: @ 80BA4C8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -334134,7 +334134,7 @@ sub_80BA4C8: ; 80BA4C8
 	thumb_func_end sub_80BA4C8
 
 	thumb_func_start CB2_OptionsMenu
-CB2_OptionsMenu: ; 80BA4DC
+CB2_OptionsMenu: @ 80BA4DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -334488,7 +334488,7 @@ _080BA828:
 	thumb_func_end CB2_OptionsMenu
 
 	thumb_func_start sub_80BA83C
-sub_80BA83C: ; 80BA83C
+sub_80BA83C: @ 80BA83C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -334512,7 +334512,7 @@ _080BA85C:
 	thumb_func_end sub_80BA83C
 
 	thumb_func_start sub_80BA86C
-sub_80BA86C: ; 80BA86C
+sub_80BA86C: @ 80BA86C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -334756,7 +334756,7 @@ _080BAA5A:
 	thumb_func_end sub_80BA86C
 
 	thumb_func_start sub_80BAA64
-sub_80BAA64: ; 80BAA64
+sub_80BAA64: @ 80BAA64
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -334836,7 +334836,7 @@ sub_80BAA64: ; 80BAA64
 	thumb_func_end sub_80BAA64
 
 	thumb_func_start sub_80BAB08
-sub_80BAB08: ; 80BAB08
+sub_80BAB08: @ 80BAB08
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -334859,7 +334859,7 @@ _080BAB2C:
 	thumb_func_end sub_80BAB08
 
 	thumb_func_start sub_80BAB38
-sub_80BAB38: ; 80BAB38
+sub_80BAB38: @ 80BAB38
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -334884,7 +334884,7 @@ sub_80BAB38: ; 80BAB38
 	thumb_func_end sub_80BAB38
 
 	thumb_func_start sub_80BAB68
-sub_80BAB68: ; 80BAB68
+sub_80BAB68: @ 80BAB68
 	push {r4-r6,lr}
 	sub sp, 0x1C
 	adds r4, r0, 0
@@ -334948,7 +334948,7 @@ _080BABAE:
 	thumb_func_end sub_80BAB68
 
 	thumb_func_start sub_80BABDC
-sub_80BABDC: ; 80BABDC
+sub_80BABDC: @ 80BABDC
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -334998,7 +334998,7 @@ _080BAC2C:
 	thumb_func_end sub_80BABDC
 
 	thumb_func_start sub_80BAC38
-sub_80BAC38: ; 80BAC38
+sub_80BAC38: @ 80BAC38
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -335073,7 +335073,7 @@ sub_80BAC38: ; 80BAC38
 	thumb_func_end sub_80BAC38
 
 	thumb_func_start sub_80BACE0
-sub_80BACE0: ; 80BACE0
+sub_80BACE0: @ 80BACE0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -335095,7 +335095,7 @@ _080BACFA:
 	thumb_func_end sub_80BACE0
 
 	thumb_func_start sub_80BAD08
-sub_80BAD08: ; 80BAD08
+sub_80BAD08: @ 80BAD08
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -335134,7 +335134,7 @@ sub_80BAD08: ; 80BAD08
 	thumb_func_end sub_80BAD08
 
 	thumb_func_start sub_80BAD5C
-sub_80BAD5C: ; 80BAD5C
+sub_80BAD5C: @ 80BAD5C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -335156,7 +335156,7 @@ _080BAD76:
 	thumb_func_end sub_80BAD5C
 
 	thumb_func_start sub_80BAD84
-sub_80BAD84: ; 80BAD84
+sub_80BAD84: @ 80BAD84
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -335195,7 +335195,7 @@ sub_80BAD84: ; 80BAD84
 	thumb_func_end sub_80BAD84
 
 	thumb_func_start sub_80BADD8
-sub_80BADD8: ; 80BADD8
+sub_80BADD8: @ 80BADD8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -335220,7 +335220,7 @@ _080BADF8:
 	thumb_func_end sub_80BADD8
 
 	thumb_func_start sub_80BAE08
-sub_80BAE08: ; 80BAE08
+sub_80BAE08: @ 80BAE08
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -335259,7 +335259,7 @@ sub_80BAE08: ; 80BAE08
 	thumb_func_end sub_80BAE08
 
 	thumb_func_start sub_80BAE5C
-sub_80BAE5C: ; 80BAE5C
+sub_80BAE5C: @ 80BAE5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -335341,7 +335341,7 @@ _080BAEFE:
 	thumb_func_end sub_80BAE5C
 
 	thumb_func_start sub_80BAF0C
-sub_80BAF0C: ; 80BAF0C
+sub_80BAF0C: @ 80BAF0C
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -335436,7 +335436,7 @@ _080BAF9E:
 	thumb_func_end sub_80BAF0C
 
 	thumb_func_start sub_80BAFCC
-sub_80BAFCC: ; 80BAFCC
+sub_80BAFCC: @ 80BAFCC
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -335486,7 +335486,7 @@ _080BB01C:
 	thumb_func_end sub_80BAFCC
 
 	thumb_func_start sub_80BB028
-sub_80BB028: ; 80BB028
+sub_80BB028: @ 80BB028
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -335562,7 +335562,7 @@ sub_80BB028: ; 80BB028
 	thumb_func_end sub_80BB028
 
 	thumb_func_start sub_80BB0D0
-sub_80BB0D0: ; 80BB0D0
+sub_80BB0D0: @ 80BB0D0
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -335588,7 +335588,7 @@ sub_80BB0D0: ; 80BB0D0
 	thumb_func_end sub_80BB0D0
 
 	thumb_func_start sub_80BB104
-sub_80BB104: ; 80BB104
+sub_80BB104: @ 80BB104
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x1
@@ -335629,7 +335629,7 @@ _080BB114:
 	thumb_func_end sub_80BB104
 
 	thumb_func_start sub_80BB154
-sub_80BB154: ; 80BB154
+sub_80BB154: @ 80BB154
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -335799,7 +335799,7 @@ sub_80BB154: ; 80BB154
 	thumb_func_end sub_80BB154
 
 	thumb_func_start sub_80BB2D0
-sub_80BB2D0: ; 80BB2D0
+sub_80BB2D0: @ 80BB2D0
 	push {r4-r6,lr}
 	ldr r0, =0x02039b50
 	movs r2, 0
@@ -335858,7 +335858,7 @@ _080BB30C:
 	thumb_func_end sub_80BB2D0
 
 	thumb_func_start sub_80BB358
-sub_80BB358: ; 80BB358
+sub_80BB358: @ 80BB358
 	ldr r1, =0x02039b50
 	movs r0, 0
 	strh r0, [r1]
@@ -335870,7 +335870,7 @@ sub_80BB358: ; 80BB358
 	thumb_func_end sub_80BB358
 
 	thumb_func_start sub_80BB370
-sub_80BB370: ; 80BB370
+sub_80BB370: @ 80BB370
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -335880,7 +335880,7 @@ sub_80BB370: ; 80BB370
 	thumb_func_end sub_80BB370
 
 	thumb_func_start sub_80BB384
-sub_80BB384: ; 80BB384
+sub_80BB384: @ 80BB384
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r3, 0
@@ -336076,7 +336076,7 @@ _080BB4E4:
 	thumb_func_end sub_80BB384
 
 	thumb_func_start sub_80BB534
-sub_80BB534: ; 80BB534
+sub_80BB534: @ 80BB534
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -336305,7 +336305,7 @@ _080BB74C:
 	thumb_func_end sub_80BB534
 
 	thumb_func_start sub_80BB774
-sub_80BB774: ; 80BB774
+sub_80BB774: @ 80BB774
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -336316,7 +336316,7 @@ sub_80BB774: ; 80BB774
 	thumb_func_end sub_80BB774
 
 	thumb_func_start sub_80BB78C
-sub_80BB78C: ; 80BB78C
+sub_80BB78C: @ 80BB78C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -336349,7 +336349,7 @@ _080BB7BE:
 	thumb_func_end sub_80BB78C
 
 	thumb_func_start sub_80BB7D4
-sub_80BB7D4: ; 80BB7D4
+sub_80BB7D4: @ 80BB7D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -336591,7 +336591,7 @@ _080BBA06:
 	thumb_func_end sub_80BB7D4
 
 	thumb_func_start sub_80BBA28
-sub_80BBA28: ; 80BBA28
+sub_80BBA28: @ 80BBA28
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -336625,7 +336625,7 @@ _080BBA5C:
 	thumb_func_end sub_80BBA28
 
 	thumb_func_start sub_80BBA78
-sub_80BBA78: ; 80BBA78
+sub_80BBA78: @ 80BBA78
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -336795,7 +336795,7 @@ _080BBBE8:
 	thumb_func_end sub_80BBA78
 
 	thumb_func_start sub_80BBBF4
-sub_80BBBF4: ; 80BBBF4
+sub_80BBBF4: @ 80BBBF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -336850,7 +336850,7 @@ _080BBC52:
 	thumb_func_end sub_80BBBF4
 
 	thumb_func_start sub_80BBC74
-sub_80BBC74: ; 80BBC74
+sub_80BBC74: @ 80BBC74
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -336917,7 +336917,7 @@ _080BBCFC:
 	thumb_func_end sub_80BBC74
 
 	thumb_func_start sub_80BBD1C
-sub_80BBD1C: ; 80BBD1C
+sub_80BBD1C: @ 80BBD1C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -337002,7 +337002,7 @@ _080BBDCA:
 	thumb_func_end sub_80BBD1C
 
 	thumb_func_start sub_80BBDE8
-sub_80BBDE8: ; 80BBDE8
+sub_80BBDE8: @ 80BBDE8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -337054,7 +337054,7 @@ _080BBE4A:
 	thumb_func_end sub_80BBDE8
 
 	thumb_func_start sub_80BBE70
-sub_80BBE70: ; 80BBE70
+sub_80BBE70: @ 80BBE70
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -337086,7 +337086,7 @@ _080BBEA0:
 	thumb_func_end sub_80BBE70
 
 	thumb_func_start sub_80BBEB8
-sub_80BBEB8: ; 80BBEB8
+sub_80BBEB8: @ 80BBEB8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -337287,7 +337287,7 @@ _080BC08A:
 	thumb_func_end sub_80BBEB8
 
 	thumb_func_start sub_80BC0A8
-sub_80BC0A8: ; 80BC0A8
+sub_80BC0A8: @ 80BC0A8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -337321,7 +337321,7 @@ _080BC0DC:
 	thumb_func_end sub_80BC0A8
 
 	thumb_func_start sub_80BC0F8
-sub_80BC0F8: ; 80BC0F8
+sub_80BC0F8: @ 80BC0F8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -337523,7 +337523,7 @@ _080BC2C8:
 	thumb_func_end sub_80BC0F8
 
 	thumb_func_start sub_80BC2D4
-sub_80BC2D4: ; 80BC2D4
+sub_80BC2D4: @ 80BC2D4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -337582,7 +337582,7 @@ _080BC33A:
 	thumb_func_end sub_80BC2D4
 
 	thumb_func_start sub_80BC360
-sub_80BC360: ; 80BC360
+sub_80BC360: @ 80BC360
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -337637,7 +337637,7 @@ _080BC3D0:
 	thumb_func_end sub_80BC360
 
 	thumb_func_start sub_80BC3DC
-sub_80BC3DC: ; 80BC3DC
+sub_80BC3DC: @ 80BC3DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -337702,7 +337702,7 @@ _080BC450:
 	thumb_func_end sub_80BC3DC
 
 	thumb_func_start sub_80BC47C
-sub_80BC47C: ; 80BC47C
+sub_80BC47C: @ 80BC47C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -337765,7 +337765,7 @@ _080BC4E8:
 	thumb_func_end sub_80BC47C
 
 	thumb_func_start sub_80BC514
-sub_80BC514: ; 80BC514
+sub_80BC514: @ 80BC514
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -338078,7 +338078,7 @@ _080BC83A:
 	thumb_func_end sub_80BC514
 
 	thumb_func_start sub_80BC844
-sub_80BC844: ; 80BC844
+sub_80BC844: @ 80BC844
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -338114,7 +338114,7 @@ _080BC87A:
 	thumb_func_end sub_80BC844
 
 	thumb_func_start sub_80BC890
-sub_80BC890: ; 80BC890
+sub_80BC890: @ 80BC890
 	push {lr}
 	bl FreeAllWindowBuffers
 	movs r0, 0
@@ -338146,7 +338146,7 @@ _080BC8CE:
 	thumb_func_end sub_80BC890
 
 	thumb_func_start sub_80BC8D4
-sub_80BC8D4: ; 80BC8D4
+sub_80BC8D4: @ 80BC8D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -338792,7 +338792,7 @@ _080BCE08:
 	thumb_func_end sub_80BC8D4
 
 	thumb_func_start sub_80BCE2C
-sub_80BCE2C: ; 80BCE2C
+sub_80BCE2C: @ 80BCE2C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -338838,7 +338838,7 @@ sub_80BCE2C: ; 80BCE2C
 	thumb_func_end sub_80BCE2C
 
 	thumb_func_start sub_80BCE84
-sub_80BCE84: ; 80BCE84
+sub_80BCE84: @ 80BCE84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -339179,7 +339179,7 @@ _080BD13E:
 	thumb_func_end sub_80BCE84
 
 	thumb_func_start sub_80BD154
-sub_80BD154: ; 80BD154
+sub_80BD154: @ 80BD154
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -339251,7 +339251,7 @@ _080BD194:
 	thumb_func_end sub_80BD154
 
 	thumb_func_start sub_80BD1F4
-sub_80BD1F4: ; 80BD1F4
+sub_80BD1F4: @ 80BD1F4
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -339290,7 +339290,7 @@ _080BD234:
 	thumb_func_end sub_80BD1F4
 
 	thumb_func_start sub_80BD23C
-sub_80BD23C: ; 80BD23C
+sub_80BD23C: @ 80BD23C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -339330,7 +339330,7 @@ _080BD266:
 	thumb_func_end sub_80BD23C
 
 	thumb_func_start sub_80BD28C
-sub_80BD28C: ; 80BD28C
+sub_80BD28C: @ 80BD28C
 	push {lr}
 	sub sp, 0x8
 	adds r2, r0, 0
@@ -339352,7 +339352,7 @@ sub_80BD28C: ; 80BD28C
 	thumb_func_end sub_80BD28C
 
 	thumb_func_start sub_80BD2B4
-sub_80BD2B4: ; 80BD2B4
+sub_80BD2B4: @ 80BD2B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -339500,7 +339500,7 @@ _080BD39C:
 	thumb_func_end sub_80BD2B4
 
 	thumb_func_start sub_80BD404
-sub_80BD404: ; 80BD404
+sub_80BD404: @ 80BD404
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -339686,7 +339686,7 @@ _080BD598:
 	thumb_func_end sub_80BD404
 
 	thumb_func_start sub_80BD5A8
-sub_80BD5A8: ; 80BD5A8
+sub_80BD5A8: @ 80BD5A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -339799,7 +339799,7 @@ _080BD694:
 	thumb_func_end sub_80BD5A8
 
 	thumb_func_start sub_80BD69C
-sub_80BD69C: ; 80BD69C
+sub_80BD69C: @ 80BD69C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -340046,7 +340046,7 @@ _080BD8A2:
 	thumb_func_end sub_80BD69C
 
 	thumb_func_start sub_80BD8D0
-sub_80BD8D0: ; 80BD8D0
+sub_80BD8D0: @ 80BD8D0
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r0, =0x02039b4c
@@ -340091,7 +340091,7 @@ _080BD90C:
 	thumb_func_end sub_80BD8D0
 
 	thumb_func_start sub_80BD930
-sub_80BD930: ; 80BD930
+sub_80BD930: @ 80BD930
 	push {r4-r6,lr}
 	ldr r3, =0x02039b4c
 	ldr r0, [r3]
@@ -340223,7 +340223,7 @@ _080BDA3A:
 	thumb_func_end sub_80BD930
 
 	thumb_func_start sub_80BDA40
-sub_80BDA40: ; 80BDA40
+sub_80BDA40: @ 80BDA40
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r6, =0x02039b4c
@@ -340260,7 +340260,7 @@ _080BDA6C:
 	thumb_func_end sub_80BDA40
 
 	thumb_func_start sub_80BDA8C
-sub_80BDA8C: ; 80BDA8C
+sub_80BDA8C: @ 80BDA8C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -340294,7 +340294,7 @@ _080BDAC6:
 	thumb_func_end sub_80BDA8C
 
 	thumb_func_start sub_80BDACC
-sub_80BDACC: ; 80BDACC
+sub_80BDACC: @ 80BDACC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -340378,7 +340378,7 @@ _080BDB6C:
 	thumb_func_end sub_80BDACC
 
 	thumb_func_start sub_80BDB7C
-sub_80BDB7C: ; 80BDB7C
+sub_80BDB7C: @ 80BDB7C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -341342,12 +341342,12 @@ _080BE42C:
 	thumb_func_end sub_80BDB7C
 
 	thumb_func_start nullsub_38
-nullsub_38: ; 80BE448
+nullsub_38: @ 80BE448
 	bx lr
 	thumb_func_end nullsub_38
 
 	thumb_func_start sub_80BE44C
-sub_80BE44C: ; 80BE44C
+sub_80BE44C: @ 80BE44C
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02039b4c
@@ -341366,7 +341366,7 @@ _080BE464:
 	thumb_func_end sub_80BE44C
 
 	thumb_func_start sub_80BE470
-sub_80BE470: ; 80BE470
+sub_80BE470: @ 80BE470
 	push {lr}
 	adds r2, r0, 0
 	ldrb r1, [r2, 0x5]
@@ -341429,7 +341429,7 @@ _080BE4D8:
 	thumb_func_end sub_80BE470
 
 	thumb_func_start sub_80BE4E0
-sub_80BE4E0: ; 80BE4E0
+sub_80BE4E0: @ 80BE4E0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -341568,7 +341568,7 @@ _080BE5F0:
 	thumb_func_end sub_80BE4E0
 
 	thumb_func_start sub_80BE604
-sub_80BE604: ; 80BE604
+sub_80BE604: @ 80BE604
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x02039b4c
@@ -341606,7 +341606,7 @@ _080BE648:
 	thumb_func_end sub_80BE604
 
 	thumb_func_start sub_80BE658
-sub_80BE658: ; 80BE658
+sub_80BE658: @ 80BE658
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r1, =0x02039b4c
@@ -341738,7 +341738,7 @@ _080BE750:
 	thumb_func_end sub_80BE658
 
 	thumb_func_start sub_80BE758
-sub_80BE758: ; 80BE758
+sub_80BE758: @ 80BE758
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02039b4c
@@ -341759,7 +341759,7 @@ _080BE774:
 	thumb_func_end sub_80BE758
 
 	thumb_func_start sub_80BE780
-sub_80BE780: ; 80BE780
+sub_80BE780: @ 80BE780
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -341848,7 +341848,7 @@ _080BE824:
 	thumb_func_end sub_80BE780
 
 	thumb_func_start sub_80BE834
-sub_80BE834: ; 80BE834
+sub_80BE834: @ 80BE834
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r1, =0x02039b4c
@@ -341930,7 +341930,7 @@ _080BE8D4:
 	thumb_func_end sub_80BE834
 
 	thumb_func_start sub_80BE8DC
-sub_80BE8DC: ; 80BE8DC
+sub_80BE8DC: @ 80BE8DC
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r5, r1, 0
@@ -341964,7 +341964,7 @@ sub_80BE8DC: ; 80BE8DC
 	thumb_func_end sub_80BE8DC
 
 	thumb_func_start sub_80BE91C
-sub_80BE91C: ; 80BE91C
+sub_80BE91C: @ 80BE91C
 	push {r4,r5,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
@@ -342029,7 +342029,7 @@ sub_80BE91C: ; 80BE91C
 	thumb_func_end sub_80BE91C
 
 	thumb_func_start sub_80BE9C4
-sub_80BE9C4: ; 80BE9C4
+sub_80BE9C4: @ 80BE9C4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -342057,7 +342057,7 @@ _080BE9F2:
 	thumb_func_end sub_80BE9C4
 
 	thumb_func_start sub_80BE9F8
-sub_80BE9F8: ; 80BE9F8
+sub_80BE9F8: @ 80BE9F8
 	adds r2, r0, 0
 	lsls r0, r1, 24
 	lsrs r0, 24
@@ -342079,7 +342079,7 @@ sub_80BE9F8: ; 80BE9F8
 	thumb_func_end sub_80BE9F8
 
 	thumb_func_start sub_80BEA24
-sub_80BEA24: ; 80BEA24
+sub_80BEA24: @ 80BEA24
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -342457,7 +342457,7 @@ _080BEDA0:
 	thumb_func_end sub_80BEA24
 
 	thumb_func_start sub_80BEDB0
-sub_80BEDB0: ; 80BEDB0
+sub_80BEDB0: @ 80BEDB0
 	push {lr}
 	bl FreeAllWindowBuffers
 	movs r0, 0
@@ -342489,7 +342489,7 @@ _080BEDEE:
 	thumb_func_end sub_80BEDB0
 
 	thumb_func_start sub_80BEDF4
-sub_80BEDF4: ; 80BEDF4
+sub_80BEDF4: @ 80BEDF4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -342704,7 +342704,7 @@ _080BEFBA:
 	thumb_func_end sub_80BEDF4
 
 	thumb_func_start sub_80BEFD0
-sub_80BEFD0: ; 80BEFD0
+sub_80BEFD0: @ 80BEFD0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -342752,7 +342752,7 @@ _080BF02C:
 	thumb_func_end sub_80BEFD0
 
 	thumb_func_start sub_80BF038
-sub_80BF038: ; 80BF038
+sub_80BF038: @ 80BF038
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -342779,7 +342779,7 @@ _080BF05E:
 	thumb_func_end sub_80BF038
 
 	thumb_func_start sub_80BF070
-sub_80BF070: ; 80BF070
+sub_80BF070: @ 80BF070
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -342807,7 +342807,7 @@ _080BF09C:
 	thumb_func_end sub_80BF070
 
 	thumb_func_start sub_80BF0AC
-sub_80BF0AC: ; 80BF0AC
+sub_80BF0AC: @ 80BF0AC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -342911,7 +342911,7 @@ _080BF196:
 	thumb_func_end sub_80BF0AC
 
 	thumb_func_start sub_80BF1B4
-sub_80BF1B4: ; 80BF1B4
+sub_80BF1B4: @ 80BF1B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -342936,7 +342936,7 @@ _080BF1D6:
 	thumb_func_end sub_80BF1B4
 
 	thumb_func_start sub_80BF1EC
-sub_80BF1EC: ; 80BF1EC
+sub_80BF1EC: @ 80BF1EC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -342980,7 +342980,7 @@ _080BF242:
 	thumb_func_end sub_80BF1EC
 
 	thumb_func_start sub_80BF250
-sub_80BF250: ; 80BF250
+sub_80BF250: @ 80BF250
 	push {r4,r5,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -343325,7 +343325,7 @@ _080BF5B2:
 	thumb_func_end sub_80BF250
 
 	thumb_func_start sub_80BF5CC
-sub_80BF5CC: ; 80BF5CC
+sub_80BF5CC: @ 80BF5CC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -343508,7 +343508,7 @@ _080BF772:
 	thumb_func_end sub_80BF5CC
 
 	thumb_func_start sub_80BF790
-sub_80BF790: ; 80BF790
+sub_80BF790: @ 80BF790
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -343557,7 +343557,7 @@ _080BF7F0:
 	thumb_func_end sub_80BF790
 
 	thumb_func_start sub_80BF7FC
-sub_80BF7FC: ; 80BF7FC
+sub_80BF7FC: @ 80BF7FC
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -343582,7 +343582,7 @@ _080BF812:
 	thumb_func_end sub_80BF7FC
 
 	thumb_func_start sub_80BF82C
-sub_80BF82C: ; 80BF82C
+sub_80BF82C: @ 80BF82C
 	push {r4-r7,lr}
 	sub sp, 0x44
 	lsls r0, 24
@@ -343943,7 +343943,7 @@ _080BFB94:
 	thumb_func_end sub_80BF82C
 
 	thumb_func_start sub_80BFBB0
-sub_80BFBB0: ; 80BFBB0
+sub_80BFBB0: @ 80BFBB0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -344028,7 +344028,7 @@ _080BFC5C:
 	thumb_func_end sub_80BFBB0
 
 	thumb_func_start sub_80BFC78
-sub_80BFC78: ; 80BFC78
+sub_80BFC78: @ 80BFC78
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -344072,7 +344072,7 @@ _080BFCD0:
 	thumb_func_end sub_80BFC78
 
 	thumb_func_start sub_80BFCDC
-sub_80BFCDC: ; 80BFCDC
+sub_80BFCDC: @ 80BFCDC
 	push {lr}
 	ldr r1, =gUnknown_08DC2F5C
 	movs r0, 0x1
@@ -344085,7 +344085,7 @@ sub_80BFCDC: ; 80BFCDC
 	thumb_func_end sub_80BFCDC
 
 	thumb_func_start sub_80BFCF4
-sub_80BFCF4: ; 80BFCF4
+sub_80BFCF4: @ 80BFCF4
 	push {lr}
 	ldr r1, =gUnknown_08DC2FEC
 	movs r0, 0x1
@@ -344098,7 +344098,7 @@ sub_80BFCF4: ; 80BFCF4
 	thumb_func_end sub_80BFCF4
 
 	thumb_func_start sub_80BFD0C
-sub_80BFD0C: ; 80BFD0C
+sub_80BFD0C: @ 80BFD0C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -344158,7 +344158,7 @@ _080BFD3E:
 	thumb_func_end sub_80BFD0C
 
 	thumb_func_start sub_80BFD7C
-sub_80BFD7C: ; 80BFD7C
+sub_80BFD7C: @ 80BFD7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -344223,7 +344223,7 @@ _080BFDB4:
 	thumb_func_end sub_80BFD7C
 
 	thumb_func_start sub_80BFDF4
-sub_80BFDF4: ; 80BFDF4
+sub_80BFDF4: @ 80BFDF4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -344256,7 +344256,7 @@ sub_80BFDF4: ; 80BFDF4
 	thumb_func_end sub_80BFDF4
 
 	thumb_func_start sub_80BFE38
-sub_80BFE38: ; 80BFE38
+sub_80BFE38: @ 80BFE38
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -344495,7 +344495,7 @@ _080C0074:
 	thumb_func_end sub_80BFE38
 
 	thumb_func_start sub_80C0088
-sub_80C0088: ; 80C0088
+sub_80C0088: @ 80C0088
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -344564,7 +344564,7 @@ _080C011E:
 	thumb_func_end sub_80C0088
 
 	thumb_func_start blockset_load_palette_to_gpu
-blockset_load_palette_to_gpu: ; 80C012C
+blockset_load_palette_to_gpu: @ 80C012C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -344636,7 +344636,7 @@ _080C01BA:
 	thumb_func_end blockset_load_palette_to_gpu
 
 	thumb_func_start sub_80C01CC
-sub_80C01CC: ; 80C01CC
+sub_80C01CC: @ 80C01CC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x20]
@@ -344676,7 +344676,7 @@ _080C0208:
 	thumb_func_end sub_80C01CC
 
 	thumb_func_start sub_80C020C
-sub_80C020C: ; 80C020C
+sub_80C020C: @ 80C020C
 	push {r4-r7,lr}
 	sub sp, 0x30
 	adds r6, r0, 0
@@ -344816,7 +344816,7 @@ _080C032E:
 	thumb_func_end sub_80C020C
 
 	thumb_func_start sub_80C0354
-sub_80C0354: ; 80C0354
+sub_80C0354: @ 80C0354
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -344946,7 +344946,7 @@ _080C03F4:
 	thumb_func_end sub_80C0354
 
 	thumb_func_start sub_80C0460
-sub_80C0460: ; 80C0460
+sub_80C0460: @ 80C0460
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -345161,7 +345161,7 @@ _080C0552:
 	thumb_func_end sub_80C0460
 
 	thumb_func_start sub_80C0620
-sub_80C0620: ; 80C0620
+sub_80C0620: @ 80C0620
 	lsls r0, 16
 	lsrs r0, 11
 	ldr r1, =gPokedexEntries
@@ -345171,7 +345171,7 @@ sub_80C0620: ; 80C0620
 	thumb_func_end sub_80C0620
 
 	thumb_func_start sub_80C0630
-sub_80C0630: ; 80C0630
+sub_80C0630: @ 80C0630
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -345202,8 +345202,8 @@ _080C065C:
 	thumb_func_end sub_80C0630
 
 	thumb_func_start pokedex_flag_operation
-; u8 pokedex_flag_operation(u16 nationalPokedexNum, u8 op)
-pokedex_flag_operation: ; 80C0664
+@ u8 pokedex_flag_operation(u16 nationalPokedexNum, u8 op)
+pokedex_flag_operation: @ 80C0664
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsls r1, 24
@@ -345391,7 +345391,7 @@ _080C07E8:
 	thumb_func_end pokedex_flag_operation
 
 	thumb_func_start pokedex_count
-pokedex_count: ; 80C07F4
+pokedex_count: @ 80C07F4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -345437,7 +345437,7 @@ _080C0832:
 	thumb_func_end pokedex_count
 
 	thumb_func_start sub_80C0844
-sub_80C0844: ; 80C0844
+sub_80C0844: @ 80C0844
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -345487,7 +345487,7 @@ _080C088C:
 	thumb_func_end sub_80C0844
 
 	thumb_func_start sub_80C089C
-sub_80C089C: ; 80C089C
+sub_80C089C: @ 80C089C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -345531,7 +345531,7 @@ _080C08D4:
 	thumb_func_end sub_80C089C
 
 	thumb_func_start sub_80C08E4
-sub_80C08E4: ; 80C08E4
+sub_80C08E4: @ 80C08E4
 	push {r4,lr}
 	movs r0, 0
 _080C08E8:
@@ -345561,7 +345561,7 @@ _080C0910:
 	thumb_func_end sub_80C08E4
 
 	thumb_func_start sub_80C0918
-sub_80C0918: ; 80C0918
+sub_80C0918: @ 80C0918
 	push {r4,lr}
 	movs r0, 0
 _080C091C:
@@ -345588,7 +345588,7 @@ _080C093C:
 	thumb_func_end sub_80C0918
 
 	thumb_func_start sub_80C0944
-sub_80C0944: ; 80C0944
+sub_80C0944: @ 80C0944
 	push {r4,r5,lr}
 	movs r0, 0
 _080C0948:
@@ -345646,7 +345646,7 @@ _080C09A8:
 	thumb_func_end sub_80C0944
 
 	thumb_func_start sub_80C09B0
-sub_80C09B0: ; 80C09B0
+sub_80C09B0: @ 80C09B0
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -345743,7 +345743,7 @@ _080C0A7E:
 	thumb_func_end sub_80C09B0
 
 	thumb_func_start sub_80C0A88
-sub_80C0A88: ; 80C0A88
+sub_80C0A88: @ 80C0A88
 	push {r4-r6,lr}
 	sub sp, 0x18
 	lsls r0, 24
@@ -345775,7 +345775,7 @@ sub_80C0A88: ; 80C0A88
 	thumb_func_end sub_80C0A88
 
 	thumb_func_start sub_80C0AC4
-sub_80C0AC4: ; 80C0AC4
+sub_80C0AC4: @ 80C0AC4
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -345838,7 +345838,7 @@ sub_80C0AC4: ; 80C0AC4
 	thumb_func_end sub_80C0AC4
 
 	thumb_func_start sub_80C0B44
-sub_80C0B44: ; 80C0B44
+sub_80C0B44: @ 80C0B44
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -345928,7 +345928,7 @@ _080C0BD4:
 	thumb_func_end sub_80C0B44
 
 	thumb_func_start sub_80C0BF0
-sub_80C0BF0: ; 80C0BF0
+sub_80C0BF0: @ 80C0BF0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -345997,7 +345997,7 @@ _080C0C52:
 	thumb_func_end sub_80C0BF0
 
 	thumb_func_start sub_80C0C6C
-sub_80C0C6C: ; 80C0C6C
+sub_80C0C6C: @ 80C0C6C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -346094,7 +346094,7 @@ _080C0CD4:
 	thumb_func_end sub_80C0C6C
 
 	thumb_func_start sub_80C0D30
-sub_80C0D30: ; 80C0D30
+sub_80C0D30: @ 80C0D30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -346169,7 +346169,7 @@ _080C0D84:
 	thumb_func_end sub_80C0D30
 
 	thumb_func_start sub_80C0DC0
-sub_80C0DC0: ; 80C0DC0
+sub_80C0DC0: @ 80C0DC0
 	push {r4,lr}
 	lsls r0, 16
 	lsls r1, 16
@@ -346203,7 +346203,7 @@ sub_80C0DC0: ; 80C0DC0
 	thumb_func_end sub_80C0DC0
 
 	thumb_func_start sub_80C0E0C
-sub_80C0E0C: ; 80C0E0C
+sub_80C0E0C: @ 80C0E0C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -346262,7 +346262,7 @@ _080C0E60:
 	thumb_func_end sub_80C0E0C
 
 	thumb_func_start sub_80C0E68
-sub_80C0E68: ; 80C0E68
+sub_80C0E68: @ 80C0E68
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -346291,7 +346291,7 @@ _080C0E96:
 	thumb_func_end sub_80C0E68
 
 	thumb_func_start sub_80C0E9C
-sub_80C0E9C: ; 80C0E9C
+sub_80C0E9C: @ 80C0E9C
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r4, r1, 0
@@ -346337,7 +346337,7 @@ sub_80C0E9C: ; 80C0E9C
 	thumb_func_end sub_80C0E9C
 
 	thumb_func_start sub_80C0EF8
-sub_80C0EF8: ; 80C0EF8
+sub_80C0EF8: @ 80C0EF8
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r1, 0
@@ -346367,7 +346367,7 @@ sub_80C0EF8: ; 80C0EF8
 	thumb_func_end sub_80C0EF8
 
 	thumb_func_start sub_80C0F30
-sub_80C0F30: ; 80C0F30
+sub_80C0F30: @ 80C0F30
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -346776,7 +346776,7 @@ _080C1232:
 	thumb_func_end sub_80C0F30
 
 	thumb_func_start sub_80C1258
-sub_80C1258: ; 80C1258
+sub_80C1258: @ 80C1258
 	push {lr}
 	ldr r0, =sub_80C12E0
 	movs r1, 0
@@ -346789,7 +346789,7 @@ sub_80C1258: ; 80C1258
 	thumb_func_end sub_80C1258
 
 	thumb_func_start sub_80C1270
-sub_80C1270: ; 80C1270
+sub_80C1270: @ 80C1270
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r5, r1, 0
@@ -346823,7 +346823,7 @@ sub_80C1270: ; 80C1270
 	thumb_func_end sub_80C1270
 
 	thumb_func_start sub_80C12B0
-sub_80C12B0: ; 80C12B0
+sub_80C12B0: @ 80C12B0
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -346850,7 +346850,7 @@ sub_80C12B0: ; 80C12B0
 	thumb_func_end sub_80C12B0
 
 	thumb_func_start sub_80C12E0
-sub_80C12E0: ; 80C12E0
+sub_80C12E0: @ 80C12E0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -347080,7 +347080,7 @@ _080C1516:
 	thumb_func_end sub_80C12E0
 
 	thumb_func_start sub_80C152C
-sub_80C152C: ; 80C152C
+sub_80C152C: @ 80C152C
 	push {lr}
 	bl FreeAllWindowBuffers
 	movs r0, 0
@@ -347112,7 +347112,7 @@ _080C156A:
 	thumb_func_end sub_80C152C
 
 	thumb_func_start sub_80C1570
-sub_80C1570: ; 80C1570
+sub_80C1570: @ 80C1570
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -347140,7 +347140,7 @@ sub_80C1570: ; 80C1570
 	thumb_func_end sub_80C1570
 
 	thumb_func_start sub_80C15B0
-sub_80C15B0: ; 80C15B0
+sub_80C15B0: @ 80C15B0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -347271,7 +347271,7 @@ _080C16BC:
 	thumb_func_end sub_80C15B0
 
 	thumb_func_start sub_80C16CC
-sub_80C16CC: ; 80C16CC
+sub_80C16CC: @ 80C16CC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -347300,7 +347300,7 @@ sub_80C16CC: ; 80C16CC
 	thumb_func_end sub_80C16CC
 
 	thumb_func_start sub_80C170C
-sub_80C170C: ; 80C170C
+sub_80C170C: @ 80C170C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -347579,7 +347579,7 @@ _080C1994:
 	thumb_func_end sub_80C170C
 
 	thumb_func_start sub_80C19A4
-sub_80C19A4: ; 80C19A4
+sub_80C19A4: @ 80C19A4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -347656,7 +347656,7 @@ sub_80C19A4: ; 80C19A4
 	thumb_func_end sub_80C19A4
 
 	thumb_func_start sub_80C1A4C
-sub_80C1A4C: ; 80C1A4C
+sub_80C1A4C: @ 80C1A4C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -347701,7 +347701,7 @@ _080C1AA6:
 	thumb_func_end sub_80C1A4C
 
 	thumb_func_start sub_80C1AB8
-sub_80C1AB8: ; 80C1AB8
+sub_80C1AB8: @ 80C1AB8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -347770,7 +347770,7 @@ _080C1B54:
 	thumb_func_end sub_80C1AB8
 
 	thumb_func_start sub_80C1B64
-sub_80C1B64: ; 80C1B64
+sub_80C1B64: @ 80C1B64
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -347816,7 +347816,7 @@ sub_80C1B64: ; 80C1B64
 	thumb_func_end sub_80C1B64
 
 	thumb_func_start sub_80C1BCC
-sub_80C1BCC: ; 80C1BCC
+sub_80C1BCC: @ 80C1BCC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -347985,7 +347985,7 @@ _080C1D2E:
 	thumb_func_end sub_80C1BCC
 
 	thumb_func_start sub_80C1D38
-sub_80C1D38: ; 80C1D38
+sub_80C1D38: @ 80C1D38
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -348013,7 +348013,7 @@ sub_80C1D38: ; 80C1D38
 	thumb_func_end sub_80C1D38
 
 	thumb_func_start sub_80C1D70
-sub_80C1D70: ; 80C1D70
+sub_80C1D70: @ 80C1D70
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -348034,7 +348034,7 @@ _080C1D8C:
 	thumb_func_end sub_80C1D70
 
 	thumb_func_start sub_80C1D98
-sub_80C1D98: ; 80C1D98
+sub_80C1D98: @ 80C1D98
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -348087,7 +348087,7 @@ _080C1DEC:
 	thumb_func_end sub_80C1D98
 
 	thumb_func_start sub_80C1DFC
-sub_80C1DFC: ; 80C1DFC
+sub_80C1DFC: @ 80C1DFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -348202,7 +348202,7 @@ _080C1EE8:
 	thumb_func_end sub_80C1DFC
 
 	thumb_func_start sub_80C1EF4
-sub_80C1EF4: ; 80C1EF4
+sub_80C1EF4: @ 80C1EF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -348349,7 +348349,7 @@ _080C203C:
 	thumb_func_end sub_80C1EF4
 
 	thumb_func_start sub_80C2040
-sub_80C2040: ; 80C2040
+sub_80C2040: @ 80C2040
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -348368,7 +348368,7 @@ sub_80C2040: ; 80C2040
 	thumb_func_end sub_80C2040
 
 	thumb_func_start sub_80C2064
-sub_80C2064: ; 80C2064
+sub_80C2064: @ 80C2064
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -348442,7 +348442,7 @@ _080C20DE:
 	thumb_func_end sub_80C2064
 
 	thumb_func_start sub_80C20F8
-sub_80C20F8: ; 80C20F8
+sub_80C20F8: @ 80C20F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -348538,7 +348538,7 @@ _080C21B6:
 	thumb_func_end sub_80C20F8
 
 	thumb_func_start sub_80C21D4
-sub_80C21D4: ; 80C21D4
+sub_80C21D4: @ 80C21D4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -348636,7 +348636,7 @@ _080C228C:
 	thumb_func_end sub_80C21D4
 
 	thumb_func_start sub_80C2294
-sub_80C2294: ; 80C2294
+sub_80C2294: @ 80C2294
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -348703,7 +348703,7 @@ _080C22FC:
 	thumb_func_end sub_80C2294
 
 	thumb_func_start sub_80C2318
-sub_80C2318: ; 80C2318
+sub_80C2318: @ 80C2318
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -348784,7 +348784,7 @@ _080C23B0:
 	thumb_func_end sub_80C2318
 
 	thumb_func_start sub_80C23B8
-sub_80C23B8: ; 80C23B8
+sub_80C23B8: @ 80C23B8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -348861,7 +348861,7 @@ _080C243E:
 	thumb_func_end sub_80C23B8
 
 	thumb_func_start sub_80C244C
-sub_80C244C: ; 80C244C
+sub_80C244C: @ 80C244C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -348899,7 +348899,7 @@ _080C248E:
 	thumb_func_end sub_80C244C
 
 	thumb_func_start sub_80C2494
-sub_80C2494: ; 80C2494
+sub_80C2494: @ 80C2494
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -348938,7 +348938,7 @@ _080C24DA:
 	thumb_func_end sub_80C2494
 
 	thumb_func_start sub_80C24E0
-sub_80C24E0: ; 80C24E0
+sub_80C24E0: @ 80C24E0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03005e00
@@ -349029,7 +349029,7 @@ _080C258C:
 	thumb_func_end sub_80C24E0
 
 	thumb_func_start sub_80C2594
-sub_80C2594: ; 80C2594
+sub_80C2594: @ 80C2594
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -349092,7 +349092,7 @@ sub_80C2594: ; 80C2594
 	thumb_func_end sub_80C2594
 
 	thumb_func_start sub_80C2618
-sub_80C2618: ; 80C2618
+sub_80C2618: @ 80C2618
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -349110,7 +349110,7 @@ sub_80C2618: ; 80C2618
 	thumb_func_end sub_80C2618
 
 	thumb_func_start sub_80C2638
-sub_80C2638: ; 80C2638
+sub_80C2638: @ 80C2638
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 4
@@ -349124,7 +349124,7 @@ sub_80C2638: ; 80C2638
 	thumb_func_end sub_80C2638
 
 	thumb_func_start sub_80C2650
-sub_80C2650: ; 80C2650
+sub_80C2650: @ 80C2650
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =gUnknown_085E8B3A
@@ -349138,7 +349138,7 @@ sub_80C2650: ; 80C2650
 	thumb_func_end sub_80C2650
 
 	thumb_func_start sub_80C2668
-sub_80C2668: ; 80C2668
+sub_80C2668: @ 80C2668
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -349151,7 +349151,7 @@ sub_80C2668: ; 80C2668
 	thumb_func_end sub_80C2668
 
 	thumb_func_start sub_80C267C
-sub_80C267C: ; 80C267C
+sub_80C267C: @ 80C267C
 	push {lr}
 	movs r0, 0x90
 	movs r1, 0x8
@@ -349163,7 +349163,7 @@ sub_80C267C: ; 80C267C
 	thumb_func_end sub_80C267C
 
 	thumb_func_start sub_80C2690
-sub_80C2690: ; 80C2690
+sub_80C2690: @ 80C2690
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -349191,7 +349191,7 @@ _080C26C0:
 	thumb_func_end sub_80C2690
 
 	thumb_func_start sub_80C26D4
-sub_80C26D4: ; 80C26D4
+sub_80C26D4: @ 80C26D4
 	push {r4,lr}
 	ldr r4, =0x04000208
 	ldrh r3, [r4]
@@ -349218,7 +349218,7 @@ sub_80C26D4: ; 80C26D4
 	thumb_func_end sub_80C26D4
 
 	thumb_func_start sub_80C2710
-sub_80C2710: ; 80C2710
+sub_80C2710: @ 80C2710
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -349229,7 +349229,7 @@ sub_80C2710: ; 80C2710
 	thumb_func_end sub_80C2710
 
 	thumb_func_start sub_80C2728
-sub_80C2728: ; 80C2728
+sub_80C2728: @ 80C2728
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -349255,7 +349255,7 @@ sub_80C2728: ; 80C2728
 	thumb_func_end sub_80C2728
 
 	thumb_func_start sub_80C2760
-sub_80C2760: ; 80C2760
+sub_80C2760: @ 80C2760
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -349639,7 +349639,7 @@ _080C2ACA:
 	thumb_func_end sub_80C2760
 
 	thumb_func_start sub_80C2AD8
-sub_80C2AD8: ; 80C2AD8
+sub_80C2AD8: @ 80C2AD8
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -349801,7 +349801,7 @@ _080C2C78:
 	thumb_func_end sub_80C2AD8
 
 	thumb_func_start sub_80C2C80
-sub_80C2C80: ; 80C2C80
+sub_80C2C80: @ 80C2C80
 	push {lr}
 	sub sp, 0x8
 	ldr r1, =0x030022c0
@@ -349955,7 +349955,7 @@ _080C2DDC:
 	thumb_func_end sub_80C2C80
 
 	thumb_func_start sav12_xor_get_clamped_above
-sav12_xor_get_clamped_above: ; 80C2DE4
+sav12_xor_get_clamped_above: @ 80C2DE4
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -349971,7 +349971,7 @@ _080C2DF6:
 	thumb_func_end sav12_xor_get_clamped_above
 
 	thumb_func_start sub_80C2DFC
-sub_80C2DFC: ; 80C2DFC
+sub_80C2DFC: @ 80C2DFC
 	push {r4,r5,lr}
 	movs r5, 0
 _080C2E00:
@@ -350006,7 +350006,7 @@ _080C2E38:
 	thumb_func_end sub_80C2DFC
 
 	thumb_func_start sub_80C2E40
-sub_80C2E40: ; 80C2E40
+sub_80C2E40: @ 80C2E40
 	push {r4,lr}
 	movs r0, 0xA
 	bl sub_80847F8
@@ -350043,7 +350043,7 @@ _080C2E7C:
 	thumb_func_end sub_80C2E40
 
 	thumb_func_start sub_80C2E84
-sub_80C2E84: ; 80C2E84
+sub_80C2E84: @ 80C2E84
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0
@@ -350083,7 +350083,7 @@ _080C2EBC:
 	thumb_func_end sub_80C2E84
 
 	thumb_func_start sub_80C2EC4
-sub_80C2EC4: ; 80C2EC4
+sub_80C2EC4: @ 80C2EC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -350236,7 +350236,7 @@ _080C3014:
 	thumb_func_end sub_80C2EC4
 
 	thumb_func_start sub_80C3020
-sub_80C3020: ; 80C3020
+sub_80C3020: @ 80C3020
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -350299,7 +350299,7 @@ _080C308C:
 	thumb_func_end sub_80C3020
 
 	thumb_func_start sub_80C30A4
-sub_80C30A4: ; 80C30A4
+sub_80C30A4: @ 80C30A4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -350357,7 +350357,7 @@ _080C3108:
 	thumb_func_end sub_80C30A4
 
 	thumb_func_start sub_80C3120
-sub_80C3120: ; 80C3120
+sub_80C3120: @ 80C3120
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -350417,7 +350417,7 @@ _080C318A:
 	thumb_func_end sub_80C3120
 
 	thumb_func_start sub_80C3190
-sub_80C3190: ; 80C3190
+sub_80C3190: @ 80C3190
 	push {r4,r5,lr}
 	ldr r4, =0x02039ce8
 	ldr r0, [r4]
@@ -350528,7 +350528,7 @@ _080C3244:
 	thumb_func_end sub_80C3190
 
 	thumb_func_start sub_80C3278
-sub_80C3278: ; 80C3278
+sub_80C3278: @ 80C3278
 	push {lr}
 	movs r1, 0xC1
 	lsls r1, 6
@@ -350577,7 +350577,7 @@ _080C32E6:
 	thumb_func_end sub_80C3278
 
 	thumb_func_start sub_80C32EC
-sub_80C32EC: ; 80C32EC
+sub_80C32EC: @ 80C32EC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -350624,7 +350624,7 @@ _080C3306:
 	thumb_func_end sub_80C32EC
 
 	thumb_func_start sub_80C334C
-sub_80C334C: ; 80C334C
+sub_80C334C: @ 80C334C
 	push {lr}
 	movs r0, 0
 	bl SetVBlankCallback
@@ -350650,7 +350650,7 @@ sub_80C334C: ; 80C334C
 	thumb_func_end sub_80C334C
 
 	thumb_func_start sub_80C3388
-sub_80C3388: ; 80C3388
+sub_80C3388: @ 80C3388
 	push {lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -350700,7 +350700,7 @@ sub_80C3388: ; 80C3388
 	thumb_func_end sub_80C3388
 
 	thumb_func_start sub_80C3404
-sub_80C3404: ; 80C3404
+sub_80C3404: @ 80C3404
 	push {lr}
 	ldr r0, =sub_80C2710
 	bl SetMainCallback2
@@ -350710,7 +350710,7 @@ sub_80C3404: ; 80C3404
 	thumb_func_end sub_80C3404
 
 	thumb_func_start sub_80C3414
-sub_80C3414: ; 80C3414
+sub_80C3414: @ 80C3414
 	push {lr}
 	bl clear_tasks
 	bl remove_some_task
@@ -350725,7 +350725,7 @@ sub_80C3414: ; 80C3414
 	thumb_func_end sub_80C3414
 
 	thumb_func_start sub_80C3438
-sub_80C3438: ; 80C3438
+sub_80C3438: @ 80C3438
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -350783,7 +350783,7 @@ _080C34A8:
 	thumb_func_end sub_80C3438
 
 	thumb_func_start sub_80C34B0
-sub_80C34B0: ; 80C34B0
+sub_80C34B0: @ 80C34B0
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -350852,7 +350852,7 @@ _080C3540:
 	thumb_func_end sub_80C34B0
 
 	thumb_func_start sub_80C3548
-sub_80C3548: ; 80C3548
+sub_80C3548: @ 80C3548
 	push {lr}
 	bl sub_80C3AF0
 	bl sub_80C3BC4
@@ -350868,7 +350868,7 @@ sub_80C3548: ; 80C3548
 	thumb_func_end sub_80C3548
 
 	thumb_func_start sub_80C3574
-sub_80C3574: ; 80C3574
+sub_80C3574: @ 80C3574
 	push {r4,r5,lr}
 	sub sp, 0x2C
 	ldr r1, =gUnknown_085ECF71
@@ -350929,7 +350929,7 @@ _080C35FA:
 	thumb_func_end sub_80C3574
 
 	thumb_func_start sub_80C3608
-sub_80C3608: ; 80C3608
+sub_80C3608: @ 80C3608
 	push {r4,lr}
 	sub sp, 0x2C
 	ldr r1, =gUnknown_085ECF78
@@ -350984,7 +350984,7 @@ _080C365C:
 	thumb_func_end sub_80C3608
 
 	thumb_func_start sub_80C3684
-sub_80C3684: ; 80C3684
+sub_80C3684: @ 80C3684
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x02039ce8
@@ -351076,7 +351076,7 @@ _080C3740:
 	thumb_func_end sub_80C3684
 
 	thumb_func_start sub_80C376C
-sub_80C376C: ; 80C376C
+sub_80C376C: @ 80C376C
 	push {lr}
 	bl sub_809D42C
 	cmp r0, 0
@@ -351095,7 +351095,7 @@ _080C3784:
 	thumb_func_end sub_80C376C
 
 	thumb_func_start sub_80C378C
-sub_80C378C: ; 80C378C
+sub_80C378C: @ 80C378C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x00000861
@@ -351192,7 +351192,7 @@ _080C386E:
 	thumb_func_end sub_80C378C
 
 	thumb_func_start sub_80C3880
-sub_80C3880: ; 80C3880
+sub_80C3880: @ 80C3880
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -351364,7 +351364,7 @@ _080C395C:
 	thumb_func_end sub_80C3880
 
 	thumb_func_start sub_80C3A18
-sub_80C3A18: ; 80C3A18
+sub_80C3A18: @ 80C3A18
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -351461,7 +351461,7 @@ _080C3ACE:
 	thumb_func_end sub_80C3A18
 
 	thumb_func_start sub_80C3AF0
-sub_80C3AF0: ; 80C3AF0
+sub_80C3AF0: @ 80C3AF0
 	push {r4,lr}
 	ldr r4, =0x02039ce8
 	ldr r1, [r4]
@@ -351498,7 +351498,7 @@ _080C3B30:
 	thumb_func_end sub_80C3AF0
 
 	thumb_func_start sub_80C3B50
-sub_80C3B50: ; 80C3B50
+sub_80C3B50: @ 80C3B50
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r4, =0x02039ce8
@@ -351552,7 +351552,7 @@ _080C3BB6:
 	thumb_func_end sub_80C3B50
 
 	thumb_func_start sub_80C3BC4
-sub_80C3BC4: ; 80C3BC4
+sub_80C3BC4: @ 80C3BC4
 	push {r4,lr}
 	ldr r4, =0x02039ce8
 	ldr r1, [r4]
@@ -351594,7 +351594,7 @@ _080C3C0E:
 	thumb_func_end sub_80C3BC4
 
 	thumb_func_start sub_80C3C34
-sub_80C3C34: ; 80C3C34
+sub_80C3C34: @ 80C3C34
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -351662,7 +351662,7 @@ sub_80C3C34: ; 80C3C34
 	thumb_func_end sub_80C3C34
 
 	thumb_func_start sub_80C3CCC
-sub_80C3CCC: ; 80C3CCC
+sub_80C3CCC: @ 80C3CCC
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351681,7 +351681,7 @@ _080C3CE4:
 	thumb_func_end sub_80C3CCC
 
 	thumb_func_start sub_80C3CF4
-sub_80C3CF4: ; 80C3CF4
+sub_80C3CF4: @ 80C3CF4
 	push {r4,lr}
 	ldr r4, =0x02039ce8
 	ldr r1, [r4]
@@ -351725,7 +351725,7 @@ _080C3D40:
 	thumb_func_end sub_80C3CF4
 
 	thumb_func_start sub_80C3D60
-sub_80C3D60: ; 80C3D60
+sub_80C3D60: @ 80C3D60
 	push {r4,r5,lr}
 	ldr r5, =0x02039ce8
 	ldr r1, [r5]
@@ -351759,7 +351759,7 @@ _080C3D9A:
 	thumb_func_end sub_80C3D60
 
 	thumb_func_start sub_80C3DC0
-sub_80C3DC0: ; 80C3DC0
+sub_80C3DC0: @ 80C3DC0
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -351781,7 +351781,7 @@ _080C3DDE:
 	thumb_func_end sub_80C3DC0
 
 	thumb_func_start sub_80C3DF0
-sub_80C3DF0: ; 80C3DF0
+sub_80C3DF0: @ 80C3DF0
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351801,7 +351801,7 @@ _080C3E0A:
 	thumb_func_end sub_80C3DF0
 
 	thumb_func_start sub_80C3E20
-sub_80C3E20: ; 80C3E20
+sub_80C3E20: @ 80C3E20
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351828,7 +351828,7 @@ _080C3E48:
 	thumb_func_end sub_80C3E20
 
 	thumb_func_start sub_80C3E58
-sub_80C3E58: ; 80C3E58
+sub_80C3E58: @ 80C3E58
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351855,7 +351855,7 @@ _080C3E80:
 	thumb_func_end sub_80C3E58
 
 	thumb_func_start sub_80C3E98
-sub_80C3E98: ; 80C3E98
+sub_80C3E98: @ 80C3E98
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351881,7 +351881,7 @@ _080C3EBE:
 	thumb_func_end sub_80C3E98
 
 	thumb_func_start sub_80C3ED4
-sub_80C3ED4: ; 80C3ED4
+sub_80C3ED4: @ 80C3ED4
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351908,7 +351908,7 @@ _080C3EFC:
 	thumb_func_end sub_80C3ED4
 
 	thumb_func_start sub_80C3F14
-sub_80C3F14: ; 80C3F14
+sub_80C3F14: @ 80C3F14
 	push {r4,lr}
 	ldr r4, =0x02039ce8
 	ldr r1, [r4]
@@ -351940,7 +351940,7 @@ _080C3F46:
 	thumb_func_end sub_80C3F14
 
 	thumb_func_start sub_80C3F64
-sub_80C3F64: ; 80C3F64
+sub_80C3F64: @ 80C3F64
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -351967,7 +351967,7 @@ _080C3F8C:
 	thumb_func_end sub_80C3F64
 
 	thumb_func_start sub_80C3FA4
-sub_80C3FA4: ; 80C3FA4
+sub_80C3FA4: @ 80C3FA4
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -351995,7 +351995,7 @@ _080C3FCE:
 	thumb_func_end sub_80C3FA4
 
 	thumb_func_start sub_80C3FE0
-sub_80C3FE0: ; 80C3FE0
+sub_80C3FE0: @ 80C3FE0
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -352022,7 +352022,7 @@ _080C4008:
 	thumb_func_end sub_80C3FE0
 
 	thumb_func_start sub_80C4020
-sub_80C4020: ; 80C4020
+sub_80C4020: @ 80C4020
 	push {r4,lr}
 	ldr r4, =0x02039ce8
 	ldr r1, [r4]
@@ -352087,7 +352087,7 @@ _080C40B6:
 	thumb_func_end sub_80C4020
 
 	thumb_func_start sub_80C40CC
-sub_80C40CC: ; 80C40CC
+sub_80C40CC: @ 80C40CC
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r2, [r0]
@@ -352133,7 +352133,7 @@ _080C412C:
 	thumb_func_end sub_80C40CC
 
 	thumb_func_start sub_80C4140
-sub_80C4140: ; 80C4140
+sub_80C4140: @ 80C4140
 	push {r4,r5,lr}
 	sub sp, 0x20
 	ldr r1, =gUnknown_0856FB68
@@ -352205,7 +352205,7 @@ _080C41C0:
 	thumb_func_end sub_80C4140
 
 	thumb_func_start sub_80C41D8
-sub_80C41D8: ; 80C41D8
+sub_80C41D8: @ 80C41D8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, =gMonIconPalettes
@@ -352304,7 +352304,7 @@ _080C428E:
 	thumb_func_end sub_80C41D8
 
 	thumb_func_start sub_80C42A4
-sub_80C42A4: ; 80C42A4
+sub_80C42A4: @ 80C42A4
 	push {r4,lr}
 	sub sp, 0x14
 	ldr r1, =gUnknown_0856FB74
@@ -352371,7 +352371,7 @@ _080C4316:
 	thumb_func_end sub_80C42A4
 
 	thumb_func_start sub_80C4330
-sub_80C4330: ; 80C4330
+sub_80C4330: @ 80C4330
 	push {lr}
 	ldr r0, =gUnknown_0856F54C
 	movs r1, 0xB0
@@ -352404,7 +352404,7 @@ sub_80C4330: ; 80C4330
 	thumb_func_end sub_80C4330
 
 	thumb_func_start sub_80C438C
-sub_80C438C: ; 80C438C
+sub_80C438C: @ 80C438C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -352420,7 +352420,7 @@ sub_80C438C: ; 80C438C
 	thumb_func_end sub_80C438C
 
 	thumb_func_start sub_80C43A8
-sub_80C43A8: ; 80C43A8
+sub_80C43A8: @ 80C43A8
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x02039ce8
@@ -352588,7 +352588,7 @@ _080C4542:
 	thumb_func_end sub_80C43A8
 
 	thumb_func_start sub_80C4550
-sub_80C4550: ; 80C4550
+sub_80C4550: @ 80C4550
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r0, =0x02039ce8
@@ -352646,7 +352646,7 @@ _080C4598:
 	thumb_func_end sub_80C4550
 
 	thumb_func_start sub_80C45C0
-sub_80C45C0: ; 80C45C0
+sub_80C45C0: @ 80C45C0
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r0, =0x02039ce8
@@ -352704,7 +352704,7 @@ _080C4608:
 	thumb_func_end sub_80C45C0
 
 	thumb_func_start sub_80C4630
-sub_80C4630: ; 80C4630
+sub_80C4630: @ 80C4630
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -352839,7 +352839,7 @@ _080C4724:
 	thumb_func_end sub_80C4630
 
 	thumb_func_start sub_80C474C
-sub_80C474C: ; 80C474C
+sub_80C474C: @ 80C474C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r6, =0x02039ce8
@@ -353017,7 +353017,7 @@ _080C48B8:
 	thumb_func_end sub_80C474C
 
 	thumb_func_start sub_80C48C8
-sub_80C48C8: ; 80C48C8
+sub_80C48C8: @ 80C48C8
 	push {lr}
 	ldr r3, =0x02039ce8
 	ldr r1, [r3]
@@ -353048,7 +353048,7 @@ _080C48F6:
 	thumb_func_end sub_80C48C8
 
 	thumb_func_start sub_80C4904
-sub_80C4904: ; 80C4904
+sub_80C4904: @ 80C4904
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02039b58
@@ -353061,7 +353061,7 @@ sub_80C4904: ; 80C4904
 	thumb_func_end sub_80C4904
 
 	thumb_func_start sub_80C4918
-sub_80C4918: ; 80C4918
+sub_80C4918: @ 80C4918
 	push {r4,lr}
 	ldr r4, =sub_80C4960
 	adds r0, r4, 0
@@ -353079,7 +353079,7 @@ sub_80C4918: ; 80C4918
 	thumb_func_end sub_80C4918
 
 	thumb_func_start sub_80C4940
-sub_80C4940: ; 80C4940
+sub_80C4940: @ 80C4940
 	push {lr}
 	ldr r0, =sub_80C4960
 	bl get_task_id_by_function
@@ -353098,7 +353098,7 @@ _080C495A:
 	thumb_func_end sub_80C4940
 
 	thumb_func_start sub_80C4960
-sub_80C4960: ; 80C4960
+sub_80C4960: @ 80C4960
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -353126,7 +353126,7 @@ _080C4972:
 	thumb_func_end sub_80C4960
 
 	thumb_func_start sub_80C4998
-sub_80C4998: ; 80C4998
+sub_80C4998: @ 80C4998
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -353158,7 +353158,7 @@ _080C49BC:
 	thumb_func_end sub_80C4998
 
 	thumb_func_start sub_80C49D8
-sub_80C49D8: ; 80C49D8
+sub_80C49D8: @ 80C49D8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -353311,7 +353311,7 @@ _080C4AE6:
 	thumb_func_end sub_80C49D8
 
 	thumb_func_start sub_80C4B08
-sub_80C4B08: ; 80C4B08
+sub_80C4B08: @ 80C4B08
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -353438,7 +353438,7 @@ _080C4C08:
 	thumb_func_end sub_80C4B08
 
 	thumb_func_start sub_80C4C1C
-sub_80C4C1C: ; 80C4C1C
+sub_80C4C1C: @ 80C4C1C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02039ce8
@@ -353485,7 +353485,7 @@ _080C4C50:
 	thumb_func_end sub_80C4C1C
 
 	thumb_func_start sub_80C4C84
-sub_80C4C84: ; 80C4C84
+sub_80C4C84: @ 80C4C84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -353636,7 +353636,7 @@ _080C4D8C:
 	thumb_func_end sub_80C4C84
 
 	thumb_func_start sub_80C4DB0
-sub_80C4DB0: ; 80C4DB0
+sub_80C4DB0: @ 80C4DB0
 	push {lr}
 	movs r0, 0x1
 	bl ShowBg
@@ -353656,7 +353656,7 @@ sub_80C4DB0: ; 80C4DB0
 	thumb_func_end sub_80C4DB0
 
 	thumb_func_start sub_80C4DDC
-sub_80C4DDC: ; 80C4DDC
+sub_80C4DDC: @ 80C4DDC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02039ce8
@@ -353716,7 +353716,7 @@ _080C4E44:
 	thumb_func_end sub_80C4DDC
 
 	thumb_func_start sub_80C4E74
-sub_80C4E74: ; 80C4E74
+sub_80C4E74: @ 80C4E74
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -353760,7 +353760,7 @@ sub_80C4E74: ; 80C4E74
 	thumb_func_end sub_80C4E74
 
 	thumb_func_start sub_80C4EE4
-sub_80C4EE4: ; 80C4EE4
+sub_80C4EE4: @ 80C4EE4
 	push {r4,r5,lr}
 	ldr r4, =0x02039ce8
 	ldr r0, [r4]
@@ -353810,7 +353810,7 @@ _080C4F18:
 	thumb_func_end sub_80C4EE4
 
 	thumb_func_start sub_80C4F50
-sub_80C4F50: ; 80C4F50
+sub_80C4F50: @ 80C4F50
 	push {lr}
 	ldr r0, =0x02039ce8
 	ldr r1, [r0]
@@ -353871,7 +353871,7 @@ _080C4FC2:
 	thumb_func_end sub_80C4F50
 
 	thumb_func_start sub_80C4FCC
-sub_80C4FCC: ; 80C4FCC
+sub_80C4FCC: @ 80C4FCC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -353896,7 +353896,7 @@ _080C4FEC:
 	thumb_func_end sub_80C4FCC
 
 	thumb_func_start sub_80C4FF0
-sub_80C4FF0: ; 80C4FF0
+sub_80C4FF0: @ 80C4FF0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	bl InUnionRoom
@@ -353985,7 +353985,7 @@ _080C50AE:
 	thumb_func_end sub_80C4FF0
 
 	thumb_func_start sub_80C50D0
-sub_80C50D0: ; 80C50D0
+sub_80C50D0: @ 80C50D0
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -354084,7 +354084,7 @@ sub_80C50D0: ; 80C50D0
 	thumb_func_end sub_80C50D0
 
 	thumb_func_start sub_80C51C4
-sub_80C51C4: ; 80C51C4
+sub_80C51C4: @ 80C51C4
 	push {lr}
 	bl sub_80C51F0
 	ldr r0, =sub_80C544C
@@ -354095,7 +354095,7 @@ sub_80C51C4: ; 80C51C4
 	thumb_func_end sub_80C51C4
 
 	thumb_func_start sub_80C51D8
-sub_80C51D8: ; 80C51D8
+sub_80C51D8: @ 80C51D8
 	push {lr}
 	ldr r0, =0x02039cec
 	ldr r0, [r0]
@@ -354108,7 +354108,7 @@ sub_80C51D8: ; 80C51D8
 	thumb_func_end sub_80C51D8
 
 	thumb_func_start sub_80C51F0
-sub_80C51F0: ; 80C51F0
+sub_80C51F0: @ 80C51F0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02039cec
@@ -354225,7 +354225,7 @@ _080C52C8:
 	thumb_func_end sub_80C51F0
 
 	thumb_func_start sub_80C52E4
-sub_80C52E4: ; 80C52E4
+sub_80C52E4: @ 80C52E4
 	push {r4,lr}
 	ldr r4, =0x02039cec
 	ldr r0, [r4]
@@ -354249,7 +354249,7 @@ _080C530A:
 	thumb_func_end sub_80C52E4
 
 	thumb_func_start sub_80C5310
-sub_80C5310: ; 80C5310
+sub_80C5310: @ 80C5310
 	push {r4,lr}
 	ldr r4, =0x02039cf0
 	ldr r0, [r4]
@@ -354276,7 +354276,7 @@ _080C533A:
 	thumb_func_end sub_80C5310
 
 	thumb_func_start sub_80C5340
-sub_80C5340: ; 80C5340
+sub_80C5340: @ 80C5340
 	push {r4,lr}
 	bl FreeAllWindowBuffers
 	ldr r4, =0x02039cf0
@@ -354329,7 +354329,7 @@ _080C53A0:
 	thumb_func_end sub_80C5340
 
 	thumb_func_start pokemon_details
-pokemon_details: ; 80C53AC
+pokemon_details: @ 80C53AC
 	push {r4-r7,lr}
 	sub sp, 0x10
 	ldr r0, =0x02039cf0
@@ -354394,7 +354394,7 @@ _080C5416:
 	thumb_func_end pokemon_details
 
 	thumb_func_start sub_80C5438
-sub_80C5438: ; 80C5438
+sub_80C5438: @ 80C5438
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -354404,7 +354404,7 @@ sub_80C5438: ; 80C5438
 	thumb_func_end sub_80C5438
 
 	thumb_func_start sub_80C544C
-sub_80C544C: ; 80C544C
+sub_80C544C: @ 80C544C
 	push {lr}
 	bl sub_80C5484
 	cmp r0, 0
@@ -354421,7 +354421,7 @@ _080C5464:
 	thumb_func_end sub_80C544C
 
 	thumb_func_start sub_80C5470
-sub_80C5470: ; 80C5470
+sub_80C5470: @ 80C5470
 	push {lr}
 	bl sub_80C570C
 	cmp r0, 0
@@ -354433,7 +354433,7 @@ _080C547E:
 	thumb_func_end sub_80C5470
 
 	thumb_func_start sub_80C5484
-sub_80C5484: ; 80C5484
+sub_80C5484: @ 80C5484
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -354689,7 +354689,7 @@ _080C5700:
 	thumb_func_end sub_80C5484
 
 	thumb_func_start sub_80C570C
-sub_80C570C: ; 80C570C
+sub_80C570C: @ 80C570C
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =0x02039cec
@@ -354795,7 +354795,7 @@ _080C57F0:
 	thumb_func_end sub_80C570C
 
 	thumb_func_start sub_80C57FC
-sub_80C57FC: ; 80C57FC
+sub_80C57FC: @ 80C57FC
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -354853,7 +354853,7 @@ _080C5860:
 	thumb_func_end sub_80C57FC
 
 	thumb_func_start sub_80C5868
-sub_80C5868: ; 80C5868
+sub_80C5868: @ 80C5868
 	push {lr}
 	bl sub_80C5484
 	cmp r0, 0
@@ -354901,7 +354901,7 @@ _080C58C6:
 	thumb_func_end sub_80C5868
 
 	thumb_func_start sub_80C58D4
-sub_80C58D4: ; 80C58D4
+sub_80C58D4: @ 80C58D4
 	push {r4,lr}
 	ldr r4, =0x02039cf8
 	ldr r0, [r4]
@@ -354945,7 +354945,7 @@ _080C5924:
 	thumb_func_end sub_80C58D4
 
 	thumb_func_start sub_80C5934
-sub_80C5934: ; 80C5934
+sub_80C5934: @ 80C5934
 	push {lr}
 	bl sub_80C570C
 	cmp r0, 0
@@ -354995,7 +354995,7 @@ _080C599A:
 	thumb_func_end sub_80C5934
 
 	thumb_func_start sub_80C59A4
-sub_80C59A4: ; 80C59A4
+sub_80C59A4: @ 80C59A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -355073,7 +355073,7 @@ _080C5A30:
 	thumb_func_end sub_80C59A4
 
 	thumb_func_start sub_80C5A48
-sub_80C5A48: ; 80C5A48
+sub_80C5A48: @ 80C5A48
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -355266,7 +355266,7 @@ _080C5BCA:
 	thumb_func_end sub_80C5A48
 
 	thumb_func_start sub_80C5BD8
-sub_80C5BD8: ; 80C5BD8
+sub_80C5BD8: @ 80C5BD8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -355486,7 +355486,7 @@ _080C5DA6:
 	thumb_func_end sub_80C5BD8
 
 	thumb_func_start sub_80C5DB8
-sub_80C5DB8: ; 80C5DB8
+sub_80C5DB8: @ 80C5DB8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -355606,7 +355606,7 @@ _080C5E92:
 	thumb_func_end sub_80C5DB8
 
 	thumb_func_start sub_80C5ED0
-sub_80C5ED0: ; 80C5ED0
+sub_80C5ED0: @ 80C5ED0
 	push {r4,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -355667,7 +355667,7 @@ _080C5F3A:
 	thumb_func_end sub_80C5ED0
 
 	thumb_func_start sub_80C5F58
-sub_80C5F58: ; 80C5F58
+sub_80C5F58: @ 80C5F58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -355869,7 +355869,7 @@ _080C60EE:
 	thumb_func_end sub_80C5F58
 
 	thumb_func_start sub_80C6104
-sub_80C6104: ; 80C6104
+sub_80C6104: @ 80C6104
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -356068,7 +356068,7 @@ _080C6294:
 	thumb_func_end sub_80C6104
 
 	thumb_func_start sub_80C629C
-sub_80C629C: ; 80C629C
+sub_80C629C: @ 80C629C
 	push {r4,lr}
 	ldr r1, =gUnknown_08DE3060
 	movs r0, 0x1
@@ -356096,7 +356096,7 @@ sub_80C629C: ; 80C629C
 	thumb_func_end sub_80C629C
 
 	thumb_func_start sub_80C62DC
-sub_80C62DC: ; 80C62DC
+sub_80C62DC: @ 80C62DC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -356221,7 +356221,7 @@ _080C63C2:
 	thumb_func_end sub_80C62DC
 
 	thumb_func_start sub_80C63FC
-sub_80C63FC: ; 80C63FC
+sub_80C63FC: @ 80C63FC
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r4, =0x02039cf0
@@ -356263,12 +356263,12 @@ _080C642C:
 	thumb_func_end sub_80C63FC
 
 	thumb_func_start nullsub_39
-nullsub_39: ; 80C6450
+nullsub_39: @ 80C6450
 	bx lr
 	thumb_func_end nullsub_39
 
 	thumb_func_start sub_80C6454
-sub_80C6454: ; 80C6454
+sub_80C6454: @ 80C6454
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02039cf4
@@ -356295,7 +356295,7 @@ _080C6466:
 	thumb_func_end sub_80C6454
 
 	thumb_func_start sub_80C6498
-sub_80C6498: ; 80C6498
+sub_80C6498: @ 80C6498
 	push {r4,lr}
 	bl clear_tasks
 	ldr r4, =0x02039cf4
@@ -356317,7 +356317,7 @@ sub_80C6498: ; 80C6498
 	thumb_func_end sub_80C6498
 
 	thumb_func_start sub_80C64CC
-sub_80C64CC: ; 80C64CC
+sub_80C64CC: @ 80C64CC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =0x02039cec
@@ -356506,7 +356506,7 @@ _080C66A0:
 	thumb_func_end sub_80C64CC
 
 	thumb_func_start sub_80C66AC
-sub_80C66AC: ; 80C66AC
+sub_80C66AC: @ 80C66AC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02039cec
@@ -356625,7 +356625,7 @@ _080C67B0:
 	thumb_func_end sub_80C66AC
 
 	thumb_func_start sub_80C67BC
-sub_80C67BC: ; 80C67BC
+sub_80C67BC: @ 80C67BC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -356770,7 +356770,7 @@ _080C68E0:
 	thumb_func_end sub_80C67BC
 
 	thumb_func_start sub_80C68E8
-sub_80C68E8: ; 80C68E8
+sub_80C68E8: @ 80C68E8
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -356851,7 +356851,7 @@ _080C696E:
 	thumb_func_end sub_80C68E8
 
 	thumb_func_start sub_80C6974
-sub_80C6974: ; 80C6974
+sub_80C6974: @ 80C6974
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -357103,7 +357103,7 @@ _080C6B7A:
 	thumb_func_end sub_80C6974
 
 	thumb_func_start sub_80C6B94
-sub_80C6B94: ; 80C6B94
+sub_80C6B94: @ 80C6B94
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r4, 0
@@ -357202,7 +357202,7 @@ _080C6C40:
 	thumb_func_end sub_80C6B94
 
 	thumb_func_start sub_80C6C70
-sub_80C6C70: ; 80C6C70
+sub_80C6C70: @ 80C6C70
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -357330,7 +357330,7 @@ _080C6D4A:
 	thumb_func_end sub_80C6C70
 
 	thumb_func_start sub_80C6D80
-sub_80C6D80: ; 80C6D80
+sub_80C6D80: @ 80C6D80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -357478,7 +357478,7 @@ _080C6E90:
 	thumb_func_end sub_80C6D80
 
 	thumb_func_start sub_80C6EAC
-sub_80C6EAC: ; 80C6EAC
+sub_80C6EAC: @ 80C6EAC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -357593,7 +357593,7 @@ sub_80C6EAC: ; 80C6EAC
 	thumb_func_end sub_80C6EAC
 
 	thumb_func_start sub_80C6FA0
-sub_80C6FA0: ; 80C6FA0
+sub_80C6FA0: @ 80C6FA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -357624,7 +357624,7 @@ _080C6FC0:
 	thumb_func_end sub_80C6FA0
 
 	thumb_func_start sub_80C6FD4
-sub_80C6FD4: ; 80C6FD4
+sub_80C6FD4: @ 80C6FD4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -357655,7 +357655,7 @@ _080C7000:
 	thumb_func_end sub_80C6FD4
 
 	thumb_func_start sub_80C7008
-sub_80C7008: ; 80C7008
+sub_80C7008: @ 80C7008
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r6, 0
@@ -357693,7 +357693,7 @@ _080C7036:
 	thumb_func_end sub_80C7008
 
 	thumb_func_start sub_80C7050
-sub_80C7050: ; 80C7050
+sub_80C7050: @ 80C7050
 	push {r4-r7,lr}
 	lsls r0, 24
 	movs r5, 0
@@ -357740,7 +357740,7 @@ _080C7092:
 	thumb_func_end sub_80C7050
 
 	thumb_func_start sub_80C70AC
-sub_80C70AC: ; 80C70AC
+sub_80C70AC: @ 80C70AC
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrb r0, [r0]
@@ -357753,7 +357753,7 @@ sub_80C70AC: ; 80C70AC
 	thumb_func_end sub_80C70AC
 
 	thumb_func_start sub_80C70C4
-sub_80C70C4: ; 80C70C4
+sub_80C70C4: @ 80C70C4
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0
@@ -357784,7 +357784,7 @@ _080C70E2:
 	thumb_func_end sub_80C70C4
 
 	thumb_func_start sub_80C70FC
-sub_80C70FC: ; 80C70FC
+sub_80C70FC: @ 80C70FC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r2, 16
@@ -357810,7 +357810,7 @@ _080C711A:
 	thumb_func_end sub_80C70FC
 
 	thumb_func_start sub_80C7128
-sub_80C7128: ; 80C7128
+sub_80C7128: @ 80C7128
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -357877,7 +357877,7 @@ _080C7198:
 	thumb_func_end sub_80C7128
 
 	thumb_func_start sub_80C71A4
-sub_80C71A4: ; 80C71A4
+sub_80C71A4: @ 80C71A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -357977,7 +357977,7 @@ _080C724E:
 	thumb_func_end sub_80C71A4
 
 	thumb_func_start c3_0808C39C
-c3_0808C39C: ; 80C7268
+c3_0808C39C: @ 80C7268
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -358341,7 +358341,7 @@ _080C756A:
 	thumb_func_end c3_0808C39C
 
 	thumb_func_start sub_80C7578
-sub_80C7578: ; 80C7578
+sub_80C7578: @ 80C7578
 	push {lr}
 	ldr r0, =c3_0808C39C
 	movs r1, 0x50
@@ -358363,7 +358363,7 @@ sub_80C7578: ; 80C7578
 	thumb_func_end sub_80C7578
 
 	thumb_func_start mapldr_0808C6D8
-mapldr_0808C6D8: ; 80C75A8
+mapldr_0808C6D8: @ 80C75A8
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldr r5, [r0, 0xC]
@@ -358396,7 +358396,7 @@ mapldr_0808C6D8: ; 80C75A8
 	thumb_func_end mapldr_0808C6D8
 
 	thumb_func_start sub_80C75FC
-sub_80C75FC: ; 80C75FC
+sub_80C75FC: @ 80C75FC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -358452,7 +358452,7 @@ sub_80C75FC: ; 80C75FC
 	thumb_func_end sub_80C75FC
 
 	thumb_func_start sub_80C7678
-sub_80C7678: ; 80C7678
+sub_80C7678: @ 80C7678
 	push {lr}
 	bl sub_80CAEA0
 	ldr r1, =0x02039d00
@@ -358468,7 +358468,7 @@ sub_80C7678: ; 80C7678
 	thumb_func_end sub_80C7678
 
 	thumb_func_start sub_80C76A4
-sub_80C76A4: ; 80C76A4
+sub_80C76A4: @ 80C76A4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -358579,7 +358579,7 @@ _080C7764:
 	thumb_func_end sub_80C76A4
 
 	thumb_func_start sub_80C7770
-sub_80C7770: ; 80C7770
+sub_80C7770: @ 80C7770
 	push {r4-r6,lr}
 	movs r0, 0
 	bl sub_80D1D18
@@ -358638,7 +358638,7 @@ _080C77C2:
 	thumb_func_end sub_80C7770
 
 	thumb_func_start sub_80C77E8
-sub_80C77E8: ; 80C77E8
+sub_80C77E8: @ 80C77E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -358715,7 +358715,7 @@ _080C7846:
 	thumb_func_end sub_80C77E8
 
 	thumb_func_start sub_80C7890
-sub_80C7890: ; 80C7890
+sub_80C7890: @ 80C7890
 	push {r4,r5,lr}
 	ldr r5, =0x02039d04
 	ldr r1, [r5]
@@ -358750,7 +358750,7 @@ _080C78AC:
 	thumb_func_end sub_80C7890
 
 	thumb_func_start sub_80C78D4
-sub_80C78D4: ; 80C78D4
+sub_80C78D4: @ 80C78D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -358760,7 +358760,7 @@ sub_80C78D4: ; 80C78D4
 	thumb_func_end sub_80C78D4
 
 	thumb_func_start sub_80C78E4
-sub_80C78E4: ; 80C78E4
+sub_80C78E4: @ 80C78E4
 	push {lr}
 	bl sub_80C7B14
 	pop {r0}
@@ -358768,7 +358768,7 @@ sub_80C78E4: ; 80C78E4
 	thumb_func_end sub_80C78E4
 
 	thumb_func_start sub_80C78F0
-sub_80C78F0: ; 80C78F0
+sub_80C78F0: @ 80C78F0
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -358821,7 +358821,7 @@ _080C7954:
 	thumb_func_end sub_80C78F0
 
 	thumb_func_start sub_80C7958
-sub_80C7958: ; 80C7958
+sub_80C7958: @ 80C7958
 	push {r4-r6,lr}
 	sub sp, 0x3C
 	adds r5, r0, 0
@@ -359027,7 +359027,7 @@ _080C7AD4:
 	thumb_func_end sub_80C7958
 
 	thumb_func_start sub_80C7B14
-sub_80C7B14: ; 80C7B14
+sub_80C7B14: @ 80C7B14
 	push {r4-r6,lr}
 	ldr r4, =0x02039d04
 	ldr r0, [r4]
@@ -359085,7 +359085,7 @@ _080C7B6A:
 	thumb_func_end sub_80C7B14
 
 	thumb_func_start sub_80C7B80
-sub_80C7B80: ; 80C7B80
+sub_80C7B80: @ 80C7B80
 	push {lr}
 	ldr r2, =0x02039d04
 	ldr r1, [r2]
@@ -359113,7 +359113,7 @@ _080C7BA6:
 	thumb_func_end sub_80C7B80
 
 	thumb_func_start sub_80C7BB4
-sub_80C7BB4: ; 80C7BB4
+sub_80C7BB4: @ 80C7BB4
 	push {lr}
 	ldr r0, =0x02039d04
 	ldr r2, [r0]
@@ -359139,7 +359139,7 @@ _080C7BD2:
 	thumb_func_end sub_80C7BB4
 
 	thumb_func_start sub_80C7BE4
-sub_80C7BE4: ; 80C7BE4
+sub_80C7BE4: @ 80C7BE4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -359254,7 +359254,7 @@ sub_80C7BE4: ; 80C7BE4
 	thumb_func_end sub_80C7BE4
 
 	thumb_func_start sub_80C7CF4
-sub_80C7CF4: ; 80C7CF4
+sub_80C7CF4: @ 80C7CF4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -359285,7 +359285,7 @@ _080C7D24:
 	thumb_func_end sub_80C7CF4
 
 	thumb_func_start sub_80C7D28
-sub_80C7D28: ; 80C7D28
+sub_80C7D28: @ 80C7D28
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -359305,7 +359305,7 @@ sub_80C7D28: ; 80C7D28
 	thumb_func_end sub_80C7D28
 
 	thumb_func_start c2_Box
-c2_Box: ; 80C7D54
+c2_Box: @ 80C7D54
 	push {lr}
 	bl RunActiveTasks
 	bl do_scheduled_bg_tilemap_copies_to_vram
@@ -359318,7 +359318,7 @@ c2_Box: ; 80C7D54
 	thumb_func_end c2_Box
 
 	thumb_func_start sub_80C7D74
-sub_80C7D74: ; 80C7D74
+sub_80C7D74: @ 80C7D74
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -359363,7 +359363,7 @@ _080C7DD4:
 	thumb_func_end sub_80C7D74
 
 	thumb_func_start c2_808CE60
-c2_808CE60: ; 80C7DEC
+c2_808CE60: @ 80C7DEC
 	push {r4,lr}
 	bl clear_tasks
 	ldr r4, =0x02039d08
@@ -359402,7 +359402,7 @@ _080C7E3C:
 	thumb_func_end c2_808CE60
 
 	thumb_func_start sub_80C7E50
-sub_80C7E50: ; 80C7E50
+sub_80C7E50: @ 80C7E50
 	push {lr}
 	movs r0, 0x10
 	movs r1, 0
@@ -359433,7 +359433,7 @@ sub_80C7E50: ; 80C7E50
 	thumb_func_end sub_80C7E50
 
 	thumb_func_start sub_80C7E98
-sub_80C7E98: ; 80C7E98
+sub_80C7E98: @ 80C7E98
 	push {r4,lr}
 	sub sp, 0x4
 	bl sub_80A1A74
@@ -359483,7 +359483,7 @@ sub_80C7E98: ; 80C7E98
 	thumb_func_end sub_80C7E98
 
 	thumb_func_start sub_80C7F1C
-sub_80C7F1C: ; 80C7F1C
+sub_80C7F1C: @ 80C7F1C
 	push {lr}
 	bl sub_80CDC0C
 	ldr r2, =0x02039d0c
@@ -359505,7 +359505,7 @@ _080C7F32:
 	thumb_func_end sub_80C7F1C
 
 	thumb_func_start sub_80C7F4C
-sub_80C7F4C: ; 80C7F4C
+sub_80C7F4C: @ 80C7F4C
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -359530,7 +359530,7 @@ _080C7F6A:
 	thumb_func_end sub_80C7F4C
 
 	thumb_func_start add_to_c3_somehow
-add_to_c3_somehow: ; 80C7F80
+add_to_c3_somehow: @ 80C7F80
 	push {r4,lr}
 	ldr r4, =0x03005e00
 	ldr r1, =0x02039d08
@@ -359550,7 +359550,7 @@ add_to_c3_somehow: ; 80C7F80
 	thumb_func_end add_to_c3_somehow
 
 	thumb_func_start task_box_related_3
-task_box_related_3: ; 80C7FA8
+task_box_related_3: @ 80C7FA8
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x02039d08
@@ -359763,7 +359763,7 @@ _080C81A2:
 	thumb_func_end task_box_related_3
 
 	thumb_func_start sub_80C81AC
-sub_80C81AC: ; 80C81AC
+sub_80C81AC: @ 80C81AC
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -359801,7 +359801,7 @@ _080C81EE:
 	thumb_func_end sub_80C81AC
 
 	thumb_func_start box_related_2
-box_related_2: ; 80C81F8
+box_related_2: @ 80C81F8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02039d08
@@ -359887,7 +359887,7 @@ _080C82A0:
 	thumb_func_end box_related_2
 
 	thumb_func_start task_pokemon_box_related
-task_pokemon_box_related: ; 80C82AC
+task_pokemon_box_related: @ 80C82AC
 	push {r4,r5,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -360410,7 +360410,7 @@ _080C879E:
 	thumb_func_end task_pokemon_box_related
 
 	thumb_func_start sub_80C87A8
-sub_80C87A8: ; 80C87A8
+sub_80C87A8: @ 80C87A8
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -360443,7 +360443,7 @@ _080C87DE:
 	thumb_func_end sub_80C87A8
 
 	thumb_func_start sub_80C87E8
-sub_80C87E8: ; 80C87E8
+sub_80C87E8: @ 80C87E8
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -360503,7 +360503,7 @@ _080C8856:
 	thumb_func_end sub_80C87E8
 
 	thumb_func_start sub_80C8864
-sub_80C8864: ; 80C8864
+sub_80C8864: @ 80C8864
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -360825,7 +360825,7 @@ _080C8B82:
 	thumb_func_end sub_80C8864
 
 	thumb_func_start sub_80C8B90
-sub_80C8B90: ; 80C8B90
+sub_80C8B90: @ 80C8B90
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -360868,7 +360868,7 @@ _080C8BE2:
 	thumb_func_end sub_80C8B90
 
 	thumb_func_start sub_80C8BEC
-sub_80C8BEC: ; 80C8BEC
+sub_80C8BEC: @ 80C8BEC
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -360911,7 +360911,7 @@ _080C8C3E:
 	thumb_func_end sub_80C8BEC
 
 	thumb_func_start c3_0808DC50
-c3_0808DC50: ; 80C8C48
+c3_0808DC50: @ 80C8C48
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -360946,7 +360946,7 @@ _080C8C84:
 	thumb_func_end c3_0808DC50
 
 	thumb_func_start sub_80C8C90
-sub_80C8C90: ; 80C8C90
+sub_80C8C90: @ 80C8C90
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -361044,7 +361044,7 @@ _080C8D6E:
 	thumb_func_end sub_80C8C90
 
 	thumb_func_start sub_80C8D78
-sub_80C8D78: ; 80C8D78
+sub_80C8D78: @ 80C8D78
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02039d08
@@ -361170,7 +361170,7 @@ _080C8EA2:
 	thumb_func_end sub_80C8D78
 
 	thumb_func_start sub_80C8EB4
-sub_80C8EB4: ; 80C8EB4
+sub_80C8EB4: @ 80C8EB4
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -361385,7 +361385,7 @@ _080C9096:
 	thumb_func_end sub_80C8EB4
 
 	thumb_func_start sub_80C90A4
-sub_80C90A4: ; 80C90A4
+sub_80C90A4: @ 80C90A4
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -361441,7 +361441,7 @@ _080C9118:
 	thumb_func_end sub_80C90A4
 
 	thumb_func_start sub_80C9128
-sub_80C9128: ; 80C9128
+sub_80C9128: @ 80C9128
 	push {r4,r5,lr}
 	ldr r5, =0x02039d08
 	ldr r0, [r5]
@@ -361523,7 +361523,7 @@ _080C91D2:
 	thumb_func_end sub_80C9128
 
 	thumb_func_start sub_80C91DC
-sub_80C91DC: ; 80C91DC
+sub_80C91DC: @ 80C91DC
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -361603,7 +361603,7 @@ _080C928C:
 	thumb_func_end sub_80C91DC
 
 	thumb_func_start sub_80C9298
-sub_80C9298: ; 80C9298
+sub_80C9298: @ 80C9298
 	push {r4,r5,lr}
 	ldr r1, =0x02039d08
 	ldr r0, [r1]
@@ -361720,7 +361720,7 @@ _080C93A2:
 	thumb_func_end sub_80C9298
 
 	thumb_func_start sub_80C93B0
-sub_80C93B0: ; 80C93B0
+sub_80C93B0: @ 80C93B0
 	push {r4,lr}
 	ldr r1, =0x02039d08
 	ldr r0, [r1]
@@ -361819,7 +361819,7 @@ _080C948C:
 	thumb_func_end sub_80C93B0
 
 	thumb_func_start sub_80C9498
-sub_80C9498: ; 80C9498
+sub_80C9498: @ 80C9498
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -361899,7 +361899,7 @@ _080C9544:
 	thumb_func_end sub_80C9498
 
 	thumb_func_start sub_80C954C
-sub_80C954C: ; 80C954C
+sub_80C954C: @ 80C954C
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -362028,7 +362028,7 @@ _080C9664:
 	thumb_func_end sub_80C954C
 
 	thumb_func_start sub_80C9670
-sub_80C9670: ; 80C9670
+sub_80C9670: @ 80C9670
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -362063,7 +362063,7 @@ _080C96AE:
 	thumb_func_end sub_80C9670
 
 	thumb_func_start sub_80C96B8
-sub_80C96B8: ; 80C96B8
+sub_80C96B8: @ 80C96B8
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -362122,7 +362122,7 @@ _080C9720:
 	thumb_func_end sub_80C96B8
 
 	thumb_func_start box_related
-box_related: ; 80C972C
+box_related: @ 80C972C
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -362222,7 +362222,7 @@ _080C9818:
 	thumb_func_end box_related
 
 	thumb_func_start sub_80C9824
-sub_80C9824: ; 80C9824
+sub_80C9824: @ 80C9824
 	push {r4,r5,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -362415,7 +362415,7 @@ _080C99CC:
 	thumb_func_end sub_80C9824
 
 	thumb_func_start sub_80C99D8
-sub_80C99D8: ; 80C99D8
+sub_80C99D8: @ 80C99D8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02039d08
@@ -362520,7 +362520,7 @@ _080C9AB8:
 	thumb_func_end sub_80C99D8
 
 	thumb_func_start sub_80C9AC8
-sub_80C9AC8: ; 80C9AC8
+sub_80C9AC8: @ 80C9AC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02039d08
@@ -362567,7 +362567,7 @@ _080C9B18:
 	thumb_func_end sub_80C9AC8
 
 	thumb_func_start sub_80C9B28
-sub_80C9B28: ; 80C9B28
+sub_80C9B28: @ 80C9B28
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02039d08
@@ -362614,7 +362614,7 @@ _080C9B78:
 	thumb_func_end sub_80C9B28
 
 	thumb_func_start sub_80C9B88
-sub_80C9B88: ; 80C9B88
+sub_80C9B88: @ 80C9B88
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x02039d08
@@ -362661,7 +362661,7 @@ _080C9BD6:
 	thumb_func_end sub_80C9B88
 
 	thumb_func_start sub_80C9BE8
-sub_80C9BE8: ; 80C9BE8
+sub_80C9BE8: @ 80C9BE8
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -362792,7 +362792,7 @@ _080C9D08:
 	thumb_func_end sub_80C9BE8
 
 	thumb_func_start sub_80C9D1C
-sub_80C9D1C: ; 80C9D1C
+sub_80C9D1C: @ 80C9D1C
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -362924,7 +362924,7 @@ _080C9E3C:
 	thumb_func_end sub_80C9D1C
 
 	thumb_func_start sub_80C9E50
-sub_80C9E50: ; 80C9E50
+sub_80C9E50: @ 80C9E50
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -363042,7 +363042,7 @@ _080C9F56:
 	thumb_func_end sub_80C9E50
 
 	thumb_func_start sub_80C9F6C
-sub_80C9F6C: ; 80C9F6C
+sub_80C9F6C: @ 80C9F6C
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x0203ce7c
@@ -363084,7 +363084,7 @@ _080C9FC0:
 	thumb_func_end sub_80C9F6C
 
 	thumb_func_start sub_80C9FC8
-sub_80C9FC8: ; 80C9FC8
+sub_80C9FC8: @ 80C9FC8
 	push {r4,lr}
 	bl sub_80D25F0
 	bl sub_80D01B8
@@ -363101,7 +363101,7 @@ sub_80C9FC8: ; 80C9FC8
 	thumb_func_end sub_80C9FC8
 
 	thumb_func_start sub_80C9FEC
-sub_80C9FEC: ; 80C9FEC
+sub_80C9FEC: @ 80C9FEC
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =0x00001f0f
@@ -363124,7 +363124,7 @@ sub_80C9FEC: ; 80C9FEC
 	thumb_func_end sub_80C9FEC
 
 	thumb_func_start sub_80CA028
-sub_80CA028: ; 80CA028
+sub_80CA028: @ 80CA028
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0x80
@@ -363139,7 +363139,7 @@ sub_80CA028: ; 80CA028
 	thumb_func_end sub_80CA028
 
 	thumb_func_start sub_80CA044
-sub_80CA044: ; 80CA044
+sub_80CA044: @ 80CA044
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =gUnknown_08572734
@@ -363175,7 +363175,7 @@ sub_80CA044: ; 80CA044
 	thumb_func_end sub_80CA044
 
 	thumb_func_start sub_80CA0A4
-sub_80CA0A4: ; 80CA0A4
+sub_80CA0A4: @ 80CA0A4
 	push {lr}
 	ldr r0, =gUnknown_08572714
 	bl InitWindows
@@ -363194,7 +363194,7 @@ _080CA0C2:
 	thumb_func_end sub_80CA0A4
 
 	thumb_func_start sub_80CA0C8
-sub_80CA0C8: ; 80CA0C8
+sub_80CA0C8: @ 80CA0C8
 	push {lr}
 	ldr r0, =gUnknown_08572744
 	bl LoadTaggedObjectPalette
@@ -363204,7 +363204,7 @@ sub_80CA0C8: ; 80CA0C8
 	thumb_func_end sub_80CA0C8
 
 	thumb_func_start sub_80CA0D8
-sub_80CA0D8: ; 80CA0D8
+sub_80CA0D8: @ 80CA0D8
 	push {lr}
 	ldr r0, =gUnknown_085723DC
 	movs r1, 0
@@ -363248,7 +363248,7 @@ _080CA12E:
 	thumb_func_end sub_80CA0D8
 
 	thumb_func_start sub_80CA154
-sub_80CA154: ; 80CA154
+sub_80CA154: @ 80CA154
 	push {r4,lr}
 	ldr r1, =0x0000dac8
 	movs r0, 0x10
@@ -363298,7 +363298,7 @@ sub_80CA154: ; 80CA154
 	thumb_func_end sub_80CA154
 
 	thumb_func_start sub_80CA1C4
-sub_80CA1C4: ; 80CA1C4
+sub_80CA1C4: @ 80CA1C4
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0857274C
@@ -363346,7 +363346,7 @@ _080CA1DA:
 	thumb_func_end sub_80CA1C4
 
 	thumb_func_start sub_80CA230
-sub_80CA230: ; 80CA230
+sub_80CA230: @ 80CA230
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r1, [r0]
@@ -363367,7 +363367,7 @@ sub_80CA230: ; 80CA230
 	thumb_func_end sub_80CA230
 
 	thumb_func_start BoxSetMosaic
-BoxSetMosaic: ; 80CA260
+BoxSetMosaic: @ 80CA260
 	push {lr}
 	bl sub_80CA230
 	ldr r3, =0x02039d08
@@ -363411,7 +363411,7 @@ _080CA2AC:
 	thumb_func_end BoxSetMosaic
 
 	thumb_func_start sub_80CA2B8
-sub_80CA2B8: ; 80CA2B8
+sub_80CA2B8: @ 80CA2B8
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
 	movs r1, 0x89
@@ -363426,7 +363426,7 @@ sub_80CA2B8: ; 80CA2B8
 	thumb_func_end sub_80CA2B8
 
 	thumb_func_start BoxSetMosaic2
-BoxSetMosaic2: ; 80CA2D0
+BoxSetMosaic2: @ 80CA2D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -363466,7 +363466,7 @@ _080CA30E:
 	thumb_func_end BoxSetMosaic2
 
 	thumb_func_start sub_80CA318
-sub_80CA318: ; 80CA318
+sub_80CA318: @ 80CA318
 	push {r4-r7,lr}
 	sub sp, 0x28
 	ldr r0, =0x02039d08
@@ -363601,7 +363601,7 @@ _080CA43C:
 	thumb_func_end sub_80CA318
 
 	thumb_func_start sub_80CA44C
-sub_80CA44C: ; 80CA44C
+sub_80CA44C: @ 80CA44C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r3, r1, 0
@@ -363674,7 +363674,7 @@ _080CA4F2:
 	thumb_func_end sub_80CA44C
 
 	thumb_func_start sub_80CA4FC
-sub_80CA4FC: ; 80CA4FC
+sub_80CA4FC: @ 80CA4FC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -363823,7 +363823,7 @@ _080CA64E:
 	thumb_func_end sub_80CA4FC
 
 	thumb_func_start sub_80CA65C
-sub_80CA65C: ; 80CA65C
+sub_80CA65C: @ 80CA65C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02039d08
@@ -363899,7 +363899,7 @@ _080CA6E6:
 	thumb_func_end sub_80CA65C
 
 	thumb_func_start sub_80CA704
-sub_80CA704: ; 80CA704
+sub_80CA704: @ 80CA704
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =gUnknown_08DD36C8
@@ -363980,7 +363980,7 @@ _080CA7B2:
 	thumb_func_end sub_80CA704
 
 	thumb_func_start sub_80CA7D4
-sub_80CA7D4: ; 80CA7D4
+sub_80CA7D4: @ 80CA7D4
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r1, [r0]
@@ -364005,7 +364005,7 @@ sub_80CA7D4: ; 80CA7D4
 	thumb_func_end sub_80CA7D4
 
 	thumb_func_start sub_80CA80C
-sub_80CA80C: ; 80CA80C
+sub_80CA80C: @ 80CA80C
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r2, [r4]
@@ -364062,7 +364062,7 @@ _080CA87C:
 	thumb_func_end sub_80CA80C
 
 	thumb_func_start sub_80CA888
-sub_80CA888: ; 80CA888
+sub_80CA888: @ 80CA888
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r1, [r4]
@@ -364092,7 +364092,7 @@ _080CA8B4:
 	thumb_func_end sub_80CA888
 
 	thumb_func_start sub_80CA8C8
-sub_80CA8C8: ; 80CA8C8
+sub_80CA8C8: @ 80CA8C8
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r5, =0x02039d08
@@ -364176,7 +364176,7 @@ _080CA976:
 	thumb_func_end sub_80CA8C8
 
 	thumb_func_start sub_80CA984
-sub_80CA984: ; 80CA984
+sub_80CA984: @ 80CA984
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -364207,7 +364207,7 @@ _080CA9AC:
 	thumb_func_end sub_80CA984
 
 	thumb_func_start sub_80CA9C0
-sub_80CA9C0: ; 80CA9C0
+sub_80CA9C0: @ 80CA9C0
 	ldr r2, =0x02039d08
 	ldr r0, [r2]
 	ldr r1, =0x000002c7
@@ -364228,7 +364228,7 @@ sub_80CA9C0: ; 80CA9C0
 	thumb_func_end sub_80CA9C0
 
 	thumb_func_start sub_80CA9EC
-sub_80CA9EC: ; 80CA9EC
+sub_80CA9EC: @ 80CA9EC
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -364248,7 +364248,7 @@ _080CAA06:
 	thumb_func_end sub_80CA9EC
 
 	thumb_func_start sub_80CAA14
-sub_80CAA14: ; 80CAA14
+sub_80CAA14: @ 80CAA14
 	push {r4,lr}
 	ldr r3, =0x02039d08
 	ldr r1, [r3]
@@ -364295,7 +364295,7 @@ _080CAA60:
 	thumb_func_end sub_80CAA14
 
 	thumb_func_start sub_80CAA74
-sub_80CAA74: ; 80CAA74
+sub_80CAA74: @ 80CAA74
 	push {r4,lr}
 	movs r4, 0x1
 _080CAA78:
@@ -364322,7 +364322,7 @@ _080CAA78:
 	thumb_func_end sub_80CAA74
 
 	thumb_func_start sub_80CAAA8
-sub_80CAAA8: ; 80CAAA8
+sub_80CAAA8: @ 80CAAA8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -364383,7 +364383,7 @@ _080CAAE0:
 	thumb_func_end sub_80CAAA8
 
 	thumb_func_start sub_80CAB20
-sub_80CAB20: ; 80CAB20
+sub_80CAB20: @ 80CAB20
 	push {lr}
 	sub sp, 0x4
 	bl sub_80CAA74
@@ -364404,7 +364404,7 @@ sub_80CAB20: ; 80CAB20
 	thumb_func_end sub_80CAB20
 
 	thumb_func_start sub_80CAB4C
-sub_80CAB4C: ; 80CAB4C
+sub_80CAB4C: @ 80CAB4C
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -364421,7 +364421,7 @@ sub_80CAB4C: ; 80CAB4C
 	thumb_func_end sub_80CAB4C
 
 	thumb_func_start sub_80CAB70
-sub_80CAB70: ; 80CAB70
+sub_80CAB70: @ 80CAB70
 	push {r4,r5,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -364479,7 +364479,7 @@ _080CABDA:
 	thumb_func_end sub_80CAB70
 
 	thumb_func_start sub_80CABE0
-sub_80CABE0: ; 80CABE0
+sub_80CABE0: @ 80CABE0
 	push {r4,lr}
 	ldr r4, =0x02039d10
 	bl get_preferred_box
@@ -364505,7 +364505,7 @@ _080CAC0A:
 	thumb_func_end sub_80CABE0
 
 	thumb_func_start sub_80CAC1C
-sub_80CAC1C: ; 80CAC1C
+sub_80CAC1C: @ 80CAC1C
 	push {lr}
 	sub sp, 0xC
 	movs r1, 0xE8
@@ -364535,7 +364535,7 @@ sub_80CAC1C: ; 80CAC1C
 	thumb_func_end sub_80CAC1C
 
 	thumb_func_start sub_80CAC58
-sub_80CAC58: ; 80CAC58
+sub_80CAC58: @ 80CAC58
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -364665,7 +364665,7 @@ _080CAD30:
 	thumb_func_end sub_80CAC58
 
 	thumb_func_start sub_80CAD9C
-sub_80CAD9C: ; 80CAD9C
+sub_80CAD9C: @ 80CAD9C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -364686,7 +364686,7 @@ sub_80CAD9C: ; 80CAD9C
 	thumb_func_end sub_80CAD9C
 
 	thumb_func_start sub_80CADC4
-sub_80CADC4: ; 80CADC4
+sub_80CADC4: @ 80CADC4
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0
@@ -364698,7 +364698,7 @@ sub_80CADC4: ; 80CADC4
 	thumb_func_end sub_80CADC4
 
 	thumb_func_start sub_80CADD8
-sub_80CADD8: ; 80CADD8
+sub_80CADD8: @ 80CADD8
 	push {lr}
 	bl sub_80CFEF0
 	movs r0, 0x12
@@ -364721,7 +364721,7 @@ _080CAE04:
 	thumb_func_end sub_80CADD8
 
 	thumb_func_start sub_80CAE0C
-sub_80CAE0C: ; 80CAE0C
+sub_80CAE0C: @ 80CAE0C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -364787,7 +364787,7 @@ _080CAE96:
 	thumb_func_end sub_80CAE0C
 
 	thumb_func_start sub_80CAEA0
-sub_80CAEA0: ; 80CAEA0
+sub_80CAEA0: @ 80CAEA0
 	ldr r0, =0x02039d0d
 	ldrb r0, [r0]
 	bx lr
@@ -364795,7 +364795,7 @@ sub_80CAEA0: ; 80CAEA0
 	thumb_func_end sub_80CAEA0
 
 	thumb_func_start sub_80CAEAC
-sub_80CAEAC: ; 80CAEAC
+sub_80CAEAC: @ 80CAEAC
 	push {lr}
 	bl sub_80CEADC
 	lsls r0, 24
@@ -364835,7 +364835,7 @@ _080CAEFA:
 	thumb_func_end sub_80CAEAC
 
 	thumb_func_start sub_80CAF04
-sub_80CAF04: ; 80CAF04
+sub_80CAF04: @ 80CAF04
 	push {r4-r6,lr}
 	bl sub_80D2F04
 	movs r2, 0
@@ -364915,7 +364915,7 @@ _080CAF6A:
 	thumb_func_end sub_80CAF04
 
 	thumb_func_start sub_80CAFAC
-sub_80CAFAC: ; 80CAFAC
+sub_80CAFAC: @ 80CAFAC
 	push {lr}
 	bl sub_80CEB24
 	lsls r0, 24
@@ -364930,7 +364930,7 @@ _080CAFBC:
 	thumb_func_end sub_80CAFAC
 
 	thumb_func_start sub_80CAFC4
-sub_80CAFC4: ; 80CAFC4
+sub_80CAFC4: @ 80CAFC4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r5, =0x02039d08
@@ -364972,7 +364972,7 @@ sub_80CAFC4: ; 80CAFC4
 	thumb_func_end sub_80CAFC4
 
 	thumb_func_start sub_80CB028
-sub_80CB028: ; 80CB028
+sub_80CB028: @ 80CB028
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -365112,7 +365112,7 @@ _080CB126:
 	thumb_func_end sub_80CB028
 
 	thumb_func_start sub_80CB140
-sub_80CB140: ; 80CB140
+sub_80CB140: @ 80CB140
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -365196,7 +365196,7 @@ _080CB1DA:
 	thumb_func_end sub_80CB140
 
 	thumb_func_start sub_80CB1F0
-sub_80CB1F0: ; 80CB1F0
+sub_80CB1F0: @ 80CB1F0
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -365231,7 +365231,7 @@ _080CB218:
 	thumb_func_end sub_80CB1F0
 
 	thumb_func_start sub_80CB234
-sub_80CB234: ; 80CB234
+sub_80CB234: @ 80CB234
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x30]
@@ -365265,7 +365265,7 @@ _080CB266:
 	thumb_func_end sub_80CB234
 
 	thumb_func_start sub_80CB278
-sub_80CB278: ; 80CB278
+sub_80CB278: @ 80CB278
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x36]
@@ -365298,7 +365298,7 @@ _080CB2A8:
 	thumb_func_end sub_80CB278
 
 	thumb_func_start sub_80CB2B0
-sub_80CB2B0: ; 80CB2B0
+sub_80CB2B0: @ 80CB2B0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -365336,7 +365336,7 @@ _080CB2DA:
 	thumb_func_end sub_80CB2B0
 
 	thumb_func_start sub_80CB2F8
-sub_80CB2F8: ; 80CB2F8
+sub_80CB2F8: @ 80CB2F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -365559,7 +365559,7 @@ _080CB4A6:
 	thumb_func_end sub_80CB2F8
 
 	thumb_func_start sub_80CB4CC
-sub_80CB4CC: ; 80CB4CC
+sub_80CB4CC: @ 80CB4CC
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -365638,7 +365638,7 @@ _080CB54C:
 	thumb_func_end sub_80CB4CC
 
 	thumb_func_start sub_80CB584
-sub_80CB584: ; 80CB584
+sub_80CB584: @ 80CB584
 	push {r4-r6,lr}
 	ldr r5, =0x02039d08
 	ldr r0, [r5]
@@ -365801,7 +365801,7 @@ _080CB6EA:
 	thumb_func_end sub_80CB584
 
 	thumb_func_start sub_80CB6F0
-sub_80CB6F0: ; 80CB6F0
+sub_80CB6F0: @ 80CB6F0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -365867,7 +365867,7 @@ _080CB744:
 	thumb_func_end sub_80CB6F0
 
 	thumb_func_start sub_80CB778
-sub_80CB778: ; 80CB778
+sub_80CB778: @ 80CB778
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r5, =0x02039d08
@@ -365894,7 +365894,7 @@ _080CB79E:
 	thumb_func_end sub_80CB778
 
 	thumb_func_start sub_80CB7AC
-sub_80CB7AC: ; 80CB7AC
+sub_80CB7AC: @ 80CB7AC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -365925,7 +365925,7 @@ _080CB7DA:
 	thumb_func_end sub_80CB7AC
 
 	thumb_func_start sub_80CB7E8
-sub_80CB7E8: ; 80CB7E8
+sub_80CB7E8: @ 80CB7E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -366104,7 +366104,7 @@ _080CB93C:
 	thumb_func_end sub_80CB7E8
 
 	thumb_func_start sub_80CB950
-sub_80CB950: ; 80CB950
+sub_80CB950: @ 80CB950
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =0x02039d08
@@ -366160,7 +366160,7 @@ _080CB9A0:
 	thumb_func_end sub_80CB950
 
 	thumb_func_start sub_80CB9BC
-sub_80CB9BC: ; 80CB9BC
+sub_80CB9BC: @ 80CB9BC
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
 	ldr r1, =0x00000c5e
@@ -366171,7 +366171,7 @@ sub_80CB9BC: ; 80CB9BC
 	thumb_func_end sub_80CB9BC
 
 	thumb_func_start sub_80CB9D0
-sub_80CB9D0: ; 80CB9D0
+sub_80CB9D0: @ 80CB9D0
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -366231,7 +366231,7 @@ _080CBA24:
 	thumb_func_end sub_80CB9D0
 
 	thumb_func_start sub_80CBA3C
-sub_80CBA3C: ; 80CBA3C
+sub_80CBA3C: @ 80CBA3C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x3A]
@@ -366302,7 +366302,7 @@ _080CBAB2:
 	thumb_func_end sub_80CBA3C
 
 	thumb_func_start sub_80CBAC4
-sub_80CBAC4: ; 80CBAC4
+sub_80CBAC4: @ 80CBAC4
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -366325,7 +366325,7 @@ _080CBAE2:
 	thumb_func_end sub_80CBAC4
 
 	thumb_func_start sub_80CBAF0
-sub_80CBAF0: ; 80CBAF0
+sub_80CBAF0: @ 80CBAF0
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r6, =0x02039d08
@@ -366389,7 +366389,7 @@ _080CBB56:
 	thumb_func_end sub_80CBAF0
 
 	thumb_func_start sub_80CBB68
-sub_80CBB68: ; 80CBB68
+sub_80CBB68: @ 80CBB68
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r5, =0x02039d08
@@ -366418,7 +366418,7 @@ _080CBB92:
 	thumb_func_end sub_80CBB68
 
 	thumb_func_start sub_80CBB9C
-sub_80CBB9C: ; 80CBB9C
+sub_80CBB9C: @ 80CBB9C
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x02039d08
@@ -366453,7 +366453,7 @@ _080CBBC6:
 	thumb_func_end sub_80CBB9C
 
 	thumb_func_start sub_80CBBDC
-sub_80CBBDC: ; 80CBBDC
+sub_80CBBDC: @ 80CBBDC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -366485,7 +366485,7 @@ _080CBC0C:
 	thumb_func_end sub_80CBBDC
 
 	thumb_func_start sub_80CBC14
-sub_80CBC14: ; 80CBC14
+sub_80CBC14: @ 80CBC14
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -366557,7 +366557,7 @@ _080CBC96:
 	thumb_func_end sub_80CBC14
 
 	thumb_func_start sub_80CBCAC
-sub_80CBCAC: ; 80CBCAC
+sub_80CBCAC: @ 80CBCAC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -366638,7 +366638,7 @@ _080CBD34:
 	thumb_func_end sub_80CBCAC
 
 	thumb_func_start sub_80CBD5C
-sub_80CBD5C: ; 80CBD5C
+sub_80CBD5C: @ 80CBD5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -366685,7 +366685,7 @@ _080CBD8E:
 	thumb_func_end sub_80CBD5C
 
 	thumb_func_start sub_80CBDC4
-sub_80CBDC4: ; 80CBDC4
+sub_80CBDC4: @ 80CBDC4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -366851,7 +366851,7 @@ _080CBEF4:
 	thumb_func_end sub_80CBDC4
 
 	thumb_func_start sub_80CBF14
-sub_80CBF14: ; 80CBF14
+sub_80CBF14: @ 80CBF14
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -366941,7 +366941,7 @@ _080CBFC0:
 	thumb_func_end sub_80CBF14
 
 	thumb_func_start sub_80CBFD8
-sub_80CBFD8: ; 80CBFD8
+sub_80CBFD8: @ 80CBFD8
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -366981,7 +366981,7 @@ _080CC01A:
 	thumb_func_end sub_80CBFD8
 
 	thumb_func_start sub_80CC020
-sub_80CC020: ; 80CC020
+sub_80CC020: @ 80CC020
 	push {r4,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -367015,7 +367015,7 @@ _080CC056:
 	thumb_func_end sub_80CC020
 
 	thumb_func_start sub_80CC064
-sub_80CC064: ; 80CC064
+sub_80CC064: @ 80CC064
 	push {lr}
 	ldr r3, =0x02039d08
 	ldr r0, [r3]
@@ -367046,7 +367046,7 @@ _080CC094:
 	thumb_func_end sub_80CC064
 
 	thumb_func_start sub_80CC0A0
-sub_80CC0A0: ; 80CC0A0
+sub_80CC0A0: @ 80CC0A0
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -367076,7 +367076,7 @@ _080CC0D0:
 	thumb_func_end sub_80CC0A0
 
 	thumb_func_start sub_80CC0D4
-sub_80CC0D4: ; 80CC0D4
+sub_80CC0D4: @ 80CC0D4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x02039d08
@@ -367098,7 +367098,7 @@ sub_80CC0D4: ; 80CC0D4
 	thumb_func_end sub_80CC0D4
 
 	thumb_func_start sub_80CC100
-sub_80CC100: ; 80CC100
+sub_80CC100: @ 80CC100
 	ldr r1, =0x02039d08
 	ldr r1, [r1]
 	ldr r2, =0x00000cb4
@@ -367117,7 +367117,7 @@ sub_80CC100: ; 80CC100
 	thumb_func_end sub_80CC100
 
 	thumb_func_start sub_80CC124
-sub_80CC124: ; 80CC124
+sub_80CC124: @ 80CC124
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -367207,7 +367207,7 @@ _080CC1CA:
 	thumb_func_end sub_80CC124
 
 	thumb_func_start sub_80CC1E0
-sub_80CC1E0: ; 80CC1E0
+sub_80CC1E0: @ 80CC1E0
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -367248,7 +367248,7 @@ _080CC22A:
 	thumb_func_end sub_80CC1E0
 
 	thumb_func_start sub_80CC230
-sub_80CC230: ; 80CC230
+sub_80CC230: @ 80CC230
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -367351,7 +367351,7 @@ _080CC304:
 	thumb_func_end sub_80CC230
 
 	thumb_func_start sub_80CC314
-sub_80CC314: ; 80CC314
+sub_80CC314: @ 80CC314
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -367364,7 +367364,7 @@ sub_80CC314: ; 80CC314
 	thumb_func_end sub_80CC314
 
 	thumb_func_start sub_80CC32C
-sub_80CC32C: ; 80CC32C
+sub_80CC32C: @ 80CC32C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -367387,7 +367387,7 @@ sub_80CC32C: ; 80CC32C
 	thumb_func_end sub_80CC32C
 
 	thumb_func_start sub_80CC35C
-sub_80CC35C: ; 80CC35C
+sub_80CC35C: @ 80CC35C
 	push {lr}
 	ldr r0, =sub_80CC370
 	bl is_function_an_active_task
@@ -367399,7 +367399,7 @@ sub_80CC35C: ; 80CC35C
 	thumb_func_end sub_80CC35C
 
 	thumb_func_start sub_80CC370
-sub_80CC370: ; 80CC370
+sub_80CC370: @ 80CC370
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -367505,7 +367505,7 @@ _080CC45E:
 	thumb_func_end sub_80CC370
 
 	thumb_func_start sub_80CC464
-sub_80CC464: ; 80CC464
+sub_80CC464: @ 80CC464
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -367612,7 +367612,7 @@ _080CC4EA:
 	thumb_func_end sub_80CC464
 
 	thumb_func_start sub_80CC54C
-sub_80CC54C: ; 80CC54C
+sub_80CC54C: @ 80CC54C
 	push {r4-r6,lr}
 	ldr r4, =0x02039d08
 	ldr r1, [r4]
@@ -367726,7 +367726,7 @@ _080CC634:
 	thumb_func_end sub_80CC54C
 
 	thumb_func_start sub_80CC644
-sub_80CC644: ; 80CC644
+sub_80CC644: @ 80CC644
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -367762,7 +367762,7 @@ _080CC678:
 	thumb_func_end sub_80CC644
 
 	thumb_func_start sub_80CC680
-sub_80CC680: ; 80CC680
+sub_80CC680: @ 80CC680
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -367785,7 +367785,7 @@ sub_80CC680: ; 80CC680
 	thumb_func_end sub_80CC680
 
 	thumb_func_start sub_80CC6B0
-sub_80CC6B0: ; 80CC6B0
+sub_80CC6B0: @ 80CC6B0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x02039d08
@@ -367888,7 +367888,7 @@ _080CC796:
 	thumb_func_end sub_80CC6B0
 
 	thumb_func_start sub_80CC7A0
-sub_80CC7A0: ; 80CC7A0
+sub_80CC7A0: @ 80CC7A0
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r4, =0x02039d08
@@ -368133,7 +368133,7 @@ _080CC9DA:
 	thumb_func_end sub_80CC7A0
 
 	thumb_func_start sub_80CCA00
-sub_80CCA00: ; 80CCA00
+sub_80CCA00: @ 80CCA00
 	push {r4,r5,lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -368165,7 +368165,7 @@ _080CCA2E:
 	thumb_func_end sub_80CCA00
 
 	thumb_func_start sub_80CCA3C
-sub_80CCA3C: ; 80CCA3C
+sub_80CCA3C: @ 80CCA3C
 	push {r4-r7,lr}
 	sub sp, 0x24
 	adds r5, r0, 0
@@ -368249,7 +368249,7 @@ _080CCAD2:
 	thumb_func_end sub_80CCA3C
 
 	thumb_func_start sub_80CCAE0
-sub_80CCAE0: ; 80CCAE0
+sub_80CCAE0: @ 80CCAE0
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	ldr r0, =0x02039d08
@@ -368311,7 +368311,7 @@ _080CCB3C:
 	thumb_func_end sub_80CCAE0
 
 	thumb_func_start sub_80CCB50
-sub_80CCB50: ; 80CCB50
+sub_80CCB50: @ 80CCB50
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -368495,7 +368495,7 @@ _080CCC70:
 	thumb_func_end sub_80CCB50
 
 	thumb_func_start sub_80CCCFC
-sub_80CCCFC: ; 80CCCFC
+sub_80CCCFC: @ 80CCCFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -368712,7 +368712,7 @@ _080CCE2E:
 	thumb_func_end sub_80CCCFC
 
 	thumb_func_start sub_80CCEE0
-sub_80CCEE0: ; 80CCEE0
+sub_80CCEE0: @ 80CCEE0
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -368751,7 +368751,7 @@ _080CCF06:
 	thumb_func_end sub_80CCEE0
 
 	thumb_func_start sub_80CCF30
-sub_80CCF30: ; 80CCF30
+sub_80CCF30: @ 80CCF30
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x32]
@@ -368782,7 +368782,7 @@ _080CCF5C:
 	thumb_func_end sub_80CCF30
 
 	thumb_func_start sub_80CCF64
-sub_80CCF64: ; 80CCF64
+sub_80CCF64: @ 80CCF64
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x30]
@@ -368814,7 +368814,7 @@ _080CCF96:
 	thumb_func_end sub_80CCF64
 
 	thumb_func_start sub_80CCF9C
-sub_80CCF9C: ; 80CCF9C
+sub_80CCF9C: @ 80CCF9C
 	push {lr}
 	bl get_preferred_box
 	lsls r0, 24
@@ -368862,7 +368862,7 @@ _080CCFFC:
 	thumb_func_end sub_80CCF9C
 
 	thumb_func_start sub_80CD00C
-sub_80CD00C: ; 80CD00C
+sub_80CD00C: @ 80CD00C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x1
@@ -368881,7 +368881,7 @@ sub_80CD00C: ; 80CD00C
 	thumb_func_end sub_80CD00C
 
 	thumb_func_start sub_80CD02C
-sub_80CD02C: ; 80CD02C
+sub_80CD02C: @ 80CD02C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0857B080
 	bl LoadObjectPic
@@ -368947,7 +368947,7 @@ _080CD0A2:
 	thumb_func_end sub_80CD02C
 
 	thumb_func_start sub_80CD0B8
-sub_80CD0B8: ; 80CD0B8
+sub_80CD0B8: @ 80CD0B8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -369030,7 +369030,7 @@ _080CD130:
 	thumb_func_end sub_80CD0B8
 
 	thumb_func_start sub_80CD158
-sub_80CD158: ; 80CD158
+sub_80CD158: @ 80CD158
 	push {r4-r6,lr}
 	movs r3, 0
 	movs r5, 0
@@ -369072,7 +369072,7 @@ _080CD164:
 	thumb_func_end sub_80CD158
 
 	thumb_func_start sub_80CD1A8
-sub_80CD1A8: ; 80CD1A8
+sub_80CD1A8: @ 80CD1A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -369129,7 +369129,7 @@ _080CD204:
 	thumb_func_end sub_80CD1A8
 
 	thumb_func_start sub_80CD210
-sub_80CD210: ; 80CD210
+sub_80CD210: @ 80CD210
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -369237,7 +369237,7 @@ _080CD2DC:
 	thumb_func_end sub_80CD210
 
 	thumb_func_start sub_80CD2E8
-sub_80CD2E8: ; 80CD2E8
+sub_80CD2E8: @ 80CD2E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -369301,7 +369301,7 @@ _080CD362:
 	thumb_func_end sub_80CD2E8
 
 	thumb_func_start sub_80CD36C
-sub_80CD36C: ; 80CD36C
+sub_80CD36C: @ 80CD36C
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -369348,7 +369348,7 @@ _080CD38C:
 	thumb_func_end sub_80CD36C
 
 	thumb_func_start sub_80CD3EC
-sub_80CD3EC: ; 80CD3EC
+sub_80CD3EC: @ 80CD3EC
 	push {lr}
 	bl sub_80CFC14
 	bl sub_80CEBDC
@@ -369381,7 +369381,7 @@ _080CD426:
 	thumb_func_end sub_80CD3EC
 
 	thumb_func_start sub_80CD444
-sub_80CD444: ; 80CD444
+sub_80CD444: @ 80CD444
 	push {r4-r6,lr}
 	adds r4, r2, 0
 	adds r6, r3, 0
@@ -369482,7 +369482,7 @@ _080CD4FC:
 	thumb_func_end sub_80CD444
 
 	thumb_func_start sub_80CD504
-sub_80CD504: ; 80CD504
+sub_80CD504: @ 80CD504
 	push {lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -369521,7 +369521,7 @@ _080CD54E:
 	thumb_func_end sub_80CD504
 
 	thumb_func_start sub_80CD554
-sub_80CD554: ; 80CD554
+sub_80CD554: @ 80CD554
 	push {r4-r7,lr}
 	ldr r7, =0x02039d08
 	ldr r5, [r7]
@@ -369689,7 +369689,7 @@ _080CD69A:
 	thumb_func_end sub_80CD554
 
 	thumb_func_start sub_80CD6AC
-sub_80CD6AC: ; 80CD6AC
+sub_80CD6AC: @ 80CD6AC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -369732,7 +369732,7 @@ sub_80CD6AC: ; 80CD6AC
 	thumb_func_end sub_80CD6AC
 
 	thumb_func_start sub_80CD70C
-sub_80CD70C: ; 80CD70C
+sub_80CD70C: @ 80CD70C
 	push {r4-r7,lr}
 	ldr r0, =0x02039d08
 	ldr r2, [r0]
@@ -369905,7 +369905,7 @@ _080CD830:
 	thumb_func_end sub_80CD70C
 
 	thumb_func_start sub_80CD894
-sub_80CD894: ; 80CD894
+sub_80CD894: @ 80CD894
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -370104,7 +370104,7 @@ _080CDA56:
 	thumb_func_end sub_80CD894
 
 	thumb_func_start sub_80CDA68
-sub_80CDA68: ; 80CDA68
+sub_80CDA68: @ 80CDA68
 	push {r4,lr}
 	ldr r1, =0x02039d78
 	ldr r4, =0x02039d08
@@ -370239,7 +370239,7 @@ _080CDB8A:
 	thumb_func_end sub_80CDA68
 
 	thumb_func_start sub_80CDBA0
-sub_80CDBA0: ; 80CDBA0
+sub_80CDBA0: @ 80CDBA0
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -370281,7 +370281,7 @@ _080CDBE0:
 	thumb_func_end sub_80CDBA0
 
 	thumb_func_start sub_80CDBF8
-sub_80CDBF8: ; 80CDBF8
+sub_80CDBF8: @ 80CDBF8
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -370293,7 +370293,7 @@ sub_80CDBF8: ; 80CDBF8
 	thumb_func_end sub_80CDBF8
 
 	thumb_func_start sub_80CDC0C
-sub_80CDC0C: ; 80CDC0C
+sub_80CDC0C: @ 80CDC0C
 	ldr r1, =0x02039d7e
 	movs r0, 0
 	strb r0, [r1]
@@ -370302,7 +370302,7 @@ sub_80CDC0C: ; 80CDC0C
 	thumb_func_end sub_80CDC0C
 
 	thumb_func_start sub_80CDC18
-sub_80CDC18: ; 80CDC18
+sub_80CDC18: @ 80CDC18
 	ldr r0, =0x02039d7e
 	ldr r1, =0x02039d79
 	ldrb r1, [r1]
@@ -370312,7 +370312,7 @@ sub_80CDC18: ; 80CDC18
 	thumb_func_end sub_80CDC18
 
 	thumb_func_start sub_80CDC2C
-sub_80CDC2C: ; 80CDC2C
+sub_80CDC2C: @ 80CDC2C
 	ldr r0, =0x02039d7e
 	ldrb r0, [r0]
 	bx lr
@@ -370320,7 +370320,7 @@ sub_80CDC2C: ; 80CDC2C
 	thumb_func_end sub_80CDC2C
 
 	thumb_func_start sub_80CDC38
-sub_80CDC38: ; 80CDC38
+sub_80CDC38: @ 80CDC38
 	lsls r0, 24
 	ldr r1, =0x02039d08
 	ldr r1, [r1]
@@ -370341,7 +370341,7 @@ sub_80CDC38: ; 80CDC38
 	thumb_func_end sub_80CDC38
 
 	thumb_func_start sub_80CDC64
-sub_80CDC64: ; 80CDC64
+sub_80CDC64: @ 80CDC64
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -370373,7 +370373,7 @@ _080CDC8E:
 	thumb_func_end sub_80CDC64
 
 	thumb_func_start sub_80CDCAC
-sub_80CDCAC: ; 80CDCAC
+sub_80CDCAC: @ 80CDCAC
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -370389,7 +370389,7 @@ sub_80CDCAC: ; 80CDCAC
 	thumb_func_end sub_80CDCAC
 
 	thumb_func_start sub_80CDCCC
-sub_80CDCCC: ; 80CDCCC
+sub_80CDCCC: @ 80CDCCC
 	push {r4,r5,lr}
 	ldr r4, =0x02039d08
 	ldr r1, [r4]
@@ -370462,7 +370462,7 @@ _080CDD56:
 	thumb_func_end sub_80CDCCC
 
 	thumb_func_start sub_80CDD5C
-sub_80CDD5C: ; 80CDD5C
+sub_80CDD5C: @ 80CDD5C
 	push {r4,r5,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -370527,7 +370527,7 @@ _080CDDD2:
 	thumb_func_end sub_80CDD5C
 
 	thumb_func_start sub_80CDDD8
-sub_80CDDD8: ; 80CDDD8
+sub_80CDDD8: @ 80CDDD8
 	push {r4,r5,lr}
 	ldr r4, =0x02039d08
 	ldr r1, [r4]
@@ -370626,7 +370626,7 @@ _080CDEAE:
 	thumb_func_end sub_80CDDD8
 
 	thumb_func_start sub_80CDEB4
-sub_80CDEB4: ; 80CDEB4
+sub_80CDEB4: @ 80CDEB4
 	push {lr}
 	bl sub_80CDED4
 	lsls r0, 24
@@ -370636,7 +370636,7 @@ sub_80CDEB4: ; 80CDEB4
 	thumb_func_end sub_80CDEB4
 
 	thumb_func_start sub_80CDEC4
-sub_80CDEC4: ; 80CDEC4
+sub_80CDEC4: @ 80CDEC4
 	push {lr}
 	bl sub_80CDF08
 	lsls r0, 24
@@ -370646,7 +370646,7 @@ sub_80CDEC4: ; 80CDEC4
 	thumb_func_end sub_80CDEC4
 
 	thumb_func_start sub_80CDED4
-sub_80CDED4: ; 80CDED4
+sub_80CDED4: @ 80CDED4
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -370676,7 +370676,7 @@ _080CDF02:
 	thumb_func_end sub_80CDED4
 
 	thumb_func_start sub_80CDF08
-sub_80CDF08: ; 80CDF08
+sub_80CDF08: @ 80CDF08
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -370701,7 +370701,7 @@ _080CDF32:
 	thumb_func_end sub_80CDF08
 
 	thumb_func_start sub_80CDF38
-sub_80CDF38: ; 80CDF38
+sub_80CDF38: @ 80CDF38
 	push {r4,lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -370749,7 +370749,7 @@ _080CDF94:
 	thumb_func_end sub_80CDF38
 
 	thumb_func_start sub_80CDFAC
-sub_80CDFAC: ; 80CDFAC
+sub_80CDFAC: @ 80CDFAC
 	push {r4,r5,lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -370792,7 +370792,7 @@ _080CDFFE:
 	thumb_func_end sub_80CDFAC
 
 	thumb_func_start sub_80CE00C
-sub_80CE00C: ; 80CE00C
+sub_80CE00C: @ 80CE00C
 	push {lr}
 	bl sub_80CEB40
 	pop {r0}
@@ -370800,7 +370800,7 @@ sub_80CE00C: ; 80CE00C
 	thumb_func_end sub_80CE00C
 
 	thumb_func_start sub_80CE018
-sub_80CE018: ; 80CE018
+sub_80CE018: @ 80CE018
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -370846,7 +370846,7 @@ _080CE064:
 	thumb_func_end sub_80CE018
 
 	thumb_func_start diegohint2
-diegohint2: ; 80CE08C
+diegohint2: @ 80CE08C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -370885,7 +370885,7 @@ _080CE0D8:
 	thumb_func_end diegohint2
 
 	thumb_func_start sub_80CE0E8
-sub_80CE0E8: ; 80CE0E8
+sub_80CE0E8: @ 80CE0E8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -370908,7 +370908,7 @@ _080CE10C:
 	thumb_func_end sub_80CE0E8
 
 	thumb_func_start diegohint1
-diegohint1: ; 80CE110
+diegohint1: @ 80CE110
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -370963,7 +370963,7 @@ _080CE154:
 	thumb_func_end diegohint1
 
 	thumb_func_start sub_80CE19C
-sub_80CE19C: ; 80CE19C
+sub_80CE19C: @ 80CE19C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -371028,7 +371028,7 @@ _080CE21A:
 	thumb_func_end sub_80CE19C
 
 	thumb_func_start sub_80CE22C
-sub_80CE22C: ; 80CE22C
+sub_80CE22C: @ 80CE22C
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -371044,7 +371044,7 @@ sub_80CE22C: ; 80CE22C
 	thumb_func_end sub_80CE22C
 
 	thumb_func_start sub_80CE250
-sub_80CE250: ; 80CE250
+sub_80CE250: @ 80CE250
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371080,7 +371080,7 @@ _080CE274:
 	thumb_func_end sub_80CE250
 
 	thumb_func_start sub_80CE2A8
-sub_80CE2A8: ; 80CE2A8
+sub_80CE2A8: @ 80CE2A8
 	push {lr}
 	bl sub_80CBFD8
 	lsls r0, 24
@@ -371104,7 +371104,7 @@ _080CE2CA:
 	thumb_func_end sub_80CE2A8
 
 	thumb_func_start sub_80CE2D8
-sub_80CE2D8: ; 80CE2D8
+sub_80CE2D8: @ 80CE2D8
 	push {lr}
 	bl sub_80CC020
 	ldr r1, =0x02039d7a
@@ -371142,7 +371142,7 @@ _080CE316:
 	thumb_func_end sub_80CE2D8
 
 	thumb_func_start sub_80CE324
-sub_80CE324: ; 80CE324
+sub_80CE324: @ 80CE324
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371162,7 +371162,7 @@ _080CE33E:
 	thumb_func_end sub_80CE324
 
 	thumb_func_start sub_80CE350
-sub_80CE350: ; 80CE350
+sub_80CE350: @ 80CE350
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r5, 0
@@ -371203,7 +371203,7 @@ _080CE37E:
 	thumb_func_end sub_80CE350
 
 	thumb_func_start sub_80CE3A0
-sub_80CE3A0: ; 80CE3A0
+sub_80CE3A0: @ 80CE3A0
 	push {r4,r5,lr}
 	bl sub_80CE51C
 	adds r3, r0, 0
@@ -371346,7 +371346,7 @@ _080CE504:
 	thumb_func_end sub_80CE3A0
 
 	thumb_func_start sub_80CE51C
-sub_80CE51C: ; 80CE51C
+sub_80CE51C: @ 80CE51C
 	push {r4-r6,lr}
 	ldr r0, =0x02039d7a
 	ldrb r1, [r0]
@@ -371402,7 +371402,7 @@ _080CE578:
 	thumb_func_end sub_80CE51C
 
 	thumb_func_start sub_80CE580
-sub_80CE580: ; 80CE580
+sub_80CE580: @ 80CE580
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -371615,7 +371615,7 @@ _080CE736:
 	thumb_func_end sub_80CE580
 
 	thumb_func_start sub_80CE760
-sub_80CE760: ; 80CE760
+sub_80CE760: @ 80CE760
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371635,7 +371635,7 @@ _080CE77A:
 	thumb_func_end sub_80CE760
 
 	thumb_func_start sub_80CE790
-sub_80CE790: ; 80CE790
+sub_80CE790: @ 80CE790
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371669,7 +371669,7 @@ _080CE7D8:
 	thumb_func_end sub_80CE790
 
 	thumb_func_start sub_80CE7E8
-sub_80CE7E8: ; 80CE7E8
+sub_80CE7E8: @ 80CE7E8
 	push {r4,r5,lr}
 	ldr r0, =0x02039d7a
 	ldrb r5, [r0]
@@ -371760,7 +371760,7 @@ _080CE8CA:
 	thumb_func_end sub_80CE7E8
 
 	thumb_func_start sub_80CE8E4
-sub_80CE8E4: ; 80CE8E4
+sub_80CE8E4: @ 80CE8E4
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371781,7 +371781,7 @@ _080CE900:
 	thumb_func_end sub_80CE8E4
 
 	thumb_func_start party_compaction
-party_compaction: ; 80CE90C
+party_compaction: @ 80CE90C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -371861,7 +371861,7 @@ _080CE992:
 	thumb_func_end party_compaction
 
 	thumb_func_start sub_80CE9A8
-sub_80CE9A8: ; 80CE9A8
+sub_80CE9A8: @ 80CE9A8
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -371920,7 +371920,7 @@ _080CEA1C:
 	thumb_func_end sub_80CE9A8
 
 	thumb_func_start sub_80CEA30
-sub_80CEA30: ; 80CEA30
+sub_80CEA30: @ 80CEA30
 	push {lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -371949,7 +371949,7 @@ _080CEA66:
 	thumb_func_end sub_80CEA30
 
 	thumb_func_start sub_80CEA6C
-sub_80CEA6C: ; 80CEA6C
+sub_80CEA6C: @ 80CEA6C
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -371992,7 +371992,7 @@ _080CEACA:
 	thumb_func_end sub_80CEA6C
 
 	thumb_func_start sub_80CEAD0
-sub_80CEAD0: ; 80CEAD0
+sub_80CEAD0: @ 80CEAD0
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
 	bx lr
@@ -372000,7 +372000,7 @@ sub_80CEAD0: ; 80CEAD0
 	thumb_func_end sub_80CEAD0
 
 	thumb_func_start sub_80CEADC
-sub_80CEADC: ; 80CEADC
+sub_80CEADC: @ 80CEADC
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x02039d78
@@ -372018,7 +372018,7 @@ _080CEAEE:
 	thumb_func_end sub_80CEADC
 
 	thumb_func_start sub_80CEAF8
-sub_80CEAF8: ; 80CEAF8
+sub_80CEAF8: @ 80CEAF8
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x02039d78
@@ -372042,7 +372042,7 @@ _080CEB16:
 	thumb_func_end sub_80CEAF8
 
 	thumb_func_start sub_80CEB24
-sub_80CEB24: ; 80CEB24
+sub_80CEB24: @ 80CEB24
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x02039d78
@@ -372060,7 +372060,7 @@ _080CEB36:
 	thumb_func_end sub_80CEB24
 
 	thumb_func_start sub_80CEB40
-sub_80CEB40: ; 80CEB40
+sub_80CEB40: @ 80CEB40
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r1, [r0]
@@ -372130,7 +372130,7 @@ _080CEBD0:
 	thumb_func_end sub_80CEB40
 
 	thumb_func_start sub_80CEBDC
-sub_80CEBDC: ; 80CEBDC
+sub_80CEBDC: @ 80CEBDC
 	push {lr}
 	ldr r0, =0x02039d7a
 	ldrb r0, [r0]
@@ -372149,7 +372149,7 @@ _080CEBFC:
 	thumb_func_end sub_80CEBDC
 
 	thumb_func_start sub_80CEC00
-sub_80CEC00: ; 80CEC00
+sub_80CEC00: @ 80CEC00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -372639,7 +372639,7 @@ _080CF0B8:
 	thumb_func_end sub_80CEC00
 
 	thumb_func_start sub_80CF0CC
-sub_80CF0CC: ; 80CF0CC
+sub_80CF0CC: @ 80CF0CC
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -372669,7 +372669,7 @@ _080CF0FE:
 	thumb_func_end sub_80CF0CC
 
 	thumb_func_start sub_80CF108
-sub_80CF108: ; 80CF108
+sub_80CF108: @ 80CF108
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -372969,7 +372969,7 @@ _080CF366:
 	thumb_func_end sub_80CF108
 
 	thumb_func_start sub_80CF374
-sub_80CF374: ; 80CF374
+sub_80CF374: @ 80CF374
 	push {r4,lr}
 	ldr r1, =0x030022c0
 	ldrh r0, [r1, 0x2C]
@@ -373109,7 +373109,7 @@ _080CF49C:
 	thumb_func_end sub_80CF374
 
 	thumb_func_start sub_80CF4B0
-sub_80CF4B0: ; 80CF4B0
+sub_80CF4B0: @ 80CF4B0
 	push {r4,lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x30]
@@ -373242,7 +373242,7 @@ _080CF5BC:
 	thumb_func_end sub_80CF4B0
 
 	thumb_func_start sub_80CF5C4
-sub_80CF5C4: ; 80CF5C4
+sub_80CF5C4: @ 80CF5C4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -373509,7 +373509,7 @@ _080CF7D8:
 	thumb_func_end sub_80CF5C4
 
 	thumb_func_start sub_80CF7E4
-sub_80CF7E4: ; 80CF7E4
+sub_80CF7E4: @ 80CF7E4
 	push {r4-r6,lr}
 	ldr r3, =0x02039d08
 	ldr r0, [r3]
@@ -373631,7 +373631,7 @@ _080CF8D2:
 	thumb_func_end sub_80CF7E4
 
 	thumb_func_start sub_80CF8D8
-sub_80CF8D8: ; 80CF8D8
+sub_80CF8D8: @ 80CF8D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -373770,7 +373770,7 @@ _080CF9E2:
 	thumb_func_end sub_80CF8D8
 
 	thumb_func_start sub_80CF9EC
-sub_80CF9EC: ; 80CF9EC
+sub_80CF9EC: @ 80CF9EC
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r0, =gUnknown_0857B9BC
@@ -373812,7 +373812,7 @@ _080CFA32:
 	thumb_func_end sub_80CF9EC
 
 	thumb_func_start sub_80CFA38
-sub_80CFA38: ; 80CFA38
+sub_80CFA38: @ 80CFA38
 	push {lr}
 	bl sub_80CFEF0
 	movs r0, 0x9
@@ -373828,7 +373828,7 @@ sub_80CFA38: ; 80CFA38
 	thumb_func_end sub_80CFA38
 
 	thumb_func_start sub_80CFA5C
-sub_80CFA5C: ; 80CFA5C
+sub_80CFA5C: @ 80CFA5C
 	push {lr}
 	bl sub_80CFEF0
 	ldr r0, =0x02039d08
@@ -373849,7 +373849,7 @@ _080CFA7C:
 	thumb_func_end sub_80CFA5C
 
 	thumb_func_start sub_80CFA84
-sub_80CFA84: ; 80CFA84
+sub_80CFA84: @ 80CFA84
 	push {lr}
 	bl sub_80CD504
 	lsls r0, 16
@@ -373940,7 +373940,7 @@ _080CFB3E:
 	thumb_func_end sub_80CFA84
 
 	thumb_func_start sub_80CFB44
-sub_80CFB44: ; 80CFB44
+sub_80CFB44: @ 80CFB44
 	push {r4,r5,lr}
 	ldr r4, =0x02039d08
 	ldr r0, [r4]
@@ -374022,7 +374022,7 @@ _080CFBEC:
 	thumb_func_end sub_80CFB44
 
 	thumb_func_start sub_80CFBF4
-sub_80CFBF4: ; 80CFBF4
+sub_80CFBF4: @ 80CFBF4
 	ldr r1, =0x02039d08
 	ldr r1, [r1]
 	ldr r2, =0x00000cb4
@@ -374039,7 +374039,7 @@ sub_80CFBF4: ; 80CFBF4
 	thumb_func_end sub_80CFBF4
 
 	thumb_func_start sub_80CFC14
-sub_80CFC14: ; 80CFC14
+sub_80CFC14: @ 80CFC14
 	push {r4-r6,lr}
 	sub sp, 0x2C
 	mov r1, sp
@@ -374214,7 +374214,7 @@ _080CFDB4:
 	thumb_func_end sub_80CFC14
 
 	thumb_func_start sub_80CFDC4
-sub_80CFDC4: ; 80CFDC4
+sub_80CFDC4: @ 80CFDC4
 	push {lr}
 	ldr r2, =0x02039d7d
 	movs r1, 0
@@ -374246,7 +374246,7 @@ _080CFDD2:
 	thumb_func_end sub_80CFDC4
 
 	thumb_func_start sub_80CFE08
-sub_80CFE08: ; 80CFE08
+sub_80CFE08: @ 80CFE08
 	ldr r0, =0x02039d79
 	ldrb r0, [r0]
 	bx lr
@@ -374254,7 +374254,7 @@ sub_80CFE08: ; 80CFE08
 	thumb_func_end sub_80CFE08
 
 	thumb_func_start sub_80CFE14
-sub_80CFE14: ; 80CFE14
+sub_80CFE14: @ 80CFE14
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -374287,7 +374287,7 @@ _080CFE4C:
 	thumb_func_end sub_80CFE14
 
 	thumb_func_start sub_80CFE54
-sub_80CFE54: ; 80CFE54
+sub_80CFE54: @ 80CFE54
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -374304,7 +374304,7 @@ sub_80CFE54: ; 80CFE54
 	thumb_func_end sub_80CFE54
 
 	thumb_func_start sub_80CFE78
-sub_80CFE78: ; 80CFE78
+sub_80CFE78: @ 80CFE78
 	ldr r0, =0x02039d7b
 	ldrb r0, [r0]
 	bx lr
@@ -374312,7 +374312,7 @@ sub_80CFE78: ; 80CFE78
 	thumb_func_end sub_80CFE78
 
 	thumb_func_start sub_80CFE84
-sub_80CFE84: ; 80CFE84
+sub_80CFE84: @ 80CFE84
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
 	ldr r1, =0x00000cb4
@@ -374330,7 +374330,7 @@ sub_80CFE84: ; 80CFE84
 	thumb_func_end sub_80CFE84
 
 	thumb_func_start sub_80CFEA8
-sub_80CFEA8: ; 80CFEA8
+sub_80CFEA8: @ 80CFEA8
 	push {lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -374349,7 +374349,7 @@ _080CFEC0:
 	thumb_func_end sub_80CFEA8
 
 	thumb_func_start sub_80CFECC
-sub_80CFECC: ; 80CFECC
+sub_80CFECC: @ 80CFECC
 	push {lr}
 	ldr r0, =0x02039d78
 	ldrb r0, [r0]
@@ -374368,7 +374368,7 @@ _080CFEE4:
 	thumb_func_end sub_80CFECC
 
 	thumb_func_start sub_80CFEF0
-sub_80CFEF0: ; 80CFEF0
+sub_80CFEF0: @ 80CFEF0
 	ldr r2, =0x02039d08
 	ldr r0, [r2]
 	ldr r1, =0x00000cac
@@ -374398,7 +374398,7 @@ sub_80CFEF0: ; 80CFEF0
 	thumb_func_end sub_80CFEF0
 
 	thumb_func_start sub_80CFF34
-sub_80CFF34: ; 80CFF34
+sub_80CFF34: @ 80CFF34
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -374444,7 +374444,7 @@ _080CFF7E:
 	thumb_func_end sub_80CFF34
 
 	thumb_func_start sub_80CFF98
-sub_80CFF98: ; 80CFF98
+sub_80CFF98: @ 80CFF98
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -374472,7 +374472,7 @@ _080CFFCC:
 	thumb_func_end sub_80CFF98
 
 	thumb_func_start sub_80CFFD0
-sub_80CFFD0: ; 80CFFD0
+sub_80CFFD0: @ 80CFFD0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -374562,13 +374562,13 @@ sub_80CFFD0: ; 80CFFD0
 	thumb_func_end sub_80CFFD0
 
 	thumb_func_start sub_80D00A8
-sub_80D00A8: ; 80D00A8
+sub_80D00A8: @ 80D00A8
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80D00A8
 
 	thumb_func_start sub_80D00AC
-sub_80D00AC: ; 80D00AC
+sub_80D00AC: @ 80D00AC
 	push {r4,r5,lr}
 	movs r5, 0x2
 	negs r5, r5
@@ -374638,7 +374638,7 @@ _080D0128:
 	thumb_func_end sub_80D00AC
 
 	thumb_func_start sub_80D013C
-sub_80D013C: ; 80D013C
+sub_80D013C: @ 80D013C
 	push {r4,r5,lr}
 	ldr r5, =0x02039d08
 	ldr r0, [r5]
@@ -374659,7 +374659,7 @@ sub_80D013C: ; 80D013C
 	thumb_func_end sub_80D013C
 
 	thumb_func_start sub_80D0164
-sub_80D0164: ; 80D0164
+sub_80D0164: @ 80D0164
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r0, =0x00000974
@@ -374696,7 +374696,7 @@ _080D01B2:
 	thumb_func_end sub_80D0164
 
 	thumb_func_start sub_80D01B8
-sub_80D01B8: ; 80D01B8
+sub_80D01B8: @ 80D01B8
 	push {lr}
 	ldr r0, =0x02039d80
 	ldr r0, [r0]
@@ -374710,7 +374710,7 @@ _080D01C6:
 	thumb_func_end sub_80D01B8
 
 	thumb_func_start sub_80D01D0
-sub_80D01D0: ; 80D01D0
+sub_80D01D0: @ 80D01D0
 	ldr r2, =0x02039d80
 	ldr r1, [r2]
 	movs r3, 0
@@ -374722,7 +374722,7 @@ sub_80D01D0: ; 80D01D0
 	thumb_func_end sub_80D01D0
 
 	thumb_func_start sub_80D01E4
-sub_80D01E4: ; 80D01E4
+sub_80D01E4: @ 80D01E4
 	push {lr}
 	ldr r0, =0x02039d80
 	ldr r0, [r0]
@@ -374772,7 +374772,7 @@ _080D0246:
 	thumb_func_end sub_80D01E4
 
 	thumb_func_start sub_80D024C
-sub_80D024C: ; 80D024C
+sub_80D024C: @ 80D024C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r6, =0x02039d80
@@ -374884,7 +374884,7 @@ _080D033A:
 	thumb_func_end sub_80D024C
 
 	thumb_func_start sub_80D0344
-sub_80D0344: ; 80D0344
+sub_80D0344: @ 80D0344
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r0, [r4]
@@ -374939,7 +374939,7 @@ _080D03AA:
 	thumb_func_end sub_80D0344
 
 	thumb_func_start sub_80D03B0
-sub_80D03B0: ; 80D03B0
+sub_80D03B0: @ 80D03B0
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r0, [r4]
@@ -374994,7 +374994,7 @@ _080D0418:
 	thumb_func_end sub_80D03B0
 
 	thumb_func_start sub_80D0420
-sub_80D0420: ; 80D0420
+sub_80D0420: @ 80D0420
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r0, [r4]
@@ -375059,7 +375059,7 @@ _080D049A:
 	thumb_func_end sub_80D0420
 
 	thumb_func_start sub_80D04A0
-sub_80D04A0: ; 80D04A0
+sub_80D04A0: @ 80D04A0
 	push {r4,lr}
 	bl sub_80CD554
 	adds r4, r0, 0
@@ -375083,7 +375083,7 @@ _080D04C2:
 	thumb_func_end sub_80D04A0
 
 	thumb_func_start sub_80D04C8
-sub_80D04C8: ; 80D04C8
+sub_80D04C8: @ 80D04C8
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r0, [r4]
@@ -375167,7 +375167,7 @@ _080D0578:
 	thumb_func_end sub_80D04C8
 
 	thumb_func_start sub_80D0580
-sub_80D0580: ; 80D0580
+sub_80D0580: @ 80D0580
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -375257,7 +375257,7 @@ _080D0626:
 	thumb_func_end sub_80D0580
 
 	thumb_func_start sub_80D062C
-sub_80D062C: ; 80D062C
+sub_80D062C: @ 80D062C
 	push {r4-r7,lr}
 	ldr r6, =0x02039d80
 	ldr r2, [r6]
@@ -375343,7 +375343,7 @@ _080D06C4:
 	thumb_func_end sub_80D062C
 
 	thumb_func_start sub_80D06D0
-sub_80D06D0: ; 80D06D0
+sub_80D06D0: @ 80D06D0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -375375,7 +375375,7 @@ _080D0700:
 	thumb_func_end sub_80D06D0
 
 	thumb_func_start sub_80D0708
-sub_80D0708: ; 80D0708
+sub_80D0708: @ 80D0708
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -375407,7 +375407,7 @@ _080D0738:
 	thumb_func_end sub_80D0708
 
 	thumb_func_start sub_80D0740
-sub_80D0740: ; 80D0740
+sub_80D0740: @ 80D0740
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -375439,7 +375439,7 @@ _080D0770:
 	thumb_func_end sub_80D0740
 
 	thumb_func_start sub_80D0778
-sub_80D0778: ; 80D0778
+sub_80D0778: @ 80D0778
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -375471,7 +375471,7 @@ _080D07A8:
 	thumb_func_end sub_80D0778
 
 	thumb_func_start sub_80D07B0
-sub_80D07B0: ; 80D07B0
+sub_80D07B0: @ 80D07B0
 	push {r4-r7,lr}
 	sub sp, 0x1C
 	lsls r0, 24
@@ -375536,7 +375536,7 @@ _080D0828:
 	thumb_func_end sub_80D07B0
 
 	thumb_func_start sub_80D0834
-sub_80D0834: ; 80D0834
+sub_80D0834: @ 80D0834
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -375578,7 +375578,7 @@ _080D0878:
 	thumb_func_end sub_80D0834
 
 	thumb_func_start sub_80D0884
-sub_80D0884: ; 80D0884
+sub_80D0884: @ 80D0884
 	ldr r3, =0x02039d80
 	ldr r3, [r3]
 	strh r0, [r3, 0xC]
@@ -375589,7 +375589,7 @@ sub_80D0884: ; 80D0884
 	thumb_func_end sub_80D0884
 
 	thumb_func_start sub_80D0894
-sub_80D0894: ; 80D0894
+sub_80D0894: @ 80D0894
 	push {r4,lr}
 	ldr r4, =0x02039d80
 	ldr r1, [r4]
@@ -375619,7 +375619,7 @@ _080D08BE:
 	thumb_func_end sub_80D0894
 
 	thumb_func_start sub_80D08CC
-sub_80D08CC: ; 80D08CC
+sub_80D08CC: @ 80D08CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -375734,7 +375734,7 @@ _080D0990:
 	thumb_func_end sub_80D08CC
 
 	thumb_func_start sub_80D09A4
-sub_80D09A4: ; 80D09A4
+sub_80D09A4: @ 80D09A4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -375798,7 +375798,7 @@ _080D0A0C:
 	thumb_func_end sub_80D09A4
 
 	thumb_func_start sub_80D0A1C
-sub_80D0A1C: ; 80D0A1C
+sub_80D0A1C: @ 80D0A1C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -375875,7 +375875,7 @@ _080D0A98:
 	thumb_func_end sub_80D0A1C
 
 	thumb_func_start sub_80D0AAC
-sub_80D0AAC: ; 80D0AAC
+sub_80D0AAC: @ 80D0AAC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -375967,7 +375967,7 @@ _080D0B46:
 	thumb_func_end sub_80D0AAC
 
 	thumb_func_start sub_80D0B5C
-sub_80D0B5C: ; 80D0B5C
+sub_80D0B5C: @ 80D0B5C
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -376001,7 +376001,7 @@ sub_80D0B5C: ; 80D0B5C
 	thumb_func_end sub_80D0B5C
 
 	thumb_func_start sub_80D0BA4
-sub_80D0BA4: ; 80D0BA4
+sub_80D0BA4: @ 80D0BA4
 	ldr r0, =0x02039d80
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x3]
@@ -376017,7 +376017,7 @@ sub_80D0BA4: ; 80D0BA4
 	thumb_func_end sub_80D0BA4
 
 	thumb_func_start sub_80D0BC0
-sub_80D0BC0: ; 80D0BC0
+sub_80D0BC0: @ 80D0BC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -376104,7 +376104,7 @@ _080D0C50:
 	thumb_func_end sub_80D0BC0
 
 	thumb_func_start sub_80D0C60
-sub_80D0C60: ; 80D0C60
+sub_80D0C60: @ 80D0C60
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -376232,7 +376232,7 @@ _080D0D3E:
 	thumb_func_end sub_80D0C60
 
 	thumb_func_start sub_80D0D8C
-sub_80D0D8C: ; 80D0D8C
+sub_80D0D8C: @ 80D0D8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -376323,7 +376323,7 @@ _080D0E42:
 	thumb_func_end sub_80D0D8C
 
 	thumb_func_start sub_80D0E50
-sub_80D0E50: ; 80D0E50
+sub_80D0E50: @ 80D0E50
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -376356,7 +376356,7 @@ _080D0E86:
 	thumb_func_end sub_80D0E50
 
 	thumb_func_start sub_80D0E90
-sub_80D0E90: ; 80D0E90
+sub_80D0E90: @ 80D0E90
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -376430,7 +376430,7 @@ _080D0F20:
 	thumb_func_end sub_80D0E90
 
 	thumb_func_start sub_80D0F38
-sub_80D0F38: ; 80D0F38
+sub_80D0F38: @ 80D0F38
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -376480,7 +376480,7 @@ sub_80D0F38: ; 80D0F38
 	thumb_func_end sub_80D0F38
 
 	thumb_func_start sub_80D0FAC
-sub_80D0FAC: ; 80D0FAC
+sub_80D0FAC: @ 80D0FAC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -376576,7 +376576,7 @@ _080D106A:
 	thumb_func_end sub_80D0FAC
 
 	thumb_func_start sub_80D1080
-sub_80D1080: ; 80D1080
+sub_80D1080: @ 80D1080
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -376642,7 +376642,7 @@ _080D1100:
 	thumb_func_end sub_80D1080
 
 	thumb_func_start sub_80D1114
-sub_80D1114: ; 80D1114
+sub_80D1114: @ 80D1114
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -376703,7 +376703,7 @@ _080D1188:
 	thumb_func_end sub_80D1114
 
 	thumb_func_start sub_80D1194
-sub_80D1194: ; 80D1194
+sub_80D1194: @ 80D1194
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -376732,7 +376732,7 @@ _080D11C2:
 	thumb_func_end sub_80D1194
 
 	thumb_func_start sub_80D11CC
-sub_80D11CC: ; 80D11CC
+sub_80D11CC: @ 80D11CC
 	push {r4,lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -376773,7 +376773,7 @@ _080D120A:
 	thumb_func_end sub_80D11CC
 
 	thumb_func_start sub_80D1218
-sub_80D1218: ; 80D1218
+sub_80D1218: @ 80D1218
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r0, =0x02039d08
@@ -376820,7 +376820,7 @@ _080D1274:
 	thumb_func_end sub_80D1218
 
 	thumb_func_start sub_80D127C
-sub_80D127C: ; 80D127C
+sub_80D127C: @ 80D127C
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r1, [r0]
@@ -376853,7 +376853,7 @@ _080D12B2:
 	thumb_func_end sub_80D127C
 
 	thumb_func_start sub_80D12B8
-sub_80D12B8: ; 80D12B8
+sub_80D12B8: @ 80D12B8
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -376867,7 +376867,7 @@ sub_80D12B8: ; 80D12B8
 	thumb_func_end sub_80D12B8
 
 	thumb_func_start sub_80D12D4
-sub_80D12D4: ; 80D12D4
+sub_80D12D4: @ 80D12D4
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
 	ldr r1, =0x00002234
@@ -376878,7 +376878,7 @@ sub_80D12D4: ; 80D12D4
 	thumb_func_end sub_80D12D4
 
 	thumb_func_start sub_80D12E8
-sub_80D12E8: ; 80D12E8
+sub_80D12E8: @ 80D12E8
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x02039d08
@@ -376910,7 +376910,7 @@ _080D131C:
 	thumb_func_end sub_80D12E8
 
 	thumb_func_start sub_80D1324
-sub_80D1324: ; 80D1324
+sub_80D1324: @ 80D1324
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -376951,7 +376951,7 @@ _080D136A:
 	thumb_func_end sub_80D1324
 
 	thumb_func_start sub_80D1370
-sub_80D1370: ; 80D1370
+sub_80D1370: @ 80D1370
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -376995,7 +376995,7 @@ _080D13BC:
 	thumb_func_end sub_80D1370
 
 	thumb_func_start sub_80D13C4
-sub_80D13C4: ; 80D13C4
+sub_80D13C4: @ 80D13C4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r2, 0
@@ -377032,7 +377032,7 @@ _080D1404:
 	thumb_func_end sub_80D13C4
 
 	thumb_func_start sub_80D140C
-sub_80D140C: ; 80D140C
+sub_80D140C: @ 80D140C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -377164,7 +377164,7 @@ _080D150A:
 	thumb_func_end sub_80D140C
 
 	thumb_func_start sub_80D1524
-sub_80D1524: ; 80D1524
+sub_80D1524: @ 80D1524
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -377240,7 +377240,7 @@ _080D15AC:
 	thumb_func_end sub_80D1524
 
 	thumb_func_start sub_80D15D4
-sub_80D15D4: ; 80D15D4
+sub_80D15D4: @ 80D15D4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -377264,7 +377264,7 @@ _080D15F6:
 	thumb_func_end sub_80D15D4
 
 	thumb_func_start sub_80D1604
-sub_80D1604: ; 80D1604
+sub_80D1604: @ 80D1604
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -377398,7 +377398,7 @@ _080D172E:
 	thumb_func_end sub_80D1604
 
 	thumb_func_start sub_80D1740
-sub_80D1740: ; 80D1740
+sub_80D1740: @ 80D1740
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -377440,7 +377440,7 @@ _080D1780:
 	thumb_func_end sub_80D1740
 
 	thumb_func_start GetItemIconPic
-GetItemIconPic: ; 80D1794
+GetItemIconPic: @ 80D1794
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -377451,7 +377451,7 @@ GetItemIconPic: ; 80D1794
 	thumb_func_end GetItemIconPic
 
 	thumb_func_start GetItemIconPalette
-GetItemIconPalette: ; 80D17A4
+GetItemIconPalette: @ 80D17A4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -377462,7 +377462,7 @@ GetItemIconPalette: ; 80D17A4
 	thumb_func_end GetItemIconPalette
 
 	thumb_func_start sub_80D17B4
-sub_80D17B4: ; 80D17B4
+sub_80D17B4: @ 80D17B4
 	push {r4,lr}
 	sub sp, 0x14
 	bl sub_80D127C
@@ -377506,7 +377506,7 @@ _080D17DA:
 	thumb_func_end sub_80D17B4
 
 	thumb_func_start sub_80D1818
-sub_80D1818: ; 80D1818
+sub_80D1818: @ 80D1818
 	push {lr}
 	ldr r0, =0x02039d08
 	ldr r0, [r0]
@@ -377528,7 +377528,7 @@ sub_80D1818: ; 80D1818
 	thumb_func_end sub_80D1818
 
 	thumb_func_start sub_80D184C
-sub_80D184C: ; 80D184C
+sub_80D184C: @ 80D184C
 	push {r4,r5,lr}
 	sub sp, 0x10
 	ldr r0, =0x02039d08
@@ -377601,7 +377601,7 @@ _080D18D2:
 	thumb_func_end sub_80D184C
 
 	thumb_func_start sub_80D18E4
-sub_80D18E4: ; 80D18E4
+sub_80D18E4: @ 80D18E4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	ldr r5, =0x02039d08
@@ -377702,7 +377702,7 @@ _080D19A4:
 	thumb_func_end sub_80D18E4
 
 	thumb_func_start sub_80D19B4
-sub_80D19B4: ; 80D19B4
+sub_80D19B4: @ 80D19B4
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r7, r0, 0
@@ -377770,7 +377770,7 @@ _080D19EC:
 	thumb_func_end sub_80D19B4
 
 	thumb_func_start sub_80D1A48
-sub_80D1A48: ; 80D1A48
+sub_80D1A48: @ 80D1A48
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -377794,7 +377794,7 @@ _080D1A68:
 	thumb_func_end sub_80D1A48
 
 	thumb_func_start sub_80D1A74
-sub_80D1A74: ; 80D1A74
+sub_80D1A74: @ 80D1A74
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -377850,7 +377850,7 @@ _080D1AD0:
 	thumb_func_end sub_80D1A74
 
 	thumb_func_start sub_80D1AD8
-sub_80D1AD8: ; 80D1AD8
+sub_80D1AD8: @ 80D1AD8
 	ldr r1, =0x02039d08
 	ldr r3, [r1]
 	ldr r1, =0x00000cb4
@@ -377880,7 +377880,7 @@ sub_80D1AD8: ; 80D1AD8
 	thumb_func_end sub_80D1AD8
 
 	thumb_func_start sub_80D1B14
-sub_80D1B14: ; 80D1B14
+sub_80D1B14: @ 80D1B14
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -377948,7 +377948,7 @@ _080D1B8A:
 	thumb_func_end sub_80D1B14
 
 	thumb_func_start sub_80D1B94
-sub_80D1B94: ; 80D1B94
+sub_80D1B94: @ 80D1B94
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -378027,7 +378027,7 @@ _080D1C20:
 	thumb_func_end sub_80D1B94
 
 	thumb_func_start sub_80D1C30
-sub_80D1C30: ; 80D1C30
+sub_80D1C30: @ 80D1C30
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -378107,7 +378107,7 @@ _080D1CBE:
 	thumb_func_end sub_80D1C30
 
 	thumb_func_start sub_80D1CCC
-sub_80D1CCC: ; 80D1CCC
+sub_80D1CCC: @ 80D1CCC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x22]
@@ -378137,18 +378137,18 @@ _080D1CFC:
 	thumb_func_end sub_80D1CCC
 
 	thumb_func_start nullsub_40
-nullsub_40: ; 80D1D04
+nullsub_40: @ 80D1D04
 	bx lr
 	thumb_func_end nullsub_40
 
 	thumb_func_start nullsub_98
-nullsub_98: ; 80D1D08
+nullsub_98: @ 80D1D08
 	bx lr
 	thumb_func_end nullsub_98
 
 	thumb_func_start get_preferred_box
-; char get_preferred_box()
-get_preferred_box: ; 80D1D0C
+@ char get_preferred_box()
+get_preferred_box: @ 80D1D0C
 	ldr r0, =0x03005d94
 	ldr r0, [r0]
 	ldrb r0, [r0]
@@ -378157,7 +378157,7 @@ get_preferred_box: ; 80D1D0C
 	thumb_func_end get_preferred_box
 
 	thumb_func_start sub_80D1D18
-sub_80D1D18: ; 80D1D18
+sub_80D1D18: @ 80D1D18
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -378173,7 +378173,7 @@ _080D1D28:
 	thumb_func_end sub_80D1D18
 
 	thumb_func_start get_pokemon_data_from_any_box
-get_pokemon_data_from_any_box: ; 80D1D30
+get_pokemon_data_from_any_box: @ 80D1D30
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378210,7 +378210,7 @@ _080D1D6E:
 	thumb_func_end get_pokemon_data_from_any_box
 
 	thumb_func_start set_pokemon_data_from_any_box
-set_pokemon_data_from_any_box: ; 80D1D74
+set_pokemon_data_from_any_box: @ 80D1D74
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -378246,7 +378246,7 @@ _080D1DAC:
 	thumb_func_end set_pokemon_data_from_any_box
 
 	thumb_func_start get_pokemon_data_from_selected_box
-get_pokemon_data_from_selected_box: ; 80D1DB8
+get_pokemon_data_from_selected_box: @ 80D1DB8
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -378263,7 +378263,7 @@ get_pokemon_data_from_selected_box: ; 80D1DB8
 	thumb_func_end get_pokemon_data_from_selected_box
 
 	thumb_func_start set_pokemon_data_from_selected_box
-set_pokemon_data_from_selected_box: ; 80D1DD8
+set_pokemon_data_from_selected_box: @ 80D1DD8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -378283,7 +378283,7 @@ set_pokemon_data_from_selected_box: ; 80D1DD8
 	thumb_func_end set_pokemon_data_from_selected_box
 
 	thumb_func_start sub_80D1DFC
-sub_80D1DFC: ; 80D1DFC
+sub_80D1DFC: @ 80D1DFC
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378322,7 +378322,7 @@ _080D1E3C:
 	thumb_func_end sub_80D1DFC
 
 	thumb_func_start sub_80D1E44
-sub_80D1E44: ; 80D1E44
+sub_80D1E44: @ 80D1E44
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -378362,7 +378362,7 @@ _080D1E84:
 	thumb_func_end sub_80D1E44
 
 	thumb_func_start sub_80D1E90
-sub_80D1E90: ; 80D1E90
+sub_80D1E90: @ 80D1E90
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378397,7 +378397,7 @@ _080D1EC6:
 	thumb_func_end sub_80D1E90
 
 	thumb_func_start sub_80D1ED0
-sub_80D1ED0: ; 80D1ED0
+sub_80D1ED0: @ 80D1ED0
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -378436,7 +378436,7 @@ _080D1F12:
 	thumb_func_end sub_80D1ED0
 
 	thumb_func_start sub_80D1F18
-sub_80D1F18: ; 80D1F18
+sub_80D1F18: @ 80D1F18
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378471,7 +378471,7 @@ _080D1F4E:
 	thumb_func_end sub_80D1F18
 
 	thumb_func_start sub_80D1F58
-sub_80D1F58: ; 80D1F58
+sub_80D1F58: @ 80D1F58
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378506,7 +378506,7 @@ _080D1F8E:
 	thumb_func_end sub_80D1F58
 
 	thumb_func_start sub_80D1F98
-sub_80D1F98: ; 80D1F98
+sub_80D1F98: @ 80D1F98
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -378572,7 +378572,7 @@ _080D2004:
 	thumb_func_end sub_80D1F98
 
 	thumb_func_start sub_80D2018
-sub_80D2018: ; 80D2018
+sub_80D2018: @ 80D2018
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -378604,7 +378604,7 @@ _080D2048:
 	thumb_func_end sub_80D2018
 
 	thumb_func_start sub_80D2054
-sub_80D2054: ; 80D2054
+sub_80D2054: @ 80D2054
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -378638,8 +378638,8 @@ _080D2088:
 	thumb_func_end sub_80D2054
 
 	thumb_func_start get_pokemon_by_box_and_pos
-; pokemon *get_pokemon_by_box_and_pos(u8 box_id, u8 pos)
-get_pokemon_by_box_and_pos: ; 80D2094
+@ pokemon *get_pokemon_by_box_and_pos(u8 box_id, u8 pos)
+get_pokemon_by_box_and_pos: @ 80D2094
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -378673,7 +378673,7 @@ _080D20CA:
 	thumb_func_end get_pokemon_by_box_and_pos
 
 	thumb_func_start sav3_get_box_name
-sav3_get_box_name: ; 80D20D0
+sav3_get_box_name: @ 80D20D0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -378696,7 +378696,7 @@ _080D20EC:
 	thumb_func_end sav3_get_box_name
 
 	thumb_func_start sub_80D20F8
-sub_80D20F8: ; 80D20F8
+sub_80D20F8: @ 80D20F8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -378718,7 +378718,7 @@ _080D2112:
 	thumb_func_end sub_80D20F8
 
 	thumb_func_start sub_80D2120
-sub_80D2120: ; 80D2120
+sub_80D2120: @ 80D2120
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -378741,7 +378741,7 @@ _080D213E:
 	thumb_func_end sub_80D2120
 
 	thumb_func_start sub_80D214C
-sub_80D214C: ; 80D214C
+sub_80D214C: @ 80D214C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -378852,7 +378852,7 @@ _080D220C:
 	thumb_func_end sub_80D214C
 
 	thumb_func_start sub_80D2218
-sub_80D2218: ; 80D2218
+sub_80D2218: @ 80D2218
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -378901,7 +378901,7 @@ _080D2262:
 	thumb_func_end sub_80D2218
 
 	thumb_func_start sub_80D2270
-sub_80D2270: ; 80D2270
+sub_80D2270: @ 80D2270
 	push {r4-r6,lr}
 	adds r2, r1, 0
 	cmp r0, 0xD
@@ -378951,7 +378951,7 @@ _080D22CA:
 	thumb_func_end sub_80D2270
 
 	thumb_func_start sub_80D22D0
-sub_80D22D0: ; 80D22D0
+sub_80D22D0: @ 80D22D0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -379008,7 +379008,7 @@ _080D231A:
 	thumb_func_end sub_80D22D0
 
 	thumb_func_start sub_80D233C
-sub_80D233C: ; 80D233C
+sub_80D233C: @ 80D233C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -379066,7 +379066,7 @@ _080D2386:
 	thumb_func_end sub_80D233C
 
 	thumb_func_start sub_80D23A8
-sub_80D23A8: ; 80D23A8
+sub_80D23A8: @ 80D23A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -379132,7 +379132,7 @@ _080D241E:
 	thumb_func_end sub_80D23A8
 
 	thumb_func_start sub_80D242C
-sub_80D242C: ; 80D242C
+sub_80D242C: @ 80D242C
 	ldr r2, =0x03005d8c
 	ldr r0, [r2]
 	ldr r1, =0x00003d84
@@ -379165,7 +379165,7 @@ sub_80D242C: ; 80D242C
 	thumb_func_end sub_80D242C
 
 	thumb_func_start sub_80D2480
-sub_80D2480: ; 80D2480
+sub_80D2480: @ 80D2480
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
 	ldr r2, =0x00003d86
@@ -379176,7 +379176,7 @@ sub_80D2480: ; 80D2480
 	thumb_func_end sub_80D2480
 
 	thumb_func_start sub_80D2494
-sub_80D2494: ; 80D2494
+sub_80D2494: @ 80D2494
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003d86
@@ -379187,7 +379187,7 @@ sub_80D2494: ; 80D2494
 	thumb_func_end sub_80D2494
 
 	thumb_func_start sub_80D24A8
-sub_80D24A8: ; 80D24A8
+sub_80D24A8: @ 80D24A8
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003d85
@@ -379198,7 +379198,7 @@ sub_80D24A8: ; 80D24A8
 	thumb_func_end sub_80D24A8
 
 	thumb_func_start sub_80D24BC
-sub_80D24BC: ; 80D24BC
+sub_80D24BC: @ 80D24BC
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -379216,7 +379216,7 @@ _080D24D0:
 	thumb_func_end sub_80D24BC
 
 	thumb_func_start sub_80D24DC
-sub_80D24DC: ; 80D24DC
+sub_80D24DC: @ 80D24DC
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003d84
@@ -379227,7 +379227,7 @@ sub_80D24DC: ; 80D24DC
 	thumb_func_end sub_80D24DC
 
 	thumb_func_start sub_80D24F0
-sub_80D24F0: ; 80D24F0
+sub_80D24F0: @ 80D24F0
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -379245,7 +379245,7 @@ _080D2504:
 	thumb_func_end sub_80D24F0
 
 	thumb_func_start sub_80D2510
-sub_80D2510: ; 80D2510
+sub_80D2510: @ 80D2510
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003d70
@@ -379255,7 +379255,7 @@ sub_80D2510: ; 80D2510
 	thumb_func_end sub_80D2510
 
 	thumb_func_start sub_80D2524
-sub_80D2524: ; 80D2524
+sub_80D2524: @ 80D2524
 	push {r4,lr}
 	ldr r2, =0x03005d8c
 	ldr r2, [r2]
@@ -379272,7 +379272,7 @@ sub_80D2524: ; 80D2524
 	thumb_func_end sub_80D2524
 
 	thumb_func_start sub_80D2548
-sub_80D2548: ; 80D2548
+sub_80D2548: @ 80D2548
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003d74
@@ -379282,7 +379282,7 @@ sub_80D2548: ; 80D2548
 	thumb_func_end sub_80D2548
 
 	thumb_func_start sub_80D255C
-sub_80D255C: ; 80D255C
+sub_80D255C: @ 80D255C
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03005d8c
@@ -379296,7 +379296,7 @@ sub_80D255C: ; 80D255C
 	thumb_func_end sub_80D255C
 
 	thumb_func_start sub_80D2578
-sub_80D2578: ; 80D2578
+sub_80D2578: @ 80D2578
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x03005d8c
@@ -379315,7 +379315,7 @@ _080D258C:
 	thumb_func_end sub_80D2578
 
 	thumb_func_start sub_80D259C
-sub_80D259C: ; 80D259C
+sub_80D259C: @ 80D259C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -379360,7 +379360,7 @@ _080D25E2:
 	thumb_func_end sub_80D259C
 
 	thumb_func_start sub_80D25F0
-sub_80D25F0: ; 80D25F0
+sub_80D25F0: @ 80D25F0
 	push {lr}
 	ldr r0, =0x02039d84
 	ldr r0, [r0]
@@ -379371,7 +379371,7 @@ sub_80D25F0: ; 80D25F0
 	thumb_func_end sub_80D25F0
 
 	thumb_func_start sub_80D2604
-sub_80D2604: ; 80D2604
+sub_80D2604: @ 80D2604
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r0, =0x02039d88
@@ -379405,7 +379405,7 @@ _080D2634:
 	thumb_func_end sub_80D2604
 
 	thumb_func_start sub_80D2644
-sub_80D2644: ; 80D2644
+sub_80D2644: @ 80D2644
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -379529,7 +379529,7 @@ _080D272C:
 	thumb_func_end sub_80D2644
 
 	thumb_func_start sub_80D2740
-sub_80D2740: ; 80D2740
+sub_80D2740: @ 80D2740
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -379555,7 +379555,7 @@ _080D2764:
 	thumb_func_end sub_80D2740
 
 	thumb_func_start sub_80D2770
-sub_80D2770: ; 80D2770
+sub_80D2770: @ 80D2770
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -379586,7 +379586,7 @@ _080D279C:
 	thumb_func_end sub_80D2770
 
 	thumb_func_start sub_80D27AC
-sub_80D27AC: ; 80D27AC
+sub_80D27AC: @ 80D27AC
 	push {r4-r6,lr}
 	ldr r4, [sp, 0x10]
 	lsls r0, 24
@@ -379624,7 +379624,7 @@ _080D27E6:
 	thumb_func_end sub_80D27AC
 
 	thumb_func_start sub_80D27F4
-sub_80D27F4: ; 80D27F4
+sub_80D27F4: @ 80D27F4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -379772,7 +379772,7 @@ _080D290E:
 	thumb_func_end sub_80D27F4
 
 	thumb_func_start sub_80D2918
-sub_80D2918: ; 80D2918
+sub_80D2918: @ 80D2918
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -379809,7 +379809,7 @@ _080D2952:
 	thumb_func_end sub_80D2918
 
 	thumb_func_start sub_80D2960
-sub_80D2960: ; 80D2960
+sub_80D2960: @ 80D2960
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -379889,7 +379889,7 @@ _080D29E4:
 	thumb_func_end sub_80D2960
 
 	thumb_func_start sub_80D29F8
-sub_80D29F8: ; 80D29F8
+sub_80D29F8: @ 80D29F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -379969,7 +379969,7 @@ _080D2A7C:
 	thumb_func_end sub_80D29F8
 
 	thumb_func_start sub_80D2A90
-sub_80D2A90: ; 80D2A90
+sub_80D2A90: @ 80D2A90
 	ldr r3, =0x02039d8c
 	str r0, [r3]
 	str r1, [r0]
@@ -379981,7 +379981,7 @@ sub_80D2A90: ; 80D2A90
 	thumb_func_end sub_80D2A90
 
 	thumb_func_start sub_80D2AA4
-sub_80D2AA4: ; 80D2AA4
+sub_80D2AA4: @ 80D2AA4
 	push {r4,r5,lr}
 	ldr r2, =0x02039d8c
 	ldr r1, [r2]
@@ -380022,7 +380022,7 @@ _080D2AE2:
 	thumb_func_end sub_80D2AA4
 
 	thumb_func_start sub_80D2AEC
-sub_80D2AEC: ; 80D2AEC
+sub_80D2AEC: @ 80D2AEC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -380102,7 +380102,7 @@ _080D2B76:
 	thumb_func_end sub_80D2AEC
 
 	thumb_func_start sub_80D2B88
-sub_80D2B88: ; 80D2B88
+sub_80D2B88: @ 80D2B88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -380134,7 +380134,7 @@ _080D2BB2:
 	thumb_func_end sub_80D2B88
 
 	thumb_func_start sub_80D2BC0
-sub_80D2BC0: ; 80D2BC0
+sub_80D2BC0: @ 80D2BC0
 	push {r4-r7,lr}
 	mov r12, r0
 	ldr r0, [sp, 0x14]
@@ -380182,7 +380182,7 @@ _080D2C16:
 	thumb_func_end sub_80D2BC0
 
 	thumb_func_start sub_80D2C1C
-sub_80D2C1C: ; 80D2C1C
+sub_80D2C1C: @ 80D2C1C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -380269,8 +380269,8 @@ _080D2CAA:
 	thumb_func_end sub_80D2C1C
 
 	thumb_func_start sub_80D2CC4
-; int sub_80D2CC4(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
-sub_80D2CC4: ; 80D2CC4
+@ int sub_80D2CC4(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
+sub_80D2CC4: @ 80D2CC4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -380350,7 +380350,7 @@ _080D2D2A:
 	thumb_func_end sub_80D2CC4
 
 	thumb_func_start sub_80D2D78
-sub_80D2D78: ; 80D2D78
+sub_80D2D78: @ 80D2D78
 	push {r4-r7,lr}
 	sub sp, 0x18
 	adds r4, r2, 0
@@ -380411,8 +380411,8 @@ sub_80D2D78: ; 80D2D78
 	thumb_func_end sub_80D2D78
 
 	thumb_func_start mon_icon_convert_unown_species_id
-; u16 mon_icon_convert_unown_species_id(u16 speciesId, u32 personality)
-mon_icon_convert_unown_species_id: ; 80D2E08
+@ u16 mon_icon_convert_unown_species_id(u16 speciesId, u32 personality)
+mon_icon_convert_unown_species_id: @ 80D2E08
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -380450,7 +380450,7 @@ _080D2E40:
 	thumb_func_end mon_icon_convert_unown_species_id
 
 	thumb_func_start mon_icon_personality_to_unown_id
-mon_icon_personality_to_unown_id: ; 80D2E48
+mon_icon_personality_to_unown_id: @ 80D2E48
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0
@@ -380485,7 +380485,7 @@ _080D2E80:
 	thumb_func_end mon_icon_personality_to_unown_id
 
 	thumb_func_start sub_80D2E84
-sub_80D2E84: ; 80D2E84
+sub_80D2E84: @ 80D2E84
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -380535,8 +380535,8 @@ _080D2ED2:
 	thumb_func_end sub_80D2E84
 
 	thumb_func_start sub_80D2EDC
-; void *sub_80D2EDC(u16 speciesId, u32 personality, bool32)
-sub_80D2EDC: ; 80D2EDC
+@ void *sub_80D2EDC(u16 speciesId, u32 personality, bool32)
+sub_80D2EDC: @ 80D2EDC
 	push {r4,lr}
 	adds r4, r2, 0
 	lsls r0, 16
@@ -380552,7 +380552,7 @@ sub_80D2EDC: ; 80D2EDC
 	thumb_func_end sub_80D2EDC
 
 	thumb_func_start sub_80D2EF8
-sub_80D2EF8: ; 80D2EF8
+sub_80D2EF8: @ 80D2EF8
 	push {lr}
 	bl sub_80D328C
 	pop {r0}
@@ -380560,7 +380560,7 @@ sub_80D2EF8: ; 80D2EF8
 	thumb_func_end sub_80D2EF8
 
 	thumb_func_start sub_80D2F04
-sub_80D2F04: ; 80D2F04
+sub_80D2F04: @ 80D2F04
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gMonIconPaletteTable
@@ -380580,7 +380580,7 @@ _080D2F0A:
 	thumb_func_end sub_80D2F04
 
 	thumb_func_start sub_80D2F28
-sub_80D2F28: ; 80D2F28
+sub_80D2F28: @ 80D2F28
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -380613,7 +380613,7 @@ _080D2F5A:
 	thumb_func_end sub_80D2F28
 
 	thumb_func_start sub_80D2F68
-sub_80D2F68: ; 80D2F68
+sub_80D2F68: @ 80D2F68
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -380639,7 +380639,7 @@ _080D2F8E:
 	thumb_func_end sub_80D2F68
 
 	thumb_func_start sub_80D2F9C
-sub_80D2F9C: ; 80D2F9C
+sub_80D2F9C: @ 80D2F9C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gMonIconPaletteTable
@@ -380660,7 +380660,7 @@ _080D2FA2:
 	thumb_func_end sub_80D2F9C
 
 	thumb_func_start sub_80D2FC0
-sub_80D2FC0: ; 80D2FC0
+sub_80D2FC0: @ 80D2FC0
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -380685,7 +380685,7 @@ _080D2FD2:
 	thumb_func_end sub_80D2FC0
 
 	thumb_func_start sub_80D2FF0
-sub_80D2FF0: ; 80D2FF0
+sub_80D2FF0: @ 80D2FF0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -380703,7 +380703,7 @@ sub_80D2FF0: ; 80D2FF0
 	thumb_func_end sub_80D2FF0
 
 	thumb_func_start sub_80D3014
-sub_80D3014: ; 80D3014
+sub_80D3014: @ 80D3014
 	push {lr}
 	bl sub_80D30DC
 	pop {r0}
@@ -380711,8 +380711,8 @@ sub_80D3014: ; 80D3014
 	thumb_func_end sub_80D3014
 
 	thumb_func_start GetMonIconTiles
-; void *GetMonIconTiles(u16 speciesId, bool32)
-GetMonIconTiles: ; 80D3020
+@ void *GetMonIconTiles(u16 speciesId, bool32)
+GetMonIconTiles: @ 80D3020
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 16
@@ -380738,7 +380738,7 @@ _080D3042:
 	thumb_func_end GetMonIconTiles
 
 	thumb_func_start sub_80D304C
-sub_80D304C: ; 80D304C
+sub_80D304C: @ 80D304C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -380767,7 +380767,7 @@ _080D3074:
 	thumb_func_end sub_80D304C
 
 	thumb_func_start sub_80D3080
-sub_80D3080: ; 80D3080
+sub_80D3080: @ 80D3080
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -380787,7 +380787,7 @@ _080D3092:
 	thumb_func_end sub_80D3080
 
 	thumb_func_start sub_80D30A0
-sub_80D30A0: ; 80D30A0
+sub_80D30A0: @ 80D30A0
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =gMonIconPaletteIndices
@@ -380798,7 +380798,7 @@ sub_80D30A0: ; 80D30A0
 	thumb_func_end sub_80D30A0
 
 	thumb_func_start sub_80D30B0
-sub_80D30B0: ; 80D30B0
+sub_80D30B0: @ 80D30B0
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -380822,7 +380822,7 @@ _080D30C2:
 	thumb_func_end sub_80D30B0
 
 	thumb_func_start sub_80D30DC
-sub_80D30DC: ; 80D30DC
+sub_80D30DC: @ 80D30DC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -380932,7 +380932,7 @@ _080D31A4:
 	thumb_func_end sub_80D30DC
 
 	thumb_func_start sub_80D31B4
-sub_80D31B4: ; 80D31B4
+sub_80D31B4: @ 80D31B4
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -381034,7 +381034,7 @@ sub_80D31B4: ; 80D31B4
 	thumb_func_end sub_80D31B4
 
 	thumb_func_start sub_80D328C
-sub_80D328C: ; 80D328C
+sub_80D328C: @ 80D328C
 	push {lr}
 	sub sp, 0x8
 	movs r1, 0
@@ -381064,7 +381064,7 @@ sub_80D328C: ; 80D328C
 	thumb_func_end sub_80D328C
 
 	thumb_func_start sub_80D32C8
-sub_80D32C8: ; 80D32C8
+sub_80D32C8: @ 80D32C8
 	mov r12, r0
 	adds r0, 0x2A
 	movs r3, 0
@@ -381083,7 +381083,7 @@ sub_80D32C8: ; 80D32C8
 	thumb_func_end sub_80D32C8
 
 	thumb_func_start exec_movement
-exec_movement: ; 80D32E8
+exec_movement: @ 80D32E8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r3, 0
@@ -381127,7 +381127,7 @@ _080D3332:
 	thumb_func_end exec_movement
 
 	thumb_func_start sub_80D3340
-sub_80D3340: ; 80D3340
+sub_80D3340: @ 80D3340
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -381167,7 +381167,7 @@ _080D3384:
 	thumb_func_end sub_80D3340
 
 	thumb_func_start sub_80D338C
-sub_80D338C: ; 80D338C
+sub_80D338C: @ 80D338C
 	push {r4,lr}
 	bl sub_80D33F4
 	lsls r0, 24
@@ -381185,7 +381185,7 @@ _080D33A6:
 	thumb_func_end sub_80D338C
 
 	thumb_func_start sub_80D33AC
-sub_80D33AC: ; 80D33AC
+sub_80D33AC: @ 80D33AC
 	push {r4,r5,lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -381220,7 +381220,7 @@ _080D33CC:
 	thumb_func_end sub_80D33AC
 
 	thumb_func_start sub_80D33F4
-sub_80D33F4: ; 80D33F4
+sub_80D33F4: @ 80D33F4
 	push {lr}
 	ldr r0, =sub_80D3660
 	bl get_task_id_by_function
@@ -381232,7 +381232,7 @@ sub_80D33F4: ; 80D33F4
 	thumb_func_end sub_80D33F4
 
 	thumb_func_start sub_80D3408
-sub_80D3408: ; 80D3408
+sub_80D3408: @ 80D3408
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -381289,7 +381289,7 @@ _080D3466:
 	thumb_func_end sub_80D3408
 
 	thumb_func_start sub_80D3474
-sub_80D3474: ; 80D3474
+sub_80D3474: @ 80D3474
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -381323,7 +381323,7 @@ _080D34AA:
 	thumb_func_end sub_80D3474
 
 	thumb_func_start sub_80D34B0
-sub_80D34B0: ; 80D34B0
+sub_80D34B0: @ 80D34B0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -381354,7 +381354,7 @@ _080D34DC:
 	thumb_func_end sub_80D34B0
 
 	thumb_func_start sub_80D34E4
-sub_80D34E4: ; 80D34E4
+sub_80D34E4: @ 80D34E4
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r2, 0
@@ -381375,7 +381375,7 @@ sub_80D34E4: ; 80D34E4
 	thumb_func_end sub_80D34E4
 
 	thumb_func_start sub_80D3508
-sub_80D3508: ; 80D3508
+sub_80D3508: @ 80D3508
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r2, 0
@@ -381395,7 +381395,7 @@ sub_80D3508: ; 80D3508
 	thumb_func_end sub_80D3508
 
 	thumb_func_start sub_80D352C
-sub_80D352C: ; 80D352C
+sub_80D352C: @ 80D352C
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -381419,7 +381419,7 @@ sub_80D352C: ; 80D352C
 	thumb_func_end sub_80D352C
 
 	thumb_func_start sub_80D355C
-sub_80D355C: ; 80D355C
+sub_80D355C: @ 80D355C
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -381440,7 +381440,7 @@ sub_80D355C: ; 80D355C
 	thumb_func_end sub_80D355C
 
 	thumb_func_start sub_80D3584
-sub_80D3584: ; 80D3584
+sub_80D3584: @ 80D3584
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -381469,7 +381469,7 @@ _080D35B6:
 	thumb_func_end sub_80D3584
 
 	thumb_func_start npc_obj_offscreen_culling_and_flag_update
-npc_obj_offscreen_culling_and_flag_update: ; 80D35BC
+npc_obj_offscreen_culling_and_flag_update: @ 80D35BC
 	lsls r0, 24
 	ldr r2, =0x02039d90
 	lsrs r0, 22
@@ -381480,7 +381480,7 @@ npc_obj_offscreen_culling_and_flag_update: ; 80D35BC
 	thumb_func_end npc_obj_offscreen_culling_and_flag_update
 
 	thumb_func_start sub_80D35CC
-sub_80D35CC: ; 80D35CC
+sub_80D35CC: @ 80D35CC
 	lsls r0, 24
 	ldr r1, =0x02039d90
 	lsrs r0, 22
@@ -381491,7 +381491,7 @@ sub_80D35CC: ; 80D35CC
 	thumb_func_end sub_80D35CC
 
 	thumb_func_start sub_80D35DC
-sub_80D35DC: ; 80D35DC
+sub_80D35DC: @ 80D35DC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -381523,7 +381523,7 @@ sub_80D35DC: ; 80D35DC
 	thumb_func_end sub_80D35DC
 
 	thumb_func_start sub_80D361C
-sub_80D361C: ; 80D361C
+sub_80D361C: @ 80D361C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -381559,7 +381559,7 @@ _080D3646:
 	thumb_func_end sub_80D361C
 
 	thumb_func_start sub_80D3660
-sub_80D3660: ; 80D3660
+sub_80D3660: @ 80D3660
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -381595,7 +381595,7 @@ _080D3690:
 	thumb_func_end sub_80D3660
 
 	thumb_func_start sub_80D36A4
-sub_80D36A4: ; 80D36A4
+sub_80D36A4: @ 80D36A4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -381652,7 +381652,7 @@ _080D370E:
 	thumb_func_end sub_80D36A4
 
 	thumb_func_start sub_80D3718
-sub_80D3718: ; 80D3718
+sub_80D3718: @ 80D3718
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -382026,7 +382026,7 @@ _080D3A2C:
 	thumb_func_end sub_80D3718
 
 	thumb_func_start hm2_ruin_valley
-hm2_ruin_valley: ; 80D3A50
+hm2_ruin_valley: @ 80D3A50
 	push {lr}
 	movs r0, 0x1
 	bl FieldEffectStart
@@ -382041,7 +382041,7 @@ hm2_ruin_valley: ; 80D3A50
 	thumb_func_end hm2_ruin_valley
 
 	thumb_func_start sub_80D3A6C
-sub_80D3A6C: ; 80D3A6C
+sub_80D3A6C: @ 80D3A6C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -382064,7 +382064,7 @@ sub_80D3A6C: ; 80D3A6C
 	thumb_func_end sub_80D3A6C
 
 	thumb_func_start sub_80D3A9C
-sub_80D3A9C: ; 80D3A9C
+sub_80D3A9C: @ 80D3A9C
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -382079,7 +382079,7 @@ sub_80D3A9C: ; 80D3A9C
 	thumb_func_end sub_80D3A9C
 
 	thumb_func_start sub_80D3ABC
-sub_80D3ABC: ; 80D3ABC
+sub_80D3ABC: @ 80D3ABC
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -382102,7 +382102,7 @@ sub_80D3ABC: ; 80D3ABC
 	thumb_func_end sub_80D3ABC
 
 	thumb_func_start sub_80D3AEC
-sub_80D3AEC: ; 80D3AEC
+sub_80D3AEC: @ 80D3AEC
 	push {lr}
 	movs r0, 0x1
 	bl FieldEffectActiveListRemove
@@ -382113,7 +382113,7 @@ sub_80D3AEC: ; 80D3AEC
 	thumb_func_end sub_80D3AEC
 
 	thumb_func_start sub_80D3B00
-sub_80D3B00: ; 80D3B00
+sub_80D3B00: @ 80D3B00
 	push {r4-r7,lr}
 	movs r6, 0
 	movs r0, 0x80
@@ -382231,7 +382231,7 @@ _080D3BA0:
 	thumb_func_end sub_80D3B00
 
 	thumb_func_start sub_80D3C10
-sub_80D3C10: ; 80D3C10
+sub_80D3C10: @ 80D3C10
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsls r1, 16
@@ -382356,7 +382356,7 @@ _080D3D00:
 	thumb_func_end sub_80D3C10
 
 	thumb_func_start sub_80D3D08
-sub_80D3D08: ; 80D3D08
+sub_80D3D08: @ 80D3D08
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -382399,7 +382399,7 @@ _080D3D56:
 	thumb_func_end sub_80D3D08
 
 	thumb_func_start sub_80D3D5C
-sub_80D3D5C: ; 80D3D5C
+sub_80D3D5C: @ 80D3D5C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -382588,7 +382588,7 @@ _080D3EC8:
 	thumb_func_end sub_80D3D5C
 
 	thumb_func_start sub_80D3EF4
-sub_80D3EF4: ; 80D3EF4
+sub_80D3EF4: @ 80D3EF4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -382870,7 +382870,7 @@ _080D414A:
 	thumb_func_end sub_80D3EF4
 
 	thumb_func_start objc_8097BA8
-objc_8097BA8: ; 80D4160
+objc_8097BA8: @ 80D4160
 	movs r2, 0
 	movs r1, 0x8
 	strh r1, [r0, 0x2E]
@@ -382883,7 +382883,7 @@ objc_8097BA8: ; 80D4160
 	thumb_func_end objc_8097BA8
 
 	thumb_func_start objc_8097BBC
-objc_8097BBC: ; 80D4174
+objc_8097BBC: @ 80D4174
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -382931,7 +382931,7 @@ _080D41C4:
 	thumb_func_end objc_8097BBC
 
 	thumb_func_start sub_80D41D0
-sub_80D41D0: ; 80D41D0
+sub_80D41D0: @ 80D41D0
 	push {r4-r6,lr}
 	movs r4, 0x1
 _080D41D4:
@@ -382979,7 +382979,7 @@ _080D422A:
 	thumb_func_end sub_80D41D0
 
 	thumb_func_start sub_80D423C
-sub_80D423C: ; 80D423C
+sub_80D423C: @ 80D423C
 	push {r4,r5,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -383043,7 +383043,7 @@ _080D42AE:
 	thumb_func_end sub_80D423C
 
 	thumb_func_start sub_80D42B8
-sub_80D42B8: ; 80D42B8
+sub_80D42B8: @ 80D42B8
 	push {r4,r5,lr}
 	lsls r0, 16
 	asrs r4, r0, 16
@@ -383118,7 +383118,7 @@ _080D434A:
 	thumb_func_end sub_80D42B8
 
 	thumb_func_start sub_80D4354
-sub_80D4354: ; 80D4354
+sub_80D4354: @ 80D4354
 	push {lr}
 	movs r0, 0x80
 	bl audio_play
@@ -383130,7 +383130,7 @@ sub_80D4354: ; 80D4354
 	thumb_func_end sub_80D4354
 
 	thumb_func_start sub_80D436C
-sub_80D436C: ; 80D436C
+sub_80D436C: @ 80D436C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x03005d8c
@@ -383155,7 +383155,7 @@ _080D4372:
 	thumb_func_end sub_80D436C
 
 	thumb_func_start sub_80D439C
-sub_80D439C: ; 80D439C
+sub_80D439C: @ 80D439C
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	ldr r0, =0x0000ffff
@@ -383203,7 +383203,7 @@ _080D43D6:
 	thumb_func_end sub_80D439C
 
 	thumb_func_start sub_80D43F0
-sub_80D43F0: ; 80D43F0
+sub_80D43F0: @ 80D43F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xC
@@ -383230,7 +383230,7 @@ _080D441A:
 	thumb_func_end sub_80D43F0
 
 	thumb_func_start sub_80D4420
-sub_80D4420: ; 80D4420
+sub_80D4420: @ 80D4420
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -383433,7 +383433,7 @@ _080D45B6:
 	thumb_func_end sub_80D4420
 
 	thumb_func_start sub_80D45C8
-sub_80D45C8: ; 80D45C8
+sub_80D45C8: @ 80D45C8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -383452,7 +383452,7 @@ _080D45E0:
 	thumb_func_end sub_80D45C8
 
 	thumb_func_start sub_80D45E8
-sub_80D45E8: ; 80D45E8
+sub_80D45E8: @ 80D45E8
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -383474,7 +383474,7 @@ _080D4606:
 	thumb_func_end sub_80D45E8
 
 	thumb_func_start sub_80D460C
-sub_80D460C: ; 80D460C
+sub_80D460C: @ 80D460C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -383528,13 +383528,13 @@ _080D4672:
 	thumb_func_end sub_80D460C
 
 	thumb_func_start sub_80D467C
-sub_80D467C: ; 80D467C
+sub_80D467C: @ 80D467C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80D467C
 
 	thumb_func_start sub_80D4680
-sub_80D4680: ; 80D4680
+sub_80D4680: @ 80D4680
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -383581,7 +383581,7 @@ _080D46D2:
 	thumb_func_end sub_80D4680
 
 	thumb_func_start sub_80D46E0
-sub_80D46E0: ; 80D46E0
+sub_80D46E0: @ 80D46E0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x03005d8c
@@ -383600,7 +383600,7 @@ sub_80D46E0: ; 80D46E0
 	thumb_func_end sub_80D46E0
 
 	thumb_func_start sub_80D4700
-sub_80D4700: ; 80D4700
+sub_80D4700: @ 80D4700
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -383693,7 +383693,7 @@ _080D47AC:
 	thumb_func_end sub_80D4700
 
 	thumb_func_start itemid_is_mail
-itemid_is_mail: ; 80D47BC
+itemid_is_mail: @ 80D47BC
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -383711,7 +383711,7 @@ _080D47D0:
 	thumb_func_end itemid_is_mail
 
 	thumb_func_start sub_80D47D4
-sub_80D47D4: ; 80D47D4
+sub_80D47D4: @ 80D47D4
 	push {lr}
 	bl sub_80A0934
 	bl AddMapNamePopUpWindowTask
@@ -383721,7 +383721,7 @@ sub_80D47D4: ; 80D47D4
 	thumb_func_end sub_80D47D4
 
 	thumb_func_start AddMapNamePopUpWindowTask
-AddMapNamePopUpWindowTask: ; 80D47E4
+AddMapNamePopUpWindowTask: @ 80D47E4
 	push {r4,lr}
 	movs r0, 0x80
 	lsls r0, 7
@@ -383791,7 +383791,7 @@ _080D486C:
 	thumb_func_end AddMapNamePopUpWindowTask
 
 	thumb_func_start Task_MapNamePopUpWindow
-Task_MapNamePopUpWindow: ; 80D487C
+Task_MapNamePopUpWindow: @ 80D487C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -383913,7 +383913,7 @@ _080D496E:
 	thumb_func_end Task_MapNamePopUpWindow
 
 	thumb_func_start HideMapNamePopUpWindow
-HideMapNamePopUpWindow: ; 80D4974
+HideMapNamePopUpWindow: @ 80D4974
 	push {lr}
 	ldr r0, =Task_MapNamePopUpWindow
 	bl is_function_an_active_task
@@ -383939,7 +383939,7 @@ _080D49A4:
 	thumb_func_end HideMapNamePopUpWindow
 
 	thumb_func_start ShowMapNamePopUpWindow
-ShowMapNamePopUpWindow: ; 80D49B0
+ShowMapNamePopUpWindow: @ 80D49B0
 	push {r4,r5,lr}
 	sub sp, 0x24
 	bl InBattlePyramid
@@ -384026,7 +384026,7 @@ _080D4A18:
 	thumb_func_end ShowMapNamePopUpWindow
 
 	thumb_func_start sub_80D4A78
-sub_80D4A78: ; 80D4A78
+sub_80D4A78: @ 80D4A78
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -384191,7 +384191,7 @@ _080D4B8A:
 	thumb_func_end sub_80D4A78
 
 	thumb_func_start LoadMapNamePopUpWindowBg
-LoadMapNamePopUpWindowBg: ; 80D4BE0
+LoadMapNamePopUpWindowBg: @ 80D4BE0
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl GetMapNamePopUpWindowId
@@ -384273,8 +384273,8 @@ _080D4C7A:
 	thumb_func_end LoadMapNamePopUpWindowBg
 
 	thumb_func_start RemoveBagObject
-; void RemoveBagObject(u8 a1)
-RemoveBagObject: ; 80D4CA8
+@ void RemoveBagObject(u8 a1)
+RemoveBagObject: @ 80D4CA8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -384314,8 +384314,8 @@ _080D4CEE:
 	thumb_func_end RemoveBagObject
 
 	thumb_func_start AddBagVisualObject
-; void AddBagVisualObject(u8 bagPocketId)
-AddBagVisualObject: ; 80D4D00
+@ void AddBagVisualObject(u8 bagPocketId)
+AddBagVisualObject: @ 80D4D00
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -384340,8 +384340,8 @@ AddBagVisualObject: ; 80D4D00
 	thumb_func_end AddBagVisualObject
 
 	thumb_func_start SetBagVisualPocketId
-; void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
-SetBagVisualPocketId: ; 80D4D38
+@ void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
+SetBagVisualPocketId: @ 80D4D38
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -384381,8 +384381,8 @@ _080D4D90:
 	thumb_func_end SetBagVisualPocketId
 
 	thumb_func_start ObjectCB_BagVisualSwitchingPockets
-; void ObjectCB_BagVisualSwitchingPockets(struct obj *object)
-ObjectCB_BagVisualSwitchingPockets: ; 80D4D94
+@ void ObjectCB_BagVisualSwitchingPockets(struct obj *object)
+ObjectCB_BagVisualSwitchingPockets: @ 80D4D94
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x26]
@@ -384409,8 +384409,8 @@ _080D4DB8:
 	thumb_func_end ObjectCB_BagVisualSwitchingPockets
 
 	thumb_func_start ShakeBagVisual
-; void ShakeBagVisual()
-ShakeBagVisual: ; 80D4DC4
+@ void ShakeBagVisual()
+ShakeBagVisual: @ 80D4DC4
 	push {r4,lr}
 	ldr r0, =0x0203ce54
 	ldr r0, [r0]
@@ -384442,8 +384442,8 @@ _080D4DF4:
 	thumb_func_end ShakeBagVisual
 
 	thumb_func_start ObjectCB_ShakeBagVisual
-; void ObjectCB_ShakeBagVisual(struct obj *object)
-ObjectCB_ShakeBagVisual: ; 80D4E0C
+@ void ObjectCB_ShakeBagVisual(struct obj *object)
+ObjectCB_ShakeBagVisual: @ 80D4E0C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -384465,8 +384465,8 @@ _080D4E28:
 	thumb_func_end ObjectCB_ShakeBagVisual
 
 	thumb_func_start AddSwitchPocketRotatingBallObject
-; void AddSwitchPocketRotatingBallObject(u16 rotationDirection)
-AddSwitchPocketRotatingBallObject: ; 80D4E34
+@ void AddSwitchPocketRotatingBallObject(u16 rotationDirection)
+AddSwitchPocketRotatingBallObject: @ 80D4E34
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 16
@@ -384499,8 +384499,8 @@ AddSwitchPocketRotatingBallObject: ; 80D4E34
 	thumb_func_end AddSwitchPocketRotatingBallObject
 
 	thumb_func_start update_switch_pocket_rotating_ball_coords
-; void update_switch_pocket_rotating_ball_coords(struct obj *object)
-update_switch_pocket_rotating_ball_coords: ; 80D4E8C
+@ void update_switch_pocket_rotating_ball_coords(struct obj *object)
+update_switch_pocket_rotating_ball_coords: @ 80D4E8C
 	ldrh r2, [r0, 0x30]
 	ldrh r1, [r0, 0x34]
 	adds r1, 0x1
@@ -384521,8 +384521,8 @@ update_switch_pocket_rotating_ball_coords: ; 80D4E8C
 	thumb_func_end update_switch_pocket_rotating_ball_coords
 
 	thumb_func_start ObjectCB_SwitchPocketRotatingBallInit
-; void ObjectCB_SwitchPocketRotatingBallInit(struct obj *object)
-ObjectCB_SwitchPocketRotatingBallInit: ; 80D4EB0
+@ void ObjectCB_SwitchPocketRotatingBallInit(struct obj *object)
+ObjectCB_SwitchPocketRotatingBallInit: @ 80D4EB0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r1, [r4, 0x1]
@@ -384570,8 +384570,8 @@ _080D4EDA:
 	thumb_func_end ObjectCB_SwitchPocketRotatingBallInit
 
 	thumb_func_start ObjectCB_SwitchPocketRotatingBallContinue
-; void ObjectCB_SwitchPocketRotatingBallContinue(struct obj *object)
-ObjectCB_SwitchPocketRotatingBallContinue: ; 80D4F14
+@ void ObjectCB_SwitchPocketRotatingBallContinue(struct obj *object)
+ObjectCB_SwitchPocketRotatingBallContinue: @ 80D4F14
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -384592,8 +384592,8 @@ _080D4F32:
 	thumb_func_end ObjectCB_SwitchPocketRotatingBallContinue
 
 	thumb_func_start AddBagItemIconObject
-; void AddBagItemIconObject(u16 itemId, u8 a2)
-AddBagItemIconObject: ; 80D4F38
+@ void AddBagItemIconObject(u16 itemId, u8 a2)
+AddBagItemIconObject: @ 80D4F38
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -384638,8 +384638,8 @@ _080D4F86:
 	thumb_func_end AddBagItemIconObject
 
 	thumb_func_start RemoveBagItemIconObject
-; void RemoveBagItemIconObject(u8 a1)
-RemoveBagItemIconObject: ; 80D4F98
+@ void RemoveBagItemIconObject(u8 a1)
+RemoveBagItemIconObject: @ 80D4F98
 	push {lr}
 	lsls r0, 24
 	movs r1, 0x80
@@ -384652,7 +384652,7 @@ RemoveBagItemIconObject: ; 80D4F98
 	thumb_func_end RemoveBagItemIconObject
 
 	thumb_func_start sub_80D4FAC
-sub_80D4FAC: ; 80D4FAC
+sub_80D4FAC: @ 80D4FAC
 	push {lr}
 	ldr r0, =0x0203ce54
 	ldr r0, [r0]
@@ -384666,7 +384666,7 @@ sub_80D4FAC: ; 80D4FAC
 	thumb_func_end sub_80D4FAC
 
 	thumb_func_start sub_80D4FC8
-sub_80D4FC8: ; 80D4FC8
+sub_80D4FC8: @ 80D4FC8
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -384683,7 +384683,7 @@ sub_80D4FC8: ; 80D4FC8
 	thumb_func_end sub_80D4FC8
 
 	thumb_func_start sub_80D4FEC
-sub_80D4FEC: ; 80D4FEC
+sub_80D4FEC: @ 80D4FEC
 	push {lr}
 	adds r3, r0, 0
 	lsls r3, 24
@@ -384705,7 +384705,7 @@ sub_80D4FEC: ; 80D4FEC
 	thumb_func_end sub_80D4FEC
 
 	thumb_func_start sub_80D5018
-sub_80D5018: ; 80D5018
+sub_80D5018: @ 80D5018
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -384754,7 +384754,7 @@ _080D505C:
 	thumb_func_end sub_80D5018
 
 	thumb_func_start sub_80D5070
-sub_80D5070: ; 80D5070
+sub_80D5070: @ 80D5070
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -384795,7 +384795,7 @@ _080D5082:
 	thumb_func_end sub_80D5070
 
 	thumb_func_start sub_80D50D4
-sub_80D50D4: ; 80D50D4
+sub_80D50D4: @ 80D50D4
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -384824,7 +384824,7 @@ sub_80D50D4: ; 80D50D4
 	thumb_func_end sub_80D50D4
 
 	thumb_func_start sub_80D510C
-sub_80D510C: ; 80D510C
+sub_80D510C: @ 80D510C
 	push {lr}
 	ldr r0, =0x00007544
 	bl FreeObjectPaletteByTag
@@ -384834,7 +384834,7 @@ sub_80D510C: ; 80D510C
 	thumb_func_end sub_80D510C
 
 	thumb_func_start sub_80D511C
-sub_80D511C: ; 80D511C
+sub_80D511C: @ 80D511C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -384885,7 +384885,7 @@ _080D5172:
 	thumb_func_end sub_80D511C
 
 	thumb_func_start sub_80D518C
-sub_80D518C: ; 80D518C
+sub_80D518C: @ 80D518C
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =gUnknown_0857FE10
@@ -384902,7 +384902,7 @@ sub_80D518C: ; 80D518C
 	thumb_func_end sub_80D518C
 
 	thumb_func_start sub_80D51AC
-sub_80D51AC: ; 80D51AC
+sub_80D51AC: @ 80D51AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -384955,7 +384955,7 @@ _080D520C:
 	thumb_func_end sub_80D51AC
 
 	thumb_func_start sub_80D5220
-sub_80D5220: ; 80D5220
+sub_80D5220: @ 80D5220
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -385048,7 +385048,7 @@ _080D52CA:
 	thumb_func_end sub_80D5220
 
 	thumb_func_start sub_80D52D0
-sub_80D52D0: ; 80D52D0
+sub_80D52D0: @ 80D52D0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -385164,7 +385164,7 @@ _080D53A6:
 	thumb_func_end sub_80D52D0
 
 	thumb_func_start sub_80D53BC
-sub_80D53BC: ; 80D53BC
+sub_80D53BC: @ 80D53BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -385269,7 +385269,7 @@ _080D5478:
 	thumb_func_end sub_80D53BC
 
 	thumb_func_start sub_80D5484
-sub_80D5484: ; 80D5484
+sub_80D5484: @ 80D5484
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -385331,7 +385331,7 @@ _080D54F6:
 	thumb_func_end sub_80D5484
 
 	thumb_func_start sub_80D5508
-sub_80D5508: ; 80D5508
+sub_80D5508: @ 80D5508
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -385492,7 +385492,7 @@ _080D563C:
 	thumb_func_end sub_80D5508
 
 	thumb_func_start sub_80D5644
-sub_80D5644: ; 80D5644
+sub_80D5644: @ 80D5644
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -385534,7 +385534,7 @@ sub_80D5644: ; 80D5644
 	thumb_func_end sub_80D5644
 
 	thumb_func_start sub_80D56A4
-sub_80D56A4: ; 80D56A4
+sub_80D56A4: @ 80D56A4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -385610,7 +385610,7 @@ _080D5728:
 	thumb_func_end sub_80D56A4
 
 	thumb_func_start sub_80D5738
-sub_80D5738: ; 80D5738
+sub_80D5738: @ 80D5738
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -385674,7 +385674,7 @@ _080D5782:
 	thumb_func_end sub_80D5738
 
 	thumb_func_start sub_80D57B8
-sub_80D57B8: ; 80D57B8
+sub_80D57B8: @ 80D57B8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -385734,7 +385734,7 @@ _080D5822:
 	thumb_func_end sub_80D57B8
 
 	thumb_func_start sub_80D5830
-sub_80D5830: ; 80D5830
+sub_80D5830: @ 80D5830
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -385758,7 +385758,7 @@ _080D584C:
 	thumb_func_end sub_80D5830
 
 	thumb_func_start sub_80D5860
-sub_80D5860: ; 80D5860
+sub_80D5860: @ 80D5860
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r2, r4, 0
@@ -385806,7 +385806,7 @@ _080D5894:
 	thumb_func_end sub_80D5860
 
 	thumb_func_start sub_80D58D4
-sub_80D58D4: ; 80D58D4
+sub_80D58D4: @ 80D58D4
 	push {lr}
 	ldrh r1, [r0, 0x36]
 	strh r1, [r0, 0x2E]
@@ -385823,7 +385823,7 @@ sub_80D58D4: ; 80D58D4
 	thumb_func_end sub_80D58D4
 
 	thumb_func_start sub_80D58F8
-sub_80D58F8: ; 80D58F8
+sub_80D58F8: @ 80D58F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r2, r4, 0
@@ -385857,7 +385857,7 @@ sub_80D58F8: ; 80D58F8
 	thumb_func_end sub_80D58F8
 
 	thumb_func_start sub_80D5944
-sub_80D5944: ; 80D5944
+sub_80D5944: @ 80D5944
 	push {lr}
 	ldrh r1, [r0, 0x36]
 	strh r1, [r0, 0x2E]
@@ -385874,7 +385874,7 @@ sub_80D5944: ; 80D5944
 	thumb_func_end sub_80D5944
 
 	thumb_func_start sub_80D5968
-sub_80D5968: ; 80D5968
+sub_80D5968: @ 80D5968
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -385958,7 +385958,7 @@ _080D5A06:
 	thumb_func_end sub_80D5968
 
 	thumb_func_start sub_80D5A24
-sub_80D5A24: ; 80D5A24
+sub_80D5A24: @ 80D5A24
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x3C]
@@ -386021,7 +386021,7 @@ _080D5A8E:
 	thumb_func_end sub_80D5A24
 
 	thumb_func_start sub_80D5A94
-sub_80D5A94: ; 80D5A94
+sub_80D5A94: @ 80D5A94
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -386100,7 +386100,7 @@ _080D5ADC:
 	thumb_func_end sub_80D5A94
 
 	thumb_func_start sub_80D5B48
-sub_80D5B48: ; 80D5B48
+sub_80D5B48: @ 80D5B48
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r2, r6, 0
@@ -386196,7 +386196,7 @@ _080D5C0C:
 	thumb_func_end sub_80D5B48
 
 	thumb_func_start sub_80D5C20
-sub_80D5C20: ; 80D5C20
+sub_80D5C20: @ 80D5C20
 	push {r4,lr}
 	ldr r4, =0x02020630
 	movs r1, 0x38
@@ -386222,7 +386222,7 @@ sub_80D5C20: ; 80D5C20
 	thumb_func_end sub_80D5C20
 
 	thumb_func_start sub_80D5C50
-sub_80D5C50: ; 80D5C50
+sub_80D5C50: @ 80D5C50
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -386289,7 +386289,7 @@ _080D5C82:
 	thumb_func_end sub_80D5C50
 
 	thumb_func_start sub_80D5CE4
-sub_80D5CE4: ; 80D5CE4
+sub_80D5CE4: @ 80D5CE4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -386337,7 +386337,7 @@ _080D5D34:
 	thumb_func_end sub_80D5CE4
 
 	thumb_func_start sub_80D5D48
-sub_80D5D48: ; 80D5D48
+sub_80D5D48: @ 80D5D48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -386390,7 +386390,7 @@ _080D5DA4:
 	thumb_func_end sub_80D5D48
 
 	thumb_func_start sub_80D5DB0
-sub_80D5DB0: ; 80D5DB0
+sub_80D5DB0: @ 80D5DB0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -386475,7 +386475,7 @@ _080D5E58:
 	thumb_func_end sub_80D5DB0
 
 	thumb_func_start sub_80D5E6C
-sub_80D5E6C: ; 80D5E6C
+sub_80D5E6C: @ 80D5E6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -386514,7 +386514,7 @@ _080D5EAA:
 	thumb_func_end sub_80D5E6C
 
 	thumb_func_start sub_80D5EB8
-sub_80D5EB8: ; 80D5EB8
+sub_80D5EB8: @ 80D5EB8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -386575,7 +386575,7 @@ _080D5F18:
 	thumb_func_end sub_80D5EB8
 
 	thumb_func_start sub_80D5F3C
-sub_80D5F3C: ; 80D5F3C
+sub_80D5F3C: @ 80D5F3C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -386725,7 +386725,7 @@ _080D6050:
 	thumb_func_end sub_80D5F3C
 
 	thumb_func_start sub_80D6064
-sub_80D6064: ; 80D6064
+sub_80D6064: @ 80D6064
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -386766,7 +386766,7 @@ sub_80D6064: ; 80D6064
 	thumb_func_end sub_80D6064
 
 	thumb_func_start sub_80D60BC
-sub_80D60BC: ; 80D60BC
+sub_80D60BC: @ 80D60BC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -386827,7 +386827,7 @@ _080D612C:
 	thumb_func_end sub_80D60BC
 
 	thumb_func_start sub_80D6134
-sub_80D6134: ; 80D6134
+sub_80D6134: @ 80D6134
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -386945,7 +386945,7 @@ _080D6208:
 	thumb_func_end sub_80D6134
 
 	thumb_func_start sub_80D622C
-sub_80D622C: ; 80D622C
+sub_80D622C: @ 80D622C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -387047,7 +387047,7 @@ _080D62CA:
 	thumb_func_end sub_80D622C
 
 	thumb_func_start sub_80D6308
-sub_80D6308: ; 80D6308
+sub_80D6308: @ 80D6308
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -387115,7 +387115,7 @@ _080D6382:
 	thumb_func_end sub_80D6308
 
 	thumb_func_start sub_80D6388
-sub_80D6388: ; 80D6388
+sub_80D6388: @ 80D6388
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -387222,7 +387222,7 @@ _080D63EE:
 	thumb_func_end sub_80D6388
 
 	thumb_func_start sub_80D646C
-sub_80D646C: ; 80D646C
+sub_80D646C: @ 80D646C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -387340,7 +387340,7 @@ _080D654A:
 	thumb_func_end sub_80D646C
 
 	thumb_func_start decrypt_bag_item_quantity
-decrypt_bag_item_quantity: ; 80D6554
+decrypt_bag_item_quantity: @ 80D6554
 	adds r1, r0, 0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -387355,7 +387355,7 @@ decrypt_bag_item_quantity: ; 80D6554
 	thumb_func_end decrypt_bag_item_quantity
 
 	thumb_func_start encrypt_bag_item_quantity
-encrypt_bag_item_quantity: ; 80D656C
+encrypt_bag_item_quantity: @ 80D656C
 	lsls r1, 16
 	lsrs r1, 16
 	ldr r2, =0x03005d90
@@ -387369,19 +387369,19 @@ encrypt_bag_item_quantity: ; 80D656C
 	thumb_func_end encrypt_bag_item_quantity
 
 	thumb_func_start sub_80D6584
-sub_80D6584: ; 80D6584
+sub_80D6584: @ 80D6584
 	ldrh r0, [r0]
 	bx lr
 	thumb_func_end sub_80D6584
 
 	thumb_func_start sub_80D6588
-sub_80D6588: ; 80D6588
+sub_80D6588: @ 80D6588
 	strh r1, [r0]
 	bx lr
 	thumb_func_end sub_80D6588
 
 	thumb_func_start encrypt_decrypt_all_item_quantities
-encrypt_decrypt_all_item_quantities: ; 80D658C
+encrypt_decrypt_all_item_quantities: @ 80D658C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -387430,7 +387430,7 @@ _080D65CC:
 	thumb_func_end encrypt_decrypt_all_item_quantities
 
 	thumb_func_start call_encrypt_decrypt_all_item_quantities
-call_encrypt_decrypt_all_item_quantities: ; 80D65E4
+call_encrypt_decrypt_all_item_quantities: @ 80D65E4
 	push {lr}
 	bl encrypt_decrypt_all_item_quantities
 	pop {r0}
@@ -387438,8 +387438,8 @@ call_encrypt_decrypt_all_item_quantities: ; 80D65E4
 	thumb_func_end call_encrypt_decrypt_all_item_quantities
 
 	thumb_func_start init_bag_pockets
-; void init_bag_pockets()
-init_bag_pockets: ; 80D65F0
+@ void init_bag_pockets()
+init_bag_pockets: @ 80D65F0
 	push {r4,lr}
 	ldr r1, =0x02039dd8
 	ldr r0, =0x03005d8c
@@ -387481,8 +387481,8 @@ init_bag_pockets: ; 80D65F0
 	thumb_func_end init_bag_pockets
 
 	thumb_func_start itemid_get_name
-; void itemid_get_name(int item_id, char *dest)
-itemid_get_name: ; 80D6644
+@ void itemid_get_name(int item_id, char *dest)
+itemid_get_name: @ 80D6644
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -387497,7 +387497,7 @@ itemid_get_name: ; 80D6644
 	thumb_func_end itemid_get_name
 
 	thumb_func_start sub_80D6660
-sub_80D6660: ; 80D6660
+sub_80D6660: @ 80D6660
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -387547,8 +387547,8 @@ _080D66BE:
 	thumb_func_end sub_80D6660
 
 	thumb_func_start GetBerryCountString
-; void GetBerryCountString(struct berry_info *berryInfo, u8 *dest, u32 berryCount)
-GetBerryCountString: ; 80D66C4
+@ void GetBerryCountString(struct berry_info *berryInfo, u8 *dest, u32 berryCount)
+GetBerryCountString: @ 80D66C4
 	push {r4,lr}
 	ldr r4, =gUnknown_085EFCE5
 	cmp r2, 0x1
@@ -387568,8 +387568,8 @@ _080D66CE:
 	thumb_func_end GetBerryCountString
 
 	thumb_func_start IsBagPocketNonEmpty
-; bool8 IsBagPocketNonEmpty(u8 pocketId)
-IsBagPocketNonEmpty: ; 80D66EC
+@ bool8 IsBagPocketNonEmpty(u8 pocketId)
+IsBagPocketNonEmpty: @ 80D66EC
 	push {lr}
 	lsls r0, 24
 	movs r2, 0
@@ -387604,7 +387604,7 @@ _080D6720:
 	thumb_func_end IsBagPocketNonEmpty
 
 	thumb_func_start sub_80D6724
-sub_80D6724: ; 80D6724
+sub_80D6724: @ 80D6724
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r7, r0, 16
@@ -387685,7 +387685,7 @@ _080D67B8:
 	thumb_func_end sub_80D6724
 
 	thumb_func_start sub_80D67C4
-sub_80D67C4: ; 80D67C4
+sub_80D67C4: @ 80D67C4
 	push {r4,lr}
 	movs r4, 0x85
 _080D67C8:
@@ -387719,7 +387719,7 @@ _080D67F6:
 	thumb_func_end sub_80D67C4
 
 	thumb_func_start sub_80D6800
-sub_80D6800: ; 80D6800
+sub_80D6800: @ 80D6800
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -387870,8 +387870,8 @@ _080D6916:
 	thumb_func_end sub_80D6800
 
 	thumb_func_start bag_add_item
-; int bag_add_item(int item_id, int quantity)
-bag_add_item: ; 80D6928
+@ int bag_add_item(int item_id, int quantity)
+bag_add_item: @ 80D6928
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -388058,8 +388058,8 @@ _080D6A92:
 	thumb_func_end bag_add_item
 
 	thumb_func_start remove_item
-; pokescrcmd
-remove_item: ; 80D6AA4
+@ pokescrcmd
+remove_item: @ 80D6AA4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -388282,7 +388282,7 @@ _080D6C5A:
 	thumb_func_end remove_item
 
 	thumb_func_start sub_80D6C68
-sub_80D6C68: ; 80D6C68
+sub_80D6C68: @ 80D6C68
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -388294,7 +388294,7 @@ sub_80D6C68: ; 80D6C68
 	thumb_func_end sub_80D6C68
 
 	thumb_func_start sub_80D6C7C
-sub_80D6C7C: ; 80D6C7C
+sub_80D6C7C: @ 80D6C7C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -388323,7 +388323,7 @@ _080D6CA6:
 	thumb_func_end sub_80D6C7C
 
 	thumb_func_start sub_80D6CAC
-sub_80D6CAC: ; 80D6CAC
+sub_80D6CAC: @ 80D6CAC
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x03005d8c
@@ -388357,7 +388357,7 @@ _080D6CE0:
 	thumb_func_end sub_80D6CAC
 
 	thumb_func_start sub_80D6CE4
-sub_80D6CE4: ; 80D6CE4
+sub_80D6CE4: @ 80D6CE4
 	push {r4,lr}
 	movs r2, 0
 	movs r1, 0
@@ -388389,7 +388389,7 @@ _080D6D04:
 	thumb_func_end sub_80D6CE4
 
 	thumb_func_start sub_80D6D1C
-sub_80D6D1C: ; 80D6D1C
+sub_80D6D1C: @ 80D6D1C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -388432,7 +388432,7 @@ _080D6D68:
 	thumb_func_end sub_80D6D1C
 
 	thumb_func_start sub_80D6D70
-sub_80D6D70: ; 80D6D70
+sub_80D6D70: @ 80D6D70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -388534,7 +388534,7 @@ _080D6E3A:
 	thumb_func_end sub_80D6D70
 
 	thumb_func_start sub_80D6E48
-sub_80D6E48: ; 80D6E48
+sub_80D6E48: @ 80D6E48
 	push {lr}
 	lsls r0, 24
 	lsls r1, 16
@@ -388564,7 +388564,7 @@ _080D6E76:
 	thumb_func_end sub_80D6E48
 
 	thumb_func_start sub_80D6E84
-sub_80D6E84: ; 80D6E84
+sub_80D6E84: @ 80D6E84
 	push {r4-r7,lr}
 	movs r2, 0
 _080D6E88:
@@ -388615,7 +388615,7 @@ _080D6ECA:
 	thumb_func_end sub_80D6E84
 
 	thumb_func_start sub_80D6EDC
-sub_80D6EDC: ; 80D6EDC
+sub_80D6EDC: @ 80D6EDC
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -388644,8 +388644,8 @@ _080D6F0E:
 	thumb_func_end sub_80D6EDC
 
 	thumb_func_start bag_pocket_get_itemid
-; int bag_pocket_get_itemid(int pocket_id_plus_1, int item_index_in_pocket)
-bag_pocket_get_itemid: ; 80D6F14
+@ int bag_pocket_get_itemid(int pocket_id_plus_1, int item_index_in_pocket)
+bag_pocket_get_itemid: @ 80D6F14
 	lsls r0, 24
 	lsls r1, 16
 	ldr r2, =0x02039dd8
@@ -388661,8 +388661,8 @@ bag_pocket_get_itemid: ; 80D6F14
 	thumb_func_end bag_pocket_get_itemid
 
 	thumb_func_start bag_pocket_get_item_quantity
-; int bag_pocket_get_item_quantity(int pocket_id_plus_1, int item_index_in_pocket)
-bag_pocket_get_item_quantity: ; 80D6F30
+@ int bag_pocket_get_item_quantity(int pocket_id_plus_1, int item_index_in_pocket)
+bag_pocket_get_item_quantity: @ 80D6F30
 	push {lr}
 	lsls r0, 24
 	lsls r1, 16
@@ -388683,7 +388683,7 @@ bag_pocket_get_item_quantity: ; 80D6F30
 	thumb_func_end bag_pocket_get_item_quantity
 
 	thumb_func_start swap32
-swap32: ; 80D6F58
+swap32: @ 80D6F58
 	ldr r3, [r0]
 	ldr r2, [r1]
 	str r2, [r0]
@@ -388692,7 +388692,7 @@ swap32: ; 80D6F58
 	thumb_func_end swap32
 
 	thumb_func_start sub_80D6F64
-sub_80D6F64: ; 80D6F64
+sub_80D6F64: @ 80D6F64
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r3, 0
@@ -388739,7 +388739,7 @@ _080D6FA6:
 	thumb_func_end sub_80D6F64
 
 	thumb_func_start sub_80D6FB4
-sub_80D6FB4: ; 80D6FB4
+sub_80D6FB4: @ 80D6FB4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -388806,7 +388806,7 @@ _080D701A:
 	thumb_func_end sub_80D6FB4
 
 	thumb_func_start sub_80D702C
-sub_80D702C: ; 80D702C
+sub_80D702C: @ 80D702C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r3, r2, 0
@@ -388866,7 +388866,7 @@ _080D708C:
 	thumb_func_end sub_80D702C
 
 	thumb_func_start sub_80D7094
-sub_80D7094: ; 80D7094
+sub_80D7094: @ 80D7094
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02039dd8
@@ -388888,8 +388888,8 @@ _080D709A:
 	thumb_func_end sub_80D7094
 
 	thumb_func_start CountTotalItemQuantityInBag
-; u16 CountTotalItemQuantityInBag(u16 itemId)
-CountTotalItemQuantityInBag: ; 80D70BC
+@ u16 CountTotalItemQuantityInBag(u16 itemId)
+CountTotalItemQuantityInBag: @ 80D70BC
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -388932,7 +388932,7 @@ _080D70FE:
 	thumb_func_end CountTotalItemQuantityInBag
 
 	thumb_func_start sub_80D710C
-sub_80D710C: ; 80D710C
+sub_80D710C: @ 80D710C
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -388992,7 +388992,7 @@ _080D717C:
 	thumb_func_end sub_80D710C
 
 	thumb_func_start sub_80D7184
-sub_80D7184: ; 80D7184
+sub_80D7184: @ 80D7184
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -389056,7 +389056,7 @@ _080D71FC:
 	thumb_func_end sub_80D7184
 
 	thumb_func_start sub_80D7204
-sub_80D7204: ; 80D7204
+sub_80D7204: @ 80D7204
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -389203,7 +389203,7 @@ _080D7326:
 	thumb_func_end sub_80D7204
 
 	thumb_func_start sub_80D7334
-sub_80D7334: ; 80D7334
+sub_80D7334: @ 80D7334
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -389343,7 +389343,7 @@ _080D744E:
 	thumb_func_end sub_80D7334
 
 	thumb_func_start itemid_sanitize
-itemid_sanitize: ; 80D745C
+itemid_sanitize: @ 80D745C
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -389361,8 +389361,8 @@ _080D7470:
 	thumb_func_end itemid_sanitize
 
 	thumb_func_start itemid_get_item
-; item *itemid_get_item(s16 itemId)
-itemid_get_item: ; 80D7474
+@ item *itemid_get_item(s16 itemId)
+itemid_get_item: @ 80D7474
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389379,7 +389379,7 @@ itemid_get_item: ; 80D7474
 	thumb_func_end itemid_get_item
 
 	thumb_func_start itemid_get_number
-itemid_get_number: ; 80D7494
+itemid_get_number: @ 80D7494
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389398,7 +389398,7 @@ itemid_get_number: ; 80D7494
 	thumb_func_end itemid_get_number
 
 	thumb_func_start itemid_get_market_price
-itemid_get_market_price: ; 80D74B8
+itemid_get_market_price: @ 80D74B8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389417,7 +389417,7 @@ itemid_get_market_price: ; 80D74B8
 	thumb_func_end itemid_get_market_price
 
 	thumb_func_start itemid_get_x12
-itemid_get_x12: ; 80D74DC
+itemid_get_x12: @ 80D74DC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389436,7 +389436,7 @@ itemid_get_x12: ; 80D74DC
 	thumb_func_end itemid_get_x12
 
 	thumb_func_start itemid_get_quality
-itemid_get_quality: ; 80D7500
+itemid_get_quality: @ 80D7500
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389455,7 +389455,7 @@ itemid_get_quality: ; 80D7500
 	thumb_func_end itemid_get_quality
 
 	thumb_func_start itemid_get_description
-itemid_get_description: ; 80D7524
+itemid_get_description: @ 80D7524
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389475,7 +389475,7 @@ itemid_get_description: ; 80D7524
 	thumb_func_end itemid_get_description
 
 	thumb_func_start itemid_is_unique
-itemid_is_unique: ; 80D7548
+itemid_is_unique: @ 80D7548
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389494,7 +389494,7 @@ itemid_is_unique: ; 80D7548
 	thumb_func_end itemid_is_unique
 
 	thumb_func_start itemid_get_x19
-itemid_get_x19: ; 80D756C
+itemid_get_x19: @ 80D756C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389513,7 +389513,7 @@ itemid_get_x19: ; 80D756C
 	thumb_func_end itemid_get_x19
 
 	thumb_func_start itemid_get_pocket_number
-itemid_get_pocket_number: ; 80D7590
+itemid_get_pocket_number: @ 80D7590
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389532,7 +389532,7 @@ itemid_get_pocket_number: ; 80D7590
 	thumb_func_end itemid_get_pocket_number
 
 	thumb_func_start itemid_get_type
-itemid_get_type: ; 80D75B4
+itemid_get_type: @ 80D75B4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389551,7 +389551,7 @@ itemid_get_type: ; 80D75B4
 	thumb_func_end itemid_get_type
 
 	thumb_func_start itemid_get_overworld_function
-itemid_get_overworld_function: ; 80D75D8
+itemid_get_overworld_function: @ 80D75D8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389571,7 +389571,7 @@ itemid_get_overworld_function: ; 80D75D8
 	thumb_func_end itemid_get_overworld_function
 
 	thumb_func_start itemid_get_usage
-itemid_get_usage: ; 80D75FC
+itemid_get_usage: @ 80D75FC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389591,7 +389591,7 @@ itemid_get_usage: ; 80D75FC
 	thumb_func_end itemid_get_usage
 
 	thumb_func_start itemid_get_battle_function
-itemid_get_battle_function: ; 80D7620
+itemid_get_battle_function: @ 80D7620
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389611,7 +389611,7 @@ itemid_get_battle_function: ; 80D7620
 	thumb_func_end itemid_get_battle_function
 
 	thumb_func_start itemid_get_x28
-itemid_get_x28: ; 80D7644
+itemid_get_x28: @ 80D7644
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -389631,12 +389631,12 @@ itemid_get_x28: ; 80D7644
 	thumb_func_end itemid_get_x28
 
 	thumb_func_start nullsub_41
-nullsub_41: ; 80D7668
+nullsub_41: @ 80D7668
 	bx lr
 	thumb_func_end nullsub_41
 
 	thumb_func_start sub_80D766C
-sub_80D766C: ; 80D766C
+sub_80D766C: @ 80D766C
 	ldr r1, =0x02039f2a
 	movs r0, 0
 	strb r0, [r1]
@@ -389645,7 +389645,7 @@ sub_80D766C: ; 80D766C
 	thumb_func_end sub_80D766C
 
 	thumb_func_start sub_80D7678
-sub_80D7678: ; 80D7678
+sub_80D7678: @ 80D7678
 	push {r4,lr}
 	movs r0, 0
 	movs r1, 0x40
@@ -389702,7 +389702,7 @@ sub_80D7678: ; 80D7678
 	thumb_func_end sub_80D7678
 
 	thumb_func_start sub_80D7724
-sub_80D7724: ; 80D7724
+sub_80D7724: @ 80D7724
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_08C17AB0
 	movs r1, 0xC0
@@ -389747,7 +389747,7 @@ _080D775E:
 	thumb_func_end sub_80D7724
 
 	thumb_func_start sub_80D779C
-sub_80D779C: ; 80D779C
+sub_80D779C: @ 80D779C
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -389780,7 +389780,7 @@ _080D77BA:
 	thumb_func_end sub_80D779C
 
 	thumb_func_start sub_80D77E4
-sub_80D77E4: ; 80D77E4
+sub_80D77E4: @ 80D77E4
 	push {lr}
 	ldr r0, =gUnknown_08587F44
 	bl InitWindows
@@ -389812,7 +389812,7 @@ _080D7822:
 	thumb_func_end sub_80D77E4
 
 	thumb_func_start sub_80D782C
-sub_80D782C: ; 80D782C
+sub_80D782C: @ 80D782C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_08587C30
 	movs r1, 0xF0
@@ -389847,7 +389847,7 @@ _080D7848:
 	thumb_func_end sub_80D782C
 
 	thumb_func_start sub_80D787C
-sub_80D787C: ; 80D787C
+sub_80D787C: @ 80D787C
 	push {r4-r7,lr}
 	ldr r4, =0x02039f34
 	ldr r0, [r4]
@@ -389977,7 +389977,7 @@ _080D7942:
 	thumb_func_end sub_80D787C
 
 	thumb_func_start sub_80D7988
-sub_80D7988: ; 80D7988
+sub_80D7988: @ 80D7988
 	push {r4,r5,lr}
 	ldr r4, =0x02039f34
 	movs r0, 0x40
@@ -390064,7 +390064,7 @@ sub_80D7988: ; 80D7988
 	thumb_func_end sub_80D7988
 
 	thumb_func_start sub_80D7A5C
-sub_80D7A5C: ; 80D7A5C
+sub_80D7A5C: @ 80D7A5C
 	push {r4,r5,lr}
 	ldr r5, =0x02039f34
 	ldr r0, [r5]
@@ -390146,7 +390146,7 @@ sub_80D7A5C: ; 80D7A5C
 	thumb_func_end sub_80D7A5C
 
 	thumb_func_start sub_80D7B24
-sub_80D7B24: ; 80D7B24
+sub_80D7B24: @ 80D7B24
 	push {r4-r6,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -390277,7 +390277,7 @@ _080D7C56:
 	thumb_func_end sub_80D7B24
 
 	thumb_func_start sub_80D7C7C
-sub_80D7C7C: ; 80D7C7C
+sub_80D7C7C: @ 80D7C7C
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -390304,7 +390304,7 @@ _080D7CA2:
 	thumb_func_end sub_80D7C7C
 
 	thumb_func_start sub_80D7CB4
-sub_80D7CB4: ; 80D7CB4
+sub_80D7CB4: @ 80D7CB4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -390417,7 +390417,7 @@ _080D7D9E:
 	thumb_func_end sub_80D7CB4
 
 	thumb_func_start sub_80D7DAC
-sub_80D7DAC: ; 80D7DAC
+sub_80D7DAC: @ 80D7DAC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -390430,7 +390430,7 @@ sub_80D7DAC: ; 80D7DAC
 	thumb_func_end sub_80D7DAC
 
 	thumb_func_start sub_80D7DC8
-sub_80D7DC8: ; 80D7DC8
+sub_80D7DC8: @ 80D7DC8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -390447,7 +390447,7 @@ sub_80D7DC8: ; 80D7DC8
 	thumb_func_end sub_80D7DC8
 
 	thumb_func_start sub_80D7DE8
-sub_80D7DE8: ; 80D7DE8
+sub_80D7DE8: @ 80D7DE8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -390487,7 +390487,7 @@ _080D7E2A:
 	thumb_func_end sub_80D7DE8
 
 	thumb_func_start sub_80D7E44
-sub_80D7E44: ; 80D7E44
+sub_80D7E44: @ 80D7E44
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -390733,7 +390733,7 @@ _080D80B8:
 	thumb_func_end sub_80D7E44
 
 	thumb_func_start sub_80D80C8
-sub_80D80C8: ; 80D80C8
+sub_80D80C8: @ 80D80C8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -390765,7 +390765,7 @@ _080D80F8:
 	thumb_func_end sub_80D80C8
 
 	thumb_func_start sub_80D8108
-sub_80D8108: ; 80D8108
+sub_80D8108: @ 80D8108
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -390908,7 +390908,7 @@ _080D822C:
 	thumb_func_end sub_80D8108
 
 	thumb_func_start sub_80D823C
-sub_80D823C: ; 80D823C
+sub_80D823C: @ 80D823C
 	push {r4,r5,lr}
 	bl CallObjectCallbacks
 	bl RunActiveTasks
@@ -390939,7 +390939,7 @@ _080D8266:
 	thumb_func_end sub_80D823C
 
 	thumb_func_start vblank_cb_battle
-vblank_cb_battle: ; 80D827C
+vblank_cb_battle: @ 80D827C
 	push {lr}
 	ldr r0, =0x02022e14
 	ldrh r1, [r0]
@@ -390999,7 +390999,7 @@ vblank_cb_battle: ; 80D827C
 	thumb_func_end vblank_cb_battle
 
 	thumb_func_start sub_80D833C
-sub_80D833C: ; 80D833C
+sub_80D833C: @ 80D833C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -391083,7 +391083,7 @@ _080D841A:
 	thumb_func_end sub_80D833C
 
 	thumb_func_start sub_80D8424
-sub_80D8424: ; 80D8424
+sub_80D8424: @ 80D8424
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -391132,7 +391132,7 @@ _080D8482:
 	thumb_func_end sub_80D8424
 
 	thumb_func_start sub_80D8490
-sub_80D8490: ; 80D8490
+sub_80D8490: @ 80D8490
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -391297,7 +391297,7 @@ _080D856C:
 	thumb_func_end sub_80D8490
 
 	thumb_func_start sub_80D8610
-sub_80D8610: ; 80D8610
+sub_80D8610: @ 80D8610
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -391508,7 +391508,7 @@ _080D87FA:
 	thumb_func_end sub_80D8610
 
 	thumb_func_start sub_80D880C
-sub_80D880C: ; 80D880C
+sub_80D880C: @ 80D880C
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -391534,7 +391534,7 @@ sub_80D880C: ; 80D880C
 	thumb_func_end sub_80D880C
 
 	thumb_func_start sub_80D883C
-sub_80D883C: ; 80D883C
+sub_80D883C: @ 80D883C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -391579,7 +391579,7 @@ sub_80D883C: ; 80D883C
 	thumb_func_end sub_80D883C
 
 	thumb_func_start sub_80D8894
-sub_80D8894: ; 80D8894
+sub_80D8894: @ 80D8894
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -391639,7 +391639,7 @@ _080D891E:
 	thumb_func_end sub_80D8894
 
 	thumb_func_start sub_80D892C
-sub_80D892C: ; 80D892C
+sub_80D892C: @ 80D892C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -391661,7 +391661,7 @@ sub_80D892C: ; 80D892C
 	thumb_func_end sub_80D892C
 
 	thumb_func_start sub_80D895C
-sub_80D895C: ; 80D895C
+sub_80D895C: @ 80D895C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -391728,7 +391728,7 @@ _080D897C:
 	thumb_func_end sub_80D895C
 
 	thumb_func_start sub_80D8A04
-sub_80D8A04: ; 80D8A04
+sub_80D8A04: @ 80D8A04
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -391766,7 +391766,7 @@ _080D8A42:
 	thumb_func_end sub_80D8A04
 
 	thumb_func_start sub_80D8A50
-sub_80D8A50: ; 80D8A50
+sub_80D8A50: @ 80D8A50
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -391793,7 +391793,7 @@ _080D8A76:
 	thumb_func_end sub_80D8A50
 
 	thumb_func_start sub_80D8A88
-sub_80D8A88: ; 80D8A88
+sub_80D8A88: @ 80D8A88
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -391874,7 +391874,7 @@ _080D8B18:
 	thumb_func_end sub_80D8A88
 
 	thumb_func_start sub_80D8B38
-sub_80D8B38: ; 80D8B38
+sub_80D8B38: @ 80D8B38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -394346,7 +394346,7 @@ _080DA100:
 	thumb_func_end sub_80D8B38
 
 	thumb_func_start sub_80DA110
-sub_80DA110: ; 80DA110
+sub_80DA110: @ 80DA110
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394365,7 +394365,7 @@ sub_80DA110: ; 80DA110
 	thumb_func_end sub_80DA110
 
 	thumb_func_start sub_80DA134
-sub_80DA134: ; 80DA134
+sub_80DA134: @ 80DA134
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x24]
@@ -394394,7 +394394,7 @@ _080DA15C:
 	thumb_func_end sub_80DA134
 
 	thumb_func_start sub_80DA164
-sub_80DA164: ; 80DA164
+sub_80DA164: @ 80DA164
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x24]
@@ -394423,7 +394423,7 @@ _080DA18E:
 	thumb_func_end sub_80DA164
 
 	thumb_func_start sub_80DA198
-sub_80DA198: ; 80DA198
+sub_80DA198: @ 80DA198
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394512,7 +394512,7 @@ _080DA250:
 	thumb_func_end sub_80DA198
 
 	thumb_func_start sub_80DA25C
-sub_80DA25C: ; 80DA25C
+sub_80DA25C: @ 80DA25C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -394536,7 +394536,7 @@ sub_80DA25C: ; 80DA25C
 	thumb_func_end sub_80DA25C
 
 	thumb_func_start sub_80DA28C
-sub_80DA28C: ; 80DA28C
+sub_80DA28C: @ 80DA28C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394611,7 +394611,7 @@ _080DA312:
 	thumb_func_end sub_80DA28C
 
 	thumb_func_start sub_80DA31C
-sub_80DA31C: ; 80DA31C
+sub_80DA31C: @ 80DA31C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -394634,7 +394634,7 @@ _080DA33A:
 	thumb_func_end sub_80DA31C
 
 	thumb_func_start sub_80DA348
-sub_80DA348: ; 80DA348
+sub_80DA348: @ 80DA348
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x0201a204
@@ -394661,7 +394661,7 @@ sub_80DA348: ; 80DA348
 	thumb_func_end sub_80DA348
 
 	thumb_func_start sub_80DA38C
-sub_80DA38C: ; 80DA38C
+sub_80DA38C: @ 80DA38C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394694,7 +394694,7 @@ _080DA3BE:
 	thumb_func_end sub_80DA38C
 
 	thumb_func_start sub_80DA3CC
-sub_80DA3CC: ; 80DA3CC
+sub_80DA3CC: @ 80DA3CC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394755,7 +394755,7 @@ _080DA45A:
 	thumb_func_end sub_80DA3CC
 
 	thumb_func_start sub_80DA464
-sub_80DA464: ; 80DA464
+sub_80DA464: @ 80DA464
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -394784,7 +394784,7 @@ _080DA48E:
 	thumb_func_end sub_80DA464
 
 	thumb_func_start sub_80DA49C
-sub_80DA49C: ; 80DA49C
+sub_80DA49C: @ 80DA49C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -394809,7 +394809,7 @@ _080DA4BE:
 	thumb_func_end sub_80DA49C
 
 	thumb_func_start sub_80DA4CC
-sub_80DA4CC: ; 80DA4CC
+sub_80DA4CC: @ 80DA4CC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -394829,7 +394829,7 @@ sub_80DA4CC: ; 80DA4CC
 	thumb_func_end sub_80DA4CC
 
 	thumb_func_start sub_80DA4F4
-sub_80DA4F4: ; 80DA4F4
+sub_80DA4F4: @ 80DA4F4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -394849,7 +394849,7 @@ sub_80DA4F4: ; 80DA4F4
 	thumb_func_end sub_80DA4F4
 
 	thumb_func_start sub_80DA51C
-sub_80DA51C: ; 80DA51C
+sub_80DA51C: @ 80DA51C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -394917,7 +394917,7 @@ _080DA5A0:
 	thumb_func_end sub_80DA51C
 
 	thumb_func_start sub_80DA5B4
-sub_80DA5B4: ; 80DA5B4
+sub_80DA5B4: @ 80DA5B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -394943,7 +394943,7 @@ _080DA5D8:
 	thumb_func_end sub_80DA5B4
 
 	thumb_func_start sub_80DA5E8
-sub_80DA5E8: ; 80DA5E8
+sub_80DA5E8: @ 80DA5E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -395020,7 +395020,7 @@ _080DA668:
 	thumb_func_end sub_80DA5E8
 
 	thumb_func_start sub_80DA6B4
-sub_80DA6B4: ; 80DA6B4
+sub_80DA6B4: @ 80DA6B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -395053,7 +395053,7 @@ _080DA6EA:
 	thumb_func_end sub_80DA6B4
 
 	thumb_func_start sub_80DA700
-sub_80DA700: ; 80DA700
+sub_80DA700: @ 80DA700
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -395085,7 +395085,7 @@ _080DA72E:
 	thumb_func_end sub_80DA700
 
 	thumb_func_start sub_80DA740
-sub_80DA740: ; 80DA740
+sub_80DA740: @ 80DA740
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -395133,7 +395133,7 @@ _080DA794:
 	thumb_func_end sub_80DA740
 
 	thumb_func_start sub_80DA7A0
-sub_80DA7A0: ; 80DA7A0
+sub_80DA7A0: @ 80DA7A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -395164,7 +395164,7 @@ sub_80DA7A0: ; 80DA7A0
 	thumb_func_end sub_80DA7A0
 
 	thumb_func_start sub_80DA7EC
-sub_80DA7EC: ; 80DA7EC
+sub_80DA7EC: @ 80DA7EC
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -395195,7 +395195,7 @@ sub_80DA7EC: ; 80DA7EC
 	thumb_func_end sub_80DA7EC
 
 	thumb_func_start sub_80DA830
-sub_80DA830: ; 80DA830
+sub_80DA830: @ 80DA830
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -395222,7 +395222,7 @@ _080DA860:
 	thumb_func_end sub_80DA830
 
 	thumb_func_start sub_80DA874
-sub_80DA874: ; 80DA874
+sub_80DA874: @ 80DA874
 	push {lr}
 	bl script_env_2_disable
 	bl script_env_2_enable_and_set_ctx_running
@@ -395231,7 +395231,7 @@ sub_80DA874: ; 80DA874
 	thumb_func_end sub_80DA874
 
 	thumb_func_start sub_80DA884
-sub_80DA884: ; 80DA884
+sub_80DA884: @ 80DA884
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -395249,7 +395249,7 @@ _080DA898:
 	thumb_func_end sub_80DA884
 
 	thumb_func_start sub_80DA8A4
-sub_80DA8A4: ; 80DA8A4
+sub_80DA8A4: @ 80DA8A4
 	push {lr}
 	ldr r0, =0x02039f25
 	ldr r1, =0x02039f2b
@@ -395268,7 +395268,7 @@ _080DA8C2:
 	thumb_func_end sub_80DA8A4
 
 	thumb_func_start sub_80DA8C8
-sub_80DA8C8: ; 80DA8C8
+sub_80DA8C8: @ 80DA8C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -395596,7 +395596,7 @@ _080DAB40:
 	thumb_func_end sub_80DA8C8
 
 	thumb_func_start sub_80DAB8C
-sub_80DAB8C: ; 80DAB8C
+sub_80DAB8C: @ 80DAB8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -395747,7 +395747,7 @@ _080DAC92:
 	thumb_func_end sub_80DAB8C
 
 	thumb_func_start sub_80DACBC
-sub_80DACBC: ; 80DACBC
+sub_80DACBC: @ 80DACBC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -395920,7 +395920,7 @@ _080DADF6:
 	thumb_func_end sub_80DACBC
 
 	thumb_func_start sub_80DAE0C
-sub_80DAE0C: ; 80DAE0C
+sub_80DAE0C: @ 80DAE0C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2D
@@ -396001,7 +396001,7 @@ _080DAE9A:
 	thumb_func_end sub_80DAE0C
 
 	thumb_func_start sub_80DAEA4
-sub_80DAEA4: ; 80DAEA4
+sub_80DAEA4: @ 80DAEA4
 	push {r4,r5,lr}
 	movs r5, 0
 _080DAEA8:
@@ -396026,7 +396026,7 @@ _080DAEA8:
 	thumb_func_end sub_80DAEA4
 
 	thumb_func_start sub_80DAED4
-sub_80DAED4: ; 80DAED4
+sub_80DAED4: @ 80DAED4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -396048,7 +396048,7 @@ sub_80DAED4: ; 80DAED4
 	thumb_func_end sub_80DAED4
 
 	thumb_func_start sub_80DAF04
-sub_80DAF04: ; 80DAF04
+sub_80DAF04: @ 80DAF04
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -396063,7 +396063,7 @@ sub_80DAF04: ; 80DAF04
 	thumb_func_end sub_80DAF04
 
 	thumb_func_start sub_80DAF1C
-sub_80DAF1C: ; 80DAF1C
+sub_80DAF1C: @ 80DAF1C
 	push {r4,r5,lr}
 	sub sp, 0x24
 	adds r4, r1, 0
@@ -396109,7 +396109,7 @@ _080DAF5C:
 	thumb_func_end sub_80DAF1C
 
 	thumb_func_start sub_80DAF88
-sub_80DAF88: ; 80DAF88
+sub_80DAF88: @ 80DAF88
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -396124,7 +396124,7 @@ sub_80DAF88: ; 80DAF88
 	thumb_func_end sub_80DAF88
 
 	thumb_func_start sub_80DAFA0
-sub_80DAFA0: ; 80DAFA0
+sub_80DAFA0: @ 80DAFA0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -396153,7 +396153,7 @@ sub_80DAFA0: ; 80DAFA0
 	thumb_func_end sub_80DAFA0
 
 	thumb_func_start sub_80DAFE0
-sub_80DAFE0: ; 80DAFE0
+sub_80DAFE0: @ 80DAFE0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -396250,7 +396250,7 @@ _080DB080:
 	thumb_func_end sub_80DAFE0
 
 	thumb_func_start sub_80DB09C
-sub_80DB09C: ; 80DB09C
+sub_80DB09C: @ 80DB09C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -396273,7 +396273,7 @@ _080DB0A6:
 	thumb_func_end sub_80DB09C
 
 	thumb_func_start sub_80DB0C4
-sub_80DB0C4: ; 80DB0C4
+sub_80DB0C4: @ 80DB0C4
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_08587C00
 	bl LoadCompressedObjectPic
@@ -396311,7 +396311,7 @@ sub_80DB0C4: ; 80DB0C4
 	thumb_func_end sub_80DB0C4
 
 	thumb_func_start sub_80DB120
-sub_80DB120: ; 80DB120
+sub_80DB120: @ 80DB120
 	push {lr}
 	ldr r0, =gUnknown_08587C08
 	bl LoadCompressedObjectPic
@@ -396347,7 +396347,7 @@ sub_80DB120: ; 80DB120
 	thumb_func_end sub_80DB120
 
 	thumb_func_start sub_80DB174
-sub_80DB174: ; 80DB174
+sub_80DB174: @ 80DB174
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -396477,7 +396477,7 @@ _080DB280:
 	thumb_func_end sub_80DB174
 
 	thumb_func_start sub_80DB2A8
-sub_80DB2A8: ; 80DB2A8
+sub_80DB2A8: @ 80DB2A8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -396493,7 +396493,7 @@ _080DB2B8:
 	thumb_func_end sub_80DB2A8
 
 	thumb_func_start sub_80DB2BC
-sub_80DB2BC: ; 80DB2BC
+sub_80DB2BC: @ 80DB2BC
 	push {r4-r6,lr}
 	ldr r5, =0x02039f34
 	ldr r0, [r5]
@@ -396518,7 +396518,7 @@ sub_80DB2BC: ; 80DB2BC
 	thumb_func_end sub_80DB2BC
 
 	thumb_func_start sub_80DB2EC
-sub_80DB2EC: ; 80DB2EC
+sub_80DB2EC: @ 80DB2EC
 	push {lr}
 	lsls r0, 16
 	lsls r1, 24
@@ -396576,7 +396576,7 @@ _080DB356:
 	thumb_func_end sub_80DB2EC
 
 	thumb_func_start prints_contest_move_description
-prints_contest_move_description: ; 80DB370
+prints_contest_move_description: @ 80DB370
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -396738,7 +396738,7 @@ _080DB472:
 	thumb_func_end prints_contest_move_description
 
 	thumb_func_start sub_80DB4E0
-sub_80DB4E0: ; 80DB4E0
+sub_80DB4E0: @ 80DB4E0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -396819,7 +396819,7 @@ _080DB576:
 	thumb_func_end sub_80DB4E0
 
 	thumb_func_start sub_80DB584
-sub_80DB584: ; 80DB584
+sub_80DB584: @ 80DB584
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0
@@ -396843,14 +396843,14 @@ _080DB58A:
 	thumb_func_end sub_80DB584
 
 	thumb_func_start sub_80DB5B0
-sub_80DB5B0: ; 80DB5B0
+sub_80DB5B0: @ 80DB5B0
 	ldr r0, =0x00002034
 	bx lr
 	.pool
 	thumb_func_end sub_80DB5B0
 
 	thumb_func_start sub_80DB5B8
-sub_80DB5B8: ; 80DB5B8
+sub_80DB5B8: @ 80DB5B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -396963,7 +396963,7 @@ _080DB68A:
 	thumb_func_end sub_80DB5B8
 
 	thumb_func_start sub_80DB69C
-sub_80DB69C: ; 80DB69C
+sub_80DB69C: @ 80DB69C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -397046,7 +397046,7 @@ _080DB6B6:
 	thumb_func_end sub_80DB69C
 
 	thumb_func_start sub_80DB748
-sub_80DB748: ; 80DB748
+sub_80DB748: @ 80DB748
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -397091,7 +397091,7 @@ _080DB78A:
 	thumb_func_end sub_80DB748
 
 	thumb_func_start sub_80DB798
-sub_80DB798: ; 80DB798
+sub_80DB798: @ 80DB798
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -397213,7 +397213,7 @@ _080DB874:
 	thumb_func_end sub_80DB798
 
 	thumb_func_start sub_80DB884
-sub_80DB884: ; 80DB884
+sub_80DB884: @ 80DB884
 	push {r4,lr}
 	movs r4, 0
 _080DB888:
@@ -397229,7 +397229,7 @@ _080DB888:
 	thumb_func_end sub_80DB884
 
 	thumb_func_start sub_80DB89C
-sub_80DB89C: ; 80DB89C
+sub_80DB89C: @ 80DB89C
 	push {lr}
 	movs r0, 0x4
 	movs r1, 0
@@ -397244,7 +397244,7 @@ sub_80DB89C: ; 80DB89C
 	thumb_func_end sub_80DB89C
 
 	thumb_func_start sub_80DB8B8
-sub_80DB8B8: ; 80DB8B8
+sub_80DB8B8: @ 80DB8B8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -397291,7 +397291,7 @@ _080DB90A:
 	thumb_func_end sub_80DB8B8
 
 	thumb_func_start sub_80DB918
-sub_80DB918: ; 80DB918
+sub_80DB918: @ 80DB918
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0
@@ -397315,7 +397315,7 @@ _080DB91E:
 	thumb_func_end sub_80DB918
 
 	thumb_func_start sub_80DB944
-sub_80DB944: ; 80DB944
+sub_80DB944: @ 80DB944
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -397429,7 +397429,7 @@ _080DB9F8:
 	thumb_func_end sub_80DB944
 
 	thumb_func_start sub_80DBA18
-sub_80DBA18: ; 80DBA18
+sub_80DBA18: @ 80DBA18
 	push {r4,r5,lr}
 	ldr r4, =0x02039f34
 	movs r2, 0
@@ -397475,7 +397475,7 @@ _080DBA52:
 	thumb_func_end sub_80DBA18
 
 	thumb_func_start sub_80DBA68
-sub_80DBA68: ; 80DBA68
+sub_80DBA68: @ 80DBA68
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -397508,7 +397508,7 @@ _080DBA9A:
 	thumb_func_end sub_80DBA68
 
 	thumb_func_start sub_80DBAA0
-sub_80DBAA0: ; 80DBAA0
+sub_80DBAA0: @ 80DBAA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -397776,7 +397776,7 @@ _080DBC3C:
 	thumb_func_end sub_80DBAA0
 
 	thumb_func_start sub_80DBCA8
-sub_80DBCA8: ; 80DBCA8
+sub_80DBCA8: @ 80DBCA8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -397809,7 +397809,7 @@ _080DBCDA:
 	thumb_func_end sub_80DBCA8
 
 	thumb_func_start sub_80DBCE0
-sub_80DBCE0: ; 80DBCE0
+sub_80DBCE0: @ 80DBCE0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -397834,7 +397834,7 @@ sub_80DBCE0: ; 80DBCE0
 	thumb_func_end sub_80DBCE0
 
 	thumb_func_start sub_80DBD18
-sub_80DBD18: ; 80DBD18
+sub_80DBD18: @ 80DBD18
 	push {r4,lr}
 	movs r4, 0
 _080DBD1C:
@@ -397851,7 +397851,7 @@ _080DBD1C:
 	thumb_func_end sub_80DBD18
 
 	thumb_func_start sub_80DBD34
-sub_80DBD34: ; 80DBD34
+sub_80DBD34: @ 80DBD34
 	lsls r0, 24
 	ldr r1, =0x02039f10
 	lsrs r0, 23
@@ -397865,7 +397865,7 @@ sub_80DBD34: ; 80DBD34
 	thumb_func_end sub_80DBD34
 
 	thumb_func_start sub_80DBD4C
-sub_80DBD4C: ; 80DBD4C
+sub_80DBD4C: @ 80DBD4C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -398065,7 +398065,7 @@ _080DBEA2:
 	thumb_func_end sub_80DBD4C
 
 	thumb_func_start sub_80DBED4
-sub_80DBED4: ; 80DBED4
+sub_80DBED4: @ 80DBED4
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -398103,7 +398103,7 @@ _080DBF0E:
 	thumb_func_end sub_80DBED4
 
 	thumb_func_start sub_80DBF30
-sub_80DBF30: ; 80DBF30
+sub_80DBF30: @ 80DBF30
 	push {lr}
 	lsls r0, 4
 	adds r0, r2
@@ -398139,7 +398139,7 @@ _080DBF62:
 	thumb_func_end sub_80DBF30
 
 	thumb_func_start sub_80DBF68
-sub_80DBF68: ; 80DBF68
+sub_80DBF68: @ 80DBF68
 	push {lr}
 	ldr r0, =0x02022e16
 	movs r1, 0
@@ -398156,7 +398156,7 @@ sub_80DBF68: ; 80DBF68
 	thumb_func_end sub_80DBF68
 
 	thumb_func_start sub_80DBF90
-sub_80DBF90: ; 80DBF90
+sub_80DBF90: @ 80DBF90
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r5, 0x80
@@ -398187,7 +398187,7 @@ _080DBF9A:
 	thumb_func_end sub_80DBF90
 
 	thumb_func_start sub_80DBFC8
-sub_80DBFC8: ; 80DBFC8
+sub_80DBFC8: @ 80DBFC8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -398211,7 +398211,7 @@ _080DBFE2:
 	thumb_func_end sub_80DBFC8
 
 	thumb_func_start sub_80DBFFC
-sub_80DBFFC: ; 80DBFFC
+sub_80DBFFC: @ 80DBFFC
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -398238,7 +398238,7 @@ _080DC020:
 	thumb_func_end sub_80DBFFC
 
 	thumb_func_start sub_80DC028
-sub_80DC028: ; 80DC028
+sub_80DC028: @ 80DC028
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -398335,7 +398335,7 @@ _080DC0D6:
 	thumb_func_end sub_80DC028
 
 	thumb_func_start sub_80DC0F4
-sub_80DC0F4: ; 80DC0F4
+sub_80DC0F4: @ 80DC0F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -398559,7 +398559,7 @@ _080DC2A8:
 	thumb_func_end sub_80DC0F4
 
 	thumb_func_start sub_80DC2BC
-sub_80DC2BC: ; 80DC2BC
+sub_80DC2BC: @ 80DC2BC
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_08587A74
 	bl LoadObjectPic
@@ -398591,7 +398591,7 @@ _080DC2C8:
 	thumb_func_end sub_80DC2BC
 
 	thumb_func_start sub_80DC308
-sub_80DC308: ; 80DC308
+sub_80DC308: @ 80DC308
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -398673,7 +398673,7 @@ _080DC38E:
 	thumb_func_end sub_80DC308
 
 	thumb_func_start sub_80DC3AC
-sub_80DC3AC: ; 80DC3AC
+sub_80DC3AC: @ 80DC3AC
 	push {r4,lr}
 	movs r4, 0
 _080DC3B0:
@@ -398689,7 +398689,7 @@ _080DC3B0:
 	thumb_func_end sub_80DC3AC
 
 	thumb_func_start sub_80DC3C4
-sub_80DC3C4: ; 80DC3C4
+sub_80DC3C4: @ 80DC3C4
 	push {r4,lr}
 	movs r2, 0
 	ldr r3, =0x02039f34
@@ -398729,7 +398729,7 @@ _080DC402:
 	thumb_func_end sub_80DC3C4
 
 	thumb_func_start sub_80DC408
-sub_80DC408: ; 80DC408
+sub_80DC408: @ 80DC408
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x24]
@@ -398766,7 +398766,7 @@ _080DC446:
 	thumb_func_end sub_80DC408
 
 	thumb_func_start sub_80DC44C
-sub_80DC44C: ; 80DC44C
+sub_80DC44C: @ 80DC44C
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r6, =0x02020630
@@ -398798,7 +398798,7 @@ _080DC458:
 	thumb_func_end sub_80DC44C
 
 	thumb_func_start sub_80DC490
-sub_80DC490: ; 80DC490
+sub_80DC490: @ 80DC490
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -398849,7 +398849,7 @@ _080DC4E2:
 	thumb_func_end sub_80DC490
 
 	thumb_func_start sub_80DC4F0
-sub_80DC4F0: ; 80DC4F0
+sub_80DC4F0: @ 80DC4F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -398917,7 +398917,7 @@ _080DC506:
 	thumb_func_end sub_80DC4F0
 
 	thumb_func_start sub_80DC594
-sub_80DC594: ; 80DC594
+sub_80DC594: @ 80DC594
 	push {lr}
 	ldr r0, =gUnknown_08587BB0
 	bl LoadCompressedObjectPic
@@ -398951,7 +398951,7 @@ sub_80DC594: ; 80DC594
 	thumb_func_end sub_80DC594
 
 	thumb_func_start sub_80DC5E8
-sub_80DC5E8: ; 80DC5E8
+sub_80DC5E8: @ 80DC5E8
 	push {r4,lr}
 	ldr r0, =sub_80DC728
 	movs r1, 0x1E
@@ -398985,7 +398985,7 @@ _080DC60A:
 	thumb_func_end sub_80DC5E8
 
 	thumb_func_start sub_80DC630
-sub_80DC630: ; 80DC630
+sub_80DC630: @ 80DC630
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -399020,7 +399020,7 @@ sub_80DC630: ; 80DC630
 	thumb_func_end sub_80DC630
 
 	thumb_func_start sub_80DC674
-sub_80DC674: ; 80DC674
+sub_80DC674: @ 80DC674
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -399043,7 +399043,7 @@ sub_80DC674: ; 80DC674
 	thumb_func_end sub_80DC674
 
 	thumb_func_start sub_80DC6A4
-sub_80DC6A4: ; 80DC6A4
+sub_80DC6A4: @ 80DC6A4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -399108,7 +399108,7 @@ _080DC716:
 	thumb_func_end sub_80DC6A4
 
 	thumb_func_start sub_80DC728
-sub_80DC728: ; 80DC728
+sub_80DC728: @ 80DC728
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -399210,7 +399210,7 @@ _080DC7CA:
 	thumb_func_end sub_80DC728
 
 	thumb_func_start sub_80DC7EC
-sub_80DC7EC: ; 80DC7EC
+sub_80DC7EC: @ 80DC7EC
 	push {r4,lr}
 	ldr r0, =sub_80DC8D0
 	movs r1, 0x1E
@@ -399234,7 +399234,7 @@ _080DC800:
 	thumb_func_end sub_80DC7EC
 
 	thumb_func_start sub_80DC81C
-sub_80DC81C: ; 80DC81C
+sub_80DC81C: @ 80DC81C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -399270,7 +399270,7 @@ sub_80DC81C: ; 80DC81C
 	thumb_func_end sub_80DC81C
 
 	thumb_func_start sub_80DC864
-sub_80DC864: ; 80DC864
+sub_80DC864: @ 80DC864
 	push {r4,lr}
 	movs r4, 0
 _080DC868:
@@ -399286,7 +399286,7 @@ _080DC868:
 	thumb_func_end sub_80DC864
 
 	thumb_func_start sub_80DC87C
-sub_80DC87C: ; 80DC87C
+sub_80DC87C: @ 80DC87C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -399324,7 +399324,7 @@ sub_80DC87C: ; 80DC87C
 	thumb_func_end sub_80DC87C
 
 	thumb_func_start sub_80DC8D0
-sub_80DC8D0: ; 80DC8D0
+sub_80DC8D0: @ 80DC8D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -399440,7 +399440,7 @@ _080DC996:
 	thumb_func_end sub_80DC8D0
 
 	thumb_func_start sub_80DC9B4
-sub_80DC9B4: ; 80DC9B4
+sub_80DC9B4: @ 80DC9B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -399469,7 +399469,7 @@ _080DC9E6:
 	thumb_func_end sub_80DC9B4
 
 	thumb_func_start sub_80DC9EC
-sub_80DC9EC: ; 80DC9EC
+sub_80DC9EC: @ 80DC9EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -399637,7 +399637,7 @@ sub_80DC9EC: ; 80DC9EC
 	thumb_func_end sub_80DC9EC
 
 	thumb_func_start sub_80DCB78
-sub_80DCB78: ; 80DCB78
+sub_80DCB78: @ 80DCB78
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -399666,7 +399666,7 @@ sub_80DCB78: ; 80DCB78
 	thumb_func_end sub_80DCB78
 
 	thumb_func_start sub_80DCBB4
-sub_80DCBB4: ; 80DCBB4
+sub_80DCBB4: @ 80DCBB4
 	push {lr}
 	movs r1, 0xFD
 	lsls r1, 6
@@ -399681,7 +399681,7 @@ sub_80DCBB4: ; 80DCBB4
 	thumb_func_end sub_80DCBB4
 
 	thumb_func_start sub_80DCBD0
-sub_80DCBD0: ; 80DCBD0
+sub_80DCBD0: @ 80DCBD0
 	push {lr}
 	movs r0, 0x50
 	movs r1, 0
@@ -399694,7 +399694,7 @@ sub_80DCBD0: ; 80DCBD0
 	thumb_func_end sub_80DCBD0
 
 	thumb_func_start sub_80DCBE8
-sub_80DCBE8: ; 80DCBE8
+sub_80DCBE8: @ 80DCBE8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -399765,7 +399765,7 @@ _080DCC76:
 	thumb_func_end sub_80DCBE8
 
 	thumb_func_start sub_80DCC84
-sub_80DCC84: ; 80DCC84
+sub_80DCC84: @ 80DCC84
 	push {lr}
 	mov r12, r0
 	adds r0, 0x3F
@@ -399809,7 +399809,7 @@ _080DCCCC:
 	thumb_func_end sub_80DCC84
 
 	thumb_func_start sub_80DCCD8
-sub_80DCCD8: ; 80DCCD8
+sub_80DCCD8: @ 80DCCD8
 	push {lr}
 	ldr r1, =0x02039f34
 	ldr r1, [r1]
@@ -399834,7 +399834,7 @@ sub_80DCCD8: ; 80DCCD8
 	thumb_func_end sub_80DCCD8
 
 	thumb_func_start sub_80DCD08
-sub_80DCD08: ; 80DCD08
+sub_80DCD08: @ 80DCD08
 	push {lr}
 	ldr r0, =0x02000000
 	movs r1, 0xD0
@@ -399868,7 +399868,7 @@ _080DCD42:
 	thumb_func_end sub_80DCD08
 
 	thumb_func_start sub_80DCD48
-sub_80DCD48: ; 80DCD48
+sub_80DCD48: @ 80DCD48
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x020322d5
@@ -399998,7 +399998,7 @@ _080DCE44:
 	thumb_func_end sub_80DCD48
 
 	thumb_func_start sub_80DCE58
-sub_80DCE58: ; 80DCE58
+sub_80DCE58: @ 80DCE58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -400259,7 +400259,7 @@ _080DD034:
 	thumb_func_end sub_80DCE58
 
 	thumb_func_start sub_80DD04C
-sub_80DD04C: ; 80DD04C
+sub_80DD04C: @ 80DD04C
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0xA0
@@ -400285,7 +400285,7 @@ _080DD052:
 	thumb_func_end sub_80DD04C
 
 	thumb_func_start sub_80DD080
-sub_80DD080: ; 80DD080
+sub_80DD080: @ 80DD080
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -400714,7 +400714,7 @@ _080DD3C4:
 	thumb_func_end sub_80DD080
 
 	thumb_func_start sub_80DD3D4
-sub_80DD3D4: ; 80DD3D4
+sub_80DD3D4: @ 80DD3D4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02039f34
@@ -400730,7 +400730,7 @@ sub_80DD3D4: ; 80DD3D4
 	thumb_func_end sub_80DD3D4
 
 	thumb_func_start sub_80DD3F0
-sub_80DD3F0: ; 80DD3F0
+sub_80DD3F0: @ 80DD3F0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02039f34
@@ -400746,7 +400746,7 @@ sub_80DD3F0: ; 80DD3F0
 	thumb_func_end sub_80DD3F0
 
 	thumb_func_start sub_80DD40C
-sub_80DD40C: ; 80DD40C
+sub_80DD40C: @ 80DD40C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -400789,7 +400789,7 @@ _080DD456:
 	thumb_func_end sub_80DD40C
 
 	thumb_func_start sub_80DD45C
-sub_80DD45C: ; 80DD45C
+sub_80DD45C: @ 80DD45C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -400886,7 +400886,7 @@ _080DD52C:
 	thumb_func_end sub_80DD45C
 
 	thumb_func_start sub_80DD560
-sub_80DD560: ; 80DD560
+sub_80DD560: @ 80DD560
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -400913,7 +400913,7 @@ sub_80DD560: ; 80DD560
 	thumb_func_end sub_80DD560
 
 	thumb_func_start sub_80DD590
-sub_80DD590: ; 80DD590
+sub_80DD590: @ 80DD590
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -401088,7 +401088,7 @@ _080DD690:
 	thumb_func_end sub_80DD590
 
 	thumb_func_start sub_80DD6DC
-sub_80DD6DC: ; 80DD6DC
+sub_80DD6DC: @ 80DD6DC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -401123,7 +401123,7 @@ _080DD712:
 	thumb_func_end sub_80DD6DC
 
 	thumb_func_start sub_80DD720
-sub_80DD720: ; 80DD720
+sub_80DD720: @ 80DD720
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -401339,7 +401339,7 @@ _080DD8F8:
 	thumb_func_end sub_80DD720
 
 	thumb_func_start sub_80DD940
-sub_80DD940: ; 80DD940
+sub_80DD940: @ 80DD940
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -401421,7 +401421,7 @@ _080DD9C8:
 	thumb_func_end sub_80DD940
 
 	thumb_func_start sub_80DD9F0
-sub_80DD9F0: ; 80DD9F0
+sub_80DD9F0: @ 80DD9F0
 	lsls r0, 16
 	ldr r3, =gUnknown_085899EC
 	ldr r1, =gContestMoves
@@ -401443,7 +401443,7 @@ sub_80DD9F0: ; 80DD9F0
 	thumb_func_end sub_80DD9F0
 
 	thumb_func_start sub_80DDA20
-sub_80DDA20: ; 80DDA20
+sub_80DDA20: @ 80DDA20
 	push {r4,r5,lr}
 	ldr r0, =c3_08130B10
 	movs r1, 0xA
@@ -401471,7 +401471,7 @@ sub_80DDA20: ; 80DDA20
 	thumb_func_end sub_80DDA20
 
 	thumb_func_start c3_08130B10
-c3_08130B10: ; 80DDA60
+c3_08130B10: @ 80DDA60
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -401558,7 +401558,7 @@ _080DDAFE:
 	thumb_func_end c3_08130B10
 
 	thumb_func_start sub_80DDB0C
-sub_80DDB0C: ; 80DDB0C
+sub_80DDB0C: @ 80DDB0C
 	push {r4,lr}
 	ldr r0, =sub_80DDB6C
 	movs r1, 0xA
@@ -401601,7 +401601,7 @@ sub_80DDB0C: ; 80DDB0C
 	thumb_func_end sub_80DDB0C
 
 	thumb_func_start sub_80DDB6C
-sub_80DDB6C: ; 80DDB6C
+sub_80DDB6C: @ 80DDB6C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -401662,7 +401662,7 @@ _080DDBD4:
 	thumb_func_end sub_80DDB6C
 
 	thumb_func_start sub_80DDBE8
-sub_80DDBE8: ; 80DDBE8
+sub_80DDBE8: @ 80DDBE8
 	push {r4,r5,lr}
 	ldr r5, =0x02020630
 	ldr r4, =0x02039f34
@@ -401713,7 +401713,7 @@ _080DDC40:
 	thumb_func_end sub_80DDBE8
 
 	thumb_func_start task08_080CD1CC
-task08_080CD1CC: ; 80DDC4C
+task08_080CD1CC: @ 80DDC4C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -401782,7 +401782,7 @@ _080DDCC4:
 	thumb_func_end task08_080CD1CC
 
 	thumb_func_start sub_80DDCDC
-sub_80DDCDC: ; 80DDCDC
+sub_80DDCDC: @ 80DDCDC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -401814,7 +401814,7 @@ sub_80DDCDC: ; 80DDCDC
 	thumb_func_end sub_80DDCDC
 
 	thumb_func_start sub_80DDD20
-sub_80DDD20: ; 80DDD20
+sub_80DDD20: @ 80DDD20
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -401884,7 +401884,7 @@ _080DDD9C:
 	thumb_func_end sub_80DDD20
 
 	thumb_func_start sub_80DDDA8
-sub_80DDDA8: ; 80DDDA8
+sub_80DDDA8: @ 80DDDA8
 	ldr r3, =0x02020630
 	ldr r0, =0x02039f34
 	ldr r2, [r0]
@@ -401915,7 +401915,7 @@ sub_80DDDA8: ; 80DDDA8
 	thumb_func_end sub_80DDDA8
 
 	thumb_func_start sub_80DDDE4
-sub_80DDDE4: ; 80DDDE4
+sub_80DDDE4: @ 80DDDE4
 	ldr r2, =0x02020630
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -401936,7 +401936,7 @@ sub_80DDDE4: ; 80DDDE4
 	thumb_func_end sub_80DDDE4
 
 	thumb_func_start sub_80DDE0C
-sub_80DDE0C: ; 80DDE0C
+sub_80DDE0C: @ 80DDE0C
 	push {lr}
 	ldr r0, =sub_80DDE30
 	movs r1, 0xF
@@ -401954,7 +401954,7 @@ sub_80DDE0C: ; 80DDE0C
 	thumb_func_end sub_80DDE0C
 
 	thumb_func_start sub_80DDE30
-sub_80DDE30: ; 80DDE30
+sub_80DDE30: @ 80DDE30
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -402025,7 +402025,7 @@ _080DDEBA:
 	thumb_func_end sub_80DDE30
 
 	thumb_func_start sub_80DDED0
-sub_80DDED0: ; 80DDED0
+sub_80DDED0: @ 80DDED0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -402109,7 +402109,7 @@ _080DDF4E:
 	thumb_func_end sub_80DDED0
 
 	thumb_func_start sub_80DDF80
-sub_80DDF80: ; 80DDF80
+sub_80DDF80: @ 80DDF80
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -402177,7 +402177,7 @@ _080DDFFC:
 	thumb_func_end sub_80DDF80
 
 	thumb_func_start sub_80DE008
-sub_80DE008: ; 80DE008
+sub_80DE008: @ 80DE008
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -402287,7 +402287,7 @@ _080DE0D6:
 	thumb_func_end sub_80DE008
 
 	thumb_func_start sub_80DE0F0
-sub_80DE0F0: ; 80DE0F0
+sub_80DE0F0: @ 80DE0F0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -402318,7 +402318,7 @@ _080DE122:
 	thumb_func_end sub_80DE0F0
 
 	thumb_func_start sub_80DE12C
-sub_80DE12C: ; 80DE12C
+sub_80DE12C: @ 80DE12C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -402410,7 +402410,7 @@ _080DE1CA:
 	thumb_func_end sub_80DE12C
 
 	thumb_func_start sub_80DE1E8
-sub_80DE1E8: ; 80DE1E8
+sub_80DE1E8: @ 80DE1E8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -402444,7 +402444,7 @@ _080DE21E:
 	thumb_func_end sub_80DE1E8
 
 	thumb_func_start sub_80DE224
-sub_80DE224: ; 80DE224
+sub_80DE224: @ 80DE224
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -402577,7 +402577,7 @@ _080DE2F0:
 	thumb_func_end sub_80DE224
 
 	thumb_func_start sub_80DE350
-sub_80DE350: ; 80DE350
+sub_80DE350: @ 80DE350
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r1, =0x06008000
@@ -402671,7 +402671,7 @@ _080DE3CA:
 	thumb_func_end sub_80DE350
 
 	thumb_func_start sub_80DE424
-sub_80DE424: ; 80DE424
+sub_80DE424: @ 80DE424
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -402699,7 +402699,7 @@ sub_80DE424: ; 80DE424
 	thumb_func_end sub_80DE424
 
 	thumb_func_start sub_80DE464
-sub_80DE464: ; 80DE464
+sub_80DE464: @ 80DE464
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -402733,7 +402733,7 @@ _080DE496:
 	thumb_func_end sub_80DE464
 
 	thumb_func_start sub_80DE4A8
-sub_80DE4A8: ; 80DE4A8
+sub_80DE4A8: @ 80DE4A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -402854,7 +402854,7 @@ _080DE5B4:
 	thumb_func_end sub_80DE4A8
 
 	thumb_func_start sub_80DE5C0
-sub_80DE5C0: ; 80DE5C0
+sub_80DE5C0: @ 80DE5C0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -402880,7 +402880,7 @@ _080DE5E4:
 	thumb_func_end sub_80DE5C0
 
 	thumb_func_start sub_80DE5F4
-sub_80DE5F4: ; 80DE5F4
+sub_80DE5F4: @ 80DE5F4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -402938,7 +402938,7 @@ _080DE654:
 	thumb_func_end sub_80DE5F4
 
 	thumb_func_start sub_80DE65C
-sub_80DE65C: ; 80DE65C
+sub_80DE65C: @ 80DE65C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -402972,7 +402972,7 @@ _080DE690:
 	thumb_func_end sub_80DE65C
 
 	thumb_func_start sub_80DE69C
-sub_80DE69C: ; 80DE69C
+sub_80DE69C: @ 80DE69C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -403091,7 +403091,7 @@ _080DE74C:
 	thumb_func_end sub_80DE69C
 
 	thumb_func_start sub_80DE794
-sub_80DE794: ; 80DE794
+sub_80DE794: @ 80DE794
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -403172,7 +403172,7 @@ _080DE822:
 	thumb_func_end sub_80DE794
 
 	thumb_func_start sub_80DE834
-sub_80DE834: ; 80DE834
+sub_80DE834: @ 80DE834
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -403188,7 +403188,7 @@ _080DE844:
 	thumb_func_end sub_80DE834
 
 	thumb_func_start sub_80DE84C
-sub_80DE84C: ; 80DE84C
+sub_80DE84C: @ 80DE84C
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -403204,7 +403204,7 @@ _080DE85A:
 	thumb_func_end sub_80DE84C
 
 	thumb_func_start sub_80DE864
-sub_80DE864: ; 80DE864
+sub_80DE864: @ 80DE864
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -403358,7 +403358,7 @@ _080DE9A2:
 	thumb_func_end sub_80DE864
 
 	thumb_func_start sub_80DE9B0
-sub_80DE9B0: ; 80DE9B0
+sub_80DE9B0: @ 80DE9B0
 	push {r4,lr}
 	ldr r4, =0x02039f34
 	ldr r0, [r4]
@@ -403383,7 +403383,7 @@ _080DE9D2:
 	thumb_func_end sub_80DE9B0
 
 	thumb_func_start sub_80DE9DC
-sub_80DE9DC: ; 80DE9DC
+sub_80DE9DC: @ 80DE9DC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -403417,7 +403417,7 @@ sub_80DE9DC: ; 80DE9DC
 	thumb_func_end sub_80DE9DC
 
 	thumb_func_start sub_80DEA20
-sub_80DEA20: ; 80DEA20
+sub_80DEA20: @ 80DEA20
 	push {lr}
 	ldr r0, =DummyObjectCallback
 	bl object_new_hidden_with_callback
@@ -403440,7 +403440,7 @@ sub_80DEA20: ; 80DEA20
 	thumb_func_end sub_80DEA20
 
 	thumb_func_start sub_80DEA5C
-sub_80DEA5C: ; 80DEA5C
+sub_80DEA5C: @ 80DEA5C
 	push {r4,lr}
 	ldr r0, =0x020241e4
 	ldrb r0, [r0, 0x3]
@@ -403476,7 +403476,7 @@ sub_80DEA5C: ; 80DEA5C
 	thumb_func_end sub_80DEA5C
 
 	thumb_func_start sub_80DEAA8
-sub_80DEAA8: ; 80DEAA8
+sub_80DEAA8: @ 80DEAA8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -403545,7 +403545,7 @@ _080DEB64:
 	thumb_func_end sub_80DEAA8
 
 	thumb_func_start sub_80DEB70
-sub_80DEB70: ; 80DEB70
+sub_80DEB70: @ 80DEB70
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -403593,7 +403593,7 @@ sub_80DEB70: ; 80DEB70
 	thumb_func_end sub_80DEB70
 
 	thumb_func_start sub_80DEBD0
-sub_80DEBD0: ; 80DEBD0
+sub_80DEBD0: @ 80DEBD0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -403641,7 +403641,7 @@ sub_80DEBD0: ; 80DEBD0
 	thumb_func_end sub_80DEBD0
 
 	thumb_func_start sub_80DEC30
-sub_80DEC30: ; 80DEC30
+sub_80DEC30: @ 80DEC30
 	push {r4,r5,lr}
 	sub sp, 0x10
 	str r0, [sp]
@@ -403711,7 +403711,7 @@ _080DECA4:
 	thumb_func_end sub_80DEC30
 
 	thumb_func_start sub_80DECB8
-sub_80DECB8: ; 80DECB8
+sub_80DECB8: @ 80DECB8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -403756,7 +403756,7 @@ sub_80DECB8: ; 80DECB8
 	thumb_func_end sub_80DECB8
 
 	thumb_func_start sub_80DED10
-sub_80DED10: ; 80DED10
+sub_80DED10: @ 80DED10
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r4, [sp, 0x20]
@@ -403789,7 +403789,7 @@ sub_80DED10: ; 80DED10
 	thumb_func_end sub_80DED10
 
 	thumb_func_start sub_80DED4C
-sub_80DED4C: ; 80DED4C
+sub_80DED4C: @ 80DED4C
 	push {lr}
 	bl RunTextPrinters
 	movs r0, 0x4
@@ -403801,7 +403801,7 @@ sub_80DED4C: ; 80DED4C
 	thumb_func_end sub_80DED4C
 
 	thumb_func_start sub_80DED60
-sub_80DED60: ; 80DED60
+sub_80DED60: @ 80DED60
 	ldr r2, =0x02039f38
 	movs r1, 0x1
 	lsls r1, r0
@@ -403813,7 +403813,7 @@ sub_80DED60: ; 80DED60
 	thumb_func_end sub_80DED60
 
 	thumb_func_start sub_80DED74
-sub_80DED74: ; 80DED74
+sub_80DED74: @ 80DED74
 	push {r4-r6,lr}
 	movs r0, 0
 	ldr r6, =0x03005d90
@@ -403842,7 +403842,7 @@ _080DED84:
 	thumb_func_end sub_80DED74
 
 	thumb_func_start sub_80DEDA8
-sub_80DEDA8: ; 80DEDA8
+sub_80DEDA8: @ 80DEDA8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -404072,7 +404072,7 @@ _080DEF90:
 	thumb_func_end sub_80DEDA8
 
 	thumb_func_start sub_80DEFA8
-sub_80DEFA8: ; 80DEFA8
+sub_80DEFA8: @ 80DEFA8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -404148,7 +404148,7 @@ _080DF03A:
 	thumb_func_end sub_80DEFA8
 
 	thumb_func_start sub_80DF040
-sub_80DF040: ; 80DF040
+sub_80DF040: @ 80DF040
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r0, =0x03005d8c
@@ -404179,7 +404179,7 @@ _080DF04C:
 	thumb_func_end sub_80DF040
 
 	thumb_func_start sub_80DF080
-sub_80DF080: ; 80DF080
+sub_80DF080: @ 80DF080
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -404424,7 +404424,7 @@ _080DF24A:
 	thumb_func_end sub_80DF080
 
 	thumb_func_start sub_80DF250
-sub_80DF250: ; 80DF250
+sub_80DF250: @ 80DF250
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -404774,7 +404774,7 @@ _080DF4C0:
 	thumb_func_end sub_80DF250
 
 	thumb_func_start sub_80DF4F8
-sub_80DF4F8: ; 80DF4F8
+sub_80DF4F8: @ 80DF4F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -405038,7 +405038,7 @@ _080DF6EE:
 	thumb_func_end sub_80DF4F8
 
 	thumb_func_start sub_80DF704
-sub_80DF704: ; 80DF704
+sub_80DF704: @ 80DF704
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -405080,7 +405080,7 @@ _080DF74A:
 	thumb_func_end sub_80DF704
 
 	thumb_func_start sub_80DF750
-sub_80DF750: ; 80DF750
+sub_80DF750: @ 80DF750
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -405319,7 +405319,7 @@ _080DF924:
 	thumb_func_end sub_80DF750
 
 	thumb_func_start sub_80DF940
-sub_80DF940: ; 80DF940
+sub_80DF940: @ 80DF940
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0x2
@@ -405401,7 +405401,7 @@ _080DF9CC:
 	thumb_func_end sub_80DF940
 
 	thumb_func_start sub_80DF9D4
-sub_80DF9D4: ; 80DF9D4
+sub_80DF9D4: @ 80DF9D4
 	ldrb r2, [r0, 0x5]
 	movs r1, 0xFF
 	strb r1, [r0, 0x5]
@@ -405410,7 +405410,7 @@ sub_80DF9D4: ; 80DF9D4
 	thumb_func_end sub_80DF9D4
 
 	thumb_func_start sub_80DF9E0
-sub_80DF9E0: ; 80DF9E0
+sub_80DF9E0: @ 80DF9E0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -405434,7 +405434,7 @@ _080DFA00:
 	thumb_func_end sub_80DF9E0
 
 	thumb_func_start sub_80DFA08
-sub_80DFA08: ; 80DFA08
+sub_80DFA08: @ 80DFA08
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -405495,8 +405495,8 @@ _080DFA70:
 	thumb_func_end sub_80DFA08
 
 	thumb_func_start CreateShopMenu
-; s8 CreateShopMenu(s8 type)
-CreateShopMenu: ; 80DFA78
+@ s8 CreateShopMenu(s8 type)
+CreateShopMenu: @ 80DFA78
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -405581,8 +405581,8 @@ _080DFAF8:
 	thumb_func_end CreateShopMenu
 
 	thumb_func_start SetShopMenuCallback
-; void SetShopMenuCallback()
-SetShopMenuCallback: ; 80DFB4C
+@ void SetShopMenuCallback()
+SetShopMenuCallback: @ 80DFB4C
 	ldr r1, =0x02039f60
 	str r0, [r1]
 	bx lr
@@ -405590,8 +405590,8 @@ SetShopMenuCallback: ; 80DFB4C
 	thumb_func_end SetShopMenuCallback
 
 	thumb_func_start SetShopItemsForSale
-; int SetShopItemsForSale(s16 *itemsForSale)
-SetShopItemsForSale: ; 80DFB58
+@ int SetShopItemsForSale(s16 *itemsForSale)
+SetShopItemsForSale: @ 80DFB58
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0
@@ -405620,8 +405620,8 @@ _080DFB80:
 	thumb_func_end SetShopItemsForSale
 
 	thumb_func_start Task_ShopMenu
-; void Task_ShopMenu(u8 taskId)
-Task_ShopMenu: ; 80DFB88
+@ void Task_ShopMenu(u8 taskId)
+Task_ShopMenu: @ 80DFB88
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -405657,8 +405657,8 @@ _080DFBC4:
 	thumb_func_end Task_ShopMenu
 
 	thumb_func_start HandleShopMenuBuy
-; void HandleShopMenuBuy(u8 taskId)
-HandleShopMenuBuy: ; 80DFBD0
+@ void HandleShopMenuBuy(u8 taskId)
+HandleShopMenuBuy: @ 80DFBD0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -405685,8 +405685,8 @@ HandleShopMenuBuy: ; 80DFBD0
 	thumb_func_end HandleShopMenuBuy
 
 	thumb_func_start HandleShopMenuSell
-; void HandleShopMenuSell(u8 taskId)
-HandleShopMenuSell: ; 80DFC0C
+@ void HandleShopMenuSell(u8 taskId)
+HandleShopMenuSell: @ 80DFC0C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -405713,8 +405713,8 @@ HandleShopMenuSell: ; 80DFC0C
 	thumb_func_end HandleShopMenuSell
 
 	thumb_func_start CB2_ExitSellMenu
-; int CB2_ExitSellMenu()
-CB2_ExitSellMenu: ; 80DFC48
+@ int CB2_ExitSellMenu()
+CB2_ExitSellMenu: @ 80DFC48
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =MapPostLoadHook_ExitBuyOrSellMenu
@@ -405727,8 +405727,8 @@ CB2_ExitSellMenu: ; 80DFC48
 	thumb_func_end CB2_ExitSellMenu
 
 	thumb_func_start HandleShopMenuQuit
-; void HandleShopMenuQuit(u8 taskId)
-HandleShopMenuQuit: ; 80DFC68
+@ void HandleShopMenuQuit(u8 taskId)
+HandleShopMenuQuit: @ 80DFC68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -405755,8 +405755,8 @@ _080DFC98:
 	thumb_func_end HandleShopMenuQuit
 
 	thumb_func_start Task_GoToBuyOrSellMenu
-; int Task_GoToBuyOrSellMenu(u8 taskId)
-Task_GoToBuyOrSellMenu: ; 80DFCA4
+@ int Task_GoToBuyOrSellMenu(u8 taskId)
+Task_GoToBuyOrSellMenu: @ 80DFCA4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -405786,8 +405786,8 @@ _080DFCD2:
 	thumb_func_end Task_GoToBuyOrSellMenu
 
 	thumb_func_start MapPostLoadHook_ExitBuyOrSellMenu
-; void MapPostLoadHook_ExitBuyOrSellMenu()
-MapPostLoadHook_ExitBuyOrSellMenu: ; 80DFCE0
+@ void MapPostLoadHook_ExitBuyOrSellMenu()
+MapPostLoadHook_ExitBuyOrSellMenu: @ 80DFCE0
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =Task_ExitSellMenu
@@ -405799,8 +405799,8 @@ MapPostLoadHook_ExitBuyOrSellMenu: ; 80DFCE0
 	thumb_func_end MapPostLoadHook_ExitBuyOrSellMenu
 
 	thumb_func_start Task_ExitSellMenu
-; void Task_ExitSellMenu(u8 taskId)
-Task_ExitSellMenu: ; 80DFCF8
+@ void Task_ExitSellMenu(u8 taskId)
+Task_ExitSellMenu: @ 80DFCF8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -405833,8 +405833,8 @@ _080DFD36:
 	thumb_func_end Task_ExitSellMenu
 
 	thumb_func_start ReturnToShopMenuAfterExitingSellMenu
-; void ReturnToShopMenuAfterExitingSellMenu(u8 taskId)
-ReturnToShopMenuAfterExitingSellMenu: ; 80DFD44
+@ void ReturnToShopMenuAfterExitingSellMenu(u8 taskId)
+ReturnToShopMenuAfterExitingSellMenu: @ 80DFD44
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -405851,8 +405851,8 @@ ReturnToShopMenuAfterExitingSellMenu: ; 80DFD44
 	thumb_func_end ReturnToShopMenuAfterExitingSellMenu
 
 	thumb_func_start CB2_BuyMenu
-; void CB2_BuyMenu()
-CB2_BuyMenu: ; 80DFD64
+@ void CB2_BuyMenu()
+CB2_BuyMenu: @ 80DFD64
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -405864,8 +405864,8 @@ CB2_BuyMenu: ; 80DFD64
 	thumb_func_end CB2_BuyMenu
 
 	thumb_func_start VBlankCB_BuyMenu
-; void VBlankCB_BuyMenu()
-VBlankCB_BuyMenu: ; 80DFD80
+@ void VBlankCB_BuyMenu()
+VBlankCB_BuyMenu: @ 80DFD80
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -405875,8 +405875,8 @@ VBlankCB_BuyMenu: ; 80DFD80
 	thumb_func_end VBlankCB_BuyMenu
 
 	thumb_func_start CB2_InitBuyMenu
-; void CB2_InitBuyMenu()
-CB2_InitBuyMenu: ; 80DFD94
+@ void CB2_InitBuyMenu()
+CB2_InitBuyMenu: @ 80DFD94
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -406016,8 +406016,8 @@ _080DFEF4:
 	thumb_func_end CB2_InitBuyMenu
 
 	thumb_func_start BuyMenuFreeMemory
-; void BuyMenuFreeMemory()
-BuyMenuFreeMemory: ; 80DFEFC
+@ void BuyMenuFreeMemory()
+BuyMenuFreeMemory: @ 80DFEFC
 	push {lr}
 	ldr r0, =0x02039f70
 	ldr r0, [r0]
@@ -406035,8 +406035,8 @@ BuyMenuFreeMemory: ; 80DFEFC
 	thumb_func_end BuyMenuFreeMemory
 
 	thumb_func_start BuyMenuBuildListMenuTemplate
-; void BuyMenuBuildListMenuTemplate()
-BuyMenuBuildListMenuTemplate: ; 80DFF2C
+@ void BuyMenuBuildListMenuTemplate()
+BuyMenuBuildListMenuTemplate: @ 80DFF2C
 	push {r4-r7,lr}
 	ldr r7, =0x02039f74
 	ldr r4, =0x02039f60
@@ -406128,8 +406128,8 @@ _080DFFDE:
 	thumb_func_end BuyMenuBuildListMenuTemplate
 
 	thumb_func_start BuyMenuSetListEntry
-; void BuyMenuSetListEntry(struct ListMenuEntry *entry, u16 code, u8 *str)
-BuyMenuSetListEntry: ; 80E0000
+@ void BuyMenuSetListEntry(struct ListMenuEntry *entry, u16 code, u8 *str)
+BuyMenuSetListEntry: @ 80E0000
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r2, 0
@@ -406160,8 +406160,8 @@ _080E002C:
 	thumb_func_end BuyMenuSetListEntry
 
 	thumb_func_start BuyMenuPrintItemDescriptionAndShowItemIcon
-; void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 menuEntryCode, bool8 isInitialSelection, struct ListMenu *listMenu)
-BuyMenuPrintItemDescriptionAndShowItemIcon: ; 80E003C
+@ void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 menuEntryCode, bool8 isInitialSelection, struct ListMenu *listMenu)
+BuyMenuPrintItemDescriptionAndShowItemIcon: @ 80E003C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -406260,8 +406260,8 @@ _080E00EA:
 	thumb_func_end BuyMenuPrintItemDescriptionAndShowItemIcon
 
 	thumb_func_start BuyMenuPrintPriceInList
-; void BuyMenuPrintPriceInList(u8 windowId, s32 menuEntryCode, u8 y)
-BuyMenuPrintPriceInList: ; 80E0114
+@ void BuyMenuPrintPriceInList(u8 windowId, s32 menuEntryCode, u8 y)
+BuyMenuPrintPriceInList: @ 80E0114
 	push {r4-r7,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -406338,8 +406338,8 @@ _080E01AC:
 	thumb_func_end BuyMenuPrintPriceInList
 
 	thumb_func_start BuyMenuAddScrollIndicatorArrows
-; void BuyMenuAddScrollIndicatorArrows()
-BuyMenuAddScrollIndicatorArrows: ; 80E01C8
+@ void BuyMenuAddScrollIndicatorArrows()
+BuyMenuAddScrollIndicatorArrows: @ 80E01C8
 	push {r4,r5,lr}
 	sub sp, 0x10
 	ldr r5, =0x02039f70
@@ -406379,8 +406379,8 @@ _080E0206:
 	thumb_func_end BuyMenuAddScrollIndicatorArrows
 
 	thumb_func_start BuyMenuRemoveScrollIndicatorArrows
-; void BuyMenuRemoveScrollIndicatorArrows()
-BuyMenuRemoveScrollIndicatorArrows: ; 80E0224
+@ void BuyMenuRemoveScrollIndicatorArrows()
+BuyMenuRemoveScrollIndicatorArrows: @ 80E0224
 	push {r4,lr}
 	ldr r4, =0x02039f70
 	ldr r0, [r4]
@@ -406403,8 +406403,8 @@ _080E0242:
 	thumb_func_end BuyMenuRemoveScrollIndicatorArrows
 
 	thumb_func_start BuyMenuPrintCursor
-; void BuyMenuPrintCursor(u8 taskId, u8 colorSetId)
-BuyMenuPrintCursor: ; 80E0250
+@ void BuyMenuPrintCursor(u8 taskId, u8 colorSetId)
+BuyMenuPrintCursor: @ 80E0250
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r1, 0
@@ -406431,8 +406431,8 @@ BuyMenuPrintCursor: ; 80E0250
 	thumb_func_end BuyMenuPrintCursor
 
 	thumb_func_start BuyMenuAddItemIcon
-; void BuyMenuAddItemIcon(u16 id, u8 iconSlot)
-BuyMenuAddItemIcon: ; 80E0284
+@ void BuyMenuAddItemIcon(u16 id, u8 iconSlot)
+BuyMenuAddItemIcon: @ 80E0284
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -406500,8 +406500,8 @@ _080E0310:
 	thumb_func_end BuyMenuAddItemIcon
 
 	thumb_func_start BuyMenuRemoveItemIcon
-; void BuyMenuRemoveItemIcon(u16 id, u8 iconSlot)
-BuyMenuRemoveItemIcon: ; 80E031C
+@ void BuyMenuRemoveItemIcon(u16 id, u8 iconSlot)
+BuyMenuRemoveItemIcon: @ 80E031C
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -406536,8 +406536,8 @@ _080E0356:
 	thumb_func_end BuyMenuRemoveItemIcon
 
 	thumb_func_start BuyMenuInitBgs
-; void BuyMenuInitBgs()
-BuyMenuInitBgs: ; 80E036C
+@ void BuyMenuInitBgs()
+BuyMenuInitBgs: @ 80E036C
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -406610,8 +406610,8 @@ BuyMenuInitBgs: ; 80E036C
 	thumb_func_end BuyMenuInitBgs
 
 	thumb_func_start BuyMenuDecompressBgGraphics
-; void BuyMenuDecompressBgGraphics()
-BuyMenuDecompressBgGraphics: ; 80E0424
+@ void BuyMenuDecompressBgGraphics()
+BuyMenuDecompressBgGraphics: @ 80E0424
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =gUnknown_08D9AFBC
@@ -406637,8 +406637,8 @@ BuyMenuDecompressBgGraphics: ; 80E0424
 	thumb_func_end BuyMenuDecompressBgGraphics
 
 	thumb_func_start BuyMenuInitWindows
-; void BuyMenuInitWindows()
-BuyMenuInitWindows: ; 80E0468
+@ void BuyMenuInitWindows()
+BuyMenuInitWindows: @ 80E0468
 	push {lr}
 	ldr r0, =gUnknown_08589A70
 	bl InitWindows
@@ -406663,8 +406663,8 @@ BuyMenuInitWindows: ; 80E0468
 	thumb_func_end BuyMenuInitWindows
 
 	thumb_func_start BuyMenuPrint
-; void BuyMenuPrint(u8 windowId, u8 *str, u8 x, u8 y, u8 speed, u8 colorSetId)
-BuyMenuPrint: ; 80E04A4
+@ void BuyMenuPrint(u8 windowId, u8 *str, u8 x, u8 y, u8 speed, u8 colorSetId)
+BuyMenuPrint: @ 80E04A4
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r6, [sp, 0x24]
@@ -406699,8 +406699,8 @@ BuyMenuPrint: ; 80E04A4
 	thumb_func_end BuyMenuPrint
 
 	thumb_func_start BuyMenuDisplayMessage
-; void BuyMenuDisplayMessage(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
-BuyMenuDisplayMessage: ; 80E04E8
+@ void BuyMenuDisplayMessage(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
+BuyMenuDisplayMessage: @ 80E04E8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -406730,8 +406730,8 @@ BuyMenuDisplayMessage: ; 80E04E8
 	thumb_func_end BuyMenuDisplayMessage
 
 	thumb_func_start BuyMenuDrawGraphics
-; void BuyMenuDrawGraphics()
-BuyMenuDrawGraphics: ; 80E0524
+@ void BuyMenuDrawGraphics()
+BuyMenuDrawGraphics: @ 80E0524
 	push {lr}
 	bl BuyMenuDrawMapGraphics
 	bl BuyMenuCopyMenuBgToBg1TilemapBuffer
@@ -406763,8 +406763,8 @@ BuyMenuDrawGraphics: ; 80E0524
 	thumb_func_end BuyMenuDrawGraphics
 
 	thumb_func_start BuyMenuDrawMapGraphics
-; void BuyMenuDrawMapGraphics()
-BuyMenuDrawMapGraphics: ; 80E0570
+@ void BuyMenuDrawMapGraphics()
+BuyMenuDrawMapGraphics: @ 80E0570
 	push {lr}
 	bl BuyMenuCollectFieldObjectData
 	bl BuyMenuDrawFieldObjects
@@ -406774,8 +406774,8 @@ BuyMenuDrawMapGraphics: ; 80E0570
 	thumb_func_end BuyMenuDrawMapGraphics
 
 	thumb_func_start BuyMenuDrawMapBg
-; void BuyMenuDrawMapBg()
-BuyMenuDrawMapBg: ; 80E0584
+@ void BuyMenuDrawMapBg()
+BuyMenuDrawMapBg: @ 80E0584
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -406893,8 +406893,8 @@ _080E0644:
 	thumb_func_end BuyMenuDrawMapBg
 
 	thumb_func_start BuyMenuDrawMapMetatile
-; void BuyMenuDrawMapMetatile(u16 x, u16 y, u16 *src, u8 metatileLayerType)
-BuyMenuDrawMapMetatile: ; 80E0670
+@ void BuyMenuDrawMapMetatile(u16 x, u16 y, u16 *src, u8 metatileLayerType)
+BuyMenuDrawMapMetatile: @ 80E0670
 	push {r4-r7,lr}
 	adds r7, r2, 0
 	lsls r3, 24
@@ -406991,8 +406991,8 @@ _080E0728:
 	thumb_func_end BuyMenuDrawMapMetatile
 
 	thumb_func_start BuyMenuDrawMapMetatileLayer
-; int BuyMenuDrawMapMetatileLayer(void *tilemapBuffer, s16 xOffset, s16 yOffset, u16 *src)
-BuyMenuDrawMapMetatileLayer: ; 80E0734
+@ int BuyMenuDrawMapMetatileLayer(void *tilemapBuffer, s16 xOffset, s16 yOffset, u16 *src)
+BuyMenuDrawMapMetatileLayer: @ 80E0734
 	lsls r1, 16
 	asrs r1, 16
 	lsls r2, 16
@@ -407015,8 +407015,8 @@ BuyMenuDrawMapMetatileLayer: ; 80E0734
 	thumb_func_end BuyMenuDrawMapMetatileLayer
 
 	thumb_func_start BuyMenuCollectFieldObjectData
-; void BuyMenuCollectFieldObjectData()
-BuyMenuCollectFieldObjectData: ; 80E075C
+@ void BuyMenuCollectFieldObjectData()
+BuyMenuCollectFieldObjectData: @ 80E075C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -407208,8 +407208,8 @@ _080E08DA:
 	thumb_func_end BuyMenuCollectFieldObjectData
 
 	thumb_func_start BuyMenuDrawFieldObjects
-; void BuyMenuDrawFieldObjects()
-BuyMenuDrawFieldObjects: ; 80E08F0
+@ void BuyMenuDrawFieldObjects()
+BuyMenuDrawFieldObjects: @ 80E08F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -407342,7 +407342,7 @@ _080E09D8:
 	thumb_func_end BuyMenuDrawFieldObjects
 
 	thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg
-BuyMenuCheckIfFieldObjectOverlapsMenuBg: ; 80E0A14
+BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2
@@ -407369,8 +407369,8 @@ _080E0A3A:
 	thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg
 
 	thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
-; void BuyMenuCopyMenuBgToBg1TilemapBuffer()
-BuyMenuCopyMenuBgToBg1TilemapBuffer: ; 80E0A40
+@ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
+BuyMenuCopyMenuBgToBg1TilemapBuffer: @ 80E0A40
 	push {r4-r6,lr}
 	ldr r0, =0x02039f70
 	ldr r0, [r0]
@@ -407407,8 +407407,8 @@ _080E0A6A:
 	thumb_func_end BuyMenuCopyMenuBgToBg1TilemapBuffer
 
 	thumb_func_start BuyMenuCheckForOverlapWithMenuBg
-; bool8 BuyMenuCheckForOverlapWithMenuBg(u16 x, u16 y)
-BuyMenuCheckForOverlapWithMenuBg: ; 80E0A88
+@ bool8 BuyMenuCheckForOverlapWithMenuBg(u16 x, u16 y)
+BuyMenuCheckForOverlapWithMenuBg: @ 80E0A88
 	push {lr}
 	ldr r2, =0x02039f70
 	ldr r2, [r2]
@@ -407444,8 +407444,8 @@ _080E0AC2:
 	thumb_func_end BuyMenuCheckForOverlapWithMenuBg
 
 	thumb_func_start Task_BuyMenu
-; void Task_BuyMenu(u8 taskId)
-Task_BuyMenu: ; 80E0AC8
+@ void Task_BuyMenu(u8 taskId)
+Task_BuyMenu: @ 80E0AC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -407633,8 +407633,8 @@ _080E0C8E:
 	thumb_func_end Task_BuyMenu
 
 	thumb_func_start Task_BuyHowManyDialogueInit
-; void Task_BuyHowManyDialogueInit(u8 taskId)
-Task_BuyHowManyDialogueInit: ; 80E0CA4
+@ void Task_BuyHowManyDialogueInit(u8 taskId)
+Task_BuyHowManyDialogueInit: @ 80E0CA4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -407725,8 +407725,8 @@ _080E0D66:
 	thumb_func_end Task_BuyHowManyDialogueInit
 
 	thumb_func_start Task_BuyHowManyDialogueHandleInput
-; void Task_BuyHowManyDialogueHandleInput(u8 taskId)
-Task_BuyHowManyDialogueHandleInput: ; 80E0D88
+@ void Task_BuyHowManyDialogueHandleInput(u8 taskId)
+Task_BuyHowManyDialogueHandleInput: @ 80E0D88
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -407840,8 +407840,8 @@ _080E0EA4:
 	thumb_func_end Task_BuyHowManyDialogueHandleInput
 
 	thumb_func_start BuyMenuConfirmPurchase
-; void BuyMenuConfirmPurchase(u8 taskId)
-BuyMenuConfirmPurchase: ; 80E0EAC
+@ void BuyMenuConfirmPurchase(u8 taskId)
+BuyMenuConfirmPurchase: @ 80E0EAC
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -407865,8 +407865,8 @@ BuyMenuConfirmPurchase: ; 80E0EAC
 	thumb_func_end BuyMenuConfirmPurchase
 
 	thumb_func_start BuyMenuTryMakePurchase
-; void BuyMenuTryMakePurchase(u8 taskId)
-BuyMenuTryMakePurchase: ; 80E0EDC
+@ void BuyMenuTryMakePurchase(u8 taskId)
+BuyMenuTryMakePurchase: @ 80E0EDC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -407936,8 +407936,8 @@ _080E0F7A:
 	thumb_func_end BuyMenuTryMakePurchase
 
 	thumb_func_start BuyMenuSubtractMoney
-; void BuyMenuSubtractMoney(u8 taskId)
-BuyMenuSubtractMoney: ; 80E0F88
+@ void BuyMenuSubtractMoney(u8 taskId)
+BuyMenuSubtractMoney: @ 80E0F88
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -407992,8 +407992,8 @@ _080E0FFC:
 	thumb_func_end BuyMenuSubtractMoney
 
 	thumb_func_start Task_ReturnToItemListAfterItemPurchase
-; void Task_ReturnToItemListAfterItemPurchase(u8 taskId)
-Task_ReturnToItemListAfterItemPurchase: ; 80E100C
+@ void Task_ReturnToItemListAfterItemPurchase(u8 taskId)
+Task_ReturnToItemListAfterItemPurchase: @ 80E100C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -408041,8 +408041,8 @@ _080E1072:
 	thumb_func_end Task_ReturnToItemListAfterItemPurchase
 
 	thumb_func_start Task_ReturnToItemListAfterDecorationPurchase
-; void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId)
-Task_ReturnToItemListAfterDecorationPurchase: ; 80E1078
+@ void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId)
+Task_ReturnToItemListAfterDecorationPurchase: @ 80E1078
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -408064,8 +408064,8 @@ _080E1096:
 	thumb_func_end Task_ReturnToItemListAfterDecorationPurchase
 
 	thumb_func_start BuyMenuReturnToItemList
-; void BuyMenuReturnToItemList(u8 taskId)
-BuyMenuReturnToItemList: ; 80E10A0
+@ void BuyMenuReturnToItemList(u8 taskId)
+BuyMenuReturnToItemList: @ 80E10A0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -408098,8 +408098,8 @@ BuyMenuReturnToItemList: ; 80E10A0
 	thumb_func_end BuyMenuReturnToItemList
 
 	thumb_func_start BuyMenuPrintItemQuantityAndPrice
-; void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
-BuyMenuPrintItemQuantityAndPrice: ; 80E10EC
+@ void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
+BuyMenuPrintItemQuantityAndPrice: @ 80E10EC
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -408150,8 +408150,8 @@ BuyMenuPrintItemQuantityAndPrice: ; 80E10EC
 	thumb_func_end BuyMenuPrintItemQuantityAndPrice
 
 	thumb_func_start ExitBuyMenu
-; void ExitBuyMenu(u8 taskId)
-ExitBuyMenu: ; 80E1168
+@ void ExitBuyMenu(u8 taskId)
+ExitBuyMenu: @ 80E1168
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -408182,8 +408182,8 @@ ExitBuyMenu: ; 80E1168
 	thumb_func_end ExitBuyMenu
 
 	thumb_func_start Task_ExitBuyMenu
-; void Task_ExitBuyMenu(u8 taskId)
-Task_ExitBuyMenu: ; 80E11B0
+@ void Task_ExitBuyMenu(u8 taskId)
+Task_ExitBuyMenu: @ 80E11B0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -408207,8 +408207,8 @@ _080E11D6:
 	thumb_func_end Task_ExitBuyMenu
 
 	thumb_func_start ClearItemPurchases
-; void ClearItemPurchases()
-ClearItemPurchases: ; 80E11E4
+@ void ClearItemPurchases()
+ClearItemPurchases: @ 80E11E4
 	push {lr}
 	ldr r0, =0x02039f7c
 	movs r1, 0
@@ -408223,8 +408223,8 @@ ClearItemPurchases: ; 80E11E4
 	thumb_func_end ClearItemPurchases
 
 	thumb_func_start RecordItemPurchase
-; void RecordItemPurchase(u8 taskId)
-RecordItemPurchase: ; 80E1204
+@ void RecordItemPurchase(u8 taskId)
+RecordItemPurchase: @ 80E1204
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -408292,8 +408292,8 @@ _080E127A:
 	thumb_func_end RecordItemPurchase
 
 	thumb_func_start CreatePokemartMenu
-; void CreatePokemartMenu(u16 *itemsForSale)
-CreatePokemartMenu: ; 80E1284
+@ void CreatePokemartMenu(u16 *itemsForSale)
+CreatePokemartMenu: @ 80E1284
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -408310,8 +408310,8 @@ CreatePokemartMenu: ; 80E1284
 	thumb_func_end CreatePokemartMenu
 
 	thumb_func_start CreateDecorationShop1Menu
-; void CreateDecorationShop1Menu(u16 *itemsForSale)
-CreateDecorationShop1Menu: ; 80E12A8
+@ void CreateDecorationShop1Menu(u16 *itemsForSale)
+CreateDecorationShop1Menu: @ 80E12A8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -408327,8 +408327,8 @@ CreateDecorationShop1Menu: ; 80E12A8
 	thumb_func_end CreateDecorationShop1Menu
 
 	thumb_func_start CreateDecorationShop2Menu
-; void CreateDecorationShop2Menu(u16 *itemsForSale)
-CreateDecorationShop2Menu: ; 80E12C8
+@ void CreateDecorationShop2Menu(u16 *itemsForSale)
+CreateDecorationShop2Menu: @ 80E12C8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -408344,7 +408344,7 @@ CreateDecorationShop2Menu: ; 80E12C8
 	thumb_func_end CreateDecorationShop2Menu
 
 	thumb_func_start sub_80E12E8
-sub_80E12E8: ; 80E12E8
+sub_80E12E8: @ 80E12E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -408525,7 +408525,7 @@ _080E1434:
 	thumb_func_end sub_80E12E8
 
 	thumb_func_start sub_80E1444
-sub_80E1444: ; 80E1444
+sub_80E1444: @ 80E1444
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -408618,7 +408618,7 @@ _080E1502:
 	thumb_func_end sub_80E1444
 
 	thumb_func_start sub_80E150C
-sub_80E150C: ; 80E150C
+sub_80E150C: @ 80E150C
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r5, 16
@@ -408654,7 +408654,7 @@ sub_80E150C: ; 80E150C
 	thumb_func_end sub_80E150C
 
 	thumb_func_start sub_80E1558
-sub_80E1558: ; 80E1558
+sub_80E1558: @ 80E1558
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -408667,7 +408667,7 @@ sub_80E1558: ; 80E1558
 	thumb_func_end sub_80E1558
 
 	thumb_func_start sub_80E1570
-sub_80E1570: ; 80E1570
+sub_80E1570: @ 80E1570
 	push {lr}
 	ldr r0, =0x02039f8c
 	ldrb r0, [r0]
@@ -408678,7 +408678,7 @@ sub_80E1570: ; 80E1570
 	thumb_func_end sub_80E1570
 
 	thumb_func_start sub_80E1584
-sub_80E1584: ; 80E1584
+sub_80E1584: @ 80E1584
 	push {lr}
 	ldr r2, =0x03005e00
 	ldr r0, =0x02039f8c
@@ -408706,7 +408706,7 @@ _080E15B2:
 	thumb_func_end sub_80E1584
 
 	thumb_func_start sub_80E15B8
-sub_80E15B8: ; 80E15B8
+sub_80E15B8: @ 80E15B8
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -408726,7 +408726,7 @@ sub_80E15B8: ; 80E15B8
 	thumb_func_end sub_80E15B8
 
 	thumb_func_start sub_80E15E4
-sub_80E15E4: ; 80E15E4
+sub_80E15E4: @ 80E15E4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x03005d8c
@@ -408749,7 +408749,7 @@ _080E15F2:
 	thumb_func_end sub_80E15E4
 
 	thumb_func_start sub_80E1610
-sub_80E1610: ; 80E1610
+sub_80E1610: @ 80E1610
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -408767,7 +408767,7 @@ _080E1618:
 	thumb_func_end sub_80E1610
 
 	thumb_func_start sub_80E162C
-sub_80E162C: ; 80E162C
+sub_80E162C: @ 80E162C
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r1, [r4]
@@ -408802,8 +408802,8 @@ _080E1676:
 	thumb_func_end sub_80E162C
 
 	thumb_func_start GetBerryInfo
-; struct berry_info *GetBerryInfo(u8 berryType)
-GetBerryInfo: ; 80E167C
+@ struct berry_info *GetBerryInfo(u8 berryType)
+GetBerryInfo: @ 80E167C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -408828,7 +408828,7 @@ _080E16AC:
 	lsls r0, r4, 3
 	subs r0, r4
 	lsls r0, 2
-	ldr r1, =gBerries - 0x1c ; 1-based array
+	ldr r1, =gBerries - 0x1c @ 1-based array
 _080E16B4:
 	adds r0, r1
 	pop {r4}
@@ -408838,8 +408838,8 @@ _080E16B4:
 	thumb_func_end GetBerryInfo
 
 	thumb_func_start GetBerryTreeInfo
-; struct BerryTreeInfo *GetBerryTreeInfo(u8 berryTreeId)
-GetBerryTreeInfo: ; 80E16C0
+@ struct BerryTreeInfo *GetBerryTreeInfo(u8 berryTreeId)
+GetBerryTreeInfo: @ 80E16C0
 	lsls r0, 24
 	ldr r1, =0x03005d8c
 	lsrs r0, 21
@@ -408853,8 +408853,8 @@ GetBerryTreeInfo: ; 80E16C0
 	thumb_func_end GetBerryTreeInfo
 
 	thumb_func_start FieldObjectInteractionWaterBerryTree
-; bool8 FieldObjectInteractionWaterBerryTree()
-FieldObjectInteractionWaterBerryTree: ; 80E16DC
+@ bool8 FieldObjectInteractionWaterBerryTree()
+FieldObjectInteractionWaterBerryTree: @ 80E16DC
 	push {lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -408910,8 +408910,8 @@ _080E1734:
 	thumb_func_end FieldObjectInteractionWaterBerryTree
 
 	thumb_func_start IsPlayerFacingPlantedBerryTree
-; bool8 IsPlayerFacingPlantedBerryTree()
-IsPlayerFacingPlantedBerryTree: ; 80E1738
+@ bool8 IsPlayerFacingPlantedBerryTree()
+IsPlayerFacingPlantedBerryTree: @ 80E1738
 	push {lr}
 	bl GetFieldObjectScriptPointerForComparison
 	ldr r1, =gUnknown_082742F9
@@ -408937,8 +408937,8 @@ _080E176A:
 	thumb_func_end IsPlayerFacingPlantedBerryTree
 
 	thumb_func_start WaterBerryTree
-; bool8 WaterBerryTree()
-WaterBerryTree: ; 80E1770
+@ bool8 WaterBerryTree()
+WaterBerryTree: @ 80E1770
 	push {lr}
 	bl GetFieldObjectScriptPointerForComparison
 	ldr r1, =gUnknown_082742F9
@@ -408957,8 +408957,8 @@ _080E178E:
 	thumb_func_end WaterBerryTree
 
 	thumb_func_start RemoveAllBerryTrees
-; void RemoveAllBerryTrees()
-RemoveAllBerryTrees: ; 80E1794
+@ void RemoveAllBerryTrees()
+RemoveAllBerryTrees: @ 80E1794
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r6, =0x03005d8c
@@ -408983,8 +408983,8 @@ _080E17A2:
 	thumb_func_end RemoveAllBerryTrees
 
 	thumb_func_start BerryTreeGrow
-; bool8 BerryTreeGrow(struct BerryTreeInfo *berryTree)
-BerryTreeGrow: ; 80E17C8
+@ bool8 BerryTreeGrow(struct BerryTreeInfo *berryTree)
+BerryTreeGrow: @ 80E17C8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r1, [r4, 0x1]
@@ -409072,8 +409072,8 @@ _080E1866:
 	thumb_func_end BerryTreeGrow
 
 	thumb_func_start BerryTreeTimeUpdate
-; void BerryTreeTimeUpdate(s32 deltaSeconds)
-BerryTreeTimeUpdate: ; 80E1870
+@ void BerryTreeTimeUpdate(s32 deltaSeconds)
+BerryTreeTimeUpdate: @ 80E1870
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r2, 0
@@ -409160,8 +409160,8 @@ _080E1910:
 	thumb_func_end BerryTreeTimeUpdate
 
 	thumb_func_start PlantBerryTree
-; void PlantBerryTree(u8 berryTreeId, u8 berryType, u8 stage, u8 a4)
-PlantBerryTree: ; 80E191C
+@ void PlantBerryTree(u8 berryTreeId, u8 berryType, u8 stage, u8 a4)
+PlantBerryTree: @ 80E191C
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -409215,8 +409215,8 @@ _080E197A:
 	thumb_func_end PlantBerryTree
 
 	thumb_func_start RemoveBerryTree
-; void RemoveBerryTree(u8 berryTreeId)
-RemoveBerryTree: ; 80E1984
+@ void RemoveBerryTree(u8 berryTreeId)
+RemoveBerryTree: @ 80E1984
 	lsls r0, 24
 	ldr r1, =0x03005d8c
 	ldr r2, [r1]
@@ -409234,8 +409234,8 @@ RemoveBerryTree: ; 80E1984
 	thumb_func_end RemoveBerryTree
 
 	thumb_func_start GetBerryTypeByBerryTreeId
-; u8 GetBerryTypeByBerryTreeId(u8 berryTreeId)
-GetBerryTypeByBerryTreeId: ; 80E19AC
+@ u8 GetBerryTypeByBerryTreeId(u8 berryTreeId)
+GetBerryTypeByBerryTreeId: @ 80E19AC
 	lsls r0, 24
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
@@ -409249,8 +409249,8 @@ GetBerryTypeByBerryTreeId: ; 80E19AC
 	thumb_func_end GetBerryTypeByBerryTreeId
 
 	thumb_func_start GetStageByBerryTreeId
-; u8 GetStageByBerryTreeId(u8 berryTreeId)
-GetStageByBerryTreeId: ; 80E19C8
+@ u8 GetStageByBerryTreeId(u8 berryTreeId)
+GetStageByBerryTreeId: @ 80E19C8
 	lsls r0, 24
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
@@ -409266,8 +409266,8 @@ GetStageByBerryTreeId: ; 80E19C8
 	thumb_func_end GetStageByBerryTreeId
 
 	thumb_func_start ItemIdToBerryType
-; u8 ItemIdToBerryType(u16 itemId)
-ItemIdToBerryType: ; 80E19E8
+@ u8 ItemIdToBerryType(u16 itemId)
+ItemIdToBerryType: @ 80E19E8
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -409290,8 +409290,8 @@ _080E1A0A:
 	thumb_func_end ItemIdToBerryType
 
 	thumb_func_start BerryTypeToItemId
-; u16 BerryTypeToItemId(u16 berryType)
-BerryTypeToItemId: ; 80E1A10
+@ u16 BerryTypeToItemId(u16 berryType)
+BerryTypeToItemId: @ 80E1A10
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -409314,8 +409314,8 @@ _080E1A32:
 	thumb_func_end BerryTypeToItemId
 
 	thumb_func_start GetBerryNameByBerryType
-; void GetBerryNameByBerryType(u8 berryType, u8 *dest)
-GetBerryNameByBerryType: ; 80E1A38
+@ void GetBerryNameByBerryType(u8 berryType, u8 *dest)
+GetBerryNameByBerryType: @ 80E1A38
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -409333,8 +409333,8 @@ GetBerryNameByBerryType: ; 80E1A38
 	thumb_func_end GetBerryNameByBerryType
 
 	thumb_func_start GetBerryCountStringByBerryType
-; void GetBerryCountStringByBerryType(u8 berryType, u8 *dest, u32 berryCount)
-GetBerryCountStringByBerryType: ; 80E1A58
+@ void GetBerryCountStringByBerryType(u8 berryType, u8 *dest, u32 berryCount)
+GetBerryCountStringByBerryType: @ 80E1A58
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -409351,8 +409351,8 @@ GetBerryCountStringByBerryType: ; 80E1A58
 	thumb_func_end GetBerryCountStringByBerryType
 
 	thumb_func_start ResetBerryTreeSparkleFlag
-; void ResetBerryTreeSparkleFlag(u8 berryTreeId)
-ResetBerryTreeSparkleFlag: ; 80E1A78
+@ void ResetBerryTreeSparkleFlag(u8 berryTreeId)
+ResetBerryTreeSparkleFlag: @ 80E1A78
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -409366,8 +409366,8 @@ ResetBerryTreeSparkleFlag: ; 80E1A78
 	thumb_func_end ResetBerryTreeSparkleFlag
 
 	thumb_func_start BerryTreeGetNumStagesWatered
-; u8 BerryTreeGetNumStagesWatered(struct BerryTreeInfo *berryTree)
-BerryTreeGetNumStagesWatered: ; 80E1A90
+@ u8 BerryTreeGetNumStagesWatered(struct BerryTreeInfo *berryTree)
+BerryTreeGetNumStagesWatered: @ 80E1A90
 	push {lr}
 	ldrb r2, [r0, 0x5]
 	movs r0, 0x10
@@ -409404,8 +409404,8 @@ _080E1AC6:
 	thumb_func_end BerryTreeGetNumStagesWatered
 
 	thumb_func_start GetNumStagesWateredByBerryTreeId
-; u8 GetNumStagesWateredByBerryTreeId(u8 berryTreeId)
-GetNumStagesWateredByBerryTreeId: ; 80E1ACC
+@ u8 GetNumStagesWateredByBerryTreeId(u8 berryTreeId)
+GetNumStagesWateredByBerryTreeId: @ 80E1ACC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -409418,8 +409418,8 @@ GetNumStagesWateredByBerryTreeId: ; 80E1ACC
 	thumb_func_end GetNumStagesWateredByBerryTreeId
 
 	thumb_func_start CalcBerryYieldInternal
-; u8 CalcBerryYieldInternal(u16 max, u16 min, u8 numStagesWatered)
-CalcBerryYieldInternal: ; 80E1AE4
+@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 numStagesWatered)
+CalcBerryYieldInternal: @ 80E1AE4
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -409466,8 +409466,8 @@ _080E1B2E:
 	thumb_func_end CalcBerryYieldInternal
 
 	thumb_func_start CalcBerryYield
-; u8 CalcBerryYield(struct BerryTreeInfo *berryTree)
-CalcBerryYield: ; 80E1B38
+@ u8 CalcBerryYield(struct BerryTreeInfo *berryTree)
+CalcBerryYield: @ 80E1B38
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -409490,8 +409490,8 @@ CalcBerryYield: ; 80E1B38
 	thumb_func_end CalcBerryYield
 
 	thumb_func_start GetBerryCountByBerryTreeId
-; u8 GetBerryCountByBerryTreeId(u8 berryTreeId)
-GetBerryCountByBerryTreeId: ; 80E1B64
+@ u8 GetBerryCountByBerryTreeId(u8 berryTreeId)
+GetBerryCountByBerryTreeId: @ 80E1B64
 	lsls r0, 24
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
@@ -409506,8 +409506,8 @@ GetBerryCountByBerryTreeId: ; 80E1B64
 	thumb_func_end GetBerryCountByBerryTreeId
 
 	thumb_func_start GetStageDurationByBerryType
-; u16 GetStageDurationByBerryType(u8 berryType)
-GetStageDurationByBerryType: ; 80E1B7C
+@ u16 GetStageDurationByBerryType(u8 berryType)
+GetStageDurationByBerryType: @ 80E1B7C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -409522,8 +409522,8 @@ GetStageDurationByBerryType: ; 80E1B7C
 	thumb_func_end GetStageDurationByBerryType
 
 	thumb_func_start FieldObjectInteractionGetBerryTreeData
-; void FieldObjectInteractionGetBerryTreeData()
-FieldObjectInteractionGetBerryTreeData: ; 80E1B94
+@ void FieldObjectInteractionGetBerryTreeData()
+FieldObjectInteractionGetBerryTreeData: @ 80E1B94
 	push {r4-r6,lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -409582,8 +409582,8 @@ _080E1BEE:
 	thumb_func_end FieldObjectInteractionGetBerryTreeData
 
 	thumb_func_start FieldObjectInteractionGetBerryName
-; void FieldObjectInteractionGetBerryName()
-FieldObjectInteractionGetBerryName: ; 80E1C2C
+@ void FieldObjectInteractionGetBerryName()
+FieldObjectInteractionGetBerryName: @ 80E1C2C
 	push {lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -409601,8 +409601,8 @@ FieldObjectInteractionGetBerryName: ; 80E1C2C
 	thumb_func_end FieldObjectInteractionGetBerryName
 
 	thumb_func_start FieldObjectInteractionGetBerryCountString
-; void FieldObjectInteractionGetBerryCountString()
-FieldObjectInteractionGetBerryCountString: ; 80E1C54
+@ void FieldObjectInteractionGetBerryCountString()
+FieldObjectInteractionGetBerryCountString: @ 80E1C54
 	push {r4,r5,lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -409630,8 +409630,8 @@ FieldObjectInteractionGetBerryCountString: ; 80E1C54
 	thumb_func_end FieldObjectInteractionGetBerryCountString
 
 	thumb_func_start ChooseBerry
-; void ChooseBerry()
-ChooseBerry: ; 80E1C94
+@ void ChooseBerry()
+ChooseBerry: @ 80E1C94
 	push {lr}
 	ldr r0, =CB2_ChooseBerry
 	bl SetMainCallback2
@@ -409641,8 +409641,8 @@ ChooseBerry: ; 80E1C94
 	thumb_func_end ChooseBerry
 
 	thumb_func_start FieldObjectInteractionPlantBerryTree
-; void FieldObjectInteractionPlantBerryTree()
-FieldObjectInteractionPlantBerryTree: ; 80E1CA4
+@ void FieldObjectInteractionPlantBerryTree()
+FieldObjectInteractionPlantBerryTree: @ 80E1CA4
 	push {r4,lr}
 	ldr r0, =0x0203ce7c
 	ldrh r0, [r0]
@@ -409667,8 +409667,8 @@ FieldObjectInteractionPlantBerryTree: ; 80E1CA4
 	thumb_func_end FieldObjectInteractionPlantBerryTree
 
 	thumb_func_start FieldObjectInteractionPickBerryTree
-; void FieldObjectInteractionPickBerryTree()
-FieldObjectInteractionPickBerryTree: ; 80E1CDC
+@ void FieldObjectInteractionPickBerryTree()
+FieldObjectInteractionPickBerryTree: @ 80E1CDC
 	push {r4-r6,lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -409702,8 +409702,8 @@ FieldObjectInteractionPickBerryTree: ; 80E1CDC
 	thumb_func_end FieldObjectInteractionPickBerryTree
 
 	thumb_func_start FieldObjectInteractionRemoveBerryTree
-; void FieldObjectInteractionRemoveBerryTree()
-FieldObjectInteractionRemoveBerryTree: ; 80E1D28
+@ void FieldObjectInteractionRemoveBerryTree()
+FieldObjectInteractionRemoveBerryTree: @ 80E1D28
 	push {lr}
 	ldr r0, =0x03005df0
 	ldrb r0, [r0]
@@ -409724,8 +409724,8 @@ FieldObjectInteractionRemoveBerryTree: ; 80E1D28
 	thumb_func_end FieldObjectInteractionRemoveBerryTree
 
 	thumb_func_start PlayerHasBerries
-; bool8 PlayerHasBerries()
-PlayerHasBerries: ; 80E1D5C
+@ bool8 PlayerHasBerries()
+PlayerHasBerries: @ 80E1D5C
 	push {lr}
 	movs r0, 0x4
 	bl IsBagPocketNonEmpty
@@ -409736,8 +409736,8 @@ PlayerHasBerries: ; 80E1D5C
 	thumb_func_end PlayerHasBerries
 
 	thumb_func_start ResetBerryTreeSparkleFlags
-; void ResetBerryTreeSparkleFlags()
-ResetBerryTreeSparkleFlags: ; 80E1D6C
+@ void ResetBerryTreeSparkleFlags()
+ResetBerryTreeSparkleFlags: @ 80E1D6C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -409818,8 +409818,8 @@ _080E1DEC:
 	thumb_func_end ResetBerryTreeSparkleFlags
 
 	thumb_func_start Multichoice
-; bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
-Multichoice: ; 80E1E08
+@ bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
+Multichoice: @ 80E1E08
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -409859,7 +409859,7 @@ _080E1E4E:
 	thumb_func_end Multichoice
 
 	thumb_func_start sub_80E1E58
-sub_80E1E58: ; 80E1E58
+sub_80E1E58: @ 80E1E58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -409906,7 +409906,7 @@ _080E1EAA:
 	thumb_func_end sub_80E1E58
 
 	thumb_func_start sub_80E1EB8
-sub_80E1EB8: ; 80E1EB8
+sub_80E1EB8: @ 80E1EB8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -409944,8 +409944,8 @@ _080E1EEC:
 	thumb_func_end sub_80E1EB8
 
 	thumb_func_start DoMultichoice
-; void DoMultichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
-DoMultichoice: ; 80E1EFC
+@ void DoMultichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
+DoMultichoice: @ 80E1EFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -410036,7 +410036,7 @@ _080E1F4C:
 	thumb_func_end DoMultichoice
 
 	thumb_func_start sub_80E1FBC
-sub_80E1FBC: ; 80E1FBC
+sub_80E1FBC: @ 80E1FBC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -410111,7 +410111,7 @@ _080E202E:
 	thumb_func_end sub_80E1FBC
 
 	thumb_func_start sub_80E2058
-sub_80E2058: ; 80E2058
+sub_80E2058: @ 80E2058
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -410192,7 +410192,7 @@ _080E20FC:
 	thumb_func_end sub_80E2058
 
 	thumb_func_start yes_no_box
-yes_no_box: ; 80E2108
+yes_no_box: @ 80E2108
 	push {r4,lr}
 	ldr r4, =task_yes_no_maybe
 	adds r0, r4, 0
@@ -410220,7 +410220,7 @@ _080E213A:
 	thumb_func_end yes_no_box
 
 	thumb_func_start sub_80E2140
-sub_80E2140: ; 80E2140
+sub_80E2140: @ 80E2140
 	push {lr}
 	ldr r0, =0x020375f0
 	ldrh r0, [r0]
@@ -410237,7 +410237,7 @@ _080E2156:
 	thumb_func_end sub_80E2140
 
 	thumb_func_start task_yes_no_maybe
-task_yes_no_maybe: ; 80E215C
+task_yes_no_maybe: @ 80E215C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -410298,7 +410298,7 @@ _080E21C4:
 	thumb_func_end task_yes_no_maybe
 
 	thumb_func_start sub_80E21D0
-sub_80E21D0: ; 80E21D0
+sub_80E21D0: @ 80E21D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -410442,7 +410442,7 @@ _080E22E8:
 	thumb_func_end sub_80E21D0
 
 	thumb_func_start sub_80E2308
-sub_80E2308: ; 80E2308
+sub_80E2308: @ 80E2308
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -410489,8 +410489,8 @@ _080E2360:
 	thumb_func_end sub_80E2308
 
 	thumb_func_start sp109_CreatePCMenu
-; bool sp109_CreatePCMenu()
-sp109_CreatePCMenu: ; 80E236C
+@ bool sp109_CreatePCMenu()
+sp109_CreatePCMenu: @ 80E236C
 	push {lr}
 	ldr r0, =sub_80E2058
 	bl is_function_an_active_task
@@ -410513,7 +410513,7 @@ _080E2396:
 	thumb_func_end sp109_CreatePCMenu
 
 	thumb_func_start CreatePCMenu
-CreatePCMenu: ; 80E239C
+CreatePCMenu: @ 80E239C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -410671,7 +410671,7 @@ _080E24C6:
 	thumb_func_end CreatePCMenu
 
 	thumb_func_start sub_80E2514
-sub_80E2514: ; 80E2514
+sub_80E2514: @ 80E2514
 	push {lr}
 	sub sp, 0x10
 	movs r0, 0
@@ -410697,7 +410697,7 @@ sub_80E2514: ; 80E2514
 	thumb_func_end sub_80E2514
 
 	thumb_func_start sub_80E2548
-sub_80E2548: ; 80E2548
+sub_80E2548: @ 80E2548
 	push {lr}
 	ldr r0, =sub_80E2058
 	bl is_function_an_active_task
@@ -410720,7 +410720,7 @@ _080E2572:
 	thumb_func_end sub_80E2548
 
 	thumb_func_start sub_80E2578
-sub_80E2578: ; 80E2578
+sub_80E2578: @ 80E2578
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -411076,7 +411076,7 @@ _080E2860:
 	thumb_func_end sub_80E2578
 
 	thumb_func_start sub_80E2878
-sub_80E2878: ; 80E2878
+sub_80E2878: @ 80E2878
 	push {lr}
 	ldr r2, =0x020375f0
 	ldrh r0, [r2]
@@ -411094,7 +411094,7 @@ _080E288C:
 	thumb_func_end sub_80E2878
 
 	thumb_func_start task_picbox
-task_picbox: ; 80E2898
+task_picbox: @ 80E2898
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -411147,7 +411147,7 @@ _080E28F8:
 	thumb_func_end task_picbox
 
 	thumb_func_start sub_80E2900
-sub_80E2900: ; 80E2900
+sub_80E2900: @ 80E2900
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -411237,7 +411237,7 @@ _080E29BA:
 	thumb_func_end sub_80E2900
 
 	thumb_func_start picbox_close
-picbox_close: ; 80E29C4
+picbox_close: @ 80E29C4
 	push {lr}
 	ldr r0, =task_picbox
 	bl get_task_id_by_function
@@ -411264,7 +411264,7 @@ _080E29F6:
 	thumb_func_end picbox_close
 
 	thumb_func_start sub_80E29FC
-sub_80E29FC: ; 80E29FC
+sub_80E29FC: @ 80E29FC
 	push {lr}
 	ldr r0, =task_picbox
 	bl get_task_id_by_function
@@ -411283,7 +411283,7 @@ _080E2A16:
 	thumb_func_end sub_80E29FC
 
 	thumb_func_start CreateWindowFromRect
-CreateWindowFromRect: ; 80E2A1C
+CreateWindowFromRect: @ 80E2A1C
 	push {r4,r5,lr}
 	sub sp, 0x20
 	adds r4, r0, 0
@@ -411330,7 +411330,7 @@ CreateWindowFromRect: ; 80E2A1C
 	thumb_func_end CreateWindowFromRect
 
 	thumb_func_start sub_80E2A78
-sub_80E2A78: ; 80E2A78
+sub_80E2A78: @ 80E2A78
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -411346,7 +411346,7 @@ sub_80E2A78: ; 80E2A78
 	thumb_func_end sub_80E2A78
 
 	thumb_func_start sub_80E2A94
-sub_80E2A94: ; 80E2A94
+sub_80E2A94: @ 80E2A94
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -411452,7 +411452,7 @@ _080E2B70:
 	thumb_func_end sub_80E2A94
 
 	thumb_func_start sp106_CreateStartMenu
-sp106_CreateStartMenu: ; 80E2B7C
+sp106_CreateStartMenu: @ 80E2B7C
 	push {lr}
 	ldr r0, =sub_80E2058
 	bl is_function_an_active_task
@@ -411475,7 +411475,7 @@ _080E2BA6:
 	thumb_func_end sp106_CreateStartMenu
 
 	thumb_func_start CreateStartMenu
-CreateStartMenu: ; 80E2BAC
+CreateStartMenu: @ 80E2BAC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r0, 0x15
@@ -411590,7 +411590,7 @@ CreateStartMenu: ; 80E2BAC
 	thumb_func_end CreateStartMenu
 
 	thumb_func_start sub_80E2CC4
-sub_80E2CC4: ; 80E2CC4
+sub_80E2CC4: @ 80E2CC4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r2, 0
@@ -411626,7 +411626,7 @@ sub_80E2CC4: ; 80E2CC4
 	thumb_func_end sub_80E2CC4
 
 	thumb_func_start display_text_and_get_width_internal
-display_text_and_get_width_internal: ; 80E2D10
+display_text_and_get_width_internal: @ 80E2D10
 	push {lr}
 	sub sp, 0x40
 	adds r1, r0, 0
@@ -411642,7 +411642,7 @@ display_text_and_get_width_internal: ; 80E2D10
 	thumb_func_end display_text_and_get_width_internal
 
 	thumb_func_start display_text_and_get_width
-display_text_and_get_width: ; 80E2D2C
+display_text_and_get_width: @ 80E2D2C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl display_text_and_get_width_internal
@@ -411656,7 +411656,7 @@ _080E2D3A:
 	thumb_func_end display_text_and_get_width
 
 	thumb_func_start convert_pixel_width_to_tile_width
-convert_pixel_width_to_tile_width: ; 80E2D40
+convert_pixel_width_to_tile_width: @ 80E2D40
 	push {lr}
 	adds r1, r0, 0
 	adds r0, 0x9
@@ -411675,7 +411675,7 @@ _080E2D56:
 	thumb_func_end convert_pixel_width_to_tile_width
 
 	thumb_func_start sub_80E2D5C
-sub_80E2D5C: ; 80E2D5C
+sub_80E2D5C: @ 80E2D5C
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r2, r1
@@ -411693,8 +411693,8 @@ _080E2D70:
 	thumb_func_end sub_80E2D5C
 
 	thumb_func_start do_choose_name_or_words_screen
-; int do_choose_name_or_words_screen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
-do_choose_name_or_words_screen: ; 80E2D78
+@ int do_choose_name_or_words_screen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
+do_choose_name_or_words_screen: @ 80E2D78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -411755,7 +411755,7 @@ _080E2DE2:
 	thumb_func_end do_choose_name_or_words_screen
 
 	thumb_func_start c2_choose_name_or_words_screen
-c2_choose_name_or_words_screen: ; 80E2E04
+c2_choose_name_or_words_screen: @ 80E2E04
 	push {lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -411826,8 +411826,8 @@ _080E2EA4:
 	thumb_func_end c2_choose_name_or_words_screen
 
 	thumb_func_start choose_name_or_words_screen_setup
-; void choose_name_or_words_screen_setup()
-choose_name_or_words_screen_setup: ; 80E2EA8
+@ void choose_name_or_words_screen_setup()
+choose_name_or_words_screen_setup: @ 80E2EA8
 	push {r4-r7,lr}
 	ldr r5, =0x02039f94
 	ldr r0, [r5]
@@ -411931,7 +411931,7 @@ _080E2F64:
 	thumb_func_end choose_name_or_words_screen_setup
 
 	thumb_func_start sub_80E2FA4
-sub_80E2FA4: ; 80E2FA4
+sub_80E2FA4: @ 80E2FA4
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r4, =0x02020630
@@ -411966,7 +411966,7 @@ _080E2FC8:
 	thumb_func_end sub_80E2FA4
 
 	thumb_func_start choose_name_or_words_screen_init_bgs
-choose_name_or_words_screen_init_bgs: ; 80E2FE4
+choose_name_or_words_screen_init_bgs: @ 80E2FE4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -412151,7 +412151,7 @@ _080E30D8:
 	thumb_func_end choose_name_or_words_screen_init_bgs
 
 	thumb_func_start sub_80E3194
-sub_80E3194: ; 80E3194
+sub_80E3194: @ 80E3194
 	push {lr}
 	ldr r0, =sub_80E31B0
 	movs r1, 0x2
@@ -412164,7 +412164,7 @@ sub_80E3194: ; 80E3194
 	thumb_func_end sub_80E3194
 
 	thumb_func_start sub_80E31B0
-sub_80E31B0: ; 80E31B0
+sub_80E31B0: @ 80E31B0
 	push {lr}
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
@@ -412227,7 +412227,7 @@ _080E3240:
 	thumb_func_end sub_80E31B0
 
 	thumb_func_start sub_80E3244
-sub_80E3244: ; 80E3244
+sub_80E3244: @ 80E3244
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =gUnknown_0858BEBB
@@ -412238,7 +412238,7 @@ sub_80E3244: ; 80E3244
 	thumb_func_end sub_80E3244
 
 	thumb_func_start sub_80E3254
-sub_80E3254: ; 80E3254
+sub_80E3254: @ 80E3254
 	ldr r1, =gUnknown_0858BEBE
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
@@ -412252,7 +412252,7 @@ sub_80E3254: ; 80E3254
 	thumb_func_end sub_80E3254
 
 	thumb_func_start sub_80E3274
-sub_80E3274: ; 80E3274
+sub_80E3274: @ 80E3274
 	ldr r1, =gUnknown_0858BEC1
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
@@ -412266,7 +412266,7 @@ sub_80E3274: ; 80E3274
 	thumb_func_end sub_80E3274
 
 	thumb_func_start sub_80E3294
-sub_80E3294: ; 80E3294
+sub_80E3294: @ 80E3294
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r1, =gUnknown_08DD4544
@@ -412339,7 +412339,7 @@ sub_80E3294: ; 80E3294
 	thumb_func_end sub_80E3294
 
 	thumb_func_start sub_80E335C
-sub_80E335C: ; 80E335C
+sub_80E335C: @ 80E335C
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -412366,7 +412366,7 @@ _080E3384:
 	thumb_func_end sub_80E335C
 
 	thumb_func_start sub_80E3398
-sub_80E3398: ; 80E3398
+sub_80E3398: @ 80E3398
 	push {lr}
 	bl sub_80E44BC
 	lsls r0, 24
@@ -412376,7 +412376,7 @@ sub_80E3398: ; 80E3398
 	thumb_func_end sub_80E3398
 
 	thumb_func_start sub_80E33A8
-sub_80E33A8: ; 80E33A8
+sub_80E33A8: @ 80E33A8
 	push {lr}
 	bl sub_80E3F04
 	lsls r0, 24
@@ -412399,7 +412399,7 @@ _080E33CA:
 	thumb_func_end sub_80E33A8
 
 	thumb_func_start pokemon_store
-pokemon_store: ; 80E33D8
+pokemon_store: @ 80E33D8
 	push {r4,lr}
 	bl sub_80E4BE4
 	movs r0, 0
@@ -412447,7 +412447,7 @@ _080E343A:
 	thumb_func_end pokemon_store
 
 	thumb_func_start sub_80E3448
-sub_80E3448: ; 80E3448
+sub_80E3448: @ 80E3448
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -412472,7 +412472,7 @@ sub_80E3448: ; 80E3448
 	thumb_func_end sub_80E3448
 
 	thumb_func_start sub_80E347C
-sub_80E347C: ; 80E347C
+sub_80E347C: @ 80E347C
 	push {r4,r5,lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -412514,7 +412514,7 @@ _080E34C6:
 	thumb_func_end sub_80E347C
 
 	thumb_func_start pokemon_transfer_to_pc_with_message
-pokemon_transfer_to_pc_with_message: ; 80E34E4
+pokemon_transfer_to_pc_with_message: @ 80E34E4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	movs r5, 0
@@ -412618,7 +412618,7 @@ _080E3586:
 	thumb_func_end pokemon_transfer_to_pc_with_message
 
 	thumb_func_start sub_80E3604
-sub_80E3604: ; 80E3604
+sub_80E3604: @ 80E3604
 	push {lr}
 	bl RunTextPrinters
 	movs r0, 0
@@ -412646,7 +412646,7 @@ _080E362E:
 	thumb_func_end sub_80E3604
 
 	thumb_func_start sub_80E3640
-sub_80E3640: ; 80E3640
+sub_80E3640: @ 80E3640
 	push {lr}
 	movs r0, 0
 	bl sub_80E4630
@@ -412673,7 +412673,7 @@ sub_80E3640: ; 80E3640
 	thumb_func_end sub_80E3640
 
 	thumb_func_start sub_80E3680
-sub_80E3680: ; 80E3680
+sub_80E3680: @ 80E3680
 	push {r4-r6,lr}
 	sub sp, 0x4
 	bl sub_80E3794
@@ -412760,7 +412760,7 @@ _080E3732:
 	thumb_func_end sub_80E3680
 
 	thumb_func_start sub_80E373C
-sub_80E373C: ; 80E373C
+sub_80E373C: @ 80E373C
 	push {r4,lr}
 	ldr r4, =sub_80E375C
 	adds r0, r4, 0
@@ -412776,7 +412776,7 @@ sub_80E373C: ; 80E373C
 	thumb_func_end sub_80E373C
 
 	thumb_func_start sub_80E375C
-sub_80E375C: ; 80E375C
+sub_80E375C: @ 80E375C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -412804,7 +412804,7 @@ _080E376E:
 	thumb_func_end sub_80E375C
 
 	thumb_func_start sub_80E3794
-sub_80E3794: ; 80E3794
+sub_80E3794: @ 80E3794
 	push {lr}
 	ldr r0, =sub_80E375C
 	bl get_task_id_by_function
@@ -412823,7 +412823,7 @@ _080E37AE:
 	thumb_func_end sub_80E3794
 
 	thumb_func_start sub_80E37B4
-sub_80E37B4: ; 80E37B4
+sub_80E37B4: @ 80E37B4
 	ldr r1, =0x02039f94
 	ldr r1, [r1]
 	ldr r3, =0x00001e18
@@ -412842,7 +412842,7 @@ sub_80E37B4: ; 80E37B4
 	thumb_func_end sub_80E37B4
 
 	thumb_func_start sub_80E37DC
-sub_80E37DC: ; 80E37DC
+sub_80E37DC: @ 80E37DC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -412910,7 +412910,7 @@ _080E3852:
 	thumb_func_end sub_80E37DC
 
 	thumb_func_start sub_80E3870
-sub_80E3870: ; 80E3870
+sub_80E3870: @ 80E3870
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -412980,7 +412980,7 @@ _080E38EA:
 	thumb_func_end sub_80E3870
 
 	thumb_func_start sub_80E3904
-sub_80E3904: ; 80E3904
+sub_80E3904: @ 80E3904
 	push {lr}
 	ldr r0, =sub_80E375C
 	bl get_task_id_by_function
@@ -412994,7 +412994,7 @@ sub_80E3904: ; 80E3904
 	thumb_func_end sub_80E3904
 
 	thumb_func_start sub_80E3920
-sub_80E3920: ; 80E3920
+sub_80E3920: @ 80E3920
 	push {lr}
 	ldr r0, =c3_0809E58C
 	movs r1, 0x3
@@ -413014,7 +413014,7 @@ sub_80E3920: ; 80E3920
 	thumb_func_end sub_80E3920
 
 	thumb_func_start sub_80E3948
-sub_80E3948: ; 80E3948
+sub_80E3948: @ 80E3948
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -413072,7 +413072,7 @@ _080E39B4:
 	thumb_func_end sub_80E3948
 
 	thumb_func_start c3_0809E58C
-c3_0809E58C: ; 80E39BC
+c3_0809E58C: @ 80E39BC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -413170,7 +413170,7 @@ _080E3A6E:
 	thumb_func_end c3_0809E58C
 
 	thumb_func_start sub_80E3A74
-sub_80E3A74: ; 80E3A74
+sub_80E3A74: @ 80E3A74
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -413226,7 +413226,7 @@ sub_80E3A74: ; 80E3A74
 	thumb_func_end sub_80E3A74
 
 	thumb_func_start sub_80E3AE8
-sub_80E3AE8: ; 80E3AE8
+sub_80E3AE8: @ 80E3AE8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -413245,7 +413245,7 @@ sub_80E3AE8: ; 80E3AE8
 	thumb_func_end sub_80E3AE8
 
 	thumb_func_start sub_80E3B10
-sub_80E3B10: ; 80E3B10
+sub_80E3B10: @ 80E3B10
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r2, 24
@@ -413265,7 +413265,7 @@ sub_80E3B10: ; 80E3B10
 	thumb_func_end sub_80E3B10
 
 	thumb_func_start sub_80E3B30
-sub_80E3B30: ; 80E3B30
+sub_80E3B30: @ 80E3B30
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r0, 0x3F
@@ -413391,7 +413391,7 @@ _080E3C14:
 	thumb_func_end sub_80E3B30
 
 	thumb_func_start sub_80E3C20
-sub_80E3C20: ; 80E3C20
+sub_80E3C20: @ 80E3C20
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -413432,7 +413432,7 @@ _080E3C52:
 	thumb_func_end sub_80E3C20
 
 	thumb_func_start sub_80E3C6C
-sub_80E3C6C: ; 80E3C6C
+sub_80E3C6C: @ 80E3C6C
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -413481,7 +413481,7 @@ _080E3CC0:
 	thumb_func_end sub_80E3C6C
 
 	thumb_func_start sub_80E3CC8
-sub_80E3CC8: ; 80E3CC8
+sub_80E3CC8: @ 80E3CC8
 	push {lr}
 	bl sub_80E3CE4
 	bl sub_80E3F8C
@@ -413493,7 +413493,7 @@ sub_80E3CC8: ; 80E3CC8
 	thumb_func_end sub_80E3CC8
 
 	thumb_func_start sub_80E3CE4
-sub_80E3CE4: ; 80E3CE4
+sub_80E3CE4: @ 80E3CE4
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_0858C138
 	movs r1, 0x26
@@ -413560,7 +413560,7 @@ sub_80E3CE4: ; 80E3CE4
 	thumb_func_end sub_80E3CE4
 
 	thumb_func_start sub_80E3D78
-sub_80E3D78: ; 80E3D78
+sub_80E3D78: @ 80E3D78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -413621,7 +413621,7 @@ _080E3DDA:
 	thumb_func_end sub_80E3D78
 
 	thumb_func_start sub_80E3DFC
-sub_80E3DFC: ; 80E3DFC
+sub_80E3DFC: @ 80E3DFC
 	ldr r2, =0x02039f94
 	ldr r2, [r2]
 	ldr r3, =0x00001e23
@@ -413641,7 +413641,7 @@ sub_80E3DFC: ; 80E3DFC
 	thumb_func_end sub_80E3DFC
 
 	thumb_func_start sub_80E3E28
-sub_80E3E28: ; 80E3E28
+sub_80E3E28: @ 80E3E28
 	push {lr}
 	bl sub_80E3F70
 	lsls r0, 24
@@ -413653,7 +413653,7 @@ sub_80E3E28: ; 80E3E28
 	thumb_func_end sub_80E3E28
 
 	thumb_func_start sub_80E3E3C
-sub_80E3E3C: ; 80E3E3C
+sub_80E3E3C: @ 80E3E3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -413693,7 +413693,7 @@ sub_80E3E3C: ; 80E3E3C
 	thumb_func_end sub_80E3E3C
 
 	thumb_func_start sub_80E3E94
-sub_80E3E94: ; 80E3E94
+sub_80E3E94: @ 80E3E94
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r5, =0x02020630
@@ -413726,7 +413726,7 @@ sub_80E3E94: ; 80E3E94
 	thumb_func_end sub_80E3E94
 
 	thumb_func_start sub_80E3ED8
-sub_80E3ED8: ; 80E3ED8
+sub_80E3ED8: @ 80E3ED8
 	push {lr}
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
@@ -413746,7 +413746,7 @@ sub_80E3ED8: ; 80E3ED8
 	thumb_func_end sub_80E3ED8
 
 	thumb_func_start sub_80E3F04
-sub_80E3F04: ; 80E3F04
+sub_80E3F04: @ 80E3F04
 	ldr r2, =0x02020630
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
@@ -413766,7 +413766,7 @@ sub_80E3F04: ; 80E3F04
 	thumb_func_end sub_80E3F04
 
 	thumb_func_start sub_80E3F30
-sub_80E3F30: ; 80E3F30
+sub_80E3F30: @ 80E3F30
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r5, sp
@@ -413799,7 +413799,7 @@ _080E3F66:
 	thumb_func_end sub_80E3F30
 
 	thumb_func_start sub_80E3F70
-sub_80E3F70: ; 80E3F70
+sub_80E3F70: @ 80E3F70
 	push {r4,lr}
 	ldr r4, =gUnknown_0858BEA0
 	bl sub_80E3274
@@ -413814,7 +413814,7 @@ sub_80E3F70: ; 80E3F70
 	thumb_func_end sub_80E3F70
 
 	thumb_func_start sub_80E3F8C
-sub_80E3F8C: ; 80E3F8C
+sub_80E3F8C: @ 80E3F8C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -413895,7 +413895,7 @@ sub_80E3F8C: ; 80E3F8C
 	thumb_func_end sub_80E3F8C
 
 	thumb_func_start sub_80E4050
-sub_80E4050: ; 80E4050
+sub_80E4050: @ 80E4050
 	ldr r0, =0x02039f94
 	ldr r2, [r0]
 	ldr r1, =0x00001e24
@@ -413917,7 +413917,7 @@ sub_80E4050: ; 80E4050
 	thumb_func_end sub_80E4050
 
 	thumb_func_start sub_80E4084
-sub_80E4084: ; 80E4084
+sub_80E4084: @ 80E4084
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =gUnknown_0858BEE8
@@ -413939,7 +413939,7 @@ _080E408A:
 	thumb_func_end sub_80E4084
 
 	thumb_func_start sub_80E40AC
-sub_80E40AC: ; 80E40AC
+sub_80E40AC: @ 80E40AC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x3A
@@ -413977,13 +413977,13 @@ sub_80E40AC: ; 80E40AC
 	thumb_func_end sub_80E40AC
 
 	thumb_func_start sub_80E4100
-sub_80E4100: ; 80E4100
+sub_80E4100: @ 80E4100
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80E4100
 
 	thumb_func_start sub_80E4104
-sub_80E4104: ; 80E4104
+sub_80E4104: @ 80E4104
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r0, 0x3A
@@ -414040,7 +414040,7 @@ _080E4168:
 	thumb_func_end sub_80E4104
 
 	thumb_func_start sub_80E4178
-sub_80E4178: ; 80E4178
+sub_80E4178: @ 80E4178
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3A
@@ -414076,7 +414076,7 @@ _080E41AC:
 	thumb_func_end sub_80E4178
 
 	thumb_func_start sub_80E41B8
-sub_80E41B8: ; 80E41B8
+sub_80E41B8: @ 80E41B8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -414123,7 +414123,7 @@ sub_80E41B8: ; 80E41B8
 	thumb_func_end sub_80E41B8
 
 	thumb_func_start sub_80E4218
-sub_80E4218: ; 80E4218
+sub_80E4218: @ 80E4218
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -414176,7 +414176,7 @@ sub_80E4218: ; 80E4218
 	thumb_func_end sub_80E4218
 
 	thumb_func_start sub_80E4290
-sub_80E4290: ; 80E4290
+sub_80E4290: @ 80E4290
 	push {r4-r6,lr}
 	ldr r5, =0x02039f94
 	ldr r0, [r5]
@@ -414266,7 +414266,7 @@ _080E4334:
 	thumb_func_end sub_80E4290
 
 	thumb_func_start sub_80E4354
-sub_80E4354: ; 80E4354
+sub_80E4354: @ 80E4354
 	push {lr}
 	ldr r1, =gUnknown_0858BF04
 	ldr r0, =0x02039f94
@@ -414285,12 +414285,12 @@ sub_80E4354: ; 80E4354
 	thumb_func_end sub_80E4354
 
 	thumb_func_start nullsub_42
-nullsub_42: ; 80E4380
+nullsub_42: @ 80E4380
 	bx lr
 	thumb_func_end nullsub_42
 
 	thumb_func_start sub_80E4384
-sub_80E4384: ; 80E4384
+sub_80E4384: @ 80E4384
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x02039f94
@@ -414329,7 +414329,7 @@ sub_80E4384: ; 80E4384
 	thumb_func_end sub_80E4384
 
 	thumb_func_start sub_80E43E0
-sub_80E43E0: ; 80E43E0
+sub_80E43E0: @ 80E43E0
 	push {r4,lr}
 	ldr r0, =gUnknown_0858C180
 	movs r1, 0x38
@@ -414357,7 +414357,7 @@ sub_80E43E0: ; 80E43E0
 	thumb_func_end sub_80E43E0
 
 	thumb_func_start sub_80E4420
-sub_80E4420: ; 80E4420
+sub_80E4420: @ 80E4420
 	push {lr}
 	sub sp, 0xC
 	bl sub_80D2F04
@@ -414396,7 +414396,7 @@ sub_80E4420: ; 80E4420
 	thumb_func_end sub_80E4420
 
 	thumb_func_start sub_80E447C
-sub_80E447C: ; 80E447C
+sub_80E447C: @ 80E447C
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =DummyObjectCallback
@@ -414427,7 +414427,7 @@ sub_80E447C: ; 80E447C
 	thumb_func_end sub_80E447C
 
 	thumb_func_start sub_80E44BC
-sub_80E44BC: ; 80E44BC
+sub_80E44BC: @ 80E44BC
 	push {r4,r5,lr}
 	bl sub_80E460C
 	lsls r0, 24
@@ -414470,7 +414470,7 @@ _080E4506:
 	thumb_func_end sub_80E44BC
 
 	thumb_func_start sub_80E450C
-sub_80E450C: ; 80E450C
+sub_80E450C: @ 80E450C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -414505,7 +414505,7 @@ _080E4546:
 	thumb_func_end sub_80E450C
 
 	thumb_func_start sub_80E4558
-sub_80E4558: ; 80E4558
+sub_80E4558: @ 80E4558
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -414529,7 +414529,7 @@ _080E457A:
 	thumb_func_end sub_80E4558
 
 	thumb_func_start sub_80E4580
-sub_80E4580: ; 80E4580
+sub_80E4580: @ 80E4580
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -414549,7 +414549,7 @@ _080E459A:
 	thumb_func_end sub_80E4580
 
 	thumb_func_start sub_80E45A4
-sub_80E45A4: ; 80E45A4
+sub_80E45A4: @ 80E45A4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -414580,7 +414580,7 @@ _080E45D2:
 	thumb_func_end sub_80E45A4
 
 	thumb_func_start sub_80E45E0
-sub_80E45E0: ; 80E45E0
+sub_80E45E0: @ 80E45E0
 	ldr r0, =0x02039f94
 	ldr r0, [r0]
 	ldr r1, =0x00001e10
@@ -414593,7 +414593,7 @@ sub_80E45E0: ; 80E45E0
 	thumb_func_end sub_80E45E0
 
 	thumb_func_start sub_80E45F8
-sub_80E45F8: ; 80E45F8
+sub_80E45F8: @ 80E45F8
 	push {lr}
 	ldr r0, =sub_80E465C
 	movs r1, 0x1
@@ -414604,7 +414604,7 @@ sub_80E45F8: ; 80E45F8
 	thumb_func_end sub_80E45F8
 
 	thumb_func_start sub_80E460C
-sub_80E460C: ; 80E460C
+sub_80E460C: @ 80E460C
 	push {lr}
 	ldr r0, =sub_80E465C
 	bl get_task_id_by_function
@@ -414622,7 +414622,7 @@ sub_80E460C: ; 80E460C
 	thumb_func_end sub_80E460C
 
 	thumb_func_start sub_80E4630
-sub_80E4630: ; 80E4630
+sub_80E4630: @ 80E4630
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -414644,7 +414644,7 @@ sub_80E4630: ; 80E4630
 	thumb_func_end sub_80E4630
 
 	thumb_func_start sub_80E465C
-sub_80E465C: ; 80E465C
+sub_80E465C: @ 80E465C
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -414667,14 +414667,14 @@ sub_80E465C: ; 80E465C
 	thumb_func_end sub_80E465C
 
 	thumb_func_start sub_80E468C
-sub_80E468C: ; 80E468C
+sub_80E468C: @ 80E468C
 	movs r1, 0
 	strh r1, [r0, 0xA]
 	bx lr
 	thumb_func_end sub_80E468C
 
 	thumb_func_start sub_80E4692
-sub_80E4692: ; 80E4692
+sub_80E4692: @ 80E4692
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0
@@ -414722,14 +414722,14 @@ _080E46E4:
 	thumb_func_end sub_80E4692
 
 	thumb_func_start sub_80E46E8
-sub_80E46E8: ; 80E46E8
+sub_80E46E8: @ 80E46E8
 	movs r1, 0
 	strh r1, [r0, 0xA]
 	bx lr
 	thumb_func_end sub_80E46E8
 
 	thumb_func_start sub_80E46F0
-sub_80E46F0: ; 80E46F0
+sub_80E46F0: @ 80E46F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -414939,7 +414939,7 @@ _080E4878:
 	thumb_func_end sub_80E46F0
 
 	thumb_func_start sub_80E4894
-sub_80E4894: ; 80E4894
+sub_80E4894: @ 80E4894
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x02039f94
@@ -414976,7 +414976,7 @@ sub_80E4894: ; 80E4894
 	thumb_func_end sub_80E4894
 
 	thumb_func_start sub_80E48E8
-sub_80E48E8: ; 80E48E8
+sub_80E48E8: @ 80E48E8
 	push {r4,r5,lr}
 	sub sp, 0x2C
 	ldr r5, =0x02039f94
@@ -415028,7 +415028,7 @@ sub_80E48E8: ; 80E48E8
 	thumb_func_end sub_80E48E8
 
 	thumb_func_start sub_80E4964
-sub_80E4964: ; 80E4964
+sub_80E4964: @ 80E4964
 	push {lr}
 	ldr r1, =gUnknown_0858BF58
 	ldr r0, =0x02039f94
@@ -415046,7 +415046,7 @@ sub_80E4964: ; 80E4964
 	thumb_func_end sub_80E4964
 
 	thumb_func_start sub_80E498C
-sub_80E498C: ; 80E498C
+sub_80E498C: @ 80E498C
 	push {lr}
 	ldr r1, =gUnknown_0858BF6C
 	ldr r0, =0x02039f94
@@ -415065,12 +415065,12 @@ sub_80E498C: ; 80E498C
 	thumb_func_end sub_80E498C
 
 	thumb_func_start nullsub_43
-nullsub_43: ; 80E49B8
+nullsub_43: @ 80E49B8
 	bx lr
 	thumb_func_end nullsub_43
 
 	thumb_func_start sub_80E49BC
-sub_80E49BC: ; 80E49BC
+sub_80E49BC: @ 80E49BC
 	push {r4,r5,lr}
 	sub sp, 0x10
 	movs r4, 0
@@ -415118,7 +415118,7 @@ _080E4A0C:
 	thumb_func_end sub_80E49BC
 
 	thumb_func_start sub_80E4A2C
-sub_80E4A2C: ; 80E4A2C
+sub_80E4A2C: @ 80E4A2C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -415145,7 +415145,7 @@ sub_80E4A2C: ; 80E4A2C
 	thumb_func_end sub_80E4A2C
 
 	thumb_func_start sub_80E4A60
-sub_80E4A60: ; 80E4A60
+sub_80E4A60: @ 80E4A60
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r0, =0x02039f94
@@ -415191,7 +415191,7 @@ _080E4AAA:
 	thumb_func_end sub_80E4A60
 
 	thumb_func_start sub_80E4AB4
-sub_80E4AB4: ; 80E4AB4
+sub_80E4AB4: @ 80E4AB4
 	push {lr}
 	ldr r0, =0x02039f94
 	ldr r2, [r0]
@@ -415228,7 +415228,7 @@ _080E4AF2:
 	thumb_func_end sub_80E4AB4
 
 	thumb_func_start sub_80E4AF8
-sub_80E4AF8: ; 80E4AF8
+sub_80E4AF8: @ 80E4AF8
 	push {r4-r6,lr}
 	bl sub_80E4AB4
 	adds r4, r0, 0
@@ -415272,7 +415272,7 @@ _080E4B42:
 	thumb_func_end sub_80E4AF8
 
 	thumb_func_start sub_80E4B54
-sub_80E4B54: ; 80E4B54
+sub_80E4B54: @ 80E4B54
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -415319,7 +415319,7 @@ _080E4BB2:
 	thumb_func_end sub_80E4B54
 
 	thumb_func_start sub_80E4BBC
-sub_80E4BBC: ; 80E4BBC
+sub_80E4BBC: @ 80E4BBC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -415341,7 +415341,7 @@ sub_80E4BBC: ; 80E4BBC
 	thumb_func_end sub_80E4BBC
 
 	thumb_func_start sub_80E4BE4
-sub_80E4BE4: ; 80E4BE4
+sub_80E4BE4: @ 80E4BE4
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r1, =0x02039f94
@@ -415397,7 +415397,7 @@ _080E4C4A:
 	thumb_func_end sub_80E4BE4
 
 	thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns
-choose_name_or_words_screen_load_bg_tile_patterns: ; 80E4C54
+choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_08DD3838
 	ldr r6, =0x02039f94
@@ -415436,7 +415436,7 @@ choose_name_or_words_screen_load_bg_tile_patterns: ; 80E4C54
 	thumb_func_end choose_name_or_words_screen_load_bg_tile_patterns
 
 	thumb_func_start sub_80E4CB8
-sub_80E4CB8: ; 80E4CB8
+sub_80E4CB8: @ 80E4CB8
 	push {lr}
 	bl sub_80E45F8
 	bl sub_80E3920
@@ -415445,7 +415445,7 @@ sub_80E4CB8: ; 80E4CB8
 	thumb_func_end sub_80E4CB8
 
 	thumb_func_start choose_name_or_words_screen_apply_bg_pals
-choose_name_or_words_screen_apply_bg_pals: ; 80E4CC8
+choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8
 	push {lr}
 	ldr r0, =gUnknown_08DD3778
 	movs r1, 0
@@ -415466,7 +415466,7 @@ choose_name_or_words_screen_apply_bg_pals: ; 80E4CC8
 	thumb_func_end choose_name_or_words_screen_apply_bg_pals
 
 	thumb_func_start sub_80E4CF8
-sub_80E4CF8: ; 80E4CF8
+sub_80E4CF8: @ 80E4CF8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -415478,12 +415478,12 @@ sub_80E4CF8: ; 80E4CF8
 	thumb_func_end sub_80E4CF8
 
 	thumb_func_start nullsub_10
-nullsub_10: ; 80E4D0C
+nullsub_10: @ 80E4D0C
 	bx lr
 	thumb_func_end nullsub_10
 
 	thumb_func_start sub_80E4D10
-sub_80E4D10: ; 80E4D10
+sub_80E4D10: @ 80E4D10
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -415583,7 +415583,7 @@ _080E4DA6:
 	thumb_func_end sub_80E4D10
 
 	thumb_func_start sub_80E4DE4
-sub_80E4DE4: ; 80E4DE4
+sub_80E4DE4: @ 80E4DE4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -415639,7 +415639,7 @@ _080E4E0E:
 	thumb_func_end sub_80E4DE4
 
 	thumb_func_start sub_80E4E5C
-sub_80E4E5C: ; 80E4E5C
+sub_80E4E5C: @ 80E4E5C
 	push {r4-r6,lr}
 	movs r0, 0xA
 	bl GetGpuReg
@@ -415699,7 +415699,7 @@ _080E4E96:
 	thumb_func_end sub_80E4E5C
 
 	thumb_func_start sub_80E4EF0
-sub_80E4EF0: ; 80E4EF0
+sub_80E4EF0: @ 80E4EF0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	ldr r1, =gUnknown_0858BFA4
@@ -415743,7 +415743,7 @@ sub_80E4EF0: ; 80E4EF0
 	thumb_func_end sub_80E4EF0
 
 	thumb_func_start sub_80E4F58
-sub_80E4F58: ; 80E4F58
+sub_80E4F58: @ 80E4F58
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -415754,7 +415754,7 @@ sub_80E4F58: ; 80E4F58
 	thumb_func_end sub_80E4F58
 
 	thumb_func_start sub_80E4F70
-sub_80E4F70: ; 80E4F70
+sub_80E4F70: @ 80E4F70
 	push {lr}
 	movs r0, 0
 	bl SetVBlankCallback
@@ -415765,7 +415765,7 @@ sub_80E4F70: ; 80E4F70
 	thumb_func_end sub_80E4F70
 
 	thumb_func_start sub_80E4F84
-sub_80E4F84: ; 80E4F84
+sub_80E4F84: @ 80E4F84
 	push {lr}
 	ldr r0, =sub_80E4F94
 	bl SetVBlankCallback
@@ -415775,7 +415775,7 @@ sub_80E4F84: ; 80E4F84
 	thumb_func_end sub_80E4F84
 
 	thumb_func_start sub_80E4F94
-sub_80E4F94: ; 80E4F94
+sub_80E4F94: @ 80E4F94
 	push {r4,r5,lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -415825,7 +415825,7 @@ sub_80E4F94: ; 80E4F94
 	thumb_func_end sub_80E4F94
 
 	thumb_func_start sub_80E501C
-sub_80E501C: ; 80E501C
+sub_80E501C: @ 80E501C
 	push {lr}
 	movs r0, 0
 	bl ShowBg
@@ -415840,7 +415840,7 @@ sub_80E501C: ; 80E501C
 	thumb_func_end sub_80E501C
 
 	thumb_func_start sub_80E503C
-sub_80E503C: ; 80E503C
+sub_80E503C: @ 80E503C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -415872,7 +415872,7 @@ _080E5066:
 	thumb_func_end sub_80E503C
 
 	thumb_func_start sub_80E5074
-sub_80E5074: ; 80E5074
+sub_80E5074: @ 80E5074
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d90
@@ -415892,7 +415892,7 @@ sub_80E5074: ; 80E5074
 	thumb_func_end sub_80E5074
 
 	thumb_func_start sub_80E509C
-sub_80E509C: ; 80E509C
+sub_80E509C: @ 80E509C
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d90
@@ -415912,7 +415912,7 @@ sub_80E509C: ; 80E509C
 	thumb_func_end sub_80E509C
 
 	thumb_func_start sub_80E50C4
-sub_80E50C4: ; 80E50C4
+sub_80E50C4: @ 80E50C4
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d90
@@ -415932,7 +415932,7 @@ sub_80E50C4: ; 80E50C4
 	thumb_func_end sub_80E50C4
 
 	thumb_func_start sub_80E50EC
-sub_80E50EC: ; 80E50EC
+sub_80E50EC: @ 80E50EC
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d90
@@ -415952,8 +415952,8 @@ sub_80E50EC: ; 80E50EC
 	thumb_func_end sub_80E50EC
 
 	thumb_func_start DecryptMoney
-; int DecryptMoney(u32 *moneyPointer)
-DecryptMoney: ; 80E5114
+@ int DecryptMoney(u32 *moneyPointer)
+DecryptMoney: @ 80E5114
 	ldr r1, =0x03005d90
 	ldr r1, [r1]
 	adds r1, 0xAC
@@ -415965,8 +415965,8 @@ DecryptMoney: ; 80E5114
 	thumb_func_end DecryptMoney
 
 	thumb_func_start EncryptMoney
-; void EncryptMoney(u32 *moneyPointer, u32 moneyAmount)
-EncryptMoney: ; 80E5128
+@ void EncryptMoney(u32 *moneyPointer, u32 moneyAmount)
+EncryptMoney: @ 80E5128
 	ldr r2, =0x03005d90
 	ldr r2, [r2]
 	adds r2, 0xAC
@@ -415978,8 +415978,8 @@ EncryptMoney: ; 80E5128
 	thumb_func_end EncryptMoney
 
 	thumb_func_start IsEnoughMoney
-; bool8 IsEnoughMoney(u32 *moneyPointer, u32 price)
-IsEnoughMoney: ; 80E513C
+@ bool8 IsEnoughMoney(u32 *moneyPointer, u32 price)
+IsEnoughMoney: @ 80E513C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl DecryptMoney
@@ -415996,8 +415996,8 @@ _080E514E:
 	thumb_func_end IsEnoughMoney
 
 	thumb_func_start add_money
-; void add_money(int *money_ptr, int amount)
-add_money: ; 80E5154
+@ void add_money(int *money_ptr, int amount)
+add_money: @ 80E5154
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -416025,8 +416025,8 @@ _080E5178:
 	thumb_func_end add_money
 
 	thumb_func_start subtract_money
-; void subtract_money(int *money_ptr, int amount)
-subtract_money: ; 80E518C
+@ void subtract_money(int *money_ptr, int amount)
+subtract_money: @ 80E518C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -416047,7 +416047,7 @@ _080E51A2:
 	thumb_func_end subtract_money
 
 	thumb_func_start sub_80E51B0
-sub_80E51B0: ; 80E51B0
+sub_80E51B0: @ 80E51B0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -416065,7 +416065,7 @@ sub_80E51B0: ; 80E51B0
 	thumb_func_end sub_80E51B0
 
 	thumb_func_start sub_80E51D4
-sub_80E51D4: ; 80E51D4
+sub_80E51D4: @ 80E51D4
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -416081,8 +416081,8 @@ sub_80E51D4: ; 80E51D4
 	thumb_func_end sub_80E51D4
 
 	thumb_func_start PrintMoneyAmountInMoneyBox
-; void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, s8 a3)
-PrintMoneyAmountInMoneyBox: ; 80E51F4
+@ void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, s8 a3)
+PrintMoneyAmountInMoneyBox: @ 80E51F4
 	push {lr}
 	sub sp, 0x4
 	adds r3, r1, 0
@@ -416100,8 +416100,8 @@ PrintMoneyAmountInMoneyBox: ; 80E51F4
 	thumb_func_end PrintMoneyAmountInMoneyBox
 
 	thumb_func_start PrintMoneyAmount
-; void PrintMoneyAmount(u8 windowId, char x, char y, int amount, u8 a5)
-PrintMoneyAmount: ; 80E5214
+@ void PrintMoneyAmount(u8 windowId, char x, char y, int amount, u8 a5)
+PrintMoneyAmount: @ 80E5214
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -416164,8 +416164,8 @@ _080E5264:
 	thumb_func_end PrintMoneyAmount
 
 	thumb_func_start set_window_border_style_and_print_money_box
-; void set_window_border_style_and_print_money_box(u8 windowId, u16 tileStart, u8 palette, int amount)
-set_window_border_style_and_print_money_box: ; 80E5298
+@ void set_window_border_style_and_print_money_box(u8 windowId, u16 tileStart, u8 palette, int amount)
+set_window_border_style_and_print_money_box: @ 80E5298
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -416196,7 +416196,7 @@ set_window_border_style_and_print_money_box: ; 80E5298
 	thumb_func_end set_window_border_style_and_print_money_box
 
 	thumb_func_start sub_80E52D4
-sub_80E52D4: ; 80E52D4
+sub_80E52D4: @ 80E52D4
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02039f98
@@ -416209,8 +416209,8 @@ sub_80E52D4: ; 80E52D4
 	thumb_func_end sub_80E52D4
 
 	thumb_func_start sub_80E52EC
-; void sub_80E52EC(int money, int x, int y)
-sub_80E52EC: ; 80E52EC
+@ void sub_80E52EC(int money, int x, int y)
+sub_80E52EC: @ 80E52EC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -416281,7 +416281,7 @@ sub_80E52EC: ; 80E52EC
 	thumb_func_end sub_80E52EC
 
 	thumb_func_start sub_80E5384
-sub_80E5384: ; 80E5384
+sub_80E5384: @ 80E5384
 	push {r4,lr}
 	bl RemoveMoneyLabelObject
 	ldr r4, =0x02039f98
@@ -416300,7 +416300,7 @@ sub_80E5384: ; 80E5384
 	thumb_func_end sub_80E5384
 
 	thumb_func_start AddMoneyLabelObject
-AddMoneyLabelObject: ; 80E53AC
+AddMoneyLabelObject: @ 80E53AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -416330,7 +416330,7 @@ AddMoneyLabelObject: ; 80E53AC
 	thumb_func_end AddMoneyLabelObject
 
 	thumb_func_start RemoveMoneyLabelObject
-RemoveMoneyLabelObject: ; 80E53F4
+RemoveMoneyLabelObject: @ 80E53F4
 	push {lr}
 	ldr r0, =0x02039f99
 	ldrb r1, [r0]
@@ -416346,8 +416346,8 @@ RemoveMoneyLabelObject: ; 80E53F4
 	thumb_func_end RemoveMoneyLabelObject
 
 	thumb_func_start AreMovesContestCombo
-; u8 AreMovesContestCombo(u16 moveId1, u16 moveId2)
-AreMovesContestCombo: ; 80E5414
+@ u8 AreMovesContestCombo(u16 moveId1, u16 moveId2)
+AreMovesContestCombo: @ 80E5414
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -416401,12 +416401,12 @@ _080E5472:
 	thumb_func_end AreMovesContestCombo
 
 	thumb_func_start ContestEffectFunc_080E547C
-ContestEffectFunc_080E547C: ; 80E547C
+ContestEffectFunc_080E547C: @ 80E547C
 	bx lr
 	thumb_func_end ContestEffectFunc_080E547C
 
 	thumb_func_start ContestEffectFunc_080E5480
-ContestEffectFunc_080E5480: ; 80E5480
+ContestEffectFunc_080E5480: @ 80E5480
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416432,7 +416432,7 @@ ContestEffectFunc_080E5480: ; 80E5480
 	thumb_func_end ContestEffectFunc_080E5480
 
 	thumb_func_start ContestEffectFunc_080E54B0
-ContestEffectFunc_080E54B0: ; 80E54B0
+ContestEffectFunc_080E54B0: @ 80E54B0
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416458,7 +416458,7 @@ ContestEffectFunc_080E54B0: ; 80E54B0
 	thumb_func_end ContestEffectFunc_080E54B0
 
 	thumb_func_start ContestEffectFunc_080E54E0
-ContestEffectFunc_080E54E0: ; 80E54E0
+ContestEffectFunc_080E54E0: @ 80E54E0
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
@@ -416503,7 +416503,7 @@ ContestEffectFunc_080E54E0: ; 80E54E0
 	thumb_func_end ContestEffectFunc_080E54E0
 
 	thumb_func_start ContestEffectFunc_080E5534
-ContestEffectFunc_080E5534: ; 80E5534
+ContestEffectFunc_080E5534: @ 80E5534
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416527,7 +416527,7 @@ ContestEffectFunc_080E5534: ; 80E5534
 	thumb_func_end ContestEffectFunc_080E5534
 
 	thumb_func_start ContestEffectFunc_080E5560
-ContestEffectFunc_080E5560: ; 80E5560
+ContestEffectFunc_080E5560: @ 80E5560
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416553,7 +416553,7 @@ ContestEffectFunc_080E5560: ; 80E5560
 	thumb_func_end ContestEffectFunc_080E5560
 
 	thumb_func_start ContestEffectFunc_080E5590
-ContestEffectFunc_080E5590: ; 80E5590
+ContestEffectFunc_080E5590: @ 80E5590
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416577,7 +416577,7 @@ ContestEffectFunc_080E5590: ; 80E5590
 	thumb_func_end ContestEffectFunc_080E5590
 
 	thumb_func_start ContestEffectFunc_080E55BC
-ContestEffectFunc_080E55BC: ; 80E55BC
+ContestEffectFunc_080E55BC: @ 80E55BC
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -416603,7 +416603,7 @@ ContestEffectFunc_080E55BC: ; 80E55BC
 	thumb_func_end ContestEffectFunc_080E55BC
 
 	thumb_func_start ContestEffectFunc_080E55EC
-ContestEffectFunc_080E55EC: ; 80E55EC
+ContestEffectFunc_080E55EC: @ 80E55EC
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x02039f34
@@ -416667,7 +416667,7 @@ _080E564C:
 	thumb_func_end ContestEffectFunc_080E55EC
 
 	thumb_func_start ContestEffectFunc_080E5664
-ContestEffectFunc_080E5664: ; 80E5664
+ContestEffectFunc_080E5664: @ 80E5664
 	push {r4-r6,lr}
 	movs r1, 0
 	ldr r2, =0x02039f34
@@ -416732,7 +416732,7 @@ _080E56C6:
 	thumb_func_end ContestEffectFunc_080E5664
 
 	thumb_func_start ContestEffectFunc_080E56E0
-ContestEffectFunc_080E56E0: ; 80E56E0
+ContestEffectFunc_080E56E0: @ 80E56E0
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -416760,7 +416760,7 @@ _080E5702:
 	thumb_func_end ContestEffectFunc_080E56E0
 
 	thumb_func_start ContestEffectFunc_080E5718
-ContestEffectFunc_080E5718: ; 80E5718
+ContestEffectFunc_080E5718: @ 80E5718
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -416853,7 +416853,7 @@ _080E57BE:
 	thumb_func_end ContestEffectFunc_080E5718
 
 	thumb_func_start ContestEffectFunc_080E57CC
-ContestEffectFunc_080E57CC: ; 80E57CC
+ContestEffectFunc_080E57CC: @ 80E57CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -416952,7 +416952,7 @@ _080E587A:
 	thumb_func_end ContestEffectFunc_080E57CC
 
 	thumb_func_start ContestEffectFunc_080E588C
-ContestEffectFunc_080E588C: ; 80E588C
+ContestEffectFunc_080E588C: @ 80E588C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -417042,7 +417042,7 @@ _080E5928:
 	thumb_func_end ContestEffectFunc_080E588C
 
 	thumb_func_start ContestEffectFunc_080E5938
-ContestEffectFunc_080E5938: ; 80E5938
+ContestEffectFunc_080E5938: @ 80E5938
 	push {r4,lr}
 	ldr r4, =0x02039f34
 	ldr r1, [r4]
@@ -417070,7 +417070,7 @@ ContestEffectFunc_080E5938: ; 80E5938
 	thumb_func_end ContestEffectFunc_080E5938
 
 	thumb_func_start ContestEffectFunc_080E5970
-ContestEffectFunc_080E5970: ; 80E5970
+ContestEffectFunc_080E5970: @ 80E5970
 	push {r4,lr}
 	ldr r4, =0x02039f34
 	ldr r1, [r4]
@@ -417101,7 +417101,7 @@ ContestEffectFunc_080E5970: ; 80E5970
 	thumb_func_end ContestEffectFunc_080E5970
 
 	thumb_func_start ContestEffectFunc_080E59B0
-ContestEffectFunc_080E59B0: ; 80E59B0
+ContestEffectFunc_080E59B0: @ 80E59B0
 	push {lr}
 	movs r0, 0
 	bl sub_80E6934
@@ -417117,7 +417117,7 @@ ContestEffectFunc_080E59B0: ; 80E59B0
 	thumb_func_end ContestEffectFunc_080E59B0
 
 	thumb_func_start ContestEffectFunc_080E59D0
-ContestEffectFunc_080E59D0: ; 80E59D0
+ContestEffectFunc_080E59D0: @ 80E59D0
 	push {lr}
 	movs r0, 0x1
 	bl sub_80E6934
@@ -417133,7 +417133,7 @@ ContestEffectFunc_080E59D0: ; 80E59D0
 	thumb_func_end ContestEffectFunc_080E59D0
 
 	thumb_func_start ContestEffectFunc_080E59F0
-ContestEffectFunc_080E59F0: ; 80E59F0
+ContestEffectFunc_080E59F0: @ 80E59F0
 	push {lr}
 	movs r0, 0x2
 	bl sub_80E6934
@@ -417149,7 +417149,7 @@ ContestEffectFunc_080E59F0: ; 80E59F0
 	thumb_func_end ContestEffectFunc_080E59F0
 
 	thumb_func_start ContestEffectFunc_080E5A10
-ContestEffectFunc_080E5A10: ; 80E5A10
+ContestEffectFunc_080E5A10: @ 80E5A10
 	push {lr}
 	movs r0, 0x3
 	bl sub_80E6934
@@ -417165,7 +417165,7 @@ ContestEffectFunc_080E5A10: ; 80E5A10
 	thumb_func_end ContestEffectFunc_080E5A10
 
 	thumb_func_start ContestEffectFunc_080E5A30
-ContestEffectFunc_080E5A30: ; 80E5A30
+ContestEffectFunc_080E5A30: @ 80E5A30
 	push {lr}
 	movs r0, 0x4
 	bl sub_80E6934
@@ -417181,7 +417181,7 @@ ContestEffectFunc_080E5A30: ; 80E5A30
 	thumb_func_end ContestEffectFunc_080E5A30
 
 	thumb_func_start ContestEffectFunc_080E5A50
-ContestEffectFunc_080E5A50: ; 80E5A50
+ContestEffectFunc_080E5A50: @ 80E5A50
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r2, =0x02039f34
@@ -417249,7 +417249,7 @@ _080E5ACC:
 	thumb_func_end ContestEffectFunc_080E5A50
 
 	thumb_func_start ContestEffectFunc_080E5AD4
-ContestEffectFunc_080E5AD4: ; 80E5AD4
+ContestEffectFunc_080E5AD4: @ 80E5AD4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -417506,7 +417506,7 @@ _080E5CC0:
 	thumb_func_end ContestEffectFunc_080E5AD4
 
 	thumb_func_start ContestEffectFunc_080E5CD4
-ContestEffectFunc_080E5CD4: ; 80E5CD4
+ContestEffectFunc_080E5CD4: @ 80E5CD4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -417592,7 +417592,7 @@ _080E5D6E:
 	thumb_func_end ContestEffectFunc_080E5CD4
 
 	thumb_func_start ContestEffectFunc_080E5D7C
-ContestEffectFunc_080E5D7C: ; 80E5D7C
+ContestEffectFunc_080E5D7C: @ 80E5D7C
 	push {r4-r7,lr}
 	movs r7, 0
 	movs r4, 0
@@ -417662,7 +417662,7 @@ _080E5DF8:
 	thumb_func_end ContestEffectFunc_080E5D7C
 
 	thumb_func_start ContestEffectFunc_080E5E04
-ContestEffectFunc_080E5E04: ; 80E5E04
+ContestEffectFunc_080E5E04: @ 80E5E04
 	push {r4,lr}
 	ldr r1, =0x02039f26
 	ldr r0, =0x02039f34
@@ -417703,7 +417703,7 @@ _080E5E46:
 	thumb_func_end ContestEffectFunc_080E5E04
 
 	thumb_func_start ContestEffectFunc_080E5E5C
-ContestEffectFunc_080E5E5C: ; 80E5E5C
+ContestEffectFunc_080E5E5C: @ 80E5E5C
 	push {r4,lr}
 	ldr r1, =0x02039f26
 	ldr r0, =0x02039f34
@@ -417744,7 +417744,7 @@ _080E5E9E:
 	thumb_func_end ContestEffectFunc_080E5E5C
 
 	thumb_func_start ContestEffectFunc_080E5EB4
-ContestEffectFunc_080E5EB4: ; 80E5EB4
+ContestEffectFunc_080E5EB4: @ 80E5EB4
 	push {r4-r7,lr}
 	movs r1, 0
 	movs r5, 0
@@ -417835,7 +417835,7 @@ _080E5F2C:
 	thumb_func_end ContestEffectFunc_080E5EB4
 
 	thumb_func_start ContestEffectFunc_080E5F64
-ContestEffectFunc_080E5F64: ; 80E5F64
+ContestEffectFunc_080E5F64: @ 80E5F64
 	push {r4-r7,lr}
 	movs r6, 0
 	ldr r0, =0x02039f34
@@ -417905,7 +417905,7 @@ _080E5FDE:
 	thumb_func_end ContestEffectFunc_080E5F64
 
 	thumb_func_start ContestEffectFunc_080E5FE4
-ContestEffectFunc_080E5FE4: ; 80E5FE4
+ContestEffectFunc_080E5FE4: @ 80E5FE4
 	push {r4,r5,lr}
 	ldr r1, =0x02039f34
 	ldr r3, [r1]
@@ -417974,7 +417974,7 @@ _080E6060:
 	thumb_func_end ContestEffectFunc_080E5FE4
 
 	thumb_func_start ContestEffectFunc_080E6068
-ContestEffectFunc_080E6068: ; 80E6068
+ContestEffectFunc_080E6068: @ 80E6068
 	push {r4,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -418057,7 +418057,7 @@ _080E60FC:
 	thumb_func_end ContestEffectFunc_080E6068
 
 	thumb_func_start ContestEffectFunc_080E611C
-ContestEffectFunc_080E611C: ; 80E611C
+ContestEffectFunc_080E611C: @ 80E611C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -418180,7 +418180,7 @@ _080E61F8:
 	thumb_func_end ContestEffectFunc_080E611C
 
 	thumb_func_start ContestEffectFunc_080E620C
-ContestEffectFunc_080E620C: ; 80E620C
+ContestEffectFunc_080E620C: @ 80E620C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -418266,7 +418266,7 @@ _080E62AC:
 	thumb_func_end ContestEffectFunc_080E620C
 
 	thumb_func_start ContestEffectFunc_080E62B8
-ContestEffectFunc_080E62B8: ; 80E62B8
+ContestEffectFunc_080E62B8: @ 80E62B8
 	push {r4-r7,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -418332,7 +418332,7 @@ _080E632E:
 	thumb_func_end ContestEffectFunc_080E62B8
 
 	thumb_func_start ContestEffectFunc_080E6334
-ContestEffectFunc_080E6334: ; 80E6334
+ContestEffectFunc_080E6334: @ 80E6334
 	push {r4,lr}
 	ldr r4, =0x02039f34
 	ldr r1, [r4]
@@ -418384,7 +418384,7 @@ _080E6390:
 	thumb_func_end ContestEffectFunc_080E6334
 
 	thumb_func_start ContestEffectFunc_080E6398
-ContestEffectFunc_080E6398: ; 80E6398
+ContestEffectFunc_080E6398: @ 80E6398
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r1, [r3]
@@ -418427,7 +418427,7 @@ _080E63E4:
 	thumb_func_end ContestEffectFunc_080E6398
 
 	thumb_func_start ContestEffectFunc_080E63E8
-ContestEffectFunc_080E63E8: ; 80E63E8
+ContestEffectFunc_080E63E8: @ 80E63E8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =0x02039f34
@@ -418593,7 +418593,7 @@ _080E6518:
 	thumb_func_end ContestEffectFunc_080E63E8
 
 	thumb_func_start ContestEffectFunc_080E6520
-ContestEffectFunc_080E6520: ; 80E6520
+ContestEffectFunc_080E6520: @ 80E6520
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -418766,12 +418766,12 @@ _080E6658:
 	thumb_func_end ContestEffectFunc_080E6520
 
 	thumb_func_start ContestEffectFunc_080E6664
-ContestEffectFunc_080E6664: ; 80E6664
+ContestEffectFunc_080E6664: @ 80E6664
 	bx lr
 	thumb_func_end ContestEffectFunc_080E6664
 
 	thumb_func_start ContestEffectFunc_080E6668
-ContestEffectFunc_080E6668: ; 80E6668
+ContestEffectFunc_080E6668: @ 80E6668
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r0, =0x02039f34
@@ -418913,7 +418913,7 @@ _080E676C:
 	thumb_func_end ContestEffectFunc_080E6668
 
 	thumb_func_start ContestEffectFunc_080E6778
-ContestEffectFunc_080E6778: ; 80E6778
+ContestEffectFunc_080E6778: @ 80E6778
 	push {lr}
 	ldr r3, =gContestMoves
 	ldr r0, =0x02039f34
@@ -418946,7 +418946,7 @@ _080E67AA:
 	thumb_func_end ContestEffectFunc_080E6778
 
 	thumb_func_start ContestEffectFunc_080E67BC
-ContestEffectFunc_080E67BC: ; 80E67BC
+ContestEffectFunc_080E67BC: @ 80E67BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -419034,7 +419034,7 @@ _080E684A:
 	thumb_func_end ContestEffectFunc_080E67BC
 
 	thumb_func_start ContestEffectFunc_080E6868
-ContestEffectFunc_080E6868: ; 80E6868
+ContestEffectFunc_080E6868: @ 80E6868
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r1, [r0]
@@ -419102,7 +419102,7 @@ _080E68CE:
 	thumb_func_end ContestEffectFunc_080E6868
 
 	thumb_func_start ContestEffectFunc_080E68EC
-ContestEffectFunc_080E68EC: ; 80E68EC
+ContestEffectFunc_080E68EC: @ 80E68EC
 	push {r4,lr}
 	ldr r4, =0x02039f34
 	ldr r0, [r4]
@@ -419141,7 +419141,7 @@ _080E692A:
 	thumb_func_end ContestEffectFunc_080E68EC
 
 	thumb_func_start sub_80E6934
-sub_80E6934: ; 80E6934
+sub_80E6934: @ 80E6934
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -419218,7 +419218,7 @@ _080E69B8:
 	thumb_func_end sub_80E6934
 
 	thumb_func_start sub_80E69C8
-sub_80E69C8: ; 80E69C8
+sub_80E69C8: @ 80E69C8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -419275,7 +419275,7 @@ _080E6A28:
 	thumb_func_end sub_80E69C8
 
 	thumb_func_start sub_80E6A2C
-sub_80E6A2C: ; 80E6A2C
+sub_80E6A2C: @ 80E6A2C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -419415,7 +419415,7 @@ _080E6B2E:
 	thumb_func_end sub_80E6A2C
 
 	thumb_func_start sub_80E6B3C
-sub_80E6B3C: ; 80E6B3C
+sub_80E6B3C: @ 80E6B3C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -419443,7 +419443,7 @@ sub_80E6B3C: ; 80E6B3C
 	thumb_func_end sub_80E6B3C
 
 	thumb_func_start sub_80E6B70
-sub_80E6B70: ; 80E6B70
+sub_80E6B70: @ 80E6B70
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -419483,7 +419483,7 @@ _080E6BA8:
 	thumb_func_end sub_80E6B70
 
 	thumb_func_start sub_80E6BB4
-sub_80E6BB4: ; 80E6BB4
+sub_80E6BB4: @ 80E6BB4
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -419513,7 +419513,7 @@ _080E6BDC:
 	thumb_func_end sub_80E6BB4
 
 	thumb_func_start sub_80E6BE8
-sub_80E6BE8: ; 80E6BE8
+sub_80E6BE8: @ 80E6BE8
 	push {lr}
 	ldr r0, =sub_80E715C
 	bl sub_80B37D4
@@ -419523,7 +419523,7 @@ sub_80E6BE8: ; 80E6BE8
 	thumb_func_end sub_80E6BE8
 
 	thumb_func_start sub_80E6BF8
-sub_80E6BF8: ; 80E6BF8
+sub_80E6BF8: @ 80E6BF8
 	push {r4,lr}
 	ldr r2, =0x03001134
 	ldr r0, =0x03005d8c
@@ -419572,7 +419572,7 @@ sub_80E6BF8: ; 80E6BF8
 	thumb_func_end sub_80E6BF8
 
 	thumb_func_start sub_80E6CA0
-sub_80E6CA0: ; 80E6CA0
+sub_80E6CA0: @ 80E6CA0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x03001134
@@ -419633,7 +419633,7 @@ _080E6D1C:
 	thumb_func_end sub_80E6CA0
 
 	thumb_func_start sub_80E6D54
-sub_80E6D54: ; 80E6D54
+sub_80E6D54: @ 80E6D54
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x03001134
@@ -419705,7 +419705,7 @@ _080E6DEE:
 	thumb_func_end sub_80E6D54
 
 	thumb_func_start sub_80E6E24
-sub_80E6E24: ; 80E6E24
+sub_80E6E24: @ 80E6E24
 	push {r4,r5,lr}
 	bl sub_80E9914
 	bl sub_80F0BB8
@@ -419813,7 +419813,7 @@ _080E6F12:
 	thumb_func_end sub_80E6E24
 
 	thumb_func_start sub_80E6F60
-sub_80E6F60: ; 80E6F60
+sub_80E6F60: @ 80E6F60
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -419962,7 +419962,7 @@ _080E70BE:
 	thumb_func_end sub_80E6F60
 
 	thumb_func_start sub_80E70F4
-sub_80E70F4: ; 80E70F4
+sub_80E70F4: @ 80E70F4
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -419988,7 +419988,7 @@ sub_80E70F4: ; 80E70F4
 	thumb_func_end sub_80E70F4
 
 	thumb_func_start sub_80E7128
-sub_80E7128: ; 80E7128
+sub_80E7128: @ 80E7128
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -420016,7 +420016,7 @@ _080E7150:
 	thumb_func_end sub_80E7128
 
 	thumb_func_start sub_80E715C
-sub_80E715C: ; 80E715C
+sub_80E715C: @ 80E715C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -420193,7 +420193,7 @@ _080E730A:
 	thumb_func_end sub_80E715C
 
 	thumb_func_start sub_80E7324
-sub_80E7324: ; 80E7324
+sub_80E7324: @ 80E7324
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -420463,7 +420463,7 @@ _080E7566:
 	thumb_func_end sub_80E7324
 
 	thumb_func_start sub_80E756C
-sub_80E756C: ; 80E756C
+sub_80E756C: @ 80E756C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -420556,7 +420556,7 @@ _080E7624:
 	thumb_func_end sub_80E756C
 
 	thumb_func_start sub_80E7630
-sub_80E7630: ; 80E7630
+sub_80E7630: @ 80E7630
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -420707,7 +420707,7 @@ _080E7752:
 	thumb_func_end sub_80E7630
 
 	thumb_func_start sub_80E776C
-sub_80E776C: ; 80E776C
+sub_80E776C: @ 80E776C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -420735,7 +420735,7 @@ _080E7794:
 	thumb_func_end sub_80E776C
 
 	thumb_func_start sub_80E77A0
-sub_80E77A0: ; 80E77A0
+sub_80E77A0: @ 80E77A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -420760,7 +420760,7 @@ _080E77C4:
 	thumb_func_end sub_80E77A0
 
 	thumb_func_start sub_80E77D4
-sub_80E77D4: ; 80E77D4
+sub_80E77D4: @ 80E77D4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -420778,7 +420778,7 @@ sub_80E77D4: ; 80E77D4
 	thumb_func_end sub_80E77D4
 
 	thumb_func_start sub_80E77FC
-sub_80E77FC: ; 80E77FC
+sub_80E77FC: @ 80E77FC
 	adds r1, r0, 0
 	ldrh r0, [r1]
 	ldrh r1, [r1, 0x2]
@@ -420788,7 +420788,7 @@ sub_80E77FC: ; 80E77FC
 	thumb_func_end sub_80E77FC
 
 	thumb_func_start sub_80E7808
-sub_80E7808: ; 80E7808
+sub_80E7808: @ 80E7808
 	strh r0, [r1]
 	lsrs r0, 16
 	strh r0, [r1, 0x2]
@@ -420796,7 +420796,7 @@ sub_80E7808: ; 80E7808
 	thumb_func_end sub_80E7808
 
 	thumb_func_start sub_80E7810
-sub_80E7810: ; 80E7810
+sub_80E7810: @ 80E7810
 	push {lr}
 	bl link_get_multiplayer_id
 	lsls r0, 24
@@ -420806,7 +420806,7 @@ sub_80E7810: ; 80E7810
 	thumb_func_end sub_80E7810
 
 	thumb_func_start sub_80E7820
-sub_80E7820: ; 80E7820
+sub_80E7820: @ 80E7820
 	lsls r0, 24
 	lsrs r0, 16
 	ldr r1, =0x020223c4
@@ -420816,7 +420816,7 @@ sub_80E7820: ; 80E7820
 	thumb_func_end sub_80E7820
 
 	thumb_func_start sub_80E7830
-sub_80E7830: ; 80E7830
+sub_80E7830: @ 80E7830
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8009FCC
@@ -420893,7 +420893,7 @@ _080E78B8:
 	thumb_func_end sub_80E7830
 
 	thumb_func_start sub_80E78C4
-sub_80E78C4: ; 80E78C4
+sub_80E78C4: @ 80E78C4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -420957,7 +420957,7 @@ _080E791A:
 	thumb_func_end sub_80E78C4
 
 	thumb_func_start sub_80E7948
-sub_80E7948: ; 80E7948
+sub_80E7948: @ 80E7948
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -421056,7 +421056,7 @@ _080E79FE:
 	thumb_func_end sub_80E7948
 
 	thumb_func_start sub_80E7A14
-sub_80E7A14: ; 80E7A14
+sub_80E7A14: @ 80E7A14
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -421118,7 +421118,7 @@ _080E7A8A:
 	thumb_func_end sub_80E7A14
 
 	thumb_func_start sub_80E7A9C
-sub_80E7A9C: ; 80E7A9C
+sub_80E7A9C: @ 80E7A9C
 	ldrh r0, [r0, 0x20]
 	lsls r0, 24
 	lsrs r0, 24
@@ -421126,7 +421126,7 @@ sub_80E7A9C: ; 80E7A9C
 	thumb_func_end sub_80E7A9C
 
 	thumb_func_start sub_80E7AA4
-sub_80E7AA4: ; 80E7AA4
+sub_80E7AA4: @ 80E7AA4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -421195,7 +421195,7 @@ sub_80E7AA4: ; 80E7AA4
 	thumb_func_end sub_80E7AA4
 
 	thumb_func_start sub_80E7B2C
-sub_80E7B2C: ; 80E7B2C
+sub_80E7B2C: @ 80E7B2C
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -421218,7 +421218,7 @@ _080E7B36:
 	thumb_func_end sub_80E7B2C
 
 	thumb_func_start sub_80E7B54
-sub_80E7B54: ; 80E7B54
+sub_80E7B54: @ 80E7B54
 	ldr r0, =0x03001160
 	ldrb r0, [r0]
 	bx lr
@@ -421226,7 +421226,7 @@ sub_80E7B54: ; 80E7B54
 	thumb_func_end sub_80E7B54
 
 	thumb_func_start sub_80E7B60
-sub_80E7B60: ; 80E7B60
+sub_80E7B60: @ 80E7B60
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -421751,7 +421751,7 @@ _080E7F1C:
 	thumb_func_end sub_80E7B60
 
 	thumb_func_start sub_80E7F68
-sub_80E7F68: ; 80E7F68
+sub_80E7F68: @ 80E7F68
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -421809,7 +421809,7 @@ _080E7FEC:
 	thumb_func_end sub_80E7F68
 
 	thumb_func_start sub_80E7FF8
-sub_80E7FF8: ; 80E7FF8
+sub_80E7FF8: @ 80E7FF8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -421935,7 +421935,7 @@ _080E810A:
 	thumb_func_end sub_80E7FF8
 
 	thumb_func_start sub_80E8110
-sub_80E8110: ; 80E8110
+sub_80E8110: @ 80E8110
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -422100,7 +422100,7 @@ _080E824C:
 	thumb_func_end sub_80E8110
 
 	thumb_func_start sub_80E8260
-sub_80E8260: ; 80E8260
+sub_80E8260: @ 80E8260
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -422304,7 +422304,7 @@ _080E8356:
 	thumb_func_end sub_80E8260
 
 	thumb_func_start sub_80E841C
-sub_80E841C: ; 80E841C
+sub_80E841C: @ 80E841C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -422347,7 +422347,7 @@ _080E845E:
 	thumb_func_end sub_80E841C
 
 	thumb_func_start sub_80E8468
-sub_80E8468: ; 80E8468
+sub_80E8468: @ 80E8468
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -422484,7 +422484,7 @@ _080E8566:
 	thumb_func_end sub_80E8468
 
 	thumb_func_start sub_80E8578
-sub_80E8578: ; 80E8578
+sub_80E8578: @ 80E8578
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -422887,7 +422887,7 @@ _080E8864:
 	thumb_func_end sub_80E8578
 
 	thumb_func_start sub_80E8880
-sub_80E8880: ; 80E8880
+sub_80E8880: @ 80E8880
 	push {r4-r7,lr}
 	mov r12, r0
 	adds r7, r1, 0
@@ -422933,7 +422933,7 @@ _080E88C0:
 	thumb_func_end sub_80E8880
 
 	thumb_func_start sub_80E88CC
-sub_80E88CC: ; 80E88CC
+sub_80E88CC: @ 80E88CC
 	push {r4-r7,lr}
 	mov r12, r0
 	adds r6, r1, 0
@@ -422985,7 +422985,7 @@ _080E8918:
 	thumb_func_end sub_80E88CC
 
 	thumb_func_start sub_80E8924
-sub_80E8924: ; 80E8924
+sub_80E8924: @ 80E8924
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -423055,7 +423055,7 @@ _080E8972:
 	thumb_func_end sub_80E8924
 
 	thumb_func_start sub_80E89AC
-sub_80E89AC: ; 80E89AC
+sub_80E89AC: @ 80E89AC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -423091,7 +423091,7 @@ sub_80E89AC: ; 80E89AC
 	thumb_func_end sub_80E89AC
 
 	thumb_func_start sub_80E89F8
-sub_80E89F8: ; 80E89F8
+sub_80E89F8: @ 80E89F8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r5, =0x02039f9c
@@ -423127,7 +423127,7 @@ sub_80E89F8: ; 80E89F8
 	thumb_func_end sub_80E89F8
 
 	thumb_func_start sub_80E8A54
-sub_80E8A54: ; 80E8A54
+sub_80E8A54: @ 80E8A54
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -423184,12 +423184,12 @@ _080E8AAE:
 	thumb_func_end sub_80E8A54
 
 	thumb_func_start nullsub_44
-nullsub_44: ; 80E8ABC
+nullsub_44: @ 80E8ABC
 	bx lr
 	thumb_func_end nullsub_44
 
 	thumb_func_start sub_80E8AC0
-sub_80E8AC0: ; 80E8AC0
+sub_80E8AC0: @ 80E8AC0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -423216,7 +423216,7 @@ _080E8ADC:
 	thumb_func_end sub_80E8AC0
 
 	thumb_func_start sub_80E8AF0
-sub_80E8AF0: ; 80E8AF0
+sub_80E8AF0: @ 80E8AF0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -423247,7 +423247,7 @@ _080E8B0A:
 	thumb_func_end sub_80E8AF0
 
 	thumb_func_start sub_80E8B28
-sub_80E8B28: ; 80E8B28
+sub_80E8B28: @ 80E8B28
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x03005d8c
@@ -423272,7 +423272,7 @@ _080E8B2E:
 	thumb_func_end sub_80E8B28
 
 	thumb_func_start sub_80E8B58
-sub_80E8B58: ; 80E8B58
+sub_80E8B58: @ 80E8B58
 	ldr r0, =0x0203a01c
 	ldr r1, =0x020375e0
 	ldrh r1, [r1]
@@ -423282,7 +423282,7 @@ sub_80E8B58: ; 80E8B58
 	thumb_func_end sub_80E8B58
 
 	thumb_func_start sub_80E8B6C
-sub_80E8B6C: ; 80E8B6C
+sub_80E8B6C: @ 80E8B6C
 	push {r4,lr}
 	ldr r0, =0x020375f0
 	movs r1, 0
@@ -423324,7 +423324,7 @@ _080E8BB0:
 	thumb_func_end sub_80E8B6C
 
 	thumb_func_start sub_80E8BC8
-sub_80E8BC8: ; 80E8BC8
+sub_80E8BC8: @ 80E8BC8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -423348,7 +423348,7 @@ _080E8BF0:
 	thumb_func_end sub_80E8BC8
 
 	thumb_func_start sub_80E8BF8
-sub_80E8BF8: ; 80E8BF8
+sub_80E8BF8: @ 80E8BF8
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -423435,7 +423435,7 @@ _080E8C8E:
 	thumb_func_end sub_80E8BF8
 
 	thumb_func_start sub_80E8C98
-sub_80E8C98: ; 80E8C98
+sub_80E8C98: @ 80E8C98
 	push {r4,lr}
 	ldr r4, =0x020375e6
 	bl sub_80E8BF8
@@ -423449,7 +423449,7 @@ sub_80E8C98: ; 80E8C98
 	thumb_func_end sub_80E8C98
 
 	thumb_func_start sub_80E8CB0
-sub_80E8CB0: ; 80E8CB0
+sub_80E8CB0: @ 80E8CB0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -423532,7 +423532,7 @@ _080E8D3C:
 	thumb_func_end sub_80E8CB0
 
 	thumb_func_start sub_80E8D4C
-sub_80E8D4C: ; 80E8D4C
+sub_80E8D4C: @ 80E8D4C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -423621,7 +423621,7 @@ _080E8DE8:
 	thumb_func_end sub_80E8D4C
 
 	thumb_func_start sub_80E8DF4
-sub_80E8DF4: ; 80E8DF4
+sub_80E8DF4: @ 80E8DF4
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -423645,7 +423645,7 @@ _080E8E12:
 	thumb_func_end sub_80E8DF4
 
 	thumb_func_start sub_80E8E18
-sub_80E8E18: ; 80E8E18
+sub_80E8E18: @ 80E8E18
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -423724,7 +423724,7 @@ _080E8E32:
 	thumb_func_end sub_80E8E18
 
 	thumb_func_start sub_80E8EE0
-sub_80E8EE0: ; 80E8EE0
+sub_80E8EE0: @ 80E8EE0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -423822,7 +423822,7 @@ _080E8F8A:
 	thumb_func_end sub_80E8EE0
 
 	thumb_func_start sub_80E8F9C
-sub_80E8F9C: ; 80E8F9C
+sub_80E8F9C: @ 80E8F9C
 	push {lr}
 	ldr r0, =0x0203a01c
 	ldrb r0, [r0]
@@ -423847,7 +423847,7 @@ sub_80E8F9C: ; 80E8F9C
 	thumb_func_end sub_80E8F9C
 
 	thumb_func_start sub_80E8FD0
-sub_80E8FD0: ; 80E8FD0
+sub_80E8FD0: @ 80E8FD0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -423911,7 +423911,7 @@ _080E904A:
 	thumb_func_end sub_80E8FD0
 
 	thumb_func_start sub_80E9068
-sub_80E9068: ; 80E9068
+sub_80E9068: @ 80E9068
 	push {lr}
 	ldr r0, =sub_80E8FD0
 	movs r1, 0
@@ -423935,7 +423935,7 @@ sub_80E9068: ; 80E9068
 	thumb_func_end sub_80E9068
 
 	thumb_func_start sub_80E909C
-sub_80E909C: ; 80E909C
+sub_80E909C: @ 80E909C
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r0, [r0, 0x17]
@@ -423957,7 +423957,7 @@ _080E90C2:
 	thumb_func_end sub_80E909C
 
 	thumb_func_start sub_80E90C8
-sub_80E90C8: ; 80E90C8
+sub_80E90C8: @ 80E90C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -423986,7 +423986,7 @@ _080E90F8:
 	thumb_func_end sub_80E90C8
 
 	thumb_func_start sub_80E9108
-sub_80E9108: ; 80E9108
+sub_80E9108: @ 80E9108
 	push {r4,lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -424032,7 +424032,7 @@ sub_80E9108: ; 80E9108
 	thumb_func_end sub_80E9108
 
 	thumb_func_start sub_80E916C
-sub_80E916C: ; 80E916C
+sub_80E916C: @ 80E916C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -424089,7 +424089,7 @@ _080E91D4:
 	thumb_func_end sub_80E916C
 
 	thumb_func_start sub_80E91F8
-sub_80E91F8: ; 80E91F8
+sub_80E91F8: @ 80E91F8
 	push {lr}
 	ldr r0, =sub_80E916C
 	movs r1, 0
@@ -424103,7 +424103,7 @@ sub_80E91F8: ; 80E91F8
 	thumb_func_end sub_80E91F8
 
 	thumb_func_start CurrentMapIsSecretBase
-CurrentMapIsSecretBase: ; 80E9214
+CurrentMapIsSecretBase: @ 80E9214
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -424125,7 +424125,7 @@ _080E9232:
 	thumb_func_end CurrentMapIsSecretBase
 
 	thumb_func_start sub_80E9238
-sub_80E9238: ; 80E9238
+sub_80E9238: @ 80E9238
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -424243,7 +424243,7 @@ _080E9328:
 	thumb_func_end sub_80E9238
 
 	thumb_func_start sub_80E933C
-sub_80E933C: ; 80E933C
+sub_80E933C: @ 80E933C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -424501,7 +424501,7 @@ _080E9562:
 	thumb_func_end sub_80E933C
 
 	thumb_func_start sub_80E9578
-sub_80E9578: ; 80E9578
+sub_80E9578: @ 80E9578
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r1, =0x02037318
@@ -424548,7 +424548,7 @@ _080E95C4:
 	thumb_func_end sub_80E9578
 
 	thumb_func_start sub_80E95D4
-sub_80E95D4: ; 80E95D4
+sub_80E95D4: @ 80E95D4
 	push {r4,r5,lr}
 	ldr r5, =0x0000401f
 	ldr r4, =gUnknown_0858D060
@@ -424570,7 +424570,7 @@ sub_80E95D4: ; 80E95D4
 	thumb_func_end sub_80E95D4
 
 	thumb_func_start sub_80E9608
-sub_80E9608: ; 80E9608
+sub_80E9608: @ 80E9608
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -424622,7 +424622,7 @@ _080E9660:
 	thumb_func_end sub_80E9608
 
 	thumb_func_start sub_80E9668
-sub_80E9668: ; 80E9668
+sub_80E9668: @ 80E9668
 	push {lr}
 	bl sub_80E9608
 	bl sub_80E8B6C
@@ -424634,7 +424634,7 @@ sub_80E9668: ; 80E9668
 	thumb_func_end sub_80E9668
 
 	thumb_func_start sub_80E9680
-sub_80E9680: ; 80E9680
+sub_80E9680: @ 80E9680
 	push {lr}
 	bl sub_80E8B58
 	bl sub_80E8B6C
@@ -424653,7 +424653,7 @@ _080E969E:
 	thumb_func_end sub_80E9680
 
 	thumb_func_start sub_80E96A4
-sub_80E96A4: ; 80E96A4
+sub_80E96A4: @ 80E96A4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -424712,7 +424712,7 @@ _080E9714:
 	thumb_func_end sub_80E96A4
 
 	thumb_func_start sub_80E9728
-sub_80E9728: ; 80E9728
+sub_80E9728: @ 80E9728
 	push {lr}
 	ldr r0, =sub_80E96A4
 	movs r1, 0
@@ -424726,7 +424726,7 @@ sub_80E9728: ; 80E9728
 	thumb_func_end sub_80E9728
 
 	thumb_func_start sub_80E9744
-sub_80E9744: ; 80E9744
+sub_80E9744: @ 80E9744
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -424752,7 +424752,7 @@ _080E9774:
 	thumb_func_end sub_80E9744
 
 	thumb_func_start sub_80E9780
-sub_80E9780: ; 80E9780
+sub_80E9780: @ 80E9780
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -424798,7 +424798,7 @@ sub_80E9780: ; 80E9780
 	thumb_func_end sub_80E9780
 
 	thumb_func_start GetSecretBaseMapName
-GetSecretBaseMapName: ; 80E97EC
+GetSecretBaseMapName: @ 80E97EC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x00004054
@@ -424815,7 +424815,7 @@ GetSecretBaseMapName: ; 80E97EC
 	thumb_func_end GetSecretBaseMapName
 
 	thumb_func_start sub_80E980C
-sub_80E980C: ; 80E980C
+sub_80E980C: @ 80E980C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -424860,7 +424860,7 @@ sub_80E980C: ; 80E980C
 	thumb_func_end sub_80E980C
 
 	thumb_func_start sub_80E9878
-sub_80E9878: ; 80E9878
+sub_80E9878: @ 80E9878
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -424887,7 +424887,7 @@ _080E98A6:
 	thumb_func_end sub_80E9878
 
 	thumb_func_start sub_80E98AC
-sub_80E98AC: ; 80E98AC
+sub_80E98AC: @ 80E98AC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x1A
@@ -424936,7 +424936,7 @@ sub_80E98AC: ; 80E98AC
 	thumb_func_end sub_80E98AC
 
 	thumb_func_start sub_80E9914
-sub_80E9914: ; 80E9914
+sub_80E9914: @ 80E9914
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -425113,7 +425113,7 @@ _080E9A60:
 	thumb_func_end sub_80E9914
 
 	thumb_func_start sub_80E9A90
-sub_80E9A90: ; 80E9A90
+sub_80E9A90: @ 80E9A90
 	push {r4-r6,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -425134,7 +425134,7 @@ sub_80E9A90: ; 80E9A90
 	thumb_func_end sub_80E9A90
 
 	thumb_func_start sub_80E9AC0
-sub_80E9AC0: ; 80E9AC0
+sub_80E9AC0: @ 80E9AC0
 	push {lr}
 	movs r0, 0x14
 	bl sav12_xor_increment
@@ -425144,7 +425144,7 @@ sub_80E9AC0: ; 80E9AC0
 	thumb_func_end sub_80E9AC0
 
 	thumb_func_start sub_80E9AD0
-sub_80E9AD0: ; 80E9AD0
+sub_80E9AD0: @ 80E9AD0
 	push {r4-r7,lr}
 	ldr r0, =0x02037318
 	ldr r4, [r0, 0x4]
@@ -425224,7 +425224,7 @@ _080E9B68:
 	thumb_func_end sub_80E9AD0
 
 	thumb_func_start sub_80E9B70
-sub_80E9B70: ; 80E9B70
+sub_80E9B70: @ 80E9B70
 	push {r4-r6,lr}
 	bl sub_80E9AD0
 	movs r0, 0x14
@@ -425247,7 +425247,7 @@ sub_80E9B70: ; 80E9B70
 	thumb_func_end sub_80E9B70
 
 	thumb_func_start sub_80E9BA8
-sub_80E9BA8: ; 80E9BA8
+sub_80E9BA8: @ 80E9BA8
 	push {r4,r5,lr}
 	movs r5, 0
 	movs r4, 0x1
@@ -425278,7 +425278,7 @@ _080E9BC4:
 	thumb_func_end sub_80E9BA8
 
 	thumb_func_start sub_80E9BDC
-sub_80E9BDC: ; 80E9BDC
+sub_80E9BDC: @ 80E9BDC
 	push {lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -425315,7 +425315,7 @@ _080E9C22:
 	thumb_func_end sub_80E9BDC
 
 	thumb_func_start sub_80E9C2C
-sub_80E9C2C: ; 80E9C2C
+sub_80E9C2C: @ 80E9C2C
 	push {lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -425347,7 +425347,7 @@ sub_80E9C2C: ; 80E9C2C
 	thumb_func_end sub_80E9C2C
 
 	thumb_func_start sub_80E9C74
-sub_80E9C74: ; 80E9C74
+sub_80E9C74: @ 80E9C74
 	push {lr}
 	ldr r0, =sub_8126AD8
 	movs r1, 0
@@ -425358,7 +425358,7 @@ sub_80E9C74: ; 80E9C74
 	thumb_func_end sub_80E9C74
 
 	thumb_func_start sub_80E9C88
-sub_80E9C88: ; 80E9C88
+sub_80E9C88: @ 80E9C88
 	push {lr}
 	ldr r0, =sub_80E9C9C
 	movs r1, 0
@@ -425369,7 +425369,7 @@ sub_80E9C88: ; 80E9C88
 	thumb_func_end sub_80E9C88
 
 	thumb_func_start sub_80E9C9C
-sub_80E9C9C: ; 80E9C9C
+sub_80E9C9C: @ 80E9C9C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -425428,7 +425428,7 @@ _080E9D1A:
 	thumb_func_end sub_80E9C9C
 
 	thumb_func_start game_continue
-game_continue: ; 80E9D2C
+game_continue: @ 80E9D2C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -425522,7 +425522,7 @@ _080E9DBC:
 	thumb_func_end game_continue
 
 	thumb_func_start sub_80E9DEC
-sub_80E9DEC: ; 80E9DEC
+sub_80E9DEC: @ 80E9DEC
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -425536,7 +425536,7 @@ _080E9DFC:
 	thumb_func_end sub_80E9DEC
 
 	thumb_func_start sub_80E9E00
-sub_80E9E00: ; 80E9E00
+sub_80E9E00: @ 80E9E00
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -425567,7 +425567,7 @@ sub_80E9E00: ; 80E9E00
 	thumb_func_end sub_80E9E00
 
 	thumb_func_start sub_80E9E44
-sub_80E9E44: ; 80E9E44
+sub_80E9E44: @ 80E9E44
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -425604,7 +425604,7 @@ sub_80E9E44: ; 80E9E44
 	thumb_func_end sub_80E9E44
 
 	thumb_func_start sub_80E9E90
-sub_80E9E90: ; 80E9E90
+sub_80E9E90: @ 80E9E90
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -425667,7 +425667,7 @@ _080E9F1A:
 	thumb_func_end sub_80E9E90
 
 	thumb_func_start sub_80E9F20
-sub_80E9F20: ; 80E9F20
+sub_80E9F20: @ 80E9F20
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -425727,7 +425727,7 @@ sub_80E9F20: ; 80E9F20
 	thumb_func_end sub_80E9F20
 
 	thumb_func_start sub_80E9FB0
-sub_80E9FB0: ; 80E9FB0
+sub_80E9FB0: @ 80E9FB0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -425765,7 +425765,7 @@ _080E9FF2:
 	thumb_func_end sub_80E9FB0
 
 	thumb_func_start sub_80E9FFC
-sub_80E9FFC: ; 80E9FFC
+sub_80E9FFC: @ 80E9FFC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -425807,7 +425807,7 @@ sub_80E9FFC: ; 80E9FFC
 	thumb_func_end sub_80E9FFC
 
 	thumb_func_start sub_80EA06C
-sub_80EA06C: ; 80EA06C
+sub_80EA06C: @ 80EA06C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -425823,7 +425823,7 @@ sub_80EA06C: ; 80EA06C
 	thumb_func_end sub_80EA06C
 
 	thumb_func_start sub_80EA08C
-sub_80EA08C: ; 80EA08C
+sub_80EA08C: @ 80EA08C
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -425889,7 +425889,7 @@ sub_80EA08C: ; 80EA08C
 	thumb_func_end sub_80EA08C
 
 	thumb_func_start sub_80EA120
-sub_80EA120: ; 80EA120
+sub_80EA120: @ 80EA120
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -425902,7 +425902,7 @@ sub_80EA120: ; 80EA120
 	thumb_func_end sub_80EA120
 
 	thumb_func_start sub_80EA13C
-sub_80EA13C: ; 80EA13C
+sub_80EA13C: @ 80EA13C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -425940,7 +425940,7 @@ sub_80EA13C: ; 80EA13C
 	thumb_func_end sub_80EA13C
 
 	thumb_func_start sub_80EA18C
-sub_80EA18C: ; 80EA18C
+sub_80EA18C: @ 80EA18C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -425970,7 +425970,7 @@ sub_80EA18C: ; 80EA18C
 	thumb_func_end sub_80EA18C
 
 	thumb_func_start task_pc_turn_off
-task_pc_turn_off: ; 80EA1D0
+task_pc_turn_off: @ 80EA1D0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -425996,7 +425996,7 @@ _080EA1FA:
 	thumb_func_end task_pc_turn_off
 
 	thumb_func_start sub_80EA20C
-sub_80EA20C: ; 80EA20C
+sub_80EA20C: @ 80EA20C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -426028,7 +426028,7 @@ sub_80EA20C: ; 80EA20C
 	thumb_func_end sub_80EA20C
 
 	thumb_func_start sub_80EA250
-sub_80EA250: ; 80EA250
+sub_80EA250: @ 80EA250
 	push {lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -426100,7 +426100,7 @@ _080EA2DA:
 	thumb_func_end sub_80EA250
 
 	thumb_func_start sub_80EA2E4
-sub_80EA2E4: ; 80EA2E4
+sub_80EA2E4: @ 80EA2E4
 	push {lr}
 	movs r0, 0x1
 	bl sub_813BADC
@@ -426118,7 +426118,7 @@ sub_80EA2E4: ; 80EA2E4
 	thumb_func_end sub_80EA2E4
 
 	thumb_func_start sub_80EA30C
-sub_80EA30C: ; 80EA30C
+sub_80EA30C: @ 80EA30C
 	push {lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -426149,7 +426149,7 @@ sub_80EA30C: ; 80EA30C
 	thumb_func_end sub_80EA30C
 
 	thumb_func_start sub_80EA354
-sub_80EA354: ; 80EA354
+sub_80EA354: @ 80EA354
 	push {r4-r7,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -426211,7 +426211,7 @@ _080EA39A:
 	thumb_func_end sub_80EA354
 
 	thumb_func_start sub_80EA3E4
-sub_80EA3E4: ; 80EA3E4
+sub_80EA3E4: @ 80EA3E4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -426700,7 +426700,7 @@ _080EA820:
 	thumb_func_end sub_80EA3E4
 
 	thumb_func_start sub_80EA828
-sub_80EA828: ; 80EA828
+sub_80EA828: @ 80EA828
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -426786,7 +426786,7 @@ _080EA8B8:
 	thumb_func_end sub_80EA828
 
 	thumb_func_start sub_80EA8D4
-sub_80EA8D4: ; 80EA8D4
+sub_80EA8D4: @ 80EA8D4
 	push {r4,lr}
 	movs r2, 0
 	adds r4, r0, 0
@@ -426816,7 +426816,7 @@ _080EA8FC:
 	thumb_func_end sub_80EA8D4
 
 	thumb_func_start sub_80EA904
-sub_80EA904: ; 80EA904
+sub_80EA904: @ 80EA904
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -426861,7 +426861,7 @@ _080EA948:
 	thumb_func_end sub_80EA904
 
 	thumb_func_start sub_80EA950
-sub_80EA950: ; 80EA950
+sub_80EA950: @ 80EA950
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -426896,7 +426896,7 @@ _080EA988:
 	thumb_func_end sub_80EA950
 
 	thumb_func_start sub_80EA990
-sub_80EA990: ; 80EA990
+sub_80EA990: @ 80EA990
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -426934,7 +426934,7 @@ _080EA9D0:
 	thumb_func_end sub_80EA990
 
 	thumb_func_start sub_80EA9D8
-sub_80EA9D8: ; 80EA9D8
+sub_80EA9D8: @ 80EA9D8
 	push {r4,lr}
 	movs r2, 0x1
 	ldr r0, =0x03005d8c
@@ -426970,7 +426970,7 @@ _080EAA12:
 	thumb_func_end sub_80EA9D8
 
 	thumb_func_start sub_80EAA18
-sub_80EAA18: ; 80EAA18
+sub_80EAA18: @ 80EAA18
 	push {r4,lr}
 	movs r3, 0x1
 	ldr r0, =0x03005d8c
@@ -427011,7 +427011,7 @@ _080EAA5C:
 	thumb_func_end sub_80EAA18
 
 	thumb_func_start sub_80EAA64
-sub_80EAA64: ; 80EAA64
+sub_80EAA64: @ 80EAA64
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -427084,7 +427084,7 @@ _080EAAEE:
 	thumb_func_end sub_80EAA64
 
 	thumb_func_start sub_80EAAF4
-sub_80EAAF4: ; 80EAAF4
+sub_80EAAF4: @ 80EAAF4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -427176,7 +427176,7 @@ _080EAB84:
 	thumb_func_end sub_80EAAF4
 
 	thumb_func_start sub_80EABA4
-sub_80EABA4: ; 80EABA4
+sub_80EABA4: @ 80EABA4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -427208,7 +427208,7 @@ _080EABCA:
 	thumb_func_end sub_80EABA4
 
 	thumb_func_start sub_80EABDC
-sub_80EABDC: ; 80EABDC
+sub_80EABDC: @ 80EABDC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrb r0, [r5]
@@ -427282,7 +427282,7 @@ _080EAC56:
 	thumb_func_end sub_80EABDC
 
 	thumb_func_start sub_80EAC5C
-sub_80EAC5C: ; 80EAC5C
+sub_80EAC5C: @ 80EAC5C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -427376,7 +427376,7 @@ _080EAD04:
 	thumb_func_end sub_80EAC5C
 
 	thumb_func_start sub_80EAD14
-sub_80EAD14: ; 80EAD14
+sub_80EAD14: @ 80EAD14
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -427446,7 +427446,7 @@ _080EAD8A:
 	thumb_func_end sub_80EAD14
 
 	thumb_func_start sub_80EAD94
-sub_80EAD94: ; 80EAD94
+sub_80EAD94: @ 80EAD94
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -427577,7 +427577,7 @@ _080EAE78:
 	thumb_func_end sub_80EAD94
 
 	thumb_func_start sub_80EAE90
-sub_80EAE90: ; 80EAE90
+sub_80EAE90: @ 80EAE90
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -427598,7 +427598,7 @@ _080EAEAE:
 	thumb_func_end sub_80EAE90
 
 	thumb_func_start sub_80EAEB4
-sub_80EAEB4: ; 80EAEB4
+sub_80EAEB4: @ 80EAEB4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -427632,7 +427632,7 @@ _080EAEBA:
 	thumb_func_end sub_80EAEB4
 
 	thumb_func_start sub_80EAEF4
-sub_80EAEF4: ; 80EAEF4
+sub_80EAEF4: @ 80EAEF4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r0, [r4]
@@ -427690,7 +427690,7 @@ sub_80EAEF4: ; 80EAEF4
 	thumb_func_end sub_80EAEF4
 
 	thumb_func_start sub_80EAF80
-sub_80EAF80: ; 80EAF80
+sub_80EAF80: @ 80EAF80
 	push {r4-r7,lr}
 	sub sp, 0x24
 	adds r6, r0, 0
@@ -427950,7 +427950,7 @@ _080EB16A:
 	thumb_func_end sub_80EAF80
 
 	thumb_func_start sub_80EB18C
-sub_80EB18C: ; 80EB18C
+sub_80EB18C: @ 80EB18C
 	push {r4,r5,lr}
 	movs r5, 0
 	adds r4, r0, 0
@@ -427971,7 +427971,7 @@ _080EB19E:
 	thumb_func_end sub_80EB18C
 
 	thumb_func_start sub_80EB1AC
-sub_80EB1AC: ; 80EB1AC
+sub_80EB1AC: @ 80EB1AC
 	push {lr}
 	ldr r0, =0x000040ec
 	movs r1, 0
@@ -428009,7 +428009,7 @@ _080EB204:
 	thumb_func_end sub_80EB1AC
 
 	thumb_func_start sub_80EB218
-sub_80EB218: ; 80EB218
+sub_80EB218: @ 80EB218
 	push {r4-r6,lr}
 	ldr r5, =0x000040f0
 	adds r0, r5, 0
@@ -428054,7 +428054,7 @@ _080EB272:
 	thumb_func_end sub_80EB218
 
 	thumb_func_start sub_80EB290
-sub_80EB290: ; 80EB290
+sub_80EB290: @ 80EB290
 	push {r4,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428081,7 +428081,7 @@ _080EB2BA:
 	thumb_func_end sub_80EB290
 
 	thumb_func_start sub_80EB2C8
-sub_80EB2C8: ; 80EB2C8
+sub_80EB2C8: @ 80EB2C8
 	push {r4,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428108,7 +428108,7 @@ _080EB2F2:
 	thumb_func_end sub_80EB2C8
 
 	thumb_func_start sub_80EB300
-sub_80EB300: ; 80EB300
+sub_80EB300: @ 80EB300
 	push {r4,r5,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428148,7 +428148,7 @@ _080EB34C:
 	thumb_func_end sub_80EB300
 
 	thumb_func_start sub_80EB368
-sub_80EB368: ; 80EB368
+sub_80EB368: @ 80EB368
 	push {r4,r5,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428188,7 +428188,7 @@ _080EB3B4:
 	thumb_func_end sub_80EB368
 
 	thumb_func_start sub_80EB3D0
-sub_80EB3D0: ; 80EB3D0
+sub_80EB3D0: @ 80EB3D0
 	push {r4,r5,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428228,7 +428228,7 @@ _080EB41C:
 	thumb_func_end sub_80EB3D0
 
 	thumb_func_start sub_80EB438
-sub_80EB438: ; 80EB438
+sub_80EB438: @ 80EB438
 	push {r4,lr}
 	ldr r0, =0x00004054
 	bl VarGet
@@ -428266,7 +428266,7 @@ _080EB480:
 	thumb_func_end sub_80EB438
 
 	thumb_func_start sub_80EB498
-sub_80EB498: ; 80EB498
+sub_80EB498: @ 80EB498
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -428344,7 +428344,7 @@ _080EB55C:
 	thumb_func_end sub_80EB498
 
 	thumb_func_start sub_80EB56C
-sub_80EB56C: ; 80EB56C
+sub_80EB56C: @ 80EB56C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -428678,7 +428678,7 @@ _080EB9D0:
 	thumb_func_end sub_80EB56C
 
 	thumb_func_start sub_80EB9E0
-sub_80EB9E0: ; 80EB9E0
+sub_80EB9E0: @ 80EB9E0
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -428785,7 +428785,7 @@ _080EBB18:
 	thumb_func_end sub_80EB9E0
 
 	thumb_func_start sub_80EBB28
-sub_80EBB28: ; 80EBB28
+sub_80EBB28: @ 80EBB28
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -429035,7 +429035,7 @@ _080EBE6C:
 	thumb_func_end sub_80EBB28
 
 	thumb_func_start sub_80EBE7C
-sub_80EBE7C: ; 80EBE7C
+sub_80EBE7C: @ 80EBE7C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -429080,7 +429080,7 @@ _080EBECC:
 	thumb_func_end sub_80EBE7C
 
 	thumb_func_start sub_80EBEE0
-sub_80EBEE0: ; 80EBEE0
+sub_80EBEE0: @ 80EBEE0
 	push {r4-r7,lr}
 	movs r3, 0
 	ldr r6, =0x03005d8c
@@ -429126,7 +429126,7 @@ _080EBF0A:
 	thumb_func_end sub_80EBEE0
 
 	thumb_func_start special_0x44
-special_0x44: ; 80EBF3C
+special_0x44: @ 80EBF3C
 	push {r4-r7,lr}
 	movs r4, 0x5
 	ldr r1, =0x03005d8c
@@ -429220,7 +429220,7 @@ _080EBFEC:
 	thumb_func_end special_0x44
 
 	thumb_func_start sub_80EBFF4
-sub_80EBFF4: ; 80EBFF4
+sub_80EBFF4: @ 80EBFF4
 	push {lr}
 	bl special_0x44
 	lsls r0, 24
@@ -429259,8 +429259,8 @@ _080EC03E:
 	thumb_func_end sub_80EBFF4
 
 	thumb_func_start UpdateTVScreensOnMap
-; void UpdateTVScreensOnMap(s32 mapWidth, s32 mapHeight)
-UpdateTVScreensOnMap: ; 80EC044
+@ void UpdateTVScreensOnMap(s32 mapWidth, s32 mapHeight)
+UpdateTVScreensOnMap: @ 80EC044
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -429320,8 +429320,8 @@ _080EC0BE:
 	thumb_func_end UpdateTVScreensOnMap
 
 	thumb_func_start SetTVMetatilesOnMap
-; void SetTVMetatilesOnMap(s32 mapWidth, s32 mapHeight, u16 metatileId)
-SetTVMetatilesOnMap: ; 80EC0CC
+@ void SetTVMetatilesOnMap(s32 mapWidth, s32 mapHeight, u16 metatileId)
+SetTVMetatilesOnMap: @ 80EC0CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -429377,7 +429377,7 @@ _080EC120:
 	thumb_func_end SetTVMetatilesOnMap
 
 	thumb_func_start TurnOffTVScreen
-TurnOffTVScreen: ; 80EC130
+TurnOffTVScreen: @ 80EC130
 	push {lr}
 	ldr r1, =0x03005dc0
 	ldr r0, [r1]
@@ -429391,7 +429391,7 @@ TurnOffTVScreen: ; 80EC130
 	thumb_func_end TurnOffTVScreen
 
 	thumb_func_start TurnOnTVScreen
-TurnOnTVScreen: ; 80EC14C
+TurnOnTVScreen: @ 80EC14C
 	push {lr}
 	ldr r1, =0x03005dc0
 	ldr r0, [r1]
@@ -429405,7 +429405,7 @@ TurnOnTVScreen: ; 80EC14C
 	thumb_func_end TurnOnTVScreen
 
 	thumb_func_start special_0x45
-special_0x45: ; 80EC168
+special_0x45: @ 80EC168
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x020375e0
@@ -429422,7 +429422,7 @@ special_0x45: ; 80EC168
 	thumb_func_end special_0x45
 
 	thumb_func_start sub_80EC18C
-sub_80EC18C: ; 80EC18C
+sub_80EC18C: @ 80EC18C
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x03005d8c
@@ -429461,7 +429461,7 @@ _080EC1CC:
 	thumb_func_end sub_80EC18C
 
 	thumb_func_start special_0x4a
-special_0x4a: ; 80EC1D4
+special_0x4a: @ 80EC1D4
 	push {lr}
 	ldr r3, =0x03005d8c
 	ldr r2, =0x020375e0
@@ -429494,7 +429494,7 @@ _080EC216:
 	thumb_func_end special_0x4a
 
 	thumb_func_start GabbyAndTyNewGameInitData
-GabbyAndTyNewGameInitData: ; 80EC21C
+GabbyAndTyNewGameInitData: @ 80EC21C
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -429612,7 +429612,7 @@ GabbyAndTyNewGameInitData: ; 80EC21C
 	thumb_func_end GabbyAndTyNewGameInitData
 
 	thumb_func_start GabbyAndTyBeforeInterview
-GabbyAndTyBeforeInterview: ; 80EC31C
+GabbyAndTyBeforeInterview: @ 80EC31C
 	push {r4,lr}
 	ldr r3, =0x03005d8c
 	ldr r2, [r3]
@@ -429756,7 +429756,7 @@ _080EC436:
 	thumb_func_end GabbyAndTyBeforeInterview
 
 	thumb_func_start GabbyAndTyAfterInterview
-GabbyAndTyAfterInterview: ; 80EC448
+GabbyAndTyAfterInterview: @ 80EC448
 	push {r4-r6,lr}
 	ldr r5, =0x03005d8c
 	ldr r2, [r5]
@@ -429830,7 +429830,7 @@ GabbyAndTyAfterInterview: ; 80EC448
 	thumb_func_end GabbyAndTyAfterInterview
 
 	thumb_func_start TakeTVShowInSearchOfTrainersOffTheAir
-TakeTVShowInSearchOfTrainersOffTheAir: ; 80EC4E8
+TakeTVShowInSearchOfTrainersOffTheAir: @ 80EC4E8
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x00002bae
@@ -429845,7 +429845,7 @@ TakeTVShowInSearchOfTrainersOffTheAir: ; 80EC4E8
 	thumb_func_end TakeTVShowInSearchOfTrainersOffTheAir
 
 	thumb_func_start GabbyAndTyGetBattleNum
-GabbyAndTyGetBattleNum: ; 80EC504
+GabbyAndTyGetBattleNum: @ 80EC504
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -429867,7 +429867,7 @@ _080EC522:
 	thumb_func_end GabbyAndTyGetBattleNum
 
 	thumb_func_start IsTVShowInSearchOfTrainersAiring
-IsTVShowInSearchOfTrainersAiring: ; 80EC530
+IsTVShowInSearchOfTrainersAiring: @ 80EC530
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002bae
@@ -429880,7 +429880,7 @@ IsTVShowInSearchOfTrainersAiring: ; 80EC530
 	thumb_func_end IsTVShowInSearchOfTrainersAiring
 
 	thumb_func_start GabbyAndTyGetLastQuote
-GabbyAndTyGetLastQuote: ; 80EC548
+GabbyAndTyGetLastQuote: @ 80EC548
 	push {r4,r5,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -429912,7 +429912,7 @@ _080EC586:
 	thumb_func_end GabbyAndTyGetLastQuote
 
 	thumb_func_start GabbyAndTyGetLastBattleTrivia
-GabbyAndTyGetLastBattleTrivia: ; 80EC58C
+GabbyAndTyGetLastBattleTrivia: @ 80EC58C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -429955,7 +429955,7 @@ _080EC5D2:
 	thumb_func_end GabbyAndTyGetLastBattleTrivia
 
 	thumb_func_start GabbyAndTySetScriptVarsToFieldObjectLocalIds
-GabbyAndTySetScriptVarsToFieldObjectLocalIds: ; 80EC5D8
+GabbyAndTySetScriptVarsToFieldObjectLocalIds: @ 80EC5D8
 	push {lr}
 	bl GabbyAndTyGetBattleNum
 	lsls r0, 24
@@ -430050,7 +430050,7 @@ _080EC6B0:
 	thumb_func_end GabbyAndTySetScriptVarsToFieldObjectLocalIds
 
 	thumb_func_start InterviewAfter
-InterviewAfter: ; 80EC6BC
+InterviewAfter: @ 80EC6BC
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrh r0, [r0]
@@ -430099,7 +430099,7 @@ _080EC724:
 	thumb_func_end InterviewAfter
 
 	thumb_func_start sub_80EC728
-sub_80EC728: ; 80EC728
+sub_80EC728: @ 80EC728
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -430268,7 +430268,7 @@ _080EC888:
 	thumb_func_end sub_80EC728
 
 	thumb_func_start sub_80EC8A4
-sub_80EC8A4: ; 80EC8A4
+sub_80EC8A4: @ 80EC8A4
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -430305,7 +430305,7 @@ _080EC8CA:
 	thumb_func_end sub_80EC8A4
 
 	thumb_func_start sub_80EC8FC
-sub_80EC8FC: ; 80EC8FC
+sub_80EC8FC: @ 80EC8FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -430406,7 +430406,7 @@ _080EC9B4:
 	thumb_func_end sub_80EC8FC
 
 	thumb_func_start sub_80EC9E8
-sub_80EC9E8: ; 80EC9E8
+sub_80EC9E8: @ 80EC9E8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80F0020
@@ -430429,7 +430429,7 @@ sub_80EC9E8: ; 80EC9E8
 	thumb_func_end sub_80EC9E8
 
 	thumb_func_start sub_80ECA10
-sub_80ECA10: ; 80ECA10
+sub_80ECA10: @ 80ECA10
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80F0020
@@ -430451,7 +430451,7 @@ sub_80ECA10: ; 80ECA10
 	thumb_func_end sub_80ECA10
 
 	thumb_func_start sub_80ECA38
-sub_80ECA38: ; 80ECA38
+sub_80ECA38: @ 80ECA38
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -430532,7 +430532,7 @@ _080ECACE:
 	thumb_func_end sub_80ECA38
 
 	thumb_func_start sub_80ECB00
-sub_80ECB00: ; 80ECB00
+sub_80ECB00: @ 80ECB00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -430650,7 +430650,7 @@ _080ECBEC:
 	thumb_func_end sub_80ECB00
 
 	thumb_func_start sub_80ECC04
-sub_80ECC04: ; 80ECC04
+sub_80ECC04: @ 80ECC04
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -430767,7 +430767,7 @@ _080ECCEE:
 	thumb_func_end sub_80ECC04
 
 	thumb_func_start sub_80ECD00
-sub_80ECD00: ; 80ECD00
+sub_80ECD00: @ 80ECD00
 	push {r4-r6,lr}
 	sub sp, 0x20
 	ldr r6, =0x03005d8c
@@ -430834,7 +430834,7 @@ _080ECD9A:
 	thumb_func_end sub_80ECD00
 
 	thumb_func_start sub_80ECDA4
-sub_80ECDA4: ; 80ECDA4
+sub_80ECDA4: @ 80ECDA4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -430869,7 +430869,7 @@ _080ECDDC:
 	thumb_func_end sub_80ECDA4
 
 	thumb_func_start sub_80ECDF4
-sub_80ECDF4: ; 80ECDF4
+sub_80ECDF4: @ 80ECDF4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -430897,7 +430897,7 @@ _080ECE1C:
 	thumb_func_end sub_80ECDF4
 
 	thumb_func_start sub_80ECE34
-sub_80ECE34: ; 80ECE34
+sub_80ECE34: @ 80ECE34
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -430925,7 +430925,7 @@ _080ECE5C:
 	thumb_func_end sub_80ECE34
 
 	thumb_func_start sub_80ECE74
-sub_80ECE74: ; 80ECE74
+sub_80ECE74: @ 80ECE74
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -430953,7 +430953,7 @@ _080ECE9C:
 	thumb_func_end sub_80ECE74
 
 	thumb_func_start sub_80ECEB4
-sub_80ECEB4: ; 80ECEB4
+sub_80ECEB4: @ 80ECEB4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -431022,7 +431022,7 @@ _080ECF4C:
 	thumb_func_end sub_80ECEB4
 
 	thumb_func_start sub_80ECF5C
-sub_80ECF5C: ; 80ECF5C
+sub_80ECF5C: @ 80ECF5C
 	push {r4-r7,lr}
 	ldr r0, =0x03005d8c
 	ldr r6, [r0]
@@ -431120,7 +431120,7 @@ _080ED02C:
 	thumb_func_end sub_80ECF5C
 
 	thumb_func_start sub_80ED03C
-sub_80ED03C: ; 80ED03C
+sub_80ED03C: @ 80ED03C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -431157,7 +431157,7 @@ _080ED07A:
 	thumb_func_end sub_80ED03C
 
 	thumb_func_start sub_80ED090
-sub_80ED090: ; 80ED090
+sub_80ED090: @ 80ED090
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -431245,7 +431245,7 @@ _080ED134:
 	thumb_func_end sub_80ED090
 
 	thumb_func_start sub_80ED164
-sub_80ED164: ; 80ED164
+sub_80ED164: @ 80ED164
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x030060bc
@@ -431332,8 +431332,8 @@ _080ED21E:
 	thumb_func_end sub_80ED164
 
 	thumb_func_start SaveRecordedItemPurchasesForTVShow
-; void SaveRecordedItemPurchasesForTVShow()
-SaveRecordedItemPurchasesForTVShow: ; 80ED238
+@ void SaveRecordedItemPurchasesForTVShow()
+SaveRecordedItemPurchasesForTVShow: @ 80ED238
 	push {r4-r7,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -431429,7 +431429,7 @@ _080ED2F2:
 	thumb_func_end SaveRecordedItemPurchasesForTVShow
 
 	thumb_func_start sub_80ED320
-sub_80ED320: ; 80ED320
+sub_80ED320: @ 80ED320
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -431539,7 +431539,7 @@ _080ED400:
 	thumb_func_end sub_80ED320
 
 	thumb_func_start StartMassOutbreak
-StartMassOutbreak: ; 80ED430
+StartMassOutbreak: @ 80ED430
 	push {r4,r5,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -431616,7 +431616,7 @@ StartMassOutbreak: ; 80ED430
 	thumb_func_end StartMassOutbreak
 
 	thumb_func_start sub_80ED4DC
-sub_80ED4DC: ; 80ED4DC
+sub_80ED4DC: @ 80ED4DC
 	push {r4,lr}
 	bl sub_80EFA88
 	ldr r0, =0x020375f0
@@ -431662,7 +431662,7 @@ _080ED532:
 	thumb_func_end sub_80ED4DC
 
 	thumb_func_start sub_80ED548
-sub_80ED548: ; 80ED548
+sub_80ED548: @ 80ED548
 	push {r4,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x030060bc
@@ -431706,7 +431706,7 @@ sub_80ED548: ; 80ED548
 	thumb_func_end sub_80ED548
 
 	thumb_func_start sub_80ED5B8
-sub_80ED5B8: ; 80ED5B8
+sub_80ED5B8: @ 80ED5B8
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x030060bc
@@ -431742,7 +431742,7 @@ sub_80ED5B8: ; 80ED5B8
 	thumb_func_end sub_80ED5B8
 
 	thumb_func_start sub_80ED610
-sub_80ED610: ; 80ED610
+sub_80ED610: @ 80ED610
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -431852,12 +431852,12 @@ _080ED706:
 	thumb_func_end sub_80ED610
 
 	thumb_func_start nullsub_45
-nullsub_45: ; 80ED714
+nullsub_45: @ 80ED714
 	bx lr
 	thumb_func_end nullsub_45
 
 	thumb_func_start sub_80ED718
-sub_80ED718: ; 80ED718
+sub_80ED718: @ 80ED718
 	push {r4-r6,lr}
 	ldr r0, =0x00000864
 	bl FlagGet
@@ -431963,7 +431963,7 @@ _080ED7E4:
 	thumb_func_end sub_80ED718
 
 	thumb_func_start EndMassOutbreak
-EndMassOutbreak: ; 80ED808
+EndMassOutbreak: @ 80ED808
 	push {r4,r5,lr}
 	ldr r3, =0x03005d8c
 	ldr r0, [r3]
@@ -432021,7 +432021,7 @@ EndMassOutbreak: ; 80ED808
 	thumb_func_end EndMassOutbreak
 
 	thumb_func_start sub_80ED888
-sub_80ED888: ; 80ED888
+sub_80ED888: @ 80ED888
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -432042,7 +432042,7 @@ sub_80ED888: ; 80ED888
 	thumb_func_end sub_80ED888
 
 	thumb_func_start sub_80ED8B4
-sub_80ED8B4: ; 80ED8B4
+sub_80ED8B4: @ 80ED8B4
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -432098,7 +432098,7 @@ _080ED91C:
 	thumb_func_end sub_80ED8B4
 
 	thumb_func_start UpdateMassOutbreakTimeLeft
-UpdateMassOutbreakTimeLeft: ; 80ED924
+UpdateMassOutbreakTimeLeft: @ 80ED924
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -432121,7 +432121,7 @@ _080ED94C:
 	thumb_func_end UpdateMassOutbreakTimeLeft
 
 	thumb_func_start sub_80ED950
-sub_80ED950: ; 80ED950
+sub_80ED950: @ 80ED950
 	push {r4,lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -432168,7 +432168,7 @@ _080ED99C:
 	thumb_func_end sub_80ED950
 
 	thumb_func_start sub_80ED9A8
-sub_80ED9A8: ; 80ED9A8
+sub_80ED9A8: @ 80ED9A8
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r0, [r6]
@@ -432229,7 +432229,7 @@ _080EDA18:
 	thumb_func_end sub_80ED9A8
 
 	thumb_func_start sub_80EDA3C
-sub_80EDA3C: ; 80EDA3C
+sub_80EDA3C: @ 80EDA3C
 	ldr r1, =0x0203a024
 	strh r0, [r1]
 	bx lr
@@ -432237,7 +432237,7 @@ sub_80EDA3C: ; 80EDA3C
 	thumb_func_end sub_80EDA3C
 
 	thumb_func_start sub_80EDA48
-sub_80EDA48: ; 80EDA48
+sub_80EDA48: @ 80EDA48
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -432264,7 +432264,7 @@ _080EDA6E:
 	thumb_func_end sub_80EDA48
 
 	thumb_func_start sub_80EDA80
-sub_80EDA80: ; 80EDA80
+sub_80EDA80: @ 80EDA80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -432346,7 +432346,7 @@ _080EDB1C:
 	thumb_func_end sub_80EDA80
 
 	thumb_func_start sub_80EDB44
-sub_80EDB44: ; 80EDB44
+sub_80EDB44: @ 80EDB44
 	push {r4-r7,lr}
 	movs r0, 0x1A
 	movs r1, 0x1
@@ -432468,7 +432468,7 @@ _080EDC40:
 	thumb_func_end sub_80EDB44
 
 	thumb_func_start sub_80EDC60
-sub_80EDC60: ; 80EDC60
+sub_80EDC60: @ 80EDC60
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r7, =0x03005d8c
@@ -432528,7 +432528,7 @@ _080EDCCE:
 	thumb_func_end sub_80EDC60
 
 	thumb_func_start sub_80EDCE8
-sub_80EDCE8: ; 80EDCE8
+sub_80EDCE8: @ 80EDCE8
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r0, [r6]
@@ -432588,7 +432588,7 @@ _080EDD56:
 	thumb_func_end sub_80EDCE8
 
 	thumb_func_start sub_80EDD78
-sub_80EDD78: ; 80EDD78
+sub_80EDD78: @ 80EDD78
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -432699,7 +432699,7 @@ _080EDE54:
 	thumb_func_end sub_80EDD78
 
 	thumb_func_start sub_80EDE70
-sub_80EDE70: ; 80EDE70
+sub_80EDE70: @ 80EDE70
 	ldr r2, =0x0203a02a
 	movs r1, 0
 	strb r1, [r2]
@@ -432710,7 +432710,7 @@ sub_80EDE70: ; 80EDE70
 	thumb_func_end sub_80EDE70
 
 	thumb_func_start sub_80EDE84
-sub_80EDE84: ; 80EDE84
+sub_80EDE84: @ 80EDE84
 	ldr r2, =0x0203a02a
 	movs r1, 0x1
 	strb r1, [r2]
@@ -432721,7 +432721,7 @@ sub_80EDE84: ; 80EDE84
 	thumb_func_end sub_80EDE84
 
 	thumb_func_start sub_80EDE98
-sub_80EDE98: ; 80EDE98
+sub_80EDE98: @ 80EDE98
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -432868,7 +432868,7 @@ _080EDFA4:
 	thumb_func_end sub_80EDE98
 
 	thumb_func_start sub_80EDFB4
-sub_80EDFB4: ; 80EDFB4
+sub_80EDFB4: @ 80EDFB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -433030,7 +433030,7 @@ _080EE0BE:
 	thumb_func_end sub_80EDFB4
 
 	thumb_func_start sub_80EE104
-sub_80EE104: ; 80EE104
+sub_80EE104: @ 80EE104
 	push {r4,lr}
 	movs r0, 0x1F
 	movs r1, 0x1
@@ -433083,7 +433083,7 @@ _080EE168:
 	thumb_func_end sub_80EE104
 
 	thumb_func_start sub_80EE184
-sub_80EE184: ; 80EE184
+sub_80EE184: @ 80EE184
 	push {r4-r7,lr}
 	ldr r6, =0x03005d8c
 	ldr r0, [r6]
@@ -433238,7 +433238,7 @@ _080EE2C2:
 	thumb_func_end sub_80EE184
 
 	thumb_func_start sub_80EE2CC
-sub_80EE2CC: ; 80EE2CC
+sub_80EE2CC: @ 80EE2CC
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r0, [r6]
@@ -433298,7 +433298,7 @@ _080EE33A:
 	thumb_func_end sub_80EE2CC
 
 	thumb_func_start sub_80EE35C
-sub_80EE35C: ; 80EE35C
+sub_80EE35C: @ 80EE35C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -433411,7 +433411,7 @@ _080EE426:
 	thumb_func_end sub_80EE35C
 
 	thumb_func_start sub_80EE44C
-sub_80EE44C: ; 80EE44C
+sub_80EE44C: @ 80EE44C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -433475,7 +433475,7 @@ _080EE4BE:
 	thumb_func_end sub_80EE44C
 
 	thumb_func_start sub_80EE4DC
-sub_80EE4DC: ; 80EE4DC
+sub_80EE4DC: @ 80EE4DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -433564,7 +433564,7 @@ _080EE59A:
 	thumb_func_end sub_80EE4DC
 
 	thumb_func_start sub_80EE5A4
-sub_80EE5A4: ; 80EE5A4
+sub_80EE5A4: @ 80EE5A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x32
@@ -433675,7 +433675,7 @@ sub_80EE5A4: ; 80EE5A4
 	thumb_func_end sub_80EE5A4
 
 	thumb_func_start sub_80EE69C
-sub_80EE69C: ; 80EE69C
+sub_80EE69C: @ 80EE69C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -433769,7 +433769,7 @@ _080EE728:
 	thumb_func_end sub_80EE69C
 
 	thumb_func_start sub_80EE72C
-sub_80EE72C: ; 80EE72C
+sub_80EE72C: @ 80EE72C
 	push {r4-r6,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -433830,7 +433830,7 @@ _080EE79C:
 	thumb_func_end sub_80EE72C
 
 	thumb_func_start sub_80EE7C0
-sub_80EE7C0: ; 80EE7C0
+sub_80EE7C0: @ 80EE7C0
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -433869,7 +433869,7 @@ _080EE812:
 	thumb_func_end sub_80EE7C0
 
 	thumb_func_start sub_80EE818
-sub_80EE818: ; 80EE818
+sub_80EE818: @ 80EE818
 	push {r4-r7,lr}
 	movs r0, 0x24
 	movs r1, 0
@@ -433953,7 +433953,7 @@ _080EE8C2:
 	thumb_func_end sub_80EE818
 
 	thumb_func_start sub_80EE8C8
-sub_80EE8C8: ; 80EE8C8
+sub_80EE8C8: @ 80EE8C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -434133,7 +434133,7 @@ _080EEA52:
 	thumb_func_end sub_80EE8C8
 
 	thumb_func_start sub_80EEA70
-sub_80EEA70: ; 80EEA70
+sub_80EEA70: @ 80EEA70
 	push {r4-r7,lr}
 	sub sp, 0x20
 	movs r0, 0x26
@@ -434251,7 +434251,7 @@ _080EEB8C:
 	thumb_func_end sub_80EEA70
 
 	thumb_func_start sub_80EEB98
-sub_80EEB98: ; 80EEB98
+sub_80EEB98: @ 80EEB98
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r6, =gUnknown_0858D0EC
@@ -434298,7 +434298,7 @@ _080EEBD2:
 	thumb_func_end sub_80EEB98
 
 	thumb_func_start sub_80EEBF4
-sub_80EEBF4: ; 80EEBF4
+sub_80EEBF4: @ 80EEBF4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -434356,7 +434356,7 @@ _080EEC60:
 	thumb_func_end sub_80EEBF4
 
 	thumb_func_start sub_80EEC80
-sub_80EEC80: ; 80EEC80
+sub_80EEC80: @ 80EEC80
 	push {r4,lr}
 	ldr r4, =0x000040e6
 	adds r0, r4, 0
@@ -434374,7 +434374,7 @@ sub_80EEC80: ; 80EEC80
 	thumb_func_end sub_80EEC80
 
 	thumb_func_start sub_80EECA4
-sub_80EECA4: ; 80EECA4
+sub_80EECA4: @ 80EECA4
 	push {r4,lr}
 	ldr r4, =0x000040eb
 	adds r0, r4, 0
@@ -434392,7 +434392,7 @@ sub_80EECA4: ; 80EECA4
 	thumb_func_end sub_80EECA4
 
 	thumb_func_start sub_80EECC8
-sub_80EECC8: ; 80EECC8
+sub_80EECC8: @ 80EECC8
 	push {r4,lr}
 	ldr r4, =0x000040e7
 	adds r0, r4, 0
@@ -434410,7 +434410,7 @@ sub_80EECC8: ; 80EECC8
 	thumb_func_end sub_80EECC8
 
 	thumb_func_start sub_80EECEC
-sub_80EECEC: ; 80EECEC
+sub_80EECEC: @ 80EECEC
 	push {r4,lr}
 	ldr r4, =0x000040e8
 	adds r0, r4, 0
@@ -434428,7 +434428,7 @@ sub_80EECEC: ; 80EECEC
 	thumb_func_end sub_80EECEC
 
 	thumb_func_start sub_80EED10
-sub_80EED10: ; 80EED10
+sub_80EED10: @ 80EED10
 	push {r4,lr}
 	ldr r4, =0x000040e9
 	adds r0, r4, 0
@@ -434446,7 +434446,7 @@ sub_80EED10: ; 80EED10
 	thumb_func_end sub_80EED10
 
 	thumb_func_start sub_80EED34
-sub_80EED34: ; 80EED34
+sub_80EED34: @ 80EED34
 	push {r4,lr}
 	ldr r4, =0x000040ea
 	adds r0, r4, 0
@@ -434466,7 +434466,7 @@ sub_80EED34: ; 80EED34
 	thumb_func_end sub_80EED34
 
 	thumb_func_start sub_80EED60
-sub_80EED60: ; 80EED60
+sub_80EED60: @ 80EED60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -434487,7 +434487,7 @@ sub_80EED60: ; 80EED60
 	thumb_func_end sub_80EED60
 
 	thumb_func_start sub_80EED88
-sub_80EED88: ; 80EED88
+sub_80EED88: @ 80EED88
 	push {r4-r7,lr}
 	ldr r0, =0x00000864
 	bl FlagGet
@@ -434557,7 +434557,7 @@ _080EEE0C:
 	thumb_func_end sub_80EED88
 
 	thumb_func_start sub_80EEE30
-sub_80EEE30: ; 80EEE30
+sub_80EEE30: @ 80EEE30
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -434586,7 +434586,7 @@ _080EEE58:
 	thumb_func_end sub_80EEE30
 
 	thumb_func_start sub_80EEE5C
-sub_80EEE5C: ; 80EEE5C
+sub_80EEE5C: @ 80EEE5C
 	push {r4,lr}
 	movs r4, 0
 _080EEE60:
@@ -434603,7 +434603,7 @@ _080EEE60:
 	thumb_func_end sub_80EEE5C
 
 	thumb_func_start sub_80EEE78
-sub_80EEE78: ; 80EEE78
+sub_80EEE78: @ 80EEE78
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =0x03005d8c
@@ -434631,7 +434631,7 @@ sub_80EEE78: ; 80EEE78
 	thumb_func_end sub_80EEE78
 
 	thumb_func_start sub_80EEEB8
-sub_80EEEB8: ; 80EEEB8
+sub_80EEEB8: @ 80EEEB8
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r6, =0x03005d8c
@@ -434685,7 +434685,7 @@ _080EEF12:
 	thumb_func_end sub_80EEEB8
 
 	thumb_func_start sub_80EEF20
-sub_80EEF20: ; 80EEF20
+sub_80EEF20: @ 80EEF20
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x03005d8c
@@ -434725,7 +434725,7 @@ _080EEF64:
 	thumb_func_end sub_80EEF20
 
 	thumb_func_start sub_80EEF6C
-sub_80EEF6C: ; 80EEF6C
+sub_80EEF6C: @ 80EEF6C
 	push {r4,r5,lr}
 	bl sub_80EEF20
 	lsls r0, 24
@@ -434810,7 +434810,7 @@ _080EF01A:
 	thumb_func_end sub_80EEF6C
 
 	thumb_func_start GetPriceReduction
-GetPriceReduction: ; 80EF038
+GetPriceReduction: @ 80EF038
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -434859,7 +434859,7 @@ _080EF08C:
 	thumb_func_end GetPriceReduction
 
 	thumb_func_start IsPriceDiscounted
-IsPriceDiscounted: ; 80EF094
+IsPriceDiscounted: @ 80EF094
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -434900,7 +434900,7 @@ _080EF0D6:
 	thumb_func_end IsPriceDiscounted
 
 	thumb_func_start sub_80EF0E4
-sub_80EF0E4: ; 80EF0E4
+sub_80EF0E4: @ 80EF0E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -434935,7 +434935,7 @@ _080EF112:
 	thumb_func_end sub_80EF0E4
 
 	thumb_func_start sub_80EF120
-sub_80EF120: ; 80EF120
+sub_80EF120: @ 80EF120
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -435006,7 +435006,7 @@ _080EF196:
 	thumb_func_end sub_80EF120
 
 	thumb_func_start sub_80EF1BC
-sub_80EF1BC: ; 80EF1BC
+sub_80EF1BC: @ 80EF1BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -435071,8 +435071,8 @@ _080EF244:
 	thumb_func_end sub_80EF1BC
 
 	thumb_func_start CopyContestCategoryToStringVar
-; void CopyContestCategoryToStringVar(u8 stringVarIndex, u8 contestCategoryId)
-CopyContestCategoryToStringVar: ; 80EF250
+@ void CopyContestCategoryToStringVar(u8 stringVarIndex, u8 contestCategoryId)
+CopyContestCategoryToStringVar: @ 80EF250
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -435148,8 +435148,8 @@ _080EF300:
 	thumb_func_end CopyContestCategoryToStringVar
 
 	thumb_func_start SetContestCategoryStringVarForInterview
-; void SetContestCategoryStringVarForInterview()
-SetContestCategoryStringVarForInterview: ; 80EF30C
+@ void SetContestCategoryStringVarForInterview()
+SetContestCategoryStringVarForInterview: @ 80EF30C
 	push {lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -435172,7 +435172,7 @@ SetContestCategoryStringVarForInterview: ; 80EF30C
 	thumb_func_end SetContestCategoryStringVarForInterview
 
 	thumb_func_start sub_80EF340
-sub_80EF340: ; 80EF340
+sub_80EF340: @ 80EF340
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -435197,7 +435197,7 @@ sub_80EF340: ; 80EF340
 	thumb_func_end sub_80EF340
 
 	thumb_func_start sub_80EF370
-sub_80EF370: ; 80EF370
+sub_80EF370: @ 80EF370
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xA
@@ -435275,7 +435275,7 @@ _080EF406:
 	thumb_func_end sub_80EF370
 
 	thumb_func_start sub_80EF40C
-sub_80EF40C: ; 80EF40C
+sub_80EF40C: @ 80EF40C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -435327,7 +435327,7 @@ _080EF460:
 	thumb_func_end sub_80EF40C
 
 	thumb_func_start sub_80EF46C
-sub_80EF46C: ; 80EF46C
+sub_80EF46C: @ 80EF46C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -435402,7 +435402,7 @@ _080EF4F0:
 	thumb_func_end sub_80EF46C
 
 	thumb_func_start sub_80EF500
-sub_80EF500: ; 80EF500
+sub_80EF500: @ 80EF500
 	push {r4-r7,lr}
 	movs r2, 0
 _080EF504:
@@ -435448,7 +435448,7 @@ _080EF53C:
 	thumb_func_end sub_80EF500
 
 	thumb_func_start sub_80EF550
-sub_80EF550: ; 80EF550
+sub_80EF550: @ 80EF550
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -435496,7 +435496,7 @@ _080EF5B2:
 	thumb_func_end sub_80EF550
 
 	thumb_func_start InterviewBefore
-InterviewBefore: ; 80EF5B8
+InterviewBefore: @ 80EF5B8
 	push {lr}
 	ldr r1, =0x020375f0
 	movs r0, 0
@@ -435560,7 +435560,7 @@ _080EF646:
 	thumb_func_end InterviewBefore
 
 	thumb_func_start sub_80EF64C
-sub_80EF64C: ; 80EF64C
+sub_80EF64C: @ 80EF64C
 	push {r4,lr}
 	movs r0, 0x1
 	bl sub_80EF550
@@ -435606,7 +435606,7 @@ _080EF6A0:
 	thumb_func_end sub_80EF64C
 
 	thumb_func_start sub_80EF6C4
-sub_80EF6C4: ; 80EF6C4
+sub_80EF6C4: @ 80EF6C4
 	push {lr}
 	movs r0, 0x2
 	bl sub_80EF550
@@ -435634,7 +435634,7 @@ _080EF6F0:
 	thumb_func_end sub_80EF6C4
 
 	thumb_func_start sub_80EF704
-sub_80EF704: ; 80EF704
+sub_80EF704: @ 80EF704
 	push {r4-r6,lr}
 	movs r0, 0x3
 	bl sub_80EF550
@@ -435691,7 +435691,7 @@ _080EF774:
 	thumb_func_end sub_80EF704
 
 	thumb_func_start sub_80EF79C
-sub_80EF79C: ; 80EF79C
+sub_80EF79C: @ 80EF79C
 	ldr r1, =0x020375f0
 	movs r0, 0x1
 	strh r0, [r1]
@@ -435700,7 +435700,7 @@ sub_80EF79C: ; 80EF79C
 	thumb_func_end sub_80EF79C
 
 	thumb_func_start sub_80EF7A8
-sub_80EF7A8: ; 80EF7A8
+sub_80EF7A8: @ 80EF7A8
 	push {lr}
 	movs r0, 0x5
 	bl sub_80EF550
@@ -435709,7 +435709,7 @@ sub_80EF7A8: ; 80EF7A8
 	thumb_func_end sub_80EF7A8
 
 	thumb_func_start sub_80EF7B4
-sub_80EF7B4: ; 80EF7B4
+sub_80EF7B4: @ 80EF7B4
 	push {lr}
 	movs r0, 0x6
 	bl sub_80EF550
@@ -435737,7 +435737,7 @@ _080EF7E0:
 	thumb_func_end sub_80EF7B4
 
 	thumb_func_start sub_80EF7F4
-sub_80EF7F4: ; 80EF7F4
+sub_80EF7F4: @ 80EF7F4
 	push {lr}
 	movs r0, 0x8
 	bl sub_80EF550
@@ -435746,7 +435746,7 @@ sub_80EF7F4: ; 80EF7F4
 	thumb_func_end sub_80EF7F4
 
 	thumb_func_start sub_80EF800
-sub_80EF800: ; 80EF800
+sub_80EF800: @ 80EF800
 	push {lr}
 	movs r0, 0x9
 	bl sub_80EF550
@@ -435755,7 +435755,7 @@ sub_80EF800: ; 80EF800
 	thumb_func_end sub_80EF800
 
 	thumb_func_start sub_80EF80C
-sub_80EF80C: ; 80EF80C
+sub_80EF80C: @ 80EF80C
 	push {lr}
 	movs r0, 0x7
 	bl sub_80EF550
@@ -435783,7 +435783,7 @@ _080EF838:
 	thumb_func_end sub_80EF80C
 
 	thumb_func_start sub_80EF84C
-sub_80EF84C: ; 80EF84C
+sub_80EF84C: @ 80EF84C
 	push {lr}
 	movs r0, 0xB
 	bl sub_80EF550
@@ -435811,7 +435811,7 @@ _080EF878:
 	thumb_func_end sub_80EF84C
 
 	thumb_func_start sub_80EF88C
-sub_80EF88C: ; 80EF88C
+sub_80EF88C: @ 80EF88C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -435860,7 +435860,7 @@ _080EF8EE:
 	thumb_func_end sub_80EF88C
 
 	thumb_func_start sub_80EF8F8
-sub_80EF8F8: ; 80EF8F8
+sub_80EF8F8: @ 80EF8F8
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -435873,7 +435873,7 @@ sub_80EF8F8: ; 80EF8F8
 	thumb_func_end sub_80EF8F8
 
 	thumb_func_start sub_80EF910
-sub_80EF910: ; 80EF910
+sub_80EF910: @ 80EF910
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -435900,7 +435900,7 @@ _080EF92A:
 	thumb_func_end sub_80EF910
 
 	thumb_func_start sub_80EF93C
-sub_80EF93C: ; 80EF93C
+sub_80EF93C: @ 80EF93C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -435997,7 +435997,7 @@ _080EF9D8:
 	thumb_func_end sub_80EF93C
 
 	thumb_func_start sub_80EF9E8
-sub_80EF9E8: ; 80EF9E8
+sub_80EF9E8: @ 80EF9E8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -436026,7 +436026,7 @@ sub_80EF9E8: ; 80EF9E8
 	thumb_func_end sub_80EF9E8
 
 	thumb_func_start sub_80EFA24
-sub_80EFA24: ; 80EFA24
+sub_80EFA24: @ 80EFA24
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -436077,7 +436077,7 @@ _080EFA7E:
 	thumb_func_end sub_80EFA24
 
 	thumb_func_start sub_80EFA88
-sub_80EFA88: ; 80EFA88
+sub_80EFA88: @ 80EFA88
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -436112,7 +436112,7 @@ _080EFAD0:
 	thumb_func_end sub_80EFA88
 
 	thumb_func_start sub_80EFADC
-sub_80EFADC: ; 80EFADC
+sub_80EFADC: @ 80EFADC
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -436141,7 +436141,7 @@ _080EFB04:
 	thumb_func_end sub_80EFADC
 
 	thumb_func_start sub_80EFB08
-sub_80EFB08: ; 80EFB08
+sub_80EFB08: @ 80EFB08
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x5
@@ -436172,7 +436172,7 @@ _080EFB34:
 	thumb_func_end sub_80EFB08
 
 	thumb_func_start sub_80EFB38
-sub_80EFB38: ; 80EFB38
+sub_80EFB38: @ 80EFB38
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -436193,7 +436193,7 @@ _080EFB52:
 	thumb_func_end sub_80EFB38
 
 	thumb_func_start sub_80EFB58
-sub_80EFB58: ; 80EFB58
+sub_80EFB58: @ 80EFB58
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl GenerateRandomNumber
@@ -436233,7 +436233,7 @@ _080EFB84:
 	thumb_func_end sub_80EFB58
 
 	thumb_func_start sub_80EFBA4
-sub_80EFBA4: ; 80EFBA4
+sub_80EFBA4: @ 80EFBA4
 	push {lr}
 	adds r2, r0, 0
 	movs r3, 0
@@ -436266,7 +436266,7 @@ _080EFBD0:
 	thumb_func_end sub_80EFBA4
 
 	thumb_func_start sub_80EFBDC
-sub_80EFBDC: ; 80EFBDC
+sub_80EFBDC: @ 80EFBDC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -436471,7 +436471,7 @@ _080EFD30:
 	thumb_func_end sub_80EFBDC
 
 	thumb_func_start sub_80EFD54
-sub_80EFD54: ; 80EFD54
+sub_80EFD54: @ 80EFD54
 	push {r4,lr}
 	movs r1, 0
 	ldr r0, =0x03005d8c
@@ -436505,7 +436505,7 @@ _080EFD90:
 	thumb_func_end sub_80EFD54
 
 	thumb_func_start sub_80EFD98
-sub_80EFD98: ; 80EFD98
+sub_80EFD98: @ 80EFD98
 	push {r4,lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -436535,7 +436535,7 @@ _080EFDD6:
 	thumb_func_end sub_80EFD98
 
 	thumb_func_start sub_80EFDDC
-sub_80EFDDC: ; 80EFDDC
+sub_80EFDDC: @ 80EFDDC
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -436617,7 +436617,7 @@ sub_80EFDDC: ; 80EFDDC
 	thumb_func_end sub_80EFDDC
 
 	thumb_func_start c2_080CC144
-c2_080CC144: ; 80EFE98
+c2_080CC144: @ 80EFE98
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -436635,7 +436635,7 @@ c2_080CC144: ; 80EFE98
 	thumb_func_end c2_080CC144
 
 	thumb_func_start sub_80EFEC4
-sub_80EFEC4: ; 80EFEC4
+sub_80EFEC4: @ 80EFEC4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -436689,7 +436689,7 @@ sub_80EFEC4: ; 80EFEC4
 	thumb_func_end sub_80EFEC4
 
 	thumb_func_start sub_80EFF48
-sub_80EFF48: ; 80EFF48
+sub_80EFF48: @ 80EFF48
 	push {lr}
 	ldr r0, =0x020375f6
 	ldrb r0, [r0]
@@ -436704,7 +436704,7 @@ sub_80EFF48: ; 80EFF48
 	thumb_func_end sub_80EFF48
 
 	thumb_func_start sub_80EFF6C
-sub_80EFF6C: ; 80EFF6C
+sub_80EFF6C: @ 80EFF6C
 	push {r4,lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -436725,7 +436725,7 @@ sub_80EFF6C: ; 80EFF6C
 	thumb_func_end sub_80EFF6C
 
 	thumb_func_start sub_80EFF9C
-sub_80EFF9C: ; 80EFF9C
+sub_80EFF9C: @ 80EFF9C
 	push {r4,lr}
 	bl sub_80F0020
 	adds r4, r0, 0
@@ -436756,7 +436756,7 @@ _080EFFD4:
 	thumb_func_end sub_80EFF9C
 
 	thumb_func_start sub_80EFFE0
-sub_80EFFE0: ; 80EFFE0
+sub_80EFFE0: @ 80EFFE0
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -436797,7 +436797,7 @@ _080F001C:
 	thumb_func_end sub_80EFFE0
 
 	thumb_func_start sub_80F0020
-sub_80F0020: ; 80F0020
+sub_80F0020: @ 80F0020
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldrb r0, [r2, 0xD]
@@ -436815,7 +436815,7 @@ sub_80F0020: ; 80F0020
 	thumb_func_end sub_80F0020
 
 	thumb_func_start CheckForBigMovieOrEmergencyNewsOnTV
-CheckForBigMovieOrEmergencyNewsOnTV: ; 80F0040
+CheckForBigMovieOrEmergencyNewsOnTV: @ 80F0040
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -436867,7 +436867,7 @@ _080F009E:
 	thumb_func_end CheckForBigMovieOrEmergencyNewsOnTV
 
 	thumb_func_start GetMomOrDadStringForTVMessage
-GetMomOrDadStringForTVMessage: ; 80F00A4
+GetMomOrDadStringForTVMessage: @ 80F00A4
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -436974,7 +436974,7 @@ _080F01A8:
 	thumb_func_end GetMomOrDadStringForTVMessage
 
 	thumb_func_start sub_80F01B8
-sub_80F01B8: ; 80F01B8
+sub_80F01B8: @ 80F01B8
 	push {lr}
 	ldr r0, =0x000040bc
 	movs r1, 0
@@ -436993,7 +436993,7 @@ sub_80F01B8: ; 80F01B8
 	thumb_func_end sub_80F01B8
 
 	thumb_func_start sub_80F01E8
-sub_80F01E8: ; 80F01E8
+sub_80F01E8: @ 80F01E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -437162,7 +437162,7 @@ _080F0344:
 	thumb_func_end sub_80F01E8
 
 	thumb_func_start sub_80F0358
-sub_80F0358: ; 80F0358
+sub_80F0358: @ 80F0358
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -437319,7 +437319,7 @@ _080F048C:
 	thumb_func_end sub_80F0358
 
 	thumb_func_start sub_80F049C
-sub_80F049C: ; 80F049C
+sub_80F049C: @ 80F049C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r2, 24
@@ -437432,7 +437432,7 @@ _080F0574:
 	thumb_func_end sub_80F049C
 
 	thumb_func_start sub_80F0580
-sub_80F0580: ; 80F0580
+sub_80F0580: @ 80F0580
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -437488,7 +437488,7 @@ _080F05E0:
 	thumb_func_end sub_80F0580
 
 	thumb_func_start sub_80F05E8
-sub_80F05E8: ; 80F05E8
+sub_80F05E8: @ 80F05E8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -437558,7 +437558,7 @@ _080F0660:
 	thumb_func_end sub_80F05E8
 
 	thumb_func_start sub_80F0668
-sub_80F0668: ; 80F0668
+sub_80F0668: @ 80F0668
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -437615,7 +437615,7 @@ _080F06CA:
 	thumb_func_end sub_80F0668
 
 	thumb_func_start sub_80F06D0
-sub_80F06D0: ; 80F06D0
+sub_80F06D0: @ 80F06D0
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -437650,7 +437650,7 @@ _080F0704:
 	thumb_func_end sub_80F06D0
 
 	thumb_func_start sub_80F0708
-sub_80F0708: ; 80F0708
+sub_80F0708: @ 80F0708
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -438087,7 +438087,7 @@ _080F0AF2:
 	thumb_func_end sub_80F0708
 
 	thumb_func_start sub_80F0B00
-sub_80F0B00: ; 80F0B00
+sub_80F0B00: @ 80F0B00
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x03005d8c
@@ -438105,7 +438105,7 @@ sub_80F0B00: ; 80F0B00
 	thumb_func_end sub_80F0B00
 
 	thumb_func_start sub_80F0B24
-sub_80F0B24: ; 80F0B24
+sub_80F0B24: @ 80F0B24
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -438137,7 +438137,7 @@ _080F0B56:
 	thumb_func_end sub_80F0B24
 
 	thumb_func_start sub_80F0B64
-sub_80F0B64: ; 80F0B64
+sub_80F0B64: @ 80F0B64
 	push {r4-r6,lr}
 	ldr r0, =0x00000864
 	bl FlagGet
@@ -438179,7 +438179,7 @@ _080F0BA2:
 	thumb_func_end sub_80F0B64
 
 	thumb_func_start sub_80F0BB8
-sub_80F0BB8: ; 80F0BB8
+sub_80F0BB8: @ 80F0BB8
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x03005d8c
@@ -438216,7 +438216,7 @@ _080F0BE6:
 	thumb_func_end sub_80F0BB8
 
 	thumb_func_start sub_80F0C04
-sub_80F0C04: ; 80F0C04
+sub_80F0C04: @ 80F0C04
 	push {r4,r5,lr}
 	movs r3, 0
 	movs r2, 0x5
@@ -438280,7 +438280,7 @@ _080F0C6E:
 	thumb_func_end sub_80F0C04
 
 	thumb_func_start sub_80F0C7C
-sub_80F0C7C: ; 80F0C7C
+sub_80F0C7C: @ 80F0C7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -438384,7 +438384,7 @@ _080F0D4C:
 	thumb_func_end sub_80F0C7C
 
 	thumb_func_start sub_80F0D60
-sub_80F0D60: ; 80F0D60
+sub_80F0D60: @ 80F0D60
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -438505,7 +438505,7 @@ _080F0E28:
 	thumb_func_end sub_80F0D60
 
 	thumb_func_start sub_80F0E58
-sub_80F0E58: ; 80F0E58
+sub_80F0E58: @ 80F0E58
 	push {lr}
 	ldr r0, [r0]
 	ldr r1, [r1]
@@ -438526,7 +438526,7 @@ sub_80F0E58: ; 80F0E58
 	thumb_func_end sub_80F0E58
 
 	thumb_func_start sub_80F0E84
-sub_80F0E84: ; 80F0E84
+sub_80F0E84: @ 80F0E84
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -438570,7 +438570,7 @@ _080F0EC6:
 	thumb_func_end sub_80F0E84
 
 	thumb_func_start sub_80F0ECC
-sub_80F0ECC: ; 80F0ECC
+sub_80F0ECC: @ 80F0ECC
 	push {lr}
 	lsls r1, 24
 	lsrs r2, r1, 24
@@ -438591,7 +438591,7 @@ _080F0EE6:
 	thumb_func_end sub_80F0ECC
 
 	thumb_func_start sub_80F0EEC
-sub_80F0EEC: ; 80F0EEC
+sub_80F0EEC: @ 80F0EEC
 	push {r4,lr}
 	movs r4, 0
 _080F0EF0:
@@ -438620,7 +438620,7 @@ _080F0F08:
 	thumb_func_end sub_80F0EEC
 
 	thumb_func_start sub_80F0F24
-sub_80F0F24: ; 80F0F24
+sub_80F0F24: @ 80F0F24
 	push {r4,r5,lr}
 	ldr r0, =0x00000864
 	bl FlagGet
@@ -438651,7 +438651,7 @@ _080F0F50:
 	thumb_func_end sub_80F0F24
 
 	thumb_func_start sub_80F0F64
-sub_80F0F64: ; 80F0F64
+sub_80F0F64: @ 80F0F64
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -438973,7 +438973,7 @@ _080F11FC:
 	thumb_func_end sub_80F0F64
 
 	thumb_func_start sub_80F1208
-sub_80F1208: ; 80F1208
+sub_80F1208: @ 80F1208
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_80F14F8
@@ -439017,7 +439017,7 @@ _080F124C:
 	thumb_func_end sub_80F1208
 
 	thumb_func_start sub_80F1254
-sub_80F1254: ; 80F1254
+sub_80F1254: @ 80F1254
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r4, 0
@@ -439055,7 +439055,7 @@ _080F128A:
 	thumb_func_end sub_80F1254
 
 	thumb_func_start sub_80F1290
-sub_80F1290: ; 80F1290
+sub_80F1290: @ 80F1290
 	push {lr}
 	bl sub_8009228
 	movs r1, 0x2
@@ -439069,7 +439069,7 @@ _080F129E:
 	thumb_func_end sub_80F1290
 
 	thumb_func_start sub_80F12A4
-sub_80F12A4: ; 80F12A4
+sub_80F12A4: @ 80F12A4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r4, 0
@@ -439333,7 +439333,7 @@ _080F14F0:
 	thumb_func_end sub_80F12A4
 
 	thumb_func_start sub_80F14F8
-sub_80F14F8: ; 80F14F8
+sub_80F14F8: @ 80F14F8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -439372,7 +439372,7 @@ _080F152C:
 	thumb_func_end sub_80F14F8
 
 	thumb_func_start sub_80F153C
-sub_80F153C: ; 80F153C
+sub_80F153C: @ 80F153C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -439547,7 +439547,7 @@ _080F16E6:
 	thumb_func_end sub_80F153C
 
 	thumb_func_start DoTVShowBravoTrainerPokemonProfile
-DoTVShowBravoTrainerPokemonProfile: ; 80F16EC
+DoTVShowBravoTrainerPokemonProfile: @ 80F16EC
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -439788,7 +439788,7 @@ _080F1952:
 	thumb_func_end DoTVShowBravoTrainerPokemonProfile
 
 	thumb_func_start DoTVShowBravoTrainerBattleTower
-DoTVShowBravoTrainerBattleTower: ; 80F1974
+DoTVShowBravoTrainerBattleTower: @ 80F1974
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -440040,7 +440040,7 @@ _080F1BEA:
 	thumb_func_end DoTVShowBravoTrainerBattleTower
 
 	thumb_func_start DoTVShowTodaysSmartShopper
-DoTVShowTodaysSmartShopper: ; 80F1C0C
+DoTVShowTodaysSmartShopper: @ 80F1C0C
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -440272,7 +440272,7 @@ _080F1E2C:
 	thumb_func_end DoTVShowTodaysSmartShopper
 
 	thumb_func_start DoTVShowTheNameRaterShow
-DoTVShowTheNameRaterShow: ; 80F1E48
+DoTVShowTheNameRaterShow: @ 80F1E48
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r2, =0x03005d8c
@@ -440568,7 +440568,7 @@ _080F20FE:
 	thumb_func_end DoTVShowTheNameRaterShow
 
 	thumb_func_start DoTVShowPokemonTodaySuccessfulCapture
-DoTVShowPokemonTodaySuccessfulCapture: ; 80F211C
+DoTVShowPokemonTodaySuccessfulCapture: @ 80F211C
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -440789,7 +440789,7 @@ _080F2358:
 	thumb_func_end DoTVShowPokemonTodaySuccessfulCapture
 
 	thumb_func_start DoTVShowPokemonTodayFailedCapture
-DoTVShowPokemonTodayFailedCapture: ; 80F2370
+DoTVShowPokemonTodayFailedCapture: @ 80F2370
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -440928,7 +440928,7 @@ _080F24C0:
 	thumb_func_end DoTVShowPokemonTodayFailedCapture
 
 	thumb_func_start DoTVShowPokemonFanClubLetter
-DoTVShowPokemonFanClubLetter: ; 80F24D8
+DoTVShowPokemonFanClubLetter: @ 80F24D8
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -441127,7 +441127,7 @@ _080F26FC:
 	thumb_func_end DoTVShowPokemonFanClubLetter
 
 	thumb_func_start DoTVShowRecentHappenings
-DoTVShowRecentHappenings: ; 80F2708
+DoTVShowRecentHappenings: @ 80F2708
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -441267,7 +441267,7 @@ _080F2898:
 	thumb_func_end DoTVShowRecentHappenings
 
 	thumb_func_start DoTVShowPokemonFanClubOpinions
-DoTVShowPokemonFanClubOpinions: ; 80F28A4
+DoTVShowPokemonFanClubOpinions: @ 80F28A4
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -441360,12 +441360,12 @@ _080F297E:
 	thumb_func_end DoTVShowPokemonFanClubOpinions
 
 	thumb_func_start DoTVShowDummiedOut
-DoTVShowDummiedOut: ; 80F299C
+DoTVShowDummiedOut: @ 80F299C
 	bx lr
 	thumb_func_end DoTVShowDummiedOut
 
 	thumb_func_start DoTVShowPokemonNewsMassOutbreak
-DoTVShowPokemonNewsMassOutbreak: ; 80F29A0
+DoTVShowPokemonNewsMassOutbreak: @ 80F29A0
 	push {r4,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -441404,7 +441404,7 @@ DoTVShowPokemonNewsMassOutbreak: ; 80F29A0
 	thumb_func_end DoTVShowPokemonNewsMassOutbreak
 
 	thumb_func_start DoTVShowPokemonContestLiveUpdates
-DoTVShowPokemonContestLiveUpdates: ; 80F2A10
+DoTVShowPokemonContestLiveUpdates: @ 80F2A10
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -442157,7 +442157,7 @@ _080F311C:
 	thumb_func_end DoTVShowPokemonContestLiveUpdates
 
 	thumb_func_start DoTVShowPokemonBattleUpdate
-DoTVShowPokemonBattleUpdate: ; 80F3140
+DoTVShowPokemonBattleUpdate: @ 80F3140
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -442367,7 +442367,7 @@ _080F3362:
 	thumb_func_end DoTVShowPokemonBattleUpdate
 
 	thumb_func_start DoTVShow3CheersForPokeblocks
-DoTVShow3CheersForPokeblocks: ; 80F3388
+DoTVShow3CheersForPokeblocks: @ 80F3388
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -442617,7 +442617,7 @@ _080F3624:
 	thumb_func_end DoTVShow3CheersForPokeblocks
 
 	thumb_func_start DoTVShowInSearchOfTrainers
-DoTVShowInSearchOfTrainers: ; 80F363C
+DoTVShowInSearchOfTrainers: @ 80F363C
 	push {r4-r7,lr}
 	ldr r0, =0x020375f0
 	movs r1, 0
@@ -442803,7 +442803,7 @@ _080F37EA:
 	thumb_func_end DoTVShowInSearchOfTrainers
 
 	thumb_func_start DoTVShowPokemonAngler
-DoTVShowPokemonAngler: ; 80F3828
+DoTVShowPokemonAngler: @ 80F3828
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -442888,7 +442888,7 @@ _080F38E0:
 	thumb_func_end DoTVShowPokemonAngler
 
 	thumb_func_start DoTVShowTheWorldOfMasters
-DoTVShowTheWorldOfMasters: ; 80F3904
+DoTVShowTheWorldOfMasters: @ 80F3904
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -442976,7 +442976,7 @@ _080F39BE:
 	thumb_func_end DoTVShowTheWorldOfMasters
 
 	thumb_func_start DoTVShowTodaysRivalTrainer
-DoTVShowTodaysRivalTrainer: ; 80F39E4
+DoTVShowTodaysRivalTrainer: @ 80F39E4
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -443206,7 +443206,7 @@ _080F3BE8:
 	thumb_func_end DoTVShowTodaysRivalTrainer
 
 	thumb_func_start DoTVShowDewfordTrendWatcherNetwork
-DoTVShowDewfordTrendWatcherNetwork: ; 80F3C04
+DoTVShowDewfordTrendWatcherNetwork: @ 80F3C04
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -443339,7 +443339,7 @@ _080F3D54:
 	thumb_func_end DoTVShowDewfordTrendWatcherNetwork
 
 	thumb_func_start DoTVShowHoennTreasureInvestigators
-DoTVShowHoennTreasureInvestigators: ; 80F3D74
+DoTVShowHoennTreasureInvestigators: @ 80F3D74
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -443444,7 +443444,7 @@ _080F3E5C:
 	thumb_func_end DoTVShowHoennTreasureInvestigators
 
 	thumb_func_start DoTVShowFindThatGamer
-DoTVShowFindThatGamer: ; 80F3E7C
+DoTVShowFindThatGamer: @ 80F3E7C
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -443614,7 +443614,7 @@ _080F4008:
 	thumb_func_end DoTVShowFindThatGamer
 
 	thumb_func_start DoTVShowBreakingNewsTV
-DoTVShowBreakingNewsTV: ; 80F4028
+DoTVShowBreakingNewsTV: @ 80F4028
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -443917,7 +443917,7 @@ _080F4344:
 	thumb_func_end DoTVShowBreakingNewsTV
 
 	thumb_func_start DoTVShowSecretBaseVisit
-DoTVShowSecretBaseVisit: ; 80F4360
+DoTVShowSecretBaseVisit: @ 80F4360
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444145,7 +444145,7 @@ _080F4588:
 	thumb_func_end DoTVShowSecretBaseVisit
 
 	thumb_func_start DoTVShowPokemonLotterWinnerFlashReport
-DoTVShowPokemonLotterWinnerFlashReport: ; 80F45A0
+DoTVShowPokemonLotterWinnerFlashReport: @ 80F45A0
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444215,7 +444215,7 @@ _080F4634:
 	thumb_func_end DoTVShowPokemonLotterWinnerFlashReport
 
 	thumb_func_start DoTVShowThePokemonBattleSeminar
-DoTVShowThePokemonBattleSeminar: ; 80F466C
+DoTVShowThePokemonBattleSeminar: @ 80F466C
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444412,7 +444412,7 @@ _080F4858:
 	thumb_func_end DoTVShowThePokemonBattleSeminar
 
 	thumb_func_start DoTVShowTrainerFanClubSpecial
-DoTVShowTrainerFanClubSpecial: ; 80F487C
+DoTVShowTrainerFanClubSpecial: @ 80F487C
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444535,7 +444535,7 @@ _080F499A:
 	thumb_func_end DoTVShowTrainerFanClubSpecial
 
 	thumb_func_start DoTVShowTrainerFanClub
-DoTVShowTrainerFanClub: ; 80F49BC
+DoTVShowTrainerFanClub: @ 80F49BC
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444705,7 +444705,7 @@ _080F4B3A:
 	thumb_func_end DoTVShowTrainerFanClub
 
 	thumb_func_start DoTVShowSpotTheCuties
-DoTVShowSpotTheCuties: ; 80F4B5C
+DoTVShowSpotTheCuties: @ 80F4B5C
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -444928,7 +444928,7 @@ _080F4D84:
 	thumb_func_end DoTVShowSpotTheCuties
 
 	thumb_func_start DoTVShowPokemonNewsBattleFrontier
-DoTVShowPokemonNewsBattleFrontier: ; 80F4D9C
+DoTVShowPokemonNewsBattleFrontier: @ 80F4D9C
 	push {r4-r7,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -445189,7 +445189,7 @@ _080F5014:
 	thumb_func_end DoTVShowPokemonNewsBattleFrontier
 
 	thumb_func_start DoTVShowWhatsNo1InHoennToday
-DoTVShowWhatsNo1InHoennToday: ; 80F5030
+DoTVShowWhatsNo1InHoennToday: @ 80F5030
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -445327,7 +445327,7 @@ _080F5164:
 	thumb_func_end DoTVShowWhatsNo1InHoennToday
 
 	thumb_func_start sub_80F5180
-sub_80F5180: ; 80F5180
+sub_80F5180: @ 80F5180
 	push {r4,lr}
 	movs r1, 0
 	movs r2, 0
@@ -445355,7 +445355,7 @@ _080F519A:
 	thumb_func_end sub_80F5180
 
 	thumb_func_start sub_80F51AC
-sub_80F51AC: ; 80F51AC
+sub_80F51AC: @ 80F51AC
 	push {r4-r6,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -445394,7 +445394,7 @@ _080F51E6:
 	thumb_func_end sub_80F51AC
 
 	thumb_func_start DoTVShowSecretBaseSecrets
-DoTVShowSecretBaseSecrets: ; 80F51EC
+DoTVShowSecretBaseSecrets: @ 80F51EC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -445735,7 +445735,7 @@ _080F552A:
 	thumb_func_end DoTVShowSecretBaseSecrets
 
 	thumb_func_start DoTVShowSafariFanClub
-DoTVShowSafariFanClub: ; 80F5548
+DoTVShowSafariFanClub: @ 80F5548
 	push {r4,r5,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -445903,7 +445903,7 @@ _080F56BC:
 	thumb_func_end DoTVShowSafariFanClub
 
 	thumb_func_start DoTVShowPokemonContestLiveUpdates2
-DoTVShowPokemonContestLiveUpdates2: ; 80F56D4
+DoTVShowPokemonContestLiveUpdates2: @ 80F56D4
 	push {r4-r6,lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -445977,7 +445977,7 @@ _080F575E:
 	thumb_func_end DoTVShowPokemonContestLiveUpdates2
 
 	thumb_func_start TVShowDone
-TVShowDone: ; 80F577C
+TVShowDone: @ 80F577C
 	ldr r1, =0x020375f0
 	movs r0, 0x1
 	strh r0, [r1]
@@ -446001,7 +446001,7 @@ TVShowDone: ; 80F577C
 	thumb_func_end TVShowDone
 
 	thumb_func_start ResetTVShowState
-ResetTVShowState: ; 80F57B8
+ResetTVShowState: @ 80F57B8
 	ldr r1, =0x0203a030
 	movs r0, 0
 	strb r0, [r1]
@@ -446010,7 +446010,7 @@ ResetTVShowState: ; 80F57B8
 	thumb_func_end ResetTVShowState
 
 	thumb_func_start sub_80F57C4
-sub_80F57C4: ; 80F57C4
+sub_80F57C4: @ 80F57C4
 	push {r4,lr}
 	movs r0, 0
 	movs r1, 0x40
@@ -446128,7 +446128,7 @@ _080F57E0:
 	thumb_func_end sub_80F57C4
 
 	thumb_func_start sub_80F591C
-sub_80F591C: ; 80F591C
+sub_80F591C: @ 80F591C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -446274,7 +446274,7 @@ _080F59F6:
 	thumb_func_end sub_80F591C
 
 	thumb_func_start sub_80F5A74
-sub_80F5A74: ; 80F5A74
+sub_80F5A74: @ 80F5A74
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -446318,7 +446318,7 @@ _080F5A96:
 	thumb_func_end sub_80F5A74
 
 	thumb_func_start sub_80F5AE0
-sub_80F5AE0: ; 80F5AE0
+sub_80F5AE0: @ 80F5AE0
 	push {r4,lr}
 	movs r4, 0
 _080F5AE4:
@@ -446336,7 +446336,7 @@ _080F5AE4:
 	thumb_func_end sub_80F5AE0
 
 	thumb_func_start sub_80F5B00
-sub_80F5B00: ; 80F5B00
+sub_80F5B00: @ 80F5B00
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02037fd4
@@ -446428,7 +446428,7 @@ _080F5BEC:
 	thumb_func_end sub_80F5B00
 
 	thumb_func_start sub_80F5C00
-sub_80F5C00: ; 80F5C00
+sub_80F5C00: @ 80F5C00
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -446443,7 +446443,7 @@ sub_80F5C00: ; 80F5C00
 	thumb_func_end sub_80F5C00
 
 	thumb_func_start sub_80F5C24
-sub_80F5C24: ; 80F5C24
+sub_80F5C24: @ 80F5C24
 	push {lr}
 	ldr r0, =0x02022e14
 	ldrh r1, [r0]
@@ -446503,7 +446503,7 @@ sub_80F5C24: ; 80F5C24
 	thumb_func_end sub_80F5C24
 
 	thumb_func_start sub_80F5CE4
-sub_80F5CE4: ; 80F5CE4
+sub_80F5CE4: @ 80F5CE4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -446702,7 +446702,7 @@ _080F5EBA:
 	thumb_func_end sub_80F5CE4
 
 	thumb_func_start sub_80F5ED8
-sub_80F5ED8: ; 80F5ED8
+sub_80F5ED8: @ 80F5ED8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -446728,7 +446728,7 @@ _080F5EFC:
 	thumb_func_end sub_80F5ED8
 
 	thumb_func_start sub_80F5F14
-sub_80F5F14: ; 80F5F14
+sub_80F5F14: @ 80F5F14
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -446741,7 +446741,7 @@ sub_80F5F14: ; 80F5F14
 	thumb_func_end sub_80F5F14
 
 	thumb_func_start sub_80F5F30
-sub_80F5F30: ; 80F5F30
+sub_80F5F30: @ 80F5F30
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -446771,7 +446771,7 @@ _080F5F60:
 	thumb_func_end sub_80F5F30
 
 	thumb_func_start sub_80F5F74
-sub_80F5F74: ; 80F5F74
+sub_80F5F74: @ 80F5F74
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -446872,7 +446872,7 @@ _080F6048:
 	thumb_func_end sub_80F5F74
 
 	thumb_func_start sub_80F6058
-sub_80F6058: ; 80F6058
+sub_80F6058: @ 80F6058
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -446950,7 +446950,7 @@ _080F60E6:
 	thumb_func_end sub_80F6058
 
 	thumb_func_start sub_80F60F0
-sub_80F60F0: ; 80F60F0
+sub_80F60F0: @ 80F60F0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -447005,7 +447005,7 @@ _080F615E:
 	thumb_func_end sub_80F60F0
 
 	thumb_func_start sub_80F616C
-sub_80F616C: ; 80F616C
+sub_80F616C: @ 80F616C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -447082,7 +447082,7 @@ _080F61F8:
 	thumb_func_end sub_80F616C
 
 	thumb_func_start sub_80F6204
-sub_80F6204: ; 80F6204
+sub_80F6204: @ 80F6204
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -447316,7 +447316,7 @@ _080F63F4:
 	thumb_func_end sub_80F6204
 
 	thumb_func_start sub_80F6404
-sub_80F6404: ; 80F6404
+sub_80F6404: @ 80F6404
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -447616,7 +447616,7 @@ _080F669C:
 	thumb_func_end sub_80F6404
 
 	thumb_func_start sub_80F66B4
-sub_80F66B4: ; 80F66B4
+sub_80F66B4: @ 80F66B4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -447664,7 +447664,7 @@ _080F6702:
 	thumb_func_end sub_80F66B4
 
 	thumb_func_start sub_80F671C
-sub_80F671C: ; 80F671C
+sub_80F671C: @ 80F671C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -447706,7 +447706,7 @@ _080F676E:
 	thumb_func_end sub_80F671C
 
 	thumb_func_start sub_80F677C
-sub_80F677C: ; 80F677C
+sub_80F677C: @ 80F677C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -447738,7 +447738,7 @@ _080F67AC:
 	thumb_func_end sub_80F677C
 
 	thumb_func_start task_repel
-task_repel: ; 80F67C4
+task_repel: @ 80F67C4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -447778,7 +447778,7 @@ _080F67E6:
 	thumb_func_end task_repel
 
 	thumb_func_start sub_80F6820
-sub_80F6820: ; 80F6820
+sub_80F6820: @ 80F6820
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -447840,7 +447840,7 @@ _080F68A8:
 	thumb_func_end sub_80F6820
 
 	thumb_func_start sub_80F68B4
-sub_80F68B4: ; 80F68B4
+sub_80F68B4: @ 80F68B4
 	push {r4,r5,lr}
 	ldr r2, =0x02022e20
 	ldrh r3, [r2]
@@ -447873,7 +447873,7 @@ _080F68E2:
 	thumb_func_end sub_80F68B4
 
 	thumb_func_start sub_80F68F0
-sub_80F68F0: ; 80F68F0
+sub_80F68F0: @ 80F68F0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -447970,7 +447970,7 @@ _080F69AE:
 	thumb_func_end sub_80F68F0
 
 	thumb_func_start sub_80F69B8
-sub_80F69B8: ; 80F69B8
+sub_80F69B8: @ 80F69B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -448055,7 +448055,7 @@ _080F6A54:
 	thumb_func_end sub_80F69B8
 
 	thumb_func_start sub_80F6A64
-sub_80F6A64: ; 80F6A64
+sub_80F6A64: @ 80F6A64
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -448085,7 +448085,7 @@ _080F6A74:
 	thumb_func_end sub_80F6A64
 
 	thumb_func_start sub_80F6A9C
-sub_80F6A9C: ; 80F6A9C
+sub_80F6A9C: @ 80F6A9C
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r6, =gMonIconPaletteIndices
@@ -448121,7 +448121,7 @@ _080F6AA6:
 	thumb_func_end sub_80F6A9C
 
 	thumb_func_start sub_80F6AE8
-sub_80F6AE8: ; 80F6AE8
+sub_80F6AE8: @ 80F6AE8
 	push {r4,lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -448181,7 +448181,7 @@ _080F6B58:
 	thumb_func_end sub_80F6AE8
 
 	thumb_func_start sub_80F6B78
-sub_80F6B78: ; 80F6B78
+sub_80F6B78: @ 80F6B78
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -448454,7 +448454,7 @@ _080F6D3E:
 	thumb_func_end sub_80F6B78
 
 	thumb_func_start sub_80F6DC0
-sub_80F6DC0: ; 80F6DC0
+sub_80F6DC0: @ 80F6DC0
 	push {r4-r6,lr}
 	sub sp, 0x20
 	mov r1, sp
@@ -448557,7 +448557,7 @@ _080F6DEE:
 	thumb_func_end sub_80F6DC0
 
 	thumb_func_start sub_80F6E9C
-sub_80F6E9C: ; 80F6E9C
+sub_80F6E9C: @ 80F6E9C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -448600,7 +448600,7 @@ sub_80F6E9C: ; 80F6E9C
 	thumb_func_end sub_80F6E9C
 
 	thumb_func_start sub_80F6EF4
-sub_80F6EF4: ; 80F6EF4
+sub_80F6EF4: @ 80F6EF4
 	push {r4,r5,lr}
 	ldr r1, =0x0203a034
 	ldr r4, [r1]
@@ -448636,7 +448636,7 @@ sub_80F6EF4: ; 80F6EF4
 	thumb_func_end sub_80F6EF4
 
 	thumb_func_start sub_80F6F40
-sub_80F6F40: ; 80F6F40
+sub_80F6F40: @ 80F6F40
 	movs r3, 0
 	movs r2, 0
 	movs r1, 0x88
@@ -448657,7 +448657,7 @@ sub_80F6F40: ; 80F6F40
 	thumb_func_end sub_80F6F40
 
 	thumb_func_start sub_80F6F68
-sub_80F6F68: ; 80F6F68
+sub_80F6F68: @ 80F6F68
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x3A]
@@ -448718,7 +448718,7 @@ _080F6FCC:
 	thumb_func_end sub_80F6F68
 
 	thumb_func_start sub_80F6FDC
-sub_80F6FDC: ; 80F6FDC
+sub_80F6FDC: @ 80F6FDC
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a034
@@ -448747,7 +448747,7 @@ _080F7008:
 	thumb_func_end sub_80F6FDC
 
 	thumb_func_start sub_80F7014
-sub_80F7014: ; 80F7014
+sub_80F7014: @ 80F7014
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x3A]
@@ -448802,7 +448802,7 @@ _080F7070:
 	thumb_func_end sub_80F7014
 
 	thumb_func_start sub_80F707C
-sub_80F707C: ; 80F707C
+sub_80F707C: @ 80F707C
 	push {r4-r7,lr}
 	ldr r4, =0x0203a034
 	ldr r1, [r4]
@@ -448895,7 +448895,7 @@ _080F70BE:
 	thumb_func_end sub_80F707C
 
 	thumb_func_start sub_80F7144
-sub_80F7144: ; 80F7144
+sub_80F7144: @ 80F7144
 	push {r4-r7,lr}
 	ldr r0, =0x0203a034
 	ldr r0, [r0]
@@ -448954,7 +448954,7 @@ _080F7174:
 	thumb_func_end sub_80F7144
 
 	thumb_func_start sub_80F71C8
-sub_80F71C8: ; 80F71C8
+sub_80F71C8: @ 80F71C8
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r5, 0x5
@@ -449103,7 +449103,7 @@ _080F72CC:
 	thumb_func_end sub_80F71C8
 
 	thumb_func_start sub_80F7310
-sub_80F7310: ; 80F7310
+sub_80F7310: @ 80F7310
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -449148,7 +449148,7 @@ _080F7352:
 	thumb_func_end sub_80F7310
 
 	thumb_func_start sub_80F7364
-sub_80F7364: ; 80F7364
+sub_80F7364: @ 80F7364
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -449212,7 +449212,7 @@ _080F73CE:
 	thumb_func_end sub_80F7364
 
 	thumb_func_start sub_80F73DC
-sub_80F73DC: ; 80F73DC
+sub_80F73DC: @ 80F73DC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -449320,7 +449320,7 @@ _080F74A4:
 	thumb_func_end sub_80F73DC
 
 	thumb_func_start sub_80F74BC
-sub_80F74BC: ; 80F74BC
+sub_80F74BC: @ 80F74BC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -449382,7 +449382,7 @@ _080F74DE:
 	thumb_func_end sub_80F74BC
 
 	thumb_func_start sub_80F753C
-sub_80F753C: ; 80F753C
+sub_80F753C: @ 80F753C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -449437,7 +449437,7 @@ _080F75A0:
 	thumb_func_end sub_80F753C
 
 	thumb_func_start sub_80F75A8
-sub_80F75A8: ; 80F75A8
+sub_80F75A8: @ 80F75A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -449499,7 +449499,7 @@ _080F7610:
 	thumb_func_end sub_80F75A8
 
 	thumb_func_start sub_80F7620
-sub_80F7620: ; 80F7620
+sub_80F7620: @ 80F7620
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0xC0
@@ -449541,7 +449541,7 @@ _080F7664:
 	thumb_func_end sub_80F7620
 
 	thumb_func_start sub_80F7670
-sub_80F7670: ; 80F7670
+sub_80F7670: @ 80F7670
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -449649,7 +449649,7 @@ _080F7744:
 	thumb_func_end sub_80F7670
 
 	thumb_func_start sub_80F7768
-sub_80F7768: ; 80F7768
+sub_80F7768: @ 80F7768
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -449713,7 +449713,7 @@ _080F77D6:
 	thumb_func_end sub_80F7768
 
 	thumb_func_start sub_80F77E0
-sub_80F77E0: ; 80F77E0
+sub_80F77E0: @ 80F77E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -449745,7 +449745,7 @@ sub_80F77E0: ; 80F77E0
 	thumb_func_end sub_80F77E0
 
 	thumb_func_start sub_80F7824
-sub_80F7824: ; 80F7824
+sub_80F7824: @ 80F7824
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -449791,7 +449791,7 @@ _080F786E:
 	thumb_func_end sub_80F7824
 
 	thumb_func_start sub_80F7880
-sub_80F7880: ; 80F7880
+sub_80F7880: @ 80F7880
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -450051,7 +450051,7 @@ _080F7A70:
 	thumb_func_end sub_80F7880
 
 	thumb_func_start sub_80F7A80
-sub_80F7A80: ; 80F7A80
+sub_80F7A80: @ 80F7A80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -450311,7 +450311,7 @@ _080F7C96:
 	thumb_func_end sub_80F7A80
 
 	thumb_func_start sub_80F7CA8
-sub_80F7CA8: ; 80F7CA8
+sub_80F7CA8: @ 80F7CA8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -450485,7 +450485,7 @@ _080F7DDC:
 	thumb_func_end sub_80F7CA8
 
 	thumb_func_start sub_80F7DF4
-sub_80F7DF4: ; 80F7DF4
+sub_80F7DF4: @ 80F7DF4
 	push {r4,r5,lr}
 	ldr r4, =0x0203a034
 	movs r0, 0x20
@@ -450534,7 +450534,7 @@ sub_80F7DF4: ; 80F7DF4
 	thumb_func_end sub_80F7DF4
 
 	thumb_func_start sub_80F7E64
-sub_80F7E64: ; 80F7E64
+sub_80F7E64: @ 80F7E64
 	push {r4,r5,lr}
 	ldr r5, =0x0203a034
 	ldr r0, [r5]
@@ -450581,7 +450581,7 @@ sub_80F7E64: ; 80F7E64
 	thumb_func_end sub_80F7E64
 
 	thumb_func_start sub_80F7ED0
-sub_80F7ED0: ; 80F7ED0
+sub_80F7ED0: @ 80F7ED0
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -450630,7 +450630,7 @@ sub_80F7ED0: ; 80F7ED0
 	thumb_func_end sub_80F7ED0
 
 	thumb_func_start sub_80F7F30
-sub_80F7F30: ; 80F7F30
+sub_80F7F30: @ 80F7F30
 	push {r4,r5,lr}
 	ldr r0, =0x02039f24
 	ldrb r1, [r0]
@@ -450661,7 +450661,7 @@ _080F7F5E:
 	thumb_func_end sub_80F7F30
 
 	thumb_func_start sub_80F7F7C
-sub_80F7F7C: ; 80F7F7C
+sub_80F7F7C: @ 80F7F7C
 	push {r4,lr}
 	movs r4, 0
 	ldr r0, =0x02039f24
@@ -450722,7 +450722,7 @@ _080F7FEE:
 	thumb_func_end sub_80F7F7C
 
 	thumb_func_start sub_80F7FFC
-sub_80F7FFC: ; 80F7FFC
+sub_80F7FFC: @ 80F7FFC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x02039f20
@@ -450992,7 +450992,7 @@ _080F8250:
 	thumb_func_end sub_80F7FFC
 
 	thumb_func_start sub_80F8264
-sub_80F8264: ; 80F8264
+sub_80F8264: @ 80F8264
 	push {r4,lr}
 	ldr r4, =0x02021cc4
 	ldr r0, =0x020375e4
@@ -451011,7 +451011,7 @@ sub_80F8264: ; 80F8264
 	thumb_func_end sub_80F8264
 
 	thumb_func_start sub_80F8290
-sub_80F8290: ; 80F8290
+sub_80F8290: @ 80F8290
 	push {lr}
 	ldr r0, =0x02021ec4
 	ldr r1, =0x020375e4
@@ -451026,7 +451026,7 @@ sub_80F8290: ; 80F8290
 	thumb_func_end sub_80F8290
 
 	thumb_func_start sub_80F82B4
-sub_80F82B4: ; 80F82B4
+sub_80F82B4: @ 80F82B4
 	push {r4-r6,lr}
 	movs r1, 0
 	movs r2, 0
@@ -451062,7 +451062,7 @@ _080F82DC:
 	thumb_func_end sub_80F82B4
 
 	thumb_func_start sub_80F82FC
-sub_80F82FC: ; 80F82FC
+sub_80F82FC: @ 80F82FC
 	ldr r2, =0x020375e0
 	ldr r1, =0x02039f00
 	ldr r0, =0x020375e4
@@ -451076,7 +451076,7 @@ sub_80F82FC: ; 80F82FC
 	thumb_func_end sub_80F82FC
 
 	thumb_func_start sub_80F831C
-sub_80F831C: ; 80F831C
+sub_80F831C: @ 80F831C
 	push {lr}
 	movs r1, 0
 	ldr r2, =0x02039f20
@@ -451102,7 +451102,7 @@ _080F833C:
 	thumb_func_end sub_80F831C
 
 	thumb_func_start sub_80F834C
-sub_80F834C: ; 80F834C
+sub_80F834C: @ 80F834C
 	push {r4,lr}
 	movs r1, 0
 	ldr r2, =0x02039f20
@@ -451135,7 +451135,7 @@ _080F836E:
 	thumb_func_end sub_80F834C
 
 	thumb_func_start sub_80F8390
-sub_80F8390: ; 80F8390
+sub_80F8390: @ 80F8390
 	push {r4,lr}
 	movs r1, 0
 	ldr r2, =0x02039f20
@@ -451166,7 +451166,7 @@ _080F83B2:
 	thumb_func_end sub_80F8390
 
 	thumb_func_start sub_80F83D0
-sub_80F83D0: ; 80F83D0
+sub_80F83D0: @ 80F83D0
 	push {lr}
 	ldr r0, =sub_80D7B24
 	bl SetMainCallback2
@@ -451176,7 +451176,7 @@ sub_80F83D0: ; 80F83D0
 	thumb_func_end sub_80F83D0
 
 	thumb_func_start sub_80F83E0
-sub_80F83E0: ; 80F83E0
+sub_80F83E0: @ 80F83E0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -451197,7 +451197,7 @@ _080F83FE:
 	thumb_func_end sub_80F83E0
 
 	thumb_func_start sub_80F840C
-sub_80F840C: ; 80F840C
+sub_80F840C: @ 80F840C
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -451218,7 +451218,7 @@ sub_80F840C: ; 80F840C
 	thumb_func_end sub_80F840C
 
 	thumb_func_start sub_80F8438
-sub_80F8438: ; 80F8438
+sub_80F8438: @ 80F8438
 	ldr r2, =0x020375e0
 	ldr r1, =0x02039e00
 	ldr r0, =0x020375e4
@@ -451232,7 +451232,7 @@ sub_80F8438: ; 80F8438
 	thumb_func_end sub_80F8438
 
 	thumb_func_start sub_80F8458
-sub_80F8458: ; 80F8458
+sub_80F8458: @ 80F8458
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -451253,7 +451253,7 @@ _080F8476:
 	thumb_func_end sub_80F8458
 
 	thumb_func_start sub_80F8484
-sub_80F8484: ; 80F8484
+sub_80F8484: @ 80F8484
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -451274,7 +451274,7 @@ sub_80F8484: ; 80F8484
 	thumb_func_end sub_80F8484
 
 	thumb_func_start sub_80F84B0
-sub_80F84B0: ; 80F84B0
+sub_80F84B0: @ 80F84B0
 	ldr r0, =0x020375e0
 	ldr r1, =0x02039f25
 	ldrb r1, [r1]
@@ -451284,7 +451284,7 @@ sub_80F84B0: ; 80F84B0
 	thumb_func_end sub_80F84B0
 
 	thumb_func_start sub_80F84C4
-sub_80F84C4: ; 80F84C4
+sub_80F84C4: @ 80F84C4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -451314,7 +451314,7 @@ sub_80F84C4: ; 80F84C4
 	thumb_func_end sub_80F84C4
 
 	thumb_func_start sub_80F8508
-sub_80F8508: ; 80F8508
+sub_80F8508: @ 80F8508
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -451352,7 +451352,7 @@ _080F8556:
 	thumb_func_end sub_80F8508
 
 	thumb_func_start sub_80F8568
-sub_80F8568: ; 80F8568
+sub_80F8568: @ 80F8568
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -451365,7 +451365,7 @@ sub_80F8568: ; 80F8568
 	thumb_func_end sub_80F8568
 
 	thumb_func_start sub_80F8584
-sub_80F8584: ; 80F8584
+sub_80F8584: @ 80F8584
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -451378,7 +451378,7 @@ sub_80F8584: ; 80F8584
 	thumb_func_end sub_80F8584
 
 	thumb_func_start sub_80F85A0
-sub_80F85A0: ; 80F85A0
+sub_80F85A0: @ 80F85A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -451391,7 +451391,7 @@ sub_80F85A0: ; 80F85A0
 	thumb_func_end sub_80F85A0
 
 	thumb_func_start sub_80F85BC
-sub_80F85BC: ; 80F85BC
+sub_80F85BC: @ 80F85BC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -451510,7 +451510,7 @@ _080F8678:
 	thumb_func_end sub_80F85BC
 
 	thumb_func_start sub_80F86B8
-sub_80F86B8: ; 80F86B8
+sub_80F86B8: @ 80F86B8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -451528,7 +451528,7 @@ sub_80F86B8: ; 80F86B8
 	thumb_func_end sub_80F86B8
 
 	thumb_func_start sub_80F86E0
-sub_80F86E0: ; 80F86E0
+sub_80F86E0: @ 80F86E0
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r4, 0
@@ -451560,7 +451560,7 @@ _080F8708:
 	thumb_func_end sub_80F86E0
 
 	thumb_func_start sub_80F8714
-sub_80F8714: ; 80F8714
+sub_80F8714: @ 80F8714
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -451613,7 +451613,7 @@ _080F877E:
 	thumb_func_end sub_80F8714
 
 	thumb_func_start sub_80F878C
-sub_80F878C: ; 80F878C
+sub_80F878C: @ 80F878C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -451633,7 +451633,7 @@ sub_80F878C: ; 80F878C
 	thumb_func_end sub_80F878C
 
 	thumb_func_start sub_80F87B4
-sub_80F87B4: ; 80F87B4
+sub_80F87B4: @ 80F87B4
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -451652,7 +451652,7 @@ _080F87D0:
 	thumb_func_end sub_80F87B4
 
 	thumb_func_start sub_80F87D8
-sub_80F87D8: ; 80F87D8
+sub_80F87D8: @ 80F87D8
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -451680,7 +451680,7 @@ sub_80F87D8: ; 80F87D8
 	thumb_func_end sub_80F87D8
 
 	thumb_func_start sub_80F8814
-sub_80F8814: ; 80F8814
+sub_80F8814: @ 80F8814
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrb r0, [r0]
@@ -451717,7 +451717,7 @@ _080F8844:
 	thumb_func_end sub_80F8814
 
 	thumb_func_start sub_80F8850
-sub_80F8850: ; 80F8850
+sub_80F8850: @ 80F8850
 	push {lr}
 	bl sub_80F8264
 	bl sub_80F8290
@@ -451727,7 +451727,7 @@ sub_80F8850: ; 80F8850
 	thumb_func_end sub_80F8850
 
 	thumb_func_start sub_80F8864
-sub_80F8864: ; 80F8864
+sub_80F8864: @ 80F8864
 	push {lr}
 	ldr r0, =0x02039f2c
 	ldrh r0, [r0]
@@ -451785,7 +451785,7 @@ _080F88D2:
 	thumb_func_end sub_80F8864
 
 	thumb_func_start sub_80F88DC
-sub_80F88DC: ; 80F88DC
+sub_80F88DC: @ 80F88DC
 	push {lr}
 	movs r0, 0xFF
 	bl sub_80DEDA8
@@ -451794,7 +451794,7 @@ sub_80F88DC: ; 80F88DC
 	thumb_func_end sub_80F88DC
 
 	thumb_func_start sub_80F88E8
-sub_80F88E8: ; 80F88E8
+sub_80F88E8: @ 80F88E8
 	push {lr}
 	ldr r0, =0x02039f20
 	ldr r1, =0x02039f25
@@ -451830,7 +451830,7 @@ _080F8934:
 	thumb_func_end sub_80F88E8
 
 	thumb_func_start sub_80F8940
-sub_80F8940: ; 80F8940
+sub_80F8940: @ 80F8940
 	push {lr}
 	movs r3, 0
 	ldr r0, =0x03005d8c
@@ -451857,7 +451857,7 @@ _080F895A:
 	thumb_func_end sub_80F8940
 
 	thumb_func_start sub_80F8970
-sub_80F8970: ; 80F8970
+sub_80F8970: @ 80F8970
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -452034,7 +452034,7 @@ _080F8AB6:
 	thumb_func_end sub_80F8970
 
 	thumb_func_start sub_80F8ACC
-sub_80F8ACC: ; 80F8ACC
+sub_80F8ACC: @ 80F8ACC
 	push {lr}
 	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
 	bl SetMainCallback2
@@ -452044,7 +452044,7 @@ sub_80F8ACC: ; 80F8ACC
 	thumb_func_end sub_80F8ACC
 
 	thumb_func_start sub_80F8ADC
-sub_80F8ADC: ; 80F8ADC
+sub_80F8ADC: @ 80F8ADC
 	push {lr}
 	ldr r0, =sub_812FDEC
 	bl SetMainCallback2
@@ -452057,7 +452057,7 @@ sub_80F8ADC: ; 80F8ADC
 	thumb_func_end sub_80F8ADC
 
 	thumb_func_start sub_80F8AFC
-sub_80F8AFC: ; 80F8AFC
+sub_80F8AFC: @ 80F8AFC
 	push {r4,r5,lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452123,7 +452123,7 @@ _080F8B7C:
 	thumb_func_end sub_80F8AFC
 
 	thumb_func_start sub_80F8B94
-sub_80F8B94: ; 80F8B94
+sub_80F8B94: @ 80F8B94
 	push {r4-r7,lr}
 	ldr r1, =0x0300301c
 	movs r0, 0xC
@@ -452223,7 +452223,7 @@ _080F8C6E:
 	thumb_func_end sub_80F8B94
 
 	thumb_func_start sub_80F8C7C
-sub_80F8C7C: ; 80F8C7C
+sub_80F8C7C: @ 80F8C7C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02039f24
@@ -452295,13 +452295,13 @@ _080F8D1A:
 	thumb_func_end sub_80F8C7C
 
 	thumb_func_start sub_80F8D24
-sub_80F8D24: ; 80F8D24
+sub_80F8D24: @ 80F8D24
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80F8D24
 
 	thumb_func_start sub_80F8D28
-sub_80F8D28: ; 80F8D28
+sub_80F8D28: @ 80F8D28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -452472,7 +452472,7 @@ _080F8E9C:
 	thumb_func_end sub_80F8D28
 
 	thumb_func_start sub_80F8EB8
-sub_80F8EB8: ; 80F8EB8
+sub_80F8EB8: @ 80F8EB8
 	push {lr}
 	ldr r0, =sub_80F8EE8
 	bl get_task_id_by_function
@@ -452496,7 +452496,7 @@ _080F8EDC:
 	thumb_func_end sub_80F8EB8
 
 	thumb_func_start sub_80F8EE8
-sub_80F8EE8: ; 80F8EE8
+sub_80F8EE8: @ 80F8EE8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -452582,7 +452582,7 @@ _080F8F98:
 	thumb_func_end sub_80F8EE8
 
 	thumb_func_start sub_80F8FA0
-sub_80F8FA0: ; 80F8FA0
+sub_80F8FA0: @ 80F8FA0
 	push {r4,lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452617,7 +452617,7 @@ _080F8FDE:
 	thumb_func_end sub_80F8FA0
 
 	thumb_func_start sub_80F8FE8
-sub_80F8FE8: ; 80F8FE8
+sub_80F8FE8: @ 80F8FE8
 	push {r4,lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452652,7 +452652,7 @@ _080F902A:
 	thumb_func_end sub_80F8FE8
 
 	thumb_func_start sub_80F903C
-sub_80F903C: ; 80F903C
+sub_80F903C: @ 80F903C
 	ldr r2, =0x030060b8
 	ldr r1, [r2]
 	ldr r0, =0x41c64e6d
@@ -452666,7 +452666,7 @@ sub_80F903C: ; 80F903C
 	thumb_func_end sub_80F903C
 
 	thumb_func_start sub_80F905C
-sub_80F905C: ; 80F905C
+sub_80F905C: @ 80F905C
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452689,7 +452689,7 @@ _080F907E:
 	thumb_func_end sub_80F905C
 
 	thumb_func_start sub_80F9088
-sub_80F9088: ; 80F9088
+sub_80F9088: @ 80F9088
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -452731,7 +452731,7 @@ _080F90D4:
 	thumb_func_end sub_80F9088
 
 	thumb_func_start sub_80F90DC
-sub_80F90DC: ; 80F90DC
+sub_80F90DC: @ 80F90DC
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452754,7 +452754,7 @@ _080F90FE:
 	thumb_func_end sub_80F90DC
 
 	thumb_func_start sub_80F910C
-sub_80F910C: ; 80F910C
+sub_80F910C: @ 80F910C
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452774,7 +452774,7 @@ _080F9126:
 	thumb_func_end sub_80F910C
 
 	thumb_func_start sub_80F9134
-sub_80F9134: ; 80F9134
+sub_80F9134: @ 80F9134
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452793,7 +452793,7 @@ _080F914E:
 	thumb_func_end sub_80F9134
 
 	thumb_func_start sub_80F9154
-sub_80F9154: ; 80F9154
+sub_80F9154: @ 80F9154
 	ldr r1, =0x02039f2a
 	movs r0, 0
 	strb r0, [r1]
@@ -452802,7 +452802,7 @@ sub_80F9154: ; 80F9154
 	thumb_func_end sub_80F9154
 
 	thumb_func_start sub_80F9160
-sub_80F9160: ; 80F9160
+sub_80F9160: @ 80F9160
 	push {lr}
 	ldr r0, =0x02039f2a
 	ldrb r1, [r0]
@@ -452821,7 +452821,7 @@ _080F917A:
 	thumb_func_end sub_80F9160
 
 	thumb_func_start sp000_heal_pokemon
-sp000_heal_pokemon: ; 80F9180
+sp000_heal_pokemon: @ 80F9180
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -452916,8 +452916,8 @@ _080F922C:
 	thumb_func_end sp000_heal_pokemon
 
 	thumb_func_start sub_80F9244
-; void sub_80F9244(s16 species_num, u8 level, int held_item)
-sub_80F9244: ; 80F9244
+@ void sub_80F9244(s16 species_num, u8 level, int held_item)
+sub_80F9244: @ 80F9244
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -452981,7 +452981,7 @@ _080F92B8:
 	thumb_func_end sub_80F9244
 
 	thumb_func_start sub_80F92C8
-sub_80F92C8: ; 80F92C8
+sub_80F92C8: @ 80F92C8
 	push {lr}
 	sub sp, 0x68
 	adds r1, r0, 0
@@ -453006,7 +453006,7 @@ sub_80F92C8: ; 80F92C8
 	thumb_func_end sub_80F92C8
 
 	thumb_func_start sub_80F92F8
-sub_80F92F8: ; 80F92F8
+sub_80F92F8: @ 80F92F8
 	push {lr}
 	bl sub_806B5C4
 	lsls r0, 24
@@ -453031,7 +453031,7 @@ _080F9318:
 	thumb_func_end sub_80F92F8
 
 	thumb_func_start sub_80F9320
-sub_80F9320: ; 80F9320
+sub_80F9320: @ 80F9320
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -453073,7 +453073,7 @@ _080F9368:
 	thumb_func_end sub_80F9320
 
 	thumb_func_start sub_80F9370
-sub_80F9370: ; 80F9370
+sub_80F9370: @ 80F9370
 	push {r4,lr}
 	movs r0, 0xAF
 	bl sub_80F9320
@@ -453097,7 +453097,7 @@ _080F9392:
 	thumb_func_end sub_80F9370
 
 	thumb_func_start sub_80F93A0
-sub_80F93A0: ; 80F93A0
+sub_80F93A0: @ 80F93A0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -453145,7 +453145,7 @@ _080F93EE:
 	thumb_func_end sub_80F93A0
 
 	thumb_func_start sub_80F9400
-sub_80F9400: ; 80F9400
+sub_80F9400: @ 80F9400
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -453174,7 +453174,7 @@ _080F941C:
 	thumb_func_end sub_80F9400
 
 	thumb_func_start sub_80F9438
-sub_80F9438: ; 80F9438
+sub_80F9438: @ 80F9438
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, =sub_80F9460
@@ -453190,7 +453190,7 @@ sub_80F9438: ; 80F9438
 	thumb_func_end sub_80F9438
 
 	thumb_func_start sub_80F9460
-sub_80F9460: ; 80F9460
+sub_80F9460: @ 80F9460
 	push {lr}
 	ldr r0, =0x0203cef8
 	ldrb r1, [r0]
@@ -453213,7 +453213,7 @@ _080F947E:
 	thumb_func_end sub_80F9460
 
 	thumb_func_start sub_80F9490
-sub_80F9490: ; 80F9490
+sub_80F9490: @ 80F9490
 	push {lr}
 	ldr r1, =0x030022c0
 	ldr r0, =sub_80F94B8
@@ -453230,7 +453230,7 @@ sub_80F9490: ; 80F9490
 	thumb_func_end sub_80F9490
 
 	thumb_func_start sub_80F94B8
-sub_80F94B8: ; 80F94B8
+sub_80F94B8: @ 80F94B8
 	push {lr}
 	ldr r0, =0x0203cef8
 	ldrb r1, [r0]
@@ -453253,7 +453253,7 @@ _080F94D6:
 	thumb_func_end sub_80F94B8
 
 	thumb_func_start sub_80F94E8
-sub_80F94E8: ; 80F94E8
+sub_80F94E8: @ 80F94E8
 	push {r4-r7,lr}
 	sub sp, 0x198
 	add r0, sp, 0x190
@@ -453311,7 +453311,7 @@ _080F9538:
 	thumb_func_end sub_80F94E8
 
 	thumb_func_start sub_80F9568
-sub_80F9568: ; 80F9568
+sub_80F9568: @ 80F9568
 	push {lr}
 	movs r1, 0x41
 	bl pokemon_getattr
@@ -453334,7 +453334,7 @@ _080F9586:
 	thumb_func_end sub_80F9568
 
 	thumb_func_start sub_80F958C
-sub_80F958C: ; 80F958C
+sub_80F958C: @ 80F958C
 	push {r4,r5,lr}
 	ldr r4, =0x020244ec
 	movs r5, 0
@@ -453364,7 +453364,7 @@ _080F95BA:
 	thumb_func_end sub_80F958C
 
 	thumb_func_start sub_80F95C0
-sub_80F95C0: ; 80F95C0
+sub_80F95C0: @ 80F95C0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -453398,7 +453398,7 @@ sub_80F95C0: ; 80F95C0
 	thumb_func_end sub_80F95C0
 
 	thumb_func_start sub_80F960C
-sub_80F960C: ; 80F960C
+sub_80F960C: @ 80F960C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -453435,7 +453435,7 @@ _080F964E:
 	thumb_func_end sub_80F960C
 
 	thumb_func_start sub_80F9654
-sub_80F9654: ; 80F9654
+sub_80F9654: @ 80F9654
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -453543,7 +453543,7 @@ _080F9722:
 	thumb_func_end sub_80F9654
 
 	thumb_func_start sub_80F972C
-sub_80F972C: ; 80F972C
+sub_80F972C: @ 80F972C
 	push {lr}
 	ldr r0, =sub_80F9654
 	movs r1, 0x50
@@ -453555,7 +453555,7 @@ sub_80F972C: ; 80F972C
 	thumb_func_end sub_80F972C
 
 	thumb_func_start overworld_poison
-overworld_poison: ; 80F9744
+overworld_poison: @ 80F9744
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r4, =0x020244ec
@@ -453626,7 +453626,7 @@ _080F97BE:
 	thumb_func_end overworld_poison
 
 	thumb_func_start sub_80F97C8
-sub_80F97C8: ; 80F97C8
+sub_80F97C8: @ 80F97C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -453705,7 +453705,7 @@ sub_80F97C8: ; 80F97C8
 	thumb_func_end sub_80F97C8
 
 	thumb_func_start sub_80F986C
-sub_80F986C: ; 80F986C
+sub_80F986C: @ 80F986C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -453735,7 +453735,7 @@ _080F9898:
 	thumb_func_end sub_80F986C
 
 	thumb_func_start sub_80F989C
-sub_80F989C: ; 80F989C
+sub_80F989C: @ 80F989C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r1, 0
@@ -453789,7 +453789,7 @@ sub_80F989C: ; 80F989C
 	thumb_func_end sub_80F989C
 
 	thumb_func_start sub_80F9910
-sub_80F9910: ; 80F9910
+sub_80F9910: @ 80F9910
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 2
@@ -453839,7 +453839,7 @@ _080F9980: .4byte gUnknown_085EED24
 	thumb_func_end sub_80F9910
 
 	thumb_func_start sub_80F9984
-sub_80F9984: ; 80F9984
+sub_80F9984: @ 80F9984
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r1, 0
@@ -453907,7 +453907,7 @@ _080F9A0A:
 	thumb_func_end sub_80F9984
 
 	thumb_func_start sub_80F9A14
-sub_80F9A14: ; 80F9A14
+sub_80F9A14: @ 80F9A14
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -453948,7 +453948,7 @@ _080F9A6E:
 	thumb_func_end sub_80F9A14
 
 	thumb_func_start sub_80F9A7C
-sub_80F9A7C: ; 80F9A7C
+sub_80F9A7C: @ 80F9A7C
 	push {lr}
 	ldr r0, =0x00004047
 	movs r1, 0x80
@@ -453960,7 +453960,7 @@ sub_80F9A7C: ; 80F9A7C
 	thumb_func_end sub_80F9A7C
 
 	thumb_func_start sub_80F9A90
-sub_80F9A90: ; 80F9A90
+sub_80F9A90: @ 80F9A90
 	push {lr}
 	ldr r0, =0x00004047
 	bl GetVarPointer
@@ -453974,7 +453974,7 @@ sub_80F9A90: ; 80F9A90
 	thumb_func_end sub_80F9A90
 
 	thumb_func_start sub_80F9AAC
-sub_80F9AAC: ; 80F9AAC
+sub_80F9AAC: @ 80F9AAC
 	push {r4,lr}
 	ldr r0, =0x00004047
 	bl GetVarPointer
@@ -453993,7 +453993,7 @@ sub_80F9AAC: ; 80F9AAC
 	thumb_func_end sub_80F9AAC
 
 	thumb_func_start sub_80F9AD4
-sub_80F9AD4: ; 80F9AD4
+sub_80F9AD4: @ 80F9AD4
 	push {lr}
 	ldr r0, =0x0000404f
 	movs r1, 0x80
@@ -454005,7 +454005,7 @@ sub_80F9AD4: ; 80F9AD4
 	thumb_func_end sub_80F9AD4
 
 	thumb_func_start sub_80F9AE8
-sub_80F9AE8: ; 80F9AE8
+sub_80F9AE8: @ 80F9AE8
 	push {lr}
 	ldr r0, =0x0000404f
 	bl GetVarPointer
@@ -454018,7 +454018,7 @@ sub_80F9AE8: ; 80F9AE8
 	thumb_func_end sub_80F9AE8
 
 	thumb_func_start sub_80F9B04
-sub_80F9B04: ; 80F9B04
+sub_80F9B04: @ 80F9B04
 	push {r4,lr}
 	ldr r0, =0x0000404f
 	bl GetVarPointer
@@ -454036,7 +454036,7 @@ sub_80F9B04: ; 80F9B04
 	thumb_func_end sub_80F9B04
 
 	thumb_func_start sub_80F9B30
-sub_80F9B30: ; 80F9B30
+sub_80F9B30: @ 80F9B30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -454107,7 +454107,7 @@ _080F9BAC:
 	thumb_func_end sub_80F9B30
 
 	thumb_func_start sub_80F9BCC
-sub_80F9BCC: ; 80F9BCC
+sub_80F9BCC: @ 80F9BCC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -454129,7 +454129,7 @@ sub_80F9BCC: ; 80F9BCC
 	thumb_func_end sub_80F9BCC
 
 	thumb_func_start sub_80F9BF4
-sub_80F9BF4: ; 80F9BF4
+sub_80F9BF4: @ 80F9BF4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -454151,7 +454151,7 @@ sub_80F9BF4: ; 80F9BF4
 	thumb_func_end sub_80F9BF4
 
 	thumb_func_start sub_80F9C1C
-sub_80F9C1C: ; 80F9C1C
+sub_80F9C1C: @ 80F9C1C
 	push {lr}
 	ldr r0, =sub_80F9C90
 	bl is_function_an_active_task
@@ -454163,7 +454163,7 @@ sub_80F9C1C: ; 80F9C1C
 	thumb_func_end sub_80F9C1C
 
 	thumb_func_start sub_80F9C30
-sub_80F9C30: ; 80F9C30
+sub_80F9C30: @ 80F9C30
 	push {lr}
 	ldr r0, =sub_80F9DFC
 	bl is_function_an_active_task
@@ -454175,7 +454175,7 @@ sub_80F9C30: ; 80F9C30
 	thumb_func_end sub_80F9C30
 
 	thumb_func_start sub_80F9C44
-sub_80F9C44: ; 80F9C44
+sub_80F9C44: @ 80F9C44
 	push {r4,r5,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -454216,7 +454216,7 @@ _080F9C7C:
 	thumb_func_end sub_80F9C44
 
 	thumb_func_start sub_80F9C90
-sub_80F9C90: ; 80F9C90
+sub_80F9C90: @ 80F9C90
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -454393,7 +454393,7 @@ _080F9DF4:
 	thumb_func_end sub_80F9C90
 
 	thumb_func_start sub_80F9DFC
-sub_80F9DFC: ; 80F9DFC
+sub_80F9DFC: @ 80F9DFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -454566,7 +454566,7 @@ _080F9F54:
 	thumb_func_end sub_80F9DFC
 
 	thumb_func_start sub_80F9F5C
-sub_80F9F5C: ; 80F9F5C
+sub_80F9F5C: @ 80F9F5C
 	push {lr}
 	ldr r0, =0x0203ab40
 	ldr r1, =0x02037318
@@ -454579,7 +454579,7 @@ sub_80F9F5C: ; 80F9F5C
 	thumb_func_end sub_80F9F5C
 
 	thumb_func_start sub_80F9F78
-sub_80F9F78: ; 80F9F78
+sub_80F9F78: @ 80F9F78
 	push {lr}
 	ldr r0, =0x02037590
 	ldrb r1, [r0]
@@ -454661,7 +454661,7 @@ _080F9FFE:
 	thumb_func_end sub_80F9F78
 
 	thumb_func_start sub_80FA004
-sub_80FA004: ; 80FA004
+sub_80FA004: @ 80FA004
 	push {r4,lr}
 	bl sub_80E8BC8
 	ldr r0, =0x020375f0
@@ -454741,7 +454741,7 @@ _080FA0C4:
 	thumb_func_end sub_80FA004
 
 	thumb_func_start sub_80FA0DC
-sub_80FA0DC: ; 80FA0DC
+sub_80FA0DC: @ 80FA0DC
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -454756,7 +454756,7 @@ sub_80FA0DC: ; 80FA0DC
 	thumb_func_end sub_80FA0DC
 
 	thumb_func_start oei_sweet_scent
-oei_sweet_scent: ; 80FA0FC
+oei_sweet_scent: @ 80FA0FC
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -454777,7 +454777,7 @@ oei_sweet_scent: ; 80FA0FC
 	thumb_func_end oei_sweet_scent
 
 	thumb_func_start sub_80FA128
-sub_80FA128: ; 80FA128
+sub_80FA128: @ 80FA128
 	push {lr}
 	movs r0, 0xB
 	bl FieldEffectActiveListRemove
@@ -454788,7 +454788,7 @@ sub_80FA128: ; 80FA128
 	thumb_func_end sub_80FA128
 
 	thumb_func_start sub_80FA13C
-sub_80FA13C: ; 80FA13C
+sub_80FA13C: @ 80FA13C
 	push {r4,lr}
 	bl sub_80F9F78
 	ldr r0, =gUnknown_0858E600
@@ -454822,7 +454822,7 @@ sub_80FA13C: ; 80FA13C
 	thumb_func_end sub_80FA13C
 
 	thumb_func_start sub_80FA18C
-sub_80FA18C: ; 80FA18C
+sub_80FA18C: @ 80FA18C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x83
@@ -454838,7 +454838,7 @@ sub_80FA18C: ; 80FA18C
 	thumb_func_end sub_80FA18C
 
 	thumb_func_start sub_80FA1A8
-sub_80FA1A8: ; 80FA1A8
+sub_80FA1A8: @ 80FA1A8
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x2E]
@@ -454866,7 +454866,7 @@ _080FA1D0:
 	thumb_func_end sub_80FA1A8
 
 	thumb_func_start sub_80FA1D8
-sub_80FA1D8: ; 80FA1D8
+sub_80FA1D8: @ 80FA1D8
 	push {lr}
 	movs r1, 0x37
 	bl FieldEffectStop
@@ -454876,7 +454876,7 @@ sub_80FA1D8: ; 80FA1D8
 	thumb_func_end sub_80FA1D8
 
 	thumb_func_start sub_80FA1E8
-sub_80FA1E8: ; 80FA1E8
+sub_80FA1E8: @ 80FA1E8
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -454891,7 +454891,7 @@ sub_80FA1E8: ; 80FA1E8
 	thumb_func_end sub_80FA1E8
 
 	thumb_func_start sub_80FA208
-sub_80FA208: ; 80FA208
+sub_80FA208: @ 80FA208
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -454912,7 +454912,7 @@ sub_80FA208: ; 80FA208
 	thumb_func_end sub_80FA208
 
 	thumb_func_start sub_80FA234
-sub_80FA234: ; 80FA234
+sub_80FA234: @ 80FA234
 	push {lr}
 	movs r0, 0x1A
 	bl FieldEffectActiveListRemove
@@ -454923,7 +454923,7 @@ sub_80FA234: ; 80FA234
 	thumb_func_end sub_80FA234
 
 	thumb_func_start sub_80FA248
-sub_80FA248: ; 80FA248
+sub_80FA248: @ 80FA248
 	push {r4,lr}
 	ldr r1, =0x0203ab40
 	movs r2, 0
@@ -454987,7 +454987,7 @@ _080FA2B6:
 	thumb_func_end sub_80FA248
 
 	thumb_func_start sub_80FA2D8
-sub_80FA2D8: ; 80FA2D8
+sub_80FA2D8: @ 80FA2D8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x9B
@@ -455008,7 +455008,7 @@ sub_80FA2D8: ; 80FA2D8
 	thumb_func_end sub_80FA2D8
 
 	thumb_func_start sub_80FA304
-sub_80FA304: ; 80FA304
+sub_80FA304: @ 80FA304
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -455039,7 +455039,7 @@ _080FA32E:
 	thumb_func_end sub_80FA304
 
 	thumb_func_start sub_80FA33C
-sub_80FA33C: ; 80FA33C
+sub_80FA33C: @ 80FA33C
 	push {lr}
 	movs r1, 0x38
 	bl FieldEffectStop
@@ -455049,7 +455049,7 @@ sub_80FA33C: ; 80FA33C
 	thumb_func_end sub_80FA33C
 
 	thumb_func_start sub_80FA34C
-sub_80FA34C: ; 80FA34C
+sub_80FA34C: @ 80FA34C
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -455064,7 +455064,7 @@ sub_80FA34C: ; 80FA34C
 	thumb_func_end sub_80FA34C
 
 	thumb_func_start sub_80FA36C
-sub_80FA36C: ; 80FA36C
+sub_80FA36C: @ 80FA36C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -455085,7 +455085,7 @@ sub_80FA36C: ; 80FA36C
 	thumb_func_end sub_80FA36C
 
 	thumb_func_start sub_80FA398
-sub_80FA398: ; 80FA398
+sub_80FA398: @ 80FA398
 	push {lr}
 	movs r0, 0x1B
 	bl FieldEffectActiveListRemove
@@ -455096,7 +455096,7 @@ sub_80FA398: ; 80FA398
 	thumb_func_end sub_80FA398
 
 	thumb_func_start sub_80FA3AC
-sub_80FA3AC: ; 80FA3AC
+sub_80FA3AC: @ 80FA3AC
 	push {r4,lr}
 	bl sub_80F9F78
 	ldr r0, =gUnknown_0858E630
@@ -455130,7 +455130,7 @@ sub_80FA3AC: ; 80FA3AC
 	thumb_func_end sub_80FA3AC
 
 	thumb_func_start sub_80FA3FC
-sub_80FA3FC: ; 80FA3FC
+sub_80FA3FC: @ 80FA3FC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xA9
@@ -455146,7 +455146,7 @@ sub_80FA3FC: ; 80FA3FC
 	thumb_func_end sub_80FA3FC
 
 	thumb_func_start sub_80FA418
-sub_80FA418: ; 80FA418
+sub_80FA418: @ 80FA418
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x2E]
@@ -455174,7 +455174,7 @@ _080FA440:
 	thumb_func_end sub_80FA418
 
 	thumb_func_start sub_80FA448
-sub_80FA448: ; 80FA448
+sub_80FA448: @ 80FA448
 	push {lr}
 	movs r1, 0x39
 	bl FieldEffectStop
@@ -455184,7 +455184,7 @@ sub_80FA448: ; 80FA448
 	thumb_func_end sub_80FA448
 
 	thumb_func_start sub_80FA458
-sub_80FA458: ; 80FA458
+sub_80FA458: @ 80FA458
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -455218,7 +455218,7 @@ sub_80FA458: ; 80FA458
 	thumb_func_end sub_80FA458
 
 	thumb_func_start sub_80FA4A0
-sub_80FA4A0: ; 80FA4A0
+sub_80FA4A0: @ 80FA4A0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -455311,7 +455311,7 @@ _080FA574:
 	thumb_func_end sub_80FA4A0
 
 	thumb_func_start sub_80FA57C
-sub_80FA57C: ; 80FA57C
+sub_80FA57C: @ 80FA57C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -455359,7 +455359,7 @@ _080FA5C8:
 	thumb_func_end sub_80FA57C
 
 	thumb_func_start sub_80FA5E4
-sub_80FA5E4: ; 80FA5E4
+sub_80FA5E4: @ 80FA5E4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -455394,7 +455394,7 @@ sub_80FA5E4: ; 80FA5E4
 	thumb_func_end sub_80FA5E4
 
 	thumb_func_start sub_80FA62C
-sub_80FA62C: ; 80FA62C
+sub_80FA62C: @ 80FA62C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -455460,7 +455460,7 @@ _080FA6A4:
 	thumb_func_end sub_80FA62C
 
 	thumb_func_start sub_80FA6AC
-sub_80FA6AC: ; 80FA6AC
+sub_80FA6AC: @ 80FA6AC
 	push {lr}
 	lsls r0, 16
 	asrs r1, r0, 16
@@ -455505,19 +455505,19 @@ _080FA6F6:
 	thumb_func_end sub_80FA6AC
 
 	thumb_func_start sub_80FA6FC
-sub_80FA6FC: ; 80FA6FC
+sub_80FA6FC: @ 80FA6FC
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80FA6FC
 
 	thumb_func_start sub_80FA700
-sub_80FA700: ; 80FA700
+sub_80FA700: @ 80FA700
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_80FA700
 
 	thumb_func_start sub_80FA704
-sub_80FA704: ; 80FA704
+sub_80FA704: @ 80FA704
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -455553,7 +455553,7 @@ sub_80FA704: ; 80FA704
 	thumb_func_end sub_80FA704
 
 	thumb_func_start sub_80FA754
-sub_80FA754: ; 80FA754
+sub_80FA754: @ 80FA754
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -455586,7 +455586,7 @@ _080FA78C:
 	thumb_func_end sub_80FA754
 
 	thumb_func_start sub_80FA794
-sub_80FA794: ; 80FA794
+sub_80FA794: @ 80FA794
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -455630,7 +455630,7 @@ _080FA7DE:
 	thumb_func_end sub_80FA794
 
 	thumb_func_start sub_80FA7EC
-sub_80FA7EC: ; 80FA7EC
+sub_80FA7EC: @ 80FA7EC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -455769,7 +455769,7 @@ _080FA96A:
 	thumb_func_end sub_80FA7EC
 
 	thumb_func_start sub_80FA970
-sub_80FA970: ; 80FA970
+sub_80FA970: @ 80FA970
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -455794,7 +455794,7 @@ sub_80FA970: ; 80FA970
 	thumb_func_end sub_80FA970
 
 	thumb_func_start sub_80FA9A4
-sub_80FA9A4: ; 80FA9A4
+sub_80FA9A4: @ 80FA9A4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -455820,7 +455820,7 @@ _080FA9CA:
 	thumb_func_end sub_80FA9A4
 
 	thumb_func_start sub_80FA9D0
-sub_80FA9D0: ; 80FA9D0
+sub_80FA9D0: @ 80FA9D0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r3, =0x02037350
@@ -455899,7 +455899,7 @@ _080FAA5E:
 	thumb_func_end sub_80FA9D0
 
 	thumb_func_start sub_80FAA7C
-sub_80FAA7C: ; 80FAA7C
+sub_80FAA7C: @ 80FAA7C
 	push {r4,lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -456026,7 +456026,7 @@ _080FAB8C:
 	thumb_func_end sub_80FAA7C
 
 	thumb_func_start door_restore_tilemap
-door_restore_tilemap: ; 80FABA4
+door_restore_tilemap: @ 80FABA4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x83
@@ -456077,7 +456077,7 @@ _080FABEA:
 	thumb_func_end door_restore_tilemap
 
 	thumb_func_start sub_80FAC24
-sub_80FAC24: ; 80FAC24
+sub_80FAC24: @ 80FAC24
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x2E]
@@ -456109,7 +456109,7 @@ _080FAC54:
 	thumb_func_end sub_80FAC24
 
 	thumb_func_start sub_80FAC68
-sub_80FAC68: ; 80FAC68
+sub_80FAC68: @ 80FAC68
 	push {lr}
 	movs r1, 0x34
 	bl FieldEffectStop
@@ -456119,7 +456119,7 @@ sub_80FAC68: ; 80FAC68
 	thumb_func_end sub_80FAC68
 
 	thumb_func_start sub_80FAC78
-sub_80FAC78: ; 80FAC78
+sub_80FAC78: @ 80FAC78
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -456259,7 +456259,7 @@ _080FADCE:
 	thumb_func_end sub_80FAC78
 
 	thumb_func_start sub_80FADE4
-sub_80FADE4: ; 80FADE4
+sub_80FADE4: @ 80FADE4
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -456302,7 +456302,7 @@ _080FAE2A:
 	thumb_func_end sub_80FADE4
 
 	thumb_func_start task50_overworld_posion_effect
-task50_overworld_posion_effect: ; 80FAE38
+task50_overworld_posion_effect: @ 80FAE38
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -456364,7 +456364,7 @@ _080FAEA2:
 	thumb_func_end task50_overworld_posion_effect
 
 	thumb_func_start overworld_posion_effect
-overworld_posion_effect: ; 80FAEA8
+overworld_posion_effect: @ 80FAEA8
 	push {lr}
 	movs r0, 0x4F
 	bl audio_play
@@ -456377,7 +456377,7 @@ overworld_posion_effect: ; 80FAEA8
 	thumb_func_end overworld_posion_effect
 
 	thumb_func_start c3_80A0DD8_is_running
-c3_80A0DD8_is_running: ; 80FAEC0
+c3_80A0DD8_is_running: @ 80FAEC0
 	push {lr}
 	ldr r0, =task50_overworld_posion_effect
 	bl is_function_an_active_task
@@ -456389,7 +456389,7 @@ c3_80A0DD8_is_running: ; 80FAEC0
 	thumb_func_end c3_80A0DD8_is_running
 
 	thumb_func_start sub_80FAED4
-sub_80FAED4: ; 80FAED4
+sub_80FAED4: @ 80FAED4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -456404,7 +456404,7 @@ sub_80FAED4: ; 80FAED4
 	thumb_func_end sub_80FAED4
 
 	thumb_func_start sub_80FAEF0
-sub_80FAEF0: ; 80FAEF0
+sub_80FAEF0: @ 80FAEF0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -456454,7 +456454,7 @@ _080FAF4E:
 	thumb_func_end sub_80FAEF0
 
 	thumb_func_start sub_80FAF64
-sub_80FAF64: ; 80FAF64
+sub_80FAF64: @ 80FAF64
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -456504,7 +456504,7 @@ _080FAFC8:
 	thumb_func_end sub_80FAF64
 
 	thumb_func_start sub_80FAFD4
-sub_80FAFD4: ; 80FAFD4
+sub_80FAFD4: @ 80FAFD4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -456522,7 +456522,7 @@ sub_80FAFD4: ; 80FAFD4
 	thumb_func_end sub_80FAFD4
 
 	thumb_func_start sub_80FAFF8
-sub_80FAFF8: ; 80FAFF8
+sub_80FAFF8: @ 80FAFF8
 	push {lr}
 	ldr r0, =sub_80FAED4
 	movs r1, 0x50
@@ -456533,7 +456533,7 @@ sub_80FAFF8: ; 80FAFF8
 	thumb_func_end sub_80FAFF8
 
 	thumb_func_start sub_80FB00C
-sub_80FB00C: ; 80FB00C
+sub_80FB00C: @ 80FB00C
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0858E864
 	bl LoadTaggedObjectPalette
@@ -456582,7 +456582,7 @@ _080FB06E:
 	thumb_func_end sub_80FB00C
 
 	thumb_func_start sub_80FB074
-sub_80FB074: ; 80FB074
+sub_80FB074: @ 80FB074
 	push {r4-r7,lr}
 	ldr r4, =0x02020630
 	adds r7, r4, 0
@@ -456613,7 +456613,7 @@ _080FB098:
 	thumb_func_end sub_80FB074
 
 	thumb_func_start sub_80FB0B0
-sub_80FB0B0: ; 80FB0B0
+sub_80FB0B0: @ 80FB0B0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x78
@@ -456640,7 +456640,7 @@ _080FB0D6:
 	thumb_func_end sub_80FB0B0
 
 	thumb_func_start sub_80FB0DC
-sub_80FB0DC: ; 80FB0DC
+sub_80FB0DC: @ 80FB0DC
 	push {lr}
 	adds r0, 0x78
 	movs r1, 0xB4
@@ -456658,7 +456658,7 @@ _080FB0F2:
 	thumb_func_end sub_80FB0DC
 
 	thumb_func_start sub_80FB0F8
-sub_80FB0F8: ; 80FB0F8
+sub_80FB0F8: @ 80FB0F8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -456738,7 +456738,7 @@ _080FB180:
 	thumb_func_end sub_80FB0F8
 
 	thumb_func_start sub_80FB1AC
-sub_80FB1AC: ; 80FB1AC
+sub_80FB1AC: @ 80FB1AC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -456866,7 +456866,7 @@ _080FB2A8:
 	thumb_func_end sub_80FB1AC
 
 	thumb_func_start sub_80FB2C0
-sub_80FB2C0: ; 80FB2C0
+sub_80FB2C0: @ 80FB2C0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -456949,7 +456949,7 @@ _080FB358:
 	thumb_func_end sub_80FB2C0
 
 	thumb_func_start sub_80FB36C
-sub_80FB36C: ; 80FB36C
+sub_80FB36C: @ 80FB36C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -457118,7 +457118,7 @@ _080FB4D8:
 	thumb_func_end sub_80FB36C
 
 	thumb_func_start sub_80FB4E0
-sub_80FB4E0: ; 80FB4E0
+sub_80FB4E0: @ 80FB4E0
 	push {lr}
 	sub sp, 0x4
 	ldr r2, =0x0000020d
@@ -457151,7 +457151,7 @@ sub_80FB4E0: ; 80FB4E0
 	thumb_func_end sub_80FB4E0
 
 	thumb_func_start sub_80FB540
-sub_80FB540: ; 80FB540
+sub_80FB540: @ 80FB540
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r0, =sub_80FB36C
@@ -457194,7 +457194,7 @@ _080FB58A:
 	thumb_func_end sub_80FB540
 
 	thumb_func_start sub_80FB59C
-sub_80FB59C: ; 80FB59C
+sub_80FB59C: @ 80FB59C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	mov r4, sp
@@ -457236,7 +457236,7 @@ _080FB5E0:
 	thumb_func_end sub_80FB59C
 
 	thumb_func_start sub_80FB5E8
-sub_80FB5E8: ; 80FB5E8
+sub_80FB5E8: @ 80FB5E8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -457361,7 +457361,7 @@ _080FB6E2:
 	thumb_func_end sub_80FB5E8
 
 	thumb_func_start sub_80FB6EC
-sub_80FB6EC: ; 80FB6EC
+sub_80FB6EC: @ 80FB6EC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =DummyObjectCallback
@@ -457416,7 +457416,7 @@ _080FB75E:
 	thumb_func_end sub_80FB6EC
 
 	thumb_func_start sub_80FB768
-sub_80FB768: ; 80FB768
+sub_80FB768: @ 80FB768
 	push {lr}
 	bl sub_80FB6EC
 	ldr r2, =0x02037350
@@ -457441,7 +457441,7 @@ sub_80FB768: ; 80FB768
 	thumb_func_end sub_80FB768
 
 	thumb_func_start sub_80FB7A4
-sub_80FB7A4: ; 80FB7A4
+sub_80FB7A4: @ 80FB7A4
 	push {lr}
 	ldr r0, =0x0000088d
 	bl FlagSet
@@ -457468,7 +457468,7 @@ sub_80FB7A4: ; 80FB7A4
 	thumb_func_end sub_80FB7A4
 
 	thumb_func_start GetCurrentMapRotatingGatePuzzleType
-GetCurrentMapRotatingGatePuzzleType: ; 80FB7E8
+GetCurrentMapRotatingGatePuzzleType: @ 80FB7E8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -457495,7 +457495,7 @@ _080FB812:
 	thumb_func_end GetCurrentMapRotatingGatePuzzleType
 
 	thumb_func_start sub_80FB818
-sub_80FB818: ; 80FB818
+sub_80FB818: @ 80FB818
 	push {r4-r6,lr}
 	movs r0, 0x80
 	lsls r0, 7
@@ -457526,7 +457526,7 @@ _080FB844:
 	thumb_func_end sub_80FB818
 
 	thumb_func_start sub_80FB854
-sub_80FB854: ; 80FB854
+sub_80FB854: @ 80FB854
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -457542,7 +457542,7 @@ sub_80FB854: ; 80FB854
 	thumb_func_end sub_80FB854
 
 	thumb_func_start sub_80FB870
-sub_80FB870: ; 80FB870
+sub_80FB870: @ 80FB870
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -457561,7 +457561,7 @@ sub_80FB870: ; 80FB870
 	thumb_func_end sub_80FB870
 
 	thumb_func_start sub_80FB890
-sub_80FB890: ; 80FB890
+sub_80FB890: @ 80FB890
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -457597,7 +457597,7 @@ _080FB8C0:
 	thumb_func_end sub_80FB890
 
 	thumb_func_start sub_80FB8CC
-sub_80FB8CC: ; 80FB8CC
+sub_80FB8CC: @ 80FB8CC
 	push {lr}
 	bl GetCurrentMapRotatingGatePuzzleType
 	cmp r0, 0x1
@@ -457639,7 +457639,7 @@ _080FB914:
 	thumb_func_end sub_80FB8CC
 
 	thumb_func_start sub_80FB928
-sub_80FB928: ; 80FB928
+sub_80FB928: @ 80FB928
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -457743,7 +457743,7 @@ _080FB9DA:
 	thumb_func_end sub_80FB928
 
 	thumb_func_start sub_80FB9FC
-sub_80FB9FC: ; 80FB9FC
+sub_80FB9FC: @ 80FB9FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -457855,7 +457855,7 @@ _080FBAD6:
 	thumb_func_end sub_80FB9FC
 
 	thumb_func_start sub_80FBAE4
-sub_80FBAE4: ; 80FBAE4
+sub_80FBAE4: @ 80FBAE4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldrh r0, [r6, 0x30]
@@ -457919,7 +457919,7 @@ _080FBB58:
 	thumb_func_end sub_80FBAE4
 
 	thumb_func_start sub_80FBB64
-sub_80FBB64: ; 80FBB64
+sub_80FBB64: @ 80FBB64
 	push {r4-r6,lr}
 	mov r12, r0
 	mov r4, r12
@@ -458002,8 +458002,8 @@ _080FBBF2:
 	thumb_func_end sub_80FBB64
 
 	thumb_func_start LoadRotatingGatePics
-; void LoadRotatingGatePics()
-LoadRotatingGatePics: ; 80FBC00
+@ void LoadRotatingGatePics()
+LoadRotatingGatePics: @ 80FBC00
 	push {lr}
 	ldr r0, =gUnknown_08591D58
 	bl LoadObjectPics
@@ -458013,7 +458013,7 @@ LoadRotatingGatePics: ; 80FBC00
 	thumb_func_end LoadRotatingGatePics
 
 	thumb_func_start sub_80FBC10
-sub_80FBC10: ; 80FBC10
+sub_80FBC10: @ 80FBC10
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -458113,7 +458113,7 @@ _080FBCB6:
 	thumb_func_end sub_80FBC10
 
 	thumb_func_start sub_80FBCDC
-sub_80FBCDC: ; 80FBCDC
+sub_80FBCDC: @ 80FBCDC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -458225,7 +458225,7 @@ _080FBD98:
 	thumb_func_end sub_80FBCDC
 
 	thumb_func_start sub_80FBDB4
-sub_80FBDB4: ; 80FBDB4
+sub_80FBDB4: @ 80FBDB4
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -458268,7 +458268,7 @@ _080FBDDA:
 	thumb_func_end sub_80FBDB4
 
 	thumb_func_start sub_80FBE08
-sub_80FBE08: ; 80FBE08
+sub_80FBE08: @ 80FBE08
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -458294,7 +458294,7 @@ _080FBE2C:
 	thumb_func_end sub_80FBE08
 
 	thumb_func_start sub_80FBE3C
-sub_80FBE3C: ; 80FBE3C
+sub_80FBE3C: @ 80FBE3C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -458342,7 +458342,7 @@ _080FBE88:
 	thumb_func_end sub_80FBE3C
 
 	thumb_func_start sub_80FBE90
-sub_80FBE90: ; 80FBE90
+sub_80FBE90: @ 80FBE90
 	push {lr}
 	bl GetCurrentMapRotatingGatePuzzleType
 	cmp r0, 0
@@ -458355,8 +458355,8 @@ _080FBEA2:
 	thumb_func_end sub_80FBE90
 
 	thumb_func_start RotatingGatePuzzleCameraUpdate
-; void RotatingGatePuzzleCameraUpdate(s32 deltaX, s32 deltaY)
-RotatingGatePuzzleCameraUpdate: ; 80FBEA8
+@ void RotatingGatePuzzleCameraUpdate(s32 deltaX, s32 deltaY)
+RotatingGatePuzzleCameraUpdate: @ 80FBEA8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -458378,7 +458378,7 @@ _080FBECA:
 	thumb_func_end RotatingGatePuzzleCameraUpdate
 
 	thumb_func_start sub_80FBED0
-sub_80FBED0: ; 80FBED0
+sub_80FBED0: @ 80FBED0
 	push {lr}
 	bl GetCurrentMapRotatingGatePuzzleType
 	cmp r0, 0
@@ -458394,7 +458394,7 @@ _080FBEEA:
 	thumb_func_end sub_80FBED0
 
 	thumb_func_start CheckForRotatingGatePuzzleCollision
-CheckForRotatingGatePuzzleCollision: ; 80FBEF0
+CheckForRotatingGatePuzzleCollision: @ 80FBEF0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -458507,7 +458507,7 @@ _080FBFC4:
 	thumb_func_end CheckForRotatingGatePuzzleCollision
 
 	thumb_func_start sub_80FBFD4
-sub_80FBFD4: ; 80FBFD4
+sub_80FBFD4: @ 80FBFD4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -458612,7 +458612,7 @@ _080FC08C:
 	thumb_func_end sub_80FBFD4
 
 	thumb_func_start GetSafariZoneFlag
-GetSafariZoneFlag: ; 80FC0A0
+GetSafariZoneFlag: @ 80FC0A0
 	push {lr}
 	ldr r0, =0x0000088c
 	bl FlagGet
@@ -458624,7 +458624,7 @@ GetSafariZoneFlag: ; 80FC0A0
 	thumb_func_end GetSafariZoneFlag
 
 	thumb_func_start SetSafariZoneFlag
-SetSafariZoneFlag: ; 80FC0B4
+SetSafariZoneFlag: @ 80FC0B4
 	push {lr}
 	ldr r0, =0x0000088c
 	bl FlagSet
@@ -458634,7 +458634,7 @@ SetSafariZoneFlag: ; 80FC0B4
 	thumb_func_end SetSafariZoneFlag
 
 	thumb_func_start ResetSafariZoneFlag
-ResetSafariZoneFlag: ; 80FC0C4
+ResetSafariZoneFlag: @ 80FC0C4
 	push {lr}
 	ldr r0, =0x0000088c
 	bl FlagReset
@@ -458644,7 +458644,7 @@ ResetSafariZoneFlag: ; 80FC0C4
 	thumb_func_end ResetSafariZoneFlag
 
 	thumb_func_start sub_80FC0D4
-sub_80FC0D4: ; 80FC0D4
+sub_80FC0D4: @ 80FC0D4
 	push {lr}
 	movs r0, 0x11
 	bl sav12_xor_increment
@@ -458669,7 +458669,7 @@ sub_80FC0D4: ; 80FC0D4
 	thumb_func_end sub_80FC0D4
 
 	thumb_func_start sub_80FC114
-sub_80FC114: ; 80FC114
+sub_80FC114: @ 80FC114
 	push {lr}
 	ldr r0, =0x0203a050
 	ldrb r0, [r0]
@@ -458690,7 +458690,7 @@ sub_80FC114: ; 80FC114
 	thumb_func_end sub_80FC114
 
 	thumb_func_start safari_step
-safari_step: ; 80FC14C
+safari_step: @ 80FC14C
 	push {lr}
 	bl GetSafariZoneFlag
 	cmp r0, 0
@@ -458718,7 +458718,7 @@ _080FC178:
 	thumb_func_end safari_step
 
 	thumb_func_start sub_80FC180
-sub_80FC180: ; 80FC180
+sub_80FC180: @ 80FC180
 	push {lr}
 	ldr r0, =gUnknown_082A4B6F
 	bl script_env_1_execute_new_script
@@ -458728,7 +458728,7 @@ sub_80FC180: ; 80FC180
 	thumb_func_end sub_80FC180
 
 	thumb_func_start sub_80FC190
-sub_80FC190: ; 80FC190
+sub_80FC190: @ 80FC190
 	push {lr}
 	ldr r1, =0x0203a051
 	ldr r0, =0x03005d10
@@ -458782,7 +458782,7 @@ _080FC21C:
 	thumb_func_end sub_80FC190
 
 	thumb_func_start sub_80FC228
-sub_80FC228: ; 80FC228
+sub_80FC228: @ 80FC228
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 20
@@ -458797,7 +458797,7 @@ sub_80FC228: ; 80FC228
 	thumb_func_end sub_80FC228
 
 	thumb_func_start sub_80FC244
-sub_80FC244: ; 80FC244
+sub_80FC244: @ 80FC244
 	push {lr}
 	ldr r0, =0x0203a054
 	movs r1, 0
@@ -458809,7 +458809,7 @@ sub_80FC244: ; 80FC244
 	thumb_func_end sub_80FC244
 
 	thumb_func_start sub_80FC258
-sub_80FC258: ; 80FC258
+sub_80FC258: @ 80FC258
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -458873,7 +458873,7 @@ _080FC2D6:
 	thumb_func_end sub_80FC258
 
 	thumb_func_start sub_80FC2E8
-sub_80FC2E8: ; 80FC2E8
+sub_80FC2E8: @ 80FC2E8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -458951,7 +458951,7 @@ _080FC376:
 	thumb_func_end sub_80FC2E8
 
 	thumb_func_start sub_80FC388
-sub_80FC388: ; 80FC388
+sub_80FC388: @ 80FC388
 	push {lr}
 	bl sub_80FC258
 	ldr r2, =0x020375f0
@@ -458973,7 +458973,7 @@ _080FC3B2:
 	thumb_func_end sub_80FC388
 
 	thumb_func_start sub_80FC3B8
-sub_80FC3B8: ; 80FC3B8
+sub_80FC3B8: @ 80FC3B8
 	push {lr}
 	bl sub_80FC2E8
 	ldr r2, =0x020375f0
@@ -458995,7 +458995,7 @@ _080FC3E2:
 	thumb_func_end sub_80FC3B8
 
 	thumb_func_start sub_80FC3E8
-sub_80FC3E8: ; 80FC3E8
+sub_80FC3E8: @ 80FC3E8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -459071,7 +459071,7 @@ _080FC472:
 	thumb_func_end sub_80FC3E8
 
 	thumb_func_start sub_80FC480
-sub_80FC480: ; 80FC480
+sub_80FC480: @ 80FC480
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x0203a054
@@ -459101,7 +459101,7 @@ _080FC4A0:
 	thumb_func_end sub_80FC480
 
 	thumb_func_start sub_80FC4B4
-sub_80FC4B4: ; 80FC4B4
+sub_80FC4B4: @ 80FC4B4
 	push {lr}
 	bl sub_80FC258
 	ldr r3, =0x020375f0
@@ -459128,7 +459128,7 @@ _080FC4EE:
 	thumb_func_end sub_80FC4B4
 
 	thumb_func_start sub_80FC4F4
-sub_80FC4F4: ; 80FC4F4
+sub_80FC4F4: @ 80FC4F4
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	lsls r4, r1, 16
@@ -459159,7 +459159,7 @@ _080FC52A:
 	thumb_func_end sub_80FC4F4
 
 	thumb_func_start sub_80FC530
-sub_80FC530: ; 80FC530
+sub_80FC530: @ 80FC530
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -459184,7 +459184,7 @@ _080FC554:
 	thumb_func_end sub_80FC530
 
 	thumb_func_start sub_80FC55C
-sub_80FC55C: ; 80FC55C
+sub_80FC55C: @ 80FC55C
 	push {r4,lr}
 	bl sub_800A550
 	adds r4, r0, 0
@@ -459205,7 +459205,7 @@ _080FC57A:
 	thumb_func_end sub_80FC55C
 
 	thumb_func_start sub_80FC580
-sub_80FC580: ; 80FC580
+sub_80FC580: @ 80FC580
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -459237,7 +459237,7 @@ _080FC590:
 	thumb_func_end sub_80FC580
 
 	thumb_func_start sub_80FC5C0
-sub_80FC5C0: ; 80FC5C0
+sub_80FC5C0: @ 80FC5C0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -459252,7 +459252,7 @@ sub_80FC5C0: ; 80FC5C0
 	thumb_func_end sub_80FC5C0
 
 	thumb_func_start sub_80FC5DC
-sub_80FC5DC: ; 80FC5DC
+sub_80FC5DC: @ 80FC5DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -459320,7 +459320,7 @@ _080FC650:
 	thumb_func_end sub_80FC5DC
 
 	thumb_func_start sub_80FC670
-sub_80FC670: ; 80FC670
+sub_80FC670: @ 80FC670
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02039f2a
@@ -459363,7 +459363,7 @@ _080FC6B6:
 	thumb_func_end sub_80FC670
 
 	thumb_func_start sub_80FC6BC
-sub_80FC6BC: ; 80FC6BC
+sub_80FC6BC: @ 80FC6BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -459508,7 +459508,7 @@ _080FC7F4:
 	thumb_func_end sub_80FC6BC
 
 	thumb_func_start sub_80FC804
-sub_80FC804: ; 80FC804
+sub_80FC804: @ 80FC804
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -459572,7 +459572,7 @@ _080FC880:
 	thumb_func_end sub_80FC804
 
 	thumb_func_start sub_80FC894
-sub_80FC894: ; 80FC894
+sub_80FC894: @ 80FC894
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -459699,7 +459699,7 @@ _080FC986:
 	thumb_func_end sub_80FC894
 
 	thumb_func_start sub_80FC998
-sub_80FC998: ; 80FC998
+sub_80FC998: @ 80FC998
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -459748,7 +459748,7 @@ _080FC9F0:
 	thumb_func_end sub_80FC998
 
 	thumb_func_start sub_80FC9F8
-sub_80FC9F8: ; 80FC9F8
+sub_80FC9F8: @ 80FC9F8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -459848,7 +459848,7 @@ _080FCAB2:
 	thumb_func_end sub_80FC9F8
 
 	thumb_func_start sub_80FCACC
-sub_80FCACC: ; 80FCACC
+sub_80FCACC: @ 80FCACC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -460034,7 +460034,7 @@ _080FCC82:
 	thumb_func_end sub_80FCACC
 
 	thumb_func_start sub_80FCC88
-sub_80FCC88: ; 80FCC88
+sub_80FCC88: @ 80FCC88
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -460227,7 +460227,7 @@ _080FCE42:
 	thumb_func_end sub_80FCC88
 
 	thumb_func_start sub_80FCE48
-sub_80FCE48: ; 80FCE48
+sub_80FCE48: @ 80FCE48
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -460350,7 +460350,7 @@ _080FCF2E:
 	thumb_func_end sub_80FCE48
 
 	thumb_func_start sub_80FCF40
-sub_80FCF40: ; 80FCF40
+sub_80FCF40: @ 80FCF40
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -460416,7 +460416,7 @@ _080FCFBE:
 	thumb_func_end sub_80FCF40
 
 	thumb_func_start sub_80FCFD0
-sub_80FCFD0: ; 80FCFD0
+sub_80FCFD0: @ 80FCFD0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -460482,8 +460482,8 @@ _080FD04E:
 	thumb_func_end sub_80FCFD0
 
 	thumb_func_start SetUpItemUseCallback
-; void SetUpItemUseCallback(u8 taskId)
-SetUpItemUseCallback: ; 80FD060
+@ void SetUpItemUseCallback(u8 taskId)
+SetUpItemUseCallback: @ 80FD060
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -460539,8 +460539,8 @@ _080FD0CC:
 	thumb_func_end SetUpItemUseCallback
 
 	thumb_func_start SetUpItemUseOnFieldCallback
-; void SetUpItemUseOnFieldCallback()
-SetUpItemUseOnFieldCallback: ; 80FD0DC
+@ void SetUpItemUseOnFieldCallback()
+SetUpItemUseOnFieldCallback: @ 80FD0DC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -460572,8 +460572,8 @@ _080FD11A:
 	thumb_func_end SetUpItemUseOnFieldCallback
 
 	thumb_func_start MapPostLoadHook_UseItem
-; void MapPostLoadHook_UseItem()
-MapPostLoadHook_UseItem: ; 80FD124
+@ void MapPostLoadHook_UseItem()
+MapPostLoadHook_UseItem: @ 80FD124
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =Task_CallItemUseOnFieldCallback
@@ -460585,8 +460585,8 @@ MapPostLoadHook_UseItem: ; 80FD124
 	thumb_func_end MapPostLoadHook_UseItem
 
 	thumb_func_start Task_CallItemUseOnFieldCallback
-; void Task_CallItemUseOnFieldCallback(u8 taskId)
-Task_CallItemUseOnFieldCallback: ; 80FD13C
+@ void Task_CallItemUseOnFieldCallback(u8 taskId)
+Task_CallItemUseOnFieldCallback: @ 80FD13C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -460607,8 +460607,8 @@ _080FD158:
 	thumb_func_end Task_CallItemUseOnFieldCallback
 
 	thumb_func_start DisplayCannotUseItemMessage
-; void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, u8 *str)
-DisplayCannotUseItemMessage: ; 80FD164
+@ void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, u8 *str)
+DisplayCannotUseItemMessage: @ 80FD164
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r1, r2, 0
@@ -460652,8 +460652,8 @@ _080FD1BE:
 	thumb_func_end DisplayCannotUseItemMessage
 
 	thumb_func_start DisplayDadsAdviceCannotUseItemMessage
-; void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
-DisplayDadsAdviceCannotUseItemMessage: ; 80FD1C8
+@ void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
+DisplayDadsAdviceCannotUseItemMessage: @ 80FD1C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -460667,8 +460667,8 @@ DisplayDadsAdviceCannotUseItemMessage: ; 80FD1C8
 	thumb_func_end DisplayDadsAdviceCannotUseItemMessage
 
 	thumb_func_start DisplayCannotDismountBikeMessage
-; void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
-DisplayCannotDismountBikeMessage: ; 80FD1E0
+@ void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
+DisplayCannotDismountBikeMessage: @ 80FD1E0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -460682,8 +460682,8 @@ DisplayCannotDismountBikeMessage: ; 80FD1E0
 	thumb_func_end DisplayCannotDismountBikeMessage
 
 	thumb_func_start CleanUpAfterFailingToUseRegisteredKeyItemOnField
-; void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId)
-CleanUpAfterFailingToUseRegisteredKeyItemOnField: ; 80FD1F8
+@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId)
+CleanUpAfterFailingToUseRegisteredKeyItemOnField: @ 80FD1F8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -460701,8 +460701,8 @@ CleanUpAfterFailingToUseRegisteredKeyItemOnField: ; 80FD1F8
 	thumb_func_end CleanUpAfterFailingToUseRegisteredKeyItemOnField
 
 	thumb_func_start CheckIfItemIsTMHMOrEvolutionStone
-; u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
-CheckIfItemIsTMHMOrEvolutionStone: ; 80FD21C
+@ u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
+CheckIfItemIsTMHMOrEvolutionStone: @ 80FD21C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -460732,7 +460732,7 @@ _080FD24E:
 	thumb_func_end CheckIfItemIsTMHMOrEvolutionStone
 
 	thumb_func_start sub_80FD254
-sub_80FD254: ; 80FD254
+sub_80FD254: @ 80FD254
 	push {lr}
 	sub sp, 0x24
 	mov r1, sp
@@ -460750,8 +460750,8 @@ sub_80FD254: ; 80FD254
 	thumb_func_end sub_80FD254
 
 	thumb_func_start ItemUseOutOfBattle_Mail
-; void ItemUseOutOfBattle_Mail(int taskId)
-ItemUseOutOfBattle_Mail: ; 80FD278
+@ void ItemUseOutOfBattle_Mail(int taskId)
+ItemUseOutOfBattle_Mail: @ 80FD278
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -460766,8 +460766,8 @@ ItemUseOutOfBattle_Mail: ; 80FD278
 	thumb_func_end ItemUseOutOfBattle_Mail
 
 	thumb_func_start ItemUseOutOfBattle_Bike
-; void ItemUseOutOfBattle_Bike(int taskId)
-ItemUseOutOfBattle_Bike: ; 80FD298
+@ void ItemUseOutOfBattle_Bike(int taskId)
+ItemUseOutOfBattle_Bike: @ 80FD298
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -460853,7 +460853,7 @@ _080FD350:
 	thumb_func_end ItemUseOutOfBattle_Bike
 
 	thumb_func_start ItemUseOnFieldCB_Bike
-ItemUseOnFieldCB_Bike: ; 80FD358
+ItemUseOnFieldCB_Bike: @ 80FD358
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -460881,8 +460881,8 @@ _080FD37E:
 	thumb_func_end ItemUseOnFieldCB_Bike
 
 	thumb_func_start CanFish
-; bool8 CanFish()
-CanFish: ; 80FD394
+@ bool8 CanFish()
+CanFish: @ 80FD394
 	push {r4-r6,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -460955,7 +460955,7 @@ _080FD41E:
 	thumb_func_end CanFish
 
 	thumb_func_start ItemUseOutOfBattle_Rod
-ItemUseOutOfBattle_Rod: ; 80FD428
+ItemUseOutOfBattle_Rod: @ 80FD428
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -460986,7 +460986,7 @@ _080FD45E:
 	thumb_func_end ItemUseOutOfBattle_Rod
 
 	thumb_func_start ItemUseOnFieldCB_Rod
-ItemUseOnFieldCB_Rod: ; 80FD468
+ItemUseOnFieldCB_Rod: @ 80FD468
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -461006,7 +461006,7 @@ ItemUseOnFieldCB_Rod: ; 80FD468
 	thumb_func_end ItemUseOnFieldCB_Rod
 
 	thumb_func_start ItemUseOutOfBattle_Itemfinder
-ItemUseOutOfBattle_Itemfinder: ; 80FD490
+ItemUseOutOfBattle_Itemfinder: @ 80FD490
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -461025,7 +461025,7 @@ ItemUseOutOfBattle_Itemfinder: ; 80FD490
 	thumb_func_end ItemUseOutOfBattle_Itemfinder
 
 	thumb_func_start ItemUseOnFieldCB_Itemfinder
-ItemUseOnFieldCB_Itemfinder: ; 80FD4B8
+ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -461059,7 +461059,7 @@ _080FD4F6:
 	thumb_func_end ItemUseOnFieldCB_Itemfinder
 
 	thumb_func_start sub_80FD504
-sub_80FD504: ; 80FD504
+sub_80FD504: @ 80FD504
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -461154,7 +461154,7 @@ _080FD5C2:
 	thumb_func_end sub_80FD504
 
 	thumb_func_start sub_80FD5CC
-sub_80FD5CC: ; 80FD5CC
+sub_80FD5CC: @ 80FD5CC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -461172,8 +461172,8 @@ sub_80FD5CC: ; 80FD5CC
 	thumb_func_end sub_80FD5CC
 
 	thumb_func_start ItemfinderCheckForHiddenItems
-; bool8 ItemfinderCheckForHiddenItems(struct map_events *events, u8 taskId)
-ItemfinderCheckForHiddenItems: ; 80FD5F0
+@ bool8 ItemfinderCheckForHiddenItems(struct map_events *events, u8 taskId)
+ItemfinderCheckForHiddenItems: @ 80FD5F0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -461291,7 +461291,7 @@ _080FD6C6:
 	thumb_func_end ItemfinderCheckForHiddenItems
 
 	thumb_func_start sub_80FD6D4
-sub_80FD6D4: ; 80FD6D4
+sub_80FD6D4: @ 80FD6D4
 	push {r4-r6,lr}
 	lsls r1, 16
 	lsrs r3, r1, 16
@@ -461344,7 +461344,7 @@ _080FD72A:
 	thumb_func_end sub_80FD6D4
 
 	thumb_func_start sub_80FD730
-sub_80FD730: ; 80FD730
+sub_80FD730: @ 80FD730
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -461430,7 +461430,7 @@ _080FD7C2:
 	thumb_func_end sub_80FD730
 
 	thumb_func_start sub_80FD7C8
-sub_80FD7C8: ; 80FD7C8
+sub_80FD7C8: @ 80FD7C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -461575,7 +461575,7 @@ _080FD8CC:
 	thumb_func_end sub_80FD7C8
 
 	thumb_func_start sub_80FD8E0
-sub_80FD8E0: ; 80FD8E0
+sub_80FD8E0: @ 80FD8E0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -461693,7 +461693,7 @@ _080FD9A2:
 	thumb_func_end sub_80FD8E0
 
 	thumb_func_start sub_80FD9B0
-sub_80FD9B0: ; 80FD9B0
+sub_80FD9B0: @ 80FD9B0
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsls r1, 16
@@ -461767,7 +461767,7 @@ _080FDA1E:
 	thumb_func_end sub_80FD9B0
 
 	thumb_func_start sub_80FDA24
-sub_80FDA24: ; 80FDA24
+sub_80FDA24: @ 80FDA24
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -461818,7 +461818,7 @@ sub_80FDA24: ; 80FDA24
 	thumb_func_end sub_80FDA24
 
 	thumb_func_start sub_80FDA94
-sub_80FDA94: ; 80FDA94
+sub_80FDA94: @ 80FDA94
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -461851,7 +461851,7 @@ _080FDACA:
 	thumb_func_end sub_80FDA94
 
 	thumb_func_start sub_80FDADC
-sub_80FDADC: ; 80FDADC
+sub_80FDADC: @ 80FDADC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -461915,7 +461915,7 @@ _080FDB50:
 	thumb_func_end sub_80FDADC
 
 	thumb_func_start ItemUseOutOfBattle_PokeblockCase
-ItemUseOutOfBattle_PokeblockCase: ; 80FDB6C
+ItemUseOutOfBattle_PokeblockCase: @ 80FDB6C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -461969,7 +461969,7 @@ _080FDBDA:
 	thumb_func_end ItemUseOutOfBattle_PokeblockCase
 
 	thumb_func_start sub_80FDBEC
-sub_80FDBEC: ; 80FDBEC
+sub_80FDBEC: @ 80FDBEC
 	push {lr}
 	ldr r1, =bag_menu_mail_related
 	movs r0, 0
@@ -461980,7 +461980,7 @@ sub_80FDBEC: ; 80FDBEC
 	thumb_func_end sub_80FDBEC
 
 	thumb_func_start sub_80FDC00
-sub_80FDC00: ; 80FDC00
+sub_80FDC00: @ 80FDC00
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462004,7 +462004,7 @@ _080FDC24:
 	thumb_func_end sub_80FDC00
 
 	thumb_func_start ItemUseOutOfBattle_CoinCase
-ItemUseOutOfBattle_CoinCase: ; 80FDC34
+ItemUseOutOfBattle_CoinCase: @ 80FDC34
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462050,7 +462050,7 @@ _080FDC9A:
 	thumb_func_end ItemUseOutOfBattle_CoinCase
 
 	thumb_func_start ItemUseOutOfBattle_PowderJar
-ItemUseOutOfBattle_PowderJar: ; 80FDCA4
+ItemUseOutOfBattle_PowderJar: @ 80FDCA4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462094,7 +462094,7 @@ _080FDD06:
 	thumb_func_end ItemUseOutOfBattle_PowderJar
 
 	thumb_func_start sub_80FDD10
-sub_80FDD10: ; 80FDD10
+sub_80FDD10: @ 80FDD10
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462132,7 +462132,7 @@ _080FDD68:
 	thumb_func_end sub_80FDD10
 
 	thumb_func_start sub_80FDD74
-sub_80FDD74: ; 80FDD74
+sub_80FDD74: @ 80FDD74
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462153,7 +462153,7 @@ sub_80FDD74: ; 80FDD74
 	thumb_func_end sub_80FDD74
 
 	thumb_func_start ItemUseOutOfBattle_WailmerPail
-ItemUseOutOfBattle_WailmerPail: ; 80FDDA4
+ItemUseOutOfBattle_WailmerPail: @ 80FDDA4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462198,7 +462198,7 @@ _080FDDFE:
 	thumb_func_end ItemUseOutOfBattle_WailmerPail
 
 	thumb_func_start sub_80FDE08
-sub_80FDE08: ; 80FDE08
+sub_80FDE08: @ 80FDE08
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462215,7 +462215,7 @@ sub_80FDE08: ; 80FDE08
 	thumb_func_end sub_80FDE08
 
 	thumb_func_start sub_80FDE2C
-sub_80FDE2C: ; 80FDE2C
+sub_80FDE2C: @ 80FDE2C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -462257,7 +462257,7 @@ _080FDE72:
 	thumb_func_end sub_80FDE2C
 
 	thumb_func_start sub_80FDE7C
-sub_80FDE7C: ; 80FDE7C
+sub_80FDE7C: @ 80FDE7C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462274,7 +462274,7 @@ sub_80FDE7C: ; 80FDE7C
 	thumb_func_end sub_80FDE7C
 
 	thumb_func_start ItemUseOutOfBattle_Medicine
-ItemUseOutOfBattle_Medicine: ; 80FDEA0
+ItemUseOutOfBattle_Medicine: @ 80FDEA0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462288,7 +462288,7 @@ ItemUseOutOfBattle_Medicine: ; 80FDEA0
 	thumb_func_end ItemUseOutOfBattle_Medicine
 
 	thumb_func_start ItemUseOutOfBattle_ReduceEV
-ItemUseOutOfBattle_ReduceEV: ; 80FDEBC
+ItemUseOutOfBattle_ReduceEV: @ 80FDEBC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462302,7 +462302,7 @@ ItemUseOutOfBattle_ReduceEV: ; 80FDEBC
 	thumb_func_end ItemUseOutOfBattle_ReduceEV
 
 	thumb_func_start ItemUseOutOfBattle_SacredAsh
-ItemUseOutOfBattle_SacredAsh: ; 80FDED8
+ItemUseOutOfBattle_SacredAsh: @ 80FDED8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462316,7 +462316,7 @@ ItemUseOutOfBattle_SacredAsh: ; 80FDED8
 	thumb_func_end ItemUseOutOfBattle_SacredAsh
 
 	thumb_func_start ItemUseOutOfBattle_PPRecovery
-ItemUseOutOfBattle_PPRecovery: ; 80FDEF4
+ItemUseOutOfBattle_PPRecovery: @ 80FDEF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462330,7 +462330,7 @@ ItemUseOutOfBattle_PPRecovery: ; 80FDEF4
 	thumb_func_end ItemUseOutOfBattle_PPRecovery
 
 	thumb_func_start ItemUseOutOfBattle_PPUp
-ItemUseOutOfBattle_PPUp: ; 80FDF10
+ItemUseOutOfBattle_PPUp: @ 80FDF10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462344,7 +462344,7 @@ ItemUseOutOfBattle_PPUp: ; 80FDF10
 	thumb_func_end ItemUseOutOfBattle_PPUp
 
 	thumb_func_start ItemUseOutOfBattle_RareCandy
-ItemUseOutOfBattle_RareCandy: ; 80FDF2C
+ItemUseOutOfBattle_RareCandy: @ 80FDF2C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462358,7 +462358,7 @@ ItemUseOutOfBattle_RareCandy: ; 80FDF2C
 	thumb_func_end ItemUseOutOfBattle_RareCandy
 
 	thumb_func_start ItemUseOutOfBattle_TMHM
-ItemUseOutOfBattle_TMHM: ; 80FDF48
+ItemUseOutOfBattle_TMHM: @ 80FDF48
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462389,7 +462389,7 @@ _080FDF80:
 	thumb_func_end ItemUseOutOfBattle_TMHM
 
 	thumb_func_start sub_80FDF90
-sub_80FDF90: ; 80FDF90
+sub_80FDF90: @ 80FDF90
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462410,7 +462410,7 @@ sub_80FDF90: ; 80FDF90
 	thumb_func_end sub_80FDF90
 
 	thumb_func_start task08_0809AD8C
-task08_0809AD8C: ; 80FDFBC
+task08_0809AD8C: @ 80FDFBC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462449,7 +462449,7 @@ _080FE000:
 	thumb_func_end task08_0809AD8C
 
 	thumb_func_start sub_80FE024
-sub_80FE024: ; 80FE024
+sub_80FE024: @ 80FE024
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462462,7 +462462,7 @@ sub_80FE024: ; 80FE024
 	thumb_func_end sub_80FE024
 
 	thumb_func_start sub_80FE03C
-sub_80FE03C: ; 80FE03C
+sub_80FE03C: @ 80FE03C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462476,7 +462476,7 @@ sub_80FE03C: ; 80FE03C
 	thumb_func_end sub_80FE03C
 
 	thumb_func_start sub_80FE058
-sub_80FE058: ; 80FE058
+sub_80FE058: @ 80FE058
 	push {r4,lr}
 	ldr r4, =0x0203ce7c
 	ldrh r0, [r4]
@@ -462514,7 +462514,7 @@ _080FE0B4:
 	thumb_func_end sub_80FE058
 
 	thumb_func_start ItemUseOutOfBattle_Repel
-ItemUseOutOfBattle_Repel: ; 80FE0BC
+ItemUseOutOfBattle_Repel: @ 80FE0BC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462558,7 +462558,7 @@ _080FE116:
 	thumb_func_end ItemUseOutOfBattle_Repel
 
 	thumb_func_start sub_80FE124
-sub_80FE124: ; 80FE124
+sub_80FE124: @ 80FE124
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462591,7 +462591,7 @@ _080FE156:
 	thumb_func_end sub_80FE124
 
 	thumb_func_start sub_80FE164
-sub_80FE164: ; 80FE164
+sub_80FE164: @ 80FE164
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462634,7 +462634,7 @@ _080FE1C2:
 	thumb_func_end sub_80FE164
 
 	thumb_func_start sub_80FE1D0
-sub_80FE1D0: ; 80FE1D0
+sub_80FE1D0: @ 80FE1D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462677,7 +462677,7 @@ _080FE226:
 	thumb_func_end sub_80FE1D0
 
 	thumb_func_start ItemUseOutOfBattle_BlackWhiteFlute
-ItemUseOutOfBattle_BlackWhiteFlute: ; 80FE234
+ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462722,7 +462722,7 @@ _080FE28C:
 	thumb_func_end ItemUseOutOfBattle_BlackWhiteFlute
 
 	thumb_func_start task08_080A1C44
-task08_080A1C44: ; 80FE2BC
+task08_080A1C44: @ 80FE2BC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462737,7 +462737,7 @@ task08_080A1C44: ; 80FE2BC
 	thumb_func_end task08_080A1C44
 
 	thumb_func_start re_escape_rope
-re_escape_rope: ; 80FE2D8
+re_escape_rope: @ 80FE2D8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -462762,7 +462762,7 @@ re_escape_rope: ; 80FE2D8
 	thumb_func_end re_escape_rope
 
 	thumb_func_start sub_80FE314
-sub_80FE314: ; 80FE314
+sub_80FE314: @ 80FE314
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r1, [r0, 0x1A]
@@ -462781,7 +462781,7 @@ _080FE32E:
 	thumb_func_end sub_80FE314
 
 	thumb_func_start ItemUseOutOfBattle_EscapeRope
-ItemUseOutOfBattle_EscapeRope: ; 80FE334
+ItemUseOutOfBattle_EscapeRope: @ 80FE334
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462814,7 +462814,7 @@ _080FE36E:
 	thumb_func_end ItemUseOutOfBattle_EscapeRope
 
 	thumb_func_start ItemUseOutOfBattle_EvolutionStone
-ItemUseOutOfBattle_EvolutionStone: ; 80FE378
+ItemUseOutOfBattle_EvolutionStone: @ 80FE378
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -462828,7 +462828,7 @@ ItemUseOutOfBattle_EvolutionStone: ; 80FE378
 	thumb_func_end ItemUseOutOfBattle_EvolutionStone
 
 	thumb_func_start ItemUseInBattle_PokeBall
-ItemUseInBattle_PokeBall: ; 80FE394
+ItemUseInBattle_PokeBall: @ 80FE394
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462878,7 +462878,7 @@ _080FE3FA:
 	thumb_func_end ItemUseInBattle_PokeBall
 
 	thumb_func_start sub_80FE408
-sub_80FE408: ; 80FE408
+sub_80FE408: @ 80FE408
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -462907,7 +462907,7 @@ _080FE43A:
 	thumb_func_end sub_80FE408
 
 	thumb_func_start sub_80FE440
-sub_80FE440: ; 80FE440
+sub_80FE440: @ 80FE440
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -462958,7 +462958,7 @@ _080FE4AC:
 	thumb_func_end sub_80FE440
 
 	thumb_func_start ItemUseInBattle_StatIncrease
-ItemUseInBattle_StatIncrease: ; 80FE4B8
+ItemUseInBattle_StatIncrease: @ 80FE4B8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -463017,7 +463017,7 @@ _080FE53C:
 	thumb_func_end ItemUseInBattle_StatIncrease
 
 	thumb_func_start sub_80FE54C
-sub_80FE54C: ; 80FE54C
+sub_80FE54C: @ 80FE54C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -463048,7 +463048,7 @@ _080FE582:
 	thumb_func_end sub_80FE54C
 
 	thumb_func_start ItemUseInBattle_Medicine
-ItemUseInBattle_Medicine: ; 80FE590
+ItemUseInBattle_Medicine: @ 80FE590
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -463062,7 +463062,7 @@ ItemUseInBattle_Medicine: ; 80FE590
 	thumb_func_end ItemUseInBattle_Medicine
 
 	thumb_func_start sub_80FE5AC
-sub_80FE5AC: ; 80FE5AC
+sub_80FE5AC: @ 80FE5AC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -463076,7 +463076,7 @@ sub_80FE5AC: ; 80FE5AC
 	thumb_func_end sub_80FE5AC
 
 	thumb_func_start ItemUseInBattle_PPRecovery
-ItemUseInBattle_PPRecovery: ; 80FE5C8
+ItemUseInBattle_PPRecovery: @ 80FE5C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -463090,7 +463090,7 @@ ItemUseInBattle_PPRecovery: ; 80FE5C8
 	thumb_func_end ItemUseInBattle_PPRecovery
 
 	thumb_func_start ItemUseInBattle_Escape
-ItemUseInBattle_Escape: ; 80FE5E4
+ItemUseInBattle_Escape: @ 80FE5E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -463136,7 +463136,7 @@ _080FE646:
 	thumb_func_end ItemUseInBattle_Escape
 
 	thumb_func_start ItemUseOutOfBattle_EnigmaBerry
-ItemUseOutOfBattle_EnigmaBerry: ; 80FE650
+ItemUseOutOfBattle_EnigmaBerry: @ 80FE650
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -463257,7 +463257,7 @@ _080FE770:
 	thumb_func_end ItemUseOutOfBattle_EnigmaBerry
 
 	thumb_func_start ItemUseInBattle_EnigmaBerry
-ItemUseInBattle_EnigmaBerry: ; 80FE77C
+ItemUseInBattle_EnigmaBerry: @ 80FE77C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -463320,7 +463320,7 @@ _080FE81A:
 	thumb_func_end ItemUseInBattle_EnigmaBerry
 
 	thumb_func_start ItemUseOutOfBattle_CannotUse
-ItemUseOutOfBattle_CannotUse: ; 80FE820
+ItemUseOutOfBattle_CannotUse: @ 80FE820
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -463337,7 +463337,7 @@ ItemUseOutOfBattle_CannotUse: ; 80FE820
 	thumb_func_end ItemUseOutOfBattle_CannotUse
 
 	thumb_func_start sub_80FE840
-sub_80FE840: ; 80FE840
+sub_80FE840: @ 80FE840
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -463379,7 +463379,7 @@ _080FE87E:
 	thumb_func_end sub_80FE840
 
 	thumb_func_start sub_80FE898
-sub_80FE898: ; 80FE898
+sub_80FE898: @ 80FE898
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -463419,7 +463419,7 @@ _080FE8DA:
 	thumb_func_end sub_80FE898
 
 	thumb_func_start sub_80FE8E0
-sub_80FE8E0: ; 80FE8E0
+sub_80FE8E0: @ 80FE8E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -463452,7 +463452,7 @@ sub_80FE8E0: ; 80FE8E0
 	thumb_func_end sub_80FE8E0
 
 	thumb_func_start sub_80FE930
-sub_80FE930: ; 80FE930
+sub_80FE930: @ 80FE930
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -463488,7 +463488,7 @@ sub_80FE930: ; 80FE930
 	thumb_func_end sub_80FE930
 
 	thumb_func_start sub_80FE988
-sub_80FE988: ; 80FE988
+sub_80FE988: @ 80FE988
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -463528,7 +463528,7 @@ sub_80FE988: ; 80FE988
 	thumb_func_end sub_80FE988
 
 	thumb_func_start sub_80FE9E4
-sub_80FE9E4: ; 80FE9E4
+sub_80FE9E4: @ 80FE9E4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -463585,7 +463585,7 @@ _080FEA4E:
 	thumb_func_end sub_80FE9E4
 
 	thumb_func_start sub_80FEA58
-sub_80FEA58: ; 80FEA58
+sub_80FEA58: @ 80FEA58
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -463644,7 +463644,7 @@ _080FEAC0:
 	thumb_func_end sub_80FEA58
 
 	thumb_func_start sub_80FEAD8
-sub_80FEAD8: ; 80FEAD8
+sub_80FEAD8: @ 80FEAD8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -463678,7 +463678,7 @@ sub_80FEAD8: ; 80FEAD8
 	thumb_func_end sub_80FEAD8
 
 	thumb_func_start sub_80FEB28
-sub_80FEB28: ; 80FEB28
+sub_80FEB28: @ 80FEB28
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -463694,7 +463694,7 @@ _080FEB3C:
 	thumb_func_end sub_80FEB28
 
 	thumb_func_start sub_80FEB44
-sub_80FEB44: ; 80FEB44
+sub_80FEB44: @ 80FEB44
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl GenerateRandomNumber2
@@ -463777,7 +463777,7 @@ _080FEB94:
 	thumb_func_end sub_80FEB44
 
 	thumb_func_start sub_80FEBFC
-sub_80FEBFC: ; 80FEBFC
+sub_80FEBFC: @ 80FEBFC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A70E8
@@ -463820,7 +463820,7 @@ _080FEC42:
 	thumb_func_end sub_80FEBFC
 
 	thumb_func_start sub_80FEC48
-sub_80FEC48: ; 80FEC48
+sub_80FEC48: @ 80FEC48
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -463869,7 +463869,7 @@ _080FEC68:
 	thumb_func_end sub_80FEC48
 
 	thumb_func_start sub_80FECB8
-sub_80FECB8: ; 80FECB8
+sub_80FECB8: @ 80FECB8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -463897,7 +463897,7 @@ _080FECE2:
 	thumb_func_end sub_80FECB8
 
 	thumb_func_start sub_80FECF0
-sub_80FECF0: ; 80FECF0
+sub_80FECF0: @ 80FECF0
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r2, r4, 0
@@ -463924,7 +463924,7 @@ sub_80FECF0: ; 80FECF0
 	thumb_func_end sub_80FECF0
 
 	thumb_func_start sub_80FED28
-sub_80FED28: ; 80FED28
+sub_80FED28: @ 80FED28
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -463960,7 +463960,7 @@ _080FED52:
 	thumb_func_end sub_80FED28
 
 	thumb_func_start sub_80FED74
-sub_80FED74: ; 80FED74
+sub_80FED74: @ 80FED74
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -464044,7 +464044,7 @@ _080FEE10:
 	thumb_func_end sub_80FED74
 
 	thumb_func_start sub_80FEE1C
-sub_80FEE1C: ; 80FEE1C
+sub_80FEE1C: @ 80FEE1C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -464089,7 +464089,7 @@ _080FEE70:
 	thumb_func_end sub_80FEE1C
 
 	thumb_func_start sub_80FEE78
-sub_80FEE78: ; 80FEE78
+sub_80FEE78: @ 80FEE78
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -464126,7 +464126,7 @@ sub_80FEE78: ; 80FEE78
 	thumb_func_end sub_80FEE78
 
 	thumb_func_start sub_80FEECC
-sub_80FEECC: ; 80FEECC
+sub_80FEECC: @ 80FEECC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -464186,7 +464186,7 @@ _080FEF3E:
 	thumb_func_end sub_80FEECC
 
 	thumb_func_start sub_80FEF44
-sub_80FEF44: ; 80FEF44
+sub_80FEF44: @ 80FEF44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -464223,7 +464223,7 @@ sub_80FEF44: ; 80FEF44
 	thumb_func_end sub_80FEF44
 
 	thumb_func_start sub_80FEF98
-sub_80FEF98: ; 80FEF98
+sub_80FEF98: @ 80FEF98
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -464278,7 +464278,7 @@ _080FEFF6:
 	thumb_func_end sub_80FEF98
 
 	thumb_func_start sub_80FEFFC
-sub_80FEFFC: ; 80FEFFC
+sub_80FEFFC: @ 80FEFFC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -464310,7 +464310,7 @@ sub_80FEFFC: ; 80FEFFC
 	thumb_func_end sub_80FEFFC
 
 	thumb_func_start sub_80FF044
-sub_80FF044: ; 80FF044
+sub_80FF044: @ 80FF044
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x32]
@@ -464354,7 +464354,7 @@ _080FF08C:
 	thumb_func_end sub_80FF044
 
 	thumb_func_start sub_80FF090
-sub_80FF090: ; 80FF090
+sub_80FF090: @ 80FF090
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -464406,7 +464406,7 @@ _080FF0EC:
 	thumb_func_end sub_80FF090
 
 	thumb_func_start sub_80FF0F4
-sub_80FF0F4: ; 80FF0F4
+sub_80FF0F4: @ 80FF0F4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
@@ -464497,7 +464497,7 @@ _080FF1AE:
 	thumb_func_end sub_80FF0F4
 
 	thumb_func_start sub_80FF1C0
-sub_80FF1C0: ; 80FF1C0
+sub_80FF1C0: @ 80FF1C0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r7, 0
@@ -464588,7 +464588,7 @@ _080FF260:
 	thumb_func_end sub_80FF1C0
 
 	thumb_func_start sub_80FF268
-sub_80FF268: ; 80FF268
+sub_80FF268: @ 80FF268
 	push {r4,lr}
 	adds r4, r0, 0
 	bl battle_type_is_double
@@ -464628,7 +464628,7 @@ _080FF28A:
 	thumb_func_end sub_80FF268
 
 	thumb_func_start sub_80FF2BC
-sub_80FF2BC: ; 80FF2BC
+sub_80FF2BC: @ 80FF2BC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -464722,7 +464722,7 @@ _080FF36A:
 	thumb_func_end sub_80FF2BC
 
 	thumb_func_start sub_80FF374
-sub_80FF374: ; 80FF374
+sub_80FF374: @ 80FF374
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0
@@ -464750,7 +464750,7 @@ sub_80FF374: ; 80FF374
 	thumb_func_end sub_80FF374
 
 	thumb_func_start sub_80FF3B0
-sub_80FF3B0: ; 80FF3B0
+sub_80FF3B0: @ 80FF3B0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -464779,7 +464779,7 @@ _080FF3DA:
 	thumb_func_end sub_80FF3B0
 
 	thumb_func_start sub_80FF3EC
-sub_80FF3EC: ; 80FF3EC
+sub_80FF3EC: @ 80FF3EC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -464839,7 +464839,7 @@ _080FF452:
 	thumb_func_end sub_80FF3EC
 
 	thumb_func_start sub_80FF458
-sub_80FF458: ; 80FF458
+sub_80FF458: @ 80FF458
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -464943,7 +464943,7 @@ _080FF51C:
 	thumb_func_end sub_80FF458
 
 	thumb_func_start sub_80FF53C
-sub_80FF53C: ; 80FF53C
+sub_80FF53C: @ 80FF53C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -465009,7 +465009,7 @@ _080FF5B4:
 	thumb_func_end sub_80FF53C
 
 	thumb_func_start sub_80FF5CC
-sub_80FF5CC: ; 80FF5CC
+sub_80FF5CC: @ 80FF5CC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -465105,7 +465105,7 @@ _080FF68E:
 	thumb_func_end sub_80FF5CC
 
 	thumb_func_start sub_80FF698
-sub_80FF698: ; 80FF698
+sub_80FF698: @ 80FF698
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -465202,7 +465202,7 @@ _080FF756:
 	thumb_func_end sub_80FF698
 
 	thumb_func_start sub_80FF768
-sub_80FF768: ; 80FF768
+sub_80FF768: @ 80FF768
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -465264,7 +465264,7 @@ _080FF7D4:
 	thumb_func_end sub_80FF768
 
 	thumb_func_start sub_80FF7EC
-sub_80FF7EC: ; 80FF7EC
+sub_80FF7EC: @ 80FF7EC
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -465371,7 +465371,7 @@ sub_80FF7EC: ; 80FF7EC
 	thumb_func_end sub_80FF7EC
 
 	thumb_func_start sub_80FF8DC
-sub_80FF8DC: ; 80FF8DC
+sub_80FF8DC: @ 80FF8DC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x2E]
@@ -465419,7 +465419,7 @@ _080FF92E:
 	thumb_func_end sub_80FF8DC
 
 	thumb_func_start sub_80FF934
-sub_80FF934: ; 80FF934
+sub_80FF934: @ 80FF934
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x2E
@@ -465484,7 +465484,7 @@ _080FF9AA:
 	thumb_func_end sub_80FF934
 
 	thumb_func_start sub_80FF9B8
-sub_80FF9B8: ; 80FF9B8
+sub_80FF9B8: @ 80FF9B8
 	push {r4,r5,lr}
 	movs r2, 0x20
 	ldrsh r4, [r0, r2]
@@ -465508,7 +465508,7 @@ sub_80FF9B8: ; 80FF9B8
 	thumb_func_end sub_80FF9B8
 
 	thumb_func_start sub_80FF9E0
-sub_80FF9E0: ; 80FF9E0
+sub_80FF9E0: @ 80FF9E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -465596,7 +465596,7 @@ _080FFA76:
 	thumb_func_end sub_80FF9E0
 
 	thumb_func_start sub_80FFA84
-sub_80FFA84: ; 80FFA84
+sub_80FFA84: @ 80FFA84
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -465623,7 +465623,7 @@ _080FFAAC:
 	thumb_func_end sub_80FFA84
 
 	thumb_func_start sub_80FFAB4
-sub_80FFAB4: ; 80FFAB4
+sub_80FFAB4: @ 80FFAB4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -465675,7 +465675,7 @@ _080FFB0E:
 	thumb_func_end sub_80FFAB4
 
 	thumb_func_start sub_80FFB18
-sub_80FFB18: ; 80FFB18
+sub_80FFB18: @ 80FFB18
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0
@@ -465730,7 +465730,7 @@ _080FFB7A:
 	thumb_func_end sub_80FFB18
 
 	thumb_func_start sub_80FFB90
-sub_80FFB90: ; 80FFB90
+sub_80FFB90: @ 80FFB90
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -465781,7 +465781,7 @@ _080FFBEC:
 	thumb_func_end sub_80FFB90
 
 	thumb_func_start sub_80FFBF4
-sub_80FFBF4: ; 80FFBF4
+sub_80FFBF4: @ 80FFBF4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -465840,7 +465840,7 @@ _080FFC62:
 	thumb_func_end sub_80FFBF4
 
 	thumb_func_start sub_80FFC70
-sub_80FFC70: ; 80FFC70
+sub_80FFC70: @ 80FFC70
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -465877,7 +465877,7 @@ _080FFCAA:
 	thumb_func_end sub_80FFC70
 
 	thumb_func_start sub_80FFCB4
-sub_80FFCB4: ; 80FFCB4
+sub_80FFCB4: @ 80FFCB4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0
@@ -465932,7 +465932,7 @@ _080FFD16:
 	thumb_func_end sub_80FFCB4
 
 	thumb_func_start sub_80FFD2C
-sub_80FFD2C: ; 80FFD2C
+sub_80FFD2C: @ 80FFD2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -466003,7 +466003,7 @@ _080FFDB2:
 	thumb_func_end sub_80FFD2C
 
 	thumb_func_start sub_80FFDBC
-sub_80FFDBC: ; 80FFDBC
+sub_80FFDBC: @ 80FFDBC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -466083,7 +466083,7 @@ _080FFE50:
 	thumb_func_end sub_80FFDBC
 
 	thumb_func_start sub_80FFE58
-sub_80FFE58: ; 80FFE58
+sub_80FFE58: @ 80FFE58
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -466142,7 +466142,7 @@ _080FFEBA:
 	thumb_func_end sub_80FFE58
 
 	thumb_func_start sub_80FFEC4
-sub_80FFEC4: ; 80FFEC4
+sub_80FFEC4: @ 80FFEC4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =gUnknown_08592700
@@ -466238,7 +466238,7 @@ _080FFF76:
 	thumb_func_end sub_80FFEC4
 
 	thumb_func_start sub_80FFF7C
-sub_80FFF7C: ; 80FFF7C
+sub_80FFF7C: @ 80FFF7C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -466275,7 +466275,7 @@ _080FFF8E:
 	thumb_func_end sub_80FFF7C
 
 	thumb_func_start sub_80FFFC0
-sub_80FFFC0: ; 80FFFC0
+sub_80FFFC0: @ 80FFFC0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -466441,7 +466441,7 @@ _08100060:
 	thumb_func_end sub_80FFFC0
 
 	thumb_func_start sub_8100128
-sub_8100128: ; 8100128
+sub_8100128: @ 8100128
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -466934,7 +466934,7 @@ _081004FC:
 	thumb_func_end sub_8100128
 
 	thumb_func_start sub_8100504
-sub_8100504: ; 8100504
+sub_8100504: @ 8100504
 	push {lr}
 	movs r2, 0x8
 	movs r3, 0x36
@@ -466954,7 +466954,7 @@ _0810051A:
 	thumb_func_end sub_8100504
 
 	thumb_func_start sub_8100524
-sub_8100524: ; 8100524
+sub_8100524: @ 8100524
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -467038,7 +467038,7 @@ _081005BA:
 	thumb_func_end sub_8100524
 
 	thumb_func_start sub_81005D4
-sub_81005D4: ; 81005D4
+sub_81005D4: @ 81005D4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -467095,7 +467095,7 @@ _08100636:
 	thumb_func_end sub_81005D4
 
 	thumb_func_start sub_8100640
-sub_8100640: ; 8100640
+sub_8100640: @ 8100640
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -467224,7 +467224,7 @@ _08100738:
 	thumb_func_end sub_8100640
 
 	thumb_func_start sub_810074C
-sub_810074C: ; 810074C
+sub_810074C: @ 810074C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -467287,7 +467287,7 @@ _081007BC:
 	thumb_func_end sub_810074C
 
 	thumb_func_start sub_81007C4
-sub_81007C4: ; 81007C4
+sub_81007C4: @ 81007C4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -467387,7 +467387,7 @@ _0810088A:
 	thumb_func_end sub_81007C4
 
 	thumb_func_start sub_8100898
-sub_8100898: ; 8100898
+sub_8100898: @ 8100898
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -467513,7 +467513,7 @@ _0810098E:
 	thumb_func_end sub_8100898
 
 	thumb_func_start sub_81009A0
-sub_81009A0: ; 81009A0
+sub_81009A0: @ 81009A0
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r3, [r2, 0x2E]
@@ -467548,7 +467548,7 @@ _081009D6:
 	thumb_func_end sub_81009A0
 
 	thumb_func_start sub_81009DC
-sub_81009DC: ; 81009DC
+sub_81009DC: @ 81009DC
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -467565,7 +467565,7 @@ _081009F2:
 	thumb_func_end sub_81009DC
 
 	thumb_func_start sub_81009F8
-sub_81009F8: ; 81009F8
+sub_81009F8: @ 81009F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -467605,7 +467605,7 @@ _08100A2C:
 	thumb_func_end sub_81009F8
 
 	thumb_func_start sub_8100A50
-sub_8100A50: ; 8100A50
+sub_8100A50: @ 8100A50
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02038436
@@ -467636,7 +467636,7 @@ _08100A6A:
 	thumb_func_end sub_8100A50
 
 	thumb_func_start sub_8100A94
-sub_8100A94: ; 8100A94
+sub_8100A94: @ 8100A94
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203841e
@@ -467671,7 +467671,7 @@ sub_8100A94: ; 8100A94
 	thumb_func_end sub_8100A94
 
 	thumb_func_start sub_8100AE0
-sub_8100AE0: ; 8100AE0
+sub_8100AE0: @ 8100AE0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -467753,7 +467753,7 @@ _08100B7E:
 	thumb_func_end sub_8100AE0
 
 	thumb_func_start sub_8100B88
-sub_8100B88: ; 8100B88
+sub_8100B88: @ 8100B88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -467909,7 +467909,7 @@ _08100CBE:
 	thumb_func_end sub_8100B88
 
 	thumb_func_start sub_8100CCC
-sub_8100CCC: ; 8100CCC
+sub_8100CCC: @ 8100CCC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -467965,7 +467965,7 @@ _08100D28:
 	thumb_func_end sub_8100CCC
 
 	thumb_func_start sub_8100D38
-sub_8100D38: ; 8100D38
+sub_8100D38: @ 8100D38
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x32]
@@ -468079,7 +468079,7 @@ _08100E10:
 	thumb_func_end sub_8100D38
 
 	thumb_func_start sub_8100E1C
-sub_8100E1C: ; 8100E1C
+sub_8100E1C: @ 8100E1C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -468126,7 +468126,7 @@ _08100E4A:
 	thumb_func_end sub_8100E1C
 
 	thumb_func_start sub_8100E80
-sub_8100E80: ; 8100E80
+sub_8100E80: @ 8100E80
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -468185,7 +468185,7 @@ _08100EE8:
 	thumb_func_end sub_8100E80
 
 	thumb_func_start sub_8100EF0
-sub_8100EF0: ; 8100EF0
+sub_8100EF0: @ 8100EF0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	bl sub_80A4DF0
@@ -468289,7 +468289,7 @@ _08100F84:
 	thumb_func_end sub_8100EF0
 
 	thumb_func_start sub_8100FD4
-sub_8100FD4: ; 8100FD4
+sub_8100FD4: @ 8100FD4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -468418,7 +468418,7 @@ _081010C2:
 	thumb_func_end sub_8100FD4
 
 	thumb_func_start sub_81010CC
-sub_81010CC: ; 81010CC
+sub_81010CC: @ 81010CC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x02038437
@@ -468466,7 +468466,7 @@ sub_81010CC: ; 81010CC
 	thumb_func_end sub_81010CC
 
 	thumb_func_start sub_8101138
-sub_8101138: ; 8101138
+sub_8101138: @ 8101138
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -468648,7 +468648,7 @@ _08101290:
 	thumb_func_end sub_8101138
 
 	thumb_func_start sub_8101298
-sub_8101298: ; 8101298
+sub_8101298: @ 8101298
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -468712,7 +468712,7 @@ _08101304:
 	thumb_func_end sub_8101298
 
 	thumb_func_start sub_810130C
-sub_810130C: ; 810130C
+sub_810130C: @ 810130C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -468749,7 +468749,7 @@ _08101320:
 	thumb_func_end sub_810130C
 
 	thumb_func_start sub_810135C
-sub_810135C: ; 810135C
+sub_810135C: @ 810135C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -468850,7 +468850,7 @@ _08101414:
 	thumb_func_end sub_810135C
 
 	thumb_func_start sub_8101440
-sub_8101440: ; 8101440
+sub_8101440: @ 8101440
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -468894,7 +468894,7 @@ _0810148E:
 	thumb_func_end sub_8101440
 
 	thumb_func_start sub_81014A0
-sub_81014A0: ; 81014A0
+sub_81014A0: @ 81014A0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -468938,7 +468938,7 @@ _081014EC:
 	thumb_func_end sub_81014A0
 
 	thumb_func_start sub_81014F4
-sub_81014F4: ; 81014F4
+sub_81014F4: @ 81014F4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -468986,7 +468986,7 @@ _0810154A:
 	thumb_func_end sub_81014F4
 
 	thumb_func_start sub_8101560
-sub_8101560: ; 8101560
+sub_8101560: @ 8101560
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -469025,7 +469025,7 @@ _081015A4:
 	thumb_func_end sub_8101560
 
 	thumb_func_start sub_81015AC
-sub_81015AC: ; 81015AC
+sub_81015AC: @ 81015AC
 	push {lr}
 	ldrh r1, [r0, 0x20]
 	subs r1, 0x20
@@ -469045,7 +469045,7 @@ sub_81015AC: ; 81015AC
 	thumb_func_end sub_81015AC
 
 	thumb_func_start sub_81015D4
-sub_81015D4: ; 81015D4
+sub_81015D4: @ 81015D4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r6, [r5, 0x38]
@@ -469127,7 +469127,7 @@ _0810166A:
 	thumb_func_end sub_81015D4
 
 	thumb_func_start sub_8101684
-sub_8101684: ; 8101684
+sub_8101684: @ 8101684
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x38]
@@ -469154,7 +469154,7 @@ _081016B0:
 	thumb_func_end sub_8101684
 
 	thumb_func_start sub_81016B8
-sub_81016B8: ; 81016B8
+sub_81016B8: @ 81016B8
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x6]
@@ -469244,7 +469244,7 @@ _08101760:
 	thumb_func_end sub_81016B8
 
 	thumb_func_start sub_8101774
-sub_8101774: ; 8101774
+sub_8101774: @ 8101774
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -469328,7 +469328,7 @@ _08101814:
 	thumb_func_end sub_8101774
 
 	thumb_func_start sub_8101820
-sub_8101820: ; 8101820
+sub_8101820: @ 8101820
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203841e
@@ -469348,7 +469348,7 @@ _08101838:
 	thumb_func_end sub_8101820
 
 	thumb_func_start sub_8101848
-sub_8101848: ; 8101848
+sub_8101848: @ 8101848
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -469391,7 +469391,7 @@ _08101890:
 	thumb_func_end sub_8101848
 
 	thumb_func_start sub_8101898
-sub_8101898: ; 8101898
+sub_8101898: @ 8101898
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203841e
@@ -469477,7 +469477,7 @@ _0810190E:
 	thumb_func_end sub_8101898
 
 	thumb_func_start sub_8101940
-sub_8101940: ; 8101940
+sub_8101940: @ 8101940
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r3, 0
@@ -469525,7 +469525,7 @@ _0810198E:
 	thumb_func_end sub_8101940
 
 	thumb_func_start sub_8101998
-sub_8101998: ; 8101998
+sub_8101998: @ 8101998
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -469561,7 +469561,7 @@ _081019B6:
 	thumb_func_end sub_8101998
 
 	thumb_func_start sub_81019E8
-sub_81019E8: ; 81019E8
+sub_81019E8: @ 81019E8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x2E
@@ -469627,7 +469627,7 @@ _08101A5E:
 	thumb_func_end sub_81019E8
 
 	thumb_func_start sub_8101A74
-sub_8101A74: ; 8101A74
+sub_8101A74: @ 8101A74
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -469663,7 +469663,7 @@ _08101A92:
 	thumb_func_end sub_8101A74
 
 	thumb_func_start sub_8101AC4
-sub_8101AC4: ; 8101AC4
+sub_8101AC4: @ 8101AC4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -469684,7 +469684,7 @@ _08101ADE:
 	thumb_func_end sub_8101AC4
 
 	thumb_func_start sub_8101AE8
-sub_8101AE8: ; 8101AE8
+sub_8101AE8: @ 8101AE8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -469760,7 +469760,7 @@ _08101B78:
 	thumb_func_end sub_8101AE8
 
 	thumb_func_start sub_8101B84
-sub_8101B84: ; 8101B84
+sub_8101B84: @ 8101B84
 	push {lr}
 	bl move_anim_8072740
 	pop {r0}
@@ -469768,7 +469768,7 @@ sub_8101B84: ; 8101B84
 	thumb_func_end sub_8101B84
 
 	thumb_func_start sub_8101B90
-sub_8101B90: ; 8101B90
+sub_8101B90: @ 8101B90
 	movs r1, 0
 	strh r1, [r0, 0x2E]
 	ldr r1, =sub_8101BA0
@@ -469778,7 +469778,7 @@ sub_8101B90: ; 8101B90
 	thumb_func_end sub_8101B90
 
 	thumb_func_start sub_8101BA0
-sub_8101BA0: ; 8101BA0
+sub_8101BA0: @ 8101BA0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -469897,7 +469897,7 @@ _08101C8E:
 	thumb_func_end sub_8101BA0
 
 	thumb_func_start sub_8101C94
-sub_8101C94: ; 8101C94
+sub_8101C94: @ 8101C94
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -469971,7 +469971,7 @@ _08101D22:
 	thumb_func_end sub_8101C94
 
 	thumb_func_start sub_8101D2C
-sub_8101D2C: ; 8101D2C
+sub_8101D2C: @ 8101D2C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -470203,7 +470203,7 @@ _08101EE6:
 	thumb_func_end sub_8101D2C
 
 	thumb_func_start sub_8101EEC
-sub_8101EEC: ; 8101EEC
+sub_8101EEC: @ 8101EEC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -470245,7 +470245,7 @@ _08101F38:
 	thumb_func_end sub_8101EEC
 
 	thumb_func_start sub_8101F40
-sub_8101F40: ; 8101F40
+sub_8101F40: @ 8101F40
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -470290,7 +470290,7 @@ _08101F5E:
 	thumb_func_end sub_8101F40
 
 	thumb_func_start sub_8101FA8
-sub_8101FA8: ; 8101FA8
+sub_8101FA8: @ 8101FA8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038437
@@ -470320,7 +470320,7 @@ sub_8101FA8: ; 8101FA8
 	thumb_func_end sub_8101FA8
 
 	thumb_func_start sub_8101FF0
-sub_8101FF0: ; 8101FF0
+sub_8101FF0: @ 8101FF0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038437
@@ -470356,7 +470356,7 @@ sub_8101FF0: ; 8101FF0
 	thumb_func_end sub_8101FF0
 
 	thumb_func_start sub_8102044
-sub_8102044: ; 8102044
+sub_8102044: @ 8102044
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -470385,7 +470385,7 @@ _0810206E:
 	thumb_func_end sub_8102044
 
 	thumb_func_start sub_810207C
-sub_810207C: ; 810207C
+sub_810207C: @ 810207C
 	movs r1, 0
 	strh r1, [r0, 0x2E]
 	strh r1, [r0, 0x30]
@@ -470396,7 +470396,7 @@ sub_810207C: ; 810207C
 	thumb_func_end sub_810207C
 
 	thumb_func_start sub_810208C
-sub_810208C: ; 810208C
+sub_810208C: @ 810208C
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -470438,7 +470438,7 @@ _081020D4:
 	thumb_func_end sub_810208C
 
 	thumb_func_start sub_81020D8
-sub_81020D8: ; 81020D8
+sub_81020D8: @ 81020D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -470482,7 +470482,7 @@ _081020F6:
 	thumb_func_end sub_81020D8
 
 	thumb_func_start sub_810213C
-sub_810213C: ; 810213C
+sub_810213C: @ 810213C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -470519,7 +470519,7 @@ _08102178:
 	thumb_func_end sub_810213C
 
 	thumb_func_start sub_810217C
-sub_810217C: ; 810217C
+sub_810217C: @ 810217C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x02038436
@@ -470557,7 +470557,7 @@ sub_810217C: ; 810217C
 	thumb_func_end sub_810217C
 
 	thumb_func_start sub_81021CC
-sub_81021CC: ; 81021CC
+sub_81021CC: @ 81021CC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -470640,7 +470640,7 @@ _08102262:
 	thumb_func_end sub_81021CC
 
 	thumb_func_start sub_8102268
-sub_8102268: ; 8102268
+sub_8102268: @ 8102268
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x2E
@@ -470692,7 +470692,7 @@ _081022C2:
 	thumb_func_end sub_8102268
 
 	thumb_func_start sub_81022D4
-sub_81022D4: ; 81022D4
+sub_81022D4: @ 81022D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -470752,7 +470752,7 @@ _08102344:
 	thumb_func_end sub_81022D4
 
 	thumb_func_start sub_810234C
-sub_810234C: ; 810234C
+sub_810234C: @ 810234C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -470775,7 +470775,7 @@ sub_810234C: ; 810234C
 	thumb_func_end sub_810234C
 
 	thumb_func_start sub_810237C
-sub_810237C: ; 810237C
+sub_810237C: @ 810237C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x2E]
@@ -470822,7 +470822,7 @@ _081023CC:
 	thumb_func_end sub_810237C
 
 	thumb_func_start sub_81023E0
-sub_81023E0: ; 81023E0
+sub_81023E0: @ 81023E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -470865,7 +470865,7 @@ _08102428:
 	thumb_func_end sub_81023E0
 
 	thumb_func_start sub_8102434
-sub_8102434: ; 8102434
+sub_8102434: @ 8102434
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -470921,7 +470921,7 @@ _08102490:
 	thumb_func_end sub_8102434
 
 	thumb_func_start sub_81024A8
-sub_81024A8: ; 81024A8
+sub_81024A8: @ 81024A8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -470949,7 +470949,7 @@ _081024C2:
 	thumb_func_end sub_81024A8
 
 	thumb_func_start sub_81024E0
-sub_81024E0: ; 81024E0
+sub_81024E0: @ 81024E0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A4DF0
@@ -470986,7 +470986,7 @@ _081024FE:
 	thumb_func_end sub_81024E0
 
 	thumb_func_start sub_8102528
-sub_8102528: ; 8102528
+sub_8102528: @ 8102528
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -471001,7 +471001,7 @@ _0810253A:
 	thumb_func_end sub_8102528
 
 	thumb_func_start sub_8102540
-sub_8102540: ; 8102540
+sub_8102540: @ 8102540
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -471032,7 +471032,7 @@ sub_8102540: ; 8102540
 	thumb_func_end sub_8102540
 
 	thumb_func_start sub_8102584
-sub_8102584: ; 8102584
+sub_8102584: @ 8102584
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -471067,7 +471067,7 @@ _081025BC:
 	thumb_func_end sub_8102584
 
 	thumb_func_start sub_81025C0
-sub_81025C0: ; 81025C0
+sub_81025C0: @ 81025C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -471168,7 +471168,7 @@ sub_81025C0: ; 81025C0
 	thumb_func_end sub_81025C0
 
 	thumb_func_start sub_81026A8
-sub_81026A8: ; 81026A8
+sub_81026A8: @ 81026A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -471377,7 +471377,7 @@ _08102832:
 	thumb_func_end sub_81026A8
 
 	thumb_func_start sub_8102844
-sub_8102844: ; 8102844
+sub_8102844: @ 8102844
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -471513,7 +471513,7 @@ _08102958:
 	thumb_func_end sub_8102844
 
 	thumb_func_start sub_810296C
-sub_810296C: ; 810296C
+sub_810296C: @ 810296C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x34]
@@ -471554,7 +471554,7 @@ _081029B0:
 	thumb_func_end sub_810296C
 
 	thumb_func_start sub_81029B4
-sub_81029B4: ; 81029B4
+sub_81029B4: @ 81029B4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -471692,7 +471692,7 @@ _08102AD2:
 	thumb_func_end sub_81029B4
 
 	thumb_func_start sub_8102AE0
-sub_8102AE0: ; 8102AE0
+sub_8102AE0: @ 8102AE0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -471736,7 +471736,7 @@ _08102B32:
 	thumb_func_end sub_8102AE0
 
 	thumb_func_start sub_8102B3C
-sub_8102B3C: ; 8102B3C
+sub_8102B3C: @ 8102B3C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x34]
@@ -471809,7 +471809,7 @@ _08102BC2:
 	thumb_func_end sub_8102B3C
 
 	thumb_func_start sub_8102BCC
-sub_8102BCC: ; 8102BCC
+sub_8102BCC: @ 8102BCC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =move_anim_8072740
@@ -471823,7 +471823,7 @@ sub_8102BCC: ; 8102BCC
 	thumb_func_end sub_8102BCC
 
 	thumb_func_start sub_8102BE8
-sub_8102BE8: ; 8102BE8
+sub_8102BE8: @ 8102BE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -471917,7 +471917,7 @@ _08102C7A:
 	thumb_func_end sub_8102BE8
 
 	thumb_func_start sub_8102CA0
-sub_8102CA0: ; 8102CA0
+sub_8102CA0: @ 8102CA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -471944,7 +471944,7 @@ _08102CAA:
 	thumb_func_end sub_8102CA0
 
 	thumb_func_start sub_8102CD4
-sub_8102CD4: ; 8102CD4
+sub_8102CD4: @ 8102CD4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -472029,7 +472029,7 @@ _08102D4E:
 	thumb_func_end sub_8102CD4
 
 	thumb_func_start sub_8102D8C
-sub_8102D8C: ; 8102D8C
+sub_8102D8C: @ 8102D8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -472076,7 +472076,7 @@ _08102DC2:
 	thumb_func_end sub_8102D8C
 
 	thumb_func_start sub_8102DE4
-sub_8102DE4: ; 8102DE4
+sub_8102DE4: @ 8102DE4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -472183,7 +472183,7 @@ _08102EA6:
 	thumb_func_end sub_8102DE4
 
 	thumb_func_start sub_8102EB0
-sub_8102EB0: ; 8102EB0
+sub_8102EB0: @ 8102EB0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r7, =0x02038436
@@ -472249,7 +472249,7 @@ _08102ECE:
 	thumb_func_end sub_8102EB0
 
 	thumb_func_start sub_8102F40
-sub_8102F40: ; 8102F40
+sub_8102F40: @ 8102F40
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3A]
@@ -472312,7 +472312,7 @@ _08102FB2:
 	thumb_func_end sub_8102F40
 
 	thumb_func_start sub_8102FB8
-sub_8102FB8: ; 8102FB8
+sub_8102FB8: @ 8102FB8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -472362,7 +472362,7 @@ _08102FDE:
 	thumb_func_end sub_8102FB8
 
 	thumb_func_start sub_8103028
-sub_8103028: ; 8103028
+sub_8103028: @ 8103028
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -472425,7 +472425,7 @@ _08103074:
 	thumb_func_end sub_8103028
 
 	thumb_func_start sub_81030B0
-sub_81030B0: ; 81030B0
+sub_81030B0: @ 81030B0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -472474,7 +472474,7 @@ _08103106:
 	thumb_func_end sub_81030B0
 
 	thumb_func_start sub_810310C
-sub_810310C: ; 810310C
+sub_810310C: @ 810310C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -472520,7 +472520,7 @@ _08103158:
 	thumb_func_end sub_810310C
 
 	thumb_func_start sub_8103164
-sub_8103164: ; 8103164
+sub_8103164: @ 8103164
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -472564,7 +472564,7 @@ _08103182:
 	thumb_func_end sub_8103164
 
 	thumb_func_start sub_81031D0
-sub_81031D0: ; 81031D0
+sub_81031D0: @ 81031D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -472591,7 +472591,7 @@ _081031F8:
 	thumb_func_end sub_81031D0
 
 	thumb_func_start sub_8103208
-sub_8103208: ; 8103208
+sub_8103208: @ 8103208
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -472622,7 +472622,7 @@ _08103226:
 	thumb_func_end sub_8103208
 
 	thumb_func_start sub_8103250
-sub_8103250: ; 8103250
+sub_8103250: @ 8103250
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -472648,7 +472648,7 @@ _08103276:
 	thumb_func_end sub_8103250
 
 	thumb_func_start sub_8103284
-sub_8103284: ; 8103284
+sub_8103284: @ 8103284
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -472704,7 +472704,7 @@ _081032CA:
 	thumb_func_end sub_8103284
 
 	thumb_func_start sub_8103300
-sub_8103300: ; 8103300
+sub_8103300: @ 8103300
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x36]
@@ -472723,7 +472723,7 @@ _08103316:
 	thumb_func_end sub_8103300
 
 	thumb_func_start sub_8103320
-sub_8103320: ; 8103320
+sub_8103320: @ 8103320
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -472786,7 +472786,7 @@ _08103388:
 	thumb_func_end sub_8103320
 
 	thumb_func_start sub_8103390
-sub_8103390: ; 8103390
+sub_8103390: @ 8103390
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -472831,7 +472831,7 @@ _081033DE:
 	thumb_func_end sub_8103390
 
 	thumb_func_start sub_81033F0
-sub_81033F0: ; 81033F0
+sub_81033F0: @ 81033F0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -472861,7 +472861,7 @@ _0810341E:
 	thumb_func_end sub_81033F0
 
 	thumb_func_start sub_810342C
-sub_810342C: ; 810342C
+sub_810342C: @ 810342C
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -472879,7 +472879,7 @@ _08103444:
 	thumb_func_end sub_810342C
 
 	thumb_func_start sub_8103448
-sub_8103448: ; 8103448
+sub_8103448: @ 8103448
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -472914,7 +472914,7 @@ sub_8103448: ; 8103448
 	thumb_func_end sub_8103448
 
 	thumb_func_start sub_8103498
-sub_8103498: ; 8103498
+sub_8103498: @ 8103498
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -472943,7 +472943,7 @@ _081034B6:
 	thumb_func_end sub_8103498
 
 	thumb_func_start sub_81034D8
-sub_81034D8: ; 81034D8
+sub_81034D8: @ 81034D8
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -473002,7 +473002,7 @@ _08103538:
 	thumb_func_end sub_81034D8
 
 	thumb_func_start sub_810353C
-sub_810353C: ; 810353C
+sub_810353C: @ 810353C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r3, =0x02020630
@@ -473044,7 +473044,7 @@ _0810357A:
 	thumb_func_end sub_810353C
 
 	thumb_func_start sub_810358C
-sub_810358C: ; 810358C
+sub_810358C: @ 810358C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -473109,7 +473109,7 @@ _081035EE:
 	thumb_func_end sub_810358C
 
 	thumb_func_start sub_8103620
-sub_8103620: ; 8103620
+sub_8103620: @ 8103620
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -473133,7 +473133,7 @@ sub_8103620: ; 8103620
 	thumb_func_end sub_8103620
 
 	thumb_func_start sub_8103658
-sub_8103658: ; 8103658
+sub_8103658: @ 8103658
 	push {lr}
 	ldrh r1, [r0, 0x30]
 	strh r1, [r0, 0x2E]
@@ -473152,7 +473152,7 @@ sub_8103658: ; 8103658
 	thumb_func_end sub_8103658
 
 	thumb_func_start sub_8103680
-sub_8103680: ; 8103680
+sub_8103680: @ 8103680
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x38]
@@ -473172,7 +473172,7 @@ _0810369A:
 	thumb_func_end sub_8103680
 
 	thumb_func_start sub_81036A0
-sub_81036A0: ; 81036A0
+sub_81036A0: @ 81036A0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -473198,7 +473198,7 @@ sub_81036A0: ; 81036A0
 	thumb_func_end sub_81036A0
 
 	thumb_func_start sub_81036DC
-sub_81036DC: ; 81036DC
+sub_81036DC: @ 81036DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -473319,7 +473319,7 @@ _081037D0:
 	thumb_func_end sub_81036DC
 
 	thumb_func_start sub_81037D8
-sub_81037D8: ; 81037D8
+sub_81037D8: @ 81037D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -473395,7 +473395,7 @@ _08103860:
 	thumb_func_end sub_81037D8
 
 	thumb_func_start sub_810387C
-sub_810387C: ; 810387C
+sub_810387C: @ 810387C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -473412,7 +473412,7 @@ sub_810387C: ; 810387C
 	thumb_func_end sub_810387C
 
 	thumb_func_start sub_81038A0
-sub_81038A0: ; 81038A0
+sub_81038A0: @ 81038A0
 	push {lr}
 	movs r1, 0x6
 	strh r1, [r0, 0x2E]
@@ -473431,7 +473431,7 @@ sub_81038A0: ; 81038A0
 	thumb_func_end sub_81038A0
 
 	thumb_func_start sub_81038C8
-sub_81038C8: ; 81038C8
+sub_81038C8: @ 81038C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -473545,7 +473545,7 @@ _08103980:
 	thumb_func_end sub_81038C8
 
 	thumb_func_start sub_81039CC
-sub_81039CC: ; 81039CC
+sub_81039CC: @ 81039CC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -473573,7 +473573,7 @@ _081039F6:
 	thumb_func_end sub_81039CC
 
 	thumb_func_start sub_8103A00
-sub_8103A00: ; 8103A00
+sub_8103A00: @ 8103A00
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r0, 0x3C
@@ -473662,7 +473662,7 @@ _08103A98:
 	thumb_func_end sub_8103A00
 
 	thumb_func_start sub_8103AA4
-sub_8103AA4: ; 8103AA4
+sub_8103AA4: @ 8103AA4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -473824,7 +473824,7 @@ _08103BD4:
 	thumb_func_end sub_8103AA4
 
 	thumb_func_start sub_8103BE4
-sub_8103BE4: ; 8103BE4
+sub_8103BE4: @ 8103BE4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -473846,7 +473846,7 @@ _08103C02:
 	thumb_func_end sub_8103BE4
 
 	thumb_func_start sub_8103C0C
-sub_8103C0C: ; 8103C0C
+sub_8103C0C: @ 8103C0C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -473955,7 +473955,7 @@ _08103CE0:
 	thumb_func_end sub_8103C0C
 
 	thumb_func_start sub_8103CF0
-sub_8103CF0: ; 8103CF0
+sub_8103CF0: @ 8103CF0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -474293,7 +474293,7 @@ _08103FC8:
 	thumb_func_end sub_8103CF0
 
 	thumb_func_start sub_8103FE8
-sub_8103FE8: ; 8103FE8
+sub_8103FE8: @ 8103FE8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -474316,7 +474316,7 @@ sub_8103FE8: ; 8103FE8
 	thumb_func_end sub_8103FE8
 
 	thumb_func_start sub_8104018
-sub_8104018: ; 8104018
+sub_8104018: @ 8104018
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -474375,7 +474375,7 @@ _0810407C:
 	thumb_func_end sub_8104018
 
 	thumb_func_start sub_8104088
-sub_8104088: ; 8104088
+sub_8104088: @ 8104088
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -474454,7 +474454,7 @@ _081040CC:
 	thumb_func_end sub_8104088
 
 	thumb_func_start sub_810413C
-sub_810413C: ; 810413C
+sub_810413C: @ 810413C
 	ldr r1, =0x0000fff0
 	strh r1, [r0, 0x32]
 	ldrh r1, [r0, 0x22]
@@ -474467,7 +474467,7 @@ sub_810413C: ; 810413C
 	thumb_func_end sub_810413C
 
 	thumb_func_start sub_8104154
-sub_8104154: ; 8104154
+sub_8104154: @ 8104154
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -474524,7 +474524,7 @@ _081041B8:
 	thumb_func_end sub_8104154
 
 	thumb_func_start sub_81041C4
-sub_81041C4: ; 81041C4
+sub_81041C4: @ 81041C4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -474562,7 +474562,7 @@ sub_81041C4: ; 81041C4
 	thumb_func_end sub_81041C4
 
 	thumb_func_start sub_810421C
-sub_810421C: ; 810421C
+sub_810421C: @ 810421C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3F
@@ -474624,7 +474624,7 @@ _08104250:
 	thumb_func_end sub_810421C
 
 	thumb_func_start sub_81042A0
-sub_81042A0: ; 81042A0
+sub_81042A0: @ 81042A0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x3C]
@@ -474678,7 +474678,7 @@ _081042FE:
 	thumb_func_end sub_81042A0
 
 	thumb_func_start sub_8104304
-sub_8104304: ; 8104304
+sub_8104304: @ 8104304
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -474719,7 +474719,7 @@ _08104322:
 	thumb_func_end sub_8104304
 
 	thumb_func_start sub_8104364
-sub_8104364: ; 8104364
+sub_8104364: @ 8104364
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -474783,7 +474783,7 @@ _08104390:
 	thumb_func_end sub_8104364
 
 	thumb_func_start sub_81043F8
-sub_81043F8: ; 81043F8
+sub_81043F8: @ 81043F8
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -474800,7 +474800,7 @@ _0810440E:
 	thumb_func_end sub_81043F8
 
 	thumb_func_start sub_8104414
-sub_8104414: ; 8104414
+sub_8104414: @ 8104414
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -474876,7 +474876,7 @@ _08104448:
 	thumb_func_end sub_8104414
 
 	thumb_func_start sub_81044BC
-sub_81044BC: ; 81044BC
+sub_81044BC: @ 81044BC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -474933,7 +474933,7 @@ _08104520:
 	thumb_func_end sub_81044BC
 
 	thumb_func_start sub_8104530
-sub_8104530: ; 8104530
+sub_8104530: @ 8104530
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -474987,7 +474987,7 @@ _0810458A:
 	thumb_func_end sub_8104530
 
 	thumb_func_start sub_8104594
-sub_8104594: ; 8104594
+sub_8104594: @ 8104594
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -475003,7 +475003,7 @@ _081045A8:
 	thumb_func_end sub_8104594
 
 	thumb_func_start sub_81045B0
-sub_81045B0: ; 81045B0
+sub_81045B0: @ 81045B0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -475047,7 +475047,7 @@ sub_81045B0: ; 81045B0
 	thumb_func_end sub_81045B0
 
 	thumb_func_start sub_8104614
-sub_8104614: ; 8104614
+sub_8104614: @ 8104614
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -475092,7 +475092,7 @@ _08104664:
 	thumb_func_end sub_8104614
 
 	thumb_func_start sub_8104674
-sub_8104674: ; 8104674
+sub_8104674: @ 8104674
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -475132,7 +475132,7 @@ sub_8104674: ; 8104674
 	thumb_func_end sub_8104674
 
 	thumb_func_start sub_81046CC
-sub_81046CC: ; 81046CC
+sub_81046CC: @ 81046CC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -475286,7 +475286,7 @@ _081047F6:
 	thumb_func_end sub_81046CC
 
 	thumb_func_start sub_8104800
-sub_8104800: ; 8104800
+sub_8104800: @ 8104800
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -475402,7 +475402,7 @@ _081048DA:
 	thumb_func_end sub_8104800
 
 	thumb_func_start sub_81048F0
-sub_81048F0: ; 81048F0
+sub_81048F0: @ 81048F0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -475440,7 +475440,7 @@ _0810492E:
 	thumb_func_end sub_81048F0
 
 	thumb_func_start sub_8104938
-sub_8104938: ; 8104938
+sub_8104938: @ 8104938
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -475484,7 +475484,7 @@ _0810498A:
 	thumb_func_end sub_8104938
 
 	thumb_func_start sub_8104998
-sub_8104998: ; 8104998
+sub_8104998: @ 8104998
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -475624,7 +475624,7 @@ _08104AA8:
 	thumb_func_end sub_8104998
 
 	thumb_func_start sub_8104AB4
-sub_8104AB4: ; 8104AB4
+sub_8104AB4: @ 8104AB4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -475650,7 +475650,7 @@ sub_8104AB4: ; 8104AB4
 	thumb_func_end sub_8104AB4
 
 	thumb_func_start sub_8104AF0
-sub_8104AF0: ; 8104AF0
+sub_8104AF0: @ 8104AF0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -475673,7 +475673,7 @@ _08104B10:
 	thumb_func_end sub_8104AF0
 
 	thumb_func_start sub_8104B1C
-sub_8104B1C: ; 8104B1C
+sub_8104B1C: @ 8104B1C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -475734,7 +475734,7 @@ _08104B6A:
 	thumb_func_end sub_8104B1C
 
 	thumb_func_start sub_8104BAC
-sub_8104BAC: ; 8104BAC
+sub_8104BAC: @ 8104BAC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =0x0203841e
@@ -475797,7 +475797,7 @@ _08104C16:
 	thumb_func_end sub_8104BAC
 
 	thumb_func_start sub_8104C38
-sub_8104C38: ; 8104C38
+sub_8104C38: @ 8104C38
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -475826,7 +475826,7 @@ sub_8104C38: ; 8104C38
 	thumb_func_end sub_8104C38
 
 	thumb_func_start sub_8104C78
-sub_8104C78: ; 8104C78
+sub_8104C78: @ 8104C78
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -475849,7 +475849,7 @@ _08104C98:
 	thumb_func_end sub_8104C78
 
 	thumb_func_start sub_8104CA4
-sub_8104CA4: ; 8104CA4
+sub_8104CA4: @ 8104CA4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -475911,7 +475911,7 @@ _08104D0E:
 	thumb_func_end sub_8104CA4
 
 	thumb_func_start sub_8104D28
-sub_8104D28: ; 8104D28
+sub_8104D28: @ 8104D28
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -476080,7 +476080,7 @@ _08104E6C:
 	thumb_func_end sub_8104D28
 
 	thumb_func_start sub_8104E74
-sub_8104E74: ; 8104E74
+sub_8104E74: @ 8104E74
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -476181,7 +476181,7 @@ _08104F1A:
 	thumb_func_end sub_8104E74
 
 	thumb_func_start sub_8104F54
-sub_8104F54: ; 8104F54
+sub_8104F54: @ 8104F54
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -476287,7 +476287,7 @@ _0810500E:
 	thumb_func_end sub_8104F54
 
 	thumb_func_start sub_810501C
-sub_810501C: ; 810501C
+sub_810501C: @ 810501C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x02038437
@@ -476330,7 +476330,7 @@ sub_810501C: ; 810501C
 	thumb_func_end sub_810501C
 
 	thumb_func_start sub_8105078
-sub_8105078: ; 8105078
+sub_8105078: @ 8105078
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -476508,7 +476508,7 @@ _081051BC:
 	thumb_func_end sub_8105078
 
 	thumb_func_start sub_81051C4
-sub_81051C4: ; 81051C4
+sub_81051C4: @ 81051C4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -476599,7 +476599,7 @@ _0810526A:
 	thumb_func_end sub_81051C4
 
 	thumb_func_start sub_8105284
-sub_8105284: ; 8105284
+sub_8105284: @ 8105284
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -476617,7 +476617,7 @@ _0810529E:
 	thumb_func_end sub_8105284
 
 	thumb_func_start sub_81052A4
-sub_81052A4: ; 81052A4
+sub_81052A4: @ 81052A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -476874,7 +476874,7 @@ _0810549E:
 	thumb_func_end sub_81052A4
 
 	thumb_func_start sub_81054E8
-sub_81054E8: ; 81054E8
+sub_81054E8: @ 81054E8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x000027db
@@ -476907,7 +476907,7 @@ _0810550E:
 	thumb_func_end sub_81054E8
 
 	thumb_func_start sub_8105538
-sub_8105538: ; 8105538
+sub_8105538: @ 8105538
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -476937,7 +476937,7 @@ _08105554:
 	thumb_func_end sub_8105538
 
 	thumb_func_start sub_810557C
-sub_810557C: ; 810557C
+sub_810557C: @ 810557C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x2E]
@@ -476995,7 +476995,7 @@ _081055E0:
 	thumb_func_end sub_810557C
 
 	thumb_func_start sub_81055F4
-sub_81055F4: ; 81055F4
+sub_81055F4: @ 81055F4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -477018,7 +477018,7 @@ _08105612:
 	thumb_func_end sub_81055F4
 
 	thumb_func_start sub_810561C
-sub_810561C: ; 810561C
+sub_810561C: @ 810561C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -477073,7 +477073,7 @@ _08105682:
 	thumb_func_end sub_810561C
 
 	thumb_func_start sub_8105694
-sub_8105694: ; 8105694
+sub_8105694: @ 8105694
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x26]
@@ -477107,7 +477107,7 @@ _081056CA:
 	thumb_func_end sub_8105694
 
 	thumb_func_start sub_81056D4
-sub_81056D4: ; 81056D4
+sub_81056D4: @ 81056D4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -477145,7 +477145,7 @@ _08105712:
 	thumb_func_end sub_81056D4
 
 	thumb_func_start sub_810571C
-sub_810571C: ; 810571C
+sub_810571C: @ 810571C
 	push {lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203841e
@@ -477177,7 +477177,7 @@ _08105754:
 	thumb_func_end sub_810571C
 
 	thumb_func_start sub_810575C
-sub_810575C: ; 810575C
+sub_810575C: @ 810575C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -477194,7 +477194,7 @@ sub_810575C: ; 810575C
 	thumb_func_end sub_810575C
 
 	thumb_func_start sub_810577C
-sub_810577C: ; 810577C
+sub_810577C: @ 810577C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -477221,7 +477221,7 @@ sub_810577C: ; 810577C
 	thumb_func_end sub_810577C
 
 	thumb_func_start sub_81057B8
-sub_81057B8: ; 81057B8
+sub_81057B8: @ 81057B8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -477265,7 +477265,7 @@ _08105802:
 	thumb_func_end sub_81057B8
 
 	thumb_func_start sub_8105810
-sub_8105810: ; 8105810
+sub_8105810: @ 8105810
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -477312,7 +477312,7 @@ _08105856:
 	thumb_func_end sub_8105810
 
 	thumb_func_start sub_8105878
-sub_8105878: ; 8105878
+sub_8105878: @ 8105878
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -477464,7 +477464,7 @@ _08105992:
 	thumb_func_end sub_8105878
 
 	thumb_func_start sub_810599C
-sub_810599C: ; 810599C
+sub_810599C: @ 810599C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -477498,7 +477498,7 @@ sub_810599C: ; 810599C
 	thumb_func_end sub_810599C
 
 	thumb_func_start sub_81059E0
-sub_81059E0: ; 81059E0
+sub_81059E0: @ 81059E0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -477602,7 +477602,7 @@ _08105AA6:
 	thumb_func_end sub_81059E0
 
 	thumb_func_start sub_8105AAC
-sub_8105AAC: ; 8105AAC
+sub_8105AAC: @ 8105AAC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -477645,7 +477645,7 @@ sub_8105AAC: ; 8105AAC
 	thumb_func_end sub_8105AAC
 
 	thumb_func_start sub_8105B08
-sub_8105B08: ; 8105B08
+sub_8105B08: @ 8105B08
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -477808,7 +477808,7 @@ _08105C42:
 	thumb_func_end sub_8105B08
 
 	thumb_func_start sub_8105C48
-sub_8105C48: ; 8105C48
+sub_8105C48: @ 8105C48
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r4, =0x03005e00
@@ -477865,7 +477865,7 @@ _08105CAA:
 	thumb_func_end sub_8105C48
 
 	thumb_func_start sub_8105CB4
-sub_8105CB4: ; 8105CB4
+sub_8105CB4: @ 8105CB4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -477943,7 +477943,7 @@ _08105D00:
 	thumb_func_end sub_8105CB4
 
 	thumb_func_start sub_8105D60
-sub_8105D60: ; 8105D60
+sub_8105D60: @ 8105D60
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -477965,7 +477965,7 @@ _08105D6A:
 	thumb_func_end sub_8105D60
 
 	thumb_func_start sub_8105D88
-sub_8105D88: ; 8105D88
+sub_8105D88: @ 8105D88
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -478010,7 +478010,7 @@ sub_8105D88: ; 8105D88
 	thumb_func_end sub_8105D88
 
 	thumb_func_start sub_8105DE8
-sub_8105DE8: ; 8105DE8
+sub_8105DE8: @ 8105DE8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0
@@ -478061,7 +478061,7 @@ _08105E08:
 	thumb_func_end sub_8105DE8
 
 	thumb_func_start sub_8105E60
-sub_8105E60: ; 8105E60
+sub_8105E60: @ 8105E60
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -478104,7 +478104,7 @@ _08105EAA:
 	thumb_func_end sub_8105E60
 
 	thumb_func_start sub_8105EB0
-sub_8105EB0: ; 8105EB0
+sub_8105EB0: @ 8105EB0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -478155,7 +478155,7 @@ _08105EC4:
 	thumb_func_end sub_8105EB0
 
 	thumb_func_start sub_8105F30
-sub_8105F30: ; 8105F30
+sub_8105F30: @ 8105F30
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -478196,7 +478196,7 @@ _08105F78:
 	thumb_func_end sub_8105F30
 
 	thumb_func_start sub_8105F84
-sub_8105F84: ; 8105F84
+sub_8105F84: @ 8105F84
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -478264,7 +478264,7 @@ _0810600C:
 	thumb_func_end sub_8105F84
 
 	thumb_func_start sub_8106020
-sub_8106020: ; 8106020
+sub_8106020: @ 8106020
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -478329,7 +478329,7 @@ _081060A4:
 	thumb_func_end sub_8106020
 
 	thumb_func_start sub_81060B0
-sub_81060B0: ; 81060B0
+sub_81060B0: @ 81060B0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -478394,7 +478394,7 @@ _08106134:
 	thumb_func_end sub_81060B0
 
 	thumb_func_start sub_8106140
-sub_8106140: ; 8106140
+sub_8106140: @ 8106140
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -478429,7 +478429,7 @@ sub_8106140: ; 8106140
 	thumb_func_end sub_8106140
 
 	thumb_func_start sub_810618C
-sub_810618C: ; 810618C
+sub_810618C: @ 810618C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -478459,7 +478459,7 @@ _081061BC:
 	thumb_func_end sub_810618C
 
 	thumb_func_start sub_81061C4
-sub_81061C4: ; 81061C4
+sub_81061C4: @ 81061C4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x2E]
@@ -478529,7 +478529,7 @@ _08106244:
 	thumb_func_end sub_81061C4
 
 	thumb_func_start sub_810624C
-sub_810624C: ; 810624C
+sub_810624C: @ 810624C
 	push {lr}
 	ldr r2, =0x0203841e
 	ldrh r1, [r2]
@@ -478550,7 +478550,7 @@ sub_810624C: ; 810624C
 	thumb_func_end sub_810624C
 
 	thumb_func_start sub_810627C
-sub_810627C: ; 810627C
+sub_810627C: @ 810627C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -478607,7 +478607,7 @@ _081062E2:
 	thumb_func_end sub_810627C
 
 	thumb_func_start sub_81062E8
-sub_81062E8: ; 81062E8
+sub_81062E8: @ 81062E8
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -478680,7 +478680,7 @@ _0810632A:
 	thumb_func_end sub_81062E8
 
 	thumb_func_start sub_81063A8
-sub_81063A8: ; 81063A8
+sub_81063A8: @ 81063A8
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -478842,7 +478842,7 @@ _081064F0:
 	thumb_func_end sub_81063A8
 
 	thumb_func_start sub_81064F8
-sub_81064F8: ; 81064F8
+sub_81064F8: @ 81064F8
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -478939,7 +478939,7 @@ _081065A6:
 	thumb_func_end sub_81064F8
 
 	thumb_func_start sub_81065EC
-sub_81065EC: ; 81065EC
+sub_81065EC: @ 81065EC
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -479101,7 +479101,7 @@ _08106730:
 	thumb_func_end sub_81065EC
 
 	thumb_func_start sub_810673C
-sub_810673C: ; 810673C
+sub_810673C: @ 810673C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -479144,7 +479144,7 @@ sub_810673C: ; 810673C
 	thumb_func_end sub_810673C
 
 	thumb_func_start sub_810679C
-sub_810679C: ; 810679C
+sub_810679C: @ 810679C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -479252,7 +479252,7 @@ _08106868:
 	thumb_func_end sub_810679C
 
 	thumb_func_start sub_8106878
-sub_8106878: ; 8106878
+sub_8106878: @ 8106878
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -479288,7 +479288,7 @@ sub_8106878: ; 8106878
 	thumb_func_end sub_8106878
 
 	thumb_func_start sub_81068CC
-sub_81068CC: ; 81068CC
+sub_81068CC: @ 81068CC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -479329,7 +479329,7 @@ _08106910:
 	thumb_func_end sub_81068CC
 
 	thumb_func_start sub_8106914
-sub_8106914: ; 8106914
+sub_8106914: @ 8106914
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -479357,7 +479357,7 @@ _08106940:
 	thumb_func_end sub_8106914
 
 	thumb_func_start sub_8106944
-sub_8106944: ; 8106944
+sub_8106944: @ 8106944
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -479395,7 +479395,7 @@ sub_8106944: ; 8106944
 	thumb_func_end sub_8106944
 
 	thumb_func_start sub_810699C
-sub_810699C: ; 810699C
+sub_810699C: @ 810699C
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -479412,7 +479412,7 @@ _081069B2:
 	thumb_func_end sub_810699C
 
 	thumb_func_start sub_81069B8
-sub_81069B8: ; 81069B8
+sub_81069B8: @ 81069B8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -479426,7 +479426,7 @@ sub_81069B8: ; 81069B8
 	thumb_func_end sub_81069B8
 
 	thumb_func_start sub_81069D0
-sub_81069D0: ; 81069D0
+sub_81069D0: @ 81069D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -479504,7 +479504,7 @@ _08106A5A:
 	thumb_func_end sub_81069D0
 
 	thumb_func_start sub_8106A64
-sub_8106A64: ; 8106A64
+sub_8106A64: @ 8106A64
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -479561,7 +479561,7 @@ _08106AC8:
 	thumb_func_end sub_8106A64
 
 	thumb_func_start sub_8106AD0
-sub_8106AD0: ; 8106AD0
+sub_8106AD0: @ 8106AD0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x2E]
@@ -479626,7 +479626,7 @@ _08106B48:
 	thumb_func_end sub_8106AD0
 
 	thumb_func_start sub_8106B54
-sub_8106B54: ; 8106B54
+sub_8106B54: @ 8106B54
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -479778,7 +479778,7 @@ _08106C78:
 	thumb_func_end sub_8106B54
 
 	thumb_func_start sub_8106C80
-sub_8106C80: ; 8106C80
+sub_8106C80: @ 8106C80
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -479819,7 +479819,7 @@ _08106CC8:
 	thumb_func_end sub_8106C80
 
 	thumb_func_start sub_8106CD0
-sub_8106CD0: ; 8106CD0
+sub_8106CD0: @ 8106CD0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r1, =0x0203841e
@@ -479887,7 +479887,7 @@ _08106D50:
 	thumb_func_end sub_8106CD0
 
 	thumb_func_start sub_8106D5C
-sub_8106D5C: ; 8106D5C
+sub_8106D5C: @ 8106D5C
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -479917,7 +479917,7 @@ _08106D8C:
 	thumb_func_end sub_8106D5C
 
 	thumb_func_start sub_8106D90
-sub_8106D90: ; 8106D90
+sub_8106D90: @ 8106D90
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -479945,7 +479945,7 @@ sub_8106D90: ; 8106D90
 	thumb_func_end sub_8106D90
 
 	thumb_func_start sub_8106DD4
-sub_8106DD4: ; 8106DD4
+sub_8106DD4: @ 8106DD4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -479968,7 +479968,7 @@ _08106DF4:
 	thumb_func_end sub_8106DD4
 
 	thumb_func_start sub_8106E00
-sub_8106E00: ; 8106E00
+sub_8106E00: @ 8106E00
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -480060,7 +480060,7 @@ _08106E88:
 	thumb_func_end sub_8106E00
 
 	thumb_func_start sub_8106EC8
-sub_8106EC8: ; 8106EC8
+sub_8106EC8: @ 8106EC8
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x34]
@@ -480092,7 +480092,7 @@ _08106EFC:
 	thumb_func_end sub_8106EC8
 
 	thumb_func_start sub_8106F00
-sub_8106F00: ; 8106F00
+sub_8106F00: @ 8106F00
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -480143,7 +480143,7 @@ _08106F54:
 	thumb_func_end sub_8106F00
 
 	thumb_func_start sub_8106F60
-sub_8106F60: ; 8106F60
+sub_8106F60: @ 8106F60
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x2E
@@ -480232,7 +480232,7 @@ _0810700A:
 	thumb_func_end sub_8106F60
 
 	thumb_func_start sub_8107018
-sub_8107018: ; 8107018
+sub_8107018: @ 8107018
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -480253,7 +480253,7 @@ _08107032:
 	thumb_func_end sub_8107018
 
 	thumb_func_start sub_810703C
-sub_810703C: ; 810703C
+sub_810703C: @ 810703C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x32]
@@ -480314,7 +480314,7 @@ _081070A6:
 	thumb_func_end sub_810703C
 
 	thumb_func_start sub_81070AC
-sub_81070AC: ; 81070AC
+sub_81070AC: @ 81070AC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02022fec
@@ -480381,7 +480381,7 @@ _08107118:
 	thumb_func_end sub_81070AC
 
 	thumb_func_start sub_8107144
-sub_8107144: ; 8107144
+sub_8107144: @ 8107144
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -480399,7 +480399,7 @@ sub_8107144: ; 8107144
 	thumb_func_end sub_8107144
 
 	thumb_func_start update_fury_cutter_counter_copy
-update_fury_cutter_counter_copy: ; 8107168
+update_fury_cutter_counter_copy: @ 8107168
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -480415,7 +480415,7 @@ update_fury_cutter_counter_copy: ; 8107168
 	thumb_func_end update_fury_cutter_counter_copy
 
 	thumb_func_start sub_8107188
-sub_8107188: ; 8107188
+sub_8107188: @ 8107188
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -480484,7 +480484,7 @@ _0810720A:
 	thumb_func_end sub_8107188
 
 	thumb_func_start sub_810721C
-sub_810721C: ; 810721C
+sub_810721C: @ 810721C
 	ldr r1, =sub_8107228
 	str r1, [r0, 0x1C]
 	bx lr
@@ -480492,7 +480492,7 @@ sub_810721C: ; 810721C
 	thumb_func_end sub_810721C
 
 	thumb_func_start sub_8107228
-sub_8107228: ; 8107228
+sub_8107228: @ 8107228
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -480524,7 +480524,7 @@ _0810725A:
 	thumb_func_end sub_8107228
 
 	thumb_func_start sub_8107260
-sub_8107260: ; 8107260
+sub_8107260: @ 8107260
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r5, =0x02038436
@@ -480648,7 +480648,7 @@ _081072D8:
 	thumb_func_end sub_8107260
 
 	thumb_func_start sub_8107380
-sub_8107380: ; 8107380
+sub_8107380: @ 8107380
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -480715,7 +480715,7 @@ _081073F6:
 	thumb_func_end sub_8107380
 
 	thumb_func_start sub_8107408
-sub_8107408: ; 8107408
+sub_8107408: @ 8107408
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x2C
@@ -480734,7 +480734,7 @@ sub_8107408: ; 8107408
 	thumb_func_end sub_8107408
 
 	thumb_func_start sub_8107430
-sub_8107430: ; 8107430
+sub_8107430: @ 8107430
 	push {lr}
 	movs r1, 0xA
 	strh r1, [r0, 0x2E]
@@ -480748,7 +480748,7 @@ sub_8107430: ; 8107430
 	thumb_func_end sub_8107430
 
 	thumb_func_start sub_810744C
-sub_810744C: ; 810744C
+sub_810744C: @ 810744C
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
@@ -480814,7 +480814,7 @@ _08107482:
 	thumb_func_end sub_810744C
 
 	thumb_func_start sub_81074E4
-sub_81074E4: ; 81074E4
+sub_81074E4: @ 81074E4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -480847,7 +480847,7 @@ _08107518:
 	thumb_func_end sub_81074E4
 
 	thumb_func_start sub_8107528
-sub_8107528: ; 8107528
+sub_8107528: @ 8107528
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -480876,7 +480876,7 @@ sub_8107528: ; 8107528
 	thumb_func_end sub_8107528
 
 	thumb_func_start sub_810756C
-sub_810756C: ; 810756C
+sub_810756C: @ 810756C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -480943,7 +480943,7 @@ _081075DE:
 	thumb_func_end sub_810756C
 
 	thumb_func_start sub_81075EC
-sub_81075EC: ; 81075EC
+sub_81075EC: @ 81075EC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
@@ -481006,7 +481006,7 @@ _08107660:
 	thumb_func_end sub_81075EC
 
 	thumb_func_start sub_8107674
-sub_8107674: ; 8107674
+sub_8107674: @ 8107674
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -481051,7 +481051,7 @@ _081076C0:
 	thumb_func_end sub_8107674
 
 	thumb_func_start sub_81076C8
-sub_81076C8: ; 81076C8
+sub_81076C8: @ 81076C8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -481071,7 +481071,7 @@ sub_81076C8: ; 81076C8
 	thumb_func_end sub_81076C8
 
 	thumb_func_start sub_81076F4
-sub_81076F4: ; 81076F4
+sub_81076F4: @ 81076F4
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -481101,7 +481101,7 @@ _08107722:
 	thumb_func_end sub_81076F4
 
 	thumb_func_start sub_8107730
-sub_8107730: ; 8107730
+sub_8107730: @ 8107730
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r7, =0x02038436
@@ -481157,7 +481157,7 @@ _0810778E:
 	thumb_func_end sub_8107730
 
 	thumb_func_start sub_81077A4
-sub_81077A4: ; 81077A4
+sub_81077A4: @ 81077A4
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -481174,7 +481174,7 @@ _081077BA:
 	thumb_func_end sub_81077A4
 
 	thumb_func_start sub_81077C0
-sub_81077C0: ; 81077C0
+sub_81077C0: @ 81077C0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r5, =0x02038436
@@ -481270,7 +481270,7 @@ _08107842:
 	thumb_func_end sub_81077C0
 
 	thumb_func_start sub_8107894
-sub_8107894: ; 8107894
+sub_8107894: @ 8107894
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -481297,7 +481297,7 @@ sub_8107894: ; 8107894
 	thumb_func_end sub_8107894
 
 	thumb_func_start sub_81078D0
-sub_81078D0: ; 81078D0
+sub_81078D0: @ 81078D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -481327,7 +481327,7 @@ _081078F4:
 	thumb_func_end sub_81078D0
 
 	thumb_func_start sub_810790C
-sub_810790C: ; 810790C
+sub_810790C: @ 810790C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -481365,7 +481365,7 @@ _0810794C:
 	thumb_func_end sub_810790C
 
 	thumb_func_start sub_8107954
-sub_8107954: ; 8107954
+sub_8107954: @ 8107954
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -481590,7 +481590,7 @@ _08107B58:
 	thumb_func_end sub_8107954
 
 	thumb_func_start sub_8107B84
-sub_8107B84: ; 8107B84
+sub_8107B84: @ 8107B84
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -481749,7 +481749,7 @@ _08107CA8:
 	thumb_func_end sub_8107B84
 
 	thumb_func_start sub_8107CC4
-sub_8107CC4: ; 8107CC4
+sub_8107CC4: @ 8107CC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -481817,7 +481817,7 @@ _08107D4A:
 	thumb_func_end sub_8107CC4
 
 	thumb_func_start sub_8107D58
-sub_8107D58: ; 8107D58
+sub_8107D58: @ 8107D58
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -482195,7 +482195,7 @@ _08108022:
 	thumb_func_end sub_8107D58
 
 	thumb_func_start sub_8108034
-sub_8108034: ; 8108034
+sub_8108034: @ 8108034
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x4]
@@ -482240,7 +482240,7 @@ _0810807A:
 	thumb_func_end sub_8108034
 
 	thumb_func_start sub_8108098
-sub_8108098: ; 8108098
+sub_8108098: @ 8108098
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -482284,7 +482284,7 @@ _081080DE:
 	thumb_func_end sub_8108098
 
 	thumb_func_start sub_81080E4
-sub_81080E4: ; 81080E4
+sub_81080E4: @ 81080E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -482325,7 +482325,7 @@ sub_81080E4: ; 81080E4
 	thumb_func_end sub_81080E4
 
 	thumb_func_start sub_8108140
-sub_8108140: ; 8108140
+sub_8108140: @ 8108140
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -482607,7 +482607,7 @@ _0810837A:
 	thumb_func_end sub_8108140
 
 	thumb_func_start sub_8108384
-sub_8108384: ; 8108384
+sub_8108384: @ 8108384
 	push {r4,r5,lr}
 	ldr r4, =0x02038436
 	ldrb r0, [r4]
@@ -482670,7 +482670,7 @@ _081083FA:
 	thumb_func_end sub_8108384
 
 	thumb_func_start sub_8108408
-sub_8108408: ; 8108408
+sub_8108408: @ 8108408
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -482804,7 +482804,7 @@ _081084DA:
 	thumb_func_end sub_8108408
 
 	thumb_func_start sub_810851C
-sub_810851C: ; 810851C
+sub_810851C: @ 810851C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -482894,7 +482894,7 @@ _081085BE:
 	thumb_func_end sub_810851C
 
 	thumb_func_start sub_81085C8
-sub_81085C8: ; 81085C8
+sub_81085C8: @ 81085C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -482944,7 +482944,7 @@ _08108606:
 	thumb_func_end sub_81085C8
 
 	thumb_func_start sub_810862C
-sub_810862C: ; 810862C
+sub_810862C: @ 810862C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -483062,7 +483062,7 @@ _08108712:
 	thumb_func_end sub_810862C
 
 	thumb_func_start sub_810871C
-sub_810871C: ; 810871C
+sub_810871C: @ 810871C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -483135,7 +483135,7 @@ _08108776:
 	thumb_func_end sub_810871C
 
 	thumb_func_start sub_81087C0
-sub_81087C0: ; 81087C0
+sub_81087C0: @ 81087C0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -483217,7 +483217,7 @@ _08108856:
 	thumb_func_end sub_81087C0
 
 	thumb_func_start sub_810886C
-sub_810886C: ; 810886C
+sub_810886C: @ 810886C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -483278,7 +483278,7 @@ _081088D8:
 	thumb_func_end sub_810886C
 
 	thumb_func_start sub_81088E4
-sub_81088E4: ; 81088E4
+sub_81088E4: @ 81088E4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -483346,7 +483346,7 @@ _0810893C:
 	thumb_func_end sub_81088E4
 
 	thumb_func_start sub_8108978
-sub_8108978: ; 8108978
+sub_8108978: @ 8108978
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -483510,7 +483510,7 @@ _08108AB8:
 	thumb_func_end sub_8108978
 
 	thumb_func_start sub_8108AC0
-sub_8108AC0: ; 8108AC0
+sub_8108AC0: @ 8108AC0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldrh r0, [r6, 0xC]
@@ -483562,7 +483562,7 @@ _08108B1A:
 	thumb_func_end sub_8108AC0
 
 	thumb_func_start sub_8108B2C
-sub_8108B2C: ; 8108B2C
+sub_8108B2C: @ 8108B2C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A6900
@@ -483611,7 +483611,7 @@ _08108B86:
 	thumb_func_end sub_8108B2C
 
 	thumb_func_start sub_8108B94
-sub_8108B94: ; 8108B94
+sub_8108B94: @ 8108B94
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	bl sub_80A6900
@@ -483650,7 +483650,7 @@ _08108BD0:
 	thumb_func_end sub_8108B94
 
 	thumb_func_start sub_8108BE0
-sub_8108BE0: ; 8108BE0
+sub_8108BE0: @ 8108BE0
 	ldr r2, =0x0203841e
 	ldrh r1, [r2]
 	strh r1, [r0, 0x20]
@@ -483671,7 +483671,7 @@ sub_8108BE0: ; 8108BE0
 	thumb_func_end sub_8108BE0
 
 	thumb_func_start sub_8108C08
-sub_8108C08: ; 8108C08
+sub_8108C08: @ 8108C08
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x36]
@@ -483710,7 +483710,7 @@ _08108C4C:
 	thumb_func_end sub_8108C08
 
 	thumb_func_start sub_8108C54
-sub_8108C54: ; 8108C54
+sub_8108C54: @ 8108C54
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -483744,7 +483744,7 @@ _08108C8C:
 	thumb_func_end sub_8108C54
 
 	thumb_func_start sub_8108C94
-sub_8108C94: ; 8108C94
+sub_8108C94: @ 8108C94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -483776,7 +483776,7 @@ sub_8108C94: ; 8108C94
 	thumb_func_end sub_8108C94
 
 	thumb_func_start sub_8108CDC
-sub_8108CDC: ; 8108CDC
+sub_8108CDC: @ 8108CDC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r0, 0x30
@@ -483837,7 +483837,7 @@ _08108D46:
 	thumb_func_end sub_8108CDC
 
 	thumb_func_start sub_8108D54
-sub_8108D54: ; 8108D54
+sub_8108D54: @ 8108D54
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -484014,7 +484014,7 @@ _08108EAA:
 	thumb_func_end sub_8108D54
 
 	thumb_func_start sub_8108EC8
-sub_8108EC8: ; 8108EC8
+sub_8108EC8: @ 8108EC8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -484043,7 +484043,7 @@ sub_8108EC8: ; 8108EC8
 	thumb_func_end sub_8108EC8
 
 	thumb_func_start sub_8108F08
-sub_8108F08: ; 8108F08
+sub_8108F08: @ 8108F08
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -484073,7 +484073,7 @@ sub_8108F08: ; 8108F08
 	thumb_func_end sub_8108F08
 
 	thumb_func_start sub_8108F4C
-sub_8108F4C: ; 8108F4C
+sub_8108F4C: @ 8108F4C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -484126,7 +484126,7 @@ _08108F9E:
 	thumb_func_end sub_8108F4C
 
 	thumb_func_start sub_8108FBC
-sub_8108FBC: ; 8108FBC
+sub_8108FBC: @ 8108FBC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -484178,7 +484178,7 @@ _08109008:
 	thumb_func_end sub_8108FBC
 
 	thumb_func_start sub_8109028
-sub_8109028: ; 8109028
+sub_8109028: @ 8109028
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -484213,7 +484213,7 @@ _08109060:
 	thumb_func_end sub_8109028
 
 	thumb_func_start sub_8109064
-sub_8109064: ; 8109064
+sub_8109064: @ 8109064
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -484267,7 +484267,7 @@ _081090A2:
 	thumb_func_end sub_8109064
 
 	thumb_func_start sub_81090D8
-sub_81090D8: ; 81090D8
+sub_81090D8: @ 81090D8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -484344,7 +484344,7 @@ _08109166:
 	thumb_func_end sub_81090D8
 
 	thumb_func_start sub_810916C
-sub_810916C: ; 810916C
+sub_810916C: @ 810916C
 	push {lr}
 	movs r1, 0
 	strh r1, [r0, 0x20]
@@ -484365,7 +484365,7 @@ sub_810916C: ; 810916C
 	thumb_func_end sub_810916C
 
 	thumb_func_start sub_8109198
-sub_8109198: ; 8109198
+sub_8109198: @ 8109198
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r5, =0x02038436
@@ -484410,7 +484410,7 @@ _081091DE:
 	thumb_func_end sub_8109198
 
 	thumb_func_start sub_8109200
-sub_8109200: ; 8109200
+sub_8109200: @ 8109200
 	ldr r2, =0x0203841e
 	ldrh r1, [r2]
 	negs r1, r1
@@ -484425,7 +484425,7 @@ sub_8109200: ; 8109200
 	thumb_func_end sub_8109200
 
 	thumb_func_start sub_810921C
-sub_810921C: ; 810921C
+sub_810921C: @ 810921C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -484444,7 +484444,7 @@ sub_810921C: ; 810921C
 	thumb_func_end sub_810921C
 
 	thumb_func_start sub_8109244
-sub_8109244: ; 8109244
+sub_8109244: @ 8109244
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8109338
@@ -484486,7 +484486,7 @@ _0810928E:
 	thumb_func_end sub_8109244
 
 	thumb_func_start sub_810929C
-sub_810929C: ; 810929C
+sub_810929C: @ 810929C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A6F3C
@@ -484543,7 +484543,7 @@ _0810930E:
 	thumb_func_end sub_810929C
 
 	thumb_func_start sub_8109314
-sub_8109314: ; 8109314
+sub_8109314: @ 8109314
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8109338
@@ -484563,7 +484563,7 @@ _08109330:
 	thumb_func_end sub_8109314
 
 	thumb_func_start sub_8109338
-sub_8109338: ; 8109338
+sub_8109338: @ 8109338
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -484587,7 +484587,7 @@ sub_8109338: ; 8109338
 	thumb_func_end sub_8109338
 
 	thumb_func_start sub_8109364
-sub_8109364: ; 8109364
+sub_8109364: @ 8109364
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203841e
@@ -484617,7 +484617,7 @@ sub_8109364: ; 8109364
 	thumb_func_end sub_8109364
 
 	thumb_func_start sub_81093A4
-sub_81093A4: ; 81093A4
+sub_81093A4: @ 81093A4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -484645,7 +484645,7 @@ sub_81093A4: ; 81093A4
 	thumb_func_end sub_81093A4
 
 	thumb_func_start sub_81093E4
-sub_81093E4: ; 81093E4
+sub_81093E4: @ 81093E4
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x3E
@@ -484667,7 +484667,7 @@ sub_81093E4: ; 81093E4
 	thumb_func_end sub_81093E4
 
 	thumb_func_start sub_810940C
-sub_810940C: ; 810940C
+sub_810940C: @ 810940C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -484710,7 +484710,7 @@ _08109458:
 	thumb_func_end sub_810940C
 
 	thumb_func_start sub_8109460
-sub_8109460: ; 8109460
+sub_8109460: @ 8109460
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -484759,7 +484759,7 @@ sub_8109460: ; 8109460
 	thumb_func_end sub_8109460
 
 	thumb_func_start sub_81094D0
-sub_81094D0: ; 81094D0
+sub_81094D0: @ 81094D0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -485125,7 +485125,7 @@ _081097AA:
 	thumb_func_end sub_81094D0
 
 	thumb_func_start sub_81097B4
-sub_81097B4: ; 81097B4
+sub_81097B4: @ 81097B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -485269,7 +485269,7 @@ _081098B6:
 	thumb_func_end sub_81097B4
 
 	thumb_func_start sub_81098EC
-sub_81098EC: ; 81098EC
+sub_81098EC: @ 81098EC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81099A0
@@ -485305,7 +485305,7 @@ _08109926:
 	thumb_func_end sub_81098EC
 
 	thumb_func_start sub_8109930
-sub_8109930: ; 8109930
+sub_8109930: @ 8109930
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -485348,7 +485348,7 @@ _08109976:
 	thumb_func_end sub_8109930
 
 	thumb_func_start sub_8109984
-sub_8109984: ; 8109984
+sub_8109984: @ 8109984
 	movs r3, 0
 	strh r3, [r0, 0x2E]
 	strh r3, [r0, 0x30]
@@ -485366,7 +485366,7 @@ sub_8109984: ; 8109984
 	thumb_func_end sub_8109984
 
 	thumb_func_start sub_81099A0
-sub_81099A0: ; 81099A0
+sub_81099A0: @ 81099A0
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -485429,7 +485429,7 @@ _08109A0C:
 	thumb_func_end sub_81099A0
 
 	thumb_func_start sub_8109A10
-sub_8109A10: ; 8109A10
+sub_8109A10: @ 8109A10
 	push {r4,r5,lr}
 	ldr r3, =0x0203841e
 	ldrh r1, [r3]
@@ -485467,7 +485467,7 @@ sub_8109A10: ; 8109A10
 	thumb_func_end sub_8109A10
 
 	thumb_func_start sub_8109A64
-sub_8109A64: ; 8109A64
+sub_8109A64: @ 8109A64
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -485553,7 +485553,7 @@ _08109AF4:
 	thumb_func_end sub_8109A64
 
 	thumb_func_start sub_8109AFC
-sub_8109AFC: ; 8109AFC
+sub_8109AFC: @ 8109AFC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -485714,7 +485714,7 @@ _08109C3E:
 	thumb_func_end sub_8109AFC
 
 	thumb_func_start sub_8109C4C
-sub_8109C4C: ; 8109C4C
+sub_8109C4C: @ 8109C4C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -485765,7 +485765,7 @@ _08109CAA:
 	thumb_func_end sub_8109C4C
 
 	thumb_func_start sub_8109CB0
-sub_8109CB0: ; 8109CB0
+sub_8109CB0: @ 8109CB0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -485900,7 +485900,7 @@ _08109DB6:
 	thumb_func_end sub_8109CB0
 
 	thumb_func_start sub_8109DBC
-sub_8109DBC: ; 8109DBC
+sub_8109DBC: @ 8109DBC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -485949,7 +485949,7 @@ _08109DE2:
 	thumb_func_end sub_8109DBC
 
 	thumb_func_start sub_8109E2C
-sub_8109E2C: ; 8109E2C
+sub_8109E2C: @ 8109E2C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -486246,7 +486246,7 @@ _0810A054:
 	thumb_func_end sub_8109E2C
 
 	thumb_func_start sub_810A060
-sub_810A060: ; 810A060
+sub_810A060: @ 810A060
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -486272,7 +486272,7 @@ sub_810A060: ; 810A060
 	thumb_func_end sub_810A060
 
 	thumb_func_start sub_810A094
-sub_810A094: ; 810A094
+sub_810A094: @ 810A094
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -486403,7 +486403,7 @@ _0810A194:
 	thumb_func_end sub_810A094
 
 	thumb_func_start sub_810A1A8
-sub_810A1A8: ; 810A1A8
+sub_810A1A8: @ 810A1A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -486440,7 +486440,7 @@ _0810A1DC:
 	thumb_func_end sub_810A1A8
 
 	thumb_func_start sub_810A1F8
-sub_810A1F8: ; 810A1F8
+sub_810A1F8: @ 810A1F8
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -486457,7 +486457,7 @@ _0810A20E:
 	thumb_func_end sub_810A1F8
 
 	thumb_func_start sub_810A214
-sub_810A214: ; 810A214
+sub_810A214: @ 810A214
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -486489,7 +486489,7 @@ _0810A246:
 	thumb_func_end sub_810A214
 
 	thumb_func_start sub_810A258
-sub_810A258: ; 810A258
+sub_810A258: @ 810A258
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -486506,7 +486506,7 @@ _0810A26E:
 	thumb_func_end sub_810A258
 
 	thumb_func_start sub_810A274
-sub_810A274: ; 810A274
+sub_810A274: @ 810A274
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -486571,7 +486571,7 @@ _0810A2D8:
 	thumb_func_end sub_810A274
 
 	thumb_func_start sub_810A308
-sub_810A308: ; 810A308
+sub_810A308: @ 810A308
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -486738,7 +486738,7 @@ _0810A422:
 	thumb_func_end sub_810A308
 
 	thumb_func_start sub_810A46C
-sub_810A46C: ; 810A46C
+sub_810A46C: @ 810A46C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -486796,7 +486796,7 @@ sub_810A46C: ; 810A46C
 	thumb_func_end sub_810A46C
 
 	thumb_func_start sub_810A4F4
-sub_810A4F4: ; 810A4F4
+sub_810A4F4: @ 810A4F4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -486856,7 +486856,7 @@ _0810A564:
 	thumb_func_end sub_810A4F4
 
 	thumb_func_start sub_810A56C
-sub_810A56C: ; 810A56C
+sub_810A56C: @ 810A56C
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x38]
@@ -486900,7 +486900,7 @@ _0810A5B6:
 	thumb_func_end sub_810A56C
 
 	thumb_func_start sub_810A5BC
-sub_810A5BC: ; 810A5BC
+sub_810A5BC: @ 810A5BC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A4DF0
@@ -486951,7 +486951,7 @@ _0810A5E0:
 	thumb_func_end sub_810A5BC
 
 	thumb_func_start sub_810A628
-sub_810A628: ; 810A628
+sub_810A628: @ 810A628
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r1, =0x0203841e
@@ -487038,7 +487038,7 @@ _0810A66E:
 	thumb_func_end sub_810A628
 
 	thumb_func_start sub_810A6EC
-sub_810A6EC: ; 810A6EC
+sub_810A6EC: @ 810A6EC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -487095,7 +487095,7 @@ _0810A754:
 	thumb_func_end sub_810A6EC
 
 	thumb_func_start sub_810A75C
-sub_810A75C: ; 810A75C
+sub_810A75C: @ 810A75C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -487153,7 +487153,7 @@ _0810A7B6:
 	thumb_func_end sub_810A75C
 
 	thumb_func_start sub_810A7DC
-sub_810A7DC: ; 810A7DC
+sub_810A7DC: @ 810A7DC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -487192,7 +487192,7 @@ sub_810A7DC: ; 810A7DC
 	thumb_func_end sub_810A7DC
 
 	thumb_func_start sub_810A834
-sub_810A834: ; 810A834
+sub_810A834: @ 810A834
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -487393,7 +487393,7 @@ _0810A9BC:
 	thumb_func_end sub_810A834
 
 	thumb_func_start sub_810A9DC
-sub_810A9DC: ; 810A9DC
+sub_810A9DC: @ 810A9DC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0x2E
@@ -487438,7 +487438,7 @@ _0810AA26:
 	thumb_func_end sub_810A9DC
 
 	thumb_func_start sub_810AA2C
-sub_810AA2C: ; 810AA2C
+sub_810AA2C: @ 810AA2C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -487494,7 +487494,7 @@ sub_810AA2C: ; 810AA2C
 	thumb_func_end sub_810AA2C
 
 	thumb_func_start sub_810AAB0
-sub_810AAB0: ; 810AAB0
+sub_810AAB0: @ 810AAB0
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -487537,7 +487537,7 @@ _0810AAF8:
 	thumb_func_end sub_810AAB0
 
 	thumb_func_start sub_810AAFC
-sub_810AAFC: ; 810AAFC
+sub_810AAFC: @ 810AAFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -487591,7 +487591,7 @@ _0810AB2A:
 	thumb_func_end sub_810AAFC
 
 	thumb_func_start sub_810AB78
-sub_810AB78: ; 810AB78
+sub_810AB78: @ 810AB78
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -487722,7 +487722,7 @@ _0810AC86:
 	thumb_func_end sub_810AB78
 
 	thumb_func_start sub_810AC8C
-sub_810AC8C: ; 810AC8C
+sub_810AC8C: @ 810AC8C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -487749,7 +487749,7 @@ _0810ACB4:
 	thumb_func_end sub_810AC8C
 
 	thumb_func_start sub_810ACC0
-sub_810ACC0: ; 810ACC0
+sub_810ACC0: @ 810ACC0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -487763,7 +487763,7 @@ sub_810ACC0: ; 810ACC0
 	thumb_func_end sub_810ACC0
 
 	thumb_func_start sub_810ACD8
-sub_810ACD8: ; 810ACD8
+sub_810ACD8: @ 810ACD8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -487801,7 +487801,7 @@ _0810ACF6:
 	thumb_func_end sub_810ACD8
 
 	thumb_func_start sub_810AD30
-sub_810AD30: ; 810AD30
+sub_810AD30: @ 810AD30
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -487844,7 +487844,7 @@ _0810AD4E:
 	thumb_func_end sub_810AD30
 
 	thumb_func_start sub_810AD98
-sub_810AD98: ; 810AD98
+sub_810AD98: @ 810AD98
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
@@ -487889,7 +487889,7 @@ _0810ADE6:
 	thumb_func_end sub_810AD98
 
 	thumb_func_start sub_810ADF8
-sub_810ADF8: ; 810ADF8
+sub_810ADF8: @ 810ADF8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -487943,7 +487943,7 @@ _0810AE50:
 	thumb_func_end sub_810ADF8
 
 	thumb_func_start sub_810AE5C
-sub_810AE5C: ; 810AE5C
+sub_810AE5C: @ 810AE5C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -488123,7 +488123,7 @@ _0810AFC0:
 	thumb_func_end sub_810AE5C
 
 	thumb_func_start sub_810AFCC
-sub_810AFCC: ; 810AFCC
+sub_810AFCC: @ 810AFCC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -488320,7 +488320,7 @@ _0810B14E:
 	thumb_func_end sub_810AFCC
 
 	thumb_func_start sub_810B154
-sub_810B154: ; 810B154
+sub_810B154: @ 810B154
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -488405,7 +488405,7 @@ _0810B1EA:
 	thumb_func_end sub_810B154
 
 	thumb_func_start sub_810B1F0
-sub_810B1F0: ; 810B1F0
+sub_810B1F0: @ 810B1F0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -488444,7 +488444,7 @@ _0810B230:
 	thumb_func_end sub_810B1F0
 
 	thumb_func_start sub_810B23C
-sub_810B23C: ; 810B23C
+sub_810B23C: @ 810B23C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -488493,7 +488493,7 @@ _0810B294:
 	thumb_func_end sub_810B23C
 
 	thumb_func_start sub_810B29C
-sub_810B29C: ; 810B29C
+sub_810B29C: @ 810B29C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -488692,7 +488692,7 @@ _0810B428:
 	thumb_func_end sub_810B29C
 
 	thumb_func_start sub_810B430
-sub_810B430: ; 810B430
+sub_810B430: @ 810B430
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -488811,7 +488811,7 @@ _0810B514:
 	thumb_func_end sub_810B430
 
 	thumb_func_start sub_810B51C
-sub_810B51C: ; 810B51C
+sub_810B51C: @ 810B51C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -488846,7 +488846,7 @@ _0810B552:
 	thumb_func_end sub_810B51C
 
 	thumb_func_start sub_810B55C
-sub_810B55C: ; 810B55C
+sub_810B55C: @ 810B55C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -488942,7 +488942,7 @@ _0810B60E:
 	thumb_func_end sub_810B55C
 
 	thumb_func_start sub_810B614
-sub_810B614: ; 810B614
+sub_810B614: @ 810B614
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -488999,7 +488999,7 @@ _0810B67E:
 	thumb_func_end sub_810B614
 
 	thumb_func_start sub_810B684
-sub_810B684: ; 810B684
+sub_810B684: @ 810B684
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -489033,7 +489033,7 @@ _0810B6B8:
 	thumb_func_end sub_810B684
 
 	thumb_func_start sub_810B6C4
-sub_810B6C4: ; 810B6C4
+sub_810B6C4: @ 810B6C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -489220,7 +489220,7 @@ _0810B80A:
 	thumb_func_end sub_810B6C4
 
 	thumb_func_start sub_810B848
-sub_810B848: ; 810B848
+sub_810B848: @ 810B848
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -489273,7 +489273,7 @@ _0810B8A6:
 	thumb_func_end sub_810B848
 
 	thumb_func_start sub_810B8AC
-sub_810B8AC: ; 810B8AC
+sub_810B8AC: @ 810B8AC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -489302,7 +489302,7 @@ sub_810B8AC: ; 810B8AC
 	thumb_func_end sub_810B8AC
 
 	thumb_func_start sub_810B8EC
-sub_810B8EC: ; 810B8EC
+sub_810B8EC: @ 810B8EC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -489358,7 +489358,7 @@ _0810B936:
 	thumb_func_end sub_810B8EC
 
 	thumb_func_start sub_810B974
-sub_810B974: ; 810B974
+sub_810B974: @ 810B974
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -489411,7 +489411,7 @@ _0810B9C6:
 	thumb_func_end sub_810B974
 
 	thumb_func_start sub_810B9E8
-sub_810B9E8: ; 810B9E8
+sub_810B9E8: @ 810B9E8
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x3E
@@ -489444,7 +489444,7 @@ _0810BA1E:
 	thumb_func_end sub_810B9E8
 
 	thumb_func_start sub_810BA24
-sub_810BA24: ; 810BA24
+sub_810BA24: @ 810BA24
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -489592,7 +489592,7 @@ _0810BB36:
 	thumb_func_end sub_810BA24
 
 	thumb_func_start sub_810BB60
-sub_810BB60: ; 810BB60
+sub_810BB60: @ 810BB60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x24]
@@ -489640,7 +489640,7 @@ _0810BB90:
 	thumb_func_end sub_810BB60
 
 	thumb_func_start sub_810BBC8
-sub_810BBC8: ; 810BBC8
+sub_810BBC8: @ 810BBC8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -489705,7 +489705,7 @@ _0810BC42:
 	thumb_func_end sub_810BBC8
 
 	thumb_func_start sub_810BC4C
-sub_810BC4C: ; 810BC4C
+sub_810BC4C: @ 810BC4C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -489745,7 +489745,7 @@ _0810BC8E:
 	thumb_func_end sub_810BC4C
 
 	thumb_func_start sub_810BC94
-sub_810BC94: ; 810BC94
+sub_810BC94: @ 810BC94
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -489898,7 +489898,7 @@ _0810BDAE:
 	thumb_func_end sub_810BC94
 
 	thumb_func_start sub_810BDD8
-sub_810BDD8: ; 810BDD8
+sub_810BDD8: @ 810BDD8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A70E8
@@ -489958,7 +489958,7 @@ _0810BE42:
 	thumb_func_end sub_810BDD8
 
 	thumb_func_start sub_810BE48
-sub_810BE48: ; 810BE48
+sub_810BE48: @ 810BE48
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -490025,7 +490025,7 @@ _0810BEC8:
 	thumb_func_end sub_810BE48
 
 	thumb_func_start sub_810BED0
-sub_810BED0: ; 810BED0
+sub_810BED0: @ 810BED0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -490173,7 +490173,7 @@ _0810BFCC:
 	thumb_func_end sub_810BED0
 
 	thumb_func_start sub_810C008
-sub_810C008: ; 810C008
+sub_810C008: @ 810C008
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -490250,7 +490250,7 @@ _0810C098:
 	thumb_func_end sub_810C008
 
 	thumb_func_start sub_810C0A0
-sub_810C0A0: ; 810C0A0
+sub_810C0A0: @ 810C0A0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -490325,7 +490325,7 @@ _0810C0E2:
 	thumb_func_end sub_810C0A0
 
 	thumb_func_start sub_810C164
-sub_810C164: ; 810C164
+sub_810C164: @ 810C164
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -490507,7 +490507,7 @@ _0810C2DA:
 	thumb_func_end sub_810C164
 
 	thumb_func_start sub_810C2F0
-sub_810C2F0: ; 810C2F0
+sub_810C2F0: @ 810C2F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -490532,7 +490532,7 @@ sub_810C2F0: ; 810C2F0
 	thumb_func_end sub_810C2F0
 
 	thumb_func_start sub_810C324
-sub_810C324: ; 810C324
+sub_810C324: @ 810C324
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -490609,7 +490609,7 @@ _0810C366:
 	thumb_func_end sub_810C324
 
 	thumb_func_start sub_810C3F0
-sub_810C3F0: ; 810C3F0
+sub_810C3F0: @ 810C3F0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -490779,7 +490779,7 @@ _0810C54A:
 	thumb_func_end sub_810C3F0
 
 	thumb_func_start sub_810C560
-sub_810C560: ; 810C560
+sub_810C560: @ 810C560
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -490951,7 +490951,7 @@ _0810C6B8:
 	thumb_func_end sub_810C560
 
 	thumb_func_start sub_810C6D4
-sub_810C6D4: ; 810C6D4
+sub_810C6D4: @ 810C6D4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3C]
@@ -491238,7 +491238,7 @@ _0810C90C:
 	thumb_func_end sub_810C6D4
 
 	thumb_func_start sub_810C918
-sub_810C918: ; 810C918
+sub_810C918: @ 810C918
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 2
@@ -491253,7 +491253,7 @@ sub_810C918: ; 810C918
 	thumb_func_end sub_810C918
 
 	thumb_func_start sub_810C934
-sub_810C934: ; 810C934
+sub_810C934: @ 810C934
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -491350,7 +491350,7 @@ _0810C9DC:
 	thumb_func_end sub_810C934
 
 	thumb_func_start sub_810C9E4
-sub_810C9E4: ; 810C9E4
+sub_810C9E4: @ 810C9E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -491527,7 +491527,7 @@ _0810CB46:
 	thumb_func_end sub_810C9E4
 
 	thumb_func_start sub_810CB58
-sub_810CB58: ; 810CB58
+sub_810CB58: @ 810CB58
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -491638,7 +491638,7 @@ _0810CC32:
 	thumb_func_end sub_810CB58
 
 	thumb_func_start sub_810CC3C
-sub_810CC3C: ; 810CC3C
+sub_810CC3C: @ 810CC3C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -491677,7 +491677,7 @@ _0810CC7C:
 	thumb_func_end sub_810CC3C
 
 	thumb_func_start unc_080B06FC
-unc_080B06FC: ; 810CC88
+unc_080B06FC: @ 810CC88
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02038400
@@ -491742,7 +491742,7 @@ _0810CCCE:
 	thumb_func_end unc_080B06FC
 
 	thumb_func_start sub_810CD1C
-sub_810CD1C: ; 810CD1C
+sub_810CD1C: @ 810CD1C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -491765,7 +491765,7 @@ _0810CD3E:
 	thumb_func_end sub_810CD1C
 
 	thumb_func_start sub_810CD4C
-sub_810CD4C: ; 810CD4C
+sub_810CD4C: @ 810CD4C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x4]
@@ -491810,7 +491810,7 @@ _0810CD92:
 	thumb_func_end sub_810CD4C
 
 	thumb_func_start sub_810CDB0
-sub_810CDB0: ; 810CDB0
+sub_810CDB0: @ 810CDB0
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -491854,7 +491854,7 @@ _0810CDF6:
 	thumb_func_end sub_810CDB0
 
 	thumb_func_start sub_810CDFC
-sub_810CDFC: ; 810CDFC
+sub_810CDFC: @ 810CDFC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -491878,7 +491878,7 @@ sub_810CDFC: ; 810CDFC
 	thumb_func_end sub_810CDFC
 
 	thumb_func_start unc_080B08A0
-unc_080B08A0: ; 810CE2C
+unc_080B08A0: @ 810CE2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -491904,7 +491904,7 @@ unc_080B08A0: ; 810CE2C
 	thumb_func_end unc_080B08A0
 
 	thumb_func_start sub_810CE68
-sub_810CE68: ; 810CE68
+sub_810CE68: @ 810CE68
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -491940,7 +491940,7 @@ _0810CE90:
 	thumb_func_end sub_810CE68
 
 	thumb_func_start sub_810CEB4
-sub_810CEB4: ; 810CEB4
+sub_810CEB4: @ 810CEB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A4DF0
@@ -491964,7 +491964,7 @@ _0810CED0:
 	thumb_func_end sub_810CEB4
 
 	thumb_func_start sub_810CEE0
-sub_810CEE0: ; 810CEE0
+sub_810CEE0: @ 810CEE0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -491999,7 +491999,7 @@ _0810CF0C:
 	thumb_func_end sub_810CEE0
 
 	thumb_func_start sub_810CF30
-sub_810CF30: ; 810CF30
+sub_810CF30: @ 810CF30
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -492175,7 +492175,7 @@ _0810D08C:
 	thumb_func_end sub_810CF30
 
 	thumb_func_start sub_810D0B8
-sub_810D0B8: ; 810D0B8
+sub_810D0B8: @ 810D0B8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x2E]
@@ -492219,7 +492219,7 @@ _0810D104:
 	thumb_func_end sub_810D0B8
 
 	thumb_func_start sub_810D10C
-sub_810D10C: ; 810D10C
+sub_810D10C: @ 810D10C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -492262,7 +492262,7 @@ _0810D142:
 	thumb_func_end sub_810D10C
 
 	thumb_func_start sub_810D164
-sub_810D164: ; 810D164
+sub_810D164: @ 810D164
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x38]
@@ -492302,7 +492302,7 @@ _0810D1A4:
 	thumb_func_end sub_810D164
 
 	thumb_func_start sub_810D1B4
-sub_810D1B4: ; 810D1B4
+sub_810D1B4: @ 810D1B4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =0x02038436
@@ -492367,7 +492367,7 @@ _0810D1FE:
 	thumb_func_end sub_810D1B4
 
 	thumb_func_start sub_810D240
-sub_810D240: ; 810D240
+sub_810D240: @ 810D240
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -492398,7 +492398,7 @@ _0810D272:
 	thumb_func_end sub_810D240
 
 	thumb_func_start sub_810D278
-sub_810D278: ; 810D278
+sub_810D278: @ 810D278
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -492421,7 +492421,7 @@ sub_810D278: ; 810D278
 	thumb_func_end sub_810D278
 
 	thumb_func_start sub_810D2B0
-sub_810D2B0: ; 810D2B0
+sub_810D2B0: @ 810D2B0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -492446,7 +492446,7 @@ sub_810D2B0: ; 810D2B0
 	thumb_func_end sub_810D2B0
 
 	thumb_func_start sub_810D2E4
-sub_810D2E4: ; 810D2E4
+sub_810D2E4: @ 810D2E4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -492463,7 +492463,7 @@ sub_810D2E4: ; 810D2E4
 	thumb_func_end sub_810D2E4
 
 	thumb_func_start sub_810D308
-sub_810D308: ; 810D308
+sub_810D308: @ 810D308
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x2E]
@@ -492503,7 +492503,7 @@ _0810D34C:
 	thumb_func_end sub_810D308
 
 	thumb_func_start sub_810D360
-sub_810D360: ; 810D360
+sub_810D360: @ 810D360
 	push {lr}
 	movs r1, 0xF
 	strh r1, [r0, 0x2E]
@@ -492517,7 +492517,7 @@ sub_810D360: ; 810D360
 	thumb_func_end sub_810D360
 
 	thumb_func_start sub_810D37C
-sub_810D37C: ; 810D37C
+sub_810D37C: @ 810D37C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -492590,7 +492590,7 @@ _0810D404:
 	thumb_func_end sub_810D37C
 
 	thumb_func_start sub_810D40C
-sub_810D40C: ; 810D40C
+sub_810D40C: @ 810D40C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -492641,7 +492641,7 @@ _0810D42A:
 	thumb_func_end sub_810D40C
 
 	thumb_func_start sub_810D47C
-sub_810D47C: ; 810D47C
+sub_810D47C: @ 810D47C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -492709,7 +492709,7 @@ _0810D4EC:
 	thumb_func_end sub_810D47C
 
 	thumb_func_start sub_810D4F4
-sub_810D4F4: ; 810D4F4
+sub_810D4F4: @ 810D4F4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -492817,7 +492817,7 @@ _0810D5D2:
 	thumb_func_end sub_810D4F4
 
 	thumb_func_start sub_810D5DC
-sub_810D5DC: ; 810D5DC
+sub_810D5DC: @ 810D5DC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x3A]
@@ -492843,7 +492843,7 @@ _0810D604:
 	thumb_func_end sub_810D5DC
 
 	thumb_func_start sub_810D608
-sub_810D608: ; 810D608
+sub_810D608: @ 810D608
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -492911,7 +492911,7 @@ _0810D680:
 	thumb_func_end sub_810D608
 
 	thumb_func_start sub_810D6A8
-sub_810D6A8: ; 810D6A8
+sub_810D6A8: @ 810D6A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -492961,7 +492961,7 @@ _0810D704:
 	thumb_func_end sub_810D6A8
 
 	thumb_func_start sub_810D714
-sub_810D714: ; 810D714
+sub_810D714: @ 810D714
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -493002,7 +493002,7 @@ sub_810D714: ; 810D714
 	thumb_func_end sub_810D714
 
 	thumb_func_start sub_810D770
-sub_810D770: ; 810D770
+sub_810D770: @ 810D770
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -493092,7 +493092,7 @@ _0810D818:
 	thumb_func_end sub_810D770
 
 	thumb_func_start sub_810D830
-sub_810D830: ; 810D830
+sub_810D830: @ 810D830
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -493131,7 +493131,7 @@ _0810D870:
 	thumb_func_end sub_810D830
 
 	thumb_func_start sub_810D874
-sub_810D874: ; 810D874
+sub_810D874: @ 810D874
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -493236,7 +493236,7 @@ _0810D918:
 	thumb_func_end sub_810D874
 
 	thumb_func_start sub_810D960
-sub_810D960: ; 810D960
+sub_810D960: @ 810D960
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -493257,7 +493257,7 @@ _0810D976:
 	thumb_func_end sub_810D960
 
 	thumb_func_start sub_810D984
-sub_810D984: ; 810D984
+sub_810D984: @ 810D984
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -493322,7 +493322,7 @@ _0810D9E2:
 	thumb_func_end sub_810D984
 
 	thumb_func_start sub_810DA10
-sub_810DA10: ; 810DA10
+sub_810DA10: @ 810DA10
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -493371,7 +493371,7 @@ _0810DA5E:
 	thumb_func_end sub_810DA10
 
 	thumb_func_start sub_810DA7C
-sub_810DA7C: ; 810DA7C
+sub_810DA7C: @ 810DA7C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -493406,7 +493406,7 @@ _0810DAB6:
 	thumb_func_end sub_810DA7C
 
 	thumb_func_start sub_810DABC
-sub_810DABC: ; 810DABC
+sub_810DABC: @ 810DABC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -493519,7 +493519,7 @@ _0810DB98:
 	thumb_func_end sub_810DABC
 
 	thumb_func_start sub_810DBAC
-sub_810DBAC: ; 810DBAC
+sub_810DBAC: @ 810DBAC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -493562,7 +493562,7 @@ _0810DBC2:
 	thumb_func_end sub_810DBAC
 
 	thumb_func_start sub_810DC10
-sub_810DC10: ; 810DC10
+sub_810DC10: @ 810DC10
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -493578,7 +493578,7 @@ _0810DC24:
 	thumb_func_end sub_810DC10
 
 	thumb_func_start sub_810DC2C
-sub_810DC2C: ; 810DC2C
+sub_810DC2C: @ 810DC2C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -493637,7 +493637,7 @@ _0810DC72:
 	thumb_func_end sub_810DC2C
 
 	thumb_func_start sub_810DCB4
-sub_810DCB4: ; 810DCB4
+sub_810DCB4: @ 810DCB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -493653,7 +493653,7 @@ _0810DCC8:
 	thumb_func_end sub_810DCB4
 
 	thumb_func_start sub_810DCD0
-sub_810DCD0: ; 810DCD0
+sub_810DCD0: @ 810DCD0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -493692,7 +493692,7 @@ sub_810DCD0: ; 810DCD0
 	thumb_func_end sub_810DCD0
 
 	thumb_func_start sub_810DD24
-sub_810DD24: ; 810DD24
+sub_810DD24: @ 810DD24
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A656C
@@ -493717,7 +493717,7 @@ _0810DD4A:
 	thumb_func_end sub_810DD24
 
 	thumb_func_start sub_810DD50
-sub_810DD50: ; 810DD50
+sub_810DD50: @ 810DD50
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038437
@@ -493767,7 +493767,7 @@ _0810DD7C:
 	thumb_func_end sub_810DD50
 
 	thumb_func_start sub_810DDC4
-sub_810DDC4: ; 810DDC4
+sub_810DDC4: @ 810DDC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -493817,7 +493817,7 @@ _0810DE16:
 	thumb_func_end sub_810DDC4
 
 	thumb_func_start sub_810DE2C
-sub_810DE2C: ; 810DE2C
+sub_810DE2C: @ 810DE2C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -493853,7 +493853,7 @@ _0810DE68:
 	thumb_func_end sub_810DE2C
 
 	thumb_func_start sub_810DE70
-sub_810DE70: ; 810DE70
+sub_810DE70: @ 810DE70
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -493874,7 +493874,7 @@ sub_810DE70: ; 810DE70
 	thumb_func_end sub_810DE70
 
 	thumb_func_start sub_810DE98
-sub_810DE98: ; 810DE98
+sub_810DE98: @ 810DE98
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -493908,7 +493908,7 @@ _0810DED2:
 	thumb_func_end sub_810DE98
 
 	thumb_func_start sub_810DED8
-sub_810DED8: ; 810DED8
+sub_810DED8: @ 810DED8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -493936,7 +493936,7 @@ sub_810DED8: ; 810DED8
 	thumb_func_end sub_810DED8
 
 	thumb_func_start sub_810DF18
-sub_810DF18: ; 810DF18
+sub_810DF18: @ 810DF18
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -494006,7 +494006,7 @@ _0810DF90:
 	thumb_func_end sub_810DF18
 
 	thumb_func_start sub_810DFA8
-sub_810DFA8: ; 810DFA8
+sub_810DFA8: @ 810DFA8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -494060,7 +494060,7 @@ _0810DFC8:
 	thumb_func_end sub_810DFA8
 
 	thumb_func_start sub_810E028
-sub_810E028: ; 810E028
+sub_810E028: @ 810E028
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -494076,7 +494076,7 @@ _0810E03C:
 	thumb_func_end sub_810E028
 
 	thumb_func_start sub_810E044
-sub_810E044: ; 810E044
+sub_810E044: @ 810E044
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -494185,7 +494185,7 @@ _0810E0FE:
 	thumb_func_end sub_810E044
 
 	thumb_func_start sub_810E13C
-sub_810E13C: ; 810E13C
+sub_810E13C: @ 810E13C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -494218,7 +494218,7 @@ sub_810E13C: ; 810E13C
 	thumb_func_end sub_810E13C
 
 	thumb_func_start sub_810E184
-sub_810E184: ; 810E184
+sub_810E184: @ 810E184
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2E]
@@ -494257,7 +494257,7 @@ _0810E1C2:
 	thumb_func_end sub_810E184
 
 	thumb_func_start sub_810E1C8
-sub_810E1C8: ; 810E1C8
+sub_810E1C8: @ 810E1C8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x02038436
@@ -494312,7 +494312,7 @@ _0810E1FE:
 	thumb_func_end sub_810E1C8
 
 	thumb_func_start sub_810E24C
-sub_810E24C: ; 810E24C
+sub_810E24C: @ 810E24C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -494376,7 +494376,7 @@ _0810E2BC:
 	thumb_func_end sub_810E24C
 
 	thumb_func_start sub_810E2C8
-sub_810E2C8: ; 810E2C8
+sub_810E2C8: @ 810E2C8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -494416,7 +494416,7 @@ _0810E308:
 	thumb_func_end sub_810E2C8
 
 	thumb_func_start sub_810E314
-sub_810E314: ; 810E314
+sub_810E314: @ 810E314
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -494670,7 +494670,7 @@ _0810E4AA:
 	thumb_func_end sub_810E314
 
 	thumb_func_start sub_810E520
-sub_810E520: ; 810E520
+sub_810E520: @ 810E520
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -495377,7 +495377,7 @@ _0810EA36:
 	thumb_func_end sub_810E520
 
 	thumb_func_start sub_810EA4C
-sub_810EA4C: ; 810EA4C
+sub_810EA4C: @ 810EA4C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038437
@@ -495414,7 +495414,7 @@ sub_810EA4C: ; 810EA4C
 	thumb_func_end sub_810EA4C
 
 	thumb_func_start sub_810EAA0
-sub_810EAA0: ; 810EAA0
+sub_810EAA0: @ 810EAA0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -495488,7 +495488,7 @@ _0810EAF8:
 	thumb_func_end sub_810EAA0
 
 	thumb_func_start sub_810EB40
-sub_810EB40: ; 810EB40
+sub_810EB40: @ 810EB40
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -495528,7 +495528,7 @@ _0810EB82:
 	thumb_func_end sub_810EB40
 
 	thumb_func_start sub_810EB88
-sub_810EB88: ; 810EB88
+sub_810EB88: @ 810EB88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -495605,7 +495605,7 @@ _0810EC16:
 	thumb_func_end sub_810EB88
 
 	thumb_func_start sub_810EC34
-sub_810EC34: ; 810EC34
+sub_810EC34: @ 810EC34
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -495655,7 +495655,7 @@ _0810EC8C:
 	thumb_func_end sub_810EC34
 
 	thumb_func_start sub_810EC94
-sub_810EC94: ; 810EC94
+sub_810EC94: @ 810EC94
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -495734,7 +495734,7 @@ _0810ED1E:
 	thumb_func_end sub_810EC94
 
 	thumb_func_start sub_810ED28
-sub_810ED28: ; 810ED28
+sub_810ED28: @ 810ED28
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -495767,7 +495767,7 @@ sub_810ED28: ; 810ED28
 	thumb_func_end sub_810ED28
 
 	thumb_func_start sub_810ED70
-sub_810ED70: ; 810ED70
+sub_810ED70: @ 810ED70
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2E]
@@ -495821,7 +495821,7 @@ _0810EDC8:
 	thumb_func_end sub_810ED70
 
 	thumb_func_start sub_810EDD0
-sub_810EDD0: ; 810EDD0
+sub_810EDD0: @ 810EDD0
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -495859,7 +495859,7 @@ _0810EE0E:
 	thumb_func_end sub_810EDD0
 
 	thumb_func_start sub_810EE14
-sub_810EE14: ; 810EE14
+sub_810EE14: @ 810EE14
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -495972,7 +495972,7 @@ _0810EEEC:
 	thumb_func_end sub_810EE14
 
 	thumb_func_start sub_810EEF8
-sub_810EEF8: ; 810EEF8
+sub_810EEF8: @ 810EEF8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl GenerateRandomNumber2
@@ -496059,7 +496059,7 @@ _0810EF76:
 	thumb_func_end sub_810EEF8
 
 	thumb_func_start sub_810EFA8
-sub_810EFA8: ; 810EFA8
+sub_810EFA8: @ 810EFA8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -496112,7 +496112,7 @@ _0810EFFE:
 	thumb_func_end sub_810EFA8
 
 	thumb_func_start sub_810F004
-sub_810F004: ; 810F004
+sub_810F004: @ 810F004
 	movs r1, 0
 	strh r1, [r0, 0x3A]
 	movs r1, 0x40
@@ -496124,7 +496124,7 @@ sub_810F004: ; 810F004
 	thumb_func_end sub_810F004
 
 	thumb_func_start sub_810F018
-sub_810F018: ; 810F018
+sub_810F018: @ 810F018
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -496183,7 +496183,7 @@ _0810F07E:
 	thumb_func_end sub_810F018
 
 	thumb_func_start sub_810F084
-sub_810F084: ; 810F084
+sub_810F084: @ 810F084
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -496271,7 +496271,7 @@ sub_810F084: ; 810F084
 	thumb_func_end sub_810F084
 
 	thumb_func_start sub_810F140
-sub_810F140: ; 810F140
+sub_810F140: @ 810F140
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x3A]
@@ -496310,7 +496310,7 @@ _0810F180:
 	thumb_func_end sub_810F140
 
 	thumb_func_start sub_810F184
-sub_810F184: ; 810F184
+sub_810F184: @ 810F184
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -496360,7 +496360,7 @@ _0810F1DA:
 	thumb_func_end sub_810F184
 
 	thumb_func_start sub_810F1EC
-sub_810F1EC: ; 810F1EC
+sub_810F1EC: @ 810F1EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -496520,7 +496520,7 @@ _0810F330:
 	thumb_func_end sub_810F1EC
 
 	thumb_func_start sub_810F340
-sub_810F340: ; 810F340
+sub_810F340: @ 810F340
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x1
@@ -496587,7 +496587,7 @@ _0810F3B6:
 	thumb_func_end sub_810F340
 
 	thumb_func_start sub_810F3C8
-sub_810F3C8: ; 810F3C8
+sub_810F3C8: @ 810F3C8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -496618,7 +496618,7 @@ _0810F3F8:
 	thumb_func_end sub_810F3C8
 
 	thumb_func_start sub_810F400
-sub_810F400: ; 810F400
+sub_810F400: @ 810F400
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x30]
@@ -496675,7 +496675,7 @@ _0810F45E:
 	thumb_func_end sub_810F400
 
 	thumb_func_start sub_810F46C
-sub_810F46C: ; 810F46C
+sub_810F46C: @ 810F46C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x34]
@@ -496764,7 +496764,7 @@ _0810F512:
 	thumb_func_end sub_810F46C
 
 	thumb_func_start sub_810F524
-sub_810F524: ; 810F524
+sub_810F524: @ 810F524
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A4DF0
@@ -496813,7 +496813,7 @@ _0810F57C:
 	thumb_func_end sub_810F524
 
 	thumb_func_start sub_810F58C
-sub_810F58C: ; 810F58C
+sub_810F58C: @ 810F58C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -496896,7 +496896,7 @@ _0810F62C:
 	thumb_func_end sub_810F58C
 
 	thumb_func_start sub_810F634
-sub_810F634: ; 810F634
+sub_810F634: @ 810F634
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -496951,7 +496951,7 @@ _0810F692:
 	thumb_func_end sub_810F634
 
 	thumb_func_start sub_810F6B0
-sub_810F6B0: ; 810F6B0
+sub_810F6B0: @ 810F6B0
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r6, =0x02038436
@@ -497018,7 +497018,7 @@ _0810F722:
 	thumb_func_end sub_810F6B0
 
 	thumb_func_start sub_810F740
-sub_810F740: ; 810F740
+sub_810F740: @ 810F740
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r1, [r4, 0x1]
@@ -497043,7 +497043,7 @@ sub_810F740: ; 810F740
 	thumb_func_end sub_810F740
 
 	thumb_func_start sub_810F774
-sub_810F774: ; 810F774
+sub_810F774: @ 810F774
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -497095,7 +497095,7 @@ _0810F7CC:
 	thumb_func_end sub_810F774
 
 	thumb_func_start sub_810F7D4
-sub_810F7D4: ; 810F7D4
+sub_810F7D4: @ 810F7D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -497122,7 +497122,7 @@ sub_810F7D4: ; 810F7D4
 	thumb_func_end sub_810F7D4
 
 	thumb_func_start sub_810F810
-sub_810F810: ; 810F810
+sub_810F810: @ 810F810
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -497145,7 +497145,7 @@ _0810F830:
 	thumb_func_end sub_810F810
 
 	thumb_func_start sub_810F83C
-sub_810F83C: ; 810F83C
+sub_810F83C: @ 810F83C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -497185,7 +497185,7 @@ _0810F870:
 	thumb_func_end sub_810F83C
 
 	thumb_func_start sub_810F898
-sub_810F898: ; 810F898
+sub_810F898: @ 810F898
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -497270,7 +497270,7 @@ _0810F936:
 	thumb_func_end sub_810F898
 
 	thumb_func_start sub_810F940
-sub_810F940: ; 810F940
+sub_810F940: @ 810F940
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -497336,7 +497336,7 @@ _0810F9AA:
 	thumb_func_end sub_810F940
 
 	thumb_func_start sub_810F9D4
-sub_810F9D4: ; 810F9D4
+sub_810F9D4: @ 810F9D4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -497542,7 +497542,7 @@ _0810FB5A:
 	thumb_func_end sub_810F9D4
 
 	thumb_func_start sub_810FB60
-sub_810FB60: ; 810FB60
+sub_810FB60: @ 810FB60
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x30
@@ -497583,7 +497583,7 @@ _0810FB9C:
 	thumb_func_end sub_810FB60
 
 	thumb_func_start sub_810FBA8
-sub_810FBA8: ; 810FBA8
+sub_810FBA8: @ 810FBA8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -497616,7 +497616,7 @@ _0810FBD4:
 	thumb_func_end sub_810FBA8
 
 	thumb_func_start sub_810FBF0
-sub_810FBF0: ; 810FBF0
+sub_810FBF0: @ 810FBF0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -497749,7 +497749,7 @@ _0810FD1E:
 	thumb_func_end sub_810FBF0
 
 	thumb_func_start sub_810FD3C
-sub_810FD3C: ; 810FD3C
+sub_810FD3C: @ 810FD3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -497836,7 +497836,7 @@ _0810FDE8:
 	thumb_func_end sub_810FD3C
 
 	thumb_func_start sub_810FDF0
-sub_810FDF0: ; 810FDF0
+sub_810FDF0: @ 810FDF0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -497856,7 +497856,7 @@ _0810FE0E:
 	thumb_func_end sub_810FDF0
 
 	thumb_func_start sub_810FE14
-sub_810FE14: ; 810FE14
+sub_810FE14: @ 810FE14
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -497993,7 +497993,7 @@ _0810FEFA:
 	thumb_func_end sub_810FE14
 
 	thumb_func_start sub_810FF34
-sub_810FF34: ; 810FF34
+sub_810FF34: @ 810FF34
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -498128,7 +498128,7 @@ _08110026:
 	thumb_func_end sub_810FF34
 
 	thumb_func_start sub_8110034
-sub_8110034: ; 8110034
+sub_8110034: @ 8110034
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -498244,7 +498244,7 @@ _08110116:
 	thumb_func_end sub_8110034
 
 	thumb_func_start sub_8110134
-sub_8110134: ; 8110134
+sub_8110134: @ 8110134
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -498374,7 +498374,7 @@ _08110238:
 	thumb_func_end sub_8110134
 
 	thumb_func_start sub_8110240
-sub_8110240: ; 8110240
+sub_8110240: @ 8110240
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -498520,7 +498520,7 @@ _08110360:
 	thumb_func_end sub_8110240
 
 	thumb_func_start sub_8110368
-sub_8110368: ; 8110368
+sub_8110368: @ 8110368
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A4DF0
@@ -498611,7 +498611,7 @@ _081103C4:
 	thumb_func_end sub_8110368
 
 	thumb_func_start sub_8110438
-sub_8110438: ; 8110438
+sub_8110438: @ 8110438
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_80A4DF0
@@ -498686,7 +498686,7 @@ _08110478:
 	thumb_func_end sub_8110438
 
 	thumb_func_start sub_81104E4
-sub_81104E4: ; 81104E4
+sub_81104E4: @ 81104E4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_80A4DF0
@@ -498754,7 +498754,7 @@ _0811055A:
 	thumb_func_end sub_81104E4
 
 	thumb_func_start sub_811057C
-sub_811057C: ; 811057C
+sub_811057C: @ 811057C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6F3C
@@ -498785,7 +498785,7 @@ _081105AE:
 	thumb_func_end sub_811057C
 
 	thumb_func_start sub_81105B4
-sub_81105B4: ; 81105B4
+sub_81105B4: @ 81105B4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038437
@@ -498840,7 +498840,7 @@ _08110618:
 	thumb_func_end sub_81105B4
 
 	thumb_func_start sub_8110630
-sub_8110630: ; 8110630
+sub_8110630: @ 8110630
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -498883,7 +498883,7 @@ _08110678:
 	thumb_func_end sub_8110630
 
 	thumb_func_start sub_811067C
-sub_811067C: ; 811067C
+sub_811067C: @ 811067C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xFD
@@ -498904,7 +498904,7 @@ sub_811067C: ; 811067C
 	thumb_func_end sub_811067C
 
 	thumb_func_start sub_81106A4
-sub_81106A4: ; 81106A4
+sub_81106A4: @ 81106A4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x32]
@@ -498954,7 +498954,7 @@ _081106F6:
 	thumb_func_end sub_81106A4
 
 	thumb_func_start sub_8110700
-sub_8110700: ; 8110700
+sub_8110700: @ 8110700
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -498971,7 +498971,7 @@ sub_8110700: ; 8110700
 	thumb_func_end sub_8110700
 
 	thumb_func_start sub_8110720
-sub_8110720: ; 8110720
+sub_8110720: @ 8110720
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -499106,7 +499106,7 @@ _081107B2:
 	thumb_func_end sub_8110720
 
 	thumb_func_start sub_8110850
-sub_8110850: ; 8110850
+sub_8110850: @ 8110850
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -499161,7 +499161,7 @@ _08110870:
 	thumb_func_end sub_8110850
 
 	thumb_func_start sub_81108CC
-sub_81108CC: ; 81108CC
+sub_81108CC: @ 81108CC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -499264,7 +499264,7 @@ _08110988:
 	thumb_func_end sub_81108CC
 
 	thumb_func_start sub_8110994
-sub_8110994: ; 8110994
+sub_8110994: @ 8110994
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -499303,7 +499303,7 @@ _081109B2:
 	thumb_func_end sub_8110994
 
 	thumb_func_start sub_81109F0
-sub_81109F0: ; 81109F0
+sub_81109F0: @ 81109F0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -499357,7 +499357,7 @@ _08110A10:
 	thumb_func_end sub_81109F0
 
 	thumb_func_start sub_8110A70
-sub_8110A70: ; 8110A70
+sub_8110A70: @ 8110A70
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x38]
@@ -499387,7 +499387,7 @@ sub_8110A70: ; 8110A70
 	thumb_func_end sub_8110A70
 
 	thumb_func_start sub_8110AB4
-sub_8110AB4: ; 8110AB4
+sub_8110AB4: @ 8110AB4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -499445,7 +499445,7 @@ _08110AEA:
 	thumb_func_end sub_8110AB4
 
 	thumb_func_start sub_8110B38
-sub_8110B38: ; 8110B38
+sub_8110B38: @ 8110B38
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -499481,7 +499481,7 @@ _08110B5C:
 	thumb_func_end sub_8110B38
 
 	thumb_func_start sub_8110B80
-sub_8110B80: ; 8110B80
+sub_8110B80: @ 8110B80
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -499522,7 +499522,7 @@ _08110BC6:
 	thumb_func_end sub_8110B80
 
 	thumb_func_start sub_8110BCC
-sub_8110BCC: ; 8110BCC
+sub_8110BCC: @ 8110BCC
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -499609,7 +499609,7 @@ _08110C6E:
 	thumb_func_end sub_8110BCC
 
 	thumb_func_start sub_8110CB0
-sub_8110CB0: ; 8110CB0
+sub_8110CB0: @ 8110CB0
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -499799,7 +499799,7 @@ _08110E3A:
 	thumb_func_end sub_8110CB0
 
 	thumb_func_start sub_8110E4C
-sub_8110E4C: ; 8110E4C
+sub_8110E4C: @ 8110E4C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -499909,7 +499909,7 @@ _08110F24:
 	thumb_func_end sub_8110E4C
 
 	thumb_func_start sub_8110F30
-sub_8110F30: ; 8110F30
+sub_8110F30: @ 8110F30
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -499938,7 +499938,7 @@ sub_8110F30: ; 8110F30
 	thumb_func_end sub_8110F30
 
 	thumb_func_start sub_8110F74
-sub_8110F74: ; 8110F74
+sub_8110F74: @ 8110F74
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -500080,7 +500080,7 @@ _0811101E:
 	thumb_func_end sub_8110F74
 
 	thumb_func_start sub_81110A4
-sub_81110A4: ; 81110A4
+sub_81110A4: @ 81110A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -500265,7 +500265,7 @@ _0811120C:
 	thumb_func_end sub_81110A4
 
 	thumb_func_start sub_8111214
-sub_8111214: ; 8111214
+sub_8111214: @ 8111214
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0xA]
@@ -500387,7 +500387,7 @@ _08111304:
 	thumb_func_end sub_8111214
 
 	thumb_func_start sub_811131C
-sub_811131C: ; 811131C
+sub_811131C: @ 811131C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -500419,7 +500419,7 @@ _0811134E:
 	thumb_func_end sub_811131C
 
 	thumb_func_start sub_811135C
-sub_811135C: ; 811135C
+sub_811135C: @ 811135C
 	push {lr}
 	ldr r0, =0x02038400
 	ldr r0, [r0]
@@ -500445,7 +500445,7 @@ _0811137E:
 	thumb_func_end sub_811135C
 
 	thumb_func_start sub_8111388
-sub_8111388: ; 8111388
+sub_8111388: @ 8111388
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -500477,7 +500477,7 @@ sub_8111388: ; 8111388
 	thumb_func_end sub_8111388
 
 	thumb_func_start sub_81113C8
-sub_81113C8: ; 81113C8
+sub_81113C8: @ 81113C8
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -500521,7 +500521,7 @@ _08111412:
 	thumb_func_end sub_81113C8
 
 	thumb_func_start sub_8111418
-sub_8111418: ; 8111418
+sub_8111418: @ 8111418
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -500544,7 +500544,7 @@ _08111434:
 	thumb_func_end sub_8111418
 
 	thumb_func_start sub_8111444
-sub_8111444: ; 8111444
+sub_8111444: @ 8111444
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038437
@@ -500583,7 +500583,7 @@ sub_8111444: ; 8111444
 	thumb_func_end sub_8111444
 
 	thumb_func_start sub_811149C
-sub_811149C: ; 811149C
+sub_811149C: @ 811149C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -500625,7 +500625,7 @@ _081114E6:
 	thumb_func_end sub_811149C
 
 	thumb_func_start sub_81114EC
-sub_81114EC: ; 81114EC
+sub_81114EC: @ 81114EC
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -500660,7 +500660,7 @@ _0811151A:
 	thumb_func_end sub_81114EC
 
 	thumb_func_start sub_811152C
-sub_811152C: ; 811152C
+sub_811152C: @ 811152C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -500708,7 +500708,7 @@ _0811157A:
 	thumb_func_end sub_811152C
 
 	thumb_func_start sub_8111590
-sub_8111590: ; 8111590
+sub_8111590: @ 8111590
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -500764,7 +500764,7 @@ _081115F4:
 	thumb_func_end sub_8111590
 
 	thumb_func_start sub_811160C
-sub_811160C: ; 811160C
+sub_811160C: @ 811160C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -500809,7 +500809,7 @@ sub_811160C: ; 811160C
 	thumb_func_end sub_811160C
 
 	thumb_func_start sub_8111674
-sub_8111674: ; 8111674
+sub_8111674: @ 8111674
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8111764
@@ -500866,7 +500866,7 @@ _081116DE:
 	thumb_func_end sub_8111674
 
 	thumb_func_start sub_81116E8
-sub_81116E8: ; 81116E8
+sub_81116E8: @ 81116E8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -500930,7 +500930,7 @@ _0811175E:
 	thumb_func_end sub_81116E8
 
 	thumb_func_start sub_8111764
-sub_8111764: ; 8111764
+sub_8111764: @ 8111764
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x3A]
@@ -501008,7 +501008,7 @@ _081117EE:
 	thumb_func_end sub_8111764
 
 	thumb_func_start sub_81117F4
-sub_81117F4: ; 81117F4
+sub_81117F4: @ 81117F4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -501024,7 +501024,7 @@ sub_81117F4: ; 81117F4
 	thumb_func_end sub_81117F4
 
 	thumb_func_start sub_8111814
-sub_8111814: ; 8111814
+sub_8111814: @ 8111814
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -501087,7 +501087,7 @@ _08111884:
 	thumb_func_end sub_8111814
 
 	thumb_func_start sub_811188C
-sub_811188C: ; 811188C
+sub_811188C: @ 811188C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -501147,7 +501147,7 @@ sub_811188C: ; 811188C
 	thumb_func_end sub_811188C
 
 	thumb_func_start sub_8111914
-sub_8111914: ; 8111914
+sub_8111914: @ 8111914
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -501191,7 +501191,7 @@ _0811195C:
 	thumb_func_end sub_8111914
 
 	thumb_func_start sub_811196C
-sub_811196C: ; 811196C
+sub_811196C: @ 811196C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -501247,7 +501247,7 @@ _081119D8:
 	thumb_func_end sub_811196C
 
 	thumb_func_start sub_81119E0
-sub_81119E0: ; 81119E0
+sub_81119E0: @ 81119E0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -501326,7 +501326,7 @@ sub_81119E0: ; 81119E0
 	thumb_func_end sub_81119E0
 
 	thumb_func_start sub_8111A88
-sub_8111A88: ; 8111A88
+sub_8111A88: @ 8111A88
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -501464,7 +501464,7 @@ _08111B96:
 	thumb_func_end sub_8111A88
 
 	thumb_func_start sub_8111B9C
-sub_8111B9C: ; 8111B9C
+sub_8111B9C: @ 8111B9C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -501478,7 +501478,7 @@ sub_8111B9C: ; 8111B9C
 	thumb_func_end sub_8111B9C
 
 	thumb_func_start sub_8111BB4
-sub_8111BB4: ; 8111BB4
+sub_8111BB4: @ 8111BB4
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	movs r5, 0
@@ -501567,7 +501567,7 @@ _08111C4A:
 	thumb_func_end sub_8111BB4
 
 	thumb_func_start sub_8111C50
-sub_8111C50: ; 8111C50
+sub_8111C50: @ 8111C50
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -501700,7 +501700,7 @@ _08111D5C:
 	thumb_func_end sub_8111C50
 
 	thumb_func_start sub_8111D78
-sub_8111D78: ; 8111D78
+sub_8111D78: @ 8111D78
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -501809,7 +501809,7 @@ _08111E48:
 	thumb_func_end sub_8111D78
 
 	thumb_func_start sub_8111E50
-sub_8111E50: ; 8111E50
+sub_8111E50: @ 8111E50
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -501829,7 +501829,7 @@ sub_8111E50: ; 8111E50
 	thumb_func_end sub_8111E50
 
 	thumb_func_start sub_8111E78
-sub_8111E78: ; 8111E78
+sub_8111E78: @ 8111E78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -502114,7 +502114,7 @@ _081120CC:
 	thumb_func_end sub_8111E78
 
 	thumb_func_start sub_81120DC
-sub_81120DC: ; 81120DC
+sub_81120DC: @ 81120DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -502186,7 +502186,7 @@ _0811215E:
 	thumb_func_end sub_81120DC
 
 	thumb_func_start sub_8112170
-sub_8112170: ; 8112170
+sub_8112170: @ 8112170
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -502298,7 +502298,7 @@ _08112258:
 	thumb_func_end sub_8112170
 
 	thumb_func_start sub_8112264
-sub_8112264: ; 8112264
+sub_8112264: @ 8112264
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -502427,7 +502427,7 @@ _081122D0:
 	thumb_func_end sub_8112264
 
 	thumb_func_start sub_8112384
-sub_8112384: ; 8112384
+sub_8112384: @ 8112384
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r3, [r2, 0x36]
@@ -502463,7 +502463,7 @@ _081123BC:
 	thumb_func_end sub_8112384
 
 	thumb_func_start sub_81123C4
-sub_81123C4: ; 81123C4
+sub_81123C4: @ 81123C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -502705,7 +502705,7 @@ _081125B4:
 	thumb_func_end sub_81123C4
 
 	thumb_func_start sub_81125E0
-sub_81125E0: ; 81125E0
+sub_81125E0: @ 81125E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -502904,7 +502904,7 @@ _08112752:
 	thumb_func_end sub_81125E0
 
 	thumb_func_start sub_8112758
-sub_8112758: ; 8112758
+sub_8112758: @ 8112758
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -502976,7 +502976,7 @@ _081127BA:
 	thumb_func_end sub_8112758
 
 	thumb_func_start sub_811280C
-sub_811280C: ; 811280C
+sub_811280C: @ 811280C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -503144,7 +503144,7 @@ _08112966:
 	thumb_func_end sub_811280C
 
 	thumb_func_start sub_8112994
-sub_8112994: ; 8112994
+sub_8112994: @ 8112994
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -503183,7 +503183,7 @@ _081129DA:
 	thumb_func_end sub_8112994
 
 	thumb_func_start sub_81129F0
-sub_81129F0: ; 81129F0
+sub_81129F0: @ 81129F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -503226,7 +503226,7 @@ _08112A28:
 	thumb_func_end sub_81129F0
 
 	thumb_func_start sub_8112A4C
-sub_8112A4C: ; 8112A4C
+sub_8112A4C: @ 8112A4C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x2E]
@@ -503289,7 +503289,7 @@ _08112AC4:
 	thumb_func_end sub_8112A4C
 
 	thumb_func_start sub_8112ACC
-sub_8112ACC: ; 8112ACC
+sub_8112ACC: @ 8112ACC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -503352,7 +503352,7 @@ _08112B3A:
 	thumb_func_end sub_8112ACC
 
 	thumb_func_start sub_8112B44
-sub_8112B44: ; 8112B44
+sub_8112B44: @ 8112B44
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -503375,7 +503375,7 @@ sub_8112B44: ; 8112B44
 	thumb_func_end sub_8112B44
 
 	thumb_func_start sub_8112B78
-sub_8112B78: ; 8112B78
+sub_8112B78: @ 8112B78
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -503480,7 +503480,7 @@ _08112C40:
 	thumb_func_end sub_8112B78
 
 	thumb_func_start sub_8112C4C
-sub_8112C4C: ; 8112C4C
+sub_8112C4C: @ 8112C4C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -503497,7 +503497,7 @@ sub_8112C4C: ; 8112C4C
 	thumb_func_end sub_8112C4C
 
 	thumb_func_start sub_8112C6C
-sub_8112C6C: ; 8112C6C
+sub_8112C6C: @ 8112C6C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -503571,7 +503571,7 @@ sub_8112C6C: ; 8112C6C
 	thumb_func_end sub_8112C6C
 
 	thumb_func_start sub_8112D10
-sub_8112D10: ; 8112D10
+sub_8112D10: @ 8112D10
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -503772,7 +503772,7 @@ _08112E96:
 	thumb_func_end sub_8112D10
 
 	thumb_func_start sub_8112E9C
-sub_8112E9C: ; 8112E9C
+sub_8112E9C: @ 8112E9C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -503873,7 +503873,7 @@ _08112F56:
 	thumb_func_end sub_8112E9C
 
 	thumb_func_start sub_8112F60
-sub_8112F60: ; 8112F60
+sub_8112F60: @ 8112F60
 	adds r3, r0, 0
 	adds r3, 0x3E
 	ldrb r1, [r3]
@@ -503912,7 +503912,7 @@ sub_8112F60: ; 8112F60
 	thumb_func_end sub_8112F60
 
 	thumb_func_start sub_8112FB8
-sub_8112FB8: ; 8112FB8
+sub_8112FB8: @ 8112FB8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x34]
@@ -503995,7 +503995,7 @@ _08113054:
 	thumb_func_end sub_8112FB8
 
 	thumb_func_start sub_8113064
-sub_8113064: ; 8113064
+sub_8113064: @ 8113064
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -504067,7 +504067,7 @@ _081130BE:
 	thumb_func_end sub_8113064
 
 	thumb_func_start sub_8113100
-sub_8113100: ; 8113100
+sub_8113100: @ 8113100
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_80A6838
@@ -504145,7 +504145,7 @@ _0811318E:
 	thumb_func_end sub_8113100
 
 	thumb_func_start sub_81131B4
-sub_81131B4: ; 81131B4
+sub_81131B4: @ 81131B4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -504192,7 +504192,7 @@ _081131D2:
 	thumb_func_end sub_81131B4
 
 	thumb_func_start sub_8113224
-sub_8113224: ; 8113224
+sub_8113224: @ 8113224
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -504214,7 +504214,7 @@ _0811323E:
 	thumb_func_end sub_8113224
 
 	thumb_func_start sub_8113250
-sub_8113250: ; 8113250
+sub_8113250: @ 8113250
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r4, =0x02038436
@@ -504278,7 +504278,7 @@ _081132B2:
 	thumb_func_end sub_8113250
 
 	thumb_func_start sub_81132E0
-sub_81132E0: ; 81132E0
+sub_81132E0: @ 81132E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x2E
@@ -504415,7 +504415,7 @@ _081133E2:
 	thumb_func_end sub_81132E0
 
 	thumb_func_start sub_81133E8
-sub_81133E8: ; 81133E8
+sub_81133E8: @ 81133E8
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -504505,7 +504505,7 @@ _08113488:
 	thumb_func_end sub_81133E8
 
 	thumb_func_start sub_81134B8
-sub_81134B8: ; 81134B8
+sub_81134B8: @ 81134B8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -504600,7 +504600,7 @@ _0811356E:
 	thumb_func_end sub_81134B8
 
 	thumb_func_start sub_8113574
-sub_8113574: ; 8113574
+sub_8113574: @ 8113574
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -504660,7 +504660,7 @@ _081135CA:
 	thumb_func_end sub_8113574
 
 	thumb_func_start sub_81135EC
-sub_81135EC: ; 81135EC
+sub_81135EC: @ 81135EC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -504741,7 +504741,7 @@ _08113674:
 	thumb_func_end sub_81135EC
 
 	thumb_func_start sub_811369C
-sub_811369C: ; 811369C
+sub_811369C: @ 811369C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -504780,7 +504780,7 @@ _081136E0:
 	thumb_func_end sub_811369C
 
 	thumb_func_start sub_81136E8
-sub_81136E8: ; 81136E8
+sub_81136E8: @ 81136E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -504828,7 +504828,7 @@ _0811373C:
 	thumb_func_end sub_81136E8
 
 	thumb_func_start sub_811375C
-sub_811375C: ; 811375C
+sub_811375C: @ 811375C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -504892,7 +504892,7 @@ _081137DE:
 	thumb_func_end sub_811375C
 
 	thumb_func_start sub_81137E4
-sub_81137E4: ; 81137E4
+sub_81137E4: @ 81137E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -504917,7 +504917,7 @@ sub_81137E4: ; 81137E4
 	thumb_func_end sub_81137E4
 
 	thumb_func_start sub_811381C
-sub_811381C: ; 811381C
+sub_811381C: @ 811381C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -504972,7 +504972,7 @@ _08113882:
 	thumb_func_end sub_811381C
 
 	thumb_func_start sub_8113888
-sub_8113888: ; 8113888
+sub_8113888: @ 8113888
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -505006,7 +505006,7 @@ _081138C4:
 	thumb_func_end sub_8113888
 
 	thumb_func_start sub_81138D4
-sub_81138D4: ; 81138D4
+sub_81138D4: @ 81138D4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x02038437
@@ -505058,7 +505058,7 @@ sub_81138D4: ; 81138D4
 	thumb_func_end sub_81138D4
 
 	thumb_func_start sub_8113950
-sub_8113950: ; 8113950
+sub_8113950: @ 8113950
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r5, [r4, 0x30]
@@ -505132,7 +505132,7 @@ _081139D4:
 	thumb_func_end sub_8113950
 
 	thumb_func_start sub_81139DC
-sub_81139DC: ; 81139DC
+sub_81139DC: @ 81139DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -505162,7 +505162,7 @@ sub_81139DC: ; 81139DC
 	thumb_func_end sub_81139DC
 
 	thumb_func_start sub_8113A18
-sub_8113A18: ; 8113A18
+sub_8113A18: @ 8113A18
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -505197,7 +505197,7 @@ _08113A4E:
 	thumb_func_end sub_8113A18
 
 	thumb_func_start sub_8113A58
-sub_8113A58: ; 8113A58
+sub_8113A58: @ 8113A58
 	push {lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x36]
@@ -505228,7 +505228,7 @@ _08113A8A:
 	thumb_func_end sub_8113A58
 
 	thumb_func_start sub_8113A90
-sub_8113A90: ; 8113A90
+sub_8113A90: @ 8113A90
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -505347,7 +505347,7 @@ _08113B60:
 	thumb_func_end sub_8113A90
 
 	thumb_func_start sub_8113B90
-sub_8113B90: ; 8113B90
+sub_8113B90: @ 8113B90
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -505363,7 +505363,7 @@ _08113BA4:
 	thumb_func_end sub_8113B90
 
 	thumb_func_start sub_8113BAC
-sub_8113BAC: ; 8113BAC
+sub_8113BAC: @ 8113BAC
 	push {r4-r7,lr}
 	sub sp, 0x1C
 	lsls r0, 24
@@ -505540,7 +505540,7 @@ _08113CDC:
 	thumb_func_end sub_8113BAC
 
 	thumb_func_start sub_8113D60
-sub_8113D60: ; 8113D60
+sub_8113D60: @ 8113D60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -505682,7 +505682,7 @@ _08113E72:
 	thumb_func_end sub_8113D60
 
 	thumb_func_start sub_8113E78
-sub_8113E78: ; 8113E78
+sub_8113E78: @ 8113E78
 	push {r4-r7,lr}
 	sub sp, 0x1C
 	lsls r0, 24
@@ -505934,7 +505934,7 @@ _081140A6:
 	thumb_func_end sub_8113E78
 
 	thumb_func_start sub_81140C8
-sub_81140C8: ; 81140C8
+sub_81140C8: @ 81140C8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -506123,7 +506123,7 @@ _08114232:
 	thumb_func_end sub_81140C8
 
 	thumb_func_start sub_8114244
-sub_8114244: ; 8114244
+sub_8114244: @ 8114244
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -506283,7 +506283,7 @@ _08114366:
 	thumb_func_end sub_8114244
 
 	thumb_func_start sub_8114374
-sub_8114374: ; 8114374
+sub_8114374: @ 8114374
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -506324,7 +506324,7 @@ _081143AA:
 	thumb_func_end sub_8114374
 
 	thumb_func_start sub_81143C0
-sub_81143C0: ; 81143C0
+sub_81143C0: @ 81143C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -506406,7 +506406,7 @@ _0811444E:
 	thumb_func_end sub_81143C0
 
 	thumb_func_start sub_8114470
-sub_8114470: ; 8114470
+sub_8114470: @ 8114470
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -506443,7 +506443,7 @@ _081144AC:
 	thumb_func_end sub_8114470
 
 	thumb_func_start sub_81144BC
-sub_81144BC: ; 81144BC
+sub_81144BC: @ 81144BC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203841e
@@ -506470,7 +506470,7 @@ sub_81144BC: ; 81144BC
 	thumb_func_end sub_81144BC
 
 	thumb_func_start sub_81144F8
-sub_81144F8: ; 81144F8
+sub_81144F8: @ 81144F8
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -506703,7 +506703,7 @@ _08114714:
 	thumb_func_end sub_81144F8
 
 	thumb_func_start sub_8114748
-sub_8114748: ; 8114748
+sub_8114748: @ 8114748
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -506852,7 +506852,7 @@ _08114886:
 	thumb_func_end sub_8114748
 
 	thumb_func_start sub_811489C
-sub_811489C: ; 811489C
+sub_811489C: @ 811489C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -506944,7 +506944,7 @@ _0811494A:
 	thumb_func_end sub_811489C
 
 	thumb_func_start sub_8114960
-sub_8114960: ; 8114960
+sub_8114960: @ 8114960
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -506971,7 +506971,7 @@ _08114980:
 	thumb_func_end sub_8114960
 
 	thumb_func_start sub_8114994
-sub_8114994: ; 8114994
+sub_8114994: @ 8114994
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -507015,7 +507015,7 @@ sub_8114994: ; 8114994
 	thumb_func_end sub_8114994
 
 	thumb_func_start sub_81149FC
-sub_81149FC: ; 81149FC
+sub_81149FC: @ 81149FC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_80A6900
@@ -507062,7 +507062,7 @@ _08114A50:
 	thumb_func_end sub_81149FC
 
 	thumb_func_start sub_8114A60
-sub_8114A60: ; 8114A60
+sub_8114A60: @ 8114A60
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -507078,7 +507078,7 @@ _08114A74:
 	thumb_func_end sub_8114A60
 
 	thumb_func_start sub_8114A7C
-sub_8114A7C: ; 8114A7C
+sub_8114A7C: @ 8114A7C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -507126,7 +507126,7 @@ _08114A9C:
 	thumb_func_end sub_8114A7C
 
 	thumb_func_start sub_8114AF0
-sub_8114AF0: ; 8114AF0
+sub_8114AF0: @ 8114AF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -507190,7 +507190,7 @@ _08114B48:
 	thumb_func_end sub_8114AF0
 
 	thumb_func_start sub_8114B80
-sub_8114B80: ; 8114B80
+sub_8114B80: @ 8114B80
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r2, [r5, 0x4]
@@ -507256,7 +507256,7 @@ _08114C02:
 	thumb_func_end sub_8114B80
 
 	thumb_func_start sub_8114C10
-sub_8114C10: ; 8114C10
+sub_8114C10: @ 8114C10
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -507290,7 +507290,7 @@ _08114C46:
 	thumb_func_end sub_8114C10
 
 	thumb_func_start sub_8114C4C
-sub_8114C4C: ; 8114C4C
+sub_8114C4C: @ 8114C4C
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -507351,7 +507351,7 @@ _08114CB6:
 	thumb_func_end sub_8114C4C
 
 	thumb_func_start sub_8114CBC
-sub_8114CBC: ; 8114CBC
+sub_8114CBC: @ 8114CBC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -507381,7 +507381,7 @@ _08114CEA:
 	thumb_func_end sub_8114CBC
 
 	thumb_func_start sub_8114CFC
-sub_8114CFC: ; 8114CFC
+sub_8114CFC: @ 8114CFC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -507586,7 +507586,7 @@ _08114EAA:
 	thumb_func_end sub_8114CFC
 
 	thumb_func_start sub_8114EB4
-sub_8114EB4: ; 8114EB4
+sub_8114EB4: @ 8114EB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -507631,7 +507631,7 @@ _08114F02:
 	thumb_func_end sub_8114EB4
 
 	thumb_func_start sub_8114F14
-sub_8114F14: ; 8114F14
+sub_8114F14: @ 8114F14
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -507661,7 +507661,7 @@ _08114F42:
 	thumb_func_end sub_8114F14
 
 	thumb_func_start sub_8114F54
-sub_8114F54: ; 8114F54
+sub_8114F54: @ 8114F54
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -507729,7 +507729,7 @@ _08114FD2:
 	thumb_func_end sub_8114F54
 
 	thumb_func_start sub_8114FD8
-sub_8114FD8: ; 8114FD8
+sub_8114FD8: @ 8114FD8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -507848,7 +507848,7 @@ _081150DA:
 	thumb_func_end sub_8114FD8
 
 	thumb_func_start sub_81150E0
-sub_81150E0: ; 81150E0
+sub_81150E0: @ 81150E0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -507944,7 +507944,7 @@ _0811516E:
 	thumb_func_end sub_81150E0
 
 	thumb_func_start sub_81151A0
-sub_81151A0: ; 81151A0
+sub_81151A0: @ 81151A0
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -508009,7 +508009,7 @@ _081151DA:
 	thumb_func_end sub_81151A0
 
 	thumb_func_start sub_8115228
-sub_8115228: ; 8115228
+sub_8115228: @ 8115228
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -508025,7 +508025,7 @@ _0811523C:
 	thumb_func_end sub_8115228
 
 	thumb_func_start sub_8115244
-sub_8115244: ; 8115244
+sub_8115244: @ 8115244
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =0x0203841e
@@ -508087,7 +508087,7 @@ _08115262:
 	thumb_func_end sub_8115244
 
 	thumb_func_start sub_81152DC
-sub_81152DC: ; 81152DC
+sub_81152DC: @ 81152DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -508189,7 +508189,7 @@ _081153A0:
 	thumb_func_end sub_81152DC
 
 	thumb_func_start sub_81153AC
-sub_81153AC: ; 81153AC
+sub_81153AC: @ 81153AC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -508318,7 +508318,7 @@ _0811549C:
 	thumb_func_end sub_81153AC
 
 	thumb_func_start sub_81154A4
-sub_81154A4: ; 81154A4
+sub_81154A4: @ 81154A4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -508438,7 +508438,7 @@ _0811557E:
 	thumb_func_end sub_81154A4
 
 	thumb_func_start sub_8115588
-sub_8115588: ; 8115588
+sub_8115588: @ 8115588
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0xC]
@@ -508504,7 +508504,7 @@ _081155F4:
 	thumb_func_end sub_8115588
 
 	thumb_func_start sub_8115600
-sub_8115600: ; 8115600
+sub_8115600: @ 8115600
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -508525,7 +508525,7 @@ _08115614:
 	thumb_func_end sub_8115600
 
 	thumb_func_start sub_8115628
-sub_8115628: ; 8115628
+sub_8115628: @ 8115628
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -508598,7 +508598,7 @@ _0811565A:
 	thumb_func_end sub_8115628
 
 	thumb_func_start sub_81156D0
-sub_81156D0: ; 81156D0
+sub_81156D0: @ 81156D0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -508638,7 +508638,7 @@ _0811571C:
 	thumb_func_end sub_81156D0
 
 	thumb_func_start sub_811572C
-sub_811572C: ; 811572C
+sub_811572C: @ 811572C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -508688,7 +508688,7 @@ _0811577A:
 	thumb_func_end sub_811572C
 
 	thumb_func_start sub_8115798
-sub_8115798: ; 8115798
+sub_8115798: @ 8115798
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -508742,7 +508742,7 @@ _081157F6:
 	thumb_func_end sub_8115798
 
 	thumb_func_start sub_81157FC
-sub_81157FC: ; 81157FC
+sub_81157FC: @ 81157FC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -508773,7 +508773,7 @@ sub_81157FC: ; 81157FC
 	thumb_func_end sub_81157FC
 
 	thumb_func_start sub_811583C
-sub_811583C: ; 811583C
+sub_811583C: @ 811583C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -508812,7 +508812,7 @@ sub_811583C: ; 811583C
 	thumb_func_end sub_811583C
 
 	thumb_func_start sub_8115884
-sub_8115884: ; 8115884
+sub_8115884: @ 8115884
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -508830,7 +508830,7 @@ _0811589A:
 	thumb_func_end sub_8115884
 
 	thumb_func_start sub_81158A4
-sub_81158A4: ; 81158A4
+sub_81158A4: @ 81158A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -508870,7 +508870,7 @@ sub_81158A4: ; 81158A4
 	thumb_func_end sub_81158A4
 
 	thumb_func_start sub_81158F8
-sub_81158F8: ; 81158F8
+sub_81158F8: @ 81158F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -508941,7 +508941,7 @@ _0811597C:
 	thumb_func_end sub_81158F8
 
 	thumb_func_start sub_8115984
-sub_8115984: ; 8115984
+sub_8115984: @ 8115984
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037fd4
@@ -508966,7 +508966,7 @@ _081159AA:
 	thumb_func_end sub_8115984
 
 	thumb_func_start sub_81159B4
-sub_81159B4: ; 81159B4
+sub_81159B4: @ 81159B4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203841e
@@ -509003,7 +509003,7 @@ sub_81159B4: ; 81159B4
 	thumb_func_end sub_81159B4
 
 	thumb_func_start sub_8115A04
-sub_8115A04: ; 8115A04
+sub_8115A04: @ 8115A04
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -509040,7 +509040,7 @@ sub_8115A04: ; 8115A04
 	thumb_func_end sub_8115A04
 
 	thumb_func_start sub_8115A54
-sub_8115A54: ; 8115A54
+sub_8115A54: @ 8115A54
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -509081,7 +509081,7 @@ sub_8115A54: ; 8115A54
 	thumb_func_end sub_8115A54
 
 	thumb_func_start sub_8115AA4
-sub_8115AA4: ; 8115AA4
+sub_8115AA4: @ 8115AA4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -509137,7 +509137,7 @@ _08115B06:
 	thumb_func_end sub_8115AA4
 
 	thumb_func_start sub_8115B0C
-sub_8115B0C: ; 8115B0C
+sub_8115B0C: @ 8115B0C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -509226,7 +509226,7 @@ _08115B82:
 	thumb_func_end sub_8115B0C
 
 	thumb_func_start sub_8115BC8
-sub_8115BC8: ; 8115BC8
+sub_8115BC8: @ 8115BC8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -509267,7 +509267,7 @@ sub_8115BC8: ; 8115BC8
 	thumb_func_end sub_8115BC8
 
 	thumb_func_start sub_8115C18
-sub_8115C18: ; 8115C18
+sub_8115C18: @ 8115C18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -509323,7 +509323,7 @@ _08115C7A:
 	thumb_func_end sub_8115C18
 
 	thumb_func_start sub_8115C80
-sub_8115C80: ; 8115C80
+sub_8115C80: @ 8115C80
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -509360,7 +509360,7 @@ sub_8115C80: ; 8115C80
 	thumb_func_end sub_8115C80
 
 	thumb_func_start sub_8115CD0
-sub_8115CD0: ; 8115CD0
+sub_8115CD0: @ 8115CD0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -509406,7 +509406,7 @@ sub_8115CD0: ; 8115CD0
 	thumb_func_end sub_8115CD0
 
 	thumb_func_start sub_8115D2C
-sub_8115D2C: ; 8115D2C
+sub_8115D2C: @ 8115D2C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -509462,7 +509462,7 @@ _08115D8E:
 	thumb_func_end sub_8115D2C
 
 	thumb_func_start sub_8115D94
-sub_8115D94: ; 8115D94
+sub_8115D94: @ 8115D94
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -509513,7 +509513,7 @@ sub_8115D94: ; 8115D94
 	thumb_func_end sub_8115D94
 
 	thumb_func_start sub_8115E00
-sub_8115E00: ; 8115E00
+sub_8115E00: @ 8115E00
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -509604,7 +509604,7 @@ _08115EAC:
 	thumb_func_end sub_8115E00
 
 	thumb_func_start sub_8115EB8
-sub_8115EB8: ; 8115EB8
+sub_8115EB8: @ 8115EB8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -509646,7 +509646,7 @@ _08115EFE:
 	thumb_func_end sub_8115EB8
 
 	thumb_func_start sub_8115F10
-sub_8115F10: ; 8115F10
+sub_8115F10: @ 8115F10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -509710,7 +509710,7 @@ _08115F6E:
 	thumb_func_end sub_8115F10
 
 	thumb_func_start sub_8115F94
-sub_8115F94: ; 8115F94
+sub_8115F94: @ 8115F94
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -509839,7 +509839,7 @@ _0811607A:
 	thumb_func_end sub_8115F94
 
 	thumb_func_start sub_81160A4
-sub_81160A4: ; 81160A4
+sub_81160A4: @ 81160A4
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r2, r4, 0
@@ -509918,7 +509918,7 @@ _08116130:
 	thumb_func_end sub_81160A4
 
 	thumb_func_start sub_8116148
-sub_8116148: ; 8116148
+sub_8116148: @ 8116148
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x34]
@@ -510007,7 +510007,7 @@ _081161E2:
 	thumb_func_end sub_8116148
 
 	thumb_func_start sub_81161F4
-sub_81161F4: ; 81161F4
+sub_81161F4: @ 81161F4
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r4, =0x020241e4
@@ -510092,7 +510092,7 @@ _08116298:
 	thumb_func_end sub_81161F4
 
 	thumb_func_start sub_81162A4
-sub_81162A4: ; 81162A4
+sub_81162A4: @ 81162A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -510128,7 +510128,7 @@ sub_81162A4: ; 81162A4
 	thumb_func_end sub_81162A4
 
 	thumb_func_start sub_81162F8
-sub_81162F8: ; 81162F8
+sub_81162F8: @ 81162F8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -510204,7 +510204,7 @@ _08116382:
 	thumb_func_end sub_81162F8
 
 	thumb_func_start sub_8116388
-sub_8116388: ; 8116388
+sub_8116388: @ 8116388
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -510236,7 +510236,7 @@ _081163B4:
 	thumb_func_end sub_8116388
 
 	thumb_func_start sub_81163D0
-sub_81163D0: ; 81163D0
+sub_81163D0: @ 81163D0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -510271,7 +510271,7 @@ _081163FC:
 	thumb_func_end sub_81163D0
 
 	thumb_func_start sub_8116420
-sub_8116420: ; 8116420
+sub_8116420: @ 8116420
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -510298,7 +510298,7 @@ _08116444:
 	thumb_func_end sub_8116420
 
 	thumb_func_start sub_8116458
-sub_8116458: ; 8116458
+sub_8116458: @ 8116458
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -510362,7 +510362,7 @@ _0811649C:
 	thumb_func_end sub_8116458
 
 	thumb_func_start sub_81164F0
-sub_81164F0: ; 81164F0
+sub_81164F0: @ 81164F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203841e
@@ -510411,7 +510411,7 @@ sub_81164F0: ; 81164F0
 	thumb_func_end sub_81164F0
 
 	thumb_func_start sub_8116560
-sub_8116560: ; 8116560
+sub_8116560: @ 8116560
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -510444,7 +510444,7 @@ _08116584:
 	thumb_func_end sub_8116560
 
 	thumb_func_start sub_81165A8
-sub_81165A8: ; 81165A8
+sub_81165A8: @ 81165A8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203841e
@@ -510473,7 +510473,7 @@ _081165D4:
 	thumb_func_end sub_81165A8
 
 	thumb_func_start sub_81165E4
-sub_81165E4: ; 81165E4
+sub_81165E4: @ 81165E4
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x3E
@@ -510506,7 +510506,7 @@ _0811661A:
 	thumb_func_end sub_81165E4
 
 	thumb_func_start sub_8116620
-sub_8116620: ; 8116620
+sub_8116620: @ 8116620
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -510539,7 +510539,7 @@ sub_8116620: ; 8116620
 	thumb_func_end sub_8116620
 
 	thumb_func_start sub_8116664
-sub_8116664: ; 8116664
+sub_8116664: @ 8116664
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -510658,7 +510658,7 @@ _0811673C:
 	thumb_func_end sub_8116664
 
 	thumb_func_start sub_811675C
-sub_811675C: ; 811675C
+sub_811675C: @ 811675C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -510747,7 +510747,7 @@ _08116832:
 	thumb_func_end sub_811675C
 
 	thumb_func_start sub_8116848
-sub_8116848: ; 8116848
+sub_8116848: @ 8116848
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -510769,7 +510769,7 @@ sub_8116848: ; 8116848
 	thumb_func_end sub_8116848
 
 	thumb_func_start sub_8116874
-sub_8116874: ; 8116874
+sub_8116874: @ 8116874
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -510801,7 +510801,7 @@ sub_8116874: ; 8116874
 	thumb_func_end sub_8116874
 
 	thumb_func_start sub_81168B8
-sub_81168B8: ; 81168B8
+sub_81168B8: @ 81168B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -510893,7 +510893,7 @@ _08116954:
 	thumb_func_end sub_81168B8
 
 	thumb_func_start sub_8116960
-sub_8116960: ; 8116960
+sub_8116960: @ 8116960
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -510922,7 +510922,7 @@ sub_8116960: ; 8116960
 	thumb_func_end sub_8116960
 
 	thumb_func_start sub_81169A0
-sub_81169A0: ; 81169A0
+sub_81169A0: @ 81169A0
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -510941,7 +510941,7 @@ _081169B8:
 	thumb_func_end sub_81169A0
 
 	thumb_func_start sub_81169C0
-sub_81169C0: ; 81169C0
+sub_81169C0: @ 81169C0
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 2
@@ -510968,7 +510968,7 @@ sub_81169C0: ; 81169C0
 	thumb_func_end sub_81169C0
 
 	thumb_func_start sub_81169F8
-sub_81169F8: ; 81169F8
+sub_81169F8: @ 81169F8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -511077,7 +511077,7 @@ _08116ACA:
 	thumb_func_end sub_81169F8
 
 	thumb_func_start sub_8116AD0
-sub_8116AD0: ; 8116AD0
+sub_8116AD0: @ 8116AD0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -511114,7 +511114,7 @@ _08116B08:
 	thumb_func_end sub_8116AD0
 
 	thumb_func_start sub_8116B14
-sub_8116B14: ; 8116B14
+sub_8116B14: @ 8116B14
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -511351,7 +511351,7 @@ _08116CAC:
 	thumb_func_end sub_8116B14
 
 	thumb_func_start sub_8116D64
-sub_8116D64: ; 8116D64
+sub_8116D64: @ 8116D64
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -511495,7 +511495,7 @@ _08116E86:
 	thumb_func_end sub_8116D64
 
 	thumb_func_start sub_8116EB4
-sub_8116EB4: ; 8116EB4
+sub_8116EB4: @ 8116EB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -511532,7 +511532,7 @@ _08116EC8:
 	thumb_func_end sub_8116EB4
 
 	thumb_func_start sub_8116F04
-sub_8116F04: ; 8116F04
+sub_8116F04: @ 8116F04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -511735,7 +511735,7 @@ _081170C4:
 	thumb_func_end sub_8116F04
 
 	thumb_func_start sub_81170EC
-sub_81170EC: ; 81170EC
+sub_81170EC: @ 81170EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -511960,7 +511960,7 @@ _081172E0:
 	thumb_func_end sub_81170EC
 
 	thumb_func_start sub_81172EC
-sub_81172EC: ; 81172EC
+sub_81172EC: @ 81172EC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -512161,7 +512161,7 @@ _08117478:
 	thumb_func_end sub_81172EC
 
 	thumb_func_start sub_8117494
-sub_8117494: ; 8117494
+sub_8117494: @ 8117494
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -512209,7 +512209,7 @@ sub_8117494: ; 8117494
 	thumb_func_end sub_8117494
 
 	thumb_func_start sub_8117500
-sub_8117500: ; 8117500
+sub_8117500: @ 8117500
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -512314,7 +512314,7 @@ _081175BE:
 	thumb_func_end sub_8117500
 
 	thumb_func_start sub_81175C4
-sub_81175C4: ; 81175C4
+sub_81175C4: @ 81175C4
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	lsls r1, 16
@@ -512357,7 +512357,7 @@ _081175FA:
 	thumb_func_end sub_81175C4
 
 	thumb_func_start sub_8117610
-sub_8117610: ; 8117610
+sub_8117610: @ 8117610
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -512399,7 +512399,7 @@ _0811763C:
 	thumb_func_end sub_8117610
 
 	thumb_func_start sub_8117660
-sub_8117660: ; 8117660
+sub_8117660: @ 8117660
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -512452,7 +512452,7 @@ _0811769C:
 	thumb_func_end sub_8117660
 
 	thumb_func_start sub_81176D8
-sub_81176D8: ; 81176D8
+sub_81176D8: @ 81176D8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -512510,7 +512510,7 @@ _0811773E:
 	thumb_func_end sub_81176D8
 
 	thumb_func_start sub_8117754
-sub_8117754: ; 8117754
+sub_8117754: @ 8117754
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -512531,7 +512531,7 @@ sub_8117754: ; 8117754
 	thumb_func_end sub_8117754
 
 	thumb_func_start sub_8117780
-sub_8117780: ; 8117780
+sub_8117780: @ 8117780
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -512552,7 +512552,7 @@ sub_8117780: ; 8117780
 	thumb_func_end sub_8117780
 
 	thumb_func_start sub_81177AC
-sub_81177AC: ; 81177AC
+sub_81177AC: @ 81177AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -512578,7 +512578,7 @@ _081177C8:
 	thumb_func_end sub_81177AC
 
 	thumb_func_start sub_81177E4
-sub_81177E4: ; 81177E4
+sub_81177E4: @ 81177E4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -512630,7 +512630,7 @@ _0811782C:
 	thumb_func_end sub_81177E4
 
 	thumb_func_start sub_8117854
-sub_8117854: ; 8117854
+sub_8117854: @ 8117854
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -512858,7 +512858,7 @@ _081179CC:
 	thumb_func_end sub_8117854
 
 	thumb_func_start sub_8117A60
-sub_8117A60: ; 8117A60
+sub_8117A60: @ 8117A60
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -513073,7 +513073,7 @@ _08117C0C:
 	thumb_func_end sub_8117A60
 
 	thumb_func_start sub_8117C24
-sub_8117C24: ; 8117C24
+sub_8117C24: @ 8117C24
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -513088,7 +513088,7 @@ sub_8117C24: ; 8117C24
 	thumb_func_end sub_8117C24
 
 	thumb_func_start sub_8117C44
-sub_8117C44: ; 8117C44
+sub_8117C44: @ 8117C44
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -513111,7 +513111,7 @@ sub_8117C44: ; 8117C44
 	thumb_func_end sub_8117C44
 
 	thumb_func_start sub_8117C70
-sub_8117C70: ; 8117C70
+sub_8117C70: @ 8117C70
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -513136,7 +513136,7 @@ sub_8117C70: ; 8117C70
 	thumb_func_end sub_8117C70
 
 	thumb_func_start sub_8117CA0
-sub_8117CA0: ; 8117CA0
+sub_8117CA0: @ 8117CA0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -513211,7 +513211,7 @@ _08117CFC:
 	thumb_func_end sub_8117CA0
 
 	thumb_func_start sub_8117D3C
-sub_8117D3C: ; 8117D3C
+sub_8117D3C: @ 8117D3C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -513286,7 +513286,7 @@ _08117D98:
 	thumb_func_end sub_8117D3C
 
 	thumb_func_start sub_8117DD8
-sub_8117DD8: ; 8117DD8
+sub_8117DD8: @ 8117DD8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -513352,7 +513352,7 @@ _08117E34:
 	thumb_func_end sub_8117DD8
 
 	thumb_func_start sub_8117E60
-sub_8117E60: ; 8117E60
+sub_8117E60: @ 8117E60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -513379,7 +513379,7 @@ _08117E84:
 	thumb_func_end sub_8117E60
 
 	thumb_func_start sub_8117E94
-sub_8117E94: ; 8117E94
+sub_8117E94: @ 8117E94
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -513398,7 +513398,7 @@ sub_8117E94: ; 8117E94
 	thumb_func_end sub_8117E94
 
 	thumb_func_start sub_8117EC4
-sub_8117EC4: ; 8117EC4
+sub_8117EC4: @ 8117EC4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -513431,7 +513431,7 @@ _08117EFC:
 	thumb_func_end sub_8117EC4
 
 	thumb_func_start sub_8117F10
-sub_8117F10: ; 8117F10
+sub_8117F10: @ 8117F10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -513446,7 +513446,7 @@ sub_8117F10: ; 8117F10
 	thumb_func_end sub_8117F10
 
 	thumb_func_start sub_8117F30
-sub_8117F30: ; 8117F30
+sub_8117F30: @ 8117F30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -513465,7 +513465,7 @@ sub_8117F30: ; 8117F30
 	thumb_func_end sub_8117F30
 
 	thumb_func_start sub_8117F60
-sub_8117F60: ; 8117F60
+sub_8117F60: @ 8117F60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -513515,7 +513515,7 @@ _08117FB4:
 	thumb_func_end sub_8117F60
 
 	thumb_func_start sub_8117FD0
-sub_8117FD0: ; 8117FD0
+sub_8117FD0: @ 8117FD0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -513557,7 +513557,7 @@ _08118014:
 	thumb_func_end sub_8117FD0
 
 	thumb_func_start lcd_bg_operations
-lcd_bg_operations: ; 811802C
+lcd_bg_operations: @ 811802C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -513686,7 +513686,7 @@ _08118132:
 	thumb_func_end lcd_bg_operations
 
 	thumb_func_start sub_8118140
-sub_8118140: ; 8118140
+sub_8118140: @ 8118140
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -513763,7 +513763,7 @@ _081181CA:
 	thumb_func_end sub_8118140
 
 	thumb_func_start battle_intro_launch
-battle_intro_launch: ; 81181D4
+battle_intro_launch: @ 81181D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -513843,7 +513843,7 @@ _08118258:
 	thumb_func_end battle_intro_launch
 
 	thumb_func_start sub_811828C
-sub_811828C: ; 811828C
+sub_811828C: @ 811828C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -513880,7 +513880,7 @@ sub_811828C: ; 811828C
 	thumb_func_end sub_811828C
 
 	thumb_func_start task_battle_intro_80BC47C
-task_battle_intro_80BC47C: ; 81182EC
+task_battle_intro_80BC47C: @ 81182EC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -514153,7 +514153,7 @@ _0811852A:
 	thumb_func_end task_battle_intro_80BC47C
 
 	thumb_func_start task00_battle_intro_80BC6C8
-task00_battle_intro_80BC6C8: ; 8118538
+task00_battle_intro_80BC6C8: @ 8118538
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -514514,7 +514514,7 @@ _08118832:
 	thumb_func_end task00_battle_intro_80BC6C8
 
 	thumb_func_start task_battle_intro_anim
-task_battle_intro_anim: ; 8118844
+task_battle_intro_anim: @ 8118844
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -514803,7 +514803,7 @@ _08118AB0:
 	thumb_func_end task_battle_intro_anim
 
 	thumb_func_start task00_battle_intro_wireless
-task00_battle_intro_wireless: ; 8118AC0
+task00_battle_intro_wireless: @ 8118AC0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -515115,7 +515115,7 @@ _08118D5A:
 	thumb_func_end task00_battle_intro_wireless
 
 	thumb_func_start sub_8118D68
-sub_8118D68: ; 8118D68
+sub_8118D68: @ 8118D68
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -515369,7 +515369,7 @@ _08118FB2:
 	thumb_func_end sub_8118D68
 
 	thumb_func_start sub_8118FBC
-sub_8118FBC: ; 8118FBC
+sub_8118FBC: @ 8118FBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -515477,7 +515477,7 @@ _08119068:
 	thumb_func_end sub_8118FBC
 
 	thumb_func_start sub_8119094
-sub_8119094: ; 8119094
+sub_8119094: @ 8119094
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -515584,8 +515584,8 @@ _08119148:
 	thumb_func_end sub_8119094
 
 	thumb_func_start MovePlayerOnBike
-; void MovePlayerOnBike(int dpad_direction, int buttons_new, int buttons_held)
-MovePlayerOnBike: ; 8119164
+@ void MovePlayerOnBike(int dpad_direction, int buttons_new, int buttons_held)
+MovePlayerOnBike: @ 8119164
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -515615,7 +515615,7 @@ _08119194:
 	thumb_func_end MovePlayerOnBike
 
 	thumb_func_start MovePlayerOnMachBike
-MovePlayerOnMachBike: ; 811919C
+MovePlayerOnMachBike: @ 811919C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -515639,7 +515639,7 @@ MovePlayerOnMachBike: ; 811919C
 	thumb_func_end MovePlayerOnMachBike
 
 	thumb_func_start CheckMovementInputMachBike
-CheckMovementInputMachBike: ; 81191CC
+CheckMovementInputMachBike: @ 81191CC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl player_get_direction_upper_nybble
@@ -515689,7 +515689,7 @@ _0811921C:
 	thumb_func_end CheckMovementInputMachBike
 
 	thumb_func_start sub_8119224
-sub_8119224: ; 8119224
+sub_8119224: @ 8119224
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -515700,7 +515700,7 @@ sub_8119224: ; 8119224
 	thumb_func_end sub_8119224
 
 	thumb_func_start sub_8119238
-sub_8119238: ; 8119238
+sub_8119238: @ 8119238
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -515734,7 +515734,7 @@ _0811927A:
 	thumb_func_end sub_8119238
 
 	thumb_func_start sub_8119280
-sub_8119280: ; 8119280
+sub_8119280: @ 8119280
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -515828,7 +515828,7 @@ _0811933A:
 	thumb_func_end sub_8119280
 
 	thumb_func_start sub_8119344
-sub_8119344: ; 8119344
+sub_8119344: @ 8119344
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -515894,8 +515894,8 @@ _081193BE:
 	thumb_func_end sub_8119344
 
 	thumb_func_start MovePlayerOnAcroBike
-; void MovePlayerOnAcroBike(int dpad_direction, int buttons_new, int buttons_held)
-MovePlayerOnAcroBike: ; 81193C8
+@ void MovePlayerOnAcroBike(int dpad_direction, int buttons_new, int buttons_held)
+MovePlayerOnAcroBike: @ 81193C8
 	push {r4,lr}
 	sub sp, 0x4
 	mov r3, sp
@@ -515923,7 +515923,7 @@ MovePlayerOnAcroBike: ; 81193C8
 	thumb_func_end MovePlayerOnAcroBike
 
 	thumb_func_start CheckMovementInputAcroBike
-CheckMovementInputAcroBike: ; 8119400
+CheckMovementInputAcroBike: @ 8119400
 	push {r4,lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -515945,7 +515945,7 @@ CheckMovementInputAcroBike: ; 8119400
 	thumb_func_end CheckMovementInputAcroBike
 
 	thumb_func_start CheckMovementInputAcroBikeNormal
-CheckMovementInputAcroBikeNormal: ; 811942C
+CheckMovementInputAcroBikeNormal: @ 811942C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -516028,7 +516028,7 @@ _081194C0:
 	thumb_func_end CheckMovementInputAcroBikeNormal
 
 	thumb_func_start CheckMovementInputAcroBikeChangingDirection
-CheckMovementInputAcroBikeChangingDirection: ; 81194C8
+CheckMovementInputAcroBikeChangingDirection: @ 81194C8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02037590
@@ -516090,7 +516090,7 @@ _0811953A:
 	thumb_func_end CheckMovementInputAcroBikeChangingDirection
 
 	thumb_func_start CheckMovementInputAcroBikeStandingWheelie
-CheckMovementInputAcroBikeStandingWheelie: ; 8119540
+CheckMovementInputAcroBikeStandingWheelie: @ 8119540
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	lsls r4, r2, 16
@@ -516170,7 +516170,7 @@ _081195D8:
 	thumb_func_end CheckMovementInputAcroBikeStandingWheelie
 
 	thumb_func_start CheckMovementInputAcroBikeBunnyHop
-CheckMovementInputAcroBikeBunnyHop: ; 81195E0
+CheckMovementInputAcroBikeBunnyHop: @ 81195E0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -516254,7 +516254,7 @@ _08119676:
 	thumb_func_end CheckMovementInputAcroBikeBunnyHop
 
 	thumb_func_start CheckMovementInputAcroBikeMovingWheelie
-CheckMovementInputAcroBikeMovingWheelie: ; 8119688
+CheckMovementInputAcroBikeMovingWheelie: @ 8119688
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -516364,7 +516364,7 @@ _08119750:
 	thumb_func_end CheckMovementInputAcroBikeMovingWheelie
 
 	thumb_func_start CheckMovementInputAcroBikeUnknownMode5
-CheckMovementInputAcroBikeUnknownMode5: ; 8119764
+CheckMovementInputAcroBikeUnknownMode5: @ 8119764
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -516408,7 +516408,7 @@ CheckMovementInputAcroBikeUnknownMode5: ; 8119764
 	thumb_func_end CheckMovementInputAcroBikeUnknownMode5
 
 	thumb_func_start CheckMovementInputAcroBikeUnknownMode6
-CheckMovementInputAcroBikeUnknownMode6: ; 81197C0
+CheckMovementInputAcroBikeUnknownMode6: @ 81197C0
 	push {r4,lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -516427,7 +516427,7 @@ CheckMovementInputAcroBikeUnknownMode6: ; 81197C0
 	thumb_func_end CheckMovementInputAcroBikeUnknownMode6
 
 	thumb_func_start sub_81197E4
-sub_81197E4: ; 81197E4
+sub_81197E4: @ 81197E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -516437,7 +516437,7 @@ sub_81197E4: ; 81197E4
 	thumb_func_end sub_81197E4
 
 	thumb_func_start sub_81197F4
-sub_81197F4: ; 81197F4
+sub_81197F4: @ 81197F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516466,7 +516466,7 @@ _0811981A:
 	thumb_func_end sub_81197F4
 
 	thumb_func_start sub_8119830
-sub_8119830: ; 8119830
+sub_8119830: @ 8119830
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -516535,7 +516535,7 @@ _081198BA:
 	thumb_func_end sub_8119830
 
 	thumb_func_start sub_81198C0
-sub_81198C0: ; 81198C0
+sub_81198C0: @ 81198C0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516564,7 +516564,7 @@ _081198E6:
 	thumb_func_end sub_81198C0
 
 	thumb_func_start sub_81198FC
-sub_81198FC: ; 81198FC
+sub_81198FC: @ 81198FC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516593,7 +516593,7 @@ _08119922:
 	thumb_func_end sub_81198FC
 
 	thumb_func_start sub_8119938
-sub_8119938: ; 8119938
+sub_8119938: @ 8119938
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516622,7 +516622,7 @@ _0811995E:
 	thumb_func_end sub_8119938
 
 	thumb_func_start sub_8119974
-sub_8119974: ; 8119974
+sub_8119974: @ 8119974
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516651,7 +516651,7 @@ _0811999A:
 	thumb_func_end sub_8119974
 
 	thumb_func_start sub_81199B0
-sub_81199B0: ; 81199B0
+sub_81199B0: @ 81199B0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516708,7 +516708,7 @@ _08119A1E:
 	thumb_func_end sub_81199B0
 
 	thumb_func_start sub_8119A24
-sub_8119A24: ; 8119A24
+sub_8119A24: @ 8119A24
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -516761,7 +516761,7 @@ _08119A84:
 	thumb_func_end sub_8119A24
 
 	thumb_func_start sub_8119A94
-sub_8119A94: ; 8119A94
+sub_8119A94: @ 8119A94
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -516771,7 +516771,7 @@ sub_8119A94: ; 8119A94
 	thumb_func_end sub_8119A94
 
 	thumb_func_start sub_8119AA4
-sub_8119AA4: ; 8119AA4
+sub_8119AA4: @ 8119AA4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516840,7 +516840,7 @@ _08119B2C:
 	thumb_func_end sub_8119AA4
 
 	thumb_func_start sub_8119B34
-sub_8119B34: ; 8119B34
+sub_8119B34: @ 8119B34
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516909,7 +516909,7 @@ _08119BBC:
 	thumb_func_end sub_8119B34
 
 	thumb_func_start sub_8119BC4
-sub_8119BC4: ; 8119BC4
+sub_8119BC4: @ 8119BC4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -516967,8 +516967,8 @@ _08119C36:
 	thumb_func_end sub_8119BC4
 
 	thumb_func_start sub_8119C3C
-; void sub_8119C3C(int buttons_new, int buttons_held)
-sub_8119C3C: ; 8119C3C
+@ void sub_8119C3C(int buttons_new, int buttons_held)
+sub_8119C3C: @ 8119C3C
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -516990,8 +516990,8 @@ _08119C5A:
 	thumb_func_end sub_8119C3C
 
 	thumb_func_start sub_8119C64
-; void sub_8119C64(int buttons_new, int buttons_held)
-sub_8119C64: ; 8119C64
+@ void sub_8119C64(int buttons_new, int buttons_held)
+sub_8119C64: @ 8119C64
 	push {r4,r5,lr}
 	lsls r1, 16
 	lsrs r5, r1, 16
@@ -517046,7 +517046,7 @@ _08119CC6:
 	thumb_func_end sub_8119C64
 
 	thumb_func_start sub_8119CCC
-sub_8119CCC: ; 8119CCC
+sub_8119CCC: @ 8119CCC
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -517103,7 +517103,7 @@ _08119D28:
 	thumb_func_end sub_8119CCC
 
 	thumb_func_start sub_8119D30
-sub_8119D30: ; 8119D30
+sub_8119D30: @ 8119D30
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -517145,7 +517145,7 @@ _08119D7A:
 	thumb_func_end sub_8119D30
 
 	thumb_func_start sub_8119D80
-sub_8119D80: ; 8119D80
+sub_8119D80: @ 8119D80
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =0x02037590
@@ -517179,7 +517179,7 @@ _08119D9C:
 	thumb_func_end sub_8119D80
 
 	thumb_func_start sub_8119DBC
-sub_8119DBC: ; 8119DBC
+sub_8119DBC: @ 8119DBC
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =0x02037590
@@ -517213,7 +517213,7 @@ _08119DD8:
 	thumb_func_end sub_8119DBC
 
 	thumb_func_start sub_8119DF8
-sub_8119DF8: ; 8119DF8
+sub_8119DF8: @ 8119DF8
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -517253,7 +517253,7 @@ _08119E32:
 	thumb_func_end sub_8119DF8
 
 	thumb_func_start sub_8119E38
-sub_8119E38: ; 8119E38
+sub_8119E38: @ 8119E38
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -517304,7 +517304,7 @@ sub_8119E38: ; 8119E38
 	thumb_func_end sub_8119E38
 
 	thumb_func_start sub_8119EA4
-sub_8119EA4: ; 8119EA4
+sub_8119EA4: @ 8119EA4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0x10]
@@ -517345,7 +517345,7 @@ _08119EE4:
 	thumb_func_end sub_8119EA4
 
 	thumb_func_start sub_8119EF0
-sub_8119EF0: ; 8119EF0
+sub_8119EF0: @ 8119EF0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -517369,8 +517369,8 @@ _08119F12:
 	thumb_func_end sub_8119EF0
 
 	thumb_func_start IsRunningDisallowedByMetatile
-; bool8 IsRunningDisallowedByMetatile(u8 metatileBehavior)
-IsRunningDisallowedByMetatile: ; 8119F18
+@ bool8 IsRunningDisallowedByMetatile(u8 metatileBehavior)
+IsRunningDisallowedByMetatile: @ 8119F18
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -517401,7 +517401,7 @@ _08119F48:
 	thumb_func_end IsRunningDisallowedByMetatile
 
 	thumb_func_start sub_8119F50
-sub_8119F50: ; 8119F50
+sub_8119F50: @ 8119F50
 	push {lr}
 	ldr r0, =0x0203ab54
 	ldrb r0, [r0]
@@ -517420,7 +517420,7 @@ _08119F66:
 	thumb_func_end sub_8119F50
 
 	thumb_func_start sub_8119F74
-sub_8119F74: ; 8119F74
+sub_8119F74: @ 8119F74
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -517464,7 +517464,7 @@ _08119FBC:
 	thumb_func_end sub_8119F74
 
 	thumb_func_start sub_8119FC4
-sub_8119FC4: ; 8119FC4
+sub_8119FC4: @ 8119FC4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -517497,7 +517497,7 @@ _08119FF2:
 	thumb_func_end sub_8119FC4
 
 	thumb_func_start sub_8119FF8
-sub_8119FF8: ; 8119FF8
+sub_8119FF8: @ 8119FF8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x02037590
@@ -517536,7 +517536,7 @@ _0811A03A:
 	thumb_func_end sub_8119FF8
 
 	thumb_func_start player_should_look_direction_be_enforced_upon_movement
-player_should_look_direction_be_enforced_upon_movement: ; 811A044
+player_should_look_direction_be_enforced_upon_movement: @ 811A044
 	push {lr}
 	movs r0, 0x4
 	bl TestPlayerAvatarFlags
@@ -517566,8 +517566,8 @@ _0811A07A:
 	thumb_func_end player_should_look_direction_be_enforced_upon_movement
 
 	thumb_func_start GetOnOffBike
-; void GetOnOffBike(u8 transitionFlags)
-GetOnOffBike: ; 811A080
+@ void GetOnOffBike(u8 transitionFlags)
+GetOnOffBike: @ 811A080
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -517602,7 +517602,7 @@ _0811A0C4:
 	thumb_func_end GetOnOffBike
 
 	thumb_func_start sub_811A0D0
-sub_811A0D0: ; 811A0D0
+sub_811A0D0: @ 811A0D0
 	push {lr}
 	ldr r2, =0x02037590
 	movs r3, 0
@@ -517639,7 +517639,7 @@ _0811A0FA:
 	thumb_func_end sub_811A0D0
 
 	thumb_func_start sub_811A114
-sub_811A114: ; 811A114
+sub_811A114: @ 811A114
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02037590
@@ -517652,7 +517652,7 @@ sub_811A114: ; 811A114
 	thumb_func_end sub_811A114
 
 	thumb_func_start sub_811A128
-sub_811A128: ; 811A128
+sub_811A128: @ 811A128
 	ldr r1, =0x02037590
 	movs r0, 0
 	strb r0, [r1, 0xA]
@@ -517662,7 +517662,7 @@ sub_811A128: ; 811A128
 	thumb_func_end sub_811A128
 
 	thumb_func_start sub_811A138
-sub_811A138: ; 811A138
+sub_811A138: @ 811A138
 	push {lr}
 	sub sp, 0x8
 	ldr r1, =gUnknown_085974B8
@@ -517705,7 +517705,7 @@ _0811A182:
 	thumb_func_end sub_811A138
 
 	thumb_func_start sub_811A188
-sub_811A188: ; 811A188
+sub_811A188: @ 811A188
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02037590
@@ -517746,8 +517746,8 @@ _0811A1D0:
 	thumb_func_end sub_811A188
 
 	thumb_func_start IsRunningDisallowed
-; bool8 IsRunningDisallowed(u8 metatileBehavior)
-IsRunningDisallowed: ; 811A1DC
+@ bool8 IsRunningDisallowed(u8 metatileBehavior)
+IsRunningDisallowed: @ 811A1DC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -517775,7 +517775,7 @@ _0811A206:
 	thumb_func_end IsRunningDisallowed
 
 	thumb_func_start sub_811A20C
-sub_811A20C: ; 811A20C
+sub_811A20C: @ 811A20C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -517822,7 +517822,7 @@ sub_811A20C: ; 811A20C
 	thumb_func_end sub_811A20C
 
 	thumb_func_start sub_811A278
-sub_811A278: ; 811A278
+sub_811A278: @ 811A278
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -517833,7 +517833,7 @@ sub_811A278: ; 811A278
 	thumb_func_end sub_811A278
 
 	thumb_func_start sub_811A290
-sub_811A290: ; 811A290
+sub_811A290: @ 811A290
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -517843,7 +517843,7 @@ sub_811A290: ; 811A290
 	thumb_func_end sub_811A290
 
 	thumb_func_start sub_811A2A4
-sub_811A2A4: ; 811A2A4
+sub_811A2A4: @ 811A2A4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x03005e00
@@ -517859,7 +517859,7 @@ sub_811A2A4: ; 811A2A4
 	thumb_func_end sub_811A2A4
 
 	thumb_func_start sub_811A2C0
-sub_811A2C0: ; 811A2C0
+sub_811A2C0: @ 811A2C0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -517892,7 +517892,7 @@ _0811A2F2:
 	thumb_func_end sub_811A2C0
 
 	thumb_func_start sub_811A2FC
-sub_811A2FC: ; 811A2FC
+sub_811A2FC: @ 811A2FC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -518032,7 +518032,7 @@ _0811A41C:
 	thumb_func_end sub_811A2FC
 
 	thumb_func_start sub_811A428
-sub_811A428: ; 811A428
+sub_811A428: @ 811A428
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -518111,7 +518111,7 @@ _0811A4C8:
 	thumb_func_end sub_811A428
 
 	thumb_func_start sub_811A4D0
-sub_811A4D0: ; 811A4D0
+sub_811A4D0: @ 811A4D0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_811C13C
@@ -518126,7 +518126,7 @@ sub_811A4D0: ; 811A4D0
 	thumb_func_end sub_811A4D0
 
 	thumb_func_start easy_chat_input_maybe
-easy_chat_input_maybe: ; 811A4F0
+easy_chat_input_maybe: @ 811A4F0
 	push {r4,r5,lr}
 	movs r5, 0x3
 	ldr r0, =0x020375e0
@@ -518404,7 +518404,7 @@ _0811A7D4:
 	thumb_func_end easy_chat_input_maybe
 
 	thumb_func_start sub_811A7E4
-sub_811A7E4: ; 811A7E4
+sub_811A7E4: @ 811A7E4
 	push {lr}
 	bl fade_and_return_progress_probably
 	ldr r0, =0x030022c0
@@ -518455,7 +518455,7 @@ _0811A84E:
 	thumb_func_end sub_811A7E4
 
 	thumb_func_start sub_811A858
-sub_811A858: ; 811A858
+sub_811A858: @ 811A858
 	push {lr}
 	ldr r0, =sub_811A7E4
 	bl SetMainCallback2
@@ -518465,7 +518465,7 @@ sub_811A858: ; 811A858
 	thumb_func_end sub_811A858
 
 	thumb_func_start sub_811A868
-sub_811A868: ; 811A868
+sub_811A868: @ 811A868
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -518488,7 +518488,7 @@ _0811A884:
 	thumb_func_end sub_811A868
 
 	thumb_func_start sub_811A88C
-sub_811A88C: ; 811A88C
+sub_811A88C: @ 811A88C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -518503,7 +518503,7 @@ sub_811A88C: ; 811A88C
 	thumb_func_end sub_811A88C
 
 	thumb_func_start sub_811A8A4
-sub_811A8A4: ; 811A8A4
+sub_811A8A4: @ 811A8A4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -518523,7 +518523,7 @@ sub_811A8A4: ; 811A8A4
 	thumb_func_end sub_811A8A4
 
 	thumb_func_start sub_811A8CC
-sub_811A8CC: ; 811A8CC
+sub_811A8CC: @ 811A8CC
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -518539,7 +518539,7 @@ sub_811A8CC: ; 811A8CC
 	thumb_func_end sub_811A8CC
 
 	thumb_func_start sub_811A8F0
-sub_811A8F0: ; 811A8F0
+sub_811A8F0: @ 811A8F0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -518555,7 +518555,7 @@ sub_811A8F0: ; 811A8F0
 	thumb_func_end sub_811A8F0
 
 	thumb_func_start sub_811A914
-sub_811A914: ; 811A914
+sub_811A914: @ 811A914
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -518571,7 +518571,7 @@ sub_811A914: ; 811A914
 	thumb_func_end sub_811A914
 
 	thumb_func_start sub_811A938
-sub_811A938: ; 811A938
+sub_811A938: @ 811A938
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -518587,7 +518587,7 @@ sub_811A938: ; 811A938
 	thumb_func_end sub_811A938
 
 	thumb_func_start sub_811A95C
-sub_811A95C: ; 811A95C
+sub_811A95C: @ 811A95C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -518740,7 +518740,7 @@ _0811AA7E:
 	thumb_func_end sub_811A95C
 
 	thumb_func_start sub_811AA90
-sub_811AA90: ; 811AA90
+sub_811AA90: @ 811AA90
 	push {r4,lr}
 	ldr r4, =0x0203a118
 	ldr r0, [r4]
@@ -518757,7 +518757,7 @@ _0811AAA2:
 	thumb_func_end sub_811AA90
 
 	thumb_func_start sub_811AAAC
-sub_811AAAC: ; 811AAAC
+sub_811AAAC: @ 811AAAC
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -518827,7 +518827,7 @@ _0811AB40:
 	thumb_func_end sub_811AAAC
 
 	thumb_func_start sub_811AB44
-sub_811AB44: ; 811AB44
+sub_811AB44: @ 811AB44
 	push {lr}
 	bl sub_811BA68
 	lsls r0, 24
@@ -518851,7 +518851,7 @@ _0811AB64:
 	thumb_func_end sub_811AB44
 
 	thumb_func_start sub_811AB68
-sub_811AB68: ; 811AB68
+sub_811AB68: @ 811AB68
 	push {r4-r7,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -519041,7 +519041,7 @@ _0811ACCC:
 	thumb_func_end sub_811AB68
 
 	thumb_func_start sub_811ACDC
-sub_811ACDC: ; 811ACDC
+sub_811ACDC: @ 811ACDC
 	push {r4-r6,lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x2E]
@@ -519223,7 +519223,7 @@ _0811AE32:
 	thumb_func_end sub_811ACDC
 
 	thumb_func_start sub_811AE44
-sub_811AE44: ; 811AE44
+sub_811AE44: @ 811AE44
 	push {lr}
 	ldr r1, =0x030022c0
 	ldrh r2, [r1, 0x2E]
@@ -519324,7 +519324,7 @@ _0811AEFA:
 	thumb_func_end sub_811AE44
 
 	thumb_func_start sub_811AF00
-sub_811AF00: ; 811AF00
+sub_811AF00: @ 811AF00
 	push {lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x2E]
@@ -519402,7 +519402,7 @@ _0811AF86:
 	thumb_func_end sub_811AF00
 
 	thumb_func_start sub_811AF8C
-sub_811AF8C: ; 811AF8C
+sub_811AF8C: @ 811AF8C
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -519451,7 +519451,7 @@ _0811AFE6:
 	thumb_func_end sub_811AF8C
 
 	thumb_func_start sub_811AFEC
-sub_811AFEC: ; 811AFEC
+sub_811AFEC: @ 811AFEC
 	push {r4,lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -519494,7 +519494,7 @@ _0811B03A:
 	thumb_func_end sub_811AFEC
 
 	thumb_func_start sub_811B040
-sub_811B040: ; 811B040
+sub_811B040: @ 811B040
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -519536,7 +519536,7 @@ _0811B086:
 	thumb_func_end sub_811B040
 
 	thumb_func_start sub_811B08C
-sub_811B08C: ; 811B08C
+sub_811B08C: @ 811B08C
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -519564,7 +519564,7 @@ _0811B0B8:
 	thumb_func_end sub_811B08C
 
 	thumb_func_start sub_811B0BC
-sub_811B0BC: ; 811B0BC
+sub_811B0BC: @ 811B0BC
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -519588,7 +519588,7 @@ _0811B0E0:
 	thumb_func_end sub_811B0BC
 
 	thumb_func_start sub_811B0E8
-sub_811B0E8: ; 811B0E8
+sub_811B0E8: @ 811B0E8
 	ldr r0, =0x0203a118
 	ldr r1, [r0]
 	movs r0, 0xA
@@ -519599,7 +519599,7 @@ sub_811B0E8: ; 811B0E8
 	thumb_func_end sub_811B0E8
 
 	thumb_func_start sub_811B0F8
-sub_811B0F8: ; 811B0F8
+sub_811B0F8: @ 811B0F8
 	push {r4,lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -519645,7 +519645,7 @@ _0811B14A:
 	thumb_func_end sub_811B0F8
 
 	thumb_func_start sub_811B150
-sub_811B150: ; 811B150
+sub_811B150: @ 811B150
 	push {lr}
 	ldr r1, =0x0203a118
 	ldr r2, [r1]
@@ -519676,7 +519676,7 @@ _0811B180:
 	thumb_func_end sub_811B150
 
 	thumb_func_start sub_811B184
-sub_811B184: ; 811B184
+sub_811B184: @ 811B184
 	push {lr}
 	ldr r2, =0x0203a118
 	ldr r0, [r2]
@@ -519704,7 +519704,7 @@ _0811B1AE:
 	thumb_func_end sub_811B184
 
 	thumb_func_start sub_811B1B4
-sub_811B1B4: ; 811B1B4
+sub_811B1B4: @ 811B1B4
 	push {r4,lr}
 	ldr r4, =0x0203a118
 	ldr r1, [r4]
@@ -519799,7 +519799,7 @@ _0811B25C:
 	thumb_func_end sub_811B1B4
 
 	thumb_func_start sub_811B264
-sub_811B264: ; 811B264
+sub_811B264: @ 811B264
 	push {lr}
 	ldr r2, =0x0203a118
 	ldr r1, [r2]
@@ -519838,7 +519838,7 @@ _0811B2A0:
 	thumb_func_end sub_811B264
 
 	thumb_func_start sub_811B2A4
-sub_811B2A4: ; 811B2A4
+sub_811B2A4: @ 811B2A4
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x8]
@@ -519847,7 +519847,7 @@ sub_811B2A4: ; 811B2A4
 	thumb_func_end sub_811B2A4
 
 	thumb_func_start sub_811B2B0
-sub_811B2B0: ; 811B2B0
+sub_811B2B0: @ 811B2B0
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -519906,7 +519906,7 @@ _0811B326:
 	thumb_func_end sub_811B2B0
 
 	thumb_func_start sub_811B32C
-sub_811B32C: ; 811B32C
+sub_811B32C: @ 811B32C
 	ldr r0, =0x0203a118
 	ldr r1, [r0]
 	movs r0, 0
@@ -519917,7 +519917,7 @@ sub_811B32C: ; 811B32C
 	thumb_func_end sub_811B32C
 
 	thumb_func_start sub_811B33C
-sub_811B33C: ; 811B33C
+sub_811B33C: @ 811B33C
 	push {lr}
 	ldr r1, =0x0203a118
 	ldr r0, [r1]
@@ -519944,7 +519944,7 @@ _0811B362:
 	thumb_func_end sub_811B33C
 
 	thumb_func_start sub_811B368
-sub_811B368: ; 811B368
+sub_811B368: @ 811B368
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -519966,7 +519966,7 @@ _0811B390:
 	thumb_func_end sub_811B368
 
 	thumb_func_start sub_811B394
-sub_811B394: ; 811B394
+sub_811B394: @ 811B394
 	push {r4,r5,lr}
 	bl sub_811B940
 	lsls r0, 16
@@ -520006,7 +520006,7 @@ _0811B3DC:
 	thumb_func_end sub_811B394
 
 	thumb_func_start sub_811B3E4
-sub_811B3E4: ; 811B3E4
+sub_811B3E4: @ 811B3E4
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r3, =0x0203a118
@@ -520037,7 +520037,7 @@ _0811B40E:
 	thumb_func_end sub_811B3E4
 
 	thumb_func_start sub_811B418
-sub_811B418: ; 811B418
+sub_811B418: @ 811B418
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r2, =0x0203a118
@@ -520069,7 +520069,7 @@ _0811B444:
 	thumb_func_end sub_811B418
 
 	thumb_func_start sub_811B454
-sub_811B454: ; 811B454
+sub_811B454: @ 811B454
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r3, =0x0203a118
@@ -520100,7 +520100,7 @@ _0811B47E:
 	thumb_func_end sub_811B454
 
 	thumb_func_start sub_811B488
-sub_811B488: ; 811B488
+sub_811B488: @ 811B488
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -520120,7 +520120,7 @@ sub_811B488: ; 811B488
 	thumb_func_end sub_811B488
 
 	thumb_func_start sub_811B4AC
-sub_811B4AC: ; 811B4AC
+sub_811B4AC: @ 811B4AC
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r0, =0x0203a118
@@ -520158,7 +520158,7 @@ _0811B4E4:
 	thumb_func_end sub_811B4AC
 
 	thumb_func_start sub_811B4EC
-sub_811B4EC: ; 811B4EC
+sub_811B4EC: @ 811B4EC
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -520191,7 +520191,7 @@ _0811B524:
 	thumb_func_end sub_811B4EC
 
 	thumb_func_start sub_811B528
-sub_811B528: ; 811B528
+sub_811B528: @ 811B528
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a118
@@ -520224,7 +520224,7 @@ _0811B55E:
 	thumb_func_end sub_811B528
 
 	thumb_func_start sub_811B568
-sub_811B568: ; 811B568
+sub_811B568: @ 811B568
 	push {r4,lr}
 	cmp r0, 0x1
 	beq _0811B5DE
@@ -520330,7 +520330,7 @@ _0811B62C:
 	thumb_func_end sub_811B568
 
 	thumb_func_start sub_811B634
-sub_811B634: ; 811B634
+sub_811B634: @ 811B634
 	push {lr}
 	cmp r0, 0x1
 	beq _0811B6A0
@@ -520408,7 +520408,7 @@ _0811B6BC:
 	thumb_func_end sub_811B634
 
 	thumb_func_start sub_811B6C4
-sub_811B6C4: ; 811B6C4
+sub_811B6C4: @ 811B6C4
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0x1
@@ -520477,7 +520477,7 @@ _0811B73A:
 	thumb_func_end sub_811B6C4
 
 	thumb_func_start sub_811B744
-sub_811B744: ; 811B744
+sub_811B744: @ 811B744
 	push {lr}
 	ldr r2, =0x0203a118
 	ldr r1, [r2]
@@ -520498,7 +520498,7 @@ _0811B75E:
 	thumb_func_end sub_811B744
 
 	thumb_func_start sub_811B768
-sub_811B768: ; 811B768
+sub_811B768: @ 811B768
 	push {r4,lr}
 	ldr r4, =0x0203a118
 	ldr r1, [r4]
@@ -520522,7 +520522,7 @@ _0811B78E:
 	thumb_func_end sub_811B768
 
 	thumb_func_start sub_811B794
-sub_811B794: ; 811B794
+sub_811B794: @ 811B794
 	push {r4,lr}
 	cmp r0, 0x5
 	bls _0811B79C
@@ -520685,7 +520685,7 @@ _0811B8C2:
 	thumb_func_end sub_811B794
 
 	thumb_func_start sub_811B8C8
-sub_811B8C8: ; 811B8C8
+sub_811B8C8: @ 811B8C8
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	movs r2, 0x6
@@ -520703,7 +520703,7 @@ sub_811B8C8: ; 811B8C8
 	thumb_func_end sub_811B8C8
 
 	thumb_func_start sub_811B8E8
-sub_811B8E8: ; 811B8E8
+sub_811B8E8: @ 811B8E8
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	movs r1, 0xB
@@ -520722,7 +520722,7 @@ sub_811B8E8: ; 811B8E8
 	thumb_func_end sub_811B8E8
 
 	thumb_func_start sub_811B908
-sub_811B908: ; 811B908
+sub_811B908: @ 811B908
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r1, [r0]
@@ -520752,7 +520752,7 @@ _0811B926:
 	thumb_func_end sub_811B908
 
 	thumb_func_start sub_811B940
-sub_811B940: ; 811B940
+sub_811B940: @ 811B940
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	movs r1, 0x11
@@ -520771,7 +520771,7 @@ sub_811B940: ; 811B940
 	thumb_func_end sub_811B940
 
 	thumb_func_start sub_811B960
-sub_811B960: ; 811B960
+sub_811B960: @ 811B960
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -520790,7 +520790,7 @@ _0811B974:
 	thumb_func_end sub_811B960
 
 	thumb_func_start sub_811B978
-sub_811B978: ; 811B978
+sub_811B978: @ 811B978
 	push {lr}
 	b _0811B98E
 _0811B97C:
@@ -520815,7 +520815,7 @@ _0811B998:
 	thumb_func_end sub_811B978
 
 	thumb_func_start sub_811B9A0
-sub_811B9A0: ; 811B9A0
+sub_811B9A0: @ 811B9A0
 	push {lr}
 	b _0811B9B6
 _0811B9A4:
@@ -520840,7 +520840,7 @@ _0811B9C0:
 	thumb_func_end sub_811B9A0
 
 	thumb_func_start sub_811B9C8
-sub_811B9C8: ; 811B9C8
+sub_811B9C8: @ 811B9C8
 	push {r4,lr}
 	ldr r4, =0x0203a118
 	ldr r1, [r4]
@@ -520884,7 +520884,7 @@ _0811BA14:
 	thumb_func_end sub_811B9C8
 
 	thumb_func_start sub_811BA1C
-sub_811BA1C: ; 811BA1C
+sub_811BA1C: @ 811BA1C
 	push {r4,lr}
 	bl sub_811B940
 	adds r4, r0, 0
@@ -520903,7 +520903,7 @@ _0811BA34:
 	thumb_func_end sub_811BA1C
 
 	thumb_func_start sub_811BA3C
-sub_811BA3C: ; 811BA3C
+sub_811BA3C: @ 811BA3C
 	ldr r2, =gUnknown_08597550
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -520919,7 +520919,7 @@ sub_811BA3C: ; 811BA3C
 	thumb_func_end sub_811BA3C
 
 	thumb_func_start sub_811BA5C
-sub_811BA5C: ; 811BA5C
+sub_811BA5C: @ 811BA5C
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0]
@@ -520928,7 +520928,7 @@ sub_811BA5C: ; 811BA5C
 	thumb_func_end sub_811BA5C
 
 	thumb_func_start sub_811BA68
-sub_811BA68: ; 811BA68
+sub_811BA68: @ 811BA68
 	ldr r2, =gUnknown_08597550
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -520945,7 +520945,7 @@ sub_811BA68: ; 811BA68
 	thumb_func_end sub_811BA68
 
 	thumb_func_start sub_811BA88
-sub_811BA88: ; 811BA88
+sub_811BA88: @ 811BA88
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldr r0, [r0, 0x34]
@@ -520954,7 +520954,7 @@ sub_811BA88: ; 811BA88
 	thumb_func_end sub_811BA88
 
 	thumb_func_start sub_811BA94
-sub_811BA94: ; 811BA94
+sub_811BA94: @ 811BA94
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	adds r0, 0x3C
@@ -520963,7 +520963,7 @@ sub_811BA94: ; 811BA94
 	thumb_func_end sub_811BA94
 
 	thumb_func_start sub_811BAA0
-sub_811BAA0: ; 811BAA0
+sub_811BAA0: @ 811BAA0
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x3]
@@ -520972,7 +520972,7 @@ sub_811BAA0: ; 811BAA0
 	thumb_func_end sub_811BAA0
 
 	thumb_func_start sub_811BAAC
-sub_811BAAC: ; 811BAAC
+sub_811BAAC: @ 811BAAC
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x2]
@@ -520981,7 +520981,7 @@ sub_811BAAC: ; 811BAAC
 	thumb_func_end sub_811BAAC
 
 	thumb_func_start sub_811BAB8
-sub_811BAB8: ; 811BAB8
+sub_811BAB8: @ 811BAB8
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x5]
@@ -520990,7 +520990,7 @@ sub_811BAB8: ; 811BAB8
 	thumb_func_end sub_811BAB8
 
 	thumb_func_start sub_811BAC4
-sub_811BAC4: ; 811BAC4
+sub_811BAC4: @ 811BAC4
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x6]
@@ -520999,7 +520999,7 @@ sub_811BAC4: ; 811BAC4
 	thumb_func_end sub_811BAC4
 
 	thumb_func_start sub_811BAD0
-sub_811BAD0: ; 811BAD0
+sub_811BAD0: @ 811BAD0
 	push {r4,r5,lr}
 	ldr r4, =gUnknown_08597550
 	ldr r2, =0x0203a118
@@ -521028,7 +521028,7 @@ sub_811BAD0: ; 811BAD0
 	thumb_func_end sub_811BAD0
 
 	thumb_func_start sub_811BB08
-sub_811BB08: ; 811BB08
+sub_811BB08: @ 811BB08
 	push {r4,r5,lr}
 	ldr r4, =gUnknown_08597550
 	ldr r2, =0x0203a118
@@ -521057,7 +521057,7 @@ sub_811BB08: ; 811BB08
 	thumb_func_end sub_811BB08
 
 	thumb_func_start sub_811BB40
-sub_811BB40: ; 811BB40
+sub_811BB40: @ 811BB40
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a118
@@ -521093,7 +521093,7 @@ _0811BB7E:
 	thumb_func_end sub_811BB40
 
 	thumb_func_start sub_811BB88
-sub_811BB88: ; 811BB88
+sub_811BB88: @ 811BB88
 	ldr r2, =gUnknown_085EC410
 	str r2, [r0]
 	ldr r0, =gUnknown_085EC42F
@@ -521103,7 +521103,7 @@ sub_811BB88: ; 811BB88
 	thumb_func_end sub_811BB88
 
 	thumb_func_start sub_811BB9C
-sub_811BB9C: ; 811BB9C
+sub_811BB9C: @ 811BB9C
 	ldr r2, =0x0203a118
 	ldr r3, [r2]
 	ldrb r2, [r3, 0xA]
@@ -521115,7 +521115,7 @@ sub_811BB9C: ; 811BB9C
 	thumb_func_end sub_811BB9C
 
 	thumb_func_start sub_811BBB0
-sub_811BBB0: ; 811BBB0
+sub_811BBB0: @ 811BBB0
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x9]
@@ -521124,7 +521124,7 @@ sub_811BBB0: ; 811BBB0
 	thumb_func_end sub_811BBB0
 
 	thumb_func_start sub_811BBBC
-sub_811BBBC: ; 811BBBC
+sub_811BBBC: @ 811BBBC
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0xC]
@@ -521133,7 +521133,7 @@ sub_811BBBC: ; 811BBBC
 	thumb_func_end sub_811BBBC
 
 	thumb_func_start sub_811BBC8
-sub_811BBC8: ; 811BBC8
+sub_811BBC8: @ 811BBC8
 	ldr r2, =0x0203a118
 	ldr r3, [r2]
 	ldrb r2, [r3, 0x10]
@@ -521145,7 +521145,7 @@ sub_811BBC8: ; 811BBC8
 	thumb_func_end sub_811BBC8
 
 	thumb_func_start sub_811BBDC
-sub_811BBDC: ; 811BBDC
+sub_811BBDC: @ 811BBDC
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0xE]
@@ -521154,7 +521154,7 @@ sub_811BBDC: ; 811BBDC
 	thumb_func_end sub_811BBDC
 
 	thumb_func_start sub_811BBE8
-sub_811BBE8: ; 811BBE8
+sub_811BBE8: @ 811BBE8
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0xF]
@@ -521163,13 +521163,13 @@ sub_811BBE8: ; 811BBE8
 	thumb_func_end sub_811BBE8
 
 	thumb_func_start sub_811BBF4
-sub_811BBF4: ; 811BBF4
+sub_811BBF4: @ 811BBF4
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_811BBF4
 
 	thumb_func_start sub_811BBF8
-sub_811BBF8: ; 811BBF8
+sub_811BBF8: @ 811BBF8
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r1, [r0]
@@ -521201,7 +521201,7 @@ _0811BC26:
 	thumb_func_end sub_811BBF8
 
 	thumb_func_start sub_811BC2C
-sub_811BC2C: ; 811BC2C
+sub_811BC2C: @ 811BC2C
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r2, [r0]
@@ -521240,7 +521240,7 @@ _0811BC6A:
 	thumb_func_end sub_811BC2C
 
 	thumb_func_start sub_811BC70
-sub_811BC70: ; 811BC70
+sub_811BC70: @ 811BC70
 	push {lr}
 	bl sub_811BA3C
 	pop {r1}
@@ -521248,7 +521248,7 @@ sub_811BC70: ; 811BC70
 	thumb_func_end sub_811BC70
 
 	thumb_func_start sub_811BC7C
-sub_811BC7C: ; 811BC7C
+sub_811BC7C: @ 811BC7C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -521286,7 +521286,7 @@ _0811BCB4:
 	thumb_func_end sub_811BC7C
 
 	thumb_func_start sub_811BCBC
-sub_811BCBC: ; 811BCBC
+sub_811BCBC: @ 811BCBC
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x12]
@@ -521295,7 +521295,7 @@ sub_811BCBC: ; 811BCBC
 	thumb_func_end sub_811BCBC
 
 	thumb_func_start sub_811BCC8
-sub_811BCC8: ; 811BCC8
+sub_811BCC8: @ 811BCC8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -521321,7 +521321,7 @@ _0811BCEE:
 	thumb_func_end sub_811BCC8
 
 	thumb_func_start sub_811BCF4
-sub_811BCF4: ; 811BCF4
+sub_811BCF4: @ 811BCF4
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x0203a118
@@ -521354,7 +521354,7 @@ _0811BD26:
 	thumb_func_end sub_811BCF4
 
 	thumb_func_start sub_811BD2C
-sub_811BD2C: ; 811BD2C
+sub_811BD2C: @ 811BD2C
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x0203a118
@@ -521387,7 +521387,7 @@ _0811BD5E:
 	thumb_func_end sub_811BD2C
 
 	thumb_func_start sub_811BD64
-sub_811BD64: ; 811BD64
+sub_811BD64: @ 811BD64
 	push {r4,lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -521424,7 +521424,7 @@ _0811BD9C:
 	thumb_func_end sub_811BD64
 
 	thumb_func_start sub_811BDB0
-sub_811BDB0: ; 811BDB0
+sub_811BDB0: @ 811BDB0
 	push {lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -521454,7 +521454,7 @@ _0811BDDE:
 	thumb_func_end sub_811BDB0
 
 	thumb_func_start sub_811BDF0
-sub_811BDF0: ; 811BDF0
+sub_811BDF0: @ 811BDF0
 	push {r4-r6,lr}
 	sub sp, 0x20
 	adds r6, r0, 0
@@ -521495,7 +521495,7 @@ _0811BE3C:
 	thumb_func_end sub_811BDF0
 
 	thumb_func_start sub_811BE54
-sub_811BE54: ; 811BE54
+sub_811BE54: @ 811BE54
 	push {r4,r5,lr}
 	ldr r0, =0x0203a118
 	ldr r0, [r0]
@@ -521532,7 +521532,7 @@ _0811BE86:
 	thumb_func_end sub_811BE54
 
 	thumb_func_start sub_811BE9C
-sub_811BE9C: ; 811BE9C
+sub_811BE9C: @ 811BE9C
 	push {r4,r5,lr}
 	ldr r5, =0x0203a118
 	ldr r0, [r5]
@@ -521594,7 +521594,7 @@ _0811BF14:
 	thumb_func_end sub_811BE9C
 
 	thumb_func_start sub_811BF20
-sub_811BF20: ; 811BF20
+sub_811BF20: @ 811BF20
 	push {lr}
 	ldr r0, =gUnknown_08597764
 	movs r1, 0x4
@@ -521612,7 +521612,7 @@ _0811BF34:
 	thumb_func_end sub_811BF20
 
 	thumb_func_start sub_811BF40
-sub_811BF40: ; 811BF40
+sub_811BF40: @ 811BF40
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0x80
@@ -521644,7 +521644,7 @@ _0811BF72:
 	thumb_func_end sub_811BF40
 
 	thumb_func_start sub_811BF78
-sub_811BF78: ; 811BF78
+sub_811BF78: @ 811BF78
 	ldr r0, =0x0203a118
 	ldr r1, [r0]
 	movs r0, 0
@@ -521654,13 +521654,13 @@ sub_811BF78: ; 811BF78
 	thumb_func_end sub_811BF78
 
 	thumb_func_start sub_811BF88
-sub_811BF88: ; 811BF88
+sub_811BF88: @ 811BF88
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_811BF88
 
 	thumb_func_start sub_811BF8C
-sub_811BF8C: ; 811BF8C
+sub_811BF8C: @ 811BF8C
 	push {lr}
 	bl sub_811CE94
 	lsls r0, 24
@@ -521676,7 +521676,7 @@ _0811BF9E:
 	thumb_func_end sub_811BF8C
 
 	thumb_func_start sub_811BFA4
-sub_811BFA4: ; 811BFA4
+sub_811BFA4: @ 811BFA4
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203a11c
@@ -521835,7 +521835,7 @@ _0811C130:
 	thumb_func_end sub_811BFA4
 
 	thumb_func_start sub_811C13C
-sub_811C13C: ; 811C13C
+sub_811C13C: @ 811C13C
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -521852,7 +521852,7 @@ _0811C14E:
 	thumb_func_end sub_811C13C
 
 	thumb_func_start sub_811C158
-sub_811C158: ; 811C158
+sub_811C158: @ 811C158
 	push {lr}
 	ldr r1, =0x0203a11c
 	ldr r1, [r1]
@@ -521866,7 +521866,7 @@ sub_811C158: ; 811C158
 	thumb_func_end sub_811C158
 
 	thumb_func_start sub_811C170
-sub_811C170: ; 811C170
+sub_811C170: @ 811C170
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522016,7 +522016,7 @@ _0811C2D0:
 	thumb_func_end sub_811C170
 
 	thumb_func_start sub_811C2D4
-sub_811C2D4: ; 811C2D4
+sub_811C2D4: @ 811C2D4
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522048,7 +522048,7 @@ _0811C306:
 	thumb_func_end sub_811C2D4
 
 	thumb_func_start sub_811C30C
-sub_811C30C: ; 811C30C
+sub_811C30C: @ 811C30C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -522151,7 +522151,7 @@ _0811C3AA:
 	thumb_func_end sub_811C30C
 
 	thumb_func_start sub_811C3E4
-sub_811C3E4: ; 811C3E4
+sub_811C3E4: @ 811C3E4
 	push {lr}
 	bl sub_811BAB8
 	lsls r0, 24
@@ -522167,7 +522167,7 @@ sub_811C3E4: ; 811C3E4
 	thumb_func_end sub_811C3E4
 
 	thumb_func_start sub_811C404
-sub_811C404: ; 811C404
+sub_811C404: @ 811C404
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522203,7 +522203,7 @@ _0811C442:
 	thumb_func_end sub_811C404
 
 	thumb_func_start sub_811C448
-sub_811C448: ; 811C448
+sub_811C448: @ 811C448
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522239,7 +522239,7 @@ _0811C486:
 	thumb_func_end sub_811C448
 
 	thumb_func_start sub_811C48C
-sub_811C48C: ; 811C48C
+sub_811C48C: @ 811C48C
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522275,7 +522275,7 @@ _0811C4CA:
 	thumb_func_end sub_811C48C
 
 	thumb_func_start sub_811C4D0
-sub_811C4D0: ; 811C4D0
+sub_811C4D0: @ 811C4D0
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522312,7 +522312,7 @@ _0811C512:
 	thumb_func_end sub_811C4D0
 
 	thumb_func_start sub_811C518
-sub_811C518: ; 811C518
+sub_811C518: @ 811C518
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522344,7 +522344,7 @@ _0811C54E:
 	thumb_func_end sub_811C518
 
 	thumb_func_start sub_811C554
-sub_811C554: ; 811C554
+sub_811C554: @ 811C554
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522433,7 +522433,7 @@ _0811C61A:
 	thumb_func_end sub_811C554
 
 	thumb_func_start sub_811C620
-sub_811C620: ; 811C620
+sub_811C620: @ 811C620
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522505,7 +522505,7 @@ _0811C6BA:
 	thumb_func_end sub_811C620
 
 	thumb_func_start sub_811C6C0
-sub_811C6C0: ; 811C6C0
+sub_811C6C0: @ 811C6C0
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522587,7 +522587,7 @@ _0811C77A:
 	thumb_func_end sub_811C6C0
 
 	thumb_func_start sub_811C780
-sub_811C780: ; 811C780
+sub_811C780: @ 811C780
 	push {lr}
 	bl sub_811E088
 	movs r0, 0
@@ -522596,7 +522596,7 @@ sub_811C780: ; 811C780
 	thumb_func_end sub_811C780
 
 	thumb_func_start sub_811C78C
-sub_811C78C: ; 811C78C
+sub_811C78C: @ 811C78C
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522633,7 +522633,7 @@ _0811C7CC:
 	thumb_func_end sub_811C78C
 
 	thumb_func_start sub_811C7D4
-sub_811C7D4: ; 811C7D4
+sub_811C7D4: @ 811C7D4
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -522683,7 +522683,7 @@ _0811C82A:
 	thumb_func_end sub_811C7D4
 
 	thumb_func_start sub_811C830
-sub_811C830: ; 811C830
+sub_811C830: @ 811C830
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522766,7 +522766,7 @@ _0811C8EA:
 	thumb_func_end sub_811C830
 
 	thumb_func_start sub_811C8F0
-sub_811C8F0: ; 811C8F0
+sub_811C8F0: @ 811C8F0
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522842,7 +522842,7 @@ _0811C996:
 	thumb_func_end sub_811C8F0
 
 	thumb_func_start sub_811C99C
-sub_811C99C: ; 811C99C
+sub_811C99C: @ 811C99C
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -522927,7 +522927,7 @@ _0811CA56:
 	thumb_func_end sub_811C99C
 
 	thumb_func_start sub_811CA5C
-sub_811CA5C: ; 811CA5C
+sub_811CA5C: @ 811CA5C
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -523007,7 +523007,7 @@ _0811CB12:
 	thumb_func_end sub_811CA5C
 
 	thumb_func_start sub_811CB18
-sub_811CB18: ; 811CB18
+sub_811CB18: @ 811CB18
 	push {lr}
 	bl sub_811E30C
 	movs r0, 0
@@ -523016,7 +523016,7 @@ sub_811CB18: ; 811CB18
 	thumb_func_end sub_811CB18
 
 	thumb_func_start sub_811CB24
-sub_811CB24: ; 811CB24
+sub_811CB24: @ 811CB24
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523076,7 +523076,7 @@ _0811CB90:
 	thumb_func_end sub_811CB24
 
 	thumb_func_start sub_811CB98
-sub_811CB98: ; 811CB98
+sub_811CB98: @ 811CB98
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523136,7 +523136,7 @@ _0811CC02:
 	thumb_func_end sub_811CB98
 
 	thumb_func_start sub_811CC08
-sub_811CC08: ; 811CC08
+sub_811CC08: @ 811CC08
 	push {r4,r5,lr}
 	ldr r5, =0x0203a11c
 	ldr r0, [r5]
@@ -523204,7 +523204,7 @@ _0811CC88:
 	thumb_func_end sub_811CC08
 
 	thumb_func_start sub_811CC90
-sub_811CC90: ; 811CC90
+sub_811CC90: @ 811CC90
 	push {r4,r5,lr}
 	ldr r5, =0x0203a11c
 	ldr r0, [r5]
@@ -523271,7 +523271,7 @@ _0811CD0C:
 	thumb_func_end sub_811CC90
 
 	thumb_func_start sub_811CD14
-sub_811CD14: ; 811CD14
+sub_811CD14: @ 811CD14
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523305,7 +523305,7 @@ _0811CD4C:
 	thumb_func_end sub_811CD14
 
 	thumb_func_start sub_811CD54
-sub_811CD54: ; 811CD54
+sub_811CD54: @ 811CD54
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523339,7 +523339,7 @@ _0811CD8C:
 	thumb_func_end sub_811CD54
 
 	thumb_func_start sub_811CD94
-sub_811CD94: ; 811CD94
+sub_811CD94: @ 811CD94
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523373,7 +523373,7 @@ _0811CDCC:
 	thumb_func_end sub_811CD94
 
 	thumb_func_start sub_811CDD4
-sub_811CDD4: ; 811CDD4
+sub_811CDD4: @ 811CDD4
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523407,7 +523407,7 @@ _0811CE0C:
 	thumb_func_end sub_811CDD4
 
 	thumb_func_start sub_811CE14
-sub_811CE14: ; 811CE14
+sub_811CE14: @ 811CE14
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523441,7 +523441,7 @@ _0811CE4C:
 	thumb_func_end sub_811CE14
 
 	thumb_func_start sub_811CE54
-sub_811CE54: ; 811CE54
+sub_811CE54: @ 811CE54
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -523475,7 +523475,7 @@ _0811CE8C:
 	thumb_func_end sub_811CE54
 
 	thumb_func_start sub_811CE94
-sub_811CE94: ; 811CE94
+sub_811CE94: @ 811CE94
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	movs r0, 0x98
@@ -523533,7 +523533,7 @@ _0811CEFE:
 	thumb_func_end sub_811CE94
 
 	thumb_func_start sub_811CF04
-sub_811CF04: ; 811CF04
+sub_811CF04: @ 811CF04
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0
@@ -523576,7 +523576,7 @@ sub_811CF04: ; 811CF04
 	thumb_func_end sub_811CF04
 
 	thumb_func_start sub_811CF64
-sub_811CF64: ; 811CF64
+sub_811CF64: @ 811CF64
 	push {r4,lr}
 	bl sub_80A1A74
 	ldr r0, =gUnknown_08DCBDB0
@@ -523615,7 +523615,7 @@ sub_811CF64: ; 811CF64
 	thumb_func_end sub_811CF64
 
 	thumb_func_start sub_811CFCC
-sub_811CFCC: ; 811CFCC
+sub_811CFCC: @ 811CFCC
 	push {r4,r5,lr}
 	sub sp, 0x14
 	bl sub_811BA88
@@ -523660,7 +523660,7 @@ _0811D020:
 	thumb_func_end sub_811CFCC
 
 	thumb_func_start sub_811D028
-sub_811D028: ; 811D028
+sub_811D028: @ 811D028
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r4, [sp, 0x1C]
@@ -523687,7 +523687,7 @@ sub_811D028: ; 811D028
 	thumb_func_end sub_811D028
 
 	thumb_func_start sub_811D058
-sub_811D058: ; 811D058
+sub_811D058: @ 811D058
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -523740,7 +523740,7 @@ sub_811D058: ; 811D058
 	thumb_func_end sub_811D058
 
 	thumb_func_start sub_811D0BC
-sub_811D0BC: ; 811D0BC
+sub_811D0BC: @ 811D0BC
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x20
@@ -523774,7 +523774,7 @@ sub_811D0BC: ; 811D0BC
 	thumb_func_end sub_811D0BC
 
 	thumb_func_start sub_811D104
-sub_811D104: ; 811D104
+sub_811D104: @ 811D104
 	push {lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -523896,7 +523896,7 @@ _0811D1FC:
 	thumb_func_end sub_811D104
 
 	thumb_func_start sub_811D214
-sub_811D214: ; 811D214
+sub_811D214: @ 811D214
 	push {lr}
 	adds r3, r0, 0
 	lsls r3, 24
@@ -523911,7 +523911,7 @@ sub_811D214: ; 811D214
 	thumb_func_end sub_811D214
 
 	thumb_func_start sub_811D230
-sub_811D230: ; 811D230
+sub_811D230: @ 811D230
 	push {r4-r6,lr}
 	sub sp, 0x8
 	bl sub_811BA68
@@ -523974,7 +523974,7 @@ sub_811D230: ; 811D230
 	thumb_func_end sub_811D230
 
 	thumb_func_start sub_811D2C8
-sub_811D2C8: ; 811D2C8
+sub_811D2C8: @ 811D2C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -524145,7 +524145,7 @@ _0811D402:
 	thumb_func_end sub_811D2C8
 
 	thumb_func_start sub_811D424
-sub_811D424: ; 811D424
+sub_811D424: @ 811D424
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -524380,7 +524380,7 @@ _0811D5D6:
 	thumb_func_end sub_811D424
 
 	thumb_func_start sub_811D60C
-sub_811D60C: ; 811D60C
+sub_811D60C: @ 811D60C
 	push {r4,lr}
 	sub sp, 0x8
 	movs r0, 0x3
@@ -524445,7 +524445,7 @@ _0811D67C:
 	thumb_func_end sub_811D60C
 
 	thumb_func_start sub_811D684
-sub_811D684: ; 811D684
+sub_811D684: @ 811D684
 	push {lr}
 	movs r0, 0x2
 	bl PutWindowTilemap
@@ -524456,7 +524456,7 @@ sub_811D684: ; 811D684
 	thumb_func_end sub_811D684
 
 	thumb_func_start sub_811D698
-sub_811D698: ; 811D698
+sub_811D698: @ 811D698
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_811DD84
@@ -524488,7 +524488,7 @@ _0811D6C6:
 	thumb_func_end sub_811D698
 
 	thumb_func_start sub_811D6D4
-sub_811D6D4: ; 811D6D4
+sub_811D6D4: @ 811D6D4
 	push {lr}
 	bl sub_811BBB0
 	lsls r0, 24
@@ -524506,7 +524506,7 @@ _0811D6EE:
 	thumb_func_end sub_811D6D4
 
 	thumb_func_start sub_811D6F4
-sub_811D6F4: ; 811D6F4
+sub_811D6F4: @ 811D6F4
 	push {r4-r7,lr}
 	sub sp, 0xC
 	movs r5, 0
@@ -524558,7 +524558,7 @@ _0811D742:
 	thumb_func_end sub_811D6F4
 
 	thumb_func_start sub_811D758
-sub_811D758: ; 811D758
+sub_811D758: @ 811D758
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r5, 0
@@ -524591,7 +524591,7 @@ _0811D764:
 	thumb_func_end sub_811D758
 
 	thumb_func_start sub_811D794
-sub_811D794: ; 811D794
+sub_811D794: @ 811D794
 	push {lr}
 	movs r0, 0
 	movs r1, 0x4
@@ -524601,7 +524601,7 @@ sub_811D794: ; 811D794
 	thumb_func_end sub_811D794
 
 	thumb_func_start sub_811D7A4
-sub_811D7A4: ; 811D7A4
+sub_811D7A4: @ 811D7A4
 	push {r4,lr}
 	bl sub_811BBDC
 	adds r4, r0, 0
@@ -524620,7 +524620,7 @@ sub_811D7A4: ; 811D7A4
 	thumb_func_end sub_811D7A4
 
 	thumb_func_start sub_811D7C8
-sub_811D7C8: ; 811D7C8
+sub_811D7C8: @ 811D7C8
 	push {r4,lr}
 	bl sub_811BBDC
 	adds r4, r0, 0
@@ -524638,7 +524638,7 @@ sub_811D7C8: ; 811D7C8
 	thumb_func_end sub_811D7C8
 
 	thumb_func_start sub_811D7EC
-sub_811D7EC: ; 811D7EC
+sub_811D7EC: @ 811D7EC
 	push {r4,r5,lr}
 	bl sub_811BBDC
 	lsls r0, 24
@@ -524673,7 +524673,7 @@ _0811D828:
 	thumb_func_end sub_811D7EC
 
 	thumb_func_start sub_811D830
-sub_811D830: ; 811D830
+sub_811D830: @ 811D830
 	push {r4,r5,lr}
 	bl sub_811BBDC
 	lsls r0, 24
@@ -524699,7 +524699,7 @@ _0811D85C:
 	thumb_func_end sub_811D830
 
 	thumb_func_start sub_811D864
-sub_811D864: ; 811D864
+sub_811D864: @ 811D864
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -524815,7 +524815,7 @@ _0811D930:
 	thumb_func_end sub_811D864
 
 	thumb_func_start sub_811D950
-sub_811D950: ; 811D950
+sub_811D950: @ 811D950
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -524867,7 +524867,7 @@ _0811D9AA:
 	thumb_func_end sub_811D950
 
 	thumb_func_start sub_811D9B4
-sub_811D9B4: ; 811D9B4
+sub_811D9B4: @ 811D9B4
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0x11
@@ -524880,7 +524880,7 @@ sub_811D9B4: ; 811D9B4
 	thumb_func_end sub_811D9B4
 
 	thumb_func_start sub_811D9CC
-sub_811D9CC: ; 811D9CC
+sub_811D9CC: @ 811D9CC
 	push {lr}
 	ldr r1, =0x0203a11c
 	cmp r0, 0x6
@@ -524981,7 +524981,7 @@ _0811DA98:
 	thumb_func_end sub_811D9CC
 
 	thumb_func_start sub_811DAA4
-sub_811DAA4: ; 811DAA4
+sub_811DAA4: @ 811DAA4
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r1, [r4]
@@ -525013,7 +525013,7 @@ _0811DAD6:
 	thumb_func_end sub_811DAA4
 
 	thumb_func_start sub_811DADC
-sub_811DADC: ; 811DADC
+sub_811DADC: @ 811DADC
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -525175,7 +525175,7 @@ _0811DC1A:
 	thumb_func_end sub_811DADC
 
 	thumb_func_start sub_811DC28
-sub_811DC28: ; 811DC28
+sub_811DC28: @ 811DC28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -525342,7 +525342,7 @@ _0811DD26:
 	thumb_func_end sub_811DC28
 
 	thumb_func_start sub_811DD84
-sub_811DD84: ; 811DD84
+sub_811DD84: @ 811DD84
 	push {lr}
 	movs r1, 0x80
 	lsls r1, 4
@@ -525361,7 +525361,7 @@ sub_811DD84: ; 811DD84
 	thumb_func_end sub_811DD84
 
 	thumb_func_start sub_811DDAC
-sub_811DDAC: ; 811DDAC
+sub_811DDAC: @ 811DDAC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -525411,7 +525411,7 @@ _0811DE0A:
 	thumb_func_end sub_811DDAC
 
 	thumb_func_start sub_811DE10
-sub_811DE10: ; 811DE10
+sub_811DE10: @ 811DE10
 	push {lr}
 	movs r0, 0x2
 	bl GetBgY
@@ -525441,7 +525441,7 @@ _0811DE42:
 	thumb_func_end sub_811DE10
 
 	thumb_func_start sub_811DE48
-sub_811DE48: ; 811DE48
+sub_811DE48: @ 811DE48
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
 	ldr r1, =0x000002ce
@@ -525452,7 +525452,7 @@ sub_811DE48: ; 811DE48
 	thumb_func_end sub_811DE48
 
 	thumb_func_start sub_811DE5C
-sub_811DE5C: ; 811DE5C
+sub_811DE5C: @ 811DE5C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -525480,7 +525480,7 @@ sub_811DE5C: ; 811DE5C
 	thumb_func_end sub_811DE5C
 
 	thumb_func_start sub_811DE90
-sub_811DE90: ; 811DE90
+sub_811DE90: @ 811DE90
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_08597CA0
 	bl LoadObjectPics
@@ -525502,7 +525502,7 @@ _0811DEA2:
 	thumb_func_end sub_811DE90
 
 	thumb_func_start sub_811DEC4
-sub_811DEC4: ; 811DEC4
+sub_811DEC4: @ 811DEC4
 	push {lr}
 	bl sub_811BA68
 	lsls r0, 24
@@ -525546,7 +525546,7 @@ sub_811DEC4: ; 811DEC4
 	thumb_func_end sub_811DEC4
 
 	thumb_func_start sub_811DF28
-sub_811DF28: ; 811DF28
+sub_811DF28: @ 811DF28
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x30
@@ -525577,7 +525577,7 @@ _0811DF56:
 	thumb_func_end sub_811DF28
 
 	thumb_func_start sub_811DF60
-sub_811DF60: ; 811DF60
+sub_811DF60: @ 811DF60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -525604,7 +525604,7 @@ sub_811DF60: ; 811DF60
 	thumb_func_end sub_811DF60
 
 	thumb_func_start sub_811DF90
-sub_811DF90: ; 811DF90
+sub_811DF90: @ 811DF90
 	ldr r0, =0x0203a11c
 	ldr r1, [r0]
 	movs r0, 0xB6
@@ -525622,7 +525622,7 @@ sub_811DF90: ; 811DF90
 	thumb_func_end sub_811DF90
 
 	thumb_func_start sub_811DFB0
-sub_811DFB0: ; 811DFB0
+sub_811DFB0: @ 811DFB0
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
 	movs r1, 0xB6
@@ -525636,7 +525636,7 @@ sub_811DFB0: ; 811DFB0
 	thumb_func_end sub_811DFB0
 
 	thumb_func_start sub_811DFC8
-sub_811DFC8: ; 811DFC8
+sub_811DFC8: @ 811DFC8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -525697,7 +525697,7 @@ sub_811DFC8: ; 811DFC8
 	thumb_func_end sub_811DFC8
 
 	thumb_func_start sub_811E050
-sub_811E050: ; 811E050
+sub_811E050: @ 811E050
 	push {r4-r6,lr}
 	ldr r5, =0x0203a11c
 	ldr r0, [r5]
@@ -525725,7 +525725,7 @@ sub_811E050: ; 811E050
 	thumb_func_end sub_811E050
 
 	thumb_func_start sub_811E088
-sub_811E088: ; 811E088
+sub_811E088: @ 811E088
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203a11c
@@ -525775,7 +525775,7 @@ _0811E0E4:
 	thumb_func_end sub_811E088
 
 	thumb_func_start sub_811E0EC
-sub_811E0EC: ; 811E0EC
+sub_811E0EC: @ 811E0EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -525866,7 +525866,7 @@ _0811E192:
 	thumb_func_end sub_811E0EC
 
 	thumb_func_start sub_811E1A4
-sub_811E1A4: ; 811E1A4
+sub_811E1A4: @ 811E1A4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -525980,7 +525980,7 @@ _0811E27A:
 	thumb_func_end sub_811E1A4
 
 	thumb_func_start sub_811E288
-sub_811E288: ; 811E288
+sub_811E288: @ 811E288
 	push {lr}
 	ldr r0, =gUnknown_08597D18
 	movs r1, 0
@@ -526016,7 +526016,7 @@ sub_811E288: ; 811E288
 	thumb_func_end sub_811E288
 
 	thumb_func_start sub_811E2DC
-sub_811E2DC: ; 811E2DC
+sub_811E2DC: @ 811E2DC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -526043,7 +526043,7 @@ _0811E302:
 	thumb_func_end sub_811E2DC
 
 	thumb_func_start sub_811E30C
-sub_811E30C: ; 811E30C
+sub_811E30C: @ 811E30C
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -526076,7 +526076,7 @@ sub_811E30C: ; 811E30C
 	thumb_func_end sub_811E30C
 
 	thumb_func_start sub_811E34C
-sub_811E34C: ; 811E34C
+sub_811E34C: @ 811E34C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -526106,7 +526106,7 @@ _0811E376:
 	thumb_func_end sub_811E34C
 
 	thumb_func_start sub_811E380
-sub_811E380: ; 811E380
+sub_811E380: @ 811E380
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r0, [r4]
@@ -526131,7 +526131,7 @@ _0811E3A2:
 	thumb_func_end sub_811E380
 
 	thumb_func_start sub_811E3AC
-sub_811E3AC: ; 811E3AC
+sub_811E3AC: @ 811E3AC
 	push {r4-r6,lr}
 	ldr r0, =gUnknown_08597DF0
 	movs r1, 0xD0
@@ -526178,7 +526178,7 @@ sub_811E3AC: ; 811E3AC
 	thumb_func_end sub_811E3AC
 
 	thumb_func_start sub_811E418
-sub_811E418: ; 811E418
+sub_811E418: @ 811E418
 	push {r4,lr}
 	ldr r4, =0x0203a11c
 	ldr r2, [r4]
@@ -526256,7 +526256,7 @@ _0811E4A6:
 	thumb_func_end sub_811E418
 
 	thumb_func_start sub_811E4AC
-sub_811E4AC: ; 811E4AC
+sub_811E4AC: @ 811E4AC
 	push {lr}
 	ldr r2, =0x0203a11c
 	ldr r1, [r2]
@@ -526275,7 +526275,7 @@ sub_811E4AC: ; 811E4AC
 	thumb_func_end sub_811E4AC
 
 	thumb_func_start sub_811E4D0
-sub_811E4D0: ; 811E4D0
+sub_811E4D0: @ 811E4D0
 	push {r4-r6,lr}
 	ldr r5, =0x0203a11c
 	ldr r3, [r5]
@@ -526349,7 +526349,7 @@ _0811E554:
 	thumb_func_end sub_811E4D0
 
 	thumb_func_start sub_811E55C
-sub_811E55C: ; 811E55C
+sub_811E55C: @ 811E55C
 	push {lr}
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
@@ -526365,7 +526365,7 @@ sub_811E55C: ; 811E55C
 	thumb_func_end sub_811E55C
 
 	thumb_func_start sub_811E578
-sub_811E578: ; 811E578
+sub_811E578: @ 811E578
 	push {lr}
 	bl sub_811BBB0
 	lsls r0, 24
@@ -526397,7 +526397,7 @@ _0811E5AE:
 	thumb_func_end sub_811E578
 
 	thumb_func_start sub_811E5B8
-sub_811E5B8: ; 811E5B8
+sub_811E5B8: @ 811E5B8
 	ldr r0, =0x0203a11c
 	ldr r0, [r0]
 	movs r1, 0xBB
@@ -526414,7 +526414,7 @@ sub_811E5B8: ; 811E5B8
 	thumb_func_end sub_811E5B8
 
 	thumb_func_start sub_811E5D4
-sub_811E5D4: ; 811E5D4
+sub_811E5D4: @ 811E5D4
 	push {r4,lr}
 	ldr r4, =gUnknown_08597E48
 	adds r0, r4, 0
@@ -526472,7 +526472,7 @@ _0811E636:
 	thumb_func_end sub_811E5D4
 
 	thumb_func_start sub_811E64C
-sub_811E64C: ; 811E64C
+sub_811E64C: @ 811E64C
 	push {r4-r6,lr}
 	bl sub_811BBF8
 	ldr r6, =0x0203a11c
@@ -526525,7 +526525,7 @@ _0811E692:
 	thumb_func_end sub_811E64C
 
 	thumb_func_start sub_811E6B0
-sub_811E6B0: ; 811E6B0
+sub_811E6B0: @ 811E6B0
 	ldr r3, =0x0203a11c
 	ldr r0, [r3]
 	movs r1, 0xBC
@@ -526551,7 +526551,7 @@ sub_811E6B0: ; 811E6B0
 	thumb_func_end sub_811E6B0
 
 	thumb_func_start sub_811E6E0
-sub_811E6E0: ; 811E6E0
+sub_811E6E0: @ 811E6E0
 	push {lr}
 	cmp r0, 0
 	bne _0811E6FC
@@ -526585,7 +526585,7 @@ _0811E70A:
 	thumb_func_end sub_811E6E0
 
 	thumb_func_start sub_811E720
-sub_811E720: ; 811E720
+sub_811E720: @ 811E720
 	push {r4,lr}
 	ldr r4, =gUnknown_08597E30
 	adds r0, r4, 0
@@ -526640,7 +526640,7 @@ _0811E77E:
 	thumb_func_end sub_811E720
 
 	thumb_func_start sub_811E794
-sub_811E794: ; 811E794
+sub_811E794: @ 811E794
 	push {r4-r6,lr}
 	bl sub_811BBF8
 	ldr r6, =0x0203a11c
@@ -526693,7 +526693,7 @@ _0811E7DA:
 	thumb_func_end sub_811E794
 
 	thumb_func_start sub_811E7F8
-sub_811E7F8: ; 811E7F8
+sub_811E7F8: @ 811E7F8
 	ldr r3, =0x0203a11c
 	ldr r0, [r3]
 	movs r1, 0xBE
@@ -526719,7 +526719,7 @@ sub_811E7F8: ; 811E7F8
 	thumb_func_end sub_811E7F8
 
 	thumb_func_start sub_811E828
-sub_811E828: ; 811E828
+sub_811E828: @ 811E828
 	push {r4,r5,lr}
 	sub sp, 0x4
 	bl sub_811BCBC
@@ -526814,7 +526814,7 @@ _0811E8D0:
 	thumb_func_end sub_811E828
 
 	thumb_func_start sub_811E8E4
-sub_811E8E4: ; 811E8E4
+sub_811E8E4: @ 811E8E4
 	push {lr}
 	bl sub_811BA68
 	lsls r0, 24
@@ -526851,7 +526851,7 @@ _0811E91C:
 	thumb_func_end sub_811E8E4
 
 	thumb_func_start sub_811E920
-sub_811E920: ; 811E920
+sub_811E920: @ 811E920
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_811E8E4
@@ -526875,7 +526875,7 @@ _0811E93E:
 	thumb_func_end sub_811E920
 
 	thumb_func_start sub_811E948
-sub_811E948: ; 811E948
+sub_811E948: @ 811E948
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -526975,7 +526975,7 @@ _0811E9FA:
 	thumb_func_end sub_811E948
 
 	thumb_func_start sub_811EA28
-sub_811EA28: ; 811EA28
+sub_811EA28: @ 811EA28
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -527013,7 +527013,7 @@ _0811EA68:
 	thumb_func_end sub_811EA28
 
 	thumb_func_start start_menu_is_selected_item_valid
-start_menu_is_selected_item_valid: ; 811EA6C
+start_menu_is_selected_item_valid: @ 811EA6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -527045,7 +527045,7 @@ _0811EA9A:
 	thumb_func_end start_menu_is_selected_item_valid
 
 	thumb_func_start sub_811EAA4
-sub_811EAA4: ; 811EAA4
+sub_811EAA4: @ 811EAA4
 	push {r4,r5,lr}
 	lsls r2, r0, 16
 	lsrs r1, r2, 16
@@ -527105,7 +527105,7 @@ _0811EB0A:
 	thumb_func_end sub_811EAA4
 
 	thumb_func_start sub_811EB10
-sub_811EB10: ; 811EB10
+sub_811EB10: @ 811EB10
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 25
@@ -527152,8 +527152,8 @@ _0811EB5E:
 	thumb_func_end sub_811EB10
 
 	thumb_func_start GetEasyChatWord
-; char *GetEasyChatWord(u8 groupId, u16 wordId)
-GetEasyChatWord: ; 811EB64
+@ char *GetEasyChatWord(u8 groupId, u16 wordId)
+GetEasyChatWord: @ 811EB64
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -527200,8 +527200,8 @@ _0811EBB2:
 	thumb_func_end GetEasyChatWord
 
 	thumb_func_start CopyEasyChatWord
-; char *CopyEasyChatWord(char *dest, u16 groupIdWordIdPair)
-CopyEasyChatWord: ; 811EBBC
+@ char *CopyEasyChatWord(char *dest, u16 groupIdWordIdPair)
+CopyEasyChatWord: @ 811EBBC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r6, r1, 16
@@ -527239,7 +527239,7 @@ _0811EC02:
 	thumb_func_end CopyEasyChatWord
 
 	thumb_func_start ConvertEasyChatWordsToString
-ConvertEasyChatWordsToString: ; 811EC08
+ConvertEasyChatWordsToString: @ 811EC08
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -527314,7 +527314,7 @@ _0811EC78:
 	thumb_func_end ConvertEasyChatWordsToString
 
 	thumb_func_start sub_811EC98
-sub_811EC98: ; 811EC98
+sub_811EC98: @ 811EC98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -527438,7 +527438,7 @@ _0811ED62:
 	thumb_func_end sub_811EC98
 
 	thumb_func_start sub_811ED7C
-sub_811ED7C: ; 811ED7C
+sub_811ED7C: @ 811ED7C
 	push {r4,r5,lr}
 	lsls r5, r0, 16
 	lsrs r0, r5, 16
@@ -527475,7 +527475,7 @@ _0811EDBA:
 	thumb_func_end sub_811ED7C
 
 	thumb_func_start sub_811EDC4
-sub_811EDC4: ; 811EDC4
+sub_811EDC4: @ 811EDC4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -527542,7 +527542,7 @@ _0811EE28:
 	thumb_func_end sub_811EDC4
 
 	thumb_func_start sub_811EE38
-sub_811EE38: ; 811EE38
+sub_811EE38: @ 811EE38
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -527586,7 +527586,7 @@ _0811EE74:
 	thumb_func_end sub_811EE38
 
 	thumb_func_start sub_811EE90
-sub_811EE90: ; 811EE90
+sub_811EE90: @ 811EE90
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -527618,7 +527618,7 @@ _0811EEC4:
 	thumb_func_end sub_811EE90
 
 	thumb_func_start sub_811EECC
-sub_811EECC: ; 811EECC
+sub_811EECC: @ 811EECC
 	push {r4,r5,lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -527692,7 +527692,7 @@ _0811EF58:
 	thumb_func_end sub_811EECC
 
 	thumb_func_start sub_811EF6C
-sub_811EF6C: ; 811EF6C
+sub_811EF6C: @ 811EF6C
 	push {lr}
 	bl GenerateRandomNumber
 	movs r1, 0x1
@@ -527714,7 +527714,7 @@ _0811EF7E:
 	thumb_func_end sub_811EF6C
 
 	thumb_func_start sub_811EF98
-sub_811EF98: ; 811EF98
+sub_811EF98: @ 811EF98
 	lsls r0, 24
 	lsrs r2, r0, 27
 	movs r1, 0xE0
@@ -527735,7 +527735,7 @@ sub_811EF98: ; 811EF98
 	thumb_func_end sub_811EF98
 
 	thumb_func_start sub_811EFC0
-sub_811EFC0: ; 811EFC0
+sub_811EFC0: @ 811EFC0
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -527761,7 +527761,7 @@ _0811EFE4:
 	thumb_func_end sub_811EFC0
 
 	thumb_func_start sub_811EFF0
-sub_811EFF0: ; 811EFF0
+sub_811EFF0: @ 811EFF0
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0
@@ -527787,7 +527787,7 @@ _0811F008:
 	thumb_func_end sub_811EFF0
 
 	thumb_func_start sub_811F01C
-sub_811F01C: ; 811F01C
+sub_811F01C: @ 811F01C
 	push {r4-r6,lr}
 	bl sub_811EFF0
 	lsls r0, 24
@@ -527846,7 +527846,7 @@ _0811F084:
 	thumb_func_end sub_811F01C
 
 	thumb_func_start sub_811F090
-sub_811F090: ; 811F090
+sub_811F090: @ 811F090
 	push {r4,r5,lr}
 	bl sub_811EFF0
 	lsls r0, 24
@@ -527901,7 +527901,7 @@ _0811F0EC:
 	thumb_func_end sub_811F090
 
 	thumb_func_start sub_811F0F8
-sub_811F0F8: ; 811F0F8
+sub_811F0F8: @ 811F0F8
 	push {lr}
 	bl sub_809D42C
 	lsls r0, 24
@@ -527911,7 +527911,7 @@ sub_811F0F8: ; 811F0F8
 	thumb_func_end sub_811F0F8
 
 	thumb_func_start sub_811F108
-sub_811F108: ; 811F108
+sub_811F108: @ 811F108
 	push {r4-r7,lr}
 	movs r0, 0
 	bl start_menu_is_selected_item_valid
@@ -527972,7 +527972,7 @@ _0811F174:
 	thumb_func_end sub_811F108
 
 	thumb_func_start sub_811F184
-sub_811F184: ; 811F184
+sub_811F184: @ 811F184
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r5, =0x03005d8c
@@ -528092,7 +528092,7 @@ _0811F244:
 	thumb_func_end sub_811F184
 
 	thumb_func_start sub_811F28C
-sub_811F28C: ; 811F28C
+sub_811F28C: @ 811F28C
 	push {r4,lr}
 	ldr r4, =0x0203a120
 	ldr r0, =0x00003ba4
@@ -528114,7 +528114,7 @@ _0811F2B2:
 	thumb_func_end sub_811F28C
 
 	thumb_func_start sub_811F2B8
-sub_811F2B8: ; 811F2B8
+sub_811F2B8: @ 811F2B8
 	push {r4,lr}
 	ldr r4, =0x0203a120
 	ldr r0, [r4]
@@ -528131,7 +528131,7 @@ _0811F2CA:
 	thumb_func_end sub_811F2B8
 
 	thumb_func_start sub_811F2D4
-sub_811F2D4: ; 811F2D4
+sub_811F2D4: @ 811F2D4
 	push {r4,r5,lr}
 	ldr r4, =0x0203a120
 	ldr r0, [r4]
@@ -528238,7 +528238,7 @@ _0811F398:
 	thumb_func_end sub_811F2D4
 
 	thumb_func_start sub_811F3AC
-sub_811F3AC: ; 811F3AC
+sub_811F3AC: @ 811F3AC
 	ldr r0, =0x0203a120
 	ldr r0, [r0]
 	ldrb r0, [r0]
@@ -528247,7 +528247,7 @@ sub_811F3AC: ; 811F3AC
 	thumb_func_end sub_811F3AC
 
 	thumb_func_start sub_811F3B8
-sub_811F3B8: ; 811F3B8
+sub_811F3B8: @ 811F3B8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -528270,7 +528270,7 @@ _0811F3DA:
 	thumb_func_end sub_811F3B8
 
 	thumb_func_start sub_811F3E0
-sub_811F3E0: ; 811F3E0
+sub_811F3E0: @ 811F3E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -528308,7 +528308,7 @@ _0811F414:
 	thumb_func_end sub_811F3E0
 
 	thumb_func_start sub_811F424
-sub_811F424: ; 811F424
+sub_811F424: @ 811F424
 	lsls r0, 24
 	ldr r1, =gEasyChatGroupNamePointers
 	lsrs r0, 22
@@ -528319,8 +528319,8 @@ sub_811F424: ; 811F424
 	thumb_func_end sub_811F424
 
 	thumb_func_start CopyEasyChatWordPadded
-; char *CopyEasyChatWordPadded(char *dest, u16 groupIdWordIdPair, u16 minLength)
-CopyEasyChatWordPadded: ; 811F434
+@ char *CopyEasyChatWordPadded(char *dest, u16 groupIdWordIdPair, u16 minLength)
+CopyEasyChatWordPadded: @ 811F434
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -528353,7 +528353,7 @@ _0811F460:
 	thumb_func_end CopyEasyChatWordPadded
 
 	thumb_func_start sub_811F46C
-sub_811F46C: ; 811F46C
+sub_811F46C: @ 811F46C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -528467,7 +528467,7 @@ _0811F530:
 	thumb_func_end sub_811F46C
 
 	thumb_func_start sub_811F548
-sub_811F548: ; 811F548
+sub_811F548: @ 811F548
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -528491,7 +528491,7 @@ _0811F560:
 	thumb_func_end sub_811F548
 
 	thumb_func_start sub_811F578
-sub_811F578: ; 811F578
+sub_811F578: @ 811F578
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -528518,7 +528518,7 @@ _0811F5A6:
 	thumb_func_end sub_811F578
 
 	thumb_func_start sub_811F5B0
-sub_811F5B0: ; 811F5B0
+sub_811F5B0: @ 811F5B0
 	ldr r0, =0x0203a120
 	ldr r0, [r0]
 	ldr r1, =0x00003ba0
@@ -528529,7 +528529,7 @@ sub_811F5B0: ; 811F5B0
 	thumb_func_end sub_811F5B0
 
 	thumb_func_start sub_811F5C4
-sub_811F5C4: ; 811F5C4
+sub_811F5C4: @ 811F5C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -528646,7 +528646,7 @@ _0811F698:
 	thumb_func_end sub_811F5C4
 
 	thumb_func_start sub_811F6B8
-sub_811F6B8: ; 811F6B8
+sub_811F6B8: @ 811F6B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -528707,7 +528707,7 @@ _0811F718:
 	thumb_func_end sub_811F6B8
 
 	thumb_func_start sub_811F72C
-sub_811F72C: ; 811F72C
+sub_811F72C: @ 811F72C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -528741,7 +528741,7 @@ _0811F75E:
 	thumb_func_end sub_811F72C
 
 	thumb_func_start sub_811F764
-sub_811F764: ; 811F764
+sub_811F764: @ 811F764
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -528828,7 +528828,7 @@ _0811F82C:
 	thumb_func_end sub_811F764
 
 	thumb_func_start sub_811F838
-sub_811F838: ; 811F838
+sub_811F838: @ 811F838
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -528853,7 +528853,7 @@ _0811F85A:
 	thumb_func_end sub_811F838
 
 	thumb_func_start sub_811F860
-sub_811F860: ; 811F860
+sub_811F860: @ 811F860
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 25
@@ -528879,7 +528879,7 @@ _0811F886:
 	thumb_func_end sub_811F860
 
 	thumb_func_start sub_811F88C
-sub_811F88C: ; 811F88C
+sub_811F88C: @ 811F88C
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -528905,7 +528905,7 @@ _0811F8AE:
 	thumb_func_end sub_811F88C
 
 	thumb_func_start sub_811F8BC
-sub_811F8BC: ; 811F8BC
+sub_811F8BC: @ 811F8BC
 	push {lr}
 	bl sub_801B058
 	ldr r1, =0x0000ffff
@@ -528922,7 +528922,7 @@ _0811F8C8:
 	thumb_func_end sub_811F8BC
 
 	thumb_func_start sub_811F8D8
-sub_811F8D8: ; 811F8D8
+sub_811F8D8: @ 811F8D8
 	push {r4,r5,lr}
 	asrs r4, r0, 9
 	movs r1, 0x7F
@@ -528950,7 +528950,7 @@ _0811F906:
 	thumb_func_end sub_811F8D8
 
 	thumb_func_start sub_811F90C
-sub_811F90C: ; 811F90C
+sub_811F90C: @ 811F90C
 	ldr r1, =0x0203a124
 	str r0, [r1]
 	bx lr
@@ -528958,7 +528958,7 @@ sub_811F90C: ; 811F90C
 	thumb_func_end sub_811F90C
 
 	thumb_func_start sub_811F918
-sub_811F918: ; 811F918
+sub_811F918: @ 811F918
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x03005d90
@@ -528989,7 +528989,7 @@ sub_811F918: ; 811F918
 	thumb_func_end sub_811F918
 
 	thumb_func_start sub_811F960
-sub_811F960: ; 811F960
+sub_811F960: @ 811F960
 	push {r4-r7,lr}
 	ldr r0, =0x0203a124
 	ldr r1, [r0]
@@ -529134,7 +529134,7 @@ _0811FA8A:
 	thumb_func_end sub_811F960
 
 	thumb_func_start sub_811FA90
-sub_811FA90: ; 811FA90
+sub_811FA90: @ 811FA90
 	push {lr}
 	bl sub_811F918
 _0811FA96:
@@ -529147,7 +529147,7 @@ _0811FA96:
 	thumb_func_end sub_811FA90
 
 	thumb_func_start sub_811FAA4
-sub_811FAA4: ; 811FAA4
+sub_811FAA4: @ 811FAA4
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r5, r1, 16
@@ -529191,7 +529191,7 @@ _0811FAC2:
 	thumb_func_end sub_811FAA4
 
 	thumb_func_start sub_811FAF8
-sub_811FAF8: ; 811FAF8
+sub_811FAF8: @ 811FAF8
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r4, =0x0203a124
@@ -529279,7 +529279,7 @@ _0811FB9A:
 	thumb_func_end sub_811FAF8
 
 	thumb_func_start sub_811FBA4
-sub_811FBA4: ; 811FBA4
+sub_811FBA4: @ 811FBA4
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -529390,7 +529390,7 @@ _0811FC78:
 	thumb_func_end sub_811FBA4
 
 	thumb_func_start sub_811FC80
-sub_811FC80: ; 811FC80
+sub_811FC80: @ 811FC80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -529709,12 +529709,12 @@ _0811FF28:
 	thumb_func_end sub_811FC80
 
 	thumb_func_start nullsub_47
-nullsub_47: ; 811FF3C
+nullsub_47: @ 811FF3C
 	bx lr
 	thumb_func_end nullsub_47
 
 	thumb_func_start sub_811FF40
-sub_811FF40: ; 811FF40
+sub_811FF40: @ 811FF40
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a124
@@ -529745,7 +529745,7 @@ _0811FF76:
 	thumb_func_end sub_811FF40
 
 	thumb_func_start sub_811FF7C
-sub_811FF7C: ; 811FF7C
+sub_811FF7C: @ 811FF7C
 	ldr r1, =0x0203a124
 	ldr r1, [r1]
 	ldrb r1, [r1, 0x5]
@@ -529760,7 +529760,7 @@ sub_811FF7C: ; 811FF7C
 	thumb_func_end sub_811FF7C
 
 	thumb_func_start sub_811FF94
-sub_811FF94: ; 811FF94
+sub_811FF94: @ 811FF94
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -529778,7 +529778,7 @@ _0811FFA4:
 	thumb_func_end sub_811FF94
 
 	thumb_func_start sub_811FFB4
-sub_811FFB4: ; 811FFB4
+sub_811FFB4: @ 811FFB4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -529796,7 +529796,7 @@ _0811FFC4:
 	thumb_func_end sub_811FFB4
 
 	thumb_func_start sub_811FFD4
-sub_811FFD4: ; 811FFD4
+sub_811FFD4: @ 811FFD4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -529873,7 +529873,7 @@ _08120072:
 	thumb_func_end sub_811FFD4
 
 	thumb_func_start sub_8120084
-sub_8120084: ; 8120084
+sub_8120084: @ 8120084
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 17
@@ -529888,7 +529888,7 @@ sub_8120084: ; 8120084
 	thumb_func_end sub_8120084
 
 	thumb_func_start sub_81200A0
-sub_81200A0: ; 81200A0
+sub_81200A0: @ 81200A0
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -529926,7 +529926,7 @@ _081200C6:
 	thumb_func_end sub_81200A0
 
 	thumb_func_start sub_81200F8
-sub_81200F8: ; 81200F8
+sub_81200F8: @ 81200F8
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x00002e28
@@ -529943,7 +529943,7 @@ sub_81200F8: ; 81200F8
 	thumb_func_end sub_81200F8
 
 	thumb_func_start sub_812011C
-sub_812011C: ; 812011C
+sub_812011C: @ 812011C
 	push {lr}
 	bl sub_8120E08
 	pop {r0}
@@ -529951,7 +529951,7 @@ sub_812011C: ; 812011C
 	thumb_func_end sub_812011C
 
 	thumb_func_start sub_8120128
-sub_8120128: ; 8120128
+sub_8120128: @ 8120128
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x00002e28
@@ -529970,7 +529970,7 @@ sub_8120128: ; 8120128
 	thumb_func_end sub_8120128
 
 	thumb_func_start sub_8120154
-sub_8120154: ; 8120154
+sub_8120154: @ 8120154
 	push {lr}
 	bl sub_81339F8
 	pop {r0}
@@ -529978,7 +529978,7 @@ sub_8120154: ; 8120154
 	thumb_func_end sub_8120154
 
 	thumb_func_start sub_8120160
-sub_8120160: ; 8120160
+sub_8120160: @ 8120160
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -530026,7 +530026,7 @@ _081201C0:
 	thumb_func_end sub_8120160
 
 	thumb_func_start sub_81201C8
-sub_81201C8: ; 81201C8
+sub_81201C8: @ 81201C8
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002e28
@@ -530037,7 +530037,7 @@ sub_81201C8: ; 81201C8
 	thumb_func_end sub_81201C8
 
 	thumb_func_start sub_81201DC
-sub_81201DC: ; 81201DC
+sub_81201DC: @ 81201DC
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl sub_81201C8
@@ -530051,7 +530051,7 @@ sub_81201DC: ; 81201DC
 	thumb_func_end sub_81201DC
 
 	thumb_func_start sub_81201F4
-sub_81201F4: ; 81201F4
+sub_81201F4: @ 81201F4
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -530064,7 +530064,7 @@ sub_81201F4: ; 81201F4
 	thumb_func_end sub_81201F4
 
 	thumb_func_start sub_8120210
-sub_8120210: ; 8120210
+sub_8120210: @ 8120210
 	push {r4-r6,lr}
 	ldr r0, =0x03005d8c
 	ldr r4, [r0]
@@ -530116,7 +530116,7 @@ _0812024E:
 	thumb_func_end sub_8120210
 
 	thumb_func_start sub_8120280
-sub_8120280: ; 8120280
+sub_8120280: @ 8120280
 	push {r4-r7,lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -530216,7 +530216,7 @@ _0812031E:
 	thumb_func_end sub_8120280
 
 	thumb_func_start sub_8120340
-sub_8120340: ; 8120340
+sub_8120340: @ 8120340
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrb r0, [r0]
@@ -530228,7 +530228,7 @@ sub_8120340: ; 8120340
 	thumb_func_end sub_8120340
 
 	thumb_func_start sub_8120358
-sub_8120358: ; 8120358
+sub_8120358: @ 8120358
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -530241,7 +530241,7 @@ sub_8120358: ; 8120358
 	thumb_func_end sub_8120358
 
 	thumb_func_start sub_8120374
-sub_8120374: ; 8120374
+sub_8120374: @ 8120374
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002e28
@@ -530253,7 +530253,7 @@ sub_8120374: ; 8120374
 	thumb_func_end sub_8120374
 
 	thumb_func_start sub_812038C
-sub_812038C: ; 812038C
+sub_812038C: @ 812038C
 	push {lr}
 	bl sub_811F01C
 	lsls r0, 16
@@ -530278,7 +530278,7 @@ _081203B6:
 	thumb_func_end sub_812038C
 
 	thumb_func_start sub_81203C4
-sub_81203C4: ; 81203C4
+sub_81203C4: @ 81203C4
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -530304,7 +530304,7 @@ _081203F2:
 	thumb_func_end sub_81203C4
 
 	thumb_func_start sub_81203FC
-sub_81203FC: ; 81203FC
+sub_81203FC: @ 81203FC
 	push {r4-r6,lr}
 	ldr r0, =0x03005d8c
 	ldr r4, [r0]
@@ -530395,7 +530395,7 @@ _081204C8:
 	thumb_func_end sub_81203FC
 
 	thumb_func_start sub_81204DC
-sub_81204DC: ; 81204DC
+sub_81204DC: @ 81204DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -530557,7 +530557,7 @@ _0812060E:
 	thumb_func_end sub_81204DC
 
 	thumb_func_start sub_8120628
-sub_8120628: ; 8120628
+sub_8120628: @ 8120628
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002e51
@@ -530569,7 +530569,7 @@ sub_8120628: ; 8120628
 	thumb_func_end sub_8120628
 
 	thumb_func_start sub_8120640
-sub_8120640: ; 8120640
+sub_8120640: @ 8120640
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002e28
@@ -530581,7 +530581,7 @@ sub_8120640: ; 8120640
 	thumb_func_end sub_8120640
 
 	thumb_func_start sub_8120658
-sub_8120658: ; 8120658
+sub_8120658: @ 8120658
 	push {lr}
 	bl sub_8133A60
 	pop {r0}
@@ -530589,7 +530589,7 @@ sub_8120658: ; 8120658
 	thumb_func_end sub_8120658
 
 	thumb_func_start sub_8120664
-sub_8120664: ; 8120664
+sub_8120664: @ 8120664
 	push {lr}
 	bl sub_8120E50
 	pop {r0}
@@ -530597,7 +530597,7 @@ sub_8120664: ; 8120664
 	thumb_func_end sub_8120664
 
 	thumb_func_start sub_8120670
-sub_8120670: ; 8120670
+sub_8120670: @ 8120670
 	push {lr}
 	bl sub_81201C8
 	lsls r0, 24
@@ -530635,7 +530635,7 @@ _081206B6:
 	thumb_func_end sub_8120670
 
 	thumb_func_start sub_81206C0
-sub_81206C0: ; 81206C0
+sub_81206C0: @ 81206C0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -530658,7 +530658,7 @@ sub_81206C0: ; 81206C0
 	thumb_func_end sub_81206C0
 
 	thumb_func_start sub_81206F0
-sub_81206F0: ; 81206F0
+sub_81206F0: @ 81206F0
 	ldr r1, =0x03002f84
 	movs r0, 0
 	strb r0, [r1]
@@ -530667,7 +530667,7 @@ sub_81206F0: ; 81206F0
 	thumb_func_end sub_81206F0
 
 	thumb_func_start sub_81206FC
-sub_81206FC: ; 81206FC
+sub_81206FC: @ 81206FC
 	ldr r1, =0x03002f84
 	movs r0, 0x1
 	strb r0, [r1]
@@ -530676,7 +530676,7 @@ sub_81206FC: ; 81206FC
 	thumb_func_end sub_81206FC
 
 	thumb_func_start sub_8120708
-sub_8120708: ; 8120708
+sub_8120708: @ 8120708
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -530706,7 +530706,7 @@ sub_8120708: ; 8120708
 	thumb_func_end sub_8120708
 
 	thumb_func_start sub_8120748
-sub_8120748: ; 8120748
+sub_8120748: @ 8120748
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	movs r1, 0x8
@@ -530954,7 +530954,7 @@ _08120938:
 	thumb_func_end sub_8120748
 
 	thumb_func_start sub_8120944
-sub_8120944: ; 8120944
+sub_8120944: @ 8120944
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -531214,7 +531214,7 @@ _08120B50:
 	thumb_func_end sub_8120944
 
 	thumb_func_start sub_8120B5C
-sub_8120B5C: ; 8120B5C
+sub_8120B5C: @ 8120B5C
 	push {lr}
 	ldr r0, =0x00004010
 	movs r1, 0x45
@@ -531225,7 +531225,7 @@ sub_8120B5C: ; 8120B5C
 	thumb_func_end sub_8120B5C
 
 	thumb_func_start sub_8120B70
-sub_8120B70: ; 8120B70
+sub_8120B70: @ 8120B70
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldrb r1, [r0]
@@ -531307,7 +531307,7 @@ _08120C00:
 	thumb_func_end sub_8120B70
 
 	thumb_func_start sub_8120C0C
-sub_8120C0C: ; 8120C0C
+sub_8120C0C: @ 8120C0C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -531419,7 +531419,7 @@ _08120CC4:
 	thumb_func_end sub_8120C0C
 
 	thumb_func_start sub_8120CD0
-sub_8120CD0: ; 8120CD0
+sub_8120CD0: @ 8120CD0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -531476,7 +531476,7 @@ _08120D28:
 	thumb_func_end sub_8120CD0
 
 	thumb_func_start sub_8120D34
-sub_8120D34: ; 8120D34
+sub_8120D34: @ 8120D34
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r6, r2, 0
@@ -531596,7 +531596,7 @@ _08120E02:
 	thumb_func_end sub_8120D34
 
 	thumb_func_start sub_8120E08
-sub_8120E08: ; 8120E08
+sub_8120E08: @ 8120E08
 	push {r4,r5,lr}
 	ldr r2, =0x0203a12c
 	ldr r0, =0x03005d8c
@@ -531632,7 +531632,7 @@ _08120E24:
 	thumb_func_end sub_8120E08
 
 	thumb_func_start sub_8120E50
-sub_8120E50: ; 8120E50
+sub_8120E50: @ 8120E50
 	ldr r3, =0x0203a12c
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -531649,7 +531649,7 @@ sub_8120E50: ; 8120E50
 	thumb_func_end sub_8120E50
 
 	thumb_func_start sub_8120E74
-sub_8120E74: ; 8120E74
+sub_8120E74: @ 8120E74
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -531663,7 +531663,7 @@ _08120E80:
 	thumb_func_end sub_8120E74
 
 	thumb_func_start sub_8120E88
-sub_8120E88: ; 8120E88
+sub_8120E88: @ 8120E88
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -531688,7 +531688,7 @@ _08120EAA:
 	thumb_func_end sub_8120E88
 
 	thumb_func_start sub_8120EB4
-sub_8120EB4: ; 8120EB4
+sub_8120EB4: @ 8120EB4
 	push {lr}
 	bl sub_8120E88
 	ldr r0, [r0, 0x4]
@@ -531697,7 +531697,7 @@ sub_8120EB4: ; 8120EB4
 	thumb_func_end sub_8120EB4
 
 	thumb_func_start sub_8120EC0
-sub_8120EC0: ; 8120EC0
+sub_8120EC0: @ 8120EC0
 	push {lr}
 	bl sub_8120E88
 	ldr r0, [r0, 0xC]
@@ -531706,7 +531706,7 @@ sub_8120EC0: ; 8120EC0
 	thumb_func_end sub_8120EC0
 
 	thumb_func_start sub_8120ECC
-sub_8120ECC: ; 8120ECC
+sub_8120ECC: @ 8120ECC
 	push {lr}
 	bl sub_8120E88
 	ldr r0, [r0, 0x8]
@@ -531715,7 +531715,7 @@ sub_8120ECC: ; 8120ECC
 	thumb_func_end sub_8120ECC
 
 	thumb_func_start sub_8120ED8
-sub_8120ED8: ; 8120ED8
+sub_8120ED8: @ 8120ED8
 	push {lr}
 	movs r1, 0
 	ldr r2, =0x0203a12c
@@ -531743,7 +531743,7 @@ _08120EFC:
 	thumb_func_end sub_8120ED8
 
 	thumb_func_start sub_8120F08
-sub_8120F08: ; 8120F08
+sub_8120F08: @ 8120F08
 	ldr r1, =0x0203a12c
 	lsls r0, 2
 	adds r0, 0x24
@@ -531764,7 +531764,7 @@ sub_8120F08: ; 8120F08
 	thumb_func_end sub_8120F08
 
 	thumb_func_start sub_8120F2C
-sub_8120F2C: ; 8120F2C
+sub_8120F2C: @ 8120F2C
 	ldr r2, =0x0203a12c
 	lsls r0, 2
 	adds r0, 0x24
@@ -531782,7 +531782,7 @@ sub_8120F2C: ; 8120F2C
 	thumb_func_end sub_8120F2C
 
 	thumb_func_start sub_8120F4C
-sub_8120F4C: ; 8120F4C
+sub_8120F4C: @ 8120F4C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203a12c
@@ -531808,7 +531808,7 @@ _08120F76:
 	thumb_func_end sub_8120F4C
 
 	thumb_func_start sub_8120F7C
-sub_8120F7C: ; 8120F7C
+sub_8120F7C: @ 8120F7C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r2, =0x0203a12c
@@ -531832,7 +531832,7 @@ sub_8120F7C: ; 8120F7C
 	thumb_func_end sub_8120F7C
 
 	thumb_func_start sub_8120FAC
-sub_8120FAC: ; 8120FAC
+sub_8120FAC: @ 8120FAC
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r2, =0x0203a12c
@@ -531856,7 +531856,7 @@ sub_8120FAC: ; 8120FAC
 	thumb_func_end sub_8120FAC
 
 	thumb_func_start sub_8120FDC
-sub_8120FDC: ; 8120FDC
+sub_8120FDC: @ 8120FDC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -531911,7 +531911,7 @@ sub_8120FDC: ; 8120FDC
 	thumb_func_end sub_8120FDC
 
 	thumb_func_start sub_8121064
-sub_8121064: ; 8121064
+sub_8121064: @ 8121064
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	adds r6, r1, 0
@@ -531956,7 +531956,7 @@ _081210B0:
 	thumb_func_end sub_8121064
 
 	thumb_func_start sub_81210B8
-sub_81210B8: ; 81210B8
+sub_81210B8: @ 81210B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -532050,7 +532050,7 @@ _0812116A:
 	thumb_func_end sub_81210B8
 
 	thumb_func_start sub_8121178
-sub_8121178: ; 8121178
+sub_8121178: @ 8121178
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -532097,7 +532097,7 @@ sub_8121178: ; 8121178
 	thumb_func_end sub_8121178
 
 	thumb_func_start sub_81211EC
-sub_81211EC: ; 81211EC
+sub_81211EC: @ 81211EC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r1, =gUnknown_085EB7EA
@@ -532224,7 +532224,7 @@ _081212AA:
 	thumb_func_end sub_81211EC
 
 	thumb_func_start sub_81212FC
-sub_81212FC: ; 81212FC
+sub_81212FC: @ 81212FC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -532289,7 +532289,7 @@ _08121376:
 	thumb_func_end sub_81212FC
 
 	thumb_func_start sub_8121388
-sub_8121388: ; 8121388
+sub_8121388: @ 8121388
 	push {lr}
 	ldr r0, =sub_81212FC
 	movs r1, 0x50
@@ -532300,7 +532300,7 @@ sub_8121388: ; 8121388
 	thumb_func_end sub_8121388
 
 	thumb_func_start sub_812139C
-sub_812139C: ; 812139C
+sub_812139C: @ 812139C
 	push {lr}
 	ldr r0, =0x03001178
 	ldrb r0, [r0]
@@ -532311,7 +532311,7 @@ sub_812139C: ; 812139C
 	thumb_func_end sub_812139C
 
 	thumb_func_start sub_81213B0
-sub_81213B0: ; 81213B0
+sub_81213B0: @ 81213B0
 	push {lr}
 	ldr r1, =0x0203a12c
 	ldr r0, =0x03005d8c
@@ -532328,7 +532328,7 @@ sub_81213B0: ; 81213B0
 	thumb_func_end sub_81213B0
 
 	thumb_func_start sub_81213D8
-sub_81213D8: ; 81213D8
+sub_81213D8: @ 81213D8
 	push {r4,r5,lr}
 	ldr r2, =0x0203a12c
 	ldr r0, =0x03005d8c
@@ -532360,7 +532360,7 @@ _0812141E:
 	thumb_func_end sub_81213D8
 
 	thumb_func_start sub_8121424
-sub_8121424: ; 8121424
+sub_8121424: @ 8121424
 	push {lr}
 	ldr r1, =0x0203a12c
 	ldr r0, =0x03005d8c
@@ -532382,7 +532382,7 @@ _0812144A:
 	thumb_func_end sub_8121424
 
 	thumb_func_start sub_8121450
-sub_8121450: ; 8121450
+sub_8121450: @ 8121450
 	push {lr}
 	ldr r1, =0x0203a12c
 	ldr r0, =0x03005d8c
@@ -532399,7 +532399,7 @@ sub_8121450: ; 8121450
 	thumb_func_end sub_8121450
 
 	thumb_func_start sub_8121478
-sub_8121478: ; 8121478
+sub_8121478: @ 8121478
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -532557,7 +532557,7 @@ _081215BA:
 	thumb_func_end sub_8121478
 
 	thumb_func_start sub_81215EC
-sub_81215EC: ; 81215EC
+sub_81215EC: @ 81215EC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -532985,7 +532985,7 @@ _081219E4:
 	thumb_func_end sub_81215EC
 
 	thumb_func_start sub_81219F0
-sub_81219F0: ; 81219F0
+sub_81219F0: @ 81219F0
 	push {lr}
 _081219F2:
 	bl sub_81215EC
@@ -533009,7 +533009,7 @@ _08121A18:
 	thumb_func_end sub_81219F0
 
 	thumb_func_start sub_8121A1C
-sub_8121A1C: ; 8121A1C
+sub_8121A1C: @ 8121A1C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -533131,7 +533131,7 @@ _08121B0C:
 	thumb_func_end sub_8121A1C
 
 	thumb_func_start sub_8121B1C
-sub_8121B1C: ; 8121B1C
+sub_8121B1C: @ 8121B1C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -533274,7 +533274,7 @@ _08121BCC:
 	thumb_func_end sub_8121B1C
 
 	thumb_func_start sub_8121C50
-sub_8121C50: ; 8121C50
+sub_8121C50: @ 8121C50
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -533284,7 +533284,7 @@ sub_8121C50: ; 8121C50
 	thumb_func_end sub_8121C50
 
 	thumb_func_start sub_8121C64
-sub_8121C64: ; 8121C64
+sub_8121C64: @ 8121C64
 	push {r4,lr}
 	ldr r4, =0x0203a134
 	ldr r0, [r4]
@@ -533309,7 +533309,7 @@ _08121C7C:
 	thumb_func_end sub_8121C64
 
 	thumb_func_start sub_8121C98
-sub_8121C98: ; 8121C98
+sub_8121C98: @ 8121C98
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -533329,7 +533329,7 @@ _08121CB2:
 	thumb_func_end sub_8121C98
 
 	thumb_func_start sub_8121CC0
-sub_8121CC0: ; 8121CC0
+sub_8121CC0: @ 8121CC0
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -533360,7 +533360,7 @@ _08121CEE:
 	thumb_func_end sub_8121CC0
 
 	thumb_func_start sub_8121D00
-sub_8121D00: ; 8121D00
+sub_8121D00: @ 8121D00
 	push {r4,lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -533426,7 +533426,7 @@ _08121D88:
 	thumb_func_end sub_8121D00
 
 	thumb_func_start sub_8121DA0
-sub_8121DA0: ; 8121DA0
+sub_8121DA0: @ 8121DA0
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -533473,7 +533473,7 @@ sub_8121DA0: ; 8121DA0
 	thumb_func_end sub_8121DA0
 
 	thumb_func_start sub_8121E10
-sub_8121E10: ; 8121E10
+sub_8121E10: @ 8121E10
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -533512,8 +533512,8 @@ sub_8121E10: ; 8121E10
 	thumb_func_end sub_8121E10
 
 	thumb_func_start SetVBlankHBlankCallbacksToNull
-; void SetVBlankHBlankCallbacksToNull()
-SetVBlankHBlankCallbacksToNull: ; 8121E68
+@ void SetVBlankHBlankCallbacksToNull()
+SetVBlankHBlankCallbacksToNull: @ 8121E68
 	push {lr}
 	movs r0, 0
 	bl SetVBlankCallback
@@ -533524,8 +533524,8 @@ SetVBlankHBlankCallbacksToNull: ; 8121E68
 	thumb_func_end SetVBlankHBlankCallbacksToNull
 
 	thumb_func_start DisplayMessageAndContinueTask
-; void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 windowBorderFirstTileNum, u8 windowBorderPalette, u8 fontId, u8 speed, u8 *str, void ( *callback)(u8 taskId))
-DisplayMessageAndContinueTask: ; 8121E7C
+@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 windowBorderFirstTileNum, u8 windowBorderPalette, u8 fontId, u8 speed, u8 *str, void ( *callback)(u8 taskId))
+DisplayMessageAndContinueTask: @ 8121E7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -533598,7 +533598,7 @@ _08121EC0:
 	thumb_func_end DisplayMessageAndContinueTask
 
 	thumb_func_start sub_8121F20
-sub_8121F20: ; 8121F20
+sub_8121F20: @ 8121F20
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -533614,8 +533614,8 @@ sub_8121F20: ; 8121F20
 	thumb_func_end sub_8121F20
 
 	thumb_func_start Task_ContinueTaskAfterMessagePrints
-; void Task_ContinueTaskAfterMessagePrints(u8 taskId)
-Task_ContinueTaskAfterMessagePrints: ; 8121F3C
+@ void Task_ContinueTaskAfterMessagePrints(u8 taskId)
+Task_ContinueTaskAfterMessagePrints: @ 8121F3C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -533637,7 +533637,7 @@ _08121F5A:
 	thumb_func_end Task_ContinueTaskAfterMessagePrints
 
 	thumb_func_start sub_8121F68
-sub_8121F68: ; 8121F68
+sub_8121F68: @ 8121F68
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x0203a138
@@ -533657,8 +533657,8 @@ sub_8121F68: ; 8121F68
 	thumb_func_end sub_8121F68
 
 	thumb_func_start CreateYesNoMenuWithCallbacks
-; void CreateYesNoMenuWithCallbacks(u8 taskId, struct WindowTemplate *windowTemplate, int a3, int a4, int a5, u16 borderFirstTileNum, u8 borderPalette, void ( **callbacks)(u8 taskId))
-CreateYesNoMenuWithCallbacks: ; 8121F94
+@ void CreateYesNoMenuWithCallbacks(u8 taskId, struct WindowTemplate *windowTemplate, int a3, int a4, int a5, u16 borderFirstTileNum, u8 borderPalette, void ( **callbacks)(u8 taskId))
+CreateYesNoMenuWithCallbacks: @ 8121F94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -533692,8 +533692,8 @@ CreateYesNoMenuWithCallbacks: ; 8121F94
 	thumb_func_end CreateYesNoMenuWithCallbacks
 
 	thumb_func_start Task_CallYesOrNoCallback
-; void Task_CallYesOrNoCallback(u8 taskId)
-Task_CallYesOrNoCallback: ; 8121FDC
+@ void Task_CallYesOrNoCallback(u8 taskId)
+Task_CallYesOrNoCallback: @ 8121FDC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -533737,8 +533737,8 @@ _08122028:
 	thumb_func_end Task_CallYesOrNoCallback
 
 	thumb_func_start AdjustQuantityAccordingToDPadInput
-; bool8 AdjustQuantityAccordingToDPadInput(u16 *quantity, u16 maxQuantity)
-AdjustQuantityAccordingToDPadInput: ; 8122034
+@ bool8 AdjustQuantityAccordingToDPadInput(u16 *quantity, u16 maxQuantity)
+AdjustQuantityAccordingToDPadInput: @ 8122034
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -533827,7 +533827,7 @@ _081220C8:
 	thumb_func_end AdjustQuantityAccordingToDPadInput
 
 	thumb_func_start GetLRKeysState
-GetLRKeysState: ; 81220D0
+GetLRKeysState: @ 81220D0
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -533860,7 +533860,7 @@ _08122108:
 	thumb_func_end GetLRKeysState
 
 	thumb_func_start sub_812210C
-sub_812210C: ; 812210C
+sub_812210C: @ 812210C
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -533893,7 +533893,7 @@ _08122144:
 	thumb_func_end sub_812210C
 
 	thumb_func_start sub_8122148
-sub_8122148: ; 8122148
+sub_8122148: @ 8122148
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -533920,7 +533920,7 @@ _08122176:
 	thumb_func_end sub_8122148
 
 	thumb_func_start itemid_80BF6D8_mail_related
-itemid_80BF6D8_mail_related: ; 812217C
+itemid_80BF6D8_mail_related: @ 812217C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -533948,7 +533948,7 @@ _081221A6:
 	thumb_func_end itemid_80BF6D8_mail_related
 
 	thumb_func_start sub_81221AC
-sub_81221AC: ; 81221AC
+sub_81221AC: @ 81221AC
 	push {lr}
 	bl is_c1_link_related_active
 	cmp r0, 0x1
@@ -533969,7 +533969,7 @@ _081221CA:
 	thumb_func_end sub_81221AC
 
 	thumb_func_start sub_81221D0
-sub_81221D0: ; 81221D0
+sub_81221D0: @ 81221D0
 	push {lr}
 	bl sub_81221AC
 	lsls r0, 24
@@ -533987,7 +533987,7 @@ _081221E8:
 	thumb_func_end sub_81221D0
 
 	thumb_func_start sub_81221EC
-sub_81221EC: ; 81221EC
+sub_81221EC: @ 81221EC
 	push {lr}
 	bl sub_81221D0
 	lsls r0, 24
@@ -534008,7 +534008,7 @@ _08122208:
 	thumb_func_end sub_81221EC
 
 	thumb_func_start atk2D_jumpifarraynotequal
-atk2D_jumpifarraynotequal: ; 812220C
+atk2D_jumpifarraynotequal: @ 812220C
 	push {r4-r6,lr}
 	adds r6, r2, 0
 	ldr r2, [sp, 0x10]
@@ -534056,7 +534056,7 @@ _08122254:
 	thumb_func_end atk2D_jumpifarraynotequal
 
 	thumb_func_start sub_812225C
-sub_812225C: ; 812225C
+sub_812225C: @ 812225C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -534092,7 +534092,7 @@ _08122290:
 	thumb_func_end sub_812225C
 
 	thumb_func_start sub_8122298
-sub_8122298: ; 8122298
+sub_8122298: @ 8122298
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -534173,7 +534173,7 @@ _08122322:
 	thumb_func_end sub_8122298
 
 	thumb_func_start sub_8122328
-sub_8122328: ; 8122328
+sub_8122328: @ 8122328
 	push {lr}
 	ldr r0, =gUnknown_0859F514
 	bl LoadCompressedObjectPic
@@ -534185,7 +534185,7 @@ sub_8122328: ; 8122328
 	thumb_func_end sub_8122328
 
 	thumb_func_start sub_8122344
-sub_8122344: ; 8122344
+sub_8122344: @ 8122344
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -534240,7 +534240,7 @@ _0812239C:
 	thumb_func_end sub_8122344
 
 	thumb_func_start sub_81223B0
-sub_81223B0: ; 81223B0
+sub_81223B0: @ 81223B0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -534283,7 +534283,7 @@ _081223F6:
 	thumb_func_end sub_81223B0
 
 	thumb_func_start sub_81223FC
-sub_81223FC: ; 81223FC
+sub_81223FC: @ 81223FC
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -534326,8 +534326,8 @@ _0812243E:
 	thumb_func_end sub_81223FC
 
 	thumb_func_start sub_8122448
-; void sub_8122448(int a1, u8 a2, u16 x, u16 y)
-sub_8122448: ; 8122448
+@ void sub_8122448(int a1, u8 a2, u16 x, u16 y)
+sub_8122448: @ 8122448
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -534404,7 +534404,7 @@ _081224C8:
 	thumb_func_end sub_8122448
 
 	thumb_func_start sub_81224D4
-sub_81224D4: ; 81224D4
+sub_81224D4: @ 81224D4
 	push {r4-r7,lr}
 	movs r6, 0
 	ldr r5, =0x03005d8c
@@ -534478,7 +534478,7 @@ _08122522:
 	thumb_func_end sub_81224D4
 
 	thumb_func_start sub_8122580
-sub_8122580: ; 8122580
+sub_8122580: @ 8122580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -534654,7 +534654,7 @@ _081226BE:
 	thumb_func_end sub_8122580
 
 	thumb_func_start sub_81226D8
-sub_81226D8: ; 81226D8
+sub_81226D8: @ 81226D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -534798,7 +534798,7 @@ _081227F4:
 	thumb_func_end sub_81226D8
 
 	thumb_func_start sub_8122804
-sub_8122804: ; 8122804
+sub_8122804: @ 8122804
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -534865,7 +534865,7 @@ _0812286C:
 	thumb_func_end sub_8122804
 
 	thumb_func_start sub_812287C
-sub_812287C: ; 812287C
+sub_812287C: @ 812287C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -535009,7 +535009,7 @@ _08122980:
 	thumb_func_end sub_812287C
 
 	thumb_func_start sub_8122998
-sub_8122998: ; 8122998
+sub_8122998: @ 8122998
 	push {lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x020375e0
@@ -535029,7 +535029,7 @@ sub_8122998: ; 8122998
 	thumb_func_end sub_8122998
 
 	thumb_func_start sub_81229C8
-sub_81229C8: ; 81229C8
+sub_81229C8: @ 81229C8
 	push {r4,lr}
 	movs r4, 0
 	ldr r0, =0x03005d8c
@@ -535074,7 +535074,7 @@ _08122A0C:
 	thumb_func_end sub_81229C8
 
 	thumb_func_start sub_8122A30
-sub_8122A30: ; 8122A30
+sub_8122A30: @ 8122A30
 	ldr r2, =0x020375f0
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -535093,7 +535093,7 @@ sub_8122A30: ; 8122A30
 	thumb_func_end sub_8122A30
 
 	thumb_func_start atk90_changetypestoenemyattacktype
-atk90_changetypestoenemyattacktype: ; 8122A58
+atk90_changetypestoenemyattacktype: @ 8122A58
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -535209,7 +535209,7 @@ _08122B22:
 	thumb_func_end atk90_changetypestoenemyattacktype
 
 	thumb_func_start sub_8122B28
-sub_8122B28: ; 8122B28
+sub_8122B28: @ 8122B28
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl GenerateRandomNumber
@@ -535271,7 +535271,7 @@ _08122B6A:
 	thumb_func_end sub_8122B28
 
 	thumb_func_start sub_8122BB0
-sub_8122BB0: ; 8122BB0
+sub_8122BB0: @ 8122BB0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -535304,7 +535304,7 @@ _08122BE8:
 	thumb_func_end sub_8122BB0
 
 	thumb_func_start sub_8122BF0
-sub_8122BF0: ; 8122BF0
+sub_8122BF0: @ 8122BF0
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -535332,7 +535332,7 @@ _08122C14:
 	thumb_func_end sub_8122BF0
 
 	thumb_func_start sub_8122C1C
-sub_8122C1C: ; 8122C1C
+sub_8122C1C: @ 8122C1C
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -535371,7 +535371,7 @@ _08122C56:
 	thumb_func_end sub_8122C1C
 
 	thumb_func_start sub_8122C5C
-sub_8122C5C: ; 8122C5C
+sub_8122C5C: @ 8122C5C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -535404,7 +535404,7 @@ _08122C8E:
 	thumb_func_end sub_8122C5C
 
 	thumb_func_start sub_8122C94
-sub_8122C94: ; 8122C94
+sub_8122C94: @ 8122C94
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -535426,8 +535426,8 @@ _08122CB6:
 	thumb_func_end sub_8122C94
 
 	thumb_func_start sub_8122CBC
-; warpdata *sub_8122CBC(int a1)
-sub_8122CBC: ; 8122CBC
+@ warpdata *sub_8122CBC(int a1)
+sub_8122CBC: @ 8122CBC
 	push {lr}
 	cmp r0, 0
 	beq _08122CD4
@@ -535446,7 +535446,7 @@ _08122CD6:
 	thumb_func_end sub_8122CBC
 
 	thumb_func_start sub_8122CDC
-sub_8122CDC: ; 8122CDC
+sub_8122CDC: @ 8122CDC
 	push {lr}
 	lsls r2, r1, 24
 	lsrs r2, 24
@@ -535462,7 +535462,7 @@ _08122CE8:
 	thumb_func_end sub_8122CDC
 
 	thumb_func_start sub_8122CF8
-sub_8122CF8: ; 8122CF8
+sub_8122CF8: @ 8122CF8
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r2, 24
@@ -535535,7 +535535,7 @@ _08122D80:
 	thumb_func_end sub_8122CF8
 
 	thumb_func_start sub_8122D88
-sub_8122D88: ; 8122D88
+sub_8122D88: @ 8122D88
 	push {r4,lr}
 	ldr r4, =0x0203a144
 	str r0, [r4]
@@ -535557,7 +535557,7 @@ sub_8122D88: ; 8122D88
 	thumb_func_end sub_8122D88
 
 	thumb_func_start sub_8122DB0
-sub_8122DB0: ; 8122DB0
+sub_8122DB0: @ 8122DB0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x0203a144
@@ -535839,7 +535839,7 @@ _08123022:
 	thumb_func_end sub_8122DB0
 
 	thumb_func_start sub_8123030
-sub_8123030: ; 8123030
+sub_8123030: @ 8123030
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 16
@@ -535859,7 +535859,7 @@ sub_8123030: ; 8123030
 	thumb_func_end sub_8123030
 
 	thumb_func_start sub_812305C
-sub_812305C: ; 812305C
+sub_812305C: @ 812305C
 	push {r4,lr}
 	ldr r4, =0x0203a144
 	ldr r0, [r4]
@@ -535897,7 +535897,7 @@ _081230A0:
 	thumb_func_end sub_812305C
 
 	thumb_func_start sub_81230AC
-sub_81230AC: ; 81230AC
+sub_81230AC: @ 81230AC
 	push {lr}
 	ldr r0, =0x0203a144
 	ldr r0, [r0]
@@ -535911,7 +535911,7 @@ sub_81230AC: ; 81230AC
 	thumb_func_end sub_81230AC
 
 	thumb_func_start sub_81230C4
-sub_81230C4: ; 81230C4
+sub_81230C4: @ 81230C4
 	push {r4,lr}
 	movs r4, 0
 	ldr r2, =0x0203a144
@@ -536019,7 +536019,7 @@ _08123184:
 	thumb_func_end sub_81230C4
 
 	thumb_func_start _swiopen
-_swiopen: ; 8123190
+_swiopen: @ 8123190
 	push {r4,r5,lr}
 	ldr r5, =0x0203a144
 	ldr r1, [r5]
@@ -536121,7 +536121,7 @@ _08123248:
 	thumb_func_end _swiopen
 
 	thumb_func_start sub_8123254
-sub_8123254: ; 8123254
+sub_8123254: @ 8123254
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r3, =0x0203a144
@@ -536236,7 +536236,7 @@ _0812331A:
 	thumb_func_end sub_8123254
 
 	thumb_func_start sub_8123334
-sub_8123334: ; 8123334
+sub_8123334: @ 8123334
 	push {r4,r5,lr}
 	ldr r5, =0x0203a144
 	ldr r2, [r5]
@@ -536352,7 +536352,7 @@ _08123412:
 	thumb_func_end sub_8123334
 
 	thumb_func_start sub_8123418
-sub_8123418: ; 8123418
+sub_8123418: @ 8123418
 	push {r4-r6,lr}
 	ldr r1, =0x0203a144
 	ldr r2, [r1]
@@ -536482,7 +536482,7 @@ _081234FA:
 	thumb_func_end sub_8123418
 
 	thumb_func_start sub_8123514
-sub_8123514: ; 8123514
+sub_8123514: @ 8123514
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r0, =0x0203a144
@@ -536706,7 +536706,7 @@ _081236B8:
 	thumb_func_end sub_8123514
 
 	thumb_func_start sub_81236C4
-sub_81236C4: ; 81236C4
+sub_81236C4: @ 81236C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -536806,7 +536806,7 @@ sub_81236C4: ; 81236C4
 	thumb_func_end sub_81236C4
 
 	thumb_func_start sub_812378C
-sub_812378C: ; 812378C
+sub_812378C: @ 812378C
 	ldr r2, =0x0203a144
 	ldr r2, [r2]
 	lsls r0, 16
@@ -536829,7 +536829,7 @@ sub_812378C: ; 812378C
 	thumb_func_end sub_812378C
 
 	thumb_func_start sub_81237B4
-sub_81237B4: ; 81237B4
+sub_81237B4: @ 81237B4
 	push {r4,lr}
 	ldr r4, =0x0203a144
 	ldr r1, [r4]
@@ -536881,7 +536881,7 @@ _0812381A:
 	thumb_func_end sub_81237B4
 
 	thumb_func_start sub_8123824
-sub_8123824: ; 8123824
+sub_8123824: @ 8123824
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 16
@@ -536919,7 +536919,7 @@ _08123860:
 	thumb_func_end sub_8123824
 
 	thumb_func_start sub_812386C
-sub_812386C: ; 812386C
+sub_812386C: @ 812386C
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -536955,7 +536955,7 @@ _081238A4:
 	thumb_func_end sub_812386C
 
 	thumb_func_start sub_81238AC
-sub_81238AC: ; 81238AC
+sub_81238AC: @ 81238AC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -537360,7 +537360,7 @@ _08123BEC:
 	thumb_func_end sub_81238AC
 
 	thumb_func_start sub_8123C00
-sub_8123C00: ; 8123C00
+sub_8123C00: @ 8123C00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -537523,7 +537523,7 @@ _08123D10:
 	thumb_func_end sub_8123C00
 
 	thumb_func_start get_flagnr_blue_points
-get_flagnr_blue_points: ; 8123D58
+get_flagnr_blue_points: @ 8123D58
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -537695,7 +537695,7 @@ _08123E96:
 	thumb_func_end get_flagnr_blue_points
 
 	thumb_func_start sub_8123E9C
-sub_8123E9C: ; 8123E9C
+sub_8123E9C: @ 8123E9C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -537709,7 +537709,7 @@ sub_8123E9C: ; 8123E9C
 	thumb_func_end sub_8123E9C
 
 	thumb_func_start sub_8123EB4
-sub_8123EB4: ; 8123EB4
+sub_8123EB4: @ 8123EB4
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -537755,7 +537755,7 @@ _08123F00:
 	thumb_func_end sub_8123EB4
 
 	thumb_func_start sub_8123F04
-sub_8123F04: ; 8123F04
+sub_8123F04: @ 8123F04
 	push {lr}
 	ldr r0, =0x00004037
 	bl VarGet
@@ -537777,7 +537777,7 @@ _08123F18:
 	thumb_func_end sub_8123F04
 
 	thumb_func_start sub_8123F30
-sub_8123F30: ; 8123F30
+sub_8123F30: @ 8123F30
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -537810,7 +537810,7 @@ _08123F4C:
 	thumb_func_end sub_8123F30
 
 	thumb_func_start sub_8123F74
-sub_8123F74: ; 8123F74
+sub_8123F74: @ 8123F74
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -537835,7 +537835,7 @@ _08123F98:
 	thumb_func_end sub_8123F74
 
 	thumb_func_start sub_8123F9C
-sub_8123F9C: ; 8123F9C
+sub_8123F9C: @ 8123F9C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -537847,7 +537847,7 @@ sub_8123F9C: ; 8123F9C
 	thumb_func_end sub_8123F9C
 
 	thumb_func_start sub_8123FB0
-sub_8123FB0: ; 8123FB0
+sub_8123FB0: @ 8123FB0
 	push {r4-r6,lr}
 	ldr r0, =0x0203a144
 	ldr r1, [r0]
@@ -537919,7 +537919,7 @@ _0812402E:
 	thumb_func_end sub_8123FB0
 
 	thumb_func_start sub_8124038
-sub_8124038: ; 8124038
+sub_8124038: @ 8124038
 	push {r4,r5,lr}
 	lsls r0, 16
 	ldr r1, =0xffff0000
@@ -537961,7 +537961,7 @@ _0812407C:
 	thumb_func_end sub_8124038
 
 	thumb_func_start sub_8124088
-sub_8124088: ; 8124088
+sub_8124088: @ 8124088
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a144
@@ -538001,12 +538001,12 @@ _081240C6:
 	thumb_func_end sub_8124088
 
 	thumb_func_start nullsub_48
-nullsub_48: ; 81240D0
+nullsub_48: @ 81240D0
 	bx lr
 	thumb_func_end nullsub_48
 
 	thumb_func_start sub_81240D4
-sub_81240D4: ; 81240D4
+sub_81240D4: @ 81240D4
 	push {r4-r7,lr}
 	sub sp, 0x28
 	lsls r0, 16
@@ -538171,7 +538171,7 @@ _08124228:
 	thumb_func_end sub_81240D4
 
 	thumb_func_start sub_8124238
-sub_8124238: ; 8124238
+sub_8124238: @ 8124238
 	push {r4,lr}
 	ldr r4, =0x0203a144
 	ldr r0, [r4]
@@ -538195,7 +538195,7 @@ _0812425C:
 	thumb_func_end sub_8124238
 
 	thumb_func_start sub_8124268
-sub_8124268: ; 8124268
+sub_8124268: @ 8124268
 	ldr r0, =0x0203a144
 	ldr r0, [r0]
 	ldr r1, [r0, 0x1C]
@@ -538206,7 +538206,7 @@ sub_8124268: ; 8124268
 	thumb_func_end sub_8124268
 
 	thumb_func_start sub_8124278
-sub_8124278: ; 8124278
+sub_8124278: @ 8124278
 	ldr r0, =0x0203a144
 	ldr r0, [r0]
 	ldr r1, [r0, 0x1C]
@@ -538217,7 +538217,7 @@ sub_8124278: ; 8124278
 	thumb_func_end sub_8124278
 
 	thumb_func_start sub_8124288
-sub_8124288: ; 8124288
+sub_8124288: @ 8124288
 	push {r4-r6,lr}
 	sub sp, 0x28
 	lsls r0, 16
@@ -538340,7 +538340,7 @@ _081243A4:
 	thumb_func_end sub_8124288
 
 	thumb_func_start sub_81243B0
-sub_81243B0: ; 81243B0
+sub_81243B0: @ 81243B0
 	push {lr}
 	ldr r3, =0x0203a144
 	ldr r0, [r3]
@@ -538363,7 +538363,7 @@ _081243CE:
 	thumb_func_end sub_81243B0
 
 	thumb_func_start sub_81243DC
-sub_81243DC: ; 81243DC
+sub_81243DC: @ 81243DC
 	push {lr}
 	ldr r0, =0x0203a144
 	ldr r3, [r0]
@@ -538428,7 +538428,7 @@ _08124452:
 	thumb_func_end sub_81243DC
 
 	thumb_func_start sub_812445C
-sub_812445C: ; 812445C
+sub_812445C: @ 812445C
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203a144
@@ -538506,7 +538506,7 @@ _081244E4:
 	thumb_func_end sub_812445C
 
 	thumb_func_start sub_81244EC
-sub_81244EC: ; 81244EC
+sub_81244EC: @ 81244EC
 	push {lr}
 	bl sub_81244F8
 	pop {r0}
@@ -538514,7 +538514,7 @@ sub_81244EC: ; 81244EC
 	thumb_func_end sub_81244EC
 
 	thumb_func_start sub_81244F8
-sub_81244F8: ; 81244F8
+sub_81244F8: @ 81244F8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a144
@@ -538560,7 +538560,7 @@ _08124548:
 	thumb_func_end sub_81244F8
 
 	thumb_func_start sub_812454C
-sub_812454C: ; 812454C
+sub_812454C: @ 812454C
 	push {lr}
 	ldr r0, =0x0203a144
 	ldr r1, [r0]
@@ -538579,8 +538579,8 @@ _08124562:
 	thumb_func_end sub_812454C
 
 	thumb_func_start GetMapName
-; u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
-GetMapName: ; 812456C
+@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
+GetMapName: @ 812456C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -538644,7 +538644,7 @@ _081245D6:
 	thumb_func_end GetMapName
 
 	thumb_func_start sub_81245DC
-sub_81245DC: ; 81245DC
+sub_81245DC: @ 81245DC
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -538670,7 +538670,7 @@ _0812460A:
 	thumb_func_end sub_81245DC
 
 	thumb_func_start sub_8124610
-sub_8124610: ; 8124610
+sub_8124610: @ 8124610
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -538688,7 +538688,7 @@ _08124626:
 	thumb_func_end sub_8124610
 
 	thumb_func_start sub_8124630
-sub_8124630: ; 8124630
+sub_8124630: @ 8124630
 	push {r4,r5,lr}
 	ldr r5, [sp, 0xC]
 	lsls r0, 16
@@ -538710,7 +538710,7 @@ sub_8124630: ; 8124630
 	thumb_func_end sub_8124630
 
 	thumb_func_start sub_8124658
-sub_8124658: ; 8124658
+sub_8124658: @ 8124658
 	ldr r0, =0x0203a144
 	ldr r0, [r0]
 	adds r0, 0x78
@@ -538720,7 +538720,7 @@ sub_8124658: ; 8124658
 	thumb_func_end sub_8124658
 
 	thumb_func_start sub_8124668
-sub_8124668: ; 8124668
+sub_8124668: @ 8124668
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -538745,7 +538745,7 @@ _0812468C:
 	thumb_func_end sub_8124668
 
 	thumb_func_start sub_8124690
-sub_8124690: ; 8124690
+sub_8124690: @ 8124690
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -538954,7 +538954,7 @@ _081248AA:
 	thumb_func_end sub_8124690
 
 	thumb_func_start sub_81248C0
-sub_81248C0: ; 81248C0
+sub_81248C0: @ 81248C0
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -538964,7 +538964,7 @@ sub_81248C0: ; 81248C0
 	thumb_func_end sub_81248C0
 
 	thumb_func_start sub_81248D4
-sub_81248D4: ; 81248D4
+sub_81248D4: @ 81248D4
 	push {lr}
 	ldr r0, =0x0203a148
 	ldr r0, [r0]
@@ -538979,7 +538979,7 @@ sub_81248D4: ; 81248D4
 	thumb_func_end sub_81248D4
 
 	thumb_func_start sub_81248F4
-sub_81248F4: ; 81248F4
+sub_81248F4: @ 81248F4
 	ldr r1, =0x0203a148
 	ldr r1, [r1]
 	str r0, [r1]
@@ -538990,7 +538990,7 @@ sub_81248F4: ; 81248F4
 	thumb_func_end sub_81248F4
 
 	thumb_func_start sub_8124904
-sub_8124904: ; 8124904
+sub_8124904: @ 8124904
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r2, =0x0203a148
@@ -539154,7 +539154,7 @@ _08124A62:
 	thumb_func_end sub_8124904
 
 	thumb_func_start sub_8124A70
-sub_8124A70: ; 8124A70
+sub_8124A70: @ 8124A70
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_085A1D68
@@ -539192,7 +539192,7 @@ sub_8124A70: ; 8124A70
 	thumb_func_end sub_8124A70
 
 	thumb_func_start sub_8124AD4
-sub_8124AD4: ; 8124AD4
+sub_8124AD4: @ 8124AD4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -539327,7 +539327,7 @@ _08124BB8:
 	thumb_func_end sub_8124AD4
 
 	thumb_func_start sub_8124BE4
-sub_8124BE4: ; 8124BE4
+sub_8124BE4: @ 8124BE4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -539431,7 +539431,7 @@ _08124C9C:
 	thumb_func_end sub_8124BE4
 
 	thumb_func_start sub_8124CBC
-sub_8124CBC: ; 8124CBC
+sub_8124CBC: @ 8124CBC
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203a148
@@ -539479,7 +539479,7 @@ _08124D0E:
 	thumb_func_end sub_8124CBC
 
 	thumb_func_start sub_8124D14
-sub_8124D14: ; 8124D14
+sub_8124D14: @ 8124D14
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203a148
@@ -539520,7 +539520,7 @@ _08124D56:
 	thumb_func_end sub_8124D14
 
 	thumb_func_start sub_8124D64
-sub_8124D64: ; 8124D64
+sub_8124D64: @ 8124D64
 	push {r4,lr}
 	ldr r0, =0x0203a148
 	ldr r0, [r0]
@@ -539588,7 +539588,7 @@ _08124DF8:
 	thumb_func_end sub_8124D64
 
 	thumb_func_start sub_8124E0C
-sub_8124E0C: ; 8124E0C
+sub_8124E0C: @ 8124E0C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203a148
@@ -539726,7 +539726,7 @@ _08124F1A:
 	thumb_func_end sub_8124E0C
 
 	thumb_func_start sub_8124F2C
-sub_8124F2C: ; 8124F2C
+sub_8124F2C: @ 8124F2C
 	push {lr}
 	ldr r2, =0x03006168
 	ldr r1, [r0, 0x4]
@@ -539862,7 +539862,7 @@ _081250B4:
 	thumb_func_end sub_8124F2C
 
 	thumb_func_start sub_81250B8
-sub_81250B8: ; 81250B8
+sub_81250B8: @ 81250B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -539953,7 +539953,7 @@ _0812514A:
 	thumb_func_end sub_81250B8
 
 	thumb_func_start sub_8125170
-sub_8125170: ; 8125170
+sub_8125170: @ 8125170
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -540047,7 +540047,7 @@ _08125208:
 	thumb_func_end sub_8125170
 
 	thumb_func_start sub_8125230
-sub_8125230: ; 8125230
+sub_8125230: @ 8125230
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x00000c7f
@@ -540065,7 +540065,7 @@ _08125236:
 	thumb_func_end sub_8125230
 
 	thumb_func_start sub_8125250
-sub_8125250: ; 8125250
+sub_8125250: @ 8125250
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540137,7 +540137,7 @@ _081252C2:
 	thumb_func_end sub_8125250
 
 	thumb_func_start sub_81252E8
-sub_81252E8: ; 81252E8
+sub_81252E8: @ 81252E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540227,7 +540227,7 @@ _0812537E:
 	thumb_func_end sub_81252E8
 
 	thumb_func_start sub_81253A4
-sub_81253A4: ; 81253A4
+sub_81253A4: @ 81253A4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -540305,7 +540305,7 @@ _08125420:
 	thumb_func_end sub_81253A4
 
 	thumb_func_start sub_8125448
-sub_8125448: ; 8125448
+sub_8125448: @ 8125448
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540377,7 +540377,7 @@ _081254BA:
 	thumb_func_end sub_8125448
 
 	thumb_func_start sub_81254E0
-sub_81254E0: ; 81254E0
+sub_81254E0: @ 81254E0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -540538,7 +540538,7 @@ _0812560C:
 	thumb_func_end sub_81254E0
 
 	thumb_func_start sub_8125630
-sub_8125630: ; 8125630
+sub_8125630: @ 8125630
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540610,7 +540610,7 @@ _081256A2:
 	thumb_func_end sub_8125630
 
 	thumb_func_start sub_81256C8
-sub_81256C8: ; 81256C8
+sub_81256C8: @ 81256C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -540772,7 +540772,7 @@ _081257D0:
 	thumb_func_end sub_81256C8
 
 	thumb_func_start sub_81257F8
-sub_81257F8: ; 81257F8
+sub_81257F8: @ 81257F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540852,7 +540852,7 @@ _0812587A:
 	thumb_func_end sub_81257F8
 
 	thumb_func_start sub_81258A0
-sub_81258A0: ; 81258A0
+sub_81258A0: @ 81258A0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -540938,7 +540938,7 @@ _0812592E:
 	thumb_func_end sub_81258A0
 
 	thumb_func_start sub_8125954
-sub_8125954: ; 8125954
+sub_8125954: @ 8125954
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -541192,7 +541192,7 @@ _08125B16:
 	thumb_func_end sub_8125954
 
 	thumb_func_start sub_8125B28
-sub_8125B28: ; 8125B28
+sub_8125B28: @ 8125B28
 	ldrh r2, [r0]
 	movs r0, 0x1F
 	adds r1, r2, 0
@@ -541222,7 +541222,7 @@ sub_8125B28: ; 8125B28
 	thumb_func_end sub_8125B28
 
 	thumb_func_start sub_8125B5C
-sub_8125B5C: ; 8125B5C
+sub_8125B5C: @ 8125B5C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -541256,7 +541256,7 @@ _08125B8E:
 	thumb_func_end sub_8125B5C
 
 	thumb_func_start sub_8125B98
-sub_8125B98: ; 8125B98
+sub_8125B98: @ 8125B98
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -541364,7 +541364,7 @@ _08125C50:
 	thumb_func_end sub_8125B98
 
 	thumb_func_start sub_8125C68
-sub_8125C68: ; 8125C68
+sub_8125C68: @ 8125C68
 	push {lr}
 	ldrh r0, [r0]
 	movs r2, 0x1F
@@ -541392,7 +541392,7 @@ _08125C8E:
 	thumb_func_end sub_8125C68
 
 	thumb_func_start sub_8125C98
-sub_8125C98: ; 8125C98
+sub_8125C98: @ 8125C98
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r3, [r4]
@@ -541423,7 +541423,7 @@ _08125CC2:
 	thumb_func_end sub_8125C98
 
 	thumb_func_start sub_8125CC8
-sub_8125CC8: ; 8125CC8
+sub_8125CC8: @ 8125CC8
 	push {r4,lr}
 	ldrh r1, [r0]
 	movs r0, 0x1F
@@ -541449,7 +541449,7 @@ sub_8125CC8: ; 8125CC8
 	thumb_func_end sub_8125CC8
 
 	thumb_func_start sub_8125CF4
-sub_8125CF4: ; 8125CF4
+sub_8125CF4: @ 8125CF4
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r7, r1, 0
@@ -541610,7 +541610,7 @@ _08125E10:
 	thumb_func_end sub_8125CF4
 
 	thumb_func_start sub_8125E18
-sub_8125E18: ; 8125E18
+sub_8125E18: @ 8125E18
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -541760,7 +541760,7 @@ _08125F28:
 	thumb_func_end sub_8125E18
 
 	thumb_func_start sub_8125F38
-sub_8125F38: ; 8125F38
+sub_8125F38: @ 8125F38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -541909,7 +541909,7 @@ _08126046:
 	thumb_func_end sub_8125F38
 
 	thumb_func_start sub_8126058
-sub_8126058: ; 8126058
+sub_8126058: @ 8126058
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -542089,7 +542089,7 @@ _08126194:
 	thumb_func_end sub_8126058
 
 	thumb_func_start sub_81261A4
-sub_81261A4: ; 81261A4
+sub_81261A4: @ 81261A4
 	push {lr}
 	ldr r2, =0x03006188
 	ldrb r1, [r0, 0x18]
@@ -542168,7 +542168,7 @@ _0812626A:
 	thumb_func_end sub_81261A4
 
 	thumb_func_start sub_8126270
-sub_8126270: ; 8126270
+sub_8126270: @ 8126270
 	ldr r2, =0x03006184
 	ldr r1, [r2]
 	movs r0, 0
@@ -542224,7 +542224,7 @@ sub_8126270: ; 8126270
 	thumb_func_end sub_8126270
 
 	thumb_func_start sub_8126318
-sub_8126318: ; 8126318
+sub_8126318: @ 8126318
 	ldr r2, =0x03006184
 	ldr r0, [r2]
 	movs r1, 0
@@ -542239,7 +542239,7 @@ sub_8126318: ; 8126318
 	thumb_func_end sub_8126318
 
 	thumb_func_start sub_8126334
-sub_8126334: ; 8126334
+sub_8126334: @ 8126334
 	push {r4,r5,lr}
 	ldr r1, =0x03006184
 	ldr r0, [r1]
@@ -542272,7 +542272,7 @@ _08126346:
 	thumb_func_end sub_8126334
 
 	thumb_func_start sub_8126370
-sub_8126370: ; 8126370
+sub_8126370: @ 8126370
 	push {r4,lr}
 	ldr r2, =0x03006184
 	ldr r1, [r2]
@@ -542301,7 +542301,7 @@ _0812637E:
 	thumb_func_end sub_8126370
 
 	thumb_func_start sub_81263A4
-sub_81263A4: ; 81263A4
+sub_81263A4: @ 81263A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -542465,7 +542465,7 @@ _081264E4:
 	thumb_func_end sub_81263A4
 
 	thumb_func_start sub_81264FC
-sub_81264FC: ; 81264FC
+sub_81264FC: @ 81264FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -542551,7 +542551,7 @@ _081265A0:
 	thumb_func_end sub_81264FC
 
 	thumb_func_start sub_81265B4
-sub_81265B4: ; 81265B4
+sub_81265B4: @ 81265B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -542632,7 +542632,7 @@ _08126650:
 	thumb_func_end sub_81265B4
 
 	thumb_func_start sub_8126664
-sub_8126664: ; 8126664
+sub_8126664: @ 8126664
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -542713,7 +542713,7 @@ _08126700:
 	thumb_func_end sub_8126664
 
 	thumb_func_start sub_8126714
-sub_8126714: ; 8126714
+sub_8126714: @ 8126714
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -542794,7 +542794,7 @@ _081267B0:
 	thumb_func_end sub_8126714
 
 	thumb_func_start sub_81267C4
-sub_81267C4: ; 81267C4
+sub_81267C4: @ 81267C4
 	push {r4,lr}
 	ldrh r0, [r0]
 	movs r1, 0x1F
@@ -542865,7 +542865,7 @@ _08126828:
 	thumb_func_end sub_81267C4
 
 	thumb_func_start sub_8126838
-sub_8126838: ; 8126838
+sub_8126838: @ 8126838
 	push {lr}
 	ldrh r0, [r0]
 	movs r1, 0x1F
@@ -542994,7 +542994,7 @@ _08126902:
 	thumb_func_end sub_8126838
 
 	thumb_func_start sub_8126908
-sub_8126908: ; 8126908
+sub_8126908: @ 8126908
 	push {lr}
 	ldrh r1, [r0]
 	movs r3, 0x1F
@@ -543024,7 +543024,7 @@ _08126936:
 	thumb_func_end sub_8126908
 
 	thumb_func_start sub_812693C
-sub_812693C: ; 812693C
+sub_812693C: @ 812693C
 	push {lr}
 	ldrh r1, [r0]
 	movs r3, 0x1F
@@ -543049,7 +543049,7 @@ sub_812693C: ; 812693C
 	thumb_func_end sub_812693C
 
 	thumb_func_start sub_8126968
-sub_8126968: ; 8126968
+sub_8126968: @ 8126968
 	push {lr}
 	ldr r3, =0x0203a173
 	ldrb r0, [r3]
@@ -543093,7 +543093,7 @@ _081269AC:
 	thumb_func_end sub_8126968
 
 	thumb_func_start sub_81269D4
-sub_81269D4: ; 81269D4
+sub_81269D4: @ 81269D4
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -543153,7 +543153,7 @@ _08126A2E:
 	thumb_func_end sub_81269D4
 
 	thumb_func_start sub_8126A58
-sub_8126A58: ; 8126A58
+sub_8126A58: @ 8126A58
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543176,7 +543176,7 @@ sub_8126A58: ; 8126A58
 	thumb_func_end sub_8126A58
 
 	thumb_func_start sub_8126A88
-sub_8126A88: ; 8126A88
+sub_8126A88: @ 8126A88
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81269D4
@@ -543199,7 +543199,7 @@ sub_8126A88: ; 8126A88
 	thumb_func_end sub_8126A88
 
 	thumb_func_start sub_8126ABC
-sub_8126ABC: ; 8126ABC
+sub_8126ABC: @ 8126ABC
 	push {lr}
 	ldr r1, =0x0203a150
 	movs r0, 0
@@ -543213,7 +543213,7 @@ sub_8126ABC: ; 8126ABC
 	thumb_func_end sub_8126ABC
 
 	thumb_func_start sub_8126AD8
-sub_8126AD8: ; 8126AD8
+sub_8126AD8: @ 8126AD8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543246,7 +543246,7 @@ sub_8126AD8: ; 8126AD8
 	thumb_func_end sub_8126AD8
 
 	thumb_func_start sub_8126B2C
-sub_8126B2C: ; 8126B2C
+sub_8126B2C: @ 8126B2C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543279,7 +543279,7 @@ sub_8126B2C: ; 8126B2C
 	thumb_func_end sub_8126B2C
 
 	thumb_func_start sub_8126B80
-sub_8126B80: ; 8126B80
+sub_8126B80: @ 8126B80
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543339,7 +543339,7 @@ _08126C00:
 	thumb_func_end sub_8126B80
 
 	thumb_func_start sub_8126C08
-sub_8126C08: ; 8126C08
+sub_8126C08: @ 8126C08
 	push {lr}
 	sub sp, 0x10
 	movs r0, 0
@@ -543370,7 +543370,7 @@ sub_8126C08: ; 8126C08
 	thumb_func_end sub_8126C08
 
 	thumb_func_start sub_8126C48
-sub_8126C48: ; 8126C48
+sub_8126C48: @ 8126C48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543409,7 +543409,7 @@ _08126C96:
 	thumb_func_end sub_8126C48
 
 	thumb_func_start sub_8126CA4
-sub_8126CA4: ; 8126CA4
+sub_8126CA4: @ 8126CA4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543454,7 +543454,7 @@ _08126D00:
 	thumb_func_end sub_8126CA4
 
 	thumb_func_start sub_8126D10
-sub_8126D10: ; 8126D10
+sub_8126D10: @ 8126D10
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543493,7 +543493,7 @@ _08126D5E:
 	thumb_func_end sub_8126D10
 
 	thumb_func_start sub_8126D6C
-sub_8126D6C: ; 8126D6C
+sub_8126D6C: @ 8126D6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -543519,7 +543519,7 @@ _08126D9E:
 	thumb_func_end sub_8126D6C
 
 	thumb_func_start sub_8126DA4
-sub_8126DA4: ; 8126DA4
+sub_8126DA4: @ 8126DA4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543539,7 +543539,7 @@ sub_8126DA4: ; 8126DA4
 	thumb_func_end sub_8126DA4
 
 	thumb_func_start sub_8126DCC
-sub_8126DCC: ; 8126DCC
+sub_8126DCC: @ 8126DCC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543562,7 +543562,7 @@ sub_8126DCC: ; 8126DCC
 	thumb_func_end sub_8126DCC
 
 	thumb_func_start sub_8126DFC
-sub_8126DFC: ; 8126DFC
+sub_8126DFC: @ 8126DFC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -543593,7 +543593,7 @@ sub_8126DFC: ; 8126DFC
 	thumb_func_end sub_8126DFC
 
 	thumb_func_start sub_8126E44
-sub_8126E44: ; 8126E44
+sub_8126E44: @ 8126E44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543623,7 +543623,7 @@ sub_8126E44: ; 8126E44
 	thumb_func_end sub_8126E44
 
 	thumb_func_start sub_8126E8C
-sub_8126E8C: ; 8126E8C
+sub_8126E8C: @ 8126E8C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -543726,7 +543726,7 @@ _08126F2C:
 	thumb_func_end sub_8126E8C
 
 	thumb_func_start sub_8126F68
-sub_8126F68: ; 8126F68
+sub_8126F68: @ 8126F68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -543836,7 +543836,7 @@ _08126FA2:
 	thumb_func_end sub_8126F68
 
 	thumb_func_start sub_8127058
-sub_8127058: ; 8127058
+sub_8127058: @ 8127058
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -543862,7 +543862,7 @@ _0812707E:
 	thumb_func_end sub_8127058
 
 	thumb_func_start sub_8127088
-sub_8127088: ; 8127088
+sub_8127088: @ 8127088
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543911,7 +543911,7 @@ _081270DE:
 	thumb_func_end sub_8127088
 
 	thumb_func_start sub_81270E8
-sub_81270E8: ; 81270E8
+sub_81270E8: @ 81270E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -543967,7 +543967,7 @@ _0812716E:
 	thumb_func_end sub_81270E8
 
 	thumb_func_start sub_8127180
-sub_8127180: ; 8127180
+sub_8127180: @ 8127180
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -543983,7 +543983,7 @@ sub_8127180: ; 8127180
 	thumb_func_end sub_8127180
 
 	thumb_func_start sub_812719C
-sub_812719C: ; 812719C
+sub_812719C: @ 812719C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -544009,7 +544009,7 @@ _081271C6:
 	thumb_func_end sub_812719C
 
 	thumb_func_start sub_81271CC
-sub_81271CC: ; 81271CC
+sub_81271CC: @ 81271CC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544035,7 +544035,7 @@ sub_81271CC: ; 81271CC
 	thumb_func_end sub_81271CC
 
 	thumb_func_start sub_8127208
-sub_8127208: ; 8127208
+sub_8127208: @ 8127208
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544066,7 +544066,7 @@ sub_8127208: ; 8127208
 	thumb_func_end sub_8127208
 
 	thumb_func_start sub_8127250
-sub_8127250: ; 8127250
+sub_8127250: @ 8127250
 	push {lr}
 	lsls r1, 24
 	ldr r2, =gUnknown_085A6B28
@@ -544080,7 +544080,7 @@ sub_8127250: ; 8127250
 	thumb_func_end sub_8127250
 
 	thumb_func_start sub_8127268
-sub_8127268: ; 8127268
+sub_8127268: @ 8127268
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544095,7 +544095,7 @@ sub_8127268: ; 8127268
 	thumb_func_end sub_8127268
 
 	thumb_func_start sub_8127284
-sub_8127284: ; 8127284
+sub_8127284: @ 8127284
 	push {lr}
 	ldr r3, =0x0203a18c
 	ldr r2, [r3]
@@ -544128,7 +544128,7 @@ _081272BE:
 	thumb_func_end sub_8127284
 
 	thumb_func_start sub_81272C8
-sub_81272C8: ; 81272C8
+sub_81272C8: @ 81272C8
 	push {r4,lr}
 	ldr r0, =0x0203a170
 	ldr r1, =0x0203a16e
@@ -544148,7 +544148,7 @@ sub_81272C8: ; 81272C8
 	thumb_func_end sub_81272C8
 
 	thumb_func_start sub_81272F8
-sub_81272F8: ; 81272F8
+sub_81272F8: @ 81272F8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203a170
@@ -544172,7 +544172,7 @@ sub_81272F8: ; 81272F8
 	thumb_func_end sub_81272F8
 
 	thumb_func_start sub_8127330
-sub_8127330: ; 8127330
+sub_8127330: @ 8127330
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -544299,7 +544299,7 @@ _081273D6:
 	thumb_func_end sub_8127330
 
 	thumb_func_start sub_8127454
-sub_8127454: ; 8127454
+sub_8127454: @ 8127454
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 16
@@ -544319,7 +544319,7 @@ sub_8127454: ; 8127454
 	thumb_func_end sub_8127454
 
 	thumb_func_start sub_8127480
-sub_8127480: ; 8127480
+sub_8127480: @ 8127480
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -544337,7 +544337,7 @@ _08127492:
 	thumb_func_end sub_8127480
 
 	thumb_func_start sub_81274A0
-sub_81274A0: ; 81274A0
+sub_81274A0: @ 81274A0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -544387,7 +544387,7 @@ _081274F6:
 	thumb_func_end sub_81274A0
 
 	thumb_func_start sub_8127500
-sub_8127500: ; 8127500
+sub_8127500: @ 8127500
 	push {r4,lr}
 	sub sp, 0x10
 	ldr r4, =0x0203a18c
@@ -544428,7 +544428,7 @@ _08127540:
 	thumb_func_end sub_8127500
 
 	thumb_func_start sub_8127554
-sub_8127554: ; 8127554
+sub_8127554: @ 8127554
 	push {r4,lr}
 	ldr r4, =0x0203a18c
 	ldr r0, [r4]
@@ -544451,7 +544451,7 @@ _08127572:
 	thumb_func_end sub_8127554
 
 	thumb_func_start sub_8127580
-sub_8127580: ; 8127580
+sub_8127580: @ 8127580
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544466,7 +544466,7 @@ sub_8127580: ; 8127580
 	thumb_func_end sub_8127580
 
 	thumb_func_start sub_812759C
-sub_812759C: ; 812759C
+sub_812759C: @ 812759C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544511,7 +544511,7 @@ sub_812759C: ; 812759C
 	thumb_func_end sub_812759C
 
 	thumb_func_start sub_8127620
-sub_8127620: ; 8127620
+sub_8127620: @ 8127620
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -544532,7 +544532,7 @@ sub_8127620: ; 8127620
 	thumb_func_end sub_8127620
 
 	thumb_func_start sub_812764C
-sub_812764C: ; 812764C
+sub_812764C: @ 812764C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -544616,7 +544616,7 @@ _08127700:
 	thumb_func_end sub_812764C
 
 	thumb_func_start sub_8127718
-sub_8127718: ; 8127718
+sub_8127718: @ 8127718
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -544640,7 +544640,7 @@ sub_8127718: ; 8127718
 	thumb_func_end sub_8127718
 
 	thumb_func_start sub_8127744
-sub_8127744: ; 8127744
+sub_8127744: @ 8127744
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -544684,7 +544684,7 @@ _08127782:
 	thumb_func_end sub_8127744
 
 	thumb_func_start sub_81277A8
-sub_81277A8: ; 81277A8
+sub_81277A8: @ 81277A8
 	push {lr}
 	movs r0, 0x3
 	bl sub_8126A58
@@ -544695,7 +544695,7 @@ sub_81277A8: ; 81277A8
 	thumb_func_end sub_81277A8
 
 	thumb_func_start sub_81277BC
-sub_81277BC: ; 81277BC
+sub_81277BC: @ 81277BC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -544722,7 +544722,7 @@ _081277E4:
 	thumb_func_end sub_81277BC
 
 	thumb_func_start sub_81277E8
-sub_81277E8: ; 81277E8
+sub_81277E8: @ 81277E8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -544749,7 +544749,7 @@ _08127810:
 	thumb_func_end sub_81277E8
 
 	thumb_func_start sub_8127814
-sub_8127814: ; 8127814
+sub_8127814: @ 8127814
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -544943,7 +544943,7 @@ _0812799A:
 	thumb_func_end sub_8127814
 
 	thumb_func_start sub_81279B4
-sub_81279B4: ; 81279B4
+sub_81279B4: @ 81279B4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -544953,7 +544953,7 @@ sub_81279B4: ; 81279B4
 	thumb_func_end sub_81279B4
 
 	thumb_func_start sub_81279C4
-sub_81279C4: ; 81279C4
+sub_81279C4: @ 81279C4
 	push {r4,lr}
 	movs r2, 0
 	ldr r0, =0x0203a170
@@ -544993,7 +544993,7 @@ _08127A0C:
 	thumb_func_end sub_81279C4
 
 	thumb_func_start sub_8127A14
-sub_8127A14: ; 8127A14
+sub_8127A14: @ 8127A14
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -545008,7 +545008,7 @@ sub_8127A14: ; 8127A14
 	thumb_func_end sub_8127A14
 
 	thumb_func_start sub_8127A30
-sub_8127A30: ; 8127A30
+sub_8127A30: @ 8127A30
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -545030,7 +545030,7 @@ sub_8127A30: ; 8127A30
 	thumb_func_end sub_8127A30
 
 	thumb_func_start sub_8127A5C
-sub_8127A5C: ; 8127A5C
+sub_8127A5C: @ 8127A5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -545055,7 +545055,7 @@ _08127A82:
 	thumb_func_end sub_8127A5C
 
 	thumb_func_start sub_8127A8C
-sub_8127A8C: ; 8127A8C
+sub_8127A8C: @ 8127A8C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -545083,7 +545083,7 @@ sub_8127A8C: ; 8127A8C
 	thumb_func_end sub_8127A8C
 
 	thumb_func_start sub_8127ACC
-sub_8127ACC: ; 8127ACC
+sub_8127ACC: @ 8127ACC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -545110,7 +545110,7 @@ sub_8127ACC: ; 8127ACC
 	thumb_func_end sub_8127ACC
 
 	thumb_func_start sub_8127B04
-sub_8127B04: ; 8127B04
+sub_8127B04: @ 8127B04
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -545147,7 +545147,7 @@ sub_8127B04: ; 8127B04
 	thumb_func_end sub_8127B04
 
 	thumb_func_start sub_8127B54
-sub_8127B54: ; 8127B54
+sub_8127B54: @ 8127B54
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -545178,7 +545178,7 @@ _08127B86:
 	thumb_func_end sub_8127B54
 
 	thumb_func_start sub_8127B90
-sub_8127B90: ; 8127B90
+sub_8127B90: @ 8127B90
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -545394,7 +545394,7 @@ _08127D28:
 	thumb_func_end sub_8127B90
 
 	thumb_func_start sub_8127D38
-sub_8127D38: ; 8127D38
+sub_8127D38: @ 8127D38
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -545507,7 +545507,7 @@ _08127E10:
 	thumb_func_end sub_8127D38
 
 	thumb_func_start sub_8127E18
-sub_8127E18: ; 8127E18
+sub_8127E18: @ 8127E18
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -545635,7 +545635,7 @@ _08127F26:
 	thumb_func_end sub_8127E18
 
 	thumb_func_start sub_8127F38
-sub_8127F38: ; 8127F38
+sub_8127F38: @ 8127F38
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x0203a17c
@@ -545665,7 +545665,7 @@ _08127F64:
 	thumb_func_end sub_8127F38
 
 	thumb_func_start sub_8127F68
-sub_8127F68: ; 8127F68
+sub_8127F68: @ 8127F68
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -545757,7 +545757,7 @@ _0812804C:
 	thumb_func_end sub_8127F68
 
 	thumb_func_start sub_8128060
-sub_8128060: ; 8128060
+sub_8128060: @ 8128060
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -545839,7 +545839,7 @@ _08128112:
 	thumb_func_end sub_8128060
 
 	thumb_func_start ConfigureCameraObjectForPlacingDecoration
-ConfigureCameraObjectForPlacingDecoration: ; 8128118
+ConfigureCameraObjectForPlacingDecoration: @ 8128118
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -545905,7 +545905,7 @@ ConfigureCameraObjectForPlacingDecoration: ; 8128118
 	thumb_func_end ConfigureCameraObjectForPlacingDecoration
 
 	thumb_func_start SetUpPlacingDecorationPlayerAvatar
-SetUpPlacingDecorationPlayerAvatar: ; 81281A8
+SetUpPlacingDecorationPlayerAvatar: @ 81281A8
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -545993,7 +545993,7 @@ _08128214:
 	thumb_func_end SetUpPlacingDecorationPlayerAvatar
 
 	thumb_func_start sub_812826C
-sub_812826C: ; 812826C
+sub_812826C: @ 812826C
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -546144,7 +546144,7 @@ _081283B2:
 	thumb_func_end sub_812826C
 
 	thumb_func_start sub_81283BC
-sub_81283BC: ; 81283BC
+sub_81283BC: @ 81283BC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -546182,7 +546182,7 @@ sub_81283BC: ; 81283BC
 	thumb_func_end sub_81283BC
 
 	thumb_func_start sub_8128414
-sub_8128414: ; 8128414
+sub_8128414: @ 8128414
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -546226,7 +546226,7 @@ sub_8128414: ; 8128414
 	thumb_func_end sub_8128414
 
 	thumb_func_start sub_8128484
-sub_8128484: ; 8128484
+sub_8128484: @ 8128484
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -546251,7 +546251,7 @@ _081284A4:
 	thumb_func_end sub_8128484
 
 	thumb_func_start sub_81284AC
-sub_81284AC: ; 81284AC
+sub_81284AC: @ 81284AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -546292,7 +546292,7 @@ _081284EE:
 	thumb_func_end sub_81284AC
 
 	thumb_func_start sub_81284F4
-sub_81284F4: ; 81284F4
+sub_81284F4: @ 81284F4
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -546333,7 +546333,7 @@ _08128536:
 	thumb_func_end sub_81284F4
 
 	thumb_func_start sub_812853C
-sub_812853C: ; 812853C
+sub_812853C: @ 812853C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -546858,7 +546858,7 @@ _0812893E:
 	thumb_func_end sub_812853C
 
 	thumb_func_start sub_8128950
-sub_8128950: ; 8128950
+sub_8128950: @ 8128950
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -546906,7 +546906,7 @@ _081289BE:
 	thumb_func_end sub_8128950
 
 	thumb_func_start sub_81289D0
-sub_81289D0: ; 81289D0
+sub_81289D0: @ 81289D0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -546922,7 +546922,7 @@ sub_81289D0: ; 81289D0
 	thumb_func_end sub_81289D0
 
 	thumb_func_start sub_81289F0
-sub_81289F0: ; 81289F0
+sub_81289F0: @ 81289F0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -546996,7 +546996,7 @@ _08128A84:
 	thumb_func_end sub_81289F0
 
 	thumb_func_start sub_8128AAC
-sub_8128AAC: ; 8128AAC
+sub_8128AAC: @ 8128AAC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -547101,7 +547101,7 @@ _08128B76:
 	thumb_func_end sub_8128AAC
 
 	thumb_func_start sub_8128B80
-sub_8128B80: ; 8128B80
+sub_8128B80: @ 8128B80
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -547117,7 +547117,7 @@ sub_8128B80: ; 8128B80
 	thumb_func_end sub_8128B80
 
 	thumb_func_start sub_8128BA0
-sub_8128BA0: ; 8128BA0
+sub_8128BA0: @ 8128BA0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -547133,7 +547133,7 @@ sub_8128BA0: ; 8128BA0
 	thumb_func_end sub_8128BA0
 
 	thumb_func_start sub_8128BBC
-sub_8128BBC: ; 8128BBC
+sub_8128BBC: @ 8128BBC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -547157,7 +547157,7 @@ sub_8128BBC: ; 8128BBC
 	thumb_func_end sub_8128BBC
 
 	thumb_func_start c1_overworld_prev_quest
-c1_overworld_prev_quest: ; 8128BEC
+c1_overworld_prev_quest: @ 8128BEC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -547207,7 +547207,7 @@ _08128C4C:
 	thumb_func_end c1_overworld_prev_quest
 
 	thumb_func_start sub_8128C64
-sub_8128C64: ; 8128C64
+sub_8128C64: @ 8128C64
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -547266,7 +547266,7 @@ _08128CCA:
 	thumb_func_end sub_8128C64
 
 	thumb_func_start sub_8128CD4
-sub_8128CD4: ; 8128CD4
+sub_8128CD4: @ 8128CD4
 	push {r4,lr}
 	bl script_env_2_enable
 	bl pal_fill_black
@@ -547292,7 +547292,7 @@ sub_8128CD4: ; 8128CD4
 	thumb_func_end sub_8128CD4
 
 	thumb_func_start sub_8128D10
-sub_8128D10: ; 8128D10
+sub_8128D10: @ 8128D10
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -547380,7 +547380,7 @@ _08128DAE:
 	thumb_func_end sub_8128D10
 
 	thumb_func_start sub_8128DB4
-sub_8128DB4: ; 8128DB4
+sub_8128DB4: @ 8128DB4
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r0, [r0, 0x2C]
@@ -547405,7 +547405,7 @@ _08128DDA:
 	thumb_func_end sub_8128DB4
 
 	thumb_func_start sub_8128DE0
-sub_8128DE0: ; 8128DE0
+sub_8128DE0: @ 8128DE0
 	push {r4,lr}
 	ldr r1, =0x0203aa3a
 	movs r0, 0
@@ -547432,7 +547432,7 @@ sub_8128DE0: ; 8128DE0
 	thumb_func_end sub_8128DE0
 
 	thumb_func_start sub_8128E18
-sub_8128E18: ; 8128E18
+sub_8128E18: @ 8128E18
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -547651,7 +547651,7 @@ _08128FBA:
 	thumb_func_end sub_8128E18
 
 	thumb_func_start sub_8128FD8
-sub_8128FD8: ; 8128FD8
+sub_8128FD8: @ 8128FD8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -547683,7 +547683,7 @@ sub_8128FD8: ; 8128FD8
 	thumb_func_end sub_8128FD8
 
 	thumb_func_start sub_8129020
-sub_8129020: ; 8129020
+sub_8129020: @ 8129020
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -547707,7 +547707,7 @@ _08129040:
 	thumb_func_end sub_8129020
 
 	thumb_func_start sub_8129048
-sub_8129048: ; 8129048
+sub_8129048: @ 8129048
 	push {lr}
 	sub sp, 0x4
 	adds r1, r0, 0
@@ -547724,7 +547724,7 @@ sub_8129048: ; 8129048
 	thumb_func_end sub_8129048
 
 	thumb_func_start sub_8129068
-sub_8129068: ; 8129068
+sub_8129068: @ 8129068
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -547742,7 +547742,7 @@ sub_8129068: ; 8129068
 	thumb_func_end sub_8129068
 
 	thumb_func_start sub_8129088
-sub_8129088: ; 8129088
+sub_8129088: @ 8129088
 	push {r4-r7,lr}
 	sub sp, 0x20
 	adds r7, r0, 0
@@ -547891,7 +547891,7 @@ _0812919A:
 	thumb_func_end sub_8129088
 
 	thumb_func_start sub_81291A4
-sub_81291A4: ; 81291A4
+sub_81291A4: @ 81291A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -547915,7 +547915,7 @@ _081291AA:
 	thumb_func_end sub_81291A4
 
 	thumb_func_start sub_81291CC
-sub_81291CC: ; 81291CC
+sub_81291CC: @ 81291CC
 	lsls r0, 16
 	ldr r1, =gTilesetPointer_SecretBaseRedCave
 	ldr r1, [r1]
@@ -547930,7 +547930,7 @@ sub_81291CC: ; 81291CC
 	thumb_func_end sub_81291CC
 
 	thumb_func_start sub_81291E8
-sub_81291E8: ; 81291E8
+sub_81291E8: @ 81291E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -547991,7 +547991,7 @@ _0812924C:
 	thumb_func_end sub_81291E8
 
 	thumb_func_start sub_812925C
-sub_812925C: ; 812925C
+sub_812925C: @ 812925C
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r3, =0x0203aa3c
@@ -548046,7 +548046,7 @@ sub_812925C: ; 812925C
 	thumb_func_end sub_812925C
 
 	thumb_func_start sub_81292D0
-sub_81292D0: ; 81292D0
+sub_81292D0: @ 81292D0
 	movs r1, 0
 	strh r1, [r0, 0x32]
 	strh r1, [r0, 0x34]
@@ -548061,7 +548061,7 @@ sub_81292D0: ; 81292D0
 	thumb_func_end sub_81292D0
 
 	thumb_func_start sub_81292E8
-sub_81292E8: ; 81292E8
+sub_81292E8: @ 81292E8
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x3C
@@ -548106,7 +548106,7 @@ _0812932E:
 	thumb_func_end sub_81292E8
 
 	thumb_func_start gpu_pal_decompress_alloc_tag_and_upload
-gpu_pal_decompress_alloc_tag_and_upload: ; 8129334
+gpu_pal_decompress_alloc_tag_and_upload: @ 8129334
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -548171,8 +548171,8 @@ _081293C6:
 	thumb_func_end gpu_pal_decompress_alloc_tag_and_upload
 
 	thumb_func_start AddDecorationIconObjectFromIconTable
-; u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decorationId)
-AddDecorationIconObjectFromIconTable: ; 81293D8
+@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decorationId)
+AddDecorationIconObjectFromIconTable: @ 81293D8
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -548255,8 +548255,8 @@ _08129492:
 	thumb_func_end AddDecorationIconObjectFromIconTable
 
 	thumb_func_start GetDecorationIconPicOrPalette
-; u32 GetDecorationIconPicOrPalette(u16 decorationId, u8 which)
-GetDecorationIconPicOrPalette: ; 812949C
+@ u32 GetDecorationIconPicOrPalette(u16 decorationId, u8 which)
+GetDecorationIconPicOrPalette: @ 812949C
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -548278,8 +548278,8 @@ _081294AC:
 	thumb_func_end GetDecorationIconPicOrPalette
 
 	thumb_func_start AddDecorationIconObjectFromFieldObject
-; u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decorationId)
-AddDecorationIconObjectFromFieldObject: ; 81294C0
+@ u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decorationId)
+AddDecorationIconObjectFromFieldObject: @ 81294C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -548394,8 +548394,8 @@ _081295BA:
 	thumb_func_end AddDecorationIconObjectFromFieldObject
 
 	thumb_func_start AddDecorationIconObject
-; u8 AddDecorationIconObject(u8 decorationId, u16 x, u16 y, u8 priority, u16 tilesTag, u16 paletteTag)
-AddDecorationIconObject: ; 81295CC
+@ u8 AddDecorationIconObject(u8 decorationId, u16 x, u16 y, u8 priority, u16 tilesTag, u16 paletteTag)
+AddDecorationIconObject: @ 81295CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -548542,7 +548542,7 @@ _081296D8:
 	thumb_func_end AddDecorationIconObject
 
 	thumb_func_start sub_81296EC
-sub_81296EC: ; 81296EC
+sub_81296EC: @ 81296EC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x0203a17c
@@ -548558,7 +548558,7 @@ sub_81296EC: ; 81296EC
 	thumb_func_end sub_81296EC
 
 	thumb_func_start sub_8129708
-sub_8129708: ; 8129708
+sub_8129708: @ 8129708
 	push {r4-r6,lr}
 	ldr r6, =0x020375e2
 	movs r0, 0
@@ -548631,7 +548631,7 @@ _08129796:
 	thumb_func_end sub_8129708
 
 	thumb_func_start sub_81297AC
-sub_81297AC: ; 81297AC
+sub_81297AC: @ 81297AC
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r0, =0x02037318
@@ -548670,7 +548670,7 @@ _081297F0:
 	thumb_func_end sub_81297AC
 
 	thumb_func_start sub_81297F8
-sub_81297F8: ; 81297F8
+sub_81297F8: @ 81297F8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -548791,7 +548791,7 @@ _081298BE:
 	thumb_func_end sub_81297F8
 
 	thumb_func_start sub_81298EC
-sub_81298EC: ; 81298EC
+sub_81298EC: @ 81298EC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -548873,7 +548873,7 @@ _08129994:
 	thumb_func_end sub_81298EC
 
 	thumb_func_start sub_81299AC
-sub_81299AC: ; 81299AC
+sub_81299AC: @ 81299AC
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x0203a17c
@@ -548903,7 +548903,7 @@ _081299D8:
 	thumb_func_end sub_81299AC
 
 	thumb_func_start SetUpPuttingAwayDecorationPlayerAvatar
-SetUpPuttingAwayDecorationPlayerAvatar: ; 81299DC
+SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -548996,7 +548996,7 @@ _08129A44:
 	thumb_func_end SetUpPuttingAwayDecorationPlayerAvatar
 
 	thumb_func_start sub_8129ABC
-sub_8129ABC: ; 8129ABC
+sub_8129ABC: @ 8129ABC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -549056,7 +549056,7 @@ _08129B2E:
 	thumb_func_end sub_8129ABC
 
 	thumb_func_start sub_8129B34
-sub_8129B34: ; 8129B34
+sub_8129B34: @ 8129B34
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -549123,7 +549123,7 @@ sub_8129B34: ; 8129B34
 	thumb_func_end sub_8129B34
 
 	thumb_func_start sub_8129BCC
-sub_8129BCC: ; 8129BCC
+sub_8129BCC: @ 8129BCC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549145,7 +549145,7 @@ sub_8129BCC: ; 8129BCC
 	thumb_func_end sub_8129BCC
 
 	thumb_func_start sub_8129BF8
-sub_8129BF8: ; 8129BF8
+sub_8129BF8: @ 8129BF8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549194,7 +549194,7 @@ sub_8129BF8: ; 8129BF8
 	thumb_func_end sub_8129BF8
 
 	thumb_func_start sub_8129C74
-sub_8129C74: ; 8129C74
+sub_8129C74: @ 8129C74
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -549286,7 +549286,7 @@ _08129D50:
 	thumb_func_end sub_8129C74
 
 	thumb_func_start sub_8129D64
-sub_8129D64: ; 8129D64
+sub_8129D64: @ 8129D64
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -549310,7 +549310,7 @@ _08129D84:
 	thumb_func_end sub_8129D64
 
 	thumb_func_start sub_8129D8C
-sub_8129D8C: ; 8129D8C
+sub_8129D8C: @ 8129D8C
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -549389,7 +549389,7 @@ _08129E08:
 	thumb_func_end sub_8129D8C
 
 	thumb_func_start sub_8129E0C
-sub_8129E0C: ; 8129E0C
+sub_8129E0C: @ 8129E0C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -549438,7 +549438,7 @@ sub_8129E0C: ; 8129E0C
 	thumb_func_end sub_8129E0C
 
 	thumb_func_start sub_8129E74
-sub_8129E74: ; 8129E74
+sub_8129E74: @ 8129E74
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -549524,7 +549524,7 @@ _08129F12:
 	thumb_func_end sub_8129E74
 
 	thumb_func_start sub_8129F20
-sub_8129F20: ; 8129F20
+sub_8129F20: @ 8129F20
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -549599,7 +549599,7 @@ _08129FBA:
 	thumb_func_end sub_8129F20
 
 	thumb_func_start sub_8129FC8
-sub_8129FC8: ; 8129FC8
+sub_8129FC8: @ 8129FC8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -549656,7 +549656,7 @@ _0812A034:
 	thumb_func_end sub_8129FC8
 
 	thumb_func_start sub_812A040
-sub_812A040: ; 812A040
+sub_812A040: @ 812A040
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -549738,7 +549738,7 @@ _0812A0C6:
 	thumb_func_end sub_812A040
 
 	thumb_func_start sub_812A0E8
-sub_812A0E8: ; 812A0E8
+sub_812A0E8: @ 812A0E8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -549822,7 +549822,7 @@ _0812A18C:
 	thumb_func_end sub_812A0E8
 
 	thumb_func_start sub_812A1A0
-sub_812A1A0: ; 812A1A0
+sub_812A1A0: @ 812A1A0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549838,7 +549838,7 @@ sub_812A1A0: ; 812A1A0
 	thumb_func_end sub_812A1A0
 
 	thumb_func_start sub_812A1C0
-sub_812A1C0: ; 812A1C0
+sub_812A1C0: @ 812A1C0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549862,7 +549862,7 @@ sub_812A1C0: ; 812A1C0
 	thumb_func_end sub_812A1C0
 
 	thumb_func_start sub_812A1F0
-sub_812A1F0: ; 812A1F0
+sub_812A1F0: @ 812A1F0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549878,7 +549878,7 @@ sub_812A1F0: ; 812A1F0
 	thumb_func_end sub_812A1F0
 
 	thumb_func_start sub_812A210
-sub_812A210: ; 812A210
+sub_812A210: @ 812A210
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549894,7 +549894,7 @@ sub_812A210: ; 812A210
 	thumb_func_end sub_812A210
 
 	thumb_func_start sub_812A22C
-sub_812A22C: ; 812A22C
+sub_812A22C: @ 812A22C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -549918,7 +549918,7 @@ sub_812A22C: ; 812A22C
 	thumb_func_end sub_812A22C
 
 	thumb_func_start sub_812A25C
-sub_812A25C: ; 812A25C
+sub_812A25C: @ 812A25C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -549965,7 +549965,7 @@ _0812A2B2:
 	thumb_func_end sub_812A25C
 
 	thumb_func_start sub_812A2C4
-sub_812A2C4: ; 812A2C4
+sub_812A2C4: @ 812A2C4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -550024,7 +550024,7 @@ _0812A32A:
 	thumb_func_end sub_812A2C4
 
 	thumb_func_start sub_812A334
-sub_812A334: ; 812A334
+sub_812A334: @ 812A334
 	push {lr}
 	bl pal_fill_black
 	movs r0, 0
@@ -550049,7 +550049,7 @@ sub_812A334: ; 812A334
 	thumb_func_end sub_812A334
 
 	thumb_func_start sub_812A36C
-sub_812A36C: ; 812A36C
+sub_812A36C: @ 812A36C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -550079,7 +550079,7 @@ _0812A398:
 	thumb_func_end sub_812A36C
 
 	thumb_func_start sub_812A39C
-sub_812A39C: ; 812A39C
+sub_812A39C: @ 812A39C
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -550100,7 +550100,7 @@ _0812A3BE:
 	thumb_func_end sub_812A39C
 
 	thumb_func_start sub_812A3C8
-sub_812A3C8: ; 812A3C8
+sub_812A3C8: @ 812A3C8
 	push {lr}
 	movs r0, 0x8
 	bl FreeObjectPaletteByTag
@@ -550109,7 +550109,7 @@ sub_812A3C8: ; 812A3C8
 	thumb_func_end sub_812A3C8
 
 	thumb_func_start sub_812A3D4
-sub_812A3D4: ; 812A3D4
+sub_812A3D4: @ 812A3D4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -550156,7 +550156,7 @@ _0812A444:
 	thumb_func_end sub_812A3D4
 
 	thumb_func_start sub_812A458
-sub_812A458: ; 812A458
+sub_812A458: @ 812A458
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -550172,7 +550172,7 @@ sub_812A458: ; 812A458
 	thumb_func_end sub_812A458
 
 	thumb_func_start sub_812A478
-sub_812A478: ; 812A478
+sub_812A478: @ 812A478
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -550208,7 +550208,7 @@ sub_812A478: ; 812A478
 	thumb_func_end sub_812A478
 
 	thumb_func_start sub_812A4DC
-sub_812A4DC: ; 812A4DC
+sub_812A4DC: @ 812A4DC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -550258,7 +550258,7 @@ _0812A530:
 	thumb_func_end sub_812A4DC
 
 	thumb_func_start sub_812A540
-sub_812A540: ; 812A540
+sub_812A540: @ 812A540
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -550290,7 +550290,7 @@ sub_812A540: ; 812A540
 	thumb_func_end sub_812A540
 
 	thumb_func_start sub_812A588
-sub_812A588: ; 812A588
+sub_812A588: @ 812A588
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -550390,7 +550390,7 @@ _0812A666:
 	thumb_func_end sub_812A588
 
 	thumb_func_start sub_812A670
-sub_812A670: ; 812A670
+sub_812A670: @ 812A670
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -550401,7 +550401,7 @@ sub_812A670: ; 812A670
 	thumb_func_end sub_812A670
 
 	thumb_func_start sub_812A688
-sub_812A688: ; 812A688
+sub_812A688: @ 812A688
 	push {r4,lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -550434,7 +550434,7 @@ sub_812A688: ; 812A688
 	thumb_func_end sub_812A688
 
 	thumb_func_start sub_812A6D4
-sub_812A6D4: ; 812A6D4
+sub_812A6D4: @ 812A6D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -550462,7 +550462,7 @@ sub_812A6D4: ; 812A6D4
 	thumb_func_end sub_812A6D4
 
 	thumb_func_start sub_812A710
-sub_812A710: ; 812A710
+sub_812A710: @ 812A710
 	push {lr}
 	ldr r0, =nullsub_49
 	bl get_task_id_by_function
@@ -550488,12 +550488,12 @@ sub_812A710: ; 812A710
 	thumb_func_end sub_812A710
 
 	thumb_func_start nullsub_49
-nullsub_49: ; 812A74C
+nullsub_49: @ 812A74C
 	bx lr
 	thumb_func_end nullsub_49
 
 	thumb_func_start sub_812A750
-sub_812A750: ; 812A750
+sub_812A750: @ 812A750
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -550523,7 +550523,7 @@ sub_812A750: ; 812A750
 	thumb_func_end sub_812A750
 
 	thumb_func_start sub_812A79C
-sub_812A79C: ; 812A79C
+sub_812A79C: @ 812A79C
 	push {lr}
 	ldr r0, =sub_812A688
 	bl SetVBlankCallback
@@ -550539,7 +550539,7 @@ sub_812A79C: ; 812A79C
 	thumb_func_end sub_812A79C
 
 	thumb_func_start sub_812A7BC
-sub_812A7BC: ; 812A7BC
+sub_812A7BC: @ 812A7BC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r2, 0xC0
@@ -550583,7 +550583,7 @@ _0812A7DA:
 	thumb_func_end sub_812A7BC
 
 	thumb_func_start sub_812A810
-sub_812A810: ; 812A810
+sub_812A810: @ 812A810
 	sub sp, 0x4
 	movs r2, 0xE0
 	lsls r2, 19
@@ -550602,7 +550602,7 @@ sub_812A810: ; 812A810
 	thumb_func_end sub_812A810
 
 	thumb_func_start sub_812A834
-sub_812A834: ; 812A834
+sub_812A834: @ 812A834
 	push {lr}
 	movs r0, 0x8
 	movs r1, 0
@@ -550658,7 +550658,7 @@ sub_812A834: ; 812A834
 	thumb_func_end sub_812A834
 
 	thumb_func_start sub_812A8C4
-sub_812A8C4: ; 812A8C4
+sub_812A8C4: @ 812A8C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -550768,7 +550768,7 @@ _0812A934:
 	thumb_func_end sub_812A8C4
 
 	thumb_func_start sub_812A9AC
-sub_812A9AC: ; 812A9AC
+sub_812A9AC: @ 812A9AC
 	push {lr}
 	bl sub_80A1A74
 	bl ResetAllObjectData
@@ -550783,7 +550783,7 @@ sub_812A9AC: ; 812A9AC
 	thumb_func_end sub_812A9AC
 
 	thumb_func_start sub_812A9CC
-sub_812A9CC: ; 812A9CC
+sub_812A9CC: @ 812A9CC
 	push {r4,r5,lr}
 	ldr r4, =0x0203aacc
 	movs r0, 0x8
@@ -550827,7 +550827,7 @@ sub_812A9CC: ; 812A9CC
 	thumb_func_end sub_812A9CC
 
 	thumb_func_start sub_812AA48
-sub_812AA48: ; 812AA48
+sub_812AA48: @ 812AA48
 	push {lr}
 	bl sub_812F908
 	bl sub_812F958
@@ -550849,7 +550849,7 @@ sub_812AA48: ; 812AA48
 	thumb_func_end sub_812AA48
 
 	thumb_func_start sub_812AA78
-sub_812AA78: ; 812AA78
+sub_812AA78: @ 812AA78
 	push {lr}
 	bl sub_812E0E4
 	bl sub_812E1C8
@@ -550860,7 +550860,7 @@ sub_812AA78: ; 812AA78
 	thumb_func_end sub_812AA78
 
 	thumb_func_start sub_812AA90
-sub_812AA90: ; 812AA90
+sub_812AA90: @ 812AA90
 	push {lr}
 	bl sub_812D188
 	bl sub_812BE5C
@@ -550871,7 +550871,7 @@ sub_812AA90: ; 812AA90
 	thumb_func_end sub_812AA90
 
 	thumb_func_start sub_812AAA8
-sub_812AAA8: ; 812AAA8
+sub_812AAA8: @ 812AAA8
 	push {r4,lr}
 	ldr r4, =sub_812AAC8
 	adds r0, r4, 0
@@ -550887,7 +550887,7 @@ sub_812AAA8: ; 812AAA8
 	thumb_func_end sub_812AAA8
 
 	thumb_func_start sub_812AAC8
-sub_812AAC8: ; 812AAC8
+sub_812AAC8: @ 812AAC8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -550915,7 +550915,7 @@ _0812AAD8:
 	thumb_func_end sub_812AAC8
 
 	thumb_func_start sub_812AB04
-sub_812AB04: ; 812AB04
+sub_812AB04: @ 812AB04
 	push {r4,lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -550942,7 +550942,7 @@ sub_812AB04: ; 812AB04
 	thumb_func_end sub_812AB04
 
 	thumb_func_start sub_812AB38
-sub_812AB38: ; 812AB38
+sub_812AB38: @ 812AB38
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -550963,7 +550963,7 @@ _0812AB50:
 	thumb_func_end sub_812AB38
 
 	thumb_func_start sub_812AB60
-sub_812AB60: ; 812AB60
+sub_812AB60: @ 812AB60
 	push {lr}
 	ldr r3, =0x0203ab34
 	ldr r1, [r3]
@@ -551002,7 +551002,7 @@ _0812ABA0:
 	thumb_func_end sub_812AB60
 
 	thumb_func_start sub_812ABA8
-sub_812ABA8: ; 812ABA8
+sub_812ABA8: @ 812ABA8
 	push {lr}
 	bl sub_812E054
 	lsls r0, 24
@@ -551020,7 +551020,7 @@ _0812ABBC:
 	thumb_func_end sub_812ABA8
 
 	thumb_func_start sub_812ABC8
-sub_812ABC8: ; 812ABC8
+sub_812ABC8: @ 812ABC8
 	push {lr}
 	movs r0, 0
 	bl sub_812DEE4
@@ -551044,7 +551044,7 @@ _0812ABE8:
 	thumb_func_end sub_812ABC8
 
 	thumb_func_start sub_812ABF8
-sub_812ABF8: ; 812ABF8
+sub_812ABF8: @ 812ABF8
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -551172,7 +551172,7 @@ _0812ACE4:
 	thumb_func_end sub_812ABF8
 
 	thumb_func_start sub_812ACF4
-sub_812ACF4: ; 812ACF4
+sub_812ACF4: @ 812ACF4
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -551202,7 +551202,7 @@ sub_812ACF4: ; 812ACF4
 	thumb_func_end sub_812ACF4
 
 	thumb_func_start sub_812AD34
-sub_812AD34: ; 812AD34
+sub_812AD34: @ 812AD34
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -551225,7 +551225,7 @@ _0812AD52:
 	thumb_func_end sub_812AD34
 
 	thumb_func_start sub_812AD60
-sub_812AD60: ; 812AD60
+sub_812AD60: @ 812AD60
 	push {lr}
 	bl sub_812DCB4
 	lsls r0, 24
@@ -551243,7 +551243,7 @@ _0812AD74:
 	thumb_func_end sub_812AD60
 
 	thumb_func_start sub_812AD80
-sub_812AD80: ; 812AD80
+sub_812AD80: @ 812AD80
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_812B4EC
@@ -551295,7 +551295,7 @@ _0812ADE6:
 	thumb_func_end sub_812AD80
 
 	thumb_func_start sub_812ADF4
-sub_812ADF4: ; 812ADF4
+sub_812ADF4: @ 812ADF4
 	push {lr}
 	bl sub_812D4CC
 	lsls r0, 24
@@ -551320,7 +551320,7 @@ _0812AE18:
 	thumb_func_end sub_812ADF4
 
 	thumb_func_start sub_812AE24
-sub_812AE24: ; 812AE24
+sub_812AE24: @ 812AE24
 	push {lr}
 	ldrh r1, [r0, 0x8]
 	adds r1, 0x1
@@ -551342,7 +551342,7 @@ _0812AE40:
 	thumb_func_end sub_812AE24
 
 	thumb_func_start sub_812AE4C
-sub_812AE4C: ; 812AE4C
+sub_812AE4C: @ 812AE4C
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -551371,7 +551371,7 @@ _0812AE78:
 	thumb_func_end sub_812AE4C
 
 	thumb_func_start sub_812AE88
-sub_812AE88: ; 812AE88
+sub_812AE88: @ 812AE88
 	push {r4,lr}
 	ldr r4, =0x0203ab34
 	ldr r0, [r4]
@@ -551406,7 +551406,7 @@ _0812AEBE:
 	thumb_func_end sub_812AE88
 
 	thumb_func_start sub_812AEC4
-sub_812AEC4: ; 812AEC4
+sub_812AEC4: @ 812AEC4
 	push {r4,lr}
 	ldr r4, =0x0203ab34
 	ldr r2, [r4]
@@ -551553,7 +551553,7 @@ _0812AFEE:
 	thumb_func_end sub_812AEC4
 
 	thumb_func_start sub_812AFFC
-sub_812AFFC: ; 812AFFC
+sub_812AFFC: @ 812AFFC
 	push {lr}
 	bl sub_812BADC
 	lsls r0, 24
@@ -551571,7 +551571,7 @@ _0812B010:
 	thumb_func_end sub_812AFFC
 
 	thumb_func_start sub_812B01C
-sub_812B01C: ; 812B01C
+sub_812B01C: @ 812B01C
 	push {r4,lr}
 	bl sub_812D0E0
 	lsls r0, 24
@@ -551635,7 +551635,7 @@ _0812B088:
 	thumb_func_end sub_812B01C
 
 	thumb_func_start sub_812B094
-sub_812B094: ; 812B094
+sub_812B094: @ 812B094
 	push {r4,lr}
 	bl sub_812D20C
 	lsls r0, 24
@@ -551671,7 +551671,7 @@ _0812B0CC:
 	thumb_func_end sub_812B094
 
 	thumb_func_start sub_812B0D8
-sub_812B0D8: ; 812B0D8
+sub_812B0D8: @ 812B0D8
 	push {lr}
 	bl sub_812E054
 	lsls r0, 24
@@ -551697,7 +551697,7 @@ _0812B0FC:
 	thumb_func_end sub_812B0D8
 
 	thumb_func_start sub_812B108
-sub_812B108: ; 812B108
+sub_812B108: @ 812B108
 	push {lr}
 	movs r0, 0
 	bl sub_812CEB8
@@ -551716,7 +551716,7 @@ sub_812B108: ; 812B108
 	thumb_func_end sub_812B108
 
 	thumb_func_start sub_812B130
-sub_812B130: ; 812B130
+sub_812B130: @ 812B130
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0xA]
@@ -551740,7 +551740,7 @@ _0812B14E:
 	thumb_func_end sub_812B130
 
 	thumb_func_start sub_812B158
-sub_812B158: ; 812B158
+sub_812B158: @ 812B158
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -551781,7 +551781,7 @@ sub_812B158: ; 812B158
 	thumb_func_end sub_812B158
 
 	thumb_func_start sub_812B1B0
-sub_812B1B0: ; 812B1B0
+sub_812B1B0: @ 812B1B0
 	push {lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -551830,7 +551830,7 @@ _0812B208:
 	thumb_func_end sub_812B1B0
 
 	thumb_func_start sub_812B214
-sub_812B214: ; 812B214
+sub_812B214: @ 812B214
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -551860,7 +551860,7 @@ sub_812B214: ; 812B214
 	thumb_func_end sub_812B214
 
 	thumb_func_start sub_812B254
-sub_812B254: ; 812B254
+sub_812B254: @ 812B254
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -551883,7 +551883,7 @@ _0812B272:
 	thumb_func_end sub_812B254
 
 	thumb_func_start sub_812B280
-sub_812B280: ; 812B280
+sub_812B280: @ 812B280
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -551913,7 +551913,7 @@ sub_812B280: ; 812B280
 	thumb_func_end sub_812B280
 
 	thumb_func_start sub_812B2C0
-sub_812B2C0: ; 812B2C0
+sub_812B2C0: @ 812B2C0
 	push {lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -551936,7 +551936,7 @@ _0812B2DE:
 	thumb_func_end sub_812B2C0
 
 	thumb_func_start sub_812B2EC
-sub_812B2EC: ; 812B2EC
+sub_812B2EC: @ 812B2EC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203ab34
@@ -551967,7 +551967,7 @@ sub_812B2EC: ; 812B2EC
 	thumb_func_end sub_812B2EC
 
 	thumb_func_start sub_812B32C
-sub_812B32C: ; 812B32C
+sub_812B32C: @ 812B32C
 	push {r4-r6,lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -552115,7 +552115,7 @@ _0812B470:
 	thumb_func_end sub_812B32C
 
 	thumb_func_start sub_812B4EC
-sub_812B4EC: ; 812B4EC
+sub_812B4EC: @ 812B4EC
 	push {r4,lr}
 	ldr r4, =0x0203ab34
 	ldr r1, [r4]
@@ -552169,7 +552169,7 @@ _0812B54A:
 	thumb_func_end sub_812B4EC
 
 	thumb_func_start sub_812B55C
-sub_812B55C: ; 812B55C
+sub_812B55C: @ 812B55C
 	push {lr}
 	ldr r2, =0x0203ab34
 	ldr r1, [r2]
@@ -552188,7 +552188,7 @@ _0812B572:
 	thumb_func_end sub_812B55C
 
 	thumb_func_start sub_812B57C
-sub_812B57C: ; 812B57C
+sub_812B57C: @ 812B57C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -552219,7 +552219,7 @@ _0812B5AA:
 	thumb_func_end sub_812B57C
 
 	thumb_func_start sub_812B5B0
-sub_812B5B0: ; 812B5B0
+sub_812B5B0: @ 812B5B0
 	push {r4,lr}
 	bl GenerateRandomNumber
 	lsls r0, 24
@@ -552250,7 +552250,7 @@ _0812B5E6:
 	thumb_func_end sub_812B5B0
 
 	thumb_func_start sub_812B5EC
-sub_812B5EC: ; 812B5EC
+sub_812B5EC: @ 812B5EC
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =gUnknown_085A76D2
@@ -552287,7 +552287,7 @@ _0812B620:
 	thumb_func_end sub_812B5EC
 
 	thumb_func_start sub_812B634
-sub_812B634: ; 812B634
+sub_812B634: @ 812B634
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -552363,7 +552363,7 @@ _0812B6B4:
 	thumb_func_end sub_812B634
 
 	thumb_func_start sub_812B6CC
-sub_812B6CC: ; 812B6CC
+sub_812B6CC: @ 812B6CC
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -552390,7 +552390,7 @@ _0812B6EA:
 	thumb_func_end sub_812B6CC
 
 	thumb_func_start sub_812B700
-sub_812B700: ; 812B700
+sub_812B700: @ 812B700
 	push {r4-r6,lr}
 	ldr r0, =0x0203ab34
 	ldr r1, [r0]
@@ -552439,7 +552439,7 @@ _0812B754:
 	thumb_func_end sub_812B700
 
 	thumb_func_start sub_812B760
-sub_812B760: ; 812B760
+sub_812B760: @ 812B760
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -552465,7 +552465,7 @@ _0812B786:
 	thumb_func_end sub_812B760
 
 	thumb_func_start dp15_jump_random_unknown
-dp15_jump_random_unknown: ; 812B78C
+dp15_jump_random_unknown: @ 812B78C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r0, =0x0203ab34
@@ -552542,7 +552542,7 @@ _0812B822:
 	thumb_func_end dp15_jump_random_unknown
 
 	thumb_func_start sub_812B828
-sub_812B828: ; 812B828
+sub_812B828: @ 812B828
 	push {r4,lr}
 	ldr r4, =0x0203ab34
 	ldr r1, [r4]
@@ -552570,7 +552570,7 @@ _0812B852:
 	thumb_func_end sub_812B828
 
 	thumb_func_start sub_812B85C
-sub_812B85C: ; 812B85C
+sub_812B85C: @ 812B85C
 	push {r4,r5,lr}
 	movs r0, 0
 	movs r1, 0x2
@@ -552622,7 +552622,7 @@ _0812B8BC:
 	thumb_func_end sub_812B85C
 
 	thumb_func_start sub_812B8D0
-sub_812B8D0: ; 812B8D0
+sub_812B8D0: @ 812B8D0
 	push {r4,r5,lr}
 	movs r0, 0
 	movs r1, 0x1
@@ -552719,7 +552719,7 @@ _0812B98E:
 	thumb_func_end sub_812B8D0
 
 	thumb_func_start sub_812B9A0
-sub_812B9A0: ; 812B9A0
+sub_812B9A0: @ 812B9A0
 	push {r4,r5,lr}
 	movs r0, 0
 	movs r1, 0x1
@@ -552814,7 +552814,7 @@ _0812BA5A:
 	thumb_func_end sub_812B9A0
 
 	thumb_func_start sub_812BA6C
-sub_812BA6C: ; 812BA6C
+sub_812BA6C: @ 812BA6C
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -552861,7 +552861,7 @@ _0812BAB6:
 	thumb_func_end sub_812BA6C
 
 	thumb_func_start sub_812BABC
-sub_812BABC: ; 812BABC
+sub_812BABC: @ 812BABC
 	push {r4,lr}
 	ldr r4, =sub_812BAFC
 	adds r0, r4, 0
@@ -552877,7 +552877,7 @@ sub_812BABC: ; 812BABC
 	thumb_func_end sub_812BABC
 
 	thumb_func_start sub_812BADC
-sub_812BADC: ; 812BADC
+sub_812BADC: @ 812BADC
 	push {lr}
 	ldr r0, =sub_812BAFC
 	bl get_task_id_by_function
@@ -552896,7 +552896,7 @@ _0812BAF6:
 	thumb_func_end sub_812BADC
 
 	thumb_func_start sub_812BAFC
-sub_812BAFC: ; 812BAFC
+sub_812BAFC: @ 812BAFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -552924,7 +552924,7 @@ _0812BB0E:
 	thumb_func_end sub_812BAFC
 
 	thumb_func_start sub_812BB34
-sub_812BB34: ; 812BB34
+sub_812BB34: @ 812BB34
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_812CF6C
@@ -552954,7 +552954,7 @@ _0812BB62:
 	thumb_func_end sub_812BB34
 
 	thumb_func_start sub_812BB68
-sub_812BB68: ; 812BB68
+sub_812BB68: @ 812BB68
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0xA]
@@ -553045,7 +553045,7 @@ _0812BC08:
 	thumb_func_end sub_812BB68
 
 	thumb_func_start sub_812BC20
-sub_812BC20: ; 812BC20
+sub_812BC20: @ 812BC20
 	push {lr}
 	bl sub_812CFB8
 	lsls r0, 24
@@ -553064,7 +553064,7 @@ _0812BC3A:
 	thumb_func_end sub_812BC20
 
 	thumb_func_start sub_812BC44
-sub_812BC44: ; 812BC44
+sub_812BC44: @ 812BC44
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -553107,7 +553107,7 @@ _0812BC76:
 	thumb_func_end sub_812BC44
 
 	thumb_func_start sub_812BC98
-sub_812BC98: ; 812BC98
+sub_812BC98: @ 812BC98
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -553147,7 +553147,7 @@ _0812BCC2:
 	thumb_func_end sub_812BC98
 
 	thumb_func_start sub_812BCE8
-sub_812BCE8: ; 812BCE8
+sub_812BCE8: @ 812BCE8
 	push {lr}
 	ldr r1, =0x0203ab34
 	ldr r1, [r1]
@@ -553179,7 +553179,7 @@ _0812BD10:
 	thumb_func_end sub_812BCE8
 
 	thumb_func_start sub_812BD28
-sub_812BD28: ; 812BD28
+sub_812BD28: @ 812BD28
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -553216,7 +553216,7 @@ sub_812BD28: ; 812BD28
 	thumb_func_end sub_812BD28
 
 	thumb_func_start sub_812BD70
-sub_812BD70: ; 812BD70
+sub_812BD70: @ 812BD70
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -553267,7 +553267,7 @@ _0812BDC4:
 	thumb_func_end sub_812BD70
 
 	thumb_func_start sub_812BDD4
-sub_812BDD4: ; 812BDD4
+sub_812BDD4: @ 812BDD4
 	push {r4,lr}
 	ldr r1, =0x0203ab34
 	ldr r4, [r1]
@@ -553295,7 +553295,7 @@ sub_812BDD4: ; 812BDD4
 	thumb_func_end sub_812BDD4
 
 	thumb_func_start sub_812BE0C
-sub_812BE0C: ; 812BE0C
+sub_812BE0C: @ 812BE0C
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -553337,7 +553337,7 @@ _0812BE4E:
 	thumb_func_end sub_812BE0C
 
 	thumb_func_start sub_812BE5C
-sub_812BE5C: ; 812BE5C
+sub_812BE5C: @ 812BE5C
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r5, =sub_812BF2C
@@ -553371,7 +553371,7 @@ _0812BE64:
 	thumb_func_end sub_812BE5C
 
 	thumb_func_start sub_812BEA4
-sub_812BEA4: ; 812BEA4
+sub_812BEA4: @ 812BEA4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -553400,7 +553400,7 @@ sub_812BEA4: ; 812BEA4
 	thumb_func_end sub_812BEA4
 
 	thumb_func_start sub_812BEDC
-sub_812BEDC: ; 812BEDC
+sub_812BEDC: @ 812BEDC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -553420,7 +553420,7 @@ sub_812BEDC: ; 812BEDC
 	thumb_func_end sub_812BEDC
 
 	thumb_func_start sub_812BF04
-sub_812BF04: ; 812BF04
+sub_812BF04: @ 812BF04
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -553441,7 +553441,7 @@ sub_812BF04: ; 812BF04
 	thumb_func_end sub_812BF04
 
 	thumb_func_start sub_812BF2C
-sub_812BF2C: ; 812BF2C
+sub_812BF2C: @ 812BF2C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -553469,13 +553469,13 @@ _0812BF3E:
 	thumb_func_end sub_812BF2C
 
 	thumb_func_start sub_812BF64
-sub_812BF64: ; 812BF64
+sub_812BF64: @ 812BF64
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_812BF64
 
 	thumb_func_start sub_812BF68
-sub_812BF68: ; 812BF68
+sub_812BF68: @ 812BF68
 	push {lr}
 	ldrh r0, [r0, 0x26]
 	lsls r0, 24
@@ -553492,7 +553492,7 @@ sub_812BF68: ; 812BF68
 	thumb_func_end sub_812BF68
 
 	thumb_func_start sub_812BF88
-sub_812BF88: ; 812BF88
+sub_812BF88: @ 812BF88
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x8]
@@ -553564,7 +553564,7 @@ _0812BFF4:
 	thumb_func_end sub_812BF88
 
 	thumb_func_start sub_812C01C
-sub_812C01C: ; 812C01C
+sub_812C01C: @ 812C01C
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -553660,7 +553660,7 @@ _0812C0D2:
 	thumb_func_end sub_812C01C
 
 	thumb_func_start sub_812C0E0
-sub_812C0E0: ; 812C0E0
+sub_812C0E0: @ 812C0E0
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r4, =0x0203ab34
@@ -553708,7 +553708,7 @@ _0812C12A:
 	thumb_func_end sub_812C0E0
 
 	thumb_func_start sub_812C138
-sub_812C138: ; 812C138
+sub_812C138: @ 812C138
 	push {r4,r5,lr}
 	ldr r4, =0x0203ab34
 	ldr r0, [r4]
@@ -553745,7 +553745,7 @@ _0812C15A:
 	thumb_func_end sub_812C138
 
 	thumb_func_start sub_812C184
-sub_812C184: ; 812C184
+sub_812C184: @ 812C184
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -553781,7 +553781,7 @@ _0812C1BE:
 	thumb_func_end sub_812C184
 
 	thumb_func_start sub_812C1C4
-sub_812C1C4: ; 812C1C4
+sub_812C1C4: @ 812C1C4
 	push {r4,lr}
 	movs r1, 0x1
 	lsls r0, 16
@@ -553827,7 +553827,7 @@ _0812C212:
 	thumb_func_end sub_812C1C4
 
 	thumb_func_start sub_812C218
-sub_812C218: ; 812C218
+sub_812C218: @ 812C218
 	push {lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -553847,7 +553847,7 @@ _0812C232:
 	thumb_func_end sub_812C218
 
 	thumb_func_start sub_812C238
-sub_812C238: ; 812C238
+sub_812C238: @ 812C238
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -553896,7 +553896,7 @@ _0812C286:
 	thumb_func_end sub_812C238
 
 	thumb_func_start sub_812C290
-sub_812C290: ; 812C290
+sub_812C290: @ 812C290
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -554037,7 +554037,7 @@ _0812C390:
 	thumb_func_end sub_812C290
 
 	thumb_func_start sub_812C3A0
-sub_812C3A0: ; 812C3A0
+sub_812C3A0: @ 812C3A0
 	push {lr}
 	ldr r1, =gUnknown_085A7514
 	ldr r0, =0x0203ab34
@@ -554057,7 +554057,7 @@ sub_812C3A0: ; 812C3A0
 	thumb_func_end sub_812C3A0
 
 	thumb_func_start sub_812C3C8
-sub_812C3C8: ; 812C3C8
+sub_812C3C8: @ 812C3C8
 	push {r4-r7,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -554100,7 +554100,7 @@ _0812C40E:
 	thumb_func_end sub_812C3C8
 
 	thumb_func_start sub_812C414
-sub_812C414: ; 812C414
+sub_812C414: @ 812C414
 	push {r4-r6,lr}
 	bl sub_812C3C8
 	lsls r0, 24
@@ -554190,7 +554190,7 @@ _0812C4B2:
 	thumb_func_end sub_812C414
 
 	thumb_func_start sub_812C4BC
-sub_812C4BC: ; 812C4BC
+sub_812C4BC: @ 812C4BC
 	push {r4,lr}
 	ldr r2, =0x0203ab34
 	ldr r0, [r2]
@@ -554225,7 +554225,7 @@ _0812C4D8:
 	thumb_func_end sub_812C4BC
 
 	thumb_func_start sub_812C500
-sub_812C500: ; 812C500
+sub_812C500: @ 812C500
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -554275,7 +554275,7 @@ _0812C552:
 	thumb_func_end sub_812C500
 
 	thumb_func_start sub_812C55C
-sub_812C55C: ; 812C55C
+sub_812C55C: @ 812C55C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -554342,7 +554342,7 @@ _0812C5D2:
 	thumb_func_end sub_812C55C
 
 	thumb_func_start sub_812C5DC
-sub_812C5DC: ; 812C5DC
+sub_812C5DC: @ 812C5DC
 	push {r4,r5,lr}
 	movs r5, 0
 	b _0812C5E8
@@ -554368,7 +554368,7 @@ _0812C5E8:
 	thumb_func_end sub_812C5DC
 
 	thumb_func_start sub_812C608
-sub_812C608: ; 812C608
+sub_812C608: @ 812C608
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -554392,7 +554392,7 @@ _0812C624:
 	thumb_func_end sub_812C608
 
 	thumb_func_start sub_812C628
-sub_812C628: ; 812C628
+sub_812C628: @ 812C628
 	push {lr}
 	ldr r1, =gUnknown_085A752C
 	ldr r0, =0x0203ab34
@@ -554410,7 +554410,7 @@ sub_812C628: ; 812C628
 	thumb_func_end sub_812C628
 
 	thumb_func_start sub_812C64C
-sub_812C64C: ; 812C64C
+sub_812C64C: @ 812C64C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203ab34
@@ -554476,7 +554476,7 @@ _0812C6C4:
 	thumb_func_end sub_812C64C
 
 	thumb_func_start j5_08111E84
-j5_08111E84: ; 812C6CC
+j5_08111E84: @ 812C6CC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203ab34
@@ -554543,7 +554543,7 @@ _0812C744:
 	thumb_func_end j5_08111E84
 
 	thumb_func_start sub_812C74C
-sub_812C74C: ; 812C74C
+sub_812C74C: @ 812C74C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r6, =0x0203ab34
@@ -554679,7 +554679,7 @@ _0812C84A:
 	thumb_func_end sub_812C74C
 
 	thumb_func_start sub_812C854
-sub_812C854: ; 812C854
+sub_812C854: @ 812C854
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -554706,7 +554706,7 @@ _0812C876:
 	thumb_func_end sub_812C854
 
 	thumb_func_start sub_812C87C
-sub_812C87C: ; 812C87C
+sub_812C87C: @ 812C87C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -554738,7 +554738,7 @@ _0812C8A8:
 	thumb_func_end sub_812C87C
 
 	thumb_func_start sub_812C8AC
-sub_812C8AC: ; 812C8AC
+sub_812C8AC: @ 812C8AC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -554789,7 +554789,7 @@ _0812C8F8:
 	thumb_func_end sub_812C8AC
 
 	thumb_func_start sub_812C8FC
-sub_812C8FC: ; 812C8FC
+sub_812C8FC: @ 812C8FC
 	push {lr}
 	ldr r1, =gUnknown_085A7538
 	ldr r0, =0x0203ab34
@@ -554807,7 +554807,7 @@ sub_812C8FC: ; 812C8FC
 	thumb_func_end sub_812C8FC
 
 	thumb_func_start sub_812C920
-sub_812C920: ; 812C920
+sub_812C920: @ 812C920
 	push {r4-r7,lr}
 	movs r6, 0
 	ldr r7, =0x0203ab34
@@ -554926,7 +554926,7 @@ _0812C9F6:
 	thumb_func_end sub_812C920
 
 	thumb_func_start sub_812CA08
-sub_812CA08: ; 812CA08
+sub_812CA08: @ 812CA08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -555113,7 +555113,7 @@ _0812CB60:
 	thumb_func_end sub_812CA08
 
 	thumb_func_start sub_812CB80
-sub_812CB80: ; 812CB80
+sub_812CB80: @ 812CB80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -555329,7 +555329,7 @@ _0812CD34:
 	thumb_func_end sub_812CB80
 
 	thumb_func_start sub_812CD40
-sub_812CD40: ; 812CD40
+sub_812CD40: @ 812CD40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -555354,7 +555354,7 @@ sub_812CD40: ; 812CD40
 	thumb_func_end sub_812CD40
 
 	thumb_func_start sub_812CD74
-sub_812CD74: ; 812CD74
+sub_812CD74: @ 812CD74
 	push {r4,lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -555378,7 +555378,7 @@ sub_812CD74: ; 812CD74
 	thumb_func_end sub_812CD74
 
 	thumb_func_start sub_812CDA4
-sub_812CDA4: ; 812CDA4
+sub_812CDA4: @ 812CDA4
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -555406,7 +555406,7 @@ sub_812CDA4: ; 812CDA4
 	thumb_func_end sub_812CDA4
 
 	thumb_func_start sub_812CDD8
-sub_812CDD8: ; 812CDD8
+sub_812CDD8: @ 812CDD8
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0xA]
@@ -555425,7 +555425,7 @@ _0812CDF0:
 	thumb_func_end sub_812CDD8
 
 	thumb_func_start sub_812CDF4
-sub_812CDF4: ; 812CDF4
+sub_812CDF4: @ 812CDF4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r4, r1, 24
@@ -555453,7 +555453,7 @@ sub_812CDF4: ; 812CDF4
 	thumb_func_end sub_812CDF4
 
 	thumb_func_start sub_812CE2C
-sub_812CE2C: ; 812CE2C
+sub_812CE2C: @ 812CE2C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -555473,7 +555473,7 @@ sub_812CE2C: ; 812CE2C
 	thumb_func_end sub_812CE2C
 
 	thumb_func_start sub_812CE54
-sub_812CE54: ; 812CE54
+sub_812CE54: @ 812CE54
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -555493,7 +555493,7 @@ sub_812CE54: ; 812CE54
 	thumb_func_end sub_812CE54
 
 	thumb_func_start sub_812CE7C
-sub_812CE7C: ; 812CE7C
+sub_812CE7C: @ 812CE7C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -555524,7 +555524,7 @@ _0812CEA8:
 	thumb_func_end sub_812CE7C
 
 	thumb_func_start sub_812CEB8
-sub_812CEB8: ; 812CEB8
+sub_812CEB8: @ 812CEB8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -555555,7 +555555,7 @@ _0812CEE4:
 	thumb_func_end sub_812CEB8
 
 	thumb_func_start sub_812CEF4
-sub_812CEF4: ; 812CEF4
+sub_812CEF4: @ 812CEF4
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x02020630
@@ -555586,7 +555586,7 @@ _0812CEFA:
 	thumb_func_end sub_812CEF4
 
 	thumb_func_start sub_812CF34
-sub_812CF34: ; 812CF34
+sub_812CF34: @ 812CF34
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0203ab34
@@ -555614,7 +555614,7 @@ sub_812CF34: ; 812CF34
 	thumb_func_end sub_812CF34
 
 	thumb_func_start sub_812CF6C
-sub_812CF6C: ; 812CF6C
+sub_812CF6C: @ 812CF6C
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r0, =0x0203ab34
@@ -555654,7 +555654,7 @@ _0812CFB0:
 	thumb_func_end sub_812CF6C
 
 	thumb_func_start sub_812CFB8
-sub_812CFB8: ; 812CFB8
+sub_812CFB8: @ 812CFB8
 	push {r4,lr}
 	movs r4, 0
 _0812CFBC:
@@ -555684,7 +555684,7 @@ _0812CFE4:
 	thumb_func_end sub_812CFB8
 
 	thumb_func_start sub_812CFEC
-sub_812CFEC: ; 812CFEC
+sub_812CFEC: @ 812CFEC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -555717,7 +555717,7 @@ _0812D01E:
 	thumb_func_end sub_812CFEC
 
 	thumb_func_start sub_812D024
-sub_812D024: ; 812D024
+sub_812D024: @ 812D024
 	push {r4-r7,lr}
 	adds r2, r0, 0
 	movs r1, 0x30
@@ -555794,7 +555794,7 @@ _0812D0A6:
 	thumb_func_end sub_812D024
 
 	thumb_func_start sub_812D0B0
-sub_812D0B0: ; 812D0B0
+sub_812D0B0: @ 812D0B0
 	push {r4,lr}
 	ldr r4, =sub_812D128
 	adds r0, r4, 0
@@ -555817,7 +555817,7 @@ sub_812D0B0: ; 812D0B0
 	thumb_func_end sub_812D0B0
 
 	thumb_func_start sub_812D0E0
-sub_812D0E0: ; 812D0E0
+sub_812D0E0: @ 812D0E0
 	push {lr}
 	ldr r0, =sub_812D128
 	bl get_task_id_by_function
@@ -555851,7 +555851,7 @@ _0812D120:
 	thumb_func_end sub_812D0E0
 
 	thumb_func_start sub_812D128
-sub_812D128: ; 812D128
+sub_812D128: @ 812D128
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -555900,7 +555900,7 @@ _0812D166:
 	thumb_func_end sub_812D128
 
 	thumb_func_start sub_812D188
-sub_812D188: ; 812D188
+sub_812D188: @ 812D188
 	push {lr}
 	ldr r0, =sub_812D230
 	movs r1, 0x8
@@ -555915,7 +555915,7 @@ sub_812D188: ; 812D188
 	thumb_func_end sub_812D188
 
 	thumb_func_start sub_812D1A8
-sub_812D1A8: ; 812D1A8
+sub_812D1A8: @ 812D1A8
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -555941,7 +555941,7 @@ sub_812D1A8: ; 812D1A8
 	thumb_func_end sub_812D1A8
 
 	thumb_func_start sub_812D1DC
-sub_812D1DC: ; 812D1DC
+sub_812D1DC: @ 812D1DC
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -555965,7 +555965,7 @@ sub_812D1DC: ; 812D1DC
 	thumb_func_end sub_812D1DC
 
 	thumb_func_start sub_812D20C
-sub_812D20C: ; 812D20C
+sub_812D20C: @ 812D20C
 	ldr r2, =0x03005e00
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -555983,7 +555983,7 @@ sub_812D20C: ; 812D20C
 	thumb_func_end sub_812D20C
 
 	thumb_func_start sub_812D230
-sub_812D230: ; 812D230
+sub_812D230: @ 812D230
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -556006,12 +556006,12 @@ sub_812D230: ; 812D230
 	thumb_func_end sub_812D230
 
 	thumb_func_start nullsub_50
-nullsub_50: ; 812D260
+nullsub_50: @ 812D260
 	bx lr
 	thumb_func_end nullsub_50
 
 	thumb_func_start sub_812D264
-sub_812D264: ; 812D264
+sub_812D264: @ 812D264
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0xA]
@@ -556034,7 +556034,7 @@ sub_812D264: ; 812D264
 	thumb_func_end sub_812D264
 
 	thumb_func_start sub_812D28C
-sub_812D28C: ; 812D28C
+sub_812D28C: @ 812D28C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, =0x02020630
@@ -556098,7 +556098,7 @@ _0812D2FC:
 	thumb_func_end sub_812D28C
 
 	thumb_func_start sub_812D30C
-sub_812D30C: ; 812D30C
+sub_812D30C: @ 812D30C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0xA]
@@ -556170,7 +556170,7 @@ _0812D384:
 	thumb_func_end sub_812D30C
 
 	thumb_func_start sub_812D394
-sub_812D394: ; 812D394
+sub_812D394: @ 812D394
 	push {lr}
 	movs r1, 0x2
 	adds r2, r0, 0
@@ -556190,7 +556190,7 @@ _0812D39E:
 	thumb_func_end sub_812D394
 
 	thumb_func_start sub_812D3B4
-sub_812D3B4: ; 812D3B4
+sub_812D3B4: @ 812D3B4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -556313,7 +556313,7 @@ _0812D484:
 	thumb_func_end sub_812D3B4
 
 	thumb_func_start sub_812D4AC
-sub_812D4AC: ; 812D4AC
+sub_812D4AC: @ 812D4AC
 	push {r4,lr}
 	ldr r4, =sub_812D4EC
 	adds r0, r4, 0
@@ -556329,7 +556329,7 @@ sub_812D4AC: ; 812D4AC
 	thumb_func_end sub_812D4AC
 
 	thumb_func_start sub_812D4CC
-sub_812D4CC: ; 812D4CC
+sub_812D4CC: @ 812D4CC
 	push {lr}
 	ldr r0, =sub_812D4EC
 	bl get_task_id_by_function
@@ -556348,7 +556348,7 @@ _0812D4E6:
 	thumb_func_end sub_812D4CC
 
 	thumb_func_start sub_812D4EC
-sub_812D4EC: ; 812D4EC
+sub_812D4EC: @ 812D4EC
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -556371,7 +556371,7 @@ sub_812D4EC: ; 812D4EC
 	thumb_func_end sub_812D4EC
 
 	thumb_func_start sub_812D51C
-sub_812D51C: ; 812D51C
+sub_812D51C: @ 812D51C
 	push {lr}
 	ldr r3, =0x0203ab34
 	ldr r1, [r3]
@@ -556418,7 +556418,7 @@ sub_812D51C: ; 812D51C
 	thumb_func_end sub_812D51C
 
 	thumb_func_start sub_812D594
-sub_812D594: ; 812D594
+sub_812D594: @ 812D594
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r1, =0x02021bbc
@@ -556478,7 +556478,7 @@ _0812D5F4:
 	thumb_func_end sub_812D594
 
 	thumb_func_start sub_812D60C
-sub_812D60C: ; 812D60C
+sub_812D60C: @ 812D60C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -556504,7 +556504,7 @@ _0812D636:
 	thumb_func_end sub_812D60C
 
 	thumb_func_start sub_812D63C
-sub_812D63C: ; 812D63C
+sub_812D63C: @ 812D63C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -556581,7 +556581,7 @@ _0812D6CC:
 	thumb_func_end sub_812D63C
 
 	thumb_func_start sub_812D6EC
-sub_812D6EC: ; 812D6EC
+sub_812D6EC: @ 812D6EC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -556621,7 +556621,7 @@ _0812D730:
 	thumb_func_end sub_812D6EC
 
 	thumb_func_start sub_812D740
-sub_812D740: ; 812D740
+sub_812D740: @ 812D740
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -556650,7 +556650,7 @@ _0812D76C:
 	thumb_func_end sub_812D740
 
 	thumb_func_start sub_812D774
-sub_812D774: ; 812D774
+sub_812D774: @ 812D774
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -556711,7 +556711,7 @@ _0812D7DC:
 	thumb_func_end sub_812D774
 
 	thumb_func_start sub_812D7E4
-sub_812D7E4: ; 812D7E4
+sub_812D7E4: @ 812D7E4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x0203ab34
@@ -556780,7 +556780,7 @@ _0812D866:
 	thumb_func_end sub_812D7E4
 
 	thumb_func_start sub_812D870
-sub_812D870: ; 812D870
+sub_812D870: @ 812D870
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -556859,7 +556859,7 @@ _0812D914:
 	thumb_func_end sub_812D870
 
 	thumb_func_start sub_812D920
-sub_812D920: ; 812D920
+sub_812D920: @ 812D920
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x10]
@@ -556887,7 +556887,7 @@ _0812D948:
 	thumb_func_end sub_812D920
 
 	thumb_func_start sub_812D950
-sub_812D950: ; 812D950
+sub_812D950: @ 812D950
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r1, =0x02021bbc
@@ -556930,7 +556930,7 @@ _0812D99E:
 	thumb_func_end sub_812D950
 
 	thumb_func_start sub_812D9A4
-sub_812D9A4: ; 812D9A4
+sub_812D9A4: @ 812D9A4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203ab34
@@ -556983,7 +556983,7 @@ _0812DA1A:
 	thumb_func_end sub_812D9A4
 
 	thumb_func_start sub_812DA20
-sub_812DA20: ; 812DA20
+sub_812DA20: @ 812DA20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203ab34
@@ -557025,7 +557025,7 @@ _0812DA66:
 	thumb_func_end sub_812DA20
 
 	thumb_func_start sub_812DA6C
-sub_812DA6C: ; 812DA6C
+sub_812DA6C: @ 812DA6C
 	push {lr}
 	bl sub_812E054
 	lsls r0, 24
@@ -557043,7 +557043,7 @@ _0812DA86:
 	thumb_func_end sub_812DA6C
 
 	thumb_func_start sub_812DA90
-sub_812DA90: ; 812DA90
+sub_812DA90: @ 812DA90
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_812E82C
@@ -557092,7 +557092,7 @@ sub_812DA90: ; 812DA90
 	thumb_func_end sub_812DA90
 
 	thumb_func_start sub_812DB04
-sub_812DB04: ; 812DB04
+sub_812DB04: @ 812DB04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r1, =0x02021bbe
@@ -557157,7 +557157,7 @@ _0812DB7A:
 	thumb_func_end sub_812DB04
 
 	thumb_func_start sub_812DB8C
-sub_812DB8C: ; 812DB8C
+sub_812DB8C: @ 812DB8C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x02021bbe
@@ -557182,7 +557182,7 @@ _0812DBB2:
 	thumb_func_end sub_812DB8C
 
 	thumb_func_start sub_812DBBC
-sub_812DBBC: ; 812DBBC
+sub_812DBBC: @ 812DBBC
 	push {lr}
 	ldr r1, =0x02021bbc
 	movs r0, 0
@@ -557210,7 +557210,7 @@ sub_812DBBC: ; 812DBBC
 	thumb_func_end sub_812DBBC
 
 	thumb_func_start sub_812DC08
-sub_812DC08: ; 812DC08
+sub_812DC08: @ 812DC08
 	push {r4-r6,lr}
 	movs r2, 0x4
 	lsls r1, 16
@@ -557248,7 +557248,7 @@ _0812DC14:
 	thumb_func_end sub_812DC08
 
 	thumb_func_start sub_812DC50
-sub_812DC50: ; 812DC50
+sub_812DC50: @ 812DC50
 	push {r4,r5,lr}
 	movs r4, 0x4
 	lsls r0, 16
@@ -557274,7 +557274,7 @@ _0812DC58:
 	thumb_func_end sub_812DC50
 
 	thumb_func_start sub_812DC80
-sub_812DC80: ; 812DC80
+sub_812DC80: @ 812DC80
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -557299,7 +557299,7 @@ sub_812DC80: ; 812DC80
 	thumb_func_end sub_812DC80
 
 	thumb_func_start sub_812DCB4
-sub_812DCB4: ; 812DCB4
+sub_812DCB4: @ 812DCB4
 	push {lr}
 	ldr r0, =sub_812DCD4
 	bl get_task_id_by_function
@@ -557318,7 +557318,7 @@ _0812DCCE:
 	thumb_func_end sub_812DCB4
 
 	thumb_func_start sub_812DCD4
-sub_812DCD4: ; 812DCD4
+sub_812DCD4: @ 812DCD4
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -557341,7 +557341,7 @@ sub_812DCD4: ; 812DCD4
 	thumb_func_end sub_812DCD4
 
 	thumb_func_start sub_812DD04
-sub_812DD04: ; 812DD04
+sub_812DD04: @ 812DD04
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -557362,7 +557362,7 @@ sub_812DD04: ; 812DD04
 	thumb_func_end sub_812DD04
 
 	thumb_func_start sub_812DD28
-sub_812DD28: ; 812DD28
+sub_812DD28: @ 812DD28
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -557381,7 +557381,7 @@ _0812DD3E:
 	thumb_func_end sub_812DD28
 
 	thumb_func_start sub_812DD48
-sub_812DD48: ; 812DD48
+sub_812DD48: @ 812DD48
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_812DFDC
@@ -557403,7 +557403,7 @@ sub_812DD48: ; 812DD48
 	thumb_func_end sub_812DD48
 
 	thumb_func_start sub_812DD78
-sub_812DD78: ; 812DD78
+sub_812DD78: @ 812DD78
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -557439,7 +557439,7 @@ sub_812DD78: ; 812DD78
 	thumb_func_end sub_812DD78
 
 	thumb_func_start sub_812DDC4
-sub_812DDC4: ; 812DDC4
+sub_812DDC4: @ 812DDC4
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -557478,7 +557478,7 @@ _0812DE08:
 	thumb_func_end sub_812DDC4
 
 	thumb_func_start sub_812DE14
-sub_812DE14: ; 812DE14
+sub_812DE14: @ 812DE14
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_812F968
@@ -557493,7 +557493,7 @@ sub_812DE14: ; 812DE14
 	thumb_func_end sub_812DE14
 
 	thumb_func_start sub_812DE30
-sub_812DE30: ; 812DE30
+sub_812DE30: @ 812DE30
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0xA]
@@ -557507,7 +557507,7 @@ sub_812DE30: ; 812DE30
 	thumb_func_end sub_812DE30
 
 	thumb_func_start sub_812DE48
-sub_812DE48: ; 812DE48
+sub_812DE48: @ 812DE48
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -557533,7 +557533,7 @@ sub_812DE48: ; 812DE48
 	thumb_func_end sub_812DE48
 
 	thumb_func_start sub_812DE7C
-sub_812DE7C: ; 812DE7C
+sub_812DE7C: @ 812DE7C
 	push {lr}
 	ldr r0, =sub_812DCD4
 	bl get_task_id_by_function
@@ -557546,7 +557546,7 @@ sub_812DE7C: ; 812DE7C
 	thumb_func_end sub_812DE7C
 
 	thumb_func_start sub_812DE94
-sub_812DE94: ; 812DE94
+sub_812DE94: @ 812DE94
 	push {lr}
 	ldr r0, =sub_812E0B0
 	movs r1, 0x3
@@ -557583,7 +557583,7 @@ _0812DEC0:
 	thumb_func_end sub_812DE94
 
 	thumb_func_start sub_812DEE4
-sub_812DEE4: ; 812DEE4
+sub_812DEE4: @ 812DEE4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -557648,7 +557648,7 @@ _0812DF52:
 	thumb_func_end sub_812DEE4
 
 	thumb_func_start sub_812DF68
-sub_812DF68: ; 812DF68
+sub_812DF68: @ 812DF68
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -557708,7 +557708,7 @@ _0812DFCE:
 	thumb_func_end sub_812DF68
 
 	thumb_func_start sub_812DFDC
-sub_812DFDC: ; 812DFDC
+sub_812DFDC: @ 812DFDC
 	push {r4-r6,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -557763,7 +557763,7 @@ _0812E02E:
 	thumb_func_end sub_812DFDC
 
 	thumb_func_start sub_812E054
-sub_812E054: ; 812E054
+sub_812E054: @ 812E054
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -557810,7 +557810,7 @@ _0812E0A8:
 	thumb_func_end sub_812E054
 
 	thumb_func_start sub_812E0B0
-sub_812E0B0: ; 812E0B0
+sub_812E0B0: @ 812E0B0
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 24
@@ -557833,12 +557833,12 @@ sub_812E0B0: ; 812E0B0
 	thumb_func_end sub_812E0B0
 
 	thumb_func_start nullsub_51
-nullsub_51: ; 812E0E0
+nullsub_51: @ 812E0E0
 	bx lr
 	thumb_func_end nullsub_51
 
 	thumb_func_start sub_812E0E4
-sub_812E0E4: ; 812E0E4
+sub_812E0E4: @ 812E0E4
 	push {r4-r7,lr}
 	movs r6, 0
 	movs r0, 0x30
@@ -557893,7 +557893,7 @@ _0812E0F0:
 	thumb_func_end sub_812E0E4
 
 	thumb_func_start sub_812E154
-sub_812E154: ; 812E154
+sub_812E154: @ 812E154
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203ab34
@@ -557949,7 +557949,7 @@ sub_812E154: ; 812E154
 	thumb_func_end sub_812E154
 
 	thumb_func_start sub_812E1C8
-sub_812E1C8: ; 812E1C8
+sub_812E1C8: @ 812E1C8
 	push {r4-r6,lr}
 	movs r4, 0xCB
 	movs r5, 0x1
@@ -558004,7 +558004,7 @@ _0812E1FE:
 	thumb_func_end sub_812E1C8
 
 	thumb_func_start sub_812E230
-sub_812E230: ; 812E230
+sub_812E230: @ 812E230
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -558061,7 +558061,7 @@ sub_812E230: ; 812E230
 	thumb_func_end sub_812E230
 
 	thumb_func_start sub_812E2A8
-sub_812E2A8: ; 812E2A8
+sub_812E2A8: @ 812E2A8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203ab34
@@ -558106,7 +558106,7 @@ _0812E2F6:
 	thumb_func_end sub_812E2A8
 
 	thumb_func_start sub_812E300
-sub_812E300: ; 812E300
+sub_812E300: @ 812E300
 	push {lr}
 	ldr r0, =gUnknown_085A7D10
 	movs r1, 0x58
@@ -558133,7 +558133,7 @@ sub_812E300: ; 812E300
 	thumb_func_end sub_812E300
 
 	thumb_func_start sub_812E33C
-sub_812E33C: ; 812E33C
+sub_812E33C: @ 812E33C
 	push {r4,r5,lr}
 	sub sp, 0x18
 	ldr r4, =0x0203aae4
@@ -558213,7 +558213,7 @@ _0812E350:
 	thumb_func_end sub_812E33C
 
 	thumb_func_start sub_812E3E8
-sub_812E3E8: ; 812E3E8
+sub_812E3E8: @ 812E3E8
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -558240,7 +558240,7 @@ _0812E410:
 	thumb_func_end sub_812E3E8
 
 	thumb_func_start sub_812E424
-sub_812E424: ; 812E424
+sub_812E424: @ 812E424
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0
@@ -558285,7 +558285,7 @@ _0812E46A:
 	thumb_func_end sub_812E424
 
 	thumb_func_start sub_812E474
-sub_812E474: ; 812E474
+sub_812E474: @ 812E474
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -558421,7 +558421,7 @@ _0812E510:
 	thumb_func_end sub_812E474
 
 	thumb_func_start sub_812E5A8
-sub_812E5A8: ; 812E5A8
+sub_812E5A8: @ 812E5A8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	ldr r4, =0x0203aaf0
@@ -558494,7 +558494,7 @@ _0812E5BC:
 	thumb_func_end sub_812E5A8
 
 	thumb_func_start sub_812E650
-sub_812E650: ; 812E650
+sub_812E650: @ 812E650
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r5, 0
@@ -558551,7 +558551,7 @@ _0812E656:
 	thumb_func_end sub_812E650
 
 	thumb_func_start sub_812E6C4
-sub_812E6C4: ; 812E6C4
+sub_812E6C4: @ 812E6C4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203ab34
@@ -558585,7 +558585,7 @@ sub_812E6C4: ; 812E6C4
 	thumb_func_end sub_812E6C4
 
 	thumb_func_start sub_812E70C
-sub_812E70C: ; 812E70C
+sub_812E70C: @ 812E70C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -558673,7 +558673,7 @@ sub_812E70C: ; 812E70C
 	thumb_func_end sub_812E70C
 
 	thumb_func_start sub_812E7CC
-sub_812E7CC: ; 812E7CC
+sub_812E7CC: @ 812E7CC
 	push {r4,lr}
 	ldr r0, =gUnknown_085A7DB8
 	movs r1, 0xB8
@@ -558715,7 +558715,7 @@ sub_812E7CC: ; 812E7CC
 	thumb_func_end sub_812E7CC
 
 	thumb_func_start sub_812E82C
-sub_812E82C: ; 812E82C
+sub_812E82C: @ 812E82C
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -558786,7 +558786,7 @@ _0812E88A:
 	thumb_func_end sub_812E82C
 
 	thumb_func_start sub_812E8C4
-sub_812E8C4: ; 812E8C4
+sub_812E8C4: @ 812E8C4
 	push {r4,lr}
 	movs r4, 0
 _0812E8C8:
@@ -558813,7 +558813,7 @@ _0812E8C8:
 	thumb_func_end sub_812E8C4
 
 	thumb_func_start sub_812E8F8
-sub_812E8F8: ; 812E8F8
+sub_812E8F8: @ 812E8F8
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -558840,7 +558840,7 @@ _0812E920:
 	thumb_func_end sub_812E8F8
 
 	thumb_func_start sub_812E934
-sub_812E934: ; 812E934
+sub_812E934: @ 812E934
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -558925,7 +558925,7 @@ sub_812E934: ; 812E934
 	thumb_func_end sub_812E934
 
 	thumb_func_start sub_812E9E8
-sub_812E9E8: ; 812E9E8
+sub_812E9E8: @ 812E9E8
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -558977,7 +558977,7 @@ _0812EA3E:
 	thumb_func_end sub_812E9E8
 
 	thumb_func_start sub_812EA44
-sub_812EA44: ; 812EA44
+sub_812EA44: @ 812EA44
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -559006,7 +559006,7 @@ sub_812EA44: ; 812EA44
 	thumb_func_end sub_812EA44
 
 	thumb_func_start sub_812EA7C
-sub_812EA7C: ; 812EA7C
+sub_812EA7C: @ 812EA7C
 	push {r4,lr}
 	movs r4, 0
 _0812EA80:
@@ -559033,7 +559033,7 @@ _0812EA80:
 	thumb_func_end sub_812EA7C
 
 	thumb_func_start sub_812EAB0
-sub_812EAB0: ; 812EAB0
+sub_812EAB0: @ 812EAB0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -559105,7 +559105,7 @@ sub_812EAB0: ; 812EAB0
 	thumb_func_end sub_812EAB0
 
 	thumb_func_start sub_812EB48
-sub_812EB48: ; 812EB48
+sub_812EB48: @ 812EB48
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -559153,7 +559153,7 @@ _0812EB9A:
 	thumb_func_end sub_812EB48
 
 	thumb_func_start sub_812EBAC
-sub_812EBAC: ; 812EBAC
+sub_812EBAC: @ 812EBAC
 	ldr r3, =0x02020630
 	ldr r1, =0x0203ab34
 	ldr r1, [r1]
@@ -559169,7 +559169,7 @@ sub_812EBAC: ; 812EBAC
 	thumb_func_end sub_812EBAC
 
 	thumb_func_start sub_812EBCC
-sub_812EBCC: ; 812EBCC
+sub_812EBCC: @ 812EBCC
 	push {r4,lr}
 	movs r0, 0x7
 	bl IndexOfObjectPaletteTag
@@ -559207,7 +559207,7 @@ _0812EBEA:
 	thumb_func_end sub_812EBCC
 
 	thumb_func_start sub_812EC20
-sub_812EC20: ; 812EC20
+sub_812EC20: @ 812EC20
 	push {lr}
 	ldr r0, =gUnknown_085A7E00
 	movs r1, 0xA8
@@ -559238,7 +559238,7 @@ sub_812EC20: ; 812EC20
 	thumb_func_end sub_812EC20
 
 	thumb_func_start sub_812EC64
-sub_812EC64: ; 812EC64
+sub_812EC64: @ 812EC64
 	ldr r1, =0x02021bbe
 	ldrh r1, [r1]
 	strh r1, [r0, 0x26]
@@ -559247,7 +559247,7 @@ sub_812EC64: ; 812EC64
 	thumb_func_end sub_812EC64
 
 	thumb_func_start sub_812EC70
-sub_812EC70: ; 812EC70
+sub_812EC70: @ 812EC70
 	push {lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -559265,7 +559265,7 @@ sub_812EC70: ; 812EC70
 	thumb_func_end sub_812EC70
 
 	thumb_func_start sub_812EC94
-sub_812EC94: ; 812EC94
+sub_812EC94: @ 812EC94
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r1, =gUnknown_085A7616
@@ -559329,7 +559329,7 @@ _0812ECA4:
 	thumb_func_end sub_812EC94
 
 	thumb_func_start sub_812ED20
-sub_812ED20: ; 812ED20
+sub_812ED20: @ 812ED20
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x2E]
@@ -559386,7 +559386,7 @@ _0812ED84:
 	thumb_func_end sub_812ED20
 
 	thumb_func_start sub_812ED8C
-sub_812ED8C: ; 812ED8C
+sub_812ED8C: @ 812ED8C
 	push {r4,lr}
 	movs r4, 0
 _0812ED90:
@@ -559413,7 +559413,7 @@ _0812ED90:
 	thumb_func_end sub_812ED8C
 
 	thumb_func_start sub_812EDC0
-sub_812EDC0: ; 812EDC0
+sub_812EDC0: @ 812EDC0
 	push {r4,lr}
 	ldr r0, =gUnknown_085A7E30
 	movs r1, 0xA8
@@ -559451,7 +559451,7 @@ sub_812EDC0: ; 812EDC0
 	thumb_func_end sub_812EDC0
 
 	thumb_func_start sub_812EE14
-sub_812EE14: ; 812EE14
+sub_812EE14: @ 812EE14
 	push {lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x2E]
@@ -559531,7 +559531,7 @@ _0812EE90:
 	thumb_func_end sub_812EE14
 
 	thumb_func_start sub_812EEA8
-sub_812EEA8: ; 812EEA8
+sub_812EEA8: @ 812EEA8
 	ldr r2, =0x02020630
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -559549,7 +559549,7 @@ sub_812EEA8: ; 812EEA8
 	thumb_func_end sub_812EEA8
 
 	thumb_func_start sub_812EECC
-sub_812EECC: ; 812EECC
+sub_812EECC: @ 812EECC
 	push {r4,lr}
 	ldr r0, =0x0203ab34
 	ldr r0, [r0]
@@ -559573,7 +559573,7 @@ sub_812EECC: ; 812EECC
 	thumb_func_end sub_812EECC
 
 	thumb_func_start sub_812EF00
-sub_812EF00: ; 812EF00
+sub_812EF00: @ 812EF00
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -559613,7 +559613,7 @@ sub_812EF00: ; 812EF00
 	thumb_func_end sub_812EF00
 
 	thumb_func_start sub_812EF54
-sub_812EF54: ; 812EF54
+sub_812EF54: @ 812EF54
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -559630,7 +559630,7 @@ _0812EF68:
 	thumb_func_end sub_812EF54
 
 	thumb_func_start sub_812EF6C
-sub_812EF6C: ; 812EF6C
+sub_812EF6C: @ 812EF6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -559652,7 +559652,7 @@ sub_812EF6C: ; 812EF6C
 	thumb_func_end sub_812EF6C
 
 	thumb_func_start sub_812EF98
-sub_812EF98: ; 812EF98
+sub_812EF98: @ 812EF98
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -559686,7 +559686,7 @@ sub_812EF98: ; 812EF98
 	thumb_func_end sub_812EF98
 
 	thumb_func_start sub_812EFDC
-sub_812EFDC: ; 812EFDC
+sub_812EFDC: @ 812EFDC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -559759,14 +559759,14 @@ _0812F056:
 	thumb_func_end sub_812EFDC
 
 	thumb_func_start sub_812F078
-sub_812F078: ; 812F078
+sub_812F078: @ 812F078
 	movs r1, 0
 	strh r1, [r0, 0x3C]
 	bx lr
 	thumb_func_end sub_812F078
 
 	thumb_func_start sub_812F080
-sub_812F080: ; 812F080
+sub_812F080: @ 812F080
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -559832,7 +559832,7 @@ _0812F0F2:
 	thumb_func_end sub_812F080
 
 	thumb_func_start sub_812F104
-sub_812F104: ; 812F104
+sub_812F104: @ 812F104
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x3F
@@ -559846,7 +559846,7 @@ sub_812F104: ; 812F104
 	thumb_func_end sub_812F104
 
 	thumb_func_start sub_812F11C
-sub_812F11C: ; 812F11C
+sub_812F11C: @ 812F11C
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x3F
@@ -559860,7 +559860,7 @@ sub_812F11C: ; 812F11C
 	thumb_func_end sub_812F11C
 
 	thumb_func_start sub_812F134
-sub_812F134: ; 812F134
+sub_812F134: @ 812F134
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x3F
@@ -559876,7 +559876,7 @@ sub_812F134: ; 812F134
 	thumb_func_end sub_812F134
 
 	thumb_func_start sub_812F150
-sub_812F150: ; 812F150
+sub_812F150: @ 812F150
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -559937,7 +559937,7 @@ _0812F1B4:
 	thumb_func_end sub_812F150
 
 	thumb_func_start sub_812F1B8
-sub_812F1B8: ; 812F1B8
+sub_812F1B8: @ 812F1B8
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -559997,7 +559997,7 @@ _0812F216:
 	thumb_func_end sub_812F1B8
 
 	thumb_func_start sub_812F21C
-sub_812F21C: ; 812F21C
+sub_812F21C: @ 812F21C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -560088,7 +560088,7 @@ _0812F2C6:
 	thumb_func_end sub_812F21C
 
 	thumb_func_start sub_812F2CC
-sub_812F2CC: ; 812F2CC
+sub_812F2CC: @ 812F2CC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0x2E
@@ -560178,7 +560178,7 @@ _0812F368:
 	thumb_func_end sub_812F2CC
 
 	thumb_func_start sub_812F36C
-sub_812F36C: ; 812F36C
+sub_812F36C: @ 812F36C
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -560221,7 +560221,7 @@ _0812F3B0:
 	thumb_func_end sub_812F36C
 
 	thumb_func_start sub_812F3B4
-sub_812F3B4: ; 812F3B4
+sub_812F3B4: @ 812F3B4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -560318,7 +560318,7 @@ _0812F468:
 	thumb_func_end sub_812F3B4
 
 	thumb_func_start sub_812F470
-sub_812F470: ; 812F470
+sub_812F470: @ 812F470
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x30
@@ -560397,7 +560397,7 @@ _0812F4FC:
 	thumb_func_end sub_812F470
 
 	thumb_func_start sub_812F514
-sub_812F514: ; 812F514
+sub_812F514: @ 812F514
 	push {r4-r6,lr}
 	sub sp, 0x30
 	adds r4, r0, 0
@@ -560506,7 +560506,7 @@ _0812F5D8:
 	thumb_func_end sub_812F514
 
 	thumb_func_start sub_812F5E0
-sub_812F5E0: ; 812F5E0
+sub_812F5E0: @ 812F5E0
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -560560,7 +560560,7 @@ _0812F63C:
 	thumb_func_end sub_812F5E0
 
 	thumb_func_start sub_812F648
-sub_812F648: ; 812F648
+sub_812F648: @ 812F648
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -560722,12 +560722,12 @@ _0812F76C:
 	thumb_func_end sub_812F648
 
 	thumb_func_start nullsub_101
-nullsub_101: ; 812F780
+nullsub_101: @ 812F780
 	bx lr
 	thumb_func_end nullsub_101
 
 	thumb_func_start sub_812F784
-sub_812F784: ; 812F784
+sub_812F784: @ 812F784
 	push {lr}
 	movs r0, 0x4C
 	movs r1, 0
@@ -560737,7 +560737,7 @@ sub_812F784: ; 812F784
 	thumb_func_end sub_812F784
 
 	thumb_func_start sub_812F794
-sub_812F794: ; 812F794
+sub_812F794: @ 812F794
 	push {r4,lr}
 	ldr r0, =gUnknown_085A8520
 	ldr r4, [r0]
@@ -560760,7 +560760,7 @@ sub_812F794: ; 812F794
 	thumb_func_end sub_812F794
 
 	thumb_func_start sub_812F7C0
-sub_812F7C0: ; 812F7C0
+sub_812F7C0: @ 812F7C0
 	ldr r0, =0x0203ab34
 	ldr r2, [r0]
 	adds r1, r2, 0
@@ -560781,7 +560781,7 @@ sub_812F7C0: ; 812F7C0
 	thumb_func_end sub_812F7C0
 
 	thumb_func_start sub_812F7E4
-sub_812F7E4: ; 812F7E4
+sub_812F7E4: @ 812F7E4
 	push {r4-r6,lr}
 	bl sub_812F8A0
 	ldr r4, =0x0203aad4
@@ -560859,7 +560859,7 @@ _0812F822:
 	thumb_func_end sub_812F7E4
 
 	thumb_func_start sub_812F8A0
-sub_812F8A0: ; 812F8A0
+sub_812F8A0: @ 812F8A0
 	push {r4-r6,lr}
 	ldr r5, =0x0203ab2c
 	movs r0, 0x8
@@ -560908,7 +560908,7 @@ _0812F8C6:
 	thumb_func_end sub_812F8A0
 
 	thumb_func_start sub_812F908
-sub_812F908: ; 812F908
+sub_812F908: @ 812F908
 	push {r4,r5,lr}
 	ldr r4, =0x0203aac8
 	movs r5, 0x88
@@ -560939,7 +560939,7 @@ sub_812F908: ; 812F908
 	thumb_func_end sub_812F908
 
 	thumb_func_start sub_812F958
-sub_812F958: ; 812F958
+sub_812F958: @ 812F958
 	push {lr}
 	bl sub_812F968
 	bl sub_812F980
@@ -560948,7 +560948,7 @@ sub_812F958: ; 812F958
 	thumb_func_end sub_812F958
 
 	thumb_func_start sub_812F968
-sub_812F968: ; 812F968
+sub_812F968: @ 812F968
 	push {lr}
 	ldr r1, =gUnknown_08DCE770
 	movs r2, 0xA0
@@ -560962,7 +560962,7 @@ sub_812F968: ; 812F968
 	thumb_func_end sub_812F968
 
 	thumb_func_start sub_812F980
-sub_812F980: ; 812F980
+sub_812F980: @ 812F980
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -561085,7 +561085,7 @@ _0812FA32:
 	thumb_func_end sub_812F980
 
 	thumb_func_start sub_812FA78
-sub_812FA78: ; 812FA78
+sub_812FA78: @ 812FA78
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, [sp, 0x10]
@@ -561142,7 +561142,7 @@ sub_812FA78: ; 812FA78
 	thumb_func_end sub_812FA78
 
 	thumb_func_start sub_812FAF4
-sub_812FAF4: ; 812FAF4
+sub_812FAF4: @ 812FAF4
 	push {lr}
 	ldr r1, =gUnknown_08DCEC70
 	movs r2, 0xA0
@@ -561158,7 +561158,7 @@ sub_812FAF4: ; 812FAF4
 	thumb_func_end sub_812FAF4
 
 	thumb_func_start sub_812FB14
-sub_812FB14: ; 812FB14
+sub_812FB14: @ 812FB14
 	ldr r1, =0x03001188
 	ldr r0, =0x0203aaf4
 	ldr r0, [r0]
@@ -561220,7 +561220,7 @@ sub_812FB14: ; 812FB14
 	thumb_func_end sub_812FB14
 
 	thumb_func_start sub_812FBC4
-sub_812FBC4: ; 812FBC4
+sub_812FBC4: @ 812FBC4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -561423,7 +561423,7 @@ sub_812FBC4: ; 812FBC4
 	thumb_func_end sub_812FBC4
 
 	thumb_func_start sub_812FDA8
-sub_812FDA8: ; 812FDA8
+sub_812FDA8: @ 812FDA8
 	push {r4-r7,lr}
 	ldr r3, =0x02039f5d
 	ldr r4, =0x02039f5c
@@ -561451,7 +561451,7 @@ sub_812FDA8: ; 812FDA8
 	thumb_func_end sub_812FDA8
 
 	thumb_func_start sub_812FDEC
-sub_812FDEC: ; 812FDEC
+sub_812FDEC: @ 812FDEC
 	push {lr}
 	bl sub_812FE58
 	pop {r0}
@@ -561459,7 +561459,7 @@ sub_812FDEC: ; 812FDEC
 	thumb_func_end sub_812FDEC
 
 	thumb_func_start sub_812FDF8
-sub_812FDF8: ; 812FDF8
+sub_812FDF8: @ 812FDF8
 	push {lr}
 	bl sub_812FFC8
 	bl RunTextPrinters
@@ -561469,7 +561469,7 @@ sub_812FDF8: ; 812FDF8
 	thumb_func_end sub_812FDF8
 
 	thumb_func_start sub_812FE0C
-sub_812FE0C: ; 812FE0C
+sub_812FE0C: @ 812FE0C
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldr r0, [r0, 0x8]
@@ -561497,7 +561497,7 @@ sub_812FE0C: ; 812FE0C
 	thumb_func_end sub_812FE0C
 
 	thumb_func_start sub_812FE58
-sub_812FE58: ; 812FE58
+sub_812FE58: @ 812FE58
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -561643,7 +561643,7 @@ _0812FFA0:
 	thumb_func_end sub_812FE58
 
 	thumb_func_start sub_812FFC8
-sub_812FFC8: ; 812FFC8
+sub_812FFC8: @ 812FFC8
 	push {lr}
 	sub sp, 0x4
 	ldr r3, =0x030011f0
@@ -561738,7 +561738,7 @@ _08130082:
 	thumb_func_end sub_812FFC8
 
 	thumb_func_start sub_8130098
-sub_8130098: ; 8130098
+sub_8130098: @ 8130098
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -561782,7 +561782,7 @@ sub_8130098: ; 8130098
 	thumb_func_end sub_8130098
 
 	thumb_func_start sub_813010C
-sub_813010C: ; 813010C
+sub_813010C: @ 813010C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -561867,7 +561867,7 @@ _081301D4:
 	thumb_func_end sub_813010C
 
 	thumb_func_start sub_81301EC
-sub_81301EC: ; 81301EC
+sub_81301EC: @ 81301EC
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -561898,7 +561898,7 @@ sub_81301EC: ; 81301EC
 	thumb_func_end sub_81301EC
 
 	thumb_func_start sub_8130238
-sub_8130238: ; 8130238
+sub_8130238: @ 8130238
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -561929,7 +561929,7 @@ _0813026E:
 	thumb_func_end sub_8130238
 
 	thumb_func_start sub_8130280
-sub_8130280: ; 8130280
+sub_8130280: @ 8130280
 	push {lr}
 	ldr r0, =0x030011f6
 	ldrb r0, [r0]
@@ -561966,7 +561966,7 @@ _081302C0:
 	thumb_func_end sub_8130280
 
 	thumb_func_start sub_81302D0
-sub_81302D0: ; 81302D0
+sub_81302D0: @ 81302D0
 	push {lr}
 	bl sub_8130280
 	bl LoadOamFromSprites
@@ -561977,7 +561977,7 @@ sub_81302D0: ; 81302D0
 	thumb_func_end sub_81302D0
 
 	thumb_func_start sub_81302E8
-sub_81302E8: ; 81302E8
+sub_81302E8: @ 81302E8
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -562038,7 +562038,7 @@ _0813036C:
 	thumb_func_end sub_81302E8
 
 	thumb_func_start sub_8130380
-sub_8130380: ; 8130380
+sub_8130380: @ 8130380
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -562138,7 +562138,7 @@ _081303F8:
 	thumb_func_end sub_8130380
 
 	thumb_func_start sub_8130430
-sub_8130430: ; 8130430
+sub_8130430: @ 8130430
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -562374,7 +562374,7 @@ _08130676:
 	thumb_func_end sub_8130430
 
 	thumb_func_start sub_8130688
-sub_8130688: ; 8130688
+sub_8130688: @ 8130688
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -562404,7 +562404,7 @@ sub_8130688: ; 8130688
 	thumb_func_end sub_8130688
 
 	thumb_func_start sub_81306CC
-sub_81306CC: ; 81306CC
+sub_81306CC: @ 81306CC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -562459,7 +562459,7 @@ _08130732:
 	thumb_func_end sub_81306CC
 
 	thumb_func_start sub_8130738
-sub_8130738: ; 8130738
+sub_8130738: @ 8130738
 	push {r4,lr}
 	ldr r4, =0x030061c4
 	movs r0, 0x80
@@ -562478,7 +562478,7 @@ sub_8130738: ; 8130738
 	thumb_func_end sub_8130738
 
 	thumb_func_start sub_8130760
-sub_8130760: ; 8130760
+sub_8130760: @ 8130760
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -562581,7 +562581,7 @@ _08130846:
 	thumb_func_end sub_8130760
 
 	thumb_func_start sub_8130884
-sub_8130884: ; 8130884
+sub_8130884: @ 8130884
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -562612,7 +562612,7 @@ sub_8130884: ; 8130884
 	thumb_func_end sub_8130884
 
 	thumb_func_start sub_81308C8
-sub_81308C8: ; 81308C8
+sub_81308C8: @ 81308C8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -562636,7 +562636,7 @@ _081308DC:
 	bne _0813092E
 	movs r4, 0
 	ldr r6, =0x02038bca
-	ldr r5, =gTrainers + 0x10 ; items offset
+	ldr r5, =gTrainers + 0x10 @ items offset
 _081308F6:
 	lsls r2, r4, 1
 	ldrh r1, [r6]
@@ -562677,7 +562677,7 @@ _0813092E:
 	thumb_func_end sub_81308C8
 
 	thumb_func_start sub_8130950
-sub_8130950: ; 8130950
+sub_8130950: @ 8130950
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -562945,7 +562945,7 @@ _08130B8C:
 	thumb_func_end sub_8130950
 
 	thumb_func_start sub_8130BA4
-sub_8130BA4: ; 8130BA4
+sub_8130BA4: @ 8130BA4
 	push {r4,lr}
 	ldr r0, =0x020241ea
 	ldrh r4, [r0]
@@ -562973,7 +562973,7 @@ _08130BC8:
 	thumb_func_end sub_8130BA4
 
 	thumb_func_start sub_8130BDC
-sub_8130BDC: ; 8130BDC
+sub_8130BDC: @ 8130BDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -563117,7 +563117,7 @@ _08130CE0:
 	thumb_func_end sub_8130BDC
 
 	thumb_func_start sub_8130CF4
-sub_8130CF4: ; 8130CF4
+sub_8130CF4: @ 8130CF4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -563409,7 +563409,7 @@ _08130EFE:
 	thumb_func_end sub_8130CF4
 
 	thumb_func_start tai_run_script
-tai_run_script: ; 8130F48
+tai_run_script: @ 8130F48
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -563557,7 +563557,7 @@ _08131066:
 	thumb_func_end tai_run_script
 
 	thumb_func_start sub_8131074
-sub_8131074: ; 8131074
+sub_8131074: @ 8131074
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -563620,7 +563620,7 @@ _081310E4:
 	thumb_func_end sub_8131074
 
 	thumb_func_start sub_81310F0
-sub_81310F0: ; 81310F0
+sub_81310F0: @ 81310F0
 	push {r4,lr}
 	lsls r0, 24
 	ldr r4, =0x020244a8
@@ -563643,7 +563643,7 @@ _081310FC:
 	thumb_func_end sub_81310F0
 
 	thumb_func_start b_history__record_ability_usage_of_player
-b_history__record_ability_usage_of_player: ; 8131118
+b_history__record_ability_usage_of_player: @ 8131118
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020244a8
@@ -563657,7 +563657,7 @@ b_history__record_ability_usage_of_player: ; 8131118
 	thumb_func_end b_history__record_ability_usage_of_player
 
 	thumb_func_start sub_8131130
-sub_8131130: ; 8131130
+sub_8131130: @ 8131130
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x020244a8
@@ -563672,7 +563672,7 @@ sub_8131130: ; 8131130
 	thumb_func_end sub_8131130
 
 	thumb_func_start b_history__record_item_x12_of_player
-b_history__record_item_x12_of_player: ; 8131148
+b_history__record_item_x12_of_player: @ 8131148
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020244a8
@@ -563686,7 +563686,7 @@ b_history__record_item_x12_of_player: ; 8131148
 	thumb_func_end b_history__record_item_x12_of_player
 
 	thumb_func_start sub_8131160
-sub_8131160: ; 8131160
+sub_8131160: @ 8131160
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x020244a8
@@ -563701,7 +563701,7 @@ sub_8131160: ; 8131160
 	thumb_func_end sub_8131160
 
 	thumb_func_start tai00_unk
-tai00_unk: ; 8131178
+tai00_unk: @ 8131178
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -563736,7 +563736,7 @@ _081311B4:
 	thumb_func_end tai00_unk
 
 	thumb_func_start tai01_unk
-tai01_unk: ; 81311B8
+tai01_unk: @ 81311B8
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -563771,7 +563771,7 @@ _081311F4:
 	thumb_func_end tai01_unk
 
 	thumb_func_start tai02_unk
-tai02_unk: ; 81311F8
+tai02_unk: @ 81311F8
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -563806,7 +563806,7 @@ _08131234:
 	thumb_func_end tai02_unk
 
 	thumb_func_start tai03_unk
-tai03_unk: ; 8131238
+tai03_unk: @ 8131238
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -563841,7 +563841,7 @@ _08131274:
 	thumb_func_end tai03_unk
 
 	thumb_func_start tai04_unk
-tai04_unk: ; 8131278
+tai04_unk: @ 8131278
 	push {r4,lr}
 	ldr r2, =0x020244a8
 	ldr r0, [r2]
@@ -563877,7 +563877,7 @@ _081312A8:
 	thumb_func_end tai04_unk
 
 	thumb_func_start tai05_unk
-tai05_unk: ; 81312BC
+tai05_unk: @ 81312BC
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -563928,7 +563928,7 @@ _0813131C:
 	thumb_func_end tai05_unk
 
 	thumb_func_start tai06_unk
-tai06_unk: ; 8131324
+tai06_unk: @ 8131324
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -563979,7 +563979,7 @@ _08131384:
 	thumb_func_end tai06_unk
 
 	thumb_func_start tai07_unk
-tai07_unk: ; 813138C
+tai07_unk: @ 813138C
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564030,7 +564030,7 @@ _081313EC:
 	thumb_func_end tai07_unk
 
 	thumb_func_start tai08_unk
-tai08_unk: ; 81313F4
+tai08_unk: @ 81313F4
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564081,7 +564081,7 @@ _08131454:
 	thumb_func_end tai08_unk
 
 	thumb_func_start tai09_unk
-tai09_unk: ; 813145C
+tai09_unk: @ 813145C
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564140,7 +564140,7 @@ _081314CA:
 	thumb_func_end tai09_unk
 
 	thumb_func_start tai0A_unk
-tai0A_unk: ; 81314D0
+tai0A_unk: @ 81314D0
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564199,7 +564199,7 @@ _0813153E:
 	thumb_func_end tai0A_unk
 
 	thumb_func_start tai0B_unk
-tai0B_unk: ; 8131544
+tai0B_unk: @ 8131544
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564258,7 +564258,7 @@ _081315B2:
 	thumb_func_end tai0B_unk
 
 	thumb_func_start tai0C_unk
-tai0C_unk: ; 81315B8
+tai0C_unk: @ 81315B8
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564317,7 +564317,7 @@ _08131626:
 	thumb_func_end tai0C_unk
 
 	thumb_func_start tai0D_unk
-tai0D_unk: ; 813162C
+tai0D_unk: @ 813162C
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564374,7 +564374,7 @@ _08131696:
 	thumb_func_end tai0D_unk
 
 	thumb_func_start tai0E_unk
-tai0E_unk: ; 813169C
+tai0E_unk: @ 813169C
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -564431,7 +564431,7 @@ _08131706:
 	thumb_func_end tai0E_unk
 
 	thumb_func_start tai0F_unk
-tai0F_unk: ; 813170C
+tai0F_unk: @ 813170C
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -564491,7 +564491,7 @@ _08131782:
 	thumb_func_end tai0F_unk
 
 	thumb_func_start tai10_unk
-tai10_unk: ; 8131788
+tai10_unk: @ 8131788
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -564551,7 +564551,7 @@ _081317FE:
 	thumb_func_end tai10_unk
 
 	thumb_func_start tai11_unk
-tai11_unk: ; 8131804
+tai11_unk: @ 8131804
 	push {lr}
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
@@ -564584,7 +564584,7 @@ _0813183C:
 	thumb_func_end tai11_unk
 
 	thumb_func_start tai12_unk
-tai12_unk: ; 8131840
+tai12_unk: @ 8131840
 	push {lr}
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
@@ -564617,7 +564617,7 @@ _08131878:
 	thumb_func_end tai12_unk
 
 	thumb_func_start tai13_unk
-tai13_unk: ; 813187C
+tai13_unk: @ 813187C
 	push {lr}
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
@@ -564650,7 +564650,7 @@ _081318B4:
 	thumb_func_end tai13_unk
 
 	thumb_func_start tai14_unk
-tai14_unk: ; 81318B8
+tai14_unk: @ 81318B8
 	push {lr}
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
@@ -564683,7 +564683,7 @@ _081318F0:
 	thumb_func_end tai14_unk
 
 	thumb_func_start tai15_unk
-tai15_unk: ; 81318F4
+tai15_unk: @ 81318F4
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564727,7 +564727,7 @@ _08131942:
 	thumb_func_end tai15_unk
 
 	thumb_func_start tai16_unk
-tai16_unk: ; 8131948
+tai16_unk: @ 8131948
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564771,7 +564771,7 @@ _08131996:
 	thumb_func_end tai16_unk
 
 	thumb_func_start tai17_unk
-tai17_unk: ; 813199C
+tai17_unk: @ 813199C
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564815,7 +564815,7 @@ _081319EA:
 	thumb_func_end tai17_unk
 
 	thumb_func_start tai18_unk
-tai18_unk: ; 81319F0
+tai18_unk: @ 81319F0
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564859,7 +564859,7 @@ _08131A3E:
 	thumb_func_end tai18_unk
 
 	thumb_func_start tai19_unk
-tai19_unk: ; 8131A44
+tai19_unk: @ 8131A44
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564895,7 +564895,7 @@ _08131A84:
 	thumb_func_end tai19_unk
 
 	thumb_func_start tai1A_unk
-tai1A_unk: ; 8131A88
+tai1A_unk: @ 8131A88
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -564931,7 +564931,7 @@ _08131AC8:
 	thumb_func_end tai1A_unk
 
 	thumb_func_start tai1B_unk
-tai1B_unk: ; 8131ACC
+tai1B_unk: @ 8131ACC
 	push {r4,lr}
 	ldr r2, =0x0203ab38
 	ldr r1, [r2]
@@ -564987,7 +564987,7 @@ _08131B2E:
 	thumb_func_end tai1B_unk
 
 	thumb_func_start tai1C_unk
-tai1C_unk: ; 8131B34
+tai1C_unk: @ 8131B34
 	push {r4,lr}
 	ldr r2, =0x0203ab38
 	ldr r1, [r2]
@@ -565044,7 +565044,7 @@ _08131B98:
 	thumb_func_end tai1C_unk
 
 	thumb_func_start tai1D_unk
-tai1D_unk: ; 8131BA0
+tai1D_unk: @ 8131BA0
 	push {r4,r5,lr}
 	ldr r2, =0x0203ab38
 	ldr r1, [r2]
@@ -565101,7 +565101,7 @@ _08131C06:
 	thumb_func_end tai1D_unk
 
 	thumb_func_start tai1E_unk
-tai1E_unk: ; 8131C0C
+tai1E_unk: @ 8131C0C
 	push {r4,r5,lr}
 	ldr r2, =0x0203ab38
 	ldr r1, [r2]
@@ -565159,7 +565159,7 @@ _08131C74:
 	thumb_func_end tai1E_unk
 
 	thumb_func_start tai1F_unk
-tai1F_unk: ; 8131C7C
+tai1F_unk: @ 8131C7C
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r4, =0x0203ab38
@@ -565215,7 +565215,7 @@ _08131CE4:
 	thumb_func_end tai1F_unk
 
 	thumb_func_start tai20_unk
-tai20_unk: ; 8131CEC
+tai20_unk: @ 8131CEC
 	push {r4,r5,lr}
 	movs r3, 0
 	ldr r4, =0x0203ab38
@@ -565271,7 +565271,7 @@ _08131D54:
 	thumb_func_end tai20_unk
 
 	thumb_func_start tai21_unk
-tai21_unk: ; 8131D5C
+tai21_unk: @ 8131D5C
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r1, [r0, 0x14]
@@ -565287,7 +565287,7 @@ tai21_unk: ; 8131D5C
 	thumb_func_end tai21_unk
 
 	thumb_func_start dp15_get_some_type
-dp15_get_some_type: ; 8131D80
+dp15_get_some_type: @ 8131D80
 	push {r4,lr}
 	ldr r1, =0x0203ab38
 	ldr r0, [r1]
@@ -565388,7 +565388,7 @@ _08131E5A:
 	thumb_func_end dp15_get_some_type
 
 	thumb_func_start sub_8131E70
-sub_8131E70: ; 8131E70
+sub_8131E70: @ 8131E70
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -565427,7 +565427,7 @@ _08131EAC:
 	thumb_func_end sub_8131E70
 
 	thumb_func_start tai5F_unk
-tai5F_unk: ; 8131EB4
+tai5F_unk: @ 8131EB4
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -565476,7 +565476,7 @@ _08131F04:
 	thumb_func_end tai5F_unk
 
 	thumb_func_start dp15_move_get_power__2_8
-dp15_move_get_power__2_8: ; 8131F1C
+dp15_move_get_power__2_8: @ 8131F1C
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
@@ -565497,7 +565497,7 @@ dp15_move_get_power__2_8: ; 8131F1C
 	thumb_func_end dp15_move_get_power__2_8
 
 	thumb_func_start dp15_is_most_powerful_move__8
-dp15_is_most_powerful_move__8: ; 8131F48
+dp15_is_most_powerful_move__8: @ 8131F48
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -565738,7 +565738,7 @@ _08132130:
 	thumb_func_end dp15_is_most_powerful_move__8
 
 	thumb_func_start dp15_get_move_to_execute_B
-dp15_get_move_to_execute_B: ; 813214C
+dp15_get_move_to_execute_B: @ 813214C
 	push {lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -565774,7 +565774,7 @@ _08132182:
 	thumb_func_end dp15_get_move_to_execute_B
 
 	thumb_func_start tai26_unk
-tai26_unk: ; 81321A4
+tai26_unk: @ 81321A4
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -565807,7 +565807,7 @@ _081321DC:
 	thumb_func_end tai26_unk
 
 	thumb_func_start tai27_unk
-tai27_unk: ; 81321E0
+tai27_unk: @ 81321E0
 	push {lr}
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
@@ -565840,7 +565840,7 @@ _08132218:
 	thumb_func_end tai27_unk
 
 	thumb_func_start tai28_unk
-tai28_unk: ; 813221C
+tai28_unk: @ 813221C
 	push {lr}
 	ldr r0, =0x0203ab3c
 	ldrb r0, [r0]
@@ -565877,7 +565877,7 @@ _08132264:
 	thumb_func_end tai28_unk
 
 	thumb_func_start tai29_unk
-tai29_unk: ; 8132268
+tai29_unk: @ 8132268
 	push {lr}
 	ldr r0, =0x0203ab3c
 	ldrb r0, [r0]
@@ -565914,17 +565914,17 @@ _081322B0:
 	thumb_func_end tai29_unk
 
 	thumb_func_start nullsub_102
-nullsub_102: ; 81322B4
+nullsub_102: @ 81322B4
 	bx lr
 	thumb_func_end nullsub_102
 
 	thumb_func_start nullsub_103
-nullsub_103: ; 81322B8
+nullsub_103: @ 81322B8
 	bx lr
 	thumb_func_end nullsub_103
 
 	thumb_func_start tai2C_unk
-tai2C_unk: ; 81322BC
+tai2C_unk: @ 81322BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -566035,7 +566035,7 @@ _08132394:
 	thumb_func_end tai2C_unk
 
 	thumb_func_start dp15_get_move_id__8
-dp15_get_move_id__8: ; 81323B8
+dp15_get_move_id__8: @ 81323B8
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r1, [r0, 0x14]
@@ -566050,7 +566050,7 @@ dp15_get_move_id__8: ; 81323B8
 	thumb_func_end dp15_get_move_id__8
 
 	thumb_func_start dp15_move_get_move_script_id
-dp15_move_get_move_script_id: ; 81323D4
+dp15_move_get_move_script_id: @ 81323D4
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
@@ -566071,7 +566071,7 @@ dp15_move_get_move_script_id: ; 81323D4
 	thumb_func_end dp15_move_get_move_script_id
 
 	thumb_func_start tai2F_unk
-tai2F_unk: ; 8132400
+tai2F_unk: @ 8132400
 	push {r4-r7,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -566207,7 +566207,7 @@ _08132504:
 	thumb_func_end tai2F_unk
 
 	thumb_func_start tai60_unk
-tai60_unk: ; 813251C
+tai60_unk: @ 813251C
 	push {r4-r6,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -566333,7 +566333,7 @@ _08132608:
 	thumb_func_end tai60_unk
 
 	thumb_func_start tai30_unk
-tai30_unk: ; 8132614
+tai30_unk: @ 8132614
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -566438,7 +566438,7 @@ _081326B8:
 	thumb_func_end tai30_unk
 
 	thumb_func_start dp15_simulate_damage_bonus_jump_if_eq
-dp15_simulate_damage_bonus_jump_if_eq: ; 8132700
+dp15_simulate_damage_bonus_jump_if_eq: @ 8132700
 	push {r4,r5,lr}
 	ldr r0, =0x02024400
 	movs r1, 0
@@ -566529,17 +566529,17 @@ _081327C8:
 	thumb_func_end dp15_simulate_damage_bonus_jump_if_eq
 
 	thumb_func_start nullsub_104
-nullsub_104: ; 81327D0
+nullsub_104: @ 81327D0
 	bx lr
 	thumb_func_end nullsub_104
 
 	thumb_func_start nullsub_105
-nullsub_105: ; 81327D4
+nullsub_105: @ 81327D4
 	bx lr
 	thumb_func_end nullsub_105
 
 	thumb_func_start tai34_unk
-tai34_unk: ; 81327D8
+tai34_unk: @ 81327D8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -566647,7 +566647,7 @@ _0813289A:
 	thumb_func_end tai34_unk
 
 	thumb_func_start tai35_unk
-tai35_unk: ; 81328B8
+tai35_unk: @ 81328B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -566751,7 +566751,7 @@ _08132950:
 	thumb_func_end tai35_unk
 
 	thumb_func_start dp15_get_weather__8
-dp15_get_weather__8: ; 8132994
+dp15_get_weather__8: @ 8132994
 	push {lr}
 	ldr r2, =0x020243cc
 	ldrh r1, [r2]
@@ -566808,7 +566808,7 @@ _081329E8:
 	thumb_func_end dp15_get_weather__8
 
 	thumb_func_start tai37_unk
-tai37_unk: ; 8132A00
+tai37_unk: @ 8132A00
 	push {lr}
 	ldr r2, =gBattleMoves
 	ldr r0, =0x020244a8
@@ -566847,7 +566847,7 @@ _08132A48:
 	thumb_func_end tai37_unk
 
 	thumb_func_start tai38_unk
-tai38_unk: ; 8132A4C
+tai38_unk: @ 8132A4C
 	push {lr}
 	ldr r2, =gBattleMoves
 	ldr r0, =0x020244a8
@@ -566886,7 +566886,7 @@ _08132A94:
 	thumb_func_end tai38_unk
 
 	thumb_func_start tai39_unk
-tai39_unk: ; 8132A98
+tai39_unk: @ 8132A98
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -566939,7 +566939,7 @@ _08132AFA:
 	thumb_func_end tai39_unk
 
 	thumb_func_start tai3A_unk
-tai3A_unk: ; 8132B00
+tai3A_unk: @ 8132B00
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -566992,7 +566992,7 @@ _08132B62:
 	thumb_func_end tai3A_unk
 
 	thumb_func_start tai3B_unk
-tai3B_unk: ; 8132B68
+tai3B_unk: @ 8132B68
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -567045,7 +567045,7 @@ _08132BCA:
 	thumb_func_end tai3B_unk
 
 	thumb_func_start tai3C_unk
-tai3C_unk: ; 8132BD0
+tai3C_unk: @ 8132BD0
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -567098,7 +567098,7 @@ _08132C32:
 	thumb_func_end tai3C_unk
 
 	thumb_func_start tai3D_unk
-tai3D_unk: ; 8132C38
+tai3D_unk: @ 8132C38
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -567200,7 +567200,7 @@ _08132D24:
 	thumb_func_end tai3D_unk
 
 	thumb_func_start dp15_determine_move_damage_jump_if_not_fatal
-dp15_determine_move_damage_jump_if_not_fatal: ; 8132D34
+dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34
 	push {r4-r7,lr}
 	ldr r2, =gBattleMoves
 	ldr r7, =0x020244a8
@@ -567290,7 +567290,7 @@ _08132E0C:
 	thumb_func_end dp15_determine_move_damage_jump_if_not_fatal
 
 	thumb_func_start tai3F_unk
-tai3F_unk: ; 8132E18
+tai3F_unk: @ 8132E18
 	push {r4-r7,lr}
 	ldr r0, =0x0203ab38
 	ldr r5, [r0]
@@ -567446,7 +567446,7 @@ _08132F40:
 	thumb_func_end tai3F_unk
 
 	thumb_func_start tai40_unk
-tai40_unk: ; 8132F48
+tai40_unk: @ 8132F48
 	push {r4-r7,lr}
 	ldr r1, =0x0203ab38
 	ldr r0, [r1]
@@ -567559,7 +567559,7 @@ _08133018:
 	thumb_func_end tai40_unk
 
 	thumb_func_start tai41_unk
-tai41_unk: ; 8133020
+tai41_unk: @ 8133020
 	push {r4-r7,lr}
 	ldr r1, =0x0203ab38
 	ldr r0, [r1]
@@ -567681,7 +567681,7 @@ _08133110:
 	thumb_func_end tai41_unk
 
 	thumb_func_start tai42_unk
-tai42_unk: ; 8133118
+tai42_unk: @ 8133118
 	push {r4-r6,lr}
 	ldr r1, =0x0203ab38
 	ldr r0, [r1]
@@ -567794,7 +567794,7 @@ _081331F4:
 	thumb_func_end tai42_unk
 
 	thumb_func_start tai43_unk
-tai43_unk: ; 81331FC
+tai43_unk: @ 81331FC
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -567864,7 +567864,7 @@ _0813327C:
 	thumb_func_end tai43_unk
 
 	thumb_func_start tai44_unk
-tai44_unk: ; 8133284
+tai44_unk: @ 8133284
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r3, [r4]
@@ -567931,7 +567931,7 @@ _0813330C:
 	thumb_func_end tai44_unk
 
 	thumb_func_start tai45_unk
-tai45_unk: ; 8133314
+tai45_unk: @ 8133314
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r2, [r0, 0x14]
@@ -567944,7 +567944,7 @@ tai45_unk: ; 8133314
 	thumb_func_end tai45_unk
 
 	thumb_func_start tai46_unk
-tai46_unk: ; 8133328
+tai46_unk: @ 8133328
 	push {r4,lr}
 	ldr r0, =0x0202449c
 	ldr r0, [r0]
@@ -567991,7 +567991,7 @@ _0813337C:
 	thumb_func_end tai46_unk
 
 	thumb_func_start dp15_end_with_move_5
-dp15_end_with_move_5: ; 8133388
+dp15_end_with_move_5: @ 8133388
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r2, [r0, 0x14]
@@ -568004,7 +568004,7 @@ dp15_end_with_move_5: ; 8133388
 	thumb_func_end dp15_end_with_move_5
 
 	thumb_func_start dp15_get_held_item_x12__8
-dp15_get_held_item_x12__8: ; 813339C
+dp15_get_held_item_x12__8: @ 813339C
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -568057,7 +568057,7 @@ _081333F2:
 	thumb_func_end dp15_get_held_item_x12__8
 
 	thumb_func_start tai62_unk
-tai62_unk: ; 8133414
+tai62_unk: @ 8133414
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -568119,7 +568119,7 @@ _0813348E:
 	thumb_func_end tai62_unk
 
 	thumb_func_start tai49_unk
-tai49_unk: ; 8133494
+tai49_unk: @ 8133494
 	push {lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -568158,7 +568158,7 @@ _081334AE:
 	thumb_func_end tai49_unk
 
 	thumb_func_start dp15_enter_battle_countdown_get_state
-dp15_enter_battle_countdown_get_state: ; 81334EC
+dp15_enter_battle_countdown_get_state: @ 81334EC
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -568193,7 +568193,7 @@ _0813350A:
 	thumb_func_end dp15_enter_battle_countdown_get_state
 
 	thumb_func_start dp15_stockpile_get_num_uses
-dp15_stockpile_get_num_uses: ; 8133538
+dp15_stockpile_get_num_uses: @ 8133538
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -568228,7 +568228,7 @@ _08133556:
 	thumb_func_end dp15_stockpile_get_num_uses
 
 	thumb_func_start dp15_is_double_battle
-dp15_is_double_battle: ; 8133584
+dp15_is_double_battle: @ 8133584
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r2, [r0, 0x14]
@@ -568246,7 +568246,7 @@ dp15_is_double_battle: ; 8133584
 	thumb_func_end dp15_is_double_battle
 
 	thumb_func_start dp15_get_dp08_item__8
-dp15_get_dp08_item__8: ; 81335AC
+dp15_get_dp08_item__8: @ 81335AC
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -568281,7 +568281,7 @@ _081335CA:
 	thumb_func_end dp15_get_dp08_item__8
 
 	thumb_func_start dp15_move_get_type__8
-dp15_move_get_type__8: ; 81335F8
+dp15_move_get_type__8: @ 81335F8
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
@@ -568302,7 +568302,7 @@ dp15_move_get_type__8: ; 81335F8
 	thumb_func_end dp15_move_get_type__8
 
 	thumb_func_start dp15_move_get_power__8_8
-dp15_move_get_power__8_8: ; 8133624
+dp15_move_get_power__8_8: @ 8133624
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
@@ -568323,7 +568323,7 @@ dp15_move_get_power__8_8: ; 8133624
 	thumb_func_end dp15_move_get_power__8_8
 
 	thumb_func_start dp15_move_get_move_script_id__8
-dp15_move_get_move_script_id__8: ; 8133650
+dp15_move_get_move_script_id__8: @ 8133650
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r3, [r0, 0x14]
@@ -568344,7 +568344,7 @@ dp15_move_get_move_script_id__8: ; 8133650
 	thumb_func_end dp15_move_get_move_script_id__8
 
 	thumb_func_start dp15_get_protect_endure_activity
-dp15_get_protect_endure_activity: ; 813367C
+dp15_get_protect_endure_activity: @ 813367C
 	push {r4,lr}
 	ldr r0, =0x0203ab38
 	ldr r1, [r0]
@@ -568379,37 +568379,37 @@ _0813369A:
 	thumb_func_end dp15_get_protect_endure_activity
 
 	thumb_func_start nullsub_106
-nullsub_106: ; 81336C8
+nullsub_106: @ 81336C8
 	bx lr
 	thumb_func_end nullsub_106
 
 	thumb_func_start nullsub_107
-nullsub_107: ; 81336CC
+nullsub_107: @ 81336CC
 	bx lr
 	thumb_func_end nullsub_107
 
 	thumb_func_start nullsub_108
-nullsub_108: ; 81336D0
+nullsub_108: @ 81336D0
 	bx lr
 	thumb_func_end nullsub_108
 
 	thumb_func_start nullsub_109
-nullsub_109: ; 81336D4
+nullsub_109: @ 81336D4
 	bx lr
 	thumb_func_end nullsub_109
 
 	thumb_func_start nullsub_110
-nullsub_110: ; 81336D8
+nullsub_110: @ 81336D8
 	bx lr
 	thumb_func_end nullsub_110
 
 	thumb_func_start nullsub_111
-nullsub_111: ; 81336DC
+nullsub_111: @ 81336DC
 	bx lr
 	thumb_func_end nullsub_111
 
 	thumb_func_start tai58_unk
-tai58_unk: ; 81336E0
+tai58_unk: @ 81336E0
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -568434,7 +568434,7 @@ tai58_unk: ; 81336E0
 	thumb_func_end tai58_unk
 
 	thumb_func_start dp15_jump
-dp15_jump: ; 8133710
+dp15_jump: @ 8133710
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -568453,7 +568453,7 @@ dp15_jump: ; 8133710
 	thumb_func_end dp15_jump
 
 	thumb_func_start dp15_return
-dp15_return: ; 8133730
+dp15_return: @ 8133730
 	push {lr}
 	bl b_mc_stack_pop_cursor
 	lsls r0, 24
@@ -568473,7 +568473,7 @@ _0813374A:
 	thumb_func_end dp15_return
 
 	thumb_func_start dp15_compare_attacker_defender_levels
-dp15_compare_attacker_defender_levels: ; 8133754
+dp15_compare_attacker_defender_levels: @ 8133754
 	push {r4,r5,lr}
 	ldr r5, =0x0203ab38
 	ldr r4, [r5]
@@ -568572,7 +568572,7 @@ _08133824:
 	thumb_func_end dp15_compare_attacker_defender_levels
 
 	thumb_func_start tai5C_unk
-tai5C_unk: ; 813382C
+tai5C_unk: @ 813382C
 	push {lr}
 	ldr r2, =0x020242bc
 	ldr r0, =0x0202420c
@@ -568612,7 +568612,7 @@ _08133874:
 	thumb_func_end tai5C_unk
 
 	thumb_func_start tai5D_unk
-tai5D_unk: ; 813387C
+tai5D_unk: @ 813387C
 	push {lr}
 	ldr r2, =0x020242bc
 	ldr r0, =0x0202420c
@@ -568652,7 +568652,7 @@ _081338C4:
 	thumb_func_end tai5D_unk
 
 	thumb_func_start tai5E_unk
-tai5E_unk: ; 81338CC
+tai5E_unk: @ 81338CC
 	push {lr}
 	ldr r0, =0x0203ab3c
 	ldrb r3, [r0]
@@ -568691,7 +568691,7 @@ _08133914:
 	thumb_func_end tai5E_unk
 
 	thumb_func_start tai61_unk
-tai61_unk: ; 813391C
+tai61_unk: @ 813391C
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -568733,7 +568733,7 @@ _08133966:
 	thumb_func_end tai61_unk
 
 	thumb_func_start b_mc_stack_push
-b_mc_stack_push: ; 813396C
+b_mc_stack_push: @ 813396C
 	push {r4,lr}
 	ldr r1, =0x020244a8
 	ldr r1, [r1]
@@ -568754,7 +568754,7 @@ b_mc_stack_push: ; 813396C
 	thumb_func_end b_mc_stack_push
 
 	thumb_func_start b_mc_stack_push_cursor
-b_mc_stack_push_cursor: ; 8133990
+b_mc_stack_push_cursor: @ 8133990
 	ldr r0, =0x020244a8
 	ldr r0, [r0]
 	ldr r2, [r0, 0x1C]
@@ -568774,7 +568774,7 @@ b_mc_stack_push_cursor: ; 8133990
 	thumb_func_end b_mc_stack_push_cursor
 
 	thumb_func_start b_mc_stack_pop_cursor
-b_mc_stack_pop_cursor: ; 81339B8
+b_mc_stack_pop_cursor: @ 81339B8
 	push {lr}
 	ldr r3, =0x020244a8
 	ldr r0, [r3]
@@ -568808,7 +568808,7 @@ _081339EE:
 	thumb_func_end b_mc_stack_pop_cursor
 
 	thumb_func_start sub_81339F8
-sub_81339F8: ; 81339F8
+sub_81339F8: @ 81339F8
 	push {r4-r6,lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -568854,7 +568854,7 @@ _08133A12:
 	thumb_func_end sub_81339F8
 
 	thumb_func_start sub_8133A60
-sub_8133A60: ; 8133A60
+sub_8133A60: @ 8133A60
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00002e59
@@ -568866,7 +568866,7 @@ sub_8133A60: ; 8133A60
 	thumb_func_end sub_8133A60
 
 	thumb_func_start sub_8133A78
-sub_8133A78: ; 8133A78
+sub_8133A78: @ 8133A78
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -569025,7 +569025,7 @@ _08133B94:
 	thumb_func_end sub_8133A78
 
 	thumb_func_start sub_8133BE4
-sub_8133BE4: ; 8133BE4
+sub_8133BE4: @ 8133BE4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -569067,7 +569067,7 @@ _08133C18:
 	thumb_func_end sub_8133BE4
 
 	thumb_func_start sub_8133C48
-sub_8133C48: ; 8133C48
+sub_8133C48: @ 8133C48
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -569134,7 +569134,7 @@ _08133CCA:
 	thumb_func_end sub_8133C48
 
 	thumb_func_start sub_8133CD8
-sub_8133CD8: ; 8133CD8
+sub_8133CD8: @ 8133CD8
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x020375f0
@@ -569147,7 +569147,7 @@ sub_8133CD8: ; 8133CD8
 	thumb_func_end sub_8133CD8
 
 	thumb_func_start sub_8133CF4
-sub_8133CF4: ; 8133CF4
+sub_8133CF4: @ 8133CF4
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x020375f0
@@ -569178,7 +569178,7 @@ _08133D20:
 	thumb_func_end sub_8133CF4
 
 	thumb_func_start sub_8133D2C
-sub_8133D2C: ; 8133D2C
+sub_8133D2C: @ 8133D2C
 	push {r4-r6,lr}
 	ldr r6, =0x020375f0
 	movs r0, 0
@@ -569220,7 +569220,7 @@ _08133D72:
 	thumb_func_end sub_8133D2C
 
 	thumb_func_start sub_8133D8C
-sub_8133D8C: ; 8133D8C
+sub_8133D8C: @ 8133D8C
 	push {lr}
 	ldr r0, =sub_8127208
 	movs r1, 0
@@ -569231,7 +569231,7 @@ sub_8133D8C: ; 8133D8C
 	thumb_func_end sub_8133D8C
 
 	thumb_func_start sub_8133DA0
-sub_8133DA0: ; 8133DA0
+sub_8133DA0: @ 8133DA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -569278,7 +569278,7 @@ _08133E04:
 	thumb_func_end sub_8133DA0
 
 	thumb_func_start sub_8133E1C
-sub_8133E1C: ; 8133E1C
+sub_8133E1C: @ 8133E1C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -569293,7 +569293,7 @@ sub_8133E1C: ; 8133E1C
 	thumb_func_end sub_8133E1C
 
 	thumb_func_start sub_8133E38
-sub_8133E38: ; 8133E38
+sub_8133E38: @ 8133E38
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -569344,7 +569344,7 @@ sub_8133E38: ; 8133E38
 	thumb_func_end sub_8133E38
 
 	thumb_func_start sub_8133EC0
-sub_8133EC0: ; 8133EC0
+sub_8133EC0: @ 8133EC0
 	push {lr}
 	ldr r0, =sub_8133C48
 	movs r1, 0
@@ -569358,7 +569358,7 @@ sub_8133EC0: ; 8133EC0
 	thumb_func_end sub_8133EC0
 
 	thumb_func_start sub_8133EDC
-sub_8133EDC: ; 8133EDC
+sub_8133EDC: @ 8133EDC
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -569376,7 +569376,7 @@ _08133EE8:
 	thumb_func_end sub_8133EDC
 
 	thumb_func_start sub_8133EF8
-sub_8133EF8: ; 8133EF8
+sub_8133EF8: @ 8133EF8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -569386,7 +569386,7 @@ sub_8133EF8: ; 8133EF8
 	thumb_func_end sub_8133EF8
 
 	thumb_func_start set_256color_bg_bg0
-set_256color_bg_bg0: ; 8133F0C
+set_256color_bg_bg0: @ 8133F0C
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -569650,7 +569650,7 @@ set_256color_bg_bg0: ; 8133F0C
 	thumb_func_end set_256color_bg_bg0
 
 	thumb_func_start sub_81341E0
-sub_81341E0: ; 81341E0
+sub_81341E0: @ 81341E0
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -569662,7 +569662,7 @@ sub_81341E0: ; 81341E0
 	thumb_func_end sub_81341E0
 
 	thumb_func_start sub_81341FC
-sub_81341FC: ; 81341FC
+sub_81341FC: @ 81341FC
 	push {r4,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -569703,7 +569703,7 @@ sub_81341FC: ; 81341FC
 	thumb_func_end sub_81341FC
 
 	thumb_func_start sub_813425C
-sub_813425C: ; 813425C
+sub_813425C: @ 813425C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -569801,7 +569801,7 @@ _08134334:
 	thumb_func_end sub_813425C
 
 	thumb_func_start sub_8134340
-sub_8134340: ; 8134340
+sub_8134340: @ 8134340
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -569840,7 +569840,7 @@ _0813437E:
 	thumb_func_end sub_8134340
 
 	thumb_func_start sub_8134390
-sub_8134390: ; 8134390
+sub_8134390: @ 8134390
 	push {r4,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -569886,7 +569886,7 @@ sub_8134390: ; 8134390
 	thumb_func_end sub_8134390
 
 	thumb_func_start sub_8134400
-sub_8134400: ; 8134400
+sub_8134400: @ 8134400
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -569962,7 +569962,7 @@ _0813449A:
 	thumb_func_end sub_8134400
 
 	thumb_func_start sub_81344AC
-sub_81344AC: ; 81344AC
+sub_81344AC: @ 81344AC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -569977,7 +569977,7 @@ sub_81344AC: ; 81344AC
 	thumb_func_end sub_81344AC
 
 	thumb_func_start sub_81344C8
-sub_81344C8: ; 81344C8
+sub_81344C8: @ 81344C8
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -570112,7 +570112,7 @@ sub_81344C8: ; 81344C8
 	thumb_func_end sub_81344C8
 
 	thumb_func_start sub_8134604
-sub_8134604: ; 8134604
+sub_8134604: @ 8134604
 	push {r4,lr}
 	ldr r4, =0x030011f8
 	ldrb r0, [r4]
@@ -570139,7 +570139,7 @@ sub_8134604: ; 8134604
 	thumb_func_end sub_8134604
 
 	thumb_func_start sub_8134640
-sub_8134640: ; 8134640
+sub_8134640: @ 8134640
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -570159,7 +570159,7 @@ sub_8134640: ; 8134640
 	thumb_func_end sub_8134640
 
 	thumb_func_start sub_8134668
-sub_8134668: ; 8134668
+sub_8134668: @ 8134668
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -570179,7 +570179,7 @@ sub_8134668: ; 8134668
 	thumb_func_end sub_8134668
 
 	thumb_func_start sub_8134690
-sub_8134690: ; 8134690
+sub_8134690: @ 8134690
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -570217,7 +570217,7 @@ sub_8134690: ; 8134690
 	thumb_func_end sub_8134690
 
 	thumb_func_start sub_81346DC
-sub_81346DC: ; 81346DC
+sub_81346DC: @ 81346DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =gUnknown_085B1E28
@@ -570264,7 +570264,7 @@ sub_81346DC: ; 81346DC
 	thumb_func_end sub_81346DC
 
 	thumb_func_start sub_813473C
-sub_813473C: ; 813473C
+sub_813473C: @ 813473C
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x03005e00
@@ -570295,7 +570295,7 @@ _08134770:
 	thumb_func_end sub_813473C
 
 	thumb_func_start sub_8134774
-sub_8134774: ; 8134774
+sub_8134774: @ 8134774
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x20]
@@ -570335,7 +570335,7 @@ _081347B0:
 	thumb_func_end sub_8134774
 
 	thumb_func_start sub_81347B4
-sub_81347B4: ; 81347B4
+sub_81347B4: @ 81347B4
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -570345,7 +570345,7 @@ sub_81347B4: ; 81347B4
 	thumb_func_end sub_81347B4
 
 	thumb_func_start LoadWallClockGraphics
-LoadWallClockGraphics: ; 81347C8
+LoadWallClockGraphics: @ 81347C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -570524,7 +570524,7 @@ _08134906:
 	thumb_func_end LoadWallClockGraphics
 
 	thumb_func_start sub_813498C
-sub_813498C: ; 813498C
+sub_813498C: @ 813498C
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -570566,7 +570566,7 @@ sub_813498C: ; 813498C
 	thumb_func_end sub_813498C
 
 	thumb_func_start Cb2_StartWallClock
-Cb2_StartWallClock: ; 81349F4
+Cb2_StartWallClock: @ 81349F4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -570707,7 +570707,7 @@ Cb2_StartWallClock: ; 81349F4
 	thumb_func_end Cb2_StartWallClock
 
 	thumb_func_start Cb2_ViewWallClock
-Cb2_ViewWallClock: ; 8134B44
+Cb2_ViewWallClock: @ 8134B44
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -570854,7 +570854,7 @@ _08134BA4:
 	thumb_func_end Cb2_ViewWallClock
 
 	thumb_func_start sub_8134C9C
-sub_8134C9C: ; 8134C9C
+sub_8134C9C: @ 8134C9C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -570866,7 +570866,7 @@ sub_8134C9C: ; 8134C9C
 	thumb_func_end sub_8134C9C
 
 	thumb_func_start sub_8134CB8
-sub_8134CB8: ; 8134CB8
+sub_8134CB8: @ 8134CB8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -570890,7 +570890,7 @@ _08134CD8:
 	thumb_func_end sub_8134CB8
 
 	thumb_func_start sub_8134CE8
-sub_8134CE8: ; 8134CE8
+sub_8134CE8: @ 8134CE8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -570999,7 +570999,7 @@ _08134DBE:
 	thumb_func_end sub_8134CE8
 
 	thumb_func_start sub_8134DC4
-sub_8134DC4: ; 8134DC4
+sub_8134DC4: @ 8134DC4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -571045,7 +571045,7 @@ sub_8134DC4: ; 8134DC4
 	thumb_func_end sub_8134DC4
 
 	thumb_func_start c3_80BF560
-c3_80BF560: ; 8134E30
+c3_80BF560: @ 8134E30
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -571100,7 +571100,7 @@ _08134E96:
 	thumb_func_end c3_80BF560
 
 	thumb_func_start sub_8134EA4
-sub_8134EA4: ; 8134EA4
+sub_8134EA4: @ 8134EA4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -571132,7 +571132,7 @@ sub_8134EA4: ; 8134EA4
 	thumb_func_end sub_8134EA4
 
 	thumb_func_start c2_080111BC
-c2_080111BC: ; 8134EE8
+c2_080111BC: @ 8134EE8
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -571151,7 +571151,7 @@ _08134F02:
 	thumb_func_end c2_080111BC
 
 	thumb_func_start sub_8134F10
-sub_8134F10: ; 8134F10
+sub_8134F10: @ 8134F10
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -571175,7 +571175,7 @@ _08134F30:
 	thumb_func_end sub_8134F10
 
 	thumb_func_start sub_8134F40
-sub_8134F40: ; 8134F40
+sub_8134F40: @ 8134F40
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -571202,7 +571202,7 @@ _08134F66:
 	thumb_func_end sub_8134F40
 
 	thumb_func_start sub_8134F78
-sub_8134F78: ; 8134F78
+sub_8134F78: @ 8134F78
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -571230,7 +571230,7 @@ sub_8134F78: ; 8134F78
 	thumb_func_end sub_8134F78
 
 	thumb_func_start sub_8134FB0
-sub_8134FB0: ; 8134FB0
+sub_8134FB0: @ 8134FB0
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -571248,7 +571248,7 @@ _08134FC6:
 	thumb_func_end sub_8134FB0
 
 	thumb_func_start sub_8134FD4
-sub_8134FD4: ; 8134FD4
+sub_8134FD4: @ 8134FD4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -571275,7 +571275,7 @@ _08134FF6:
 	thumb_func_end sub_8134FD4
 
 	thumb_func_start sub_8134FFC
-sub_8134FFC: ; 8134FFC
+sub_8134FFC: @ 8134FFC
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -571324,7 +571324,7 @@ _08135044:
 	thumb_func_end sub_8134FFC
 
 	thumb_func_start sub_813504C
-sub_813504C: ; 813504C
+sub_813504C: @ 813504C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -571408,7 +571408,7 @@ _081350DE:
 	thumb_func_end sub_813504C
 
 	thumb_func_start sub_81350E8
-sub_81350E8: ; 81350E8
+sub_81350E8: @ 81350E8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -571452,7 +571452,7 @@ _0813512A:
 	thumb_func_end sub_81350E8
 
 	thumb_func_start sub_8135130
-sub_8135130: ; 8135130
+sub_8135130: @ 8135130
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -571512,7 +571512,7 @@ _081351A2:
 	thumb_func_end sub_8135130
 
 	thumb_func_start sub_81351AC
-sub_81351AC: ; 81351AC
+sub_81351AC: @ 81351AC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -571590,7 +571590,7 @@ _08135230:
 	thumb_func_end sub_81351AC
 
 	thumb_func_start sub_8135244
-sub_8135244: ; 8135244
+sub_8135244: @ 8135244
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -571668,7 +571668,7 @@ _081352C8:
 	thumb_func_end sub_8135244
 
 	thumb_func_start sub_81352DC
-sub_81352DC: ; 81352DC
+sub_81352DC: @ 81352DC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03005e00
@@ -571755,7 +571755,7 @@ _08135370:
 	thumb_func_end sub_81352DC
 
 	thumb_func_start sub_8135380
-sub_8135380: ; 8135380
+sub_8135380: @ 8135380
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03005e00
@@ -571842,7 +571842,7 @@ _08135414:
 	thumb_func_end sub_8135380
 
 	thumb_func_start npc_before_player_of_type
-npc_before_player_of_type: ; 8135424
+npc_before_player_of_type: @ 8135424
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -571882,7 +571882,7 @@ _08135472:
 	thumb_func_end npc_before_player_of_type
 
 	thumb_func_start oei_task_add
-oei_task_add: ; 8135478
+oei_task_add: @ 8135478
 	push {lr}
 	ldr r0, =0x0203ab40
 	adds r1, r0, 0x2
@@ -571898,7 +571898,7 @@ oei_task_add: ; 8135478
 	thumb_func_end oei_task_add
 
 	thumb_func_start task08_080C9820
-task08_080C9820: ; 813549C
+task08_080C9820: @ 813549C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -571959,7 +571959,7 @@ _0813551E:
 	thumb_func_end task08_080C9820
 
 	thumb_func_start sub_813552C
-sub_813552C: ; 813552C
+sub_813552C: @ 813552C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -571992,7 +571992,7 @@ _08135560:
 	thumb_func_end sub_813552C
 
 	thumb_func_start sub_8135578
-sub_8135578: ; 8135578
+sub_8135578: @ 8135578
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -572065,7 +572065,7 @@ _081355FC:
 	thumb_func_end sub_8135578
 
 	thumb_func_start sub_813561C
-sub_813561C: ; 813561C
+sub_813561C: @ 813561C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -572092,7 +572092,7 @@ sub_813561C: ; 813561C
 	thumb_func_end sub_813561C
 
 	thumb_func_start sub_8135654
-sub_8135654: ; 8135654
+sub_8135654: @ 8135654
 	push {r4,lr}
 	bl sub_81797DC
 	lsls r0, 24
@@ -572136,7 +572136,7 @@ _081356AC:
 	thumb_func_end sub_8135654
 
 	thumb_func_start sub_81356C4
-sub_81356C4: ; 81356C4
+sub_81356C4: @ 81356C4
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -572151,7 +572151,7 @@ sub_81356C4: ; 81356C4
 	thumb_func_end sub_81356C4
 
 	thumb_func_start oei_rocksmash
-oei_rocksmash: ; 81356E4
+oei_rocksmash: @ 81356E4
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -572174,7 +572174,7 @@ oei_rocksmash: ; 81356E4
 	thumb_func_end oei_rocksmash
 
 	thumb_func_start sub_8135714
-sub_8135714: ; 8135714
+sub_8135714: @ 8135714
 	push {lr}
 	movs r0, 0x83
 	bl audio_play
@@ -572186,7 +572186,7 @@ sub_8135714: ; 8135714
 	thumb_func_end sub_8135714
 
 	thumb_func_start sub_813572C
-sub_813572C: ; 813572C
+sub_813572C: @ 813572C
 	push {lr}
 	bl sub_80FE314
 	lsls r0, 24
@@ -572210,7 +572210,7 @@ _0813574C:
 	thumb_func_end sub_813572C
 
 	thumb_func_start hm2_dig
-hm2_dig: ; 8135760
+hm2_dig: @ 8135760
 	push {lr}
 	bl flagmods_08054D70
 	movs r0, 0x26
@@ -572226,7 +572226,7 @@ hm2_dig: ; 8135760
 	thumb_func_end hm2_dig
 
 	thumb_func_start sub_8135780
-sub_8135780: ; 8135780
+sub_8135780: @ 8135780
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -572254,7 +572254,7 @@ _081357AC:
 	thumb_func_end sub_8135780
 
 	thumb_func_start sub_81357BC
-sub_81357BC: ; 81357BC
+sub_81357BC: @ 81357BC
 	push {r4,lr}
 	movs r0, 0x26
 	bl FieldEffectActiveListRemove
@@ -572285,7 +572285,7 @@ _081357EE:
 	thumb_func_end sub_81357BC
 
 	thumb_func_start sub_81357FC
-sub_81357FC: ; 81357FC
+sub_81357FC: @ 81357FC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -572381,7 +572381,7 @@ _081358D4:
 	thumb_func_end sub_81357FC
 
 	thumb_func_start sub_81358F4
-sub_81358F4: ; 81358F4
+sub_81358F4: @ 81358F4
 	push {lr}
 	ldr r1, =sub_8059D50
 	movs r0, 0x1
@@ -572392,7 +572392,7 @@ sub_81358F4: ; 81358F4
 	thumb_func_end sub_81358F4
 
 	thumb_func_start sub_8135908
-sub_8135908: ; 8135908
+sub_8135908: @ 8135908
 	push {lr}
 	ldr r1, =c2_exit_to_overworld_2_switch
 	movs r0, 0x2
@@ -572403,7 +572403,7 @@ sub_8135908: ; 8135908
 	thumb_func_end sub_8135908
 
 	thumb_func_start sub_813591C
-sub_813591C: ; 813591C
+sub_813591C: @ 813591C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -572415,7 +572415,7 @@ sub_813591C: ; 813591C
 	thumb_func_end sub_813591C
 
 	thumb_func_start sub_8135938
-sub_8135938: ; 8135938
+sub_8135938: @ 8135938
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -572425,7 +572425,7 @@ sub_8135938: ; 8135938
 	thumb_func_end sub_8135938
 
 	thumb_func_start sub_813594C
-sub_813594C: ; 813594C
+sub_813594C: @ 813594C
 	push {lr}
 _0813594E:
 	bl sub_81221EC
@@ -572449,7 +572449,7 @@ _08135972:
 	thumb_func_end sub_813594C
 
 	thumb_func_start sub_8135978
-sub_8135978: ; 8135978
+sub_8135978: @ 8135978
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -572693,7 +572693,7 @@ _08135BD2:
 	thumb_func_end sub_8135978
 
 	thumb_func_start sub_8135BDC
-sub_8135BDC: ; 8135BDC
+sub_8135BDC: @ 8135BDC
 	push {lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -572728,7 +572728,7 @@ sub_8135BDC: ; 8135BDC
 	thumb_func_end sub_8135BDC
 
 	thumb_func_start sub_8135C38
-sub_8135C38: ; 8135C38
+sub_8135C38: @ 8135C38
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203ab50
@@ -572824,7 +572824,7 @@ _08135D1A:
 	thumb_func_end sub_8135C38
 
 	thumb_func_start sub_8135D24
-sub_8135D24: ; 8135D24
+sub_8135D24: @ 8135D24
 	push {r4,lr}
 	ldr r0, =gUnknown_085B2748
 	bl InitWindows
@@ -572862,7 +572862,7 @@ _08135D50:
 	thumb_func_end sub_8135D24
 
 	thumb_func_start sub_8135D7C
-sub_8135D7C: ; 8135D7C
+sub_8135D7C: @ 8135D7C
 	push {r4,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -572887,7 +572887,7 @@ sub_8135D7C: ; 8135D7C
 	thumb_func_end sub_8135D7C
 
 	thumb_func_start sub_8135DAC
-sub_8135DAC: ; 8135DAC
+sub_8135DAC: @ 8135DAC
 	push {r4,lr}
 	ldr r0, =0x00000111
 	bl itemid_get_item
@@ -572936,7 +572936,7 @@ _08135DFE:
 	thumb_func_end sub_8135DAC
 
 	thumb_func_start sub_8135E2C
-sub_8135E2C: ; 8135E2C
+sub_8135E2C: @ 8135E2C
 	push {r4-r7,lr}
 	movs r6, 0
 	ldr r1, =0x0203ab50
@@ -573032,7 +573032,7 @@ _08135E7C:
 	thumb_func_end sub_8135E2C
 
 	thumb_func_start sub_8135F04
-sub_8135F04: ; 8135F04
+sub_8135F04: @ 8135F04
 	push {r4-r6,lr}
 	lsls r1, 16
 	ldr r2, =0x03005d8c
@@ -573077,7 +573077,7 @@ sub_8135F04: ; 8135F04
 	thumb_func_end sub_8135F04
 
 	thumb_func_start sub_8135F70
-sub_8135F70: ; 8135F70
+sub_8135F70: @ 8135F70
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -573117,7 +573117,7 @@ _08135FB0:
 	thumb_func_end sub_8135F70
 
 	thumb_func_start sub_8135FCC
-sub_8135FCC: ; 8135FCC
+sub_8135FCC: @ 8135FCC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -573270,7 +573270,7 @@ _081360F8:
 	thumb_func_end sub_8135FCC
 
 	thumb_func_start sub_8136110
-sub_8136110: ; 8136110
+sub_8136110: @ 8136110
 	push {lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -573295,7 +573295,7 @@ sub_8136110: ; 8136110
 	thumb_func_end sub_8136110
 
 	thumb_func_start sub_8136140
-sub_8136140: ; 8136140
+sub_8136140: @ 8136140
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -573356,7 +573356,7 @@ _08136192:
 	thumb_func_end sub_8136140
 
 	thumb_func_start sub_81361B0
-sub_81361B0: ; 81361B0
+sub_81361B0: @ 81361B0
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -573437,7 +573437,7 @@ _08136246:
 	thumb_func_end sub_81361B0
 
 	thumb_func_start sub_813624C
-sub_813624C: ; 813624C
+sub_813624C: @ 813624C
 	ldr r1, =0x0203ab48
 	movs r0, 0
 	strh r0, [r1, 0x4]
@@ -573447,7 +573447,7 @@ sub_813624C: ; 813624C
 	thumb_func_end sub_813624C
 
 	thumb_func_start sub_813625C
-sub_813625C: ; 813625C
+sub_813625C: @ 813625C
 	push {r4,r5,lr}
 	bl sub_8136140
 	ldr r0, =0x0203ab50
@@ -573509,7 +573509,7 @@ _081362D6:
 	thumb_func_end sub_813625C
 
 	thumb_func_start sub_81362E0
-sub_81362E0: ; 81362E0
+sub_81362E0: @ 81362E0
 	push {r4,r5,lr}
 	ldr r0, =0x0203ab48
 	ldrh r1, [r0, 0x6]
@@ -573557,7 +573557,7 @@ _0813633C:
 	thumb_func_end sub_81362E0
 
 	thumb_func_start sub_8136344
-sub_8136344: ; 8136344
+sub_8136344: @ 8136344
 	push {r4-r7,lr}
 	ldr r0, =0x0203ab48
 	ldrh r1, [r0, 0x4]
@@ -573615,7 +573615,7 @@ _081363A4:
 	thumb_func_end sub_8136344
 
 	thumb_func_start sub_81363BC
-sub_81363BC: ; 81363BC
+sub_81363BC: @ 81363BC
 	push {r4,lr}
 	sub sp, 0x10
 	ldr r4, =0x0203ab50
@@ -573656,7 +573656,7 @@ _081363FC:
 	thumb_func_end sub_81363BC
 
 	thumb_func_start sub_8136418
-sub_8136418: ; 8136418
+sub_8136418: @ 8136418
 	push {r4,lr}
 	ldr r4, =0x0203ab50
 	ldr r0, [r4]
@@ -573679,7 +573679,7 @@ _08136436:
 	thumb_func_end sub_8136418
 
 	thumb_func_start sub_8136444
-sub_8136444: ; 8136444
+sub_8136444: @ 8136444
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -573703,7 +573703,7 @@ sub_8136444: ; 8136444
 	thumb_func_end sub_8136444
 
 	thumb_func_start sub_8136470
-sub_8136470: ; 8136470
+sub_8136470: @ 8136470
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -573767,7 +573767,7 @@ _081364E0:
 	thumb_func_end sub_8136470
 
 	thumb_func_start sub_81364EC
-sub_81364EC: ; 81364EC
+sub_81364EC: @ 81364EC
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -573795,7 +573795,7 @@ sub_81364EC: ; 81364EC
 	thumb_func_end sub_81364EC
 
 	thumb_func_start sub_8136524
-sub_8136524: ; 8136524
+sub_8136524: @ 8136524
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -573861,7 +573861,7 @@ _081365BE:
 	thumb_func_end sub_8136524
 
 	thumb_func_start sub_81365C8
-sub_81365C8: ; 81365C8
+sub_81365C8: @ 81365C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -574002,7 +574002,7 @@ _08136708:
 	thumb_func_end sub_81365C8
 
 	thumb_func_start sub_813671C
-sub_813671C: ; 813671C
+sub_813671C: @ 813671C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -574144,7 +574144,7 @@ _08136848:
 	thumb_func_end sub_813671C
 
 	thumb_func_start sub_8136854
-sub_8136854: ; 8136854
+sub_8136854: @ 8136854
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -574240,7 +574240,7 @@ _081368E6:
 	thumb_func_end sub_8136854
 
 	thumb_func_start sub_8136938
-sub_8136938: ; 8136938
+sub_8136938: @ 8136938
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -574306,7 +574306,7 @@ _0813696A:
 	thumb_func_end sub_8136938
 
 	thumb_func_start sub_81369E0
-sub_81369E0: ; 81369E0
+sub_81369E0: @ 81369E0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -574356,7 +574356,7 @@ _08136A3C:
 	thumb_func_end sub_81369E0
 
 	thumb_func_start sub_8136A50
-sub_8136A50: ; 8136A50
+sub_8136A50: @ 8136A50
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -574374,7 +574374,7 @@ sub_8136A50: ; 8136A50
 	thumb_func_end sub_8136A50
 
 	thumb_func_start sub_8136A74
-sub_8136A74: ; 8136A74
+sub_8136A74: @ 8136A74
 	push {lr}
 	ldr r2, =0x03005d8c
 	ldr r0, =0x0203ce7c
@@ -574392,7 +574392,7 @@ sub_8136A74: ; 8136A74
 	thumb_func_end sub_8136A74
 
 	thumb_func_start sub_8136AA0
-sub_8136AA0: ; 8136AA0
+sub_8136AA0: @ 8136AA0
 	push {lr}
 	ldr r0, =0x0203ab48
 	ldr r1, [r0]
@@ -574404,7 +574404,7 @@ sub_8136AA0: ; 8136AA0
 	thumb_func_end sub_8136AA0
 
 	thumb_func_start sub_8136AB4
-sub_8136AB4: ; 8136AB4
+sub_8136AB4: @ 8136AB4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -574459,7 +574459,7 @@ sub_8136AB4: ; 8136AB4
 	thumb_func_end sub_8136AB4
 
 	thumb_func_start sub_8136B48
-sub_8136B48: ; 8136B48
+sub_8136B48: @ 8136B48
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -574483,7 +574483,7 @@ sub_8136B48: ; 8136B48
 	thumb_func_end sub_8136B48
 
 	thumb_func_start sub_8136B78
-sub_8136B78: ; 8136B78
+sub_8136B78: @ 8136B78
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -574515,7 +574515,7 @@ sub_8136B78: ; 8136B78
 	thumb_func_end sub_8136B78
 
 	thumb_func_start sub_8136BC0
-sub_8136BC0: ; 8136BC0
+sub_8136BC0: @ 8136BC0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -574571,7 +574571,7 @@ _08136C36:
 	thumb_func_end sub_8136BC0
 
 	thumb_func_start sub_8136C54
-sub_8136C54: ; 8136C54
+sub_8136C54: @ 8136C54
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -574596,7 +574596,7 @@ sub_8136C54: ; 8136C54
 	thumb_func_end sub_8136C54
 
 	thumb_func_start sub_8136C8C
-sub_8136C8C: ; 8136C8C
+sub_8136C8C: @ 8136C8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -574667,7 +574667,7 @@ _08136D1A:
 	thumb_func_end sub_8136C8C
 
 	thumb_func_start sub_8136D2C
-sub_8136D2C: ; 8136D2C
+sub_8136D2C: @ 8136D2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -574706,7 +574706,7 @@ sub_8136D2C: ; 8136D2C
 	thumb_func_end sub_8136D2C
 
 	thumb_func_start sub_8136D90
-sub_8136D90: ; 8136D90
+sub_8136D90: @ 8136D90
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -574741,7 +574741,7 @@ sub_8136D90: ; 8136D90
 	thumb_func_end sub_8136D90
 
 	thumb_func_start sub_8136DE8
-sub_8136DE8: ; 8136DE8
+sub_8136DE8: @ 8136DE8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -574767,7 +574767,7 @@ sub_8136DE8: ; 8136DE8
 	thumb_func_end sub_8136DE8
 
 	thumb_func_start sub_8136E20
-sub_8136E20: ; 8136E20
+sub_8136E20: @ 8136E20
 	push {r4,lr}
 	lsls r0, 24
 	ldr r3, =0x03005d8c
@@ -574815,7 +574815,7 @@ sub_8136E20: ; 8136E20
 	thumb_func_end sub_8136E20
 
 	thumb_func_start sub_8136E88
-sub_8136E88: ; 8136E88
+sub_8136E88: @ 8136E88
 	push {r4,lr}
 	movs r4, 0
 _08136E8C:
@@ -574832,7 +574832,7 @@ _08136E8C:
 	thumb_func_end sub_8136E88
 
 	thumb_func_start sub_8136EA4
-sub_8136EA4: ; 8136EA4
+sub_8136EA4: @ 8136EA4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x1
@@ -574863,7 +574863,7 @@ _08136ECC:
 	thumb_func_end sub_8136EA4
 
 	thumb_func_start sub_8136EDC
-sub_8136EDC: ; 8136EDC
+sub_8136EDC: @ 8136EDC
 	push {lr}
 	movs r1, 0x6
 	bl sub_8136F9C
@@ -574878,7 +574878,7 @@ _08136EEE:
 	thumb_func_end sub_8136EDC
 
 	thumb_func_start sub_8136EF4
-sub_8136EF4: ; 8136EF4
+sub_8136EF4: @ 8136EF4
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x03005d8c
@@ -574909,7 +574909,7 @@ _08136F26:
 	thumb_func_end sub_8136EF4
 
 	thumb_func_start sub_8136F2C
-sub_8136F2C: ; 8136F2C
+sub_8136F2C: @ 8136F2C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8136EF4
@@ -574941,7 +574941,7 @@ _08136F62:
 	thumb_func_end sub_8136F2C
 
 	thumb_func_start sub_8136F68
-sub_8136F68: ; 8136F68
+sub_8136F68: @ 8136F68
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -574967,7 +574967,7 @@ _08136F96:
 	thumb_func_end sub_8136F68
 
 	thumb_func_start sub_8136F9C
-sub_8136F9C: ; 8136F9C
+sub_8136F9C: @ 8136F9C
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -575014,7 +575014,7 @@ _08136FDE:
 	thumb_func_end sub_8136F9C
 
 	thumb_func_start sub_8136FE4
-sub_8136FE4: ; 8136FE4
+sub_8136FE4: @ 8136FE4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -575066,7 +575066,7 @@ _0813702A:
 	thumb_func_end sub_8136FE4
 
 	thumb_func_start sub_8137044
-sub_8137044: ; 8137044
+sub_8137044: @ 8137044
 	push {r4,lr}
 	adds r4, r1, 0
 	movs r1, 0
@@ -575085,7 +575085,7 @@ sub_8137044: ; 8137044
 	thumb_func_end sub_8137044
 
 	thumb_func_start sub_8137068
-sub_8137068: ; 8137068
+sub_8137068: @ 8137068
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -575124,7 +575124,7 @@ _081370AC:
 	thumb_func_end sub_8137068
 
 	thumb_func_start sub_81370B4
-sub_81370B4: ; 81370B4
+sub_81370B4: @ 81370B4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r7, 0
@@ -575163,7 +575163,7 @@ _081370E2:
 	thumb_func_end sub_81370B4
 
 	thumb_func_start sub_81370FC
-sub_81370FC: ; 81370FC
+sub_81370FC: @ 81370FC
 	push {r4,lr}
 	bl sub_81798D0
 	lsls r0, 24
@@ -575210,7 +575210,7 @@ _08137172:
 	thumb_func_end sub_81370FC
 
 	thumb_func_start hm2_flash
-hm2_flash: ; 8137178
+hm2_flash: @ 8137178
 	push {r4,lr}
 	bl oei_task_add
 	adds r4, r0, 0
@@ -575237,7 +575237,7 @@ hm2_flash: ; 8137178
 	thumb_func_end hm2_flash
 
 	thumb_func_start sub_81371B4
-sub_81371B4: ; 81371B4
+sub_81371B4: @ 81371B4
 	push {lr}
 	movs r0, 0xCF
 	bl audio_play
@@ -575251,7 +575251,7 @@ sub_81371B4: ; 81371B4
 	thumb_func_end sub_81371B4
 
 	thumb_func_start sub_81371D4
-sub_81371D4: ; 81371D4
+sub_81371D4: @ 81371D4
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -575262,7 +575262,7 @@ sub_81371D4: ; 81371D4
 	thumb_func_end sub_81371D4
 
 	thumb_func_start sub_81371EC
-sub_81371EC: ; 81371EC
+sub_81371EC: @ 81371EC
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -575272,7 +575272,7 @@ sub_81371EC: ; 81371EC
 	thumb_func_end sub_81371EC
 
 	thumb_func_start c2_change_map
-c2_change_map: ; 8137200
+c2_change_map: @ 8137200
 	push {r4,lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -575369,7 +575369,7 @@ _081372D2:
 	thumb_func_end c2_change_map
 
 	thumb_func_start sub_8137304
-sub_8137304: ; 8137304
+sub_8137304: @ 8137304
 	push {r4-r7,lr}
 	bl get_map_light_from_warp0
 	lsls r0, 24
@@ -575419,7 +575419,7 @@ _0813735A:
 	thumb_func_end sub_8137304
 
 	thumb_func_start sub_8137360
-sub_8137360: ; 8137360
+sub_8137360: @ 8137360
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -575461,7 +575461,7 @@ _081373A2:
 	thumb_func_end sub_8137360
 
 	thumb_func_start fade_type_for_given_maplight_pair
-fade_type_for_given_maplight_pair: ; 81373A8
+fade_type_for_given_maplight_pair: @ 81373A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -575503,7 +575503,7 @@ _081373EA:
 	thumb_func_end fade_type_for_given_maplight_pair
 
 	thumb_func_start sub_81373F0
-sub_81373F0: ; 81373F0
+sub_81373F0: @ 81373F0
 	push {lr}
 	ldr r0, =sub_8137404
 	movs r1, 0
@@ -575514,7 +575514,7 @@ sub_81373F0: ; 81373F0
 	thumb_func_end sub_81373F0
 
 	thumb_func_start sub_8137404
-sub_8137404: ; 8137404
+sub_8137404: @ 8137404
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -575529,7 +575529,7 @@ sub_8137404: ; 8137404
 	thumb_func_end sub_8137404
 
 	thumb_func_start sub_8137420
-sub_8137420: ; 8137420
+sub_8137420: @ 8137420
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -575585,7 +575585,7 @@ sub_8137420: ; 8137420
 	thumb_func_end sub_8137420
 
 	thumb_func_start sub_81374C4
-sub_81374C4: ; 81374C4
+sub_81374C4: @ 81374C4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -575622,7 +575622,7 @@ _08137500:
 	thumb_func_end sub_81374C4
 
 	thumb_func_start sub_813750C
-sub_813750C: ; 813750C
+sub_813750C: @ 813750C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -575668,7 +575668,7 @@ _08137566:
 	thumb_func_end sub_813750C
 
 	thumb_func_start sub_8137574
-sub_8137574: ; 8137574
+sub_8137574: @ 8137574
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -575697,7 +575697,7 @@ _081375A0:
 	thumb_func_end sub_8137574
 
 	thumb_func_start sub_81375A8
-sub_81375A8: ; 81375A8
+sub_81375A8: @ 81375A8
 	push {lr}
 	ldr r0, =sub_81375BC
 	movs r1, 0
@@ -575708,7 +575708,7 @@ sub_81375A8: ; 81375A8
 	thumb_func_end sub_81375A8
 
 	thumb_func_start sub_81375BC
-sub_81375BC: ; 81375BC
+sub_81375BC: @ 81375BC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -575723,7 +575723,7 @@ sub_81375BC: ; 81375BC
 	thumb_func_end sub_81375BC
 
 	thumb_func_start sub_81375D8
-sub_81375D8: ; 81375D8
+sub_81375D8: @ 81375D8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -575780,7 +575780,7 @@ sub_81375D8: ; 81375D8
 	thumb_func_end sub_81375D8
 
 	thumb_func_start sub_8137678
-sub_8137678: ; 8137678
+sub_8137678: @ 8137678
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -575823,7 +575823,7 @@ _081376C8:
 	thumb_func_end sub_8137678
 
 	thumb_func_start sub_81376DC
-sub_81376DC: ; 81376DC
+sub_81376DC: @ 81376DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -575866,7 +575866,7 @@ _08137726:
 	thumb_func_end sub_81376DC
 
 	thumb_func_start sub_8137734
-sub_8137734: ; 8137734
+sub_8137734: @ 8137734
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -576014,7 +576014,7 @@ _0813785A:
 	thumb_func_end sub_8137734
 
 	thumb_func_start sp0C8_whiteout_maybe
-sp0C8_whiteout_maybe: ; 813787C
+sp0C8_whiteout_maybe: @ 813787C
 	push {lr}
 	ldr r0, =c2_whiteout
 	bl SetMainCallback2
@@ -576025,7 +576025,7 @@ sp0C8_whiteout_maybe: ; 813787C
 	thumb_func_end sp0C8_whiteout_maybe
 
 	thumb_func_start sub_8137890
-sub_8137890: ; 8137890
+sub_8137890: @ 8137890
 	push {r4,lr}
 	ldr r0, =0x00004024
 	bl VarGet
@@ -576046,7 +576046,7 @@ sub_8137890: ; 8137890
 	thumb_func_end sub_8137890
 
 	thumb_func_start sub_81378BC
-sub_81378BC: ; 81378BC
+sub_81378BC: @ 81378BC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x00004024
@@ -576064,7 +576064,7 @@ sub_81378BC: ; 81378BC
 	thumb_func_end sub_81378BC
 
 	thumb_func_start sub_81378E4
-sub_81378E4: ; 81378E4
+sub_81378E4: @ 81378E4
 	push {r4,lr}
 	bl GenerateRandomNumber
 	adds r4, r0, 0
@@ -576081,7 +576081,7 @@ sub_81378E4: ; 81378E4
 	thumb_func_end sub_81378E4
 
 	thumb_func_start sub_8137904
-sub_8137904: ; 8137904
+sub_8137904: @ 8137904
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -576110,7 +576110,7 @@ _08137928:
 	thumb_func_end sub_8137904
 
 	thumb_func_start sub_813793C
-sub_813793C: ; 813793C
+sub_813793C: @ 813793C
 	push {r4-r6,lr}
 	bl sub_8137890
 	lsrs r6, r0, 16
@@ -576148,7 +576148,7 @@ _08137980:
 	thumb_func_end sub_813793C
 
 	thumb_func_start sub_8137988
-sub_8137988: ; 8137988
+sub_8137988: @ 8137988
 	push {lr}
 	bl get_map_light_from_warp0
 	lsls r0, 24
@@ -576181,7 +576181,7 @@ _081379CE:
 	thumb_func_end sub_8137988
 
 	thumb_func_start sub_81379D8
-sub_81379D8: ; 81379D8
+sub_81379D8: @ 81379D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -576199,7 +576199,7 @@ _081379F2:
 	thumb_func_end sub_81379D8
 
 	thumb_func_start sub_81379F8
-sub_81379F8: ; 81379F8
+sub_81379F8: @ 81379F8
 	push {lr}
 	ldr r0, =sub_81379D8
 	movs r1, 0x50
@@ -576210,7 +576210,7 @@ sub_81379F8: ; 81379F8
 	thumb_func_end sub_81379F8
 
 	thumb_func_start sub_8137A0C
-sub_8137A0C: ; 8137A0C
+sub_8137A0C: @ 8137A0C
 	push {lr}
 	ldr r0, =0x00004049
 	bl GetVarPointer
@@ -576222,7 +576222,7 @@ sub_8137A0C: ; 8137A0C
 	thumb_func_end sub_8137A0C
 
 	thumb_func_start sub_8137A20
-sub_8137A20: ; 8137A20
+sub_8137A20: @ 8137A20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -576244,7 +576244,7 @@ sub_8137A20: ; 8137A20
 	thumb_func_end sub_8137A20
 
 	thumb_func_start sub_8137A4C
-sub_8137A4C: ; 8137A4C
+sub_8137A4C: @ 8137A4C
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -576277,7 +576277,7 @@ _08137A80:
 	thumb_func_end sub_8137A4C
 
 	thumb_func_start sub_8137A98
-sub_8137A98: ; 8137A98
+sub_8137A98: @ 8137A98
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -576460,7 +576460,7 @@ _08137C06:
 	thumb_func_end sub_8137A98
 
 	thumb_func_start sub_8137C10
-sub_8137C10: ; 8137C10
+sub_8137C10: @ 8137C10
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -576472,7 +576472,7 @@ sub_8137C10: ; 8137C10
 	thumb_func_end sub_8137C10
 
 	thumb_func_start sub_8137C28
-sub_8137C28: ; 8137C28
+sub_8137C28: @ 8137C28
 	push {lr}
 	ldr r0, =sub_8174194
 	bl SetMainCallback2
@@ -576483,7 +576483,7 @@ sub_8137C28: ; 8137C28
 	thumb_func_end sub_8137C28
 
 	thumb_func_start sub_8137C3C
-sub_8137C3C: ; 8137C3C
+sub_8137C3C: @ 8137C3C
 	push {lr}
 	ldr r0, =c2_exit_to_overworld_2_switch
 	bl SetMainCallback2
@@ -576496,7 +576496,7 @@ sub_8137C3C: ; 8137C3C
 	thumb_func_end sub_8137C3C
 
 	thumb_func_start mapldr_080CA5C0
-mapldr_080CA5C0: ; 8137C5C
+mapldr_080CA5C0: @ 8137C5C
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -576520,7 +576520,7 @@ mapldr_080CA5C0: ; 8137C5C
 	thumb_func_end mapldr_080CA5C0
 
 	thumb_func_start sub_8137C94
-sub_8137C94: ; 8137C94
+sub_8137C94: @ 8137C94
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -576539,7 +576539,7 @@ _08137CAC:
 	thumb_func_end sub_8137C94
 
 	thumb_func_start sub_8137CB4
-sub_8137CB4: ; 8137CB4
+sub_8137CB4: @ 8137CB4
 	push {lr}
 	ldr r0, =sub_8177888
 	bl SetMainCallback2
@@ -576550,7 +576550,7 @@ sub_8137CB4: ; 8137CB4
 	thumb_func_end sub_8137CB4
 
 	thumb_func_start Special_ViewWallClock
-Special_ViewWallClock: ; 8137CC8
+Special_ViewWallClock: @ 8137CC8
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, =c2_exit_to_overworld_2_switch
@@ -576564,7 +576564,7 @@ Special_ViewWallClock: ; 8137CC8
 	thumb_func_end Special_ViewWallClock
 
 	thumb_func_start wild_pokemon_reroll
-wild_pokemon_reroll: ; 8137CEC
+wild_pokemon_reroll: @ 8137CEC
 	ldr r0, =0x0203ab54
 	movs r1, 0
 	strb r1, [r0]
@@ -576578,7 +576578,7 @@ wild_pokemon_reroll: ; 8137CEC
 	thumb_func_end wild_pokemon_reroll
 
 	thumb_func_start sub_8137D0C
-sub_8137D0C: ; 8137D0C
+sub_8137D0C: @ 8137D0C
 	ldr r1, =0x0203ab54
 	movs r0, 0x1
 	strb r0, [r1]
@@ -576594,7 +576594,7 @@ sub_8137D0C: ; 8137D0C
 	thumb_func_end sub_8137D0C
 
 	thumb_func_start sp0E3_walkrun_bitfield_interpretation
-sp0E3_walkrun_bitfield_interpretation: ; 8137D34
+sp0E3_walkrun_bitfield_interpretation: @ 8137D34
 	push {lr}
 	movs r0, 0x4
 	bl TestPlayerAvatarFlags
@@ -576619,7 +576619,7 @@ _08137D58:
 	thumb_func_end sp0E3_walkrun_bitfield_interpretation
 
 	thumb_func_start sub_8137D5C
-sub_8137D5C: ; 8137D5C
+sub_8137D5C: @ 8137D5C
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	lsls r1, 24
@@ -576744,7 +576744,7 @@ _08137E5C:
 	thumb_func_end sub_8137D5C
 
 	thumb_func_start sub_8137E6C
-sub_8137E6C: ; 8137E6C
+sub_8137E6C: @ 8137E6C
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldr r1, =0x0203ab58
@@ -576765,7 +576765,7 @@ sub_8137E6C: ; 8137E6C
 	thumb_func_end sub_8137E6C
 
 	thumb_func_start sub_8137E9C
-sub_8137E9C: ; 8137E9C
+sub_8137E9C: @ 8137E9C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -576809,7 +576809,7 @@ _08137EE6:
 	thumb_func_end sub_8137E9C
 
 	thumb_func_start sub_8137EFC
-sub_8137EFC: ; 8137EFC
+sub_8137EFC: @ 8137EFC
 	push {r4,lr}
 	ldr r0, =0x00004028
 	bl VarGet
@@ -576841,7 +576841,7 @@ _08137F3E:
 	thumb_func_end sub_8137EFC
 
 	thumb_func_start sub_8137F44
-sub_8137F44: ; 8137F44
+sub_8137F44: @ 8137F44
 	push {r4,lr}
 	ldr r0, =0x020322dc
 	ldrh r1, [r0]
@@ -576875,7 +576875,7 @@ _08137F7C:
 	thumb_func_end sub_8137F44
 
 	thumb_func_start sub_8137F90
-sub_8137F90: ; 8137F90
+sub_8137F90: @ 8137F90
 	push {lr}
 	ldr r0, =0x0000088d
 	bl FlagSet
@@ -576889,7 +576889,7 @@ sub_8137F90: ; 8137F90
 	thumb_func_end sub_8137F90
 
 	thumb_func_start sub_8137FB0
-sub_8137FB0: ; 8137FB0
+sub_8137FB0: @ 8137FB0
 	push {lr}
 	ldr r0, =0x0000088d
 	bl FlagReset
@@ -576899,7 +576899,7 @@ sub_8137FB0: ; 8137FB0
 	thumb_func_end sub_8137FB0
 
 	thumb_func_start sub_8137FC0
-sub_8137FC0: ; 8137FC0
+sub_8137FC0: @ 8137FC0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -576930,7 +576930,7 @@ _08137FF6:
 	thumb_func_end sub_8137FC0
 
 	thumb_func_start sub_8137FFC
-sub_8137FFC: ; 8137FFC
+sub_8137FFC: @ 8137FFC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -577042,7 +577042,7 @@ _081380CE:
 	thumb_func_end sub_8137FFC
 
 	thumb_func_start is_tile_that_overrides_player_control
-is_tile_that_overrides_player_control: ; 81380D8
+is_tile_that_overrides_player_control: @ 81380D8
 	push {lr}
 	movs r0, 0x88
 	bl FlagGet
@@ -577079,7 +577079,7 @@ _0813811A:
 	thumb_func_end is_tile_that_overrides_player_control
 
 	thumb_func_start sub_8138120
-sub_8138120: ; 8138120
+sub_8138120: @ 8138120
 	push {lr}
 	movs r0, 0x8A
 	bl FlagGet
@@ -577116,7 +577116,7 @@ _08138162:
 	thumb_func_end sub_8138120
 
 	thumb_func_start sub_8138168
-sub_8138168: ; 8138168
+sub_8138168: @ 8138168
 	push {lr}
 	movs r0, 0x72
 	bl FlagGet
@@ -577153,7 +577153,7 @@ _081381AA:
 	thumb_func_end sub_8138168
 
 	thumb_func_start sub_81381B0
-sub_81381B0: ; 81381B0
+sub_81381B0: @ 81381B0
 	push {lr}
 	movs r0, 0x80
 	bl FlagGet
@@ -577190,7 +577190,7 @@ _081381F2:
 	thumb_func_end sub_81381B0
 
 	thumb_func_start sub_81381F8
-sub_81381F8: ; 81381F8
+sub_81381F8: @ 81381F8
 	push {lr}
 	movs r0, 0x75
 	bl FlagGet
@@ -577227,7 +577227,7 @@ _0813823A:
 	thumb_func_end sub_81381F8
 
 	thumb_func_start sub_8138240
-sub_8138240: ; 8138240
+sub_8138240: @ 8138240
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -577275,7 +577275,7 @@ _0813828A:
 	thumb_func_end sub_8138240
 
 	thumb_func_start SpawnLinkPartnerFieldObject
-SpawnLinkPartnerFieldObject: ; 81382A0
+SpawnLinkPartnerFieldObject: @ 81382A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -577477,7 +577477,7 @@ _08138410:
 	thumb_func_end SpawnLinkPartnerFieldObject
 
 	thumb_func_start sub_813842C
-sub_813842C: ; 813842C
+sub_813842C: @ 813842C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -577573,7 +577573,7 @@ _081384E6:
 	thumb_func_end sub_813842C
 
 	thumb_func_start sub_81384F0
-sub_81384F0: ; 81384F0
+sub_81384F0: @ 81384F0
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gUnknown_085B2B68
@@ -577610,7 +577610,7 @@ _0813852A:
 	thumb_func_end sub_81384F0
 
 	thumb_func_start sub_8138540
-sub_8138540: ; 8138540
+sub_8138540: @ 8138540
 	push {r4-r6,lr}
 	movs r5, 0xC
 _08138544:
@@ -577824,7 +577824,7 @@ _08138744:
 	thumb_func_end sub_8138540
 
 	thumb_func_start sub_8138750
-sub_8138750: ; 8138750
+sub_8138750: @ 8138750
 	push {r4-r6,lr}
 	ldr r4, =gUnknown_085B2B68
 	movs r5, 0x3
@@ -577979,7 +577979,7 @@ _081388DA:
 	thumb_func_end sub_8138750
 
 	thumb_func_start sub_81388E4
-sub_81388E4: ; 81388E4
+sub_81388E4: @ 81388E4
 	push {lr}
 	ldr r0, =0x0203ab5c
 	movs r1, 0
@@ -577997,7 +577997,7 @@ sub_81388E4: ; 81388E4
 	thumb_func_end sub_81388E4
 
 	thumb_func_start sub_8138910
-sub_8138910: ; 8138910
+sub_8138910: @ 8138910
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -578041,7 +578041,7 @@ _08138970:
 	thumb_func_end sub_8138910
 
 	thumb_func_start sub_8138978
-sub_8138978: ; 8138978
+sub_8138978: @ 8138978
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -578198,7 +578198,7 @@ _08138A92:
 	thumb_func_end sub_8138978
 
 	thumb_func_start sub_8138AA4
-sub_8138AA4: ; 8138AA4
+sub_8138AA4: @ 8138AA4
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrb r0, [r0]
@@ -578211,7 +578211,7 @@ sub_8138AA4: ; 8138AA4
 	thumb_func_end sub_8138AA4
 
 	thumb_func_start sub_8138AC0
-sub_8138AC0: ; 8138AC0
+sub_8138AC0: @ 8138AC0
 	push {lr}
 	ldr r0, =0x02021fc4
 	bl box_related_two__2
@@ -578221,7 +578221,7 @@ sub_8138AC0: ; 8138AC0
 	thumb_func_end sub_8138AC0
 
 	thumb_func_start sub_8138AD0
-sub_8138AD0: ; 8138AD0
+sub_8138AD0: @ 8138AD0
 	ldr r1, =0x020375e0
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -578235,7 +578235,7 @@ sub_8138AD0: ; 8138AD0
 	thumb_func_end sub_8138AD0
 
 	thumb_func_start sub_8138AF0
-sub_8138AF0: ; 8138AF0
+sub_8138AF0: @ 8138AF0
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -578253,7 +578253,7 @@ sub_8138AF0: ; 8138AF0
 	thumb_func_end sub_8138AF0
 
 	thumb_func_start sub_8138B10
-sub_8138B10: ; 8138B10
+sub_8138B10: @ 8138B10
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -578276,7 +578276,7 @@ _08138B3C:
 	thumb_func_end sub_8138B10
 
 	thumb_func_start sub_8138B48
-sub_8138B48: ; 8138B48
+sub_8138B48: @ 8138B48
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -578299,7 +578299,7 @@ _08138B74:
 	thumb_func_end sub_8138B48
 
 	thumb_func_start sub_8138B80
-sub_8138B80: ; 8138B80
+sub_8138B80: @ 8138B80
 	ldr r0, =0x0202433a
 	ldrb r0, [r0]
 	bx lr
@@ -578307,7 +578307,7 @@ sub_8138B80: ; 8138B80
 	thumb_func_end sub_8138B80
 
 	thumb_func_start sub_8138B8C
-sub_8138B8C: ; 8138B8C
+sub_8138B8C: @ 8138B8C
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x020375e0
@@ -578340,7 +578340,7 @@ _08138BC2:
 	thumb_func_end sub_8138B8C
 
 	thumb_func_start sub_8138BC8
-sub_8138BC8: ; 8138BC8
+sub_8138BC8: @ 8138BC8
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -578351,7 +578351,7 @@ sub_8138BC8: ; 8138BC8
 	thumb_func_end sub_8138BC8
 
 	thumb_func_start sub_8138BDC
-sub_8138BDC: ; 8138BDC
+sub_8138BDC: @ 8138BDC
 	push {lr}
 	ldr r0, =0x03005cf8
 	movs r1, 0
@@ -578371,7 +578371,7 @@ _08138BF6:
 	thumb_func_end sub_8138BDC
 
 	thumb_func_start sub_8138C04
-sub_8138C04: ; 8138C04
+sub_8138C04: @ 8138C04
 	push {r4,lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -578437,7 +578437,7 @@ _08138C7E:
 	thumb_func_end sub_8138C04
 
 	thumb_func_start sub_8138C84
-sub_8138C84: ; 8138C84
+sub_8138C84: @ 8138C84
 	push {lr}
 	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
 	bl sub_817018C
@@ -578447,7 +578447,7 @@ sub_8138C84: ; 8138C84
 	thumb_func_end sub_8138C84
 
 	thumb_func_start sub_8138C94
-sub_8138C94: ; 8138C94
+sub_8138C94: @ 8138C94
 	push {lr}
 	ldr r0, =sub_8138C84
 	bl SetMainCallback2
@@ -578457,7 +578457,7 @@ sub_8138C94: ; 8138C94
 	thumb_func_end sub_8138C94
 
 	thumb_func_start sp0D9_ComputerRelated
-sp0D9_ComputerRelated: ; 8138CA4
+sp0D9_ComputerRelated: @ 8138CA4
 	push {r4,lr}
 	ldr r4, =sub_8138CE8
 	adds r0, r4, 0
@@ -578490,7 +578490,7 @@ _08138CD8:
 	thumb_func_end sp0D9_ComputerRelated
 
 	thumb_func_start sub_8138CE8
-sub_8138CE8: ; 8138CE8
+sub_8138CE8: @ 8138CE8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -578512,7 +578512,7 @@ _08138D06:
 	thumb_func_end sub_8138CE8
 
 	thumb_func_start sub_8138D10
-sub_8138D10: ; 8138D10
+sub_8138D10: @ 8138D10
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r6, 0
@@ -578579,7 +578579,7 @@ _08138D7C:
 	thumb_func_end sub_8138D10
 
 	thumb_func_start sub_8138D88
-sub_8138D88: ; 8138D88
+sub_8138D88: @ 8138D88
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -578654,7 +578654,7 @@ _08138DE6:
 	thumb_func_end sub_8138D88
 
 	thumb_func_start sub_8138E20
-sub_8138E20: ; 8138E20
+sub_8138E20: @ 8138E20
 	push {lr}
 	bl sub_8138E2C
 	pop {r0}
@@ -578662,7 +578662,7 @@ sub_8138E20: ; 8138E20
 	thumb_func_end sub_8138E20
 
 	thumb_func_start sub_8138E2C
-sub_8138E2C: ; 8138E2C
+sub_8138E2C: @ 8138E2C
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -578739,7 +578739,7 @@ _08138E82:
 	thumb_func_end sub_8138E2C
 
 	thumb_func_start sub_8138EC0
-sub_8138EC0: ; 8138EC0
+sub_8138EC0: @ 8138EC0
 	push {r4,lr}
 	ldr r4, =sub_8138F04
 	adds r0, r4, 0
@@ -578772,7 +578772,7 @@ _08138EF4:
 	thumb_func_end sub_8138EC0
 
 	thumb_func_start sub_8138F04
-sub_8138F04: ; 8138F04
+sub_8138F04: @ 8138F04
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -578794,7 +578794,7 @@ _08138F22:
 	thumb_func_end sub_8138F04
 
 	thumb_func_start sub_8138F2C
-sub_8138F2C: ; 8138F2C
+sub_8138F2C: @ 8138F2C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xE
@@ -578853,7 +578853,7 @@ _08138F9A:
 	thumb_func_end sub_8138F2C
 
 	thumb_func_start sub_8138FAC
-sub_8138FAC: ; 8138FAC
+sub_8138FAC: @ 8138FAC
 	push {lr}
 	ldr r2, =0x00000e9d
 	movs r0, 0x12
@@ -578870,7 +578870,7 @@ sub_8138FAC: ; 8138FAC
 	thumb_func_end sub_8138FAC
 
 	thumb_func_start sub_8138FD4
-sub_8138FD4: ; 8138FD4
+sub_8138FD4: @ 8138FD4
 	push {lr}
 	ldr r1, =0x020375e0
 	ldr r0, =0x000001f5
@@ -578882,7 +578882,7 @@ sub_8138FD4: ; 8138FD4
 	thumb_func_end sub_8138FD4
 
 	thumb_func_start sub_8138FEC
-sub_8138FEC: ; 8138FEC
+sub_8138FEC: @ 8138FEC
 	push {lr}
 	ldr r1, =0x020375e0
 	ldr r0, =0x000001f5
@@ -578894,7 +578894,7 @@ sub_8138FEC: ; 8138FEC
 	thumb_func_end sub_8138FEC
 
 	thumb_func_start sub_8139004
-sub_8139004: ; 8139004
+sub_8139004: @ 8139004
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -578918,7 +578918,7 @@ _0813902A:
 	thumb_func_end sub_8139004
 
 	thumb_func_start sub_8139030
-sub_8139030: ; 8139030
+sub_8139030: @ 8139030
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -578942,7 +578942,7 @@ _08139056:
 	thumb_func_end sub_8139030
 
 	thumb_func_start sub_813905C
-sub_813905C: ; 813905C
+sub_813905C: @ 813905C
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -578966,7 +578966,7 @@ _08139082:
 	thumb_func_end sub_813905C
 
 	thumb_func_start sub_8139088
-sub_8139088: ; 8139088
+sub_8139088: @ 8139088
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -578990,7 +578990,7 @@ _081390AE:
 	thumb_func_end sub_8139088
 
 	thumb_func_start sub_81390B4
-sub_81390B4: ; 81390B4
+sub_81390B4: @ 81390B4
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -579014,7 +579014,7 @@ _081390DA:
 	thumb_func_end sub_81390B4
 
 	thumb_func_start sub_81390E0
-sub_81390E0: ; 81390E0
+sub_81390E0: @ 81390E0
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =gBaseStats
@@ -579071,7 +579071,7 @@ _0813914A:
 	thumb_func_end sub_81390E0
 
 	thumb_func_start SpawnScriptFieldObject
-SpawnScriptFieldObject: ; 8139158
+SpawnScriptFieldObject: @ 8139158
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x03005d8c
@@ -579111,7 +579111,7 @@ SpawnScriptFieldObject: ; 8139158
 	thumb_func_end SpawnScriptFieldObject
 
 	thumb_func_start RemoveScriptFieldObject
-RemoveScriptFieldObject: ; 81391AC
+RemoveScriptFieldObject: @ 81391AC
 	push {lr}
 	bl GetPlayerAvatarObjectId
 	lsls r0, 24
@@ -579129,7 +579129,7 @@ RemoveScriptFieldObject: ; 81391AC
 	thumb_func_end RemoveScriptFieldObject
 
 	thumb_func_start sub_81391D0
-sub_81391D0: ; 81391D0
+sub_81391D0: @ 81391D0
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -579151,7 +579151,7 @@ sub_81391D0: ; 81391D0
 	thumb_func_end sub_81391D0
 
 	thumb_func_start sub_8139200
-sub_8139200: ; 8139200
+sub_8139200: @ 8139200
 	push {r4,lr}
 	ldr r4, =0x02021cc4
 	ldr r0, =0x00004026
@@ -579169,7 +579169,7 @@ sub_8139200: ; 8139200
 	thumb_func_end sub_8139200
 
 	thumb_func_start sub_8139228
-sub_8139228: ; 8139228
+sub_8139228: @ 8139228
 	push {lr}
 	movs r0, 0x20
 	bl sub_80847F8
@@ -579180,7 +579180,7 @@ sub_8139228: ; 8139228
 	thumb_func_end sub_8139228
 
 	thumb_func_start sub_8139238
-sub_8139238: ; 8139238
+sub_8139238: @ 8139238
 	push {lr}
 	ldr r0, =0x02021cc4
 	bl sub_8165284
@@ -579190,7 +579190,7 @@ sub_8139238: ; 8139238
 	thumb_func_end sub_8139238
 
 	thumb_func_start sub_8139248
-sub_8139248: ; 8139248
+sub_8139248: @ 8139248
 	push {r4,r5,lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -579232,7 +579232,7 @@ _08139296:
 	thumb_func_end sub_8139248
 
 	thumb_func_start sub_81392AC
-sub_81392AC: ; 81392AC
+sub_81392AC: @ 81392AC
 	push {lr}
 	ldr r1, =0x020375e0
 	ldr r0, =0x00000213
@@ -579252,7 +579252,7 @@ _081392CE:
 	thumb_func_end sub_81392AC
 
 	thumb_func_start sub_81392D4
-sub_81392D4: ; 81392D4
+sub_81392D4: @ 81392D4
 	push {lr}
 	ldr r1, =0x020375e0
 	movs r0, 0x85
@@ -579273,7 +579273,7 @@ _081392F2:
 	thumb_func_end sub_81392D4
 
 	thumb_func_start sub_81392F8
-sub_81392F8: ; 81392F8
+sub_81392F8: @ 81392F8
 	push {lr}
 	ldr r1, =0x020375e0
 	ldr r0, =0x00000215
@@ -579293,7 +579293,7 @@ _0813931A:
 	thumb_func_end sub_81392F8
 
 	thumb_func_start sub_8139320
-sub_8139320: ; 8139320
+sub_8139320: @ 8139320
 	push {lr}
 	ldr r1, =0x020375e0
 	ldr r0, =0x00000216
@@ -579313,7 +579313,7 @@ _08139342:
 	thumb_func_end sub_8139320
 
 	thumb_func_start sub_8139348
-sub_8139348: ; 8139348
+sub_8139348: @ 8139348
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -579333,7 +579333,7 @@ sub_8139348: ; 8139348
 	thumb_func_end sub_8139348
 
 	thumb_func_start sub_8139370
-sub_8139370: ; 8139370
+sub_8139370: @ 8139370
 	push {r4,lr}
 	sub sp, 0x4
 	movs r0, 0x2A
@@ -579372,7 +579372,7 @@ _081393B6:
 	thumb_func_end sub_8139370
 
 	thumb_func_start sub_81393C8
-sub_81393C8: ; 81393C8
+sub_81393C8: @ 81393C8
 	push {lr}
 	bl sub_8139688
 	lsls r0, 24
@@ -579397,7 +579397,7 @@ _081393F6:
 	thumb_func_end sub_81393C8
 
 	thumb_func_start sub_81393FC
-sub_81393FC: ; 81393FC
+sub_81393FC: @ 81393FC
 	push {lr}
 	movs r0, 0xC7
 	bl FlagGet
@@ -579442,7 +579442,7 @@ _08139456:
 	thumb_func_end sub_81393FC
 
 	thumb_func_start sub_813945C
-sub_813945C: ; 813945C
+sub_813945C: @ 813945C
 	push {lr}
 	ldr r0, =0x000008bf
 	bl FlagSet
@@ -579452,7 +579452,7 @@ sub_813945C: ; 813945C
 	thumb_func_end sub_813945C
 
 	thumb_func_start sub_813946C
-sub_813946C: ; 813946C
+sub_813946C: @ 813946C
 	push {r4,r5,lr}
 	sub sp, 0x14
 	ldr r5, =0x020244ec
@@ -579503,7 +579503,7 @@ sub_813946C: ; 813946C
 	thumb_func_end sub_813946C
 
 	thumb_func_start sub_81394D8
-sub_81394D8: ; 81394D8
+sub_81394D8: @ 81394D8
 	push {r4-r6,lr}
 	ldr r0, =0x00004023
 	bl VarGet
@@ -579546,7 +579546,7 @@ _08139528:
 	thumb_func_end sub_81394D8
 
 	thumb_func_start sub_8139530
-sub_8139530: ; 8139530
+sub_8139530: @ 8139530
 	push {lr}
 	bl sub_80D2218
 	lsls r0, 24
@@ -579556,7 +579556,7 @@ sub_8139530: ; 8139530
 	thumb_func_end sub_8139530
 
 	thumb_func_start sub_8139540
-sub_8139540: ; 8139540
+sub_8139540: @ 8139540
 	push {lr}
 	ldr r0, =0x020244ec
 	movs r1, 0x3F
@@ -579575,7 +579575,7 @@ _0813955A:
 	thumb_func_end sub_8139540
 
 	thumb_func_start sub_8139560
-sub_8139560: ; 8139560
+sub_8139560: @ 8139560
 	push {lr}
 	ldr r0, =sub_81395BC
 	movs r1, 0x9
@@ -579611,7 +579611,7 @@ sub_8139560: ; 8139560
 	thumb_func_end sub_8139560
 
 	thumb_func_start sub_81395BC
-sub_81395BC: ; 81395BC
+sub_81395BC: @ 81395BC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -579660,7 +579660,7 @@ _08139614:
 	thumb_func_end sub_81395BC
 
 	thumb_func_start sub_8139620
-sub_8139620: ; 8139620
+sub_8139620: @ 8139620
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -579671,7 +579671,7 @@ sub_8139620: ; 8139620
 	thumb_func_end sub_8139620
 
 	thumb_func_start sub_8139634
-sub_8139634: ; 8139634
+sub_8139634: @ 8139634
 	push {lr}
 	movs r0, 0x95
 	lsls r0, 2
@@ -579683,7 +579683,7 @@ sub_8139634: ; 8139634
 	thumb_func_end sub_8139634
 
 	thumb_func_start sub_8139648
-sub_8139648: ; 8139648
+sub_8139648: @ 8139648
 	push {lr}
 	bl get_map_light_from_warp0
 	lsls r0, 24
@@ -579701,7 +579701,7 @@ _08139664:
 	thumb_func_end sub_8139648
 
 	thumb_func_start sub_8139668
-sub_8139668: ; 8139668
+sub_8139668: @ 8139668
 	push {lr}
 	bl get_map_light_from_warp0
 	lsls r0, 24
@@ -579719,7 +579719,7 @@ _08139684:
 	thumb_func_end sub_8139668
 
 	thumb_func_start sub_8139688
-sub_8139688: ; 8139688
+sub_8139688: @ 8139688
 	push {r4-r6,lr}
 	bl calc_player_party_count
 	lsls r0, 24
@@ -579765,7 +579765,7 @@ _081396D8:
 	thumb_func_end sub_8139688
 
 	thumb_func_start sub_81396E0
-sub_81396E0: ; 81396E0
+sub_81396E0: @ 81396E0
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -579784,12 +579784,12 @@ sub_81396E0: ; 81396E0
 	thumb_func_end sub_81396E0
 
 	thumb_func_start nullsub_54
-nullsub_54: ; 8139708
+nullsub_54: @ 8139708
 	bx lr
 	thumb_func_end nullsub_54
 
 	thumb_func_start sub_813970C
-sub_813970C: ; 813970C
+sub_813970C: @ 813970C
 	push {r4,lr}
 	ldr r0, =0x000040c2
 	bl VarGet
@@ -579826,7 +579826,7 @@ _0813974C:
 	thumb_func_end sub_813970C
 
 	thumb_func_start sub_8139754
-sub_8139754: ; 8139754
+sub_8139754: @ 8139754
 	push {r4,lr}
 	ldr r0, =0x000040c2
 	ldr r4, =0x03005cf8
@@ -579840,7 +579840,7 @@ sub_8139754: ; 8139754
 	thumb_func_end sub_8139754
 
 	thumb_func_start sub_8139770
-sub_8139770: ; 8139770
+sub_8139770: @ 8139770
 	push {r4-r6,lr}
 	ldr r6, =0x020375e0
 	ldrh r0, [r6]
@@ -579878,7 +579878,7 @@ _081397BE:
 	thumb_func_end sub_8139770
 
 	thumb_func_start sub_81397C4
-sub_81397C4: ; 81397C4
+sub_81397C4: @ 81397C4
 	push {r4,r5,lr}
 	ldr r2, =0x020375f0
 	ldrh r1, [r2]
@@ -579957,7 +579957,7 @@ _08139862:
 	thumb_func_end sub_81397C4
 
 	thumb_func_start sub_813986C
-sub_813986C: ; 813986C
+sub_813986C: @ 813986C
 	push {lr}
 	ldr r0, =0x020375f0
 	ldrh r0, [r0]
@@ -580003,7 +580003,7 @@ _081398BA:
 	thumb_func_end sub_813986C
 
 	thumb_func_start sub_81398C0
-sub_81398C0: ; 81398C0
+sub_81398C0: @ 81398C0
 	push {r4,lr}
 	ldr r1, =0x020375e0
 	ldr r2, =0xfffffedf
@@ -580038,7 +580038,7 @@ _081398FC:
 	thumb_func_end sub_81398C0
 
 	thumb_func_start sub_813990C
-sub_813990C: ; 813990C
+sub_813990C: @ 813990C
 	push {r4,r5,lr}
 	bl calc_player_party_count
 	lsls r0, 24
@@ -580073,7 +580073,7 @@ _08139944:
 	thumb_func_end sub_813990C
 
 	thumb_func_start in_multi_battle_room_with_var_condition
-in_multi_battle_room_with_var_condition: ; 813994C
+in_multi_battle_room_with_var_condition: @ 813994C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -580098,7 +580098,7 @@ _0813997A:
 	thumb_func_end in_multi_battle_room_with_var_condition
 
 	thumb_func_start sub_8139980
-sub_8139980: ; 8139980
+sub_8139980: @ 8139980
 	push {lr}
 	movs r0, 0
 	bl SetCameraPanningCallback
@@ -580110,7 +580110,7 @@ sub_8139980: ; 8139980
 	thumb_func_end sub_8139980
 
 	thumb_func_start sub_8139994
-sub_8139994: ; 8139994
+sub_8139994: @ 8139994
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -580160,7 +580160,7 @@ _081399E6:
 	thumb_func_end sub_8139994
 
 	thumb_func_start sub_81399F4
-sub_81399F4: ; 81399F4
+sub_81399F4: @ 81399F4
 	push {r4,lr}
 	ldr r2, =0x0203ab60
 	movs r0, 0
@@ -580226,7 +580226,7 @@ _08139A6E:
 	thumb_func_end sub_81399F4
 
 	thumb_func_start sub_8139A78
-sub_8139A78: ; 8139A78
+sub_8139A78: @ 8139A78
 	push {r4-r6,lr}
 	ldr r0, =sub_8139AF4
 	movs r1, 0x9
@@ -580283,7 +580283,7 @@ _08139ACE:
 	thumb_func_end sub_8139A78
 
 	thumb_func_start sub_8139AF4
-sub_8139AF4: ; 8139AF4
+sub_8139AF4: @ 8139AF4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -580334,7 +580334,7 @@ _08139B54:
 	thumb_func_end sub_8139AF4
 
 	thumb_func_start sub_8139B60
-sub_8139B60: ; 8139B60
+sub_8139B60: @ 8139B60
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -580408,7 +580408,7 @@ sub_8139B60: ; 8139B60
 	thumb_func_end sub_8139B60
 
 	thumb_func_start sub_8139C10
-sub_8139C10: ; 8139C10
+sub_8139C10: @ 8139C10
 	push {r4,lr}
 	ldr r4, =0x0203ab5e
 	ldrb r0, [r4]
@@ -580423,7 +580423,7 @@ sub_8139C10: ; 8139C10
 	thumb_func_end sub_8139C10
 
 	thumb_func_start sub_8139C2C
-sub_8139C2C: ; 8139C2C
+sub_8139C2C: @ 8139C2C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -580462,7 +580462,7 @@ _08139C6C:
 	thumb_func_end sub_8139C2C
 
 	thumb_func_start sub_8139C80
-sub_8139C80: ; 8139C80
+sub_8139C80: @ 8139C80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -580602,7 +580602,7 @@ _08139D7C:
 	thumb_func_end sub_8139C80
 
 	thumb_func_start sub_8139D98
-sub_8139D98: ; 8139D98
+sub_8139D98: @ 8139D98
 	push {r4-r7,lr}
 	sub sp, 0x18
 	ldr r6, =0x020375e0
@@ -580711,7 +580711,7 @@ _08139E6E:
 	thumb_func_end sub_8139D98
 
 	thumb_func_start warp0_in_pokecenter
-warp0_in_pokecenter: ; 8139E80
+warp0_in_pokecenter: @ 8139E80
 	push {r4,lr}
 	ldr r0, =0x020322dc
 	movs r1, 0
@@ -580752,7 +580752,7 @@ _08139EC8:
 	thumb_func_end warp0_in_pokecenter
 
 	thumb_func_start sub_8139ED0
-sub_8139ED0: ; 8139ED0
+sub_8139ED0: @ 8139ED0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -580771,7 +580771,7 @@ _08139EEE:
 	thumb_func_end sub_8139ED0
 
 	thumb_func_start sub_8139EF4
-sub_8139EF4: ; 8139EF4
+sub_8139EF4: @ 8139EF4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -580793,7 +580793,7 @@ sub_8139EF4: ; 8139EF4
 	thumb_func_end sub_8139EF4
 
 	thumb_func_start sub_8139F20
-sub_8139F20: ; 8139F20
+sub_8139F20: @ 8139F20
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r0, =0x0000402f
@@ -580938,7 +580938,7 @@ _0813A062:
 	thumb_func_end sub_8139F20
 
 	thumb_func_start sub_813A080
-sub_813A080: ; 813A080
+sub_813A080: @ 813A080
 	push {r4-r7,lr}
 	ldr r0, =0x000040ce
 	bl VarGet
@@ -581011,7 +581011,7 @@ _0813A110:
 	thumb_func_end sub_813A080
 
 	thumb_func_start sub_813A128
-sub_813A128: ; 813A128
+sub_813A128: @ 813A128
 	push {r4,lr}
 	ldr r0, =sub_813A2DC
 	movs r1, 0x8
@@ -581230,7 +581230,7 @@ _0813A2D2:
 	thumb_func_end sub_813A128
 
 	thumb_func_start sub_813A2DC
-sub_813A2DC: ; 813A2DC
+sub_813A2DC: @ 813A2DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -581375,7 +581375,7 @@ _0813A38C:
 	thumb_func_end sub_813A2DC
 
 	thumb_func_start sub_813A42C
-sub_813A42C: ; 813A42C
+sub_813A42C: @ 813A42C
 	ldr r1, =0x030061d0
 	ldr r0, =0x0203ab64
 	ldr r0, [r0]
@@ -581406,7 +581406,7 @@ sub_813A42C: ; 813A42C
 	thumb_func_end sub_813A42C
 
 	thumb_func_start sub_813A46C
-sub_813A46C: ; 813A46C
+sub_813A46C: @ 813A46C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0x5
@@ -581461,7 +581461,7 @@ _0813A4D4:
 	thumb_func_end sub_813A46C
 
 	thumb_func_start sub_813A4EC
-sub_813A4EC: ; 813A4EC
+sub_813A4EC: @ 813A4EC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -581525,7 +581525,7 @@ _0813A566:
 	thumb_func_end sub_813A4EC
 
 	thumb_func_start sub_813A570
-sub_813A570: ; 813A570
+sub_813A570: @ 813A570
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -581586,7 +581586,7 @@ sub_813A570: ; 813A570
 	thumb_func_end sub_813A570
 
 	thumb_func_start sub_813A600
-sub_813A600: ; 813A600
+sub_813A600: @ 813A600
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -581612,7 +581612,7 @@ _0813A624:
 	thumb_func_end sub_813A600
 
 	thumb_func_start sub_813A630
-sub_813A630: ; 813A630
+sub_813A630: @ 813A630
 	push {lr}
 	ldr r0, =sub_813A600
 	bl get_task_id_by_function
@@ -581639,7 +581639,7 @@ _0813A65C:
 	thumb_func_end sub_813A630
 
 	thumb_func_start sub_813A664
-sub_813A664: ; 813A664
+sub_813A664: @ 813A664
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -581661,7 +581661,7 @@ sub_813A664: ; 813A664
 	thumb_func_end sub_813A664
 
 	thumb_func_start sub_813A694
-sub_813A694: ; 813A694
+sub_813A694: @ 813A694
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -581742,7 +581742,7 @@ _0813A724:
 	thumb_func_end sub_813A694
 
 	thumb_func_start sub_813A738
-sub_813A738: ; 813A738
+sub_813A738: @ 813A738
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -581768,12 +581768,12 @@ _0813A75E:
 	thumb_func_end sub_813A738
 
 	thumb_func_start nullsub_55
-nullsub_55: ; 813A768
+nullsub_55: @ 813A768
 	bx lr
 	thumb_func_end nullsub_55
 
 	thumb_func_start sub_813A76C
-sub_813A76C: ; 813A76C
+sub_813A76C: @ 813A76C
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r6, =0x020229e8
@@ -581812,7 +581812,7 @@ _0813A7A8:
 	thumb_func_end sub_813A76C
 
 	thumb_func_start sub_813A7B8
-sub_813A7B8: ; 813A7B8
+sub_813A7B8: @ 813A7B8
 	push {lr}
 	ldr r1, =0x020375e0
 	ldrh r0, [r1]
@@ -581839,7 +581839,7 @@ _0813A7C6:
 	thumb_func_end sub_813A7B8
 
 	thumb_func_start sub_813A7F4
-sub_813A7F4: ; 813A7F4
+sub_813A7F4: @ 813A7F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -581861,7 +581861,7 @@ sub_813A7F4: ; 813A7F4
 	thumb_func_end sub_813A7F4
 
 	thumb_func_start sub_813A820
-sub_813A820: ; 813A820
+sub_813A820: @ 813A820
 	push {r4,lr}
 	ldr r0, =0x00004030
 	bl VarGet
@@ -581883,7 +581883,7 @@ sub_813A820: ; 813A820
 	thumb_func_end sub_813A820
 
 	thumb_func_start sub_813A854
-sub_813A854: ; 813A854
+sub_813A854: @ 813A854
 	push {r4,lr}
 	ldr r4, =gUnknown_085B30D4
 	ldr r0, =0x00004031
@@ -581900,7 +581900,7 @@ sub_813A854: ; 813A854
 	thumb_func_end sub_813A854
 
 	thumb_func_start sub_813A878
-sub_813A878: ; 813A878
+sub_813A878: @ 813A878
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -581955,7 +581955,7 @@ _0813A8F0:
 	thumb_func_end sub_813A878
 
 	thumb_func_start sub_813A8FC
-sub_813A8FC: ; 813A8FC
+sub_813A8FC: @ 813A8FC
 	push {lr}
 	sub sp, 0x2C
 	ldr r0, =0x03005d90
@@ -581993,7 +581993,7 @@ sub_813A8FC: ; 813A8FC
 	thumb_func_end sub_813A8FC
 
 	thumb_func_start sub_813A958
-sub_813A958: ; 813A958
+sub_813A958: @ 813A958
 	push {r4,lr}
 	ldr r4, =0x0203ab6d
 	ldr r0, =gUnknown_085B311C
@@ -582013,7 +582013,7 @@ sub_813A958: ; 813A958
 	thumb_func_end sub_813A958
 
 	thumb_func_start sub_813A988
-sub_813A988: ; 813A988
+sub_813A988: @ 813A988
 	push {r4,lr}
 	ldr r4, =0x0203ab6d
 	ldrb r0, [r4]
@@ -582028,7 +582028,7 @@ sub_813A988: ; 813A988
 	thumb_func_end sub_813A988
 
 	thumb_func_start sub_813A9A4
-sub_813A9A4: ; 813A9A4
+sub_813A9A4: @ 813A9A4
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -582051,7 +582051,7 @@ _0813A9CA:
 	thumb_func_end sub_813A9A4
 
 	thumb_func_start sub_813A9D0
-sub_813A9D0: ; 813A9D0
+sub_813A9D0: @ 813A9D0
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -582075,7 +582075,7 @@ _0813A9FE:
 	thumb_func_end sub_813A9D0
 
 	thumb_func_start sub_813AA04
-sub_813AA04: ; 813AA04
+sub_813AA04: @ 813AA04
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0x00000eb8
@@ -582086,7 +582086,7 @@ sub_813AA04: ; 813AA04
 	thumb_func_end sub_813AA04
 
 	thumb_func_start sub_813AA18
-sub_813AA18: ; 813AA18
+sub_813AA18: @ 813AA18
 	push {r4,lr}
 	ldr r4, =0x0203ab6e
 	ldr r0, =gUnknown_085B3124
@@ -582105,7 +582105,7 @@ sub_813AA18: ; 813AA18
 	thumb_func_end sub_813AA18
 
 	thumb_func_start sub_813AA44
-sub_813AA44: ; 813AA44
+sub_813AA44: @ 813AA44
 	push {r4,lr}
 	ldr r4, =0x0203ab6e
 	ldrb r0, [r4]
@@ -582120,7 +582120,7 @@ sub_813AA44: ; 813AA44
 	thumb_func_end sub_813AA44
 
 	thumb_func_start sub_813AA60
-sub_813AA60: ; 813AA60
+sub_813AA60: @ 813AA60
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -582284,7 +582284,7 @@ _0813ABC2:
 	thumb_func_end sub_813AA60
 
 	thumb_func_start sub_813ABD4
-sub_813ABD4: ; 813ABD4
+sub_813ABD4: @ 813ABD4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 16
@@ -582337,7 +582337,7 @@ _0813AC32:
 	thumb_func_end sub_813ABD4
 
 	thumb_func_start sub_813AC44
-sub_813AC44: ; 813AC44
+sub_813AC44: @ 813AC44
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -582367,7 +582367,7 @@ _0813AC70:
 	thumb_func_end sub_813AC44
 
 	thumb_func_start sub_813AC7C
-sub_813AC7C: ; 813AC7C
+sub_813AC7C: @ 813AC7C
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrh r0, [r0]
@@ -582407,7 +582407,7 @@ _0813ACD2:
 	thumb_func_end sub_813AC7C
 
 	thumb_func_start sub_813ACE8
-sub_813ACE8: ; 813ACE8
+sub_813ACE8: @ 813ACE8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -582442,7 +582442,7 @@ _0813AD20:
 	thumb_func_end sub_813ACE8
 
 	thumb_func_start sub_813AD34
-sub_813AD34: ; 813AD34
+sub_813AD34: @ 813AD34
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -582506,7 +582506,7 @@ _0813ADAC:
 	thumb_func_end sub_813AD34
 
 	thumb_func_start sub_813ADB8
-sub_813ADB8: ; 813ADB8
+sub_813ADB8: @ 813ADB8
 	push {r4,lr}
 	ldr r4, =0x0203ab5e
 	ldrb r0, [r4]
@@ -582521,7 +582521,7 @@ sub_813ADB8: ; 813ADB8
 	thumb_func_end sub_813ADB8
 
 	thumb_func_start sub_813ADD4
-sub_813ADD4: ; 813ADD4
+sub_813ADD4: @ 813ADD4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -582622,7 +582622,7 @@ _0813AE90:
 	thumb_func_end sub_813ADD4
 
 	thumb_func_start sub_813AEB4
-sub_813AEB4: ; 813AEB4
+sub_813AEB4: @ 813AEB4
 	push {r4,lr}
 	movs r1, 0
 	ldr r0, =0x020375e2
@@ -582688,7 +582688,7 @@ _0813AF38:
 	thumb_func_end sub_813AEB4
 
 	thumb_func_start sub_813AF48
-sub_813AF48: ; 813AF48
+sub_813AF48: @ 813AF48
 	push {r4,r5,lr}
 	ldr r0, =sub_813A600
 	bl get_task_id_by_function
@@ -582743,7 +582743,7 @@ _0813AFB6:
 	thumb_func_end sub_813AF48
 
 	thumb_func_start sub_813AFC8
-sub_813AFC8: ; 813AFC8
+sub_813AFC8: @ 813AFC8
 	push {lr}
 	ldr r0, =task_deoxys_sound
 	movs r1, 0x8
@@ -582754,7 +582754,7 @@ sub_813AFC8: ; 813AFC8
 	thumb_func_end sub_813AFC8
 
 	thumb_func_start task_deoxys_sound
-task_deoxys_sound: ; 813AFDC
+task_deoxys_sound: @ 813AFDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -582842,7 +582842,7 @@ _0813B0A2:
 	thumb_func_end task_deoxys_sound
 
 	thumb_func_start sub_813B0B4
-sub_813B0B4: ; 813B0B4
+sub_813B0B4: @ 813B0B4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -582919,7 +582919,7 @@ _0813B13A:
 	thumb_func_end sub_813B0B4
 
 	thumb_func_start sub_813B160
-sub_813B160: ; 813B160
+sub_813B160: @ 813B160
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -582938,7 +582938,7 @@ _0813B17C:
 	thumb_func_end sub_813B160
 
 	thumb_func_start increment_var_x4026_on_birth_island_modulo_100
-increment_var_x4026_on_birth_island_modulo_100: ; 813B184
+increment_var_x4026_on_birth_island_modulo_100: @ 813B184
 	push {r4,lr}
 	ldr r4, =0x00004034
 	adds r0, r4, 0
@@ -582972,7 +582972,7 @@ _0813B1C8:
 	thumb_func_end increment_var_x4026_on_birth_island_modulo_100
 
 	thumb_func_start sub_813B1D0
-sub_813B1D0: ; 813B1D0
+sub_813B1D0: @ 813B1D0
 	push {lr}
 	ldr r0, =0x00004035
 	bl VarGet
@@ -582995,8 +582995,8 @@ sub_813B1D0: ; 813B1D0
 	thumb_func_end sub_813B1D0
 
 	thumb_func_start set_unknown_box_id
-; void set_unknown_box_id(char id)
-set_unknown_box_id: ; 813B204
+@ void set_unknown_box_id(char id)
+set_unknown_box_id: @ 813B204
 	ldr r1, =0x0203ab6f
 	strb r0, [r1]
 	bx lr
@@ -583004,7 +583004,7 @@ set_unknown_box_id: ; 813B204
 	thumb_func_end set_unknown_box_id
 
 	thumb_func_start get_unknown_box_id
-get_unknown_box_id: ; 813B210
+get_unknown_box_id: @ 813B210
 	ldr r0, =0x0203ab6f
 	ldrb r0, [r0]
 	bx lr
@@ -583012,7 +583012,7 @@ get_unknown_box_id: ; 813B210
 	thumb_func_end get_unknown_box_id
 
 	thumb_func_start sub_813B21C
-sub_813B21C: ; 813B21C
+sub_813B21C: @ 813B21C
 	push {r4,r5,lr}
 	ldr r5, =0x000008d7
 	adds r0, r5, 0
@@ -583044,7 +583044,7 @@ _0813B25A:
 	thumb_func_end sub_813B21C
 
 	thumb_func_start sub_813B260
-sub_813B260: ; 813B260
+sub_813B260: @ 813B260
 	push {r4-r7,lr}
 	ldr r0, =0x00004036
 	bl VarGet
@@ -583106,7 +583106,7 @@ _0813B2DC:
 	thumb_func_end sub_813B260
 
 	thumb_func_start sub_813B2E4
-sub_813B2E4: ; 813B2E4
+sub_813B2E4: @ 813B2E4
 	push {r4,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -583169,7 +583169,7 @@ _0813B36A:
 	thumb_func_end sub_813B2E4
 
 	thumb_func_start sub_813B374
-sub_813B374: ; 813B374
+sub_813B374: @ 813B374
 	push {r4,lr}
 	ldr r0, =0x00004037
 	bl VarGet
@@ -583197,7 +583197,7 @@ _0813B3AA:
 	thumb_func_end sub_813B374
 
 	thumb_func_start sub_813B3B0
-sub_813B3B0: ; 813B3B0
+sub_813B3B0: @ 813B3B0
 	push {r4-r6,lr}
 	ldr r5, =0x00004038
 	adds r0, r5, 0
@@ -583294,7 +583294,7 @@ _0813B47E:
 	thumb_func_end sub_813B3B0
 
 	thumb_func_start sub_813B484
-sub_813B484: ; 813B484
+sub_813B484: @ 813B484
 	push {lr}
 	movs r0, 0x2
 	bl sub_80AB104
@@ -583303,7 +583303,7 @@ sub_813B484: ; 813B484
 	thumb_func_end sub_813B484
 
 	thumb_func_start sub_813B490
-sub_813B490: ; 813B490
+sub_813B490: @ 813B490
 	push {r4-r7,lr}
 	movs r3, 0
 	ldr r0, =0x03005d8c
@@ -583346,7 +583346,7 @@ _0813B4D8:
 	thumb_func_end sub_813B490
 
 	thumb_func_start sub_813B4E0
-sub_813B4E0: ; 813B4E0
+sub_813B4E0: @ 813B4E0
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -583374,7 +583374,7 @@ _0813B50E:
 	thumb_func_end sub_813B4E0
 
 	thumb_func_start sub_813B514
-sub_813B514: ; 813B514
+sub_813B514: @ 813B514
 	push {lr}
 	ldr r0, =0x0000403f
 	bl VarGet
@@ -583392,7 +583392,7 @@ _0813B52E:
 	thumb_func_end sub_813B514
 
 	thumb_func_start sub_813B534
-sub_813B534: ; 813B534
+sub_813B534: @ 813B534
 	push {lr}
 	ldr r2, =0x0203ab70
 	ldr r1, =0x02022fec
@@ -583414,7 +583414,7 @@ _0813B552:
 	thumb_func_end sub_813B534
 
 	thumb_func_start sub_813B568
-sub_813B568: ; 813B568
+sub_813B568: @ 813B568
 	push {lr}
 	ldr r0, =sub_813B57C
 	movs r1, 0x5
@@ -583425,7 +583425,7 @@ sub_813B568: ; 813B568
 	thumb_func_end sub_813B568
 
 	thumb_func_start sub_813B57C
-sub_813B57C: ; 813B57C
+sub_813B57C: @ 813B57C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -583680,7 +583680,7 @@ _0813B7C6:
 	thumb_func_end sub_813B57C
 
 	thumb_func_start sub_813B7D8
-sub_813B7D8: ; 813B7D8
+sub_813B7D8: @ 813B7D8
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -583704,7 +583704,7 @@ _0813B802:
 	thumb_func_end sub_813B7D8
 
 	thumb_func_start sub_813B80C
-sub_813B80C: ; 813B80C
+sub_813B80C: @ 813B80C
 	push {lr}
 	ldr r0, =sub_813B824
 	movs r1, 0x8
@@ -583717,7 +583717,7 @@ sub_813B80C: ; 813B80C
 	thumb_func_end sub_813B80C
 
 	thumb_func_start sub_813B824
-sub_813B824: ; 813B824
+sub_813B824: @ 813B824
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -583761,7 +583761,7 @@ _0813B86C:
 	thumb_func_end sub_813B824
 
 	thumb_func_start sub_813B880
-sub_813B880: ; 813B880
+sub_813B880: @ 813B880
 	push {lr}
 	ldr r0, =_fwalk
 	movs r1, 0x8
@@ -583785,7 +583785,7 @@ sub_813B880: ; 813B880
 	thumb_func_end sub_813B880
 
 	thumb_func_start _fwalk
-_fwalk: ; 813B8B0
+_fwalk: @ 813B8B0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -583875,7 +583875,7 @@ _0813B94E:
 	thumb_func_end _fwalk
 
 	thumb_func_start sub_813B968
-sub_813B968: ; 813B968
+sub_813B968: @ 813B968
 	push {r4,r5,lr}
 	ldr r5, =0x020375f0
 	ldr r0, =0x020375e0
@@ -583901,7 +583901,7 @@ sub_813B968: ; 813B968
 	thumb_func_end sub_813B968
 
 	thumb_func_start sub_813B9A0
-sub_813B9A0: ; 813B9A0
+sub_813B9A0: @ 813B9A0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -583919,7 +583919,7 @@ _0813B9B6:
 	thumb_func_end sub_813B9A0
 
 	thumb_func_start sub_813B9C0
-sub_813B9C0: ; 813B9C0
+sub_813B9C0: @ 813B9C0
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -583961,7 +583961,7 @@ _0813BA08:
 	thumb_func_end sub_813B9C0
 
 	thumb_func_start sub_813BA10
-sub_813BA10: ; 813BA10
+sub_813BA10: @ 813BA10
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r2, =0x0000141e
@@ -583977,7 +583977,7 @@ sub_813BA10: ; 813BA10
 	thumb_func_end sub_813BA10
 
 	thumb_func_start sub_813BA30
-sub_813BA30: ; 813BA30
+sub_813BA30: @ 813BA30
 	push {lr}
 	bl sub_813BF44
 	lsls r0, 24
@@ -584000,7 +584000,7 @@ _0813BA52:
 	thumb_func_end sub_813BA30
 
 	thumb_func_start sub_813BA60
-sub_813BA60: ; 813BA60
+sub_813BA60: @ 813BA60
 	push {r4,lr}
 	ldr r4, =0x03005d8c
 	ldr r0, [r4]
@@ -584044,7 +584044,7 @@ _0813BAB6:
 	thumb_func_end sub_813BA60
 
 	thumb_func_start sub_813BADC
-sub_813BADC: ; 813BADC
+sub_813BADC: @ 813BADC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -584110,7 +584110,7 @@ _0813BB58:
 	thumb_func_end sub_813BADC
 
 	thumb_func_start sub_813BB74
-sub_813BB74: ; 813BB74
+sub_813BB74: @ 813BB74
 	push {r4-r7,lr}
 	sub sp, 0x8
 	movs r3, 0
@@ -584176,7 +584176,7 @@ _0813BBEA:
 	thumb_func_end sub_813BB74
 
 	thumb_func_start sub_813BC00
-sub_813BC00: ; 813BC00
+sub_813BC00: @ 813BC00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -584263,7 +584263,7 @@ _0813BC8E:
 	thumb_func_end sub_813BC00
 
 	thumb_func_start sub_813BCA8
-sub_813BCA8: ; 813BCA8
+sub_813BCA8: @ 813BCA8
 	push {r4,r5,lr}
 	movs r3, 0
 	movs r2, 0
@@ -584298,7 +584298,7 @@ _0813BCCE:
 	thumb_func_end sub_813BCA8
 
 	thumb_func_start sub_813BCE8
-sub_813BCE8: ; 813BCE8
+sub_813BCE8: @ 813BCE8
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r2, =0x03005d90
@@ -584359,7 +584359,7 @@ _0813BD58:
 	thumb_func_end sub_813BCE8
 
 	thumb_func_start sub_813BD60
-sub_813BD60: ; 813BD60
+sub_813BD60: @ 813BD60
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x0000141e
@@ -584375,7 +584375,7 @@ sub_813BD60: ; 813BD60
 	thumb_func_end sub_813BD60
 
 	thumb_func_start sub_813BD84
-sub_813BD84: ; 813BD84
+sub_813BD84: @ 813BD84
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
 	ldr r0, =0x0000141e
@@ -584399,7 +584399,7 @@ sub_813BD84: ; 813BD84
 	thumb_func_end sub_813BD84
 
 	thumb_func_start sub_813BDB4
-sub_813BDB4: ; 813BDB4
+sub_813BDB4: @ 813BDB4
 	push {lr}
 	movs r3, 0
 	movs r2, 0
@@ -584456,7 +584456,7 @@ _0813BE14:
 	thumb_func_end sub_813BDB4
 
 	thumb_func_start sub_813BE30
-sub_813BE30: ; 813BE30
+sub_813BE30: @ 813BE30
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -584541,7 +584541,7 @@ _0813BF04:
 	thumb_func_end sub_813BE30
 
 	thumb_func_start sub_813BF10
-sub_813BF10: ; 813BF10
+sub_813BF10: @ 813BF10
 	push {lr}
 	ldr r0, =0x00004095
 	bl VarGet
@@ -584565,7 +584565,7 @@ _0813BF40:
 	thumb_func_end sub_813BF10
 
 	thumb_func_start sub_813BF44
-sub_813BF44: ; 813BF44
+sub_813BF44: @ 813BF44
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x0000141e
@@ -584579,7 +584579,7 @@ sub_813BF44: ; 813BF44
 	thumb_func_end sub_813BF44
 
 	thumb_func_start sub_813BF60
-sub_813BF60: ; 813BF60
+sub_813BF60: @ 813BF60
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x0000141e
@@ -584593,7 +584593,7 @@ sub_813BF60: ; 813BF60
 	thumb_func_end sub_813BF60
 
 	thumb_func_start sub_813BF7C
-sub_813BF7C: ; 813BF7C
+sub_813BF7C: @ 813BF7C
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrb r0, [r0]
@@ -584606,7 +584606,7 @@ sub_813BF7C: ; 813BF7C
 	thumb_func_end sub_813BF7C
 
 	thumb_func_start sub_813BF94
-sub_813BF94: ; 813BF94
+sub_813BF94: @ 813BF94
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -584632,7 +584632,7 @@ sub_813BF94: ; 813BF94
 	thumb_func_end sub_813BF94
 
 	thumb_func_start sub_813BFC4
-sub_813BFC4: ; 813BFC4
+sub_813BFC4: @ 813BFC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0x4
@@ -584658,7 +584658,7 @@ _0813BFCA:
 	thumb_func_end sub_813BFC4
 
 	thumb_func_start sub_813BFF8
-sub_813BFF8: ; 813BFF8
+sub_813BFF8: @ 813BFF8
 	adds r1, r0, 0
 	ldrh r0, [r1, 0xA]
 	ldrh r2, [r1, 0xC]
@@ -584669,7 +584669,7 @@ sub_813BFF8: ; 813BFF8
 	thumb_func_end sub_813BFF8
 
 	thumb_func_start sub_813C008
-sub_813C008: ; 813C008
+sub_813C008: @ 813C008
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	lsls r2, 16
@@ -584701,7 +584701,7 @@ _0813C036:
 	thumb_func_end sub_813C008
 
 	thumb_func_start sub_813C03C
-sub_813C03C: ; 813C03C
+sub_813C03C: @ 813C03C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -584781,7 +584781,7 @@ _0813C0BA:
 	thumb_func_end sub_813C03C
 
 	thumb_func_start sub_813C0D0
-sub_813C0D0: ; 813C0D0
+sub_813C0D0: @ 813C0D0
 	push {lr}
 	adds r2, r0, 0
 	cmp r1, 0x2
@@ -584836,7 +584836,7 @@ _0813C12A:
 	thumb_func_end sub_813C0D0
 
 	thumb_func_start sub_813C134
-sub_813C134: ; 813C134
+sub_813C134: @ 813C134
 	push {r4,lr}
 	cmp r0, 0x2
 	beq _0813C14E
@@ -584873,7 +584873,7 @@ _0813C166:
 	thumb_func_end sub_813C134
 
 	thumb_func_start sub_813C170
-sub_813C170: ; 813C170
+sub_813C170: @ 813C170
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -584937,7 +584937,7 @@ _0813C1D4:
 	thumb_func_end sub_813C170
 
 	thumb_func_start sub_813C1F8
-sub_813C1F8: ; 813C1F8
+sub_813C1F8: @ 813C1F8
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -584950,7 +584950,7 @@ sub_813C1F8: ; 813C1F8
 	thumb_func_end sub_813C1F8
 
 	thumb_func_start sub_813C214
-sub_813C214: ; 813C214
+sub_813C214: @ 813C214
 	push {lr}
 	movs r1, 0x64
 	muls r1, r0
@@ -584972,7 +584972,7 @@ _0813C230:
 	thumb_func_end sub_813C214
 
 	thumb_func_start sub_813C23C
-sub_813C23C: ; 813C23C
+sub_813C23C: @ 813C23C
 	push {lr}
 	movs r1, 0x64
 	muls r1, r0
@@ -584994,7 +584994,7 @@ _0813C258:
 	thumb_func_end sub_813C23C
 
 	thumb_func_start sub_813C264
-sub_813C264: ; 813C264
+sub_813C264: @ 813C264
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0202433a
@@ -585024,7 +585024,7 @@ _0813C298:
 	thumb_func_end sub_813C264
 
 	thumb_func_start sub_813C2A0
-sub_813C2A0: ; 813C2A0
+sub_813C2A0: @ 813C2A0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -585060,7 +585060,7 @@ _0813C2DA:
 	thumb_func_end sub_813C2A0
 
 	thumb_func_start sub_813C2F4
-sub_813C2F4: ; 813C2F4
+sub_813C2F4: @ 813C2F4
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r4, =0x02021cc4
@@ -585116,7 +585116,7 @@ sub_813C2F4: ; 813C2F4
 	thumb_func_end sub_813C2F4
 
 	thumb_func_start sub_813C384
-sub_813C384: ; 813C384
+sub_813C384: @ 813C384
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -585255,7 +585255,7 @@ _0813C4A8:
 	thumb_func_end sub_813C384
 
 	thumb_func_start sub_813C4BC
-sub_813C4BC: ; 813C4BC
+sub_813C4BC: @ 813C4BC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -585346,7 +585346,7 @@ _0813C540:
 	thumb_func_end sub_813C4BC
 
 	thumb_func_start sub_813C5A0
-sub_813C5A0: ; 813C5A0
+sub_813C5A0: @ 813C5A0
 	push {r4,lr}
 	ldr r4, =0x0203ab74
 	ldrb r0, [r4]
@@ -585361,7 +585361,7 @@ sub_813C5A0: ; 813C5A0
 	thumb_func_end sub_813C5A0
 
 	thumb_func_start sub_813C5BC
-sub_813C5BC: ; 813C5BC
+sub_813C5BC: @ 813C5BC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -585385,7 +585385,7 @@ _0813C5DC:
 	thumb_func_end sub_813C5BC
 
 	thumb_func_start sub_813C5EC
-sub_813C5EC: ; 813C5EC
+sub_813C5EC: @ 813C5EC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -585417,7 +585417,7 @@ _0813C61A:
 	thumb_func_end sub_813C5EC
 
 	thumb_func_start sub_813C62C
-sub_813C62C: ; 813C62C
+sub_813C62C: @ 813C62C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -585445,7 +585445,7 @@ sub_813C62C: ; 813C62C
 	thumb_func_end sub_813C62C
 
 	thumb_func_start sub_813C664
-sub_813C664: ; 813C664
+sub_813C664: @ 813C664
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -585473,7 +585473,7 @@ _0813C694:
 	thumb_func_end sub_813C664
 
 	thumb_func_start sub_813C6A8
-sub_813C6A8: ; 813C6A8
+sub_813C6A8: @ 813C6A8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -585494,7 +585494,7 @@ sub_813C6A8: ; 813C6A8
 	thumb_func_end sub_813C6A8
 
 	thumb_func_start sub_813C6D4
-sub_813C6D4: ; 813C6D4
+sub_813C6D4: @ 813C6D4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -585632,7 +585632,7 @@ _0813C6FA:
 	thumb_func_end sub_813C6D4
 
 	thumb_func_start sub_813C80C
-sub_813C80C: ; 813C80C
+sub_813C80C: @ 813C80C
 	push {lr}
 	bl remove_some_task
 	bl clear_tasks
@@ -585644,7 +585644,7 @@ sub_813C80C: ; 813C80C
 	thumb_func_end sub_813C80C
 
 	thumb_func_start sub_813C828
-sub_813C828: ; 813C828
+sub_813C828: @ 813C828
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -585683,7 +585683,7 @@ sub_813C828: ; 813C828
 	thumb_func_end sub_813C828
 
 	thumb_func_start sub_813C880
-sub_813C880: ; 813C880
+sub_813C880: @ 813C880
 	push {lr}
 	movs r1, 0x94
 	lsls r1, 4
@@ -585694,7 +585694,7 @@ sub_813C880: ; 813C880
 	thumb_func_end sub_813C880
 
 	thumb_func_start sub_813C890
-sub_813C890: ; 813C890
+sub_813C890: @ 813C890
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -585725,7 +585725,7 @@ sub_813C890: ; 813C890
 	thumb_func_end sub_813C890
 
 	thumb_func_start sub_813C8D8
-sub_813C8D8: ; 813C8D8
+sub_813C8D8: @ 813C8D8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -585735,7 +585735,7 @@ sub_813C8D8: ; 813C8D8
 	thumb_func_end sub_813C8D8
 
 	thumb_func_start sub_813C8EC
-sub_813C8EC: ; 813C8EC
+sub_813C8EC: @ 813C8EC
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -585746,7 +585746,7 @@ sub_813C8EC: ; 813C8EC
 	thumb_func_end sub_813C8EC
 
 	thumb_func_start sub_813C904
-sub_813C904: ; 813C904
+sub_813C904: @ 813C904
 	push {lr}
 	movs r0, 0
 	bl SetVBlankCallback
@@ -585758,7 +585758,7 @@ sub_813C904: ; 813C904
 	thumb_func_end sub_813C904
 
 	thumb_func_start sub_813C91C
-sub_813C91C: ; 813C91C
+sub_813C91C: @ 813C91C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -585883,7 +585883,7 @@ _0813CA3C:
 	thumb_func_end sub_813C91C
 
 	thumb_func_start sub_813CA54
-sub_813CA54: ; 813CA54
+sub_813CA54: @ 813CA54
 	ldr r0, =0x0203ab7c
 	ldr r0, [r0]
 	movs r1, 0x8A
@@ -585896,7 +585896,7 @@ sub_813CA54: ; 813CA54
 	thumb_func_end sub_813CA54
 
 	thumb_func_start sub_813CA68
-sub_813CA68: ; 813CA68
+sub_813CA68: @ 813CA68
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x0203ab7c
@@ -585990,7 +585990,7 @@ _0813CB36:
 	thumb_func_end sub_813CA68
 
 	thumb_func_start sub_813CB40
-sub_813CB40: ; 813CB40
+sub_813CB40: @ 813CB40
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -586210,7 +586210,7 @@ _0813CCF8:
 	thumb_func_end sub_813CB40
 
 	thumb_func_start sub_813CD04
-sub_813CD04: ; 813CD04
+sub_813CD04: @ 813CD04
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -586259,7 +586259,7 @@ _0813CD58:
 	thumb_func_end sub_813CD04
 
 	thumb_func_start sub_813CD64
-sub_813CD64: ; 813CD64
+sub_813CD64: @ 813CD64
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -586367,7 +586367,7 @@ _0813CE22:
 	thumb_func_end sub_813CD64
 
 	thumb_func_start sub_813CE34
-sub_813CE34: ; 813CE34
+sub_813CE34: @ 813CE34
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -586380,7 +586380,7 @@ sub_813CE34: ; 813CE34
 	thumb_func_end sub_813CE34
 
 	thumb_func_start sub_813CE48
-sub_813CE48: ; 813CE48
+sub_813CE48: @ 813CE48
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -586448,7 +586448,7 @@ _0813CECE:
 	thumb_func_end sub_813CE48
 
 	thumb_func_start sub_813CED4
-sub_813CED4: ; 813CED4
+sub_813CED4: @ 813CED4
 	push {r4,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -586483,7 +586483,7 @@ _0813CF04:
 	thumb_func_end sub_813CED4
 
 	thumb_func_start sub_813CF0C
-sub_813CF0C: ; 813CF0C
+sub_813CF0C: @ 813CF0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -586843,7 +586843,7 @@ _0813D198:
 	thumb_func_end sub_813CF0C
 
 	thumb_func_start sub_813D1C8
-sub_813D1C8: ; 813D1C8
+sub_813D1C8: @ 813D1C8
 	push {lr}
 	ldr r1, =0x0203ab7c
 	ldr r2, [r1]
@@ -586907,7 +586907,7 @@ _0813D206:
 	thumb_func_end sub_813D1C8
 
 	thumb_func_start sub_813D25C
-sub_813D25C: ; 813D25C
+sub_813D25C: @ 813D25C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -587090,7 +587090,7 @@ _0813D3C6:
 	thumb_func_end sub_813D25C
 
 	thumb_func_start sub_813D3D8
-sub_813D3D8: ; 813D3D8
+sub_813D3D8: @ 813D3D8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -587126,7 +587126,7 @@ sub_813D3D8: ; 813D3D8
 	thumb_func_end sub_813D3D8
 
 	thumb_func_start sub_813D42C
-sub_813D42C: ; 813D42C
+sub_813D42C: @ 813D42C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -587284,7 +587284,7 @@ _0813D594:
 	thumb_func_end sub_813D42C
 
 	thumb_func_start sub_813D5A0
-sub_813D5A0: ; 813D5A0
+sub_813D5A0: @ 813D5A0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -587415,7 +587415,7 @@ _0813D6A8:
 	thumb_func_end sub_813D5A0
 
 	thumb_func_start sub_813D6B4
-sub_813D6B4: ; 813D6B4
+sub_813D6B4: @ 813D6B4
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0x1
@@ -587430,7 +587430,7 @@ sub_813D6B4: ; 813D6B4
 	thumb_func_end sub_813D6B4
 
 	thumb_func_start sub_813D6D0
-sub_813D6D0: ; 813D6D0
+sub_813D6D0: @ 813D6D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -587582,7 +587582,7 @@ _0813D7D8:
 	thumb_func_end sub_813D6D0
 
 	thumb_func_start sub_813D824
-sub_813D824: ; 813D824
+sub_813D824: @ 813D824
 	push {r4,r5,lr}
 	movs r0, 0x2
 	bl FreeObjectTilesByTag
@@ -587648,7 +587648,7 @@ _0813D892:
 	thumb_func_end sub_813D824
 
 	thumb_func_start sub_813D8A8
-sub_813D8A8: ; 813D8A8
+sub_813D8A8: @ 813D8A8
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =0x0203ab7c
@@ -587671,7 +587671,7 @@ sub_813D8A8: ; 813D8A8
 	thumb_func_end sub_813D8A8
 
 	thumb_func_start sub_813D8E8
-sub_813D8E8: ; 813D8E8
+sub_813D8E8: @ 813D8E8
 	push {r4-r6,lr}
 	ldr r1, =0x0203ab7c
 	ldr r0, [r1]
@@ -587767,7 +587767,7 @@ _0813D9A4:
 	thumb_func_end sub_813D8E8
 
 	thumb_func_start sub_813D9B0
-sub_813D9B0: ; 813D9B0
+sub_813D9B0: @ 813D9B0
 	push {lr}
 	bl fade_and_return_progress_probably
 	bl RunActiveTasks
@@ -587776,7 +587776,7 @@ sub_813D9B0: ; 813D9B0
 	thumb_func_end sub_813D9B0
 
 	thumb_func_start sub_813D9C0
-sub_813D9C0: ; 813D9C0
+sub_813D9C0: @ 813D9C0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -587839,7 +587839,7 @@ _0813DA30:
 	thumb_func_end sub_813D9C0
 
 	thumb_func_start sub_813DA40
-sub_813DA40: ; 813DA40
+sub_813DA40: @ 813DA40
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -587874,7 +587874,7 @@ sub_813DA40: ; 813DA40
 	thumb_func_end sub_813DA40
 
 	thumb_func_start evolution_cutscene
-evolution_cutscene: ; 813DA8C
+evolution_cutscene: @ 813DA8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -588157,7 +588157,7 @@ evolution_cutscene: ; 813DA8C
 	thumb_func_end evolution_cutscene
 
 	thumb_func_start sub_813DD7C
-sub_813DD7C: ; 813DD7C
+sub_813DD7C: @ 813DD7C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -588334,7 +588334,7 @@ sub_813DD7C: ; 813DD7C
 	thumb_func_end sub_813DD7C
 
 	thumb_func_start sub_813DF70
-sub_813DF70: ; 813DF70
+sub_813DF70: @ 813DF70
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r2, =0x03005e00
@@ -588570,7 +588570,7 @@ _0813E1C8:
 	thumb_func_end sub_813DF70
 
 	thumb_func_start sub_813E1D4
-sub_813E1D4: ; 813E1D4
+sub_813E1D4: @ 813E1D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -588742,7 +588742,7 @@ sub_813E1D4: ; 813E1D4
 	thumb_func_end sub_813E1D4
 
 	thumb_func_start sub_813E3A4
-sub_813E3A4: ; 813E3A4
+sub_813E3A4: @ 813E3A4
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -588754,7 +588754,7 @@ sub_813E3A4: ; 813E3A4
 	thumb_func_end sub_813E3A4
 
 	thumb_func_start sub_813E3C0
-sub_813E3C0: ; 813E3C0
+sub_813E3C0: @ 813E3C0
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -588766,7 +588766,7 @@ sub_813E3C0: ; 813E3C0
 	thumb_func_end sub_813E3C0
 
 	thumb_func_start evovle_mon_internal_maybe
-evovle_mon_internal_maybe: ; 813E3DC
+evovle_mon_internal_maybe: @ 813E3DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -588945,7 +588945,7 @@ _0813E546:
 	thumb_func_end evovle_mon_internal_maybe
 
 	thumb_func_start evovle_mon_maybe
-evovle_mon_maybe: ; 813E570
+evovle_mon_maybe: @ 813E570
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -590236,7 +590236,7 @@ _0813F1A4:
 	thumb_func_end evovle_mon_maybe
 
 	thumb_func_start sub_813F1B8
-sub_813F1B8: ; 813F1B8
+sub_813F1B8: @ 813F1B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -591384,12 +591384,12 @@ _0813FCC4:
 	thumb_func_end sub_813F1B8
 
 	thumb_func_start nullsub_83
-nullsub_83: ; 813FCD8
+nullsub_83: @ 813FCD8
 	bx lr
 	thumb_func_end nullsub_83
 
 	thumb_func_start sub_813FCDC
-sub_813FCDC: ; 813FCDC
+sub_813FCDC: @ 813FCDC
 	push {lr}
 	ldr r0, =0x02022e14
 	ldrh r1, [r0]
@@ -591433,7 +591433,7 @@ sub_813FCDC: ; 813FCDC
 	thumb_func_end sub_813FCDC
 
 	thumb_func_start sub_813FD64
-sub_813FD64: ; 813FD64
+sub_813FD64: @ 813FD64
 	push {lr}
 	ldr r0, =0x02022e14
 	ldrh r1, [r0]
@@ -591477,7 +591477,7 @@ sub_813FD64: ; 813FD64
 	thumb_func_end sub_813FD64
 
 	thumb_func_start sub_813FDEC
-sub_813FDEC: ; 813FDEC
+sub_813FDEC: @ 813FDEC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -591571,7 +591571,7 @@ _0813FE9A:
 	thumb_func_end sub_813FDEC
 
 	thumb_func_start sub_813FEA4
-sub_813FEA4: ; 813FEA4
+sub_813FEA4: @ 813FEA4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -591606,7 +591606,7 @@ _0813FEDE:
 	thumb_func_end sub_813FEA4
 
 	thumb_func_start sub_813FEE8
-sub_813FEE8: ; 813FEE8
+sub_813FEE8: @ 813FEE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -591700,7 +591700,7 @@ _0813FFA6:
 	thumb_func_end sub_813FEE8
 
 	thumb_func_start sub_813FFC0
-sub_813FFC0: ; 813FFC0
+sub_813FFC0: @ 813FFC0
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r1, 0
@@ -591734,7 +591734,7 @@ _0813FFD6:
 	thumb_func_end sub_813FFC0
 
 	thumb_func_start sub_8140000
-sub_8140000: ; 8140000
+sub_8140000: @ 8140000
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -591831,7 +591831,7 @@ _081400DE:
 	thumb_func_end sub_8140000
 
 	thumb_func_start sub_8140100
-sub_8140100: ; 8140100
+sub_8140100: @ 8140100
 	push {lr}
 	ldr r0, =sub_813FDEC
 	bl get_task_id_by_function
@@ -591857,7 +591857,7 @@ _0814011E:
 	thumb_func_end sub_8140100
 
 	thumb_func_start sub_8140134
-sub_8140134: ; 8140134
+sub_8140134: @ 8140134
 	push {lr}
 	ldr r0, =sub_813FDEC
 	bl get_task_id_by_function
@@ -591886,7 +591886,7 @@ _0814015A:
 	thumb_func_end sub_8140134
 
 	thumb_func_start sub_8140174
-sub_8140174: ; 8140174
+sub_8140174: @ 8140174
 	push {lr}
 	movs r0, 0x50
 	movs r1, 0
@@ -591929,7 +591929,7 @@ sub_8140174: ; 8140174
 	thumb_func_end sub_8140174
 
 	thumb_func_start sub_81401E0
-sub_81401E0: ; 81401E0
+sub_81401E0: @ 81401E0
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -591950,7 +591950,7 @@ sub_81401E0: ; 81401E0
 	thumb_func_end sub_81401E0
 
 	thumb_func_start sub_8140208
-sub_8140208: ; 8140208
+sub_8140208: @ 8140208
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -591975,7 +591975,7 @@ _08140232:
 	thumb_func_end sub_8140208
 
 	thumb_func_start sub_8140238
-sub_8140238: ; 8140238
+sub_8140238: @ 8140238
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -591996,7 +591996,7 @@ _0814025A:
 	thumb_func_end sub_8140238
 
 	thumb_func_start sub_8140264
-sub_8140264: ; 8140264
+sub_8140264: @ 8140264
 	push {r4,lr}
 	sub sp, 0x4
 	bl LoadOamFromSprites
@@ -592117,7 +592117,7 @@ _08140374:
 	thumb_func_end sub_8140264
 
 	thumb_func_start sub_8140388
-sub_8140388: ; 8140388
+sub_8140388: @ 8140388
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r5, 0
@@ -592169,7 +592169,7 @@ sub_8140388: ; 8140388
 	thumb_func_end sub_8140388
 
 	thumb_func_start sub_8140418
-sub_8140418: ; 8140418
+sub_8140418: @ 8140418
 	push {r4,r5,lr}
 	ldr r5, =0x0203ab88
 	ldr r0, [r5]
@@ -592205,7 +592205,7 @@ sub_8140418: ; 8140418
 	thumb_func_end sub_8140418
 
 	thumb_func_start sub_8140470
-sub_8140470: ; 8140470
+sub_8140470: @ 8140470
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r1, =gUnknown_085B6418
@@ -592360,7 +592360,7 @@ _081405B6:
 	thumb_func_end sub_8140470
 
 	thumb_func_start sub_81405CC
-sub_81405CC: ; 81405CC
+sub_81405CC: @ 81405CC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -592578,7 +592578,7 @@ _08140806:
 	thumb_func_end sub_81405CC
 
 	thumb_func_start sub_8140814
-sub_8140814: ; 8140814
+sub_8140814: @ 8140814
 	push {r4-r6,lr}
 	ldr r3, =0x0203ab88
 	ldr r0, [r3]
@@ -592656,7 +592656,7 @@ _0814088E:
 	thumb_func_end sub_8140814
 
 	thumb_func_start sub_81408A8
-sub_81408A8: ; 81408A8
+sub_81408A8: @ 81408A8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -592699,7 +592699,7 @@ _081408FE:
 	thumb_func_end sub_81408A8
 
 	thumb_func_start sub_8140914
-sub_8140914: ; 8140914
+sub_8140914: @ 8140914
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -592735,7 +592735,7 @@ sub_8140914: ; 8140914
 	thumb_func_end sub_8140914
 
 	thumb_func_start sub_8140968
-sub_8140968: ; 8140968
+sub_8140968: @ 8140968
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -592757,7 +592757,7 @@ sub_8140968: ; 8140968
 	thumb_func_end sub_8140968
 
 	thumb_func_start sub_8140994
-sub_8140994: ; 8140994
+sub_8140994: @ 8140994
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -592776,7 +592776,7 @@ sub_8140994: ; 8140994
 	thumb_func_end sub_8140994
 
 	thumb_func_start sub_81409B8
-sub_81409B8: ; 81409B8
+sub_81409B8: @ 81409B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -592961,7 +592961,7 @@ _08140B4E:
 	thumb_func_end sub_81409B8
 
 	thumb_func_start sub_8140B64
-sub_8140B64: ; 8140B64
+sub_8140B64: @ 8140B64
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -592981,7 +592981,7 @@ sub_8140B64: ; 8140B64
 	thumb_func_end sub_8140B64
 
 	thumb_func_start sub_8140B8C
-sub_8140B8C: ; 8140B8C
+sub_8140B8C: @ 8140B8C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -593013,7 +593013,7 @@ sub_8140B8C: ; 8140B8C
 	thumb_func_end sub_8140B8C
 
 	thumb_func_start sub_8140BD0
-sub_8140BD0: ; 8140BD0
+sub_8140BD0: @ 8140BD0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -593115,7 +593115,7 @@ _08140C6E:
 	thumb_func_end sub_8140BD0
 
 	thumb_func_start sub_8140CA8
-sub_8140CA8: ; 8140CA8
+sub_8140CA8: @ 8140CA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -593217,7 +593217,7 @@ _08140D5E:
 	thumb_func_end sub_8140CA8
 
 	thumb_func_start sub_8140D6C
-sub_8140D6C: ; 8140D6C
+sub_8140D6C: @ 8140D6C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -593458,7 +593458,7 @@ _08140F3A:
 	thumb_func_end sub_8140D6C
 
 	thumb_func_start sub_8140F6C
-sub_8140F6C: ; 8140F6C
+sub_8140F6C: @ 8140F6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -593501,7 +593501,7 @@ _08140F96:
 	thumb_func_end sub_8140F6C
 
 	thumb_func_start sub_8140FC4
-sub_8140FC4: ; 8140FC4
+sub_8140FC4: @ 8140FC4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -593560,7 +593560,7 @@ _08141024:
 	thumb_func_end sub_8140FC4
 
 	thumb_func_start sub_8141040
-sub_8141040: ; 8141040
+sub_8141040: @ 8141040
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -593653,7 +593653,7 @@ _081410F2:
 	thumb_func_end sub_8141040
 
 	thumb_func_start sub_81410FC
-sub_81410FC: ; 81410FC
+sub_81410FC: @ 81410FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -593718,7 +593718,7 @@ _08141180:
 	thumb_func_end sub_81410FC
 
 	thumb_func_start sub_814118C
-sub_814118C: ; 814118C
+sub_814118C: @ 814118C
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -593935,7 +593935,7 @@ _0814133A:
 	thumb_func_end sub_814118C
 
 	thumb_func_start sub_8141344
-sub_8141344: ; 8141344
+sub_8141344: @ 8141344
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -594164,7 +594164,7 @@ _081414F8:
 	thumb_func_end sub_8141344
 
 	thumb_func_start sub_814155C
-sub_814155C: ; 814155C
+sub_814155C: @ 814155C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -594217,7 +594217,7 @@ sub_814155C: ; 814155C
 	thumb_func_end sub_814155C
 
 	thumb_func_start sub_81415D4
-sub_81415D4: ; 81415D4
+sub_81415D4: @ 81415D4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -594341,7 +594341,7 @@ _081416C6:
 	thumb_func_end sub_81415D4
 
 	thumb_func_start sub_81416D4
-sub_81416D4: ; 81416D4
+sub_81416D4: @ 81416D4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -594417,7 +594417,7 @@ _08141768:
 	thumb_func_end sub_81416D4
 
 	thumb_func_start sub_8141778
-sub_8141778: ; 8141778
+sub_8141778: @ 8141778
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -594484,7 +594484,7 @@ _081417F4:
 	thumb_func_end sub_8141778
 
 	thumb_func_start sub_8141800
-sub_8141800: ; 8141800
+sub_8141800: @ 8141800
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -594551,7 +594551,7 @@ _08141888:
 	thumb_func_end sub_8141800
 
 	thumb_func_start sub_814189C
-sub_814189C: ; 814189C
+sub_814189C: @ 814189C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -594647,7 +594647,7 @@ _08141958:
 	thumb_func_end sub_814189C
 
 	thumb_func_start sub_8141984
-sub_8141984: ; 8141984
+sub_8141984: @ 8141984
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -594718,7 +594718,7 @@ _08141A04:
 	thumb_func_end sub_8141984
 
 	thumb_func_start sub_8141A18
-sub_8141A18: ; 8141A18
+sub_8141A18: @ 8141A18
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -594788,7 +594788,7 @@ sub_8141A18: ; 8141A18
 	thumb_func_end sub_8141A18
 
 	thumb_func_start sub_8141AC0
-sub_8141AC0: ; 8141AC0
+sub_8141AC0: @ 8141AC0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -594856,7 +594856,7 @@ sub_8141AC0: ; 8141AC0
 	thumb_func_end sub_8141AC0
 
 	thumb_func_start sub_8141B58
-sub_8141B58: ; 8141B58
+sub_8141B58: @ 8141B58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -595038,7 +595038,7 @@ _08141CF2:
 	thumb_func_end sub_8141B58
 
 	thumb_func_start dp01t_12_3_battle_menu
-dp01t_12_3_battle_menu: ; 8141D0C
+dp01t_12_3_battle_menu: @ 8141D0C
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -595128,7 +595128,7 @@ _08141DD8:
 	thumb_func_end dp01t_12_3_battle_menu
 
 	thumb_func_start sub_8141DE4
-sub_8141DE4: ; 8141DE4
+sub_8141DE4: @ 8141DE4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -595190,7 +595190,7 @@ _08141E3C:
 	thumb_func_end sub_8141DE4
 
 	thumb_func_start sub_8141E7C
-sub_8141E7C: ; 8141E7C
+sub_8141E7C: @ 8141E7C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -595235,7 +595235,7 @@ _08141EDE:
 	thumb_func_end sub_8141E7C
 
 	thumb_func_start sub_8141EF8
-sub_8141EF8: ; 8141EF8
+sub_8141EF8: @ 8141EF8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -595300,7 +595300,7 @@ _08141F64:
 	thumb_func_end sub_8141EF8
 
 	thumb_func_start sub_8141F7C
-sub_8141F7C: ; 8141F7C
+sub_8141F7C: @ 8141F7C
 	push {r4-r7,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -595361,7 +595361,7 @@ _08141FDE:
 	thumb_func_end sub_8141F7C
 
 	thumb_func_start sub_8141FF4
-sub_8141FF4: ; 8141FF4
+sub_8141FF4: @ 8141FF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -595424,7 +595424,7 @@ _08142036:
 	thumb_func_end sub_8141FF4
 
 	thumb_func_start sub_8142070
-sub_8142070: ; 8142070
+sub_8142070: @ 8142070
 	push {lr}
 	ldr r2, =0x0203ab88
 	ldr r1, [r2]
@@ -595477,7 +595477,7 @@ _081420AE:
 	thumb_func_end sub_8142070
 
 	thumb_func_start sub_81420D0
-sub_81420D0: ; 81420D0
+sub_81420D0: @ 81420D0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -595617,7 +595617,7 @@ _081421C8:
 	thumb_func_end sub_81420D0
 
 	thumb_func_start sub_81421E8
-sub_81421E8: ; 81421E8
+sub_81421E8: @ 81421E8
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -595690,7 +595690,7 @@ _0814227E:
 	thumb_func_end sub_81421E8
 
 	thumb_func_start sub_8142284
-sub_8142284: ; 8142284
+sub_8142284: @ 8142284
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -595988,7 +595988,7 @@ _081424E2:
 	thumb_func_end sub_8142284
 
 	thumb_func_start sub_81424FC
-sub_81424FC: ; 81424FC
+sub_81424FC: @ 81424FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -596274,7 +596274,7 @@ _08142738:
 	thumb_func_end sub_81424FC
 
 	thumb_func_start sub_8142758
-sub_8142758: ; 8142758
+sub_8142758: @ 8142758
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -596368,7 +596368,7 @@ _0814280A:
 	thumb_func_end sub_8142758
 
 	thumb_func_start sub_8142814
-sub_8142814: ; 8142814
+sub_8142814: @ 8142814
 	push {r4-r6,lr}
 	ldr r4, =0x0203ab88
 	ldr r0, [r4]
@@ -596444,7 +596444,7 @@ sub_8142814: ; 8142814
 	thumb_func_end sub_8142814
 
 	thumb_func_start sub_81428C4
-sub_81428C4: ; 81428C4
+sub_81428C4: @ 81428C4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -596460,7 +596460,7 @@ sub_81428C4: ; 81428C4
 	thumb_func_end sub_81428C4
 
 	thumb_func_start sub_81428E4
-sub_81428E4: ; 81428E4
+sub_81428E4: @ 81428E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -596484,7 +596484,7 @@ _08142908:
 	thumb_func_end sub_81428E4
 
 	thumb_func_start sub_8142918
-sub_8142918: ; 8142918
+sub_8142918: @ 8142918
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -596528,7 +596528,7 @@ sub_8142918: ; 8142918
 	thumb_func_end sub_8142918
 
 	thumb_func_start sub_814297C
-sub_814297C: ; 814297C
+sub_814297C: @ 814297C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -596546,7 +596546,7 @@ sub_814297C: ; 814297C
 	thumb_func_end sub_814297C
 
 	thumb_func_start sub_81429A0
-sub_81429A0: ; 81429A0
+sub_81429A0: @ 81429A0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -596582,7 +596582,7 @@ _081429DE:
 	thumb_func_end sub_81429A0
 
 	thumb_func_start sub_81429F0
-sub_81429F0: ; 81429F0
+sub_81429F0: @ 81429F0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -596643,7 +596643,7 @@ _08142A60:
 	thumb_func_end sub_81429F0
 
 	thumb_func_start sub_8142A88
-sub_8142A88: ; 8142A88
+sub_8142A88: @ 8142A88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -596774,7 +596774,7 @@ _08142BB0:
 	thumb_func_end sub_8142A88
 
 	thumb_func_start sub_8142BC8
-sub_8142BC8: ; 8142BC8
+sub_8142BC8: @ 8142BC8
 	push {r4,lr}
 	bl script_env_2_enable
 	bl GetCoins
@@ -596803,7 +596803,7 @@ sub_8142BC8: ; 8142BC8
 	thumb_func_end sub_8142BC8
 
 	thumb_func_start sub_8142C0C
-sub_8142C0C: ; 8142C0C
+sub_8142C0C: @ 8142C0C
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -596833,7 +596833,7 @@ _08142C5A:
 	thumb_func_end sub_8142C0C
 
 	thumb_func_start sub_8142C60
-sub_8142C60: ; 8142C60
+sub_8142C60: @ 8142C60
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r6, r2, 0
@@ -596888,7 +596888,7 @@ _08142CBC:
 	thumb_func_end sub_8142C60
 
 	thumb_func_start sub_8142CD0
-sub_8142CD0: ; 8142CD0
+sub_8142CD0: @ 8142CD0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -597056,7 +597056,7 @@ _08142DCC:
 	thumb_func_end sub_8142CD0
 
 	thumb_func_start sub_8142E3C
-sub_8142E3C: ; 8142E3C
+sub_8142E3C: @ 8142E3C
 	push {r4,lr}
 	movs r4, 0
 _08142E40:
@@ -597083,7 +597083,7 @@ _08142E40:
 	thumb_func_end sub_8142E3C
 
 	thumb_func_start sub_8142E70
-sub_8142E70: ; 8142E70
+sub_8142E70: @ 8142E70
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -597215,7 +597215,7 @@ _08142F66:
 	thumb_func_end sub_8142E70
 
 	thumb_func_start sub_8142F7C
-sub_8142F7C: ; 8142F7C
+sub_8142F7C: @ 8142F7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -597305,7 +597305,7 @@ _08142F8C:
 	thumb_func_end sub_8142F7C
 
 	thumb_func_start sub_8143038
-sub_8143038: ; 8143038
+sub_8143038: @ 8143038
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -597446,7 +597446,7 @@ _08143142:
 	thumb_func_end sub_8143038
 
 	thumb_func_start sub_8143150
-sub_8143150: ; 8143150
+sub_8143150: @ 8143150
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -597517,7 +597517,7 @@ _081431D0:
 	thumb_func_end sub_8143150
 
 	thumb_func_start sub_81431E4
-sub_81431E4: ; 81431E4
+sub_81431E4: @ 81431E4
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r4, =gUnknown_085B741C
@@ -597589,7 +597589,7 @@ _08143216:
 	thumb_func_end sub_81431E4
 
 	thumb_func_start sub_8143280
-sub_8143280: ; 8143280
+sub_8143280: @ 8143280
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =0x0203ab88
@@ -597661,7 +597661,7 @@ _081432EE:
 	thumb_func_end sub_8143280
 
 	thumb_func_start sub_8143314
-sub_8143314: ; 8143314
+sub_8143314: @ 8143314
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -597896,7 +597896,7 @@ _0814341C:
 	thumb_func_end sub_8143314
 
 	thumb_func_start sub_8143514
-sub_8143514: ; 8143514
+sub_8143514: @ 8143514
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -598018,7 +598018,7 @@ _081435CC:
 	thumb_func_end sub_8143514
 
 	thumb_func_start sub_8143614
-sub_8143614: ; 8143614
+sub_8143614: @ 8143614
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -598112,7 +598112,7 @@ _081436C6:
 	thumb_func_end sub_8143614
 
 	thumb_func_start sub_81436D0
-sub_81436D0: ; 81436D0
+sub_81436D0: @ 81436D0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -598154,7 +598154,7 @@ sub_81436D0: ; 81436D0
 	thumb_func_end sub_81436D0
 
 	thumb_func_start sub_814372C
-sub_814372C: ; 814372C
+sub_814372C: @ 814372C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -598380,7 +598380,7 @@ _081438F4:
 	thumb_func_end sub_814372C
 
 	thumb_func_start sub_814390C
-sub_814390C: ; 814390C
+sub_814390C: @ 814390C
 	ldr r1, =0x0203ab88
 	ldr r1, [r1]
 	ldrh r1, [r1, 0x26]
@@ -598390,7 +598390,7 @@ sub_814390C: ; 814390C
 	thumb_func_end sub_814390C
 
 	thumb_func_start sub_814391C
-sub_814391C: ; 814391C
+sub_814391C: @ 814391C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r4, =gUnknown_085B7948
@@ -598445,7 +598445,7 @@ sub_814391C: ; 814391C
 	thumb_func_end sub_814391C
 
 	thumb_func_start sub_814399C
-sub_814399C: ; 814399C
+sub_814399C: @ 814399C
 	ldrb r0, [r0, 0x3]
 	lsls r0, 26
 	lsrs r0, 27
@@ -598467,7 +598467,7 @@ sub_814399C: ; 814399C
 	thumb_func_end sub_814399C
 
 	thumb_func_start sub_81439C8
-sub_81439C8: ; 81439C8
+sub_81439C8: @ 81439C8
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r5, =0x0203ab88
@@ -598527,7 +598527,7 @@ _08143A24:
 	thumb_func_end sub_81439C8
 
 	thumb_func_start sub_8143A40
-sub_8143A40: ; 8143A40
+sub_8143A40: @ 8143A40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -598594,7 +598594,7 @@ _08143A8C:
 	thumb_func_end sub_8143A40
 
 	thumb_func_start sub_8143AC8
-sub_8143AC8: ; 8143AC8
+sub_8143AC8: @ 8143AC8
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203ab88
@@ -598633,7 +598633,7 @@ _08143B08:
 	thumb_func_end sub_8143AC8
 
 	thumb_func_start sub_8143B14
-sub_8143B14: ; 8143B14
+sub_8143B14: @ 8143B14
 	push {r4,r5,lr}
 	bl sub_8143AC8
 	ldr r5, =0x0203ab88
@@ -598656,7 +598656,7 @@ sub_8143B14: ; 8143B14
 	thumb_func_end sub_8143B14
 
 	thumb_func_start sub_8143B48
-sub_8143B48: ; 8143B48
+sub_8143B48: @ 8143B48
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8143AC8
@@ -598692,7 +598692,7 @@ _08143B7E:
 	thumb_func_end sub_8143B48
 
 	thumb_func_start sub_8143B84
-sub_8143B84: ; 8143B84
+sub_8143B84: @ 8143B84
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -598807,7 +598807,7 @@ _08143C74:
 	thumb_func_end sub_8143B84
 
 	thumb_func_start sub_8143C90
-sub_8143C90: ; 8143C90
+sub_8143C90: @ 8143C90
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203ab88
@@ -598856,7 +598856,7 @@ _08143CAE:
 	thumb_func_end sub_8143C90
 
 	thumb_func_start sub_8143CFC
-sub_8143CFC: ; 8143CFC
+sub_8143CFC: @ 8143CFC
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	bl sub_8143B84
@@ -598981,7 +598981,7 @@ _08143DF8:
 	thumb_func_end sub_8143CFC
 
 	thumb_func_start sub_8143E14
-sub_8143E14: ; 8143E14
+sub_8143E14: @ 8143E14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -599154,7 +599154,7 @@ _08143F80:
 	thumb_func_end sub_8143E14
 
 	thumb_func_start sub_8143FA4
-sub_8143FA4: ; 8143FA4
+sub_8143FA4: @ 8143FA4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x32
@@ -599231,7 +599231,7 @@ _0814403E:
 	thumb_func_end sub_8143FA4
 
 	thumb_func_start sub_8144050
-sub_8144050: ; 8144050
+sub_8144050: @ 8144050
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x32]
@@ -599338,7 +599338,7 @@ _0814411E:
 	thumb_func_end sub_8144050
 
 	thumb_func_start sub_8144128
-sub_8144128: ; 8144128
+sub_8144128: @ 8144128
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8143B84
@@ -599375,7 +599375,7 @@ _0814415C:
 	thumb_func_end sub_8144128
 
 	thumb_func_start sub_8144168
-sub_8144168: ; 8144168
+sub_8144168: @ 8144168
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8143B84
@@ -599407,7 +599407,7 @@ _0814419C:
 	thumb_func_end sub_8144168
 
 	thumb_func_start prev_quest_read_x24_hm_usage
-prev_quest_read_x24_hm_usage: ; 81441A8
+prev_quest_read_x24_hm_usage: @ 81441A8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8143B84
@@ -599493,7 +599493,7 @@ _0814425C:
 	thumb_func_end prev_quest_read_x24_hm_usage
 
 	thumb_func_start sub_8144264
-sub_8144264: ; 8144264
+sub_8144264: @ 8144264
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -599687,7 +599687,7 @@ _081443F8:
 	thumb_func_end sub_8144264
 
 	thumb_func_start sub_8144410
-sub_8144410: ; 8144410
+sub_8144410: @ 8144410
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -599792,7 +599792,7 @@ _081444FA:
 	thumb_func_end sub_8144410
 
 	thumb_func_start sub_8144514
-sub_8144514: ; 8144514
+sub_8144514: @ 8144514
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -599877,7 +599877,7 @@ _081445B8:
 	thumb_func_end sub_8144514
 
 	thumb_func_start sub_81445D8
-sub_81445D8: ; 81445D8
+sub_81445D8: @ 81445D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -599968,7 +599968,7 @@ _0814468A:
 	thumb_func_end sub_81445D8
 
 	thumb_func_start sub_81446AC
-sub_81446AC: ; 81446AC
+sub_81446AC: @ 81446AC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -599993,7 +599993,7 @@ sub_81446AC: ; 81446AC
 	thumb_func_end sub_81446AC
 
 	thumb_func_start sub_81446DC
-sub_81446DC: ; 81446DC
+sub_81446DC: @ 81446DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -600219,7 +600219,7 @@ _0814477C:
 	thumb_func_end sub_81446DC
 
 	thumb_func_start sub_81448B8
-sub_81448B8: ; 81448B8
+sub_81448B8: @ 81448B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -600390,7 +600390,7 @@ _08144992:
 	thumb_func_end sub_81448B8
 
 	thumb_func_start sub_8144A24
-sub_8144A24: ; 8144A24
+sub_8144A24: @ 8144A24
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -600680,7 +600680,7 @@ _08144C54:
 	thumb_func_end sub_8144A24
 
 	thumb_func_start sub_8144C70
-sub_8144C70: ; 8144C70
+sub_8144C70: @ 8144C70
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x30]
@@ -600729,7 +600729,7 @@ _08144CC0:
 	thumb_func_end sub_8144C70
 
 	thumb_func_start sub_8144CD0
-sub_8144CD0: ; 8144CD0
+sub_8144CD0: @ 8144CD0
 	push {r4,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -600823,7 +600823,7 @@ _08144D7E:
 	thumb_func_end sub_8144CD0
 
 	thumb_func_start sub_8144D94
-sub_8144D94: ; 8144D94
+sub_8144D94: @ 8144D94
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x30]
@@ -600913,7 +600913,7 @@ _08144E3E:
 	thumb_func_end sub_8144D94
 
 	thumb_func_start sub_8144E60
-sub_8144E60: ; 8144E60
+sub_8144E60: @ 8144E60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -601055,7 +601055,7 @@ _08144F7C:
 	thumb_func_end sub_8144E60
 
 	thumb_func_start sub_8144F94
-sub_8144F94: ; 8144F94
+sub_8144F94: @ 8144F94
 	adds r0, 0x3E
 	ldrb r3, [r0]
 	lsls r1, r3, 29
@@ -601072,7 +601072,7 @@ sub_8144F94: ; 8144F94
 	thumb_func_end sub_8144F94
 
 	thumb_func_start sub_8144FB0
-sub_8144FB0: ; 8144FB0
+sub_8144FB0: @ 8144FB0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x22]
@@ -601132,7 +601132,7 @@ _0814501C:
 	thumb_func_end sub_8144FB0
 
 	thumb_func_start sub_8145030
-sub_8145030: ; 8145030
+sub_8145030: @ 8145030
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -601218,7 +601218,7 @@ _081450C6:
 	thumb_func_end sub_8145030
 
 	thumb_func_start sub_81450D8
-sub_81450D8: ; 81450D8
+sub_81450D8: @ 81450D8
 	push {r4,r5,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -601361,7 +601361,7 @@ _08145208:
 	thumb_func_end sub_81450D8
 
 	thumb_func_start sub_8145218
-sub_8145218: ; 8145218
+sub_8145218: @ 8145218
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -601421,7 +601421,7 @@ _08145288:
 	thumb_func_end sub_8145218
 
 	thumb_func_start sub_8145294
-sub_8145294: ; 8145294
+sub_8145294: @ 8145294
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203ab88
@@ -601510,7 +601510,7 @@ _0814533E:
 	thumb_func_end sub_8145294
 
 	thumb_func_start sub_8145354
-sub_8145354: ; 8145354
+sub_8145354: @ 8145354
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -601634,7 +601634,7 @@ _0814544A:
 	thumb_func_end sub_8145354
 
 	thumb_func_start sub_814545C
-sub_814545C: ; 814545C
+sub_814545C: @ 814545C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -601738,7 +601738,7 @@ _0814552A:
 	thumb_func_end sub_814545C
 
 	thumb_func_start sub_8145534
-sub_8145534: ; 8145534
+sub_8145534: @ 8145534
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -601779,7 +601779,7 @@ _08145582:
 	thumb_func_end sub_8145534
 
 	thumb_func_start sub_8145588
-sub_8145588: ; 8145588
+sub_8145588: @ 8145588
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -601797,7 +601797,7 @@ sub_8145588: ; 8145588
 	thumb_func_end sub_8145588
 
 	thumb_func_start sub_81455A8
-sub_81455A8: ; 81455A8
+sub_81455A8: @ 81455A8
 	push {r4,lr}
 	ldr r3, =0x03002f50
 	movs r0, 0
@@ -601848,7 +601848,7 @@ _081455E2:
 	thumb_func_end sub_81455A8
 
 	thumb_func_start sub_814560C
-sub_814560C: ; 814560C
+sub_814560C: @ 814560C
 	push {r4,lr}
 	ldr r4, =0x0203ab90
 	ldr r1, [r4]
@@ -601878,7 +601878,7 @@ sub_814560C: ; 814560C
 	thumb_func_end sub_814560C
 
 	thumb_func_start sub_8145648
-sub_8145648: ; 8145648
+sub_8145648: @ 8145648
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -601926,7 +601926,7 @@ _0814567E:
 	thumb_func_end sub_8145648
 
 	thumb_func_start sub_81456A8
-sub_81456A8: ; 81456A8
+sub_81456A8: @ 81456A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -602102,7 +602102,7 @@ _08145810: .4byte 0x0203ab90
 	thumb_func_end sub_81456A8
 
 	thumb_func_start sub_8145814
-sub_8145814: ; 8145814
+sub_8145814: @ 8145814
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -602113,7 +602113,7 @@ sub_8145814: ; 8145814
 	thumb_func_end sub_8145814
 
 	thumb_func_start sub_8145824
-sub_8145824: ; 8145824
+sub_8145824: @ 8145824
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -602137,7 +602137,7 @@ _08145848:
 	thumb_func_end sub_8145824
 
 	thumb_func_start sub_8145850
-sub_8145850: ; 8145850
+sub_8145850: @ 8145850
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -602223,7 +602223,7 @@ _081458F8:
 	thumb_func_end sub_8145850
 
 	thumb_func_start sub_8145914
-sub_8145914: ; 8145914
+sub_8145914: @ 8145914
 	push {r4-r6,lr}
 	ldr r4, =0x02020630
 	ldr r6, =0x0203ab98
@@ -602261,7 +602261,7 @@ sub_8145914: ; 8145914
 	thumb_func_end sub_8145914
 
 	thumb_func_start sub_814596C
-sub_814596C: ; 814596C
+sub_814596C: @ 814596C
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r7, r0, 0
@@ -602484,7 +602484,7 @@ _08145B0A:
 	thumb_func_end sub_814596C
 
 	thumb_func_start sub_8145B24
-sub_8145B24: ; 8145B24
+sub_8145B24: @ 8145B24
 	push {lr}
 	lsls r0, 24
 	asrs r0, 24
@@ -602512,8 +602512,8 @@ _08145B40:
 	thumb_func_end sub_8145B24
 
 	thumb_func_start PrintCoinsString
-; void PrintCoinsString(s32 coinAmount)
-PrintCoinsString: ; 8145B54
+@ void PrintCoinsString(s32 coinAmount)
+PrintCoinsString: @ 8145B54
 	push {r4,lr}
 	sub sp, 0xC
 	adds r1, r0, 0
@@ -602550,8 +602550,8 @@ PrintCoinsString: ; 8145B54
 	thumb_func_end PrintCoinsString
 
 	thumb_func_start ShowCoinsWindow
-; void ShowCoinsWindow(s32 coinAmount, u8 x, u8 y)
-ShowCoinsWindow: ; 8145BAC
+@ void ShowCoinsWindow(s32 coinAmount, u8 x, u8 y)
+ShowCoinsWindow: @ 8145BAC
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r5, r0, 0
@@ -602598,8 +602598,8 @@ ShowCoinsWindow: ; 8145BAC
 	thumb_func_end ShowCoinsWindow
 
 	thumb_func_start HideCoinsWindow
-; void HideCoinsWindow()
-HideCoinsWindow: ; 8145C14
+@ void HideCoinsWindow()
+HideCoinsWindow: @ 8145C14
 	push {r4,lr}
 	ldr r4, =0x0203ab9c
 	ldrb r0, [r4]
@@ -602614,8 +602614,8 @@ HideCoinsWindow: ; 8145C14
 	thumb_func_end HideCoinsWindow
 
 	thumb_func_start GetCoins
-; u16 GetCoins()
-GetCoins: ; 8145C30
+@ u16 GetCoins()
+GetCoins: @ 8145C30
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x00000494
@@ -602633,8 +602633,8 @@ GetCoins: ; 8145C30
 	thumb_func_end GetCoins
 
 	thumb_func_start SetCoins
-; void SetCoins(u16 amount)
-SetCoins: ; 8145C58
+@ void SetCoins(u16 amount)
+SetCoins: @ 8145C58
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r1, =0x03005d8c
@@ -602652,8 +602652,8 @@ SetCoins: ; 8145C58
 	thumb_func_end SetCoins
 
 	thumb_func_start AddCoins
-; bool8 AddCoins(u16 amount)
-AddCoins: ; 8145C80
+@ bool8 AddCoins(u16 amount)
+AddCoins: @ 8145C80
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -602693,8 +602693,8 @@ _08145CC0:
 	thumb_func_end AddCoins
 
 	thumb_func_start SubtractCoins
-; bool8 SubtractCoins(u16 amount)
-SubtractCoins: ; 8145CCC
+@ bool8 SubtractCoins(u16 amount)
+SubtractCoins: @ 8145CCC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -602718,7 +602718,7 @@ _08145CEE:
 	thumb_func_end SubtractCoins
 
 	thumb_func_start sub_8145CF4
-sub_8145CF4: ; 8145CF4
+sub_8145CF4: @ 8145CF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -602768,7 +602768,7 @@ _08145D42:
 	thumb_func_end sub_8145CF4
 
 	thumb_func_start sub_8145D48
-sub_8145D48: ; 8145D48
+sub_8145D48: @ 8145D48
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -602838,7 +602838,7 @@ _08145DBA:
 	thumb_func_end sub_8145D48
 
 	thumb_func_start hm_prepare_rocksmash
-hm_prepare_rocksmash: ; 8145DC4
+hm_prepare_rocksmash: @ 8145DC4
 	push {r4,lr}
 	movs r0, 0x57
 	bl npc_before_player_of_type
@@ -602869,7 +602869,7 @@ _08145DF2:
 	thumb_func_end hm_prepare_rocksmash
 
 	thumb_func_start sub_8145E0C
-sub_8145E0C: ; 8145E0C
+sub_8145E0C: @ 8145E0C
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -602884,7 +602884,7 @@ sub_8145E0C: ; 8145E0C
 	thumb_func_end sub_8145E0C
 
 	thumb_func_start sub_8145E2C
-sub_8145E2C: ; 8145E2C
+sub_8145E2C: @ 8145E2C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -602913,7 +602913,7 @@ sub_8145E2C: ; 8145E2C
 	thumb_func_end sub_8145E2C
 
 	thumb_func_start sub_8145E74
-sub_8145E74: ; 8145E74
+sub_8145E74: @ 8145E74
 	push {lr}
 	movs r0, 0x28
 	bl FieldEffectActiveListRemove
@@ -602923,7 +602923,7 @@ sub_8145E74: ; 8145E74
 	thumb_func_end sub_8145E74
 
 	thumb_func_start sub_8145E84
-sub_8145E84: ; 8145E84
+sub_8145E84: @ 8145E84
 	push {r4,lr}
 	ldr r4, =0x0300120b
 	ldrb r0, [r4]
@@ -602963,7 +602963,7 @@ _08145EC0:
 	thumb_func_end sub_8145E84
 
 	thumb_func_start sub_8145EDC
-sub_8145EDC: ; 8145EDC
+sub_8145EDC: @ 8145EDC
 	push {lr}
 	ldr r1, =0x0300120a
 	strb r0, [r1]
@@ -602975,7 +602975,7 @@ sub_8145EDC: ; 8145EDC
 	thumb_func_end sub_8145EDC
 
 	thumb_func_start sub_8145EF4
-sub_8145EF4: ; 8145EF4
+sub_8145EF4: @ 8145EF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -602989,7 +602989,7 @@ sub_8145EF4: ; 8145EF4
 	thumb_func_end sub_8145EF4
 
 	thumb_func_start sub_8145F10
-sub_8145F10: ; 8145F10
+sub_8145F10: @ 8145F10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -602999,7 +602999,7 @@ sub_8145F10: ; 8145F10
 	thumb_func_end sub_8145F10
 
 	thumb_func_start sub_8145F20
-sub_8145F20: ; 8145F20
+sub_8145F20: @ 8145F20
 	push {r4,lr}
 	ldr r0, =sub_8145FA8
 	bl get_task_id_by_function
@@ -603034,7 +603034,7 @@ _08145F60:
 	thumb_func_end sub_8145F20
 
 	thumb_func_start sub_8145F6C
-sub_8145F6C: ; 8145F6C
+sub_8145F6C: @ 8145F6C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -603061,7 +603061,7 @@ sub_8145F6C: ; 8145F6C
 	thumb_func_end sub_8145F6C
 
 	thumb_func_start sub_8145FA8
-sub_8145FA8: ; 8145FA8
+sub_8145FA8: @ 8145FA8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603089,7 +603089,7 @@ _08145FBA:
 	thumb_func_end sub_8145FA8
 
 	thumb_func_start sub_8145FE0
-sub_8145FE0: ; 8145FE0
+sub_8145FE0: @ 8145FE0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80AC3D0
@@ -603124,7 +603124,7 @@ _0814602A:
 	thumb_func_end sub_8145FE0
 
 	thumb_func_start sub_8146030
-sub_8146030: ; 8146030
+sub_8146030: @ 8146030
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =gUnknown_085C8948
@@ -603153,7 +603153,7 @@ _0814605C:
 	thumb_func_end sub_8146030
 
 	thumb_func_start sub_8146064
-sub_8146064: ; 8146064
+sub_8146064: @ 8146064
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =gUnknown_085C89F0
@@ -603175,7 +603175,7 @@ sub_8146064: ; 8146064
 	thumb_func_end sub_8146064
 
 	thumb_func_start sub_814608C
-sub_814608C: ; 814608C
+sub_814608C: @ 814608C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -603202,7 +603202,7 @@ _081460B0:
 	thumb_func_end sub_814608C
 
 	thumb_func_start sub_81460BC
-sub_81460BC: ; 81460BC
+sub_81460BC: @ 81460BC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -603244,7 +603244,7 @@ _08146104:
 	thumb_func_end sub_81460BC
 
 	thumb_func_start sub_814610C
-sub_814610C: ; 814610C
+sub_814610C: @ 814610C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603272,7 +603272,7 @@ _0814611E:
 	thumb_func_end sub_814610C
 
 	thumb_func_start sub_8146144
-sub_8146144: ; 8146144
+sub_8146144: @ 8146144
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4C
@@ -603297,7 +603297,7 @@ sub_8146144: ; 8146144
 	thumb_func_end sub_8146144
 
 	thumb_func_start sub_8146178
-sub_8146178: ; 8146178
+sub_8146178: @ 8146178
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -603350,7 +603350,7 @@ _081461CE:
 	thumb_func_end sub_8146178
 
 	thumb_func_start sub_81461D8
-sub_81461D8: ; 81461D8
+sub_81461D8: @ 81461D8
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -603371,7 +603371,7 @@ _081461F4:
 	thumb_func_end sub_81461D8
 
 	thumb_func_start sub_8146204
-sub_8146204: ; 8146204
+sub_8146204: @ 8146204
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603399,7 +603399,7 @@ _08146216:
 	thumb_func_end sub_8146204
 
 	thumb_func_start sub_814623C
-sub_814623C: ; 814623C
+sub_814623C: @ 814623C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -603442,7 +603442,7 @@ sub_814623C: ; 814623C
 	thumb_func_end sub_814623C
 
 	thumb_func_start sub_81462A8
-sub_81462A8: ; 81462A8
+sub_81462A8: @ 81462A8
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r4, =0x0203aba0
@@ -603496,7 +603496,7 @@ _081462FA:
 	thumb_func_end sub_81462A8
 
 	thumb_func_start sub_8146320
-sub_8146320: ; 8146320
+sub_8146320: @ 8146320
 	push {lr}
 	bl sub_8149F2C
 	ldr r0, =0x0203aba0
@@ -603521,7 +603521,7 @@ _08146344:
 	thumb_func_end sub_8146320
 
 	thumb_func_start sub_8146358
-sub_8146358: ; 8146358
+sub_8146358: @ 8146358
 	ldr r1, =0x02038c28
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -603542,7 +603542,7 @@ sub_8146358: ; 8146358
 	thumb_func_end sub_8146358
 
 	thumb_func_start sub_8146384
-sub_8146384: ; 8146384
+sub_8146384: @ 8146384
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603570,7 +603570,7 @@ _08146396:
 	thumb_func_end sub_8146384
 
 	thumb_func_start sub_81463BC
-sub_81463BC: ; 81463BC
+sub_81463BC: @ 81463BC
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -603610,7 +603610,7 @@ sub_81463BC: ; 81463BC
 	thumb_func_end sub_81463BC
 
 	thumb_func_start sub_8146420
-sub_8146420: ; 8146420
+sub_8146420: @ 8146420
 	push {r4-r7,lr}
 	ldr r1, =0x0203aba0
 	ldr r2, [r1]
@@ -603678,7 +603678,7 @@ _0814648E:
 	thumb_func_end sub_8146420
 
 	thumb_func_start sub_81464B0
-sub_81464B0: ; 81464B0
+sub_81464B0: @ 81464B0
 	push {lr}
 	bl sub_8149F2C
 	ldr r0, =0x0203aba0
@@ -603703,7 +603703,7 @@ _081464D4:
 	thumb_func_end sub_81464B0
 
 	thumb_func_start sub_81464E8
-sub_81464E8: ; 81464E8
+sub_81464E8: @ 81464E8
 	ldr r1, =0x02038c28
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -603724,7 +603724,7 @@ sub_81464E8: ; 81464E8
 	thumb_func_end sub_81464E8
 
 	thumb_func_start sub_8146514
-sub_8146514: ; 8146514
+sub_8146514: @ 8146514
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603752,7 +603752,7 @@ _08146526:
 	thumb_func_end sub_8146514
 
 	thumb_func_start sub_814654C
-sub_814654C: ; 814654C
+sub_814654C: @ 814654C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603780,7 +603780,7 @@ _0814655E:
 	thumb_func_end sub_814654C
 
 	thumb_func_start sub_8146584
-sub_8146584: ; 8146584
+sub_8146584: @ 8146584
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603808,7 +603808,7 @@ _08146596:
 	thumb_func_end sub_8146584
 
 	thumb_func_start sub_81465BC
-sub_81465BC: ; 81465BC
+sub_81465BC: @ 81465BC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603836,7 +603836,7 @@ _081465CE:
 	thumb_func_end sub_81465BC
 
 	thumb_func_start sub_81465F4
-sub_81465F4: ; 81465F4
+sub_81465F4: @ 81465F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603864,7 +603864,7 @@ _08146606:
 	thumb_func_end sub_81465F4
 
 	thumb_func_start sub_814662C
-sub_814662C: ; 814662C
+sub_814662C: @ 814662C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603892,7 +603892,7 @@ _0814663E:
 	thumb_func_end sub_814662C
 
 	thumb_func_start sub_8146664
-sub_8146664: ; 8146664
+sub_8146664: @ 8146664
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -603920,7 +603920,7 @@ _08146676:
 	thumb_func_end sub_8146664
 
 	thumb_func_start sub_814669C
-sub_814669C: ; 814669C
+sub_814669C: @ 814669C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8149F08
@@ -603969,7 +603969,7 @@ _081466E2:
 	thumb_func_end sub_814669C
 
 	thumb_func_start sub_814670C
-sub_814670C: ; 814670C
+sub_814670C: @ 814670C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -604005,7 +604005,7 @@ sub_814670C: ; 814670C
 	thumb_func_end sub_814670C
 
 	thumb_func_start sub_8146760
-sub_8146760: ; 8146760
+sub_8146760: @ 8146760
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -604041,7 +604041,7 @@ sub_8146760: ; 8146760
 	thumb_func_end sub_8146760
 
 	thumb_func_start sub_81467B4
-sub_81467B4: ; 81467B4
+sub_81467B4: @ 81467B4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -604075,7 +604075,7 @@ sub_81467B4: ; 81467B4
 	thumb_func_end sub_81467B4
 
 	thumb_func_start sub_8146800
-sub_8146800: ; 8146800
+sub_8146800: @ 8146800
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -604111,7 +604111,7 @@ sub_8146800: ; 8146800
 	thumb_func_end sub_8146800
 
 	thumb_func_start sub_8146854
-sub_8146854: ; 8146854
+sub_8146854: @ 8146854
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -604184,7 +604184,7 @@ _08146880:
 	thumb_func_end sub_8146854
 
 	thumb_func_start sub_81468E4
-sub_81468E4: ; 81468E4
+sub_81468E4: @ 81468E4
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -604217,7 +604217,7 @@ sub_81468E4: ; 81468E4
 	thumb_func_end sub_81468E4
 
 	thumb_func_start sub_814692C
-sub_814692C: ; 814692C
+sub_814692C: @ 814692C
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -604250,7 +604250,7 @@ sub_814692C: ; 814692C
 	thumb_func_end sub_814692C
 
 	thumb_func_start sub_8146974
-sub_8146974: ; 8146974
+sub_8146974: @ 8146974
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -604289,7 +604289,7 @@ sub_8146974: ; 8146974
 	thumb_func_end sub_8146974
 
 	thumb_func_start sub_81469CC
-sub_81469CC: ; 81469CC
+sub_81469CC: @ 81469CC
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -604328,7 +604328,7 @@ sub_81469CC: ; 81469CC
 	thumb_func_end sub_81469CC
 
 	thumb_func_start sub_8146A24
-sub_8146A24: ; 8146A24
+sub_8146A24: @ 8146A24
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -604367,7 +604367,7 @@ sub_8146A24: ; 8146A24
 	thumb_func_end sub_8146A24
 
 	thumb_func_start sub_8146A7C
-sub_8146A7C: ; 8146A7C
+sub_8146A7C: @ 8146A7C
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -604399,7 +604399,7 @@ sub_8146A7C: ; 8146A7C
 	thumb_func_end sub_8146A7C
 
 	thumb_func_start sub_8146AC8
-sub_8146AC8: ; 8146AC8
+sub_8146AC8: @ 8146AC8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -604446,7 +604446,7 @@ _08146B18:
 	thumb_func_end sub_8146AC8
 
 	thumb_func_start sub_8146B24
-sub_8146B24: ; 8146B24
+sub_8146B24: @ 8146B24
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -604491,7 +604491,7 @@ _08146B6E:
 	thumb_func_end sub_8146B24
 
 	thumb_func_start sub_8146B7C
-sub_8146B7C: ; 8146B7C
+sub_8146B7C: @ 8146B7C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -604514,7 +604514,7 @@ sub_8146B7C: ; 8146B7C
 	thumb_func_end sub_8146B7C
 
 	thumb_func_start sub_8146BA8
-sub_8146BA8: ; 8146BA8
+sub_8146BA8: @ 8146BA8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02037fd4
@@ -604548,7 +604548,7 @@ _08146BDE:
 	thumb_func_end sub_8146BA8
 
 	thumb_func_start sub_8146BF8
-sub_8146BF8: ; 8146BF8
+sub_8146BF8: @ 8146BF8
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -604622,7 +604622,7 @@ _08146C42:
 	thumb_func_end sub_8146BF8
 
 	thumb_func_start sub_8146C8C
-sub_8146C8C: ; 8146C8C
+sub_8146C8C: @ 8146C8C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -604696,7 +604696,7 @@ _08146CD6:
 	thumb_func_end sub_8146C8C
 
 	thumb_func_start sub_8146D20
-sub_8146D20: ; 8146D20
+sub_8146D20: @ 8146D20
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -604751,7 +604751,7 @@ _08146D70:
 	thumb_func_end sub_8146D20
 
 	thumb_func_start sub_8146D90
-sub_8146D90: ; 8146D90
+sub_8146D90: @ 8146D90
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x18]
@@ -604770,7 +604770,7 @@ _08146DA6:
 	thumb_func_end sub_8146D90
 
 	thumb_func_start sub_8146DAC
-sub_8146DAC: ; 8146DAC
+sub_8146DAC: @ 8146DAC
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -604793,7 +604793,7 @@ sub_8146DAC: ; 8146DAC
 	thumb_func_end sub_8146DAC
 
 	thumb_func_start sub_8146DD8
-sub_8146DD8: ; 8146DD8
+sub_8146DD8: @ 8146DD8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -604813,7 +604813,7 @@ _08146DEE:
 	thumb_func_end sub_8146DD8
 
 	thumb_func_start sub_8146DF8
-sub_8146DF8: ; 8146DF8
+sub_8146DF8: @ 8146DF8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203aba0
@@ -604902,7 +604902,7 @@ _08146EB0:
 	thumb_func_end sub_8146DF8
 
 	thumb_func_start sub_8146EC0
-sub_8146EC0: ; 8146EC0
+sub_8146EC0: @ 8146EC0
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -604953,7 +604953,7 @@ _08146EF8:
 	thumb_func_end sub_8146EC0
 
 	thumb_func_start sub_8146F3C
-sub_8146F3C: ; 8146F3C
+sub_8146F3C: @ 8146F3C
 	push {lr}
 	bl sub_8146EC0
 	ldr r1, =0x040000b0
@@ -604970,7 +604970,7 @@ sub_8146F3C: ; 8146F3C
 	thumb_func_end sub_8146F3C
 
 	thumb_func_start sub_8146F68
-sub_8146F68: ; 8146F68
+sub_8146F68: @ 8146F68
 	push {lr}
 	bl sub_8146EC0
 	ldr r1, =0x040000b0
@@ -604987,7 +604987,7 @@ sub_8146F68: ; 8146F68
 	thumb_func_end sub_8146F68
 
 	thumb_func_start sub_8146F94
-sub_8146F94: ; 8146F94
+sub_8146F94: @ 8146F94
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -605015,7 +605015,7 @@ _08146FA6:
 	thumb_func_end sub_8146F94
 
 	thumb_func_start sub_8146FCC
-sub_8146FCC: ; 8146FCC
+sub_8146FCC: @ 8146FCC
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -605048,7 +605048,7 @@ sub_8146FCC: ; 8146FCC
 	thumb_func_end sub_8146FCC
 
 	thumb_func_start sub_8147018
-sub_8147018: ; 8147018
+sub_8147018: @ 8147018
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -605114,7 +605114,7 @@ _08147046:
 	thumb_func_end sub_8147018
 
 	thumb_func_start sub_81470A4
-sub_81470A4: ; 81470A4
+sub_81470A4: @ 81470A4
 	push {lr}
 	movs r0, 0x2D
 	bl FieldEffectActiveListContains
@@ -605135,7 +605135,7 @@ _081470C4:
 	thumb_func_end sub_81470A4
 
 	thumb_func_start sub_81470D0
-sub_81470D0: ; 81470D0
+sub_81470D0: @ 81470D0
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_085C8E68
 	ldr r5, =0x02038c08
@@ -605183,7 +605183,7 @@ sub_81470D0: ; 81470D0
 	thumb_func_end sub_81470D0
 
 	thumb_func_start sub_814713C
-sub_814713C: ; 814713C
+sub_814713C: @ 814713C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -605283,7 +605283,7 @@ _081471F2:
 	thumb_func_end sub_814713C
 
 	thumb_func_start sub_8147204
-sub_8147204: ; 8147204
+sub_8147204: @ 8147204
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -605311,7 +605311,7 @@ _08147216:
 	thumb_func_end sub_8147204
 
 	thumb_func_start sub_814723C
-sub_814723C: ; 814723C
+sub_814723C: @ 814723C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8149F08
@@ -605355,7 +605355,7 @@ _08147262:
 	thumb_func_end sub_814723C
 
 	thumb_func_start sub_81472A4
-sub_81472A4: ; 81472A4
+sub_81472A4: @ 81472A4
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -605428,7 +605428,7 @@ _08147318:
 	thumb_func_end sub_81472A4
 
 	thumb_func_start sub_8147334
-sub_8147334: ; 8147334
+sub_8147334: @ 8147334
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -605552,7 +605552,7 @@ _08147406:
 	thumb_func_end sub_8147334
 
 	thumb_func_start sub_8147428
-sub_8147428: ; 8147428
+sub_8147428: @ 8147428
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -605621,7 +605621,7 @@ _08147494:
 	thumb_func_end sub_8147428
 
 	thumb_func_start sub_81474B0
-sub_81474B0: ; 81474B0
+sub_81474B0: @ 81474B0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -605750,7 +605750,7 @@ _08147588:
 	thumb_func_end sub_81474B0
 
 	thumb_func_start sub_81475B0
-sub_81475B0: ; 81475B0
+sub_81475B0: @ 81475B0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r7, r0, 0
@@ -605827,7 +605827,7 @@ _0814762A:
 	thumb_func_end sub_81475B0
 
 	thumb_func_start sub_8147648
-sub_8147648: ; 8147648
+sub_8147648: @ 8147648
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -605852,7 +605852,7 @@ sub_8147648: ; 8147648
 	thumb_func_end sub_8147648
 
 	thumb_func_start sub_8147688
-sub_8147688: ; 8147688
+sub_8147688: @ 8147688
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -605910,7 +605910,7 @@ _081476C0:
 	thumb_func_end sub_8147688
 
 	thumb_func_start sub_8147718
-sub_8147718: ; 8147718
+sub_8147718: @ 8147718
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -605938,7 +605938,7 @@ _0814772A:
 	thumb_func_end sub_8147718
 
 	thumb_func_start sub_8147750
-sub_8147750: ; 8147750
+sub_8147750: @ 8147750
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8149F08
@@ -605974,7 +605974,7 @@ _08147762:
 	thumb_func_end sub_8147750
 
 	thumb_func_start sub_81477A8
-sub_81477A8: ; 81477A8
+sub_81477A8: @ 81477A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -606081,7 +606081,7 @@ _0814785A:
 	thumb_func_end sub_81477A8
 
 	thumb_func_start sub_8147888
-sub_8147888: ; 8147888
+sub_8147888: @ 8147888
 	push {lr}
 	bl sub_8149F2C
 	ldr r0, =0x0203aba0
@@ -606106,7 +606106,7 @@ _081478AC:
 	thumb_func_end sub_8147888
 
 	thumb_func_start sub_81478C0
-sub_81478C0: ; 81478C0
+sub_81478C0: @ 81478C0
 	ldr r1, =0x02038c28
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -606127,7 +606127,7 @@ sub_81478C0: ; 81478C0
 	thumb_func_end sub_81478C0
 
 	thumb_func_start sub_81478EC
-sub_81478EC: ; 81478EC
+sub_81478EC: @ 81478EC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606155,7 +606155,7 @@ _081478FE:
 	thumb_func_end sub_81478EC
 
 	thumb_func_start sub_8147924
-sub_8147924: ; 8147924
+sub_8147924: @ 8147924
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8149F08
@@ -606195,7 +606195,7 @@ _0814794A:
 	thumb_func_end sub_8147924
 
 	thumb_func_start sub_814797C
-sub_814797C: ; 814797C
+sub_814797C: @ 814797C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -606277,7 +606277,7 @@ _081479F6:
 	thumb_func_end sub_814797C
 
 	thumb_func_start sub_8147A18
-sub_8147A18: ; 8147A18
+sub_8147A18: @ 8147A18
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -606302,7 +606302,7 @@ sub_8147A18: ; 8147A18
 	thumb_func_end sub_8147A18
 
 	thumb_func_start sub_8147A58
-sub_8147A58: ; 8147A58
+sub_8147A58: @ 8147A58
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -606355,7 +606355,7 @@ _08147A90:
 	thumb_func_end sub_8147A58
 
 	thumb_func_start sub_8147AE4
-sub_8147AE4: ; 8147AE4
+sub_8147AE4: @ 8147AE4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606373,7 +606373,7 @@ sub_8147AE4: ; 8147AE4
 	thumb_func_end sub_8147AE4
 
 	thumb_func_start sub_8147B04
-sub_8147B04: ; 8147B04
+sub_8147B04: @ 8147B04
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606391,7 +606391,7 @@ sub_8147B04: ; 8147B04
 	thumb_func_end sub_8147B04
 
 	thumb_func_start sub_8147B24
-sub_8147B24: ; 8147B24
+sub_8147B24: @ 8147B24
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606409,7 +606409,7 @@ sub_8147B24: ; 8147B24
 	thumb_func_end sub_8147B24
 
 	thumb_func_start sub_8147B44
-sub_8147B44: ; 8147B44
+sub_8147B44: @ 8147B44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606427,7 +606427,7 @@ sub_8147B44: ; 8147B44
 	thumb_func_end sub_8147B44
 
 	thumb_func_start sub_8147B64
-sub_8147B64: ; 8147B64
+sub_8147B64: @ 8147B64
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606445,7 +606445,7 @@ sub_8147B64: ; 8147B64
 	thumb_func_end sub_8147B64
 
 	thumb_func_start sub_8147B84
-sub_8147B84: ; 8147B84
+sub_8147B84: @ 8147B84
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -606473,7 +606473,7 @@ _08147B96:
 	thumb_func_end sub_8147B84
 
 	thumb_func_start sub_8147BBC
-sub_8147BBC: ; 8147BBC
+sub_8147BBC: @ 8147BBC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_8149F08
@@ -606519,7 +606519,7 @@ _08147BF0:
 	thumb_func_end sub_8147BBC
 
 	thumb_func_start sub_8147C24
-sub_8147C24: ; 8147C24
+sub_8147C24: @ 8147C24
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -606604,7 +606604,7 @@ _08147C7E:
 	thumb_func_end sub_8147C24
 
 	thumb_func_start sub_8147CE4
-sub_8147CE4: ; 8147CE4
+sub_8147CE4: @ 8147CE4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203aba0
@@ -606730,7 +606730,7 @@ _08147DA6:
 	thumb_func_end sub_8147CE4
 
 	thumb_func_start sub_8147DD0
-sub_8147DD0: ; 8147DD0
+sub_8147DD0: @ 8147DD0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, =0x0203aba0
@@ -606789,7 +606789,7 @@ _08147DE4:
 	thumb_func_end sub_8147DD0
 
 	thumb_func_start sub_8147E4C
-sub_8147E4C: ; 8147E4C
+sub_8147E4C: @ 8147E4C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203aba0
@@ -606821,7 +606821,7 @@ _08147E7C:
 	thumb_func_end sub_8147E4C
 
 	thumb_func_start sub_8147E88
-sub_8147E88: ; 8147E88
+sub_8147E88: @ 8147E88
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -606900,7 +606900,7 @@ _08147F1C:
 	thumb_func_end sub_8147E88
 
 	thumb_func_start sub_8147F40
-sub_8147F40: ; 8147F40
+sub_8147F40: @ 8147F40
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r2, =0x0203aba0
@@ -607007,7 +607007,7 @@ _08147FEA:
 	thumb_func_end sub_8147F40
 
 	thumb_func_start sub_8148008
-sub_8148008: ; 8148008
+sub_8148008: @ 8148008
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203aba0
@@ -607035,7 +607035,7 @@ sub_8148008: ; 8148008
 	thumb_func_end sub_8148008
 
 	thumb_func_start sub_8148040
-sub_8148040: ; 8148040
+sub_8148040: @ 8148040
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x0203aba0
@@ -607073,7 +607073,7 @@ _08148070:
 	thumb_func_end sub_8148040
 
 	thumb_func_start sub_814808C
-sub_814808C: ; 814808C
+sub_814808C: @ 814808C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x040000b0
@@ -607100,7 +607100,7 @@ sub_814808C: ; 814808C
 	thumb_func_end sub_814808C
 
 	thumb_func_start sub_81480CC
-sub_81480CC: ; 81480CC
+sub_81480CC: @ 81480CC
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -607156,7 +607156,7 @@ _08148104:
 	thumb_func_end sub_81480CC
 
 	thumb_func_start sub_8148160
-sub_8148160: ; 8148160
+sub_8148160: @ 8148160
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -607203,7 +607203,7 @@ _08148198:
 	thumb_func_end sub_8148160
 
 	thumb_func_start sub_81481E0
-sub_81481E0: ; 81481E0
+sub_81481E0: @ 81481E0
 	push {lr}
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -607228,7 +607228,7 @@ _08148208:
 	thumb_func_end sub_81481E0
 
 	thumb_func_start sub_8148218
-sub_8148218: ; 8148218
+sub_8148218: @ 8148218
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -607387,7 +607387,7 @@ sub_8148218: ; 8148218
 	thumb_func_end sub_8148218
 
 	thumb_func_start sub_8148380
-sub_8148380: ; 8148380
+sub_8148380: @ 8148380
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =gUnknown_085C8C24
@@ -607409,13 +607409,13 @@ _08148386:
 	thumb_func_end sub_8148380
 
 	thumb_func_start sub_81483A8
-sub_81483A8: ; 81483A8
+sub_81483A8: @ 81483A8
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81483A8
 
 	thumb_func_start sub_81483AC
-sub_81483AC: ; 81483AC
+sub_81483AC: @ 81483AC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -607452,7 +607452,7 @@ sub_81483AC: ; 81483AC
 	thumb_func_end sub_81483AC
 
 	thumb_func_start sub_81483F8
-sub_81483F8: ; 81483F8
+sub_81483F8: @ 81483F8
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -607484,7 +607484,7 @@ _08148424:
 	thumb_func_end sub_81483F8
 
 	thumb_func_start sub_814842C
-sub_814842C: ; 814842C
+sub_814842C: @ 814842C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r3, [r2, 0x32]
@@ -607511,7 +607511,7 @@ _08148452:
 	thumb_func_end sub_814842C
 
 	thumb_func_start sub_8148458
-sub_8148458: ; 8148458
+sub_8148458: @ 8148458
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -607537,7 +607537,7 @@ _0814847C:
 	thumb_func_end sub_8148458
 
 	thumb_func_start sub_8148484
-sub_8148484: ; 8148484
+sub_8148484: @ 8148484
 	ldr r3, =0x02020630
 	lsls r0, 16
 	asrs r0, 16
@@ -607551,7 +607551,7 @@ sub_8148484: ; 8148484
 	thumb_func_end sub_8148484
 
 	thumb_func_start sub_814849C
-sub_814849C: ; 814849C
+sub_814849C: @ 814849C
 	ldr r2, =0x02020630
 	lsls r0, 16
 	asrs r0, 16
@@ -607567,7 +607567,7 @@ sub_814849C: ; 814849C
 	thumb_func_end sub_814849C
 
 	thumb_func_start sub_81484B8
-sub_81484B8: ; 81484B8
+sub_81484B8: @ 81484B8
 	ldr r2, =0x02020630
 	lsls r0, 16
 	asrs r0, 16
@@ -607582,7 +607582,7 @@ sub_81484B8: ; 81484B8
 	thumb_func_end sub_81484B8
 
 	thumb_func_start sub_81484D0
-sub_81484D0: ; 81484D0
+sub_81484D0: @ 81484D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -607610,7 +607610,7 @@ _081484E2:
 	thumb_func_end sub_81484D0
 
 	thumb_func_start sub_8148508
-sub_8148508: ; 8148508
+sub_8148508: @ 8148508
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	bl sub_8149F08
@@ -607670,7 +607670,7 @@ _0814853A:
 	thumb_func_end sub_8148508
 
 	thumb_func_start sub_8148590
-sub_8148590: ; 8148590
+sub_8148590: @ 8148590
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -607777,7 +607777,7 @@ _08148644:
 	thumb_func_end sub_8148590
 
 	thumb_func_start sub_814865C
-sub_814865C: ; 814865C
+sub_814865C: @ 814865C
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -607802,7 +607802,7 @@ sub_814865C: ; 814865C
 	thumb_func_end sub_814865C
 
 	thumb_func_start sub_814869C
-sub_814869C: ; 814869C
+sub_814869C: @ 814869C
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -607854,7 +607854,7 @@ _081486E6:
 	thumb_func_end sub_814869C
 
 	thumb_func_start sub_8148728
-sub_8148728: ; 8148728
+sub_8148728: @ 8148728
 	push {lr}
 	ldr r2, =0x04000006
 	ldrh r0, [r2]
@@ -607881,7 +607881,7 @@ _0814874E:
 	thumb_func_end sub_8148728
 
 	thumb_func_start sub_8148760
-sub_8148760: ; 8148760
+sub_8148760: @ 8148760
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -607909,7 +607909,7 @@ _08148772:
 	thumb_func_end sub_8148760
 
 	thumb_func_start sub_8148798
-sub_8148798: ; 8148798
+sub_8148798: @ 8148798
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -608004,7 +608004,7 @@ _081487CC:
 	thumb_func_end sub_8148798
 
 	thumb_func_start sub_8148864
-sub_8148864: ; 8148864
+sub_8148864: @ 8148864
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -608310,7 +608310,7 @@ _08148AA6:
 	thumb_func_end sub_8148864
 
 	thumb_func_start sub_8148AD4
-sub_8148AD4: ; 8148AD4
+sub_8148AD4: @ 8148AD4
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r2, 0x1
@@ -608346,7 +608346,7 @@ _08148B04:
 	thumb_func_end sub_8148AD4
 
 	thumb_func_start sub_8148B14
-sub_8148B14: ; 8148B14
+sub_8148B14: @ 8148B14
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -608371,7 +608371,7 @@ sub_8148B14: ; 8148B14
 	thumb_func_end sub_8148B14
 
 	thumb_func_start sub_8148B54
-sub_8148B54: ; 8148B54
+sub_8148B54: @ 8148B54
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -608399,7 +608399,7 @@ _08148B66:
 	thumb_func_end sub_8148B54
 
 	thumb_func_start sub_8148B8C
-sub_8148B8C: ; 8148B8C
+sub_8148B8C: @ 8148B8C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -608427,7 +608427,7 @@ _08148B9E:
 	thumb_func_end sub_8148B8C
 
 	thumb_func_start sub_8148BC4
-sub_8148BC4: ; 8148BC4
+sub_8148BC4: @ 8148BC4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8149F08
@@ -608472,7 +608472,7 @@ _08148BEE:
 	thumb_func_end sub_8148BC4
 
 	thumb_func_start sub_8148C28
-sub_8148C28: ; 8148C28
+sub_8148C28: @ 8148C28
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x16
@@ -608561,7 +608561,7 @@ _08148CDE:
 	thumb_func_end sub_8148C28
 
 	thumb_func_start sub_8148CE8
-sub_8148CE8: ; 8148CE8
+sub_8148CE8: @ 8148CE8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x0203aba0
@@ -608626,7 +608626,7 @@ _08148D4C:
 	thumb_func_end sub_8148CE8
 
 	thumb_func_start sub_8148D6C
-sub_8148D6C: ; 8148D6C
+sub_8148D6C: @ 8148D6C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203aba0
@@ -608737,7 +608737,7 @@ _08148E3C:
 	thumb_func_end sub_8148D6C
 
 	thumb_func_start sub_8148E54
-sub_8148E54: ; 8148E54
+sub_8148E54: @ 8148E54
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -608765,7 +608765,7 @@ _08148E66:
 	thumb_func_end sub_8148E54
 
 	thumb_func_start sub_8148E8C
-sub_8148E8C: ; 8148E8C
+sub_8148E8C: @ 8148E8C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -608847,7 +608847,7 @@ sub_8148E8C: ; 8148E8C
 	thumb_func_end sub_8148E8C
 
 	thumb_func_start sub_8148F4C
-sub_8148F4C: ; 8148F4C
+sub_8148F4C: @ 8148F4C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -608941,7 +608941,7 @@ _08148FE8:
 	thumb_func_end sub_8148F4C
 
 	thumb_func_start sub_8149008
-sub_8149008: ; 8149008
+sub_8149008: @ 8149008
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x040000b0
@@ -608968,7 +608968,7 @@ sub_8149008: ; 8149008
 	thumb_func_end sub_8149008
 
 	thumb_func_start sub_8149048
-sub_8149048: ; 8149048
+sub_8149048: @ 8149048
 	push {r4,lr}
 	adds r2, r1, 0
 	ldrb r1, [r2]
@@ -609105,7 +609105,7 @@ _08149138:
 	thumb_func_end sub_8149048
 
 	thumb_func_start sub_8149140
-sub_8149140: ; 8149140
+sub_8149140: @ 8149140
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -609133,7 +609133,7 @@ _08149152:
 	thumb_func_end sub_8149140
 
 	thumb_func_start sub_8149178
-sub_8149178: ; 8149178
+sub_8149178: @ 8149178
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -609167,7 +609167,7 @@ sub_8149178: ; 8149178
 	thumb_func_end sub_8149178
 
 	thumb_func_start sub_81491C8
-sub_81491C8: ; 81491C8
+sub_81491C8: @ 81491C8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -609214,7 +609214,7 @@ _08149218:
 	thumb_func_end sub_81491C8
 
 	thumb_func_start sub_8149224
-sub_8149224: ; 8149224
+sub_8149224: @ 8149224
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -609259,7 +609259,7 @@ _0814926E:
 	thumb_func_end sub_8149224
 
 	thumb_func_start sub_814927C
-sub_814927C: ; 814927C
+sub_814927C: @ 814927C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -609287,7 +609287,7 @@ _0814928E:
 	thumb_func_end sub_814927C
 
 	thumb_func_start sub_81492B4
-sub_81492B4: ; 81492B4
+sub_81492B4: @ 81492B4
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -609352,7 +609352,7 @@ _08149316:
 	thumb_func_end sub_81492B4
 
 	thumb_func_start sub_8149358
-sub_8149358: ; 8149358
+sub_8149358: @ 8149358
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -609376,7 +609376,7 @@ sub_8149358: ; 8149358
 	thumb_func_end sub_8149358
 
 	thumb_func_start sub_8149388
-sub_8149388: ; 8149388
+sub_8149388: @ 8149388
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0xA]
@@ -609421,7 +609421,7 @@ _081493CC:
 	thumb_func_end sub_8149388
 
 	thumb_func_start sub_81493D8
-sub_81493D8: ; 81493D8
+sub_81493D8: @ 81493D8
 	push {lr}
 	sub sp, 0x4
 	adds r1, r0, 0
@@ -609451,7 +609451,7 @@ _08149402:
 	thumb_func_end sub_81493D8
 
 	thumb_func_start sub_8149410
-sub_8149410: ; 8149410
+sub_8149410: @ 8149410
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -609475,7 +609475,7 @@ _0814942E:
 	thumb_func_end sub_8149410
 
 	thumb_func_start sub_814943C
-sub_814943C: ; 814943C
+sub_814943C: @ 814943C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x00007fff
@@ -609497,7 +609497,7 @@ sub_814943C: ; 814943C
 	thumb_func_end sub_814943C
 
 	thumb_func_start sub_814946C
-sub_814946C: ; 814946C
+sub_814946C: @ 814946C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -609570,7 +609570,7 @@ _081494F0:
 	thumb_func_end sub_814946C
 
 	thumb_func_start sub_8149508
-sub_8149508: ; 8149508
+sub_8149508: @ 8149508
 	push {lr}
 	ldr r1, =0x040000b0
 	ldrh r2, [r1, 0xA]
@@ -609613,7 +609613,7 @@ _08149554:
 	thumb_func_end sub_8149508
 
 	thumb_func_start sub_8149578
-sub_8149578: ; 8149578
+sub_8149578: @ 8149578
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -609641,7 +609641,7 @@ _0814958A:
 	thumb_func_end sub_8149578
 
 	thumb_func_start sub_81495B0
-sub_81495B0: ; 81495B0
+sub_81495B0: @ 81495B0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8149F08
@@ -609693,7 +609693,7 @@ _081495DC:
 	thumb_func_end sub_81495B0
 
 	thumb_func_start sub_8149628
-sub_8149628: ; 8149628
+sub_8149628: @ 8149628
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r6, r0, 0
@@ -609748,7 +609748,7 @@ _0814963C:
 	thumb_func_end sub_8149628
 
 	thumb_func_start sub_814969C
-sub_814969C: ; 814969C
+sub_814969C: @ 814969C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x0203aba0
@@ -609778,7 +609778,7 @@ _081496C6:
 	thumb_func_end sub_814969C
 
 	thumb_func_start sub_81496D8
-sub_81496D8: ; 81496D8
+sub_81496D8: @ 81496D8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r4, =0x0203aba0
@@ -609821,7 +609821,7 @@ sub_81496D8: ; 81496D8
 	thumb_func_end sub_81496D8
 
 	thumb_func_start sub_8149740
-sub_8149740: ; 8149740
+sub_8149740: @ 8149740
 	push {lr}
 	ldr r0, =0x0203aba0
 	ldr r1, [r0]
@@ -609846,7 +609846,7 @@ _08149766:
 	thumb_func_end sub_8149740
 
 	thumb_func_start sub_8149774
-sub_8149774: ; 8149774
+sub_8149774: @ 8149774
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -609901,7 +609901,7 @@ _081497C4:
 	thumb_func_end sub_8149774
 
 	thumb_func_start sub_8149804
-sub_8149804: ; 8149804
+sub_8149804: @ 8149804
 	push {lr}
 	bl sub_8149F2C
 	ldr r1, =0x04000054
@@ -609930,7 +609930,7 @@ sub_8149804: ; 8149804
 	thumb_func_end sub_8149804
 
 	thumb_func_start sub_8149840
-sub_8149840: ; 8149840
+sub_8149840: @ 8149840
 	ldr r2, =0x04000054
 	ldr r1, =0x02038c28
 	ldr r0, =0x04000006
@@ -609947,7 +609947,7 @@ sub_8149840: ; 8149840
 	thumb_func_end sub_8149840
 
 	thumb_func_start sub_8149864
-sub_8149864: ; 8149864
+sub_8149864: @ 8149864
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x38]
@@ -610076,7 +610076,7 @@ _0814994C:
 	thumb_func_end sub_8149864
 
 	thumb_func_start sub_814995C
-sub_814995C: ; 814995C
+sub_814995C: @ 814995C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -610104,7 +610104,7 @@ _0814996E:
 	thumb_func_end sub_814995C
 
 	thumb_func_start sub_8149994
-sub_8149994: ; 8149994
+sub_8149994: @ 8149994
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -610140,7 +610140,7 @@ sub_8149994: ; 8149994
 	thumb_func_end sub_8149994
 
 	thumb_func_start sub_81499E8
-sub_81499E8: ; 81499E8
+sub_81499E8: @ 81499E8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -610185,7 +610185,7 @@ _08149A2A:
 	thumb_func_end sub_81499E8
 
 	thumb_func_start sub_8149A40
-sub_8149A40: ; 8149A40
+sub_8149A40: @ 8149A40
 	push {lr}
 	ldrh r1, [r0, 0xA]
 	subs r1, 0x1
@@ -610207,7 +610207,7 @@ _08149A60:
 	thumb_func_end sub_8149A40
 
 	thumb_func_start sub_8149A6C
-sub_8149A6C: ; 8149A6C
+sub_8149A6C: @ 8149A6C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -610235,7 +610235,7 @@ _08149A7E:
 	thumb_func_end sub_8149A6C
 
 	thumb_func_start sub_8149AA4
-sub_8149AA4: ; 8149AA4
+sub_8149AA4: @ 8149AA4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_8149F08
@@ -610280,7 +610280,7 @@ _08149AC8:
 	thumb_func_end sub_8149AA4
 
 	thumb_func_start sub_8149B08
-sub_8149B08: ; 8149B08
+sub_8149B08: @ 8149B08
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -610341,7 +610341,7 @@ sub_8149B08: ; 8149B08
 	thumb_func_end sub_8149B08
 
 	thumb_func_start sub_8149B84
-sub_8149B84: ; 8149B84
+sub_8149B84: @ 8149B84
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -610455,7 +610455,7 @@ _08149C40:
 	thumb_func_end sub_8149B84
 
 	thumb_func_start sub_8149C60
-sub_8149C60: ; 8149C60
+sub_8149C60: @ 8149C60
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0xA]
@@ -610504,7 +610504,7 @@ _08149CC4:
 	thumb_func_end sub_8149C60
 
 	thumb_func_start sub_8149CCC
-sub_8149CCC: ; 8149CCC
+sub_8149CCC: @ 8149CCC
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0xE]
@@ -610524,7 +610524,7 @@ _08149CE4:
 	thumb_func_end sub_8149CCC
 
 	thumb_func_start sub_8149CE8
-sub_8149CE8: ; 8149CE8
+sub_8149CE8: @ 8149CE8
 	push {r4,lr}
 	ldr r4, =0x040000b0
 	ldrh r1, [r4, 0xA]
@@ -610582,7 +610582,7 @@ _08149D20:
 	thumb_func_end sub_8149CE8
 
 	thumb_func_start sub_8149D78
-sub_8149D78: ; 8149D78
+sub_8149D78: @ 8149D78
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -610632,7 +610632,7 @@ sub_8149D78: ; 8149D78
 	thumb_func_end sub_8149D78
 
 	thumb_func_start sub_8149DDC
-sub_8149DDC: ; 8149DDC
+sub_8149DDC: @ 8149DDC
 	push {lr}
 	ldr r0, =sub_8149DFC
 	bl get_task_id_by_function
@@ -610651,7 +610651,7 @@ _08149DF6:
 	thumb_func_end sub_8149DDC
 
 	thumb_func_start sub_8149DFC
-sub_8149DFC: ; 8149DFC
+sub_8149DFC: @ 8149DFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -610679,7 +610679,7 @@ _08149E0E:
 	thumb_func_end sub_8149DFC
 
 	thumb_func_start sub_8149E34
-sub_8149E34: ; 8149E34
+sub_8149E34: @ 8149E34
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x14]
@@ -610730,7 +610730,7 @@ _08149E82:
 	thumb_func_end sub_8149E34
 
 	thumb_func_start sub_8149E90
-sub_8149E90: ; 8149E90
+sub_8149E90: @ 8149E90
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x14]
@@ -610791,7 +610791,7 @@ _08149EFE:
 	thumb_func_end sub_8149E90
 
 	thumb_func_start sub_8149F08
-sub_8149F08: ; 8149F08
+sub_8149F08: @ 8149F08
 	push {r4,lr}
 	ldr r4, =0x0203aba0
 	ldr r0, [r4]
@@ -610810,7 +610810,7 @@ sub_8149F08: ; 8149F08
 	thumb_func_end sub_8149F08
 
 	thumb_func_start sub_8149F2C
-sub_8149F2C: ; 8149F2C
+sub_8149F2C: @ 8149F2C
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -610820,7 +610820,7 @@ sub_8149F2C: ; 8149F2C
 	thumb_func_end sub_8149F2C
 
 	thumb_func_start sub_8149F40
-sub_8149F40: ; 8149F40
+sub_8149F40: @ 8149F40
 	ldr r1, =0x04000008
 	ldrh r1, [r1]
 	lsrs r1, 2
@@ -610835,7 +610835,7 @@ sub_8149F40: ; 8149F40
 	thumb_func_end sub_8149F40
 
 	thumb_func_start sub_8149F58
-sub_8149F58: ; 8149F58
+sub_8149F58: @ 8149F58
 	push {r4,lr}
 	ldr r3, =0x04000008
 	ldrh r2, [r3]
@@ -610859,7 +610859,7 @@ sub_8149F58: ; 8149F58
 	thumb_func_end sub_8149F58
 
 	thumb_func_start sub_8149F84
-sub_8149F84: ; 8149F84
+sub_8149F84: @ 8149F84
 	push {lr}
 	movs r0, 0x1
 	negs r0, r0
@@ -610871,7 +610871,7 @@ sub_8149F84: ; 8149F84
 	thumb_func_end sub_8149F84
 
 	thumb_func_start sub_8149F98
-sub_8149F98: ; 8149F98
+sub_8149F98: @ 8149F98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -610936,7 +610936,7 @@ _0814A000:
 	thumb_func_end sub_8149F98
 
 	thumb_func_start sub_814A014
-sub_814A014: ; 814A014
+sub_814A014: @ 814A014
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -611154,7 +611154,7 @@ _0814A196:
 	thumb_func_end sub_814A014
 
 	thumb_func_start sub_814A1AC
-sub_814A1AC: ; 814A1AC
+sub_814A1AC: @ 814A1AC
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r0, [sp, 0x14]
@@ -611221,7 +611221,7 @@ _0814A21C:
 	thumb_func_end sub_814A1AC
 
 	thumb_func_start sub_814A228
-sub_814A228: ; 814A228
+sub_814A228: @ 814A228
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -611362,7 +611362,7 @@ _0814A316:
 	thumb_func_end sub_814A228
 
 	thumb_func_start sub_814A324
-sub_814A324: ; 814A324
+sub_814A324: @ 814A324
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -611396,7 +611396,7 @@ sub_814A324: ; 814A324
 	thumb_func_end sub_814A324
 
 	thumb_func_start sub_814A374
-sub_814A374: ; 814A374
+sub_814A374: @ 814A374
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -611429,7 +611429,7 @@ sub_814A374: ; 814A374
 	thumb_func_end sub_814A374
 
 	thumb_func_start sub_814A3BC
-sub_814A3BC: ; 814A3BC
+sub_814A3BC: @ 814A3BC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -611457,7 +611457,7 @@ _0814A3CE:
 	thumb_func_end sub_814A3BC
 
 	thumb_func_start sub_814A3F4
-sub_814A3F4: ; 814A3F4
+sub_814A3F4: @ 814A3F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -611485,7 +611485,7 @@ _0814A406:
 	thumb_func_end sub_814A3F4
 
 	thumb_func_start sub_814A42C
-sub_814A42C: ; 814A42C
+sub_814A42C: @ 814A42C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -611550,7 +611550,7 @@ sub_814A42C: ; 814A42C
 	thumb_func_end sub_814A42C
 
 	thumb_func_start sub_814A4D4
-sub_814A4D4: ; 814A4D4
+sub_814A4D4: @ 814A4D4
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -611572,7 +611572,7 @@ sub_814A4D4: ; 814A4D4
 	thumb_func_end sub_814A4D4
 
 	thumb_func_start sub_814A500
-sub_814A500: ; 814A500
+sub_814A500: @ 814A500
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r2, 0
@@ -611607,7 +611607,7 @@ _0814A50C:
 	thumb_func_end sub_814A500
 
 	thumb_func_start sub_814A550
-sub_814A550: ; 814A550
+sub_814A550: @ 814A550
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -611758,7 +611758,7 @@ _0814A654:
 	thumb_func_end sub_814A550
 
 	thumb_func_start sub_814A684
-sub_814A684: ; 814A684
+sub_814A684: @ 814A684
 	push {lr}
 	bl sub_8149F2C
 	ldr r2, =0x04000050
@@ -611789,7 +611789,7 @@ _0814A6B4:
 	thumb_func_end sub_814A684
 
 	thumb_func_start sub_814A6CC
-sub_814A6CC: ; 814A6CC
+sub_814A6CC: @ 814A6CC
 	ldr r1, =0x02038c28
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -611806,7 +611806,7 @@ sub_814A6CC: ; 814A6CC
 	thumb_func_end sub_814A6CC
 
 	thumb_func_start sub_814A6F0
-sub_814A6F0: ; 814A6F0
+sub_814A6F0: @ 814A6F0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -611834,7 +611834,7 @@ _0814A702:
 	thumb_func_end sub_814A6F0
 
 	thumb_func_start sub_814A728
-sub_814A728: ; 814A728
+sub_814A728: @ 814A728
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -611862,7 +611862,7 @@ _0814A73A:
 	thumb_func_end sub_814A728
 
 	thumb_func_start sub_814A760
-sub_814A760: ; 814A760
+sub_814A760: @ 814A760
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -611890,7 +611890,7 @@ _0814A772:
 	thumb_func_end sub_814A760
 
 	thumb_func_start sub_814A798
-sub_814A798: ; 814A798
+sub_814A798: @ 814A798
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -611955,7 +611955,7 @@ sub_814A798: ; 814A798
 	thumb_func_end sub_814A798
 
 	thumb_func_start sub_814A828
-sub_814A828: ; 814A828
+sub_814A828: @ 814A828
 	push {r4,r5,lr}
 	sub sp, 0x24
 	adds r4, r0, 0
@@ -612013,7 +612013,7 @@ _0814A88A:
 	thumb_func_end sub_814A828
 
 	thumb_func_start sub_814A898
-sub_814A898: ; 814A898
+sub_814A898: @ 814A898
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -612111,7 +612111,7 @@ _0814A956:
 	thumb_func_end sub_814A898
 
 	thumb_func_start sub_814A960
-sub_814A960: ; 814A960
+sub_814A960: @ 814A960
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -612184,7 +612184,7 @@ sub_814A960: ; 814A960
 	thumb_func_end sub_814A960
 
 	thumb_func_start sub_814AA04
-sub_814AA04: ; 814AA04
+sub_814AA04: @ 814AA04
 	push {r4-r6,lr}
 	sub sp, 0x24
 	adds r6, r0, 0
@@ -612245,7 +612245,7 @@ _0814AA70:
 	thumb_func_end sub_814AA04
 
 	thumb_func_start sub_814AA84
-sub_814AA84: ; 814AA84
+sub_814AA84: @ 814AA84
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xE0
@@ -612271,7 +612271,7 @@ sub_814AA84: ; 814AA84
 	thumb_func_end sub_814AA84
 
 	thumb_func_start sub_814AAB8
-sub_814AAB8: ; 814AAB8
+sub_814AAB8: @ 814AAB8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -612383,7 +612383,7 @@ _0814AB86:
 	thumb_func_end sub_814AAB8
 
 	thumb_func_start sub_814ABA0
-sub_814ABA0: ; 814ABA0
+sub_814ABA0: @ 814ABA0
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -612415,7 +612415,7 @@ sub_814ABA0: ; 814ABA0
 	thumb_func_end sub_814ABA0
 
 	thumb_func_start sub_814ABE4
-sub_814ABE4: ; 814ABE4
+sub_814ABE4: @ 814ABE4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -612454,7 +612454,7 @@ _0814AC24:
 	thumb_func_end sub_814ABE4
 
 	thumb_func_start sub_814AC38
-sub_814AC38: ; 814AC38
+sub_814AC38: @ 814AC38
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r6, r0, 0
@@ -612571,7 +612571,7 @@ _0814AD2E:
 	thumb_func_end sub_814AC38
 
 	thumb_func_start sub_814AD48
-sub_814AD48: ; 814AD48
+sub_814AD48: @ 814AD48
 	push {r4,lr}
 	sub sp, 0x24
 	adds r4, r0, 0
@@ -612624,7 +612624,7 @@ _0814ADA0:
 	thumb_func_end sub_814AD48
 
 	thumb_func_start sub_814ADB4
-sub_814ADB4: ; 814ADB4
+sub_814ADB4: @ 814ADB4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0xffff7fff
@@ -612644,7 +612644,7 @@ sub_814ADB4: ; 814ADB4
 	thumb_func_end sub_814ADB4
 
 	thumb_func_start sub_814ADD8
-sub_814ADD8: ; 814ADD8
+sub_814ADD8: @ 814ADD8
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -612694,7 +612694,7 @@ _0814AE2E:
 	thumb_func_end sub_814ADD8
 
 	thumb_func_start sub_814AE40
-sub_814AE40: ; 814AE40
+sub_814AE40: @ 814AE40
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -612741,12 +612741,12 @@ sub_814AE40: ; 814AE40
 	thumb_func_end sub_814AE40
 
 	thumb_func_start nullsub_112
-nullsub_112: ; 814AEAC
+nullsub_112: @ 814AEAC
 	bx lr
 	thumb_func_end nullsub_112
 
 	thumb_func_start sub_814AEB0
-sub_814AEB0: ; 814AEB0
+sub_814AEB0: @ 814AEB0
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -612759,7 +612759,7 @@ sub_814AEB0: ; 814AEB0
 	thumb_func_end sub_814AEB0
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl4
-bx_exec_buffer_A_ch0_tbl4: ; 814AECC
+bx_exec_buffer_A_ch0_tbl4: @ 814AECC
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -612794,7 +612794,7 @@ _0814AF18:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl4
 
 	thumb_func_start sub_814AF1C
-sub_814AF1C: ; 814AF1C
+sub_814AF1C: @ 814AF1C
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -612819,7 +612819,7 @@ _0814AF40:
 	thumb_func_end sub_814AF1C
 
 	thumb_func_start sub_814AF54
-sub_814AF54: ; 814AF54
+sub_814AF54: @ 814AF54
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -612864,7 +612864,7 @@ _0814AFA4:
 	thumb_func_end sub_814AF54
 
 	thumb_func_start sub_814AFBC
-sub_814AFBC: ; 814AFBC
+sub_814AFBC: @ 814AFBC
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -612900,7 +612900,7 @@ _0814AFF4:
 	thumb_func_end sub_814AFBC
 
 	thumb_func_start sub_814B004
-sub_814B004: ; 814B004
+sub_814B004: @ 814B004
 	push {r4-r6,lr}
 	movs r6, 0
 	bl battle_type_is_double
@@ -612999,7 +612999,7 @@ _0814B0C6:
 	thumb_func_end sub_814B004
 
 	thumb_func_start sub_814B0E8
-sub_814B0E8: ; 814B0E8
+sub_814B0E8: @ 814B0E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -613187,7 +613187,7 @@ _0814B252:
 	thumb_func_end sub_814B0E8
 
 	thumb_func_start sub_814B290
-sub_814B290: ; 814B290
+sub_814B290: @ 814B290
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -613217,7 +613217,7 @@ _0814B2BE:
 	thumb_func_end sub_814B290
 
 	thumb_func_start bx_t4_healthbar_update
-bx_t4_healthbar_update: ; 814B2D0
+bx_t4_healthbar_update: @ 814B2D0
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -613267,7 +613267,7 @@ _0814B332:
 	thumb_func_end bx_t4_healthbar_update
 
 	thumb_func_start sub_814B340
-sub_814B340: ; 814B340
+sub_814B340: @ 814B340
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -613332,7 +613332,7 @@ _0814B3BC:
 	thumb_func_end sub_814B340
 
 	thumb_func_start sub_814B3DC
-sub_814B3DC: ; 814B3DC
+sub_814B3DC: @ 814B3DC
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -613379,7 +613379,7 @@ _0814B430:
 	thumb_func_end sub_814B3DC
 
 	thumb_func_start bx_t4_button_a
-bx_t4_button_a: ; 814B44C
+bx_t4_button_a: @ 814B44C
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -613393,7 +613393,7 @@ _0814B45E:
 	thumb_func_end bx_t4_button_a
 
 	thumb_func_start dp01t_0F_4_move_anim
-dp01t_0F_4_move_anim: ; 814B464
+dp01t_0F_4_move_anim: @ 814B464
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -613453,7 +613453,7 @@ _0814B4DA:
 	thumb_func_end dp01t_0F_4_move_anim
 
 	thumb_func_start sub_814B4E0
-sub_814B4E0: ; 814B4E0
+sub_814B4E0: @ 814B4E0
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -613502,7 +613502,7 @@ _0814B532:
 	thumb_func_end sub_814B4E0
 
 	thumb_func_start sub_814B554
-sub_814B554: ; 814B554
+sub_814B554: @ 814B554
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -613539,7 +613539,7 @@ _0814B590:
 	thumb_func_end sub_814B554
 
 	thumb_func_start sub_814B5A8
-sub_814B5A8: ; 814B5A8
+sub_814B5A8: @ 814B5A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -613636,7 +613636,7 @@ _0814B664:
 	thumb_func_end sub_814B5A8
 
 	thumb_func_start sub_814B69C
-sub_814B69C: ; 814B69C
+sub_814B69C: @ 814B69C
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -613704,7 +613704,7 @@ _0814B714:
 	thumb_func_end sub_814B69C
 
 	thumb_func_start dp01_tbl4_exec_completed
-dp01_tbl4_exec_completed: ; 814B740
+dp01_tbl4_exec_completed: @ 814B740
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -613754,7 +613754,7 @@ _0814B7A6:
 	thumb_func_end dp01_tbl4_exec_completed
 
 	thumb_func_start sub_814B7B8
-sub_814B7B8: ; 814B7B8
+sub_814B7B8: @ 814B7B8
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -613778,7 +613778,7 @@ _0814B7DA:
 	thumb_func_end sub_814B7B8
 
 	thumb_func_start sub_814B7E8
-sub_814B7E8: ; 814B7E8
+sub_814B7E8: @ 814B7E8
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -613802,7 +613802,7 @@ _0814B80A:
 	thumb_func_end sub_814B7E8
 
 	thumb_func_start dp01t_00_4_getattr
-dp01t_00_4_getattr: ; 814B818
+dp01t_00_4_getattr: @ 814B818
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -613857,7 +613857,7 @@ _0814B872:
 	thumb_func_end dp01t_00_4_getattr
 
 	thumb_func_start dp01_getattr_by_ch1_for_player_pokemon__
-dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C
+dp01_getattr_by_ch1_for_player_pokemon__: @ 814B88C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -614735,7 +614735,7 @@ _0814C022:
 	thumb_func_end dp01_getattr_by_ch1_for_player_pokemon__
 
 	thumb_func_start sub_814C038
-sub_814C038: ; 814C038
+sub_814C038: @ 814C038
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -614743,7 +614743,7 @@ sub_814C038: ; 814C038
 	thumb_func_end sub_814C038
 
 	thumb_func_start sub_814C044
-sub_814C044: ; 814C044
+sub_814C044: @ 814C044
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -614786,7 +614786,7 @@ _0814C092:
 	thumb_func_end sub_814C044
 
 	thumb_func_start sub_814C09C
-sub_814C09C: ; 814C09C
+sub_814C09C: @ 814C09C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -615819,7 +615819,7 @@ _0814CA62:
 	thumb_func_end sub_814C09C
 
 	thumb_func_start sub_814CA98
-sub_814CA98: ; 814CA98
+sub_814CA98: @ 814CA98
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -615874,7 +615874,7 @@ _0814CAF0:
 	thumb_func_end sub_814CA98
 
 	thumb_func_start sub_814CB0C
-sub_814CB0C: ; 814CB0C
+sub_814CB0C: @ 814CB0C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -615991,7 +615991,7 @@ sub_814CB0C: ; 814CB0C
 	thumb_func_end sub_814CB0C
 
 	thumb_func_start sub_814CC28
-sub_814CC28: ; 814CC28
+sub_814CC28: @ 814CC28
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -616037,7 +616037,7 @@ sub_814CC28: ; 814CC28
 	thumb_func_end sub_814CC28
 
 	thumb_func_start sub_814CC98
-sub_814CC98: ; 814CC98
+sub_814CC98: @ 814CC98
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -616200,7 +616200,7 @@ sub_814CC98: ; 814CC98
 	thumb_func_end sub_814CC98
 
 	thumb_func_start sub_814CE14
-sub_814CE14: ; 814CE14
+sub_814CE14: @ 814CE14
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -616259,7 +616259,7 @@ _0814CE92:
 	thumb_func_end sub_814CE14
 
 	thumb_func_start sub_814CEA4
-sub_814CEA4: ; 814CEA4
+sub_814CEA4: @ 814CEA4
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -616329,7 +616329,7 @@ _0814CF22:
 	thumb_func_end sub_814CEA4
 
 	thumb_func_start sub_814CF30
-sub_814CF30: ; 814CF30
+sub_814CF30: @ 814CF30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -616522,7 +616522,7 @@ _0814D002:
 	thumb_func_end sub_814CF30
 
 	thumb_func_start sub_814D0E4
-sub_814D0E4: ; 814D0E4
+sub_814D0E4: @ 814D0E4
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -616530,7 +616530,7 @@ sub_814D0E4: ; 814D0E4
 	thumb_func_end sub_814D0E4
 
 	thumb_func_start sub_814D0F0
-sub_814D0F0: ; 814D0F0
+sub_814D0F0: @ 814D0F0
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -616603,7 +616603,7 @@ sub_814D0F0: ; 814D0F0
 	thumb_func_end sub_814D0F0
 
 	thumb_func_start sub_814D19C
-sub_814D19C: ; 814D19C
+sub_814D19C: @ 814D19C
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -616708,7 +616708,7 @@ _0814D266:
 	thumb_func_end sub_814D19C
 
 	thumb_func_start sub_814D288
-sub_814D288: ; 814D288
+sub_814D288: @ 814D288
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -616716,7 +616716,7 @@ sub_814D288: ; 814D288
 	thumb_func_end sub_814D288
 
 	thumb_func_start sub_814D294
-sub_814D294: ; 814D294
+sub_814D294: @ 814D294
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -616724,7 +616724,7 @@ sub_814D294: ; 814D294
 	thumb_func_end sub_814D294
 
 	thumb_func_start sub_814D2A0
-sub_814D2A0: ; 814D2A0
+sub_814D2A0: @ 814D2A0
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -616732,7 +616732,7 @@ sub_814D2A0: ; 814D2A0
 	thumb_func_end sub_814D2A0
 
 	thumb_func_start sub_814D2AC
-sub_814D2AC: ; 814D2AC
+sub_814D2AC: @ 814D2AC
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -616740,7 +616740,7 @@ sub_814D2AC: ; 814D2AC
 	thumb_func_end sub_814D2AC
 
 	thumb_func_start sub_814D2B8
-sub_814D2B8: ; 814D2B8
+sub_814D2B8: @ 814D2B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -616889,7 +616889,7 @@ _0814D3F4:
 	thumb_func_end sub_814D2B8
 
 	thumb_func_start bx_move_anim_4
-bx_move_anim_4: ; 814D40C
+bx_move_anim_4: @ 814D40C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -617073,7 +617073,7 @@ _0814D580:
 	thumb_func_end bx_move_anim_4
 
 	thumb_func_start sub_814D590
-sub_814D590: ; 814D590
+sub_814D590: @ 814D590
 	push {r4,r5,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -617105,7 +617105,7 @@ sub_814D590: ; 814D590
 	thumb_func_end sub_814D590
 
 	thumb_func_start sub_814D5E8
-sub_814D5E8: ; 814D5E8
+sub_814D5E8: @ 814D5E8
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617113,7 +617113,7 @@ sub_814D5E8: ; 814D5E8
 	thumb_func_end sub_814D5E8
 
 	thumb_func_start sub_814D5F4
-sub_814D5F4: ; 814D5F4
+sub_814D5F4: @ 814D5F4
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617121,7 +617121,7 @@ sub_814D5F4: ; 814D5F4
 	thumb_func_end sub_814D5F4
 
 	thumb_func_start sub_814D600
-sub_814D600: ; 814D600
+sub_814D600: @ 814D600
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617129,7 +617129,7 @@ sub_814D600: ; 814D600
 	thumb_func_end sub_814D600
 
 	thumb_func_start sub_814D60C
-sub_814D60C: ; 814D60C
+sub_814D60C: @ 814D60C
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617137,7 +617137,7 @@ sub_814D60C: ; 814D60C
 	thumb_func_end sub_814D60C
 
 	thumb_func_start sub_814D618
-sub_814D618: ; 814D618
+sub_814D618: @ 814D618
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617145,7 +617145,7 @@ sub_814D618: ; 814D618
 	thumb_func_end sub_814D618
 
 	thumb_func_start sub_814D624
-sub_814D624: ; 814D624
+sub_814D624: @ 814D624
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617153,7 +617153,7 @@ sub_814D624: ; 814D624
 	thumb_func_end sub_814D624
 
 	thumb_func_start sub_814D630
-sub_814D630: ; 814D630
+sub_814D630: @ 814D630
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617161,7 +617161,7 @@ sub_814D630: ; 814D630
 	thumb_func_end sub_814D630
 
 	thumb_func_start sub_814D63C
-sub_814D63C: ; 814D63C
+sub_814D63C: @ 814D63C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -617257,7 +617257,7 @@ _0814D6F6:
 	thumb_func_end sub_814D63C
 
 	thumb_func_start sub_814D72C
-sub_814D72C: ; 814D72C
+sub_814D72C: @ 814D72C
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617265,7 +617265,7 @@ sub_814D72C: ; 814D72C
 	thumb_func_end sub_814D72C
 
 	thumb_func_start sub_814D738
-sub_814D738: ; 814D738
+sub_814D738: @ 814D738
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -617314,7 +617314,7 @@ _0814D78C:
 	thumb_func_end sub_814D738
 
 	thumb_func_start sub_814D7B0
-sub_814D7B0: ; 814D7B0
+sub_814D7B0: @ 814D7B0
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -617361,7 +617361,7 @@ _0814D800:
 	thumb_func_end sub_814D7B0
 
 	thumb_func_start sub_814D818
-sub_814D818: ; 814D818
+sub_814D818: @ 814D818
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617369,7 +617369,7 @@ sub_814D818: ; 814D818
 	thumb_func_end sub_814D818
 
 	thumb_func_start sub_814D824
-sub_814D824: ; 814D824
+sub_814D824: @ 814D824
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617377,7 +617377,7 @@ sub_814D824: ; 814D824
 	thumb_func_end sub_814D824
 
 	thumb_func_start sub_814D830
-sub_814D830: ; 814D830
+sub_814D830: @ 814D830
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617385,7 +617385,7 @@ sub_814D830: ; 814D830
 	thumb_func_end sub_814D830
 
 	thumb_func_start sub_814D83C
-sub_814D83C: ; 814D83C
+sub_814D83C: @ 814D83C
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617393,7 +617393,7 @@ sub_814D83C: ; 814D83C
 	thumb_func_end sub_814D83C
 
 	thumb_func_start sub_814D848
-sub_814D848: ; 814D848
+sub_814D848: @ 814D848
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617401,7 +617401,7 @@ sub_814D848: ; 814D848
 	thumb_func_end sub_814D848
 
 	thumb_func_start sub_814D854
-sub_814D854: ; 814D854
+sub_814D854: @ 814D854
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617409,7 +617409,7 @@ sub_814D854: ; 814D854
 	thumb_func_end sub_814D854
 
 	thumb_func_start sub_814D860
-sub_814D860: ; 814D860
+sub_814D860: @ 814D860
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617417,7 +617417,7 @@ sub_814D860: ; 814D860
 	thumb_func_end sub_814D860
 
 	thumb_func_start sub_814D86C
-sub_814D86C: ; 814D86C
+sub_814D86C: @ 814D86C
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617425,7 +617425,7 @@ sub_814D86C: ; 814D86C
 	thumb_func_end sub_814D86C
 
 	thumb_func_start sub_814D878
-sub_814D878: ; 814D878
+sub_814D878: @ 814D878
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617433,7 +617433,7 @@ sub_814D878: ; 814D878
 	thumb_func_end sub_814D878
 
 	thumb_func_start sub_814D884
-sub_814D884: ; 814D884
+sub_814D884: @ 814D884
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -617448,7 +617448,7 @@ sub_814D884: ; 814D884
 	thumb_func_end sub_814D884
 
 	thumb_func_start sub_814D8A0
-sub_814D8A0: ; 814D8A0
+sub_814D8A0: @ 814D8A0
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -617473,7 +617473,7 @@ sub_814D8A0: ; 814D8A0
 	thumb_func_end sub_814D8A0
 
 	thumb_func_start sub_814D8D8
-sub_814D8D8: ; 814D8D8
+sub_814D8D8: @ 814D8D8
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -617487,7 +617487,7 @@ sub_814D8D8: ; 814D8D8
 	thumb_func_end sub_814D8D8
 
 	thumb_func_start sub_814D8F0
-sub_814D8F0: ; 814D8F0
+sub_814D8F0: @ 814D8F0
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -617508,7 +617508,7 @@ sub_814D8F0: ; 814D8F0
 	thumb_func_end sub_814D8F0
 
 	thumb_func_start dp01t_29_4_blink
-dp01t_29_4_blink: ; 814D918
+dp01t_29_4_blink: @ 814D918
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -617557,7 +617557,7 @@ _0814D976:
 	thumb_func_end dp01t_29_4_blink
 
 	thumb_func_start sub_814D988
-sub_814D988: ; 814D988
+sub_814D988: @ 814D988
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -617565,7 +617565,7 @@ sub_814D988: ; 814D988
 	thumb_func_end sub_814D988
 
 	thumb_func_start sub_814D994
-sub_814D994: ; 814D994
+sub_814D994: @ 814D994
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -617598,7 +617598,7 @@ _0814D9A8:
 	thumb_func_end sub_814D994
 
 	thumb_func_start sub_814D9D8
-sub_814D9D8: ; 814D9D8
+sub_814D9D8: @ 814D9D8
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -617641,7 +617641,7 @@ _0814DA28:
 	thumb_func_end sub_814D9D8
 
 	thumb_func_start sub_814DA34
-sub_814DA34: ; 814DA34
+sub_814DA34: @ 814DA34
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -617668,7 +617668,7 @@ sub_814DA34: ; 814DA34
 	thumb_func_end sub_814DA34
 
 	thumb_func_start dp01t_2E_4_battle_intro
-dp01t_2E_4_battle_intro: ; 814DA74
+dp01t_2E_4_battle_intro: @ 814DA74
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -617690,7 +617690,7 @@ dp01t_2E_4_battle_intro: ; 814DA74
 	thumb_func_end dp01t_2E_4_battle_intro
 
 	thumb_func_start sub_814DAA8
-sub_814DAA8: ; 814DAA8
+sub_814DAA8: @ 814DAA8
 	push {r4-r7,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -617924,7 +617924,7 @@ _0814DC80:
 	thumb_func_end sub_814DAA8
 
 	thumb_func_start sub_814DCCC
-sub_814DCCC: ; 814DCCC
+sub_814DCCC: @ 814DCCC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -618041,7 +618041,7 @@ _0814DDB4:
 	thumb_func_end sub_814DCCC
 
 	thumb_func_start sub_814DDD8
-sub_814DDD8: ; 814DDD8
+sub_814DDD8: @ 814DDD8
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -618127,7 +618127,7 @@ _0814DE7C:
 	thumb_func_end sub_814DDD8
 
 	thumb_func_start sub_814DE9C
-sub_814DE9C: ; 814DE9C
+sub_814DE9C: @ 814DE9C
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -618163,7 +618163,7 @@ _0814DED4:
 	thumb_func_end sub_814DE9C
 
 	thumb_func_start sub_814DEE4
-sub_814DEE4: ; 814DEE4
+sub_814DEE4: @ 814DEE4
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -618197,7 +618197,7 @@ _0814DF16:
 	thumb_func_end sub_814DEE4
 
 	thumb_func_start sub_814DF34
-sub_814DF34: ; 814DF34
+sub_814DF34: @ 814DF34
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -618205,7 +618205,7 @@ sub_814DF34: ; 814DF34
 	thumb_func_end sub_814DF34
 
 	thumb_func_start sub_814DF40
-sub_814DF40: ; 814DF40
+sub_814DF40: @ 814DF40
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -618248,7 +618248,7 @@ _0814DF86:
 	thumb_func_end sub_814DF40
 
 	thumb_func_start sub_814DFA0
-sub_814DFA0: ; 814DFA0
+sub_814DFA0: @ 814DFA0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024064
@@ -618301,7 +618301,7 @@ _0814E002:
 	thumb_func_end sub_814DFA0
 
 	thumb_func_start sub_814E014
-sub_814E014: ; 814E014
+sub_814E014: @ 814E014
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -618316,7 +618316,7 @@ sub_814E014: ; 814E014
 	thumb_func_end sub_814E014
 
 	thumb_func_start sub_814E034
-sub_814E034: ; 814E034
+sub_814E034: @ 814E034
 	push {lr}
 	bl dp01_tbl4_exec_completed
 	pop {r0}
@@ -618324,7 +618324,7 @@ sub_814E034: ; 814E034
 	thumb_func_end sub_814E034
 
 	thumb_func_start sub_814E040
-sub_814E040: ; 814E040
+sub_814E040: @ 814E040
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -618375,12 +618375,12 @@ sub_814E040: ; 814E040
 	thumb_func_end sub_814E040
 
 	thumb_func_start nullsub_113
-nullsub_113: ; 814E0C0
+nullsub_113: @ 814E0C0
 	bx lr
 	thumb_func_end nullsub_113
 
 	thumb_func_start battle_pick_message
-battle_pick_message: ; 814E0C4
+battle_pick_message: @ 814E0C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -619074,7 +619074,7 @@ _0814E6DE:
 	thumb_func_end battle_pick_message
 
 	thumb_func_start get_battle_strings_
-get_battle_strings_: ; 814E6F0
+get_battle_strings_: @ 814E6F0
 	push {lr}
 	ldr r1, =0x02022e2c
 	bl get_battle_strings
@@ -619084,7 +619084,7 @@ get_battle_strings_: ; 814E6F0
 	thumb_func_end get_battle_strings_
 
 	thumb_func_start sub_814E700
-sub_814E700: ; 814E700
+sub_814E700: @ 814E700
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -619138,7 +619138,7 @@ _0814E75A:
 	thumb_func_end sub_814E700
 
 	thumb_func_start get_battle_strings
-get_battle_strings: ; 814E764
+get_battle_strings: @ 814E764
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -620233,7 +620233,7 @@ _0814F20E:
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
-	ldr r0, =gTrainers + 0x4 ; name offset
+	ldr r0, =gTrainers + 0x4 @ name offset
 	adds r4, r1, r0
 	b _0814F5C0
 	.pool
@@ -620548,7 +620548,7 @@ _0814F4F0:
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
-	ldr r1, =gTrainers + 0x4 ; name offset
+	ldr r1, =gTrainers + 0x4 @ name offset
 	adds r4, r0, r1
 	b _0814F5C0
 	.pool
@@ -620712,7 +620712,7 @@ _0814F62A:
 	thumb_func_end get_battle_strings
 
 	thumb_func_start sub_814F648
-sub_814F648: ; 814F648
+sub_814F648: @ 814F648
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -621029,7 +621029,7 @@ _0814F8EA:
 	thumb_func_end sub_814F648
 
 	thumb_func_start sub_814F8F8
-sub_814F8F8: ; 814F8F8
+sub_814F8F8: @ 814F8F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r2, 0
@@ -621072,7 +621072,7 @@ _0814F944:
 	thumb_func_end sub_814F8F8
 
 	thumb_func_start sub_814F950
-sub_814F950: ; 814F950
+sub_814F950: @ 814F950
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r4, 0
@@ -621148,7 +621148,7 @@ _0814F9E0:
 	thumb_func_end sub_814F950
 
 	thumb_func_start battle_show_message_maybe
-battle_show_message_maybe: ; 814F9EC
+battle_show_message_maybe: @ 814F9EC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -621364,7 +621364,7 @@ _0814FB9C:
 	thumb_func_end battle_show_message_maybe
 
 	thumb_func_start sub_814FBAC
-sub_814FBAC: ; 814FBAC
+sub_814FBAC: @ 814FBAC
 	push {r4,r5,lr}
 	ldr r0, =0x02024064
 	ldrb r2, [r0]
@@ -621411,7 +621411,7 @@ sub_814FBAC: ; 814FBAC
 	thumb_func_end sub_814FBAC
 
 	thumb_func_start sub_814FC20
-sub_814FC20: ; 814FC20
+sub_814FC20: @ 814FC20
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -621461,7 +621461,7 @@ _0814FC6A:
 	thumb_func_end sub_814FC20
 
 	thumb_func_start sub_814FC70
-sub_814FC70: ; 814FC70
+sub_814FC70: @ 814FC70
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -621483,7 +621483,7 @@ _0814FC8E:
 	thumb_func_end sub_814FC70
 
 	thumb_func_start sub_814FC9C
-sub_814FC9C: ; 814FC9C
+sub_814FC9C: @ 814FC9C
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -621504,7 +621504,7 @@ sub_814FC9C: ; 814FC9C
 	thumb_func_end sub_814FC9C
 
 	thumb_func_start sub_814FCC8
-sub_814FCC8: ; 814FCC8
+sub_814FCC8: @ 814FCC8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -622070,7 +622070,7 @@ _08150226:
 	thumb_func_end sub_814FCC8
 
 	thumb_func_start mainloop
-mainloop: ; 815023C
+mainloop: @ 815023C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -622082,7 +622082,7 @@ mainloop: ; 815023C
 	thumb_func_end mainloop
 
 	thumb_func_start c2_8011A1C
-c2_8011A1C: ; 8150258
+c2_8011A1C: @ 8150258
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -622244,7 +622244,7 @@ _08150340:
 	thumb_func_end c2_8011A1C
 
 	thumb_func_start sub_81503E4
-sub_81503E4: ; 81503E4
+sub_81503E4: @ 81503E4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -622430,7 +622430,7 @@ _08150542:
 	thumb_func_end sub_81503E4
 
 	thumb_func_start sub_8150550
-sub_8150550: ; 8150550
+sub_8150550: @ 8150550
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r6, =0x0203abac
@@ -622568,7 +622568,7 @@ _08150646:
 	thumb_func_end sub_8150550
 
 	thumb_func_start sub_8150664
-sub_8150664: ; 8150664
+sub_8150664: @ 8150664
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r7, =0x0203abac
@@ -622763,7 +622763,7 @@ _081507E6:
 	thumb_func_end sub_8150664
 
 	thumb_func_start sub_8150800
-sub_8150800: ; 8150800
+sub_8150800: @ 8150800
 	push {r4,lr}
 	movs r0, 0
 	bl CopyBgTilemapBufferToVram
@@ -622804,12 +622804,12 @@ sub_8150800: ; 8150800
 	thumb_func_end sub_8150800
 
 	thumb_func_start nullsub_58
-nullsub_58: ; 8150864
+nullsub_58: @ 8150864
 	bx lr
 	thumb_func_end nullsub_58
 
 	thumb_func_start sub_8150868
-sub_8150868: ; 8150868
+sub_8150868: @ 8150868
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203abac
@@ -622900,7 +622900,7 @@ _08150934:
 	thumb_func_end sub_8150868
 
 	thumb_func_start sub_8150948
-sub_8150948: ; 8150948
+sub_8150948: @ 8150948
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203abac
@@ -623025,7 +623025,7 @@ _08150A60:
 	thumb_func_end sub_8150948
 
 	thumb_func_start sub_8150A68
-sub_8150A68: ; 8150A68
+sub_8150A68: @ 8150A68
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -623103,7 +623103,7 @@ _08150AEE:
 	thumb_func_end sub_8150A68
 
 	thumb_func_start sub_8150AF4
-sub_8150AF4: ; 8150AF4
+sub_8150AF4: @ 8150AF4
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -623172,7 +623172,7 @@ _08150B68:
 	thumb_func_end sub_8150AF4
 
 	thumb_func_start sub_8150B6C
-sub_8150B6C: ; 8150B6C
+sub_8150B6C: @ 8150B6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -623356,7 +623356,7 @@ _08150D1C:
 	thumb_func_end sub_8150B6C
 
 	thumb_func_start sub_8150D28
-sub_8150D28: ; 8150D28
+sub_8150D28: @ 8150D28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -623745,7 +623745,7 @@ _08151074:
 	thumb_func_end sub_8150D28
 
 	thumb_func_start sub_8151088
-sub_8151088: ; 8151088
+sub_8151088: @ 8151088
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -623852,7 +623852,7 @@ _081510CC:
 	thumb_func_end sub_8151088
 
 	thumb_func_start sub_815115C
-sub_815115C: ; 815115C
+sub_815115C: @ 815115C
 	push {r4,r5,lr}
 	ldr r5, =0x0203abac
 	ldr r4, [r5]
@@ -623900,7 +623900,7 @@ _081511AC:
 	thumb_func_end sub_815115C
 
 	thumb_func_start sub_81511B8
-sub_81511B8: ; 81511B8
+sub_81511B8: @ 81511B8
 	push {r4,r5,lr}
 	ldr r5, =0x0203abac
 	ldr r4, [r5]
@@ -623948,7 +623948,7 @@ _08151208:
 	thumb_func_end sub_81511B8
 
 	thumb_func_start sub_8151214
-sub_8151214: ; 8151214
+sub_8151214: @ 8151214
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -624128,7 +624128,7 @@ _08151368:
 	thumb_func_end sub_8151214
 
 	thumb_func_start sub_8151388
-sub_8151388: ; 8151388
+sub_8151388: @ 8151388
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -624282,7 +624282,7 @@ _081514A6:
 	thumb_func_end sub_8151388
 
 	thumb_func_start sub_81514C8
-sub_81514C8: ; 81514C8
+sub_81514C8: @ 81514C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -624335,7 +624335,7 @@ _08151522:
 	thumb_func_end sub_81514C8
 
 	thumb_func_start sub_8151534
-sub_8151534: ; 8151534
+sub_8151534: @ 8151534
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -624354,7 +624354,7 @@ _08151548:
 	thumb_func_end sub_8151534
 
 	thumb_func_start sub_8151550
-sub_8151550: ; 8151550
+sub_8151550: @ 8151550
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -624375,7 +624375,7 @@ sub_8151550: ; 8151550
 	thumb_func_end sub_8151550
 
 	thumb_func_start sub_8151574
-sub_8151574: ; 8151574
+sub_8151574: @ 8151574
 	push {r4-r7,lr}
 	adds r2, r1, 0
 	adds r4, r0, 0
@@ -624409,7 +624409,7 @@ _0815159A:
 	thumb_func_end sub_8151574
 
 	thumb_func_start sub_81515B0
-sub_81515B0: ; 81515B0
+sub_81515B0: @ 81515B0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -624431,7 +624431,7 @@ _081515CE:
 	thumb_func_end sub_81515B0
 
 	thumb_func_start sub_81515D4
-sub_81515D4: ; 81515D4
+sub_81515D4: @ 81515D4
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -624456,7 +624456,7 @@ _081515F8:
 	thumb_func_end sub_81515D4
 
 	thumb_func_start sub_81515FC
-sub_81515FC: ; 81515FC
+sub_81515FC: @ 81515FC
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	cmp r6, 0
@@ -624481,7 +624481,7 @@ _0815161E:
 	thumb_func_end sub_81515FC
 
 	thumb_func_start sub_8151624
-sub_8151624: ; 8151624
+sub_8151624: @ 8151624
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x80
@@ -624496,7 +624496,7 @@ sub_8151624: ; 8151624
 	thumb_func_end sub_8151624
 
 	thumb_func_start sub_815163C
-sub_815163C: ; 815163C
+sub_815163C: @ 815163C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -624514,7 +624514,7 @@ sub_815163C: ; 815163C
 	thumb_func_end sub_815163C
 
 	thumb_func_start sub_815165C
-sub_815165C: ; 815165C
+sub_815165C: @ 815165C
 	push {lr}
 	adds r2, r0, 0
 	ldr r1, _08151674
@@ -624529,7 +624529,7 @@ _08151674: .4byte 0x00000000
 	thumb_func_end sub_815165C
 
 	thumb_func_start sub_8151678
-sub_8151678: ; 8151678
+sub_8151678: @ 8151678
 	push {lr}
 	movs r1, 0
 	strb r1, [r0]
@@ -624542,7 +624542,7 @@ sub_8151678: ; 8151678
 	thumb_func_end sub_8151678
 
 	thumb_func_start sub_815168C
-sub_815168C: ; 815168C
+sub_815168C: @ 815168C
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -624617,7 +624617,7 @@ _0815170A:
 	thumb_func_end sub_815168C
 
 	thumb_func_start sub_8151710
-sub_8151710: ; 8151710
+sub_8151710: @ 8151710
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -624648,7 +624648,7 @@ _0815173E:
 	thumb_func_end sub_8151710
 
 	thumb_func_start sub_8151744
-sub_8151744: ; 8151744
+sub_8151744: @ 8151744
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -624926,7 +624926,7 @@ _0815193E:
 	thumb_func_end sub_8151744
 
 	thumb_func_start sub_815194C
-sub_815194C: ; 815194C
+sub_815194C: @ 815194C
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -625005,7 +625005,7 @@ _081519CA:
 	thumb_func_end sub_815194C
 
 	thumb_func_start task_tutorial_controls_fadein
-task_tutorial_controls_fadein: ; 81519DC
+task_tutorial_controls_fadein: @ 81519DC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -625065,7 +625065,7 @@ _08151A40:
 	thumb_func_end task_tutorial_controls_fadein
 
 	thumb_func_start sub_8151A48
-sub_8151A48: ; 8151A48
+sub_8151A48: @ 8151A48
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	lsls r1, 16
@@ -625113,7 +625113,7 @@ _08151A8C:
 	thumb_func_end sub_8151A48
 
 	thumb_func_start sub_8151A9C
-sub_8151A9C: ; 8151A9C
+sub_8151A9C: @ 8151A9C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -625195,7 +625195,7 @@ _08151B30:
 	thumb_func_end sub_8151A9C
 
 	thumb_func_start sub_8151B3C
-sub_8151B3C: ; 8151B3C
+sub_8151B3C: @ 8151B3C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -625221,7 +625221,7 @@ _08151B4E:
 	thumb_func_end sub_8151B3C
 
 	thumb_func_start sub_8151B68
-sub_8151B68: ; 8151B68
+sub_8151B68: @ 8151B68
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	adds r5, r1, 0
@@ -625282,7 +625282,7 @@ _08151BCC:
 	thumb_func_end sub_8151B68
 
 	thumb_func_start sub_8151BD4
-sub_8151BD4: ; 8151BD4
+sub_8151BD4: @ 8151BD4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrb r1, [r4, 0x1]
@@ -625346,7 +625346,7 @@ _08151C16:
 	thumb_func_end sub_8151BD4
 
 	thumb_func_start sub_8151C50
-sub_8151C50: ; 8151C50
+sub_8151C50: @ 8151C50
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -625394,7 +625394,7 @@ _08151CA0:
 	thumb_func_end sub_8151C50
 
 	thumb_func_start sub_8151CA8
-sub_8151CA8: ; 8151CA8
+sub_8151CA8: @ 8151CA8
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -625467,7 +625467,7 @@ _08151D20:
 	thumb_func_end sub_8151CA8
 
 	thumb_func_start sub_8151D28
-sub_8151D28: ; 8151D28
+sub_8151D28: @ 8151D28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -625622,7 +625622,7 @@ _08151E3A:
 	thumb_func_end sub_8151D28
 
 	thumb_func_start sub_8151E50
-sub_8151E50: ; 8151E50
+sub_8151E50: @ 8151E50
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -625856,7 +625856,7 @@ _08151FF6:
 	thumb_func_end sub_8151E50
 
 	thumb_func_start sub_8152008
-sub_8152008: ; 8152008
+sub_8152008: @ 8152008
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r0, [sp, 0x14]
@@ -625904,7 +625904,7 @@ _08152052:
 	thumb_func_end sub_8152008
 
 	thumb_func_start sub_8152058
-sub_8152058: ; 8152058
+sub_8152058: @ 8152058
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r0, [sp, 0x14]
@@ -625952,7 +625952,7 @@ _081520A2:
 	thumb_func_end sub_8152058
 
 	thumb_func_start sub_81520A8
-sub_81520A8: ; 81520A8
+sub_81520A8: @ 81520A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -626029,7 +626029,7 @@ _08152122:
 	thumb_func_end sub_81520A8
 
 	thumb_func_start sub_8152134
-sub_8152134: ; 8152134
+sub_8152134: @ 8152134
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -626106,7 +626106,7 @@ _081521AE:
 	thumb_func_end sub_8152134
 
 	thumb_func_start sub_81521C0
-sub_81521C0: ; 81521C0
+sub_81521C0: @ 81521C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -626183,7 +626183,7 @@ _08152244:
 	thumb_func_end sub_81521C0
 
 	thumb_func_start sub_8152254
-sub_8152254: ; 8152254
+sub_8152254: @ 8152254
 	push {r4-r7,lr}
 	movs r3, 0
 	ldr r0, =0x0203abb8
@@ -626245,7 +626245,7 @@ _081522C4:
 	thumb_func_end sub_8152254
 
 	thumb_func_start sub_81522D4
-sub_81522D4: ; 81522D4
+sub_81522D4: @ 81522D4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -626386,7 +626386,7 @@ _081523D2:
 	thumb_func_end sub_81522D4
 
 	thumb_func_start sub_81523F4
-sub_81523F4: ; 81523F4
+sub_81523F4: @ 81523F4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -626423,7 +626423,7 @@ _08152432:
 	thumb_func_end sub_81523F4
 
 	thumb_func_start sub_8152438
-sub_8152438: ; 8152438
+sub_8152438: @ 8152438
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -626458,7 +626458,7 @@ _0815246E:
 	thumb_func_end sub_8152438
 
 	thumb_func_start sub_8152474
-sub_8152474: ; 8152474
+sub_8152474: @ 8152474
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -626503,7 +626503,7 @@ _081524BC:
 	thumb_func_end sub_8152474
 
 	thumb_func_start sub_81524C4
-sub_81524C4: ; 81524C4
+sub_81524C4: @ 81524C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -626644,7 +626644,7 @@ _081525C0:
 	thumb_func_end sub_81524C4
 
 	thumb_func_start sub_81525D0
-sub_81525D0: ; 81525D0
+sub_81525D0: @ 81525D0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -626706,7 +626706,7 @@ _0815263C:
 	thumb_func_end sub_81525D0
 
 	thumb_func_start calls_flash_erase_block
-calls_flash_erase_block: ; 8152650
+calls_flash_erase_block: @ 8152650
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x03007860
@@ -626732,7 +626732,7 @@ _08152656:
 	thumb_func_end calls_flash_erase_block
 
 	thumb_func_start sub_8152680
-sub_8152680: ; 8152680
+sub_8152680: @ 8152680
 	ldr r0, =0x03006200
 	movs r1, 0
 	str r1, [r0]
@@ -626745,7 +626745,7 @@ sub_8152680: ; 8152680
 	thumb_func_end sub_8152680
 
 	thumb_func_start sub_815269C
-sub_815269C: ; 815269C
+sub_815269C: @ 815269C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -626799,7 +626799,7 @@ _081526F4:
 	thumb_func_end sub_815269C
 
 	thumb_func_start save_write_to_flash
-save_write_to_flash: ; 8152700
+save_write_to_flash: @ 8152700
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	lsls r0, 16
@@ -626867,7 +626867,7 @@ _08152782:
 	thumb_func_end save_write_to_flash
 
 	thumb_func_start sub_81527A0
-sub_81527A0: ; 81527A0
+sub_81527A0: @ 81527A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -626973,7 +626973,7 @@ _08152840:
 	thumb_func_end sub_81527A0
 
 	thumb_func_start sub_8152890
-sub_8152890: ; 8152890
+sub_8152890: @ 8152890
 	push {r4-r7,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -627028,7 +627028,7 @@ _081528D2:
 	thumb_func_end sub_8152890
 
 	thumb_func_start sub_8152908
-sub_8152908: ; 8152908
+sub_8152908: @ 8152908
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -627053,7 +627053,7 @@ _0815292E:
 	thumb_func_end sub_8152908
 
 	thumb_func_start sub_8152934
-sub_8152934: ; 8152934
+sub_8152934: @ 8152934
 	push {r4-r6,lr}
 	ldr r1, =0x03006204
 	ldr r0, =0x0203abbc
@@ -627087,7 +627087,7 @@ sub_8152934: ; 8152934
 	thumb_func_end sub_8152934
 
 	thumb_func_start sub_8152990
-sub_8152990: ; 8152990
+sub_8152990: @ 8152990
 	ldr r1, =0x03006204
 	ldr r0, =0x0203abbc
 	str r0, [r1]
@@ -627110,7 +627110,7 @@ sub_8152990: ; 8152990
 	thumb_func_end sub_8152990
 
 	thumb_func_start sub_81529D4
-sub_81529D4: ; 81529D4
+sub_81529D4: @ 81529D4
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -627150,7 +627150,7 @@ _08152A2A:
 	thumb_func_end sub_81529D4
 
 	thumb_func_start sub_8152A34
-sub_8152A34: ; 8152A34
+sub_8152A34: @ 8152A34
 	push {r4,lr}
 	lsls r0, 16
 	movs r4, 0x1
@@ -627180,7 +627180,7 @@ _08152A5E:
 	thumb_func_end sub_8152A34
 
 	thumb_func_start calls_flash_erase_block_2
-calls_flash_erase_block_2: ; 8152A80
+calls_flash_erase_block_2: @ 8152A80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -627366,7 +627366,7 @@ _08152C10:
 	thumb_func_end calls_flash_erase_block_2
 
 	thumb_func_start sav12_xor_get
-sav12_xor_get: ; 8152C20
+sav12_xor_get: @ 8152C20
 	push {r4-r6,lr}
 	lsls r0, 16
 	ldr r6, =0x030061f0
@@ -627426,7 +627426,7 @@ _08152C9C:
 	thumb_func_end sav12_xor_get
 
 	thumb_func_start sub_8152CAC
-sub_8152CAC: ; 8152CAC
+sub_8152CAC: @ 8152CAC
 	push {r4-r6,lr}
 	lsls r0, 16
 	ldr r6, =0x030061f0
@@ -627490,7 +627490,7 @@ _08152D34:
 	thumb_func_end sub_8152CAC
 
 	thumb_func_start sub_8152D44
-sub_8152D44: ; 8152D44
+sub_8152D44: @ 8152D44
 	push {r4-r6,lr}
 	lsls r0, 16
 	ldr r6, =0x030061f0
@@ -627551,7 +627551,7 @@ _08152DC0:
 	thumb_func_end sub_8152D44
 
 	thumb_func_start sub_8152DD0
-sub_8152DD0: ; 8152DD0
+sub_8152DD0: @ 8152DD0
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -627581,7 +627581,7 @@ _08152E06:
 	thumb_func_end sub_8152DD0
 
 	thumb_func_start sub_8152E10
-sub_8152E10: ; 8152E10
+sub_8152E10: @ 8152E10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -627666,7 +627666,7 @@ _08152E98:
 	thumb_func_end sub_8152E10
 
 	thumb_func_start sub_8152EC8
-sub_8152EC8: ; 8152EC8
+sub_8152EC8: @ 8152EC8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -627911,7 +627911,7 @@ _081530C4:
 	thumb_func_end sub_8152EC8
 
 	thumb_func_start sub_81530DC
-sub_81530DC: ; 81530DC
+sub_81530DC: @ 81530DC
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -627966,7 +627966,7 @@ _08153146:
 	thumb_func_end sub_81530DC
 
 	thumb_func_start sub_815314C
-sub_815314C: ; 815314C
+sub_815314C: @ 815314C
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -627981,7 +627981,7 @@ sub_815314C: ; 815314C
 	thumb_func_end sub_815314C
 
 	thumb_func_start sub_8153164
-sub_8153164: ; 8153164
+sub_8153164: @ 8153164
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -628009,7 +628009,7 @@ _08153182:
 	thumb_func_end sub_8153164
 
 	thumb_func_start sub_8153190
-sub_8153190: ; 8153190
+sub_8153190: @ 8153190
 	push {r4,r5,lr}
 	ldr r3, =0x03006220
 	ldr r0, =0x03005d90
@@ -628063,7 +628063,7 @@ _081531D2:
 	thumb_func_end sub_8153190
 
 	thumb_func_start calls_flash_erase_block_3
-calls_flash_erase_block_3: ; 8153204
+calls_flash_erase_block_3: @ 8153204
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -628185,7 +628185,7 @@ _0815331A:
 	thumb_func_end calls_flash_erase_block_3
 
 	thumb_func_start save_game_when_memory_present
-save_game_when_memory_present: ; 8153338
+save_game_when_memory_present: @ 8153338
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -628220,7 +628220,7 @@ _08153376:
 	thumb_func_end save_game_when_memory_present
 
 	thumb_func_start sub_8153380
-sub_8153380: ; 8153380
+sub_8153380: @ 8153380
 	push {lr}
 	ldr r0, =0x03005d88
 	ldr r0, [r0]
@@ -628241,7 +628241,7 @@ _081533A6:
 	thumb_func_end sub_8153380
 
 	thumb_func_start sub_81533AC
-sub_81533AC: ; 81533AC
+sub_81533AC: @ 81533AC
 	push {r4,lr}
 	ldr r1, =0x03006220
 	movs r0, 0xE
@@ -628269,7 +628269,7 @@ _081533DA:
 	thumb_func_end sub_81533AC
 
 	thumb_func_start sub_81533E0
-sub_81533E0: ; 81533E0
+sub_81533E0: @ 81533E0
 	push {lr}
 	ldr r1, =0x03006220
 	movs r0, 0xE
@@ -628288,7 +628288,7 @@ _081533F8:
 	thumb_func_end sub_81533E0
 
 	thumb_func_start sub_8153408
-sub_8153408: ; 8153408
+sub_8153408: @ 8153408
 	push {lr}
 	ldr r1, =0x03006220
 	movs r0, 0xE
@@ -628307,7 +628307,7 @@ _08153420:
 	thumb_func_end sub_8153408
 
 	thumb_func_start sub_8153430
-sub_8153430: ; 8153430
+sub_8153430: @ 8153430
 	push {r4,lr}
 	ldr r0, =0x03005d88
 	ldr r0, [r0]
@@ -628337,7 +628337,7 @@ _0815346E:
 	thumb_func_end sub_8153430
 
 	thumb_func_start sub_8153474
-sub_8153474: ; 8153474
+sub_8153474: @ 8153474
 	push {r4-r6,lr}
 	movs r6, 0
 	ldr r0, =0x03006208
@@ -628380,7 +628380,7 @@ _081534C0:
 	thumb_func_end sub_8153474
 
 	thumb_func_start sub_81534D0
-sub_81534D0: ; 81534D0
+sub_81534D0: @ 81534D0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -628442,7 +628442,7 @@ _08153550:
 	thumb_func_end sub_81534D0
 
 	thumb_func_start sub_815355C
-sub_815355C: ; 815355C
+sub_815355C: @ 815355C
 	push {r4-r7,lr}
 	ldr r5, =0x03006204
 	ldr r0, =0x0203abbc
@@ -628502,7 +628502,7 @@ _081535CA:
 	thumb_func_end sub_815355C
 
 	thumb_func_start sub_81535DC
-sub_81535DC: ; 81535DC
+sub_81535DC: @ 81535DC
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -628549,7 +628549,7 @@ _0815362A:
 	thumb_func_end sub_81535DC
 
 	thumb_func_start sub_8153634
-sub_8153634: ; 8153634
+sub_8153634: @ 8153634
 	push {r4-r7,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -628591,7 +628591,7 @@ _08153682:
 	thumb_func_end sub_8153634
 
 	thumb_func_start sub_8153688
-sub_8153688: ; 8153688
+sub_8153688: @ 8153688
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -628746,7 +628746,7 @@ _081537C2:
 	thumb_func_end sub_8153688
 
 	thumb_func_start sub_81537CC
-sub_81537CC: ; 81537CC
+sub_81537CC: @ 81537CC
 	push {r4,lr}
 	adds r4, r3, 0
 	lsls r0, 16
@@ -628780,7 +628780,7 @@ _081537FE:
 	thumb_func_end sub_81537CC
 
 	thumb_func_start sub_8153804
-sub_8153804: ; 8153804
+sub_8153804: @ 8153804
 	push {lr}
 	ldr r0, =0x02021fc4
 	ldr r1, =gUnknown_08674C86
@@ -628793,7 +628793,7 @@ sub_8153804: ; 8153804
 	thumb_func_end sub_8153804
 
 	thumb_func_start sub_8153820
-sub_8153820: ; 8153820
+sub_8153820: @ 8153820
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -628815,7 +628815,7 @@ sub_8153820: ; 8153820
 	thumb_func_end sub_8153820
 
 	thumb_func_start sub_8153850
-sub_8153850: ; 8153850
+sub_8153850: @ 8153850
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_main_handler
@@ -628836,7 +628836,7 @@ _0815386A:
 	thumb_func_end sub_8153850
 
 	thumb_func_start sub_8153870
-sub_8153870: ; 8153870
+sub_8153870: @ 8153870
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x0203bbc0
@@ -628847,7 +628847,7 @@ sub_8153870: ; 8153870
 	thumb_func_end sub_8153870
 
 	thumb_func_start sub_8153884
-sub_8153884: ; 8153884
+sub_8153884: @ 8153884
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x0203bbc0
@@ -628862,7 +628862,7 @@ sub_8153884: ; 8153884
 	thumb_func_end sub_8153884
 
 	thumb_func_start sub_81538A0
-sub_81538A0: ; 81538A0
+sub_81538A0: @ 81538A0
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r4, =0x0203bbc0
@@ -628881,7 +628881,7 @@ _081538AC:
 	thumb_func_end sub_81538A0
 
 	thumb_func_start sub_81538C4
-sub_81538C4: ; 81538C4
+sub_81538C4: @ 81538C4
 	ldr r1, =0x0203bbc0
 	str r0, [r1, 0x6C]
 	bx lr
@@ -628889,7 +628889,7 @@ sub_81538C4: ; 81538C4
 	thumb_func_end sub_81538C4
 
 	thumb_func_start sub_81538D0
-sub_81538D0: ; 81538D0
+sub_81538D0: @ 81538D0
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x03005d8c
@@ -628911,7 +628911,7 @@ _081538DE:
 	thumb_func_end sub_81538D0
 
 	thumb_func_start sub_81538F8
-sub_81538F8: ; 81538F8
+sub_81538F8: @ 81538F8
 	push {r4,r5,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -628949,7 +628949,7 @@ _0815393E:
 	thumb_func_end sub_81538F8
 
 	thumb_func_start sub_8153944
-sub_8153944: ; 8153944
+sub_8153944: @ 8153944
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -628969,7 +628969,7 @@ sub_8153944: ; 8153944
 	thumb_func_end sub_8153944
 
 	thumb_func_start sub_8153970
-sub_8153970: ; 8153970
+sub_8153970: @ 8153970
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -629016,7 +629016,7 @@ _081539BC:
 	thumb_func_end sub_8153970
 
 	thumb_func_start sub_81539D4
-sub_81539D4: ; 81539D4
+sub_81539D4: @ 81539D4
 	push {r4-r6,lr}
 	ldr r6, =0x03005d8c
 	ldr r0, [r6]
@@ -629055,7 +629055,7 @@ _08153A1A:
 	thumb_func_end sub_81539D4
 
 	thumb_func_start script_status_stop_and_ret_1
-script_status_stop_and_ret_1: ; 8153A24
+script_status_stop_and_ret_1: @ 8153A24
 	push {lr}
 	bl script_stop
 	movs r0, 0x1
@@ -629064,7 +629064,7 @@ script_status_stop_and_ret_1: ; 8153A24
 	thumb_func_end script_status_stop_and_ret_1
 
 	thumb_func_start sub_8153A30
-sub_8153A30: ; 8153A30
+sub_8153A30: @ 8153A30
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	bl script_read_word
@@ -629103,13 +629103,13 @@ _08153A78:
 	thumb_func_end sub_8153A30
 
 	thumb_func_start sub_8153A80
-sub_8153A80: ; 8153A80
+sub_8153A80: @ 8153A80
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_8153A80
 
 	thumb_func_start sub_8153A84
-sub_8153A84: ; 8153A84
+sub_8153A84: @ 8153A84
 	ldr r1, [r0, 0x8]
 	ldrb r2, [r1]
 	adds r1, 0x1
@@ -629120,7 +629120,7 @@ sub_8153A84: ; 8153A84
 	thumb_func_end sub_8153A84
 
 	thumb_func_start sub_8153A94
-sub_8153A94: ; 8153A94
+sub_8153A94: @ 8153A94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x8]
@@ -629150,7 +629150,7 @@ _08153ABE:
 	thumb_func_end sub_8153A94
 
 	thumb_func_start sub_8153ACC
-sub_8153ACC: ; 8153ACC
+sub_8153ACC: @ 8153ACC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -629166,7 +629166,7 @@ sub_8153ACC: ; 8153ACC
 	thumb_func_end sub_8153ACC
 
 	thumb_func_start sub_8153AE8
-sub_8153AE8: ; 8153AE8
+sub_8153AE8: @ 8153AE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -629243,7 +629243,7 @@ _08153BA0:
 	thumb_func_end sub_8153AE8
 
 	thumb_func_start sub_8153BB0
-sub_8153BB0: ; 8153BB0
+sub_8153BB0: @ 8153BB0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, [r4, 0x8]
@@ -629267,7 +629267,7 @@ sub_8153BB0: ; 8153BB0
 	thumb_func_end sub_8153BB0
 
 	thumb_func_start sub_8153BE4
-sub_8153BE4: ; 8153BE4
+sub_8153BE4: @ 8153BE4
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -629319,7 +629319,7 @@ sub_8153BE4: ; 8153BE4
 	thumb_func_end sub_8153BE4
 
 	thumb_func_start sub_8153C4C
-sub_8153C4C: ; 8153C4C
+sub_8153C4C: @ 8153C4C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_809D3E8
@@ -629336,7 +629336,7 @@ sub_8153C4C: ; 8153C4C
 	thumb_func_end sub_8153C4C
 
 	thumb_func_start sub_8153C70
-sub_8153C70: ; 8153C70
+sub_8153C70: @ 8153C70
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, [r4, 0x8]
@@ -629357,7 +629357,7 @@ sub_8153C70: ; 8153C70
 	thumb_func_end sub_8153C70
 
 	thumb_func_start sub_8153C9C
-sub_8153C9C: ; 8153C9C
+sub_8153C9C: @ 8153C9C
 	push {r4,r5,lr}
 	ldr r1, [r0, 0x8]
 	ldrb r5, [r1]
@@ -629380,7 +629380,7 @@ sub_8153C9C: ; 8153C9C
 	thumb_func_end sub_8153C9C
 
 	thumb_func_start sub_8153CC8
-sub_8153CC8: ; 8153CC8
+sub_8153CC8: @ 8153CC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -629488,7 +629488,7 @@ _08153DB6:
 	thumb_func_end sub_8153CC8
 
 	thumb_func_start sub_8153DD4
-sub_8153DD4: ; 8153DD4
+sub_8153DD4: @ 8153DD4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl script_read_word
@@ -629517,7 +629517,7 @@ sub_8153DD4: ; 8153DD4
 	thumb_func_end sub_8153DD4
 
 	thumb_func_start sub_8153E1C
-sub_8153E1C: ; 8153E1C
+sub_8153E1C: @ 8153E1C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_809D5F4
@@ -629534,7 +629534,7 @@ sub_8153E1C: ; 8153E1C
 	thumb_func_end sub_8153E1C
 
 	thumb_func_start sub_8153E40
-sub_8153E40: ; 8153E40
+sub_8153E40: @ 8153E40
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl script_read_word
@@ -629570,7 +629570,7 @@ _08153E7E:
 	thumb_func_end sub_8153E40
 
 	thumb_func_start sub_8153E88
-sub_8153E88: ; 8153E88
+sub_8153E88: @ 8153E88
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl script_read_word
@@ -629608,7 +629608,7 @@ _08153ECA:
 	thumb_func_end sub_8153E88
 
 	thumb_func_start SetUpReflection
-SetUpReflection: ; 8153ED4
+SetUpReflection: @ 8153ED4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -629699,7 +629699,7 @@ _08153F7A:
 	thumb_func_end SetUpReflection
 
 	thumb_func_start sub_8153F98
-sub_8153F98: ; 8153F98
+sub_8153F98: @ 8153F98
 	push {lr}
 	ldrb r0, [r0, 0x5]
 	bl GetFieldObjectGraphicsInfo
@@ -629712,8 +629712,8 @@ sub_8153F98: ; 8153F98
 	thumb_func_end sub_8153F98
 
 	thumb_func_start npc_pal_op
-; void npc_pal_op(struct npc_state *npcState, struct obj *obj)
-npc_pal_op: ; 8153FAC
+@ void npc_pal_op(struct npc_state *npcState, struct obj *obj)
+npc_pal_op: @ 8153FAC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -629768,8 +629768,8 @@ _08154012:
 	thumb_func_end npc_pal_op
 
 	thumb_func_start npc_pal_op_B
-; void npc_pal_op_B(void *a1, u8 slot)
-npc_pal_op_B: ; 815401C
+@ void npc_pal_op_B(void *a1, u8 slot)
+npc_pal_op_B: @ 815401C
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -629814,7 +629814,7 @@ _08154070:
 	thumb_func_end npc_pal_op_B
 
 	thumb_func_start npc_pal_op_A
-npc_pal_op_A: ; 8154078
+npc_pal_op_A: @ 8154078
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -629838,8 +629838,8 @@ _0815409C:
 	thumb_func_end npc_pal_op_A
 
 	thumb_func_start objc_reflection_maybe
-; void objc_reflection_maybe(struct obj *object)
-objc_reflection_maybe: ; 81540A8
+@ void objc_reflection_maybe(struct obj *object)
+objc_reflection_maybe: @ 81540A8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -630030,7 +630030,7 @@ _08154214:
 	thumb_func_end objc_reflection_maybe
 
 	thumb_func_start sub_8154228
-sub_8154228: ; 8154228
+sub_8154228: @ 8154228
 	push {r4,lr}
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x20]
@@ -630070,7 +630070,7 @@ _08154266:
 	thumb_func_end sub_8154228
 
 	thumb_func_start objid_set_invisible
-objid_set_invisible: ; 8154278
+objid_set_invisible: @ 8154278
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x02020630
@@ -630088,7 +630088,7 @@ objid_set_invisible: ; 8154278
 	thumb_func_end objid_set_invisible
 
 	thumb_func_start sub_8154298
-sub_8154298: ; 8154298
+sub_8154298: @ 8154298
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -630174,7 +630174,7 @@ _0815432E:
 	thumb_func_end sub_8154298
 
 	thumb_func_start oei_shadow
-oei_shadow: ; 8154340
+oei_shadow: @ 8154340
 	push {r4,r5,lr}
 	ldr r5, =0x02038c08
 	ldrb r0, [r5]
@@ -630247,7 +630247,7 @@ _081543C4:
 	thumb_func_end oei_shadow
 
 	thumb_func_start oamc_shadow
-oamc_shadow: ; 81543E4
+oamc_shadow: @ 81543E4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -630341,7 +630341,7 @@ _08154498:
 	thumb_func_end oamc_shadow
 
 	thumb_func_start oei_grass_normal
-oei_grass_normal: ; 81544AC
+oei_grass_normal: @ 81544AC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02038c08
@@ -630419,7 +630419,7 @@ _08154538:
 	thumb_func_end oei_grass_normal
 
 	thumb_func_start unc_grass_normal
-unc_grass_normal: ; 8154550
+unc_grass_normal: @ 8154550
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -630551,7 +630551,7 @@ _08154648:
 	thumb_func_end unc_grass_normal
 
 	thumb_func_start sub_8154658
-sub_8154658: ; 8154658
+sub_8154658: @ 8154658
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -630605,7 +630605,7 @@ _081546B4:
 	thumb_func_end sub_8154658
 
 	thumb_func_start sub_81546C8
-sub_81546C8: ; 81546C8
+sub_81546C8: @ 81546C8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -630679,7 +630679,7 @@ _0815474C:
 	thumb_func_end sub_81546C8
 
 	thumb_func_start sub_8154758
-sub_8154758: ; 8154758
+sub_8154758: @ 8154758
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02038c08
@@ -630758,7 +630758,7 @@ _081547E8:
 	thumb_func_end sub_8154758
 
 	thumb_func_start unc_grass_tall
-unc_grass_tall: ; 8154800
+unc_grass_tall: @ 8154800
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -630882,7 +630882,7 @@ _081548EA:
 	thumb_func_end unc_grass_tall
 
 	thumb_func_start sub_81548FC
-sub_81548FC: ; 81548FC
+sub_81548FC: @ 81548FC
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -630936,7 +630936,7 @@ _08154958:
 	thumb_func_end sub_81548FC
 
 	thumb_func_start sub_815496C
-sub_815496C: ; 815496C
+sub_815496C: @ 815496C
 	push {r4-r6,lr}
 	ldr r6, =0x02038c08
 	ldrb r0, [r6]
@@ -631014,7 +631014,7 @@ _081549F8:
 	thumb_func_end sub_815496C
 
 	thumb_func_start sub_8154A10
-sub_8154A10: ; 8154A10
+sub_8154A10: @ 8154A10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -631137,7 +631137,7 @@ _08154AF2:
 	thumb_func_end sub_8154A10
 
 	thumb_func_start sub_8154B04
-sub_8154B04: ; 8154B04
+sub_8154B04: @ 8154B04
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -631191,7 +631191,7 @@ _08154B62:
 	thumb_func_end sub_8154B04
 
 	thumb_func_start sub_8154B78
-sub_8154B78: ; 8154B78
+sub_8154B78: @ 8154B78
 	push {r4,r5,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -631246,7 +631246,7 @@ _08154BD8:
 	thumb_func_end sub_8154B78
 
 	thumb_func_start sub_8154BEC
-sub_8154BEC: ; 8154BEC
+sub_8154BEC: @ 8154BEC
 	push {r4,r5,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -631301,7 +631301,7 @@ _08154C4C:
 	thumb_func_end sub_8154BEC
 
 	thumb_func_start sub_8154C60
-sub_8154C60: ; 8154C60
+sub_8154C60: @ 8154C60
 	push {lr}
 	ldr r2, =gUnknown_085CDC4C
 	movs r3, 0x2E
@@ -631316,7 +631316,7 @@ sub_8154C60: ; 8154C60
 	thumb_func_end sub_8154C60
 
 	thumb_func_start sub_8154C7C
-sub_8154C7C: ; 8154C7C
+sub_8154C7C: @ 8154C7C
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -631337,7 +631337,7 @@ _08154C92:
 	thumb_func_end sub_8154C7C
 
 	thumb_func_start sub_8154CA0
-sub_8154CA0: ; 8154CA0
+sub_8154CA0: @ 8154CA0
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r4, 0
@@ -631377,7 +631377,7 @@ _08154CE4:
 	thumb_func_end sub_8154CA0
 
 	thumb_func_start sub_8154CEC
-sub_8154CEC: ; 8154CEC
+sub_8154CEC: @ 8154CEC
 	push {r4-r6,lr}
 	ldr r6, =0x02038c08
 	ldrb r0, [r6]
@@ -631452,7 +631452,7 @@ _08154D76:
 	thumb_func_end sub_8154CEC
 
 	thumb_func_start sub_8154D90
-sub_8154D90: ; 8154D90
+sub_8154D90: @ 8154D90
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -631522,7 +631522,7 @@ _08154E0A:
 	thumb_func_end sub_8154D90
 
 	thumb_func_start sub_8154E1C
-sub_8154E1C: ; 8154E1C
+sub_8154E1C: @ 8154E1C
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -631576,7 +631576,7 @@ _08154E78:
 	thumb_func_end sub_8154E1C
 
 	thumb_func_start oei_water_drop_tall
-oei_water_drop_tall: ; 8154E8C
+oei_water_drop_tall: @ 8154E8C
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -631630,7 +631630,7 @@ _08154EE8:
 	thumb_func_end oei_water_drop_tall
 
 	thumb_func_start sub_8154EFC
-sub_8154EFC: ; 8154EFC
+sub_8154EFC: @ 8154EFC
 	push {r4-r7,lr}
 	ldr r7, =0x02038c08
 	ldrb r0, [r7]
@@ -631711,7 +631711,7 @@ _08154F92:
 	thumb_func_end sub_8154EFC
 
 	thumb_func_start sub_8154FB4
-sub_8154FB4: ; 8154FB4
+sub_8154FB4: @ 8154FB4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -631791,7 +631791,7 @@ _08155046:
 	thumb_func_end sub_8154FB4
 
 	thumb_func_start oei_ripples
-oei_ripples: ; 8155054
+oei_ripples: @ 8155054
 	push {r4,lr}
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x14]
@@ -631838,7 +631838,7 @@ _081550A0:
 	thumb_func_end oei_ripples
 
 	thumb_func_start sub_81550B4
-sub_81550B4: ; 81550B4
+sub_81550B4: @ 81550B4
 	push {r4-r6,lr}
 	ldr r6, =0x02038c08
 	ldrb r0, [r6]
@@ -631916,7 +631916,7 @@ _08155140:
 	thumb_func_end sub_81550B4
 
 	thumb_func_start sub_8155158
-sub_8155158: ; 8155158
+sub_8155158: @ 8155158
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -631993,7 +631993,7 @@ _081551E4:
 	thumb_func_end sub_8155158
 
 	thumb_func_start sub_81551F0
-sub_81551F0: ; 81551F0
+sub_81551F0: @ 81551F0
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632045,7 +632045,7 @@ _08155248:
 	thumb_func_end sub_81551F0
 
 	thumb_func_start sub_815525C
-sub_815525C: ; 815525C
+sub_815525C: @ 815525C
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632097,7 +632097,7 @@ _081552B4:
 	thumb_func_end sub_815525C
 
 	thumb_func_start sub_81552C8
-sub_81552C8: ; 81552C8
+sub_81552C8: @ 81552C8
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632149,7 +632149,7 @@ _08155320:
 	thumb_func_end sub_81552C8
 
 	thumb_func_start sub_8155334
-sub_8155334: ; 8155334
+sub_8155334: @ 8155334
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632201,7 +632201,7 @@ _0815538C:
 	thumb_func_end sub_8155334
 
 	thumb_func_start ash
-ash: ; 81553A0
+ash: @ 81553A0
 	push {r4,lr}
 	lsls r2, 16
 	lsrs r2, 16
@@ -632229,7 +632229,7 @@ ash: ; 81553A0
 	thumb_func_end ash
 
 	thumb_func_start oei_ash
-oei_ash: ; 81553D4
+oei_ash: @ 81553D4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02038c08
@@ -632297,7 +632297,7 @@ _0815544A:
 	thumb_func_end oei_ash
 
 	thumb_func_start sub_8155460
-sub_8155460: ; 8155460
+sub_8155460: @ 8155460
 	push {lr}
 	ldr r2, =gUnknown_085CDC54
 	movs r3, 0x2E
@@ -632312,7 +632312,7 @@ sub_8155460: ; 8155460
 	thumb_func_end sub_8155460
 
 	thumb_func_start sub_815547C
-sub_815547C: ; 815547C
+sub_815547C: @ 815547C
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r3, 0
@@ -632340,7 +632340,7 @@ _081554A6:
 	thumb_func_end sub_815547C
 
 	thumb_func_start sub_81554AC
-sub_81554AC: ; 81554AC
+sub_81554AC: @ 81554AC
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r2, r4, 0
@@ -632387,7 +632387,7 @@ sub_81554AC: ; 81554AC
 	thumb_func_end sub_81554AC
 
 	thumb_func_start sub_815550C
-sub_815550C: ; 815550C
+sub_815550C: @ 815550C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -632409,7 +632409,7 @@ _0815552C:
 	thumb_func_end sub_815550C
 
 	thumb_func_start sub_8155534
-sub_8155534: ; 8155534
+sub_8155534: @ 8155534
 	push {r4,r5,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632464,7 +632464,7 @@ _0815558E:
 	thumb_func_end sub_8155534
 
 	thumb_func_start sub_81555AC
-sub_81555AC: ; 81555AC
+sub_81555AC: @ 81555AC
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -632488,7 +632488,7 @@ sub_81555AC: ; 81555AC
 	thumb_func_end sub_81555AC
 
 	thumb_func_start sub_81555D8
-sub_81555D8: ; 81555D8
+sub_81555D8: @ 81555D8
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
@@ -632512,7 +632512,7 @@ sub_81555D8: ; 81555D8
 	thumb_func_end sub_81555D8
 
 	thumb_func_start sub_8155604
-sub_8155604: ; 8155604
+sub_8155604: @ 8155604
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -632539,7 +632539,7 @@ sub_8155604: ; 8155604
 	thumb_func_end sub_8155604
 
 	thumb_func_start sub_8155638
-sub_8155638: ; 8155638
+sub_8155638: @ 8155638
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0xF
 	ands r0, r1
@@ -632547,7 +632547,7 @@ sub_8155638: ; 8155638
 	thumb_func_end sub_8155638
 
 	thumb_func_start sub_8155640
-sub_8155640: ; 8155640
+sub_8155640: @ 8155640
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0xF0
 	ands r0, r1
@@ -632556,7 +632556,7 @@ sub_8155640: ; 8155640
 	thumb_func_end sub_8155640
 
 	thumb_func_start sub_815564C
-sub_815564C: ; 815564C
+sub_815564C: @ 815564C
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0xF0
 	lsls r0, 4
@@ -632566,7 +632566,7 @@ sub_815564C: ; 815564C
 	thumb_func_end sub_815564C
 
 	thumb_func_start sub_8155658
-sub_8155658: ; 8155658
+sub_8155658: @ 8155658
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -632608,7 +632608,7 @@ sub_8155658: ; 8155658
 	thumb_func_end sub_8155658
 
 	thumb_func_start sub_81556B0
-sub_81556B0: ; 81556B0
+sub_81556B0: @ 81556B0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -632637,7 +632637,7 @@ _081556DC:
 	thumb_func_end sub_81556B0
 
 	thumb_func_start sub_81556E8
-sub_81556E8: ; 81556E8
+sub_81556E8: @ 81556E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -632717,7 +632717,7 @@ _08155770:
 	thumb_func_end sub_81556E8
 
 	thumb_func_start sub_815577C
-sub_815577C: ; 815577C
+sub_815577C: @ 815577C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r1, 0
@@ -632787,7 +632787,7 @@ _081557F6:
 	thumb_func_end sub_815577C
 
 	thumb_func_start sub_8155800
-sub_8155800: ; 8155800
+sub_8155800: @ 8155800
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -632824,7 +632824,7 @@ sub_8155800: ; 8155800
 	thumb_func_end sub_8155800
 
 	thumb_func_start sub_8155850
-sub_8155850: ; 8155850
+sub_8155850: @ 8155850
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x2E
@@ -632861,7 +632861,7 @@ _08155888:
 	thumb_func_end sub_8155850
 
 	thumb_func_start sub_8155890
-sub_8155890: ; 8155890
+sub_8155890: @ 8155890
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -632915,7 +632915,7 @@ _081558EC:
 	thumb_func_end sub_8155890
 
 	thumb_func_start sub_8155900
-sub_8155900: ; 8155900
+sub_8155900: @ 8155900
 	push {r4-r7,lr}
 	ldr r7, =0x02038c08
 	ldrb r0, [r7]
@@ -633003,7 +633003,7 @@ _081559A4:
 	thumb_func_end sub_8155900
 
 	thumb_func_start sub_81559BC
-sub_81559BC: ; 81559BC
+sub_81559BC: @ 81559BC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -633105,7 +633105,7 @@ _08155A76:
 	thumb_func_end sub_81559BC
 
 	thumb_func_start sub_8155A88
-sub_8155A88: ; 8155A88
+sub_8155A88: @ 8155A88
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -633153,7 +633153,7 @@ _08155AD8:
 	thumb_func_end sub_8155A88
 
 	thumb_func_start sub_8155AEC
-sub_8155AEC: ; 8155AEC
+sub_8155AEC: @ 8155AEC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -633186,7 +633186,7 @@ _08155B20:
 	thumb_func_end sub_8155AEC
 
 	thumb_func_start sub_8155B2C
-sub_8155B2C: ; 8155B2C
+sub_8155B2C: @ 8155B2C
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	adds r1, r4, 0x4
@@ -633242,8 +633242,8 @@ _08155B8C:
 	thumb_func_end sub_8155B2C
 
 	thumb_func_start ShowTreeDisguiseFieldEffect
-; u8 ShowTreeDisguiseFieldEffect()
-ShowTreeDisguiseFieldEffect: ; 8155BA0
+@ u8 ShowTreeDisguiseFieldEffect()
+ShowTreeDisguiseFieldEffect: @ 8155BA0
 	push {lr}
 	movs r0, 0x1C
 	movs r1, 0x18
@@ -633254,8 +633254,8 @@ ShowTreeDisguiseFieldEffect: ; 8155BA0
 	thumb_func_end ShowTreeDisguiseFieldEffect
 
 	thumb_func_start ShowMountainDisguiseFieldEffect
-; u8 ShowMountainDisguiseFieldEffect()
-ShowMountainDisguiseFieldEffect: ; 8155BB0
+@ u8 ShowMountainDisguiseFieldEffect()
+ShowMountainDisguiseFieldEffect: @ 8155BB0
 	push {lr}
 	movs r0, 0x1D
 	movs r1, 0x19
@@ -633266,8 +633266,8 @@ ShowMountainDisguiseFieldEffect: ; 8155BB0
 	thumb_func_end ShowMountainDisguiseFieldEffect
 
 	thumb_func_start ShowSandDisguiseFieldEffect
-; u8 ShowSandDisguiseFieldEffect()
-ShowSandDisguiseFieldEffect: ; 8155BC0
+@ u8 ShowSandDisguiseFieldEffect()
+ShowSandDisguiseFieldEffect: @ 8155BC0
 	push {lr}
 	movs r0, 0x24
 	movs r1, 0x1C
@@ -633278,8 +633278,8 @@ ShowSandDisguiseFieldEffect: ; 8155BC0
 	thumb_func_end ShowSandDisguiseFieldEffect
 
 	thumb_func_start ShowDisguiseFieldEffect
-; u8 ShowDisguiseFieldEffect(u8 fieldEffectId, u8 fieldEffectObjectId, u8 paletteSlot)
-ShowDisguiseFieldEffect: ; 8155BD0
+@ u8 ShowDisguiseFieldEffect(u8 fieldEffectId, u8 fieldEffectObjectId, u8 paletteSlot)
+ShowDisguiseFieldEffect: @ 8155BD0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -633371,7 +633371,7 @@ _08155C74:
 	thumb_func_end ShowDisguiseFieldEffect
 
 	thumb_func_start sub_8155C88
-sub_8155C88: ; 8155C88
+sub_8155C88: @ 8155C88
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -633491,7 +633491,7 @@ _08155D68:
 	thumb_func_end sub_8155C88
 
 	thumb_func_start sub_8155D78
-sub_8155D78: ; 8155D78
+sub_8155D78: @ 8155D78
 	push {lr}
 	adds r1, r0, 0
 	adds r0, 0x21
@@ -633514,7 +633514,7 @@ _08155D96:
 	thumb_func_end sub_8155D78
 
 	thumb_func_start sub_8155DA0
-sub_8155DA0: ; 8155DA0
+sub_8155DA0: @ 8155DA0
 	push {lr}
 	adds r2, r0, 0
 	adds r2, 0x21
@@ -633550,7 +633550,7 @@ _08155DD8:
 	thumb_func_end sub_8155DA0
 
 	thumb_func_start sub_8155DDC
-sub_8155DDC: ; 8155DDC
+sub_8155DDC: @ 8155DDC
 	push {r4,lr}
 	ldr r4, =0x02038c08
 	ldr r0, [r4]
@@ -633606,7 +633606,7 @@ _08155E3C:
 	thumb_func_end sub_8155DDC
 
 	thumb_func_start sub_8155E50
-sub_8155E50: ; 8155E50
+sub_8155E50: @ 8155E50
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x2E
@@ -633651,7 +633651,7 @@ _08155E9A:
 	thumb_func_end sub_8155E50
 
 	thumb_func_start sub_8155EA0
-sub_8155EA0: ; 8155EA0
+sub_8155EA0: @ 8155EA0
 	movs r1, 0
 	strh r1, [r0, 0x3A]
 	strh r1, [r0, 0x3C]
@@ -633659,7 +633659,7 @@ sub_8155EA0: ; 8155EA0
 	thumb_func_end sub_8155EA0
 
 	thumb_func_start sub_8155EA8
-sub_8155EA8: ; 8155EA8
+sub_8155EA8: @ 8155EA8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -633773,7 +633773,7 @@ _08155F76:
 	thumb_func_end sub_8155EA8
 
 	thumb_func_start sub_8155F80
-sub_8155F80: ; 8155F80
+sub_8155F80: @ 8155F80
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r1, 0x32
@@ -634044,7 +634044,7 @@ _08156184:
 	thumb_func_end sub_8155F80
 
 	thumb_func_start sub_8156194
-sub_8156194: ; 8156194
+sub_8156194: @ 8156194
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -634076,7 +634076,7 @@ _081561C8:
 	thumb_func_end sub_8156194
 
 	thumb_func_start sub_81561D0
-sub_81561D0: ; 81561D0
+sub_81561D0: @ 81561D0
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -634101,7 +634101,7 @@ _081561F6:
 	thumb_func_end sub_81561D0
 
 	thumb_func_start sub_81561FC
-sub_81561FC: ; 81561FC
+sub_81561FC: @ 81561FC
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r0, r1, 0
@@ -634203,7 +634203,7 @@ _081562BE:
 	thumb_func_end sub_81561FC
 
 	thumb_func_start sub_81562C4
-sub_81562C4: ; 81562C4
+sub_81562C4: @ 81562C4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -634252,7 +634252,7 @@ _081562DE:
 	thumb_func_end sub_81562C4
 
 	thumb_func_start sub_8156324
-sub_8156324: ; 8156324
+sub_8156324: @ 8156324
 	push {r4-r6,lr}
 	ldr r1, =0x02039f34
 	ldr r0, [r1]
@@ -634328,7 +634328,7 @@ _0815639E:
 	thumb_func_end sub_8156324
 
 	thumb_func_start sub_81563B0
-sub_81563B0: ; 81563B0
+sub_81563B0: @ 81563B0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -634455,7 +634455,7 @@ _081564A0:
 	thumb_func_end sub_81563B0
 
 	thumb_func_start sub_81564AC
-sub_81564AC: ; 81564AC
+sub_81564AC: @ 81564AC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -634484,7 +634484,7 @@ _081564D2:
 	thumb_func_end sub_81564AC
 
 	thumb_func_start sub_81564DC
-sub_81564DC: ; 81564DC
+sub_81564DC: @ 81564DC
 	push {r4,lr}
 	ldr r3, =0x02039f34
 	ldr r0, [r3]
@@ -634527,7 +634527,7 @@ _08156516:
 	thumb_func_end sub_81564DC
 
 	thumb_func_start sub_8156530
-sub_8156530: ; 8156530
+sub_8156530: @ 8156530
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
@@ -634543,7 +634543,7 @@ sub_8156530: ; 8156530
 	thumb_func_end sub_8156530
 
 	thumb_func_start sub_8156550
-sub_8156550: ; 8156550
+sub_8156550: @ 8156550
 	push {lr}
 	bl sub_8156530
 	ldr r0, =0x02039f34
@@ -634578,7 +634578,7 @@ _08156590:
 	thumb_func_end sub_8156550
 
 	thumb_func_start sub_8156594
-sub_8156594: ; 8156594
+sub_8156594: @ 8156594
 	push {lr}
 	bl sub_8156530
 	ldr r0, =0x02039f34
@@ -634613,7 +634613,7 @@ _081565D4:
 	thumb_func_end sub_8156594
 
 	thumb_func_start sub_81565D8
-sub_81565D8: ; 81565D8
+sub_81565D8: @ 81565D8
 	push {lr}
 	bl sub_8156530
 	ldr r0, =0x02039f34
@@ -634648,7 +634648,7 @@ _08156618:
 	thumb_func_end sub_81565D8
 
 	thumb_func_start sub_815661C
-sub_815661C: ; 815661C
+sub_815661C: @ 815661C
 	push {lr}
 	bl sub_8156530
 	ldr r0, =0x02039f34
@@ -634683,7 +634683,7 @@ _0815665C:
 	thumb_func_end sub_815661C
 
 	thumb_func_start sub_8156660
-sub_8156660: ; 8156660
+sub_8156660: @ 8156660
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
@@ -634701,7 +634701,7 @@ sub_8156660: ; 8156660
 	thumb_func_end sub_8156660
 
 	thumb_func_start sub_8156684
-sub_8156684: ; 8156684
+sub_8156684: @ 8156684
 	push {lr}
 	bl sub_8156660
 	ldr r0, =0x02039f34
@@ -634736,7 +634736,7 @@ _081566C4:
 	thumb_func_end sub_8156684
 
 	thumb_func_start sub_81566C8
-sub_81566C8: ; 81566C8
+sub_81566C8: @ 81566C8
 	push {lr}
 	bl sub_8156660
 	ldr r0, =0x02039f34
@@ -634771,7 +634771,7 @@ _08156708:
 	thumb_func_end sub_81566C8
 
 	thumb_func_start sub_815670C
-sub_815670C: ; 815670C
+sub_815670C: @ 815670C
 	push {lr}
 	bl sub_8156660
 	ldr r0, =0x02039f34
@@ -634806,7 +634806,7 @@ _0815674C:
 	thumb_func_end sub_815670C
 
 	thumb_func_start sub_8156750
-sub_8156750: ; 8156750
+sub_8156750: @ 8156750
 	push {lr}
 	bl sub_8156660
 	ldr r0, =0x02039f34
@@ -634841,7 +634841,7 @@ _08156790:
 	thumb_func_end sub_8156750
 
 	thumb_func_start sub_8156794
-sub_8156794: ; 8156794
+sub_8156794: @ 8156794
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r2, [r0, 0xC]
@@ -634861,7 +634861,7 @@ sub_8156794: ; 8156794
 	thumb_func_end sub_8156794
 
 	thumb_func_start sub_81567BC
-sub_81567BC: ; 81567BC
+sub_81567BC: @ 81567BC
 	push {lr}
 	bl sub_8156794
 	ldr r0, =0x02039f34
@@ -634896,7 +634896,7 @@ _081567FC:
 	thumb_func_end sub_81567BC
 
 	thumb_func_start sub_8156800
-sub_8156800: ; 8156800
+sub_8156800: @ 8156800
 	push {lr}
 	bl sub_8156794
 	ldr r0, =0x02039f34
@@ -634931,7 +634931,7 @@ _08156840:
 	thumb_func_end sub_8156800
 
 	thumb_func_start sub_8156844
-sub_8156844: ; 8156844
+sub_8156844: @ 8156844
 	push {lr}
 	bl sub_8156794
 	ldr r0, =0x02039f34
@@ -634966,7 +634966,7 @@ _08156884:
 	thumb_func_end sub_8156844
 
 	thumb_func_start sub_8156888
-sub_8156888: ; 8156888
+sub_8156888: @ 8156888
 	push {lr}
 	bl sub_8156794
 	ldr r0, =0x02039f34
@@ -635001,7 +635001,7 @@ _081568C8:
 	thumb_func_end sub_8156888
 
 	thumb_func_start sub_81568CC
-sub_81568CC: ; 81568CC
+sub_81568CC: @ 81568CC
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -635033,7 +635033,7 @@ sub_81568CC: ; 81568CC
 	thumb_func_end sub_81568CC
 
 	thumb_func_start sub_815690C
-sub_815690C: ; 815690C
+sub_815690C: @ 815690C
 	push {lr}
 	bl sub_81568CC
 	ldr r0, =0x02039f34
@@ -635068,7 +635068,7 @@ _0815694C:
 	thumb_func_end sub_815690C
 
 	thumb_func_start sub_8156950
-sub_8156950: ; 8156950
+sub_8156950: @ 8156950
 	push {lr}
 	bl sub_81568CC
 	ldr r0, =0x02039f34
@@ -635103,7 +635103,7 @@ _08156990:
 	thumb_func_end sub_8156950
 
 	thumb_func_start sub_8156994
-sub_8156994: ; 8156994
+sub_8156994: @ 8156994
 	push {lr}
 	bl sub_81568CC
 	ldr r0, =0x02039f34
@@ -635138,7 +635138,7 @@ _081569D4:
 	thumb_func_end sub_8156994
 
 	thumb_func_start sub_81569D8
-sub_81569D8: ; 81569D8
+sub_81569D8: @ 81569D8
 	push {lr}
 	bl sub_81568CC
 	ldr r0, =0x02039f34
@@ -635173,7 +635173,7 @@ _08156A18:
 	thumb_func_end sub_81569D8
 
 	thumb_func_start sub_8156A1C
-sub_8156A1C: ; 8156A1C
+sub_8156A1C: @ 8156A1C
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r3, [r0, 0xC]
@@ -635196,7 +635196,7 @@ sub_8156A1C: ; 8156A1C
 	thumb_func_end sub_8156A1C
 
 	thumb_func_start sub_8156A48
-sub_8156A48: ; 8156A48
+sub_8156A48: @ 8156A48
 	push {r4,r5,lr}
 	bl sub_8156A1C
 	ldr r0, =0x02039f34
@@ -635237,7 +635237,7 @@ _08156A90:
 	thumb_func_end sub_8156A48
 
 	thumb_func_start sub_8156A98
-sub_8156A98: ; 8156A98
+sub_8156A98: @ 8156A98
 	push {r4,r5,lr}
 	bl sub_8156A1C
 	ldr r0, =0x02039f34
@@ -635278,7 +635278,7 @@ _08156AE0:
 	thumb_func_end sub_8156A98
 
 	thumb_func_start sub_8156AE8
-sub_8156AE8: ; 8156AE8
+sub_8156AE8: @ 8156AE8
 	push {r4,r5,lr}
 	bl sub_8156A1C
 	ldr r0, =0x02039f34
@@ -635319,7 +635319,7 @@ _08156B30:
 	thumb_func_end sub_8156AE8
 
 	thumb_func_start sub_8156B38
-sub_8156B38: ; 8156B38
+sub_8156B38: @ 8156B38
 	push {r4,r5,lr}
 	bl sub_8156A1C
 	ldr r0, =0x02039f34
@@ -635360,7 +635360,7 @@ _08156B80:
 	thumb_func_end sub_8156B38
 
 	thumb_func_start sub_8156B88
-sub_8156B88: ; 8156B88
+sub_8156B88: @ 8156B88
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r2, [r0, 0xC]
@@ -635381,7 +635381,7 @@ sub_8156B88: ; 8156B88
 	thumb_func_end sub_8156B88
 
 	thumb_func_start sub_8156BB4
-sub_8156BB4: ; 8156BB4
+sub_8156BB4: @ 8156BB4
 	push {r4,r5,lr}
 	bl sub_8156B88
 	ldr r0, =0x02039f34
@@ -635422,7 +635422,7 @@ _08156BFC:
 	thumb_func_end sub_8156BB4
 
 	thumb_func_start sub_8156C04
-sub_8156C04: ; 8156C04
+sub_8156C04: @ 8156C04
 	push {r4,r5,lr}
 	bl sub_8156B88
 	ldr r0, =0x02039f34
@@ -635463,7 +635463,7 @@ _08156C4C:
 	thumb_func_end sub_8156C04
 
 	thumb_func_start sub_8156C54
-sub_8156C54: ; 8156C54
+sub_8156C54: @ 8156C54
 	push {r4,r5,lr}
 	bl sub_8156B88
 	ldr r0, =0x02039f34
@@ -635504,7 +635504,7 @@ _08156C9C:
 	thumb_func_end sub_8156C54
 
 	thumb_func_start sub_8156CA4
-sub_8156CA4: ; 8156CA4
+sub_8156CA4: @ 8156CA4
 	push {r4,r5,lr}
 	bl sub_8156B88
 	ldr r0, =0x02039f34
@@ -635545,7 +635545,7 @@ _08156CEC:
 	thumb_func_end sub_8156CA4
 
 	thumb_func_start sub_8156CF4
-sub_8156CF4: ; 8156CF4
+sub_8156CF4: @ 8156CF4
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
@@ -635561,7 +635561,7 @@ sub_8156CF4: ; 8156CF4
 	thumb_func_end sub_8156CF4
 
 	thumb_func_start sub_8156D18
-sub_8156D18: ; 8156D18
+sub_8156D18: @ 8156D18
 	push {lr}
 	bl sub_8156CF4
 	ldr r0, =0x02039f34
@@ -635596,7 +635596,7 @@ _08156D58:
 	thumb_func_end sub_8156D18
 
 	thumb_func_start sub_8156D5C
-sub_8156D5C: ; 8156D5C
+sub_8156D5C: @ 8156D5C
 	push {lr}
 	bl sub_8156CF4
 	ldr r0, =0x02039f34
@@ -635631,7 +635631,7 @@ _08156D9C:
 	thumb_func_end sub_8156D5C
 
 	thumb_func_start sub_8156DA0
-sub_8156DA0: ; 8156DA0
+sub_8156DA0: @ 8156DA0
 	push {r4,lr}
 	ldr r2, =0x02039e00
 	ldr r4, =0x02039f34
@@ -635663,7 +635663,7 @@ sub_8156DA0: ; 8156DA0
 	thumb_func_end sub_8156DA0
 
 	thumb_func_start sub_8156DE4
-sub_8156DE4: ; 8156DE4
+sub_8156DE4: @ 8156DE4
 	push {r4,lr}
 	bl sub_8156DA0
 	ldr r0, =0x02039f34
@@ -635700,7 +635700,7 @@ _08156E24:
 	thumb_func_end sub_8156DE4
 
 	thumb_func_start sub_8156E2C
-sub_8156E2C: ; 8156E2C
+sub_8156E2C: @ 8156E2C
 	push {r4,lr}
 	bl sub_8156DA0
 	ldr r0, =0x02039f34
@@ -635737,7 +635737,7 @@ _08156E6C:
 	thumb_func_end sub_8156E2C
 
 	thumb_func_start sub_8156E74
-sub_8156E74: ; 8156E74
+sub_8156E74: @ 8156E74
 	push {r4,lr}
 	bl sub_8156DA0
 	ldr r0, =0x02039f34
@@ -635774,7 +635774,7 @@ _08156EB4:
 	thumb_func_end sub_8156E74
 
 	thumb_func_start sub_8156EBC
-sub_8156EBC: ; 8156EBC
+sub_8156EBC: @ 8156EBC
 	push {r4,lr}
 	bl sub_8156DA0
 	ldr r0, =0x02039f34
@@ -635811,7 +635811,7 @@ _08156EFC:
 	thumb_func_end sub_8156EBC
 
 	thumb_func_start sub_8156F04
-sub_8156F04: ; 8156F04
+sub_8156F04: @ 8156F04
 	ldr r2, =0x02039e00
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -635840,7 +635840,7 @@ sub_8156F04: ; 8156F04
 	thumb_func_end sub_8156F04
 
 	thumb_func_start sub_8156F44
-sub_8156F44: ; 8156F44
+sub_8156F44: @ 8156F44
 	push {lr}
 	bl sub_8156F04
 	ldr r0, =0x02039f34
@@ -635875,7 +635875,7 @@ _08156F84:
 	thumb_func_end sub_8156F44
 
 	thumb_func_start sub_8156F88
-sub_8156F88: ; 8156F88
+sub_8156F88: @ 8156F88
 	push {lr}
 	bl sub_8156F04
 	ldr r0, =0x02039f34
@@ -635910,7 +635910,7 @@ _08156FC8:
 	thumb_func_end sub_8156F88
 
 	thumb_func_start sub_8156FCC
-sub_8156FCC: ; 8156FCC
+sub_8156FCC: @ 8156FCC
 	ldr r2, =0x02039e00
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -635943,7 +635943,7 @@ sub_8156FCC: ; 8156FCC
 	thumb_func_end sub_8156FCC
 
 	thumb_func_start sub_8157018
-sub_8157018: ; 8157018
+sub_8157018: @ 8157018
 	push {lr}
 	bl sub_8156FCC
 	ldr r0, =0x02039f34
@@ -635978,7 +635978,7 @@ _08157058:
 	thumb_func_end sub_8157018
 
 	thumb_func_start sub_815705C
-sub_815705C: ; 815705C
+sub_815705C: @ 815705C
 	push {lr}
 	bl sub_8156FCC
 	ldr r0, =0x02039f34
@@ -636013,7 +636013,7 @@ _0815709C:
 	thumb_func_end sub_815705C
 
 	thumb_func_start sub_81570A0
-sub_81570A0: ; 81570A0
+sub_81570A0: @ 81570A0
 	push {r4-r7,lr}
 	ldr r2, =0x02039e00
 	ldr r5, =0x02039f34
@@ -636081,7 +636081,7 @@ _0815711A:
 	thumb_func_end sub_81570A0
 
 	thumb_func_start sub_815712C
-sub_815712C: ; 815712C
+sub_815712C: @ 815712C
 	push {lr}
 	bl sub_81570A0
 	ldr r0, =0x02039f34
@@ -636118,7 +636118,7 @@ _0815716C:
 	thumb_func_end sub_815712C
 
 	thumb_func_start sub_8157174
-sub_8157174: ; 8157174
+sub_8157174: @ 8157174
 	push {r4-r7,lr}
 	ldr r2, =0x02039e00
 	ldr r5, =0x02039f34
@@ -636186,7 +636186,7 @@ _081571EE:
 	thumb_func_end sub_8157174
 
 	thumb_func_start sub_8157200
-sub_8157200: ; 8157200
+sub_8157200: @ 8157200
 	push {lr}
 	bl sub_8157174
 	ldr r0, =0x02039f34
@@ -636223,7 +636223,7 @@ _08157240:
 	thumb_func_end sub_8157200
 
 	thumb_func_start sub_8157248
-sub_8157248: ; 8157248
+sub_8157248: @ 8157248
 	push {r4,lr}
 	ldr r2, =0x02039e00
 	ldr r0, =0x02039f34
@@ -636263,7 +636263,7 @@ sub_8157248: ; 8157248
 	thumb_func_end sub_8157248
 
 	thumb_func_start sub_81572A4
-sub_81572A4: ; 81572A4
+sub_81572A4: @ 81572A4
 	push {lr}
 	bl sub_8157248
 	ldr r0, =0x02039f34
@@ -636298,7 +636298,7 @@ _081572E4:
 	thumb_func_end sub_81572A4
 
 	thumb_func_start sub_81572E8
-sub_81572E8: ; 81572E8
+sub_81572E8: @ 81572E8
 	push {lr}
 	bl sub_8157248
 	ldr r0, =0x02039f34
@@ -636333,7 +636333,7 @@ _08157328:
 	thumb_func_end sub_81572E8
 
 	thumb_func_start sub_815732C
-sub_815732C: ; 815732C
+sub_815732C: @ 815732C
 	push {lr}
 	bl sub_8157248
 	ldr r0, =0x02039f34
@@ -636368,7 +636368,7 @@ _0815736C:
 	thumb_func_end sub_815732C
 
 	thumb_func_start sub_8157370
-sub_8157370: ; 8157370
+sub_8157370: @ 8157370
 	push {lr}
 	bl sub_8157248
 	ldr r0, =0x02039f34
@@ -636403,7 +636403,7 @@ _081573B0:
 	thumb_func_end sub_8157370
 
 	thumb_func_start sub_81573B4
-sub_81573B4: ; 81573B4
+sub_81573B4: @ 81573B4
 	push {r4,lr}
 	ldr r2, =0x02039e00
 	ldr r0, =0x02039f34
@@ -636443,7 +636443,7 @@ sub_81573B4: ; 81573B4
 	thumb_func_end sub_81573B4
 
 	thumb_func_start sub_8157410
-sub_8157410: ; 8157410
+sub_8157410: @ 8157410
 	push {lr}
 	bl sub_81573B4
 	ldr r0, =0x02039f34
@@ -636478,7 +636478,7 @@ _08157450:
 	thumb_func_end sub_8157410
 
 	thumb_func_start sub_8157454
-sub_8157454: ; 8157454
+sub_8157454: @ 8157454
 	push {lr}
 	bl sub_81573B4
 	ldr r0, =0x02039f34
@@ -636513,7 +636513,7 @@ _08157494:
 	thumb_func_end sub_8157454
 
 	thumb_func_start sub_8157498
-sub_8157498: ; 8157498
+sub_8157498: @ 8157498
 	push {lr}
 	bl sub_81573B4
 	ldr r0, =0x02039f34
@@ -636548,7 +636548,7 @@ _081574D8:
 	thumb_func_end sub_8157498
 
 	thumb_func_start sub_81574DC
-sub_81574DC: ; 81574DC
+sub_81574DC: @ 81574DC
 	push {lr}
 	bl sub_81573B4
 	ldr r0, =0x02039f34
@@ -636583,7 +636583,7 @@ _0815751C:
 	thumb_func_end sub_81574DC
 
 	thumb_func_start sub_8157520
-sub_8157520: ; 8157520
+sub_8157520: @ 8157520
 	push {r4,r5,lr}
 	ldr r3, =0x02039e00
 	ldr r5, =0x02039f34
@@ -636629,7 +636629,7 @@ _08157560:
 	thumb_func_end sub_8157520
 
 	thumb_func_start sub_8157578
-sub_8157578: ; 8157578
+sub_8157578: @ 8157578
 	push {lr}
 	bl sub_8157520
 	ldr r0, =0x02039f34
@@ -636664,7 +636664,7 @@ _081575B8:
 	thumb_func_end sub_8157578
 
 	thumb_func_start sub_81575BC
-sub_81575BC: ; 81575BC
+sub_81575BC: @ 81575BC
 	push {lr}
 	bl sub_8157520
 	ldr r0, =0x02039f34
@@ -636699,7 +636699,7 @@ _081575FC:
 	thumb_func_end sub_81575BC
 
 	thumb_func_start sub_8157600
-sub_8157600: ; 8157600
+sub_8157600: @ 8157600
 	push {lr}
 	bl sub_8157520
 	ldr r0, =0x02039f34
@@ -636734,7 +636734,7 @@ _08157640:
 	thumb_func_end sub_8157600
 
 	thumb_func_start sub_8157644
-sub_8157644: ; 8157644
+sub_8157644: @ 8157644
 	push {lr}
 	bl sub_8157520
 	ldr r0, =0x02039f34
@@ -636769,7 +636769,7 @@ _08157684:
 	thumb_func_end sub_8157644
 
 	thumb_func_start sub_8157688
-sub_8157688: ; 8157688
+sub_8157688: @ 8157688
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r2, =0x02039e00
@@ -636831,7 +636831,7 @@ _081576DE:
 	thumb_func_end sub_8157688
 
 	thumb_func_start sub_8157700
-sub_8157700: ; 8157700
+sub_8157700: @ 8157700
 	push {lr}
 	bl sub_8157688
 	ldr r0, =0x02039f34
@@ -636868,7 +636868,7 @@ _08157740:
 	thumb_func_end sub_8157700
 
 	thumb_func_start sub_8157748
-sub_8157748: ; 8157748
+sub_8157748: @ 8157748
 	push {lr}
 	bl sub_8157688
 	ldr r0, =0x02039f34
@@ -636905,7 +636905,7 @@ _08157788:
 	thumb_func_end sub_8157748
 
 	thumb_func_start sub_8157790
-sub_8157790: ; 8157790
+sub_8157790: @ 8157790
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r2, =0x02039e00
@@ -636966,7 +636966,7 @@ _081577E4:
 	thumb_func_end sub_8157790
 
 	thumb_func_start sub_8157808
-sub_8157808: ; 8157808
+sub_8157808: @ 8157808
 	push {lr}
 	bl sub_8157790
 	ldr r0, =0x02039f34
@@ -637003,7 +637003,7 @@ _08157848:
 	thumb_func_end sub_8157808
 
 	thumb_func_start sub_8157850
-sub_8157850: ; 8157850
+sub_8157850: @ 8157850
 	push {lr}
 	bl sub_8157790
 	ldr r0, =0x02039f34
@@ -637040,7 +637040,7 @@ _08157890:
 	thumb_func_end sub_8157850
 
 	thumb_func_start sub_8157898
-sub_8157898: ; 8157898
+sub_8157898: @ 8157898
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r3, =0x02039e00
@@ -637087,7 +637087,7 @@ _081578D6:
 	thumb_func_end sub_8157898
 
 	thumb_func_start sub_81578F8
-sub_81578F8: ; 81578F8
+sub_81578F8: @ 81578F8
 	push {lr}
 	bl sub_8157898
 	ldr r0, =0x02039f34
@@ -637124,7 +637124,7 @@ _08157938:
 	thumb_func_end sub_81578F8
 
 	thumb_func_start sub_8157940
-sub_8157940: ; 8157940
+sub_8157940: @ 8157940
 	push {lr}
 	bl sub_8157898
 	ldr r0, =0x02039f34
@@ -637161,7 +637161,7 @@ _08157980:
 	thumb_func_end sub_8157940
 
 	thumb_func_start sub_8157988
-sub_8157988: ; 8157988
+sub_8157988: @ 8157988
 	push {r4,r5,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -637194,7 +637194,7 @@ sub_8157988: ; 8157988
 	thumb_func_end sub_8157988
 
 	thumb_func_start sub_81579CC
-sub_81579CC: ; 81579CC
+sub_81579CC: @ 81579CC
 	push {lr}
 	bl sub_8157988
 	ldr r0, =0x02039f34
@@ -637229,7 +637229,7 @@ _08157A0C:
 	thumb_func_end sub_81579CC
 
 	thumb_func_start sub_8157A10
-sub_8157A10: ; 8157A10
+sub_8157A10: @ 8157A10
 	push {lr}
 	bl sub_8157988
 	ldr r0, =0x02039f34
@@ -637264,7 +637264,7 @@ _08157A50:
 	thumb_func_end sub_8157A10
 
 	thumb_func_start sub_8157A54
-sub_8157A54: ; 8157A54
+sub_8157A54: @ 8157A54
 	push {lr}
 	bl sub_8157988
 	ldr r0, =0x02039f34
@@ -637299,7 +637299,7 @@ _08157A94:
 	thumb_func_end sub_8157A54
 
 	thumb_func_start sub_8157A98
-sub_8157A98: ; 8157A98
+sub_8157A98: @ 8157A98
 	push {lr}
 	bl sub_8157988
 	ldr r0, =0x02039f34
@@ -637334,7 +637334,7 @@ _08157AD8:
 	thumb_func_end sub_8157A98
 
 	thumb_func_start sub_8157ADC
-sub_8157ADC: ; 8157ADC
+sub_8157ADC: @ 8157ADC
 	push {r4-r6,lr}
 	movs r6, 0
 	ldr r5, =0x0203ab38
@@ -637378,7 +637378,7 @@ _08157B18:
 	thumb_func_end sub_8157ADC
 
 	thumb_func_start sub_8157B38
-sub_8157B38: ; 8157B38
+sub_8157B38: @ 8157B38
 	push {lr}
 	bl sub_8157ADC
 	ldr r0, =0x02039f34
@@ -637413,7 +637413,7 @@ _08157B78:
 	thumb_func_end sub_8157B38
 
 	thumb_func_start sub_8157B7C
-sub_8157B7C: ; 8157B7C
+sub_8157B7C: @ 8157B7C
 	push {lr}
 	bl sub_8157ADC
 	ldr r0, =0x02039f34
@@ -637448,7 +637448,7 @@ _08157BBC:
 	thumb_func_end sub_8157B7C
 
 	thumb_func_start sub_8157BC0
-sub_8157BC0: ; 8157BC0
+sub_8157BC0: @ 8157BC0
 	push {lr}
 	bl sub_8157ADC
 	ldr r0, =0x02039f34
@@ -637483,7 +637483,7 @@ _08157C00:
 	thumb_func_end sub_8157BC0
 
 	thumb_func_start sub_8157C04
-sub_8157C04: ; 8157C04
+sub_8157C04: @ 8157C04
 	push {lr}
 	bl sub_8157ADC
 	ldr r0, =0x02039f34
@@ -637518,7 +637518,7 @@ _08157C44:
 	thumb_func_end sub_8157C04
 
 	thumb_func_start sub_8157C48
-sub_8157C48: ; 8157C48
+sub_8157C48: @ 8157C48
 	push {lr}
 	ldr r0, =0x0203ab38
 	ldr r0, [r0]
@@ -637553,7 +637553,7 @@ _08157C7C:
 	thumb_func_end sub_8157C48
 
 	thumb_func_start sub_8157C94
-sub_8157C94: ; 8157C94
+sub_8157C94: @ 8157C94
 	push {lr}
 	bl sub_8157C48
 	ldr r0, =0x02039f34
@@ -637590,7 +637590,7 @@ _08157CD4:
 	thumb_func_end sub_8157C94
 
 	thumb_func_start sub_8157CDC
-sub_8157CDC: ; 8157CDC
+sub_8157CDC: @ 8157CDC
 	push {lr}
 	bl sub_8157C48
 	ldr r0, =0x02039f34
@@ -637627,7 +637627,7 @@ _08157D1C:
 	thumb_func_end sub_8157CDC
 
 	thumb_func_start sub_8157D24
-sub_8157D24: ; 8157D24
+sub_8157D24: @ 8157D24
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -637657,7 +637657,7 @@ sub_8157D24: ; 8157D24
 	thumb_func_end sub_8157D24
 
 	thumb_func_start sub_8157D60
-sub_8157D60: ; 8157D60
+sub_8157D60: @ 8157D60
 	push {lr}
 	bl sub_8157D24
 	ldr r0, =0x02039f34
@@ -637694,7 +637694,7 @@ _08157DA0:
 	thumb_func_end sub_8157D60
 
 	thumb_func_start sub_8157DA8
-sub_8157DA8: ; 8157DA8
+sub_8157DA8: @ 8157DA8
 	push {lr}
 	bl sub_8157D24
 	ldr r0, =0x02039f34
@@ -637731,7 +637731,7 @@ _08157DE8:
 	thumb_func_end sub_8157DA8
 
 	thumb_func_start sub_8157DF0
-sub_8157DF0: ; 8157DF0
+sub_8157DF0: @ 8157DF0
 	push {r4,r5,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -637768,7 +637768,7 @@ sub_8157DF0: ; 8157DF0
 	thumb_func_end sub_8157DF0
 
 	thumb_func_start sub_8157E3C
-sub_8157E3C: ; 8157E3C
+sub_8157E3C: @ 8157E3C
 	push {lr}
 	bl sub_8157DF0
 	ldr r0, =0x02039f34
@@ -637805,7 +637805,7 @@ _08157E7C:
 	thumb_func_end sub_8157E3C
 
 	thumb_func_start sub_8157E84
-sub_8157E84: ; 8157E84
+sub_8157E84: @ 8157E84
 	push {lr}
 	bl sub_8157DF0
 	ldr r0, =0x02039f34
@@ -637842,7 +637842,7 @@ _08157EC4:
 	thumb_func_end sub_8157E84
 
 	thumb_func_start sub_8157ECC
-sub_8157ECC: ; 8157ECC
+sub_8157ECC: @ 8157ECC
 	push {lr}
 	bl sub_8157DF0
 	ldr r0, =0x02039f34
@@ -637879,7 +637879,7 @@ _08157F0C:
 	thumb_func_end sub_8157ECC
 
 	thumb_func_start sub_8157F14
-sub_8157F14: ; 8157F14
+sub_8157F14: @ 8157F14
 	push {lr}
 	bl sub_8157DF0
 	ldr r0, =0x02039f34
@@ -637916,7 +637916,7 @@ _08157F54:
 	thumb_func_end sub_8157F14
 
 	thumb_func_start sub_8157F5C
-sub_8157F5C: ; 8157F5C
+sub_8157F5C: @ 8157F5C
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -637948,7 +637948,7 @@ sub_8157F5C: ; 8157F5C
 	thumb_func_end sub_8157F5C
 
 	thumb_func_start sub_8157FA0
-sub_8157FA0: ; 8157FA0
+sub_8157FA0: @ 8157FA0
 	push {lr}
 	bl sub_8157F5C
 	ldr r0, =0x02039f34
@@ -637985,7 +637985,7 @@ _08157FE0:
 	thumb_func_end sub_8157FA0
 
 	thumb_func_start sub_8157FE8
-sub_8157FE8: ; 8157FE8
+sub_8157FE8: @ 8157FE8
 	push {lr}
 	bl sub_8157F5C
 	ldr r0, =0x02039f34
@@ -638022,7 +638022,7 @@ _08158028:
 	thumb_func_end sub_8157FE8
 
 	thumb_func_start sub_8158030
-sub_8158030: ; 8158030
+sub_8158030: @ 8158030
 	push {lr}
 	bl sub_8157F5C
 	ldr r0, =0x02039f34
@@ -638059,7 +638059,7 @@ _08158070:
 	thumb_func_end sub_8158030
 
 	thumb_func_start sub_8158078
-sub_8158078: ; 8158078
+sub_8158078: @ 8158078
 	push {lr}
 	bl sub_8157F5C
 	ldr r0, =0x02039f34
@@ -638096,7 +638096,7 @@ _081580B8:
 	thumb_func_end sub_8158078
 
 	thumb_func_start sub_81580C0
-sub_81580C0: ; 81580C0
+sub_81580C0: @ 81580C0
 	push {r4,r5,lr}
 	ldr r5, =0x0203ab38
 	ldr r0, [r5]
@@ -638129,7 +638129,7 @@ sub_81580C0: ; 81580C0
 	thumb_func_end sub_81580C0
 
 	thumb_func_start sub_8158108
-sub_8158108: ; 8158108
+sub_8158108: @ 8158108
 	push {lr}
 	bl sub_81580C0
 	ldr r0, =0x02039f34
@@ -638164,7 +638164,7 @@ _08158148:
 	thumb_func_end sub_8158108
 
 	thumb_func_start sub_815814C
-sub_815814C: ; 815814C
+sub_815814C: @ 815814C
 	push {lr}
 	bl sub_81580C0
 	ldr r0, =0x02039f34
@@ -638199,7 +638199,7 @@ _0815818C:
 	thumb_func_end sub_815814C
 
 	thumb_func_start sub_8158190
-sub_8158190: ; 8158190
+sub_8158190: @ 8158190
 	push {lr}
 	bl sub_81580C0
 	ldr r0, =0x02039f34
@@ -638234,7 +638234,7 @@ _081581D0:
 	thumb_func_end sub_8158190
 
 	thumb_func_start sub_81581D4
-sub_81581D4: ; 81581D4
+sub_81581D4: @ 81581D4
 	push {lr}
 	bl sub_81580C0
 	ldr r0, =0x02039f34
@@ -638269,7 +638269,7 @@ _08158214:
 	thumb_func_end sub_81581D4
 
 	thumb_func_start sub_8158218
-sub_8158218: ; 8158218
+sub_8158218: @ 8158218
 	push {r4,r5,lr}
 	ldr r5, =0x0203ab38
 	ldr r0, [r5]
@@ -638299,7 +638299,7 @@ sub_8158218: ; 8158218
 	thumb_func_end sub_8158218
 
 	thumb_func_start sub_8158254
-sub_8158254: ; 8158254
+sub_8158254: @ 8158254
 	push {lr}
 	bl sub_8158218
 	ldr r0, =0x02039f34
@@ -638334,7 +638334,7 @@ _08158294:
 	thumb_func_end sub_8158254
 
 	thumb_func_start sub_8158298
-sub_8158298: ; 8158298
+sub_8158298: @ 8158298
 	push {lr}
 	bl sub_8158218
 	ldr r0, =0x02039f34
@@ -638369,7 +638369,7 @@ _081582D8:
 	thumb_func_end sub_8158298
 
 	thumb_func_start sub_81582DC
-sub_81582DC: ; 81582DC
+sub_81582DC: @ 81582DC
 	push {lr}
 	bl sub_8158218
 	ldr r0, =0x02039f34
@@ -638404,7 +638404,7 @@ _0815831C:
 	thumb_func_end sub_81582DC
 
 	thumb_func_start sub_8158320
-sub_8158320: ; 8158320
+sub_8158320: @ 8158320
 	push {lr}
 	bl sub_8158218
 	ldr r0, =0x02039f34
@@ -638439,7 +638439,7 @@ _08158360:
 	thumb_func_end sub_8158320
 
 	thumb_func_start sub_8158364
-sub_8158364: ; 8158364
+sub_8158364: @ 8158364
 	push {r4,r5,lr}
 	ldr r5, =0x0203ab38
 	ldr r0, [r5]
@@ -638476,7 +638476,7 @@ sub_8158364: ; 8158364
 	thumb_func_end sub_8158364
 
 	thumb_func_start sub_81583B8
-sub_81583B8: ; 81583B8
+sub_81583B8: @ 81583B8
 	push {lr}
 	bl sub_8158364
 	ldr r0, =0x02039f34
@@ -638511,7 +638511,7 @@ _081583F8:
 	thumb_func_end sub_81583B8
 
 	thumb_func_start sub_81583FC
-sub_81583FC: ; 81583FC
+sub_81583FC: @ 81583FC
 	push {lr}
 	bl sub_8158364
 	ldr r0, =0x02039f34
@@ -638546,7 +638546,7 @@ _0815843C:
 	thumb_func_end sub_81583FC
 
 	thumb_func_start sub_8158440
-sub_8158440: ; 8158440
+sub_8158440: @ 8158440
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638569,7 +638569,7 @@ sub_8158440: ; 8158440
 	thumb_func_end sub_8158440
 
 	thumb_func_start sub_815846C
-sub_815846C: ; 815846C
+sub_815846C: @ 815846C
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638594,7 +638594,7 @@ sub_815846C: ; 815846C
 	thumb_func_end sub_815846C
 
 	thumb_func_start sub_815849C
-sub_815849C: ; 815849C
+sub_815849C: @ 815849C
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638622,7 +638622,7 @@ sub_815849C: ; 815849C
 	thumb_func_end sub_815849C
 
 	thumb_func_start sub_81584D4
-sub_81584D4: ; 81584D4
+sub_81584D4: @ 81584D4
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638649,7 +638649,7 @@ sub_81584D4: ; 81584D4
 	thumb_func_end sub_81584D4
 
 	thumb_func_start sub_8158508
-sub_8158508: ; 8158508
+sub_8158508: @ 8158508
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638676,7 +638676,7 @@ sub_8158508: ; 8158508
 	thumb_func_end sub_8158508
 
 	thumb_func_start sub_815853C
-sub_815853C: ; 815853C
+sub_815853C: @ 815853C
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638719,7 +638719,7 @@ _08158586:
 	thumb_func_end sub_815853C
 
 	thumb_func_start sub_815858C
-sub_815858C: ; 815858C
+sub_815858C: @ 815858C
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638762,7 +638762,7 @@ _081585D6:
 	thumb_func_end sub_815858C
 
 	thumb_func_start sub_81585DC
-sub_81585DC: ; 81585DC
+sub_81585DC: @ 81585DC
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638805,7 +638805,7 @@ _08158626:
 	thumb_func_end sub_81585DC
 
 	thumb_func_start sub_815862C
-sub_815862C: ; 815862C
+sub_815862C: @ 815862C
 	push {r4,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638848,7 +638848,7 @@ _08158676:
 	thumb_func_end sub_815862C
 
 	thumb_func_start sub_815867C
-sub_815867C: ; 815867C
+sub_815867C: @ 815867C
 	push {r4,r5,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638891,7 +638891,7 @@ _081586C8:
 	thumb_func_end sub_815867C
 
 	thumb_func_start sub_81586D0
-sub_81586D0: ; 81586D0
+sub_81586D0: @ 81586D0
 	push {r4,r5,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638934,7 +638934,7 @@ _0815871C:
 	thumb_func_end sub_81586D0
 
 	thumb_func_start sub_8158724
-sub_8158724: ; 8158724
+sub_8158724: @ 8158724
 	push {r4,r5,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -638977,7 +638977,7 @@ _08158770:
 	thumb_func_end sub_8158724
 
 	thumb_func_start sub_8158778
-sub_8158778: ; 8158778
+sub_8158778: @ 8158778
 	push {r4,r5,lr}
 	ldr r0, =0x02039f34
 	ldr r0, [r0]
@@ -639020,7 +639020,7 @@ _081587C4:
 	thumb_func_end sub_8158778
 
 	thumb_func_start sub_81587CC
-sub_81587CC: ; 81587CC
+sub_81587CC: @ 81587CC
 	push {r4,r5,lr}
 	bl GenerateRandomNumber
 	movs r2, 0xFF
@@ -639061,7 +639061,7 @@ _08158814:
 	thumb_func_end sub_81587CC
 
 	thumb_func_start sub_815881C
-sub_815881C: ; 815881C
+sub_815881C: @ 815881C
 	push {r4,r5,lr}
 	bl GenerateRandomNumber
 	movs r2, 0xFF
@@ -639102,7 +639102,7 @@ _08158864:
 	thumb_func_end sub_815881C
 
 	thumb_func_start sub_815886C
-sub_815886C: ; 815886C
+sub_815886C: @ 815886C
 	ldr r3, =0x0203ab38
 	ldr r2, [r3]
 	ldrb r1, [r2, 0x1]
@@ -639121,7 +639121,7 @@ sub_815886C: ; 815886C
 	thumb_func_end sub_815886C
 
 	thumb_func_start dp15_call
-dp15_call: ; 815888C
+dp15_call: @ 815888C
 	push {r4,lr}
 	ldr r4, =0x0203ab38
 	ldr r0, [r4]
@@ -639146,7 +639146,7 @@ dp15_call: ; 815888C
 	thumb_func_end dp15_call
 
 	thumb_func_start sub_81588BC
-sub_81588BC: ; 81588BC
+sub_81588BC: @ 81588BC
 	push {lr}
 	bl sub_8158908
 	lsls r0, 24
@@ -639166,7 +639166,7 @@ _081588D6:
 	thumb_func_end sub_81588BC
 
 	thumb_func_start sub_81588E0
-sub_81588E0: ; 81588E0
+sub_81588E0: @ 81588E0
 	push {r4,lr}
 	ldr r1, =0x02039f34
 	ldr r1, [r1]
@@ -639188,7 +639188,7 @@ sub_81588E0: ; 81588E0
 	thumb_func_end sub_81588E0
 
 	thumb_func_start sub_8158908
-sub_8158908: ; 8158908
+sub_8158908: @ 8158908
 	push {lr}
 	ldr r3, =0x02039f34
 	ldr r0, [r3]
@@ -639223,7 +639223,7 @@ _08158940:
 	thumb_func_end sub_8158908
 
 	thumb_func_start sub_8158948
-sub_8158948: ; 8158948
+sub_8158948: @ 8158948
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r4, 0
@@ -639269,7 +639269,7 @@ _08158986:
 	thumb_func_end sub_8158948
 
 	thumb_func_start sub_81589A4
-sub_81589A4: ; 81589A4
+sub_81589A4: @ 81589A4
 	push {lr}
 	bl sub_8158948
 	ldr r0, =0x02039f34
@@ -639306,7 +639306,7 @@ _081589E4:
 	thumb_func_end sub_81589A4
 
 	thumb_func_start sub_81589EC
-sub_81589EC: ; 81589EC
+sub_81589EC: @ 81589EC
 	push {lr}
 	bl sub_8158948
 	ldr r0, =0x02039f34
@@ -639343,7 +639343,7 @@ _08158A2C:
 	thumb_func_end sub_81589EC
 
 	thumb_func_start sub_8158A34
-sub_8158A34: ; 8158A34
+sub_8158A34: @ 8158A34
 	push {r4-r6,lr}
 	movs r6, 0
 	ldr r3, =0x0203ab38
@@ -639399,7 +639399,7 @@ _08158A8E:
 	thumb_func_end sub_8158A34
 
 	thumb_func_start sub_8158AA0
-sub_8158AA0: ; 8158AA0
+sub_8158AA0: @ 8158AA0
 	push {lr}
 	bl sub_8158A34
 	ldr r0, =0x02039f34
@@ -639436,7 +639436,7 @@ _08158AE0:
 	thumb_func_end sub_8158AA0
 
 	thumb_func_start sub_8158AE8
-sub_8158AE8: ; 8158AE8
+sub_8158AE8: @ 8158AE8
 	push {lr}
 	bl sub_8158A34
 	ldr r0, =0x02039f34
@@ -639473,7 +639473,7 @@ _08158B28:
 	thumb_func_end sub_8158AE8
 
 	thumb_func_start sub_8158B30
-sub_8158B30: ; 8158B30
+sub_8158B30: @ 8158B30
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -639520,7 +639520,7 @@ sub_8158B30: ; 8158B30
 	thumb_func_end sub_8158B30
 
 	thumb_func_start sub_8158B98
-sub_8158B98: ; 8158B98
+sub_8158B98: @ 8158B98
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -639576,7 +639576,7 @@ _08158BFE:
 	thumb_func_end sub_8158B98
 
 	thumb_func_start sub_8158C04
-sub_8158C04: ; 8158C04
+sub_8158C04: @ 8158C04
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -639618,7 +639618,7 @@ _08158C4C:
 	thumb_func_end sub_8158C04
 
 	thumb_func_start mas_80DCF38
-mas_80DCF38: ; 8158C58
+mas_80DCF38: @ 8158C58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -639700,7 +639700,7 @@ mas_80DCF38: ; 8158C58
 	thumb_func_end mas_80DCF38
 
 	thumb_func_start sub_8158D08
-sub_8158D08: ; 8158D08
+sub_8158D08: @ 8158D08
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -639767,7 +639767,7 @@ _08158D82:
 	thumb_func_end sub_8158D08
 
 	thumb_func_start sub_8158D8C
-sub_8158D8C: ; 8158D8C
+sub_8158D8C: @ 8158D8C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -639892,7 +639892,7 @@ _08158E8C:
 	thumb_func_end sub_8158D8C
 
 	thumb_func_start sub_8158E9C
-sub_8158E9C: ; 8158E9C
+sub_8158E9C: @ 8158E9C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -640046,7 +640046,7 @@ _08158FEE:
 	thumb_func_end sub_8158E9C
 
 	thumb_func_start sub_8158FF4
-sub_8158FF4: ; 8158FF4
+sub_8158FF4: @ 8158FF4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -640111,7 +640111,7 @@ _0815906A:
 	thumb_func_end sub_8158FF4
 
 	thumb_func_start sub_8159078
-sub_8159078: ; 8159078
+sub_8159078: @ 8159078
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -640144,7 +640144,7 @@ _081590B0:
 	thumb_func_end sub_8159078
 
 	thumb_func_start sub_81590B8
-sub_81590B8: ; 81590B8
+sub_81590B8: @ 81590B8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -640203,7 +640203,7 @@ _08159136:
 	thumb_func_end sub_81590B8
 
 	thumb_func_start sub_815913C
-sub_815913C: ; 815913C
+sub_815913C: @ 815913C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -640306,7 +640306,7 @@ _08159204:
 	thumb_func_end sub_815913C
 
 	thumb_func_start sub_8159210
-sub_8159210: ; 8159210
+sub_8159210: @ 8159210
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -640331,7 +640331,7 @@ sub_8159210: ; 8159210
 	thumb_func_end sub_8159210
 
 	thumb_func_start sub_8159244
-sub_8159244: ; 8159244
+sub_8159244: @ 8159244
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -640356,7 +640356,7 @@ sub_8159244: ; 8159244
 	thumb_func_end sub_8159244
 
 	thumb_func_start sub_8159278
-sub_8159278: ; 8159278
+sub_8159278: @ 8159278
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -640422,7 +640422,7 @@ sub_8159278: ; 8159278
 	thumb_func_end sub_8159278
 
 	thumb_func_start sub_8159308
-sub_8159308: ; 8159308
+sub_8159308: @ 8159308
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -640471,12 +640471,12 @@ _0815935A:
 	thumb_func_end sub_8159308
 
 	thumb_func_start nullsub_114
-nullsub_114: ; 8159368
+nullsub_114: @ 8159368
 	bx lr
 	thumb_func_end nullsub_114
 
 	thumb_func_start sub_815936C
-sub_815936C: ; 815936C
+sub_815936C: @ 815936C
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -640489,7 +640489,7 @@ sub_815936C: ; 815936C
 	thumb_func_end sub_815936C
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl6
-bx_exec_buffer_A_ch0_tbl6: ; 8159388
+bx_exec_buffer_A_ch0_tbl6: @ 8159388
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -640524,7 +640524,7 @@ _081593D4:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl6
 
 	thumb_func_start bx_battle_menu_t6_2
-bx_battle_menu_t6_2: ; 81593D8
+bx_battle_menu_t6_2: @ 81593D8
 	push {r4,r5,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -640702,7 +640702,7 @@ _0815954E:
 	thumb_func_end bx_battle_menu_t6_2
 
 	thumb_func_start sub_815955C
-sub_815955C: ; 815955C
+sub_815955C: @ 815955C
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -640727,7 +640727,7 @@ _08159580:
 	thumb_func_end sub_815955C
 
 	thumb_func_start bx_t6_button_a
-bx_t6_button_a: ; 8159594
+bx_t6_button_a: @ 8159594
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -640741,7 +640741,7 @@ _081595A6:
 	thumb_func_end bx_t6_button_a
 
 	thumb_func_start sub_81595AC
-sub_81595AC: ; 81595AC
+sub_81595AC: @ 81595AC
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x03005d70
@@ -640766,7 +640766,7 @@ _081595D0:
 	thumb_func_end sub_81595AC
 
 	thumb_func_start sub_81595E4
-sub_81595E4: ; 81595E4
+sub_81595E4: @ 81595E4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -640794,7 +640794,7 @@ _0815960E:
 	thumb_func_end sub_81595E4
 
 	thumb_func_start bx_wait_t6
-bx_wait_t6: ; 8159624
+bx_wait_t6: @ 8159624
 	push {lr}
 	ldr r0, =0x020244b9
 	ldrb r0, [r0]
@@ -640823,7 +640823,7 @@ _0815964E:
 	thumb_func_end bx_wait_t6
 
 	thumb_func_start sub_8159660
-sub_8159660: ; 8159660
+sub_8159660: @ 8159660
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -640847,7 +640847,7 @@ _08159684:
 	thumb_func_end sub_8159660
 
 	thumb_func_start sub_8159698
-sub_8159698: ; 8159698
+sub_8159698: @ 8159698
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x4]
@@ -640872,7 +640872,7 @@ _081596BE:
 	thumb_func_end sub_8159698
 
 	thumb_func_start sub_81596D4
-sub_81596D4: ; 81596D4
+sub_81596D4: @ 81596D4
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -640896,7 +640896,7 @@ _081596F6:
 	thumb_func_end sub_81596D4
 
 	thumb_func_start dp01_tbl6_exec_completed
-dp01_tbl6_exec_completed: ; 8159704
+dp01_tbl6_exec_completed: @ 8159704
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -640946,7 +640946,7 @@ _0815976A:
 	thumb_func_end dp01_tbl6_exec_completed
 
 	thumb_func_start bx_80364D0
-bx_80364D0: ; 815977C
+bx_80364D0: @ 815977C
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -640970,7 +640970,7 @@ _0815979E:
 	thumb_func_end bx_80364D0
 
 	thumb_func_start sub_81597AC
-sub_81597AC: ; 81597AC
+sub_81597AC: @ 81597AC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -640978,7 +640978,7 @@ sub_81597AC: ; 81597AC
 	thumb_func_end sub_81597AC
 
 	thumb_func_start sub_81597B8
-sub_81597B8: ; 81597B8
+sub_81597B8: @ 81597B8
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -640986,7 +640986,7 @@ sub_81597B8: ; 81597B8
 	thumb_func_end sub_81597B8
 
 	thumb_func_start sub_81597C4
-sub_81597C4: ; 81597C4
+sub_81597C4: @ 81597C4
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -640994,7 +640994,7 @@ sub_81597C4: ; 81597C4
 	thumb_func_end sub_81597C4
 
 	thumb_func_start sub_81597D0
-sub_81597D0: ; 81597D0
+sub_81597D0: @ 81597D0
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641002,7 +641002,7 @@ sub_81597D0: ; 81597D0
 	thumb_func_end sub_81597D0
 
 	thumb_func_start sub_81597DC
-sub_81597DC: ; 81597DC
+sub_81597DC: @ 81597DC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641010,7 +641010,7 @@ sub_81597DC: ; 81597DC
 	thumb_func_end sub_81597DC
 
 	thumb_func_start sub_81597E8
-sub_81597E8: ; 81597E8
+sub_81597E8: @ 81597E8
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641018,7 +641018,7 @@ sub_81597E8: ; 81597E8
 	thumb_func_end sub_81597E8
 
 	thumb_func_start sub_81597F4
-sub_81597F4: ; 81597F4
+sub_81597F4: @ 81597F4
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641026,7 +641026,7 @@ sub_81597F4: ; 81597F4
 	thumb_func_end sub_81597F4
 
 	thumb_func_start sub_8159800
-sub_8159800: ; 8159800
+sub_8159800: @ 8159800
 	push {r4-r6,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -641119,7 +641119,7 @@ sub_8159800: ; 8159800
 	thumb_func_end sub_8159800
 
 	thumb_func_start sub_81598E0
-sub_81598E0: ; 81598E0
+sub_81598E0: @ 81598E0
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641127,7 +641127,7 @@ sub_81598E0: ; 81598E0
 	thumb_func_end sub_81598E0
 
 	thumb_func_start sub_81598EC
-sub_81598EC: ; 81598EC
+sub_81598EC: @ 81598EC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641135,7 +641135,7 @@ sub_81598EC: ; 81598EC
 	thumb_func_end sub_81598EC
 
 	thumb_func_start sub_81598F8
-sub_81598F8: ; 81598F8
+sub_81598F8: @ 81598F8
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641143,7 +641143,7 @@ sub_81598F8: ; 81598F8
 	thumb_func_end sub_81598F8
 
 	thumb_func_start sub_8159904
-sub_8159904: ; 8159904
+sub_8159904: @ 8159904
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641151,7 +641151,7 @@ sub_8159904: ; 8159904
 	thumb_func_end sub_8159904
 
 	thumb_func_start sub_8159910
-sub_8159910: ; 8159910
+sub_8159910: @ 8159910
 	push {r4,r5,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -641185,7 +641185,7 @@ sub_8159910: ; 8159910
 	thumb_func_end sub_8159910
 
 	thumb_func_start sub_8159964
-sub_8159964: ; 8159964
+sub_8159964: @ 8159964
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r5, =0x02024064
@@ -641224,7 +641224,7 @@ sub_8159964: ; 8159964
 	thumb_func_end sub_8159964
 
 	thumb_func_start sub_81599C4
-sub_81599C4: ; 81599C4
+sub_81599C4: @ 81599C4
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641232,7 +641232,7 @@ sub_81599C4: ; 81599C4
 	thumb_func_end sub_81599C4
 
 	thumb_func_start sub_81599D0
-sub_81599D0: ; 81599D0
+sub_81599D0: @ 81599D0
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641240,7 +641240,7 @@ sub_81599D0: ; 81599D0
 	thumb_func_end sub_81599D0
 
 	thumb_func_start dp01t_10_6_message
-dp01t_10_6_message: ; 81599DC
+dp01t_10_6_message: @ 81599DC
 	push {r4,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -641270,7 +641270,7 @@ dp01t_10_6_message: ; 81599DC
 	thumb_func_end dp01t_10_6_message
 
 	thumb_func_start dp01t_11_6_message_for_player_only
-dp01t_11_6_message_for_player_only: ; 8159A30
+dp01t_11_6_message_for_player_only: @ 8159A30
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -641289,7 +641289,7 @@ _08159A50:
 	thumb_func_end dp01t_11_6_message_for_player_only
 
 	thumb_func_start sub_8159A54
-sub_8159A54: ; 8159A54
+sub_8159A54: @ 8159A54
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -641315,7 +641315,7 @@ _08159A7A:
 	thumb_func_end sub_8159A54
 
 	thumb_func_start sub_8159A94
-sub_8159A94: ; 8159A94
+sub_8159A94: @ 8159A94
 	push {r4,lr}
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
@@ -641354,7 +641354,7 @@ _08159AAE:
 	thumb_func_end sub_8159A94
 
 	thumb_func_start sub_8159AFC
-sub_8159AFC: ; 8159AFC
+sub_8159AFC: @ 8159AFC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641362,7 +641362,7 @@ sub_8159AFC: ; 8159AFC
 	thumb_func_end sub_8159AFC
 
 	thumb_func_start sub_8159B08
-sub_8159B08: ; 8159B08
+sub_8159B08: @ 8159B08
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641370,7 +641370,7 @@ sub_8159B08: ; 8159B08
 	thumb_func_end sub_8159B08
 
 	thumb_func_start sub_8159B14
-sub_8159B14: ; 8159B14
+sub_8159B14: @ 8159B14
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -641397,7 +641397,7 @@ sub_8159B14: ; 8159B14
 	thumb_func_end sub_8159B14
 
 	thumb_func_start sub_8159B54
-sub_8159B54: ; 8159B54
+sub_8159B54: @ 8159B54
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641405,7 +641405,7 @@ sub_8159B54: ; 8159B54
 	thumb_func_end sub_8159B54
 
 	thumb_func_start sub_8159B60
-sub_8159B60: ; 8159B60
+sub_8159B60: @ 8159B60
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641413,7 +641413,7 @@ sub_8159B60: ; 8159B60
 	thumb_func_end sub_8159B60
 
 	thumb_func_start sub_8159B6C
-sub_8159B6C: ; 8159B6C
+sub_8159B6C: @ 8159B6C
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641421,7 +641421,7 @@ sub_8159B6C: ; 8159B6C
 	thumb_func_end sub_8159B6C
 
 	thumb_func_start sub_8159B78
-sub_8159B78: ; 8159B78
+sub_8159B78: @ 8159B78
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641429,7 +641429,7 @@ sub_8159B78: ; 8159B78
 	thumb_func_end sub_8159B78
 
 	thumb_func_start sub_8159B84
-sub_8159B84: ; 8159B84
+sub_8159B84: @ 8159B84
 	push {lr}
 	ldr r0, =0x03005d70
 	ldr r1, =0x02024064
@@ -641453,7 +641453,7 @@ sub_8159B84: ; 8159B84
 	thumb_func_end sub_8159B84
 
 	thumb_func_start sub_8159BC0
-sub_8159BC0: ; 8159BC0
+sub_8159BC0: @ 8159BC0
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641461,7 +641461,7 @@ sub_8159BC0: ; 8159BC0
 	thumb_func_end sub_8159BC0
 
 	thumb_func_start sub_8159BCC
-sub_8159BCC: ; 8159BCC
+sub_8159BCC: @ 8159BCC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641469,7 +641469,7 @@ sub_8159BCC: ; 8159BCC
 	thumb_func_end sub_8159BCC
 
 	thumb_func_start sub_8159BD8
-sub_8159BD8: ; 8159BD8
+sub_8159BD8: @ 8159BD8
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641477,7 +641477,7 @@ sub_8159BD8: ; 8159BD8
 	thumb_func_end sub_8159BD8
 
 	thumb_func_start sub_8159BE4
-sub_8159BE4: ; 8159BE4
+sub_8159BE4: @ 8159BE4
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641485,7 +641485,7 @@ sub_8159BE4: ; 8159BE4
 	thumb_func_end sub_8159BE4
 
 	thumb_func_start sub_8159BF0
-sub_8159BF0: ; 8159BF0
+sub_8159BF0: @ 8159BF0
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641493,7 +641493,7 @@ sub_8159BF0: ; 8159BF0
 	thumb_func_end sub_8159BF0
 
 	thumb_func_start sub_8159BFC
-sub_8159BFC: ; 8159BFC
+sub_8159BFC: @ 8159BFC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641501,7 +641501,7 @@ sub_8159BFC: ; 8159BFC
 	thumb_func_end sub_8159BFC
 
 	thumb_func_start sub_8159C08
-sub_8159C08: ; 8159C08
+sub_8159C08: @ 8159C08
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641509,7 +641509,7 @@ sub_8159C08: ; 8159C08
 	thumb_func_end sub_8159C08
 
 	thumb_func_start sub_8159C14
-sub_8159C14: ; 8159C14
+sub_8159C14: @ 8159C14
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641517,7 +641517,7 @@ sub_8159C14: ; 8159C14
 	thumb_func_end sub_8159C14
 
 	thumb_func_start sub_8159C20
-sub_8159C20: ; 8159C20
+sub_8159C20: @ 8159C20
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641525,7 +641525,7 @@ sub_8159C20: ; 8159C20
 	thumb_func_end sub_8159C20
 
 	thumb_func_start sub_8159C2C
-sub_8159C2C: ; 8159C2C
+sub_8159C2C: @ 8159C2C
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641533,7 +641533,7 @@ sub_8159C2C: ; 8159C2C
 	thumb_func_end sub_8159C2C
 
 	thumb_func_start sub_8159C38
-sub_8159C38: ; 8159C38
+sub_8159C38: @ 8159C38
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641541,7 +641541,7 @@ sub_8159C38: ; 8159C38
 	thumb_func_end sub_8159C38
 
 	thumb_func_start sub_8159C44
-sub_8159C44: ; 8159C44
+sub_8159C44: @ 8159C44
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641549,7 +641549,7 @@ sub_8159C44: ; 8159C44
 	thumb_func_end sub_8159C44
 
 	thumb_func_start sub_8159C50
-sub_8159C50: ; 8159C50
+sub_8159C50: @ 8159C50
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641557,7 +641557,7 @@ sub_8159C50: ; 8159C50
 	thumb_func_end sub_8159C50
 
 	thumb_func_start sub_8159C5C
-sub_8159C5C: ; 8159C5C
+sub_8159C5C: @ 8159C5C
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641565,7 +641565,7 @@ sub_8159C5C: ; 8159C5C
 	thumb_func_end sub_8159C5C
 
 	thumb_func_start sub_8159C68
-sub_8159C68: ; 8159C68
+sub_8159C68: @ 8159C68
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641573,7 +641573,7 @@ sub_8159C68: ; 8159C68
 	thumb_func_end sub_8159C68
 
 	thumb_func_start sub_8159C74
-sub_8159C74: ; 8159C74
+sub_8159C74: @ 8159C74
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641581,7 +641581,7 @@ sub_8159C74: ; 8159C74
 	thumb_func_end sub_8159C74
 
 	thumb_func_start sub_8159C80
-sub_8159C80: ; 8159C80
+sub_8159C80: @ 8159C80
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -641614,7 +641614,7 @@ _08159C94:
 	thumb_func_end sub_8159C80
 
 	thumb_func_start dp01t_34_6_move_anim_start_t3
-dp01t_34_6_move_anim_start_t3: ; 8159CC4
+dp01t_34_6_move_anim_start_t3: @ 8159CC4
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -641657,7 +641657,7 @@ _08159D14:
 	thumb_func_end dp01t_34_6_move_anim_start_t3
 
 	thumb_func_start sub_8159D20
-sub_8159D20: ; 8159D20
+sub_8159D20: @ 8159D20
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -641682,7 +641682,7 @@ sub_8159D20: ; 8159D20
 	thumb_func_end sub_8159D20
 
 	thumb_func_start dp01t_2E_6_battle_intro
-dp01t_2E_6_battle_intro: ; 8159D5C
+dp01t_2E_6_battle_intro: @ 8159D5C
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -641704,7 +641704,7 @@ dp01t_2E_6_battle_intro: ; 8159D5C
 	thumb_func_end dp01t_2E_6_battle_intro
 
 	thumb_func_start sub_8159D90
-sub_8159D90: ; 8159D90
+sub_8159D90: @ 8159D90
 	push {r4,r5,lr}
 	ldr r5, =0x03005d70
 	ldr r4, =0x02024064
@@ -641740,7 +641740,7 @@ sub_8159D90: ; 8159D90
 	thumb_func_end sub_8159D90
 
 	thumb_func_start sub_8159DEC
-sub_8159DEC: ; 8159DEC
+sub_8159DEC: @ 8159DEC
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641748,7 +641748,7 @@ sub_8159DEC: ; 8159DEC
 	thumb_func_end sub_8159DEC
 
 	thumb_func_start sub_8159DF8
-sub_8159DF8: ; 8159DF8
+sub_8159DF8: @ 8159DF8
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641756,7 +641756,7 @@ sub_8159DF8: ; 8159DF8
 	thumb_func_end sub_8159DF8
 
 	thumb_func_start sub_8159E04
-sub_8159E04: ; 8159E04
+sub_8159E04: @ 8159E04
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641764,7 +641764,7 @@ sub_8159E04: ; 8159E04
 	thumb_func_end sub_8159E04
 
 	thumb_func_start sub_8159E10
-sub_8159E10: ; 8159E10
+sub_8159E10: @ 8159E10
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641772,7 +641772,7 @@ sub_8159E10: ; 8159E10
 	thumb_func_end sub_8159E10
 
 	thumb_func_start sub_8159E1C
-sub_8159E1C: ; 8159E1C
+sub_8159E1C: @ 8159E1C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02023064
@@ -641816,7 +641816,7 @@ _08159E68:
 	thumb_func_end sub_8159E1C
 
 	thumb_func_start sub_8159E78
-sub_8159E78: ; 8159E78
+sub_8159E78: @ 8159E78
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641824,7 +641824,7 @@ sub_8159E78: ; 8159E78
 	thumb_func_end sub_8159E78
 
 	thumb_func_start sub_8159E84
-sub_8159E84: ; 8159E84
+sub_8159E84: @ 8159E84
 	push {lr}
 	bl dp01_tbl6_exec_completed
 	pop {r0}
@@ -641832,7 +641832,7 @@ sub_8159E84: ; 8159E84
 	thumb_func_end sub_8159E84
 
 	thumb_func_start sub_8159E90
-sub_8159E90: ; 8159E90
+sub_8159E90: @ 8159E90
 	push {r4,lr}
 	ldr r2, =0x0202433a
 	ldr r1, =0x02023064
@@ -641868,12 +641868,12 @@ _08159ECC:
 	thumb_func_end sub_8159E90
 
 	thumb_func_start nullsub_115
-nullsub_115: ; 8159EEC
+nullsub_115: @ 8159EEC
 	bx lr
 	thumb_func_end nullsub_115
 
 	thumb_func_start sub_8159EF0
-sub_8159EF0: ; 8159EF0
+sub_8159EF0: @ 8159EF0
 	ldr r1, =0x03005db0
 	ldr r0, =hm_add_c3_launch_phase_2
 	str r0, [r1]
@@ -641886,7 +641886,7 @@ sub_8159EF0: ; 8159EF0
 	thumb_func_end sub_8159EF0
 
 	thumb_func_start hm2_sweet_scent
-hm2_sweet_scent: ; 8159F10
+hm2_sweet_scent: @ 8159F10
 	push {lr}
 	movs r0, 0x33
 	bl FieldEffectStart
@@ -641901,7 +641901,7 @@ hm2_sweet_scent: ; 8159F10
 	thumb_func_end hm2_sweet_scent
 
 	thumb_func_start sub_8159F2C
-sub_8159F2C: ; 8159F2C
+sub_8159F2C: @ 8159F2C
 	push {lr}
 	bl sub_80AC3D0
 	bl oei_task_add
@@ -641923,7 +641923,7 @@ sub_8159F2C: ; 8159F2C
 	thumb_func_end sub_8159F2C
 
 	thumb_func_start sub_8159F5C
-sub_8159F5C: ; 8159F5C
+sub_8159F5C: @ 8159F5C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r0, 0xEC
@@ -641981,7 +641981,7 @@ sub_8159F5C: ; 8159F5C
 	thumb_func_end sub_8159F5C
 
 	thumb_func_start sub_8159FEC
-sub_8159FEC: ; 8159FEC
+sub_8159FEC: @ 8159FEC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -642056,7 +642056,7 @@ _0815A088:
 	thumb_func_end sub_8159FEC
 
 	thumb_func_start sub_815A090
-sub_815A090: ; 815A090
+sub_815A090: @ 815A090
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -642084,7 +642084,7 @@ _0815A0BE:
 	thumb_func_end sub_815A090
 
 	thumb_func_start sub_815A0D4
-sub_815A0D4: ; 815A0D4
+sub_815A0D4: @ 815A0D4
 	push {lr}
 	adds r2, r0, 0
 	ldr r1, =0x0203841e
@@ -642118,7 +642118,7 @@ _0815A100:
 	thumb_func_end sub_815A0D4
 
 	thumb_func_start sub_815A114
-sub_815A114: ; 815A114
+sub_815A114: @ 815A114
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0x30
@@ -642160,7 +642160,7 @@ _0815A15A:
 	thumb_func_end sub_815A114
 
 	thumb_func_start sub_815A160
-sub_815A160: ; 815A160
+sub_815A160: @ 815A160
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -642198,7 +642198,7 @@ sub_815A160: ; 815A160
 	thumb_func_end sub_815A160
 
 	thumb_func_start sub_815A1B0
-sub_815A1B0: ; 815A1B0
+sub_815A1B0: @ 815A1B0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5A
@@ -642230,7 +642230,7 @@ sub_815A1B0: ; 815A1B0
 	thumb_func_end sub_815A1B0
 
 	thumb_func_start sub_815A1F4
-sub_815A1F4: ; 815A1F4
+sub_815A1F4: @ 815A1F4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -642264,7 +642264,7 @@ _0815A228:
 	thumb_func_end sub_815A1F4
 
 	thumb_func_start sub_815A234
-sub_815A234: ; 815A234
+sub_815A234: @ 815A234
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -642281,7 +642281,7 @@ sub_815A234: ; 815A234
 	thumb_func_end sub_815A234
 
 	thumb_func_start sub_815A254
-sub_815A254: ; 815A254
+sub_815A254: @ 815A254
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -642350,7 +642350,7 @@ _0815A2B2:
 	thumb_func_end sub_815A254
 
 	thumb_func_start sub_815A2F0
-sub_815A2F0: ; 815A2F0
+sub_815A2F0: @ 815A2F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xFD
@@ -642372,7 +642372,7 @@ sub_815A2F0: ; 815A2F0
 	thumb_func_end sub_815A2F0
 
 	thumb_func_start sub_815A31C
-sub_815A31C: ; 815A31C
+sub_815A31C: @ 815A31C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -642447,7 +642447,7 @@ _0815A3A0:
 	thumb_func_end sub_815A31C
 
 	thumb_func_start sub_815A3AC
-sub_815A3AC: ; 815A3AC
+sub_815A3AC: @ 815A3AC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x32]
@@ -642485,7 +642485,7 @@ _0815A3E8:
 	thumb_func_end sub_815A3AC
 
 	thumb_func_start sub_815A3F0
-sub_815A3F0: ; 815A3F0
+sub_815A3F0: @ 815A3F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -642568,7 +642568,7 @@ _0815A48C:
 	thumb_func_end sub_815A3F0
 
 	thumb_func_start sub_815A49C
-sub_815A49C: ; 815A49C
+sub_815A49C: @ 815A49C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -642623,7 +642623,7 @@ _0815A4FE:
 	thumb_func_end sub_815A49C
 
 	thumb_func_start sub_815A504
-sub_815A504: ; 815A504
+sub_815A504: @ 815A504
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -642642,7 +642642,7 @@ sub_815A504: ; 815A504
 	thumb_func_end sub_815A504
 
 	thumb_func_start sub_815A52C
-sub_815A52C: ; 815A52C
+sub_815A52C: @ 815A52C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -642718,7 +642718,7 @@ _0815A5AC:
 	thumb_func_end sub_815A52C
 
 	thumb_func_start c3_80DE6F0
-c3_80DE6F0: ; 815A5C8
+c3_80DE6F0: @ 815A5C8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -642737,7 +642737,7 @@ c3_80DE6F0: ; 815A5C8
 	thumb_func_end c3_80DE6F0
 
 	thumb_func_start sub_815A5F0
-sub_815A5F0: ; 815A5F0
+sub_815A5F0: @ 815A5F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -642840,7 +642840,7 @@ _0815A6A2:
 	thumb_func_end sub_815A5F0
 
 	thumb_func_start sub_815A6C4
-sub_815A6C4: ; 815A6C4
+sub_815A6C4: @ 815A6C4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -642891,7 +642891,7 @@ _0815A6F8:
 	thumb_func_end sub_815A6C4
 
 	thumb_func_start sub_815A73C
-sub_815A73C: ; 815A73C
+sub_815A73C: @ 815A73C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -642915,7 +642915,7 @@ _0815A75E:
 	thumb_func_end sub_815A73C
 
 	thumb_func_start sub_815A76C
-sub_815A76C: ; 815A76C
+sub_815A76C: @ 815A76C
 	push {lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x30]
@@ -642954,7 +642954,7 @@ _0815A7AC:
 	thumb_func_end sub_815A76C
 
 	thumb_func_start sub_815A7B0
-sub_815A7B0: ; 815A7B0
+sub_815A7B0: @ 815A7B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_80A6838
@@ -642979,7 +642979,7 @@ sub_815A7B0: ; 815A7B0
 	thumb_func_end sub_815A7B0
 
 	thumb_func_start sub_815A7EC
-sub_815A7EC: ; 815A7EC
+sub_815A7EC: @ 815A7EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -643074,7 +643074,7 @@ _0815A8A4:
 	thumb_func_end sub_815A7EC
 
 	thumb_func_start sub_815A8AC
-sub_815A8AC: ; 815A8AC
+sub_815A8AC: @ 815A8AC
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -643091,7 +643091,7 @@ _0815A8C2:
 	thumb_func_end sub_815A8AC
 
 	thumb_func_start sub_815A8C8
-sub_815A8C8: ; 815A8C8
+sub_815A8C8: @ 815A8C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -643120,7 +643120,7 @@ _0815A8F0:
 	thumb_func_end sub_815A8C8
 
 	thumb_func_start sub_815A904
-sub_815A904: ; 815A904
+sub_815A904: @ 815A904
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -643145,7 +643145,7 @@ _0815A924:
 	thumb_func_end sub_815A904
 
 	thumb_func_start sub_815A934
-sub_815A934: ; 815A934
+sub_815A934: @ 815A934
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r1, =0x00001f3f
@@ -643191,7 +643191,7 @@ sub_815A934: ; 815A934
 	thumb_func_end sub_815A934
 
 	thumb_func_start sub_815A9A0
-sub_815A9A0: ; 815A9A0
+sub_815A9A0: @ 815A9A0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -643295,7 +643295,7 @@ _0815AA60:
 	thumb_func_end sub_815A9A0
 
 	thumb_func_start sub_815AA6C
-sub_815AA6C: ; 815AA6C
+sub_815AA6C: @ 815AA6C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x00003f3f
@@ -643321,7 +643321,7 @@ sub_815AA6C: ; 815AA6C
 	thumb_func_end sub_815AA6C
 
 	thumb_func_start sub_815AAA4
-sub_815AAA4: ; 815AAA4
+sub_815AAA4: @ 815AAA4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -643404,7 +643404,7 @@ _0815AB46:
 	thumb_func_end sub_815AAA4
 
 	thumb_func_start sub_815AB5C
-sub_815AB5C: ; 815AB5C
+sub_815AB5C: @ 815AB5C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x32]
@@ -643466,7 +643466,7 @@ _0815ABC8:
 	thumb_func_end sub_815AB5C
 
 	thumb_func_start sub_815ABD0
-sub_815ABD0: ; 815ABD0
+sub_815ABD0: @ 815ABD0
 	push {lr}
 	ldrb r2, [r0, 0x1]
 	movs r1, 0xD
@@ -643483,7 +643483,7 @@ sub_815ABD0: ; 815ABD0
 	thumb_func_end sub_815ABD0
 
 	thumb_func_start sub_815ABEC
-sub_815ABEC: ; 815ABEC
+sub_815ABEC: @ 815ABEC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -643542,7 +643542,7 @@ _0815AC70:
 	thumb_func_end sub_815ABEC
 
 	thumb_func_start sub_815AC8C
-sub_815AC8C: ; 815AC8C
+sub_815AC8C: @ 815AC8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -643572,7 +643572,7 @@ _0815ACB8:
 	thumb_func_end sub_815AC8C
 
 	thumb_func_start sub_815ACD0
-sub_815ACD0: ; 815ACD0
+sub_815ACD0: @ 815ACD0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -643630,7 +643630,7 @@ _0815AD26:
 	thumb_func_end sub_815ACD0
 
 	thumb_func_start sub_815AD4C
-sub_815AD4C: ; 815AD4C
+sub_815AD4C: @ 815AD4C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -643681,7 +643681,7 @@ _0815ADAA:
 	thumb_func_end sub_815AD4C
 
 	thumb_func_start sub_815ADB0
-sub_815ADB0: ; 815ADB0
+sub_815ADB0: @ 815ADB0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -643818,7 +643818,7 @@ _0815AEA2:
 	thumb_func_end sub_815ADB0
 
 	thumb_func_start sub_815AED8
-sub_815AED8: ; 815AED8
+sub_815AED8: @ 815AED8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -643969,7 +643969,7 @@ _0815AFE0:
 	thumb_func_end sub_815AED8
 
 	thumb_func_start sub_815AFF0
-sub_815AFF0: ; 815AFF0
+sub_815AFF0: @ 815AFF0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -644013,7 +644013,7 @@ sub_815AFF0: ; 815AFF0
 	thumb_func_end sub_815AFF0
 
 	thumb_func_start sub_815B054
-sub_815B054: ; 815B054
+sub_815B054: @ 815B054
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -644251,7 +644251,7 @@ _0815B22E:
 	thumb_func_end sub_815B054
 
 	thumb_func_start sub_815B23C
-sub_815B23C: ; 815B23C
+sub_815B23C: @ 815B23C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -644285,7 +644285,7 @@ _0815B270:
 	thumb_func_end sub_815B23C
 
 	thumb_func_start sub_815B27C
-sub_815B27C: ; 815B27C
+sub_815B27C: @ 815B27C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -644379,7 +644379,7 @@ _0815B324:
 	thumb_func_end sub_815B27C
 
 	thumb_func_start sub_815B338
-sub_815B338: ; 815B338
+sub_815B338: @ 815B338
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -644425,7 +644425,7 @@ _0815B38E:
 	thumb_func_end sub_815B338
 
 	thumb_func_start sub_815B394
-sub_815B394: ; 815B394
+sub_815B394: @ 815B394
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0
@@ -644557,7 +644557,7 @@ _0815B496:
 	thumb_func_end sub_815B394
 
 	thumb_func_start sub_815B49C
-sub_815B49C: ; 815B49C
+sub_815B49C: @ 815B49C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -644585,7 +644585,7 @@ _0815B4C0:
 	thumb_func_end sub_815B49C
 
 	thumb_func_start sub_815B4D4
-sub_815B4D4: ; 815B4D4
+sub_815B4D4: @ 815B4D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -644665,7 +644665,7 @@ _0815B566:
 	thumb_func_end sub_815B4D4
 
 	thumb_func_start sub_815B570
-sub_815B570: ; 815B570
+sub_815B570: @ 815B570
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GenerateRandomNumber2
@@ -644713,7 +644713,7 @@ _0815B5B4:
 	thumb_func_end sub_815B570
 
 	thumb_func_start sub_815B5D0
-sub_815B5D0: ; 815B5D0
+sub_815B5D0: @ 815B5D0
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -644791,7 +644791,7 @@ _0815B654:
 	thumb_func_end sub_815B5D0
 
 	thumb_func_start sub_815B65C
-sub_815B65C: ; 815B65C
+sub_815B65C: @ 815B65C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -644833,7 +644833,7 @@ _0815B6AE:
 	thumb_func_end sub_815B65C
 
 	thumb_func_start sub_815B6B4
-sub_815B6B4: ; 815B6B4
+sub_815B6B4: @ 815B6B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -644875,7 +644875,7 @@ _0815B706:
 	thumb_func_end sub_815B6B4
 
 	thumb_func_start sub_815B70C
-sub_815B70C: ; 815B70C
+sub_815B70C: @ 815B70C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -644931,7 +644931,7 @@ _0815B770:
 	thumb_func_end sub_815B70C
 
 	thumb_func_start sub_815B778
-sub_815B778: ; 815B778
+sub_815B778: @ 815B778
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -644973,7 +644973,7 @@ _0815B7CA:
 	thumb_func_end sub_815B778
 
 	thumb_func_start sub_815B7D0
-sub_815B7D0: ; 815B7D0
+sub_815B7D0: @ 815B7D0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -645350,7 +645350,7 @@ _0815BAFC:
 	thumb_func_end sub_815B7D0
 
 	thumb_func_start c3_80DFBE4
-c3_80DFBE4: ; 815BB18
+c3_80DFBE4: @ 815BB18
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -645378,7 +645378,7 @@ c3_80DFBE4: ; 815BB18
 	thumb_func_end c3_80DFBE4
 
 	thumb_func_start sub_815BB58
-sub_815BB58: ; 815BB58
+sub_815BB58: @ 815BB58
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -645398,7 +645398,7 @@ sub_815BB58: ; 815BB58
 	thumb_func_end sub_815BB58
 
 	thumb_func_start sub_815BB84
-sub_815BB84: ; 815BB84
+sub_815BB84: @ 815BB84
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -645677,7 +645677,7 @@ _0815BDF2:
 	thumb_func_end sub_815BB84
 
 	thumb_func_start sub_815BE04
-sub_815BE04: ; 815BE04
+sub_815BE04: @ 815BE04
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -645821,7 +645821,7 @@ _0815BE2E:
 	thumb_func_end sub_815BE04
 
 	thumb_func_start sub_815BF44
-sub_815BF44: ; 815BF44
+sub_815BF44: @ 815BF44
 	push {lr}
 	adds r3, r0, 0
 	ldrh r2, [r3, 0x32]
@@ -645913,7 +645913,7 @@ _0815BFE8:
 	thumb_func_end sub_815BF44
 
 	thumb_func_start sub_815BFF4
-sub_815BFF4: ; 815BFF4
+sub_815BFF4: @ 815BFF4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02020630
@@ -645957,7 +645957,7 @@ _0815C040:
 	thumb_func_end sub_815BFF4
 
 	thumb_func_start sub_815C050
-sub_815C050: ; 815C050
+sub_815C050: @ 815C050
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x3E
@@ -646003,7 +646003,7 @@ _0815C09C:
 	thumb_func_end sub_815C050
 
 	thumb_func_start sub_815C0A4
-sub_815C0A4: ; 815C0A4
+sub_815C0A4: @ 815C0A4
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -646335,7 +646335,7 @@ _0815C396:
 	thumb_func_end sub_815C0A4
 
 	thumb_func_start sub_815C3A8
-sub_815C3A8: ; 815C3A8
+sub_815C3A8: @ 815C3A8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -646377,7 +646377,7 @@ _0815C3FA:
 	thumb_func_end sub_815C3A8
 
 	thumb_func_start sub_815C400
-sub_815C400: ; 815C400
+sub_815C400: @ 815C400
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -646440,7 +646440,7 @@ _0815C472:
 	thumb_func_end sub_815C400
 
 	thumb_func_start sub_815C478
-sub_815C478: ; 815C478
+sub_815C478: @ 815C478
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -646541,7 +646541,7 @@ _0815C538:
 	thumb_func_end sub_815C478
 
 	thumb_func_start sub_815C548
-sub_815C548: ; 815C548
+sub_815C548: @ 815C548
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -646718,7 +646718,7 @@ _0815C6A8:
 	thumb_func_end sub_815C548
 
 	thumb_func_start sub_815C6B0
-sub_815C6B0: ; 815C6B0
+sub_815C6B0: @ 815C6B0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038436
@@ -646755,7 +646755,7 @@ _0815C6DE:
 	thumb_func_end sub_815C6B0
 
 	thumb_func_start sub_815C700
-sub_815C700: ; 815C700
+sub_815C700: @ 815C700
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -646813,7 +646813,7 @@ _0815C768:
 	thumb_func_end sub_815C700
 
 	thumb_func_start sub_815C770
-sub_815C770: ; 815C770
+sub_815C770: @ 815C770
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -646851,7 +646851,7 @@ sub_815C770: ; 815C770
 	thumb_func_end sub_815C770
 
 	thumb_func_start sub_815C7C4
-sub_815C7C4: ; 815C7C4
+sub_815C7C4: @ 815C7C4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -647057,7 +647057,7 @@ _0815C950:
 	thumb_func_end sub_815C7C4
 
 	thumb_func_start sub_815C95C
-sub_815C95C: ; 815C95C
+sub_815C95C: @ 815C95C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -647156,7 +647156,7 @@ _0815CA1A:
 	thumb_func_end sub_815C95C
 
 	thumb_func_start sub_815CA20
-sub_815CA20: ; 815CA20
+sub_815CA20: @ 815CA20
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -647328,7 +647328,7 @@ _0815CB78:
 	thumb_func_end sub_815CA20
 
 	thumb_func_start sub_815CB88
-sub_815CB88: ; 815CB88
+sub_815CB88: @ 815CB88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl GenerateRandomNumber2
@@ -647410,7 +647410,7 @@ _0815CC1E:
 	thumb_func_end sub_815CB88
 
 	thumb_func_start sub_815CC34
-sub_815CC34: ; 815CC34
+sub_815CC34: @ 815CC34
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -647465,7 +647465,7 @@ _0815CC8E:
 	thumb_func_end sub_815CC34
 
 	thumb_func_start sub_815CC94
-sub_815CC94: ; 815CC94
+sub_815CC94: @ 815CC94
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r1, =0x00001f3f
@@ -647514,7 +647514,7 @@ sub_815CC94: ; 815CC94
 	thumb_func_end sub_815CC94
 
 	thumb_func_start sub_815CD0C
-sub_815CD0C: ; 815CD0C
+sub_815CD0C: @ 815CD0C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -647603,7 +647603,7 @@ _0815CDAA:
 	thumb_func_end sub_815CD0C
 
 	thumb_func_start sub_815CDB4
-sub_815CDB4: ; 815CDB4
+sub_815CDB4: @ 815CDB4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02038436
@@ -647635,7 +647635,7 @@ sub_815CDB4: ; 815CDB4
 	thumb_func_end sub_815CDB4
 
 	thumb_func_start sub_815CDFC
-sub_815CDFC: ; 815CDFC
+sub_815CDFC: @ 815CDFC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -647741,7 +647741,7 @@ _0815CEC8:
 	thumb_func_end sub_815CDFC
 
 	thumb_func_start sub_815CED8
-sub_815CED8: ; 815CED8
+sub_815CED8: @ 815CED8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -648026,7 +648026,7 @@ _0815D05A:
 	thumb_func_end sub_815CED8
 
 	thumb_func_start sub_815D160
-sub_815D160: ; 815D160
+sub_815D160: @ 815D160
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -648073,7 +648073,7 @@ _0815D1AE:
 	thumb_func_end sub_815D160
 
 	thumb_func_start sub_815D1BC
-sub_815D1BC: ; 815D1BC
+sub_815D1BC: @ 815D1BC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -648135,7 +648135,7 @@ _0815D22A:
 	thumb_func_end sub_815D1BC
 
 	thumb_func_start sub_815D240
-sub_815D240: ; 815D240
+sub_815D240: @ 815D240
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -648281,7 +648281,7 @@ _0815D326:
 	thumb_func_end sub_815D240
 
 	thumb_func_start sub_815D398
-sub_815D398: ; 815D398
+sub_815D398: @ 815D398
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -648627,7 +648627,7 @@ _0815D63C:
 	thumb_func_end sub_815D398
 
 	thumb_func_start sub_815D64C
-sub_815D64C: ; 815D64C
+sub_815D64C: @ 815D64C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -648657,7 +648657,7 @@ sub_815D64C: ; 815D64C
 	thumb_func_end sub_815D64C
 
 	thumb_func_start sub_815D694
-sub_815D694: ; 815D694
+sub_815D694: @ 815D694
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -648730,7 +648730,7 @@ _0815D720:
 	thumb_func_end sub_815D694
 
 	thumb_func_start sub_815D72C
-sub_815D72C: ; 815D72C
+sub_815D72C: @ 815D72C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -648784,7 +648784,7 @@ sub_815D72C: ; 815D72C
 	thumb_func_end sub_815D72C
 
 	thumb_func_start sub_815D794
-sub_815D794: ; 815D794
+sub_815D794: @ 815D794
 	ldrh r1, [r0, 0x3A]
 	ldrh r2, [r0, 0x36]
 	adds r1, r2
@@ -648803,7 +648803,7 @@ sub_815D794: ; 815D794
 	thumb_func_end sub_815D794
 
 	thumb_func_start sub_815D7B4
-sub_815D7B4: ; 815D7B4
+sub_815D7B4: @ 815D7B4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -648840,7 +648840,7 @@ sub_815D7B4: ; 815D7B4
 	thumb_func_end sub_815D7B4
 
 	thumb_func_start sub_815D804
-sub_815D804: ; 815D804
+sub_815D804: @ 815D804
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x2E]
@@ -648896,7 +648896,7 @@ _0815D86A:
 	thumb_func_end sub_815D804
 
 	thumb_func_start sub_815D870
-sub_815D870: ; 815D870
+sub_815D870: @ 815D870
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x0203841e
@@ -648941,7 +648941,7 @@ _0815D896:
 	thumb_func_end sub_815D870
 
 	thumb_func_start sub_815D8D8
-sub_815D8D8: ; 815D8D8
+sub_815D8D8: @ 815D8D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -649112,7 +649112,7 @@ _0815DA12:
 	thumb_func_end sub_815D8D8
 
 	thumb_func_start sub_815DA20
-sub_815DA20: ; 815DA20
+sub_815DA20: @ 815DA20
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -649302,7 +649302,7 @@ _0815DB80:
 	thumb_func_end sub_815DA20
 
 	thumb_func_start sub_815DB90
-sub_815DB90: ; 815DB90
+sub_815DB90: @ 815DB90
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -649424,7 +649424,7 @@ _0815DC74:
 	thumb_func_end sub_815DB90
 
 	thumb_func_start sub_815DCA4
-sub_815DCA4: ; 815DCA4
+sub_815DCA4: @ 815DCA4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -649494,7 +649494,7 @@ _0815DCEA:
 	thumb_func_end sub_815DCA4
 
 	thumb_func_start sub_815DD48
-sub_815DD48: ; 815DD48
+sub_815DD48: @ 815DD48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -649571,7 +649571,7 @@ _0815DDDA:
 	thumb_func_end sub_815DD48
 
 	thumb_func_start sub_815DDE0
-sub_815DDE0: ; 815DDE0
+sub_815DDE0: @ 815DDE0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -649681,7 +649681,7 @@ _0815DE98:
 	thumb_func_end sub_815DDE0
 
 	thumb_func_start sub_815DEBC
-sub_815DEBC: ; 815DEBC
+sub_815DEBC: @ 815DEBC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -649724,7 +649724,7 @@ _0815DF02:
 	thumb_func_end sub_815DEBC
 
 	thumb_func_start sub_815DF0C
-sub_815DF0C: ; 815DF0C
+sub_815DF0C: @ 815DF0C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -649764,7 +649764,7 @@ sub_815DF0C: ; 815DF0C
 	thumb_func_end sub_815DF0C
 
 	thumb_func_start sub_815DF64
-sub_815DF64: ; 815DF64
+sub_815DF64: @ 815DF64
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -649817,7 +649817,7 @@ _0815DFC6:
 	thumb_func_end sub_815DF64
 
 	thumb_func_start sub_815DFCC
-sub_815DFCC: ; 815DFCC
+sub_815DFCC: @ 815DFCC
 	push {lr}
 	sub sp, 0x1C
 	lsls r0, 24
@@ -649850,7 +649850,7 @@ sub_815DFCC: ; 815DFCC
 	thumb_func_end sub_815DFCC
 
 	thumb_func_start sub_815E01C
-sub_815E01C: ; 815E01C
+sub_815E01C: @ 815E01C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r6, =0x02038436
@@ -649940,7 +649940,7 @@ _0815E0C8:
 	thumb_func_end sub_815E01C
 
 	thumb_func_start sub_815E0DC
-sub_815E0DC: ; 815E0DC
+sub_815E0DC: @ 815E0DC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -649972,7 +649972,7 @@ _0815E110:
 	thumb_func_end sub_815E0DC
 
 	thumb_func_start sub_815E114
-sub_815E114: ; 815E114
+sub_815E114: @ 815E114
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -650087,7 +650087,7 @@ _0815E1D0:
 	thumb_func_end sub_815E114
 
 	thumb_func_start sub_815E20C
-sub_815E20C: ; 815E20C
+sub_815E20C: @ 815E20C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -650252,7 +650252,7 @@ _0815E33E:
 	thumb_func_end sub_815E20C
 
 	thumb_func_start sub_815E34C
-sub_815E34C: ; 815E34C
+sub_815E34C: @ 815E34C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -650348,7 +650348,7 @@ _0815E3F2:
 	thumb_func_end sub_815E34C
 
 	thumb_func_start sub_815E404
-sub_815E404: ; 815E404
+sub_815E404: @ 815E404
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -650383,7 +650383,7 @@ _0815E43A:
 	thumb_func_end sub_815E404
 
 	thumb_func_start sub_815E444
-sub_815E444: ; 815E444
+sub_815E444: @ 815E444
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203841e
@@ -650409,7 +650409,7 @@ sub_815E444: ; 815E444
 	thumb_func_end sub_815E444
 
 	thumb_func_start sub_815E47C
-sub_815E47C: ; 815E47C
+sub_815E47C: @ 815E47C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -650561,7 +650561,7 @@ _0815E5BE:
 	thumb_func_end sub_815E47C
 
 	thumb_func_start sub_815E5CC
-sub_815E5CC: ; 815E5CC
+sub_815E5CC: @ 815E5CC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -650695,7 +650695,7 @@ _0815E6D2:
 	thumb_func_end sub_815E5CC
 
 	thumb_func_start sub_815E6D8
-sub_815E6D8: ; 815E6D8
+sub_815E6D8: @ 815E6D8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -650777,7 +650777,7 @@ _0815E772:
 	thumb_func_end sub_815E6D8
 
 	thumb_func_start sub_815E784
-sub_815E784: ; 815E784
+sub_815E784: @ 815E784
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x2E
@@ -650883,7 +650883,7 @@ _0815E83C:
 	thumb_func_end sub_815E784
 
 	thumb_func_start sub_815E840
-sub_815E840: ; 815E840
+sub_815E840: @ 815E840
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -650923,7 +650923,7 @@ _0815E884:
 	thumb_func_end sub_815E840
 
 	thumb_func_start sub_815E898
-sub_815E898: ; 815E898
+sub_815E898: @ 815E898
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -651012,7 +651012,7 @@ _0815E94E:
 	thumb_func_end sub_815E898
 
 	thumb_func_start sub_815E954
-sub_815E954: ; 815E954
+sub_815E954: @ 815E954
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r0, =0x0203841e
@@ -651060,7 +651060,7 @@ _0815E996:
 	thumb_func_end sub_815E954
 
 	thumb_func_start sub_815E9BC
-sub_815E9BC: ; 815E9BC
+sub_815E9BC: @ 815E9BC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -651108,7 +651108,7 @@ _0815EA10:
 	thumb_func_end sub_815E9BC
 
 	thumb_func_start sub_815EA14
-sub_815EA14: ; 815EA14
+sub_815EA14: @ 815EA14
 	push {lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203841e
@@ -651147,7 +651147,7 @@ _0815EA4A:
 	thumb_func_end sub_815EA14
 
 	thumb_func_start sub_815EA60
-sub_815EA60: ; 815EA60
+sub_815EA60: @ 815EA60
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -651394,7 +651394,7 @@ _0815EC40:
 	thumb_func_end sub_815EA60
 
 	thumb_func_start sub_815EC48
-sub_815EC48: ; 815EC48
+sub_815EC48: @ 815EC48
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -651464,7 +651464,7 @@ _0815ECD4:
 	thumb_func_end sub_815EC48
 
 	thumb_func_start sub_815ECE4
-sub_815ECE4: ; 815ECE4
+sub_815ECE4: @ 815ECE4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -651673,7 +651673,7 @@ _0815EE78:
 	thumb_func_end sub_815ECE4
 
 	thumb_func_start sub_815EE84
-sub_815EE84: ; 815EE84
+sub_815EE84: @ 815EE84
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203841e
@@ -651736,7 +651736,7 @@ _0815EECE:
 	thumb_func_end sub_815EE84
 
 	thumb_func_start sub_815EF08
-sub_815EF08: ; 815EF08
+sub_815EF08: @ 815EF08
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x38
@@ -652001,7 +652001,7 @@ _0815F106:
 	thumb_func_end sub_815EF08
 
 	thumb_func_start sub_815F10C
-sub_815F10C: ; 815F10C
+sub_815F10C: @ 815F10C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -652066,7 +652066,7 @@ _0815F17C:
 	thumb_func_end sub_815F10C
 
 	thumb_func_start sub_815F18C
-sub_815F18C: ; 815F18C
+sub_815F18C: @ 815F18C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -652127,7 +652127,7 @@ _0815F1DE:
 	thumb_func_end sub_815F18C
 
 	thumb_func_start sub_815F20C
-sub_815F20C: ; 815F20C
+sub_815F20C: @ 815F20C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -652264,7 +652264,7 @@ _0815F310:
 	thumb_func_end sub_815F20C
 
 	thumb_func_start sub_815F330
-sub_815F330: ; 815F330
+sub_815F330: @ 815F330
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -652435,7 +652435,7 @@ _0815F482:
 	thumb_func_end sub_815F330
 
 	thumb_func_start sub_815F48C
-sub_815F48C: ; 815F48C
+sub_815F48C: @ 815F48C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038437
@@ -652479,7 +652479,7 @@ _0815F4C8:
 	thumb_func_end sub_815F48C
 
 	thumb_func_start sub_815F4F0
-sub_815F4F0: ; 815F4F0
+sub_815F4F0: @ 815F4F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -652629,7 +652629,7 @@ _0815F61A:
 	thumb_func_end sub_815F4F0
 
 	thumb_func_start sub_815F620
-sub_815F620: ; 815F620
+sub_815F620: @ 815F620
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -652806,7 +652806,7 @@ _0815F780:
 	thumb_func_end sub_815F620
 
 	thumb_func_start sub_815F79C
-sub_815F79C: ; 815F79C
+sub_815F79C: @ 815F79C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -652828,7 +652828,7 @@ _0815F7BA:
 	thumb_func_end sub_815F79C
 
 	thumb_func_start sub_815F7C4
-sub_815F7C4: ; 815F7C4
+sub_815F7C4: @ 815F7C4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -652940,7 +652940,7 @@ _0815F896:
 	thumb_func_end sub_815F7C4
 
 	thumb_func_start sub_815F8A0
-sub_815F8A0: ; 815F8A0
+sub_815F8A0: @ 815F8A0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -652985,7 +652985,7 @@ _0815F8E0:
 	thumb_func_end sub_815F8A0
 
 	thumb_func_start sub_815F8F4
-sub_815F8F4: ; 815F8F4
+sub_815F8F4: @ 815F8F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -653616,7 +653616,7 @@ _0815FE68:
 	thumb_func_end sub_815F8F4
 
 	thumb_func_start sub_815FE80
-sub_815FE80: ; 815FE80
+sub_815FE80: @ 815FE80
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -653769,7 +653769,7 @@ _0815FFBC:
 	thumb_func_end sub_815FE80
 
 	thumb_func_start sub_815FFC4
-sub_815FFC4: ; 815FFC4
+sub_815FFC4: @ 815FFC4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -653961,7 +653961,7 @@ _08160150:
 	thumb_func_end sub_815FFC4
 
 	thumb_func_start sub_8160164
-sub_8160164: ; 8160164
+sub_8160164: @ 8160164
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -654017,7 +654017,7 @@ _08160198:
 	thumb_func_end sub_8160164
 
 	thumb_func_start sub_81601DC
-sub_81601DC: ; 81601DC
+sub_81601DC: @ 81601DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -654147,7 +654147,7 @@ _081602DA:
 	thumb_func_end sub_81601DC
 
 	thumb_func_start sub_81602E0
-sub_81602E0: ; 81602E0
+sub_81602E0: @ 81602E0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038437
@@ -654190,7 +654190,7 @@ _08160326:
 	thumb_func_end sub_81602E0
 
 	thumb_func_start sub_8160338
-sub_8160338: ; 8160338
+sub_8160338: @ 8160338
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02038437
@@ -654241,7 +654241,7 @@ _08160396:
 	thumb_func_end sub_8160338
 
 	thumb_func_start sub_81603A8
-sub_81603A8: ; 81603A8
+sub_81603A8: @ 81603A8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02038436
@@ -654278,7 +654278,7 @@ _081603D2:
 	thumb_func_end sub_81603A8
 
 	thumb_func_start sub_81603F4
-sub_81603F4: ; 81603F4
+sub_81603F4: @ 81603F4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -654415,7 +654415,7 @@ _081604E8:
 	thumb_func_end sub_81603F4
 
 	thumb_func_start sub_81604F0
-sub_81604F0: ; 81604F0
+sub_81604F0: @ 81604F0
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -654461,7 +654461,7 @@ _08160538:
 	thumb_func_end sub_81604F0
 
 	thumb_func_start sub_8160544
-sub_8160544: ; 8160544
+sub_8160544: @ 8160544
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -654491,7 +654491,7 @@ sub_8160544: ; 8160544
 	thumb_func_end sub_8160544
 
 	thumb_func_start sub_816058C
-sub_816058C: ; 816058C
+sub_816058C: @ 816058C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -654564,7 +654564,7 @@ _08160618:
 	thumb_func_end sub_816058C
 
 	thumb_func_start sub_8160624
-sub_8160624: ; 8160624
+sub_8160624: @ 8160624
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -654574,7 +654574,7 @@ sub_8160624: ; 8160624
 	thumb_func_end sub_8160624
 
 	thumb_func_start sub_8160638
-sub_8160638: ; 8160638
+sub_8160638: @ 8160638
 	push {lr}
 	sub sp, 0x4
 	bl script_env_2_enable
@@ -654595,7 +654595,7 @@ sub_8160638: ; 8160638
 	thumb_func_end sub_8160638
 
 	thumb_func_start sub_8160664
-sub_8160664: ; 8160664
+sub_8160664: @ 8160664
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -654620,7 +654620,7 @@ _08160688:
 	thumb_func_end sub_8160664
 
 	thumb_func_start sub_81606A0
-sub_81606A0: ; 81606A0
+sub_81606A0: @ 81606A0
 	push {r4-r6,lr}
 	bl ResetAllObjectData
 	bl ResetObjectPaletteAllocator
@@ -654674,7 +654674,7 @@ sub_81606A0: ; 81606A0
 	thumb_func_end sub_81606A0
 
 	thumb_func_start sub_8160740
-sub_8160740: ; 8160740
+sub_8160740: @ 8160740
 	push {r4,r5,lr}
 	bl ResetAllObjectData
 	bl ResetObjectPaletteAllocator
@@ -654731,7 +654731,7 @@ sub_8160740: ; 8160740
 	thumb_func_end sub_8160740
 
 	thumb_func_start sub_81607EC
-sub_81607EC: ; 81607EC
+sub_81607EC: @ 81607EC
 	push {lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -654758,7 +654758,7 @@ sub_81607EC: ; 81607EC
 	thumb_func_end sub_81607EC
 
 	thumb_func_start sub_816082C
-sub_816082C: ; 816082C
+sub_816082C: @ 816082C
 	push {lr}
 	bl sub_8160868
 	bl RunActiveTasks
@@ -654771,7 +654771,7 @@ sub_816082C: ; 816082C
 	thumb_func_end sub_816082C
 
 	thumb_func_start sub_816084C
-sub_816084C: ; 816084C
+sub_816084C: @ 816084C
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r4, =0x02021fc4
@@ -654786,7 +654786,7 @@ sub_816084C: ; 816084C
 	thumb_func_end sub_816084C
 
 	thumb_func_start sub_8160868
-sub_8160868: ; 8160868
+sub_8160868: @ 8160868
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -655450,7 +655450,7 @@ _08160E8A:
 	thumb_func_end sub_8160868
 
 	thumb_func_start sub_8160EA0
-sub_8160EA0: ; 8160EA0
+sub_8160EA0: @ 8160EA0
 	push {r4,lr}
 	bl sub_8161234
 	ldr r4, =0x0203bc34
@@ -655476,7 +655476,7 @@ sub_8160EA0: ; 8160EA0
 	thumb_func_end sub_8160EA0
 
 	thumb_func_start render_previous_quest_text
-render_previous_quest_text: ; 8160EE0
+render_previous_quest_text: @ 8160EE0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -655528,7 +655528,7 @@ _08160F38:
 	thumb_func_end render_previous_quest_text
 
 	thumb_func_start sub_8160F50
-sub_8160F50: ; 8160F50
+sub_8160F50: @ 8160F50
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -655634,7 +655634,7 @@ _0816103E:
 	thumb_func_end sub_8160F50
 
 	thumb_func_start sub_8161054
-sub_8161054: ; 8161054
+sub_8161054: @ 8161054
 	ldr r0, =0x0203bc34
 	ldr r2, [r0]
 	ldr r1, =0x0203bc38
@@ -655650,7 +655650,7 @@ sub_8161054: ; 8161054
 	thumb_func_end sub_8161054
 
 	thumb_func_start sub_8161074
-sub_8161074: ; 8161074
+sub_8161074: @ 8161074
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -655682,7 +655682,7 @@ _081610A6:
 	thumb_func_end sub_8161074
 
 	thumb_func_start sub_81610B8
-sub_81610B8: ; 81610B8
+sub_81610B8: @ 81610B8
 	push {r4-r7,lr}
 	ldr r2, =0x0203bc34
 	ldr r0, [r2]
@@ -655801,7 +655801,7 @@ _08161176:
 	thumb_func_end sub_81610B8
 
 	thumb_func_start sub_81611AC
-sub_81611AC: ; 81611AC
+sub_81611AC: @ 81611AC
 	push {r4-r6,lr}
 	ldr r4, =0x0203bc34
 	ldr r1, [r4]
@@ -655859,7 +655859,7 @@ _08161210:
 	thumb_func_end sub_81611AC
 
 	thumb_func_start sub_8161234
-sub_8161234: ; 8161234
+sub_8161234: @ 8161234
 	push {r4,lr}
 	ldr r4, =0x0203bc34
 	ldr r0, [r4]
@@ -655897,7 +655897,7 @@ _08161270:
 	thumb_func_end sub_8161234
 
 	thumb_func_start sub_8161280
-sub_8161280: ; 8161280
+sub_8161280: @ 8161280
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -656014,7 +656014,7 @@ _081612F6:
 	thumb_func_end sub_8161280
 
 	thumb_func_start sub_816137C
-sub_816137C: ; 816137C
+sub_816137C: @ 816137C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -656202,7 +656202,7 @@ _081614FE:
 	thumb_func_end sub_816137C
 
 	thumb_func_start hm_prepare_dive_probably
-hm_prepare_dive_probably: ; 8161508
+hm_prepare_dive_probably: @ 8161508
 	push {r4-r6,lr}
 	bl brm_get_pokemon_selection
 	lsls r0, 24
@@ -656245,7 +656245,7 @@ _0816155A:
 	thumb_func_end hm_prepare_dive_probably
 
 	thumb_func_start sub_8161560
-sub_8161560: ; 8161560
+sub_8161560: @ 8161560
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -656276,7 +656276,7 @@ sub_8161560: ; 8161560
 	thumb_func_end sub_8161560
 
 	thumb_func_start sub_81615A8
-sub_81615A8: ; 81615A8
+sub_81615A8: @ 81615A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -656366,7 +656366,7 @@ _08161658:
 	thumb_func_end sub_81615A8
 
 	thumb_func_start sub_816166C
-sub_816166C: ; 816166C
+sub_816166C: @ 816166C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -656402,7 +656402,7 @@ sub_816166C: ; 816166C
 	thumb_func_end sub_816166C
 
 	thumb_func_start sub_81616C0
-sub_81616C0: ; 81616C0
+sub_81616C0: @ 81616C0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -656439,7 +656439,7 @@ sub_81616C0: ; 81616C0
 	thumb_func_end sub_81616C0
 
 	thumb_func_start sub_8161724
-sub_8161724: ; 8161724
+sub_8161724: @ 8161724
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -656481,7 +656481,7 @@ _08161772:
 	thumb_func_end sub_8161724
 
 	thumb_func_start sub_8161784
-sub_8161784: ; 8161784
+sub_8161784: @ 8161784
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -656507,7 +656507,7 @@ _081617AA:
 	thumb_func_end sub_8161784
 
 	thumb_func_start sub_81617B8
-sub_81617B8: ; 81617B8
+sub_81617B8: @ 81617B8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -656533,7 +656533,7 @@ sub_81617B8: ; 81617B8
 	thumb_func_end sub_81617B8
 
 	thumb_func_start sub_81617F4
-sub_81617F4: ; 81617F4
+sub_81617F4: @ 81617F4
 	push {r4,lr}
 	ldr r0, =0x0203bc40
 	mov r12, r0
@@ -656594,7 +656594,7 @@ sub_81617F4: ; 81617F4
 	thumb_func_end sub_81617F4
 
 	thumb_func_start sub_8161880
-sub_8161880: ; 8161880
+sub_8161880: @ 8161880
 	push {r4,r5,lr}
 	lsls r0, 24
 	movs r3, 0
@@ -656625,7 +656625,7 @@ _081618AA:
 	thumb_func_end sub_8161880
 
 	thumb_func_start sub_81618B4
-sub_81618B4: ; 81618B4
+sub_81618B4: @ 81618B4
 	push {r4,lr}
 	movs r4, 0
 _081618B8:
@@ -656642,7 +656642,7 @@ _081618B8:
 	thumb_func_end sub_81618B4
 
 	thumb_func_start sub_81618D0
-sub_81618D0: ; 81618D0
+sub_81618D0: @ 81618D0
 	push {r4,lr}
 	lsls r0, 24
 	movs r2, 0
@@ -656683,7 +656683,7 @@ _08161910:
 	thumb_func_end sub_81618D0
 
 	thumb_func_start sub_8161918
-sub_8161918: ; 8161918
+sub_8161918: @ 8161918
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -656722,7 +656722,7 @@ _08161958:
 	thumb_func_end sub_8161918
 
 	thumb_func_start IsThereStorageSpaceForDecoration
-IsThereStorageSpaceForDecoration: ; 8161960
+IsThereStorageSpaceForDecoration: @ 8161960
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -656759,7 +656759,7 @@ _081619A2:
 	thumb_func_end IsThereStorageSpaceForDecoration
 
 	thumb_func_start sub_81619A8
-sub_81619A8: ; 81619A8
+sub_81619A8: @ 81619A8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -656787,7 +656787,7 @@ _081619D6:
 	thumb_func_end sub_81619A8
 
 	thumb_func_start sub_81619DC
-sub_81619DC: ; 81619DC
+sub_81619DC: @ 81619DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -656837,7 +656837,7 @@ _08161A28:
 	thumb_func_end sub_81619DC
 
 	thumb_func_start sub_8161A38
-sub_8161A38: ; 8161A38
+sub_8161A38: @ 8161A38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -656922,7 +656922,7 @@ _08161ABC:
 	thumb_func_end sub_8161A38
 
 	thumb_func_start sub_8161AD0
-sub_8161AD0: ; 8161AD0
+sub_8161AD0: @ 8161AD0
 	push {r4,r5,lr}
 	lsls r0, 24
 	movs r4, 0
@@ -656960,7 +656960,7 @@ _08161B04:
 	thumb_func_end sub_8161AD0
 
 	thumb_func_start sub_8161B10
-sub_8161B10: ; 8161B10
+sub_8161B10: @ 8161B10
 	push {r4,r5,lr}
 	movs r5, 0
 	movs r4, 0
@@ -656982,7 +656982,7 @@ _08161B16:
 	thumb_func_end sub_8161B10
 
 	thumb_func_start sub_8161B34
-sub_8161B34: ; 8161B34
+sub_8161B34: @ 8161B34
 	push {r4,r5,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -657002,7 +657002,7 @@ sub_8161B34: ; 8161B34
 	thumb_func_end sub_8161B34
 
 	thumb_func_start sub_8161B60
-sub_8161B60: ; 8161B60
+sub_8161B60: @ 8161B60
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r6, =0x0203bc86
@@ -657030,7 +657030,7 @@ _08161B6C:
 	thumb_func_end sub_8161B60
 
 	thumb_func_start sub_8161B94
-sub_8161B94: ; 8161B94
+sub_8161B94: @ 8161B94
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -657157,7 +657157,7 @@ _08161BC8:
 	thumb_func_end sub_8161B94
 
 	thumb_func_start sub_8161CBC
-sub_8161CBC: ; 8161CBC
+sub_8161CBC: @ 8161CBC
 	push {lr}
 	bl sub_8161B34
 	bl sub_8161B60
@@ -657170,7 +657170,7 @@ sub_8161CBC: ; 8161CBC
 	thumb_func_end sub_8161CBC
 
 	thumb_func_start mapnumbers_history_shift_sav1_0_2_4_out
-mapnumbers_history_shift_sav1_0_2_4_out: ; 8161CD8
+mapnumbers_history_shift_sav1_0_2_4_out: @ 8161CD8
 	ldr r0, =0x0203bc80
 	ldrb r1, [r0, 0x2]
 	strb r1, [r0, 0x4]
@@ -657191,7 +657191,7 @@ mapnumbers_history_shift_sav1_0_2_4_out: ; 8161CD8
 	thumb_func_end mapnumbers_history_shift_sav1_0_2_4_out
 
 	thumb_func_start sub_8161D00
-sub_8161D00: ; 8161D00
+sub_8161D00: @ 8161D00
 	push {r4,r5,lr}
 	movs r1, 0
 	ldr r0, =0x03005d8c
@@ -657230,7 +657230,7 @@ _08161D3E:
 	thumb_func_end sub_8161D00
 
 	thumb_func_start sub_8161D54
-sub_8161D54: ; 8161D54
+sub_8161D54: @ 8161D54
 	push {r4-r7,lr}
 	movs r4, 0
 	bl GenerateRandomNumber
@@ -657300,7 +657300,7 @@ _08161DE2:
 	thumb_func_end sub_8161D54
 
 	thumb_func_start sub_8161DE8
-sub_8161DE8: ; 8161DE8
+sub_8161DE8: @ 8161DE8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -657331,7 +657331,7 @@ _08161E22:
 	thumb_func_end sub_8161DE8
 
 	thumb_func_start sub_8161E28
-sub_8161E28: ; 8161E28
+sub_8161E28: @ 8161E28
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x02024744
@@ -657397,7 +657397,7 @@ sub_8161E28: ; 8161E28
 	thumb_func_end sub_8161E28
 
 	thumb_func_start sub_8161EDC
-sub_8161EDC: ; 8161EDC
+sub_8161EDC: @ 8161EDC
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
@@ -657427,7 +657427,7 @@ _08161F12:
 	thumb_func_end sub_8161EDC
 
 	thumb_func_start sub_8161F18
-sub_8161F18: ; 8161F18
+sub_8161F18: @ 8161F18
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x39
@@ -657451,7 +657451,7 @@ sub_8161F18: ; 8161F18
 	thumb_func_end sub_8161F18
 
 	thumb_func_start sub_8161F4C
-sub_8161F4C: ; 8161F4C
+sub_8161F4C: @ 8161F4C
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x000031dc
@@ -657463,7 +657463,7 @@ sub_8161F4C: ; 8161F4C
 	thumb_func_end sub_8161F4C
 
 	thumb_func_start sub_8161F64
-sub_8161F64: ; 8161F64
+sub_8161F64: @ 8161F64
 	ldr r3, =0x0203bc86
 	ldrb r2, [r3]
 	strb r2, [r0]
@@ -657474,7 +657474,7 @@ sub_8161F64: ; 8161F64
 	thumb_func_end sub_8161F64
 
 	thumb_func_start sub_8161F74
-sub_8161F74: ; 8161F74
+sub_8161F74: @ 8161F74
 	push {lr}
 	ldr r1, =gUnknown_085DF96C
 	ldr r0, =0x020375e0
@@ -657489,7 +657489,7 @@ sub_8161F74: ; 8161F74
 	thumb_func_end sub_8161F74
 
 	thumb_func_start sub_8161F94
-sub_8161F94: ; 8161F94
+sub_8161F94: @ 8161F94
 	push {r4-r7,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -657570,7 +657570,7 @@ _0816200E:
 	thumb_func_end sub_8161F94
 
 	thumb_func_start sub_8162054
-sub_8162054: ; 8162054
+sub_8162054: @ 8162054
 	push {r4-r6,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -657640,7 +657640,7 @@ _081620E8:
 	thumb_func_end sub_8162054
 
 	thumb_func_start sub_81620F4
-sub_81620F4: ; 81620F4
+sub_81620F4: @ 81620F4
 	push {r4-r7,lr}
 	ldr r6, =0x03005d90
 	ldr r0, [r6]
@@ -657730,7 +657730,7 @@ _081621B4:
 	thumb_func_end sub_81620F4
 
 	thumb_func_start sub_81621C0
-sub_81621C0: ; 81621C0
+sub_81621C0: @ 81621C0
 	push {r4,r5,lr}
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
@@ -657774,7 +657774,7 @@ _081621EE:
 	thumb_func_end sub_81621C0
 
 	thumb_func_start sub_816222C
-sub_816222C: ; 816222C
+sub_816222C: @ 816222C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -657992,7 +657992,7 @@ _081623DA:
 	thumb_func_end sub_816222C
 
 	thumb_func_start sub_81623F0
-sub_81623F0: ; 81623F0
+sub_81623F0: @ 81623F0
 	push {r4-r7,lr}
 	ldr r6, =0x03005d90
 	ldr r0, [r6]
@@ -658139,7 +658139,7 @@ _08162530:
 	thumb_func_end sub_81623F0
 
 	thumb_func_start sub_8162548
-sub_8162548: ; 8162548
+sub_8162548: @ 8162548
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -658194,7 +658194,7 @@ _0816258A:
 	thumb_func_end sub_8162548
 
 	thumb_func_start sub_81625B4
-sub_81625B4: ; 81625B4
+sub_81625B4: @ 81625B4
 	push {r4,lr}
 	adds r4, r2, 0
 	lsls r0, 24
@@ -658245,7 +658245,7 @@ _08162604:
 	thumb_func_end sub_81625B4
 
 	thumb_func_start sub_8162614
-sub_8162614: ; 8162614
+sub_8162614: @ 8162614
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -658414,7 +658414,7 @@ _08162788:
 	thumb_func_end sub_8162614
 
 	thumb_func_start sub_8162794
-sub_8162794: ; 8162794
+sub_8162794: @ 8162794
 	push {lr}
 	movs r0, 0xFA
 	lsls r0, 1
@@ -658425,7 +658425,7 @@ sub_8162794: ; 8162794
 	thumb_func_end sub_8162794
 
 	thumb_func_start sub_81627A4
-sub_81627A4: ; 81627A4
+sub_81627A4: @ 81627A4
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -658539,7 +658539,7 @@ _08162896:
 	thumb_func_end sub_81627A4
 
 	thumb_func_start sub_81628A0
-sub_81628A0: ; 81628A0
+sub_81628A0: @ 81628A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -658798,7 +658798,7 @@ _08162A8A:
 	thumb_func_end sub_81628A0
 
 	thumb_func_start sub_8162AA0
-sub_8162AA0: ; 8162AA0
+sub_8162AA0: @ 8162AA0
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -658925,7 +658925,7 @@ _08162BCA:
 	thumb_func_end sub_8162AA0
 
 	thumb_func_start sub_8162BD8
-sub_8162BD8: ; 8162BD8
+sub_8162BD8: @ 8162BD8
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -659065,7 +659065,7 @@ _08162D1E:
 	thumb_func_end sub_8162BD8
 
 	thumb_func_start sub_8162D34
-sub_8162D34: ; 8162D34
+sub_8162D34: @ 8162D34
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -659166,7 +659166,7 @@ _08162E0C:
 	thumb_func_end sub_8162D34
 
 	thumb_func_start sub_8162E20
-sub_8162E20: ; 8162E20
+sub_8162E20: @ 8162E20
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -659204,7 +659204,7 @@ _08162E68:
 	ldr r0, =0x00000c03
 	cmp r5, r0
 	bne _08162E88
-	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
+	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
 _08162E70:
 	adds r0, r6, r4
 	adds r1, r4, r2
@@ -659317,7 +659317,7 @@ _08162F62:
 	thumb_func_end sub_8162E20
 
 	thumb_func_start sub_8162F68
-sub_8162F68: ; 8162F68
+sub_8162F68: @ 8162F68
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -659416,7 +659416,7 @@ _08163042:
 	thumb_func_end sub_8162F68
 
 	thumb_func_start sub_8163048
-sub_8163048: ; 8163048
+sub_8163048: @ 8163048
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -659434,7 +659434,7 @@ sub_8163048: ; 8163048
 	thumb_func_end sub_8163048
 
 	thumb_func_start sub_816306C
-sub_816306C: ; 816306C
+sub_816306C: @ 816306C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -659457,7 +659457,7 @@ sub_816306C: ; 816306C
 	thumb_func_end sub_816306C
 
 	thumb_func_start sub_81630A0
-sub_81630A0: ; 81630A0
+sub_81630A0: @ 81630A0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -659475,7 +659475,7 @@ sub_81630A0: ; 81630A0
 	thumb_func_end sub_81630A0
 
 	thumb_func_start sub_81630C4
-sub_81630C4: ; 81630C4
+sub_81630C4: @ 81630C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -659902,7 +659902,7 @@ _08163426:
 	thumb_func_end sub_81630C4
 
 	thumb_func_start sub_8163444
-sub_8163444: ; 8163444
+sub_8163444: @ 8163444
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -660014,7 +660014,7 @@ _081634D4:
 	thumb_func_end sub_8163444
 
 	thumb_func_start sub_8163524
-sub_8163524: ; 8163524
+sub_8163524: @ 8163524
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -660069,7 +660069,7 @@ _08163580:
 	thumb_func_end sub_8163524
 
 	thumb_func_start sub_8163590
-sub_8163590: ; 8163590
+sub_8163590: @ 8163590
 	push {lr}
 	bl zero_enemy_party_data
 	ldr r0, =0x03005d90
@@ -660099,7 +660099,7 @@ _081635CA:
 	thumb_func_end sub_8163590
 
 	thumb_func_start sub_81635D4
-sub_81635D4: ; 81635D4
+sub_81635D4: @ 81635D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -660309,7 +660309,7 @@ _08163776:
 	thumb_func_end sub_81635D4
 
 	thumb_func_start sub_816379C
-sub_816379C: ; 816379C
+sub_816379C: @ 816379C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -660438,7 +660438,7 @@ _08163846:
 	thumb_func_end sub_816379C
 
 	thumb_func_start ConvertBattleFrontierTrainerSpeechToString
-ConvertBattleFrontierTrainerSpeechToString: ; 81638AC
+ConvertBattleFrontierTrainerSpeechToString: @ 81638AC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x02021fc4
@@ -660495,7 +660495,7 @@ _0816390A:
 	thumb_func_end ConvertBattleFrontierTrainerSpeechToString
 
 	thumb_func_start sub_8163914
-sub_8163914: ; 8163914
+sub_8163914: @ 8163914
 	push {lr}
 	bl sub_8165C40
 	ldr r0, =0x020375e2
@@ -660559,7 +660559,7 @@ _081639A8:
 	thumb_func_end sub_8163914
 
 	thumb_func_start sub_81639AC
-sub_81639AC: ; 81639AC
+sub_81639AC: @ 81639AC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	bl sub_81864CC
@@ -660650,7 +660650,7 @@ _08163A78:
 	thumb_func_end sub_81639AC
 
 	thumb_func_start sub_8163A8C
-sub_8163A8C: ; 8163A8C
+sub_8163A8C: @ 8163A8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -660674,7 +660674,7 @@ _08163AB0:
 	thumb_func_end sub_8163A8C
 
 	thumb_func_start sub_8163AC4
-sub_8163AC4: ; 8163AC4
+sub_8163AC4: @ 8163AC4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r0, =0x02024474
@@ -661039,7 +661039,7 @@ _08163E68:
 	thumb_func_end sub_8163AC4
 
 	thumb_func_start sub_8163E90
-sub_8163E90: ; 8163E90
+sub_8163E90: @ 8163E90
 	push {r4-r6,lr}
 	ldr r6, =0x03005d90
 	ldr r0, [r6]
@@ -661078,7 +661078,7 @@ _08163ED0:
 	thumb_func_end sub_8163E90
 
 	thumb_func_start sub_8163EE4
-sub_8163EE4: ; 8163EE4
+sub_8163EE4: @ 8163EE4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -661226,7 +661226,7 @@ _08163FF4:
 	thumb_func_end sub_8163EE4
 
 	thumb_func_start sub_8164040
-sub_8164040: ; 8164040
+sub_8164040: @ 8164040
 	push {r4,r5,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -661291,17 +661291,17 @@ _0816408E:
 	thumb_func_end sub_8164040
 
 	thumb_func_start nullsub_61
-nullsub_61: ; 81640D8
+nullsub_61: @ 81640D8
 	bx lr
 	thumb_func_end nullsub_61
 
 	thumb_func_start nullsub_116
-nullsub_116: ; 81640DC
+nullsub_116: @ 81640DC
 	bx lr
 	thumb_func_end nullsub_116
 
 	thumb_func_start sub_81640E0
-sub_81640E0: ; 81640E0
+sub_81640E0: @ 81640E0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -661379,7 +661379,7 @@ _08164150:
 	thumb_func_end sub_81640E0
 
 	thumb_func_start sub_8164188
-sub_8164188: ; 8164188
+sub_8164188: @ 8164188
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -661508,7 +661508,7 @@ _08164258:
 	thumb_func_end sub_8164188
 
 	thumb_func_start sub_81642A0
-sub_81642A0: ; 81642A0
+sub_81642A0: @ 81642A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -662011,7 +662011,7 @@ _081646A0:
 	thumb_func_end sub_81642A0
 
 	thumb_func_start sub_81646BC
-sub_81646BC: ; 81646BC
+sub_81646BC: @ 81646BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -662166,7 +662166,7 @@ _081647CE:
 	thumb_func_end sub_81646BC
 
 	thumb_func_start sub_8164828
-sub_8164828: ; 8164828
+sub_8164828: @ 8164828
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -662522,7 +662522,7 @@ _08164B54:
 	thumb_func_end sub_8164828
 
 	thumb_func_start sub_8164B74
-sub_8164B74: ; 8164B74
+sub_8164B74: @ 8164B74
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -662768,7 +662768,7 @@ _08164DB6:
 	thumb_func_end sub_8164B74
 
 	thumb_func_start sub_8164DCC
-sub_8164DCC: ; 8164DCC
+sub_8164DCC: @ 8164DCC
 	push {lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -662782,7 +662782,7 @@ _08164DDA:
 	thumb_func_end sub_8164DCC
 
 	thumb_func_start sub_8164DE4
-sub_8164DE4: ; 8164DE4
+sub_8164DE4: @ 8164DE4
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -662797,7 +662797,7 @@ sub_8164DE4: ; 8164DE4
 	thumb_func_end sub_8164DE4
 
 	thumb_func_start sub_8164E04
-sub_8164E04: ; 8164E04
+sub_8164E04: @ 8164E04
 	push {r4-r6,lr}
 	sub sp, 0x20
 	ldr r0, =0x000040ce
@@ -662876,7 +662876,7 @@ _08164E9A:
 	thumb_func_end sub_8164E04
 
 	thumb_func_start sub_8164ED8
-sub_8164ED8: ; 8164ED8
+sub_8164ED8: @ 8164ED8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -662953,7 +662953,7 @@ _08164F52:
 	thumb_func_end sub_8164ED8
 
 	thumb_func_start sub_8164F70
-sub_8164F70: ; 8164F70
+sub_8164F70: @ 8164F70
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r2, 0xE8
@@ -662975,7 +662975,7 @@ _08164F7E:
 	thumb_func_end sub_8164F70
 
 	thumb_func_start sub_8164F94
-sub_8164F94: ; 8164F94
+sub_8164F94: @ 8164F94
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r2, 0xA0
@@ -662997,7 +662997,7 @@ _08164FA2:
 	thumb_func_end sub_8164F94
 
 	thumb_func_start sub_8164FB8
-sub_8164FB8: ; 8164FB8
+sub_8164FB8: @ 8164FB8
 	push {lr}
 	movs r1, 0
 	movs r2, 0
@@ -663011,7 +663011,7 @@ _08164FBE:
 	thumb_func_end sub_8164FB8
 
 	thumb_func_start sub_8164FCC
-sub_8164FCC: ; 8164FCC
+sub_8164FCC: @ 8164FCC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -663036,7 +663036,7 @@ _08164FEE:
 	thumb_func_end sub_8164FCC
 
 	thumb_func_start sub_8164FFC
-sub_8164FFC: ; 8164FFC
+sub_8164FFC: @ 8164FFC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -663062,7 +663062,7 @@ _08165022:
 	thumb_func_end sub_8164FFC
 
 	thumb_func_start sub_816502C
-sub_816502C: ; 816502C
+sub_816502C: @ 816502C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -663206,7 +663206,7 @@ _08165132:
 	thumb_func_end sub_816502C
 
 	thumb_func_start sub_816515C
-sub_816515C: ; 816515C
+sub_816515C: @ 816515C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -663312,7 +663312,7 @@ _08165206:
 	thumb_func_end sub_816515C
 
 	thumb_func_start sub_8165244
-sub_8165244: ; 8165244
+sub_8165244: @ 8165244
 	ldr r1, =gTrainerPicIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -663326,7 +663326,7 @@ sub_8165244: ; 8165244
 	thumb_func_end sub_8165244
 
 	thumb_func_start sub_8165264
-sub_8165264: ; 8165264
+sub_8165264: @ 8165264
 	ldr r1, =gTrainerClassNameIndices
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -663340,7 +663340,7 @@ sub_8165264: ; 8165264
 	thumb_func_end sub_8165264
 
 	thumb_func_start sub_8165284
-sub_8165284: ; 8165284
+sub_8165284: @ 8165284
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -663367,7 +663367,7 @@ _08165294:
 	thumb_func_end sub_8165284
 
 	thumb_func_start sub_81652B4
-sub_81652B4: ; 81652B4
+sub_81652B4: @ 81652B4
 	push {r4-r6,lr}
 	ldr r2, =0x020375f0
 	movs r0, 0
@@ -663422,7 +663422,7 @@ _08165316:
 	thumb_func_end sub_81652B4
 
 	thumb_func_start sub_8165328
-sub_8165328: ; 8165328
+sub_8165328: @ 8165328
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r2, 0xB8
@@ -663444,7 +663444,7 @@ _08165336:
 	thumb_func_end sub_8165328
 
 	thumb_func_start sub_816534C
-sub_816534C: ; 816534C
+sub_816534C: @ 816534C
 	push {lr}
 	movs r1, 0
 	movs r2, 0
@@ -663458,7 +663458,7 @@ _08165352:
 	thumb_func_end sub_816534C
 
 	thumb_func_start sub_8165360
-sub_8165360: ; 8165360
+sub_8165360: @ 8165360
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -663471,7 +663471,7 @@ sub_8165360: ; 8165360
 	thumb_func_end sub_8165360
 
 	thumb_func_start sub_816537C
-sub_816537C: ; 816537C
+sub_816537C: @ 816537C
 	push {lr}
 	ldr r0, =0x0202433a
 	ldrb r0, [r0]
@@ -663505,7 +663505,7 @@ _081653C0:
 	thumb_func_end sub_816537C
 
 	thumb_func_start sub_81653CC
-sub_81653CC: ; 81653CC
+sub_81653CC: @ 81653CC
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -663532,7 +663532,7 @@ _081653F8:
 	thumb_func_end sub_81653CC
 
 	thumb_func_start sub_8165404
-sub_8165404: ; 8165404
+sub_8165404: @ 8165404
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -663661,7 +663661,7 @@ _081654DE:
 	adds r4, r0
 	adds r0, r4, 0
 	movs r1, 0x7
-	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
+	ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
 	bl pokemon_setattr
 	movs r0, 0
 	str r0, [sp, 0x44]
@@ -664049,7 +664049,7 @@ _0816585A:
 	thumb_func_end sub_8165404
 
 	thumb_func_start sub_816587C
-sub_816587C: ; 816587C
+sub_816587C: @ 816587C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -664233,7 +664233,7 @@ _081659BE:
 	thumb_func_end sub_816587C
 
 	thumb_func_start sub_81659DC
-sub_81659DC: ; 81659DC
+sub_81659DC: @ 81659DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -664380,7 +664380,7 @@ _08165AD8:
 	thumb_func_end sub_81659DC
 
 	thumb_func_start sub_8165AE8
-sub_8165AE8: ; 8165AE8
+sub_8165AE8: @ 8165AE8
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r0, 0
@@ -664401,7 +664401,7 @@ _08165AF4:
 	thumb_func_end sub_8165AE8
 
 	thumb_func_start sub_8165B08
-sub_8165B08: ; 8165B08
+sub_8165B08: @ 8165B08
 	push {lr}
 	movs r1, 0
 	movs r3, 0
@@ -664417,7 +664417,7 @@ _08165B10:
 	thumb_func_end sub_8165B08
 
 	thumb_func_start sub_8165B20
-sub_8165B20: ; 8165B20
+sub_8165B20: @ 8165B20
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -664473,7 +664473,7 @@ _08165B70:
 	thumb_func_end sub_8165B20
 
 	thumb_func_start sub_8165B88
-sub_8165B88: ; 8165B88
+sub_8165B88: @ 8165B88
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -664552,7 +664552,7 @@ _08165C2A:
 	thumb_func_end sub_8165B88
 
 	thumb_func_start sub_8165C40
-sub_8165C40: ; 8165C40
+sub_8165C40: @ 8165C40
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -664585,7 +664585,7 @@ _08165C88:
 	thumb_func_end sub_8165C40
 
 	thumb_func_start sub_8165C90
-sub_8165C90: ; 8165C90
+sub_8165C90: @ 8165C90
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -664609,7 +664609,7 @@ _08165CB0:
 	thumb_func_end sub_8165C90
 
 	thumb_func_start sub_8165CB4
-sub_8165CB4: ; 8165CB4
+sub_8165CB4: @ 8165CB4
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -664652,7 +664652,7 @@ _08165CF4:
 	thumb_func_end sub_8165CB4
 
 	thumb_func_start sub_8165D08
-sub_8165D08: ; 8165D08
+sub_8165D08: @ 8165D08
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -664685,7 +664685,7 @@ _08165D3A:
 	thumb_func_end sub_8165D08
 
 	thumb_func_start sub_8165D40
-sub_8165D40: ; 8165D40
+sub_8165D40: @ 8165D40
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -664715,7 +664715,7 @@ _08165D72:
 	thumb_func_end sub_8165D40
 
 	thumb_func_start sub_8165D78
-sub_8165D78: ; 8165D78
+sub_8165D78: @ 8165D78
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -664771,7 +664771,7 @@ _08165E02:
 	thumb_func_end sub_8165D78
 
 	thumb_func_start sub_8165E18
-sub_8165E18: ; 8165E18
+sub_8165E18: @ 8165E18
 	push {r4,r5,lr}
 	ldr r5, =0x03005d90
 _08165E1C:
@@ -664839,7 +664839,7 @@ _08165E8C:
 	thumb_func_end sub_8165E18
 
 	thumb_func_start sub_8165EA4
-sub_8165EA4: ; 8165EA4
+sub_8165EA4: @ 8165EA4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -665101,7 +665101,7 @@ _0816609A:
 	thumb_func_end sub_8165EA4
 
 	thumb_func_start sub_81660B8
-sub_81660B8: ; 81660B8
+sub_81660B8: @ 81660B8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -665160,7 +665160,7 @@ _0816611A:
 	thumb_func_end sub_81660B8
 
 	thumb_func_start sub_8166124
-sub_8166124: ; 8166124
+sub_8166124: @ 8166124
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -665216,7 +665216,7 @@ _08166182:
 	thumb_func_end sub_8166124
 
 	thumb_func_start sub_8166188
-sub_8166188: ; 8166188
+sub_8166188: @ 8166188
 	push {r4-r7,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -665271,7 +665271,7 @@ _081661E8:
 	thumb_func_end sub_8166188
 
 	thumb_func_start sub_8166204
-sub_8166204: ; 8166204
+sub_8166204: @ 8166204
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -665296,7 +665296,7 @@ sub_8166204: ; 8166204
 	thumb_func_end sub_8166204
 
 	thumb_func_start sub_816624C
-sub_816624C: ; 816624C
+sub_816624C: @ 816624C
 	push {r4,r5,lr}
 	ldr r4, =0x0203bcac
 	ldr r0, =0x0000806c
@@ -665338,7 +665338,7 @@ _08166284:
 	thumb_func_end sub_816624C
 
 	thumb_func_start sub_81662C0
-sub_81662C0: ; 81662C0
+sub_81662C0: @ 81662C0
 	push {r4,lr}
 	ldr r4, =0x0203bc90
 	ldr r0, [r4]
@@ -665366,7 +665366,7 @@ _081662F0:
 	thumb_func_end sub_81662C0
 
 	thumb_func_start sub_8166304
-sub_8166304: ; 8166304
+sub_8166304: @ 8166304
 	push {lr}
 	bl sub_81668F8
 	bl CallObjectCallbacks
@@ -665377,7 +665377,7 @@ sub_8166304: ; 8166304
 	thumb_func_end sub_8166304
 
 	thumb_func_start sub_816631C
-sub_816631C: ; 816631C
+sub_816631C: @ 816631C
 	push {lr}
 	ldr r0, =0x0203bc90
 	ldr r0, [r0]
@@ -665393,7 +665393,7 @@ sub_816631C: ; 816631C
 	thumb_func_end sub_816631C
 
 	thumb_func_start sub_8166340
-sub_8166340: ; 8166340
+sub_8166340: @ 8166340
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -665410,7 +665410,7 @@ sub_8166340: ; 8166340
 	thumb_func_end sub_8166340
 
 	thumb_func_start launch_c3_walk_stairs_and_run_once
-launch_c3_walk_stairs_and_run_once: ; 816636C
+launch_c3_walk_stairs_and_run_once: @ 816636C
 	ldr r1, =0x0203bc90
 	ldr r1, [r1]
 	str r0, [r1]
@@ -665422,7 +665422,7 @@ launch_c3_walk_stairs_and_run_once: ; 816636C
 	thumb_func_end launch_c3_walk_stairs_and_run_once
 
 	thumb_func_start sub_8166380
-sub_8166380: ; 8166380
+sub_8166380: @ 8166380
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =0x0203bc90
@@ -665613,7 +665613,7 @@ _08166556:
 	thumb_func_end sub_8166380
 
 	thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive
-map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564
+map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203bc90
@@ -665699,7 +665699,7 @@ _08166610:
 	thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive
 
 	thumb_func_start sub_8166634
-sub_8166634: ; 8166634
+sub_8166634: @ 8166634
 	push {lr}
 	ldr r0, =0x0203bc90
 	ldr r0, [r0]
@@ -665901,7 +665901,7 @@ _0816680E:
 	thumb_func_end sub_8166634
 
 	thumb_func_start sub_816681C
-sub_816681C: ; 816681C
+sub_816681C: @ 816681C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, =0x0203bc90
@@ -665985,7 +665985,7 @@ _081668D4:
 	thumb_func_end sub_816681C
 
 	thumb_func_start sub_81668F8
-sub_81668F8: ; 81668F8
+sub_81668F8: @ 81668F8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x0203bc90
@@ -666114,7 +666114,7 @@ _08166A18:
 	thumb_func_end sub_81668F8
 
 	thumb_func_start sub_8166A34
-sub_8166A34: ; 8166A34
+sub_8166A34: @ 8166A34
 	push {r4-r6,lr}
 	ldr r1, =0x0203bc90
 	ldr r0, [r1]
@@ -666294,7 +666294,7 @@ _08166BDA:
 	thumb_func_end sub_8166A34
 
 	thumb_func_start sub_8166BEC
-sub_8166BEC: ; 8166BEC
+sub_8166BEC: @ 8166BEC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203bc90
@@ -666441,7 +666441,7 @@ _08166D18:
 	thumb_func_end sub_8166BEC
 
 	thumb_func_start sub_8166D44
-sub_8166D44: ; 8166D44
+sub_8166D44: @ 8166D44
 	push {r4,lr}
 	sub sp, 0x4C
 	ldr r0, =0x0203bcac
@@ -666503,7 +666503,7 @@ sub_8166D44: ; 8166D44
 	thumb_func_end sub_8166D44
 
 	thumb_func_start sub_8166DE4
-sub_8166DE4: ; 8166DE4
+sub_8166DE4: @ 8166DE4
 	push {r4,lr}
 	bl sub_8198C58
 	lsls r0, 24
@@ -666537,7 +666537,7 @@ _08166E18:
 	thumb_func_end sub_8166DE4
 
 	thumb_func_start sub_8166E24
-sub_8166E24: ; 8166E24
+sub_8166E24: @ 8166E24
 	push {r4,lr}
 	movs r0, 0x2
 	movs r1, 0x97
@@ -666623,7 +666623,7 @@ _08166EB8:
 	thumb_func_end sub_8166E24
 
 	thumb_func_start sub_8166EDC
-sub_8166EDC: ; 8166EDC
+sub_8166EDC: @ 8166EDC
 	push {r4,r5,lr}
 	movs r0, 0x2
 	movs r1, 0x11
@@ -666681,7 +666681,7 @@ _08166F44:
 	thumb_func_end sub_8166EDC
 
 	thumb_func_start sub_8166F50
-sub_8166F50: ; 8166F50
+sub_8166F50: @ 8166F50
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x2
@@ -666713,7 +666713,7 @@ sub_8166F50: ; 8166F50
 	thumb_func_end sub_8166F50
 
 	thumb_func_start sub_8166F94
-sub_8166F94: ; 8166F94
+sub_8166F94: @ 8166F94
 	push {lr}
 	movs r0, 0x2
 	bl rbox_fill_rectangle
@@ -666727,7 +666727,7 @@ sub_8166F94: ; 8166F94
 	thumb_func_end sub_8166F94
 
 	thumb_func_start sub_8166FB0
-sub_8166FB0: ; 8166FB0
+sub_8166FB0: @ 8166FB0
 	push {lr}
 	sub sp, 0xC
 	ldr r2, =0x02021fc4
@@ -666747,7 +666747,7 @@ sub_8166FB0: ; 8166FB0
 	thumb_func_end sub_8166FB0
 
 	thumb_func_start sub_8166FD4
-sub_8166FD4: ; 8166FD4
+sub_8166FD4: @ 8166FD4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -666785,7 +666785,7 @@ _08167018:
 	thumb_func_end sub_8166FD4
 
 	thumb_func_start sub_8167024
-sub_8167024: ; 8167024
+sub_8167024: @ 8167024
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -666811,7 +666811,7 @@ _0816702E:
 	thumb_func_end sub_8167024
 
 	thumb_func_start sub_8167054
-sub_8167054: ; 8167054
+sub_8167054: @ 8167054
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -666899,7 +666899,7 @@ _081670F0:
 	thumb_func_end sub_8167054
 
 	thumb_func_start sub_8167104
-sub_8167104: ; 8167104
+sub_8167104: @ 8167104
 	push {r4,r5,lr}
 	ldr r5, =0x020244ec
 	ldr r0, =0x0203bcac
@@ -666955,7 +666955,7 @@ _08167144:
 	thumb_func_end sub_8167104
 
 	thumb_func_start sub_8167184
-sub_8167184: ; 8167184
+sub_8167184: @ 8167184
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -667068,7 +667068,7 @@ _08167250:
 	thumb_func_end sub_8167184
 
 	thumb_func_start sub_8167268
-sub_8167268: ; 8167268
+sub_8167268: @ 8167268
 	push {lr}
 	ldr r0, =0x0203bcac
 	ldr r1, [r0]
@@ -667099,7 +667099,7 @@ _0816729E:
 	thumb_func_end sub_8167268
 
 	thumb_func_start sub_81672A4
-sub_81672A4: ; 81672A4
+sub_81672A4: @ 81672A4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -667136,7 +667136,7 @@ _081672DE:
 	thumb_func_end sub_81672A4
 
 	thumb_func_start sub_81672E4
-sub_81672E4: ; 81672E4
+sub_81672E4: @ 81672E4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -667173,7 +667173,7 @@ _08167314:
 	thumb_func_end sub_81672E4
 
 	thumb_func_start sub_8167324
-sub_8167324: ; 8167324
+sub_8167324: @ 8167324
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -667185,7 +667185,7 @@ sub_8167324: ; 8167324
 	thumb_func_end sub_8167324
 
 	thumb_func_start sub_8167338
-sub_8167338: ; 8167338
+sub_8167338: @ 8167338
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -667258,7 +667258,7 @@ _081673AC:
 	thumb_func_end sub_8167338
 
 	thumb_func_start sub_81673DC
-sub_81673DC: ; 81673DC
+sub_81673DC: @ 81673DC
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -667298,7 +667298,7 @@ _08167418:
 	thumb_func_end sub_81673DC
 
 	thumb_func_start sub_8167420
-sub_8167420: ; 8167420
+sub_8167420: @ 8167420
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r5, 0
@@ -667364,7 +667364,7 @@ _08167472:
 	thumb_func_end sub_8167420
 
 	thumb_func_start sub_81674BC
-sub_81674BC: ; 81674BC
+sub_81674BC: @ 81674BC
 	push {r4,r5,lr}
 	ldr r4, =0x0203bcac
 	ldr r0, [r4]
@@ -667422,7 +667422,7 @@ _08167510:
 	thumb_func_end sub_81674BC
 
 	thumb_func_start sub_816753C
-sub_816753C: ; 816753C
+sub_816753C: @ 816753C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -667512,7 +667512,7 @@ sub_816753C: ; 816753C
 	thumb_func_end sub_816753C
 
 	thumb_func_start sub_8167608
-sub_8167608: ; 8167608
+sub_8167608: @ 8167608
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -667660,7 +667660,7 @@ _08167742:
 	thumb_func_end sub_8167608
 
 	thumb_func_start sub_8167760
-sub_8167760: ; 8167760
+sub_8167760: @ 8167760
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -667869,7 +667869,7 @@ _08167902:
 	thumb_func_end sub_8167760
 
 	thumb_func_start sub_8167930
-sub_8167930: ; 8167930
+sub_8167930: @ 8167930
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203bcac
@@ -668102,7 +668102,7 @@ _08167B8E:
 	thumb_func_end sub_8167930
 
 	thumb_func_start sub_8167BA0
-sub_8167BA0: ; 8167BA0
+sub_8167BA0: @ 8167BA0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -668207,7 +668207,7 @@ _08167C94:
 	thumb_func_end sub_8167BA0
 
 	thumb_func_start sub_8167CA0
-sub_8167CA0: ; 8167CA0
+sub_8167CA0: @ 8167CA0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -668428,7 +668428,7 @@ _08167E90:
 	thumb_func_end sub_8167CA0
 
 	thumb_func_start sub_8167EA4
-sub_8167EA4: ; 8167EA4
+sub_8167EA4: @ 8167EA4
 	push {r4-r6,lr}
 	ldr r4, =0x0203bcac
 	ldr r1, [r4]
@@ -668542,7 +668542,7 @@ _08167F9E:
 	thumb_func_end sub_8167EA4
 
 	thumb_func_start sub_8167FA4
-sub_8167FA4: ; 8167FA4
+sub_8167FA4: @ 8167FA4
 	push {r4,r5,lr}
 	ldr r4, =0x0203bcac
 	ldr r1, [r4]
@@ -668619,7 +668619,7 @@ _08168040:
 	thumb_func_end sub_8167FA4
 
 	thumb_func_start sub_8168048
-sub_8168048: ; 8168048
+sub_8168048: @ 8168048
 	push {r4-r6,lr}
 	ldr r4, =0x0203bcac
 	ldr r1, [r4]
@@ -668744,7 +668744,7 @@ _08168162:
 	thumb_func_end sub_8168048
 
 	thumb_func_start sub_8168168
-sub_8168168: ; 8168168
+sub_8168168: @ 8168168
 	ldr r1, =0x0203bcac
 	ldr r1, [r1]
 	ldr r2, =0x00007b0e
@@ -668757,7 +668757,7 @@ sub_8168168: ; 8168168
 	thumb_func_end sub_8168168
 
 	thumb_func_start sub_8168180
-sub_8168180: ; 8168180
+sub_8168180: @ 8168180
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x2E
@@ -668784,7 +668784,7 @@ _081681B0:
 	thumb_func_end sub_8168180
 
 	thumb_func_start sub_81681B4
-sub_81681B4: ; 81681B4
+sub_81681B4: @ 81681B4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203bcac
@@ -668817,7 +668817,7 @@ _081681DE:
 	thumb_func_end sub_81681B4
 
 	thumb_func_start sub_81681F4
-sub_81681F4: ; 81681F4
+sub_81681F4: @ 81681F4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -668856,7 +668856,7 @@ _0816823E:
 	thumb_func_end sub_81681F4
 
 	thumb_func_start sub_8168248
-sub_8168248: ; 8168248
+sub_8168248: @ 8168248
 	push {lr}
 	sub sp, 0x10
 	ldr r0, =gUnknown_085DFDB8
@@ -668888,7 +668888,7 @@ sub_8168248: ; 8168248
 	thumb_func_end sub_8168248
 
 	thumb_func_start sub_8168294
-sub_8168294: ; 8168294
+sub_8168294: @ 8168294
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -668958,7 +668958,7 @@ _081682FE:
 	thumb_func_end sub_8168294
 
 	thumb_func_start sub_8168328
-sub_8168328: ; 8168328
+sub_8168328: @ 8168328
 	push {r4,r5,lr}
 	ldr r4, =0x0203bcac
 	ldr r0, [r4]
@@ -668997,7 +668997,7 @@ _0816836E:
 	thumb_func_end sub_8168328
 
 	thumb_func_start sub_8168374
-sub_8168374: ; 8168374
+sub_8168374: @ 8168374
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x20]
@@ -669034,12 +669034,12 @@ _081683A8:
 	thumb_func_end sub_8168374
 
 	thumb_func_start nullsub_117
-nullsub_117: ; 81683B4
+nullsub_117: @ 81683B4
 	bx lr
 	thumb_func_end nullsub_117
 
 	thumb_func_start bx_goto_buffer_A_ch0_tbl3
-bx_goto_buffer_A_ch0_tbl3: ; 81683B8
+bx_goto_buffer_A_ch0_tbl3: @ 81683B8
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -669066,7 +669066,7 @@ bx_goto_buffer_A_ch0_tbl3: ; 81683B8
 	thumb_func_end bx_goto_buffer_A_ch0_tbl3
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl2
-bx_exec_buffer_A_ch0_tbl2: ; 81683F4
+bx_exec_buffer_A_ch0_tbl2: @ 81683F4
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -669101,7 +669101,7 @@ _08168440:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl2
 
 	thumb_func_start sub_8168444
-sub_8168444: ; 8168444
+sub_8168444: @ 8168444
 	push {r4,r5,lr}
 	ldr r1, =0x0202449c
 	ldr r0, [r1]
@@ -669244,7 +669244,7 @@ _08168564:
 	thumb_func_end sub_8168444
 
 	thumb_func_start sub_816856C
-sub_816856C: ; 816856C
+sub_816856C: @ 816856C
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -669269,7 +669269,7 @@ _08168590:
 	thumb_func_end sub_816856C
 
 	thumb_func_start sub_81685A4
-sub_81685A4: ; 81685A4
+sub_81685A4: @ 81685A4
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -669283,7 +669283,7 @@ _081685B6:
 	thumb_func_end sub_81685A4
 
 	thumb_func_start bx_wait_t5
-bx_wait_t5: ; 81685BC
+bx_wait_t5: @ 81685BC
 	push {lr}
 	ldr r0, =0x020244b9
 	ldrb r0, [r0]
@@ -669297,7 +669297,7 @@ _081685CA:
 	thumb_func_end bx_wait_t5
 
 	thumb_func_start sub_81685D4
-sub_81685D4: ; 81685D4
+sub_81685D4: @ 81685D4
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -669322,7 +669322,7 @@ _081685FC:
 	thumb_func_end sub_81685D4
 
 	thumb_func_start sub_8168610
-sub_8168610: ; 8168610
+sub_8168610: @ 8168610
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x4]
@@ -669347,7 +669347,7 @@ _08168636:
 	thumb_func_end sub_8168610
 
 	thumb_func_start sub_816864C
-sub_816864C: ; 816864C
+sub_816864C: @ 816864C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -669551,7 +669551,7 @@ _081687DC:
 	thumb_func_end sub_816864C
 
 	thumb_func_start sub_8168818
-sub_8168818: ; 8168818
+sub_8168818: @ 8168818
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -669676,7 +669676,7 @@ _08168904:
 	thumb_func_end sub_8168818
 
 	thumb_func_start sub_8168934
-sub_8168934: ; 8168934
+sub_8168934: @ 8168934
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -669726,7 +669726,7 @@ _08168996:
 	thumb_func_end sub_8168934
 
 	thumb_func_start bx_blink_t5
-bx_blink_t5: ; 81689A4
+bx_blink_t5: @ 81689A4
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -669786,7 +669786,7 @@ _08168A1A:
 	thumb_func_end bx_blink_t5
 
 	thumb_func_start sub_8168A20
-sub_8168A20: ; 8168A20
+sub_8168A20: @ 8168A20
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -669833,7 +669833,7 @@ _08168A74:
 	thumb_func_end sub_8168A20
 
 	thumb_func_start sub_8168A90
-sub_8168A90: ; 8168A90
+sub_8168A90: @ 8168A90
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -669858,7 +669858,7 @@ _08168AB4:
 	thumb_func_end sub_8168A90
 
 	thumb_func_start sub_8168AC8
-sub_8168AC8: ; 8168AC8
+sub_8168AC8: @ 8168AC8
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -669882,7 +669882,7 @@ _08168AEA:
 	thumb_func_end sub_8168AC8
 
 	thumb_func_start dp01_tbl5_exec_completed
-dp01_tbl5_exec_completed: ; 8168AF8
+dp01_tbl5_exec_completed: @ 8168AF8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -669932,7 +669932,7 @@ _08168B5E:
 	thumb_func_end dp01_tbl5_exec_completed
 
 	thumb_func_start sub_8168B70
-sub_8168B70: ; 8168B70
+sub_8168B70: @ 8168B70
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -669956,7 +669956,7 @@ _08168B92:
 	thumb_func_end sub_8168B70
 
 	thumb_func_start dp01t_00_5_getattr
-dp01t_00_5_getattr: ; 8168BA0
+dp01t_00_5_getattr: @ 8168BA0
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -670011,7 +670011,7 @@ _08168BFA:
 	thumb_func_end dp01t_00_5_getattr
 
 	thumb_func_start sub_8168C14
-sub_8168C14: ; 8168C14
+sub_8168C14: @ 8168C14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -670889,7 +670889,7 @@ _081693AA:
 	thumb_func_end sub_8168C14
 
 	thumb_func_start sub_81693C0
-sub_81693C0: ; 81693C0
+sub_81693C0: @ 81693C0
 	push {lr}
 	bl sub_805A614
 	pop {r0}
@@ -670897,7 +670897,7 @@ sub_81693C0: ; 81693C0
 	thumb_func_end sub_81693C0
 
 	thumb_func_start sub_81693CC
-sub_81693CC: ; 81693CC
+sub_81693CC: @ 81693CC
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -670940,7 +670940,7 @@ _0816941A:
 	thumb_func_end sub_81693CC
 
 	thumb_func_start sub_8169424
-sub_8169424: ; 8169424
+sub_8169424: @ 8169424
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -671973,7 +671973,7 @@ _08169DEA:
 	thumb_func_end sub_8169424
 
 	thumb_func_start sub_8169E20
-sub_8169E20: ; 8169E20
+sub_8169E20: @ 8169E20
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -671981,7 +671981,7 @@ sub_8169E20: ; 8169E20
 	thumb_func_end sub_8169E20
 
 	thumb_func_start sub_8169E2C
-sub_8169E2C: ; 8169E2C
+sub_8169E2C: @ 8169E2C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -671989,7 +671989,7 @@ sub_8169E2C: ; 8169E2C
 	thumb_func_end sub_8169E2C
 
 	thumb_func_start sub_8169E38
-sub_8169E38: ; 8169E38
+sub_8169E38: @ 8169E38
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -671997,7 +671997,7 @@ sub_8169E38: ; 8169E38
 	thumb_func_end sub_8169E38
 
 	thumb_func_start sub_8169E44
-sub_8169E44: ; 8169E44
+sub_8169E44: @ 8169E44
 	push {r4-r6,lr}
 	ldr r0, =0x02023064
 	ldr r6, =0x02024064
@@ -672052,7 +672052,7 @@ _08169EB6:
 	thumb_func_end sub_8169E44
 
 	thumb_func_start sub_8169EC8
-sub_8169EC8: ; 8169EC8
+sub_8169EC8: @ 8169EC8
 	push {r4-r6,lr}
 	ldr r4, =0x02024064
 	ldrb r1, [r4]
@@ -672137,7 +672137,7 @@ sub_8169EC8: ; 8169EC8
 	thumb_func_end sub_8169EC8
 
 	thumb_func_start dp01t_07_6_
-dp01t_07_6_: ; 8169F94
+dp01t_07_6_: @ 8169F94
 	push {r4-r6,lr}
 	ldr r4, =0x02024064
 	ldrb r1, [r4]
@@ -672222,7 +672222,7 @@ dp01t_07_6_: ; 8169F94
 	thumb_func_end dp01t_07_6_
 
 	thumb_func_start sub_816A060
-sub_816A060: ; 816A060
+sub_816A060: @ 816A060
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672230,7 +672230,7 @@ sub_816A060: ; 816A060
 	thumb_func_end sub_816A060
 
 	thumb_func_start sub_816A06C
-sub_816A06C: ; 816A06C
+sub_816A06C: @ 816A06C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672238,7 +672238,7 @@ sub_816A06C: ; 816A06C
 	thumb_func_end sub_816A06C
 
 	thumb_func_start sub_816A078
-sub_816A078: ; 816A078
+sub_816A078: @ 816A078
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672246,7 +672246,7 @@ sub_816A078: ; 816A078
 	thumb_func_end sub_816A078
 
 	thumb_func_start sub_816A084
-sub_816A084: ; 816A084
+sub_816A084: @ 816A084
 	push {r4,r5,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -672280,7 +672280,7 @@ sub_816A084: ; 816A084
 	thumb_func_end sub_816A084
 
 	thumb_func_start sub_816A0D8
-sub_816A0D8: ; 816A0D8
+sub_816A0D8: @ 816A0D8
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r5, =0x02024064
@@ -672319,7 +672319,7 @@ sub_816A0D8: ; 816A0D8
 	thumb_func_end sub_816A0D8
 
 	thumb_func_start sub_816A138
-sub_816A138: ; 816A138
+sub_816A138: @ 816A138
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672327,7 +672327,7 @@ sub_816A138: ; 816A138
 	thumb_func_end sub_816A138
 
 	thumb_func_start sub_816A144
-sub_816A144: ; 816A144
+sub_816A144: @ 816A144
 	push {r4-r6,lr}
 	ldr r0, =0x02023064
 	mov r12, r0
@@ -672457,7 +672457,7 @@ _0816A25A:
 	thumb_func_end sub_816A144
 
 	thumb_func_start bx_move_anim_5
-bx_move_anim_5: ; 816A26C
+bx_move_anim_5: @ 816A26C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -672617,7 +672617,7 @@ _0816A3AC:
 	thumb_func_end bx_move_anim_5
 
 	thumb_func_start sub_816A3B8
-sub_816A3B8: ; 816A3B8
+sub_816A3B8: @ 816A3B8
 	push {r4,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -672647,7 +672647,7 @@ sub_816A3B8: ; 816A3B8
 	thumb_func_end sub_816A3B8
 
 	thumb_func_start dp01t_11_5_message_for_player_only
-dp01t_11_5_message_for_player_only: ; 816A40C
+dp01t_11_5_message_for_player_only: @ 816A40C
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -672666,7 +672666,7 @@ _0816A42C:
 	thumb_func_end dp01t_11_5_message_for_player_only
 
 	thumb_func_start sub_816A430
-sub_816A430: ; 816A430
+sub_816A430: @ 816A430
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -672692,7 +672692,7 @@ _0816A456:
 	thumb_func_end sub_816A430
 
 	thumb_func_start dp01t_12_1_battle_menu
-dp01t_12_1_battle_menu: ; 816A470
+dp01t_12_1_battle_menu: @ 816A470
 	push {r4,lr}
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
@@ -672731,7 +672731,7 @@ _0816A48A:
 	thumb_func_end dp01t_12_1_battle_menu
 
 	thumb_func_start sub_816A4D8
-sub_816A4D8: ; 816A4D8
+sub_816A4D8: @ 816A4D8
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672739,7 +672739,7 @@ sub_816A4D8: ; 816A4D8
 	thumb_func_end sub_816A4D8
 
 	thumb_func_start sub_816A4E4
-sub_816A4E4: ; 816A4E4
+sub_816A4E4: @ 816A4E4
 	push {r4,lr}
 	ldr r4, =0x0202449c
 	ldr r1, [r4]
@@ -672813,7 +672813,7 @@ _0816A574:
 	thumb_func_end sub_816A4E4
 
 	thumb_func_start sub_816A57C
-sub_816A57C: ; 816A57C
+sub_816A57C: @ 816A57C
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -672840,7 +672840,7 @@ sub_816A57C: ; 816A57C
 	thumb_func_end sub_816A57C
 
 	thumb_func_start sub_816A5BC
-sub_816A5BC: ; 816A5BC
+sub_816A5BC: @ 816A5BC
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672848,7 +672848,7 @@ sub_816A5BC: ; 816A5BC
 	thumb_func_end sub_816A5BC
 
 	thumb_func_start sub_816A5C8
-sub_816A5C8: ; 816A5C8
+sub_816A5C8: @ 816A5C8
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672856,7 +672856,7 @@ sub_816A5C8: ; 816A5C8
 	thumb_func_end sub_816A5C8
 
 	thumb_func_start sub_816A5D4
-sub_816A5D4: ; 816A5D4
+sub_816A5D4: @ 816A5D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -672959,7 +672959,7 @@ _0816A69E:
 	thumb_func_end sub_816A5D4
 
 	thumb_func_start sub_816A6D4
-sub_816A6D4: ; 816A6D4
+sub_816A6D4: @ 816A6D4
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672967,7 +672967,7 @@ sub_816A6D4: ; 816A6D4
 	thumb_func_end sub_816A6D4
 
 	thumb_func_start sub_816A6E0
-sub_816A6E0: ; 816A6E0
+sub_816A6E0: @ 816A6E0
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672975,7 +672975,7 @@ sub_816A6E0: ; 816A6E0
 	thumb_func_end sub_816A6E0
 
 	thumb_func_start sub_816A6EC
-sub_816A6EC: ; 816A6EC
+sub_816A6EC: @ 816A6EC
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672983,7 +672983,7 @@ sub_816A6EC: ; 816A6EC
 	thumb_func_end sub_816A6EC
 
 	thumb_func_start sub_816A6F8
-sub_816A6F8: ; 816A6F8
+sub_816A6F8: @ 816A6F8
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672991,7 +672991,7 @@ sub_816A6F8: ; 816A6F8
 	thumb_func_end sub_816A6F8
 
 	thumb_func_start sub_816A704
-sub_816A704: ; 816A704
+sub_816A704: @ 816A704
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -672999,7 +672999,7 @@ sub_816A704: ; 816A704
 	thumb_func_end sub_816A704
 
 	thumb_func_start sub_816A710
-sub_816A710: ; 816A710
+sub_816A710: @ 816A710
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673007,7 +673007,7 @@ sub_816A710: ; 816A710
 	thumb_func_end sub_816A710
 
 	thumb_func_start sub_816A71C
-sub_816A71C: ; 816A71C
+sub_816A71C: @ 816A71C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673015,7 +673015,7 @@ sub_816A71C: ; 816A71C
 	thumb_func_end sub_816A71C
 
 	thumb_func_start sub_816A728
-sub_816A728: ; 816A728
+sub_816A728: @ 816A728
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673023,7 +673023,7 @@ sub_816A728: ; 816A728
 	thumb_func_end sub_816A728
 
 	thumb_func_start sub_816A734
-sub_816A734: ; 816A734
+sub_816A734: @ 816A734
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673031,7 +673031,7 @@ sub_816A734: ; 816A734
 	thumb_func_end sub_816A734
 
 	thumb_func_start sub_816A740
-sub_816A740: ; 816A740
+sub_816A740: @ 816A740
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673039,7 +673039,7 @@ sub_816A740: ; 816A740
 	thumb_func_end sub_816A740
 
 	thumb_func_start sub_816A74C
-sub_816A74C: ; 816A74C
+sub_816A74C: @ 816A74C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673047,7 +673047,7 @@ sub_816A74C: ; 816A74C
 	thumb_func_end sub_816A74C
 
 	thumb_func_start sub_816A758
-sub_816A758: ; 816A758
+sub_816A758: @ 816A758
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673055,7 +673055,7 @@ sub_816A758: ; 816A758
 	thumb_func_end sub_816A758
 
 	thumb_func_start sub_816A764
-sub_816A764: ; 816A764
+sub_816A764: @ 816A764
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673063,7 +673063,7 @@ sub_816A764: ; 816A764
 	thumb_func_end sub_816A764
 
 	thumb_func_start sub_816A770
-sub_816A770: ; 816A770
+sub_816A770: @ 816A770
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673071,7 +673071,7 @@ sub_816A770: ; 816A770
 	thumb_func_end sub_816A770
 
 	thumb_func_start sub_816A77C
-sub_816A77C: ; 816A77C
+sub_816A77C: @ 816A77C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673079,7 +673079,7 @@ sub_816A77C: ; 816A77C
 	thumb_func_end sub_816A77C
 
 	thumb_func_start sub_816A788
-sub_816A788: ; 816A788
+sub_816A788: @ 816A788
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673087,7 +673087,7 @@ sub_816A788: ; 816A788
 	thumb_func_end sub_816A788
 
 	thumb_func_start sub_816A794
-sub_816A794: ; 816A794
+sub_816A794: @ 816A794
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -673136,7 +673136,7 @@ _0816A7F2:
 	thumb_func_end sub_816A794
 
 	thumb_func_start sub_816A804
-sub_816A804: ; 816A804
+sub_816A804: @ 816A804
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673144,7 +673144,7 @@ sub_816A804: ; 816A804
 	thumb_func_end sub_816A804
 
 	thumb_func_start sub_816A810
-sub_816A810: ; 816A810
+sub_816A810: @ 816A810
 	push {lr}
 	ldr r2, =0x02023064
 	ldr r0, =0x02024064
@@ -673166,7 +673166,7 @@ sub_816A810: ; 816A810
 	thumb_func_end sub_816A810
 
 	thumb_func_start sub_816A840
-sub_816A840: ; 816A840
+sub_816A840: @ 816A840
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -673209,7 +673209,7 @@ _0816A890:
 	thumb_func_end sub_816A840
 
 	thumb_func_start sub_816A89C
-sub_816A89C: ; 816A89C
+sub_816A89C: @ 816A89C
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -673234,7 +673234,7 @@ sub_816A89C: ; 816A89C
 	thumb_func_end sub_816A89C
 
 	thumb_func_start dp01t_2E_5_battle_intro
-dp01t_2E_5_battle_intro: ; 816A8D8
+dp01t_2E_5_battle_intro: @ 816A8D8
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -673256,7 +673256,7 @@ dp01t_2E_5_battle_intro: ; 816A8D8
 	thumb_func_end dp01t_2E_5_battle_intro
 
 	thumb_func_start sub_816A90C
-sub_816A90C: ; 816A90C
+sub_816A90C: @ 816A90C
 	push {r4-r7,lr}
 	ldr r6, =0x020241e4
 	ldr r7, =0x02024064
@@ -673411,7 +673411,7 @@ _0816AA24:
 	thumb_func_end sub_816A90C
 
 	thumb_func_start sub_816AA80
-sub_816AA80: ; 816AA80
+sub_816AA80: @ 816AA80
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -673577,7 +673577,7 @@ sub_816AA80: ; 816AA80
 	thumb_func_end sub_816AA80
 
 	thumb_func_start sub_816AC04
-sub_816AC04: ; 816AC04
+sub_816AC04: @ 816AC04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -673629,7 +673629,7 @@ _0816AC5E:
 	thumb_func_end sub_816AC04
 
 	thumb_func_start sub_816AC78
-sub_816AC78: ; 816AC78
+sub_816AC78: @ 816AC78
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -673686,7 +673686,7 @@ _0816ACE6:
 	thumb_func_end sub_816AC78
 
 	thumb_func_start sub_816ACFC
-sub_816ACFC: ; 816ACFC
+sub_816ACFC: @ 816ACFC
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673694,7 +673694,7 @@ sub_816ACFC: ; 816ACFC
 	thumb_func_end sub_816ACFC
 
 	thumb_func_start sub_816AD08
-sub_816AD08: ; 816AD08
+sub_816AD08: @ 816AD08
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673702,7 +673702,7 @@ sub_816AD08: ; 816AD08
 	thumb_func_end sub_816AD08
 
 	thumb_func_start sub_816AD14
-sub_816AD14: ; 816AD14
+sub_816AD14: @ 816AD14
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673710,7 +673710,7 @@ sub_816AD14: ; 816AD14
 	thumb_func_end sub_816AD14
 
 	thumb_func_start sub_816AD20
-sub_816AD20: ; 816AD20
+sub_816AD20: @ 816AD20
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r5, =0x02023064
@@ -673754,7 +673754,7 @@ _0816AD6C:
 	thumb_func_end sub_816AD20
 
 	thumb_func_start sub_816AD7C
-sub_816AD7C: ; 816AD7C
+sub_816AD7C: @ 816AD7C
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673762,7 +673762,7 @@ sub_816AD7C: ; 816AD7C
 	thumb_func_end sub_816AD7C
 
 	thumb_func_start sub_816AD88
-sub_816AD88: ; 816AD88
+sub_816AD88: @ 816AD88
 	push {lr}
 	bl dp01_tbl5_exec_completed
 	pop {r0}
@@ -673770,7 +673770,7 @@ sub_816AD88: ; 816AD88
 	thumb_func_end sub_816AD88
 
 	thumb_func_start sub_816AD94
-sub_816AD94: ; 816AD94
+sub_816AD94: @ 816AD94
 	push {r4,lr}
 	ldr r2, =0x0202433a
 	ldr r1, =0x02023064
@@ -673806,12 +673806,12 @@ _0816ADD0:
 	thumb_func_end sub_816AD94
 
 	thumb_func_start nullsub_118
-nullsub_118: ; 816ADF0
+nullsub_118: @ 816ADF0
 	bx lr
 	thumb_func_end nullsub_118
 
 	thumb_func_start sub_816ADF4
-sub_816ADF4: ; 816ADF4
+sub_816ADF4: @ 816ADF4
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r0, =0x03005d8c
@@ -673861,7 +673861,7 @@ _0816AE48:
 	thumb_func_end sub_816ADF4
 
 	thumb_func_start sub_816AE58
-sub_816AE58: ; 816AE58
+sub_816AE58: @ 816AE58
 	push {lr}
 	ldr r1, =0x0203bcb0
 	ldr r0, =gUnknown_085DFED4
@@ -673883,7 +673883,7 @@ sub_816AE58: ; 816AE58
 	thumb_func_end sub_816AE58
 
 	thumb_func_start sub_816AE98
-sub_816AE98: ; 816AE98
+sub_816AE98: @ 816AE98
 	push {lr}
 	ldr r1, =0x0203bcb0
 	ldr r0, =gUnknown_085DFED8
@@ -673905,7 +673905,7 @@ sub_816AE98: ; 816AE98
 	thumb_func_end sub_816AE98
 
 	thumb_func_start sub_816AED8
-sub_816AED8: ; 816AED8
+sub_816AED8: @ 816AED8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -673984,7 +673984,7 @@ _0816AF12:
 	thumb_func_end sub_816AED8
 
 	thumb_func_start sub_816AF98
-sub_816AF98: ; 816AF98
+sub_816AF98: @ 816AF98
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -674067,7 +674067,7 @@ _0816B04C:
 	thumb_func_end sub_816AF98
 
 	thumb_func_start sub_816B060
-sub_816B060: ; 816B060
+sub_816B060: @ 816B060
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -674080,7 +674080,7 @@ sub_816B060: ; 816B060
 	thumb_func_end sub_816B060
 
 	thumb_func_start task_pc_itemstorage
-task_pc_itemstorage: ; 816B07C
+task_pc_itemstorage: @ 816B07C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -674102,7 +674102,7 @@ task_pc_itemstorage: ; 816B07C
 	thumb_func_end task_pc_itemstorage
 
 	thumb_func_start sub_816B0A8
-sub_816B0A8: ; 816B0A8
+sub_816B0A8: @ 816B0A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -674161,7 +674161,7 @@ _0816B12A:
 	thumb_func_end sub_816B0A8
 
 	thumb_func_start sub_816B138
-sub_816B138: ; 816B138
+sub_816B138: @ 816B138
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -674171,7 +674171,7 @@ sub_816B138: ; 816B138
 	thumb_func_end sub_816B138
 
 	thumb_func_start sub_816B148
-sub_816B148: ; 816B148
+sub_816B148: @ 816B148
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -674204,7 +674204,7 @@ _0816B184:
 	thumb_func_end sub_816B148
 
 	thumb_func_start sub_816B190
-sub_816B190: ; 816B190
+sub_816B190: @ 816B190
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r1, 0
@@ -674262,7 +674262,7 @@ sub_816B190: ; 816B190
 	thumb_func_end sub_816B190
 
 	thumb_func_start sub_816B21C
-sub_816B21C: ; 816B21C
+sub_816B21C: @ 816B21C
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -674285,7 +674285,7 @@ sub_816B21C: ; 816B21C
 	thumb_func_end sub_816B21C
 
 	thumb_func_start sub_816B248
-sub_816B248: ; 816B248
+sub_816B248: @ 816B248
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -674344,7 +674344,7 @@ _0816B2C0:
 	thumb_func_end sub_816B248
 
 	thumb_func_start sub_816B2C8
-sub_816B2C8: ; 816B2C8
+sub_816B2C8: @ 816B2C8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -674364,7 +674364,7 @@ sub_816B2C8: ; 816B2C8
 	thumb_func_end sub_816B2C8
 
 	thumb_func_start sub_816B2F0
-sub_816B2F0: ; 816B2F0
+sub_816B2F0: @ 816B2F0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -674386,7 +674386,7 @@ _0816B310:
 	thumb_func_end sub_816B2F0
 
 	thumb_func_start sub_816B31C
-sub_816B31C: ; 816B31C
+sub_816B31C: @ 816B31C
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =mapldr_080EBC0C
@@ -674399,7 +674399,7 @@ sub_816B31C: ; 816B31C
 	thumb_func_end sub_816B31C
 
 	thumb_func_start mapldr_080EBC0C
-mapldr_080EBC0C: ; 816B33C
+mapldr_080EBC0C: @ 816B33C
 	push {lr}
 	bl sub_81973A4
 	movs r0, 0
@@ -674419,7 +674419,7 @@ mapldr_080EBC0C: ; 816B33C
 	thumb_func_end mapldr_080EBC0C
 
 	thumb_func_start sub_816B368
-sub_816B368: ; 816B368
+sub_816B368: @ 816B368
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -674443,7 +674443,7 @@ _0816B388:
 	thumb_func_end sub_816B368
 
 	thumb_func_start sub_816B398
-sub_816B398: ; 816B398
+sub_816B398: @ 816B398
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -674478,7 +674478,7 @@ _0816B3D4:
 	thumb_func_end sub_816B398
 
 	thumb_func_start sub_816B3E4
-sub_816B3E4: ; 816B3E4
+sub_816B3E4: @ 816B3E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -674513,7 +674513,7 @@ _0816B420:
 	thumb_func_end sub_816B3E4
 
 	thumb_func_start sub_816B430
-sub_816B430: ; 816B430
+sub_816B430: @ 816B430
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -674560,7 +674560,7 @@ sub_816B430: ; 816B430
 	thumb_func_end sub_816B430
 
 	thumb_func_start sub_816B4A4
-sub_816B4A4: ; 816B4A4
+sub_816B4A4: @ 816B4A4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -674575,7 +674575,7 @@ sub_816B4A4: ; 816B4A4
 	thumb_func_end sub_816B4A4
 
 	thumb_func_start sub_816B4C0
-sub_816B4C0: ; 816B4C0
+sub_816B4C0: @ 816B4C0
 	push {lr}
 	ldr r1, =0x0203bcb8
 	ldrb r0, [r1, 0x5]
@@ -674593,7 +674593,7 @@ _0816B4D6:
 	thumb_func_end sub_816B4C0
 
 	thumb_func_start sub_816B4DC
-sub_816B4DC: ; 816B4DC
+sub_816B4DC: @ 816B4DC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -674618,7 +674618,7 @@ sub_816B4DC: ; 816B4DC
 	thumb_func_end sub_816B4DC
 
 	thumb_func_start sub_816B510
-sub_816B510: ; 816B510
+sub_816B510: @ 816B510
 	push {r4,lr}
 	movs r2, 0
 	movs r1, 0x6
@@ -674652,7 +674652,7 @@ _0816B534:
 	thumb_func_end sub_816B510
 
 	thumb_func_start sub_816B54C
-sub_816B54C: ; 816B54C
+sub_816B54C: @ 816B54C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -674742,7 +674742,7 @@ _0816B5D4:
 	thumb_func_end sub_816B54C
 
 	thumb_func_start sub_816B5F8
-sub_816B5F8: ; 816B5F8
+sub_816B5F8: @ 816B5F8
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -674795,7 +674795,7 @@ sub_816B5F8: ; 816B5F8
 	thumb_func_end sub_816B5F8
 
 	thumb_func_start sub_816B674
-sub_816B674: ; 816B674
+sub_816B674: @ 816B674
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -674878,7 +674878,7 @@ _0816B71E:
 	thumb_func_end sub_816B674
 
 	thumb_func_start sub_816B730
-sub_816B730: ; 816B730
+sub_816B730: @ 816B730
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -674917,7 +674917,7 @@ sub_816B730: ; 816B730
 	thumb_func_end sub_816B730
 
 	thumb_func_start sub_816B798
-sub_816B798: ; 816B798
+sub_816B798: @ 816B798
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -674947,7 +674947,7 @@ sub_816B798: ; 816B798
 	thumb_func_end sub_816B798
 
 	thumb_func_start sub_816B7DC
-sub_816B7DC: ; 816B7DC
+sub_816B7DC: @ 816B7DC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -674981,7 +674981,7 @@ sub_816B7DC: ; 816B7DC
 	thumb_func_end sub_816B7DC
 
 	thumb_func_start sub_816B82C
-sub_816B82C: ; 816B82C
+sub_816B82C: @ 816B82C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -675019,7 +675019,7 @@ _0816B86E:
 	thumb_func_end sub_816B82C
 
 	thumb_func_start sub_816B878
-sub_816B878: ; 816B878
+sub_816B878: @ 816B878
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -675041,7 +675041,7 @@ sub_816B878: ; 816B878
 	thumb_func_end sub_816B878
 
 	thumb_func_start sub_816B8A4
-sub_816B8A4: ; 816B8A4
+sub_816B8A4: @ 816B8A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -675079,7 +675079,7 @@ _0816B8E6:
 	thumb_func_end sub_816B8A4
 
 	thumb_func_start sub_816B900
-sub_816B900: ; 816B900
+sub_816B900: @ 816B900
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =pal_fill_for_maplights_or_black
@@ -675092,7 +675092,7 @@ sub_816B900: ; 816B900
 	thumb_func_end sub_816B900
 
 	thumb_func_start pal_fill_for_maplights_or_black
-pal_fill_for_maplights_or_black: ; 816B920
+pal_fill_for_maplights_or_black: @ 816B920
 	push {r4,lr}
 	bl sub_81973A4
 	ldr r0, =task00_080EBBDC
@@ -675122,7 +675122,7 @@ _0816B95A:
 	thumb_func_end pal_fill_for_maplights_or_black
 
 	thumb_func_start task00_080EBBDC
-task00_080EBBDC: ; 816B964
+task00_080EBBDC: @ 816B964
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -675146,7 +675146,7 @@ _0816B984:
 	thumb_func_end task00_080EBBDC
 
 	thumb_func_start sub_816B994
-sub_816B994: ; 816B994
+sub_816B994: @ 816B994
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -675159,7 +675159,7 @@ sub_816B994: ; 816B994
 	thumb_func_end sub_816B994
 
 	thumb_func_start sub_816B9B0
-sub_816B9B0: ; 816B9B0
+sub_816B9B0: @ 816B9B0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -675179,7 +675179,7 @@ sub_816B9B0: ; 816B9B0
 	thumb_func_end sub_816B9B0
 
 	thumb_func_start sub_816B9D8
-sub_816B9D8: ; 816B9D8
+sub_816B9D8: @ 816B9D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -675214,7 +675214,7 @@ _0816BA10:
 	thumb_func_end sub_816B9D8
 
 	thumb_func_start sub_816BA18
-sub_816BA18: ; 816BA18
+sub_816BA18: @ 816BA18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -675275,7 +675275,7 @@ _0816BA9C:
 	thumb_func_end sub_816BA18
 
 	thumb_func_start sub_816BAAC
-sub_816BAAC: ; 816BAAC
+sub_816BAAC: @ 816BAAC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -675285,7 +675285,7 @@ sub_816BAAC: ; 816BAAC
 	thumb_func_end sub_816BAAC
 
 	thumb_func_start sub_816BABC
-sub_816BABC: ; 816BABC
+sub_816BABC: @ 816BABC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -675315,7 +675315,7 @@ _0816BAEA:
 	thumb_func_end sub_816BABC
 
 	thumb_func_start sub_816BAF8
-sub_816BAF8: ; 816BAF8
+sub_816BAF8: @ 816BAF8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -675338,7 +675338,7 @@ _0816BB1C:
 	thumb_func_end sub_816BAF8
 
 	thumb_func_start sub_816BB28
-sub_816BB28: ; 816BB28
+sub_816BB28: @ 816BB28
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =sub_816BB48
@@ -675351,7 +675351,7 @@ sub_816BB28: ; 816BB28
 	thumb_func_end sub_816BB28
 
 	thumb_func_start sub_816BB48
-sub_816BB48: ; 816BB48
+sub_816BB48: @ 816BB48
 	push {r4-r6,lr}
 	ldr r0, =task00_080EBBDC
 	movs r1, 0
@@ -675402,7 +675402,7 @@ _0816BBAE:
 	thumb_func_end sub_816BB48
 
 	thumb_func_start sub_816BBB8
-sub_816BBB8: ; 816BBB8
+sub_816BBB8: @ 816BBB8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -675415,7 +675415,7 @@ sub_816BBB8: ; 816BBB8
 	thumb_func_end sub_816BBB8
 
 	thumb_func_start sub_816BBD4
-sub_816BBD4: ; 816BBD4
+sub_816BBD4: @ 816BBD4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -675443,7 +675443,7 @@ sub_816BBD4: ; 816BBD4
 	thumb_func_end sub_816BBD4
 
 	thumb_func_start sub_816BC14
-sub_816BC14: ; 816BC14
+sub_816BC14: @ 816BC14
 	push {r4,lr}
 	ldr r4, =0x0203bcc4
 	movs r0, 0xCE
@@ -675474,7 +675474,7 @@ sub_816BC14: ; 816BC14
 	thumb_func_end sub_816BC14
 
 	thumb_func_start sub_816BC58
-sub_816BC58: ; 816BC58
+sub_816BC58: @ 816BC58
 	push {r4,lr}
 	movs r4, 0
 _0816BC5C:
@@ -675494,7 +675494,7 @@ _0816BC5C:
 	thumb_func_end sub_816BC58
 
 	thumb_func_start sub_816BC7C
-sub_816BC7C: ; 816BC7C
+sub_816BC7C: @ 816BC7C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -675529,7 +675529,7 @@ _0816BCB4:
 	thumb_func_end sub_816BC7C
 
 	thumb_func_start sub_816BCC4
-sub_816BCC4: ; 816BCC4
+sub_816BCC4: @ 816BCC4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -675560,7 +675560,7 @@ _0816BCF8:
 	thumb_func_end sub_816BCC4
 
 	thumb_func_start sub_816BD04
-sub_816BD04: ; 816BD04
+sub_816BD04: @ 816BD04
 	push {r4-r6,lr}
 	movs r6, 0
 	ldr r0, =0x0203bcb8
@@ -675649,7 +675649,7 @@ _0816BD58:
 	thumb_func_end sub_816BD04
 
 	thumb_func_start sub_816BDC8
-sub_816BDC8: ; 816BDC8
+sub_816BDC8: @ 816BDC8
 	push {lr}
 	adds r2, r0, 0
 	lsls r0, r1, 16
@@ -675661,7 +675661,7 @@ sub_816BDC8: ; 816BDC8
 	thumb_func_end sub_816BDC8
 
 	thumb_func_start sub_816BDDC
-sub_816BDDC: ; 816BDDC
+sub_816BDDC: @ 816BDDC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -675708,7 +675708,7 @@ _0816BE38:
 	thumb_func_end sub_816BDDC
 
 	thumb_func_start fish4_goto_x5_or_x6
-fish4_goto_x5_or_x6: ; 816BE44
+fish4_goto_x5_or_x6: @ 816BE44
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -675783,7 +675783,7 @@ _0816BED4:
 	thumb_func_end fish4_goto_x5_or_x6
 
 	thumb_func_start sub_816BEF0
-sub_816BEF0: ; 816BEF0
+sub_816BEF0: @ 816BEF0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r1, r0, 0
@@ -675833,7 +675833,7 @@ _0816BF32:
 	thumb_func_end sub_816BEF0
 
 	thumb_func_start sub_816BF60
-sub_816BF60: ; 816BF60
+sub_816BF60: @ 816BF60
 	push {r4,lr}
 	sub sp, 0x10
 	ldr r4, =0x0203bcb8
@@ -675864,7 +675864,7 @@ _0816BF8C:
 	thumb_func_end sub_816BF60
 
 	thumb_func_start sub_816BF9C
-sub_816BF9C: ; 816BF9C
+sub_816BF9C: @ 816BF9C
 	push {r4,lr}
 	ldr r4, =0x0203bcb8
 	ldrb r0, [r4, 0x9]
@@ -675881,7 +675881,7 @@ _0816BFAE:
 	thumb_func_end sub_816BF9C
 
 	thumb_func_start sub_816BFB8
-sub_816BFB8: ; 816BFB8
+sub_816BFB8: @ 816BFB8
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -675903,7 +675903,7 @@ sub_816BFB8: ; 816BFB8
 	thumb_func_end sub_816BFB8
 
 	thumb_func_start sub_816BFE0
-sub_816BFE0: ; 816BFE0
+sub_816BFE0: @ 816BFE0
 	push {r4-r6,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -675965,7 +675965,7 @@ _0816C050:
 	thumb_func_end sub_816BFE0
 
 	thumb_func_start sub_816C060
-sub_816C060: ; 816C060
+sub_816C060: @ 816C060
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -676012,7 +676012,7 @@ _0816C0B2:
 	thumb_func_end sub_816C060
 
 	thumb_func_start sub_816C0C8
-sub_816C0C8: ; 816C0C8
+sub_816C0C8: @ 816C0C8
 	push {r4,r5,lr}
 	ldr r0, =0x0203bcc4
 	ldr r0, [r0]
@@ -676043,7 +676043,7 @@ _0816C0FA:
 	thumb_func_end sub_816C0C8
 
 	thumb_func_start sub_816C110
-sub_816C110: ; 816C110
+sub_816C110: @ 816C110
 	push {lr}
 	sub sp, 0x4
 	bl sub_80D6E84
@@ -676065,7 +676065,7 @@ sub_816C110: ; 816C110
 	thumb_func_end sub_816C110
 
 	thumb_func_start sub_816C140
-sub_816C140: ; 816C140
+sub_816C140: @ 816C140
 	push {lr}
 	ldr r0, =0x0203bcba
 	subs r1, r0, 0x2
@@ -676078,7 +676078,7 @@ sub_816C140: ; 816C140
 	thumb_func_end sub_816C140
 
 	thumb_func_start sub_816C158
-sub_816C158: ; 816C158
+sub_816C158: @ 816C158
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -676158,7 +676158,7 @@ _0816C186:
 	thumb_func_end sub_816C158
 
 	thumb_func_start sub_816C228
-sub_816C228: ; 816C228
+sub_816C228: @ 816C228
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -676228,7 +676228,7 @@ _0816C2BA:
 	thumb_func_end sub_816C228
 
 	thumb_func_start sub_816C2C0
-sub_816C2C0: ; 816C2C0
+sub_816C2C0: @ 816C2C0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -676262,7 +676262,7 @@ sub_816C2C0: ; 816C2C0
 	thumb_func_end sub_816C2C0
 
 	thumb_func_start sub_816C30C
-sub_816C30C: ; 816C30C
+sub_816C30C: @ 816C30C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -676330,7 +676330,7 @@ _0816C39E:
 	thumb_func_end sub_816C30C
 
 	thumb_func_start bx_battle_menu_t3
-bx_battle_menu_t3: ; 816C3A4
+bx_battle_menu_t3: @ 816C3A4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -676375,7 +676375,7 @@ _0816C3F2:
 	thumb_func_end bx_battle_menu_t3
 
 	thumb_func_start sub_816C400
-sub_816C400: ; 816C400
+sub_816C400: @ 816C400
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -676409,7 +676409,7 @@ sub_816C400: ; 816C400
 	thumb_func_end sub_816C400
 
 	thumb_func_start sub_816C450
-sub_816C450: ; 816C450
+sub_816C450: @ 816C450
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -676478,7 +676478,7 @@ sub_816C450: ; 816C450
 	thumb_func_end sub_816C450
 
 	thumb_func_start sub_816C4FC
-sub_816C4FC: ; 816C4FC
+sub_816C4FC: @ 816C4FC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -676554,7 +676554,7 @@ _0816C59A:
 	thumb_func_end sub_816C4FC
 
 	thumb_func_start sub_816C5A0
-sub_816C5A0: ; 816C5A0
+sub_816C5A0: @ 816C5A0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -676657,7 +676657,7 @@ _0816C622:
 	thumb_func_end sub_816C5A0
 
 	thumb_func_start sub_816C690
-sub_816C690: ; 816C690
+sub_816C690: @ 816C690
 	push {lr}
 	adds r3, r0, 0
 	lsls r3, 24
@@ -676680,7 +676680,7 @@ sub_816C690: ; 816C690
 	thumb_func_end sub_816C690
 
 	thumb_func_start sub_816C6BC
-sub_816C6BC: ; 816C6BC
+sub_816C6BC: @ 816C6BC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -676723,7 +676723,7 @@ sub_816C6BC: ; 816C6BC
 	thumb_func_end sub_816C6BC
 
 	thumb_func_start sub_816C71C
-sub_816C71C: ; 816C71C
+sub_816C71C: @ 816C71C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -676824,7 +676824,7 @@ _0816C7FE:
 	thumb_func_end sub_816C71C
 
 	thumb_func_start sub_816C818
-sub_816C818: ; 816C818
+sub_816C818: @ 816C818
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -676924,7 +676924,7 @@ _0816C8EC:
 	thumb_func_end sub_816C818
 
 	thumb_func_start sub_816C8FC
-sub_816C8FC: ; 816C8FC
+sub_816C8FC: @ 816C8FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -676999,7 +676999,7 @@ _0816C9A2:
 	thumb_func_end sub_816C8FC
 
 	thumb_func_start sub_816C9B8
-sub_816C9B8: ; 816C9B8
+sub_816C9B8: @ 816C9B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -677088,7 +677088,7 @@ _0816CA7C:
 	thumb_func_end sub_816C9B8
 
 	thumb_func_start sub_816CA94
-sub_816CA94: ; 816CA94
+sub_816CA94: @ 816CA94
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -677110,7 +677110,7 @@ sub_816CA94: ; 816CA94
 	thumb_func_end sub_816CA94
 
 	thumb_func_start sub_816CAC8
-sub_816CAC8: ; 816CAC8
+sub_816CAC8: @ 816CAC8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -677138,7 +677138,7 @@ sub_816CAC8: ; 816CAC8
 	thumb_func_end sub_816CAC8
 
 	thumb_func_start sub_816CB04
-sub_816CB04: ; 816CB04
+sub_816CB04: @ 816CB04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -677185,7 +677185,7 @@ _0816CB5E:
 	thumb_func_end sub_816CB04
 
 	thumb_func_start sub_816CB74
-sub_816CB74: ; 816CB74
+sub_816CB74: @ 816CB74
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -677219,7 +677219,7 @@ _0816CBAC:
 	thumb_func_end sub_816CB74
 
 	thumb_func_start sub_816CBC0
-sub_816CBC0: ; 816CBC0
+sub_816CBC0: @ 816CBC0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -677239,7 +677239,7 @@ sub_816CBC0: ; 816CBC0
 	thumb_func_end sub_816CBC0
 
 	thumb_func_start sub_816CBE8
-sub_816CBE8: ; 816CBE8
+sub_816CBE8: @ 816CBE8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -677250,7 +677250,7 @@ sub_816CBE8: ; 816CBE8
 	thumb_func_end sub_816CBE8
 
 	thumb_func_start sub_816CC00
-sub_816CC00: ; 816CC00
+sub_816CC00: @ 816CC00
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -677286,7 +677286,7 @@ _0816CC4C:
 	thumb_func_end sub_816CC00
 
 	thumb_func_start sub_816CC54
-sub_816CC54: ; 816CC54
+sub_816CC54: @ 816CC54
 	push {lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -677301,8 +677301,8 @@ _0816CC66:
 	thumb_func_end sub_816CC54
 
 	thumb_func_start load_copyright_graphics
-; void load_copyright_graphics(u16 tile_patterns_dest, u16 tilemap_dest, u16 unknown_dest)
-load_copyright_graphics: ; 816CC70
+@ void load_copyright_graphics(u16 tile_patterns_dest, u16 tilemap_dest, u16 unknown_dest)
+load_copyright_graphics: @ 816CC70
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -677334,7 +677334,7 @@ load_copyright_graphics: ; 816CC70
 	thumb_func_end load_copyright_graphics
 
 	thumb_func_start SerialCb_CopyrightScreen
-SerialCb_CopyrightScreen: ; 816CCB8
+SerialCb_CopyrightScreen: @ 816CCB8
 	push {lr}
 	ldr r0, =0x030062b0
 	bl GameCubeMultiBoot_HandleSerialInterrupt
@@ -677344,7 +677344,7 @@ SerialCb_CopyrightScreen: ; 816CCB8
 	thumb_func_end SerialCb_CopyrightScreen
 
 	thumb_func_start do_copyright_screen
-do_copyright_screen: ; 816CCC8
+do_copyright_screen: @ 816CCC8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r0, =0x030022c0
@@ -677531,7 +677531,7 @@ _0816CEA2:
 	thumb_func_end do_copyright_screen
 
 	thumb_func_start c2_copyright_1
-c2_copyright_1: ; 816CEAC
+c2_copyright_1: @ 816CEAC
 	push {lr}
 	bl do_copyright_screen
 	lsls r0, 24
@@ -677571,7 +677571,7 @@ _0816CEFA:
 	thumb_func_end c2_copyright_1
 
 	thumb_func_start c2_show_copyright_and_intro_again_2
-c2_show_copyright_and_intro_again_2: ; 816CF0C
+c2_show_copyright_and_intro_again_2: @ 816CF0C
 	push {lr}
 	bl do_copyright_screen
 	pop {r0}
@@ -677579,8 +677579,8 @@ c2_show_copyright_and_intro_again_2: ; 816CF0C
 	thumb_func_end c2_show_copyright_and_intro_again_2
 
 	thumb_func_start task_intro_1
-; void task_intro_1(int task_id)
-task_intro_1: ; 816CF18
+@ void task_intro_1(int task_id)
+task_intro_1: @ 816CF18
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -677763,7 +677763,7 @@ task_intro_1: ; 816CF18
 	thumb_func_end task_intro_1
 
 	thumb_func_start task_intro_2
-task_intro_2: ; 816D12C
+task_intro_2: @ 816D12C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -677804,7 +677804,7 @@ task_intro_2: ; 816D12C
 	thumb_func_end task_intro_2
 
 	thumb_func_start task_intro_3
-task_intro_3: ; 816D190
+task_intro_3: @ 816D190
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -677933,7 +677933,7 @@ _0816D27A:
 	thumb_func_end task_intro_3
 
 	thumb_func_start task_intro_3_3
-task_intro_3_3: ; 816D2A0
+task_intro_3_3: @ 816D2A0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -678011,7 +678011,7 @@ _0816D332:
 	thumb_func_end task_intro_3_3
 
 	thumb_func_start sub_816D338
-sub_816D338: ; 816D338
+sub_816D338: @ 816D338
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x2E]
@@ -678029,7 +678029,7 @@ _0816D350:
 	thumb_func_end sub_816D338
 
 	thumb_func_start task_intro_4
-task_intro_4: ; 816D354
+task_intro_4: @ 816D354
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -678136,7 +678136,7 @@ _0816D43E:
 	thumb_func_end task_intro_4
 
 	thumb_func_start task_intro_5
-task_intro_5: ; 816D458
+task_intro_5: @ 816D458
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -678159,7 +678159,7 @@ _0816D476:
 	thumb_func_end task_intro_5
 
 	thumb_func_start task_intro_6
-task_intro_6: ; 816D48C
+task_intro_6: @ 816D48C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -678192,7 +678192,7 @@ task_intro_6: ; 816D48C
 	thumb_func_end task_intro_6
 
 	thumb_func_start task_intro_7
-task_intro_7: ; 816D4E4
+task_intro_7: @ 816D4E4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -678327,8 +678327,8 @@ _0816D598:
 	thumb_func_end task_intro_7
 
 	thumb_func_start task_intro_8
-; void task_intro_8(int task_id)
-task_intro_8: ; 816D650
+@ void task_intro_8(int task_id)
+task_intro_8: @ 816D650
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -678513,7 +678513,7 @@ _0816D7A0:
 	thumb_func_end task_intro_8
 
 	thumb_func_start task_intro_9
-task_intro_9: ; 816D7E8
+task_intro_9: @ 816D7E8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -678536,7 +678536,7 @@ _0816D806:
 	thumb_func_end task_intro_9
 
 	thumb_func_start sub_816D81C
-sub_816D81C: ; 816D81C
+sub_816D81C: @ 816D81C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -678751,7 +678751,7 @@ _0816D9BA:
 	thumb_func_end sub_816D81C
 
 	thumb_func_start sub_816D9C0
-sub_816D9C0: ; 816D9C0
+sub_816D9C0: @ 816D9C0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -678900,7 +678900,7 @@ _0816DADA:
 	thumb_func_end sub_816D9C0
 
 	thumb_func_start sub_816DAE8
-sub_816DAE8: ; 816DAE8
+sub_816DAE8: @ 816DAE8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -679005,7 +679005,7 @@ _0816DBA4:
 	thumb_func_end sub_816DAE8
 
 	thumb_func_start task_intro_10
-task_intro_10: ; 816DBAC
+task_intro_10: @ 816DBAC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -679070,7 +679070,7 @@ task_intro_10: ; 816DBAC
 	thumb_func_end task_intro_10
 
 	thumb_func_start task_intro_11
-task_intro_11: ; 816DC64
+task_intro_11: @ 816DC64
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -679140,7 +679140,7 @@ _0816DCE6:
 	thumb_func_end task_intro_11
 
 	thumb_func_start task_intro_12
-task_intro_12: ; 816DCFC
+task_intro_12: @ 816DCFC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -679162,7 +679162,7 @@ _0816DD18:
 	thumb_func_end task_intro_12
 
 	thumb_func_start task_intro_13
-task_intro_13: ; 816DD28
+task_intro_13: @ 816DD28
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -679215,7 +679215,7 @@ _0816DD94:
 	thumb_func_end task_intro_13
 
 	thumb_func_start task_intro_14
-task_intro_14: ; 816DDD8
+task_intro_14: @ 816DDD8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -679276,7 +679276,7 @@ task_intro_14: ; 816DDD8
 	thumb_func_end task_intro_14
 
 	thumb_func_start task_intro_15
-task_intro_15: ; 816DE7C
+task_intro_15: @ 816DE7C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -679319,7 +679319,7 @@ _0816DEC6:
 	thumb_func_end task_intro_15
 
 	thumb_func_start task_intro_16
-task_intro_16: ; 816DED0
+task_intro_16: @ 816DED0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -679334,7 +679334,7 @@ task_intro_16: ; 816DED0
 	thumb_func_end task_intro_16
 
 	thumb_func_start task_intro_17
-task_intro_17: ; 816DEEC
+task_intro_17: @ 816DEEC
 	push {lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -679365,7 +679365,7 @@ task_intro_17: ; 816DEEC
 	thumb_func_end task_intro_17
 
 	thumb_func_start task_intro_18
-task_intro_18: ; 816DF2C
+task_intro_18: @ 816DF2C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -679656,7 +679656,7 @@ _0816E176:
 	thumb_func_end task_intro_18
 
 	thumb_func_start sub_816E190
-sub_816E190: ; 816E190
+sub_816E190: @ 816E190
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -679704,7 +679704,7 @@ _0816E19C:
 	thumb_func_end sub_816E190
 
 	thumb_func_start sub_816E1F8
-sub_816E1F8: ; 816E1F8
+sub_816E1F8: @ 816E1F8
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x34]
@@ -679797,7 +679797,7 @@ _0816E29C:
 	thumb_func_end sub_816E1F8
 
 	thumb_func_start task_intro_19
-task_intro_19: ; 816E2A0
+task_intro_19: @ 816E2A0
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -679865,7 +679865,7 @@ task_intro_19: ; 816E2A0
 	thumb_func_end task_intro_19
 
 	thumb_func_start task_intro_20
-task_intro_20: ; 816E358
+task_intro_20: @ 816E358
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -680283,7 +680283,7 @@ _0816E6BC:
 	thumb_func_end task_intro_20
 
 	thumb_func_start sub_816E6D4
-sub_816E6D4: ; 816E6D4
+sub_816E6D4: @ 816E6D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -680341,7 +680341,7 @@ _0816E6EE:
 	thumb_func_end sub_816E6D4
 
 	thumb_func_start sub_816E74C
-sub_816E74C: ; 816E74C
+sub_816E74C: @ 816E74C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -680392,7 +680392,7 @@ _0816E75E:
 	thumb_func_end sub_816E74C
 
 	thumb_func_start sub_816E7B4
-sub_816E7B4: ; 816E7B4
+sub_816E7B4: @ 816E7B4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -680506,7 +680506,7 @@ _0816E882:
 	thumb_func_end sub_816E7B4
 
 	thumb_func_start task_intro_21
-task_intro_21: ; 816E888
+task_intro_21: @ 816E888
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -680577,7 +680577,7 @@ task_intro_21: ; 816E888
 	thumb_func_end task_intro_21
 
 	thumb_func_start task_intro_22
-task_intro_22: ; 816E954
+task_intro_22: @ 816E954
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -680602,7 +680602,7 @@ task_intro_22: ; 816E954
 	thumb_func_end task_intro_22
 
 	thumb_func_start task_intro_23
-task_intro_23: ; 816E998
+task_intro_23: @ 816E998
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -680634,7 +680634,7 @@ task_intro_23: ; 816E998
 	thumb_func_end task_intro_23
 
 	thumb_func_start task_intro_24
-task_intro_24: ; 816E9DC
+task_intro_24: @ 816E9DC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -680737,7 +680737,7 @@ _0816EAA6:
 	thumb_func_end task_intro_24
 
 	thumb_func_start task_intro_25
-task_intro_25: ; 816EAB8
+task_intro_25: @ 816EAB8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -680782,7 +680782,7 @@ task_intro_25: ; 816EAB8
 	thumb_func_end task_intro_25
 
 	thumb_func_start task_intro_26
-task_intro_26: ; 816EB44
+task_intro_26: @ 816EB44
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -680919,7 +680919,7 @@ _0816EC62:
 	thumb_func_end task_intro_26
 
 	thumb_func_start sub_816EC6C
-sub_816EC6C: ; 816EC6C
+sub_816EC6C: @ 816EC6C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -681013,7 +681013,7 @@ _0816ED12:
 	thumb_func_end sub_816EC6C
 
 	thumb_func_start task_intro_27
-task_intro_27: ; 816ED20
+task_intro_27: @ 816ED20
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -681068,7 +681068,7 @@ task_intro_27: ; 816ED20
 	thumb_func_end task_intro_27
 
 	thumb_func_start task_intro_28
-task_intro_28: ; 816EDB4
+task_intro_28: @ 816EDB4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -681185,7 +681185,7 @@ _0816EE86:
 	thumb_func_end task_intro_28
 
 	thumb_func_start task_intro_29
-task_intro_29: ; 816EE90
+task_intro_29: @ 816EE90
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -681198,7 +681198,7 @@ task_intro_29: ; 816EE90
 	thumb_func_end task_intro_29
 
 	thumb_func_start sub_816EEA8
-sub_816EEA8: ; 816EEA8
+sub_816EEA8: @ 816EEA8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -681445,8 +681445,8 @@ _0816F0B2:
 	thumb_func_end sub_816EEA8
 
 	thumb_func_start intro_reset_and_hide_bgs
-; void intro_reset_and_hide_bgs()
-intro_reset_and_hide_bgs: ; 816F0C0
+@ void intro_reset_and_hide_bgs()
+intro_reset_and_hide_bgs: @ 816F0C0
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -681489,7 +681489,7 @@ intro_reset_and_hide_bgs: ; 816F0C0
 	thumb_func_end intro_reset_and_hide_bgs
 
 	thumb_func_start task_intro_3_1
-task_intro_3_1: ; 816F128
+task_intro_3_1: @ 816F128
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -681575,7 +681575,7 @@ _0816F1DA:
 	thumb_func_end task_intro_3_1
 
 	thumb_func_start task_intro_3_2
-task_intro_3_2: ; 816F1E0
+task_intro_3_2: @ 816F1E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -681670,7 +681670,7 @@ _0816F2A2:
 	thumb_func_end task_intro_3_2
 
 	thumb_func_start sub_816F2A8
-sub_816F2A8: ; 816F2A8
+sub_816F2A8: @ 816F2A8
 	push {r4,lr}
 	sub sp, 0x24
 	lsls r2, 16
@@ -681721,7 +681721,7 @@ sub_816F2A8: ; 816F2A8
 	thumb_func_end sub_816F2A8
 
 	thumb_func_start sub_816F318
-sub_816F318: ; 816F318
+sub_816F318: @ 816F318
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -681796,7 +681796,7 @@ _0816F39A:
 	thumb_func_end sub_816F318
 
 	thumb_func_start sub_816F3A4
-sub_816F3A4: ; 816F3A4
+sub_816F3A4: @ 816F3A4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x02020630
@@ -681884,7 +681884,7 @@ _0816F44C:
 	thumb_func_end sub_816F3A4
 
 	thumb_func_start sub_816F454
-sub_816F454: ; 816F454
+sub_816F454: @ 816F454
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -681900,7 +681900,7 @@ _0816F464:
 	thumb_func_end sub_816F454
 
 	thumb_func_start sub_816F46C
-sub_816F46C: ; 816F46C
+sub_816F46C: @ 816F46C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -682068,7 +682068,7 @@ _0816F59E:
 	thumb_func_end sub_816F46C
 
 	thumb_func_start sub_816F5B4
-sub_816F5B4: ; 816F5B4
+sub_816F5B4: @ 816F5B4
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -682157,7 +682157,7 @@ _0816F654:
 	thumb_func_end sub_816F5B4
 
 	thumb_func_start sub_816F660
-sub_816F660: ; 816F660
+sub_816F660: @ 816F660
 	push {r4,lr}
 	adds r1, r0, 0
 	movs r2, 0x2E
@@ -682218,7 +682218,7 @@ _0816F6C4:
 	thumb_func_end sub_816F660
 
 	thumb_func_start sub_816F6D0
-sub_816F6D0: ; 816F6D0
+sub_816F6D0: @ 816F6D0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x22]
@@ -682284,7 +682284,7 @@ _0816F744:
 	thumb_func_end sub_816F6D0
 
 	thumb_func_start sub_816F750
-sub_816F750: ; 816F750
+sub_816F750: @ 816F750
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r2, [r4, 0x22]
@@ -682350,7 +682350,7 @@ _0816F7C4:
 	thumb_func_end sub_816F750
 
 	thumb_func_start sub_816F7D0
-sub_816F7D0: ; 816F7D0
+sub_816F7D0: @ 816F7D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -682588,7 +682588,7 @@ _0816F8A0:
 	thumb_func_end sub_816F7D0
 
 	thumb_func_start sub_816F9D4
-sub_816F9D4: ; 816F9D4
+sub_816F9D4: @ 816F9D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -682702,7 +682702,7 @@ _0816FAAA:
 	thumb_func_end sub_816F9D4
 
 	thumb_func_start sub_816FAB0
-sub_816FAB0: ; 816FAB0
+sub_816FAB0: @ 816FAB0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -682777,7 +682777,7 @@ _0816FB12:
 	thumb_func_end sub_816FAB0
 
 	thumb_func_start sub_816FB38
-sub_816FB38: ; 816FB38
+sub_816FB38: @ 816FB38
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x2E
@@ -683025,7 +683025,7 @@ _0816FD38:
 	thumb_func_end sub_816FB38
 
 	thumb_func_start sub_816FD44
-sub_816FD44: ; 816FD44
+sub_816FD44: @ 816FD44
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -683088,7 +683088,7 @@ _0816FDB0:
 	thumb_func_end sub_816FD44
 
 	thumb_func_start sub_816FDB8
-sub_816FDB8: ; 816FDB8
+sub_816FDB8: @ 816FDB8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -683222,7 +683222,7 @@ _0816FDD2:
 	thumb_func_end sub_816FDB8
 
 	thumb_func_start sub_816FEDC
-sub_816FEDC: ; 816FEDC
+sub_816FEDC: @ 816FEDC
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -683405,7 +683405,7 @@ _08170038:
 	thumb_func_end sub_816FEDC
 
 	thumb_func_start sub_8170040
-sub_8170040: ; 8170040
+sub_8170040: @ 8170040
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -683501,7 +683501,7 @@ _081700BE:
 	thumb_func_end sub_8170040
 
 	thumb_func_start sub_81700F8
-sub_81700F8: ; 81700F8
+sub_81700F8: @ 81700F8
 	push {r4,r5,lr}
 	ldr r5, =0x04000208
 	ldrh r4, [r5]
@@ -683557,7 +683557,7 @@ _0817014C:
 	thumb_func_end sub_81700F8
 
 	thumb_func_start sub_817018C
-sub_817018C: ; 817018C
+sub_817018C: @ 817018C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0
@@ -683581,7 +683581,7 @@ sub_817018C: ; 817018C
 	thumb_func_end sub_817018C
 
 	thumb_func_start sub_81701C4
-sub_81701C4: ; 81701C4
+sub_81701C4: @ 81701C4
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -683636,7 +683636,7 @@ sub_81701C4: ; 81701C4
 	thumb_func_end sub_81701C4
 
 	thumb_func_start sub_8170260
-sub_8170260: ; 8170260
+sub_8170260: @ 8170260
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -683646,7 +683646,7 @@ sub_8170260: ; 8170260
 	thumb_func_end sub_8170260
 
 	thumb_func_start sub_8170274
-sub_8170274: ; 8170274
+sub_8170274: @ 8170274
 	push {lr}
 	bl sub_8170290
 	bl CallObjectCallbacks
@@ -683658,7 +683658,7 @@ sub_8170274: ; 8170274
 	thumb_func_end sub_8170274
 
 	thumb_func_start sub_8170290
-sub_8170290: ; 8170290
+sub_8170290: @ 8170290
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r1, =0x0203bcd0
@@ -683834,7 +683834,7 @@ _08170416:
 	thumb_func_end sub_8170290
 
 	thumb_func_start sub_8170428
-sub_8170428: ; 8170428
+sub_8170428: @ 8170428
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r4, =0x0203bcd0
@@ -683874,7 +683874,7 @@ _08170470:
 	thumb_func_end sub_8170428
 
 	thumb_func_start sub_8170478
-sub_8170478: ; 8170478
+sub_8170478: @ 8170478
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -684074,7 +684074,7 @@ sub_8170478: ; 8170478
 	thumb_func_end sub_8170478
 
 	thumb_func_start sub_8170660
-sub_8170660: ; 8170660
+sub_8170660: @ 8170660
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -684291,7 +684291,7 @@ _08170814:
 	thumb_func_end sub_8170660
 
 	thumb_func_start sub_8170834
-sub_8170834: ; 8170834
+sub_8170834: @ 8170834
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -684400,7 +684400,7 @@ sub_8170834: ; 8170834
 	thumb_func_end sub_8170834
 
 	thumb_func_start sub_8170920
-sub_8170920: ; 8170920
+sub_8170920: @ 8170920
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -684422,7 +684422,7 @@ sub_8170920: ; 8170920
 	thumb_func_end sub_8170920
 
 	thumb_func_start sub_817094C
-sub_817094C: ; 817094C
+sub_817094C: @ 817094C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -684491,7 +684491,7 @@ sub_817094C: ; 817094C
 	thumb_func_end sub_817094C
 
 	thumb_func_start sub_81709EC
-sub_81709EC: ; 81709EC
+sub_81709EC: @ 81709EC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -684508,7 +684508,7 @@ sub_81709EC: ; 81709EC
 	thumb_func_end sub_81709EC
 
 	thumb_func_start sub_8170A0C
-sub_8170A0C: ; 8170A0C
+sub_8170A0C: @ 8170A0C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -684528,7 +684528,7 @@ sub_8170A0C: ; 8170A0C
 	thumb_func_end sub_8170A0C
 
 	thumb_func_start sub_8170A38
-sub_8170A38: ; 8170A38
+sub_8170A38: @ 8170A38
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -684629,7 +684629,7 @@ _08170AF8:
 	thumb_func_end sub_8170A38
 
 	thumb_func_start sub_8170B04
-sub_8170B04: ; 8170B04
+sub_8170B04: @ 8170B04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -684711,7 +684711,7 @@ _08170BA4:
 	thumb_func_end sub_8170B04
 
 	thumb_func_start sub_8170BB0
-sub_8170BB0: ; 8170BB0
+sub_8170BB0: @ 8170BB0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -684859,7 +684859,7 @@ _08170CEE:
 	thumb_func_end sub_8170BB0
 
 	thumb_func_start sub_8170CFC
-sub_8170CFC: ; 8170CFC
+sub_8170CFC: @ 8170CFC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -684879,7 +684879,7 @@ sub_8170CFC: ; 8170CFC
 	thumb_func_end sub_8170CFC
 
 	thumb_func_start sub_8170D24
-sub_8170D24: ; 8170D24
+sub_8170D24: @ 8170D24
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -684899,7 +684899,7 @@ sub_8170D24: ; 8170D24
 	thumb_func_end sub_8170D24
 
 	thumb_func_start sub_8170D4C
-sub_8170D4C: ; 8170D4C
+sub_8170D4C: @ 8170D4C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -684926,7 +684926,7 @@ _08170D74:
 	thumb_func_end sub_8170D4C
 
 	thumb_func_start ball_number_to_ball_processing_index
-ball_number_to_ball_processing_index: ; 8170D84
+ball_number_to_ball_processing_index: @ 8170D84
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -684994,7 +684994,7 @@ _08170DFE:
 	thumb_func_end ball_number_to_ball_processing_index
 
 	thumb_func_start sub_8170E04
-sub_8170E04: ; 8170E04
+sub_8170E04: @ 8170E04
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -685094,7 +685094,7 @@ sub_8170E04: ; 8170E04
 	thumb_func_end sub_8170E04
 
 	thumb_func_start sub_8170EF0
-sub_8170EF0: ; 8170EF0
+sub_8170EF0: @ 8170EF0
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -685122,7 +685122,7 @@ _08170F1A:
 	thumb_func_end sub_8170EF0
 
 	thumb_func_start sub_8170F2C
-sub_8170F2C: ; 8170F2C
+sub_8170F2C: @ 8170F2C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -685233,7 +685233,7 @@ _08170F54:
 	thumb_func_end sub_8170F2C
 
 	thumb_func_start sub_8171030
-sub_8171030: ; 8171030
+sub_8171030: @ 8171030
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -685284,7 +685284,7 @@ _0817108A:
 	thumb_func_end sub_8171030
 
 	thumb_func_start sub_81710A8
-sub_81710A8: ; 81710A8
+sub_81710A8: @ 81710A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -685327,7 +685327,7 @@ _081710F4:
 	thumb_func_end sub_81710A8
 
 	thumb_func_start sub_8171104
-sub_8171104: ; 8171104
+sub_8171104: @ 8171104
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -685351,7 +685351,7 @@ sub_8171104: ; 8171104
 	thumb_func_end sub_8171104
 
 	thumb_func_start sub_8171134
-sub_8171134: ; 8171134
+sub_8171134: @ 8171134
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -685433,7 +685433,7 @@ _081711D2:
 	thumb_func_end sub_8171134
 
 	thumb_func_start sub_81711E8
-sub_81711E8: ; 81711E8
+sub_81711E8: @ 81711E8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -685471,7 +685471,7 @@ _08171224:
 	thumb_func_end sub_81711E8
 
 	thumb_func_start sub_8171240
-sub_8171240: ; 8171240
+sub_8171240: @ 8171240
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r1, =0x020241e4
@@ -685621,7 +685621,7 @@ _0817137C:
 	thumb_func_end sub_8171240
 
 	thumb_func_start sub_817138C
-sub_817138C: ; 817138C
+sub_817138C: @ 817138C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -685657,7 +685657,7 @@ _081713C6:
 	thumb_func_end sub_817138C
 
 	thumb_func_start sub_81713D0
-sub_81713D0: ; 81713D0
+sub_81713D0: @ 81713D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -685787,7 +685787,7 @@ _081714CA:
 	thumb_func_end sub_81713D0
 
 	thumb_func_start sub_81714D4
-sub_81714D4: ; 81714D4
+sub_81714D4: @ 81714D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -685824,7 +685824,7 @@ _08171510:
 	thumb_func_end sub_81714D4
 
 	thumb_func_start sub_8171520
-sub_8171520: ; 8171520
+sub_8171520: @ 8171520
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x34]
@@ -686156,7 +686156,7 @@ _081717AE:
 	thumb_func_end sub_8171520
 
 	thumb_func_start sub_81717B4
-sub_81717B4: ; 81717B4
+sub_81717B4: @ 81717B4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x38]
@@ -686177,7 +686177,7 @@ _081717CE:
 	thumb_func_end sub_81717B4
 
 	thumb_func_start sub_81717D8
-sub_81717D8: ; 81717D8
+sub_81717D8: @ 81717D8
 	adds r3, r0, 0
 	adds r3, 0x2C
 	ldrb r1, [r3]
@@ -686195,7 +686195,7 @@ sub_81717D8: ; 81717D8
 	thumb_func_end sub_81717D8
 
 	thumb_func_start sub_81717F8
-sub_81717F8: ; 81717F8
+sub_81717F8: @ 81717F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -686293,7 +686293,7 @@ _081718BC:
 	thumb_func_end sub_81717F8
 
 	thumb_func_start sub_81718D8
-sub_81718D8: ; 81718D8
+sub_81718D8: @ 81718D8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -686408,7 +686408,7 @@ _081719B0:
 	thumb_func_end sub_81718D8
 
 	thumb_func_start sub_81719C0
-sub_81719C0: ; 81719C0
+sub_81719C0: @ 81719C0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -686432,7 +686432,7 @@ _081719E4:
 	thumb_func_end sub_81719C0
 
 	thumb_func_start sub_81719EC
-sub_81719EC: ; 81719EC
+sub_81719EC: @ 81719EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -686522,7 +686522,7 @@ _08171A82:
 	thumb_func_end sub_81719EC
 
 	thumb_func_start sub_8171AAC
-sub_8171AAC: ; 8171AAC
+sub_8171AAC: @ 8171AAC
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r4, 0
@@ -686552,7 +686552,7 @@ _08171ADC:
 	thumb_func_end sub_8171AAC
 
 	thumb_func_start sub_8171AE4
-sub_8171AE4: ; 8171AE4
+sub_8171AE4: @ 8171AE4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -686641,7 +686641,7 @@ _08171B36:
 	thumb_func_end sub_8171AE4
 
 	thumb_func_start sub_8171BAC
-sub_8171BAC: ; 8171BAC
+sub_8171BAC: @ 8171BAC
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	movs r5, 0
@@ -686756,7 +686756,7 @@ _08171C8A:
 	thumb_func_end sub_8171BAC
 
 	thumb_func_start sub_8171CAC
-sub_8171CAC: ; 8171CAC
+sub_8171CAC: @ 8171CAC
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x24]
@@ -686789,7 +686789,7 @@ _08171CD0:
 	thumb_func_end sub_8171CAC
 
 	thumb_func_start sub_8171CE8
-sub_8171CE8: ; 8171CE8
+sub_8171CE8: @ 8171CE8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x80
@@ -686851,7 +686851,7 @@ _08171D52:
 	thumb_func_end sub_8171CE8
 
 	thumb_func_start sub_8171D60
-sub_8171D60: ; 8171D60
+sub_8171D60: @ 8171D60
 	push {r4,r5,lr}
 	lsls r0, 24
 	ldr r1, =gUnknown_085E5094
@@ -686876,7 +686876,7 @@ _08171D86:
 	thumb_func_end sub_8171D60
 
 	thumb_func_start sub_8171D98
-sub_8171D98: ; 8171D98
+sub_8171D98: @ 8171D98
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -686941,7 +686941,7 @@ sub_8171D98: ; 8171D98
 	thumb_func_end sub_8171D98
 
 	thumb_func_start sub_8171E20
-sub_8171E20: ; 8171E20
+sub_8171E20: @ 8171E20
 	push {lr}
 	ldr r0, =0x030022c0
 	ldr r1, =0x00000439
@@ -686964,7 +686964,7 @@ _08171E3E:
 	thumb_func_end sub_8171E20
 
 	thumb_func_start sub_8171E50
-sub_8171E50: ; 8171E50
+sub_8171E50: @ 8171E50
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687095,7 +687095,7 @@ _08171F58:
 	thumb_func_end sub_8171E50
 
 	thumb_func_start sub_8171F68
-sub_8171F68: ; 8171F68
+sub_8171F68: @ 8171F68
 	push {lr}
 	adds r1, r0, 0
 	ldrh r2, [r1, 0x30]
@@ -687116,7 +687116,7 @@ _08171F84:
 	thumb_func_end sub_8171F68
 
 	thumb_func_start sub_8171F88
-sub_8171F88: ; 8171F88
+sub_8171F88: @ 8171F88
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -687147,7 +687147,7 @@ _08171FBC:
 	thumb_func_end sub_8171F88
 
 	thumb_func_start sub_8171FC4
-sub_8171FC4: ; 8171FC4
+sub_8171FC4: @ 8171FC4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687265,7 +687265,7 @@ _08172092:
 	thumb_func_end sub_8171FC4
 
 	thumb_func_start sub_81720C8
-sub_81720C8: ; 81720C8
+sub_81720C8: @ 81720C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687383,7 +687383,7 @@ _08172196:
 	thumb_func_end sub_81720C8
 
 	thumb_func_start sub_81721CC
-sub_81721CC: ; 81721CC
+sub_81721CC: @ 81721CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687499,7 +687499,7 @@ _08172296:
 	thumb_func_end sub_81721CC
 
 	thumb_func_start sub_81722CC
-sub_81722CC: ; 81722CC
+sub_81722CC: @ 81722CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687619,7 +687619,7 @@ _0817239E:
 	thumb_func_end sub_81722CC
 
 	thumb_func_start sub_81723D4
-sub_81723D4: ; 81723D4
+sub_81723D4: @ 81723D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687761,7 +687761,7 @@ _081724D6:
 	thumb_func_end sub_81723D4
 
 	thumb_func_start sub_8172508
-sub_8172508: ; 8172508
+sub_8172508: @ 8172508
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -687806,7 +687806,7 @@ _08172558:
 	thumb_func_end sub_8172508
 
 	thumb_func_start sub_8172560
-sub_8172560: ; 8172560
+sub_8172560: @ 8172560
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -687920,7 +687920,7 @@ _08172626:
 	thumb_func_end sub_8172560
 
 	thumb_func_start sub_817265C
-sub_817265C: ; 817265C
+sub_817265C: @ 817265C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -687968,7 +687968,7 @@ _081726B4:
 	thumb_func_end sub_817265C
 
 	thumb_func_start sub_81726BC
-sub_81726BC: ; 81726BC
+sub_81726BC: @ 81726BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -688106,7 +688106,7 @@ _081727C4:
 	thumb_func_end sub_81726BC
 
 	thumb_func_start sub_81727E8
-sub_81727E8: ; 81727E8
+sub_81727E8: @ 81727E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -688217,7 +688217,7 @@ _081728A8:
 	thumb_func_end sub_81727E8
 
 	thumb_func_start sub_81728E0
-sub_81728E0: ; 81728E0
+sub_81728E0: @ 81728E0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -688267,7 +688267,7 @@ _0817293C:
 	thumb_func_end sub_81728E0
 
 	thumb_func_start sub_8172944
-sub_8172944: ; 8172944
+sub_8172944: @ 8172944
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r0, =0x030022c0
@@ -688345,7 +688345,7 @@ _081729E2:
 	thumb_func_end sub_8172944
 
 	thumb_func_start sub_81729E8
-sub_81729E8: ; 81729E8
+sub_81729E8: @ 81729E8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -688434,7 +688434,7 @@ _08172A7E:
 	thumb_func_end sub_81729E8
 
 	thumb_func_start sub_8172AB0
-sub_8172AB0: ; 8172AB0
+sub_8172AB0: @ 8172AB0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -688503,7 +688503,7 @@ _08172B30:
 	thumb_func_end sub_8172AB0
 
 	thumb_func_start sub_8172B40
-sub_8172B40: ; 8172B40
+sub_8172B40: @ 8172B40
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -688540,7 +688540,7 @@ _08172B78:
 	thumb_func_end sub_8172B40
 
 	thumb_func_start sub_8172B90
-sub_8172B90: ; 8172B90
+sub_8172B90: @ 8172B90
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -688589,7 +688589,7 @@ _08172BEA:
 	thumb_func_end sub_8172B90
 
 	thumb_func_start sub_8172BF0
-sub_8172BF0: ; 8172BF0
+sub_8172BF0: @ 8172BF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -688793,7 +688793,7 @@ _08172D8A:
 	thumb_func_end sub_8172BF0
 
 	thumb_func_start sub_8172D98
-sub_8172D98: ; 8172D98
+sub_8172D98: @ 8172D98
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -688909,7 +688909,7 @@ _08172E84:
 	thumb_func_end sub_8172D98
 
 	thumb_func_start sub_8172E9C
-sub_8172E9C: ; 8172E9C
+sub_8172E9C: @ 8172E9C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -688932,7 +688932,7 @@ sub_8172E9C: ; 8172E9C
 	thumb_func_end sub_8172E9C
 
 	thumb_func_start sub_8172ED0
-sub_8172ED0: ; 8172ED0
+sub_8172ED0: @ 8172ED0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -688947,7 +688947,7 @@ sub_8172ED0: ; 8172ED0
 	thumb_func_end sub_8172ED0
 
 	thumb_func_start sub_8172EF0
-sub_8172EF0: ; 8172EF0
+sub_8172EF0: @ 8172EF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -689058,7 +689058,7 @@ _08172FDE:
 	thumb_func_end sub_8172EF0
 
 	thumb_func_start sub_8172FEC
-sub_8172FEC: ; 8172FEC
+sub_8172FEC: @ 8172FEC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -689263,7 +689263,7 @@ _08173190:
 	thumb_func_end sub_8172FEC
 
 	thumb_func_start sub_81731B0
-sub_81731B0: ; 81731B0
+sub_81731B0: @ 81731B0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -689303,7 +689303,7 @@ _081731F0:
 	thumb_func_end sub_81731B0
 
 	thumb_func_start sub_81731FC
-sub_81731FC: ; 81731FC
+sub_81731FC: @ 81731FC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x30
@@ -689345,7 +689345,7 @@ _08173246:
 	thumb_func_end sub_81731FC
 
 	thumb_func_start sub_8173250
-sub_8173250: ; 8173250
+sub_8173250: @ 8173250
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -689396,7 +689396,7 @@ _081732A6:
 	thumb_func_end sub_8173250
 
 	thumb_func_start sub_81732B0
-sub_81732B0: ; 81732B0
+sub_81732B0: @ 81732B0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -689416,7 +689416,7 @@ sub_81732B0: ; 81732B0
 	thumb_func_end sub_81732B0
 
 	thumb_func_start sub_81732E4
-sub_81732E4: ; 81732E4
+sub_81732E4: @ 81732E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -689435,7 +689435,7 @@ sub_81732E4: ; 81732E4
 	thumb_func_end sub_81732E4
 
 	thumb_func_start sub_817330C
-sub_817330C: ; 817330C
+sub_817330C: @ 817330C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -689491,7 +689491,7 @@ sub_817330C: ; 817330C
 	thumb_func_end sub_817330C
 
 	thumb_func_start sub_817339C
-sub_817339C: ; 817339C
+sub_817339C: @ 817339C
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -689517,7 +689517,7 @@ _081733C0:
 	thumb_func_end sub_817339C
 
 	thumb_func_start sub_81733D4
-sub_81733D4: ; 81733D4
+sub_81733D4: @ 81733D4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80A6900
@@ -689542,7 +689542,7 @@ _081733F6:
 	thumb_func_end sub_81733D4
 
 	thumb_func_start sub_8173400
-sub_8173400: ; 8173400
+sub_8173400: @ 8173400
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x02020630
@@ -689585,7 +689585,7 @@ _08173448:
 	thumb_func_end sub_8173400
 
 	thumb_func_start sub_817345C
-sub_817345C: ; 817345C
+sub_817345C: @ 817345C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -689626,7 +689626,7 @@ _081734A0:
 	thumb_func_end sub_817345C
 
 	thumb_func_start sub_81734B4
-sub_81734B4: ; 81734B4
+sub_81734B4: @ 81734B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -689676,7 +689676,7 @@ _0817350C:
 	thumb_func_end sub_81734B4
 
 	thumb_func_start sub_817351C
-sub_817351C: ; 817351C
+sub_817351C: @ 817351C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -689698,7 +689698,7 @@ sub_817351C: ; 817351C
 	thumb_func_end sub_817351C
 
 	thumb_func_start sub_817354C
-sub_817354C: ; 817354C
+sub_817354C: @ 817354C
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -689708,7 +689708,7 @@ sub_817354C: ; 817354C
 	thumb_func_end sub_817354C
 
 	thumb_func_start sub_8173560
-sub_8173560: ; 8173560
+sub_8173560: @ 8173560
 	push {lr}
 	bl RunActiveTasks
 	bl RunTextPrinters
@@ -689720,7 +689720,7 @@ sub_8173560: ; 8173560
 	thumb_func_end sub_8173560
 
 	thumb_func_start sub_817357C
-sub_817357C: ; 817357C
+sub_817357C: @ 817357C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -689833,7 +689833,7 @@ _0817368A:
 	thumb_func_end sub_817357C
 
 	thumb_func_start sub_8173694
-sub_8173694: ; 8173694
+sub_8173694: @ 8173694
 	push {r4,lr}
 	bl sub_817357C
 	lsls r0, 24
@@ -689863,7 +689863,7 @@ _081736C4:
 	thumb_func_end sub_8173694
 
 	thumb_func_start sub_81736D8
-sub_81736D8: ; 81736D8
+sub_81736D8: @ 81736D8
 	push {r4,lr}
 	bl sub_817357C
 	lsls r0, 24
@@ -689893,7 +689893,7 @@ _08173708:
 	thumb_func_end sub_81736D8
 
 	thumb_func_start sub_817371C
-sub_817371C: ; 817371C
+sub_817371C: @ 817371C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -690087,7 +690087,7 @@ _081738A6:
 	thumb_func_end sub_817371C
 
 	thumb_func_start sub_81738BC
-sub_81738BC: ; 81738BC
+sub_81738BC: @ 81738BC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -690207,7 +690207,7 @@ _08173956:
 	thumb_func_end sub_81738BC
 
 	thumb_func_start sub_81739C4
-sub_81739C4: ; 81739C4
+sub_81739C4: @ 81739C4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -690269,7 +690269,7 @@ _08173A4C:
 	thumb_func_end sub_81739C4
 
 	thumb_func_start sub_8173A5C
-sub_8173A5C: ; 8173A5C
+sub_8173A5C: @ 8173A5C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -690297,7 +690297,7 @@ _08173A84:
 	thumb_func_end sub_8173A5C
 
 	thumb_func_start sub_8173A8C
-sub_8173A8C: ; 8173A8C
+sub_8173A8C: @ 8173A8C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -690312,7 +690312,7 @@ sub_8173A8C: ; 8173A8C
 	thumb_func_end sub_8173A8C
 
 	thumb_func_start sub_8173AA8
-sub_8173AA8: ; 8173AA8
+sub_8173AA8: @ 8173AA8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -690438,7 +690438,7 @@ _08173B20:
 	thumb_func_end sub_8173AA8
 
 	thumb_func_start sub_8173BC0
-sub_8173BC0: ; 8173BC0
+sub_8173BC0: @ 8173BC0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -690491,7 +690491,7 @@ _08173C1A:
 	thumb_func_end sub_8173BC0
 
 	thumb_func_start sub_8173C34
-sub_8173C34: ; 8173C34
+sub_8173C34: @ 8173C34
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -690602,7 +690602,7 @@ _08173D10:
 	thumb_func_end sub_8173C34
 
 	thumb_func_start sub_8173D24
-sub_8173D24: ; 8173D24
+sub_8173D24: @ 8173D24
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -690674,7 +690674,7 @@ _08173D74:
 	thumb_func_end sub_8173D24
 
 	thumb_func_start sub_8173DC0
-sub_8173DC0: ; 8173DC0
+sub_8173DC0: @ 8173DC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -690780,7 +690780,7 @@ _08173E7E:
 	thumb_func_end sub_8173DC0
 
 	thumb_func_start sub_8173EA4
-sub_8173EA4: ; 8173EA4
+sub_8173EA4: @ 8173EA4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -690813,7 +690813,7 @@ _08173EDE:
 	thumb_func_end sub_8173EA4
 
 	thumb_func_start sub_8173EE4
-sub_8173EE4: ; 8173EE4
+sub_8173EE4: @ 8173EE4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -690876,7 +690876,7 @@ sub_8173EE4: ; 8173EE4
 	thumb_func_end sub_8173EE4
 
 	thumb_func_start sub_8173F84
-sub_8173F84: ; 8173F84
+sub_8173F84: @ 8173F84
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -690953,7 +690953,7 @@ _08174018:
 	thumb_func_end sub_8173F84
 
 	thumb_func_start sub_8174028
-sub_8174028: ; 8174028
+sub_8174028: @ 8174028
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -690980,7 +690980,7 @@ _0817404E:
 	thumb_func_end sub_8174028
 
 	thumb_func_start sub_8174060
-sub_8174060: ; 8174060
+sub_8174060: @ 8174060
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -691014,7 +691014,7 @@ sub_8174060: ; 8174060
 	thumb_func_end sub_8174060
 
 	thumb_func_start sub_81740B0
-sub_81740B0: ; 81740B0
+sub_81740B0: @ 81740B0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -691106,7 +691106,7 @@ _08174164:
 	thumb_func_end sub_81740B0
 
 	thumb_func_start sub_8174184
-sub_8174184: ; 8174184
+sub_8174184: @ 8174184
 	push {lr}
 	ldr r0, =sub_8175620
 	bl SetMainCallback2
@@ -691116,7 +691116,7 @@ sub_8174184: ; 8174184
 	thumb_func_end sub_8174184
 
 	thumb_func_start sub_8174194
-sub_8174194: ; 8174194
+sub_8174194: @ 8174194
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	movs r1, 0x87
@@ -691270,7 +691270,7 @@ _08174308:
 	thumb_func_end sub_8174194
 
 	thumb_func_start sub_8174324
-sub_8174324: ; 8174324
+sub_8174324: @ 8174324
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -691360,7 +691360,7 @@ _081743DA:
 	thumb_func_end sub_8174324
 
 	thumb_func_start sub_81743EC
-sub_81743EC: ; 81743EC
+sub_81743EC: @ 81743EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -691594,7 +691594,7 @@ _081745D0:
 	thumb_func_end sub_81743EC
 
 	thumb_func_start sub_81745FC
-sub_81745FC: ; 81745FC
+sub_81745FC: @ 81745FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -691731,7 +691731,7 @@ _081746E6:
 	thumb_func_end sub_81745FC
 
 	thumb_func_start sub_8174728
-sub_8174728: ; 8174728
+sub_8174728: @ 8174728
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -691896,7 +691896,7 @@ _08174884:
 	thumb_func_end sub_8174728
 
 	thumb_func_start sub_8174898
-sub_8174898: ; 8174898
+sub_8174898: @ 8174898
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -691930,7 +691930,7 @@ sub_8174898: ; 8174898
 	thumb_func_end sub_8174898
 
 	thumb_func_start sub_81748F0
-sub_81748F0: ; 81748F0
+sub_81748F0: @ 81748F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -692007,7 +692007,7 @@ _08174988:
 	thumb_func_end sub_81748F0
 
 	thumb_func_start sub_81749A0
-sub_81749A0: ; 81749A0
+sub_81749A0: @ 81749A0
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -692051,7 +692051,7 @@ sub_81749A0: ; 81749A0
 	thumb_func_end sub_81749A0
 
 	thumb_func_start sub_8174A08
-sub_8174A08: ; 8174A08
+sub_8174A08: @ 8174A08
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -692075,7 +692075,7 @@ _08174A28:
 	thumb_func_end sub_8174A08
 
 	thumb_func_start sub_8174A38
-sub_8174A38: ; 8174A38
+sub_8174A38: @ 8174A38
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -692110,7 +692110,7 @@ sub_8174A38: ; 8174A38
 	thumb_func_end sub_8174A38
 
 	thumb_func_start sub_8174A88
-sub_8174A88: ; 8174A88
+sub_8174A88: @ 8174A88
 	push {r4-r7,lr}
 	sub sp, 0x2C
 	adds r7, r0, 0
@@ -692343,7 +692343,7 @@ _08174C82:
 	thumb_func_end sub_8174A88
 
 	thumb_func_start sub_8174C98
-sub_8174C98: ; 8174C98
+sub_8174C98: @ 8174C98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -692582,7 +692582,7 @@ _08174E30:
 	thumb_func_end sub_8174C98
 
 	thumb_func_start sub_8174EC4
-sub_8174EC4: ; 8174EC4
+sub_8174EC4: @ 8174EC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -692665,7 +692665,7 @@ _08174EEA:
 	thumb_func_end sub_8174EC4
 
 	thumb_func_start sub_8174F70
-sub_8174F70: ; 8174F70
+sub_8174F70: @ 8174F70
 	push {lr}
 	bl remove_some_task
 	bl clear_tasks
@@ -692686,7 +692686,7 @@ sub_8174F70: ; 8174F70
 	thumb_func_end sub_8174F70
 
 	thumb_func_start sub_8174FAC
-sub_8174FAC: ; 8174FAC
+sub_8174FAC: @ 8174FAC
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -692735,7 +692735,7 @@ sub_8174FAC: ; 8174FAC
 	thumb_func_end sub_8174FAC
 
 	thumb_func_start sub_8175024
-sub_8175024: ; 8175024
+sub_8175024: @ 8175024
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203bcdc
@@ -692848,7 +692848,7 @@ _08175114:
 	thumb_func_end sub_8175024
 
 	thumb_func_start sub_8175120
-sub_8175120: ; 8175120
+sub_8175120: @ 8175120
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r1, [r2, 0x20]
@@ -692921,7 +692921,7 @@ _0817519C:
 	thumb_func_end sub_8175120
 
 	thumb_func_start sub_81751A4
-sub_81751A4: ; 81751A4
+sub_81751A4: @ 81751A4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0x26]
@@ -692969,7 +692969,7 @@ _081751F2:
 	thumb_func_end sub_81751A4
 
 	thumb_func_start sub_81751FC
-sub_81751FC: ; 81751FC
+sub_81751FC: @ 81751FC
 	push {r4,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -693030,7 +693030,7 @@ _08175276:
 	thumb_func_end sub_81751FC
 
 	thumb_func_start sub_8175280
-sub_8175280: ; 8175280
+sub_8175280: @ 8175280
 	push {r4,lr}
 	ldr r4, =0x020375e0
 	movs r0, 0xB4
@@ -693059,7 +693059,7 @@ _081752AA:
 	thumb_func_end sub_8175280
 
 	thumb_func_start sub_81752C0
-sub_81752C0: ; 81752C0
+sub_81752C0: @ 81752C0
 	push {r4,lr}
 	ldr r0, =sub_8175364
 	bl get_task_id_by_function
@@ -693082,7 +693082,7 @@ _081752D4:
 	thumb_func_end sub_81752C0
 
 	thumb_func_start sub_81752F4
-sub_81752F4: ; 81752F4
+sub_81752F4: @ 81752F4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5, 0xE]
@@ -693139,7 +693139,7 @@ _08175358:
 	thumb_func_end sub_81752F4
 
 	thumb_func_start sub_8175364
-sub_8175364: ; 8175364
+sub_8175364: @ 8175364
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -693293,7 +693293,7 @@ _081754B0:
 	thumb_func_end sub_8175364
 
 	thumb_func_start sub_81754C8
-sub_81754C8: ; 81754C8
+sub_81754C8: @ 81754C8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -693303,7 +693303,7 @@ sub_81754C8: ; 81754C8
 	thumb_func_end sub_81754C8
 
 	thumb_func_start sub_81754DC
-sub_81754DC: ; 81754DC
+sub_81754DC: @ 81754DC
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -693343,7 +693343,7 @@ _08175522:
 	thumb_func_end sub_81754DC
 
 	thumb_func_start sub_8175548
-sub_8175548: ; 8175548
+sub_8175548: @ 8175548
 	push {lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -693377,7 +693377,7 @@ sub_8175548: ; 8175548
 	thumb_func_end sub_8175548
 
 	thumb_func_start sub_81755A4
-sub_81755A4: ; 81755A4
+sub_81755A4: @ 81755A4
 	push {lr}
 	bl FreeAllWindowBuffers
 	movs r0, 0
@@ -693391,7 +693391,7 @@ _081755B8:
 	thumb_func_end sub_81755A4
 
 	thumb_func_start sub_81755BC
-sub_81755BC: ; 81755BC
+sub_81755BC: @ 81755BC
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -693444,7 +693444,7 @@ _081755E4:
 	thumb_func_end sub_81755BC
 
 	thumb_func_start sub_8175620
-sub_8175620: ; 8175620
+sub_8175620: @ 8175620
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -693556,7 +693556,7 @@ _0817566A:
 	thumb_func_end sub_8175620
 
 	thumb_func_start sub_8175744
-sub_8175744: ; 8175744
+sub_8175744: @ 8175744
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -693580,7 +693580,7 @@ _08175764:
 	thumb_func_end sub_8175744
 
 	thumb_func_start sub_8175774
-sub_8175774: ; 8175774
+sub_8175774: @ 8175774
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -693652,7 +693652,7 @@ _081757FC:
 	thumb_func_end sub_8175774
 
 	thumb_func_start sub_8175808
-sub_8175808: ; 8175808
+sub_8175808: @ 8175808
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -693682,7 +693682,7 @@ _08175836:
 	thumb_func_end sub_8175808
 
 	thumb_func_start c2_080C9BFC
-c2_080C9BFC: ; 8175848
+c2_080C9BFC: @ 8175848
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -693723,7 +693723,7 @@ _08175890:
 	thumb_func_end c2_080C9BFC
 
 	thumb_func_start sub_81758A4
-sub_81758A4: ; 81758A4
+sub_81758A4: @ 81758A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -693753,7 +693753,7 @@ _081758D2:
 	thumb_func_end sub_81758A4
 
 	thumb_func_start sub_81758E4
-sub_81758E4: ; 81758E4
+sub_81758E4: @ 81758E4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -693928,7 +693928,7 @@ _08175A7A:
 	thumb_func_end sub_81758E4
 
 	thumb_func_start sub_8175A9C
-sub_8175A9C: ; 8175A9C
+sub_8175A9C: @ 8175A9C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -693966,7 +693966,7 @@ _08175AD8:
 	thumb_func_end sub_8175A9C
 
 	thumb_func_start sub_8175AE4
-sub_8175AE4: ; 8175AE4
+sub_8175AE4: @ 8175AE4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -693993,7 +693993,7 @@ _08175B0A:
 	thumb_func_end sub_8175AE4
 
 	thumb_func_start sub_8175B1C
-sub_8175B1C: ; 8175B1C
+sub_8175B1C: @ 8175B1C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -694043,7 +694043,7 @@ sub_8175B1C: ; 8175B1C
 	thumb_func_end sub_8175B1C
 
 	thumb_func_start sub_8175B90
-sub_8175B90: ; 8175B90
+sub_8175B90: @ 8175B90
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -694081,7 +694081,7 @@ _08175BCC:
 	thumb_func_end sub_8175B90
 
 	thumb_func_start sub_8175BD8
-sub_8175BD8: ; 8175BD8
+sub_8175BD8: @ 8175BD8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -694124,7 +694124,7 @@ _08175C1E:
 	thumb_func_end sub_8175BD8
 
 	thumb_func_start sub_8175C34
-sub_8175C34: ; 8175C34
+sub_8175C34: @ 8175C34
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -694191,7 +694191,7 @@ _08175CB8:
 	thumb_func_end sub_8175C34
 
 	thumb_func_start sub_8175CC8
-sub_8175CC8: ; 8175CC8
+sub_8175CC8: @ 8175CC8
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -694208,7 +694208,7 @@ _08175CDC:
 	thumb_func_end sub_8175CC8
 
 	thumb_func_start sub_8175CE4
-sub_8175CE4: ; 8175CE4
+sub_8175CE4: @ 8175CE4
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -694284,7 +694284,7 @@ sub_8175CE4: ; 8175CE4
 	thumb_func_end sub_8175CE4
 
 	thumb_func_start sub_8175DA0
-sub_8175DA0: ; 8175DA0
+sub_8175DA0: @ 8175DA0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -694599,7 +694599,7 @@ _0817602A:
 	thumb_func_end sub_8175DA0
 
 	thumb_func_start sub_817603C
-sub_817603C: ; 817603C
+sub_817603C: @ 817603C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -694707,7 +694707,7 @@ _081760F6:
 	thumb_func_end sub_817603C
 
 	thumb_func_start sub_81760FC
-sub_81760FC: ; 81760FC
+sub_81760FC: @ 81760FC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -694873,7 +694873,7 @@ _08176244:
 	thumb_func_end sub_81760FC
 
 	thumb_func_start sub_817624C
-sub_817624C: ; 817624C
+sub_817624C: @ 817624C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -695186,7 +695186,7 @@ _08176514:
 	thumb_func_end sub_817624C
 
 	thumb_func_start sub_817651C
-sub_817651C: ; 817651C
+sub_817651C: @ 817651C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -695337,7 +695337,7 @@ _08176646:
 	thumb_func_end sub_817651C
 
 	thumb_func_start sub_817664C
-sub_817664C: ; 817664C
+sub_817664C: @ 817664C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -695881,7 +695881,7 @@ _08176A94:
 	thumb_func_end sub_817664C
 
 	thumb_func_start sub_8176AB0
-sub_8176AB0: ; 8176AB0
+sub_8176AB0: @ 8176AB0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -696071,7 +696071,7 @@ _08176C98:
 	thumb_func_end sub_8176AB0
 
 	thumb_func_start sub_8176CA0
-sub_8176CA0: ; 8176CA0
+sub_8176CA0: @ 8176CA0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -696134,7 +696134,7 @@ _08176D08:
 	thumb_func_end sub_8176CA0
 
 	thumb_func_start sub_8176D1C
-sub_8176D1C: ; 8176D1C
+sub_8176D1C: @ 8176D1C
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r4, r2, 0
@@ -696177,7 +696177,7 @@ _08176D52:
 	thumb_func_end sub_8176D1C
 
 	thumb_func_start sub_8176D78
-sub_8176D78: ; 8176D78
+sub_8176D78: @ 8176D78
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -696218,7 +696218,7 @@ _08176DB6:
 	thumb_func_end sub_8176D78
 
 	thumb_func_start sub_8176DBC
-sub_8176DBC: ; 8176DBC
+sub_8176DBC: @ 8176DBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -696289,7 +696289,7 @@ _08176DFC:
 	thumb_func_end sub_8176DBC
 
 	thumb_func_start sub_8176E40
-sub_8176E40: ; 8176E40
+sub_8176E40: @ 8176E40
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -696360,7 +696360,7 @@ _08176E5E:
 	thumb_func_end sub_8176E40
 
 	thumb_func_start sub_8176EE8
-sub_8176EE8: ; 8176EE8
+sub_8176EE8: @ 8176EE8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203bd28
@@ -696443,7 +696443,7 @@ _08176F88:
 	thumb_func_end sub_8176EE8
 
 	thumb_func_start sub_8176F90
-sub_8176F90: ; 8176F90
+sub_8176F90: @ 8176F90
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203bd28
@@ -696543,7 +696543,7 @@ _08177048:
 	thumb_func_end sub_8176F90
 
 	thumb_func_start sub_8177050
-sub_8177050: ; 8177050
+sub_8177050: @ 8177050
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -696776,7 +696776,7 @@ _0817721C:
 	thumb_func_end sub_8177050
 
 	thumb_func_start sub_8177224
-sub_8177224: ; 8177224
+sub_8177224: @ 8177224
 	push {r4-r7,lr}
 	adds r5, r3, 0
 	lsls r0, 16
@@ -696846,7 +696846,7 @@ sub_8177224: ; 8177224
 	thumb_func_end sub_8177224
 
 	thumb_func_start sub_81772B8
-sub_81772B8: ; 81772B8
+sub_81772B8: @ 81772B8
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r4, =0x02020630
@@ -696952,7 +696952,7 @@ _08177380:
 	thumb_func_end sub_81772B8
 
 	thumb_func_start sub_8177388
-sub_8177388: ; 8177388
+sub_8177388: @ 8177388
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -697188,7 +697188,7 @@ _0817753E:
 	thumb_func_end sub_8177388
 
 	thumb_func_start sub_8177558
-sub_8177558: ; 8177558
+sub_8177558: @ 8177558
 	push {r4,lr}
 	bl GenerateRandomNumber
 	adds r4, r0, 0
@@ -697208,7 +697208,7 @@ sub_8177558: ; 8177558
 	thumb_func_end sub_8177558
 
 	thumb_func_start sub_8177584
-sub_8177584: ; 8177584
+sub_8177584: @ 8177584
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -697243,7 +697243,7 @@ _081775B4:
 	thumb_func_end sub_8177584
 
 	thumb_func_start sub_81775CC
-sub_81775CC: ; 81775CC
+sub_81775CC: @ 81775CC
 	push {lr}
 	bl sub_817783C
 	ldr r1, =0x020375f0
@@ -697254,7 +697254,7 @@ sub_81775CC: ; 81775CC
 	thumb_func_end sub_81775CC
 
 	thumb_func_start sub_81775E0
-sub_81775E0: ; 81775E0
+sub_81775E0: @ 81775E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -697449,7 +697449,7 @@ _0817776E:
 	thumb_func_end sub_81775E0
 
 	thumb_func_start sub_817778C
-sub_817778C: ; 817778C
+sub_817778C: @ 817778C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -697515,7 +697515,7 @@ _081777FA:
 	thumb_func_end sub_817778C
 
 	thumb_func_start sub_8177814
-sub_8177814: ; 8177814
+sub_8177814: @ 8177814
 	push {r4,lr}
 	adds r1, r0, 0
 	lsrs r4, r1, 16
@@ -697533,7 +697533,7 @@ sub_8177814: ; 8177814
 	thumb_func_end sub_8177814
 
 	thumb_func_start sub_817783C
-sub_817783C: ; 817783C
+sub_817783C: @ 817783C
 	push {r4,lr}
 	ldr r0, =0x0000404b
 	bl VarGet
@@ -697551,7 +697551,7 @@ sub_817783C: ; 817783C
 	thumb_func_end sub_817783C
 
 	thumb_func_start sub_8177864
-sub_8177864: ; 8177864
+sub_8177864: @ 8177864
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -697561,7 +697561,7 @@ sub_8177864: ; 8177864
 	thumb_func_end sub_8177864
 
 	thumb_func_start sub_8177874
-sub_8177874: ; 8177874
+sub_8177874: @ 8177874
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -697571,7 +697571,7 @@ sub_8177874: ; 8177874
 	thumb_func_end sub_8177874
 
 	thumb_func_start sub_8177888
-sub_8177888: ; 8177888
+sub_8177888: @ 8177888
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -697711,7 +697711,7 @@ _0817797C:
 	thumb_func_end sub_8177888
 
 	thumb_func_start sub_8177A08
-sub_8177A08: ; 8177A08
+sub_8177A08: @ 8177A08
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -697722,7 +697722,7 @@ sub_8177A08: ; 8177A08
 	thumb_func_end sub_8177A08
 
 	thumb_func_start sub_8177A20
-sub_8177A20: ; 8177A20
+sub_8177A20: @ 8177A20
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -697746,7 +697746,7 @@ _08177A40:
 	thumb_func_end sub_8177A20
 
 	thumb_func_start sub_8177A50
-sub_8177A50: ; 8177A50
+sub_8177A50: @ 8177A50
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -697780,7 +697780,7 @@ _08177A82:
 	thumb_func_end sub_8177A50
 
 	thumb_func_start sub_8177A98
-sub_8177A98: ; 8177A98
+sub_8177A98: @ 8177A98
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -697806,7 +697806,7 @@ _08177AC2:
 	thumb_func_end sub_8177A98
 
 	thumb_func_start pokedex_diploma_something
-pokedex_diploma_something: ; 8177AD4
+pokedex_diploma_something: @ 8177AD4
 	push {r4,lr}
 	bl sub_80C0944
 	lsls r0, 16
@@ -697849,7 +697849,7 @@ _08177B0C:
 	thumb_func_end pokedex_diploma_something
 
 	thumb_func_start sub_8177B44
-sub_8177B44: ; 8177B44
+sub_8177B44: @ 8177B44
 	push {lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -697884,7 +697884,7 @@ sub_8177B44: ; 8177B44
 	thumb_func_end sub_8177B44
 
 	thumb_func_start sub_8177B9C
-sub_8177B9C: ; 8177B9C
+sub_8177B9C: @ 8177B9C
 	push {lr}
 	ldr r0, =gUnknown_085E8204
 	bl InitWindows
@@ -697904,7 +697904,7 @@ sub_8177B9C: ; 8177B9C
 	thumb_func_end sub_8177B9C
 
 	thumb_func_start sub_8177BCC
-sub_8177BCC: ; 8177BCC
+sub_8177BCC: @ 8177BCC
 	push {r4-r6,lr}
 	sub sp, 0x18
 	adds r6, r0, 0
@@ -697940,7 +697940,7 @@ sub_8177BCC: ; 8177BCC
 	thumb_func_end sub_8177BCC
 
 	thumb_func_start sub_8177C14
-sub_8177C14: ; 8177C14
+sub_8177C14: @ 8177C14
 	push {r4,lr}
 	ldr r4, =0x0203bcf4
 	ldr r0, =0x0000180c
@@ -697965,7 +697965,7 @@ sub_8177C14: ; 8177C14
 	thumb_func_end sub_8177C14
 
 	thumb_func_start sub_8177C54
-sub_8177C54: ; 8177C54
+sub_8177C54: @ 8177C54
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -697977,7 +697977,7 @@ sub_8177C54: ; 8177C54
 	thumb_func_end sub_8177C54
 
 	thumb_func_start sub_8177C70
-sub_8177C70: ; 8177C70
+sub_8177C70: @ 8177C70
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -697987,7 +697987,7 @@ sub_8177C70: ; 8177C70
 	thumb_func_end sub_8177C70
 
 	thumb_func_start sub_8177C84
-sub_8177C84: ; 8177C84
+sub_8177C84: @ 8177C84
 	push {lr}
 _08177C86:
 	bl sub_81221EC
@@ -698011,7 +698011,7 @@ _08177CAA:
 	thumb_func_end sub_8177C84
 
 	thumb_func_start sub_8177CB0
-sub_8177CB0: ; 8177CB0
+sub_8177CB0: @ 8177CB0
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -698162,7 +698162,7 @@ _08177E0E:
 	thumb_func_end sub_8177CB0
 
 	thumb_func_start sub_8177E14
-sub_8177E14: ; 8177E14
+sub_8177E14: @ 8177E14
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -698207,7 +698207,7 @@ sub_8177E14: ; 8177E14
 	thumb_func_end sub_8177E14
 
 	thumb_func_start sub_8177E88
-sub_8177E88: ; 8177E88
+sub_8177E88: @ 8177E88
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, =0x0203bcf4
@@ -698364,7 +698364,7 @@ _08177FFE:
 	thumb_func_end sub_8177E88
 
 	thumb_func_start sub_8178008
-sub_8178008: ; 8178008
+sub_8178008: @ 8178008
 	push {r4,lr}
 	ldr r0, =gUnknown_085EFD28
 	bl InitWindows
@@ -698394,7 +698394,7 @@ _08178020:
 	thumb_func_end sub_8178008
 
 	thumb_func_start sub_817804C
-sub_817804C: ; 817804C
+sub_817804C: @ 817804C
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r6, [sp, 0x24]
@@ -698429,7 +698429,7 @@ sub_817804C: ; 817804C
 	thumb_func_end sub_817804C
 
 	thumb_func_start sub_8178090
-sub_8178090: ; 8178090
+sub_8178090: @ 8178090
 	push {r4,lr}
 	sub sp, 0x8
 	movs r0, 0
@@ -698473,7 +698473,7 @@ sub_8178090: ; 8178090
 	thumb_func_end sub_8178090
 
 	thumb_func_start sub_81780F4
-sub_81780F4: ; 81780F4
+sub_81780F4: @ 81780F4
 	push {lr}
 	bl sub_8178110
 	bl sub_8178174
@@ -698485,7 +698485,7 @@ sub_81780F4: ; 81780F4
 	thumb_func_end sub_81780F4
 
 	thumb_func_start sub_8178110
-sub_8178110: ; 8178110
+sub_8178110: @ 8178110
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r5, =0x0203bcf4
@@ -698525,7 +698525,7 @@ sub_8178110: ; 8178110
 	thumb_func_end sub_8178110
 
 	thumb_func_start sub_8178174
-sub_8178174: ; 8178174
+sub_8178174: @ 8178174
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r0, =0x0203bcf4
@@ -698617,7 +698617,7 @@ _08178242:
 	thumb_func_end sub_8178174
 
 	thumb_func_start itemid_copy_name
-itemid_copy_name: ; 8178250
+itemid_copy_name: @ 8178250
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r0, =0x0203bcf4
@@ -698675,7 +698675,7 @@ _081782C2:
 	thumb_func_end itemid_copy_name
 
 	thumb_func_start sub_81782D0
-sub_81782D0: ; 81782D0
+sub_81782D0: @ 81782D0
 	push {lr}
 	sub sp, 0xC
 	ldr r0, =0x0203bcf4
@@ -698702,7 +698702,7 @@ sub_81782D0: ; 81782D0
 	thumb_func_end sub_81782D0
 
 	thumb_func_start sub_8178304
-sub_8178304: ; 8178304
+sub_8178304: @ 8178304
 	push {lr}
 	sub sp, 0xC
 	ldr r0, =0x0203bcf4
@@ -698729,7 +698729,7 @@ sub_8178304: ; 8178304
 	thumb_func_end sub_8178304
 
 	thumb_func_start sub_8178338
-sub_8178338: ; 8178338
+sub_8178338: @ 8178338
 	push {r4,lr}
 	ldr r4, =0x0203bcf4
 	ldr r0, [r4]
@@ -698754,7 +698754,7 @@ sub_8178338: ; 8178338
 	thumb_func_end sub_8178338
 
 	thumb_func_start sub_817836C
-sub_817836C: ; 817836C
+sub_817836C: @ 817836C
 	push {lr}
 	ldr r0, =0x0203bcf4
 	ldr r0, [r0]
@@ -698774,7 +698774,7 @@ sub_817836C: ; 817836C
 	thumb_func_end sub_817836C
 
 	thumb_func_start sub_817839C
-sub_817839C: ; 817839C
+sub_817839C: @ 817839C
 	push {r4,lr}
 	movs r0, 0x40
 	bl sub_80D518C
@@ -698814,7 +698814,7 @@ sub_817839C: ; 817839C
 	thumb_func_end sub_817839C
 
 	thumb_func_start sub_8178404
-sub_8178404: ; 8178404
+sub_8178404: @ 8178404
 	push {r4,r5,lr}
 	ldr r4, =0x0203bcf4
 	ldr r0, [r4]
@@ -699001,7 +699001,7 @@ _08178588:
 	thumb_func_end sub_8178404
 
 	thumb_func_start sub_8178594
-sub_8178594: ; 8178594
+sub_8178594: @ 8178594
 	push {r4,lr}
 	movs r4, 0
 _08178598:
@@ -699029,7 +699029,7 @@ _08178598:
 	thumb_func_end sub_8178594
 
 	thumb_func_start sub_81785D0
-sub_81785D0: ; 81785D0
+sub_81785D0: @ 81785D0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -699059,7 +699059,7 @@ sub_81785D0: ; 81785D0
 	thumb_func_end sub_81785D0
 
 	thumb_func_start sub_8178610
-sub_8178610: ; 8178610
+sub_8178610: @ 8178610
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -699087,7 +699087,7 @@ _08178642:
 	thumb_func_end sub_8178610
 
 	thumb_func_start sub_8178654
-sub_8178654: ; 8178654
+sub_8178654: @ 8178654
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -699132,7 +699132,7 @@ _081786A6:
 	thumb_func_end sub_8178654
 
 	thumb_func_start sub_81786AC
-sub_81786AC: ; 81786AC
+sub_81786AC: @ 81786AC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -699191,7 +699191,7 @@ _08178718:
 	thumb_func_end sub_81786AC
 
 	thumb_func_start sub_8178728
-sub_8178728: ; 8178728
+sub_8178728: @ 8178728
 	push {r4-r6,lr}
 	ldr r5, =0x0203ce70
 	adds r6, r5, 0
@@ -699261,7 +699261,7 @@ _0817877A:
 	thumb_func_end sub_8178728
 
 	thumb_func_start sub_81787AC
-sub_81787AC: ; 81787AC
+sub_81787AC: @ 81787AC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -699470,7 +699470,7 @@ _08178922:
 	thumb_func_end sub_81787AC
 
 	thumb_func_start sub_8178944
-sub_8178944: ; 8178944
+sub_8178944: @ 8178944
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -699480,7 +699480,7 @@ sub_8178944: ; 8178944
 	thumb_func_end sub_8178944
 
 	thumb_func_start sub_8178958
-sub_8178958: ; 8178958
+sub_8178958: @ 8178958
 	push {lr}
 	movs r2, 0
 	ldr r1, =0x020229e8
@@ -699497,7 +699497,7 @@ _08178968:
 	thumb_func_end sub_8178958
 
 	thumb_func_start sub_8178974
-sub_8178974: ; 8178974
+sub_8178974: @ 8178974
 	push {r4,lr}
 	sub sp, 0x8
 	bl ResetAllObjectData
@@ -699572,7 +699572,7 @@ _08178A22:
 	thumb_func_end sub_8178974
 
 	thumb_func_start sub_8178A40
-sub_8178A40: ; 8178A40
+sub_8178A40: @ 8178A40
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -699601,7 +699601,7 @@ _08178A66:
 	thumb_func_end sub_8178A40
 
 	thumb_func_start sub_8178A78
-sub_8178A78: ; 8178A78
+sub_8178A78: @ 8178A78
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r1, =0x030022c0
@@ -700066,7 +700066,7 @@ _08178E98:
 	thumb_func_end sub_8178A78
 
 	thumb_func_start sub_8178EC4
-sub_8178EC4: ; 8178EC4
+sub_8178EC4: @ 8178EC4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -700131,7 +700131,7 @@ sub_8178EC4: ; 8178EC4
 	thumb_func_end sub_8178EC4
 
 	thumb_func_start sub_8178F44
-sub_8178F44: ; 8178F44
+sub_8178F44: @ 8178F44
 	push {r4,r5,lr}
 	sub sp, 0x18
 	adds r5, r0, 0
@@ -700170,7 +700170,7 @@ sub_8178F44: ; 8178F44
 	thumb_func_end sub_8178F44
 
 	thumb_func_start fullscreen_save_activate
-fullscreen_save_activate: ; 8178F90
+fullscreen_save_activate: @ 8178F90
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -700194,7 +700194,7 @@ fullscreen_save_activate: ; 8178F90
 	thumb_func_end fullscreen_save_activate
 
 	thumb_func_start sub_8178FC8
-sub_8178FC8: ; 8178FC8
+sub_8178FC8: @ 8178FC8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -700204,7 +700204,7 @@ sub_8178FC8: ; 8178FC8
 	thumb_func_end sub_8178FC8
 
 	thumb_func_start sub_8178FDC
-sub_8178FDC: ; 8178FDC
+sub_8178FDC: @ 8178FDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -700444,7 +700444,7 @@ _08179272:
 	thumb_func_end sub_8178FDC
 
 	thumb_func_start sub_8179288
-sub_8179288: ; 8179288
+sub_8179288: @ 8179288
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r0, =0x0203bcfe
@@ -700546,7 +700546,7 @@ _08179380:
 	thumb_func_end sub_8179288
 
 	thumb_func_start sub_8179390
-sub_8179390: ; 8179390
+sub_8179390: @ 8179390
 	push {lr}
 	ldr r1, =0x0203bcfe
 	movs r0, 0
@@ -700576,7 +700576,7 @@ _081793C4:
 	thumb_func_end sub_8179390
 
 	thumb_func_start sub_81793E0
-sub_81793E0: ; 81793E0
+sub_81793E0: @ 81793E0
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x0203bcfe
@@ -700606,7 +700606,7 @@ _08179410:
 	thumb_func_end sub_81793E0
 
 	thumb_func_start sub_8179428
-sub_8179428: ; 8179428
+sub_8179428: @ 8179428
 	push {r4,r5,lr}
 	bl fade_and_return_progress_probably
 	lsls r0, 24
@@ -700630,7 +700630,7 @@ _0817944E:
 	thumb_func_end sub_8179428
 
 	thumb_func_start sub_8179454
-sub_8179454: ; 8179454
+sub_8179454: @ 8179454
 	push {r4,r5,lr}
 	ldr r5, =0x030022c0
 	ldr r0, [r5, 0x24]
@@ -700715,7 +700715,7 @@ _08179500:
 	thumb_func_end sub_8179454
 
 	thumb_func_start sub_8179514
-sub_8179514: ; 8179514
+sub_8179514: @ 8179514
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -700749,7 +700749,7 @@ _0817954E:
 	thumb_func_end sub_8179514
 
 	thumb_func_start sub_8179554
-sub_8179554: ; 8179554
+sub_8179554: @ 8179554
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -700794,7 +700794,7 @@ _08179596:
 	thumb_func_end sub_8179554
 
 	thumb_func_start sub_81795AC
-sub_81795AC: ; 81795AC
+sub_81795AC: @ 81795AC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -700830,7 +700830,7 @@ _081795E0:
 	thumb_func_end sub_81795AC
 
 	thumb_func_start sub_81795E8
-sub_81795E8: ; 81795E8
+sub_81795E8: @ 81795E8
 	push {lr}
 	ldr r0, =0x000008af
 	bl FlagGet
@@ -700865,7 +700865,7 @@ _08179636:
 	thumb_func_end sub_81795E8
 
 	thumb_func_start sub_817963C
-sub_817963C: ; 817963C
+sub_817963C: @ 817963C
 	push {lr}
 	ldr r2, =0x0000022a
 	movs r0, 0x10
@@ -700904,7 +700904,7 @@ sub_817963C: ; 817963C
 	thumb_func_end sub_817963C
 
 	thumb_func_start sub_81796AC
-sub_81796AC: ; 81796AC
+sub_81796AC: @ 81796AC
 	push {r4,lr}
 	ldr r4, =0x020244ec
 	adds r0, r4, 0
@@ -700941,12 +700941,12 @@ _081796F6:
 	thumb_func_end sub_81796AC
 
 	thumb_func_start nullsub_84
-nullsub_84: ; 81796FC
+nullsub_84: @ 81796FC
 	bx lr
 	thumb_func_end nullsub_84
 
 	thumb_func_start sub_8179700
-sub_8179700: ; 8179700
+sub_8179700: @ 8179700
 	push {lr}
 	ldr r0, =sub_8179778
 	movs r1, 0x9
@@ -700975,7 +700975,7 @@ sub_8179700: ; 8179700
 	thumb_func_end sub_8179700
 
 	thumb_func_start sub_817973C
-sub_817973C: ; 817973C
+sub_817973C: @ 817973C
 	push {lr}
 	ldr r0, =sub_8179778
 	movs r1, 0x9
@@ -701004,7 +701004,7 @@ sub_817973C: ; 817973C
 	thumb_func_end sub_817973C
 
 	thumb_func_start sub_8179778
-sub_8179778: ; 8179778
+sub_8179778: @ 8179778
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -701052,7 +701052,7 @@ _081797D0:
 	thumb_func_end sub_8179778
 
 	thumb_func_start sub_81797DC
-sub_81797DC: ; 81797DC
+sub_81797DC: @ 81797DC
 	push {lr}
 	movs r0, 0x8B
 	lsls r0, 4
@@ -701092,7 +701092,7 @@ _0817982E:
 	thumb_func_end sub_81797DC
 
 	thumb_func_start sub_8179834
-sub_8179834: ; 8179834
+sub_8179834: @ 8179834
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -701107,7 +701107,7 @@ sub_8179834: ; 8179834
 	thumb_func_end sub_8179834
 
 	thumb_func_start sub_8179850
-sub_8179850: ; 8179850
+sub_8179850: @ 8179850
 	push {lr}
 	movs r0, 0x3C
 	bl FieldEffectActiveListRemove
@@ -701117,7 +701117,7 @@ sub_8179850: ; 8179850
 	thumb_func_end sub_8179850
 
 	thumb_func_start sub_8179860
-sub_8179860: ; 8179860
+sub_8179860: @ 8179860
 	push {lr}
 	ldr r2, =0x0000022a
 	movs r0, 0xE
@@ -701157,7 +701157,7 @@ sub_8179860: ; 8179860
 	thumb_func_end sub_8179860
 
 	thumb_func_start sub_81798D0
-sub_81798D0: ; 81798D0
+sub_81798D0: @ 81798D0
 	push {lr}
 	ldr r0, =0x000008b2
 	bl FlagGet
@@ -701188,7 +701188,7 @@ _08179912:
 	thumb_func_end sub_81798D0
 
 	thumb_func_start sub_8179918
-sub_8179918: ; 8179918
+sub_8179918: @ 8179918
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -701203,7 +701203,7 @@ sub_8179918: ; 8179918
 	thumb_func_end sub_8179918
 
 	thumb_func_start sub_8179934
-sub_8179934: ; 8179934
+sub_8179934: @ 8179934
 	push {lr}
 	movs r0, 0x3C
 	bl FieldEffectActiveListRemove
@@ -701213,7 +701213,7 @@ sub_8179934: ; 8179934
 	thumb_func_end sub_8179934
 
 	thumb_func_start sub_8179944
-sub_8179944: ; 8179944
+sub_8179944: @ 8179944
 	push {lr}
 	ldr r2, =0x0000022a
 	movs r0, 0xE
@@ -701252,12 +701252,12 @@ sub_8179944: ; 8179944
 	thumb_func_end sub_8179944
 
 	thumb_func_start nullsub_64
-nullsub_64: ; 81799B4
+nullsub_64: @ 81799B4
 	bx lr
 	thumb_func_end nullsub_64
 
 	thumb_func_start sub_81799B8
-sub_81799B8: ; 81799B8
+sub_81799B8: @ 81799B8
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -701292,7 +701292,7 @@ _081799F0:
 	thumb_func_end sub_81799B8
 
 	thumb_func_start sub_8179A04
-sub_8179A04: ; 8179A04
+sub_8179A04: @ 8179A04
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -701449,7 +701449,7 @@ _08179B5C:
 	thumb_func_end sub_8179A04
 
 	thumb_func_start sub_8179B68
-sub_8179B68: ; 8179B68
+sub_8179B68: @ 8179B68
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -701461,7 +701461,7 @@ sub_8179B68: ; 8179B68
 	thumb_func_end sub_8179B68
 
 	thumb_func_start sub_8179B84
-sub_8179B84: ; 8179B84
+sub_8179B84: @ 8179B84
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -701471,7 +701471,7 @@ sub_8179B84: ; 8179B84
 	thumb_func_end sub_8179B84
 
 	thumb_func_start sub_8179B98
-sub_8179B98: ; 8179B98
+sub_8179B98: @ 8179B98
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -701663,7 +701663,7 @@ _08179D66:
 	thumb_func_end sub_8179B98
 
 	thumb_func_start sub_8179D70
-sub_8179D70: ; 8179D70
+sub_8179D70: @ 8179D70
 	push {lr}
 _08179D72:
 	bl sub_81221EC
@@ -701687,7 +701687,7 @@ _08179D96:
 	thumb_func_end sub_8179D70
 
 	thumb_func_start sub_8179D9C
-sub_8179D9C: ; 8179D9C
+sub_8179D9C: @ 8179D9C
 	push {lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -701721,7 +701721,7 @@ sub_8179D9C: ; 8179D9C
 	thumb_func_end sub_8179D9C
 
 	thumb_func_start sub_8179DF4
-sub_8179DF4: ; 8179DF4
+sub_8179DF4: @ 8179DF4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -701889,7 +701889,7 @@ _08179FA2:
 	thumb_func_end sub_8179DF4
 
 	thumb_func_start sub_8179FAC
-sub_8179FAC: ; 8179FAC
+sub_8179FAC: @ 8179FAC
 	push {lr}
 	ldr r0, =gUnknown_085F0558
 	bl InitWindows
@@ -701915,7 +701915,7 @@ sub_8179FAC: ; 8179FAC
 	thumb_func_end sub_8179FAC
 
 	thumb_func_start sub_8179FEC
-sub_8179FEC: ; 8179FEC
+sub_8179FEC: @ 8179FEC
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x03005d8c
@@ -701943,7 +701943,7 @@ sub_8179FEC: ; 8179FEC
 	thumb_func_end sub_8179FEC
 
 	thumb_func_start sub_817A030
-sub_817A030: ; 817A030
+sub_817A030: @ 817A030
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -702075,7 +702075,7 @@ _0817A154:
 	thumb_func_end sub_817A030
 
 	thumb_func_start sub_817A168
-sub_817A168: ; 817A168
+sub_817A168: @ 817A168
 	push {lr}
 	ldr r0, =sub_817A030
 	movs r1, 0
@@ -702097,7 +702097,7 @@ sub_817A168: ; 817A168
 	thumb_func_end sub_817A168
 
 	thumb_func_start sub_817A194
-sub_817A194: ; 817A194
+sub_817A194: @ 817A194
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -702122,7 +702122,7 @@ _0817A1B6:
 	thumb_func_end sub_817A194
 
 	thumb_func_start sub_817A1C4
-sub_817A1C4: ; 817A1C4
+sub_817A1C4: @ 817A1C4
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -702214,7 +702214,7 @@ _0817A268:
 	thumb_func_end sub_817A1C4
 
 	thumb_func_start sub_817A2C0
-sub_817A2C0: ; 817A2C0
+sub_817A2C0: @ 817A2C0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -702249,7 +702249,7 @@ _0817A304:
 	thumb_func_end sub_817A2C0
 
 	thumb_func_start sub_817A320
-sub_817A320: ; 817A320
+sub_817A320: @ 817A320
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -702277,7 +702277,7 @@ sub_817A320: ; 817A320
 	thumb_func_end sub_817A320
 
 	thumb_func_start sub_817A358
-sub_817A358: ; 817A358
+sub_817A358: @ 817A358
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -702370,7 +702370,7 @@ _0817A402:
 	thumb_func_end sub_817A358
 
 	thumb_func_start sub_817A434
-sub_817A434: ; 817A434
+sub_817A434: @ 817A434
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x02020630
@@ -702395,7 +702395,7 @@ sub_817A434: ; 817A434
 	thumb_func_end sub_817A434
 
 	thumb_func_start sub_817A468
-sub_817A468: ; 817A468
+sub_817A468: @ 817A468
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x20]
@@ -702429,7 +702429,7 @@ _0817A49A:
 	thumb_func_end sub_817A468
 
 	thumb_func_start sub_817A4A4
-sub_817A4A4: ; 817A4A4
+sub_817A4A4: @ 817A4A4
 	push {r4,r5,lr}
 	movs r0, 0xBC
 	movs r1, 0x64
@@ -702468,7 +702468,7 @@ sub_817A4A4: ; 817A4A4
 	thumb_func_end sub_817A4A4
 
 	thumb_func_start sub_817A4F8
-sub_817A4F8: ; 817A4F8
+sub_817A4F8: @ 817A4F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -702522,7 +702522,7 @@ _0817A548:
 	thumb_func_end sub_817A4F8
 
 	thumb_func_start sub_817A56C
-sub_817A56C: ; 817A56C
+sub_817A56C: @ 817A56C
 	push {lr}
 	ldr r0, =gUnknown_085F06A8
 	movs r1, 0xAE
@@ -702546,7 +702546,7 @@ sub_817A56C: ; 817A56C
 	thumb_func_end sub_817A56C
 
 	thumb_func_start sub_817A5A0
-sub_817A5A0: ; 817A5A0
+sub_817A5A0: @ 817A5A0
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x20]
@@ -702571,7 +702571,7 @@ _0817A5C6:
 	thumb_func_end sub_817A5A0
 
 	thumb_func_start sub_817A5CC
-sub_817A5CC: ; 817A5CC
+sub_817A5CC: @ 817A5CC
 	push {r4-r7,lr}
 	ldr r0, =0x0203bd18
 	ldr r1, [r0]
@@ -702620,7 +702620,7 @@ _0817A61A:
 	thumb_func_end sub_817A5CC
 
 	thumb_func_start sub_817A634
-sub_817A634: ; 817A634
+sub_817A634: @ 817A634
 	push {r4,lr}
 	ldr r0, =0x0203bd18
 	ldr r4, [r0]
@@ -702873,7 +702873,7 @@ _0817A90E:
 	thumb_func_end sub_817A634
 
 	thumb_func_start sub_817A91C
-sub_817A91C: ; 817A91C
+sub_817A91C: @ 817A91C
 	push {r4-r7,lr}
 	ldr r0, =0x0203bd18
 	ldr r5, [r0]
@@ -702962,7 +702962,7 @@ _0817A9DE:
 	thumb_func_end sub_817A91C
 
 	thumb_func_start sub_817A9E4
-sub_817A9E4: ; 817A9E4
+sub_817A9E4: @ 817A9E4
 	push {r4,r5,lr}
 	ldr r0, =0x0203bd18
 	ldr r2, [r0]
@@ -703007,7 +703007,7 @@ _0817AA36:
 	thumb_func_end sub_817A9E4
 
 	thumb_func_start sub_817AA3C
-sub_817AA3C: ; 817AA3C
+sub_817AA3C: @ 817AA3C
 	push {lr}
 	ldr r0, =0x0203bd18
 	ldr r0, [r0]
@@ -703020,7 +703020,7 @@ sub_817AA3C: ; 817AA3C
 	thumb_func_end sub_817AA3C
 
 	thumb_func_start sub_817AA54
-sub_817AA54: ; 817AA54
+sub_817AA54: @ 817AA54
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -703153,7 +703153,7 @@ _0817AB20:
 	thumb_func_end sub_817AA54
 
 	thumb_func_start sub_817AB68
-sub_817AB68: ; 817AB68
+sub_817AB68: @ 817AB68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -703314,7 +703314,7 @@ _0817ACB8:
 	thumb_func_end sub_817AB68
 
 	thumb_func_start c2_clear_save_data_screen_2
-c2_clear_save_data_screen_2: ; 817ACC8
+c2_clear_save_data_screen_2: @ 817ACC8
 	push {lr}
 	bl sub_817AE00
 	lsls r0, 24
@@ -703330,7 +703330,7 @@ _0817ACDC:
 	thumb_func_end c2_clear_save_data_screen_2
 
 	thumb_func_start sub_817ACE4
-sub_817ACE4: ; 817ACE4
+sub_817ACE4: @ 817ACE4
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -703370,7 +703370,7 @@ sub_817ACE4: ; 817ACE4
 	thumb_func_end sub_817ACE4
 
 	thumb_func_start sub_817AD40
-sub_817AD40: ; 817AD40
+sub_817AD40: @ 817AD40
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -703429,7 +703429,7 @@ _0817ADB2:
 	thumb_func_end sub_817AD40
 
 	thumb_func_start sub_817ADC0
-sub_817ADC0: ; 817ADC0
+sub_817ADC0: @ 817ADC0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -703446,7 +703446,7 @@ sub_817ADC0: ; 817ADC0
 	thumb_func_end sub_817ADC0
 
 	thumb_func_start sub_817ADE4
-sub_817ADE4: ; 817ADE4
+sub_817ADE4: @ 817ADE4
 	push {lr}
 	bl RunActiveTasks
 	bl fade_and_return_progress_probably
@@ -703455,7 +703455,7 @@ sub_817ADE4: ; 817ADE4
 	thumb_func_end sub_817ADE4
 
 	thumb_func_start sub_817ADF4
-sub_817ADF4: ; 817ADF4
+sub_817ADF4: @ 817ADF4
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	pop {r0}
@@ -703463,7 +703463,7 @@ sub_817ADF4: ; 817ADF4
 	thumb_func_end sub_817ADF4
 
 	thumb_func_start sub_817AE00
-sub_817AE00: ; 817AE00
+sub_817AE00: @ 817AE00
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -703640,7 +703640,7 @@ _0817AFCA:
 	thumb_func_end sub_817AE00
 
 	thumb_func_start sub_817AFD4
-sub_817AFD4: ; 817AFD4
+sub_817AFD4: @ 817AFD4
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -703682,7 +703682,7 @@ _0817B020:
 	thumb_func_end sub_817AFD4
 
 	thumb_func_start sub_817B02C
-sub_817B02C: ; 817B02C
+sub_817B02C: @ 817B02C
 	push {lr}
 	ldr r0, =gUnknown_085F06C8
 	bl InitWindows
@@ -703705,7 +703705,7 @@ sub_817B02C: ; 817B02C
 	thumb_func_end sub_817B02C
 
 	thumb_func_start load_intro_part2_graphics
-load_intro_part2_graphics: ; 817B064
+load_intro_part2_graphics: @ 817B064
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -703779,7 +703779,7 @@ _0817B11E:
 	thumb_func_end load_intro_part2_graphics
 
 	thumb_func_start sub_817B150
-sub_817B150: ; 817B150
+sub_817B150: @ 817B150
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -703826,7 +703826,7 @@ _0817B1B6:
 	thumb_func_end sub_817B150
 
 	thumb_func_start sub_817B1C8
-sub_817B1C8: ; 817B1C8
+sub_817B1C8: @ 817B1C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -703970,7 +703970,7 @@ _0817B370:
 	thumb_func_end sub_817B1C8
 
 	thumb_func_start sub_817B3A8
-sub_817B3A8: ; 817B3A8
+sub_817B3A8: @ 817B3A8
 	push {lr}
 	ldr r1, =0x00000603
 	movs r0, 0xE
@@ -703991,7 +703991,7 @@ sub_817B3A8: ; 817B3A8
 	thumb_func_end sub_817B3A8
 
 	thumb_func_start sub_817B3DC
-sub_817B3DC: ; 817B3DC
+sub_817B3DC: @ 817B3DC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -704052,7 +704052,7 @@ sub_817B3DC: ; 817B3DC
 	thumb_func_end sub_817B3DC
 
 	thumb_func_start sub_817B458
-sub_817B458: ; 817B458
+sub_817B458: @ 817B458
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -704160,7 +704160,7 @@ _0817B532:
 	thumb_func_end sub_817B458
 
 	thumb_func_start sub_817B540
-sub_817B540: ; 817B540
+sub_817B540: @ 817B540
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -704269,7 +704269,7 @@ _0817B620:
 	thumb_func_end sub_817B540
 
 	thumb_func_start sub_817B62C
-sub_817B62C: ; 817B62C
+sub_817B62C: @ 817B62C
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x0203bd28
@@ -704323,7 +704323,7 @@ _0817B690:
 	thumb_func_end sub_817B62C
 
 	thumb_func_start sub_817B698
-sub_817B698: ; 817B698
+sub_817B698: @ 817B698
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -704426,7 +704426,7 @@ _0817B74E:
 	thumb_func_end sub_817B698
 
 	thumb_func_start sub_817B76C
-sub_817B76C: ; 817B76C
+sub_817B76C: @ 817B76C
 	push {lr}
 	ldr r1, =gUnknown_085F50A4
 	ldr r2, =gUnknown_085F5094
@@ -704439,7 +704439,7 @@ sub_817B76C: ; 817B76C
 	thumb_func_end sub_817B76C
 
 	thumb_func_start sub_817B788
-sub_817B788: ; 817B788
+sub_817B788: @ 817B788
 	push {lr}
 	ldr r1, =gUnknown_085F5120
 	ldr r2, =gUnknown_085F5114
@@ -704452,7 +704452,7 @@ sub_817B788: ; 817B788
 	thumb_func_end sub_817B788
 
 	thumb_func_start sub_817B7A4
-sub_817B7A4: ; 817B7A4
+sub_817B7A4: @ 817B7A4
 	push {lr}
 	ldr r1, =gUnknown_085F519C
 	ldr r2, =gUnknown_085F5198
@@ -704465,12 +704465,12 @@ sub_817B7A4: ; 817B7A4
 	thumb_func_end sub_817B7A4
 
 	thumb_func_start nullsub_65
-nullsub_65: ; 817B7C0
+nullsub_65: @ 817B7C0
 	bx lr
 	thumb_func_end nullsub_65
 
 	thumb_func_start sub_817B7C4
-sub_817B7C4: ; 817B7C4
+sub_817B7C4: @ 817B7C4
 	push {r4,lr}
 	ldr r4, =0x02020630
 	movs r1, 0x2E
@@ -704528,7 +704528,7 @@ sub_817B7C4: ; 817B7C4
 	thumb_func_end sub_817B7C4
 
 	thumb_func_start sub_817B834
-sub_817B834: ; 817B834
+sub_817B834: @ 817B834
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -704568,7 +704568,7 @@ sub_817B834: ; 817B834
 	thumb_func_end sub_817B834
 
 	thumb_func_start sub_817B88C
-sub_817B88C: ; 817B88C
+sub_817B88C: @ 817B88C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -704608,12 +704608,12 @@ sub_817B88C: ; 817B88C
 	thumb_func_end sub_817B88C
 
 	thumb_func_start nullsub_66
-nullsub_66: ; 817B8E4
+nullsub_66: @ 817B8E4
 	bx lr
 	thumb_func_end nullsub_66
 
 	thumb_func_start sub_817B8E8
-sub_817B8E8: ; 817B8E8
+sub_817B8E8: @ 817B8E8
 	push {r4,lr}
 	ldr r4, =0x02020630
 	movs r1, 0x2E
@@ -704664,7 +704664,7 @@ sub_817B8E8: ; 817B8E8
 	thumb_func_end sub_817B8E8
 
 	thumb_func_start sub_817B948
-sub_817B948: ; 817B948
+sub_817B948: @ 817B948
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -704719,7 +704719,7 @@ sub_817B948: ; 817B948
 	thumb_func_end sub_817B948
 
 	thumb_func_start sub_817B9C4
-sub_817B9C4: ; 817B9C4
+sub_817B9C4: @ 817B9C4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -704774,12 +704774,12 @@ sub_817B9C4: ; 817B9C4
 	thumb_func_end sub_817B9C4
 
 	thumb_func_start nullsub_67
-nullsub_67: ; 817BA40
+nullsub_67: @ 817BA40
 	bx lr
 	thumb_func_end nullsub_67
 
 	thumb_func_start sub_817BA44
-sub_817BA44: ; 817BA44
+sub_817BA44: @ 817BA44
 	push {r4,r5,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -704809,7 +704809,7 @@ _0817BA4C:
 	thumb_func_end sub_817BA44
 
 	thumb_func_start sub_817BA7C
-sub_817BA7C: ; 817BA7C
+sub_817BA7C: @ 817BA7C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x22
@@ -704910,7 +704910,7 @@ _0817BB30:
 	thumb_func_end sub_817BA7C
 
 	thumb_func_start sub_817BB38
-sub_817BB38: ; 817BB38
+sub_817BB38: @ 817BB38
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -704955,7 +704955,7 @@ _0817BB82:
 	thumb_func_end sub_817BB38
 
 	thumb_func_start sub_817BB94
-sub_817BB94: ; 817BB94
+sub_817BB94: @ 817BB94
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x22
@@ -705014,7 +705014,7 @@ _0817BC00:
 	thumb_func_end sub_817BB94
 
 	thumb_func_start sub_817BC08
-sub_817BC08: ; 817BC08
+sub_817BC08: @ 817BC08
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -705065,7 +705065,7 @@ _0817BC5E:
 	thumb_func_end sub_817BC08
 
 	thumb_func_start sub_817BC70
-sub_817BC70: ; 817BC70
+sub_817BC70: @ 817BC70
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x38
@@ -705104,7 +705104,7 @@ _0817BCB2:
 	thumb_func_end sub_817BC70
 
 	thumb_func_start sub_817BCB8
-sub_817BCB8: ; 817BCB8
+sub_817BCB8: @ 817BCB8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -705155,7 +705155,7 @@ _0817BD0E:
 	thumb_func_end sub_817BCB8
 
 	thumb_func_start sub_817BD20
-sub_817BD20: ; 817BD20
+sub_817BD20: @ 817BD20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x3C]
@@ -705267,7 +705267,7 @@ _0817BDEA:
 	thumb_func_end sub_817BD20
 
 	thumb_func_start sub_817BDF0
-sub_817BDF0: ; 817BDF0
+sub_817BDF0: @ 817BDF0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -705330,7 +705330,7 @@ _0817BE60:
 	thumb_func_end sub_817BDF0
 
 	thumb_func_start sub_817BE78
-sub_817BE78: ; 817BE78
+sub_817BE78: @ 817BE78
 	push {lr}
 	ldr r0, =gUnknown_085F540C
 	bl LoadCompressedObjectPicUsingHeap
@@ -705342,7 +705342,7 @@ sub_817BE78: ; 817BE78
 	thumb_func_end sub_817BE78
 
 	thumb_func_start sub_817BE94
-sub_817BE94: ; 817BE94
+sub_817BE94: @ 817BE94
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -705365,7 +705365,7 @@ sub_817BE94: ; 817BE94
 	thumb_func_end sub_817BE94
 
 	thumb_func_start sub_817BEC4
-sub_817BEC4: ; 817BEC4
+sub_817BEC4: @ 817BEC4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -705401,7 +705401,7 @@ sub_817BEC4: ; 817BEC4
 	thumb_func_end sub_817BEC4
 
 	thumb_func_start sub_817BF14
-sub_817BF14: ; 817BF14
+sub_817BF14: @ 817BF14
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -705460,7 +705460,7 @@ _0817BF78:
 	thumb_func_end sub_817BF14
 
 	thumb_func_start sub_817BF84
-sub_817BF84: ; 817BF84
+sub_817BF84: @ 817BF84
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -705488,7 +705488,7 @@ _0817BFAE:
 	thumb_func_end sub_817BF84
 
 	thumb_func_start sub_817BFB4
-sub_817BFB4: ; 817BFB4
+sub_817BFB4: @ 817BFB4
 	push {lr}
 	ldr r0, =sub_817BFCC
 	movs r1, 0
@@ -705501,7 +705501,7 @@ sub_817BFB4: ; 817BFB4
 	thumb_func_end sub_817BFB4
 
 	thumb_func_start sub_817BFCC
-sub_817BFCC: ; 817BFCC
+sub_817BFCC: @ 817BFCC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -705525,7 +705525,7 @@ sub_817BFCC: ; 817BFCC
 	thumb_func_end sub_817BFCC
 
 	thumb_func_start sub_817C000
-sub_817C000: ; 817C000
+sub_817C000: @ 817C000
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -705572,7 +705572,7 @@ _0817C04C:
 	thumb_func_end sub_817C000
 
 	thumb_func_start sub_817C058
-sub_817C058: ; 817C058
+sub_817C058: @ 817C058
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -705582,7 +705582,7 @@ sub_817C058: ; 817C058
 	thumb_func_end sub_817C058
 
 	thumb_func_start sub_817C068
-sub_817C068: ; 817C068
+sub_817C068: @ 817C068
 	push {lr}
 	ldr r0, =sub_817C080
 	movs r1, 0
@@ -705595,7 +705595,7 @@ sub_817C068: ; 817C068
 	thumb_func_end sub_817C068
 
 	thumb_func_start sub_817C080
-sub_817C080: ; 817C080
+sub_817C080: @ 817C080
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -705619,7 +705619,7 @@ sub_817C080: ; 817C080
 	thumb_func_end sub_817C080
 
 	thumb_func_start sub_817C0B4
-sub_817C0B4: ; 817C0B4
+sub_817C0B4: @ 817C0B4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -705687,7 +705687,7 @@ _0817C128:
 	thumb_func_end sub_817C0B4
 
 	thumb_func_start sub_817C134
-sub_817C134: ; 817C134
+sub_817C134: @ 817C134
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -705697,7 +705697,7 @@ sub_817C134: ; 817C134
 	thumb_func_end sub_817C134
 
 	thumb_func_start sub_817C144
-sub_817C144: ; 817C144
+sub_817C144: @ 817C144
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -705720,7 +705720,7 @@ sub_817C144: ; 817C144
 	thumb_func_end sub_817C144
 
 	thumb_func_start sub_817C174
-sub_817C174: ; 817C174
+sub_817C174: @ 817C174
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -705757,7 +705757,7 @@ sub_817C174: ; 817C174
 	thumb_func_end sub_817C174
 
 	thumb_func_start sub_817C1D4
-sub_817C1D4: ; 817C1D4
+sub_817C1D4: @ 817C1D4
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -705825,7 +705825,7 @@ _0817C254:
 	thumb_func_end sub_817C1D4
 
 	thumb_func_start sub_817C260
-sub_817C260: ; 817C260
+sub_817C260: @ 817C260
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -705844,7 +705844,7 @@ _0817C278:
 	thumb_func_end sub_817C260
 
 	thumb_func_start sub_817C280
-sub_817C280: ; 817C280
+sub_817C280: @ 817C280
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -705867,7 +705867,7 @@ sub_817C280: ; 817C280
 	thumb_func_end sub_817C280
 
 	thumb_func_start sub_817C2B0
-sub_817C2B0: ; 817C2B0
+sub_817C2B0: @ 817C2B0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -705904,7 +705904,7 @@ sub_817C2B0: ; 817C2B0
 	thumb_func_end sub_817C2B0
 
 	thumb_func_start sub_817C310
-sub_817C310: ; 817C310
+sub_817C310: @ 817C310
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -705972,12 +705972,12 @@ _0817C390:
 	thumb_func_end sub_817C310
 
 	thumb_func_start nullsub_68
-nullsub_68: ; 817C39C
+nullsub_68: @ 817C39C
 	bx lr
 	thumb_func_end nullsub_68
 
 	thumb_func_start sub_817C3A0
-sub_817C3A0: ; 817C3A0
+sub_817C3A0: @ 817C3A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -706131,7 +706131,7 @@ _0817C3BA:
 	thumb_func_end sub_817C3A0
 
 	thumb_func_start sub_817C4EC
-sub_817C4EC: ; 817C4EC
+sub_817C4EC: @ 817C4EC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -706150,7 +706150,7 @@ sub_817C4EC: ; 817C4EC
 	thumb_func_end sub_817C4EC
 
 	thumb_func_start sub_817C510
-sub_817C510: ; 817C510
+sub_817C510: @ 817C510
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -706193,7 +706193,7 @@ _0817C556:
 	thumb_func_end sub_817C510
 
 	thumb_func_start sub_817C560
-sub_817C560: ; 817C560
+sub_817C560: @ 817C560
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -706341,7 +706341,7 @@ _0817C670:
 	thumb_func_end sub_817C560
 
 	thumb_func_start sub_817C67C
-sub_817C67C: ; 817C67C
+sub_817C67C: @ 817C67C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -706429,7 +706429,7 @@ sub_817C67C: ; 817C67C
 	thumb_func_end sub_817C67C
 
 	thumb_func_start sub_817C72C
-sub_817C72C: ; 817C72C
+sub_817C72C: @ 817C72C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -706517,7 +706517,7 @@ sub_817C72C: ; 817C72C
 	thumb_func_end sub_817C72C
 
 	thumb_func_start sub_817C7DC
-sub_817C7DC: ; 817C7DC
+sub_817C7DC: @ 817C7DC
 	ldr r2, =gUnknown_0860A320
 	lsls r0, 2
 	adds r0, r2
@@ -706531,7 +706531,7 @@ sub_817C7DC: ; 817C7DC
 	thumb_func_end sub_817C7DC
 
 	thumb_func_start sub_817C7F4
-sub_817C7F4: ; 817C7F4
+sub_817C7F4: @ 817C7F4
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	lsrs r5, r4, 16
@@ -706585,7 +706585,7 @@ _0817C84E:
 	thumb_func_end sub_817C7F4
 
 	thumb_func_start sub_817C858
-sub_817C858: ; 817C858
+sub_817C858: @ 817C858
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -706639,7 +706639,7 @@ _0817C8A0:
 	thumb_func_end sub_817C858
 
 	thumb_func_start sub_817C8BC
-sub_817C8BC: ; 817C8BC
+sub_817C8BC: @ 817C8BC
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r0, [r0, 0x17]
@@ -706666,7 +706666,7 @@ _0817C8E6:
 	thumb_func_end sub_817C8BC
 
 	thumb_func_start hm_teleport_run_dp02scr
-hm_teleport_run_dp02scr: ; 817C8FC
+hm_teleport_run_dp02scr: @ 817C8FC
 	push {lr}
 	bl sub_808469C
 	movs r0, 0x3F
@@ -706682,7 +706682,7 @@ hm_teleport_run_dp02scr: ; 817C8FC
 	thumb_func_end hm_teleport_run_dp02scr
 
 	thumb_func_start sub_817C91C
-sub_817C91C: ; 817C91C
+sub_817C91C: @ 817C91C
 	push {lr}
 	bl oei_task_add
 	lsls r0, 24
@@ -706705,7 +706705,7 @@ sub_817C91C: ; 817C91C
 	thumb_func_end sub_817C91C
 
 	thumb_func_start sub_817C94C
-sub_817C94C: ; 817C94C
+sub_817C94C: @ 817C94C
 	push {lr}
 	movs r0, 0x3F
 	bl FieldEffectActiveListRemove
@@ -706715,7 +706715,7 @@ sub_817C94C: ; 817C94C
 	thumb_func_end sub_817C94C
 
 	thumb_func_start sub_817C95C
-sub_817C95C: ; 817C95C
+sub_817C95C: @ 817C95C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -709201,7 +709201,7 @@ _0817E0A6:
 	thumb_func_end sub_817C95C
 
 	thumb_func_start sub_817E0B8
-sub_817E0B8: ; 817E0B8
+sub_817E0B8: @ 817E0B8
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -709239,7 +709239,7 @@ _0817E0F6:
 	thumb_func_end sub_817E0B8
 
 	thumb_func_start sub_817E0FC
-sub_817E0FC: ; 817E0FC
+sub_817E0FC: @ 817E0FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -709506,7 +709506,7 @@ _0817E310:
 	thumb_func_end sub_817E0FC
 
 	thumb_func_start sub_817E32C
-sub_817E32C: ; 817E32C
+sub_817E32C: @ 817E32C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -709605,7 +709605,7 @@ _0817E3EE:
 	thumb_func_end sub_817E32C
 
 	thumb_func_start sub_817E3F4
-sub_817E3F4: ; 817E3F4
+sub_817E3F4: @ 817E3F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -709928,7 +709928,7 @@ _0817E670:
 	thumb_func_end sub_817E3F4
 
 	thumb_func_start sub_817E684
-sub_817E684: ; 817E684
+sub_817E684: @ 817E684
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -710406,7 +710406,7 @@ _0817EA6C:
 	thumb_func_end sub_817E684
 
 	thumb_func_start sub_817EA80
-sub_817EA80: ; 817EA80
+sub_817EA80: @ 817EA80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -710963,7 +710963,7 @@ _0817EEBC:
 	thumb_func_end sub_817EA80
 
 	thumb_func_start sub_817EECC
-sub_817EECC: ; 817EECC
+sub_817EECC: @ 817EECC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -711360,7 +711360,7 @@ _0817F1FA:
 	thumb_func_end sub_817EECC
 
 	thumb_func_start sub_817F21C
-sub_817F21C: ; 817F21C
+sub_817F21C: @ 817F21C
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	mov r12, r2
@@ -711432,7 +711432,7 @@ _0817F2A0:
 	thumb_func_end sub_817F21C
 
 	thumb_func_start sub_817F2A8
-sub_817F2A8: ; 817F2A8
+sub_817F2A8: @ 817F2A8
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -711503,7 +711503,7 @@ _0817F324:
 	thumb_func_end sub_817F2A8
 
 	thumb_func_start sub_817F33C
-sub_817F33C: ; 817F33C
+sub_817F33C: @ 817F33C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -711547,7 +711547,7 @@ _0817F388:
 	thumb_func_end sub_817F33C
 
 	thumb_func_start sub_817F394
-sub_817F394: ; 817F394
+sub_817F394: @ 817F394
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -711598,12 +711598,12 @@ _0817F3E6:
 	thumb_func_end sub_817F394
 
 	thumb_func_start nullsub_69
-nullsub_69: ; 817F3EC
+nullsub_69: @ 817F3EC
 	bx lr
 	thumb_func_end nullsub_69
 
 	thumb_func_start sub_817F3F0
-sub_817F3F0: ; 817F3F0
+sub_817F3F0: @ 817F3F0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -711669,7 +711669,7 @@ sub_817F3F0: ; 817F3F0
 	thumb_func_end sub_817F3F0
 
 	thumb_func_start sub_817F474
-sub_817F474: ; 817F474
+sub_817F474: @ 817F474
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -711691,7 +711691,7 @@ _0817F492:
 	thumb_func_end sub_817F474
 
 	thumb_func_start sub_817F498
-sub_817F498: ; 817F498
+sub_817F498: @ 817F498
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -711775,7 +711775,7 @@ _0817F528:
 	thumb_func_end sub_817F498
 
 	thumb_func_start sub_817F544
-sub_817F544: ; 817F544
+sub_817F544: @ 817F544
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -711801,7 +711801,7 @@ sub_817F544: ; 817F544
 	thumb_func_end sub_817F544
 
 	thumb_func_start sub_817F578
-sub_817F578: ; 817F578
+sub_817F578: @ 817F578
 	lsls r1, 24
 	ldr r3, =0x03001274
 	movs r2, 0x1
@@ -711816,7 +711816,7 @@ sub_817F578: ; 817F578
 	thumb_func_end sub_817F578
 
 	thumb_func_start sub_817F594
-sub_817F594: ; 817F594
+sub_817F594: @ 817F594
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r6, r1, 24
@@ -711866,7 +711866,7 @@ sub_817F594: ; 817F594
 	thumb_func_end sub_817F594
 
 	thumb_func_start sub_817F60C
-sub_817F60C: ; 817F60C
+sub_817F60C: @ 817F60C
 	ldr r1, =nullsub_69
 	str r1, [r0, 0x1C]
 	bx lr
@@ -711874,7 +711874,7 @@ sub_817F60C: ; 817F60C
 	thumb_func_end sub_817F60C
 
 	thumb_func_start sub_817F618
-sub_817F618: ; 817F618
+sub_817F618: @ 817F618
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r1, 16
@@ -711917,7 +711917,7 @@ sub_817F618: ; 817F618
 	thumb_func_end sub_817F618
 
 	thumb_func_start sub_817F670
-sub_817F670: ; 817F670
+sub_817F670: @ 817F670
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -711967,7 +711967,7 @@ _0817F6B0:
 	thumb_func_end sub_817F670
 
 	thumb_func_start sub_817F6D4
-sub_817F6D4: ; 817F6D4
+sub_817F6D4: @ 817F6D4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -711999,7 +711999,7 @@ _0817F6F8:
 	thumb_func_end sub_817F6D4
 
 	thumb_func_start sub_817F70C
-sub_817F70C: ; 817F70C
+sub_817F70C: @ 817F70C
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x30
@@ -712016,7 +712016,7 @@ _0817F720:
 	thumb_func_end sub_817F70C
 
 	thumb_func_start sub_817F724
-sub_817F724: ; 817F724
+sub_817F724: @ 817F724
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -712045,7 +712045,7 @@ _0817F752:
 	thumb_func_end sub_817F724
 
 	thumb_func_start sub_817F758
-sub_817F758: ; 817F758
+sub_817F758: @ 817F758
 	push {r4,lr}
 	ldr r4, =0x03001270
 	ldrb r1, [r4]
@@ -712065,7 +712065,7 @@ sub_817F758: ; 817F758
 	thumb_func_end sub_817F758
 
 	thumb_func_start sub_817F77C
-sub_817F77C: ; 817F77C
+sub_817F77C: @ 817F77C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -712138,7 +712138,7 @@ _0817F800:
 	thumb_func_end sub_817F77C
 
 	thumb_func_start pokemonanimfunc_01
-pokemonanimfunc_01: ; 817F808
+pokemonanimfunc_01: @ 817F808
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -712210,7 +712210,7 @@ _0817F88C:
 	thumb_func_end pokemonanimfunc_01
 
 	thumb_func_start pokemonanimfunc_02
-pokemonanimfunc_02: ; 817F898
+pokemonanimfunc_02: @ 817F898
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x32]
@@ -712264,7 +712264,7 @@ _0817F8EE:
 	thumb_func_end pokemonanimfunc_02
 
 	thumb_func_start sub_817F8FC
-sub_817F8FC: ; 817F8FC
+sub_817F8FC: @ 817F8FC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -712313,7 +712313,7 @@ _0817F946:
 	thumb_func_end sub_817F8FC
 
 	thumb_func_start pokemonanimfunc_03
-pokemonanimfunc_03: ; 817F95C
+pokemonanimfunc_03: @ 817F95C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x28
@@ -712329,7 +712329,7 @@ pokemonanimfunc_03: ; 817F95C
 	thumb_func_end pokemonanimfunc_03
 
 	thumb_func_start sub_817F978
-sub_817F978: ; 817F978
+sub_817F978: @ 817F978
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -712379,7 +712379,7 @@ _0817F9C4:
 	thumb_func_end sub_817F978
 
 	thumb_func_start pokemonanimfunc_04
-pokemonanimfunc_04: ; 817F9D8
+pokemonanimfunc_04: @ 817F9D8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x28
@@ -712395,7 +712395,7 @@ pokemonanimfunc_04: ; 817F9D8
 	thumb_func_end pokemonanimfunc_04
 
 	thumb_func_start sub_817F9F4
-sub_817F9F4: ; 817F9F4
+sub_817F9F4: @ 817F9F4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -712460,7 +712460,7 @@ _0817FA60:
 	thumb_func_end sub_817F9F4
 
 	thumb_func_start pokemonanimfunc_1E
-pokemonanimfunc_1E: ; 817FA6C
+pokemonanimfunc_1E: @ 817FA6C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -712476,7 +712476,7 @@ pokemonanimfunc_1E: ; 817FA6C
 	thumb_func_end pokemonanimfunc_1E
 
 	thumb_func_start pokemonanimfunc_06
-pokemonanimfunc_06: ; 817FA88
+pokemonanimfunc_06: @ 817FA88
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -712598,7 +712598,7 @@ _0817FB56:
 	thumb_func_end pokemonanimfunc_06
 
 	thumb_func_start pokemonanimfunc_09
-pokemonanimfunc_09: ; 817FB64
+pokemonanimfunc_09: @ 817FB64
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -712692,7 +712692,7 @@ _0817FC12:
 	thumb_func_end pokemonanimfunc_09
 
 	thumb_func_start sub_817FC20
-sub_817FC20: ; 817FC20
+sub_817FC20: @ 817FC20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -712776,7 +712776,7 @@ _0817FCBE:
 	thumb_func_end sub_817FC20
 
 	thumb_func_start pokemonanimfunc_0A
-pokemonanimfunc_0A: ; 817FCC4
+pokemonanimfunc_0A: @ 817FCC4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817FC20
@@ -712789,7 +712789,7 @@ pokemonanimfunc_0A: ; 817FCC4
 	thumb_func_end pokemonanimfunc_0A
 
 	thumb_func_start sub_817FCDC
-sub_817FCDC: ; 817FCDC
+sub_817FCDC: @ 817FCDC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -712829,7 +712829,7 @@ _0817FD12:
 	thumb_func_end sub_817FCDC
 
 	thumb_func_start pokemonanimfunc_0F
-pokemonanimfunc_0F: ; 817FD24
+pokemonanimfunc_0F: @ 817FD24
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -712847,7 +712847,7 @@ pokemonanimfunc_0F: ; 817FD24
 	thumb_func_end pokemonanimfunc_0F
 
 	thumb_func_start sub_817FD44
-sub_817FD44: ; 817FD44
+sub_817FD44: @ 817FD44
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -712886,7 +712886,7 @@ _0817FD78:
 	thumb_func_end sub_817FD44
 
 	thumb_func_start pokemonanimfunc_10
-pokemonanimfunc_10: ; 817FD88
+pokemonanimfunc_10: @ 817FD88
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -712902,7 +712902,7 @@ pokemonanimfunc_10: ; 817FD88
 	thumb_func_end pokemonanimfunc_10
 
 	thumb_func_start pokemonanimfunc_11
-pokemonanimfunc_11: ; 817FDA4
+pokemonanimfunc_11: @ 817FDA4
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldrh r2, [r7, 0x32]
@@ -712976,7 +712976,7 @@ _0817FE24:
 	thumb_func_end pokemonanimfunc_11
 
 	thumb_func_start sub_817FE30
-sub_817FE30: ; 817FE30
+sub_817FE30: @ 817FE30
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r2, =0x03001240
@@ -713082,7 +713082,7 @@ _0817FEF8:
 	thumb_func_end sub_817FE30
 
 	thumb_func_start pokemonanimfunc_12
-pokemonanimfunc_12: ; 817FF00
+pokemonanimfunc_12: @ 817FF00
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -713110,7 +713110,7 @@ pokemonanimfunc_12: ; 817FF00
 	thumb_func_end pokemonanimfunc_12
 
 	thumb_func_start sub_817FF3C
-sub_817FF3C: ; 817FF3C
+sub_817FF3C: @ 817FF3C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x2E]
@@ -713169,7 +713169,7 @@ _0817FFAA:
 	thumb_func_end sub_817FF3C
 
 	thumb_func_start pokemonanimfunc_1F
-pokemonanimfunc_1F: ; 817FFB8
+pokemonanimfunc_1F: @ 817FFB8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -713196,7 +713196,7 @@ pokemonanimfunc_1F: ; 817FFB8
 	thumb_func_end pokemonanimfunc_1F
 
 	thumb_func_start sub_817FFF0
-sub_817FFF0: ; 817FFF0
+sub_817FFF0: @ 817FFF0
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x2E]
@@ -713272,7 +713272,7 @@ _0818006A:
 	thumb_func_end sub_817FFF0
 
 	thumb_func_start pokemonanimfunc_14
-pokemonanimfunc_14: ; 8180090
+pokemonanimfunc_14: @ 8180090
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -713302,7 +713302,7 @@ pokemonanimfunc_14: ; 8180090
 	thumb_func_end pokemonanimfunc_14
 
 	thumb_func_start pokemonanimfunc_15
-pokemonanimfunc_15: ; 81800D0
+pokemonanimfunc_15: @ 81800D0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -713354,7 +713354,7 @@ _08180128:
 	thumb_func_end pokemonanimfunc_15
 
 	thumb_func_start pokemonanimfunc_16
-pokemonanimfunc_16: ; 8180134
+pokemonanimfunc_16: @ 8180134
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	movs r7, 0
@@ -713461,7 +713461,7 @@ _08180204:
 	thumb_func_end pokemonanimfunc_16
 
 	thumb_func_start pokemonanimfunc_17
-pokemonanimfunc_17: ; 8180210
+pokemonanimfunc_17: @ 8180210
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -713594,7 +713594,7 @@ _0818030A:
 	thumb_func_end pokemonanimfunc_17
 
 	thumb_func_start sub_818031C
-sub_818031C: ; 818031C
+sub_818031C: @ 818031C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -713662,7 +713662,7 @@ _08180394:
 	thumb_func_end sub_818031C
 
 	thumb_func_start pokemonanimfunc_19
-pokemonanimfunc_19: ; 81803A0
+pokemonanimfunc_19: @ 81803A0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x30
@@ -713678,7 +713678,7 @@ pokemonanimfunc_19: ; 81803A0
 	thumb_func_end pokemonanimfunc_19
 
 	thumb_func_start pokemonanimfunc_1A
-pokemonanimfunc_1A: ; 81803BC
+pokemonanimfunc_1A: @ 81803BC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -713769,7 +713769,7 @@ _0818045E:
 	thumb_func_end pokemonanimfunc_1A
 
 	thumb_func_start pokemonanimfunc_1B
-pokemonanimfunc_1B: ; 8180474
+pokemonanimfunc_1B: @ 8180474
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -713833,7 +713833,7 @@ _081804E8:
 	thumb_func_end pokemonanimfunc_1B
 
 	thumb_func_start sub_81804F8
-sub_81804F8: ; 81804F8
+sub_81804F8: @ 81804F8
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -713907,7 +713907,7 @@ _08180582:
 	thumb_func_end sub_81804F8
 
 	thumb_func_start pokemonanimfunc_1C
-pokemonanimfunc_1C: ; 8180594
+pokemonanimfunc_1C: @ 8180594
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -713923,7 +713923,7 @@ pokemonanimfunc_1C: ; 8180594
 	thumb_func_end pokemonanimfunc_1C
 
 	thumb_func_start sub_81805B0
-sub_81805B0: ; 81805B0
+sub_81805B0: @ 81805B0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -714002,7 +714002,7 @@ _08180644:
 	thumb_func_end sub_81805B0
 
 	thumb_func_start pokemonanimfunc_18
-pokemonanimfunc_18: ; 8180654
+pokemonanimfunc_18: @ 8180654
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -714018,7 +714018,7 @@ pokemonanimfunc_18: ; 8180654
 	thumb_func_end pokemonanimfunc_18
 
 	thumb_func_start pokemonanimfunc_1D
-pokemonanimfunc_1D: ; 8180670
+pokemonanimfunc_1D: @ 8180670
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	bl sub_817F70C
@@ -714094,7 +714094,7 @@ _081806FC:
 	thumb_func_end pokemonanimfunc_1D
 
 	thumb_func_start sub_8180714
-sub_8180714: ; 8180714
+sub_8180714: @ 8180714
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r6, 0
@@ -714215,7 +714215,7 @@ _081807FE:
 	thumb_func_end sub_8180714
 
 	thumb_func_start pokemonanimfunc_00
-pokemonanimfunc_00: ; 818080C
+pokemonanimfunc_00: @ 818080C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x10
@@ -714231,7 +714231,7 @@ pokemonanimfunc_00: ; 818080C
 	thumb_func_end pokemonanimfunc_00
 
 	thumb_func_start sub_8180828
-sub_8180828: ; 8180828
+sub_8180828: @ 8180828
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -714318,7 +714318,7 @@ _081808D0:
 	thumb_func_end sub_8180828
 
 	thumb_func_start pokemonanimfunc_13
-pokemonanimfunc_13: ; 81808D8
+pokemonanimfunc_13: @ 81808D8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714340,7 +714340,7 @@ _081808F2:
 	thumb_func_end pokemonanimfunc_13
 
 	thumb_func_start sub_8180900
-sub_8180900: ; 8180900
+sub_8180900: @ 8180900
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -714503,7 +714503,7 @@ _08180A3A:
 	thumb_func_end sub_8180900
 
 	thumb_func_start pokemonanimfunc_05
-pokemonanimfunc_05: ; 8180A50
+pokemonanimfunc_05: @ 8180A50
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -714531,7 +714531,7 @@ pokemonanimfunc_05: ; 8180A50
 	thumb_func_end pokemonanimfunc_05
 
 	thumb_func_start pokemonanimfunc_20
-pokemonanimfunc_20: ; 8180A8C
+pokemonanimfunc_20: @ 8180A8C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714584,7 +714584,7 @@ _08180AE8:
 	thumb_func_end pokemonanimfunc_20
 
 	thumb_func_start pokemonanimfunc_21
-pokemonanimfunc_21: ; 8180AF8
+pokemonanimfunc_21: @ 8180AF8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714636,7 +714636,7 @@ _08180B50:
 	thumb_func_end pokemonanimfunc_21
 
 	thumb_func_start pokemonanimfunc_22
-pokemonanimfunc_22: ; 8180B5C
+pokemonanimfunc_22: @ 8180B5C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714690,7 +714690,7 @@ _08180BB6:
 	thumb_func_end pokemonanimfunc_22
 
 	thumb_func_start pokemonanimfunc_23
-pokemonanimfunc_23: ; 8180BC4
+pokemonanimfunc_23: @ 8180BC4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714743,7 +714743,7 @@ _08180C20:
 	thumb_func_end pokemonanimfunc_23
 
 	thumb_func_start pokemonanimfunc_24
-pokemonanimfunc_24: ; 8180C30
+pokemonanimfunc_24: @ 8180C30
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -714796,7 +714796,7 @@ _08180C8C:
 	thumb_func_end pokemonanimfunc_24
 
 	thumb_func_start pokemonanimfunc_25
-pokemonanimfunc_25: ; 8180C9C
+pokemonanimfunc_25: @ 8180C9C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -714809,7 +714809,7 @@ pokemonanimfunc_25: ; 8180C9C
 	thumb_func_end pokemonanimfunc_25
 
 	thumb_func_start sub_8180CB4
-sub_8180CB4: ; 8180CB4
+sub_8180CB4: @ 8180CB4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -714836,7 +714836,7 @@ _08180CD6:
 	thumb_func_end sub_8180CB4
 
 	thumb_func_start sub_8180CE8
-sub_8180CE8: ; 8180CE8
+sub_8180CE8: @ 8180CE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -714884,7 +714884,7 @@ _08180D32:
 	thumb_func_end sub_8180CE8
 
 	thumb_func_start sub_8180D44
-sub_8180D44: ; 8180D44
+sub_8180D44: @ 8180D44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -714946,7 +714946,7 @@ _08180DAE:
 	thumb_func_end sub_8180D44
 
 	thumb_func_start sub_8180DC0
-sub_8180DC0: ; 8180DC0
+sub_8180DC0: @ 8180DC0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715000,7 +715000,7 @@ _08180E1C:
 	thumb_func_end sub_8180DC0
 
 	thumb_func_start sub_8180E28
-sub_8180E28: ; 8180E28
+sub_8180E28: @ 8180E28
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715026,7 +715026,7 @@ _08180E4A:
 	thumb_func_end sub_8180E28
 
 	thumb_func_start pokemonanimfunc_26
-pokemonanimfunc_26: ; 8180E5C
+pokemonanimfunc_26: @ 8180E5C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -715041,7 +715041,7 @@ pokemonanimfunc_26: ; 8180E5C
 	thumb_func_end pokemonanimfunc_26
 
 	thumb_func_start sub_8180E78
-sub_8180E78: ; 8180E78
+sub_8180E78: @ 8180E78
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715085,7 +715085,7 @@ _08180EBA:
 	thumb_func_end sub_8180E78
 
 	thumb_func_start sub_8180ED0
-sub_8180ED0: ; 8180ED0
+sub_8180ED0: @ 8180ED0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715131,7 +715131,7 @@ _08180F1A:
 	thumb_func_end sub_8180ED0
 
 	thumb_func_start sub_8180F2C
-sub_8180F2C: ; 8180F2C
+sub_8180F2C: @ 8180F2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715191,7 +715191,7 @@ _08180F96:
 	thumb_func_end sub_8180F2C
 
 	thumb_func_start pokemonanimfunc_27
-pokemonanimfunc_27: ; 8180FA8
+pokemonanimfunc_27: @ 8180FA8
 	push {r4,lr}
 	adds r3, r0, 0
 	ldrh r1, [r3, 0x34]
@@ -715247,7 +715247,7 @@ _08180FFE:
 	thumb_func_end pokemonanimfunc_27
 
 	thumb_func_start pokemonanimfunc_28
-pokemonanimfunc_28: ; 818100C
+pokemonanimfunc_28: @ 818100C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -715260,7 +715260,7 @@ pokemonanimfunc_28: ; 818100C
 	thumb_func_end pokemonanimfunc_28
 
 	thumb_func_start sub_8181024
-sub_8181024: ; 8181024
+sub_8181024: @ 8181024
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715294,7 +715294,7 @@ _08181054:
 	thumb_func_end sub_8181024
 
 	thumb_func_start sub_8181068
-sub_8181068: ; 8181068
+sub_8181068: @ 8181068
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715338,7 +715338,7 @@ _081810B2:
 	thumb_func_end sub_8181068
 
 	thumb_func_start sub_81810C4
-sub_81810C4: ; 81810C4
+sub_81810C4: @ 81810C4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715365,7 +715365,7 @@ _081810E8:
 	thumb_func_end sub_81810C4
 
 	thumb_func_start pokemonanimfunc_29
-pokemonanimfunc_29: ; 81810F8
+pokemonanimfunc_29: @ 81810F8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -715378,7 +715378,7 @@ pokemonanimfunc_29: ; 81810F8
 	thumb_func_end pokemonanimfunc_29
 
 	thumb_func_start sub_8181110
-sub_8181110: ; 8181110
+sub_8181110: @ 8181110
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715406,7 +715406,7 @@ _08181134:
 	thumb_func_end sub_8181110
 
 	thumb_func_start sub_8181144
-sub_8181144: ; 8181144
+sub_8181144: @ 8181144
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715453,7 +715453,7 @@ _08181186:
 	thumb_func_end sub_8181144
 
 	thumb_func_start sub_81811A4
-sub_81811A4: ; 81811A4
+sub_81811A4: @ 81811A4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715483,7 +715483,7 @@ _081811CE:
 	thumb_func_end sub_81811A4
 
 	thumb_func_start pokemonanimfunc_2A
-pokemonanimfunc_2A: ; 81811E0
+pokemonanimfunc_2A: @ 81811E0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -715508,7 +715508,7 @@ pokemonanimfunc_2A: ; 81811E0
 	thumb_func_end pokemonanimfunc_2A
 
 	thumb_func_start sub_8181214
-sub_8181214: ; 8181214
+sub_8181214: @ 8181214
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x03001240
@@ -715669,7 +715669,7 @@ _0818134A:
 	thumb_func_end sub_8181214
 
 	thumb_func_start pokemonanimfunc_2B
-pokemonanimfunc_2B: ; 8181354
+pokemonanimfunc_2B: @ 8181354
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -715685,7 +715685,7 @@ pokemonanimfunc_2B: ; 8181354
 	thumb_func_end pokemonanimfunc_2B
 
 	thumb_func_start sub_8181370
-sub_8181370: ; 8181370
+sub_8181370: @ 8181370
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -715767,7 +715767,7 @@ _08181404:
 	thumb_func_end sub_8181370
 
 	thumb_func_start pokemonanimfunc_2C
-pokemonanimfunc_2C: ; 8181418
+pokemonanimfunc_2C: @ 8181418
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x32]
@@ -715860,7 +715860,7 @@ _081814CE:
 	thumb_func_end pokemonanimfunc_2C
 
 	thumb_func_start sub_81814D4
-sub_81814D4: ; 81814D4
+sub_81814D4: @ 81814D4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -715956,7 +715956,7 @@ _08181588:
 	thumb_func_end sub_81814D4
 
 	thumb_func_start pokemonanimfunc_2D
-pokemonanimfunc_2D: ; 81815A0
+pokemonanimfunc_2D: @ 81815A0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -715981,7 +715981,7 @@ pokemonanimfunc_2D: ; 81815A0
 	thumb_func_end pokemonanimfunc_2D
 
 	thumb_func_start sub_81815D4
-sub_81815D4: ; 81815D4
+sub_81815D4: @ 81815D4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0x32
@@ -716078,7 +716078,7 @@ _0818168A:
 	thumb_func_end sub_81815D4
 
 	thumb_func_start pokemonanimfunc_2E
-pokemonanimfunc_2E: ; 81816A0
+pokemonanimfunc_2E: @ 81816A0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -716103,7 +716103,7 @@ pokemonanimfunc_2E: ; 81816A0
 	thumb_func_end pokemonanimfunc_2E
 
 	thumb_func_start pokemonanimfunc_2F
-pokemonanimfunc_2F: ; 81816D4
+pokemonanimfunc_2F: @ 81816D4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -716129,7 +716129,7 @@ pokemonanimfunc_2F: ; 81816D4
 	thumb_func_end pokemonanimfunc_2F
 
 	thumb_func_start sub_8181708
-sub_8181708: ; 8181708
+sub_8181708: @ 8181708
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -716180,7 +716180,7 @@ _08181760:
 	thumb_func_end sub_8181708
 
 	thumb_func_start sub_8181770
-sub_8181770: ; 8181770
+sub_8181770: @ 8181770
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x34
@@ -716201,7 +716201,7 @@ _08181784:
 	thumb_func_end sub_8181770
 
 	thumb_func_start sub_8181794
-sub_8181794: ; 8181794
+sub_8181794: @ 8181794
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -716260,7 +716260,7 @@ _08181800:
 	thumb_func_end sub_8181794
 
 	thumb_func_start sub_8181810
-sub_8181810: ; 8181810
+sub_8181810: @ 8181810
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r4, =0x03001240
@@ -716422,7 +716422,7 @@ _08181950:
 	thumb_func_end sub_8181810
 
 	thumb_func_start pokemonanimfunc_30
-pokemonanimfunc_30: ; 8181960
+pokemonanimfunc_30: @ 8181960
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -716447,7 +716447,7 @@ pokemonanimfunc_30: ; 8181960
 	thumb_func_end pokemonanimfunc_30
 
 	thumb_func_start pokemonanimfunc_31
-pokemonanimfunc_31: ; 8181994
+pokemonanimfunc_31: @ 8181994
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -716579,7 +716579,7 @@ _08181A62:
 	thumb_func_end pokemonanimfunc_31
 
 	thumb_func_start pokemonanimfunc_32
-pokemonanimfunc_32: ; 8181A78
+pokemonanimfunc_32: @ 8181A78
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -716608,7 +716608,7 @@ pokemonanimfunc_32: ; 8181A78
 	thumb_func_end pokemonanimfunc_32
 
 	thumb_func_start sub_8181ABC
-sub_8181ABC: ; 8181ABC
+sub_8181ABC: @ 8181ABC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldr r6, =0x03001240
@@ -716684,7 +716684,7 @@ _08181B44:
 	thumb_func_end sub_8181ABC
 
 	thumb_func_start sub_8181B4C
-sub_8181B4C: ; 8181B4C
+sub_8181B4C: @ 8181B4C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -716794,7 +716794,7 @@ _08181C1A:
 	thumb_func_end sub_8181B4C
 
 	thumb_func_start sub_8181C2C
-sub_8181C2C: ; 8181C2C
+sub_8181C2C: @ 8181C2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -716889,7 +716889,7 @@ _08181CD0:
 	thumb_func_end sub_8181C2C
 
 	thumb_func_start sub_8181CE8
-sub_8181CE8: ; 8181CE8
+sub_8181CE8: @ 8181CE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -716985,7 +716985,7 @@ _08181DA6:
 	thumb_func_end sub_8181CE8
 
 	thumb_func_start pokemonanimfunc_33
-pokemonanimfunc_33: ; 8181DB0
+pokemonanimfunc_33: @ 8181DB0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -717010,7 +717010,7 @@ pokemonanimfunc_33: ; 8181DB0
 	thumb_func_end pokemonanimfunc_33
 
 	thumb_func_start pokemonanimfunc_34
-pokemonanimfunc_34: ; 8181DE4
+pokemonanimfunc_34: @ 8181DE4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -717093,7 +717093,7 @@ _08181E8A:
 	thumb_func_end pokemonanimfunc_34
 
 	thumb_func_start pokemonanimfunc_35
-pokemonanimfunc_35: ; 8181E90
+pokemonanimfunc_35: @ 8181E90
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r1, 0x32
@@ -717152,7 +717152,7 @@ _08181EEE:
 	thumb_func_end pokemonanimfunc_35
 
 	thumb_func_start pokemonanimfunc_36
-pokemonanimfunc_36: ; 8181EF8
+pokemonanimfunc_36: @ 8181EF8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -717167,7 +717167,7 @@ pokemonanimfunc_36: ; 8181EF8
 	thumb_func_end pokemonanimfunc_36
 
 	thumb_func_start sub_8181F14
-sub_8181F14: ; 8181F14
+sub_8181F14: @ 8181F14
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x3C]
@@ -717201,7 +717201,7 @@ _08181F38:
 	thumb_func_end sub_8181F14
 
 	thumb_func_start sub_8181F50
-sub_8181F50: ; 8181F50
+sub_8181F50: @ 8181F50
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717258,7 +717258,7 @@ _08181FAE:
 	thumb_func_end sub_8181F50
 
 	thumb_func_start sub_8181FC0
-sub_8181FC0: ; 8181FC0
+sub_8181FC0: @ 8181FC0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717303,7 +717303,7 @@ _08181FFE:
 	thumb_func_end sub_8181FC0
 
 	thumb_func_start pokemonanimfunc_37
-pokemonanimfunc_37: ; 818201C
+pokemonanimfunc_37: @ 818201C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -717401,7 +717401,7 @@ _081820B2:
 	thumb_func_end pokemonanimfunc_37
 
 	thumb_func_start pokemonanimfunc_38
-pokemonanimfunc_38: ; 81820E0
+pokemonanimfunc_38: @ 81820E0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -717417,7 +717417,7 @@ pokemonanimfunc_38: ; 81820E0
 	thumb_func_end pokemonanimfunc_38
 
 	thumb_func_start sub_81820FC
-sub_81820FC: ; 81820FC
+sub_81820FC: @ 81820FC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717471,7 +717471,7 @@ _0818214A:
 	thumb_func_end sub_81820FC
 
 	thumb_func_start sub_818216C
-sub_818216C: ; 818216C
+sub_818216C: @ 818216C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717518,7 +717518,7 @@ _081821AA:
 	thumb_func_end sub_818216C
 
 	thumb_func_start sub_81821CC
-sub_81821CC: ; 81821CC
+sub_81821CC: @ 81821CC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717580,7 +717580,7 @@ _08182224:
 	thumb_func_end sub_81821CC
 
 	thumb_func_start sub_8182248
-sub_8182248: ; 8182248
+sub_8182248: @ 8182248
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717629,7 +717629,7 @@ _0818228E:
 	thumb_func_end sub_8182248
 
 	thumb_func_start pokemonanimfunc_39
-pokemonanimfunc_39: ; 81822B0
+pokemonanimfunc_39: @ 81822B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717729,7 +717729,7 @@ _0818235C:
 	thumb_func_end pokemonanimfunc_39
 
 	thumb_func_start pokemonanimfunc_3A
-pokemonanimfunc_3A: ; 8182370
+pokemonanimfunc_3A: @ 8182370
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -717882,7 +717882,7 @@ _08182494:
 	thumb_func_end pokemonanimfunc_3A
 
 	thumb_func_start pokemonanimfunc_3B
-pokemonanimfunc_3B: ; 81824A0
+pokemonanimfunc_3B: @ 81824A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -717967,7 +717967,7 @@ _08182540:
 	thumb_func_end pokemonanimfunc_3B
 
 	thumb_func_start pokemonanimfunc_3C
-pokemonanimfunc_3C: ; 8182548
+pokemonanimfunc_3C: @ 8182548
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -718040,7 +718040,7 @@ _081825D4:
 	thumb_func_end pokemonanimfunc_3C
 
 	thumb_func_start pokemonanimfunc_3D
-pokemonanimfunc_3D: ; 81825DC
+pokemonanimfunc_3D: @ 81825DC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -718055,7 +718055,7 @@ pokemonanimfunc_3D: ; 81825DC
 	thumb_func_end pokemonanimfunc_3D
 
 	thumb_func_start sub_81825F8
-sub_81825F8: ; 81825F8
+sub_81825F8: @ 81825F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3C]
@@ -718097,7 +718097,7 @@ _08182620:
 	thumb_func_end sub_81825F8
 
 	thumb_func_start sub_8182648
-sub_8182648: ; 8182648
+sub_8182648: @ 8182648
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3C]
@@ -718187,7 +718187,7 @@ _081826EE:
 	thumb_func_end sub_8182648
 
 	thumb_func_start sub_81826F8
-sub_81826F8: ; 81826F8
+sub_81826F8: @ 81826F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x3C]
@@ -718239,7 +718239,7 @@ _08182742:
 	thumb_func_end sub_81826F8
 
 	thumb_func_start sub_8182764
-sub_8182764: ; 8182764
+sub_8182764: @ 8182764
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -718315,7 +718315,7 @@ _081827F4:
 	thumb_func_end sub_8182764
 
 	thumb_func_start pokemonanimfunc_3E
-pokemonanimfunc_3E: ; 81827FC
+pokemonanimfunc_3E: @ 81827FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -718343,7 +718343,7 @@ _08182822:
 	thumb_func_end pokemonanimfunc_3E
 
 	thumb_func_start sub_8182830
-sub_8182830: ; 8182830
+sub_8182830: @ 8182830
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -718419,7 +718419,7 @@ _081828C0:
 	thumb_func_end sub_8182830
 
 	thumb_func_start pokemonanimfunc_3F
-pokemonanimfunc_3F: ; 81828C8
+pokemonanimfunc_3F: @ 81828C8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -718447,7 +718447,7 @@ _081828EE:
 	thumb_func_end pokemonanimfunc_3F
 
 	thumb_func_start pokemonanimfunc_40
-pokemonanimfunc_40: ; 81828FC
+pokemonanimfunc_40: @ 81828FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -718534,7 +718534,7 @@ _0818299E:
 	thumb_func_end pokemonanimfunc_40
 
 	thumb_func_start pokemonanimfunc_41
-pokemonanimfunc_41: ; 81829AC
+pokemonanimfunc_41: @ 81829AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -718629,7 +718629,7 @@ _08182A5E:
 	thumb_func_end pokemonanimfunc_41
 
 	thumb_func_start pokemonanimfunc_42
-pokemonanimfunc_42: ; 8182A6C
+pokemonanimfunc_42: @ 8182A6C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -718720,7 +718720,7 @@ _08182B16:
 	thumb_func_end pokemonanimfunc_42
 
 	thumb_func_start pokemonanimfunc_43
-pokemonanimfunc_43: ; 8182B24
+pokemonanimfunc_43: @ 8182B24
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -718853,7 +718853,7 @@ _08182C08:
 	thumb_func_end pokemonanimfunc_43
 
 	thumb_func_start pokemonanimfunc_44
-pokemonanimfunc_44: ; 8182C18
+pokemonanimfunc_44: @ 8182C18
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -718984,7 +718984,7 @@ _08182D12:
 	thumb_func_end pokemonanimfunc_44
 
 	thumb_func_start pokemonanimfunc_45
-pokemonanimfunc_45: ; 8182D24
+pokemonanimfunc_45: @ 8182D24
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x20
@@ -719000,7 +719000,7 @@ pokemonanimfunc_45: ; 8182D24
 	thumb_func_end pokemonanimfunc_45
 
 	thumb_func_start pokemonanimfunc_46
-pokemonanimfunc_46: ; 8182D40
+pokemonanimfunc_46: @ 8182D40
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -719016,7 +719016,7 @@ pokemonanimfunc_46: ; 8182D40
 	thumb_func_end pokemonanimfunc_46
 
 	thumb_func_start pokemonanimfunc_47
-pokemonanimfunc_47: ; 8182D5C
+pokemonanimfunc_47: @ 8182D5C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x50
@@ -719032,7 +719032,7 @@ pokemonanimfunc_47: ; 8182D5C
 	thumb_func_end pokemonanimfunc_47
 
 	thumb_func_start pokemonanimfunc_48
-pokemonanimfunc_48: ; 8182D78
+pokemonanimfunc_48: @ 8182D78
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719060,7 +719060,7 @@ pokemonanimfunc_48: ; 8182D78
 	thumb_func_end pokemonanimfunc_48
 
 	thumb_func_start pokemonanimfunc_49
-pokemonanimfunc_49: ; 8182DB4
+pokemonanimfunc_49: @ 8182DB4
 	push {lr}
 	movs r1, 0x1
 	strh r1, [r0, 0x3A]
@@ -719070,7 +719070,7 @@ pokemonanimfunc_49: ; 8182DB4
 	thumb_func_end pokemonanimfunc_49
 
 	thumb_func_start pokemonanimfunc_4A
-pokemonanimfunc_4A: ; 8182DC4
+pokemonanimfunc_4A: @ 8182DC4
 	push {lr}
 	movs r1, 0x1
 	strh r1, [r0, 0x3A]
@@ -719080,7 +719080,7 @@ pokemonanimfunc_4A: ; 8182DC4
 	thumb_func_end pokemonanimfunc_4A
 
 	thumb_func_start pokemonanimfunc_4B
-pokemonanimfunc_4B: ; 8182DD4
+pokemonanimfunc_4B: @ 8182DD4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -719108,7 +719108,7 @@ _08182DF8:
 	thumb_func_end pokemonanimfunc_4B
 
 	thumb_func_start pokemonanimfunc_4C
-pokemonanimfunc_4C: ; 8182E00
+pokemonanimfunc_4C: @ 8182E00
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1E
@@ -719126,7 +719126,7 @@ pokemonanimfunc_4C: ; 8182E00
 	thumb_func_end pokemonanimfunc_4C
 
 	thumb_func_start pokemonanimfunc_4D
-pokemonanimfunc_4D: ; 8182E20
+pokemonanimfunc_4D: @ 8182E20
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1E
@@ -719142,7 +719142,7 @@ pokemonanimfunc_4D: ; 8182E20
 	thumb_func_end pokemonanimfunc_4D
 
 	thumb_func_start pokemonanimfunc_4E
-pokemonanimfunc_4E: ; 8182E3C
+pokemonanimfunc_4E: @ 8182E3C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719172,7 +719172,7 @@ pokemonanimfunc_4E: ; 8182E3C
 	thumb_func_end pokemonanimfunc_4E
 
 	thumb_func_start pokemonanimfunc_4F
-pokemonanimfunc_4F: ; 8182E7C
+pokemonanimfunc_4F: @ 8182E7C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719202,7 +719202,7 @@ pokemonanimfunc_4F: ; 8182E7C
 	thumb_func_end pokemonanimfunc_4F
 
 	thumb_func_start pokemonanimfunc_50
-pokemonanimfunc_50: ; 8182EBC
+pokemonanimfunc_50: @ 8182EBC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x18
@@ -719218,7 +719218,7 @@ pokemonanimfunc_50: ; 8182EBC
 	thumb_func_end pokemonanimfunc_50
 
 	thumb_func_start pokemonanimfunc_51
-pokemonanimfunc_51: ; 8182ED8
+pokemonanimfunc_51: @ 8182ED8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -719234,7 +719234,7 @@ pokemonanimfunc_51: ; 8182ED8
 	thumb_func_end pokemonanimfunc_51
 
 	thumb_func_start pokemonanimfunc_52
-pokemonanimfunc_52: ; 8182EF4
+pokemonanimfunc_52: @ 8182EF4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3
@@ -719250,7 +719250,7 @@ pokemonanimfunc_52: ; 8182EF4
 	thumb_func_end pokemonanimfunc_52
 
 	thumb_func_start pokemonanimfunc_53
-pokemonanimfunc_53: ; 8182F10
+pokemonanimfunc_53: @ 8182F10
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719277,7 +719277,7 @@ pokemonanimfunc_53: ; 8182F10
 	thumb_func_end pokemonanimfunc_53
 
 	thumb_func_start pokemonanimfunc_54
-pokemonanimfunc_54: ; 8182F48
+pokemonanimfunc_54: @ 8182F48
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719304,7 +719304,7 @@ pokemonanimfunc_54: ; 8182F48
 	thumb_func_end pokemonanimfunc_54
 
 	thumb_func_start pokemonanimfunc_55
-pokemonanimfunc_55: ; 8182F80
+pokemonanimfunc_55: @ 8182F80
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719331,7 +719331,7 @@ pokemonanimfunc_55: ; 8182F80
 	thumb_func_end pokemonanimfunc_55
 
 	thumb_func_start pokemonanimfunc_56
-pokemonanimfunc_56: ; 8182FB8
+pokemonanimfunc_56: @ 8182FB8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719362,7 +719362,7 @@ pokemonanimfunc_56: ; 8182FB8
 	thumb_func_end pokemonanimfunc_56
 
 	thumb_func_start pokemonanimfunc_07
-pokemonanimfunc_07: ; 8182FFC
+pokemonanimfunc_07: @ 8182FFC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719387,7 +719387,7 @@ pokemonanimfunc_07: ; 8182FFC
 	thumb_func_end pokemonanimfunc_07
 
 	thumb_func_start pokemonanimfunc_08
-pokemonanimfunc_08: ; 8183030
+pokemonanimfunc_08: @ 8183030
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719414,7 +719414,7 @@ pokemonanimfunc_08: ; 8183030
 	thumb_func_end pokemonanimfunc_08
 
 	thumb_func_start pokemonanimfunc_0B
-pokemonanimfunc_0B: ; 8183068
+pokemonanimfunc_0B: @ 8183068
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719439,7 +719439,7 @@ pokemonanimfunc_0B: ; 8183068
 	thumb_func_end pokemonanimfunc_0B
 
 	thumb_func_start pokemonanimfunc_0C
-pokemonanimfunc_0C: ; 818309C
+pokemonanimfunc_0C: @ 818309C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719466,7 +719466,7 @@ pokemonanimfunc_0C: ; 818309C
 	thumb_func_end pokemonanimfunc_0C
 
 	thumb_func_start pokemonanimfunc_0D
-pokemonanimfunc_0D: ; 81830D4
+pokemonanimfunc_0D: @ 81830D4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719491,7 +719491,7 @@ pokemonanimfunc_0D: ; 81830D4
 	thumb_func_end pokemonanimfunc_0D
 
 	thumb_func_start pokemonanimfunc_0E
-pokemonanimfunc_0E: ; 8183108
+pokemonanimfunc_0E: @ 8183108
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -719518,7 +719518,7 @@ pokemonanimfunc_0E: ; 8183108
 	thumb_func_end pokemonanimfunc_0E
 
 	thumb_func_start sub_8183140
-sub_8183140: ; 8183140
+sub_8183140: @ 8183140
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -719564,7 +719564,7 @@ _08183180:
 	thumb_func_end sub_8183140
 
 	thumb_func_start pokemonanimfunc_57
-pokemonanimfunc_57: ; 8183194
+pokemonanimfunc_57: @ 8183194
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -719582,7 +719582,7 @@ pokemonanimfunc_57: ; 8183194
 	thumb_func_end pokemonanimfunc_57
 
 	thumb_func_start pokemonanimfunc_58
-pokemonanimfunc_58: ; 81831B4
+pokemonanimfunc_58: @ 81831B4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1E
@@ -719600,7 +719600,7 @@ pokemonanimfunc_58: ; 81831B4
 	thumb_func_end pokemonanimfunc_58
 
 	thumb_func_start pokemonanimfunc_59
-pokemonanimfunc_59: ; 81831D4
+pokemonanimfunc_59: @ 81831D4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -719732,7 +719732,7 @@ _081832BC:
 	thumb_func_end pokemonanimfunc_59
 
 	thumb_func_start sub_81832C8
-sub_81832C8: ; 81832C8
+sub_81832C8: @ 81832C8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -719876,7 +719876,7 @@ _081833DC:
 	thumb_func_end sub_81832C8
 
 	thumb_func_start pokemonanimfunc_5A
-pokemonanimfunc_5A: ; 81833E8
+pokemonanimfunc_5A: @ 81833E8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -719902,7 +719902,7 @@ _0818340A:
 	thumb_func_end pokemonanimfunc_5A
 
 	thumb_func_start sub_8183418
-sub_8183418: ; 8183418
+sub_8183418: @ 8183418
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -720049,7 +720049,7 @@ _08183538:
 	thumb_func_end sub_8183418
 
 	thumb_func_start pokemonanimfunc_5B
-pokemonanimfunc_5B: ; 8183544
+pokemonanimfunc_5B: @ 8183544
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -720075,7 +720075,7 @@ _08183566:
 	thumb_func_end pokemonanimfunc_5B
 
 	thumb_func_start sub_8183574
-sub_8183574: ; 8183574
+sub_8183574: @ 8183574
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -720161,7 +720161,7 @@ _0818360A:
 	thumb_func_end sub_8183574
 
 	thumb_func_start pokemonanimfunc_5C
-pokemonanimfunc_5C: ; 8183618
+pokemonanimfunc_5C: @ 8183618
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x28
@@ -720179,7 +720179,7 @@ pokemonanimfunc_5C: ; 8183618
 	thumb_func_end pokemonanimfunc_5C
 
 	thumb_func_start pokemonanimfunc_5D
-pokemonanimfunc_5D: ; 8183638
+pokemonanimfunc_5D: @ 8183638
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x46
@@ -720197,7 +720197,7 @@ pokemonanimfunc_5D: ; 8183638
 	thumb_func_end pokemonanimfunc_5D
 
 	thumb_func_start pokemonanimfunc_5E
-pokemonanimfunc_5E: ; 8183658
+pokemonanimfunc_5E: @ 8183658
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x14
@@ -720213,7 +720213,7 @@ pokemonanimfunc_5E: ; 8183658
 	thumb_func_end pokemonanimfunc_5E
 
 	thumb_func_start pokemonanimfunc_5F
-pokemonanimfunc_5F: ; 8183674
+pokemonanimfunc_5F: @ 8183674
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x32]
@@ -720267,7 +720267,7 @@ _081836CA:
 	thumb_func_end pokemonanimfunc_5F
 
 	thumb_func_start pokemonanimfunc_60
-pokemonanimfunc_60: ; 81836D8
+pokemonanimfunc_60: @ 81836D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x32]
@@ -720321,7 +720321,7 @@ _0818372E:
 	thumb_func_end pokemonanimfunc_60
 
 	thumb_func_start pokemonanimfunc_61
-pokemonanimfunc_61: ; 818373C
+pokemonanimfunc_61: @ 818373C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x46
@@ -720339,7 +720339,7 @@ pokemonanimfunc_61: ; 818373C
 	thumb_func_end pokemonanimfunc_61
 
 	thumb_func_start pokemonanimfunc_62
-pokemonanimfunc_62: ; 818375C
+pokemonanimfunc_62: @ 818375C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x18
@@ -720357,7 +720357,7 @@ pokemonanimfunc_62: ; 818375C
 	thumb_func_end pokemonanimfunc_62
 
 	thumb_func_start pokemonanimfunc_63
-pokemonanimfunc_63: ; 818377C
+pokemonanimfunc_63: @ 818377C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x38
@@ -720375,7 +720375,7 @@ pokemonanimfunc_63: ; 818377C
 	thumb_func_end pokemonanimfunc_63
 
 	thumb_func_start pokemonanimfunc_64
-pokemonanimfunc_64: ; 818379C
+pokemonanimfunc_64: @ 818379C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F758
@@ -720405,7 +720405,7 @@ pokemonanimfunc_64: ; 818379C
 	thumb_func_end pokemonanimfunc_64
 
 	thumb_func_start sub_81837DC
-sub_81837DC: ; 81837DC
+sub_81837DC: @ 81837DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -720575,7 +720575,7 @@ _0818392C:
 	thumb_func_end sub_81837DC
 
 	thumb_func_start pokemonanimfunc_65
-pokemonanimfunc_65: ; 818393C
+pokemonanimfunc_65: @ 818393C
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -720601,7 +720601,7 @@ _0818395E:
 	thumb_func_end pokemonanimfunc_65
 
 	thumb_func_start pokemonanimfunc_66
-pokemonanimfunc_66: ; 818396C
+pokemonanimfunc_66: @ 818396C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -720733,7 +720733,7 @@ _08183A54:
 	thumb_func_end pokemonanimfunc_66
 
 	thumb_func_start pokemonanimfunc_67
-pokemonanimfunc_67: ; 8183A60
+pokemonanimfunc_67: @ 8183A60
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -720859,7 +720859,7 @@ _08183B40:
 	thumb_func_end pokemonanimfunc_67
 
 	thumb_func_start sub_8183B4C
-sub_8183B4C: ; 8183B4C
+sub_8183B4C: @ 8183B4C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -720956,7 +720956,7 @@ _08183C06:
 	thumb_func_end sub_8183B4C
 
 	thumb_func_start pokemonanimfunc_68
-pokemonanimfunc_68: ; 8183C0C
+pokemonanimfunc_68: @ 8183C0C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x1
@@ -720973,7 +720973,7 @@ pokemonanimfunc_68: ; 8183C0C
 	thumb_func_end pokemonanimfunc_68
 
 	thumb_func_start pokemonanimfunc_69
-pokemonanimfunc_69: ; 8183C2C
+pokemonanimfunc_69: @ 8183C2C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -720991,7 +720991,7 @@ pokemonanimfunc_69: ; 8183C2C
 	thumb_func_end pokemonanimfunc_69
 
 	thumb_func_start pokemonanimfunc_6A
-pokemonanimfunc_6A: ; 8183C4C
+pokemonanimfunc_6A: @ 8183C4C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -721008,7 +721008,7 @@ pokemonanimfunc_6A: ; 8183C4C
 	thumb_func_end pokemonanimfunc_6A
 
 	thumb_func_start sub_8183C6C
-sub_8183C6C: ; 8183C6C
+sub_8183C6C: @ 8183C6C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x3C]
@@ -721075,7 +721075,7 @@ _08183CE8:
 	thumb_func_end sub_8183C6C
 
 	thumb_func_start pokemonanimfunc_6B
-pokemonanimfunc_6B: ; 8183CF0
+pokemonanimfunc_6B: @ 8183CF0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -721104,7 +721104,7 @@ _08183D16:
 	thumb_func_end pokemonanimfunc_6B
 
 	thumb_func_start pokemonanimfunc_6C
-pokemonanimfunc_6C: ; 8183D28
+pokemonanimfunc_6C: @ 8183D28
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -721133,7 +721133,7 @@ _08183D4E:
 	thumb_func_end pokemonanimfunc_6C
 
 	thumb_func_start pokemonanimfunc_6D
-pokemonanimfunc_6D: ; 8183D60
+pokemonanimfunc_6D: @ 8183D60
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721162,7 +721162,7 @@ _08183D88:
 	thumb_func_end pokemonanimfunc_6D
 
 	thumb_func_start pokemonanimfunc_6E
-pokemonanimfunc_6E: ; 8183D94
+pokemonanimfunc_6E: @ 8183D94
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721190,7 +721190,7 @@ _08183DBA:
 	thumb_func_end pokemonanimfunc_6E
 
 	thumb_func_start pokemonanimfunc_6F
-pokemonanimfunc_6F: ; 8183DC8
+pokemonanimfunc_6F: @ 8183DC8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721219,7 +721219,7 @@ _08183DF0:
 	thumb_func_end pokemonanimfunc_6F
 
 	thumb_func_start pokemonanimfunc_70
-pokemonanimfunc_70: ; 8183DFC
+pokemonanimfunc_70: @ 8183DFC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721247,7 +721247,7 @@ _08183E22:
 	thumb_func_end pokemonanimfunc_70
 
 	thumb_func_start pokemonanimfunc_71
-pokemonanimfunc_71: ; 8183E30
+pokemonanimfunc_71: @ 8183E30
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -721269,7 +721269,7 @@ _08183E4A:
 	thumb_func_end pokemonanimfunc_71
 
 	thumb_func_start pokemonanimfunc_72
-pokemonanimfunc_72: ; 8183E58
+pokemonanimfunc_72: @ 8183E58
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -721291,7 +721291,7 @@ _08183E72:
 	thumb_func_end pokemonanimfunc_72
 
 	thumb_func_start pokemonanimfunc_73
-pokemonanimfunc_73: ; 8183E80
+pokemonanimfunc_73: @ 8183E80
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -721317,7 +721317,7 @@ _08183EA2:
 	thumb_func_end pokemonanimfunc_73
 
 	thumb_func_start pokemonanimfunc_74
-pokemonanimfunc_74: ; 8183EB0
+pokemonanimfunc_74: @ 8183EB0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721344,7 +721344,7 @@ _08183ED4:
 	thumb_func_end pokemonanimfunc_74
 
 	thumb_func_start pokemonanimfunc_75
-pokemonanimfunc_75: ; 8183EE0
+pokemonanimfunc_75: @ 8183EE0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721372,7 +721372,7 @@ _08183F06:
 	thumb_func_end pokemonanimfunc_75
 
 	thumb_func_start pokemonanimfunc_76
-pokemonanimfunc_76: ; 8183F14
+pokemonanimfunc_76: @ 8183F14
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -721399,7 +721399,7 @@ _08183F38:
 	thumb_func_end pokemonanimfunc_76
 
 	thumb_func_start pokemonanimfunc_77
-pokemonanimfunc_77: ; 8183F44
+pokemonanimfunc_77: @ 8183F44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721427,7 +721427,7 @@ _08183F6A:
 	thumb_func_end pokemonanimfunc_77
 
 	thumb_func_start pokemonanimfunc_78
-pokemonanimfunc_78: ; 8183F78
+pokemonanimfunc_78: @ 8183F78
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x32
@@ -721454,7 +721454,7 @@ _08183F9C:
 	thumb_func_end pokemonanimfunc_78
 
 	thumb_func_start sub_8183FA8
-sub_8183FA8: ; 8183FA8
+sub_8183FA8: @ 8183FA8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -721539,7 +721539,7 @@ _0818403E:
 	thumb_func_end sub_8183FA8
 
 	thumb_func_start pokemonanimfunc_79
-pokemonanimfunc_79: ; 8184048
+pokemonanimfunc_79: @ 8184048
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x32
@@ -721563,7 +721563,7 @@ _08184066:
 	thumb_func_end pokemonanimfunc_79
 
 	thumb_func_start pokemonanimfunc_7A
-pokemonanimfunc_7A: ; 8184070
+pokemonanimfunc_7A: @ 8184070
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x32
@@ -721587,7 +721587,7 @@ _0818408E:
 	thumb_func_end pokemonanimfunc_7A
 
 	thumb_func_start pokemonanimfunc_7B
-pokemonanimfunc_7B: ; 8184098
+pokemonanimfunc_7B: @ 8184098
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x32
@@ -721612,7 +721612,7 @@ _081840B8:
 	thumb_func_end pokemonanimfunc_7B
 
 	thumb_func_start sub_81840C4
-sub_81840C4: ; 81840C4
+sub_81840C4: @ 81840C4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x3C
@@ -721722,7 +721722,7 @@ _08184188:
 	thumb_func_end sub_81840C4
 
 	thumb_func_start pokemonanimfunc_7C
-pokemonanimfunc_7C: ; 8184190
+pokemonanimfunc_7C: @ 8184190
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x32
@@ -721747,7 +721747,7 @@ _081841B0:
 	thumb_func_end pokemonanimfunc_7C
 
 	thumb_func_start pokemonanimfunc_7D
-pokemonanimfunc_7D: ; 81841BC
+pokemonanimfunc_7D: @ 81841BC
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x32
@@ -721772,7 +721772,7 @@ _081841DC:
 	thumb_func_end pokemonanimfunc_7D
 
 	thumb_func_start pokemonanimfunc_7E
-pokemonanimfunc_7E: ; 81841E8
+pokemonanimfunc_7E: @ 81841E8
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x32
@@ -721797,7 +721797,7 @@ _08184208:
 	thumb_func_end pokemonanimfunc_7E
 
 	thumb_func_start pokemonanimfunc_7F
-pokemonanimfunc_7F: ; 8184214
+pokemonanimfunc_7F: @ 8184214
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x32
@@ -721821,7 +721821,7 @@ _08184232:
 	thumb_func_end pokemonanimfunc_7F
 
 	thumb_func_start pokemonanimfunc_80
-pokemonanimfunc_80: ; 818423C
+pokemonanimfunc_80: @ 818423C
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x32
@@ -721845,7 +721845,7 @@ _0818425A:
 	thumb_func_end pokemonanimfunc_80
 
 	thumb_func_start pokemonanimfunc_81
-pokemonanimfunc_81: ; 8184264
+pokemonanimfunc_81: @ 8184264
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x32
@@ -721871,7 +721871,7 @@ _08184286:
 	thumb_func_end pokemonanimfunc_81
 
 	thumb_func_start sub_8184290
-sub_8184290: ; 8184290
+sub_8184290: @ 8184290
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -721908,7 +721908,7 @@ sub_8184290: ; 8184290
 	thumb_func_end sub_8184290
 
 	thumb_func_start pokemonanimfunc_82
-pokemonanimfunc_82: ; 81842DC
+pokemonanimfunc_82: @ 81842DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -721974,7 +721974,7 @@ _08184358:
 	thumb_func_end pokemonanimfunc_82
 
 	thumb_func_start pokemonanimfunc_83
-pokemonanimfunc_83: ; 8184360
+pokemonanimfunc_83: @ 8184360
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -722040,7 +722040,7 @@ _081843DC:
 	thumb_func_end pokemonanimfunc_83
 
 	thumb_func_start pokemonanimfunc_84
-pokemonanimfunc_84: ; 81843E4
+pokemonanimfunc_84: @ 81843E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -722106,7 +722106,7 @@ _08184460:
 	thumb_func_end pokemonanimfunc_84
 
 	thumb_func_start sub_8184468
-sub_8184468: ; 8184468
+sub_8184468: @ 8184468
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r0, 0x32
@@ -722220,7 +722220,7 @@ _08184544:
 	thumb_func_end sub_8184468
 
 	thumb_func_start pokemonanimfunc_85
-pokemonanimfunc_85: ; 8184550
+pokemonanimfunc_85: @ 8184550
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -722245,7 +722245,7 @@ _08184570:
 	thumb_func_end pokemonanimfunc_85
 
 	thumb_func_start pokemonanimfunc_86
-pokemonanimfunc_86: ; 818457C
+pokemonanimfunc_86: @ 818457C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -722269,7 +722269,7 @@ _0818459A:
 	thumb_func_end pokemonanimfunc_86
 
 	thumb_func_start pokemonanimfunc_87
-pokemonanimfunc_87: ; 81845A8
+pokemonanimfunc_87: @ 81845A8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -722293,7 +722293,7 @@ _081845C6:
 	thumb_func_end pokemonanimfunc_87
 
 	thumb_func_start sub_81845D4
-sub_81845D4: ; 81845D4
+sub_81845D4: @ 81845D4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -722324,7 +722324,7 @@ _081845FE:
 	thumb_func_end sub_81845D4
 
 	thumb_func_start sub_8184610
-sub_8184610: ; 8184610
+sub_8184610: @ 8184610
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -722349,7 +722349,7 @@ _0818462E:
 	thumb_func_end sub_8184610
 
 	thumb_func_start sub_8184640
-sub_8184640: ; 8184640
+sub_8184640: @ 8184640
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -722379,7 +722379,7 @@ _08184668:
 	thumb_func_end sub_8184640
 
 	thumb_func_start sub_8184678
-sub_8184678: ; 8184678
+sub_8184678: @ 8184678
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -722414,7 +722414,7 @@ _081846AC:
 	thumb_func_end sub_8184678
 
 	thumb_func_start sub_81846B8
-sub_81846B8: ; 81846B8
+sub_81846B8: @ 81846B8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F70C
@@ -722440,7 +722440,7 @@ _081846DA:
 	thumb_func_end sub_81846B8
 
 	thumb_func_start pokemonanimfunc_88
-pokemonanimfunc_88: ; 81846EC
+pokemonanimfunc_88: @ 81846EC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -722464,7 +722464,7 @@ pokemonanimfunc_88: ; 81846EC
 	thumb_func_end pokemonanimfunc_88
 
 	thumb_func_start pokemonanimfunc_89
-pokemonanimfunc_89: ; 8184718
+pokemonanimfunc_89: @ 8184718
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -722488,7 +722488,7 @@ pokemonanimfunc_89: ; 8184718
 	thumb_func_end pokemonanimfunc_89
 
 	thumb_func_start pokemonanimfunc_8A
-pokemonanimfunc_8A: ; 8184744
+pokemonanimfunc_8A: @ 8184744
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_817F670
@@ -722511,7 +722511,7 @@ pokemonanimfunc_8A: ; 8184744
 	thumb_func_end pokemonanimfunc_8A
 
 	thumb_func_start sub_8184770
-sub_8184770: ; 8184770
+sub_8184770: @ 8184770
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -722536,7 +722536,7 @@ _08184790:
 	thumb_func_end sub_8184770
 
 	thumb_func_start sub_8184798
-sub_8184798: ; 8184798
+sub_8184798: @ 8184798
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r1, =gUnknown_0860AE7C
@@ -722614,7 +722614,7 @@ _0818482E:
 	thumb_func_end sub_8184798
 
 	thumb_func_start pokemonanimfunc_8B
-pokemonanimfunc_8B: ; 8184834
+pokemonanimfunc_8B: @ 8184834
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -722646,7 +722646,7 @@ _08184860:
 	thumb_func_end pokemonanimfunc_8B
 
 	thumb_func_start pokemonanimfunc_8C
-pokemonanimfunc_8C: ; 818486C
+pokemonanimfunc_8C: @ 818486C
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -722678,7 +722678,7 @@ _08184898:
 	thumb_func_end pokemonanimfunc_8C
 
 	thumb_func_start pokemonanimfunc_8D
-pokemonanimfunc_8D: ; 81848A4
+pokemonanimfunc_8D: @ 81848A4
 	push {r4,lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x32]
@@ -722711,7 +722711,7 @@ _081848D2:
 	thumb_func_end pokemonanimfunc_8D
 
 	thumb_func_start sub_81848E0
-sub_81848E0: ; 81848E0
+sub_81848E0: @ 81848E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x32
@@ -722753,7 +722753,7 @@ _0818492A:
 	thumb_func_end sub_81848E0
 
 	thumb_func_start sub_8184934
-sub_8184934: ; 8184934
+sub_8184934: @ 8184934
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x34
@@ -722837,7 +722837,7 @@ _081849CC:
 	thumb_func_end sub_8184934
 
 	thumb_func_start pokemonanimfunc_8E
-pokemonanimfunc_8E: ; 81849D4
+pokemonanimfunc_8E: @ 81849D4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -722894,7 +722894,7 @@ _08184A30:
 	thumb_func_end pokemonanimfunc_8E
 
 	thumb_func_start pokemonanimfunc_8F
-pokemonanimfunc_8F: ; 8184A3C
+pokemonanimfunc_8F: @ 8184A3C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -722951,7 +722951,7 @@ _08184A98:
 	thumb_func_end pokemonanimfunc_8F
 
 	thumb_func_start pokemonanimfunc_90
-pokemonanimfunc_90: ; 8184AA4
+pokemonanimfunc_90: @ 8184AA4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723008,7 +723008,7 @@ _08184B00:
 	thumb_func_end pokemonanimfunc_90
 
 	thumb_func_start pokemonanimfunc_91
-pokemonanimfunc_91: ; 8184B0C
+pokemonanimfunc_91: @ 8184B0C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723066,7 +723066,7 @@ _08184B6A:
 	thumb_func_end pokemonanimfunc_91
 
 	thumb_func_start pokemonanimfunc_92
-pokemonanimfunc_92: ; 8184B78
+pokemonanimfunc_92: @ 8184B78
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723123,7 +723123,7 @@ _08184BD4:
 	thumb_func_end pokemonanimfunc_92
 
 	thumb_func_start pokemonanimfunc_93
-pokemonanimfunc_93: ; 8184BE0
+pokemonanimfunc_93: @ 8184BE0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723180,7 +723180,7 @@ _08184C3C:
 	thumb_func_end pokemonanimfunc_93
 
 	thumb_func_start pokemonanimfunc_94
-pokemonanimfunc_94: ; 8184C48
+pokemonanimfunc_94: @ 8184C48
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723237,7 +723237,7 @@ _08184CA4:
 	thumb_func_end pokemonanimfunc_94
 
 	thumb_func_start pokemonanimfunc_95
-pokemonanimfunc_95: ; 8184CB0
+pokemonanimfunc_95: @ 8184CB0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723295,7 +723295,7 @@ _08184D0E:
 	thumb_func_end pokemonanimfunc_95
 
 	thumb_func_start pokemonanimfunc_96
-pokemonanimfunc_96: ; 8184D1C
+pokemonanimfunc_96: @ 8184D1C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x32
@@ -723353,7 +723353,7 @@ _08184D7A:
 	thumb_func_end pokemonanimfunc_96
 
 	thumb_func_start sub_8184D88
-sub_8184D88: ; 8184D88
+sub_8184D88: @ 8184D88
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -723371,7 +723371,7 @@ _08184D9C:
 	thumb_func_end sub_8184D88
 
 	thumb_func_start sub_8184DA4
-sub_8184DA4: ; 8184DA4
+sub_8184DA4: @ 8184DA4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -723449,7 +723449,7 @@ _08184E1C:
 	thumb_func_end sub_8184DA4
 
 	thumb_func_start sub_8184E58
-sub_8184E58: ; 8184E58
+sub_8184E58: @ 8184E58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -723602,7 +723602,7 @@ _08184FA0:
 	thumb_func_end sub_8184E58
 
 	thumb_func_start sub_8184FBC
-sub_8184FBC: ; 8184FBC
+sub_8184FBC: @ 8184FBC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -723637,7 +723637,7 @@ _08184FF0:
 	thumb_func_end sub_8184FBC
 
 	thumb_func_start sub_8185008
-sub_8185008: ; 8185008
+sub_8185008: @ 8185008
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -723678,7 +723678,7 @@ _08185046:
 	thumb_func_end sub_8185008
 
 	thumb_func_start sub_8185054
-sub_8185054: ; 8185054
+sub_8185054: @ 8185054
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -723732,7 +723732,7 @@ _081850C6:
 	thumb_func_end sub_8185054
 
 	thumb_func_start sub_81850D0
-sub_81850D0: ; 81850D0
+sub_81850D0: @ 81850D0
 	ldr r0, =0x0203c7ac
 	ldrb r0, [r0]
 	bx lr
@@ -723740,7 +723740,7 @@ sub_81850D0: ; 81850D0
 	thumb_func_end sub_81850D0
 
 	thumb_func_start sub_81850DC
-sub_81850DC: ; 81850DC
+sub_81850DC: @ 81850DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -723845,7 +723845,7 @@ _0818517E:
 	thumb_func_end sub_81850DC
 
 	thumb_func_start sub_81851A8
-sub_81851A8: ; 81851A8
+sub_81851A8: @ 81851A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -723946,7 +723946,7 @@ _0818525E:
 	thumb_func_end sub_81851A8
 
 	thumb_func_start sub_8185278
-sub_8185278: ; 8185278
+sub_8185278: @ 8185278
 	ldrb r3, [r2]
 	subs r3, 0x1
 	strb r3, [r2]
@@ -723961,7 +723961,7 @@ sub_8185278: ; 8185278
 	thumb_func_end sub_8185278
 
 	thumb_func_start sub_8185290
-sub_8185290: ; 8185290
+sub_8185290: @ 8185290
 	push {r4,r5,lr}
 	movs r0, 0xF8
 	lsls r0, 4
@@ -723978,7 +723978,7 @@ sub_8185290: ; 8185290
 	thumb_func_end sub_8185290
 
 	thumb_func_start sub_81852B0
-sub_81852B0: ; 81852B0
+sub_81852B0: @ 81852B0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r1, =0x000004ec
@@ -724010,7 +724010,7 @@ _081852EA:
 	thumb_func_end sub_81852B0
 
 	thumb_func_start sub_81852F0
-sub_81852F0: ; 81852F0
+sub_81852F0: @ 81852F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -724047,7 +724047,7 @@ _08185332:
 	thumb_func_end sub_81852F0
 
 	thumb_func_start sub_8185338
-sub_8185338: ; 8185338
+sub_8185338: @ 8185338
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -724837,7 +724837,7 @@ _08185A14:
 	thumb_func_end sub_8185338
 
 	thumb_func_start sub_8185A54
-sub_8185A54: ; 8185A54
+sub_8185A54: @ 8185A54
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -724865,7 +724865,7 @@ _08185A80:
 	thumb_func_end sub_8185A54
 
 	thumb_func_start start_ov_to_battle_anim
-start_ov_to_battle_anim: ; 8185A88
+start_ov_to_battle_anim: @ 8185A88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x80
@@ -724885,7 +724885,7 @@ start_ov_to_battle_anim: ; 8185A88
 	thumb_func_end start_ov_to_battle_anim
 
 	thumb_func_start sub_8185AB0
-sub_8185AB0: ; 8185AB0
+sub_8185AB0: @ 8185AB0
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -724923,7 +724923,7 @@ sub_8185AB0: ; 8185AB0
 	thumb_func_end sub_8185AB0
 
 	thumb_func_start sub_8185B1C
-sub_8185B1C: ; 8185B1C
+sub_8185B1C: @ 8185B1C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -724953,7 +724953,7 @@ _08185B4A:
 	thumb_func_end sub_8185B1C
 
 	thumb_func_start sub_8185B60
-sub_8185B60: ; 8185B60
+sub_8185B60: @ 8185B60
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -725242,7 +725242,7 @@ _08185D6C:
 	thumb_func_end sub_8185B60
 
 	thumb_func_start sub_8185E24
-sub_8185E24: ; 8185E24
+sub_8185E24: @ 8185E24
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0xF8
@@ -725283,7 +725283,7 @@ _08185E6E:
 	thumb_func_end sub_8185E24
 
 	thumb_func_start sub_8185E8C
-sub_8185E8C: ; 8185E8C
+sub_8185E8C: @ 8185E8C
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -725293,7 +725293,7 @@ sub_8185E8C: ; 8185E8C
 	thumb_func_end sub_8185E8C
 
 	thumb_func_start sub_8185EA0
-sub_8185EA0: ; 8185EA0
+sub_8185EA0: @ 8185EA0
 	ldr r0, =0x0203c7ae
 	ldrb r0, [r0]
 	bx lr
@@ -725301,7 +725301,7 @@ sub_8185EA0: ; 8185EA0
 	thumb_func_end sub_8185EA0
 
 	thumb_func_start sub_8185EAC
-sub_8185EAC: ; 8185EAC
+sub_8185EAC: @ 8185EAC
 	ldr r0, =0x0203c7af
 	ldrb r0, [r0]
 	bx lr
@@ -725309,7 +725309,7 @@ sub_8185EAC: ; 8185EAC
 	thumb_func_end sub_8185EAC
 
 	thumb_func_start sub_8185EB8
-sub_8185EB8: ; 8185EB8
+sub_8185EB8: @ 8185EB8
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x0203c7c0
@@ -725339,7 +725339,7 @@ _08185EBE:
 	thumb_func_end sub_8185EB8
 
 	thumb_func_start sub_8185EFC
-sub_8185EFC: ; 8185EFC
+sub_8185EFC: @ 8185EFC
 	push {r4-r6,lr}
 	movs r5, 0
 	ldr r6, =0x020244ec
@@ -725369,7 +725369,7 @@ _08185F02:
 	thumb_func_end sub_8185EFC
 
 	thumb_func_start sub_8185F40
-sub_8185F40: ; 8185F40
+sub_8185F40: @ 8185F40
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r0, =0x020229e8
@@ -725408,7 +725408,7 @@ _08185F7E:
 	thumb_func_end sub_8185F40
 
 	thumb_func_start sub_8185F84
-sub_8185F84: ; 8185F84
+sub_8185F84: @ 8185F84
 	ldr r1, =0x0203c7b5
 	movs r0, 0
 	strb r0, [r1]
@@ -725417,7 +725417,7 @@ sub_8185F84: ; 8185F84
 	thumb_func_end sub_8185F84
 
 	thumb_func_start sub_8185F90
-sub_8185F90: ; 8185F90
+sub_8185F90: @ 8185F90
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r2, =0x0203c7b5
@@ -725434,7 +725434,7 @@ sub_8185F90: ; 8185F90
 	thumb_func_end sub_8185F90
 
 	thumb_func_start sub_8185FAC
-sub_8185FAC: ; 8185FAC
+sub_8185FAC: @ 8185FAC
 	ldr r0, =0x0203c7b5
 	ldrb r0, [r0]
 	bx lr
@@ -725442,7 +725442,7 @@ sub_8185FAC: ; 8185FAC
 	thumb_func_end sub_8185FAC
 
 	thumb_func_start sub_8185FB8
-sub_8185FB8: ; 8185FB8
+sub_8185FB8: @ 8185FB8
 	ldr r0, =0x0203c7b6
 	ldrb r0, [r0]
 	bx lr
@@ -725450,7 +725450,7 @@ sub_8185FB8: ; 8185FB8
 	thumb_func_end sub_8185FB8
 
 	thumb_func_start sub_8185FC4
-sub_8185FC4: ; 8185FC4
+sub_8185FC4: @ 8185FC4
 	ldr r0, =0x0203c7b7
 	ldrb r0, [r0]
 	bx lr
@@ -725458,7 +725458,7 @@ sub_8185FC4: ; 8185FC4
 	thumb_func_end sub_8185FC4
 
 	thumb_func_start sub_8185FD0
-sub_8185FD0: ; 8185FD0
+sub_8185FD0: @ 8185FD0
 	push {r4-r7,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -725505,7 +725505,7 @@ _0818601C:
 	thumb_func_end sub_8185FD0
 
 	thumb_func_start sub_818603C
-sub_818603C: ; 818603C
+sub_818603C: @ 818603C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -726004,7 +726004,7 @@ _081863FC:
 	thumb_func_end sub_818603C
 
 	thumb_func_start sub_8186438
-sub_8186438: ; 8186438
+sub_8186438: @ 8186438
 	ldr r0, =0x0203c7bc
 	ldr r0, [r0]
 	bx lr
@@ -726012,7 +726012,7 @@ sub_8186438: ; 8186438
 	thumb_func_end sub_8186438
 
 	thumb_func_start sub_8186444
-sub_8186444: ; 8186444
+sub_8186444: @ 8186444
 	ldr r1, =0x0203ccd0
 	movs r0, 0x1
 	strb r0, [r1]
@@ -726021,7 +726021,7 @@ sub_8186444: ; 8186444
 	thumb_func_end sub_8186444
 
 	thumb_func_start rfu_lacks_rfufunc
-rfu_lacks_rfufunc: ; 8186450
+rfu_lacks_rfufunc: @ 8186450
 	push {lr}
 	movs r1, 0
 	ldr r0, =0x0203ccd0
@@ -726037,7 +726037,7 @@ _0818645E:
 	thumb_func_end rfu_lacks_rfufunc
 
 	thumb_func_start sub_8186468
-sub_8186468: ; 8186468
+sub_8186468: @ 8186468
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -726063,7 +726063,7 @@ _08186472:
 	thumb_func_end sub_8186468
 
 	thumb_func_start sub_818649C
-sub_818649C: ; 818649C
+sub_818649C: @ 818649C
 	ldr r0, =0x0203ccd9
 	ldrb r0, [r0]
 	bx lr
@@ -726071,7 +726071,7 @@ sub_818649C: ; 818649C
 	thumb_func_end sub_818649C
 
 	thumb_func_start sub_81864A8
-sub_81864A8: ; 81864A8
+sub_81864A8: @ 81864A8
 	ldr r0, =0x0203ccda
 	ldrb r0, [r0]
 	bx lr
@@ -726079,7 +726079,7 @@ sub_81864A8: ; 81864A8
 	thumb_func_end sub_81864A8
 
 	thumb_func_start sub_81864B4
-sub_81864B4: ; 81864B4
+sub_81864B4: @ 81864B4
 	ldr r0, =0x03001278
 	ldrb r0, [r0]
 	bx lr
@@ -726087,7 +726087,7 @@ sub_81864B4: ; 81864B4
 	thumb_func_end sub_81864B4
 
 	thumb_func_start sub_81864C0
-sub_81864C0: ; 81864C0
+sub_81864C0: @ 81864C0
 	ldr r0, =0x03001279
 	ldrb r0, [r0]
 	bx lr
@@ -726095,7 +726095,7 @@ sub_81864C0: ; 81864C0
 	thumb_func_end sub_81864C0
 
 	thumb_func_start sub_81864CC
-sub_81864CC: ; 81864CC
+sub_81864CC: @ 81864CC
 	ldr r0, =0x0203cce8
 	ldr r1, =0x0202433a
 	ldrb r1, [r1]
@@ -726105,19 +726105,19 @@ sub_81864CC: ; 81864CC
 	thumb_func_end sub_81864CC
 
 	thumb_func_start sub_81864E0
-sub_81864E0: ; 81864E0
+sub_81864E0: @ 81864E0
 	ldr r0, =0x0203ccdc
 	bx lr
 	.pool
 	thumb_func_end sub_81864E0
 
 	thumb_func_start nullsub_70
-nullsub_70: ; 81864E8
+nullsub_70: @ 81864E8
 	bx lr
 	thumb_func_end nullsub_70
 
 	thumb_func_start sub_81864EC
-sub_81864EC: ; 81864EC
+sub_81864EC: @ 81864EC
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -726130,7 +726130,7 @@ sub_81864EC: ; 81864EC
 	thumb_func_end sub_81864EC
 
 	thumb_func_start sub_8186508
-sub_8186508: ; 8186508
+sub_8186508: @ 8186508
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -726165,7 +726165,7 @@ _08186554:
 	thumb_func_end sub_8186508
 
 	thumb_func_start sub_8186558
-sub_8186558: ; 8186558
+sub_8186558: @ 8186558
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -726190,7 +726190,7 @@ _0818657C:
 	thumb_func_end sub_8186558
 
 	thumb_func_start sub_8186590
-sub_8186590: ; 8186590
+sub_8186590: @ 8186590
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -726215,7 +726215,7 @@ _081865B4:
 	thumb_func_end sub_8186590
 
 	thumb_func_start sub_81865C8
-sub_81865C8: ; 81865C8
+sub_81865C8: @ 81865C8
 	push {r4-r6,lr}
 	ldr r5, =0x02020630
 	ldr r6, =0x020241e4
@@ -726261,7 +726261,7 @@ _0818661A:
 	thumb_func_end sub_81865C8
 
 	thumb_func_start sub_8186630
-sub_8186630: ; 8186630
+sub_8186630: @ 8186630
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -726297,7 +726297,7 @@ _08186668:
 	thumb_func_end sub_8186630
 
 	thumb_func_start sub_8186678
-sub_8186678: ; 8186678
+sub_8186678: @ 8186678
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -726523,7 +726523,7 @@ _0818683A:
 	thumb_func_end sub_8186678
 
 	thumb_func_start sub_818686C
-sub_818686C: ; 818686C
+sub_818686C: @ 818686C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -726964,7 +726964,7 @@ _08186C10:
 	thumb_func_end sub_818686C
 
 	thumb_func_start sub_8186C48
-sub_8186C48: ; 8186C48
+sub_8186C48: @ 8186C48
 	push {r4-r7,lr}
 	ldr r4, =0x02020630
 	ldr r0, =0x020241e4
@@ -727045,7 +727045,7 @@ _08186CFA:
 	thumb_func_end sub_8186C48
 
 	thumb_func_start sub_8186D04
-sub_8186D04: ; 8186D04
+sub_8186D04: @ 8186D04
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -727084,7 +727084,7 @@ _08186D50:
 	thumb_func_end sub_8186D04
 
 	thumb_func_start sub_8186D58
-sub_8186D58: ; 8186D58
+sub_8186D58: @ 8186D58
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x020241e4
@@ -727113,7 +727113,7 @@ _08186D86:
 	thumb_func_end sub_8186D58
 
 	thumb_func_start sub_8186D9C
-sub_8186D9C: ; 8186D9C
+sub_8186D9C: @ 8186D9C
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -727162,7 +727162,7 @@ _08186DF6:
 	thumb_func_end sub_8186D9C
 
 	thumb_func_start sub_8186E10
-sub_8186E10: ; 8186E10
+sub_8186E10: @ 8186E10
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -727176,7 +727176,7 @@ _08186E22:
 	thumb_func_end sub_8186E10
 
 	thumb_func_start bx_blink_t2
-bx_blink_t2: ; 8186E28
+bx_blink_t2: @ 8186E28
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -727236,7 +727236,7 @@ _08186E9E:
 	thumb_func_end bx_blink_t2
 
 	thumb_func_start sub_8186EA4
-sub_8186EA4: ; 8186EA4
+sub_8186EA4: @ 8186EA4
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -727283,7 +727283,7 @@ _08186EF0:
 	thumb_func_end sub_8186EA4
 
 	thumb_func_start sub_8186F14
-sub_8186F14: ; 8186F14
+sub_8186F14: @ 8186F14
 	push {r4,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -727335,7 +727335,7 @@ _08186F6E:
 	thumb_func_end sub_8186F14
 
 	thumb_func_start sub_8186F94
-sub_8186F94: ; 8186F94
+sub_8186F94: @ 8186F94
 	push {r4-r7,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -727431,7 +727431,7 @@ _08187050:
 	thumb_func_end sub_8186F94
 
 	thumb_func_start sub_8187084
-sub_8187084: ; 8187084
+sub_8187084: @ 8187084
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -727515,7 +727515,7 @@ _08187120:
 	thumb_func_end sub_8187084
 
 	thumb_func_start sub_818714C
-sub_818714C: ; 818714C
+sub_818714C: @ 818714C
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -727539,7 +727539,7 @@ _0818716E:
 	thumb_func_end sub_818714C
 
 	thumb_func_start sub_818717C
-sub_818717C: ; 818717C
+sub_818717C: @ 818717C
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -727563,7 +727563,7 @@ _0818719E:
 	thumb_func_end sub_818717C
 
 	thumb_func_start sub_81871AC
-sub_81871AC: ; 81871AC
+sub_81871AC: @ 81871AC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -727613,7 +727613,7 @@ _08187212:
 	thumb_func_end sub_81871AC
 
 	thumb_func_start sub_8187224
-sub_8187224: ; 8187224
+sub_8187224: @ 8187224
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -727668,7 +727668,7 @@ _0818727E:
 	thumb_func_end sub_8187224
 
 	thumb_func_start sub_8187298
-sub_8187298: ; 8187298
+sub_8187298: @ 8187298
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -728546,7 +728546,7 @@ _08187A2E:
 	thumb_func_end sub_8187298
 
 	thumb_func_start sub_8187A44
-sub_8187A44: ; 8187A44
+sub_8187A44: @ 8187A44
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -728554,7 +728554,7 @@ sub_8187A44: ; 8187A44
 	thumb_func_end sub_8187A44
 
 	thumb_func_start sub_8187A50
-sub_8187A50: ; 8187A50
+sub_8187A50: @ 8187A50
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -728597,7 +728597,7 @@ _08187A9E:
 	thumb_func_end sub_8187A50
 
 	thumb_func_start dp01_setattr_for_opponent_pokemon
-dp01_setattr_for_opponent_pokemon: ; 8187AA8
+dp01_setattr_for_opponent_pokemon: @ 8187AA8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -729582,7 +729582,7 @@ _081883B4:
 	thumb_func_end dp01_setattr_for_opponent_pokemon
 
 	thumb_func_start sub_81883C8
-sub_81883C8: ; 81883C8
+sub_81883C8: @ 81883C8
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -729637,7 +729637,7 @@ _08188420:
 	thumb_func_end sub_81883C8
 
 	thumb_func_start sub_818843C
-sub_818843C: ; 818843C
+sub_818843C: @ 818843C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -729778,7 +729778,7 @@ sub_818843C: ; 818843C
 	thumb_func_end sub_818843C
 
 	thumb_func_start sub_818858C
-sub_818858C: ; 818858C
+sub_818858C: @ 818858C
 	push {r4,lr}
 	ldr r1, =0x0202406e
 	ldr r4, =0x02024064
@@ -729810,7 +729810,7 @@ sub_818858C: ; 818858C
 	thumb_func_end sub_818858C
 
 	thumb_func_start sub_81885D8
-sub_81885D8: ; 81885D8
+sub_81885D8: @ 81885D8
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -729983,7 +729983,7 @@ sub_81885D8: ; 81885D8
 	thumb_func_end sub_81885D8
 
 	thumb_func_start sub_8188768
-sub_8188768: ; 8188768
+sub_8188768: @ 8188768
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -730044,7 +730044,7 @@ _081887EC:
 	thumb_func_end sub_8188768
 
 	thumb_func_start sub_8188800
-sub_8188800: ; 8188800
+sub_8188800: @ 8188800
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -730114,7 +730114,7 @@ _0818887E:
 	thumb_func_end sub_8188800
 
 	thumb_func_start sub_818888C
-sub_818888C: ; 818888C
+sub_818888C: @ 818888C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -730300,7 +730300,7 @@ _0818892C:
 	thumb_func_end sub_818888C
 
 	thumb_func_start sub_8188A40
-sub_8188A40: ; 8188A40
+sub_8188A40: @ 8188A40
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730308,7 +730308,7 @@ sub_8188A40: ; 8188A40
 	thumb_func_end sub_8188A40
 
 	thumb_func_start sub_8188A4C
-sub_8188A4C: ; 8188A4C
+sub_8188A4C: @ 8188A4C
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -730382,7 +730382,7 @@ sub_8188A4C: ; 8188A4C
 	thumb_func_end sub_8188A4C
 
 	thumb_func_start sub_8188AF8
-sub_8188AF8: ; 8188AF8
+sub_8188AF8: @ 8188AF8
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -730459,7 +730459,7 @@ _08188B88:
 	thumb_func_end sub_8188AF8
 
 	thumb_func_start sub_8188BA4
-sub_8188BA4: ; 8188BA4
+sub_8188BA4: @ 8188BA4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730467,7 +730467,7 @@ sub_8188BA4: ; 8188BA4
 	thumb_func_end sub_8188BA4
 
 	thumb_func_start sub_8188BB0
-sub_8188BB0: ; 8188BB0
+sub_8188BB0: @ 8188BB0
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730475,7 +730475,7 @@ sub_8188BB0: ; 8188BB0
 	thumb_func_end sub_8188BB0
 
 	thumb_func_start sub_8188BBC
-sub_8188BBC: ; 8188BBC
+sub_8188BBC: @ 8188BBC
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730483,7 +730483,7 @@ sub_8188BBC: ; 8188BBC
 	thumb_func_end sub_8188BBC
 
 	thumb_func_start sub_8188BC8
-sub_8188BC8: ; 8188BC8
+sub_8188BC8: @ 8188BC8
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730491,7 +730491,7 @@ sub_8188BC8: ; 8188BC8
 	thumb_func_end sub_8188BC8
 
 	thumb_func_start sub_8188BD4
-sub_8188BD4: ; 8188BD4
+sub_8188BD4: @ 8188BD4
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -730628,7 +730628,7 @@ _08188CFA:
 	thumb_func_end sub_8188BD4
 
 	thumb_func_start sub_8188D0C
-sub_8188D0C: ; 8188D0C
+sub_8188D0C: @ 8188D0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -730812,7 +730812,7 @@ _08188E80:
 	thumb_func_end sub_8188D0C
 
 	thumb_func_start sub_8188E90
-sub_8188E90: ; 8188E90
+sub_8188E90: @ 8188E90
 	push {r4,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -730842,7 +730842,7 @@ sub_8188E90: ; 8188E90
 	thumb_func_end sub_8188E90
 
 	thumb_func_start sub_8188EE4
-sub_8188EE4: ; 8188EE4
+sub_8188EE4: @ 8188EE4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730850,7 +730850,7 @@ sub_8188EE4: ; 8188EE4
 	thumb_func_end sub_8188EE4
 
 	thumb_func_start sub_8188EF0
-sub_8188EF0: ; 8188EF0
+sub_8188EF0: @ 8188EF0
 	push {lr}
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -730868,7 +730868,7 @@ sub_8188EF0: ; 8188EF0
 	thumb_func_end sub_8188EF0
 
 	thumb_func_start sub_8188F14
-sub_8188F14: ; 8188F14
+sub_8188F14: @ 8188F14
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730876,7 +730876,7 @@ sub_8188F14: ; 8188F14
 	thumb_func_end sub_8188F14
 
 	thumb_func_start sub_8188F20
-sub_8188F20: ; 8188F20
+sub_8188F20: @ 8188F20
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -730919,7 +730919,7 @@ _08188F6C:
 	thumb_func_end sub_8188F20
 
 	thumb_func_start sub_8188F7C
-sub_8188F7C: ; 8188F7C
+sub_8188F7C: @ 8188F7C
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730927,7 +730927,7 @@ sub_8188F7C: ; 8188F7C
 	thumb_func_end sub_8188F7C
 
 	thumb_func_start sub_8188F88
-sub_8188F88: ; 8188F88
+sub_8188F88: @ 8188F88
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -730954,7 +730954,7 @@ sub_8188F88: ; 8188F88
 	thumb_func_end sub_8188F88
 
 	thumb_func_start sub_8188FC4
-sub_8188FC4: ; 8188FC4
+sub_8188FC4: @ 8188FC4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -730962,7 +730962,7 @@ sub_8188FC4: ; 8188FC4
 	thumb_func_end sub_8188FC4
 
 	thumb_func_start sub_8188FD0
-sub_8188FD0: ; 8188FD0
+sub_8188FD0: @ 8188FD0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -731058,7 +731058,7 @@ _0818908A:
 	thumb_func_end sub_8188FD0
 
 	thumb_func_start sub_81890C0
-sub_81890C0: ; 81890C0
+sub_81890C0: @ 81890C0
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731066,7 +731066,7 @@ sub_81890C0: ; 81890C0
 	thumb_func_end sub_81890C0
 
 	thumb_func_start sub_81890CC
-sub_81890CC: ; 81890CC
+sub_81890CC: @ 81890CC
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -731115,7 +731115,7 @@ _08189120:
 	thumb_func_end sub_81890CC
 
 	thumb_func_start sub_8189144
-sub_8189144: ; 8189144
+sub_8189144: @ 8189144
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -731162,7 +731162,7 @@ _08189194:
 	thumb_func_end sub_8189144
 
 	thumb_func_start sub_81891AC
-sub_81891AC: ; 81891AC
+sub_81891AC: @ 81891AC
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731170,7 +731170,7 @@ sub_81891AC: ; 81891AC
 	thumb_func_end sub_81891AC
 
 	thumb_func_start sub_81891B8
-sub_81891B8: ; 81891B8
+sub_81891B8: @ 81891B8
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731178,7 +731178,7 @@ sub_81891B8: ; 81891B8
 	thumb_func_end sub_81891B8
 
 	thumb_func_start sub_81891C4
-sub_81891C4: ; 81891C4
+sub_81891C4: @ 81891C4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731186,7 +731186,7 @@ sub_81891C4: ; 81891C4
 	thumb_func_end sub_81891C4
 
 	thumb_func_start sub_81891D0
-sub_81891D0: ; 81891D0
+sub_81891D0: @ 81891D0
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731194,7 +731194,7 @@ sub_81891D0: ; 81891D0
 	thumb_func_end sub_81891D0
 
 	thumb_func_start sub_81891DC
-sub_81891DC: ; 81891DC
+sub_81891DC: @ 81891DC
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731202,7 +731202,7 @@ sub_81891DC: ; 81891DC
 	thumb_func_end sub_81891DC
 
 	thumb_func_start sub_81891E8
-sub_81891E8: ; 81891E8
+sub_81891E8: @ 81891E8
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731210,7 +731210,7 @@ sub_81891E8: ; 81891E8
 	thumb_func_end sub_81891E8
 
 	thumb_func_start sub_81891F4
-sub_81891F4: ; 81891F4
+sub_81891F4: @ 81891F4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731218,7 +731218,7 @@ sub_81891F4: ; 81891F4
 	thumb_func_end sub_81891F4
 
 	thumb_func_start sub_8189200
-sub_8189200: ; 8189200
+sub_8189200: @ 8189200
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731226,7 +731226,7 @@ sub_8189200: ; 8189200
 	thumb_func_end sub_8189200
 
 	thumb_func_start sub_818920C
-sub_818920C: ; 818920C
+sub_818920C: @ 818920C
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731234,7 +731234,7 @@ sub_818920C: ; 818920C
 	thumb_func_end sub_818920C
 
 	thumb_func_start sub_8189218
-sub_8189218: ; 8189218
+sub_8189218: @ 8189218
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -731249,7 +731249,7 @@ sub_8189218: ; 8189218
 	thumb_func_end sub_8189218
 
 	thumb_func_start sub_8189234
-sub_8189234: ; 8189234
+sub_8189234: @ 8189234
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -731274,7 +731274,7 @@ sub_8189234: ; 8189234
 	thumb_func_end sub_8189234
 
 	thumb_func_start sub_818926C
-sub_818926C: ; 818926C
+sub_818926C: @ 818926C
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -731288,7 +731288,7 @@ sub_818926C: ; 818926C
 	thumb_func_end sub_818926C
 
 	thumb_func_start sub_8189284
-sub_8189284: ; 8189284
+sub_8189284: @ 8189284
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -731309,7 +731309,7 @@ sub_8189284: ; 8189284
 	thumb_func_end sub_8189284
 
 	thumb_func_start sub_81892AC
-sub_81892AC: ; 81892AC
+sub_81892AC: @ 81892AC
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -731358,7 +731358,7 @@ _0818930A:
 	thumb_func_end sub_81892AC
 
 	thumb_func_start sub_818931C
-sub_818931C: ; 818931C
+sub_818931C: @ 818931C
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731366,7 +731366,7 @@ sub_818931C: ; 818931C
 	thumb_func_end sub_818931C
 
 	thumb_func_start sub_8189328
-sub_8189328: ; 8189328
+sub_8189328: @ 8189328
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -731399,7 +731399,7 @@ _0818933C:
 	thumb_func_end sub_8189328
 
 	thumb_func_start sub_818936C
-sub_818936C: ; 818936C
+sub_818936C: @ 818936C
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -731442,7 +731442,7 @@ _081893BC:
 	thumb_func_end sub_818936C
 
 	thumb_func_start sub_81893C8
-sub_81893C8: ; 81893C8
+sub_81893C8: @ 81893C8
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -731468,7 +731468,7 @@ sub_81893C8: ; 81893C8
 	thumb_func_end sub_81893C8
 
 	thumb_func_start sub_8189404
-sub_8189404: ; 8189404
+sub_8189404: @ 8189404
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -731490,7 +731490,7 @@ sub_8189404: ; 8189404
 	thumb_func_end sub_8189404
 
 	thumb_func_start sub_8189438
-sub_8189438: ; 8189438
+sub_8189438: @ 8189438
 	push {r4-r6,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -731605,7 +731605,7 @@ _081894FA:
 	thumb_func_end sub_8189438
 
 	thumb_func_start c3_0803D564
-c3_0803D564: ; 8189548
+c3_0803D564: @ 8189548
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -731703,7 +731703,7 @@ _081895F4:
 	thumb_func_end c3_0803D564
 
 	thumb_func_start sub_818962C
-sub_818962C: ; 818962C
+sub_818962C: @ 818962C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x6]
@@ -731718,7 +731718,7 @@ sub_818962C: ; 818962C
 	thumb_func_end sub_818962C
 
 	thumb_func_start sub_8189648
-sub_8189648: ; 8189648
+sub_8189648: @ 8189648
 	push {r4-r7,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -731843,7 +731843,7 @@ _08189742:
 	thumb_func_end sub_8189648
 
 	thumb_func_start sub_818975C
-sub_818975C: ; 818975C
+sub_818975C: @ 818975C
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -731879,7 +731879,7 @@ _08189794:
 	thumb_func_end sub_818975C
 
 	thumb_func_start sub_81897A4
-sub_81897A4: ; 81897A4
+sub_81897A4: @ 81897A4
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -731913,7 +731913,7 @@ _081897D6:
 	thumb_func_end sub_81897A4
 
 	thumb_func_start sub_81897F4
-sub_81897F4: ; 81897F4
+sub_81897F4: @ 81897F4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -731921,7 +731921,7 @@ sub_81897F4: ; 81897F4
 	thumb_func_end sub_81897F4
 
 	thumb_func_start sub_8189800
-sub_8189800: ; 8189800
+sub_8189800: @ 8189800
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -731964,7 +731964,7 @@ _08189846:
 	thumb_func_end sub_8189800
 
 	thumb_func_start sub_8189860
-sub_8189860: ; 8189860
+sub_8189860: @ 8189860
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02024064
@@ -732013,7 +732013,7 @@ _081898B8:
 	thumb_func_end sub_8189860
 
 	thumb_func_start sub_81898C8
-sub_81898C8: ; 81898C8
+sub_81898C8: @ 81898C8
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -732021,7 +732021,7 @@ sub_81898C8: ; 81898C8
 	thumb_func_end sub_81898C8
 
 	thumb_func_start sub_81898D4
-sub_81898D4: ; 81898D4
+sub_81898D4: @ 81898D4
 	push {lr}
 	bl sub_81871AC
 	pop {r0}
@@ -732029,7 +732029,7 @@ sub_81898D4: ; 81898D4
 	thumb_func_end sub_81898D4
 
 	thumb_func_start sub_81898E0
-sub_81898E0: ; 81898E0
+sub_81898E0: @ 81898E0
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -732068,17 +732068,17 @@ _08189910:
 	thumb_func_end sub_81898E0
 
 	thumb_func_start nullsub_119
-nullsub_119: ; 8189944
+nullsub_119: @ 8189944
 	bx lr
 	thumb_func_end nullsub_119
 
 	thumb_func_start nullsub_120
-nullsub_120: ; 8189948
+nullsub_120: @ 8189948
 	bx lr
 	thumb_func_end nullsub_120
 
 	thumb_func_start sub_818994C
-sub_818994C: ; 818994C
+sub_818994C: @ 818994C
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -732091,7 +732091,7 @@ sub_818994C: ; 818994C
 	thumb_func_end sub_818994C
 
 	thumb_func_start sub_8189968
-sub_8189968: ; 8189968
+sub_8189968: @ 8189968
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -732126,7 +732126,7 @@ _081899B4:
 	thumb_func_end sub_8189968
 
 	thumb_func_start sub_81899B8
-sub_81899B8: ; 81899B8
+sub_81899B8: @ 81899B8
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -732151,7 +732151,7 @@ _081899DC:
 	thumb_func_end sub_81899B8
 
 	thumb_func_start sub_81899F0
-sub_81899F0: ; 81899F0
+sub_81899F0: @ 81899F0
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -732196,7 +732196,7 @@ _08189A40:
 	thumb_func_end sub_81899F0
 
 	thumb_func_start sub_8189A58
-sub_8189A58: ; 8189A58
+sub_8189A58: @ 8189A58
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -732232,7 +732232,7 @@ _08189A90:
 	thumb_func_end sub_8189A58
 
 	thumb_func_start sub_8189AA0
-sub_8189AA0: ; 8189AA0
+sub_8189AA0: @ 8189AA0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -732530,7 +732530,7 @@ _08189D18:
 	thumb_func_end sub_8189AA0
 
 	thumb_func_start sub_8189D40
-sub_8189D40: ; 8189D40
+sub_8189D40: @ 8189D40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -732894,7 +732894,7 @@ _0818A02A:
 	thumb_func_end sub_8189D40
 
 	thumb_func_start sub_818A064
-sub_818A064: ; 818A064
+sub_818A064: @ 818A064
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -732924,7 +732924,7 @@ _0818A092:
 	thumb_func_end sub_818A064
 
 	thumb_func_start sub_818A0A4
-sub_818A0A4: ; 818A0A4
+sub_818A0A4: @ 818A0A4
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -732974,7 +732974,7 @@ _0818A106:
 	thumb_func_end sub_818A0A4
 
 	thumb_func_start sub_818A114
-sub_818A114: ; 818A114
+sub_818A114: @ 818A114
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -733039,7 +733039,7 @@ _0818A190:
 	thumb_func_end sub_818A114
 
 	thumb_func_start sub_818A1B0
-sub_818A1B0: ; 818A1B0
+sub_818A1B0: @ 818A1B0
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -733086,7 +733086,7 @@ _0818A204:
 	thumb_func_end sub_818A1B0
 
 	thumb_func_start sub_818A220
-sub_818A220: ; 818A220
+sub_818A220: @ 818A220
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -733100,7 +733100,7 @@ _0818A232:
 	thumb_func_end sub_818A220
 
 	thumb_func_start sub_818A238
-sub_818A238: ; 818A238
+sub_818A238: @ 818A238
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -733160,7 +733160,7 @@ _0818A2AE:
 	thumb_func_end sub_818A238
 
 	thumb_func_start sub_818A2B4
-sub_818A2B4: ; 818A2B4
+sub_818A2B4: @ 818A2B4
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -733209,7 +733209,7 @@ _0818A306:
 	thumb_func_end sub_818A2B4
 
 	thumb_func_start sub_818A328
-sub_818A328: ; 818A328
+sub_818A328: @ 818A328
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -733246,7 +733246,7 @@ _0818A364:
 	thumb_func_end sub_818A328
 
 	thumb_func_start sub_818A37C
-sub_818A37C: ; 818A37C
+sub_818A37C: @ 818A37C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -733343,7 +733343,7 @@ _0818A438:
 	thumb_func_end sub_818A37C
 
 	thumb_func_start sub_818A470
-sub_818A470: ; 818A470
+sub_818A470: @ 818A470
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -733411,7 +733411,7 @@ _0818A4E8:
 	thumb_func_end sub_818A470
 
 	thumb_func_start sub_818A514
-sub_818A514: ; 818A514
+sub_818A514: @ 818A514
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -733461,7 +733461,7 @@ _0818A57A:
 	thumb_func_end sub_818A514
 
 	thumb_func_start sub_818A58C
-sub_818A58C: ; 818A58C
+sub_818A58C: @ 818A58C
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -733485,7 +733485,7 @@ _0818A5AE:
 	thumb_func_end sub_818A58C
 
 	thumb_func_start sub_818A5BC
-sub_818A5BC: ; 818A5BC
+sub_818A5BC: @ 818A5BC
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -733509,7 +733509,7 @@ _0818A5DE:
 	thumb_func_end sub_818A5BC
 
 	thumb_func_start sub_818A5EC
-sub_818A5EC: ; 818A5EC
+sub_818A5EC: @ 818A5EC
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -733564,7 +733564,7 @@ _0818A646:
 	thumb_func_end sub_818A5EC
 
 	thumb_func_start sub_818A660
-sub_818A660: ; 818A660
+sub_818A660: @ 818A660
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -734442,7 +734442,7 @@ _0818ADF6:
 	thumb_func_end sub_818A660
 
 	thumb_func_start sub_818AE0C
-sub_818AE0C: ; 818AE0C
+sub_818AE0C: @ 818AE0C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -734450,7 +734450,7 @@ sub_818AE0C: ; 818AE0C
 	thumb_func_end sub_818AE0C
 
 	thumb_func_start sub_818AE18
-sub_818AE18: ; 818AE18
+sub_818AE18: @ 818AE18
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -734493,7 +734493,7 @@ _0818AE66:
 	thumb_func_end sub_818AE18
 
 	thumb_func_start sub_818AE70
-sub_818AE70: ; 818AE70
+sub_818AE70: @ 818AE70
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -735526,7 +735526,7 @@ _0818B836:
 	thumb_func_end sub_818AE70
 
 	thumb_func_start sub_818B86C
-sub_818B86C: ; 818B86C
+sub_818B86C: @ 818B86C
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -735581,7 +735581,7 @@ _0818B8C4:
 	thumb_func_end sub_818B86C
 
 	thumb_func_start sub_818B8E0
-sub_818B8E0: ; 818B8E0
+sub_818B8E0: @ 818B8E0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -735698,7 +735698,7 @@ sub_818B8E0: ; 818B8E0
 	thumb_func_end sub_818B8E0
 
 	thumb_func_start sub_818B9FC
-sub_818B9FC: ; 818B9FC
+sub_818B9FC: @ 818B9FC
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -735744,7 +735744,7 @@ sub_818B9FC: ; 818B9FC
 	thumb_func_end sub_818B9FC
 
 	thumb_func_start sub_818BA6C
-sub_818BA6C: ; 818BA6C
+sub_818BA6C: @ 818BA6C
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -735907,7 +735907,7 @@ sub_818BA6C: ; 818BA6C
 	thumb_func_end sub_818BA6C
 
 	thumb_func_start sub_818BBE8
-sub_818BBE8: ; 818BBE8
+sub_818BBE8: @ 818BBE8
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -735966,7 +735966,7 @@ _0818BC66:
 	thumb_func_end sub_818BBE8
 
 	thumb_func_start sub_818BC78
-sub_818BC78: ; 818BC78
+sub_818BC78: @ 818BC78
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -736036,7 +736036,7 @@ _0818BCF6:
 	thumb_func_end sub_818BC78
 
 	thumb_func_start sub_818BD04
-sub_818BD04: ; 818BD04
+sub_818BD04: @ 818BD04
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -736333,7 +736333,7 @@ _0818BF72:
 	thumb_func_end sub_818BD04
 
 	thumb_func_start sub_818BFAC
-sub_818BFAC: ; 818BFAC
+sub_818BFAC: @ 818BFAC
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736341,7 +736341,7 @@ sub_818BFAC: ; 818BFAC
 	thumb_func_end sub_818BFAC
 
 	thumb_func_start sub_818BFB8
-sub_818BFB8: ; 818BFB8
+sub_818BFB8: @ 818BFB8
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -736414,7 +736414,7 @@ sub_818BFB8: ; 818BFB8
 	thumb_func_end sub_818BFB8
 
 	thumb_func_start sub_818C064
-sub_818C064: ; 818C064
+sub_818C064: @ 818C064
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -736519,7 +736519,7 @@ _0818C12E:
 	thumb_func_end sub_818C064
 
 	thumb_func_start sub_818C150
-sub_818C150: ; 818C150
+sub_818C150: @ 818C150
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736527,7 +736527,7 @@ sub_818C150: ; 818C150
 	thumb_func_end sub_818C150
 
 	thumb_func_start sub_818C15C
-sub_818C15C: ; 818C15C
+sub_818C15C: @ 818C15C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736535,7 +736535,7 @@ sub_818C15C: ; 818C15C
 	thumb_func_end sub_818C15C
 
 	thumb_func_start sub_818C168
-sub_818C168: ; 818C168
+sub_818C168: @ 818C168
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736543,7 +736543,7 @@ sub_818C168: ; 818C168
 	thumb_func_end sub_818C168
 
 	thumb_func_start sub_818C174
-sub_818C174: ; 818C174
+sub_818C174: @ 818C174
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736551,7 +736551,7 @@ sub_818C174: ; 818C174
 	thumb_func_end sub_818C174
 
 	thumb_func_start sub_818C180
-sub_818C180: ; 818C180
+sub_818C180: @ 818C180
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -736688,7 +736688,7 @@ _0818C2A6:
 	thumb_func_end sub_818C180
 
 	thumb_func_start bx_move_anim_2
-bx_move_anim_2: ; 818C2B8
+bx_move_anim_2: @ 818C2B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -736872,7 +736872,7 @@ _0818C42C:
 	thumb_func_end bx_move_anim_2
 
 	thumb_func_start sub_818C43C
-sub_818C43C: ; 818C43C
+sub_818C43C: @ 818C43C
 	push {r4,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -736902,7 +736902,7 @@ sub_818C43C: ; 818C43C
 	thumb_func_end sub_818C43C
 
 	thumb_func_start sub_818C490
-sub_818C490: ; 818C490
+sub_818C490: @ 818C490
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736910,7 +736910,7 @@ sub_818C490: ; 818C490
 	thumb_func_end sub_818C490
 
 	thumb_func_start sub_818C49C
-sub_818C49C: ; 818C49C
+sub_818C49C: @ 818C49C
 	push {lr}
 	ldr r1, =0x02024332
 	ldr r0, =0x0202406c
@@ -736936,7 +736936,7 @@ _0818C4C6:
 	thumb_func_end sub_818C49C
 
 	thumb_func_start sub_818C4D8
-sub_818C4D8: ; 818C4D8
+sub_818C4D8: @ 818C4D8
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -736972,7 +736972,7 @@ _0818C522:
 	thumb_func_end sub_818C4D8
 
 	thumb_func_start sub_818C52C
-sub_818C52C: ; 818C52C
+sub_818C52C: @ 818C52C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -736980,7 +736980,7 @@ sub_818C52C: ; 818C52C
 	thumb_func_end sub_818C52C
 
 	thumb_func_start sub_818C538
-sub_818C538: ; 818C538
+sub_818C538: @ 818C538
 	push {r4,r5,lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -737023,7 +737023,7 @@ _0818C584:
 	thumb_func_end sub_818C538
 
 	thumb_func_start sub_818C594
-sub_818C594: ; 818C594
+sub_818C594: @ 818C594
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737031,7 +737031,7 @@ sub_818C594: ; 818C594
 	thumb_func_end sub_818C594
 
 	thumb_func_start sub_818C5A0
-sub_818C5A0: ; 818C5A0
+sub_818C5A0: @ 818C5A0
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -737058,7 +737058,7 @@ sub_818C5A0: ; 818C5A0
 	thumb_func_end sub_818C5A0
 
 	thumb_func_start sub_818C5DC
-sub_818C5DC: ; 818C5DC
+sub_818C5DC: @ 818C5DC
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737066,7 +737066,7 @@ sub_818C5DC: ; 818C5DC
 	thumb_func_end sub_818C5DC
 
 	thumb_func_start sub_818C5E8
-sub_818C5E8: ; 818C5E8
+sub_818C5E8: @ 818C5E8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -737169,7 +737169,7 @@ _0818C6B2:
 	thumb_func_end sub_818C5E8
 
 	thumb_func_start sub_818C6E8
-sub_818C6E8: ; 818C6E8
+sub_818C6E8: @ 818C6E8
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737177,7 +737177,7 @@ sub_818C6E8: ; 818C6E8
 	thumb_func_end sub_818C6E8
 
 	thumb_func_start sub_818C6F4
-sub_818C6F4: ; 818C6F4
+sub_818C6F4: @ 818C6F4
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -737226,7 +737226,7 @@ _0818C748:
 	thumb_func_end sub_818C6F4
 
 	thumb_func_start sub_818C76C
-sub_818C76C: ; 818C76C
+sub_818C76C: @ 818C76C
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -737273,7 +737273,7 @@ _0818C7BC:
 	thumb_func_end sub_818C76C
 
 	thumb_func_start sub_818C7D4
-sub_818C7D4: ; 818C7D4
+sub_818C7D4: @ 818C7D4
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737281,7 +737281,7 @@ sub_818C7D4: ; 818C7D4
 	thumb_func_end sub_818C7D4
 
 	thumb_func_start sub_818C7E0
-sub_818C7E0: ; 818C7E0
+sub_818C7E0: @ 818C7E0
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737289,7 +737289,7 @@ sub_818C7E0: ; 818C7E0
 	thumb_func_end sub_818C7E0
 
 	thumb_func_start sub_818C7EC
-sub_818C7EC: ; 818C7EC
+sub_818C7EC: @ 818C7EC
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737297,7 +737297,7 @@ sub_818C7EC: ; 818C7EC
 	thumb_func_end sub_818C7EC
 
 	thumb_func_start sub_818C7F8
-sub_818C7F8: ; 818C7F8
+sub_818C7F8: @ 818C7F8
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737305,7 +737305,7 @@ sub_818C7F8: ; 818C7F8
 	thumb_func_end sub_818C7F8
 
 	thumb_func_start sub_818C804
-sub_818C804: ; 818C804
+sub_818C804: @ 818C804
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737313,7 +737313,7 @@ sub_818C804: ; 818C804
 	thumb_func_end sub_818C804
 
 	thumb_func_start sub_818C810
-sub_818C810: ; 818C810
+sub_818C810: @ 818C810
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737321,7 +737321,7 @@ sub_818C810: ; 818C810
 	thumb_func_end sub_818C810
 
 	thumb_func_start sub_818C81C
-sub_818C81C: ; 818C81C
+sub_818C81C: @ 818C81C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737329,7 +737329,7 @@ sub_818C81C: ; 818C81C
 	thumb_func_end sub_818C81C
 
 	thumb_func_start sub_818C828
-sub_818C828: ; 818C828
+sub_818C828: @ 818C828
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737337,7 +737337,7 @@ sub_818C828: ; 818C828
 	thumb_func_end sub_818C828
 
 	thumb_func_start sub_818C834
-sub_818C834: ; 818C834
+sub_818C834: @ 818C834
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737345,7 +737345,7 @@ sub_818C834: ; 818C834
 	thumb_func_end sub_818C834
 
 	thumb_func_start sub_818C840
-sub_818C840: ; 818C840
+sub_818C840: @ 818C840
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -737360,7 +737360,7 @@ sub_818C840: ; 818C840
 	thumb_func_end sub_818C840
 
 	thumb_func_start sub_818C85C
-sub_818C85C: ; 818C85C
+sub_818C85C: @ 818C85C
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -737385,7 +737385,7 @@ sub_818C85C: ; 818C85C
 	thumb_func_end sub_818C85C
 
 	thumb_func_start sub_818C894
-sub_818C894: ; 818C894
+sub_818C894: @ 818C894
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -737399,7 +737399,7 @@ sub_818C894: ; 818C894
 	thumb_func_end sub_818C894
 
 	thumb_func_start sub_818C8AC
-sub_818C8AC: ; 818C8AC
+sub_818C8AC: @ 818C8AC
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -737420,7 +737420,7 @@ sub_818C8AC: ; 818C8AC
 	thumb_func_end sub_818C8AC
 
 	thumb_func_start sub_818C8D4
-sub_818C8D4: ; 818C8D4
+sub_818C8D4: @ 818C8D4
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -737469,7 +737469,7 @@ _0818C932:
 	thumb_func_end sub_818C8D4
 
 	thumb_func_start sub_818C944
-sub_818C944: ; 818C944
+sub_818C944: @ 818C944
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -737477,7 +737477,7 @@ sub_818C944: ; 818C944
 	thumb_func_end sub_818C944
 
 	thumb_func_start sub_818C950
-sub_818C950: ; 818C950
+sub_818C950: @ 818C950
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -737510,7 +737510,7 @@ _0818C964:
 	thumb_func_end sub_818C950
 
 	thumb_func_start sub_818C994
-sub_818C994: ; 818C994
+sub_818C994: @ 818C994
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -737553,7 +737553,7 @@ _0818C9E4:
 	thumb_func_end sub_818C994
 
 	thumb_func_start sub_818C9F0
-sub_818C9F0: ; 818C9F0
+sub_818C9F0: @ 818C9F0
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -737580,7 +737580,7 @@ sub_818C9F0: ; 818C9F0
 	thumb_func_end sub_818C9F0
 
 	thumb_func_start dp01t_2E_2_battle_intro
-dp01t_2E_2_battle_intro: ; 818CA30
+dp01t_2E_2_battle_intro: @ 818CA30
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -737602,7 +737602,7 @@ dp01t_2E_2_battle_intro: ; 818CA30
 	thumb_func_end dp01t_2E_2_battle_intro
 
 	thumb_func_start sub_818CA64
-sub_818CA64: ; 818CA64
+sub_818CA64: @ 818CA64
 	push {r4-r6,lr}
 	ldr r5, =0x020241e4
 	ldr r6, =0x02024064
@@ -737784,7 +737784,7 @@ _0818CBD4:
 	thumb_func_end sub_818CA64
 
 	thumb_func_start sub_818CC24
-sub_818CC24: ; 818CC24
+sub_818CC24: @ 818CC24
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -737901,7 +737901,7 @@ _0818CD0C:
 	thumb_func_end sub_818CC24
 
 	thumb_func_start sub_818CD30
-sub_818CD30: ; 818CD30
+sub_818CD30: @ 818CD30
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -737987,7 +737987,7 @@ _0818CDD4:
 	thumb_func_end sub_818CD30
 
 	thumb_func_start bx_increment_dp11b_field_5_till_x60_then_resume
-bx_increment_dp11b_field_5_till_x60_then_resume: ; 818CDF4
+bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -738023,7 +738023,7 @@ _0818CE2C:
 	thumb_func_end bx_increment_dp11b_field_5_till_x60_then_resume
 
 	thumb_func_start sub_818CE3C
-sub_818CE3C: ; 818CE3C
+sub_818CE3C: @ 818CE3C
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -738057,7 +738057,7 @@ _0818CE6E:
 	thumb_func_end sub_818CE3C
 
 	thumb_func_start sub_818CE8C
-sub_818CE8C: ; 818CE8C
+sub_818CE8C: @ 818CE8C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -738065,7 +738065,7 @@ sub_818CE8C: ; 818CE8C
 	thumb_func_end sub_818CE8C
 
 	thumb_func_start sub_818CE98
-sub_818CE98: ; 818CE98
+sub_818CE98: @ 818CE98
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -738108,7 +738108,7 @@ _0818CEDE:
 	thumb_func_end sub_818CE98
 
 	thumb_func_start sub_818CEF8
-sub_818CEF8: ; 818CEF8
+sub_818CEF8: @ 818CEF8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02024064
@@ -738157,7 +738157,7 @@ _0818CF50:
 	thumb_func_end sub_818CEF8
 
 	thumb_func_start sub_818CF60
-sub_818CF60: ; 818CF60
+sub_818CF60: @ 818CF60
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -738165,7 +738165,7 @@ sub_818CF60: ; 818CF60
 	thumb_func_end sub_818CF60
 
 	thumb_func_start sub_818CF6C
-sub_818CF6C: ; 818CF6C
+sub_818CF6C: @ 818CF6C
 	push {lr}
 	bl sub_818A514
 	pop {r0}
@@ -738173,7 +738173,7 @@ sub_818CF6C: ; 818CF6C
 	thumb_func_end sub_818CF6C
 
 	thumb_func_start sub_818CF78
-sub_818CF78: ; 818CF78
+sub_818CF78: @ 818CF78
 	push {r4,lr}
 	ldr r2, =0x0202433a
 	ldr r1, =0x02023064
@@ -738202,17 +738202,17 @@ sub_818CF78: ; 818CF78
 	thumb_func_end sub_818CF78
 
 	thumb_func_start nullsub_121
-nullsub_121: ; 818CFC4
+nullsub_121: @ 818CFC4
 	bx lr
 	thumb_func_end nullsub_121
 
 	thumb_func_start nullsub_122
-nullsub_122: ; 818CFC8
+nullsub_122: @ 818CFC8
 	bx lr
 	thumb_func_end nullsub_122
 
 	thumb_func_start dp13_810BB8C
-dp13_810BB8C: ; 818CFCC
+dp13_810BB8C: @ 818CFCC
 	push {r4-r7,lr}
 	ldr r4, =gUnknown_0860B058
 	ldr r3, =0x0203cd04
@@ -738234,8 +738234,8 @@ _0818CFD4:
 	thumb_func_end dp13_810BB8C
 
 	thumb_func_start load_pokemon_image_TODO
-; int load_pokemon_image_TODO(int species_num, unsigned int a2, u8 a3, void *a4, int a5, u8 a6)
-load_pokemon_image_TODO: ; 818CFF4
+@ int load_pokemon_image_TODO(int species_num, unsigned int a2, u8 a3, void *a4, int a5, u8 a6)
+load_pokemon_image_TODO: @ 818CFF4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r1, 0
@@ -738320,7 +738320,7 @@ _0818D08E:
 	thumb_func_end load_pokemon_image_TODO
 
 	thumb_func_start sub_818D09C
-sub_818D09C: ; 818D09C
+sub_818D09C: @ 818D09C
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r4, [sp, 0x10]
@@ -738343,7 +738343,7 @@ sub_818D09C: ; 818D09C
 	thumb_func_end sub_818D09C
 
 	thumb_func_start sub_818D0C4
-sub_818D0C4: ; 818D0C4
+sub_818D0C4: @ 818D0C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -738429,7 +738429,7 @@ _0818D16E:
 	thumb_func_end sub_818D0C4
 
 	thumb_func_start sub_818D180
-sub_818D180: ; 818D180
+sub_818D180: @ 818D180
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r1, [sp, 0xC]
@@ -738462,7 +738462,7 @@ _0818D1B4:
 	thumb_func_end sub_818D180
 
 	thumb_func_start uns_builder_assign_animtable1
-uns_builder_assign_animtable1: ; 818D1C0
+uns_builder_assign_animtable1: @ 818D1C0
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -738484,7 +738484,7 @@ _0818D1E0:
 	thumb_func_end uns_builder_assign_animtable1
 
 	thumb_func_start oamt_spawn_poke_or_trainer_picture
-oamt_spawn_poke_or_trainer_picture: ; 818D1EC
+oamt_spawn_poke_or_trainer_picture: @ 818D1EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -738675,7 +738675,7 @@ _0818D356:
 	thumb_func_end oamt_spawn_poke_or_trainer_picture
 
 	thumb_func_start sub_818D384
-sub_818D384: ; 818D384
+sub_818D384: @ 818D384
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -738726,7 +738726,7 @@ sub_818D384: ; 818D384
 	thumb_func_end sub_818D384
 
 	thumb_func_start sub_818D3E4
-sub_818D3E4: ; 818D3E4
+sub_818D3E4: @ 818D3E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -738944,7 +738944,7 @@ _0818D588:
 	thumb_func_end sub_818D3E4
 
 	thumb_func_start sub_818D5B0
-sub_818D5B0: ; 818D5B0
+sub_818D5B0: @ 818D5B0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -739026,7 +739026,7 @@ _0818D646:
 	thumb_func_end sub_818D5B0
 
 	thumb_func_start sub_818D65C
-sub_818D65C: ; 818D65C
+sub_818D65C: @ 818D65C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -739084,7 +739084,7 @@ _0818D6BA:
 	thumb_func_end sub_818D65C
 
 	thumb_func_start sub_818D6CC
-sub_818D6CC: ; 818D6CC
+sub_818D6CC: @ 818D6CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -739170,7 +739170,7 @@ _0818D764:
 	thumb_func_end sub_818D6CC
 
 	thumb_func_start sub_818D778
-sub_818D778: ; 818D778
+sub_818D778: @ 818D778
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -739221,7 +739221,7 @@ sub_818D778: ; 818D778
 	thumb_func_end sub_818D778
 
 	thumb_func_start sub_818D7D8
-sub_818D7D8: ; 818D7D8
+sub_818D7D8: @ 818D7D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -739260,7 +739260,7 @@ sub_818D7D8: ; 818D7D8
 	thumb_func_end sub_818D7D8
 
 	thumb_func_start sub_818D820
-sub_818D820: ; 818D820
+sub_818D820: @ 818D820
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -739272,7 +739272,7 @@ sub_818D820: ; 818D820
 	thumb_func_end sub_818D820
 
 	thumb_func_start sub_818D834
-sub_818D834: ; 818D834
+sub_818D834: @ 818D834
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r4, [sp, 0x18]
@@ -739299,7 +739299,7 @@ sub_818D834: ; 818D834
 	thumb_func_end sub_818D834
 
 	thumb_func_start sub_818D864
-sub_818D864: ; 818D864
+sub_818D864: @ 818D864
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -739338,7 +739338,7 @@ sub_818D864: ; 818D864
 	thumb_func_end sub_818D864
 
 	thumb_func_start sub_818D8AC
-sub_818D8AC: ; 818D8AC
+sub_818D8AC: @ 818D8AC
 	push {r4,r5,lr}
 	sub sp, 0x14
 	adds r5, r1, 0
@@ -739375,7 +739375,7 @@ sub_818D8AC: ; 818D8AC
 	thumb_func_end sub_818D8AC
 
 	thumb_func_start sub_818D8F0
-sub_818D8F0: ; 818D8F0
+sub_818D8F0: @ 818D8F0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -739387,7 +739387,7 @@ sub_818D8F0: ; 818D8F0
 	thumb_func_end sub_818D8F0
 
 	thumb_func_start sub_818D904
-sub_818D904: ; 818D904
+sub_818D904: @ 818D904
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -739416,7 +739416,7 @@ sub_818D904: ; 818D904
 	thumb_func_end sub_818D904
 
 	thumb_func_start sub_818D938
-sub_818D938: ; 818D938
+sub_818D938: @ 818D938
 	push {r4,r5,lr}
 	sub sp, 0x14
 	adds r5, r1, 0
@@ -739453,7 +739453,7 @@ sub_818D938: ; 818D938
 	thumb_func_end sub_818D938
 
 	thumb_func_start sub_818D97C
-sub_818D97C: ; 818D97C
+sub_818D97C: @ 818D97C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -739479,7 +739479,7 @@ _0818D9A2:
 	thumb_func_end sub_818D97C
 
 	thumb_func_start sub_818D9AC
-sub_818D9AC: ; 818D9AC
+sub_818D9AC: @ 818D9AC
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
 	ldr r1, =0x00003b58
@@ -739490,7 +739490,7 @@ sub_818D9AC: ; 818D9AC
 	thumb_func_end sub_818D9AC
 
 	thumb_func_start sub_818D9C0
-sub_818D9C0: ; 818D9C0
+sub_818D9C0: @ 818D9C0
 	push {r4,r5,lr}
 	ldr r5, =0x00004010
 	ldr r4, =gUnknown_0860B07E
@@ -739533,7 +739533,7 @@ _0818DA24:
 	thumb_func_end sub_818D9C0
 
 	thumb_func_start sub_818DA30
-sub_818DA30: ; 818DA30
+sub_818DA30: @ 818DA30
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -739572,7 +739572,7 @@ _0818DA72:
 	thumb_func_end sub_818DA30
 
 	thumb_func_start sub_818DA78
-sub_818DA78: ; 818DA78
+sub_818DA78: @ 818DA78
 	push {lr}
 	bl sub_818D9AC
 	lsls r0, 24
@@ -739602,7 +739602,7 @@ _0818DAA6:
 	thumb_func_end sub_818DA78
 
 	thumb_func_start sub_818DAAC
-sub_818DAAC: ; 818DAAC
+sub_818DAAC: @ 818DAAC
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -739637,7 +739637,7 @@ _0818DAE6:
 	thumb_func_end sub_818DAAC
 
 	thumb_func_start sub_818DAEC
-sub_818DAEC: ; 818DAEC
+sub_818DAEC: @ 818DAEC
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl sub_818D9AC
@@ -739651,7 +739651,7 @@ sub_818DAEC: ; 818DAEC
 	thumb_func_end sub_818DAEC
 
 	thumb_func_start sub_818DB04
-sub_818DB04: ; 818DB04
+sub_818DB04: @ 818DB04
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0
@@ -739671,7 +739671,7 @@ _0818DB14:
 	thumb_func_end sub_818DB04
 
 	thumb_func_start sub_818DB20
-sub_818DB20: ; 818DB20
+sub_818DB20: @ 818DB20
 	push {r4-r6,lr}
 	bl GenerateRandomNumber
 	ldr r5, =0x0203cd64
@@ -739713,7 +739713,7 @@ sub_818DB20: ; 818DB20
 	thumb_func_end sub_818DB20
 
 	thumb_func_start sub_818DB7C
-sub_818DB7C: ; 818DB7C
+sub_818DB7C: @ 818DB7C
 	push {lr}
 	ldr r2, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739745,7 +739745,7 @@ sub_818DB7C: ; 818DB7C
 	thumb_func_end sub_818DB7C
 
 	thumb_func_start sub_818DBC4
-sub_818DBC4: ; 818DBC4
+sub_818DBC4: @ 818DBC4
 	ldr r3, =0x0203cd64
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -739762,7 +739762,7 @@ sub_818DBC4: ; 818DBC4
 	thumb_func_end sub_818DBC4
 
 	thumb_func_start sub_818DBE8
-sub_818DBE8: ; 818DBE8
+sub_818DBE8: @ 818DBE8
 	push {lr}
 	ldr r1, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739789,7 +739789,7 @@ _0818DC16:
 	thumb_func_end sub_818DBE8
 
 	thumb_func_start sub_818DC1C
-sub_818DC1C: ; 818DC1C
+sub_818DC1C: @ 818DC1C
 	lsls r0, 24
 	ldr r1, =gUnknown_0860B224
 	lsrs r0, 22
@@ -739800,7 +739800,7 @@ sub_818DC1C: ; 818DC1C
 	thumb_func_end sub_818DC1C
 
 	thumb_func_start sub_818DC2C
-sub_818DC2C: ; 818DC2C
+sub_818DC2C: @ 818DC2C
 	push {r4,lr}
 	ldr r1, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739821,7 +739821,7 @@ sub_818DC2C: ; 818DC2C
 	thumb_func_end sub_818DC2C
 
 	thumb_func_start sub_818DC60
-sub_818DC60: ; 818DC60
+sub_818DC60: @ 818DC60
 	push {r4,r5,lr}
 	ldr r5, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739854,7 +739854,7 @@ _0818DC9C:
 	thumb_func_end sub_818DC60
 
 	thumb_func_start sub_818DCAC
-sub_818DCAC: ; 818DCAC
+sub_818DCAC: @ 818DCAC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r0, r1, 16
@@ -739869,7 +739869,7 @@ sub_818DCAC: ; 818DCAC
 	thumb_func_end sub_818DCAC
 
 	thumb_func_start sub_818DCC8
-sub_818DCC8: ; 818DCC8
+sub_818DCC8: @ 818DCC8
 	push {lr}
 	ldr r2, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739886,7 +739886,7 @@ sub_818DCC8: ; 818DCC8
 	thumb_func_end sub_818DCC8
 
 	thumb_func_start sub_818DCF4
-sub_818DCF4: ; 818DCF4
+sub_818DCF4: @ 818DCF4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -739903,7 +739903,7 @@ sub_818DCF4: ; 818DCF4
 	thumb_func_end sub_818DCF4
 
 	thumb_func_start sub_818DD14
-sub_818DD14: ; 818DD14
+sub_818DD14: @ 818DD14
 	push {r4,r5,lr}
 	ldr r5, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -739927,7 +739927,7 @@ sub_818DD14: ; 818DD14
 	thumb_func_end sub_818DD14
 
 	thumb_func_start sub_818DD54
-sub_818DD54: ; 818DD54
+sub_818DD54: @ 818DD54
 	ldr r1, =0x0203cd64
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -739943,7 +739943,7 @@ sub_818DD54: ; 818DD54
 	thumb_func_end sub_818DD54
 
 	thumb_func_start sub_818DD78
-sub_818DD78: ; 818DD78
+sub_818DD78: @ 818DD78
 	push {lr}
 	bl sub_81AAC50
 	pop {r0}
@@ -739951,7 +739951,7 @@ sub_818DD78: ; 818DD78
 	thumb_func_end sub_818DD78
 
 	thumb_func_start sub_818DD84
-sub_818DD84: ; 818DD84
+sub_818DD84: @ 818DD84
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -740036,7 +740036,7 @@ _0818DE36:
 	thumb_func_end sub_818DD84
 
 	thumb_func_start sub_818DE44
-sub_818DE44: ; 818DE44
+sub_818DE44: @ 818DE44
 	push {lr}
 	ldr r0, =0x0203ce7c
 	ldrh r0, [r0]
@@ -740049,7 +740049,7 @@ sub_818DE44: ; 818DE44
 	thumb_func_end sub_818DE44
 
 	thumb_func_start sub_818DE5C
-sub_818DE5C: ; 818DE5C
+sub_818DE5C: @ 818DE5C
 	push {lr}
 	ldr r1, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -740070,7 +740070,7 @@ _0818DE74:
 	thumb_func_end sub_818DE5C
 
 	thumb_func_start sub_818DE88
-sub_818DE88: ; 818DE88
+sub_818DE88: @ 818DE88
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -740083,7 +740083,7 @@ sub_818DE88: ; 818DE88
 	thumb_func_end sub_818DE88
 
 	thumb_func_start sub_818DEA0
-sub_818DEA0: ; 818DEA0
+sub_818DEA0: @ 818DEA0
 	push {r4,r5,lr}
 	ldr r5, =0x0203cd64
 	ldr r0, =0x03005d8c
@@ -740109,7 +740109,7 @@ sub_818DEA0: ; 818DEA0
 	thumb_func_end sub_818DEA0
 
 	thumb_func_start sub_818DEDC
-sub_818DEDC: ; 818DEDC
+sub_818DEDC: @ 818DEDC
 	push {lr}
 	bl sub_818DB7C
 	ldr r0, =0x0203cd64
@@ -740122,7 +740122,7 @@ sub_818DEDC: ; 818DEDC
 	thumb_func_end sub_818DEDC
 
 	thumb_func_start sub_818DEF4
-sub_818DEF4: ; 818DEF4
+sub_818DEF4: @ 818DEF4
 	push {lr}
 	bl script_env_2_enable_and_set_ctx_running
 	pop {r0}
@@ -740130,7 +740130,7 @@ sub_818DEF4: ; 818DEF4
 	thumb_func_end sub_818DEF4
 
 	thumb_func_start sub_818DF00
-sub_818DF00: ; 818DF00
+sub_818DF00: @ 818DF00
 	push {r4-r7,lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -740179,7 +740179,7 @@ _0818DF1A:
 	thumb_func_end sub_818DF00
 
 	thumb_func_start sub_818DF68
-sub_818DF68: ; 818DF68
+sub_818DF68: @ 818DF68
 	push {r4-r6,lr}
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740252,7 +740252,7 @@ _0818DFB4:
 	thumb_func_end sub_818DF68
 
 	thumb_func_start sub_818E004
-sub_818E004: ; 818E004
+sub_818E004: @ 818E004
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740274,7 +740274,7 @@ sub_818E004: ; 818E004
 	thumb_func_end sub_818E004
 
 	thumb_func_start sub_818E038
-sub_818E038: ; 818E038
+sub_818E038: @ 818E038
 	push {lr}
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740301,7 +740301,7 @@ _0818E066:
 	thumb_func_end sub_818E038
 
 	thumb_func_start sub_818E06C
-sub_818E06C: ; 818E06C
+sub_818E06C: @ 818E06C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -740399,7 +740399,7 @@ _0818E12C:
 	thumb_func_end sub_818E06C
 
 	thumb_func_start sub_818E13C
-sub_818E13C: ; 818E13C
+sub_818E13C: @ 818E13C
 	push {r4-r7,lr}
 	movs r7, 0x1
 	ldr r5, =0x0203cd68
@@ -740477,7 +740477,7 @@ _0818E1DC:
 	thumb_func_end sub_818E13C
 
 	thumb_func_start sub_818E1F4
-sub_818E1F4: ; 818E1F4
+sub_818E1F4: @ 818E1F4
 	push {r4-r6,lr}
 	ldr r3, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740525,7 +740525,7 @@ _0818E23C:
 	thumb_func_end sub_818E1F4
 
 	thumb_func_start sub_818E258
-sub_818E258: ; 818E258
+sub_818E258: @ 818E258
 	push {lr}
 	movs r2, 0
 	adds r1, r0, 0
@@ -740545,7 +740545,7 @@ _0818E268:
 	thumb_func_end sub_818E258
 
 	thumb_func_start sub_818E274
-sub_818E274: ; 818E274
+sub_818E274: @ 818E274
 	push {r4,lr}
 	ldr r4, =0x02021cc4
 	ldr r0, =0x0203cd68
@@ -740562,7 +740562,7 @@ sub_818E274: ; 818E274
 	thumb_func_end sub_818E274
 
 	thumb_func_start sub_818E298
-sub_818E298: ; 818E298
+sub_818E298: @ 818E298
 	push {r4,lr}
 	ldr r4, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740592,7 +740592,7 @@ _0818E2CC:
 	thumb_func_end sub_818E298
 
 	thumb_func_start sub_818E2D8
-sub_818E2D8: ; 818E2D8
+sub_818E2D8: @ 818E2D8
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740607,7 +740607,7 @@ sub_818E2D8: ; 818E2D8
 	thumb_func_end sub_818E2D8
 
 	thumb_func_start sub_818E2FC
-sub_818E2FC: ; 818E2FC
+sub_818E2FC: @ 818E2FC
 	push {lr}
 	bl easy_chat_input_maybe
 	pop {r0}
@@ -740615,7 +740615,7 @@ sub_818E2FC: ; 818E2FC
 	thumb_func_end sub_818E2FC
 
 	thumb_func_start sub_818E308
-sub_818E308: ; 818E308
+sub_818E308: @ 818E308
 	push {r4-r6,lr}
 	ldr r5, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740648,7 +740648,7 @@ _0818E33C:
 	thumb_func_end sub_818E308
 
 	thumb_func_start sub_818E358
-sub_818E358: ; 818E358
+sub_818E358: @ 818E358
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740663,7 +740663,7 @@ sub_818E358: ; 818E358
 	thumb_func_end sub_818E358
 
 	thumb_func_start sub_818E37C
-sub_818E37C: ; 818E37C
+sub_818E37C: @ 818E37C
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740677,7 +740677,7 @@ sub_818E37C: ; 818E37C
 	thumb_func_end sub_818E37C
 
 	thumb_func_start sub_818E39C
-sub_818E39C: ; 818E39C
+sub_818E39C: @ 818E39C
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740691,7 +740691,7 @@ sub_818E39C: ; 818E39C
 	thumb_func_end sub_818E39C
 
 	thumb_func_start sub_818E3BC
-sub_818E3BC: ; 818E3BC
+sub_818E3BC: @ 818E3BC
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740705,7 +740705,7 @@ sub_818E3BC: ; 818E3BC
 	thumb_func_end sub_818E3BC
 
 	thumb_func_start sub_818E3E0
-sub_818E3E0: ; 818E3E0
+sub_818E3E0: @ 818E3E0
 	push {lr}
 	bl sub_81AAC70
 	pop {r0}
@@ -740713,7 +740713,7 @@ sub_818E3E0: ; 818E3E0
 	thumb_func_end sub_818E3E0
 
 	thumb_func_start sub_818E3EC
-sub_818E3EC: ; 818E3EC
+sub_818E3EC: @ 818E3EC
 	push {r4,lr}
 	ldr r4, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740745,7 +740745,7 @@ _0818E422:
 	thumb_func_end sub_818E3EC
 
 	thumb_func_start sub_818E430
-sub_818E430: ; 818E430
+sub_818E430: @ 818E430
 	push {r4,r5,lr}
 	ldr r1, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740781,7 +740781,7 @@ _0818E448:
 	thumb_func_end sub_818E430
 
 	thumb_func_start sub_818E47C
-sub_818E47C: ; 818E47C
+sub_818E47C: @ 818E47C
 	push {lr}
 	ldr r1, =0x020375e0
 	movs r0, 0x11
@@ -740793,7 +740793,7 @@ sub_818E47C: ; 818E47C
 	thumb_func_end sub_818E47C
 
 	thumb_func_start sub_818E490
-sub_818E490: ; 818E490
+sub_818E490: @ 818E490
 	push {lr}
 	ldr r0, =0x0203ce7c
 	ldrh r0, [r0]
@@ -740805,7 +740805,7 @@ sub_818E490: ; 818E490
 	thumb_func_end sub_818E490
 
 	thumb_func_start sub_818E4A4
-sub_818E4A4: ; 818E4A4
+sub_818E4A4: @ 818E4A4
 	push {r4-r6,lr}
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740852,7 +740852,7 @@ _0818E4C2:
 	thumb_func_end sub_818E4A4
 
 	thumb_func_start sub_818E510
-sub_818E510: ; 818E510
+sub_818E510: @ 818E510
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -740868,7 +740868,7 @@ sub_818E510: ; 818E510
 	thumb_func_end sub_818E510
 
 	thumb_func_start sub_818E538
-sub_818E538: ; 818E538
+sub_818E538: @ 818E538
 	push {lr}
 	ldr r2, =0x0203cd68
 	ldr r0, =0x03005d8c
@@ -740885,7 +740885,7 @@ sub_818E538: ; 818E538
 	thumb_func_end sub_818E538
 
 	thumb_func_start sub_818E564
-sub_818E564: ; 818E564
+sub_818E564: @ 818E564
 	push {lr}
 	bl script_env_2_enable_and_set_ctx_running
 	pop {r0}
@@ -740893,7 +740893,7 @@ sub_818E564: ; 818E564
 	thumb_func_end sub_818E564
 
 	thumb_func_start sub_818E570
-sub_818E570: ; 818E570
+sub_818E570: @ 818E570
 	push {r4-r7,lr}
 	ldr r2, =0x0203cd68
 	ldr r1, =0x03005d8c
@@ -740966,7 +740966,7 @@ _0818E5EC:
 	thumb_func_end sub_818E570
 
 	thumb_func_start sub_818E604
-sub_818E604: ; 818E604
+sub_818E604: @ 818E604
 	push {r4,lr}
 	ldr r4, =0x0203cd6c
 	ldr r1, [r4]
@@ -740993,7 +740993,7 @@ sub_818E604: ; 818E604
 	thumb_func_end sub_818E604
 
 	thumb_func_start sub_818E638
-sub_818E638: ; 818E638
+sub_818E638: @ 818E638
 	push {r4,lr}
 	ldr r4, =0x0203cd6c
 	ldr r0, =0x03005d8c
@@ -741018,7 +741018,7 @@ sub_818E638: ; 818E638
 	thumb_func_end sub_818E638
 
 	thumb_func_start sub_818E674
-sub_818E674: ; 818E674
+sub_818E674: @ 818E674
 	push {lr}
 	ldr r2, =0x0203cd6c
 	ldr r0, =0x03005d8c
@@ -741047,7 +741047,7 @@ _0818E69E:
 	thumb_func_end sub_818E674
 
 	thumb_func_start sub_818E6B0
-sub_818E6B0: ; 818E6B0
+sub_818E6B0: @ 818E6B0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -741084,7 +741084,7 @@ _0818E6EA:
 	thumb_func_end sub_818E6B0
 
 	thumb_func_start sub_818E704
-sub_818E704: ; 818E704
+sub_818E704: @ 818E704
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	movs r3, 0
@@ -741156,7 +741156,7 @@ _0818E78C:
 	thumb_func_end sub_818E704
 
 	thumb_func_start sub_818E794
-sub_818E794: ; 818E794
+sub_818E794: @ 818E794
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r4, =0x0203cd6c
@@ -741186,7 +741186,7 @@ sub_818E794: ; 818E794
 	thumb_func_end sub_818E794
 
 	thumb_func_start sub_818E7E0
-sub_818E7E0: ; 818E7E0
+sub_818E7E0: @ 818E7E0
 	push {r4,lr}
 	adds r3, r1, 0
 	ldr r2, =0x0203cd6c
@@ -741211,7 +741211,7 @@ sub_818E7E0: ; 818E7E0
 	thumb_func_end sub_818E7E0
 
 	thumb_func_start sub_818E81C
-sub_818E81C: ; 818E81C
+sub_818E81C: @ 818E81C
 	push {r4,lr}
 	ldr r3, =0x0203cd6c
 	ldr r1, =0x03005d8c
@@ -741229,7 +741229,7 @@ sub_818E81C: ; 818E81C
 	thumb_func_end sub_818E81C
 
 	thumb_func_start sub_818E848
-sub_818E848: ; 818E848
+sub_818E848: @ 818E848
 	ldr r2, =0x0203cd6c
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
@@ -741243,7 +741243,7 @@ sub_818E848: ; 818E848
 	thumb_func_end sub_818E848
 
 	thumb_func_start sub_818E868
-sub_818E868: ; 818E868
+sub_818E868: @ 818E868
 	push {lr}
 	lsls r1, 24
 	ldr r2, =gUnknown_0860B338
@@ -741257,7 +741257,7 @@ sub_818E868: ; 818E868
 	thumb_func_end sub_818E868
 
 	thumb_func_start sub_818E880
-sub_818E880: ; 818E880
+sub_818E880: @ 818E880
 	push {lr}
 	ldr r1, =0x0203cd6c
 	ldr r0, =0x03005d8c
@@ -741284,7 +741284,7 @@ _0818E8AE:
 	thumb_func_end sub_818E880
 
 	thumb_func_start sub_818E8B4
-sub_818E8B4: ; 818E8B4
+sub_818E8B4: @ 818E8B4
 	push {lr}
 	ldr r1, =0x0203cd6c
 	ldr r0, =0x03005d8c
@@ -741306,7 +741306,7 @@ _0818E8DA:
 	thumb_func_end sub_818E8B4
 
 	thumb_func_start sub_818E8E0
-sub_818E8E0: ; 818E8E0
+sub_818E8E0: @ 818E8E0
 	push {r4,lr}
 	movs r3, 0
 	ldr r1, =0x0203cd6c
@@ -741332,7 +741332,7 @@ _0818E8FE:
 	thumb_func_end sub_818E8E0
 
 	thumb_func_start sub_818E914
-sub_818E914: ; 818E914
+sub_818E914: @ 818E914
 	push {lr}
 	ldr r0, =0x02021dc4
 	ldr r1, =0x02021cc4
@@ -741343,7 +741343,7 @@ sub_818E914: ; 818E914
 	thumb_func_end sub_818E914
 
 	thumb_func_start sub_818E92C
-sub_818E92C: ; 818E92C
+sub_818E92C: @ 818E92C
 	push {lr}
 	ldr r1, =c2_exit_to_overworld_2_switch
 	movs r0, 0x3
@@ -741354,7 +741354,7 @@ sub_818E92C: ; 818E92C
 	thumb_func_end sub_818E92C
 
 	thumb_func_start sub_818E940
-sub_818E940: ; 818E940
+sub_818E940: @ 818E940
 	ldr r1, =0x0203cd6c
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -741368,7 +741368,7 @@ sub_818E940: ; 818E940
 	thumb_func_end sub_818E940
 
 	thumb_func_start sub_818E960
-sub_818E960: ; 818E960
+sub_818E960: @ 818E960
 	ldr r1, =0x0203cd6c
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -741387,7 +741387,7 @@ sub_818E960: ; 818E960
 	thumb_func_end sub_818E960
 
 	thumb_func_start sub_818E990
-sub_818E990: ; 818E990
+sub_818E990: @ 818E990
 	ldr r1, =0x0203cd6c
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -741400,7 +741400,7 @@ sub_818E990: ; 818E990
 	thumb_func_end sub_818E990
 
 	thumb_func_start sub_818E9AC
-sub_818E9AC: ; 818E9AC
+sub_818E9AC: @ 818E9AC
 	push {lr}
 	ldr r1, =gUnknown_0860D090
 	ldr r0, =0x020375e0
@@ -741415,7 +741415,7 @@ sub_818E9AC: ; 818E9AC
 	thumb_func_end sub_818E9AC
 
 	thumb_func_start sub_818E9CC
-sub_818E9CC: ; 818E9CC
+sub_818E9CC: @ 818E9CC
 	push {r4-r7,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -741492,7 +741492,7 @@ _0818EA3E:
 	thumb_func_end sub_818E9CC
 
 	thumb_func_start sub_818EA84
-sub_818EA84: ; 818EA84
+sub_818EA84: @ 818EA84
 	push {r4-r6,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -741744,7 +741744,7 @@ _0818ED10:
 	thumb_func_end sub_818EA84
 
 	thumb_func_start sub_818ED28
-sub_818ED28: ; 818ED28
+sub_818ED28: @ 818ED28
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -742045,7 +742045,7 @@ _0818F01E:
 	thumb_func_end sub_818ED28
 
 	thumb_func_start sub_818F02C
-sub_818F02C: ; 818F02C
+sub_818F02C: @ 818F02C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -742867,7 +742867,7 @@ _0818F6EE:
 	thumb_func_end sub_818F02C
 
 	thumb_func_start sub_818F720
-sub_818F720: ; 818F720
+sub_818F720: @ 818F720
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743110,7 +743110,7 @@ _0818F8C8:
 	thumb_func_end sub_818F720
 
 	thumb_func_start sub_818F904
-sub_818F904: ; 818F904
+sub_818F904: @ 818F904
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743193,7 +743193,7 @@ _0818F974:
 	thumb_func_end sub_818F904
 
 	thumb_func_start sub_818F9B0
-sub_818F9B0: ; 818F9B0
+sub_818F9B0: @ 818F9B0
 	push {lr}
 	ldr r0, =0x02021cc4
 	ldr r2, =gUnknown_085CCD20
@@ -743212,7 +743212,7 @@ sub_818F9B0: ; 818F9B0
 	thumb_func_end sub_818F9B0
 
 	thumb_func_start sub_818F9E0
-sub_818F9E0: ; 818F9E0
+sub_818F9E0: @ 818F9E0
 	push {lr}
 	ldr r0, =0x02021cc4
 	ldr r2, =gUnknown_085CCD20
@@ -743235,7 +743235,7 @@ sub_818F9E0: ; 818F9E0
 	thumb_func_end sub_818F9E0
 
 	thumb_func_start sub_818FA20
-sub_818FA20: ; 818FA20
+sub_818FA20: @ 818FA20
 	push {r4,r5,lr}
 	ldr r1, =0x0203cd70
 	movs r0, 0
@@ -743269,7 +743269,7 @@ sub_818FA20: ; 818FA20
 	thumb_func_end sub_818FA20
 
 	thumb_func_start sub_818FA74
-sub_818FA74: ; 818FA74
+sub_818FA74: @ 818FA74
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743440,7 +743440,7 @@ _0818FB74:
 	thumb_func_end sub_818FA74
 
 	thumb_func_start sub_818FBDC
-sub_818FBDC: ; 818FBDC
+sub_818FBDC: @ 818FBDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -743519,7 +743519,7 @@ _0818FC6C:
 	thumb_func_end sub_818FBDC
 
 	thumb_func_start sub_818FC78
-sub_818FC78: ; 818FC78
+sub_818FC78: @ 818FC78
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -743554,7 +743554,7 @@ _0818FCB6:
 	thumb_func_end sub_818FC78
 
 	thumb_func_start sub_818FCBC
-sub_818FCBC: ; 818FCBC
+sub_818FCBC: @ 818FCBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743674,7 +743674,7 @@ _0818FD60:
 	thumb_func_end sub_818FCBC
 
 	thumb_func_start sub_818FDB8
-sub_818FDB8: ; 818FDB8
+sub_818FDB8: @ 818FDB8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743794,7 +743794,7 @@ _0818FE5C:
 	thumb_func_end sub_818FDB8
 
 	thumb_func_start sub_818FEB4
-sub_818FEB4: ; 818FEB4
+sub_818FEB4: @ 818FEB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -743939,7 +743939,7 @@ _0818FFAA:
 	thumb_func_end sub_818FEB4
 
 	thumb_func_start sub_818FFC0
-sub_818FFC0: ; 818FFC0
+sub_818FFC0: @ 818FFC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -744176,7 +744176,7 @@ _08190156:
 	thumb_func_end sub_818FFC0
 
 	thumb_func_start sub_8190168
-sub_8190168: ; 8190168
+sub_8190168: @ 8190168
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -744209,7 +744209,7 @@ _0819019A:
 	thumb_func_end sub_8190168
 
 	thumb_func_start sub_81901A0
-sub_81901A0: ; 81901A0
+sub_81901A0: @ 81901A0
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -744332,7 +744332,7 @@ _08190292:
 	thumb_func_end sub_81901A0
 
 	thumb_func_start sub_8190298
-sub_8190298: ; 8190298
+sub_8190298: @ 8190298
 	push {lr}
 	bl sub_81902AC
 	ldr r1, =0x02038bca
@@ -744343,7 +744343,7 @@ sub_8190298: ; 8190298
 	thumb_func_end sub_8190298
 
 	thumb_func_start sub_81902AC
-sub_81902AC: ; 81902AC
+sub_81902AC: @ 81902AC
 	push {r4,lr}
 	ldr r0, =0x03005d90
 	ldr r4, [r0]
@@ -744366,7 +744366,7 @@ sub_81902AC: ; 81902AC
 	thumb_func_end sub_81902AC
 
 	thumb_func_start sub_81902E4
-sub_81902E4: ; 81902E4
+sub_81902E4: @ 81902E4
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
@@ -744378,7 +744378,7 @@ sub_81902E4: ; 81902E4
 	thumb_func_end sub_81902E4
 
 	thumb_func_start sub_81902F8
-sub_81902F8: ; 81902F8
+sub_81902F8: @ 81902F8
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -744406,7 +744406,7 @@ sub_81902F8: ; 81902F8
 	thumb_func_end sub_81902F8
 
 	thumb_func_start sub_819033C
-sub_819033C: ; 819033C
+sub_819033C: @ 819033C
 	push {r4,r5,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -744461,7 +744461,7 @@ _08190396:
 	thumb_func_end sub_819033C
 
 	thumb_func_start sub_81903B8
-sub_81903B8: ; 81903B8
+sub_81903B8: @ 81903B8
 	push {r4,r5,lr}
 	ldr r0, =sub_8190400
 	movs r1, 0
@@ -744491,7 +744491,7 @@ sub_81903B8: ; 81903B8
 	thumb_func_end sub_81903B8
 
 	thumb_func_start sub_8190400
-sub_8190400: ; 8190400
+sub_8190400: @ 8190400
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -744856,7 +744856,7 @@ _08190772:
 	thumb_func_end sub_8190400
 
 	thumb_func_start sub_8190790
-sub_8190790: ; 8190790
+sub_8190790: @ 8190790
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x22]
@@ -744912,7 +744912,7 @@ _081907F0:
 	thumb_func_end sub_8190790
 
 	thumb_func_start sub_81907F8
-sub_81907F8: ; 81907F8
+sub_81907F8: @ 81907F8
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x22]
@@ -744968,7 +744968,7 @@ _08190858:
 	thumb_func_end sub_81907F8
 
 	thumb_func_start sub_8190860
-sub_8190860: ; 8190860
+sub_8190860: @ 8190860
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x20]
@@ -745024,7 +745024,7 @@ _081908C0:
 	thumb_func_end sub_8190860
 
 	thumb_func_start sub_81908CC
-sub_81908CC: ; 81908CC
+sub_81908CC: @ 81908CC
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x20]
@@ -745081,7 +745081,7 @@ _08190930:
 	thumb_func_end sub_81908CC
 
 	thumb_func_start sub_8190938
-sub_8190938: ; 8190938
+sub_8190938: @ 8190938
 	push {lr}
 	adds r1, r0, 0
 	movs r2, 0x34
@@ -745096,7 +745096,7 @@ _0819094A:
 	thumb_func_end sub_8190938
 
 	thumb_func_start sub_8190950
-sub_8190950: ; 8190950
+sub_8190950: @ 8190950
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -745160,7 +745160,7 @@ _081909C0:
 	thumb_func_end sub_8190950
 
 	thumb_func_start sub_81909CC
-sub_81909CC: ; 81909CC
+sub_81909CC: @ 81909CC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -745224,7 +745224,7 @@ _08190A3C:
 	thumb_func_end sub_81909CC
 
 	thumb_func_start sub_8190A48
-sub_8190A48: ; 8190A48
+sub_8190A48: @ 8190A48
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -745288,7 +745288,7 @@ _08190AB8:
 	thumb_func_end sub_8190A48
 
 	thumb_func_start sub_8190AC4
-sub_8190AC4: ; 8190AC4
+sub_8190AC4: @ 8190AC4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x34
@@ -745353,7 +745353,7 @@ _08190B34:
 	thumb_func_end sub_8190AC4
 
 	thumb_func_start sub_8190B40
-sub_8190B40: ; 8190B40
+sub_8190B40: @ 8190B40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -745499,7 +745499,7 @@ _08190C5C:
 	thumb_func_end sub_8190B40
 
 	thumb_func_start sub_8190C6C
-sub_8190C6C: ; 8190C6C
+sub_8190C6C: @ 8190C6C
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -745553,7 +745553,7 @@ _08190CCE:
 	thumb_func_end sub_8190C6C
 
 	thumb_func_start sub_8190CD4
-sub_8190CD4: ; 8190CD4
+sub_8190CD4: @ 8190CD4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -747923,7 +747923,7 @@ _08192202:
 	thumb_func_end sub_8190CD4
 
 	thumb_func_start sub_819221C
-sub_819221C: ; 819221C
+sub_819221C: @ 819221C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -748266,7 +748266,7 @@ _081924CC:
 	thumb_func_end sub_819221C
 
 	thumb_func_start sub_81924E0
-sub_81924E0: ; 81924E0
+sub_81924E0: @ 81924E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -749490,7 +749490,7 @@ _08192ED2:
 	thumb_func_end sub_81924E0
 
 	thumb_func_start sub_8192F08
-sub_8192F08: ; 8192F08
+sub_8192F08: @ 8192F08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -749750,7 +749750,7 @@ _0819313C:
 	thumb_func_end sub_8192F08
 
 	thumb_func_start sub_819314C
-sub_819314C: ; 819314C
+sub_819314C: @ 819314C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -750603,7 +750603,7 @@ _08193802:
 	thumb_func_end sub_819314C
 
 	thumb_func_start sub_81938A4
-sub_81938A4: ; 81938A4
+sub_81938A4: @ 81938A4
 	push {lr}
 	ldr r0, =sub_8194220
 	movs r1, 0
@@ -750629,7 +750629,7 @@ sub_81938A4: ; 81938A4
 	thumb_func_end sub_81938A4
 
 	thumb_func_start sub_81938E0
-sub_81938E0: ; 81938E0
+sub_81938E0: @ 81938E0
 	push {r4,lr}
 	bl sub_8194D48
 	ldr r4, =0x03005d90
@@ -750679,7 +750679,7 @@ sub_81938E0: ; 81938E0
 	thumb_func_end sub_81938E0
 
 	thumb_func_start sub_819395C
-sub_819395C: ; 819395C
+sub_819395C: @ 819395C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -750953,7 +750953,7 @@ _08193BC2:
 	thumb_func_end sub_819395C
 
 	thumb_func_start sub_8193BDC
-sub_8193BDC: ; 8193BDC
+sub_8193BDC: @ 8193BDC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -751123,7 +751123,7 @@ _08193D26:
 	thumb_func_end sub_8193BDC
 
 	thumb_func_start sub_8193D40
-sub_8193D40: ; 8193D40
+sub_8193D40: @ 8193D40
 	push {lr}
 	ldr r0, =sub_8194220
 	movs r1, 0
@@ -751150,7 +751150,7 @@ sub_8193D40: ; 8193D40
 	thumb_func_end sub_8193D40
 
 	thumb_func_start sub_8193D7C
-sub_8193D7C: ; 8193D7C
+sub_8193D7C: @ 8193D7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -751298,7 +751298,7 @@ _08193EAE:
 	thumb_func_end sub_8193D7C
 
 	thumb_func_start sub_8193ED0
-sub_8193ED0: ; 8193ED0
+sub_8193ED0: @ 8193ED0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -751731,7 +751731,7 @@ _08194204:
 	thumb_func_end sub_8193ED0
 
 	thumb_func_start sub_8194220
-sub_8194220: ; 8194220
+sub_8194220: @ 8194220
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -752443,7 +752443,7 @@ _081948C2:
 	thumb_func_end sub_8194220
 
 	thumb_func_start sub_81948EC
-sub_81948EC: ; 81948EC
+sub_81948EC: @ 81948EC
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -752493,7 +752493,7 @@ _08194938:
 	thumb_func_end sub_81948EC
 
 	thumb_func_start sub_8194950
-sub_8194950: ; 8194950
+sub_8194950: @ 8194950
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -752730,7 +752730,7 @@ _08194B3C:
 	thumb_func_end sub_8194950
 
 	thumb_func_start sub_8194B54
-sub_8194B54: ; 8194B54
+sub_8194B54: @ 8194B54
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -752742,7 +752742,7 @@ sub_8194B54: ; 8194B54
 	thumb_func_end sub_8194B54
 
 	thumb_func_start sub_8194B70
-sub_8194B70: ; 8194B70
+sub_8194B70: @ 8194B70
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0x80
@@ -752785,7 +752785,7 @@ sub_8194B70: ; 8194B70
 	thumb_func_end sub_8194B70
 
 	thumb_func_start sub_8194BEC
-sub_8194BEC: ; 8194BEC
+sub_8194BEC: @ 8194BEC
 	push {lr}
 	ldr r0, =0x04000006
 	ldrh r0, [r0]
@@ -752878,7 +752878,7 @@ _08194CD4:
 	thumb_func_end sub_8194BEC
 
 	thumb_func_start sub_8194CE4
-sub_8194CE4: ; 8194CE4
+sub_8194CE4: @ 8194CE4
 	push {lr}
 	ldr r0, =0x02022e14
 	ldrh r1, [r0]
@@ -752914,7 +752914,7 @@ sub_8194CE4: ; 8194CE4
 	thumb_func_end sub_8194CE4
 
 	thumb_func_start sub_8194D48
-sub_8194D48: ; 8194D48
+sub_8194D48: @ 8194D48
 	ldr r1, =0x0203bc8c
 	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
@@ -752926,7 +752926,7 @@ sub_8194D48: ; 8194D48
 	thumb_func_end sub_8194D48
 
 	thumb_func_start sub_8194D68
-sub_8194D68: ; 8194D68
+sub_8194D68: @ 8194D68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -753034,7 +753034,7 @@ _08194E00:
 	thumb_func_end sub_8194D68
 
 	thumb_func_start sub_8194E44
-sub_8194E44: ; 8194E44
+sub_8194E44: @ 8194E44
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -753083,7 +753083,7 @@ _08194E50:
 	thumb_func_end sub_8194E44
 
 	thumb_func_start sub_8194EB4
-sub_8194EB4: ; 8194EB4
+sub_8194EB4: @ 8194EB4
 	push {lr}
 	bl sub_80F94E8
 	pop {r0}
@@ -753091,7 +753091,7 @@ sub_8194EB4: ; 8194EB4
 	thumb_func_end sub_8194EB4
 
 	thumb_func_start sub_8194EC0
-sub_8194EC0: ; 8194EC0
+sub_8194EC0: @ 8194EC0
 	push {r4,lr}
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
@@ -753117,7 +753117,7 @@ _08194EEC:
 	thumb_func_end sub_8194EC0
 
 	thumb_func_start sub_8194EF8
-sub_8194EF8: ; 8194EF8
+sub_8194EF8: @ 8194EF8
 	push {r4,lr}
 	bl sub_8194D48
 	movs r2, 0
@@ -753162,7 +753162,7 @@ _08194F2A:
 	thumb_func_end sub_8194EF8
 
 	thumb_func_start sub_8194F58
-sub_8194F58: ; 8194F58
+sub_8194F58: @ 8194F58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -753652,7 +753652,7 @@ _0819533E:
 	thumb_func_end sub_8194F58
 
 	thumb_func_start sub_8195358
-sub_8195358: ; 8195358
+sub_8195358: @ 8195358
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -753690,7 +753690,7 @@ _0819538E:
 	thumb_func_end sub_8195358
 
 	thumb_func_start sub_81953A0
-sub_81953A0: ; 81953A0
+sub_81953A0: @ 81953A0
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -753728,7 +753728,7 @@ _081953D6:
 	thumb_func_end sub_81953A0
 
 	thumb_func_start sub_81953E8
-sub_81953E8: ; 81953E8
+sub_81953E8: @ 81953E8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -753769,7 +753769,7 @@ _08195430:
 	thumb_func_end sub_81953E8
 
 	thumb_func_start sub_8195438
-sub_8195438: ; 8195438
+sub_8195438: @ 8195438
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -754301,7 +754301,7 @@ _0819587E:
 	thumb_func_end sub_8195438
 
 	thumb_func_start sub_8195898
-sub_8195898: ; 8195898
+sub_8195898: @ 8195898
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -754361,7 +754361,7 @@ _08195902:
 	thumb_func_end sub_8195898
 
 	thumb_func_start sub_8195910
-sub_8195910: ; 8195910
+sub_8195910: @ 8195910
 	ldr r0, =gTrainers
 	ldr r1, =0x00007df3
 	adds r0, r1
@@ -754371,7 +754371,7 @@ sub_8195910: ; 8195910
 	thumb_func_end sub_8195910
 
 	thumb_func_start sub_8195924
-sub_8195924: ; 8195924
+sub_8195924: @ 8195924
 	ldr r0, =gTrainers
 	ldr r1, =0x00007df1
 	adds r0, r1
@@ -754381,11 +754381,11 @@ sub_8195924: ; 8195924
 	thumb_func_end sub_8195924
 
 	thumb_func_start sub_8195938
-sub_8195938: ; 8195938
+sub_8195938: @ 8195938
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
-	ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 ; Tucker's name
+	ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 @ Tucker's name
 _08195940:
 	adds r0, r3, r2
 	adds r1, r2, r4
@@ -754404,7 +754404,7 @@ _08195940:
 	thumb_func_end sub_8195938
 
 	thumb_func_start sub_8195960
-sub_8195960: ; 8195960
+sub_8195960: @ 8195960
 	push {lr}
 	ldr r1, =gUnknown_0860DE50
 	ldr r0, =0x020375e0
@@ -754419,7 +754419,7 @@ sub_8195960: ; 8195960
 	thumb_func_end sub_8195960
 
 	thumb_func_start sub_8195980
-sub_8195980: ; 8195980
+sub_8195980: @ 8195980
 	push {r4-r7,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -754496,7 +754496,7 @@ _081959F2:
 	thumb_func_end sub_8195980
 
 	thumb_func_start sub_8195A38
-sub_8195A38: ; 8195A38
+sub_8195A38: @ 8195A38
 	push {r4-r7,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -754570,7 +754570,7 @@ _08195AD0:
 	thumb_func_end sub_8195A38
 
 	thumb_func_start sub_8195AE4
-sub_8195AE4: ; 8195AE4
+sub_8195AE4: @ 8195AE4
 	push {r4-r6,lr}
 	ldr r6, =0x03005d90
 	ldr r0, [r6]
@@ -754659,7 +754659,7 @@ _08195BA0:
 	thumb_func_end sub_8195AE4
 
 	thumb_func_start sub_8195BB0
-sub_8195BB0: ; 8195BB0
+sub_8195BB0: @ 8195BB0
 	push {r4,lr}
 	ldr r0, =0x000040ce
 	bl VarGet
@@ -754708,7 +754708,7 @@ _08195C16:
 	thumb_func_end sub_8195BB0
 
 	thumb_func_start sub_8195C20
-sub_8195C20: ; 8195C20
+sub_8195C20: @ 8195C20
 	push {r4,lr}
 	ldr r4, =0x02038bca
 	bl GenerateRandomNumber
@@ -754732,7 +754732,7 @@ sub_8195C20: ; 8195C20
 	thumb_func_end sub_8195C20
 
 	thumb_func_start sub_8195C50
-sub_8195C50: ; 8195C50
+sub_8195C50: @ 8195C50
 	push {lr}
 	ldr r3, =0x02038bca
 	ldrh r1, [r3]
@@ -754753,7 +754753,7 @@ _08195C6C:
 	thumb_func_end sub_8195C50
 
 	thumb_func_start sub_8195C7C
-sub_8195C7C: ; 8195C7C
+sub_8195C7C: @ 8195C7C
 	push {r4-r7,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -754801,7 +754801,7 @@ _08195CCA:
 	thumb_func_end sub_8195C7C
 
 	thumb_func_start sub_8195CE4
-sub_8195CE4: ; 8195CE4
+sub_8195CE4: @ 8195CE4
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -754829,7 +754829,7 @@ sub_8195CE4: ; 8195CE4
 	thumb_func_end sub_8195CE4
 
 	thumb_func_start sub_8195D28
-sub_8195D28: ; 8195D28
+sub_8195D28: @ 8195D28
 	push {r4,r5,lr}
 	ldr r0, =0x000040ce
 	bl VarGet
@@ -754887,7 +754887,7 @@ _08195DA6:
 	thumb_func_end sub_8195D28
 
 	thumb_func_start sub_8195DB8
-sub_8195DB8: ; 8195DB8
+sub_8195DB8: @ 8195DB8
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -754927,7 +754927,7 @@ _08195E06:
 	thumb_func_end sub_8195DB8
 
 	thumb_func_start sub_8195E10
-sub_8195E10: ; 8195E10
+sub_8195E10: @ 8195E10
 	push {lr}
 	bl GameFreakRTC_CalcLocalDateTime
 	ldr r0, =0x03005cf8
@@ -754943,7 +754943,7 @@ sub_8195E10: ; 8195E10
 	thumb_func_end sub_8195E10
 
 	thumb_func_start sub_8195E34
-sub_8195E34: ; 8195E34
+sub_8195E34: @ 8195E34
 	adds r3, r0, 0
 	movs r1, 0
 	ldrsh r0, [r3, r1]
@@ -754965,7 +754965,7 @@ sub_8195E34: ; 8195E34
 	thumb_func_end sub_8195E34
 
 	thumb_func_start sub_8195E58
-sub_8195E58: ; 8195E58
+sub_8195E58: @ 8195E58
 	push {lr}
 	bl GameFreakRTC_CalcLocalDateTime
 	ldr r0, =0x03005cf8
@@ -754991,7 +754991,7 @@ _08195E86:
 	thumb_func_end sub_8195E58
 
 	thumb_func_start sub_8195E8C
-sub_8195E8C: ; 8195E8C
+sub_8195E8C: @ 8195E8C
 	push {r4,r5,lr}
 	movs r5, 0x1
 	ldr r4, =0x020244ec
@@ -755031,7 +755031,7 @@ _08195ED2:
 	thumb_func_end sub_8195E8C
 
 	thumb_func_start sub_8195ED8
-sub_8195ED8: ; 8195ED8
+sub_8195ED8: @ 8195ED8
 	push {r4,lr}
 	ldr r4, =0x02037318
 	ldrb r0, [r4, 0x17]
@@ -755085,7 +755085,7 @@ _08195F3A:
 	thumb_func_end sub_8195ED8
 
 	thumb_func_start sub_8195F40
-sub_8195F40: ; 8195F40
+sub_8195F40: @ 8195F40
 	push {lr}
 	ldr r1, =0x0203cd80
 	ldrb r0, [r1, 0x6]
@@ -755108,7 +755108,7 @@ _08195F62:
 	thumb_func_end sub_8195F40
 
 	thumb_func_start sub_8195F68
-sub_8195F68: ; 8195F68
+sub_8195F68: @ 8195F68
 	push {r4,lr}
 	bl sub_8195FCC
 	adds r4, r0, 0
@@ -755155,7 +755155,7 @@ _08195FC6:
 	thumb_func_end sub_8195F68
 
 	thumb_func_start sub_8195FCC
-sub_8195FCC: ; 8195FCC
+sub_8195FCC: @ 8195FCC
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0
@@ -755181,7 +755181,7 @@ _08195FE8:
 	thumb_func_end sub_8195FCC
 
 	thumb_func_start sub_8195FF8
-sub_8195FF8: ; 8195FF8
+sub_8195FF8: @ 8195FF8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -755216,7 +755216,7 @@ _0819602C:
 	thumb_func_end sub_8195FF8
 
 	thumb_func_start sub_8196034
-sub_8196034: ; 8196034
+sub_8196034: @ 8196034
 	push {lr}
 	ldr r0, =0x0000012f
 	bl FlagGet
@@ -755250,7 +755250,7 @@ _0819607A:
 	thumb_func_end sub_8196034
 
 	thumb_func_start sub_8196080
-sub_8196080: ; 8196080
+sub_8196080: @ 8196080
 	push {lr}
 	ldr r1, =0x0203cd80
 	movs r0, 0x1
@@ -755262,7 +755262,7 @@ sub_8196080: ; 8196080
 	thumb_func_end sub_8196080
 
 	thumb_func_start sub_8196094
-sub_8196094: ; 8196094
+sub_8196094: @ 8196094
 	push {lr}
 	ldr r0, =sub_81960E0
 	bl is_function_an_active_task
@@ -755274,7 +755274,7 @@ sub_8196094: ; 8196094
 	thumb_func_end sub_8196094
 
 	thumb_func_start task_prev_quest
-task_prev_quest: ; 81960A8
+task_prev_quest: @ 81960A8
 	push {lr}
 	ldr r0, =0x0203cd80
 	ldrb r0, [r0, 0x7]
@@ -755296,7 +755296,7 @@ _081960C2:
 	thumb_func_end task_prev_quest
 
 	thumb_func_start sub_81960E0
-sub_81960E0: ; 81960E0
+sub_81960E0: @ 81960E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -755334,7 +755334,7 @@ _0819611E:
 	thumb_func_end sub_81960E0
 
 	thumb_func_start sub_819612C
-sub_819612C: ; 819612C
+sub_819612C: @ 819612C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -755414,7 +755414,7 @@ _081961E6:
 	thumb_func_end sub_819612C
 
 	thumb_func_start sub_81961F0
-sub_81961F0: ; 81961F0
+sub_81961F0: @ 81961F0
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -755472,7 +755472,7 @@ _0819626A:
 	thumb_func_end sub_81961F0
 
 	thumb_func_start sub_8196274
-sub_8196274: ; 8196274
+sub_8196274: @ 8196274
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -755502,7 +755502,7 @@ _081962A4:
 	thumb_func_end sub_8196274
 
 	thumb_func_start sub_81962B0
-sub_81962B0: ; 81962B0
+sub_81962B0: @ 81962B0
 	push {lr}
 	movs r1, 0xC0
 	lsls r1, 3
@@ -755525,7 +755525,7 @@ _081962D2:
 	thumb_func_end sub_81962B0
 
 	thumb_func_start sub_81962D8
-sub_81962D8: ; 81962D8
+sub_81962D8: @ 81962D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -755566,7 +755566,7 @@ _0819632A:
 	thumb_func_end sub_81962D8
 
 	thumb_func_start sub_8196330
-sub_8196330: ; 8196330
+sub_8196330: @ 8196330
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -755611,7 +755611,7 @@ _0819638A:
 	thumb_func_end sub_8196330
 
 	thumb_func_start sub_8196390
-sub_8196390: ; 8196390
+sub_8196390: @ 8196390
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -755657,7 +755657,7 @@ _081963E8:
 	thumb_func_end sub_8196390
 
 	thumb_func_start sub_81963F0
-sub_81963F0: ; 81963F0
+sub_81963F0: @ 81963F0
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -755704,7 +755704,7 @@ _08196456:
 	thumb_func_end sub_81963F0
 
 	thumb_func_start sub_819645C
-sub_819645C: ; 819645C
+sub_819645C: @ 819645C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -755883,7 +755883,7 @@ sub_819645C: ; 819645C
 	thumb_func_end sub_819645C
 
 	thumb_func_start sub_81965D8
-sub_81965D8: ; 81965D8
+sub_81965D8: @ 81965D8
 	push {lr}
 	sub sp, 0x10
 	str r1, [sp]
@@ -755939,7 +755939,7 @@ sub_81965D8: ; 81965D8
 	thumb_func_end sub_81965D8
 
 	thumb_func_start sub_8196648
-sub_8196648: ; 8196648
+sub_8196648: @ 8196648
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030022c0
@@ -755976,7 +755976,7 @@ _08196678:
 	thumb_func_end sub_8196648
 
 	thumb_func_start sub_8196694
-sub_8196694: ; 8196694
+sub_8196694: @ 8196694
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -756036,7 +756036,7 @@ _081966FC:
 	thumb_func_end sub_8196694
 
 	thumb_func_start sub_8196710
-sub_8196710: ; 8196710
+sub_8196710: @ 8196710
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
 	ldr r2, =0x000009ca
@@ -756051,7 +756051,7 @@ sub_8196710: ; 8196710
 	thumb_func_end sub_8196710
 
 	thumb_func_start sub_819672C
-sub_819672C: ; 819672C
+sub_819672C: @ 819672C
 	push {lr}
 	ldr r1, =gUnknown_085500A4
 	lsls r0, 4
@@ -756067,7 +756067,7 @@ sub_819672C: ; 819672C
 	thumb_func_end sub_819672C
 
 	thumb_func_start sub_8196748
-sub_8196748: ; 8196748
+sub_8196748: @ 8196748
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r6, 0
@@ -756092,7 +756092,7 @@ _0819675E:
 	thumb_func_end sub_8196748
 
 	thumb_func_start sub_8196774
-sub_8196774: ; 8196774
+sub_8196774: @ 8196774
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	movs r4, 0
@@ -756124,7 +756124,7 @@ _081967A4:
 	thumb_func_end sub_8196774
 
 	thumb_func_start sub_81967AC
-sub_81967AC: ; 81967AC
+sub_81967AC: @ 81967AC
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	movs r7, 0
@@ -756193,7 +756193,7 @@ _08196832:
 	thumb_func_end sub_81967AC
 
 	thumb_func_start sub_8196844
-sub_8196844: ; 8196844
+sub_8196844: @ 8196844
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -756213,7 +756213,7 @@ _0819685C:
 	thumb_func_end sub_8196844
 
 	thumb_func_start sub_8196864
-sub_8196864: ; 8196864
+sub_8196864: @ 8196864
 	ldr r2, =gUnknown_0860DEB8
 	lsls r1, r0, 2
 	adds r1, r0
@@ -756236,7 +756236,7 @@ sub_8196864: ; 8196864
 	thumb_func_end sub_8196864
 
 	thumb_func_start sub_8196890
-sub_8196890: ; 8196890
+sub_8196890: @ 8196890
 	ldr r2, =gUnknown_0860DEB8
 	lsls r1, r0, 2
 	adds r1, r0
@@ -756259,7 +756259,7 @@ sub_8196890: ; 8196890
 	thumb_func_end sub_8196890
 
 	thumb_func_start sub_81968BC
-sub_81968BC: ; 81968BC
+sub_81968BC: @ 81968BC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GenerateRandomNumber
@@ -756300,7 +756300,7 @@ _081968EC:
 	thumb_func_end sub_81968BC
 
 	thumb_func_start sub_8196910
-sub_8196910: ; 8196910
+sub_8196910: @ 8196910
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -756403,7 +756403,7 @@ _081969D0:
 	thumb_func_end sub_8196910
 
 	thumb_func_start sub_81969E0
-sub_81969E0: ; 81969E0
+sub_81969E0: @ 81969E0
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -756418,7 +756418,7 @@ sub_81969E0: ; 81969E0
 	thumb_func_end sub_81969E0
 
 	thumb_func_start sub_81969FC
-sub_81969FC: ; 81969FC
+sub_81969FC: @ 81969FC
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	adds r6, r1, 0
@@ -756446,7 +756446,7 @@ _08196A1A:
 	thumb_func_end sub_81969FC
 
 	thumb_func_start sub_8196A2C
-sub_8196A2C: ; 8196A2C
+sub_8196A2C: @ 8196A2C
 	push {lr}
 	ldr r3, =gUnknown_0860EFAC
 	lsls r1, 2
@@ -756460,7 +756460,7 @@ sub_8196A2C: ; 8196A2C
 	thumb_func_end sub_8196A2C
 
 	thumb_func_start sub_8196A44
-sub_8196A44: ; 8196A44
+sub_8196A44: @ 8196A44
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	ldr r2, =gUnknown_0860DEB8
@@ -756492,7 +756492,7 @@ _08196A78:
 	lsls r1, r4, 2
 	adds r1, r4
 	lsls r1, 3
-	ldr r0, =gTrainers + 0x4 ; name offset
+	ldr r0, =gTrainers + 0x4 @ name offset
 	adds r1, r0
 	adds r0, r5, 0
 	bl CopyString
@@ -756504,7 +756504,7 @@ _08196A90:
 	thumb_func_end sub_8196A44
 
 	thumb_func_start sub_8196A9C
-sub_8196A9C: ; 8196A9C
+sub_8196A9C: @ 8196A9C
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_819672C
@@ -756520,7 +756520,7 @@ sub_8196A9C: ; 8196A9C
 	thumb_func_end sub_8196A9C
 
 	thumb_func_start sub_8196AB8
-sub_8196AB8: ; 8196AB8
+sub_8196AB8: @ 8196AB8
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -756609,7 +756609,7 @@ _08196B4A:
 	thumb_func_end sub_8196AB8
 
 	thumb_func_start sub_8196B50
-sub_8196B50: ; 8196B50
+sub_8196B50: @ 8196B50
 	push {lr}
 	bl GenerateRandomNumber
 	lsls r0, 16
@@ -756651,7 +756651,7 @@ _08196B92:
 	thumb_func_end sub_8196B50
 
 	thumb_func_start sub_8196B98
-sub_8196B98: ; 8196B98
+sub_8196B98: @ 8196B98
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -756758,7 +756758,7 @@ _08196C62:
 	thumb_func_end sub_8196B98
 
 	thumb_func_start sub_8196C70
-sub_8196C70: ; 8196C70
+sub_8196C70: @ 8196C70
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	ldr r2, =gUnknown_0860DEB8
@@ -756822,7 +756822,7 @@ _08196CD6:
 	thumb_func_end sub_8196C70
 
 	thumb_func_start sub_8196CF4
-sub_8196CF4: ; 8196CF4
+sub_8196CF4: @ 8196CF4
 	push {lr}
 	adds r0, r1, 0
 	ldr r2, =gUnknown_0860EFF4
@@ -756838,7 +756838,7 @@ sub_8196CF4: ; 8196CF4
 	thumb_func_end sub_8196CF4
 
 	thumb_func_start sub_8196D14
-sub_8196D14: ; 8196D14
+sub_8196D14: @ 8196D14
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	movs r4, 0
@@ -756869,7 +756869,7 @@ _08196D34:
 	thumb_func_end sub_8196D14
 
 	thumb_func_start sub_8196D4C
-sub_8196D4C: ; 8196D4C
+sub_8196D4C: @ 8196D4C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gUnknown_0860F010
@@ -756894,7 +756894,7 @@ _08196D6C:
 	thumb_func_end sub_8196D4C
 
 	thumb_func_start sub_8196D74
-sub_8196D74: ; 8196D74
+sub_8196D74: @ 8196D74
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -756955,7 +756955,7 @@ _08196DF6:
 	thumb_func_end sub_8196D74
 
 	thumb_func_start sub_8196E04
-sub_8196E04: ; 8196E04
+sub_8196E04: @ 8196E04
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -757156,7 +757156,7 @@ _08196F7E:
 	thumb_func_end sub_8196E04
 
 	thumb_func_start sub_8196F90
-sub_8196F90: ; 8196F90
+sub_8196F90: @ 8196F90
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -757298,7 +757298,7 @@ _0819707A:
 	thumb_func_end sub_8196F90
 
 	thumb_func_start sub_8197080
-sub_8197080: ; 8197080
+sub_8197080: @ 8197080
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -757406,7 +757406,7 @@ _0819715C:
 	thumb_func_end sub_8197080
 
 	thumb_func_start sub_8197184
-sub_8197184: ; 8197184
+sub_8197184: @ 8197184
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -757436,7 +757436,7 @@ sub_8197184: ; 8197184
 	thumb_func_end sub_8197184
 
 	thumb_func_start sub_81971C4
-sub_81971C4: ; 81971C4
+sub_81971C4: @ 81971C4
 	push {lr}
 	bl sub_819645C
 	pop {r0}
@@ -757444,7 +757444,7 @@ sub_81971C4: ; 81971C4
 	thumb_func_end sub_81971C4
 
 	thumb_func_start sub_81971D0
-sub_81971D0: ; 81971D0
+sub_81971D0: @ 81971D0
 	push {lr}
 	ldr r0, =gUnknown_0860F098
 	bl InitWindows
@@ -757459,7 +757459,7 @@ sub_81971D0: ; 81971D0
 	thumb_func_end sub_81971D0
 
 	thumb_func_start sub_81971F4
-sub_81971F4: ; 81971F4
+sub_81971F4: @ 81971F4
 	push {lr}
 	bl FreeAllWindowBuffers
 	pop {r0}
@@ -757467,7 +757467,7 @@ sub_81971F4: ; 81971F4
 	thumb_func_end sub_81971F4
 
 	thumb_func_start sub_8197200
-sub_8197200: ; 8197200
+sub_8197200: @ 8197200
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -757484,7 +757484,7 @@ sub_8197200: ; 8197200
 	thumb_func_end sub_8197200
 
 	thumb_func_start sub_8197224
-sub_8197224: ; 8197224
+sub_8197224: @ 8197224
 	push {lr}
 	bl RunTextPrinters
 	movs r0, 0
@@ -757496,8 +757496,8 @@ sub_8197224: ; 8197224
 	thumb_func_end sub_8197224
 
 	thumb_func_start AddTextPrinterParametrized
-; u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
-AddTextPrinterParametrized: ; 8197238
+@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
+AddTextPrinterParametrized: @ 8197238
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -757569,8 +757569,8 @@ AddTextPrinterParametrized: ; 8197238
 	thumb_func_end AddTextPrinterParametrized
 
 	thumb_func_start AddTextPrinterForMessage
-; void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
-AddTextPrinterForMessage: ; 81972C4
+@ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
+AddTextPrinterForMessage: @ 81972C4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -757607,8 +757607,8 @@ AddTextPrinterForMessage: ; 81972C4
 	thumb_func_end AddTextPrinterForMessage
 
 	thumb_func_start AddTextPrinterForMessage_2
-; void AddTextPrinterForMessage_2(u8 allowSkippingDelayWithButtonPress)
-AddTextPrinterForMessage_2: ; 8197310
+@ void AddTextPrinterForMessage_2(u8 allowSkippingDelayWithButtonPress)
+AddTextPrinterForMessage_2: @ 8197310
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -757645,8 +757645,8 @@ AddTextPrinterForMessage_2: ; 8197310
 	thumb_func_end AddTextPrinterForMessage_2
 
 	thumb_func_start AddTextPrinterWithCustomSpeedForMessage
-; void AddTextPrinterWithCustomSpeedForMessage(u8 allowSkippingDelayWithButtonPress, u8 speed)
-AddTextPrinterWithCustomSpeedForMessage: ; 819735C
+@ void AddTextPrinterWithCustomSpeedForMessage(u8 allowSkippingDelayWithButtonPress, u8 speed)
+AddTextPrinterWithCustomSpeedForMessage: @ 819735C
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r3, r1, 0
@@ -757682,7 +757682,7 @@ AddTextPrinterWithCustomSpeedForMessage: ; 819735C
 	thumb_func_end AddTextPrinterWithCustomSpeedForMessage
 
 	thumb_func_start sub_81973A4
-sub_81973A4: ; 81973A4
+sub_81973A4: @ 81973A4
 	push {lr}
 	movs r1, 0x80
 	lsls r1, 2
@@ -757699,7 +757699,7 @@ sub_81973A4: ; 81973A4
 	thumb_func_end sub_81973A4
 
 	thumb_func_start sub_81973C4
-sub_81973C4: ; 81973C4
+sub_81973C4: @ 81973C4
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -757727,7 +757727,7 @@ _081973F2:
 	thumb_func_end sub_81973C4
 
 	thumb_func_start sub_81973FC
-sub_81973FC: ; 81973FC
+sub_81973FC: @ 81973FC
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -757755,7 +757755,7 @@ _0819742A:
 	thumb_func_end sub_81973FC
 
 	thumb_func_start sub_8197434
-sub_8197434: ; 8197434
+sub_8197434: @ 8197434
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -757783,7 +757783,7 @@ _08197462:
 	thumb_func_end sub_8197434
 
 	thumb_func_start sub_819746C
-sub_819746C: ; 819746C
+sub_819746C: @ 819746C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -757811,7 +757811,7 @@ _0819749A:
 	thumb_func_end sub_819746C
 
 	thumb_func_start sub_81974A4
-sub_81974A4: ; 81974A4
+sub_81974A4: @ 81974A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -757966,7 +757966,7 @@ _08197578:
 	thumb_func_end sub_81974A4
 
 	thumb_func_start sub_81975F4
-sub_81975F4: ; 81975F4
+sub_81975F4: @ 81975F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -758161,7 +758161,7 @@ sub_81975F4: ; 81975F4
 	thumb_func_end sub_81975F4
 
 	thumb_func_start sub_81977BC
-sub_81977BC: ; 81977BC
+sub_81977BC: @ 81977BC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -758200,7 +758200,7 @@ sub_81977BC: ; 81977BC
 	thumb_func_end sub_81977BC
 
 	thumb_func_start sub_8197804
-sub_8197804: ; 8197804
+sub_8197804: @ 8197804
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -758243,8 +758243,8 @@ sub_8197804: ; 8197804
 	thumb_func_end sub_8197804
 
 	thumb_func_start SetStandardWindowBorderStyle
-; void SetStandardWindowBorderStyle(u8 windowId, bool copyToVram)
-SetStandardWindowBorderStyle: ; 8197854
+@ void SetStandardWindowBorderStyle(u8 windowId, bool copyToVram)
+SetStandardWindowBorderStyle: @ 8197854
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -758259,7 +758259,7 @@ SetStandardWindowBorderStyle: ; 8197854
 	thumb_func_end SetStandardWindowBorderStyle
 
 	thumb_func_start sub_819786C
-sub_819786C: ; 819786C
+sub_819786C: @ 819786C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -758284,7 +758284,7 @@ sub_819786C: ; 819786C
 	thumb_func_end sub_819786C
 
 	thumb_func_start sub_819789C
-sub_819789C: ; 819789C
+sub_819789C: @ 819789C
 	push {lr}
 	ldr r0, =gUnknown_0860F074
 	movs r1, 0xE0
@@ -758296,7 +758296,7 @@ sub_819789C: ; 819789C
 	thumb_func_end sub_819789C
 
 	thumb_func_start sub_81978B0
-sub_81978B0: ; 81978B0
+sub_81978B0: @ 81978B0
 	push {lr}
 	adds r1, r0, 0
 	lsls r1, 16
@@ -758310,14 +758310,14 @@ sub_81978B0: ; 81978B0
 	thumb_func_end sub_81978B0
 
 	thumb_func_start sub_81978C8
-sub_81978C8: ; 81978C8
+sub_81978C8: @ 81978C8
 	ldr r0, =gUnknown_0860F074
 	bx lr
 	.pool
 	thumb_func_end sub_81978C8
 
 	thumb_func_start sub_81978D0
-sub_81978D0: ; 81978D0
+sub_81978D0: @ 81978D0
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -758335,8 +758335,8 @@ _081978DC:
 	thumb_func_end sub_81978D0
 
 	thumb_func_start DisplayItemMessageOnField
-; void DisplayItemMessageOnField(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
-DisplayItemMessageOnField: ; 81978EC
+@ void DisplayItemMessageOnField(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
+DisplayItemMessageOnField: @ 81978EC
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -758369,7 +758369,7 @@ DisplayItemMessageOnField: ; 81978EC
 	thumb_func_end DisplayItemMessageOnField
 
 	thumb_func_start sub_8197930
-sub_8197930: ; 8197930
+sub_8197930: @ 8197930
 	push {lr}
 	ldr r0, =gUnknown_0860F0A8
 	movs r1, 0x85
@@ -758383,7 +758383,7 @@ sub_8197930: ; 8197930
 	thumb_func_end sub_8197930
 
 	thumb_func_start sub_8197948
-sub_8197948: ; 8197948
+sub_8197948: @ 8197948
 	push {lr}
 	adds r3, r0, 0
 	lsls r3, 24
@@ -758399,7 +758399,7 @@ sub_8197948: ; 8197948
 	thumb_func_end sub_8197948
 
 	thumb_func_start sub_8197964
-sub_8197964: ; 8197964
+sub_8197964: @ 8197964
 	push {lr}
 	ldr r0, =0x03003014
 	ldrb r1, [r0]
@@ -758422,7 +758422,7 @@ _0819798A:
 	thumb_func_end sub_8197964
 
 	thumb_func_start sav2_get_text_speed
-sav2_get_text_speed: ; 8197990
+sav2_get_text_speed: @ 8197990
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -758448,7 +758448,7 @@ _081979AC:
 	thumb_func_end sav2_get_text_speed
 
 	thumb_func_start sub_81979C4
-sub_81979C4: ; 81979C4
+sub_81979C4: @ 81979C4
 	push {r4,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -758483,7 +758483,7 @@ _081979F6:
 	thumb_func_end sub_81979C4
 
 	thumb_func_start get_start_menu_window_id_maybe
-get_start_menu_window_id_maybe: ; 8197A08
+get_start_menu_window_id_maybe: @ 8197A08
 	ldr r0, =0x0203cd8c
 	ldrb r0, [r0]
 	bx lr
@@ -758491,7 +758491,7 @@ get_start_menu_window_id_maybe: ; 8197A08
 	thumb_func_end get_start_menu_window_id_maybe
 
 	thumb_func_start remove_start_menu_window_maybe
-remove_start_menu_window_maybe: ; 8197A14
+remove_start_menu_window_maybe: @ 8197A14
 	push {r4,lr}
 	ldr r4, =0x0203cd8c
 	ldrb r0, [r4]
@@ -758508,21 +758508,21 @@ _08197A26:
 	thumb_func_end remove_start_menu_window_maybe
 
 	thumb_func_start sub_8197A30
-sub_8197A30: ; 8197A30
+sub_8197A30: @ 8197A30
 	movs r0, 0x80
 	lsls r0, 2
 	bx lr
 	thumb_func_end sub_8197A30
 
 	thumb_func_start sub_8197A38
-sub_8197A38: ; 8197A38
+sub_8197A38: @ 8197A38
 	movs r0, 0x85
 	lsls r0, 2
 	bx lr
 	thumb_func_end sub_8197A38
 
 	thumb_func_start AddMapNamePopUpWindow
-AddMapNamePopUpWindow: ; 8197A40
+AddMapNamePopUpWindow: @ 8197A40
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r4, =0x0203cd8d
@@ -758551,7 +758551,7 @@ _08197A66:
 	thumb_func_end AddMapNamePopUpWindow
 
 	thumb_func_start GetMapNamePopUpWindowId
-GetMapNamePopUpWindowId: ; 8197A74
+GetMapNamePopUpWindowId: @ 8197A74
 	ldr r0, =0x0203cd8d
 	ldrb r0, [r0]
 	bx lr
@@ -758559,7 +758559,7 @@ GetMapNamePopUpWindowId: ; 8197A74
 	thumb_func_end GetMapNamePopUpWindowId
 
 	thumb_func_start RemoveMapNamePopUpWindow
-RemoveMapNamePopUpWindow: ; 8197A80
+RemoveMapNamePopUpWindow: @ 8197A80
 	push {r4,lr}
 	ldr r4, =0x0203cd8d
 	ldrb r0, [r4]
@@ -758576,8 +758576,8 @@ _08197A92:
 	thumb_func_end RemoveMapNamePopUpWindow
 
 	thumb_func_start AddTextPrinterWithCallbackForMessage
-; void AddTextPrinterWithCallbackForMessage(u8 allowSkippingDelayWithButtonPress, void ( *callback)(u16, struct TextPrinter *))
-AddTextPrinterWithCallbackForMessage: ; 8197A9C
+@ void AddTextPrinterWithCallbackForMessage(u8 allowSkippingDelayWithButtonPress, void ( *callback)(u16, struct TextPrinter *))
+AddTextPrinterWithCallbackForMessage: @ 8197A9C
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r1, 0
@@ -758614,7 +758614,7 @@ AddTextPrinterWithCallbackForMessage: ; 8197A9C
 	thumb_func_end AddTextPrinterWithCallbackForMessage
 
 	thumb_func_start sub_8197AE8
-sub_8197AE8: ; 8197AE8
+sub_8197AE8: @ 8197AE8
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -758642,7 +758642,7 @@ _08197B12:
 	thumb_func_end sub_8197AE8
 
 	thumb_func_start sub_8197B1C
-sub_8197B1C: ; 8197B1C
+sub_8197B1C: @ 8197B1C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -758674,7 +758674,7 @@ _08197B52:
 	thumb_func_end sub_8197B1C
 
 	thumb_func_start sub_8197B64
-sub_8197B64: ; 8197B64
+sub_8197B64: @ 8197B64
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -758709,7 +758709,7 @@ _08197BA2:
 	thumb_func_end sub_8197B64
 
 	thumb_func_start sub_8197BB4
-sub_8197BB4: ; 8197BB4
+sub_8197BB4: @ 8197BB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -758976,7 +758976,7 @@ sub_8197BB4: ; 8197BB4
 	thumb_func_end sub_8197BB4
 
 	thumb_func_start sub_8197DF8
-sub_8197DF8: ; 8197DF8
+sub_8197DF8: @ 8197DF8
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -759004,7 +759004,7 @@ _08197E26:
 	thumb_func_end sub_8197DF8
 
 	thumb_func_start sub_8197E30
-sub_8197E30: ; 8197E30
+sub_8197E30: @ 8197E30
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -759046,8 +759046,8 @@ sub_8197E30: ; 8197E30
 	thumb_func_end sub_8197E30
 
 	thumb_func_start SetWindowBorderStyle
-; void SetWindowBorderStyle(u8 windowId, bool copyToVram, s16 tileStart, s8 palette)
-SetWindowBorderStyle: ; 8197E80
+@ void SetWindowBorderStyle(u8 windowId, bool copyToVram, s16 tileStart, s8 palette)
+SetWindowBorderStyle: @ 8197E80
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -759079,7 +759079,7 @@ _08197EB6:
 	thumb_func_end SetWindowBorderStyle
 
 	thumb_func_start sub_8197EC8
-sub_8197EC8: ; 8197EC8
+sub_8197EC8: @ 8197EC8
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -759114,7 +759114,7 @@ _08197F06:
 	thumb_func_end sub_8197EC8
 
 	thumb_func_start DrawWindowBorder
-DrawWindowBorder: ; 8197F18
+DrawWindowBorder: @ 8197F18
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -759278,7 +759278,7 @@ DrawWindowBorder: ; 8197F18
 	thumb_func_end DrawWindowBorder
 
 	thumb_func_start sub_8198070
-sub_8198070: ; 8198070
+sub_8198070: @ 8198070
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -759306,7 +759306,7 @@ _0819809E:
 	thumb_func_end sub_8198070
 
 	thumb_func_start sub_81980A8
-sub_81980A8: ; 81980A8
+sub_81980A8: @ 81980A8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -759344,7 +759344,7 @@ sub_81980A8: ; 81980A8
 	thumb_func_end sub_81980A8
 
 	thumb_func_start sub_81980F0
-sub_81980F0: ; 81980F0
+sub_81980F0: @ 81980F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -759415,7 +759415,7 @@ _0819815C:
 	thumb_func_end sub_81980F0
 
 	thumb_func_start sub_8198180
-sub_8198180: ; 8198180
+sub_8198180: @ 8198180
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -759476,7 +759476,7 @@ _081981EE:
 	thumb_func_end sub_8198180
 
 	thumb_func_start sub_8198204
-sub_8198204: ; 8198204
+sub_8198204: @ 8198204
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -759581,7 +759581,7 @@ _081982C8:
 	thumb_func_end sub_8198204
 
 	thumb_func_start sub_81982D8
-sub_81982D8: ; 81982D8
+sub_81982D8: @ 81982D8
 	push {lr}
 	ldr r1, =0x0203cda0
 	ldrb r0, [r1]
@@ -759596,7 +759596,7 @@ _081982E8:
 	thumb_func_end sub_81982D8
 
 	thumb_func_start sub_81982F0
-sub_81982F0: ; 81982F0
+sub_81982F0: @ 81982F0
 	push {r4,lr}
 	ldr r4, =0x0203cda0
 	ldrb r0, [r4]
@@ -759615,7 +759615,7 @@ _08198308:
 	thumb_func_end sub_81982F0
 
 	thumb_func_start sub_8198314
-sub_8198314: ; 8198314
+sub_8198314: @ 8198314
 	push {r4,lr}
 	ldr r4, =0x0203cda0
 	ldrb r0, [r4]
@@ -759640,7 +759640,7 @@ _0819833C:
 	thumb_func_end sub_8198314
 
 	thumb_func_start sub_8198348
-sub_8198348: ; 8198348
+sub_8198348: @ 8198348
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -759693,7 +759693,7 @@ _08198392:
 	thumb_func_end sub_8198348
 
 	thumb_func_start sub_81983AC
-sub_81983AC: ; 81983AC
+sub_81983AC: @ 81983AC
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r4, [sp, 0x20]
@@ -759728,7 +759728,7 @@ sub_81983AC: ; 81983AC
 	thumb_func_end sub_81983AC
 
 	thumb_func_start sub_81983EC
-sub_81983EC: ; 81983EC
+sub_81983EC: @ 81983EC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -759776,8 +759776,8 @@ sub_81983EC: ; 81983EC
 	thumb_func_end sub_81983EC
 
 	thumb_func_start RedrawMenuCursor
-; void RedrawMenuCursor(s8 oldPos, s8 newPos)
-RedrawMenuCursor: ; 8198448
+@ void RedrawMenuCursor(s8 oldPos, s8 newPos)
+RedrawMenuCursor: @ 8198448
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -759846,8 +759846,8 @@ RedrawMenuCursor: ; 8198448
 	thumb_func_end RedrawMenuCursor
 
 	thumb_func_start MoveMenuCursor
-; s8 MoveMenuCursor(s8 cursorDelta)
-MoveMenuCursor: ; 81984D8
+@ s8 MoveMenuCursor(s8 cursorDelta)
+MoveMenuCursor: @ 81984D8
 	push {r4,r5,lr}
 	ldr r1, =0x0203cd90
 	ldrb r5, [r1, 0x2]
@@ -759885,8 +759885,8 @@ _0819850A:
 	thumb_func_end MoveMenuCursor
 
 	thumb_func_start MoveMenuCursorNoWrapAround
-; s8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
-MoveMenuCursorNoWrapAround: ; 819851C
+@ s8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
+MoveMenuCursorNoWrapAround: @ 819851C
 	push {r4,r5,lr}
 	ldr r1, =0x0203cd90
 	ldrb r5, [r1, 0x2]
@@ -759924,7 +759924,7 @@ _0819854E:
 	thumb_func_end MoveMenuCursorNoWrapAround
 
 	thumb_func_start GetMenuCursorPos
-GetMenuCursorPos: ; 8198560
+GetMenuCursorPos: @ 8198560
 	ldr r0, =0x0203cd90
 	ldrb r0, [r0, 0x2]
 	bx lr
@@ -759932,7 +759932,7 @@ GetMenuCursorPos: ; 8198560
 	thumb_func_end GetMenuCursorPos
 
 	thumb_func_start ProcessMenuInput
-ProcessMenuInput: ; 819856C
+ProcessMenuInput: @ 819856C
 	push {r4,lr}
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
@@ -759989,8 +759989,8 @@ _081985D2:
 	thumb_func_end ProcessMenuInput
 
 	thumb_func_start ProcessMenuInputNoWrapAround
-; int ProcessMenuInputNoWrapAround()
-ProcessMenuInputNoWrapAround: ; 81985D8
+@ int ProcessMenuInputNoWrapAround()
+ProcessMenuInputNoWrapAround: @ 81985D8
 	push {r4-r6,lr}
 	ldr r4, =0x0203cd90
 	ldrb r5, [r4, 0x2]
@@ -760056,7 +760056,7 @@ _08198650:
 	thumb_func_end ProcessMenuInputNoWrapAround
 
 	thumb_func_start ProcessMenuInput_other
-ProcessMenuInput_other: ; 8198658
+ProcessMenuInput_other: @ 8198658
 	push {r4,lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x2E]
@@ -760112,7 +760112,7 @@ _081986BC:
 	thumb_func_end ProcessMenuInput_other
 
 	thumb_func_start ProcessMenuInputNoWrapAround_other
-ProcessMenuInputNoWrapAround_other: ; 81986C4
+ProcessMenuInputNoWrapAround_other: @ 81986C4
 	push {r4-r6,lr}
 	ldr r4, =0x0203cd90
 	ldrb r5, [r4, 0x2]
@@ -760177,7 +760177,7 @@ _0819873A:
 	thumb_func_end ProcessMenuInputNoWrapAround_other
 
 	thumb_func_start PrintTextArray
-PrintTextArray: ; 8198740
+PrintTextArray: @ 8198740
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -760243,7 +760243,7 @@ _081987A4:
 	thumb_func_end PrintTextArray
 
 	thumb_func_start sub_81987BC
-sub_81987BC: ; 81987BC
+sub_81987BC: @ 81987BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -760323,7 +760323,7 @@ _0819883C:
 	thumb_func_end sub_81987BC
 
 	thumb_func_start sub_8198854
-sub_8198854: ; 8198854
+sub_8198854: @ 8198854
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -760364,7 +760364,7 @@ sub_8198854: ; 8198854
 	thumb_func_end sub_8198854
 
 	thumb_func_start AddItemMenuActionTextPrinters
-AddItemMenuActionTextPrinters: ; 81988A4
+AddItemMenuActionTextPrinters: @ 81988A4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -760500,7 +760500,7 @@ _0819899E:
 	thumb_func_end AddItemMenuActionTextPrinters
 
 	thumb_func_start sub_81989B8
-sub_81989B8: ; 81989B8
+sub_81989B8: @ 81989B8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -760555,8 +760555,8 @@ sub_81989B8: ; 81989B8
 	thumb_func_end sub_81989B8
 
 	thumb_func_start rbox_template_set
-; void rbox_template_set(WindowTemplate *template, char bg_id, char x, char y, char w, char h, char a7, s16 a8)
-rbox_template_set: ; 8198A24
+@ void rbox_template_set(WindowTemplate *template, char bg_id, char x, char y, char w, char h, char a7, s16 a8)
+rbox_template_set: @ 8198A24
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -760581,7 +760581,7 @@ rbox_template_set: ; 8198A24
 	thumb_func_end rbox_template_set
 
 	thumb_func_start sub_8198A50
-sub_8198A50: ; 8198A50
+sub_8198A50: @ 8198A50
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -760626,7 +760626,7 @@ sub_8198A50: ; 8198A50
 	thumb_func_end sub_8198A50
 
 	thumb_func_start sub_8198AA4
-sub_8198AA4: ; 8198AA4
+sub_8198AA4: @ 8198AA4
 	push {r4-r6,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -760669,7 +760669,7 @@ sub_8198AA4: ; 8198AA4
 	thumb_func_end sub_8198AA4
 
 	thumb_func_start sub_8198AF8
-sub_8198AF8: ; 8198AF8
+sub_8198AF8: @ 8198AF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -760816,7 +760816,7 @@ sub_8198AF8: ; 8198AF8
 	thumb_func_end sub_8198AF8
 
 	thumb_func_start sub_8198C34
-sub_8198C34: ; 8198C34
+sub_8198C34: @ 8198C34
 	push {lr}
 	sub sp, 0xC
 	lsls r1, 24
@@ -760837,7 +760837,7 @@ sub_8198C34: ; 8198C34
 	thumb_func_end sub_8198C34
 
 	thumb_func_start sub_8198C58
-sub_8198C58: ; 8198C58
+sub_8198C58: @ 8198C58
 	push {r4,lr}
 	bl ProcessMenuInputNoWrapAround
 	lsls r0, 24
@@ -760855,7 +760855,7 @@ _08198C6E:
 	thumb_func_end sub_8198C58
 
 	thumb_func_start sub_8198C78
-sub_8198C78: ; 8198C78
+sub_8198C78: @ 8198C78
 	push {r4,lr}
 	ldr r4, =0x0203cd9f
 	ldrb r0, [r4]
@@ -760870,7 +760870,7 @@ sub_8198C78: ; 8198C78
 	thumb_func_end sub_8198C78
 
 	thumb_func_start sub_8198C94
-sub_8198C94: ; 8198C94
+sub_8198C94: @ 8198C94
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -760971,7 +760971,7 @@ _08198D3A:
 	thumb_func_end sub_8198C94
 
 	thumb_func_start sub_8198D54
-sub_8198D54: ; 8198D54
+sub_8198D54: @ 8198D54
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -761025,7 +761025,7 @@ sub_8198D54: ; 8198D54
 	thumb_func_end sub_8198D54
 
 	thumb_func_start sub_8198DBC
-sub_8198DBC: ; 8198DBC
+sub_8198DBC: @ 8198DBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -761181,7 +761181,7 @@ _08198EDE:
 	thumb_func_end sub_8198DBC
 
 	thumb_func_start sub_8198EF8
-sub_8198EF8: ; 8198EF8
+sub_8198EF8: @ 8198EF8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -761230,7 +761230,7 @@ sub_8198EF8: ; 8198EF8
 	thumb_func_end sub_8198EF8
 
 	thumb_func_start sub_8198F58
-sub_8198F58: ; 8198F58
+sub_8198F58: @ 8198F58
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -761296,7 +761296,7 @@ _08198FB6:
 	thumb_func_end sub_8198F58
 
 	thumb_func_start sub_8198FD4
-sub_8198FD4: ; 8198FD4
+sub_8198FD4: @ 8198FD4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -761367,7 +761367,7 @@ sub_8198FD4: ; 8198FD4
 	thumb_func_end sub_8198FD4
 
 	thumb_func_start sub_8199060
-sub_8199060: ; 8199060
+sub_8199060: @ 8199060
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -761466,7 +761466,7 @@ sub_8199060: ; 8199060
 	thumb_func_end sub_8199060
 
 	thumb_func_start sub_8199134
-sub_8199134: ; 8199134
+sub_8199134: @ 8199134
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -761571,7 +761571,7 @@ _081991E8:
 	thumb_func_end sub_8199134
 
 	thumb_func_start sub_81991F8
-sub_81991F8: ; 81991F8
+sub_81991F8: @ 81991F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -761643,7 +761643,7 @@ _08199276:
 	thumb_func_end sub_81991F8
 
 	thumb_func_start sub_8199284
-sub_8199284: ; 8199284
+sub_8199284: @ 8199284
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldrh r1, [r4, 0x2E]
@@ -761733,7 +761733,7 @@ _0819932C:
 	thumb_func_end sub_8199284
 
 	thumb_func_start sub_8199334
-sub_8199334: ; 8199334
+sub_8199334: @ 8199334
 	push {r4-r6,lr}
 	ldr r5, =0x0203cd90
 	ldrb r4, [r5, 0x2]
@@ -761821,7 +761821,7 @@ _081993D2:
 	thumb_func_end sub_8199334
 
 	thumb_func_start sub_81993D8
-sub_81993D8: ; 81993D8
+sub_81993D8: @ 81993D8
 	push {r4,r5,lr}
 	ldr r4, =0x030022c0
 	ldrh r1, [r4, 0x2E]
@@ -761909,7 +761909,7 @@ _0819947C:
 	thumb_func_end sub_81993D8
 
 	thumb_func_start sub_8199484
-sub_8199484: ; 8199484
+sub_8199484: @ 8199484
 	push {r4-r6,lr}
 	ldr r6, =0x0203cd90
 	ldrb r4, [r6, 0x2]
@@ -761995,8 +761995,8 @@ _0819951E:
 	thumb_func_end sub_8199484
 
 	thumb_func_start InitMenuInUpperLeftCorner
-; int InitMenuInUpperLeftCorner(s8 windowId, s8 numItems, u8 initialCursorPos, bool doNotPlaySoundWhenAPressed)
-InitMenuInUpperLeftCorner: ; 8199524
+@ int InitMenuInUpperLeftCorner(s8 windowId, s8 numItems, u8 initialCursorPos, bool doNotPlaySoundWhenAPressed)
+InitMenuInUpperLeftCorner: @ 8199524
 	push {r4-r6,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -762038,7 +762038,7 @@ _0819955E:
 	thumb_func_end InitMenuInUpperLeftCorner
 
 	thumb_func_start InitMenuInUpperLeftCornerPlaySoundWhenAPressed
-InitMenuInUpperLeftCornerPlaySoundWhenAPressed: ; 8199570
+InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 8199570
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -762055,7 +762055,7 @@ InitMenuInUpperLeftCornerPlaySoundWhenAPressed: ; 8199570
 	thumb_func_end InitMenuInUpperLeftCornerPlaySoundWhenAPressed
 
 	thumb_func_start PrintMenuTable
-PrintMenuTable: ; 819958C
+PrintMenuTable: @ 819958C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -762103,7 +762103,7 @@ _081995D0:
 	thumb_func_end PrintMenuTable
 
 	thumb_func_start sub_81995E4
-sub_81995E4: ; 81995E4
+sub_81995E4: @ 81995E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -762212,8 +762212,8 @@ _081996A6:
 	thumb_func_end sub_81995E4
 
 	thumb_func_start CreateYesNoMenu
-; void CreateYesNoMenu(struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos)
-CreateYesNoMenu: ; 81996C0
+@ void CreateYesNoMenu(struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos)
+CreateYesNoMenu: @ 81996C0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -762324,7 +762324,7 @@ CreateYesNoMenu: ; 81996C0
 	thumb_func_end CreateYesNoMenu
 
 	thumb_func_start sub_81997AC
-sub_81997AC: ; 81997AC
+sub_81997AC: @ 81997AC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -762402,7 +762402,7 @@ _08199824:
 	thumb_func_end sub_81997AC
 
 	thumb_func_start sub_819983C
-sub_819983C: ; 819983C
+sub_819983C: @ 819983C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -762535,7 +762535,7 @@ _0819992A:
 	thumb_func_end sub_819983C
 
 	thumb_func_start sub_8199944
-sub_8199944: ; 8199944
+sub_8199944: @ 8199944
 	push {r4-r7,lr}
 	ldr r4, [sp, 0x14]
 	lsls r2, 24
@@ -762589,8 +762589,8 @@ _08199992:
 	thumb_func_end sub_8199944
 
 	thumb_func_start clear_scheduled_bg_copies_to_vram
-; void clear_scheduled_bg_copies_to_vram()
-clear_scheduled_bg_copies_to_vram: ; 81999A8
+@ void clear_scheduled_bg_copies_to_vram()
+clear_scheduled_bg_copies_to_vram: @ 81999A8
 	push {lr}
 	ldr r0, =0x0203cda4
 	movs r1, 0
@@ -762602,8 +762602,8 @@ clear_scheduled_bg_copies_to_vram: ; 81999A8
 	thumb_func_end clear_scheduled_bg_copies_to_vram
 
 	thumb_func_start schedule_bg_copy_tilemap_to_vram
-; void schedule_bg_copy_tilemap_to_vram(u8 bg_id)
-schedule_bg_copy_tilemap_to_vram: ; 81999BC
+@ void schedule_bg_copy_tilemap_to_vram(u8 bg_id)
+schedule_bg_copy_tilemap_to_vram: @ 81999BC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0203cda4
@@ -762615,8 +762615,8 @@ schedule_bg_copy_tilemap_to_vram: ; 81999BC
 	thumb_func_end schedule_bg_copy_tilemap_to_vram
 
 	thumb_func_start do_scheduled_bg_tilemap_copies_to_vram
-; void do_scheduled_bg_tilemap_copies_to_vram()
-do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0
+@ void do_scheduled_bg_tilemap_copies_to_vram()
+do_scheduled_bg_tilemap_copies_to_vram: @ 81999D0
 	push {r4,lr}
 	ldr r4, =0x0203cda4
 	ldrb r0, [r4]
@@ -762658,8 +762658,8 @@ _08199A14:
 	thumb_func_end do_scheduled_bg_tilemap_copies_to_vram
 
 	thumb_func_start reset_temp_tile_data_buffers
-; void reset_temp_tile_data_buffers()
-reset_temp_tile_data_buffers: ; 8199A20
+@ void reset_temp_tile_data_buffers()
+reset_temp_tile_data_buffers: @ 8199A20
 	push {lr}
 	ldr r3, =0x0203cda8
 	ldr r1, =0x0203cdac
@@ -762679,7 +762679,7 @@ _08199A2C:
 	thumb_func_end reset_temp_tile_data_buffers
 
 	thumb_func_start free_temp_tile_data_buffers_if_possible
-free_temp_tile_data_buffers_if_possible: ; 8199A44
+free_temp_tile_data_buffers_if_possible: @ 8199A44
 	push {r4-r6,lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -762721,8 +762721,8 @@ _08199A8A:
 	thumb_func_end free_temp_tile_data_buffers_if_possible
 
 	thumb_func_start decompress_and_copy_tile_data_to_vram
-; int decompress_and_copy_tile_data_to_vram(u8 bg_id, int src, int size, u16 offset, u8 mode)
-decompress_and_copy_tile_data_to_vram: ; 8199A90
+@ int decompress_and_copy_tile_data_to_vram(u8 bg_id, int src, int size, u16 offset, u8 mode)
+decompress_and_copy_tile_data_to_vram: @ 8199A90
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -762785,8 +762785,8 @@ _08199AFA:
 	thumb_func_end decompress_and_copy_tile_data_to_vram
 
 	thumb_func_start copy_decompressed_tile_data_to_vram_autofree
-; void copy_decompressed_tile_data_to_vram_autofree(u8 bg_id, int src, u16 size, u16 offset, u8 mode)
-copy_decompressed_tile_data_to_vram_autofree: ; 8199B08
+@ void copy_decompressed_tile_data_to_vram_autofree(u8 bg_id, int src, u16 size, u16 offset, u8 mode)
+copy_decompressed_tile_data_to_vram_autofree: @ 8199B08
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -762847,8 +762847,8 @@ _08199B6E:
 	thumb_func_end copy_decompressed_tile_data_to_vram_autofree
 
 	thumb_func_start task_free_buf_after_copying_tile_data_to_vram
-; void task_free_buf_after_copying_tile_data_to_vram(int task_id)
-task_free_buf_after_copying_tile_data_to_vram: ; 8199B84
+@ void task_free_buf_after_copying_tile_data_to_vram(int task_id)
+task_free_buf_after_copying_tile_data_to_vram: @ 8199B84
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -762877,8 +762877,8 @@ _08199BB4:
 	thumb_func_end task_free_buf_after_copying_tile_data_to_vram
 
 	thumb_func_start malloc_and_decompress
-; void *malloc_and_decompress(void *src, int *size)
-malloc_and_decompress: ; 8199BC0
+@ void *malloc_and_decompress(void *src, int *size)
+malloc_and_decompress: @ 8199BC0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrb r0, [r5, 0x1]
@@ -762905,8 +762905,8 @@ _08199BE8:
 	thumb_func_end malloc_and_decompress
 
 	thumb_func_start copy_decompressed_tile_data_to_vram
-; s16 copy_decompressed_tile_data_to_vram(u8 bg_id, int src, u16 size, u16 offset, u8 mode)
-copy_decompressed_tile_data_to_vram: ; 8199BF0
+@ s16 copy_decompressed_tile_data_to_vram(u8 bg_id, int src, u16 size, u16 offset, u8 mode)
+copy_decompressed_tile_data_to_vram: @ 8199BF0
 	push {r4,lr}
 	adds r4, r1, 0
 	ldr r1, [sp, 0x8]
@@ -762942,7 +762942,7 @@ _08199C2A:
 	thumb_func_end copy_decompressed_tile_data_to_vram
 
 	thumb_func_start sub_8199C30
-sub_8199C30: ; 8199C30
+sub_8199C30: @ 8199C30
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -763018,7 +763018,7 @@ _08199CA8:
 	thumb_func_end sub_8199C30
 
 	thumb_func_start sub_8199CBC
-sub_8199CBC: ; 8199CBC
+sub_8199CBC: @ 8199CBC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -763088,7 +763088,7 @@ _08199D2A:
 	thumb_func_end sub_8199CBC
 
 	thumb_func_start sub_8199D3C
-sub_8199D3C: ; 8199D3C
+sub_8199D3C: @ 8199D3C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -763140,7 +763140,7 @@ _08199D8C:
 	thumb_func_end sub_8199D3C
 
 	thumb_func_start sub_8199D98
-sub_8199D98: ; 8199D98
+sub_8199D98: @ 8199D98
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -763179,7 +763179,7 @@ sub_8199D98: ; 8199D98
 	thumb_func_end sub_8199D98
 
 	thumb_func_start sub_8199DF0
-sub_8199DF0: ; 8199DF0
+sub_8199DF0: @ 8199DF0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -763238,7 +763238,7 @@ _08199E16:
 	thumb_func_end sub_8199DF0
 
 	thumb_func_start box_print
-box_print: ; 8199E64
+box_print: @ 8199E64
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r1, 0
@@ -763307,8 +763307,8 @@ box_print: ; 8199E64
 	thumb_func_end box_print
 
 	thumb_func_start AddTextPrinterParametrized2
-; void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
-AddTextPrinterParametrized2: ; 8199EEC
+@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
+AddTextPrinterParametrized2: @ 8199EEC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -763379,7 +763379,7 @@ AddTextPrinterParametrized2: ; 8199EEC
 	thumb_func_end AddTextPrinterParametrized2
 
 	thumb_func_start sub_8199F74
-sub_8199F74: ; 8199F74
+sub_8199F74: @ 8199F74
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -763466,7 +763466,7 @@ sub_8199F74: ; 8199F74
 	thumb_func_end sub_8199F74
 
 	thumb_func_start sub_819A024
-sub_819A024: ; 819A024
+sub_819A024: @ 819A024
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -763512,7 +763512,7 @@ _0819A04C:
 	thumb_func_end sub_819A024
 
 	thumb_func_start sub_819A080
-sub_819A080: ; 819A080
+sub_819A080: @ 819A080
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -763763,7 +763763,7 @@ _0819A24A:
 	thumb_func_end sub_819A080
 
 	thumb_func_start sub_819A25C
-sub_819A25C: ; 819A25C
+sub_819A25C: @ 819A25C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -763781,7 +763781,7 @@ sub_819A25C: ; 819A25C
 	thumb_func_end sub_819A25C
 
 	thumb_func_start sub_819A27C
-sub_819A27C: ; 819A27C
+sub_819A27C: @ 819A27C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -763814,7 +763814,7 @@ sub_819A27C: ; 819A27C
 	thumb_func_end sub_819A27C
 
 	thumb_func_start sub_819A2BC
-sub_819A2BC: ; 819A2BC
+sub_819A2BC: @ 819A2BC
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -763846,8 +763846,8 @@ _0819A2E6:
 	thumb_func_end sub_819A2BC
 
 	thumb_func_start blit_move_info_icon
-; void blit_move_info_icon(u8 windowId, u8 a2, u16 x, u16 y)
-blit_move_info_icon: ; 819A2F8
+@ void blit_move_info_icon(u8 windowId, u8 a2, u16 x, u16 y)
+blit_move_info_icon: @ 819A2F8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	lsls r0, 24
@@ -763885,7 +763885,7 @@ blit_move_info_icon: ; 819A2F8
 	thumb_func_end blit_move_info_icon
 
 	thumb_func_start sub_819A344
-sub_819A344: ; 819A344
+sub_819A344: @ 819A344
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -764009,7 +764009,7 @@ _0819A43C:
 	thumb_func_end sub_819A344
 
 	thumb_func_start sub_819A44C
-sub_819A44C: ; 819A44C
+sub_819A44C: @ 819A44C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrb r4, [r5, 0x5]
@@ -764073,7 +764073,7 @@ _0819A4C2:
 	thumb_func_end sub_819A44C
 
 	thumb_func_start sub_819A4C8
-sub_819A4C8: ; 819A4C8
+sub_819A4C8: @ 819A4C8
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -764085,7 +764085,7 @@ sub_819A4C8: ; 819A4C8
 	thumb_func_end sub_819A4C8
 
 	thumb_func_start sub_819A4E4
-sub_819A4E4: ; 819A4E4
+sub_819A4E4: @ 819A4E4
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -764095,7 +764095,7 @@ sub_819A4E4: ; 819A4E4
 	thumb_func_end sub_819A4E4
 
 	thumb_func_start sub_819A4F8
-sub_819A4F8: ; 819A4F8
+sub_819A4F8: @ 819A4F8
 	push {lr}
 	ldr r0, =0x0300127c
 	movs r1, 0
@@ -764108,7 +764108,7 @@ sub_819A4F8: ; 819A4F8
 	thumb_func_end sub_819A4F8
 
 	thumb_func_start sub_819A514
-sub_819A514: ; 819A514
+sub_819A514: @ 819A514
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r0, =0x030022c0
@@ -764550,7 +764550,7 @@ _0819A98E:
 	thumb_func_end sub_819A514
 
 	thumb_func_start sub_819A9AC
-sub_819A9AC: ; 819A9AC
+sub_819A9AC: @ 819A9AC
 	push {r4,r5,lr}
 	ldr r5, =0x0300127c
 	ldr r4, [r5]
@@ -764603,7 +764603,7 @@ _0819AA12:
 	thumb_func_end sub_819A9AC
 
 	thumb_func_start sub_819AA18
-sub_819AA18: ; 819AA18
+sub_819AA18: @ 819AA18
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -764740,7 +764740,7 @@ _0819AA24:
 	thumb_func_end sub_819AA18
 
 	thumb_func_start sub_819AB40
-sub_819AB40: ; 819AB40
+sub_819AB40: @ 819AB40
 	push {r4-r6,lr}
 	movs r4, 0
 _0819AB44:
@@ -764789,7 +764789,7 @@ _0819AB44:
 	thumb_func_end sub_819AB40
 
 	thumb_func_start sub_819ABA8
-sub_819ABA8: ; 819ABA8
+sub_819ABA8: @ 819ABA8
 	push {r4,lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -764845,7 +764845,7 @@ _0819ABDE:
 	thumb_func_end sub_819ABA8
 
 	thumb_func_start sub_819AC10
-sub_819AC10: ; 819AC10
+sub_819AC10: @ 819AC10
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -764902,7 +764902,7 @@ _0819AC46:
 	thumb_func_end sub_819AC10
 
 	thumb_func_start sub_819AC78
-sub_819AC78: ; 819AC78
+sub_819AC78: @ 819AC78
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -764959,7 +764959,7 @@ _0819ACAE:
 	thumb_func_end sub_819AC78
 
 	thumb_func_start sub_819ACE0
-sub_819ACE0: ; 819ACE0
+sub_819ACE0: @ 819ACE0
 	push {r4-r6,lr}
 	ldr r5, =0x0300127c
 	ldr r0, [r5]
@@ -765063,7 +765063,7 @@ _0819AD9C:
 	thumb_func_end sub_819ACE0
 
 	thumb_func_start sub_819ADAC
-sub_819ADAC: ; 819ADAC
+sub_819ADAC: @ 819ADAC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -765108,7 +765108,7 @@ _0819ADCE:
 	thumb_func_end sub_819ADAC
 
 	thumb_func_start sub_819AE08
-sub_819AE08: ; 819AE08
+sub_819AE08: @ 819AE08
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -765257,7 +765257,7 @@ _0819AF50:
 	thumb_func_end sub_819AE08
 
 	thumb_func_start bc_exit_to_overworld
-bc_exit_to_overworld: ; 819AF68
+bc_exit_to_overworld: @ 819AF68
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -765337,7 +765337,7 @@ _0819B00E:
 	thumb_func_end bc_exit_to_overworld
 
 	thumb_func_start sub_819B02C
-sub_819B02C: ; 819B02C
+sub_819B02C: @ 819B02C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -765451,7 +765451,7 @@ _0819B11A:
 	thumb_func_end sub_819B02C
 
 	thumb_func_start sub_819B124
-sub_819B124: ; 819B124
+sub_819B124: @ 819B124
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -765710,7 +765710,7 @@ _0819B36E:
 	thumb_func_end sub_819B124
 
 	thumb_func_start sub_819B378
-sub_819B378: ; 819B378
+sub_819B378: @ 819B378
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -765832,7 +765832,7 @@ _0819B476:
 	thumb_func_end sub_819B378
 
 	thumb_func_start sub_819B484
-sub_819B484: ; 819B484
+sub_819B484: @ 819B484
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -766035,7 +766035,7 @@ _0819B620:
 	thumb_func_end sub_819B484
 
 	thumb_func_start sub_819B63C
-sub_819B63C: ; 819B63C
+sub_819B63C: @ 819B63C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -766175,7 +766175,7 @@ _0819B6D4:
 	thumb_func_end sub_819B63C
 
 	thumb_func_start sub_819B764
-sub_819B764: ; 819B764
+sub_819B764: @ 819B764
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -766278,7 +766278,7 @@ _0819B826:
 	thumb_func_end sub_819B764
 
 	thumb_func_start sub_819B844
-sub_819B844: ; 819B844
+sub_819B844: @ 819B844
 	push {r4,r5,lr}
 	ldr r5, =0x0300127c
 	ldr r1, [r5]
@@ -766351,7 +766351,7 @@ _0819B852:
 	thumb_func_end sub_819B844
 
 	thumb_func_start sub_819B8D4
-sub_819B8D4: ; 819B8D4
+sub_819B8D4: @ 819B8D4
 	push {r4,r5,lr}
 	ldr r5, =0x0300127c
 	ldr r1, [r5]
@@ -766416,7 +766416,7 @@ sub_819B8D4: ; 819B8D4
 	thumb_func_end sub_819B8D4
 
 	thumb_func_start sub_819B958
-sub_819B958: ; 819B958
+sub_819B958: @ 819B958
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -766459,7 +766459,7 @@ sub_819B958: ; 819B958
 	thumb_func_end sub_819B958
 
 	thumb_func_start sub_819B9B4
-sub_819B9B4: ; 819B9B4
+sub_819B9B4: @ 819B9B4
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -766484,7 +766484,7 @@ sub_819B9B4: ; 819B9B4
 	thumb_func_end sub_819B9B4
 
 	thumb_func_start sub_819B9E8
-sub_819B9E8: ; 819B9E8
+sub_819B9E8: @ 819B9E8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r5, =0x0300127c
@@ -766537,7 +766537,7 @@ sub_819B9E8: ; 819B9E8
 	thumb_func_end sub_819B9E8
 
 	thumb_func_start sub_819BA64
-sub_819BA64: ; 819BA64
+sub_819BA64: @ 819BA64
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x2
@@ -766582,7 +766582,7 @@ _0819BA9C:
 	thumb_func_end sub_819BA64
 
 	thumb_func_start sub_819BAC8
-sub_819BAC8: ; 819BAC8
+sub_819BAC8: @ 819BAC8
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x2
@@ -766608,7 +766608,7 @@ sub_819BAC8: ; 819BAC8
 	thumb_func_end sub_819BAC8
 
 	thumb_func_start sub_819BAFC
-sub_819BAFC: ; 819BAFC
+sub_819BAFC: @ 819BAFC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r0, =0x0300127c
@@ -766680,7 +766680,7 @@ _0819BB74:
 	thumb_func_end sub_819BAFC
 
 	thumb_func_start sub_819BBA8
-sub_819BBA8: ; 819BBA8
+sub_819BBA8: @ 819BBA8
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x4
@@ -766719,7 +766719,7 @@ sub_819BBA8: ; 819BBA8
 	thumb_func_end sub_819BBA8
 
 	thumb_func_start sub_819BC04
-sub_819BC04: ; 819BC04
+sub_819BC04: @ 819BC04
 	push {lr}
 	ldr r2, =0x030062e8
 	ldr r1, =gUnknown_0861041C
@@ -766739,7 +766739,7 @@ sub_819BC04: ; 819BC04
 	thumb_func_end sub_819BC04
 
 	thumb_func_start sub_819BC30
-sub_819BC30: ; 819BC30
+sub_819BC30: @ 819BC30
 	push {r4,lr}
 	ldr r0, =0x0300127c
 	ldr r0, [r0]
@@ -766791,7 +766791,7 @@ _0819BC96:
 	thumb_func_end sub_819BC30
 
 	thumb_func_start sub_819BC9C
-sub_819BC9C: ; 819BC9C
+sub_819BC9C: @ 819BC9C
 	push {lr}
 	bl sub_819C568
 	bl sub_819ACE0
@@ -766814,13 +766814,13 @@ _0819BCC6:
 	thumb_func_end sub_819BC9C
 
 	thumb_func_start sub_819BCCC
-sub_819BCCC: ; 819BCCC
+sub_819BCCC: @ 819BCCC
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_819BCCC
 
 	thumb_func_start sub_819BCD0
-sub_819BCD0: ; 819BCD0
+sub_819BCD0: @ 819BCD0
 	push {lr}
 	ldr r0, =0x0300127c
 	ldr r1, [r0]
@@ -766841,7 +766841,7 @@ sub_819BCD0: ; 819BCD0
 	thumb_func_end sub_819BCD0
 
 	thumb_func_start sub_819BCF8
-sub_819BCF8: ; 819BCF8
+sub_819BCF8: @ 819BCF8
 	push {r4,r5,lr}
 	sub sp, 0x2C
 	ldr r5, =0x0300127c
@@ -766897,7 +766897,7 @@ _0819BD64:
 	thumb_func_end sub_819BCF8
 
 	thumb_func_start sub_819BD70
-sub_819BD70: ; 819BD70
+sub_819BD70: @ 819BD70
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -766979,7 +766979,7 @@ sub_819BD70: ; 819BD70
 	thumb_func_end sub_819BD70
 
 	thumb_func_start sub_819BE20
-sub_819BE20: ; 819BE20
+sub_819BE20: @ 819BE20
 	ldr r1, =0x0300127c
 	ldr r1, [r1]
 	movs r2, 0xA8
@@ -766991,7 +766991,7 @@ sub_819BE20: ; 819BE20
 	thumb_func_end sub_819BE20
 
 	thumb_func_start sub_819BE34
-sub_819BE34: ; 819BE34
+sub_819BE34: @ 819BE34
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -767104,7 +767104,7 @@ sub_819BE34: ; 819BE34
 	thumb_func_end sub_819BE34
 
 	thumb_func_start sub_819BF2C
-sub_819BF2C: ; 819BF2C
+sub_819BF2C: @ 819BF2C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -767238,7 +767238,7 @@ _0819C012:
 	thumb_func_end sub_819BF2C
 
 	thumb_func_start sub_819C040
-sub_819C040: ; 819C040
+sub_819C040: @ 819C040
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -767323,7 +767323,7 @@ _0819C0DC:
 	thumb_func_end sub_819C040
 
 	thumb_func_start sub_819C100
-sub_819C100: ; 819C100
+sub_819C100: @ 819C100
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r0, 0x3F
@@ -767419,7 +767419,7 @@ _0819C1BA:
 	thumb_func_end sub_819C100
 
 	thumb_func_start sub_819C1D0
-sub_819C1D0: ; 819C1D0
+sub_819C1D0: @ 819C1D0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -767543,7 +767543,7 @@ _0819C2CC:
 	thumb_func_end sub_819C1D0
 
 	thumb_func_start sub_819C2D4
-sub_819C2D4: ; 819C2D4
+sub_819C2D4: @ 819C2D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -767766,7 +767766,7 @@ _0819C4A4:
 	thumb_func_end sub_819C2D4
 
 	thumb_func_start sub_819C4B4
-sub_819C4B4: ; 819C4B4
+sub_819C4B4: @ 819C4B4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -767841,7 +767841,7 @@ sub_819C4B4: ; 819C4B4
 	thumb_func_end sub_819C4B4
 
 	thumb_func_start sub_819C568
-sub_819C568: ; 819C568
+sub_819C568: @ 819C568
 	push {r4,lr}
 	ldr r4, =0x0300127c
 	ldr r0, [r4]
@@ -767887,7 +767887,7 @@ sub_819C568: ; 819C568
 	thumb_func_end sub_819C568
 
 	thumb_func_start sub_819C5D0
-sub_819C5D0: ; 819C5D0
+sub_819C5D0: @ 819C5D0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -767936,7 +767936,7 @@ sub_819C5D0: ; 819C5D0
 	thumb_func_end sub_819C5D0
 
 	thumb_func_start sub_819C634
-sub_819C634: ; 819C634
+sub_819C634: @ 819C634
 	push {r4-r7,lr}
 	lsls r0, 16
 	ldr r2, =0x0203bc8c
@@ -767994,7 +767994,7 @@ _0819C696:
 	thumb_func_end sub_819C634
 
 	thumb_func_start sub_819C69C
-sub_819C69C: ; 819C69C
+sub_819C69C: @ 819C69C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -768146,7 +768146,7 @@ _0819C7D8:
 	thumb_func_end sub_819C69C
 
 	thumb_func_start sub_819C7E0
-sub_819C7E0: ; 819C7E0
+sub_819C7E0: @ 819C7E0
 	push {lr}
 	bl CallObjectCallbacks
 	bl PrepareSpritesForOamLoad
@@ -768158,7 +768158,7 @@ sub_819C7E0: ; 819C7E0
 	thumb_func_end sub_819C7E0
 
 	thumb_func_start sub_819C7FC
-sub_819C7FC: ; 819C7FC
+sub_819C7FC: @ 819C7FC
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -768168,7 +768168,7 @@ sub_819C7FC: ; 819C7FC
 	thumb_func_end sub_819C7FC
 
 	thumb_func_start sub_819C810
-sub_819C810: ; 819C810
+sub_819C810: @ 819C810
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -768281,7 +768281,7 @@ sub_819C810: ; 819C810
 	thumb_func_end sub_819C810
 
 	thumb_func_start sub_819C90C
-sub_819C90C: ; 819C90C
+sub_819C90C: @ 819C90C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -768386,7 +768386,7 @@ _0819C9F0:
 	thumb_func_end sub_819C90C
 
 	thumb_func_start sub_819CA08
-sub_819CA08: ; 819CA08
+sub_819CA08: @ 819CA08
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -768507,7 +768507,7 @@ _0819CAFE:
 	thumb_func_end sub_819CA08
 
 	thumb_func_start sub_819CB1C
-sub_819CB1C: ; 819CB1C
+sub_819CB1C: @ 819CB1C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -768602,7 +768602,7 @@ _0819CBD6:
 	thumb_func_end sub_819CB1C
 
 	thumb_func_start sub_819CBDC
-sub_819CBDC: ; 819CBDC
+sub_819CBDC: @ 819CBDC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -768638,7 +768638,7 @@ _0819CC16:
 	thumb_func_end sub_819CBDC
 
 	thumb_func_start sub_819CC24
-sub_819CC24: ; 819CC24
+sub_819CC24: @ 819CC24
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -768673,7 +768673,7 @@ _0819CC5A:
 	thumb_func_end sub_819CC24
 
 	thumb_func_start sub_819CC74
-sub_819CC74: ; 819CC74
+sub_819CC74: @ 819CC74
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -768717,7 +768717,7 @@ _0819CCC2:
 	thumb_func_end sub_819CC74
 
 	thumb_func_start sub_819CCD4
-sub_819CCD4: ; 819CCD4
+sub_819CCD4: @ 819CCD4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -768759,7 +768759,7 @@ _0819CD1A:
 	thumb_func_end sub_819CCD4
 
 	thumb_func_start sub_819CD34
-sub_819CD34: ; 819CD34
+sub_819CD34: @ 819CD34
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -768884,7 +768884,7 @@ _0819CE36:
 	thumb_func_end sub_819CD34
 
 	thumb_func_start sub_819CE40
-sub_819CE40: ; 819CE40
+sub_819CE40: @ 819CE40
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -769005,7 +769005,7 @@ _0819CF4C:
 	thumb_func_end sub_819CE40
 
 	thumb_func_start sub_819CF54
-sub_819CF54: ; 819CF54
+sub_819CF54: @ 819CF54
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -769148,7 +769148,7 @@ _0819D05C:
 	thumb_func_end sub_819CF54
 
 	thumb_func_start sub_819D064
-sub_819D064: ; 819D064
+sub_819D064: @ 819D064
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -769246,7 +769246,7 @@ _0819D118:
 	thumb_func_end sub_819D064
 
 	thumb_func_start sub_819D12C
-sub_819D12C: ; 819D12C
+sub_819D12C: @ 819D12C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -769499,7 +769499,7 @@ _0819D310:
 	thumb_func_end sub_819D12C
 
 	thumb_func_start sub_819D324
-sub_819D324: ; 819D324
+sub_819D324: @ 819D324
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -769803,7 +769803,7 @@ _0819D570:
 	thumb_func_end sub_819D324
 
 	thumb_func_start sub_819D588
-sub_819D588: ; 819D588
+sub_819D588: @ 819D588
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -770025,7 +770025,7 @@ _0819D762:
 	thumb_func_end sub_819D588
 
 	thumb_func_start sub_819D770
-sub_819D770: ; 819D770
+sub_819D770: @ 819D770
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -770310,7 +770310,7 @@ _0819D9D8:
 	thumb_func_end sub_819D770
 
 	thumb_func_start sub_819D9EC
-sub_819D9EC: ; 819D9EC
+sub_819D9EC: @ 819D9EC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -770528,7 +770528,7 @@ _0819DBCA:
 	thumb_func_end sub_819D9EC
 
 	thumb_func_start sub_819DBD8
-sub_819DBD8: ; 819DBD8
+sub_819DBD8: @ 819DBD8
 	push {r4,r5,lr}
 	ldr r5, =0x03001284
 	ldr r4, [r5]
@@ -770551,7 +770551,7 @@ _0819DBF6:
 	thumb_func_end sub_819DBD8
 
 	thumb_func_start sub_819DC00
-sub_819DC00: ; 819DC00
+sub_819DC00: @ 819DC00
 	push {lr}
 	ldr r0, =0x03001284
 	movs r1, 0
@@ -770564,7 +770564,7 @@ sub_819DC00: ; 819DC00
 	thumb_func_end sub_819DC00
 
 	thumb_func_start sub_819DC1C
-sub_819DC1C: ; 819DC1C
+sub_819DC1C: @ 819DC1C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r1, =0x030022c0
@@ -771010,7 +771010,7 @@ _0819E0AA:
 	thumb_func_end sub_819DC1C
 
 	thumb_func_start sub_819E0C0
-sub_819E0C0: ; 819E0C0
+sub_819E0C0: @ 819E0C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -771565,7 +771565,7 @@ _0819E4C8:
 	thumb_func_end sub_819E0C0
 
 	thumb_func_start sub_819E538
-sub_819E538: ; 819E538
+sub_819E538: @ 819E538
 	push {r4-r7,lr}
 	movs r5, 0
 _0819E53C:
@@ -771668,7 +771668,7 @@ _0819E5CC:
 	thumb_func_end sub_819E538
 
 	thumb_func_start sub_819E608
-sub_819E608: ; 819E608
+sub_819E608: @ 819E608
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -771734,7 +771734,7 @@ _0819E684:
 	thumb_func_end sub_819E608
 
 	thumb_func_start sub_819E694
-sub_819E694: ; 819E694
+sub_819E694: @ 819E694
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -771778,7 +771778,7 @@ _0819E6D8:
 	thumb_func_end sub_819E694
 
 	thumb_func_start sub_819E6E8
-sub_819E6E8: ; 819E6E8
+sub_819E6E8: @ 819E6E8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -771838,7 +771838,7 @@ _0819E74A:
 	thumb_func_end sub_819E6E8
 
 	thumb_func_start sub_819E758
-sub_819E758: ; 819E758
+sub_819E758: @ 819E758
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -771895,7 +771895,7 @@ _0819E78E:
 	thumb_func_end sub_819E758
 
 	thumb_func_start sub_819E7C0
-sub_819E7C0: ; 819E7C0
+sub_819E7C0: @ 819E7C0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -771958,7 +771958,7 @@ _0819E802:
 	thumb_func_end sub_819E7C0
 
 	thumb_func_start sub_819E838
-sub_819E838: ; 819E838
+sub_819E838: @ 819E838
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -772052,7 +772052,7 @@ _0819E8D4:
 	thumb_func_end sub_819E838
 
 	thumb_func_start sub_819E8EC
-sub_819E8EC: ; 819E8EC
+sub_819E8EC: @ 819E8EC
 	push {r4-r6,lr}
 	movs r2, 0
 	ldr r5, =0x02020630
@@ -772099,7 +772099,7 @@ _0819E92C:
 	thumb_func_end sub_819E8EC
 
 	thumb_func_start sub_819E944
-sub_819E944: ; 819E944
+sub_819E944: @ 819E944
 	push {r4,r5,lr}
 	ldr r0, =0x03001284
 	ldr r3, [r0]
@@ -772179,7 +772179,7 @@ _0819E960:
 	thumb_func_end sub_819E944
 
 	thumb_func_start sub_819E9E0
-sub_819E9E0: ; 819E9E0
+sub_819E9E0: @ 819E9E0
 	push {r4,r5,lr}
 	ldr r5, =0x03001284
 	ldr r1, [r5]
@@ -772244,7 +772244,7 @@ sub_819E9E0: ; 819E9E0
 	thumb_func_end sub_819E9E0
 
 	thumb_func_start sub_819EA64
-sub_819EA64: ; 819EA64
+sub_819EA64: @ 819EA64
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -772287,7 +772287,7 @@ sub_819EA64: ; 819EA64
 	thumb_func_end sub_819EA64
 
 	thumb_func_start sub_819EAC0
-sub_819EAC0: ; 819EAC0
+sub_819EAC0: @ 819EAC0
 	push {lr}
 	movs r0, 0x1
 	bl PutWindowTilemap
@@ -772302,7 +772302,7 @@ sub_819EAC0: ; 819EAC0
 	thumb_func_end sub_819EAC0
 
 	thumb_func_start sub_819EADC
-sub_819EADC: ; 819EADC
+sub_819EADC: @ 819EADC
 	push {lr}
 	movs r0, 0x7
 	bl PutWindowTilemap
@@ -772317,7 +772317,7 @@ sub_819EADC: ; 819EADC
 	thumb_func_end sub_819EADC
 
 	thumb_func_start sub_819EAF8
-sub_819EAF8: ; 819EAF8
+sub_819EAF8: @ 819EAF8
 	push {lr}
 	bl sub_819EAC0
 	movs r0, 0x5
@@ -772333,7 +772333,7 @@ sub_819EAF8: ; 819EAF8
 	thumb_func_end sub_819EAF8
 
 	thumb_func_start sub_819EB18
-sub_819EB18: ; 819EB18
+sub_819EB18: @ 819EB18
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -772358,7 +772358,7 @@ sub_819EB18: ; 819EB18
 	thumb_func_end sub_819EB18
 
 	thumb_func_start sub_819EB4C
-sub_819EB4C: ; 819EB4C
+sub_819EB4C: @ 819EB4C
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0x1
@@ -772430,7 +772430,7 @@ _0819EBD4:
 	thumb_func_end sub_819EB4C
 
 	thumb_func_start sub_819EBEC
-sub_819EBEC: ; 819EBEC
+sub_819EBEC: @ 819EBEC
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -772457,7 +772457,7 @@ sub_819EBEC: ; 819EBEC
 	thumb_func_end sub_819EBEC
 
 	thumb_func_start sub_819EC20
-sub_819EC20: ; 819EC20
+sub_819EC20: @ 819EC20
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x3
@@ -772505,7 +772505,7 @@ sub_819EC20: ; 819EC20
 	thumb_func_end sub_819EC20
 
 	thumb_func_start sub_819EC94
-sub_819EC94: ; 819EC94
+sub_819EC94: @ 819EC94
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0x4
@@ -772544,7 +772544,7 @@ sub_819EC94: ; 819EC94
 	thumb_func_end sub_819EC94
 
 	thumb_func_start sub_819ECF0
-sub_819ECF0: ; 819ECF0
+sub_819ECF0: @ 819ECF0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -772578,7 +772578,7 @@ sub_819ECF0: ; 819ECF0
 	thumb_func_end sub_819ECF0
 
 	thumb_func_start sub_819ED34
-sub_819ED34: ; 819ED34
+sub_819ED34: @ 819ED34
 	push {lr}
 	movs r0, 0x5
 	movs r1, 0
@@ -772609,7 +772609,7 @@ _0819ED60:
 	thumb_func_end sub_819ED34
 
 	thumb_func_start sub_819ED78
-sub_819ED78: ; 819ED78
+sub_819ED78: @ 819ED78
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0
@@ -772640,7 +772640,7 @@ _0819EDA4:
 	thumb_func_end sub_819ED78
 
 	thumb_func_start sub_819EDBC
-sub_819EDBC: ; 819EDBC
+sub_819EDBC: @ 819EDBC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -772676,7 +772676,7 @@ _0819EDF6:
 	thumb_func_end sub_819EDBC
 
 	thumb_func_start sub_819EE08
-sub_819EE08: ; 819EE08
+sub_819EE08: @ 819EE08
 	push {r4,lr}
 	sub sp, 0x18
 	ldr r0, =gUnknown_08610918
@@ -772777,7 +772777,7 @@ _0819EED8:
 	thumb_func_end sub_819EE08
 
 	thumb_func_start sub_819EEF0
-sub_819EEF0: ; 819EEF0
+sub_819EEF0: @ 819EEF0
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =gUnknown_08610918
@@ -772854,7 +772854,7 @@ _0819EF90:
 	thumb_func_end sub_819EEF0
 
 	thumb_func_start sub_819EFA8
-sub_819EFA8: ; 819EFA8
+sub_819EFA8: @ 819EFA8
 	push {r4-r6,lr}
 	sub sp, 0x2C
 	ldr r6, =0x03001284
@@ -772927,7 +772927,7 @@ _0819F03A:
 	thumb_func_end sub_819EFA8
 
 	thumb_func_start sub_819F048
-sub_819F048: ; 819F048
+sub_819F048: @ 819F048
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -772973,7 +772973,7 @@ _0819F094:
 	thumb_func_end sub_819F048
 
 	thumb_func_start sub_819F0A0
-sub_819F0A0: ; 819F0A0
+sub_819F0A0: @ 819F0A0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -772993,7 +772993,7 @@ sub_819F0A0: ; 819F0A0
 	thumb_func_end sub_819F0A0
 
 	thumb_func_start sub_819F0CC
-sub_819F0CC: ; 819F0CC
+sub_819F0CC: @ 819F0CC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -773025,7 +773025,7 @@ sub_819F0CC: ; 819F0CC
 	thumb_func_end sub_819F0CC
 
 	thumb_func_start sub_819F114
-sub_819F114: ; 819F114
+sub_819F114: @ 819F114
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -773042,7 +773042,7 @@ sub_819F114: ; 819F114
 	thumb_func_end sub_819F114
 
 	thumb_func_start sub_819F134
-sub_819F134: ; 819F134
+sub_819F134: @ 819F134
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -773077,7 +773077,7 @@ sub_819F134: ; 819F134
 	thumb_func_end sub_819F134
 
 	thumb_func_start sub_819F184
-sub_819F184: ; 819F184
+sub_819F184: @ 819F184
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -773097,7 +773097,7 @@ sub_819F184: ; 819F184
 	thumb_func_end sub_819F184
 
 	thumb_func_start sub_819F1AC
-sub_819F1AC: ; 819F1AC
+sub_819F1AC: @ 819F1AC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -773119,7 +773119,7 @@ sub_819F1AC: ; 819F1AC
 	thumb_func_end sub_819F1AC
 
 	thumb_func_start sub_819F1DC
-sub_819F1DC: ; 819F1DC
+sub_819F1DC: @ 819F1DC
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03005e00
@@ -773141,7 +773141,7 @@ sub_819F1DC: ; 819F1DC
 	thumb_func_end sub_819F1DC
 
 	thumb_func_start sub_819F20C
-sub_819F20C: ; 819F20C
+sub_819F20C: @ 819F20C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -773217,7 +773217,7 @@ _0819F29E:
 	thumb_func_end sub_819F20C
 
 	thumb_func_start sub_819F2B4
-sub_819F2B4: ; 819F2B4
+sub_819F2B4: @ 819F2B4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -773254,7 +773254,7 @@ sub_819F2B4: ; 819F2B4
 	thumb_func_end sub_819F2B4
 
 	thumb_func_start sub_819F304
-sub_819F304: ; 819F304
+sub_819F304: @ 819F304
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -773365,7 +773365,7 @@ sub_819F304: ; 819F304
 	thumb_func_end sub_819F304
 
 	thumb_func_start sub_819F3F8
-sub_819F3F8: ; 819F3F8
+sub_819F3F8: @ 819F3F8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -773400,7 +773400,7 @@ sub_819F3F8: ; 819F3F8
 	thumb_func_end sub_819F3F8
 
 	thumb_func_start sub_819F444
-sub_819F444: ; 819F444
+sub_819F444: @ 819F444
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -773433,7 +773433,7 @@ sub_819F444: ; 819F444
 	thumb_func_end sub_819F444
 
 	thumb_func_start sub_819F488
-sub_819F488: ; 819F488
+sub_819F488: @ 819F488
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -773549,7 +773549,7 @@ _0819F58A:
 	thumb_func_end sub_819F488
 
 	thumb_func_start sub_819F59C
-sub_819F59C: ; 819F59C
+sub_819F59C: @ 819F59C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -773597,7 +773597,7 @@ _0819F5F8:
 	thumb_func_end sub_819F59C
 
 	thumb_func_start sub_819F600
-sub_819F600: ; 819F600
+sub_819F600: @ 819F600
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -773636,7 +773636,7 @@ _0819F640:
 	thumb_func_end sub_819F600
 
 	thumb_func_start sub_819F654
-sub_819F654: ; 819F654
+sub_819F654: @ 819F654
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -773673,7 +773673,7 @@ _0819F694:
 	thumb_func_end sub_819F654
 
 	thumb_func_start sub_819F69C
-sub_819F69C: ; 819F69C
+sub_819F69C: @ 819F69C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -773806,7 +773806,7 @@ _0819F7AC:
 	thumb_func_end sub_819F69C
 
 	thumb_func_start sub_819F7B4
-sub_819F7B4: ; 819F7B4
+sub_819F7B4: @ 819F7B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -773950,7 +773950,7 @@ _0819F8D8:
 	thumb_func_end sub_819F7B4
 
 	thumb_func_start sub_819F8E0
-sub_819F8E0: ; 819F8E0
+sub_819F8E0: @ 819F8E0
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r0, =0x03001284
@@ -774035,7 +774035,7 @@ _0819F908:
 	thumb_func_end sub_819F8E0
 
 	thumb_func_start sub_819F99C
-sub_819F99C: ; 819F99C
+sub_819F99C: @ 819F99C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -774114,7 +774114,7 @@ _0819F9DC:
 	thumb_func_end sub_819F99C
 
 	thumb_func_start sub_819FA50
-sub_819FA50: ; 819FA50
+sub_819FA50: @ 819FA50
 	push {lr}
 	bl script_env_2_enable_and_set_ctx_running
 	pop {r0}
@@ -774122,7 +774122,7 @@ sub_819FA50: ; 819FA50
 	thumb_func_end sub_819FA50
 
 	thumb_func_start sub_819FA5C
-sub_819FA5C: ; 819FA5C
+sub_819FA5C: @ 819FA5C
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -774159,7 +774159,7 @@ _0819FA6A:
 	thumb_func_end sub_819FA5C
 
 	thumb_func_start sub_819FAA0
-sub_819FAA0: ; 819FAA0
+sub_819FAA0: @ 819FAA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -774293,7 +774293,7 @@ _0819FB48:
 	thumb_func_end sub_819FAA0
 
 	thumb_func_start sub_819FBB0
-sub_819FBB0: ; 819FBB0
+sub_819FBB0: @ 819FBB0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	adds r0, 0xB1
@@ -774308,7 +774308,7 @@ sub_819FBB0: ; 819FBB0
 	thumb_func_end sub_819FBB0
 
 	thumb_func_start sub_819FBC8
-sub_819FBC8: ; 819FBC8
+sub_819FBC8: @ 819FBC8
 	push {r4,r5,lr}
 	ldr r2, =0x03005d90
 	ldr r0, [r2]
@@ -774370,7 +774370,7 @@ _0819FC38:
 	thumb_func_end sub_819FBC8
 
 	thumb_func_start sub_819FC40
-sub_819FC40: ; 819FC40
+sub_819FC40: @ 819FC40
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x03005d90
@@ -774388,7 +774388,7 @@ sub_819FC40: ; 819FC40
 	thumb_func_end sub_819FC40
 
 	thumb_func_start sub_819FC60
-sub_819FC60: ; 819FC60
+sub_819FC60: @ 819FC60
 	push {r4-r7,lr}
 	sub sp, 0xC
 	movs r5, 0
@@ -774465,7 +774465,7 @@ _0819FCBC:
 	thumb_func_end sub_819FC60
 
 	thumb_func_start sub_819FCF8
-sub_819FCF8: ; 819FCF8
+sub_819FCF8: @ 819FCF8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -774524,7 +774524,7 @@ _0819FD5A:
 	thumb_func_end sub_819FCF8
 
 	thumb_func_start sub_819FD64
-sub_819FD64: ; 819FD64
+sub_819FD64: @ 819FD64
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -774803,7 +774803,7 @@ _0819FF6E:
 	thumb_func_end sub_819FD64
 
 	thumb_func_start sub_819FF98
-sub_819FF98: ; 819FF98
+sub_819FF98: @ 819FF98
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -775058,7 +775058,7 @@ _081A0170:
 	thumb_func_end sub_819FF98
 
 	thumb_func_start sub_81A0194
-sub_81A0194: ; 81A0194
+sub_81A0194: @ 81A0194
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -775106,7 +775106,7 @@ _081A01E2:
 	thumb_func_end sub_81A0194
 
 	thumb_func_start sub_81A01E8
-sub_81A01E8: ; 81A01E8
+sub_81A01E8: @ 81A01E8
 	push {r4-r7,lr}
 	mov r12, r1
 	lsls r0, 16
@@ -775186,7 +775186,7 @@ _081A026C:
 	thumb_func_end sub_81A01E8
 
 	thumb_func_start sub_81A0284
-sub_81A0284: ; 81A0284
+sub_81A0284: @ 81A0284
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -775327,7 +775327,7 @@ _081A037C:
 	thumb_func_end sub_81A0284
 
 	thumb_func_start sub_81A0390
-sub_81A0390: ; 81A0390
+sub_81A0390: @ 81A0390
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -775503,7 +775503,7 @@ _081A04D6:
 	thumb_func_end sub_81A0390
 
 	thumb_func_start sub_81A04E4
-sub_81A04E4: ; 81A04E4
+sub_81A04E4: @ 81A04E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -775761,7 +775761,7 @@ _081A06FA:
 	thumb_func_end sub_81A04E4
 
 	thumb_func_start sub_81A070C
-sub_81A070C: ; 81A070C
+sub_81A070C: @ 81A070C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -775819,7 +775819,7 @@ _081A0778:
 	thumb_func_end sub_81A070C
 
 	thumb_func_start sub_81A0784
-sub_81A0784: ; 81A0784
+sub_81A0784: @ 81A0784
 	push {r4,r5,lr}
 	sub sp, 0x20
 	adds r4, r0, 0
@@ -775869,7 +775869,7 @@ sub_81A0784: ; 81A0784
 	thumb_func_end sub_81A0784
 
 	thumb_func_start sub_81A07E8
-sub_81A07E8: ; 81A07E8
+sub_81A07E8: @ 81A07E8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -775885,7 +775885,7 @@ sub_81A07E8: ; 81A07E8
 	thumb_func_end sub_81A07E8
 
 	thumb_func_start sub_81A0804
-sub_81A0804: ; 81A0804
+sub_81A0804: @ 81A0804
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -775928,7 +775928,7 @@ _081A0842:
 	thumb_func_end sub_81A0804
 
 	thumb_func_start sub_81A085C
-sub_81A085C: ; 81A085C
+sub_81A085C: @ 81A085C
 	push {lr}
 	ldr r1, =gUnknown_086114E0
 	ldr r0, =0x020375e0
@@ -775943,7 +775943,7 @@ sub_81A085C: ; 81A085C
 	thumb_func_end sub_81A085C
 
 	thumb_func_start sub_81A087C
-sub_81A087C: ; 81A087C
+sub_81A087C: @ 81A087C
 	push {r4-r7,lr}
 	bl sub_819FBC8
 	ldr r3, =0x03005d90
@@ -776042,7 +776042,7 @@ _081A08E2:
 	thumb_func_end sub_81A087C
 
 	thumb_func_start sub_81A093C
-sub_81A093C: ; 81A093C
+sub_81A093C: @ 81A093C
 	push {lr}
 	bl sub_819FBB0
 	lsls r0, 24
@@ -776064,7 +776064,7 @@ _081A095A:
 	thumb_func_end sub_81A093C
 
 	thumb_func_start sub_81A0964
-sub_81A0964: ; 81A0964
+sub_81A0964: @ 81A0964
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrb r0, [r0]
@@ -776075,7 +776075,7 @@ sub_81A0964: ; 81A0964
 	thumb_func_end sub_81A0964
 
 	thumb_func_start sub_81A0978
-sub_81A0978: ; 81A0978
+sub_81A0978: @ 81A0978
 	push {lr}
 	bl sub_819FBC8
 	pop {r0}
@@ -776083,7 +776083,7 @@ sub_81A0978: ; 81A0978
 	thumb_func_end sub_81A0978
 
 	thumb_func_start sub_81A0984
-sub_81A0984: ; 81A0984
+sub_81A0984: @ 81A0984
 	push {lr}
 	bl sub_819FD64
 	pop {r0}
@@ -776091,7 +776091,7 @@ sub_81A0984: ; 81A0984
 	thumb_func_end sub_81A0984
 
 	thumb_func_start sub_81A0990
-sub_81A0990: ; 81A0990
+sub_81A0990: @ 81A0990
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	adds r2, 0xB1
@@ -776112,7 +776112,7 @@ sub_81A0990: ; 81A0990
 	thumb_func_end sub_81A0990
 
 	thumb_func_start sub_81A09B4
-sub_81A09B4: ; 81A09B4
+sub_81A09B4: @ 81A09B4
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -776126,7 +776126,7 @@ sub_81A09B4: ; 81A09B4
 	thumb_func_end sub_81A09B4
 
 	thumb_func_start sub_81A09D0
-sub_81A09D0: ; 81A09D0
+sub_81A09D0: @ 81A09D0
 	push {lr}
 	ldr r3, =0x03005d90
 	ldr r0, [r3]
@@ -776170,7 +776170,7 @@ _081A0A1C:
 	thumb_func_end sub_81A09D0
 
 	thumb_func_start sub_81A0A20
-sub_81A0A20: ; 81A0A20
+sub_81A0A20: @ 81A0A20
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrb r0, [r0]
@@ -776181,7 +776181,7 @@ sub_81A0A20: ; 81A0A20
 	thumb_func_end sub_81A0A20
 
 	thumb_func_start sub_81A0A34
-sub_81A0A34: ; 81A0A34
+sub_81A0A34: @ 81A0A34
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -776208,7 +776208,7 @@ _081A0A68:
 	thumb_func_end sub_81A0A34
 
 	thumb_func_start sub_81A0A70
-sub_81A0A70: ; 81A0A70
+sub_81A0A70: @ 81A0A70
 	push {lr}
 	ldr r1, =0x020375e4
 	ldrh r0, [r1]
@@ -776444,7 +776444,7 @@ _081A0C8E:
 	thumb_func_end sub_81A0A70
 
 	thumb_func_start sub_81A0C9C
-sub_81A0C9C: ; 81A0C9C
+sub_81A0C9C: @ 81A0C9C
 	push {lr}
 	bl script_env_2_enable
 	bl player_bitmagic
@@ -776459,7 +776459,7 @@ sub_81A0C9C: ; 81A0C9C
 	thumb_func_end sub_81A0C9C
 
 	thumb_func_start sub_81A0CC0
-sub_81A0CC0: ; 81A0CC0
+sub_81A0CC0: @ 81A0CC0
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -776523,7 +776523,7 @@ _081A0D34:
 	thumb_func_end sub_81A0CC0
 
 	thumb_func_start sub_81A0D40
-sub_81A0D40: ; 81A0D40
+sub_81A0D40: @ 81A0D40
 	push {r4,lr}
 	ldr r0, =0x020375e2
 	ldrh r0, [r0]
@@ -776555,7 +776555,7 @@ _081A0D6E:
 	thumb_func_end sub_81A0D40
 
 	thumb_func_start sub_81A0D80
-sub_81A0D80: ; 81A0D80
+sub_81A0D80: @ 81A0D80
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r3, [r0]
@@ -776598,7 +776598,7 @@ _081A0DCE:
 	thumb_func_end sub_81A0D80
 
 	thumb_func_start sub_81A0DD4
-sub_81A0DD4: ; 81A0DD4
+sub_81A0DD4: @ 81A0DD4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -776859,7 +776859,7 @@ _081A0FCE:
 	thumb_func_end sub_81A0DD4
 
 	thumb_func_start sub_81A0FE4
-sub_81A0FE4: ; 81A0FE4
+sub_81A0FE4: @ 81A0FE4
 	push {r4,lr}
 	ldr r4, =0x030062f0
 	ldr r0, [r4]
@@ -776873,7 +776873,7 @@ sub_81A0FE4: ; 81A0FE4
 	thumb_func_end sub_81A0FE4
 
 	thumb_func_start sub_81A0FFC
-sub_81A0FFC: ; 81A0FFC
+sub_81A0FFC: @ 81A0FFC
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r0, =0x020375e2
@@ -777095,7 +777095,7 @@ _081A11E6:
 	thumb_func_end sub_81A0FFC
 
 	thumb_func_start sub_81A11F8
-sub_81A11F8: ; 81A11F8
+sub_81A11F8: @ 81A11F8
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldr r0, =0x020375e2
@@ -777112,7 +777112,7 @@ sub_81A11F8: ; 81A11F8
 	thumb_func_end sub_81A11F8
 
 	thumb_func_start sub_81A1218
-sub_81A1218: ; 81A1218
+sub_81A1218: @ 81A1218
 	push {lr}
 	bl sub_81AAC28
 	pop {r0}
@@ -777120,7 +777120,7 @@ sub_81A1218: ; 81A1218
 	thumb_func_end sub_81A1218
 
 	thumb_func_start sub_81A1224
-sub_81A1224: ; 81A1224
+sub_81A1224: @ 81A1224
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -777290,7 +777290,7 @@ _081A1362:
 	thumb_func_end sub_81A1224
 
 	thumb_func_start sub_81A1370
-sub_81A1370: ; 81A1370
+sub_81A1370: @ 81A1370
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -777391,7 +777391,7 @@ _081A1422:
 	thumb_func_end sub_81A1370
 
 	thumb_func_start sub_81A1438
-sub_81A1438: ; 81A1438
+sub_81A1438: @ 81A1438
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r2, [r4]
@@ -777496,7 +777496,7 @@ _081A14C2:
 	thumb_func_end sub_81A1438
 
 	thumb_func_start sub_81A150C
-sub_81A150C: ; 81A150C
+sub_81A150C: @ 81A150C
 	push {lr}
 	ldr r2, =gUnknown_08610970
 	ldr r0, =0x03005d90
@@ -777566,7 +777566,7 @@ _081A1594:
 	thumb_func_end sub_81A150C
 
 	thumb_func_start sub_81A15A4
-sub_81A15A4: ; 81A15A4
+sub_81A15A4: @ 81A15A4
 	push {lr}
 	ldr r2, =gUnknown_08610970
 	ldr r0, =0x03005d90
@@ -777634,7 +777634,7 @@ _081A1628:
 	thumb_func_end sub_81A15A4
 
 	thumb_func_start sub_81A1638
-sub_81A1638: ; 81A1638
+sub_81A1638: @ 81A1638
 	ldr r1, =0x020375e0
 	movs r0, 0x1
 	strh r0, [r1]
@@ -777643,7 +777643,7 @@ sub_81A1638: ; 81A1638
 	thumb_func_end sub_81A1638
 
 	thumb_func_start sub_81A1644
-sub_81A1644: ; 81A1644
+sub_81A1644: @ 81A1644
 	ldr r1, =0x020375e0
 	movs r0, 0x1
 	strh r0, [r1]
@@ -777652,7 +777652,7 @@ sub_81A1644: ; 81A1644
 	thumb_func_end sub_81A1644
 
 	thumb_func_start sub_81A1650
-sub_81A1650: ; 81A1650
+sub_81A1650: @ 81A1650
 	push {lr}
 	movs r2, 0x58
 	muls r2, r0
@@ -777704,7 +777704,7 @@ _081A16B0:
 	thumb_func_end sub_81A1650
 
 	thumb_func_start sub_81A16B4
-sub_81A16B4: ; 81A16B4
+sub_81A16B4: @ 81A16B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -777728,7 +777728,7 @@ _081A16D4:
 	thumb_func_end sub_81A16B4
 
 	thumb_func_start sub_81A16DC
-sub_81A16DC: ; 81A16DC
+sub_81A16DC: @ 81A16DC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -777766,7 +777766,7 @@ _081A1718:
 	thumb_func_end sub_81A16DC
 
 	thumb_func_start sub_81A172C
-sub_81A172C: ; 81A172C
+sub_81A172C: @ 81A172C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_81A16DC
@@ -777789,7 +777789,7 @@ sub_81A172C: ; 81A172C
 	thumb_func_end sub_81A172C
 
 	thumb_func_start sub_81A175C
-sub_81A175C: ; 81A175C
+sub_81A175C: @ 81A175C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =sub_81A16B4
@@ -777808,7 +777808,7 @@ sub_81A175C: ; 81A175C
 	thumb_func_end sub_81A175C
 
 	thumb_func_start sub_81A1780
-sub_81A1780: ; 81A1780
+sub_81A1780: @ 81A1780
 	push {lr}
 	ldr r1, =gUnknown_08611C18
 	ldr r0, =0x020375e0
@@ -777823,7 +777823,7 @@ sub_81A1780: ; 81A1780
 	thumb_func_end sub_81A1780
 
 	thumb_func_start sub_81A17A0
-sub_81A17A0: ; 81A17A0
+sub_81A17A0: @ 81A17A0
 	push {lr}
 	movs r0, 0x80
 	lsls r0, 7
@@ -777885,7 +777885,7 @@ _081A1822:
 	thumb_func_end sub_81A17A0
 
 	thumb_func_start sub_81A1830
-sub_81A1830: ; 81A1830
+sub_81A1830: @ 81A1830
 	push {r4-r6,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -778009,7 +778009,7 @@ _081A1956:
 	thumb_func_end sub_81A1830
 
 	thumb_func_start sub_81A1968
-sub_81A1968: ; 81A1968
+sub_81A1968: @ 81A1968
 	push {r4,r5,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -778157,7 +778157,7 @@ _081A1AC4:
 	thumb_func_end sub_81A1968
 
 	thumb_func_start sub_81A1AD4
-sub_81A1AD4: ; 81A1AD4
+sub_81A1AD4: @ 81A1AD4
 	push {r4-r7,lr}
 	bl sub_81B8558
 	movs r3, 0
@@ -778189,7 +778189,7 @@ _081A1B00:
 	thumb_func_end sub_81A1AD4
 
 	thumb_func_start sub_81A1B1C
-sub_81A1B1C: ; 81A1B1C
+sub_81A1B1C: @ 81A1B1C
 	push {lr}
 	bl Reset
 	pop {r0}
@@ -778197,7 +778197,7 @@ sub_81A1B1C: ; 81A1B1C
 	thumb_func_end sub_81A1B1C
 
 	thumb_func_start sub_81A1B28
-sub_81A1B28: ; 81A1B28
+sub_81A1B28: @ 81A1B28
 	ldr r1, =0x0203bc88
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
@@ -778206,7 +778206,7 @@ sub_81A1B28: ; 81A1B28
 	thumb_func_end sub_81A1B28
 
 	thumb_func_start sub_81A1B38
-sub_81A1B38: ; 81A1B38
+sub_81A1B38: @ 81A1B38
 	push {r4,r5,lr}
 	movs r4, 0
 	movs r5, 0x64
@@ -778251,7 +778251,7 @@ _081A1B76:
 	thumb_func_end sub_81A1B38
 
 	thumb_func_start sub_81A1B98
-sub_81A1B98: ; 81A1B98
+sub_81A1B98: @ 81A1B98
 	push {lr}
 	ldr r0, =0x020375e4
 	ldrh r1, [r0]
@@ -778314,7 +778314,7 @@ _081A1C1E:
 	thumb_func_end sub_81A1B98
 
 	thumb_func_start sub_81A1C24
-sub_81A1C24: ; 81A1C24
+sub_81A1C24: @ 81A1C24
 	push {lr}
 	ldr r1, =0x03005d90
 	ldr r1, [r1]
@@ -778335,7 +778335,7 @@ _081A1C46:
 	thumb_func_end sub_81A1C24
 
 	thumb_func_start sub_81A1C4C
-sub_81A1C4C: ; 81A1C4C
+sub_81A1C4C: @ 81A1C4C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -778369,7 +778369,7 @@ sub_81A1C4C: ; 81A1C4C
 	thumb_func_end sub_81A1C4C
 
 	thumb_func_start sub_81A1C90
-sub_81A1C90: ; 81A1C90
+sub_81A1C90: @ 81A1C90
 	push {r4,lr}
 	sub sp, 0x34
 	adds r2, r0, 0
@@ -778408,7 +778408,7 @@ _081A1C9E:
 	thumb_func_end sub_81A1C90
 
 	thumb_func_start sub_81A1CD8
-sub_81A1CD8: ; 81A1CD8
+sub_81A1CD8: @ 81A1CD8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -778479,7 +778479,7 @@ _081A1D24:
 	thumb_func_end sub_81A1CD8
 
 	thumb_func_start sub_81A1D78
-sub_81A1D78: ; 81A1D78
+sub_81A1D78: @ 81A1D78
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, [sp, 0x10]
@@ -778512,7 +778512,7 @@ sub_81A1D78: ; 81A1D78
 	thumb_func_end sub_81A1D78
 
 	thumb_func_start sub_81A1DBC
-sub_81A1DBC: ; 81A1DBC
+sub_81A1DBC: @ 81A1DBC
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -778537,7 +778537,7 @@ _081A1DDE:
 	thumb_func_end sub_81A1DBC
 
 	thumb_func_start sub_81A1DEC
-sub_81A1DEC: ; 81A1DEC
+sub_81A1DEC: @ 81A1DEC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -778639,7 +778639,7 @@ _081A1E96:
 	thumb_func_end sub_81A1DEC
 
 	thumb_func_start sub_81A1EA8
-sub_81A1EA8: ; 81A1EA8
+sub_81A1EA8: @ 81A1EA8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -778757,7 +778757,7 @@ _081A1F28:
 	thumb_func_end sub_81A1EA8
 
 	thumb_func_start sub_81A1FD8
-sub_81A1FD8: ; 81A1FD8
+sub_81A1FD8: @ 81A1FD8
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -778781,7 +778781,7 @@ _081A1FF8:
 	thumb_func_end sub_81A1FD8
 
 	thumb_func_start sub_81A2008
-sub_81A2008: ; 81A2008
+sub_81A2008: @ 81A2008
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -778846,7 +778846,7 @@ sub_81A2008: ; 81A2008
 	thumb_func_end sub_81A2008
 
 	thumb_func_start sub_81A2094
-sub_81A2094: ; 81A2094
+sub_81A2094: @ 81A2094
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -778926,7 +778926,7 @@ _081A211C:
 	thumb_func_end sub_81A2094
 
 	thumb_func_start sub_81A2134
-sub_81A2134: ; 81A2134
+sub_81A2134: @ 81A2134
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -779074,7 +779074,7 @@ _081A2184:
 	thumb_func_end sub_81A2134
 
 	thumb_func_start sub_81A22B8
-sub_81A22B8: ; 81A22B8
+sub_81A22B8: @ 81A22B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -779145,7 +779145,7 @@ _081A2304:
 	thumb_func_end sub_81A22B8
 
 	thumb_func_start sub_81A2358
-sub_81A2358: ; 81A2358
+sub_81A2358: @ 81A2358
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r5, [sp, 0x10]
@@ -779178,7 +779178,7 @@ sub_81A2358: ; 81A2358
 	thumb_func_end sub_81A2358
 
 	thumb_func_start sub_81A239C
-sub_81A239C: ; 81A239C
+sub_81A239C: @ 81A239C
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -779202,7 +779202,7 @@ _081A23BC:
 	thumb_func_end sub_81A239C
 
 	thumb_func_start sub_81A23CC
-sub_81A23CC: ; 81A23CC
+sub_81A23CC: @ 81A23CC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -779280,7 +779280,7 @@ _081A244E:
 	thumb_func_end sub_81A23CC
 
 	thumb_func_start sub_81A2460
-sub_81A2460: ; 81A2460
+sub_81A2460: @ 81A2460
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -779382,7 +779382,7 @@ _081A24B0:
 	thumb_func_end sub_81A2460
 
 	thumb_func_start sub_81A2560
-sub_81A2560: ; 81A2560
+sub_81A2560: @ 81A2560
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x03005d90
@@ -779403,7 +779403,7 @@ _081A257A:
 	thumb_func_end sub_81A2560
 
 	thumb_func_start sub_81A258C
-sub_81A258C: ; 81A258C
+sub_81A258C: @ 81A258C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -779468,7 +779468,7 @@ sub_81A258C: ; 81A258C
 	thumb_func_end sub_81A258C
 
 	thumb_func_start sub_81A2618
-sub_81A2618: ; 81A2618
+sub_81A2618: @ 81A2618
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -779529,7 +779529,7 @@ _081A2684:
 	thumb_func_end sub_81A2618
 
 	thumb_func_start sub_81A2698
-sub_81A2698: ; 81A2698
+sub_81A2698: @ 81A2698
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -779655,7 +779655,7 @@ sub_81A2698: ; 81A2698
 	thumb_func_end sub_81A2698
 
 	thumb_func_start sub_81A27E8
-sub_81A27E8: ; 81A27E8
+sub_81A27E8: @ 81A27E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -779726,7 +779726,7 @@ _081A2834:
 	thumb_func_end sub_81A27E8
 
 	thumb_func_start sub_81A2888
-sub_81A2888: ; 81A2888
+sub_81A2888: @ 81A2888
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r1, 0
@@ -779758,7 +779758,7 @@ sub_81A2888: ; 81A2888
 	thumb_func_end sub_81A2888
 
 	thumb_func_start sub_81A28CC
-sub_81A28CC: ; 81A28CC
+sub_81A28CC: @ 81A28CC
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x03005d90
@@ -779779,7 +779779,7 @@ _081A28E6:
 	thumb_func_end sub_81A28CC
 
 	thumb_func_start sub_81A28F8
-sub_81A28F8: ; 81A28F8
+sub_81A28F8: @ 81A28F8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -779836,7 +779836,7 @@ _081A2956:
 	thumb_func_end sub_81A28F8
 
 	thumb_func_start sub_81A2968
-sub_81A2968: ; 81A2968
+sub_81A2968: @ 81A2968
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r5, =0x0203ab74
@@ -779911,7 +779911,7 @@ sub_81A2968: ; 81A2968
 	thumb_func_end sub_81A2968
 
 	thumb_func_start sub_81A2A28
-sub_81A2A28: ; 81A2A28
+sub_81A2A28: @ 81A2A28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -780008,7 +780008,7 @@ _081A2A80:
 	thumb_func_end sub_81A2A28
 
 	thumb_func_start sub_81A2B04
-sub_81A2B04: ; 81A2B04
+sub_81A2B04: @ 81A2B04
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -780057,7 +780057,7 @@ sub_81A2B04: ; 81A2B04
 	thumb_func_end sub_81A2B04
 
 	thumb_func_start sub_81A2B70
-sub_81A2B70: ; 81A2B70
+sub_81A2B70: @ 81A2B70
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -780081,7 +780081,7 @@ _081A2B90:
 	thumb_func_end sub_81A2B70
 
 	thumb_func_start sub_81A2BA0
-sub_81A2BA0: ; 81A2BA0
+sub_81A2BA0: @ 81A2BA0
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -780105,7 +780105,7 @@ _081A2BC0:
 	thumb_func_end sub_81A2BA0
 
 	thumb_func_start sub_81A2BD0
-sub_81A2BD0: ; 81A2BD0
+sub_81A2BD0: @ 81A2BD0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -780207,7 +780207,7 @@ _081A2C80:
 	thumb_func_end sub_81A2BD0
 
 	thumb_func_start sub_81A2C94
-sub_81A2C94: ; 81A2C94
+sub_81A2C94: @ 81A2C94
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -780323,7 +780323,7 @@ _081A2CE0:
 	thumb_func_end sub_81A2C94
 
 	thumb_func_start sub_81A2DB4
-sub_81A2DB4: ; 81A2DB4
+sub_81A2DB4: @ 81A2DB4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -780394,7 +780394,7 @@ _081A2E00:
 	thumb_func_end sub_81A2DB4
 
 	thumb_func_start sub_81A2E54
-sub_81A2E54: ; 81A2E54
+sub_81A2E54: @ 81A2E54
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r1, 0
@@ -780426,7 +780426,7 @@ sub_81A2E54: ; 81A2E54
 	thumb_func_end sub_81A2E54
 
 	thumb_func_start sub_81A2E98
-sub_81A2E98: ; 81A2E98
+sub_81A2E98: @ 81A2E98
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x03005d90
@@ -780447,7 +780447,7 @@ _081A2EB2:
 	thumb_func_end sub_81A2E98
 
 	thumb_func_start sub_81A2EC4
-sub_81A2EC4: ; 81A2EC4
+sub_81A2EC4: @ 81A2EC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -780506,7 +780506,7 @@ _081A2F26:
 	thumb_func_end sub_81A2EC4
 
 	thumb_func_start sub_81A2F38
-sub_81A2F38: ; 81A2F38
+sub_81A2F38: @ 81A2F38
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r5, =0x0203ab74
@@ -780581,7 +780581,7 @@ sub_81A2F38: ; 81A2F38
 	thumb_func_end sub_81A2F38
 
 	thumb_func_start sub_81A2FF8
-sub_81A2FF8: ; 81A2FF8
+sub_81A2FF8: @ 81A2FF8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -780792,7 +780792,7 @@ _081A315C:
 	thumb_func_end sub_81A2FF8
 
 	thumb_func_start sub_81A31FC
-sub_81A31FC: ; 81A31FC
+sub_81A31FC: @ 81A31FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -781246,7 +781246,7 @@ _081A35CE:
 	thumb_func_end sub_81A31FC
 
 	thumb_func_start sub_81A35EC
-sub_81A35EC: ; 81A35EC
+sub_81A35EC: @ 81A35EC
 	push {r4,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -781262,7 +781262,7 @@ sub_81A35EC: ; 81A35EC
 	thumb_func_end sub_81A35EC
 
 	thumb_func_start sub_81A3610
-sub_81A3610: ; 81A3610
+sub_81A3610: @ 81A3610
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -781357,7 +781357,7 @@ _081A36C2:
 	thumb_func_end sub_81A3610
 
 	thumb_func_start sub_81A36D0
-sub_81A36D0: ; 81A36D0
+sub_81A36D0: @ 81A36D0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -781593,7 +781593,7 @@ _081A38F8:
 	thumb_func_end sub_81A36D0
 
 	thumb_func_start sub_81A3908
-sub_81A3908: ; 81A3908
+sub_81A3908: @ 81A3908
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -781685,7 +781685,7 @@ _081A399E:
 	thumb_func_end sub_81A3908
 
 	thumb_func_start sub_81A39C4
-sub_81A39C4: ; 81A39C4
+sub_81A39C4: @ 81A39C4
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -781790,7 +781790,7 @@ _081A3AC6:
 	thumb_func_end sub_81A39C4
 
 	thumb_func_start sub_81A3ACC
-sub_81A3ACC: ; 81A3ACC
+sub_81A3ACC: @ 81A3ACC
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x03005d90
@@ -781815,7 +781815,7 @@ _081A3AD8:
 	thumb_func_end sub_81A3ACC
 
 	thumb_func_start sub_81A3B00
-sub_81A3B00: ; 81A3B00
+sub_81A3B00: @ 81A3B00
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r1, [r0]
@@ -781837,7 +781837,7 @@ _081A3B24:
 	thumb_func_end sub_81A3B00
 
 	thumb_func_start sub_81A3B30
-sub_81A3B30: ; 81A3B30
+sub_81A3B30: @ 81A3B30
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -781861,7 +781861,7 @@ sub_81A3B30: ; 81A3B30
 	thumb_func_end sub_81A3B30
 
 	thumb_func_start sub_81A3B64
-sub_81A3B64: ; 81A3B64
+sub_81A3B64: @ 81A3B64
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -782051,7 +782051,7 @@ _081A3CF6:
 	thumb_func_end sub_81A3B64
 
 	thumb_func_start sub_81A3D30
-sub_81A3D30: ; 81A3D30
+sub_81A3D30: @ 81A3D30
 	push {r4,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -782069,7 +782069,7 @@ sub_81A3D30: ; 81A3D30
 	thumb_func_end sub_81A3D30
 
 	thumb_func_start sub_81A3D58
-sub_81A3D58: ; 81A3D58
+sub_81A3D58: @ 81A3D58
 	push {r4,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -782102,7 +782102,7 @@ _081A3D94:
 	thumb_func_end sub_81A3D58
 
 	thumb_func_start sub_81A3DA0
-sub_81A3DA0: ; 81A3DA0
+sub_81A3DA0: @ 81A3DA0
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r1, =0x020375e2
@@ -782126,7 +782126,7 @@ _081A3DC8:
 	thumb_func_end sub_81A3DA0
 
 	thumb_func_start sub_81A3DD0
-sub_81A3DD0: ; 81A3DD0
+sub_81A3DD0: @ 81A3DD0
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	lsls r0, 16
@@ -782233,7 +782233,7 @@ _081A3ED6:
 	thumb_func_end sub_81A3DD0
 
 	thumb_func_start sub_81A3EF0
-sub_81A3EF0: ; 81A3EF0
+sub_81A3EF0: @ 81A3EF0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -782358,7 +782358,7 @@ _081A3FBE:
 	thumb_func_end sub_81A3EF0
 
 	thumb_func_start sub_81A3FD4
-sub_81A3FD4: ; 81A3FD4
+sub_81A3FD4: @ 81A3FD4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -782621,7 +782621,7 @@ _081A4202:
 	thumb_func_end sub_81A3FD4
 
 	thumb_func_start sub_81A4224
-sub_81A4224: ; 81A4224
+sub_81A4224: @ 81A4224
 	push {lr}
 	bl sub_81652B4
 	pop {r0}
@@ -782629,7 +782629,7 @@ sub_81A4224: ; 81A4224
 	thumb_func_end sub_81A4224
 
 	thumb_func_start sub_81A4230
-sub_81A4230: ; 81A4230
+sub_81A4230: @ 81A4230
 	push {r4-r7,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -782783,7 +782783,7 @@ _081A4394:
 	thumb_func_end sub_81A4230
 
 	thumb_func_start sub_81A43A8
-sub_81A43A8: ; 81A43A8
+sub_81A43A8: @ 81A43A8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -782832,7 +782832,7 @@ _081A43EE:
 	thumb_func_end sub_81A43A8
 
 	thumb_func_start sub_81A4410
-sub_81A4410: ; 81A4410
+sub_81A4410: @ 81A4410
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl sub_8185338
@@ -782852,7 +782852,7 @@ sub_81A4410: ; 81A4410
 	thumb_func_end sub_81A4410
 
 	thumb_func_start sub_81A443C
-sub_81A443C: ; 81A443C
+sub_81A443C: @ 81A443C
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrh r0, [r0]
@@ -782881,7 +782881,7 @@ _081A446E:
 	thumb_func_end sub_81A443C
 
 	thumb_func_start sub_81A447C
-sub_81A447C: ; 81A447C
+sub_81A447C: @ 81A447C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783007,7 +783007,7 @@ _081A454E:
 	thumb_func_end sub_81A447C
 
 	thumb_func_start sub_81A457C
-sub_81A457C: ; 81A457C
+sub_81A457C: @ 81A457C
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -783020,7 +783020,7 @@ sub_81A457C: ; 81A457C
 	thumb_func_end sub_81A457C
 
 	thumb_func_start sub_81A4594
-sub_81A4594: ; 81A4594
+sub_81A4594: @ 81A4594
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783128,7 +783128,7 @@ _081A465C:
 	thumb_func_end sub_81A4594
 
 	thumb_func_start sub_81A4684
-sub_81A4684: ; 81A4684
+sub_81A4684: @ 81A4684
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783287,7 +783287,7 @@ _081A47BC:
 	thumb_func_end sub_81A4684
 
 	thumb_func_start sub_81A47E0
-sub_81A47E0: ; 81A47E0
+sub_81A47E0: @ 81A47E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783397,7 +783397,7 @@ _081A487A:
 	thumb_func_end sub_81A47E0
 
 	thumb_func_start sub_81A48B4
-sub_81A48B4: ; 81A48B4
+sub_81A48B4: @ 81A48B4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783514,7 +783514,7 @@ _081A4952:
 	thumb_func_end sub_81A48B4
 
 	thumb_func_start sub_81A4998
-sub_81A4998: ; 81A4998
+sub_81A4998: @ 81A4998
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783632,7 +783632,7 @@ _081A4A90:
 	thumb_func_end sub_81A4998
 
 	thumb_func_start sub_81A4AA0
-sub_81A4AA0: ; 81A4AA0
+sub_81A4AA0: @ 81A4AA0
 	push {r4,lr}
 	ldr r4, =0x0203ab74
 	ldr r0, =gUnknown_08611C84
@@ -783660,7 +783660,7 @@ sub_81A4AA0: ; 81A4AA0
 	thumb_func_end sub_81A4AA0
 
 	thumb_func_start sub_81A4AE8
-sub_81A4AE8: ; 81A4AE8
+sub_81A4AE8: @ 81A4AE8
 	push {r4,lr}
 	ldr r4, =0x0203ab74
 	ldrb r0, [r4]
@@ -783680,7 +783680,7 @@ sub_81A4AE8: ; 81A4AE8
 	thumb_func_end sub_81A4AE8
 
 	thumb_func_start sub_81A4B14
-sub_81A4B14: ; 81A4B14
+sub_81A4B14: @ 81A4B14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -783817,7 +783817,7 @@ _081A4BAE:
 	thumb_func_end sub_81A4B14
 
 	thumb_func_start sub_81A4C30
-sub_81A4C30: ; 81A4C30
+sub_81A4C30: @ 81A4C30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -783875,7 +783875,7 @@ _081A4C84:
 	thumb_func_end sub_81A4C30
 
 	thumb_func_start sub_81A4CB0
-sub_81A4CB0: ; 81A4CB0
+sub_81A4CB0: @ 81A4CB0
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -783911,7 +783911,7 @@ _081A4CDA:
 	thumb_func_end sub_81A4CB0
 
 	thumb_func_start sub_81A4D00
-sub_81A4D00: ; 81A4D00
+sub_81A4D00: @ 81A4D00
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -783947,7 +783947,7 @@ _081A4D2A:
 	thumb_func_end sub_81A4D00
 
 	thumb_func_start sub_81A4D50
-sub_81A4D50: ; 81A4D50
+sub_81A4D50: @ 81A4D50
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02022fec
@@ -783997,7 +783997,7 @@ _081A4D90:
 	thumb_func_end sub_81A4D50
 
 	thumb_func_start sub_81A4DB8
-sub_81A4DB8: ; 81A4DB8
+sub_81A4DB8: @ 81A4DB8
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -784013,7 +784013,7 @@ sub_81A4DB8: ; 81A4DB8
 	thumb_func_end sub_81A4DB8
 
 	thumb_func_start sub_81A4DD8
-sub_81A4DD8: ; 81A4DD8
+sub_81A4DD8: @ 81A4DD8
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -784031,7 +784031,7 @@ sub_81A4DD8: ; 81A4DD8
 	thumb_func_end sub_81A4DD8
 
 	thumb_func_start sub_81A4E04
-sub_81A4E04: ; 81A4E04
+sub_81A4E04: @ 81A4E04
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -784264,7 +784264,7 @@ _081A4FD0:
 	thumb_func_end sub_81A4E04
 
 	thumb_func_start sub_81A4FF0
-sub_81A4FF0: ; 81A4FF0
+sub_81A4FF0: @ 81A4FF0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -784295,7 +784295,7 @@ sub_81A4FF0: ; 81A4FF0
 	thumb_func_end sub_81A4FF0
 
 	thumb_func_start sub_81A5030
-sub_81A5030: ; 81A5030
+sub_81A5030: @ 81A5030
 	push {lr}
 	lsls r0, 24
 	ldr r2, =0x02038bca
@@ -784315,7 +784315,7 @@ sub_81A5030: ; 81A5030
 	thumb_func_end sub_81A5030
 
 	thumb_func_start sub_81A5060
-sub_81A5060: ; 81A5060
+sub_81A5060: @ 81A5060
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -784353,7 +784353,7 @@ sub_81A5060: ; 81A5060
 	thumb_func_end sub_81A5060
 
 	thumb_func_start sub_81A50B0
-sub_81A50B0: ; 81A50B0
+sub_81A50B0: @ 81A50B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -784384,7 +784384,7 @@ sub_81A50B0: ; 81A50B0
 	thumb_func_end sub_81A50B0
 
 	thumb_func_start sub_81A50F0
-sub_81A50F0: ; 81A50F0
+sub_81A50F0: @ 81A50F0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r1, 0
@@ -784421,7 +784421,7 @@ sub_81A50F0: ; 81A50F0
 	thumb_func_end sub_81A50F0
 
 	thumb_func_start sub_81A513C
-sub_81A513C: ; 81A513C
+sub_81A513C: @ 81A513C
 	push {r4,r5,lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -784475,7 +784475,7 @@ _081A51A0:
 	thumb_func_end sub_81A513C
 
 	thumb_func_start sub_81A51A8
-sub_81A51A8: ; 81A51A8
+sub_81A51A8: @ 81A51A8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -784538,7 +784538,7 @@ _081A5228:
 	thumb_func_end sub_81A51A8
 
 	thumb_func_start sub_81A5238
-sub_81A5238: ; 81A5238
+sub_81A5238: @ 81A5238
 	push {lr}
 	ldr r1, =gUnknown_08611F84
 	ldr r0, =0x020375e0
@@ -784553,7 +784553,7 @@ sub_81A5238: ; 81A5238
 	thumb_func_end sub_81A5238
 
 	thumb_func_start sub_81A5258
-sub_81A5258: ; 81A5258
+sub_81A5258: @ 81A5258
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -784846,7 +784846,7 @@ _081A5544:
 	thumb_func_end sub_81A5258
 
 	thumb_func_start sub_81A5558
-sub_81A5558: ; 81A5558
+sub_81A5558: @ 81A5558
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -785002,7 +785002,7 @@ _081A565E:
 	thumb_func_end sub_81A5558
 
 	thumb_func_start sub_81A5698
-sub_81A5698: ; 81A5698
+sub_81A5698: @ 81A5698
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x02024332
@@ -785018,7 +785018,7 @@ _081A56AA:
 	thumb_func_end sub_81A5698
 
 	thumb_func_start sub_81A56B4
-sub_81A56B4: ; 81A56B4
+sub_81A56B4: @ 81A56B4
 	ldr r0, =0x0202449c
 	ldr r2, [r0]
 	movs r0, 0xA6
@@ -785044,7 +785044,7 @@ sub_81A56B4: ; 81A56B4
 	thumb_func_end sub_81A56B4
 
 	thumb_func_start sub_81A56E8
-sub_81A56E8: ; 81A56E8
+sub_81A56E8: @ 81A56E8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0202449c
@@ -785066,7 +785066,7 @@ sub_81A56E8: ; 81A56E8
 	thumb_func_end sub_81A56E8
 
 	thumb_func_start sub_81A5718
-sub_81A5718: ; 81A5718
+sub_81A5718: @ 81A5718
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -785168,7 +785168,7 @@ _081A57DA:
 	thumb_func_end sub_81A5718
 
 	thumb_func_start sub_81A57E4
-sub_81A57E4: ; 81A57E4
+sub_81A57E4: @ 81A57E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -785239,7 +785239,7 @@ _081A5864:
 	thumb_func_end sub_81A57E4
 
 	thumb_func_start sub_81A586C
-sub_81A586C: ; 81A586C
+sub_81A586C: @ 81A586C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -785276,7 +785276,7 @@ _081A58A4:
 	thumb_func_end sub_81A586C
 
 	thumb_func_start sub_81A58B4
-sub_81A58B4: ; 81A58B4
+sub_81A58B4: @ 81A58B4
 	push {r4-r6,lr}
 	ldr r4, =0x03005d90
 	ldr r1, [r4]
@@ -785352,7 +785352,7 @@ _081A5930:
 	thumb_func_end sub_81A58B4
 
 	thumb_func_start sub_81A5964
-sub_81A5964: ; 81A5964
+sub_81A5964: @ 81A5964
 	push {r4,lr}
 	ldr r0, =0x03005d90
 	ldr r3, [r0]
@@ -785420,7 +785420,7 @@ _081A59EE:
 	thumb_func_end sub_81A5964
 
 	thumb_func_start sub_81A59FC
-sub_81A59FC: ; 81A59FC
+sub_81A59FC: @ 81A59FC
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -785512,7 +785512,7 @@ _081A5ABA:
 	thumb_func_end sub_81A59FC
 
 	thumb_func_start sub_81A5AC4
-sub_81A5AC4: ; 81A5AC4
+sub_81A5AC4: @ 81A5AC4
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -785540,7 +785540,7 @@ sub_81A5AC4: ; 81A5AC4
 	thumb_func_end sub_81A5AC4
 
 	thumb_func_start sub_81A5B08
-sub_81A5B08: ; 81A5B08
+sub_81A5B08: @ 81A5B08
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r1, [r4]
@@ -785593,7 +785593,7 @@ _081A5B76:
 	thumb_func_end sub_81A5B08
 
 	thumb_func_start sub_81A5B88
-sub_81A5B88: ; 81A5B88
+sub_81A5B88: @ 81A5B88
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -785633,7 +785633,7 @@ _081A5BD6:
 	thumb_func_end sub_81A5B88
 
 	thumb_func_start sub_81A5BE0
-sub_81A5BE0: ; 81A5BE0
+sub_81A5BE0: @ 81A5BE0
 	push {lr}
 	ldr r0, =0x02021cc4
 	ldr r1, =0x02038bca
@@ -785645,7 +785645,7 @@ sub_81A5BE0: ; 81A5BE0
 	thumb_func_end sub_81A5BE0
 
 	thumb_func_start sub_81A5BF8
-sub_81A5BF8: ; 81A5BF8
+sub_81A5BF8: @ 81A5BF8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -785791,7 +785791,7 @@ sub_81A5BF8: ; 81A5BF8
 	thumb_func_end sub_81A5BF8
 
 	thumb_func_start sub_81A5D44
-sub_81A5D44: ; 81A5D44
+sub_81A5D44: @ 81A5D44
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -785932,7 +785932,7 @@ sub_81A5D44: ; 81A5D44
 	thumb_func_end sub_81A5D44
 
 	thumb_func_start sub_81A5E74
-sub_81A5E74: ; 81A5E74
+sub_81A5E74: @ 81A5E74
 	push {lr}
 	ldr r1, =gUnknown_08612120
 	ldr r0, =0x020375e0
@@ -785947,7 +785947,7 @@ sub_81A5E74: ; 81A5E74
 	thumb_func_end sub_81A5E74
 
 	thumb_func_start sub_81A5E94
-sub_81A5E94: ; 81A5E94
+sub_81A5E94: @ 81A5E94
 	push {r4-r7,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -786065,7 +786065,7 @@ _081A5F40:
 	thumb_func_end sub_81A5E94
 
 	thumb_func_start sub_81A5FA8
-sub_81A5FA8: ; 81A5FA8
+sub_81A5FA8: @ 81A5FA8
 	push {r4-r7,lr}
 	ldr r7, =0x03005d90
 	ldr r0, [r7]
@@ -786140,7 +786140,7 @@ _081A6044:
 	thumb_func_end sub_81A5FA8
 
 	thumb_func_start sub_81A6054
-sub_81A6054: ; 81A6054
+sub_81A6054: @ 81A6054
 	push {r4-r6,lr}
 	ldr r6, =0x03005d90
 	ldr r0, [r6]
@@ -786239,7 +786239,7 @@ _081A6128:
 	thumb_func_end sub_81A6054
 
 	thumb_func_start sub_81A613C
-sub_81A613C: ; 81A613C
+sub_81A613C: @ 81A613C
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -786267,17 +786267,17 @@ sub_81A613C: ; 81A613C
 	thumb_func_end sub_81A613C
 
 	thumb_func_start nullsub_75
-nullsub_75: ; 81A6180
+nullsub_75: @ 81A6180
 	bx lr
 	thumb_func_end nullsub_75
 
 	thumb_func_start nullsub_123
-nullsub_123: ; 81A6184
+nullsub_123: @ 81A6184
 	bx lr
 	thumb_func_end nullsub_123
 
 	thumb_func_start sub_81A6188
-sub_81A6188: ; 81A6188
+sub_81A6188: @ 81A6188
 	push {lr}
 	bl zero_player_party_data
 	bl sub_819A4F8
@@ -786286,7 +786286,7 @@ sub_81A6188: ; 81A6188
 	thumb_func_end sub_81A6188
 
 	thumb_func_start sub_81A6198
-sub_81A6198: ; 81A6198
+sub_81A6198: @ 81A6198
 	push {lr}
 	bl sub_819DC00
 	pop {r0}
@@ -786294,7 +786294,7 @@ sub_81A6198: ; 81A6198
 	thumb_func_end sub_81A6198
 
 	thumb_func_start sub_81A61A4
-sub_81A61A4: ; 81A61A4
+sub_81A61A4: @ 81A61A4
 	ldr r1, =0x03001288
 	movs r0, 0x1
 	strb r0, [r1]
@@ -786303,7 +786303,7 @@ sub_81A61A4: ; 81A61A4
 	thumb_func_end sub_81A61A4
 
 	thumb_func_start sub_81A61B0
-sub_81A61B0: ; 81A61B0
+sub_81A61B0: @ 81A61B0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -786551,7 +786551,7 @@ _081A636E:
 	thumb_func_end sub_81A61B0
 
 	thumb_func_start sub_81A63B8
-sub_81A63B8: ; 81A63B8
+sub_81A63B8: @ 81A63B8
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
@@ -786563,7 +786563,7 @@ sub_81A63B8: ; 81A63B8
 	thumb_func_end sub_81A63B8
 
 	thumb_func_start sub_81A63CC
-sub_81A63CC: ; 81A63CC
+sub_81A63CC: @ 81A63CC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -786665,7 +786665,7 @@ _081A6408:
 	thumb_func_end sub_81A63CC
 
 	thumb_func_start sub_81A64C4
-sub_81A64C4: ; 81A64C4
+sub_81A64C4: @ 81A64C4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -787046,7 +787046,7 @@ _081A67AE:
 	thumb_func_end sub_81A64C4
 
 	thumb_func_start sub_81A67EC
-sub_81A67EC: ; 81A67EC
+sub_81A67EC: @ 81A67EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -787305,7 +787305,7 @@ _081A69EA:
 	thumb_func_end sub_81A67EC
 
 	thumb_func_start sub_81A6A08
-sub_81A6A08: ; 81A6A08
+sub_81A6A08: @ 81A6A08
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -787422,7 +787422,7 @@ _081A6ADE:
 	thumb_func_end sub_81A6A08
 
 	thumb_func_start sub_81A6AEC
-sub_81A6AEC: ; 81A6AEC
+sub_81A6AEC: @ 81A6AEC
 	push {r4-r7,lr}
 	sub sp, 0x8
 	movs r7, 0
@@ -787513,7 +787513,7 @@ _081A6B86:
 	thumb_func_end sub_81A6AEC
 
 	thumb_func_start sub_81A6BA4
-sub_81A6BA4: ; 81A6BA4
+sub_81A6BA4: @ 81A6BA4
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -787561,7 +787561,7 @@ _081A6BEE:
 	thumb_func_end sub_81A6BA4
 
 	thumb_func_start sub_81A6BF4
-sub_81A6BF4: ; 81A6BF4
+sub_81A6BF4: @ 81A6BF4
 	push {lr}
 	movs r2, 0
 	ldr r1, =0x02037318
@@ -787582,7 +787582,7 @@ _081A6C0C:
 	thumb_func_end sub_81A6BF4
 
 	thumb_func_start sub_81A6C1C
-sub_81A6C1C: ; 81A6C1C
+sub_81A6C1C: @ 81A6C1C
 	push {r4,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -787640,7 +787640,7 @@ _081A6C50:
 	thumb_func_end sub_81A6C1C
 
 	thumb_func_start sub_81A6CA8
-sub_81A6CA8: ; 81A6CA8
+sub_81A6CA8: @ 81A6CA8
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -787664,7 +787664,7 @@ _081A6CBE:
 	thumb_func_end sub_81A6CA8
 
 	thumb_func_start sub_81A6CD0
-sub_81A6CD0: ; 81A6CD0
+sub_81A6CD0: @ 81A6CD0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -787930,7 +787930,7 @@ _081A6EC0:
 	thumb_func_end sub_81A6CD0
 
 	thumb_func_start sub_81A6EF0
-sub_81A6EF0: ; 81A6EF0
+sub_81A6EF0: @ 81A6EF0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -787994,7 +787994,7 @@ _081A6F38:
 	thumb_func_end sub_81A6EF0
 
 	thumb_func_start sub_81A6F70
-sub_81A6F70: ; 81A6F70
+sub_81A6F70: @ 81A6F70
 	push {lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -788030,7 +788030,7 @@ _081A6FA8:
 	thumb_func_end sub_81A6F70
 
 	thumb_func_start sub_81A6FB4
-sub_81A6FB4: ; 81A6FB4
+sub_81A6FB4: @ 81A6FB4
 	push {r4,r5,lr}
 	ldr r5, =0x03005d90
 	ldr r0, [r5]
@@ -788082,7 +788082,7 @@ _081A701E:
 	thumb_func_end sub_81A6FB4
 
 	thumb_func_start sub_81A7024
-sub_81A7024: ; 81A7024
+sub_81A7024: @ 81A7024
 	push {lr}
 	lsls r1, 16
 	lsls r2, 24
@@ -788098,7 +788098,7 @@ _081A7034:
 	thumb_func_end sub_81A7024
 
 	thumb_func_start sub_81A703C
-sub_81A703C: ; 81A703C
+sub_81A703C: @ 81A703C
 	push {lr}
 	ldr r1, =gUnknown_086125F8
 	ldr r0, =0x020375e0
@@ -788113,7 +788113,7 @@ sub_81A703C: ; 81A703C
 	thumb_func_end sub_81A703C
 
 	thumb_func_start sub_81A705C
-sub_81A705C: ; 81A705C
+sub_81A705C: @ 81A705C
 	push {lr}
 	bl sub_81A79EC
 	ldr r1, =0x0300128c
@@ -788124,7 +788124,7 @@ sub_81A705C: ; 81A705C
 	thumb_func_end sub_81A705C
 
 	thumb_func_start sub_81A7070
-sub_81A7070: ; 81A7070
+sub_81A7070: @ 81A7070
 	push {r4-r7,lr}
 	ldr r0, =0x00004010
 	movs r1, 0x1C
@@ -788219,7 +788219,7 @@ _081A7132:
 	thumb_func_end sub_81A7070
 
 	thumb_func_start sub_81A7140
-sub_81A7140: ; 81A7140
+sub_81A7140: @ 81A7140
 	push {lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -788328,7 +788328,7 @@ _081A723A:
 	thumb_func_end sub_81A7140
 
 	thumb_func_start sub_81A7248
-sub_81A7248: ; 81A7248
+sub_81A7248: @ 81A7248
 	push {r4,r5,lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -788482,7 +788482,7 @@ _081A73AA:
 	thumb_func_end sub_81A7248
 
 	thumb_func_start sub_81A73B8
-sub_81A73B8: ; 81A73B8
+sub_81A73B8: @ 81A73B8
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -788506,7 +788506,7 @@ _081A73E0:
 	thumb_func_end sub_81A73B8
 
 	thumb_func_start sub_81A73EC
-sub_81A73EC: ; 81A73EC
+sub_81A73EC: @ 81A73EC
 	ldr r0, =0x020375f0
 	ldr r1, =0x0300128c
 	ldrb r1, [r1]
@@ -788516,7 +788516,7 @@ sub_81A73EC: ; 81A73EC
 	thumb_func_end sub_81A73EC
 
 	thumb_func_start sub_81A7400
-sub_81A7400: ; 81A7400
+sub_81A7400: @ 81A7400
 	ldr r1, =0x0300128e
 	movs r0, 0x1
 	strb r0, [r1]
@@ -788525,7 +788525,7 @@ sub_81A7400: ; 81A7400
 	thumb_func_end sub_81A7400
 
 	thumb_func_start sub_81A740C
-sub_81A740C: ; 81A740C
+sub_81A740C: @ 81A740C
 	ldr r1, =0x0300128e
 	movs r0, 0
 	strb r0, [r1]
@@ -788534,7 +788534,7 @@ sub_81A740C: ; 81A740C
 	thumb_func_end sub_81A740C
 
 	thumb_func_start sub_81A7418
-sub_81A7418: ; 81A7418
+sub_81A7418: @ 81A7418
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -788564,17 +788564,17 @@ sub_81A7418: ; 81A7418
 	thumb_func_end sub_81A7418
 
 	thumb_func_start nullsub_76
-nullsub_76: ; 81A7460
+nullsub_76: @ 81A7460
 	bx lr
 	thumb_func_end nullsub_76
 
 	thumb_func_start nullsub_124
-nullsub_124: ; 81A7464
+nullsub_124: @ 81A7464
 	bx lr
 	thumb_func_end nullsub_124
 
 	thumb_func_start sub_81A7468
-sub_81A7468: ; 81A7468
+sub_81A7468: @ 81A7468
 	push {lr}
 	ldr r0, =0x03001290
 	ldr r0, [r0]
@@ -788626,7 +788626,7 @@ _081A74C2:
 	thumb_func_end sub_81A7468
 
 	thumb_func_start sub_81A74CC
-sub_81A74CC: ; 81A74CC
+sub_81A74CC: @ 81A74CC
 	ldr r0, =0x020375f0
 	ldr r1, =0x0300128d
 	ldrb r1, [r1]
@@ -788636,7 +788636,7 @@ sub_81A74CC: ; 81A74CC
 	thumb_func_end sub_81A74CC
 
 	thumb_func_start sub_81A74E0
-sub_81A74E0: ; 81A74E0
+sub_81A74E0: @ 81A74E0
 	push {r4,lr}
 	bl GenerateRandomNumber
 	adds r4, r0, 0
@@ -788656,7 +788656,7 @@ sub_81A74E0: ; 81A74E0
 	thumb_func_end sub_81A74E0
 
 	thumb_func_start sub_81A7508
-sub_81A7508: ; 81A7508
+sub_81A7508: @ 81A7508
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -788704,7 +788704,7 @@ _081A7560:
 	thumb_func_end sub_81A7508
 
 	thumb_func_start sub_81A7580
-sub_81A7580: ; 81A7580
+sub_81A7580: @ 81A7580
 	push {lr}
 	ldr r0, =sub_81A7EE4
 	movs r1, 0x2
@@ -788715,7 +788715,7 @@ sub_81A7580: ; 81A7580
 	thumb_func_end sub_81A7580
 
 	thumb_func_start sub_81A7594
-sub_81A7594: ; 81A7594
+sub_81A7594: @ 81A7594
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -788788,7 +788788,7 @@ _081A75DA:
 	thumb_func_end sub_81A7594
 
 	thumb_func_start sub_81A7628
-sub_81A7628: ; 81A7628
+sub_81A7628: @ 81A7628
 	push {r4,lr}
 	adds r4, r1, 0
 	bl GetMonAbility
@@ -788841,7 +788841,7 @@ _081A7674:
 	thumb_func_end sub_81A7628
 
 	thumb_func_start sub_81A767C
-sub_81A767C: ; 81A767C
+sub_81A767C: @ 81A767C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -788931,7 +788931,7 @@ _081A771C:
 	thumb_func_end sub_81A767C
 
 	thumb_func_start sub_81A7728
-sub_81A7728: ; 81A7728
+sub_81A7728: @ 81A7728
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -789214,7 +789214,7 @@ _081A7956:
 	thumb_func_end sub_81A7728
 
 	thumb_func_start sub_81A7974
-sub_81A7974: ; 81A7974
+sub_81A7974: @ 81A7974
 	push {r4-r7,lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -789278,7 +789278,7 @@ _081A79E6:
 	thumb_func_end sub_81A7974
 
 	thumb_func_start sub_81A79EC
-sub_81A79EC: ; 81A79EC
+sub_81A79EC: @ 81A79EC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r1, =0x03005d90
@@ -789465,7 +789465,7 @@ _081A7B48:
 	thumb_func_end sub_81A79EC
 
 	thumb_func_start sub_81A7B58
-sub_81A7B58: ; 81A7B58
+sub_81A7B58: @ 81A7B58
 	push {r4,lr}
 	ldr r4, =0x03001294
 	bl GenerateRandomNumber
@@ -789486,7 +789486,7 @@ sub_81A7B58: ; 81A7B58
 	thumb_func_end sub_81A7B58
 
 	thumb_func_start sub_81A7B84
-sub_81A7B84: ; 81A7B84
+sub_81A7B84: @ 81A7B84
 	ldr r0, =0x0300128e
 	ldrb r0, [r0]
 	bx lr
@@ -789494,7 +789494,7 @@ sub_81A7B84: ; 81A7B84
 	thumb_func_end sub_81A7B84
 
 	thumb_func_start sub_81A7B90
-sub_81A7B90: ; 81A7B90
+sub_81A7B90: @ 81A7B90
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -789666,7 +789666,7 @@ _081A7CE2:
 	thumb_func_end sub_81A7B90
 
 	thumb_func_start sub_81A7D00
-sub_81A7D00: ; 81A7D00
+sub_81A7D00: @ 81A7D00
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -789708,7 +789708,7 @@ _081A7D4C:
 	thumb_func_end sub_81A7D00
 
 	thumb_func_start sub_81A7D54
-sub_81A7D54: ; 81A7D54
+sub_81A7D54: @ 81A7D54
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -789736,7 +789736,7 @@ _081A7D66:
 	thumb_func_end sub_81A7D54
 
 	thumb_func_start sub_81A7D8C
-sub_81A7D8C: ; 81A7D8C
+sub_81A7D8C: @ 81A7D8C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x14]
@@ -789787,7 +789787,7 @@ _081A7DDA:
 	thumb_func_end sub_81A7D8C
 
 	thumb_func_start sub_81A7DE8
-sub_81A7DE8: ; 81A7DE8
+sub_81A7DE8: @ 81A7DE8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x14]
@@ -789848,7 +789848,7 @@ _081A7E56:
 	thumb_func_end sub_81A7DE8
 
 	thumb_func_start sub_81A7E60
-sub_81A7E60: ; 81A7E60
+sub_81A7E60: @ 81A7E60
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -789898,7 +789898,7 @@ sub_81A7E60: ; 81A7E60
 	thumb_func_end sub_81A7E60
 
 	thumb_func_start sub_81A7EC4
-sub_81A7EC4: ; 81A7EC4
+sub_81A7EC4: @ 81A7EC4
 	push {lr}
 	ldr r0, =sub_81A7D54
 	bl get_task_id_by_function
@@ -789917,7 +789917,7 @@ _081A7EDE:
 	thumb_func_end sub_81A7EC4
 
 	thumb_func_start sub_81A7EE4
-sub_81A7EE4: ; 81A7EE4
+sub_81A7EE4: @ 81A7EE4
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -789960,7 +789960,7 @@ _081A7F30:
 	thumb_func_end sub_81A7EE4
 
 	thumb_func_start sub_81A7F38
-sub_81A7F38: ; 81A7F38
+sub_81A7F38: @ 81A7F38
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -790131,7 +790131,7 @@ _081A807A:
 	thumb_func_end sub_81A7F38
 
 	thumb_func_start sub_81A8090
-sub_81A8090: ; 81A8090
+sub_81A8090: @ 81A8090
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl InBattlePike
@@ -790145,7 +790145,7 @@ sub_81A8090: ; 81A8090
 	thumb_func_end sub_81A8090
 
 	thumb_func_start InBattlePike
-InBattlePike: ; 81A80A8
+InBattlePike: @ 81A80A8
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x02037318
@@ -790173,7 +790173,7 @@ _081A80CC:
 	thumb_func_end InBattlePike
 
 	thumb_func_start sub_81A80DC
-sub_81A80DC: ; 81A80DC
+sub_81A80DC: @ 81A80DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -790361,7 +790361,7 @@ _081A824C:
 	thumb_func_end sub_81A80DC
 
 	thumb_func_start sub_81A825C
-sub_81A825C: ; 81A825C
+sub_81A825C: @ 81A825C
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -790377,7 +790377,7 @@ sub_81A825C: ; 81A825C
 	thumb_func_end sub_81A825C
 
 	thumb_func_start sub_81A827C
-sub_81A827C: ; 81A827C
+sub_81A827C: @ 81A827C
 	ldr r2, =0x020375f0
 	ldr r1, =gUnknown_0861266C
 	ldr r0, =0x03005d90
@@ -790396,7 +790396,7 @@ sub_81A827C: ; 81A827C
 	thumb_func_end sub_81A827C
 
 	thumb_func_start sub_81A82A4
-sub_81A82A4: ; 81A82A4
+sub_81A82A4: @ 81A82A4
 	push {r4-r7,lr}
 	lsls r0, 24
 	movs r7, 0x6
@@ -790486,7 +790486,7 @@ _081A8356:
 	thumb_func_end sub_81A82A4
 
 	thumb_func_start sub_81A8374
-sub_81A8374: ; 81A8374
+sub_81A8374: @ 81A8374
 	push {r4-r7,lr}
 	ldr r4, =0x03005d90
 	ldr r1, [r4]
@@ -790632,7 +790632,7 @@ _081A849A:
 	thumb_func_end sub_81A8374
 
 	thumb_func_start sub_81A84B4
-sub_81A84B4: ; 81A84B4
+sub_81A84B4: @ 81A84B4
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x03005d90
@@ -790659,7 +790659,7 @@ _081A84C0:
 	thumb_func_end sub_81A84B4
 
 	thumb_func_start sub_81A84EC
-sub_81A84EC: ; 81A84EC
+sub_81A84EC: @ 81A84EC
 	push {lr}
 	ldr r0, =0x020375e2
 	ldrh r0, [r0]
@@ -790701,7 +790701,7 @@ _081A8542:
 	thumb_func_end sub_81A84EC
 
 	thumb_func_start sub_81A8554
-sub_81A8554: ; 81A8554
+sub_81A8554: @ 81A8554
 	push {r4-r6,lr}
 	ldr r5, =0x020244ec
 	movs r6, 0
@@ -790736,7 +790736,7 @@ _081A858A:
 	thumb_func_end sub_81A8554
 
 	thumb_func_start sub_81A8590
-sub_81A8590: ; 81A8590
+sub_81A8590: @ 81A8590
 	push {r4-r6,lr}
 	lsls r0, 24
 	movs r6, 0
@@ -790819,7 +790819,7 @@ _081A8634:
 	thumb_func_end sub_81A8590
 
 	thumb_func_start sub_81A863C
-sub_81A863C: ; 81A863C
+sub_81A863C: @ 81A863C
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	movs r0, 0
@@ -790834,7 +790834,7 @@ sub_81A863C: ; 81A863C
 	thumb_func_end sub_81A863C
 
 	thumb_func_start sub_81A8658
-sub_81A8658: ; 81A8658
+sub_81A8658: @ 81A8658
 	push {r4,lr}
 	ldr r3, =gUnknown_08612675
 	ldr r2, =0x020375e6
@@ -790863,7 +790863,7 @@ sub_81A8658: ; 81A8658
 	thumb_func_end sub_81A8658
 
 	thumb_func_start sub_81A869C
-sub_81A869C: ; 81A869C
+sub_81A869C: @ 81A869C
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldr r0, =0x020375e2
@@ -790882,7 +790882,7 @@ sub_81A869C: ; 81A869C
 	thumb_func_end sub_81A869C
 
 	thumb_func_start sub_81A86C0
-sub_81A86C0: ; 81A86C0
+sub_81A86C0: @ 81A86C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -790986,7 +790986,7 @@ _081A8786:
 	thumb_func_end sub_81A86C0
 
 	thumb_func_start sub_81A8794
-sub_81A8794: ; 81A8794
+sub_81A8794: @ 81A8794
 	push {r4-r7,lr}
 	movs r5, 0
 	ldr r7, =0x03005d8c
@@ -791024,7 +791024,7 @@ _081A879C:
 	thumb_func_end sub_81A8794
 
 	thumb_func_start sub_81A87E8
-sub_81A87E8: ; 81A87E8
+sub_81A87E8: @ 81A87E8
 	push {r4,lr}
 	movs r4, 0
 _081A87EC:
@@ -791056,7 +791056,7 @@ _081A87EC:
 	thumb_func_end sub_81A87E8
 
 	thumb_func_start sub_81A8830
-sub_81A8830: ; 81A8830
+sub_81A8830: @ 81A8830
 	push {r4-r6,lr}
 	ldr r3, =0x03005d90
 	ldr r1, [r3]
@@ -791108,7 +791108,7 @@ _081A887C:
 	thumb_func_end sub_81A8830
 
 	thumb_func_start sub_81A88B0
-sub_81A88B0: ; 81A88B0
+sub_81A88B0: @ 81A88B0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -791156,7 +791156,7 @@ _081A8906:
 	thumb_func_end sub_81A88B0
 
 	thumb_func_start sub_81A890C
-sub_81A890C: ; 81A890C
+sub_81A890C: @ 81A890C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -791180,8 +791180,8 @@ _081A892A:
 	thumb_func_end sub_81A890C
 
 	thumb_func_start sub_81A8934
-; void sub_81A8934(u8)
-sub_81A8934: ; 81A8934
+@ void sub_81A8934(u8)
+sub_81A8934: @ 81A8934
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -791203,7 +791203,7 @@ _081A894A:
 	thumb_func_end sub_81A8934
 
 	thumb_func_start sub_81A895C
-sub_81A895C: ; 81A895C
+sub_81A895C: @ 81A895C
 	push {r4,lr}
 	ldr r4, =0x0203ce50
 	ldr r0, [r4]
@@ -791234,7 +791234,7 @@ _081A896E:
 	thumb_func_end sub_81A895C
 
 	thumb_func_start sub_81A89A0
-sub_81A89A0: ; 81A89A0
+sub_81A89A0: @ 81A89A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -791402,7 +791402,7 @@ _081A8AE4:
 	thumb_func_end sub_81A89A0
 
 	thumb_func_start sub_81A8AF8
-sub_81A8AF8: ; 81A8AF8
+sub_81A8AF8: @ 81A8AF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -791711,7 +791711,7 @@ _081A8D4A:
 	thumb_func_end sub_81A8AF8
 
 	thumb_func_start sub_81A8D60
-sub_81A8D60: ; 81A8D60
+sub_81A8D60: @ 81A8D60
 	push {r4,lr}
 	ldr r4, =0x0203ce50
 	ldr r3, [r4]
@@ -791740,7 +791740,7 @@ sub_81A8D60: ; 81A8D60
 	thumb_func_end sub_81A8D60
 
 	thumb_func_start sub_81A8D94
-sub_81A8D94: ; 81A8D94
+sub_81A8D94: @ 81A8D94
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -791873,7 +791873,7 @@ _081A8E76:
 	thumb_func_end sub_81A8D94
 
 	thumb_func_start sub_81A8E7C
-sub_81A8E7C: ; 81A8E7C
+sub_81A8E7C: @ 81A8E7C
 	push {lr}
 	ldr r1, =gUnknown_08613EE0
 	ldr r0, =0x020375e0
@@ -791888,7 +791888,7 @@ sub_81A8E7C: ; 81A8E7C
 	thumb_func_end sub_81A8E7C
 
 	thumb_func_start sub_81A8E9C
-sub_81A8E9C: ; 81A8E9C
+sub_81A8E9C: @ 81A8E9C
 	push {r4-r6,lr}
 	ldr r3, =0x03005d90
 	ldr r1, [r3]
@@ -791954,7 +791954,7 @@ _081A8F14:
 	thumb_func_end sub_81A8E9C
 
 	thumb_func_start sub_81A8F38
-sub_81A8F38: ; 81A8F38
+sub_81A8F38: @ 81A8F38
 	push {r4,lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -792069,7 +792069,7 @@ _081A903A:
 	thumb_func_end sub_81A8F38
 
 	thumb_func_start sub_81A9048
-sub_81A9048: ; 81A9048
+sub_81A9048: @ 81A9048
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -792171,7 +792171,7 @@ _081A9126:
 	thumb_func_end sub_81A9048
 
 	thumb_func_start sub_81A9134
-sub_81A9134: ; 81A9134
+sub_81A9134: @ 81A9134
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -792201,7 +792201,7 @@ sub_81A9134: ; 81A9134
 	thumb_func_end sub_81A9134
 
 	thumb_func_start sub_81A917C
-sub_81A917C: ; 81A917C
+sub_81A917C: @ 81A917C
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r1, [r4]
@@ -792254,7 +792254,7 @@ _081A91EA:
 	thumb_func_end sub_81A917C
 
 	thumb_func_start sub_81A91FC
-sub_81A91FC: ; 81A91FC
+sub_81A91FC: @ 81A91FC
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -792294,7 +792294,7 @@ _081A924A:
 	thumb_func_end sub_81A91FC
 
 	thumb_func_start sub_81A9254
-sub_81A9254: ; 81A9254
+sub_81A9254: @ 81A9254
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =0x03005d90
@@ -792322,7 +792322,7 @@ _081A925A:
 	thumb_func_end sub_81A9254
 
 	thumb_func_start CalculateBattlePyramidItemBallItemId
-CalculateBattlePyramidItemBallItemId: ; 81A9290
+CalculateBattlePyramidItemBallItemId: @ 81A9290
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -792460,7 +792460,7 @@ _081A9396:
 	thumb_func_end CalculateBattlePyramidItemBallItemId
 
 	thumb_func_start sub_81A93C8
-sub_81A93C8: ; 81A93C8
+sub_81A93C8: @ 81A93C8
 	push {r4,r5,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -792500,7 +792500,7 @@ _081A940A:
 	thumb_func_end sub_81A93C8
 
 	thumb_func_start sub_81A9414
-sub_81A9414: ; 81A9414
+sub_81A9414: @ 81A9414
 	ldr r1, =0x0203bc88
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
@@ -792509,7 +792509,7 @@ sub_81A9414: ; 81A9414
 	thumb_func_end sub_81A9414
 
 	thumb_func_start sub_81A9424
-sub_81A9424: ; 81A9424
+sub_81A9424: @ 81A9424
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -792739,7 +792739,7 @@ _081A95EE:
 	thumb_func_end sub_81A9424
 
 	thumb_func_start sub_81A9618
-sub_81A9618: ; 81A9618
+sub_81A9618: @ 81A9618
 	push {r4,r5,lr}
 	ldr r5, =0x03005d90
 	ldr r1, [r5]
@@ -792777,7 +792777,7 @@ _081A9650:
 	thumb_func_end sub_81A9618
 
 	thumb_func_start sub_81A966C
-sub_81A966C: ; 81A966C
+sub_81A966C: @ 81A966C
 	push {r4,lr}
 	ldr r4, =0x020375f0
 	bl InBattlePyramid
@@ -792791,7 +792791,7 @@ sub_81A966C: ; 81A966C
 	thumb_func_end sub_81A966C
 
 	thumb_func_start sub_81A9684
-sub_81A9684: ; 81A9684
+sub_81A9684: @ 81A9684
 	push {r4,lr}
 	ldr r0, =0x020375e4
 	ldrh r0, [r0]
@@ -792886,7 +792886,7 @@ _081A9754:
 	thumb_func_end sub_81A9684
 
 	thumb_func_start sub_81A975C
-sub_81A975C: ; 81A975C
+sub_81A975C: @ 81A975C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -792941,7 +792941,7 @@ _081A97A2:
 	thumb_func_end sub_81A975C
 
 	thumb_func_start sub_81A97C8
-sub_81A97C8: ; 81A97C8
+sub_81A97C8: @ 81A97C8
 	push {lr}
 	ldr r0, =sub_81A97DC
 	movs r1, 0
@@ -792952,7 +792952,7 @@ sub_81A97C8: ; 81A97C8
 	thumb_func_end sub_81A97C8
 
 	thumb_func_start sub_81A97DC
-sub_81A97DC: ; 81A97DC
+sub_81A97DC: @ 81A97DC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -792983,7 +792983,7 @@ _081A980C:
 	thumb_func_end sub_81A97DC
 
 	thumb_func_start sub_81A9828
-sub_81A9828: ; 81A9828
+sub_81A9828: @ 81A9828
 	push {lr}
 	bl sub_809FDD4
 	pop {r0}
@@ -792991,7 +792991,7 @@ sub_81A9828: ; 81A9828
 	thumb_func_end sub_81A9828
 
 	thumb_func_start sub_81A9834
-sub_81A9834: ; 81A9834
+sub_81A9834: @ 81A9834
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -793159,7 +793159,7 @@ _081A9962:
 	thumb_func_end sub_81A9834
 
 	thumb_func_start sub_81A9998
-sub_81A9998: ; 81A9998
+sub_81A9998: @ 81A9998
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -793302,7 +793302,7 @@ _081A9A98:
 	thumb_func_end sub_81A9998
 
 	thumb_func_start sub_81A9AA8
-sub_81A9AA8: ; 81A9AA8
+sub_81A9AA8: @ 81A9AA8
 	lsls r0, 24
 	ldr r1, =0x03005d90
 	ldr r1, [r1]
@@ -793316,7 +793316,7 @@ sub_81A9AA8: ; 81A9AA8
 	thumb_func_end sub_81A9AA8
 
 	thumb_func_start GetBattlePyramidTrainerFlag
-GetBattlePyramidTrainerFlag: ; 81A9AC4
+GetBattlePyramidTrainerFlag: @ 81A9AC4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -793344,7 +793344,7 @@ GetBattlePyramidTrainerFlag: ; 81A9AC4
 	thumb_func_end GetBattlePyramidTrainerFlag
 
 	thumb_func_start sub_81A9B04
-sub_81A9B04: ; 81A9B04
+sub_81A9B04: @ 81A9B04
 	push {lr}
 	ldr r0, =0x02038bca
 	ldrh r0, [r0]
@@ -793370,7 +793370,7 @@ _081A9B2E:
 	thumb_func_end sub_81A9B04
 
 	thumb_func_start sub_81A9B44
-sub_81A9B44: ; 81A9B44
+sub_81A9B44: @ 81A9B44
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -793454,7 +793454,7 @@ _081A9B86:
 	thumb_func_end sub_81A9B44
 
 	thumb_func_start sub_81A9C04
-sub_81A9C04: ; 81A9C04
+sub_81A9C04: @ 81A9C04
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r0, =0x03005d90
@@ -793697,7 +793697,7 @@ _081A9E0C:
 	thumb_func_end sub_81A9C04
 
 	thumb_func_start sub_81A9E28
-sub_81A9E28: ; 81A9E28
+sub_81A9E28: @ 81A9E28
 	push {lr}
 	bl sub_81AA9E4
 	lsls r0, 24
@@ -793711,7 +793711,7 @@ sub_81A9E28: ; 81A9E28
 	thumb_func_end sub_81A9E28
 
 	thumb_func_start InBattlePyramid
-InBattlePyramid: ; 81A9E40
+InBattlePyramid: @ 81A9E40
 	push {lr}
 	ldr r0, =0x02037318
 	ldrh r1, [r0, 0x12]
@@ -793736,7 +793736,7 @@ _081A9E66:
 	thumb_func_end InBattlePyramid
 
 	thumb_func_start sub_81A9E6C
-sub_81A9E6C: ; 81A9E6C
+sub_81A9E6C: @ 81A9E6C
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x02037318
@@ -793757,7 +793757,7 @@ _081A9E82:
 	thumb_func_end sub_81A9E6C
 
 	thumb_func_start sub_81A9E90
-sub_81A9E90: ; 81A9E90
+sub_81A9E90: @ 81A9E90
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -793781,7 +793781,7 @@ _081A9EB8:
 	thumb_func_end sub_81A9E90
 
 	thumb_func_start sub_81A9EC8
-sub_81A9EC8: ; 81A9EC8
+sub_81A9EC8: @ 81A9EC8
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -793794,7 +793794,7 @@ _081A9ED8:
 	thumb_func_end sub_81A9EC8
 
 	thumb_func_start sub_81A9EDC
-sub_81A9EDC: ; 81A9EDC
+sub_81A9EDC: @ 81A9EDC
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -793811,7 +793811,7 @@ sub_81A9EDC: ; 81A9EDC
 	thumb_func_end sub_81A9EDC
 
 	thumb_func_start sub_81A9EFC
-sub_81A9EFC: ; 81A9EFC
+sub_81A9EFC: @ 81A9EFC
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -793828,7 +793828,7 @@ sub_81A9EFC: ; 81A9EFC
 	thumb_func_end sub_81A9EFC
 
 	thumb_func_start sub_81A9F1C
-sub_81A9F1C: ; 81A9F1C
+sub_81A9F1C: @ 81A9F1C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -793845,7 +793845,7 @@ sub_81A9F1C: ; 81A9F1C
 	thumb_func_end sub_81A9F1C
 
 	thumb_func_start sub_81A9F3C
-sub_81A9F3C: ; 81A9F3C
+sub_81A9F3C: @ 81A9F3C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -793880,7 +793880,7 @@ _081A9F7A:
 	thumb_func_end sub_81A9F3C
 
 	thumb_func_start sub_81A9F80
-sub_81A9F80: ; 81A9F80
+sub_81A9F80: @ 81A9F80
 	push {lr}
 	ldr r0, =gUnknown_08252C88
 	bl script_env_1_execute_new_script
@@ -793890,7 +793890,7 @@ sub_81A9F80: ; 81A9F80
 	thumb_func_end sub_81A9F80
 
 	thumb_func_start sub_81A9F90
-sub_81A9F90: ; 81A9F90
+sub_81A9F90: @ 81A9F90
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -794001,7 +794001,7 @@ _081AA062:
 	thumb_func_end sub_81A9F90
 
 	thumb_func_start sub_81AA078
-sub_81AA078: ; 81AA078
+sub_81AA078: @ 81AA078
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -794174,7 +794174,7 @@ _081AA1BE:
 	thumb_func_end sub_81AA078
 
 	thumb_func_start sub_81AA1D8
-sub_81AA1D8: ; 81AA1D8
+sub_81AA1D8: @ 81AA1D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -794304,7 +794304,7 @@ _081AA2E4:
 	thumb_func_end sub_81AA1D8
 
 	thumb_func_start sub_81AA2F8
-sub_81AA2F8: ; 81AA2F8
+sub_81AA2F8: @ 81AA2F8
 	push {r4,r5,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -794338,7 +794338,7 @@ _081AA32A:
 	thumb_func_end sub_81AA2F8
 
 	thumb_func_start sub_81AA33C
-sub_81AA33C: ; 81AA33C
+sub_81AA33C: @ 81AA33C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -794384,7 +794384,7 @@ _081AA386:
 	thumb_func_end sub_81AA33C
 
 	thumb_func_start sub_81AA398
-sub_81AA398: ; 81AA398
+sub_81AA398: @ 81AA398
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -794542,7 +794542,7 @@ _081AA4C0:
 	thumb_func_end sub_81AA398
 
 	thumb_func_start sub_81AA4D8
-sub_81AA4D8: ; 81AA4D8
+sub_81AA4D8: @ 81AA4D8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -794734,7 +794734,7 @@ _081AA634:
 	thumb_func_end sub_81AA4D8
 
 	thumb_func_start sub_81AA648
-sub_81AA648: ; 81AA648
+sub_81AA648: @ 81AA648
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -794879,7 +794879,7 @@ _081AA74E:
 	thumb_func_end sub_81AA648
 
 	thumb_func_start sub_81AA760
-sub_81AA760: ; 81AA760
+sub_81AA760: @ 81AA760
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -794972,7 +794972,7 @@ _081AA7FE:
 	thumb_func_end sub_81AA760
 
 	thumb_func_start sub_81AA810
-sub_81AA810: ; 81AA810
+sub_81AA810: @ 81AA810
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -795152,7 +795152,7 @@ _081AA95C:
 	thumb_func_end sub_81AA810
 
 	thumb_func_start sub_81AA96C
-sub_81AA96C: ; 81AA96C
+sub_81AA96C: @ 81AA96C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldr r0, =0x03005d90
@@ -795206,7 +795206,7 @@ _081AA9C0:
 	thumb_func_end sub_81AA96C
 
 	thumb_func_start sub_81AA9E4
-sub_81AA9E4: ; 81AA9E4
+sub_81AA9E4: @ 81AA9E4
 	push {r4,lr}
 	ldr r0, =0x03005d90
 	ldr r4, [r0]
@@ -795249,7 +795249,7 @@ _081AAA3A:
 	thumb_func_end sub_81AA9E4
 
 	thumb_func_start sub_81AAA40
-sub_81AAA40: ; 81AAA40
+sub_81AAA40: @ 81AAA40
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -795283,7 +795283,7 @@ _081AAA74:
 	thumb_func_end sub_81AAA40
 
 	thumb_func_start sub_81AAA7C
-sub_81AAA7C: ; 81AAA7C
+sub_81AAA7C: @ 81AAA7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -795331,7 +795331,7 @@ _081AAA9E:
 	thumb_func_end sub_81AAA7C
 
 	thumb_func_start CalculateBattlePyramidPickupItemId
-CalculateBattlePyramidPickupItemId: ; 81AAAE0
+CalculateBattlePyramidPickupItemId: @ 81AAAE0
 	push {r4-r6,lr}
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -795401,7 +795401,7 @@ _081AAB5A:
 	thumb_func_end CalculateBattlePyramidPickupItemId
 
 	thumb_func_start sub_81AAB70
-sub_81AAB70: ; 81AAB70
+sub_81AAB70: @ 81AAB70
 	push {r4,lr}
 	ldr r4, =0x0203ce58
 	movs r0, 0
@@ -795423,8 +795423,8 @@ sub_81AAB70: ; 81AAB70
 	thumb_func_end sub_81AAB70
 
 	thumb_func_start CB2_BagMenuFromStartMenu
-; void CB2_BagMenuFromStartMenu()
-CB2_BagMenuFromStartMenu: ; 81AAB9C
+@ void CB2_BagMenuFromStartMenu()
+CB2_BagMenuFromStartMenu: @ 81AAB9C
 	push {lr}
 	ldr r2, =sub_8086194
 	movs r0, 0
@@ -795436,7 +795436,7 @@ CB2_BagMenuFromStartMenu: ; 81AAB9C
 	thumb_func_end CB2_BagMenuFromStartMenu
 
 	thumb_func_start sub_81AABB0
-sub_81AABB0: ; 81AABB0
+sub_81AABB0: @ 81AABB0
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -795459,7 +795459,7 @@ _081AABD4:
 	thumb_func_end sub_81AABB0
 
 	thumb_func_start CB2_ChooseBerry
-CB2_ChooseBerry: ; 81AABDC
+CB2_ChooseBerry: @ 81AABDC
 	push {lr}
 	ldr r2, =sub_80861B0
 	movs r0, 0x4
@@ -795471,7 +795471,7 @@ CB2_ChooseBerry: ; 81AABDC
 	thumb_func_end CB2_ChooseBerry
 
 	thumb_func_start sub_81AABF0
-sub_81AABF0: ; 81AABF0
+sub_81AABF0: @ 81AABF0
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x5
@@ -795482,8 +795482,8 @@ sub_81AABF0: ; 81AABF0
 	thumb_func_end sub_81AABF0
 
 	thumb_func_start CB2_GoToSellMenu
-; void CB2_GoToSellMenu()
-CB2_GoToSellMenu: ; 81AAC00
+@ void CB2_GoToSellMenu()
+CB2_GoToSellMenu: @ 81AAC00
 	push {lr}
 	ldr r2, =CB2_ExitSellMenu
 	movs r0, 0x3
@@ -795495,7 +795495,7 @@ CB2_GoToSellMenu: ; 81AAC00
 	thumb_func_end CB2_GoToSellMenu
 
 	thumb_func_start sub_81AAC14
-sub_81AAC14: ; 81AAC14
+sub_81AAC14: @ 81AAC14
 	push {lr}
 	ldr r2, =sub_816B31C
 	movs r0, 0x6
@@ -795507,7 +795507,7 @@ sub_81AAC14: ; 81AAC14
 	thumb_func_end sub_81AAC14
 
 	thumb_func_start sub_81AAC28
-sub_81AAC28: ; 81AAC28
+sub_81AAC28: @ 81AAC28
 	push {lr}
 	ldr r2, =bag_menu_leave_maybe_3
 	movs r0, 0x9
@@ -795524,7 +795524,7 @@ sub_81AAC28: ; 81AAC28
 	thumb_func_end sub_81AAC28
 
 	thumb_func_start sub_81AAC50
-sub_81AAC50: ; 81AAC50
+sub_81AAC50: @ 81AAC50
 	push {lr}
 	ldr r2, =bag_menu_leave_maybe_2
 	movs r0, 0x7
@@ -795539,7 +795539,7 @@ sub_81AAC50: ; 81AAC50
 	thumb_func_end sub_81AAC50
 
 	thumb_func_start sub_81AAC70
-sub_81AAC70: ; 81AAC70
+sub_81AAC70: @ 81AAC70
 	push {lr}
 	ldr r2, =bag_menu_leave_maybe
 	movs r0, 0x8
@@ -795554,8 +795554,8 @@ sub_81AAC70: ; 81AAC70
 	thumb_func_end sub_81AAC70
 
 	thumb_func_start GoToBagMenu
-; void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)())
-GoToBagMenu: ; 81AAC90
+@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)())
+GoToBagMenu: @ 81AAC90
 	push {r4-r7,lr}
 	adds r4, r2, 0
 	lsls r0, 24
@@ -795645,7 +795645,7 @@ _081AAD3A:
 	thumb_func_end GoToBagMenu
 
 	thumb_func_start c2_bag_3
-c2_bag_3: ; 81AAD5C
+c2_bag_3: @ 81AAD5C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -795657,7 +795657,7 @@ c2_bag_3: ; 81AAD5C
 	thumb_func_end c2_bag_3
 
 	thumb_func_start vblank_cb_bag_menu
-vblank_cb_bag_menu: ; 81AAD78
+vblank_cb_bag_menu: @ 81AAD78
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -795667,7 +795667,7 @@ vblank_cb_bag_menu: ; 81AAD78
 	thumb_func_end vblank_cb_bag_menu
 
 	thumb_func_start CB2_Bag
-CB2_Bag: ; 81AAD8C
+CB2_Bag: @ 81AAD8C
 	push {lr}
 _081AAD8E:
 	bl sub_81221EC
@@ -795691,7 +795691,7 @@ _081AADB2:
 	thumb_func_end CB2_Bag
 
 	thumb_func_start setup_bag_menu
-setup_bag_menu: ; 81AADB8
+setup_bag_menu: @ 81AADB8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -795961,7 +795961,7 @@ _081AB046:
 	thumb_func_end setup_bag_menu
 
 	thumb_func_start bag_menu_init_bgs
-bag_menu_init_bgs: ; 81AB050
+bag_menu_init_bgs: @ 81AB050
 	push {r4,lr}
 	bl sub_8121DA0
 	ldr r4, =0x0203ce54
@@ -796004,7 +796004,7 @@ bag_menu_init_bgs: ; 81AB050
 	thumb_func_end bag_menu_init_bgs
 
 	thumb_func_start load_bag_menu_graphics
-load_bag_menu_graphics: ; 81AB0BC
+load_bag_menu_graphics: @ 81AB0BC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203ce54
@@ -796133,7 +796133,7 @@ _081AB1E6:
 	thumb_func_end load_bag_menu_graphics
 
 	thumb_func_start sub_81AB1F0
-sub_81AB1F0: ; 81AB1F0
+sub_81AB1F0: @ 81AB1F0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -796155,7 +796155,7 @@ _081AB206:
 	thumb_func_end sub_81AB1F0
 
 	thumb_func_start allocate_bag_item_list_buffers
-allocate_bag_item_list_buffers: ; 81AB218
+allocate_bag_item_list_buffers: @ 81AB218
 	push {r4,lr}
 	ldr r4, =0x0203ce74
 	movs r0, 0x82
@@ -796174,8 +796174,8 @@ allocate_bag_item_list_buffers: ; 81AB218
 	thumb_func_end allocate_bag_item_list_buffers
 
 	thumb_func_start load_bag_item_list_buffers
-; void load_bag_item_list_buffers(int pocket_id)
-load_bag_item_list_buffers: ; 81AB240
+@ void load_bag_item_list_buffers(int pocket_id)
+load_bag_item_list_buffers: @ 81AB240
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -796328,8 +796328,8 @@ _081AB34A:
 	thumb_func_end load_bag_item_list_buffers
 
 	thumb_func_start get_name
-; void get_name(char *dest, int name_id)
-get_name: ; 81AB39C
+@ void get_name(char *dest, int name_id)
+get_name: @ 81AB39C
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -796402,7 +796402,7 @@ _081AB43E:
 	thumb_func_end get_name
 
 	thumb_func_start bag_menu_change_item_callback
-bag_menu_change_item_callback: ; 81AB450
+bag_menu_change_item_callback: @ 81AB450
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -796493,8 +796493,8 @@ _081AB50C:
 	thumb_func_end bag_menu_change_item_callback
 
 	thumb_func_start sub_81AB520
-; void sub_81AB520(u8 rbox_id, int item_index_in_pocket, int a3)
-sub_81AB520: ; 81AB520
+@ void sub_81AB520(u8 rbox_id, int item_index_in_pocket, int a3)
+sub_81AB520: @ 81AB520
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -796667,8 +796667,8 @@ _081AB696:
 	thumb_func_end sub_81AB520
 
 	thumb_func_start bag_menu_print_description_box_text
-; void bag_menu_print_description_box_text(int a1)
-bag_menu_print_description_box_text: ; 81AB6B0
+@ void bag_menu_print_description_box_text(int a1)
+bag_menu_print_description_box_text: @ 81AB6B0
 	push {r4,lr}
 	sub sp, 0x14
 	adds r1, r0, 0
@@ -796727,7 +796727,7 @@ _081AB6FC:
 	thumb_func_end bag_menu_print_description_box_text
 
 	thumb_func_start bag_menu_print_cursor_
-bag_menu_print_cursor_: ; 81AB73C
+bag_menu_print_cursor_: @ 81AB73C
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -796745,7 +796745,7 @@ bag_menu_print_cursor_: ; 81AB73C
 	thumb_func_end bag_menu_print_cursor_
 
 	thumb_func_start bag_menu_print_cursor
-bag_menu_print_cursor: ; 81AB75C
+bag_menu_print_cursor: @ 81AB75C
 	push {r4,r5,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -796793,7 +796793,7 @@ _081AB7AE:
 	thumb_func_end bag_menu_print_cursor
 
 	thumb_func_start bag_menu_add_pocket_scroll_arrow_indicators_maybe
-bag_menu_add_pocket_scroll_arrow_indicators_maybe: ; 81AB7BC
+bag_menu_add_pocket_scroll_arrow_indicators_maybe: @ 81AB7BC
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r5, =0x0203ce54
@@ -796841,7 +796841,7 @@ _081AB80A:
 	thumb_func_end bag_menu_add_pocket_scroll_arrow_indicators_maybe
 
 	thumb_func_start sub_81AB824
-sub_81AB824: ; 81AB824
+sub_81AB824: @ 81AB824
 	push {r4,lr}
 	ldr r4, =0x0203ce54
 	ldr r0, [r4]
@@ -796865,7 +796865,7 @@ _081AB842:
 	thumb_func_end sub_81AB824
 
 	thumb_func_start bag_menu_add_list_scroll_arrow_indicators_maybe
-bag_menu_add_list_scroll_arrow_indicators_maybe: ; 81AB854
+bag_menu_add_list_scroll_arrow_indicators_maybe: @ 81AB854
 	push {r4,lr}
 	ldr r4, =0x0203ce54
 	ldr r2, [r4]
@@ -796896,7 +796896,7 @@ _081AB882:
 	thumb_func_end bag_menu_add_list_scroll_arrow_indicators_maybe
 
 	thumb_func_start sub_81AB89C
-sub_81AB89C: ; 81AB89C
+sub_81AB89C: @ 81AB89C
 	push {r4,lr}
 	ldr r4, =0x0203ce54
 	ldr r0, [r4]
@@ -796919,7 +796919,7 @@ _081AB8BA:
 	thumb_func_end sub_81AB89C
 
 	thumb_func_start free_bag_item_list_buffers
-free_bag_item_list_buffers: ; 81AB8C8
+free_bag_item_list_buffers: @ 81AB8C8
 	push {lr}
 	ldr r0, =0x0203ce78
 	ldr r0, [r0]
@@ -796937,7 +796937,7 @@ free_bag_item_list_buffers: ; 81AB8C8
 	thumb_func_end free_bag_item_list_buffers
 
 	thumb_func_start unknown_ItemMenu_Confirm
-unknown_ItemMenu_Confirm: ; 81AB8F8
+unknown_ItemMenu_Confirm: @ 81AB8F8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -796965,7 +796965,7 @@ unknown_ItemMenu_Confirm: ; 81AB8F8
 	thumb_func_end unknown_ItemMenu_Confirm
 
 	thumb_func_start task_close_bag_menu_2
-task_close_bag_menu_2: ; 81AB930
+task_close_bag_menu_2: @ 81AB930
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -797016,7 +797016,7 @@ _081AB9A0:
 	thumb_func_end task_close_bag_menu_2
 
 	thumb_func_start sub_81AB9A8
-sub_81AB9A8: ; 81AB9A8
+sub_81AB9A8: @ 81AB9A8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -797113,7 +797113,7 @@ _081ABA60:
 	thumb_func_end sub_81AB9A8
 
 	thumb_func_start sub_81ABA6C
-sub_81ABA6C: ; 81ABA6C
+sub_81ABA6C: @ 81ABA6C
 	push {r4,lr}
 	movs r4, 0
 _081ABA70:
@@ -797130,7 +797130,7 @@ _081ABA70:
 	thumb_func_end sub_81ABA6C
 
 	thumb_func_start sub_81ABA88
-sub_81ABA88: ; 81ABA88
+sub_81ABA88: @ 81ABA88
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -797158,7 +797158,7 @@ sub_81ABA88: ; 81ABA88
 	thumb_func_end sub_81ABA88
 
 	thumb_func_start sub_81ABAC4
-sub_81ABAC4: ; 81ABAC4
+sub_81ABAC4: @ 81ABAC4
 	push {r4,lr}
 	movs r4, 0
 _081ABAC8:
@@ -797175,7 +797175,7 @@ _081ABAC8:
 	thumb_func_end sub_81ABAC4
 
 	thumb_func_start sub_81ABAE0
-sub_81ABAE0: ; 81ABAE0
+sub_81ABAE0: @ 81ABAE0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	movs r5, 0
@@ -797212,7 +797212,7 @@ _081ABAEC:
 	thumb_func_end sub_81ABAE0
 
 	thumb_func_start sub_81ABB2C
-sub_81ABB2C: ; 81ABB2C
+sub_81ABB2C: @ 81ABB2C
 	lsls r0, 24
 	ldr r1, =0x0203ce58
 	lsrs r0, 23
@@ -797231,8 +797231,8 @@ sub_81ABB2C: ; 81ABB2C
 	thumb_func_end sub_81ABB2C
 
 	thumb_func_start DisplayItemMessage
-; void DisplayItemMessage(u8 taskId, u8 fontId, u8 *str, void ( *callback)(u8 taskId))
-DisplayItemMessage: ; 81ABB4C
+@ void DisplayItemMessage(u8 taskId, u8 fontId, u8 *str, void ( *callback)(u8 taskId))
+DisplayItemMessage: @ 81ABB4C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -797285,7 +797285,7 @@ DisplayItemMessage: ; 81ABB4C
 	thumb_func_end DisplayItemMessage
 
 	thumb_func_start bag_menu_inits_lists_menu
-bag_menu_inits_lists_menu: ; 81ABBBC
+bag_menu_inits_lists_menu: @ 81ABBBC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -797340,7 +797340,7 @@ bag_menu_inits_lists_menu: ; 81ABBBC
 	thumb_func_end bag_menu_inits_lists_menu
 
 	thumb_func_start sub_81ABC3C
-sub_81ABC3C: ; 81ABC3C
+sub_81ABC3C: @ 81ABC3C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -797354,7 +797354,7 @@ sub_81ABC3C: ; 81ABC3C
 	thumb_func_end sub_81ABC3C
 
 	thumb_func_start sub_81ABC54
-sub_81ABC54: ; 81ABC54
+sub_81ABC54: @ 81ABC54
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -797401,7 +797401,7 @@ _081ABC6C:
 	thumb_func_end sub_81ABC54
 
 	thumb_func_start sub_81ABCC0
-sub_81ABCC0: ; 81ABCC0
+sub_81ABCC0: @ 81ABCC0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -797447,7 +797447,7 @@ _081ABCD4:
 	thumb_func_end sub_81ABCC0
 
 	thumb_func_start Task_BagMenu
-Task_BagMenu: ; 81ABD28
+Task_BagMenu: @ 81ABD28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -797632,7 +797632,7 @@ _081ABEB2:
 	thumb_func_end Task_BagMenu
 
 	thumb_func_start set_callback3_to_bag
-set_callback3_to_bag: ; 81ABECC
+set_callback3_to_bag: @ 81ABECC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -797661,7 +797661,7 @@ set_callback3_to_bag: ; 81ABECC
 	thumb_func_end set_callback3_to_bag
 
 	thumb_func_start GetSwitchBagPocketDirection
-GetSwitchBagPocketDirection: ; 81ABF10
+GetSwitchBagPocketDirection: @ 81ABF10
 	push {lr}
 	ldr r0, =0x0203ce54
 	ldr r0, [r0]
@@ -797709,8 +797709,8 @@ _081ABF6C:
 	thumb_func_end GetSwitchBagPocketDirection
 
 	thumb_func_start ChangeBagPocketId
-; void ChangeBagPocketId(u8 *bagPocketId, u8 deltaBagPocketId)
-ChangeBagPocketId: ; 81ABF70
+@ void ChangeBagPocketId(u8 *bagPocketId, u8 deltaBagPocketId)
+ChangeBagPocketId: @ 81ABF70
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -797745,8 +797745,8 @@ _081ABFA0:
 	thumb_func_end ChangeBagPocketId
 
 	thumb_func_start SwitchBagPocket
-; void SwitchBagPocket(u8 taskId, u16 deltaBagPocketId, u16 a3)
-SwitchBagPocket: ; 81ABFA8
+@ void SwitchBagPocket(u8 taskId, u16 deltaBagPocketId, u16 a3)
+SwitchBagPocket: @ 81ABFA8
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -797892,7 +797892,7 @@ _081AC09A:
 	thumb_func_end SwitchBagPocket
 
 	thumb_func_start sub_81AC10C
-sub_81AC10C: ; 81AC10C
+sub_81AC10C: @ 81AC10C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -798030,7 +798030,7 @@ _081AC22E:
 	thumb_func_end sub_81AC10C
 
 	thumb_func_start sub_81AC23C
-sub_81AC23C: ; 81AC23C
+sub_81AC23C: @ 81AC23C
 	push {lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -798055,8 +798055,8 @@ sub_81AC23C: ; 81AC23C
 	thumb_func_end sub_81AC23C
 
 	thumb_func_start bag_menu_draw_pocket_indicator_square
-; void bag_menu_draw_pocket_indicator_square(char x, int is_current_bag)
-bag_menu_draw_pocket_indicator_square: ; 81AC26C
+@ void bag_menu_draw_pocket_indicator_square(char x, int is_current_bag)
+bag_menu_draw_pocket_indicator_square: @ 81AC26C
 	push {lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -798097,7 +798097,7 @@ _081AC2AE:
 	thumb_func_end bag_menu_draw_pocket_indicator_square
 
 	thumb_func_start sub_81AC2C0
-sub_81AC2C0: ; 81AC2C0
+sub_81AC2C0: @ 81AC2C0
 	push {lr}
 	ldr r1, =0x0203ce58
 	ldrb r0, [r1, 0x4]
@@ -798120,7 +798120,7 @@ _081AC2E2:
 	thumb_func_end sub_81AC2C0
 
 	thumb_func_start bag_menu_swap_items
-bag_menu_swap_items: ; 81AC2E8
+bag_menu_swap_items: @ 81AC2E8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -798207,8 +798207,8 @@ bag_menu_swap_items: ; 81AC2E8
 	thumb_func_end bag_menu_swap_items
 
 	thumb_func_start sub_81AC3C0
-; void sub_81AC3C0(u8 taskId)
-sub_81AC3C0: ; 81AC3C0
+@ void sub_81AC3C0(u8 taskId)
+sub_81AC3C0: @ 81AC3C0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -798307,7 +798307,7 @@ _081AC48E:
 	thumb_func_end sub_81AC3C0
 
 	thumb_func_start sub_81AC498
-sub_81AC498: ; 81AC498
+sub_81AC498: @ 81AC498
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -798413,7 +798413,7 @@ _081AC566:
 	thumb_func_end sub_81AC498
 
 	thumb_func_start sub_81AC590
-sub_81AC590: ; 81AC590
+sub_81AC590: @ 81AC590
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -798491,7 +798491,7 @@ _081AC5F2:
 	thumb_func_end sub_81AC590
 
 	thumb_func_start sub_81AC644
-sub_81AC644: ; 81AC644
+sub_81AC644: @ 81AC644
 	push {r4,r5,lr}
 	sub sp, 0x14
 	ldr r0, =0x0203ce58
@@ -798950,7 +798950,7 @@ _081ACAEE:
 	thumb_func_end sub_81AC644
 
 	thumb_func_start sub_81ACAF8
-sub_81ACAF8: ; 81ACAF8
+sub_81ACAF8: @ 81ACAF8
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -798992,7 +798992,7 @@ sub_81ACAF8: ; 81ACAF8
 	thumb_func_end sub_81ACAF8
 
 	thumb_func_start sub_81ACB54
-sub_81ACB54: ; 81ACB54
+sub_81ACB54: @ 81ACB54
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -799037,7 +799037,7 @@ sub_81ACB54: ; 81ACB54
 	thumb_func_end sub_81ACB54
 
 	thumb_func_start unknown_item_menu_type
-unknown_item_menu_type: ; 81ACBB0
+unknown_item_menu_type: @ 81ACBB0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -799074,7 +799074,7 @@ _081ACBF4:
 	thumb_func_end unknown_item_menu_type
 
 	thumb_func_start Task_HandleInBattleItemMenuInput
-Task_HandleInBattleItemMenuInput: ; 81ACC04
+Task_HandleInBattleItemMenuInput: @ 81ACC04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -799128,7 +799128,7 @@ _081ACC6A:
 	thumb_func_end Task_HandleInBattleItemMenuInput
 
 	thumb_func_start Task_HandleOutOfBattleItemMenuInput
-Task_HandleOutOfBattleItemMenuInput: ; 81ACC78
+Task_HandleOutOfBattleItemMenuInput: @ 81ACC78
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -799309,7 +799309,7 @@ _081ACDF0:
 	thumb_func_end Task_HandleOutOfBattleItemMenuInput
 
 	thumb_func_start sub_81ACDFC
-sub_81ACDFC: ; 81ACDFC
+sub_81ACDFC: @ 81ACDFC
 	push {lr}
 	lsls r0, 24
 	asrs r1, r0, 24
@@ -799341,7 +799341,7 @@ _081ACE32:
 	thumb_func_end sub_81ACDFC
 
 	thumb_func_start bag_menu_remove_some_window
-bag_menu_remove_some_window: ; 81ACE38
+bag_menu_remove_some_window: @ 81ACE38
 	push {lr}
 	ldr r0, =0x0203ce54
 	ldr r0, [r0]
@@ -799375,8 +799375,8 @@ _081ACE76:
 	thumb_func_end bag_menu_remove_some_window
 
 	thumb_func_start ItemMenu_UseOutOfBattle
-; void ItemMenu_UseOutOfBattle(u8 taskId)
-ItemMenu_UseOutOfBattle: ; 81ACE7C
+@ void ItemMenu_UseOutOfBattle(u8 taskId)
+ItemMenu_UseOutOfBattle: @ 81ACE7C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -799428,7 +799428,7 @@ _081ACEEE:
 	thumb_func_end ItemMenu_UseOutOfBattle
 
 	thumb_func_start ItemMenu_Toss
-ItemMenu_Toss: ; 81ACEF4
+ItemMenu_Toss: @ 81ACEF4
 	push {r4-r7,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -799489,7 +799489,7 @@ _081ACF6A:
 	thumb_func_end ItemMenu_Toss
 
 	thumb_func_start BagMenuConfirmToss
-BagMenuConfirmToss: ; 81ACF88
+BagMenuConfirmToss: @ 81ACF88
 	push {r4,r5,lr}
 	sub sp, 0x14
 	adds r5, r0, 0
@@ -799541,7 +799541,7 @@ BagMenuConfirmToss: ; 81ACF88
 	thumb_func_end BagMenuConfirmToss
 
 	thumb_func_start BagMenuCancelToss
-BagMenuCancelToss: ; 81AD010
+BagMenuCancelToss: @ 81AD010
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -799566,7 +799566,7 @@ BagMenuCancelToss: ; 81AD010
 	thumb_func_end BagMenuCancelToss
 
 	thumb_func_start Task_ChooseHowManyToToss
-Task_ChooseHowManyToToss: ; 81AD044
+Task_ChooseHowManyToToss: @ 81AD044
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -799627,7 +799627,7 @@ _081AD0C6:
 	thumb_func_end Task_ChooseHowManyToToss
 
 	thumb_func_start BagMenuActuallyToss
-BagMenuActuallyToss: ; 81AD0CC
+BagMenuActuallyToss: @ 81AD0CC
 	push {r4-r6,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -799678,7 +799678,7 @@ BagMenuActuallyToss: ; 81AD0CC
 	thumb_func_end BagMenuActuallyToss
 
 	thumb_func_start Task_ActuallyToss
-Task_ActuallyToss: ; 81AD150
+Task_ActuallyToss: @ 81AD150
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -799743,7 +799743,7 @@ _081AD1CE:
 	thumb_func_end Task_ActuallyToss
 
 	thumb_func_start ItemMenu_Register
-ItemMenu_Register: ; 81AD1EC
+ItemMenu_Register: @ 81AD1EC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -799801,7 +799801,7 @@ _081AD23A:
 	thumb_func_end ItemMenu_Register
 
 	thumb_func_start ItemMenu_Give
-ItemMenu_Give: ; 81AD278
+ItemMenu_Give: @ 81AD278
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -799852,7 +799852,7 @@ _081AD2EA:
 	thumb_func_end ItemMenu_Give
 
 	thumb_func_start bag_menu_print_there_is_no_pokemon
-bag_menu_print_there_is_no_pokemon: ; 81AD2F0
+bag_menu_print_there_is_no_pokemon: @ 81AD2F0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -799866,7 +799866,7 @@ bag_menu_print_there_is_no_pokemon: ; 81AD2F0
 	thumb_func_end bag_menu_print_there_is_no_pokemon
 
 	thumb_func_start bag_menu_print_cant_be_held_msg
-bag_menu_print_cant_be_held_msg: ; 81AD30C
+bag_menu_print_cant_be_held_msg: @ 81AD30C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -799891,7 +799891,7 @@ bag_menu_print_cant_be_held_msg: ; 81AD30C
 	thumb_func_end bag_menu_print_cant_be_held_msg
 
 	thumb_func_start sub_81AD350
-sub_81AD350: ; 81AD350
+sub_81AD350: @ 81AD350
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -799913,7 +799913,7 @@ _081AD36E:
 	thumb_func_end sub_81AD350
 
 	thumb_func_start ItemMenu_CheckTag
-ItemMenu_CheckTag: ; 81AD378
+ItemMenu_CheckTag: @ 81AD378
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -799928,7 +799928,7 @@ ItemMenu_CheckTag: ; 81AD378
 	thumb_func_end ItemMenu_CheckTag
 
 	thumb_func_start ItemMenu_Cancel
-ItemMenu_Cancel: ; 81AD398
+ItemMenu_Cancel: @ 81AD398
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -799958,7 +799958,7 @@ ItemMenu_Cancel: ; 81AD398
 	thumb_func_end ItemMenu_Cancel
 
 	thumb_func_start ItemMenu_UseInBattle
-ItemMenu_UseInBattle: ; 81AD3DC
+ItemMenu_UseInBattle: @ 81AD3DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -799981,7 +799981,7 @@ _081AD400:
 	thumb_func_end ItemMenu_UseInBattle
 
 	thumb_func_start bag_menu_mail_related
-bag_menu_mail_related: ; 81AD40C
+bag_menu_mail_related: @ 81AD40C
 	push {lr}
 	movs r0, 0xC
 	movs r1, 0x5
@@ -799992,7 +799992,7 @@ bag_menu_mail_related: ; 81AD40C
 	thumb_func_end bag_menu_mail_related
 
 	thumb_func_start item_menu_type_2
-item_menu_type_2: ; 81AD41C
+item_menu_type_2: @ 81AD41C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -800053,7 +800053,7 @@ _081AD4AE:
 	thumb_func_end item_menu_type_2
 
 	thumb_func_start item_menu_type_b
-item_menu_type_b: ; 81AD4B4
+item_menu_type_b: @ 81AD4B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -800100,8 +800100,8 @@ _081AD51A:
 	thumb_func_end item_menu_type_b
 
 	thumb_func_start UseRegisteredKeyItemOnField
-; bool8 UseRegisteredKeyItemOnField()
-UseRegisteredKeyItemOnField: ; 81AD520
+@ bool8 UseRegisteredKeyItemOnField()
+UseRegisteredKeyItemOnField: @ 81AD520
 	push {r4-r7,lr}
 	bl InUnionRoom
 	cmp r0, 0x1
@@ -800182,8 +800182,8 @@ _081AD5D2:
 	thumb_func_end UseRegisteredKeyItemOnField
 
 	thumb_func_start display_sell_item_ask_str
-; void display_sell_item_ask_str(int a1)
-display_sell_item_ask_str: ; 81AD5DC
+@ void display_sell_item_ask_str(int a1)
+display_sell_item_ask_str: @ 81AD5DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -800245,7 +800245,7 @@ _081AD66A:
 	thumb_func_end display_sell_item_ask_str
 
 	thumb_func_start sub_81AD680
-sub_81AD680: ; 81AD680
+sub_81AD680: @ 81AD680
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -800284,7 +800284,7 @@ sub_81AD680: ; 81AD680
 	thumb_func_end sub_81AD680
 
 	thumb_func_start sub_81AD6E4
-sub_81AD6E4: ; 81AD6E4
+sub_81AD6E4: @ 81AD6E4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -800297,7 +800297,7 @@ sub_81AD6E4: ; 81AD6E4
 	thumb_func_end sub_81AD6E4
 
 	thumb_func_start sub_81AD6FC
-sub_81AD6FC: ; 81AD6FC
+sub_81AD6FC: @ 81AD6FC
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -800322,7 +800322,7 @@ sub_81AD6FC: ; 81AD6FC
 	thumb_func_end sub_81AD6FC
 
 	thumb_func_start sub_81AD730
-sub_81AD730: ; 81AD730
+sub_81AD730: @ 81AD730
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -800366,7 +800366,7 @@ sub_81AD730: ; 81AD730
 	thumb_func_end sub_81AD730
 
 	thumb_func_start sub_81AD794
-sub_81AD794: ; 81AD794
+sub_81AD794: @ 81AD794
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -800444,7 +800444,7 @@ _081AD844:
 	thumb_func_end sub_81AD794
 
 	thumb_func_start sub_81AD84C
-sub_81AD84C: ; 81AD84C
+sub_81AD84C: @ 81AD84C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -800491,7 +800491,7 @@ sub_81AD84C: ; 81AD84C
 	thumb_func_end sub_81AD84C
 
 	thumb_func_start sub_81AD8C8
-sub_81AD8C8: ; 81AD8C8
+sub_81AD8C8: @ 81AD8C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -800592,7 +800592,7 @@ sub_81AD8C8: ; 81AD8C8
 	thumb_func_end sub_81AD8C8
 
 	thumb_func_start sub_81AD9C0
-sub_81AD9C0: ; 81AD9C0
+sub_81AD9C0: @ 81AD9C0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -800615,7 +800615,7 @@ _081AD9E2:
 	thumb_func_end sub_81AD9C0
 
 	thumb_func_start display_deposit_item_ask_str
-display_deposit_item_ask_str: ; 81AD9EC
+display_deposit_item_ask_str: @ 81AD9EC
 	push {r4-r6,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -800675,7 +800675,7 @@ _081ADA5E:
 	thumb_func_end display_deposit_item_ask_str
 
 	thumb_func_start sub_81ADA7C
-sub_81ADA7C: ; 81ADA7C
+sub_81ADA7C: @ 81ADA7C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -800742,7 +800742,7 @@ _081ADB0E:
 	thumb_func_end sub_81ADA7C
 
 	thumb_func_start sub_81ADB14
-sub_81ADB14: ; 81ADB14
+sub_81ADB14: @ 81ADB14
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -800847,7 +800847,7 @@ _081ADBF2:
 	thumb_func_end sub_81ADB14
 
 	thumb_func_start sub_81ADC0C
-sub_81ADC0C: ; 81ADC0C
+sub_81ADC0C: @ 81ADC0C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -800880,8 +800880,8 @@ _081ADC44:
 	thumb_func_end sub_81ADC0C
 
 	thumb_func_start IsWallysBag
-; bool8 IsWallysBag()
-IsWallysBag: ; 81ADC54
+@ bool8 IsWallysBag()
+IsWallysBag: @ 81ADC54
 	push {lr}
 	ldr r0, =0x0203ce58
 	ldrb r0, [r0, 0x4]
@@ -800898,8 +800898,8 @@ _081ADC6A:
 	thumb_func_end IsWallysBag
 
 	thumb_func_start PrepareBagForWallyTutorial
-; void PrepareBagForWallyTutorial()
-PrepareBagForWallyTutorial: ; 81ADC70
+@ void PrepareBagForWallyTutorial()
+PrepareBagForWallyTutorial: @ 81ADC70
 	push {r4-r6,lr}
 	ldr r4, =0x0203ce80
 	movs r0, 0xD0
@@ -800965,8 +800965,8 @@ _081ADCAE:
 	thumb_func_end PrepareBagForWallyTutorial
 
 	thumb_func_start RestoreBagAfterWallyTutorial
-; void RestoreBagAfterWallyTutorial()
-RestoreBagAfterWallyTutorial: ; 81ADD00
+@ void RestoreBagAfterWallyTutorial()
+RestoreBagAfterWallyTutorial: @ 81ADD00
 	push {r4-r6,lr}
 	ldr r5, =0x03005d8c
 	ldr r0, [r5]
@@ -801019,8 +801019,8 @@ _081ADD3A:
 	thumb_func_end RestoreBagAfterWallyTutorial
 
 	thumb_func_start DoWallyTutorialBagMenu
-; void DoWallyTutorialBagMenu()
-DoWallyTutorialBagMenu: ; 81ADD70
+@ void DoWallyTutorialBagMenu()
+DoWallyTutorialBagMenu: @ 81ADD70
 	push {lr}
 	bl PrepareBagForWallyTutorial
 	movs r0, 0xD
@@ -801039,8 +801039,8 @@ DoWallyTutorialBagMenu: ; 81ADD70
 	thumb_func_end DoWallyTutorialBagMenu
 
 	thumb_func_start Task_WallyTutorialBagMenu
-; void Task_WallyTutorialBagMenu(u8 taskId)
-Task_WallyTutorialBagMenu: ; 81ADD98
+@ void Task_WallyTutorialBagMenu(u8 taskId)
+Task_WallyTutorialBagMenu: @ 81ADD98
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -801115,7 +801115,7 @@ _081ADE32:
 	thumb_func_end Task_WallyTutorialBagMenu
 
 	thumb_func_start unknown_ItemMenu_Show
-unknown_ItemMenu_Show: ; 81ADE38
+unknown_ItemMenu_Show: @ 81ADE38
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -801137,7 +801137,7 @@ unknown_ItemMenu_Show: ; 81ADE38
 	thumb_func_end unknown_ItemMenu_Show
 
 	thumb_func_start bag_menu_leave_maybe_3
-bag_menu_leave_maybe_3: ; 81ADE6C
+bag_menu_leave_maybe_3: @ 81ADE6C
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =sub_819FA50
@@ -801150,7 +801150,7 @@ bag_menu_leave_maybe_3: ; 81ADE6C
 	thumb_func_end bag_menu_leave_maybe_3
 
 	thumb_func_start unknown_ItemMenu_Give2
-unknown_ItemMenu_Give2: ; 81ADE8C
+unknown_ItemMenu_Give2: @ 81ADE8C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -801172,7 +801172,7 @@ unknown_ItemMenu_Give2: ; 81ADE8C
 	thumb_func_end unknown_ItemMenu_Give2
 
 	thumb_func_start bag_menu_leave_maybe_2
-bag_menu_leave_maybe_2: ; 81ADEBC
+bag_menu_leave_maybe_2: @ 81ADEBC
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =sub_818DEF4
@@ -801185,7 +801185,7 @@ bag_menu_leave_maybe_2: ; 81ADEBC
 	thumb_func_end bag_menu_leave_maybe_2
 
 	thumb_func_start unknown_ItemMenu_Confirm2
-unknown_ItemMenu_Confirm2: ; 81ADEDC
+unknown_ItemMenu_Confirm2: @ 81ADEDC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -801203,7 +801203,7 @@ unknown_ItemMenu_Confirm2: ; 81ADEDC
 	thumb_func_end unknown_ItemMenu_Confirm2
 
 	thumb_func_start bag_menu_leave_maybe
-bag_menu_leave_maybe: ; 81ADF00
+bag_menu_leave_maybe: @ 81ADF00
 	push {lr}
 	ldr r0, =0x03005dac
 	ldr r1, =sub_818E564
@@ -801216,7 +801216,7 @@ bag_menu_leave_maybe: ; 81ADF00
 	thumb_func_end bag_menu_leave_maybe
 
 	thumb_func_start bag_menu_print_pocket_names
-bag_menu_print_pocket_names: ; 81ADF20
+bag_menu_print_pocket_names: @ 81ADF20
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -801311,7 +801311,7 @@ _081ADFBA:
 	thumb_func_end bag_menu_print_pocket_names
 
 	thumb_func_start bag_menu_copy_pocket_name_to_window
-bag_menu_copy_pocket_name_to_window: ; 81ADFF8
+bag_menu_copy_pocket_name_to_window: @ 81ADFF8
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	cmp r7, 0x8
@@ -801353,7 +801353,7 @@ _081AE002:
 	thumb_func_end bag_menu_copy_pocket_name_to_window
 
 	thumb_func_start setup_bag_menu_textboxes
-setup_bag_menu_textboxes: ; 81AE054
+setup_bag_menu_textboxes: @ 81AE054
 	push {r4,lr}
 	ldr r0, =gUnknown_08614174
 	bl InitWindows
@@ -801396,7 +801396,7 @@ _081AE088:
 	thumb_func_end setup_bag_menu_textboxes
 
 	thumb_func_start bag_menu_print
-bag_menu_print: ; 81AE0BC
+bag_menu_print: @ 81AE0BC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -801450,7 +801450,7 @@ bag_menu_print: ; 81AE0BC
 	thumb_func_end bag_menu_print
 
 	thumb_func_start sub_81AE124
-sub_81AE124: ; 81AE124
+sub_81AE124: @ 81AE124
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0203ce54
@@ -801465,7 +801465,7 @@ sub_81AE124: ; 81AE124
 	thumb_func_end sub_81AE124
 
 	thumb_func_start bag_menu_add_window
-bag_menu_add_window: ; 81AE13C
+bag_menu_add_window: @ 81AE13C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -801499,7 +801499,7 @@ _081AE172:
 	thumb_func_end bag_menu_add_window
 
 	thumb_func_start bag_menu_remove_window
-bag_menu_remove_window: ; 81AE184
+bag_menu_remove_window: @ 81AE184
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -801530,8 +801530,8 @@ _081AE1B8:
 	thumb_func_end bag_menu_remove_window
 
 	thumb_func_start AddItemMessageWindow
-; u8 AddItemMessageWindow(u8 a1)
-AddItemMessageWindow: ; 81AE1C4
+@ u8 AddItemMessageWindow(u8 a1)
+AddItemMessageWindow: @ 81AE1C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -801558,7 +801558,7 @@ _081AE1E8:
 	thumb_func_end AddItemMessageWindow
 
 	thumb_func_start bag_menu_remove_item_message_window
-bag_menu_remove_item_message_window: ; 81AE1F8
+bag_menu_remove_item_message_window: @ 81AE1F8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -801589,7 +801589,7 @@ _081AE22C:
 	thumb_func_end bag_menu_remove_item_message_window
 
 	thumb_func_start bag_menu_yes_no
-bag_menu_yes_no: ; 81AE238
+bag_menu_yes_no: @ 81AE238
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -801615,7 +801615,7 @@ bag_menu_yes_no: ; 81AE238
 	thumb_func_end bag_menu_yes_no
 
 	thumb_func_start bag_menu_add_money_window
-bag_menu_add_money_window: ; 81AE268
+bag_menu_add_money_window: @ 81AE268
 	push {r4,lr}
 	movs r0, 0x9
 	bl bag_menu_add_window
@@ -801643,7 +801643,7 @@ bag_menu_add_money_window: ; 81AE268
 	thumb_func_end bag_menu_add_money_window
 
 	thumb_func_start bag_menu_remove_money_window
-bag_menu_remove_money_window: ; 81AE2A4
+bag_menu_remove_money_window: @ 81AE2A4
 	push {lr}
 	movs r0, 0x9
 	bl bag_menu_remove_window
@@ -801653,7 +801653,7 @@ bag_menu_remove_money_window: ; 81AE2A4
 	thumb_func_end bag_menu_remove_money_window
 
 	thumb_func_start bag_menu_prepare_tmhm_move_window
-bag_menu_prepare_tmhm_move_window: ; 81AE2B4
+bag_menu_prepare_tmhm_move_window: @ 81AE2B4
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0
@@ -801686,7 +801686,7 @@ bag_menu_prepare_tmhm_move_window: ; 81AE2B4
 	thumb_func_end bag_menu_prepare_tmhm_move_window
 
 	thumb_func_start PrintTMHMMoveData
-PrintTMHMMoveData: ; 81AE2FC
+PrintTMHMMoveData: @ 81AE2FC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -801845,14 +801845,14 @@ _081AE440:
 	thumb_func_end PrintTMHMMoveData
 
 	thumb_func_start ListMenuDummyTask
-; void ListMenuDummyTask(u8 taskId)
-ListMenuDummyTask: ; 81AE458
+@ void ListMenuDummyTask(u8 taskId)
+ListMenuDummyTask: @ 81AE458
 	bx lr
 	thumb_func_end ListMenuDummyTask
 
 	thumb_func_start DoMysteryGiftListMenu
-; int DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, int a3, int a4, int a5)
-DoMysteryGiftListMenu: ; 81AE45C
+@ int DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, int a3, int a4, int a5)
+DoMysteryGiftListMenu: @ 81AE45C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -801998,8 +801998,8 @@ _081AE574:
 	thumb_func_end DoMysteryGiftListMenu
 
 	thumb_func_start ListMenuInit
-; u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
-ListMenuInit: ; 81AE584
+@ u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
+ListMenuInit: @ 81AE584
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -802022,8 +802022,8 @@ ListMenuInit: ; 81AE584
 	thumb_func_end ListMenuInit
 
 	thumb_func_start Unused_ListMenuInit2
-; u8 Unused_ListMenuInit2(struct ListMenuTemplate *listMenuTemplate, int a2, u16 scrollOffset, u16 selectedRow)
-Unused_ListMenuInit2: ; 81AE5B0
+@ u8 Unused_ListMenuInit2(struct ListMenuTemplate *listMenuTemplate, int a2, u16 scrollOffset, u16 selectedRow)
+Unused_ListMenuInit2: @ 81AE5B0
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -802067,8 +802067,8 @@ _081AE5F0:
 	thumb_func_end Unused_ListMenuInit2
 
 	thumb_func_start ListMenuHandleInput
-; int ListMenuHandleInput(u8 taskId)
-ListMenuHandleInput: ; 81AE604
+@ int ListMenuHandleInput(u8 taskId)
+ListMenuHandleInput: @ 81AE604
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -802179,7 +802179,7 @@ _081AE6C2:
 	thumb_func_end ListMenuHandleInput
 
 	thumb_func_start sub_81AE6C8
-sub_81AE6C8: ; 81AE6C8
+sub_81AE6C8: @ 81AE6C8
 	push {r4,lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -802217,7 +802217,7 @@ _081AE6FC:
 	thumb_func_end sub_81AE6C8
 
 	thumb_func_start sub_81AE70C
-sub_81AE70C: ; 81AE70C
+sub_81AE70C: @ 81AE70C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -802250,7 +802250,7 @@ sub_81AE70C: ; 81AE70C
 	thumb_func_end sub_81AE70C
 
 	thumb_func_start sub_81AE750
-sub_81AE750: ; 81AE750
+sub_81AE750: @ 81AE750
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -802287,7 +802287,7 @@ sub_81AE750: ; 81AE750
 	thumb_func_end sub_81AE750
 
 	thumb_func_start sub_81AE794
-sub_81AE794: ; 81AE794
+sub_81AE794: @ 81AE794
 	push {r4,r5,lr}
 	adds r3, r1, 0
 	adds r5, r2, 0
@@ -802317,7 +802317,7 @@ sub_81AE794: ; 81AE794
 	thumb_func_end sub_81AE794
 
 	thumb_func_start sub_81AE7D0
-sub_81AE7D0: ; 81AE7D0
+sub_81AE7D0: @ 81AE7D0
 	push {r4-r7,lr}
 	sub sp, 0x20
 	mov r12, r2
@@ -802374,7 +802374,7 @@ _081AE82A:
 	thumb_func_end sub_81AE7D0
 
 	thumb_func_start sub_81AE838
-sub_81AE838: ; 81AE838
+sub_81AE838: @ 81AE838
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -802397,7 +802397,7 @@ _081AE856:
 	thumb_func_end sub_81AE838
 
 	thumb_func_start get_coro_args_x18_x1A
-get_coro_args_x18_x1A: ; 81AE860
+get_coro_args_x18_x1A: @ 81AE860
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -802423,8 +802423,8 @@ _081AE882:
 	thumb_func_end get_coro_args_x18_x1A
 
 	thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
-; u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId)
-ListMenuGetYCoordForPrintingArrowCursor: ; 81AE88C
+@ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId)
+ListMenuGetYCoordForPrintingArrowCursor: @ 81AE88C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -802461,8 +802461,8 @@ ListMenuGetYCoordForPrintingArrowCursor: ; 81AE88C
 	thumb_func_end ListMenuGetYCoordForPrintingArrowCursor
 
 	thumb_func_start ListMenuInitInternal
-; u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
-ListMenuInitInternal: ; 81AE8D4
+@ u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
+ListMenuInitInternal: @ 81AE8D4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -802566,8 +802566,8 @@ _081AE96C:
 	thumb_func_end ListMenuInitInternal
 
 	thumb_func_start ListMenuPrint
-; void ListMenuPrint(struct ListMenu *listMenu, u8 *str, u8 x, u8 y)
-ListMenuPrint: ; 81AE9B4
+@ void ListMenuPrint(struct ListMenu *listMenu, u8 *str, u8 x, u8 y)
+ListMenuPrint: @ 81AE9B4
 	push {r4-r7,lr}
 	sub sp, 0x18
 	adds r4, r0, 0
@@ -802658,8 +802658,8 @@ _081AEA5E:
 	thumb_func_end ListMenuPrint
 
 	thumb_func_start ListMenuPrintEntries
-; void ListMenuPrintEntries(struct ListMenu *listMenu, u16 startIndex, u16 yOffset, u16 count)
-ListMenuPrintEntries: ; 81AEA68
+@ void ListMenuPrintEntries(struct ListMenu *listMenu, u16 startIndex, u16 yOffset, u16 count)
+ListMenuPrintEntries: @ 81AEA68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -802757,8 +802757,8 @@ _081AEB10:
 	thumb_func_end ListMenuPrintEntries
 
 	thumb_func_start ListMenuDrawCursor
-; void ListMenuDrawCursor(struct ListMenu *listMenu)
-ListMenuDrawCursor: ; 81AEB20
+@ void ListMenuDrawCursor(struct ListMenu *listMenu)
+ListMenuDrawCursor: @ 81AEB20
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -802879,7 +802879,7 @@ _081AEC0C:
 	thumb_func_end ListMenuDrawCursor
 
 	thumb_func_start ListMenuAddCursorObject
-ListMenuAddCursorObject: ; 81AEC18
+ListMenuAddCursorObject: @ 81AEC18
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -802926,7 +802926,7 @@ ListMenuAddCursorObject: ; 81AEC18
 	thumb_func_end ListMenuAddCursorObject
 
 	thumb_func_start ListMenuErasePrintedCursor
-ListMenuErasePrintedCursor: ; 81AEC78
+ListMenuErasePrintedCursor: @ 81AEC78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -802995,8 +802995,8 @@ _081AECF4:
 	thumb_func_end ListMenuErasePrintedCursor
 
 	thumb_func_start ListMenuUpdateSelectedRowIndexAndScrollOffset
-; u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(int, bool8 movingDown)
-ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00
+@ u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(int, bool8 movingDown)
+ListMenuUpdateSelectedRowIndexAndScrollOffset: @ 81AED00
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -803136,8 +803136,8 @@ _081AEDE8:
 	thumb_func_end ListMenuUpdateSelectedRowIndexAndScrollOffset
 
 	thumb_func_start ListMenuScroll
-; void ListMenuScroll(struct ListMenu *listMenu, int a2, bool8 movingDown)
-ListMenuScroll: ; 81AEDF0
+@ void ListMenuScroll(struct ListMenu *listMenu, int a2, bool8 movingDown)
+ListMenuScroll: @ 81AEDF0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -803287,8 +803287,8 @@ _081AEF1A:
 	thumb_func_end ListMenuScroll
 
 	thumb_func_start ListMenuChangeSelection
-; bool8 ListMenuChangeSelection(struct ListMenu *listMenu, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown)
-ListMenuChangeSelection: ; 81AEF28
+@ bool8 ListMenuChangeSelection(struct ListMenu *listMenu, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown)
+ListMenuChangeSelection: @ 81AEF28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -803400,8 +803400,8 @@ _081AEFF0:
 	thumb_func_end ListMenuChangeSelection
 
 	thumb_func_start ListMenuCallSelectionChangedCallback
-; void ListMenuCallSelectionChangedCallback(struct ListMenu *listMenu, u8 a2)
-ListMenuCallSelectionChangedCallback: ; 81AF000
+@ void ListMenuCallSelectionChangedCallback(struct ListMenu *listMenu, u8 a2)
+ListMenuCallSelectionChangedCallback: @ 81AF000
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -803425,7 +803425,7 @@ _081AF022:
 	thumb_func_end ListMenuCallSelectionChangedCallback
 
 	thumb_func_start sub_81AF028
-sub_81AF028: ; 81AF028
+sub_81AF028: @ 81AF028
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -803467,7 +803467,7 @@ sub_81AF028: ; 81AF028
 	thumb_func_end sub_81AF028
 
 	thumb_func_start sub_81AF078
-sub_81AF078: ; 81AF078
+sub_81AF078: @ 81AF078
 	push {lr}
 	lsls r1, 24
 	cmp r1, 0
@@ -803480,7 +803480,7 @@ _081AF086:
 	thumb_func_end sub_81AF078
 
 	thumb_func_start sub_81AF08C
-sub_81AF08C: ; 81AF08C
+sub_81AF08C: @ 81AF08C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -803588,7 +803588,7 @@ _081AF158:
 	thumb_func_end sub_81AF08C
 
 	thumb_func_start sub_81AF15C
-sub_81AF15C: ; 81AF15C
+sub_81AF15C: @ 81AF15C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -803725,7 +803725,7 @@ _081AF25C:
 	thumb_func_end sub_81AF15C
 
 	thumb_func_start sub_81AF264
-sub_81AF264: ; 81AF264
+sub_81AF264: @ 81AF264
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -803802,7 +803802,7 @@ _081AF2E4:
 	thumb_func_end sub_81AF264
 
 	thumb_func_start AddScrollIndicatorArrowObject
-AddScrollIndicatorArrowObject: ; 81AF2F0
+AddScrollIndicatorArrowObject: @ 81AF2F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -803871,7 +803871,7 @@ AddScrollIndicatorArrowObject: ; 81AF2F0
 	thumb_func_end AddScrollIndicatorArrowObject
 
 	thumb_func_start AddScrollIndicatorArrowPair
-AddScrollIndicatorArrowPair: ; 81AF380
+AddScrollIndicatorArrowPair: @ 81AF380
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -804000,7 +804000,7 @@ _081AF47C:
 	thumb_func_end AddScrollIndicatorArrowPair
 
 	thumb_func_start AddScrollIndicatorArrowPairParametrized
-AddScrollIndicatorArrowPairParametrized: ; 81AF4A0
+AddScrollIndicatorArrowPairParametrized: @ 81AF4A0
 	push {r4,lr}
 	adds r4, r1, 0
 	subs r0, 0x2
@@ -804051,7 +804051,7 @@ _081AF4D6:
 	thumb_func_end AddScrollIndicatorArrowPairParametrized
 
 	thumb_func_start Task_ScrollIndicatorArrowPair
-Task_ScrollIndicatorArrowPair: ; 81AF504
+Task_ScrollIndicatorArrowPair: @ 81AF504
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804127,7 +804127,7 @@ _081AF594:
 	thumb_func_end Task_ScrollIndicatorArrowPair
 
 	thumb_func_start Task_ScrollIndicatorArrowPairOnMainMenu
-Task_ScrollIndicatorArrowPairOnMainMenu: ; 81AF59C
+Task_ScrollIndicatorArrowPairOnMainMenu: @ 81AF59C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804194,7 +804194,7 @@ _081AF612:
 	thumb_func_end Task_ScrollIndicatorArrowPairOnMainMenu
 
 	thumb_func_start RemoveScrollIndicatorArrowPair
-RemoveScrollIndicatorArrowPair: ; 81AF620
+RemoveScrollIndicatorArrowPair: @ 81AF620
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804237,7 +804237,7 @@ _081AF648:
 	thumb_func_end RemoveScrollIndicatorArrowPair
 
 	thumb_func_start ListMenuAddCursorObjectInternal
-ListMenuAddCursorObjectInternal: ; 81AF680
+ListMenuAddCursorObjectInternal: @ 81AF680
 	push {lr}
 	cmp r1, 0
 	beq _081AF68A
@@ -804256,8 +804256,8 @@ _081AF694:
 	thumb_func_end ListMenuAddCursorObjectInternal
 
 	thumb_func_start ListMenuUpdateCursorObject
-; void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 a4)
-ListMenuUpdateCursorObject: ; 81AF69C
+@ void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 a4)
+ListMenuUpdateCursorObject: @ 81AF69C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804281,7 +804281,7 @@ _081AF6BE:
 	thumb_func_end ListMenuUpdateCursorObject
 
 	thumb_func_start ListMenuRemoveCursorObject
-ListMenuRemoveCursorObject: ; 81AF6C4
+ListMenuRemoveCursorObject: @ 81AF6C4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804301,12 +804301,12 @@ _081AF6DE:
 	thumb_func_end ListMenuRemoveCursorObject
 
 	thumb_func_start Task_RedOutlineCursor
-Task_RedOutlineCursor: ; 81AF6E4
+Task_RedOutlineCursor: @ 81AF6E4
 	bx lr
 	thumb_func_end Task_RedOutlineCursor
 
 	thumb_func_start ListMenuGetRedOutlineCursorSpriteCount
-ListMenuGetRedOutlineCursorSpriteCount: ; 81AF6E8
+ListMenuGetRedOutlineCursorSpriteCount: @ 81AF6E8
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -804344,7 +804344,7 @@ _081AF71C:
 	thumb_func_end ListMenuGetRedOutlineCursorSpriteCount
 
 	thumb_func_start ListMenuSetUpRedOutlineCursorSpriteOamTable
-ListMenuSetUpRedOutlineCursorSpriteOamTable: ; 81AF724
+ListMenuSetUpRedOutlineCursorSpriteOamTable: @ 81AF724
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -804466,7 +804466,7 @@ _081AF7F6:
 	thumb_func_end ListMenuSetUpRedOutlineCursorSpriteOamTable
 
 	thumb_func_start ListMenuAddRedOutlineCursorObject
-ListMenuAddRedOutlineCursorObject: ; 81AF828
+ListMenuAddRedOutlineCursorObject: @ 81AF828
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -804627,8 +804627,8 @@ _081AF96E:
 	thumb_func_end ListMenuAddRedOutlineCursorObject
 
 	thumb_func_start ListMenuUpdateRedOutlineCursorObject
-; void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
-ListMenuUpdateRedOutlineCursorObject: ; 81AF994
+@ void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
+ListMenuUpdateRedOutlineCursorObject: @ 81AF994
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804663,7 +804663,7 @@ ListMenuUpdateRedOutlineCursorObject: ; 81AF994
 	thumb_func_end ListMenuUpdateRedOutlineCursorObject
 
 	thumb_func_start ListMenuRemoveRedOutlineCursorObject
-ListMenuRemoveRedOutlineCursorObject: ; 81AF9D8
+ListMenuRemoveRedOutlineCursorObject: @ 81AF9D8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804702,7 +804702,7 @@ _081AFA06:
 	thumb_func_end ListMenuRemoveRedOutlineCursorObject
 
 	thumb_func_start ObjectCB_RedArrowCursor
-ObjectCB_RedArrowCursor: ; 81AFA30
+ObjectCB_RedArrowCursor: @ 81AFA30
 	push {lr}
 	adds r2, r0, 0
 	ldr r1, =gUnknown_08329F40
@@ -804727,12 +804727,12 @@ _081AFA48:
 	thumb_func_end ObjectCB_RedArrowCursor
 
 	thumb_func_start Task_RedArrowCursor
-Task_RedArrowCursor: ; 81AFA5C
+Task_RedArrowCursor: @ 81AFA5C
 	bx lr
 	thumb_func_end Task_RedArrowCursor
 
 	thumb_func_start ListMenuAddRedArrowCursorObject
-ListMenuAddRedArrowCursorObject: ; 81AFA60
+ListMenuAddRedArrowCursorObject: @ 81AFA60
 	push {r4-r7,lr}
 	sub sp, 0x28
 	adds r5, r0, 0
@@ -804847,8 +804847,8 @@ _081AFB46:
 	thumb_func_end ListMenuAddRedArrowCursorObject
 
 	thumb_func_start ListMenuUpdateRedArrowCursorObject
-; void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
-ListMenuUpdateRedArrowCursorObject: ; 81AFB68
+@ void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
+ListMenuUpdateRedArrowCursorObject: @ 81AFB68
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804877,7 +804877,7 @@ ListMenuUpdateRedArrowCursorObject: ; 81AFB68
 	thumb_func_end ListMenuUpdateRedArrowCursorObject
 
 	thumb_func_start ListMenuRemoveRedArrowCursorObject
-ListMenuRemoveRedArrowCursorObject: ; 81AFBA0
+ListMenuRemoveRedArrowCursorObject: @ 81AFBA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -804914,7 +804914,7 @@ _081AFBC8:
 	thumb_func_end ListMenuRemoveRedArrowCursorObject
 
 	thumb_func_start sub_81AFBF0
-sub_81AFBF0: ; 81AFBF0
+sub_81AFBF0: @ 81AFBF0
 	push {lr}
 	ldr r1, =0x0203ce9c
 	movs r2, 0
@@ -804931,7 +804931,7 @@ _081AFBFA:
 	thumb_func_end sub_81AFBF0
 
 	thumb_func_start sub_81AFC0C
-sub_81AFC0C: ; 81AFC0C
+sub_81AFC0C: @ 81AFC0C
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -804949,7 +804949,7 @@ _081AFC20:
 	thumb_func_end sub_81AFC0C
 
 	thumb_func_start sub_81AFC28
-sub_81AFC28: ; 81AFC28
+sub_81AFC28: @ 81AFC28
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -804994,7 +804994,7 @@ _081AFC68:
 	thumb_func_end sub_81AFC28
 
 	thumb_func_start sub_81AFC74
-sub_81AFC74: ; 81AFC74
+sub_81AFC74: @ 81AFC74
 	lsls r0, 24
 	ldr r1, =0x0203ce9c
 	lsrs r0, 22
@@ -805005,7 +805005,7 @@ sub_81AFC74: ; 81AFC74
 	thumb_func_end sub_81AFC74
 
 	thumb_func_start sav1_are_mapnumbers_in_given_list
-sav1_are_mapnumbers_in_given_list: ; 81AFC84
+sav1_are_mapnumbers_in_given_list: @ 81AFC84
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r0, =0x03005d8c
@@ -805046,7 +805046,7 @@ _081AFCC6:
 	thumb_func_end sav1_are_mapnumbers_in_given_list
 
 	thumb_func_start sav1_is_in_pokecenter
-sav1_is_in_pokecenter: ; 81AFCCC
+sav1_is_in_pokecenter: @ 81AFCCC
 	push {lr}
 	ldr r0, =gUnknown_086143BC
 	bl sav1_are_mapnumbers_in_given_list
@@ -805056,7 +805056,7 @@ sav1_is_in_pokecenter: ; 81AFCCC
 	thumb_func_end sav1_is_in_pokecenter
 
 	thumb_func_start sub_81AFCDC
-sub_81AFCDC: ; 81AFCDC
+sub_81AFCDC: @ 81AFCDC
 	push {lr}
 	ldr r0, =gUnknown_0861440A
 	bl sav1_are_mapnumbers_in_given_list
@@ -805066,7 +805066,7 @@ sub_81AFCDC: ; 81AFCDC
 	thumb_func_end sub_81AFCDC
 
 	thumb_func_start sub_81AFCEC
-sub_81AFCEC: ; 81AFCEC
+sub_81AFCEC: @ 81AFCEC
 	push {lr}
 	ldr r0, =gUnknown_0861440E
 	bl sav1_are_mapnumbers_in_given_list
@@ -805076,7 +805076,7 @@ sub_81AFCEC: ; 81AFCEC
 	thumb_func_end sub_81AFCEC
 
 	thumb_func_start sav2_set_x9_bit3_when_sav1_in_pokecenter
-sav2_set_x9_bit3_when_sav1_in_pokecenter: ; 81AFCFC
+sav2_set_x9_bit3_when_sav1_in_pokecenter: @ 81AFCFC
 	push {lr}
 	bl sav1_is_in_pokecenter
 	cmp r0, 0
@@ -805102,7 +805102,7 @@ _081AFD22:
 	thumb_func_end sav2_set_x9_bit3_when_sav1_in_pokecenter
 
 	thumb_func_start sub_81AFD2C
-sub_81AFD2C: ; 81AFD2C
+sub_81AFD2C: @ 81AFD2C
 	push {lr}
 	bl sub_81AFCDC
 	cmp r0, 0
@@ -805128,7 +805128,7 @@ _081AFD52:
 	thumb_func_end sub_81AFD2C
 
 	thumb_func_start sub_81AFD5C
-sub_81AFD5C: ; 81AFD5C
+sub_81AFD5C: @ 81AFD5C
 	push {lr}
 	bl sub_81AFCEC
 	cmp r0, 0
@@ -805154,7 +805154,7 @@ _081AFD82:
 	thumb_func_end sub_81AFD5C
 
 	thumb_func_start sav2_set_x9_depending_on_sav1_map
-sav2_set_x9_depending_on_sav1_map: ; 81AFD8C
+sav2_set_x9_depending_on_sav1_map: @ 81AFD8C
 	push {lr}
 	bl sav2_set_x9_bit3_when_sav1_in_pokecenter
 	bl sub_81AFD2C
@@ -805164,7 +805164,7 @@ sav2_set_x9_depending_on_sav1_map: ; 81AFD8C
 	thumb_func_end sav2_set_x9_depending_on_sav1_map
 
 	thumb_func_start sub_81AFDA0
-sub_81AFDA0: ; 81AFDA0
+sub_81AFDA0: @ 81AFDA0
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	adds r2, 0xA8
@@ -805190,7 +805190,7 @@ sub_81AFDA0: ; 81AFDA0
 	thumb_func_end sub_81AFDA0
 
 	thumb_func_start sub_81AFDD0
-sub_81AFDD0: ; 81AFDD0
+sub_81AFDD0: @ 81AFDD0
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
@@ -805202,8 +805202,8 @@ sub_81AFDD0: ; 81AFDD0
 	thumb_func_end sub_81AFDD0
 
 	thumb_func_start AllocItemIconTemporaryBuffers
-; bool8 AllocItemIconTemporaryBuffers()
-AllocItemIconTemporaryBuffers: ; 81AFDE4
+@ bool8 AllocItemIconTemporaryBuffers()
+AllocItemIconTemporaryBuffers: @ 81AFDE4
 	push {r4,r5,lr}
 	ldr r5, =0x0203cebc
 	movs r0, 0x90
@@ -805234,8 +805234,8 @@ _081AFE1C:
 	thumb_func_end AllocItemIconTemporaryBuffers
 
 	thumb_func_start FreeItemIconTemporaryBuffers
-; void FreeItemIconTemporaryBuffers()
-FreeItemIconTemporaryBuffers: ; 81AFE24
+@ void FreeItemIconTemporaryBuffers()
+FreeItemIconTemporaryBuffers: @ 81AFE24
 	push {lr}
 	ldr r0, =0x0203cebc
 	ldr r0, [r0]
@@ -805249,8 +805249,8 @@ FreeItemIconTemporaryBuffers: ; 81AFE24
 	thumb_func_end FreeItemIconTemporaryBuffers
 
 	thumb_func_start CopyItemIconPicTo4x4Buffer
-; void CopyItemIconPicTo4x4Buffer(void *src, void *dest)
-CopyItemIconPicTo4x4Buffer: ; 81AFE44
+@ void CopyItemIconPicTo4x4Buffer(void *src, void *dest)
+CopyItemIconPicTo4x4Buffer: @ 81AFE44
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -805275,8 +805275,8 @@ _081AFE4C:
 	thumb_func_end CopyItemIconPicTo4x4Buffer
 
 	thumb_func_start AddItemIconObject
-; u8 AddItemIconObject(u16 tilesTag, u16 paletteTag, u16 itemId)
-AddItemIconObject: ; 81AFE70
+@ u8 AddItemIconObject(u16 tilesTag, u16 paletteTag, u16 itemId)
+AddItemIconObject: @ 81AFE70
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -805357,8 +805357,8 @@ _081AFF2A:
 	thumb_func_end AddItemIconObject
 
 	thumb_func_start AddItemIconObjectWithCustomObjectTemplate
-; u8 AddItemIconObjectWithCustomObjectTemplate(struct objtemplate *objectTemplate, u16 tilesTag, u16 paletteTag, u16 itemId)
-AddItemIconObjectWithCustomObjectTemplate: ; 81AFF34
+@ u8 AddItemIconObjectWithCustomObjectTemplate(struct objtemplate *objectTemplate, u16 tilesTag, u16 paletteTag, u16 itemId)
+AddItemIconObjectWithCustomObjectTemplate: @ 81AFF34
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -805444,8 +805444,8 @@ _081AFFEE:
 	thumb_func_end AddItemIconObjectWithCustomObjectTemplate
 
 	thumb_func_start GetItemIconPicOrPalette
-; u32 GetItemIconPicOrPalette(u16 itemId, u8 which)
-GetItemIconPicOrPalette: ; 81AFFFC
+@ u32 GetItemIconPicOrPalette(u16 itemId, u8 which)
+GetItemIconPicOrPalette: @ 81AFFFC
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -805476,7 +805476,7 @@ _081B0022:
 	thumb_func_end GetItemIconPicOrPalette
 
 	thumb_func_start sub_81B0038
-sub_81B0038: ; 81B0038
+sub_81B0038: @ 81B0038
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -805662,7 +805662,7 @@ _081B0194:
 	thumb_func_end sub_81B0038
 
 	thumb_func_start sub_81B01B0
-sub_81B01B0: ; 81B01B0
+sub_81B01B0: @ 81B01B0
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -805674,7 +805674,7 @@ sub_81B01B0: ; 81B01B0
 	thumb_func_end sub_81B01B0
 
 	thumb_func_start sub_81B01CC
-sub_81B01CC: ; 81B01CC
+sub_81B01CC: @ 81B01CC
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -805684,7 +805684,7 @@ sub_81B01CC: ; 81B01CC
 	thumb_func_end sub_81B01CC
 
 	thumb_func_start c2_811EBD0
-c2_811EBD0: ; 81B01E0
+c2_811EBD0: @ 81B01E0
 	push {lr}
 _081B01E2:
 	bl sub_81221EC
@@ -805708,7 +805708,7 @@ _081B0206:
 	thumb_func_end c2_811EBD0
 
 	thumb_func_start sub_81B020C
-sub_81B020C: ; 81B020C
+sub_81B020C: @ 81B020C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x030022c0
@@ -806000,7 +806000,7 @@ _081B04B2:
 	thumb_func_end sub_81B020C
 
 	thumb_func_start sub_81B04BC
-sub_81B04BC: ; 81B04BC
+sub_81B04BC: @ 81B04BC
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x1
@@ -806024,7 +806024,7 @@ sub_81B04BC: ; 81B04BC
 	thumb_func_end sub_81B04BC
 
 	thumb_func_start sub_81B04F8
-sub_81B04F8: ; 81B04F8
+sub_81B04F8: @ 81B04F8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806048,7 +806048,7 @@ _081B051C:
 	thumb_func_end sub_81B04F8
 
 	thumb_func_start reset_brm
-reset_brm: ; 81B052C
+reset_brm: @ 81B052C
 	ldr r0, =0x0203cec4
 	movs r1, 0
 	str r1, [r0]
@@ -806063,7 +806063,7 @@ reset_brm: ; 81B052C
 	thumb_func_end reset_brm
 
 	thumb_func_start sub_81B0550
-sub_81B0550: ; 81B0550
+sub_81B0550: @ 81B0550
 	push {r4,r5,lr}
 	ldr r5, =0x0203cee4
 	movs r4, 0x80
@@ -806113,7 +806113,7 @@ _081B05C2:
 	thumb_func_end sub_81B0550
 
 	thumb_func_start sub_81B05C8
-sub_81B05C8: ; 81B05C8
+sub_81B05C8: @ 81B05C8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203cec4
@@ -806223,7 +806223,7 @@ _081B06B6:
 	thumb_func_end sub_81B05C8
 
 	thumb_func_start sub_81B06C0
-sub_81B06C0: ; 81B06C0
+sub_81B06C0: @ 81B06C0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 28
@@ -806248,7 +806248,7 @@ sub_81B06C0: ; 81B06C0
 	thumb_func_end sub_81B06C0
 
 	thumb_func_start sub_81B06F4
-sub_81B06F4: ; 81B06F4
+sub_81B06F4: @ 81B06F4
 	push {lr}
 	ldr r0, =0x0203cec4
 	ldr r0, [r0]
@@ -806281,7 +806281,7 @@ _081B0726:
 	thumb_func_end sub_81B06F4
 
 	thumb_func_start sub_81B0740
-sub_81B0740: ; 81B0740
+sub_81B0740: @ 81B0740
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -806361,7 +806361,7 @@ _081B07D2:
 	thumb_func_end sub_81B0740
 
 	thumb_func_start sub_81B07E0
-sub_81B07E0: ; 81B07E0
+sub_81B07E0: @ 81B07E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -806525,7 +806525,7 @@ _081B093E:
 	thumb_func_end sub_81B07E0
 
 	thumb_func_start sub_81B0948
-sub_81B0948: ; 81B0948
+sub_81B0948: @ 81B0948
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -806615,7 +806615,7 @@ _081B0A02:
 	thumb_func_end sub_81B0948
 
 	thumb_func_start sub_81B0A10
-sub_81B0A10: ; 81B0A10
+sub_81B0A10: @ 81B0A10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -806681,7 +806681,7 @@ _081B0A7C:
 	thumb_func_end sub_81B0A10
 
 	thumb_func_start sub_81B0A9C
-sub_81B0A9C: ; 81B0A9C
+sub_81B0A9C: @ 81B0A9C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -806737,7 +806737,7 @@ _081B0B02:
 	thumb_func_end sub_81B0A9C
 
 	thumb_func_start sub_81B0B08
-sub_81B0B08: ; 81B0B08
+sub_81B0B08: @ 81B0B08
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806779,7 +806779,7 @@ _081B0B5A:
 	thumb_func_end sub_81B0B08
 
 	thumb_func_start sub_81B0B60
-sub_81B0B60: ; 81B0B60
+sub_81B0B60: @ 81B0B60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806807,7 +806807,7 @@ _081B0B90:
 	thumb_func_end sub_81B0B60
 
 	thumb_func_start sub_81B0B98
-sub_81B0B98: ; 81B0B98
+sub_81B0B98: @ 81B0B98
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806832,7 +806832,7 @@ _081B0BBE:
 	thumb_func_end sub_81B0B98
 
 	thumb_func_start sub_81B0BC4
-sub_81B0BC4: ; 81B0BC4
+sub_81B0BC4: @ 81B0BC4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806860,7 +806860,7 @@ _081B0BF4:
 	thumb_func_end sub_81B0BC4
 
 	thumb_func_start sub_81B0BFC
-sub_81B0BFC: ; 81B0BFC
+sub_81B0BFC: @ 81B0BFC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -806931,7 +806931,7 @@ _081B0C8C:
 	thumb_func_end sub_81B0BFC
 
 	thumb_func_start sub_81B0C94
-sub_81B0C94: ; 81B0C94
+sub_81B0C94: @ 81B0C94
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -806978,7 +806978,7 @@ _081B0CE4:
 	thumb_func_end sub_81B0C94
 
 	thumb_func_start sub_81B0CEC
-sub_81B0CEC: ; 81B0CEC
+sub_81B0CEC: @ 81B0CEC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -807057,7 +807057,7 @@ _081B0D8E:
 	thumb_func_end sub_81B0CEC
 
 	thumb_func_start sub_81B0DA0
-sub_81B0DA0: ; 81B0DA0
+sub_81B0DA0: @ 81B0DA0
 	push {r4,r5,lr}
 	ldr r5, =0x0203cec4
 	ldr r0, [r5]
@@ -807087,7 +807087,7 @@ _081B0DCE:
 	thumb_func_end sub_81B0DA0
 
 	thumb_func_start sub_81B0DD4
-sub_81B0DD4: ; 81B0DD4
+sub_81B0DD4: @ 81B0DD4
 	lsls r0, 16
 	ldr r1, =0x0203cee0
 	lsrs r0, 11
@@ -807099,7 +807099,7 @@ sub_81B0DD4: ; 81B0DD4
 	thumb_func_end sub_81B0DD4
 
 	thumb_func_start party_menu_add_per_mon_objects_internal
-party_menu_add_per_mon_objects_internal: ; 81B0DE8
+party_menu_add_per_mon_objects_internal: @ 81B0DE8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -807220,7 +807220,7 @@ _081B0EDC:
 	thumb_func_end party_menu_add_per_mon_objects_internal
 
 	thumb_func_start party_menu_add_per_mon_objects
-party_menu_add_per_mon_objects: ; 81B0EF4
+party_menu_add_per_mon_objects: @ 81B0EF4
 	push {r4,r5,lr}
 	ldr r5, =0x0203cec4
 	ldr r0, [r5]
@@ -807250,7 +807250,7 @@ _081B0F22:
 	thumb_func_end party_menu_add_per_mon_objects
 
 	thumb_func_start sub_81B0F28
-sub_81B0F28: ; 81B0F28
+sub_81B0F28: @ 81B0F28
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x0203cec8
@@ -807327,7 +807327,7 @@ _081B0FBC:
 	thumb_func_end sub_81B0F28
 
 	thumb_func_start sub_81B0FCC
-sub_81B0FCC: ; 81B0FCC
+sub_81B0FCC: @ 81B0FCC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -807473,7 +807473,7 @@ _081B10E8:
 	thumb_func_end sub_81B0FCC
 
 	thumb_func_start sub_81B10F8
-sub_81B10F8: ; 81B10F8
+sub_81B10F8: @ 81B10F8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -807552,7 +807552,7 @@ _081B117A:
 	thumb_func_end sub_81B10F8
 
 	thumb_func_start sub_81B118C
-sub_81B118C: ; 81B118C
+sub_81B118C: @ 81B118C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -807614,7 +807614,7 @@ _081B11F8:
 	thumb_func_end sub_81B118C
 
 	thumb_func_start sub_81B120C
-sub_81B120C: ; 81B120C
+sub_81B120C: @ 81B120C
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r1, =gUnknown_086157C4
@@ -807646,7 +807646,7 @@ sub_81B120C: ; 81B120C
 	thumb_func_end sub_81B120C
 
 	thumb_func_start sub_81B1250
-sub_81B1250: ; 81B1250
+sub_81B1250: @ 81B1250
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -807673,7 +807673,7 @@ _081B1282:
 	thumb_func_end sub_81B1250
 
 	thumb_func_start sub_81B1288
-sub_81B1288: ; 81B1288
+sub_81B1288: @ 81B1288
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -807699,7 +807699,7 @@ sub_81B1288: ; 81B1288
 	thumb_func_end sub_81B1288
 
 	thumb_func_start sub_81B12C0
-sub_81B12C0: ; 81B12C0
+sub_81B12C0: @ 81B12C0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -807727,7 +807727,7 @@ sub_81B12C0: ; 81B12C0
 	thumb_func_end sub_81B12C0
 
 	thumb_func_start c3_0811FAB4
-c3_0811FAB4: ; 81B12F8
+c3_0811FAB4: @ 81B12F8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -807768,7 +807768,7 @@ _081B134C:
 	thumb_func_end c3_0811FAB4
 
 	thumb_func_start brm_get_pokemon_selection
-brm_get_pokemon_selection: ; 81B1354
+brm_get_pokemon_selection: @ 81B1354
 	ldr r0, =0x0203cec8
 	ldrb r0, [r0, 0x9]
 	bx lr
@@ -807776,7 +807776,7 @@ brm_get_pokemon_selection: ; 81B1354
 	thumb_func_end brm_get_pokemon_selection
 
 	thumb_func_start sub_81B1360
-sub_81B1360: ; 81B1360
+sub_81B1360: @ 81B1360
 	ldr r0, =0x0203cec8
 	ldrb r0, [r0, 0x8]
 	lsls r0, 28
@@ -807786,7 +807786,7 @@ sub_81B1360: ; 81B1360
 	thumb_func_end sub_81B1360
 
 	thumb_func_start sub_81B1370
-sub_81B1370: ; 81B1370
+sub_81B1370: @ 81B1370
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -807847,7 +807847,7 @@ _081B13E0:
 	thumb_func_end sub_81B1370
 
 	thumb_func_start sub_81B13EC
-sub_81B13EC: ; 81B13EC
+sub_81B13EC: @ 81B13EC
 	push {lr}
 	ldr r0, =0x0203cec8
 	ldrb r1, [r0, 0xB]
@@ -807867,7 +807867,7 @@ _081B1406:
 	thumb_func_end sub_81B13EC
 
 	thumb_func_start sub_81B140C
-sub_81B140C: ; 81B140C
+sub_81B140C: @ 81B140C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -808036,7 +808036,7 @@ _081B159E:
 	thumb_func_end sub_81B140C
 
 	thumb_func_start sub_81B15A4
-sub_81B15A4: ; 81B15A4
+sub_81B15A4: @ 81B15A4
 	push {lr}
 	ldrb r1, [r0]
 	movs r0, 0x64
@@ -808060,7 +808060,7 @@ _081B15CC:
 	thumb_func_end sub_81B15A4
 
 	thumb_func_start sub_81B15D0
-sub_81B15D0: ; 81B15D0
+sub_81B15D0: @ 81B15D0
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -808129,7 +808129,7 @@ _081B1652:
 	thumb_func_end sub_81B15D0
 
 	thumb_func_start sub_81B1660
-sub_81B1660: ; 81B1660
+sub_81B1660: @ 81B1660
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -808181,7 +808181,7 @@ _081B16CE:
 	thumb_func_end sub_81B1660
 
 	thumb_func_start sub_81B16D4
-sub_81B16D4: ; 81B16D4
+sub_81B16D4: @ 81B16D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -808206,7 +808206,7 @@ _081B16F8:
 	thumb_func_end sub_81B16D4
 
 	thumb_func_start sub_81B1708
-sub_81B1708: ; 81B1708
+sub_81B1708: @ 81B1708
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -808250,7 +808250,7 @@ _081B1758:
 	thumb_func_end sub_81B1708
 
 	thumb_func_start sub_81B1760
-sub_81B1760: ; 81B1760
+sub_81B1760: @ 81B1760
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030022c0
@@ -808339,7 +808339,7 @@ _081B17F0:
 	thumb_func_end sub_81B1760
 
 	thumb_func_start sub_81B17F8
-sub_81B17F8: ; 81B17F8
+sub_81B17F8: @ 81B17F8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -808384,7 +808384,7 @@ _081B184C:
 	thumb_func_end sub_81B17F8
 
 	thumb_func_start sub_81B1854
-sub_81B1854: ; 81B1854
+sub_81B1854: @ 81B1854
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -808523,7 +808523,7 @@ _081B1952:
 	thumb_func_end sub_81B1854
 
 	thumb_func_start sub_81B195C
-sub_81B195C: ; 81B195C
+sub_81B195C: @ 81B195C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -808735,7 +808735,7 @@ _081B1AF4:
 	thumb_func_end sub_81B195C
 
 	thumb_func_start sub_81B1B00
-sub_81B1B00: ; 81B1B00
+sub_81B1B00: @ 81B1B00
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -808773,8 +808773,8 @@ _081B1B3C:
 	thumb_func_end sub_81B1B00
 
 	thumb_func_start GetMonNickname
-; u8 *GetMonNickname(struct pokemon *mon, u8 *dest)
-GetMonNickname: ; 81B1B44
+@ u8 *GetMonNickname(struct pokemon *mon, u8 *dest)
+GetMonNickname: @ 81B1B44
 	push {r4,lr}
 	adds r4, r1, 0
 	movs r1, 0x2
@@ -808788,7 +808788,7 @@ GetMonNickname: ; 81B1B44
 	thumb_func_end GetMonNickname
 
 	thumb_func_start sub_81B1B5C
-sub_81B1B5C: ; 81B1B5C
+sub_81B1B5C: @ 81B1B5C
 	push {r4,lr}
 	lsls r4, r1, 24
 	lsrs r4, 24
@@ -808811,7 +808811,7 @@ sub_81B1B5C: ; 81B1B5C
 	thumb_func_end sub_81B1B5C
 
 	thumb_func_start sub_81B1B8C
-sub_81B1B8C: ; 81B1B8C
+sub_81B1B8C: @ 81B1B8C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -808847,7 +808847,7 @@ _081B1BC8:
 	thumb_func_end sub_81B1B8C
 
 	thumb_func_start sub_81B1BD4
-sub_81B1BD4: ; 81B1BD4
+sub_81B1BD4: @ 81B1BD4
 	push {lr}
 	ldr r0, =sub_81B1B8C
 	bl is_function_an_active_task
@@ -808859,7 +808859,7 @@ sub_81B1BD4: ; 81B1BD4
 	thumb_func_end sub_81B1BD4
 
 	thumb_func_start sub_81B1BE8
-sub_81B1BE8: ; 81B1BE8
+sub_81B1BE8: @ 81B1BE8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -808885,7 +808885,7 @@ _081B1C0E:
 	thumb_func_end sub_81B1BE8
 
 	thumb_func_start sub_81B1C1C
-sub_81B1C1C: ; 81B1C1C
+sub_81B1C1C: @ 81B1C1C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -808932,7 +808932,7 @@ _081B1C74:
 	thumb_func_end sub_81B1C1C
 
 	thumb_func_start sub_81B1C84
-sub_81B1C84: ; 81B1C84
+sub_81B1C84: @ 81B1C84
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -808961,7 +808961,7 @@ sub_81B1C84: ; 81B1C84
 	thumb_func_end sub_81B1C84
 
 	thumb_func_start sub_81B1CD0
-sub_81B1CD0: ; 81B1CD0
+sub_81B1CD0: @ 81B1CD0
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -808990,7 +808990,7 @@ sub_81B1CD0: ; 81B1CD0
 	thumb_func_end sub_81B1CD0
 
 	thumb_func_start sub_81B1D1C
-sub_81B1D1C: ; 81B1D1C
+sub_81B1D1C: @ 81B1D1C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -809019,7 +809019,7 @@ sub_81B1D1C: ; 81B1D1C
 	thumb_func_end sub_81B1D1C
 
 	thumb_func_start sub_81B1D68
-sub_81B1D68: ; 81B1D68
+sub_81B1D68: @ 81B1D68
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -809050,7 +809050,7 @@ sub_81B1D68: ; 81B1D68
 	thumb_func_end sub_81B1D68
 
 	thumb_func_start sub_81B1DB8
-sub_81B1DB8: ; 81B1DB8
+sub_81B1DB8: @ 81B1DB8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -809088,7 +809088,7 @@ _081B1DF6:
 	thumb_func_end sub_81B1DB8
 
 	thumb_func_start sub_81B1E00
-sub_81B1E00: ; 81B1E00
+sub_81B1E00: @ 81B1E00
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -809127,7 +809127,7 @@ _081B1E3E:
 	thumb_func_end sub_81B1E00
 
 	thumb_func_start pokemon_item_not_removed
-pokemon_item_not_removed: ; 81B1E48
+pokemon_item_not_removed: @ 81B1E48
 	push {lr}
 	ldr r0, =0x02021fc4
 	ldr r1, =gUnknown_085E9A69
@@ -809138,7 +809138,7 @@ pokemon_item_not_removed: ; 81B1E48
 	thumb_func_end pokemon_item_not_removed
 
 	thumb_func_start sub_81B1E60
-sub_81B1E60: ; 81B1E60
+sub_81B1E60: @ 81B1E60
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -809225,7 +809225,7 @@ _081B1EFE:
 	thumb_func_end sub_81B1E60
 
 	thumb_func_start sub_81B1F18
-sub_81B1F18: ; 81B1F18
+sub_81B1F18: @ 81B1F18
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -809292,7 +809292,7 @@ sub_81B1F18: ; 81B1F18
 	thumb_func_end sub_81B1F18
 
 	thumb_func_start sub_81B1FA8
-sub_81B1FA8: ; 81B1FA8
+sub_81B1FA8: @ 81B1FA8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -809347,7 +809347,7 @@ _081B200A:
 	thumb_func_end sub_81B1FA8
 
 	thumb_func_start pokemon_ailments_get_primary
-pokemon_ailments_get_primary: ; 81B2014
+pokemon_ailments_get_primary: @ 81B2014
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x88
@@ -809392,8 +809392,8 @@ _081B2056:
 	thumb_func_end pokemon_ailments_get_primary
 
 	thumb_func_start sub_81B205C
-; u8 sub_81B205C(struct pokemon *mon, int a2, void *a3)
-sub_81B205C: ; 81B205C
+@ u8 sub_81B205C(struct pokemon *mon, int a2, void *a3)
+sub_81B205C: @ 81B205C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x39
@@ -809428,7 +809428,7 @@ _081B2096:
 	thumb_func_end sub_81B205C
 
 	thumb_func_start sub_81B209C
-sub_81B209C: ; 81B209C
+sub_81B209C: @ 81B209C
 	push {r4,r5,lr}
 	ldr r2, =0x0203cec8
 	ldrb r1, [r2, 0x8]
@@ -809501,7 +809501,7 @@ _081B2126:
 	thumb_func_end sub_81B209C
 
 	thumb_func_start sub_81B2134
-sub_81B2134: ; 81B2134
+sub_81B2134: @ 81B2134
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2D
@@ -809527,7 +809527,7 @@ _081B215C:
 	thumb_func_end sub_81B2134
 
 	thumb_func_start sub_81B2164
-sub_81B2164: ; 81B2164
+sub_81B2164: @ 81B2164
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2D
@@ -809550,7 +809550,7 @@ _081B2184:
 	thumb_func_end sub_81B2164
 
 	thumb_func_start sub_81B218C
-sub_81B218C: ; 81B218C
+sub_81B218C: @ 81B218C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -809570,7 +809570,7 @@ _081B21A4:
 	thumb_func_end sub_81B218C
 
 	thumb_func_start sub_81B21AC
-sub_81B21AC: ; 81B21AC
+sub_81B21AC: @ 81B21AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -809613,7 +809613,7 @@ _081B21FE:
 	thumb_func_end sub_81B21AC
 
 	thumb_func_start sub_81B2210
-sub_81B2210: ; 81B2210
+sub_81B2210: @ 81B2210
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -809637,7 +809637,7 @@ sub_81B2210: ; 81B2210
 	thumb_func_end sub_81B2210
 
 	thumb_func_start sub_81B2248
-sub_81B2248: ; 81B2248
+sub_81B2248: @ 81B2248
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -809662,7 +809662,7 @@ _081B226C:
 	thumb_func_end sub_81B2248
 
 	thumb_func_start sub_81B227C
-sub_81B227C: ; 81B227C
+sub_81B227C: @ 81B227C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -809709,7 +809709,7 @@ _081B22C8:
 	thumb_func_end sub_81B227C
 
 	thumb_func_start sub_81B22D8
-sub_81B22D8: ; 81B22D8
+sub_81B22D8: @ 81B22D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -809781,7 +809781,7 @@ _081B2356:
 	thumb_func_end sub_81B22D8
 
 	thumb_func_start sub_81B2360
-sub_81B2360: ; 81B2360
+sub_81B2360: @ 81B2360
 	lsls r0, 24
 	ldr r1, =gUnknown_0861500C
 	lsrs r0, 23
@@ -809792,7 +809792,7 @@ sub_81B2360: ; 81B2360
 	thumb_func_end sub_81B2360
 
 	thumb_func_start sub_81B2370
-sub_81B2370: ; 81B2370
+sub_81B2370: @ 81B2370
 	push {lr}
 	lsls r0, 16
 	lsls r1, 24
@@ -809817,7 +809817,7 @@ _081B2396:
 	thumb_func_end sub_81B2370
 
 	thumb_func_start sub_81B239C
-sub_81B239C: ; 81B239C
+sub_81B239C: @ 81B239C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -809882,7 +809882,7 @@ _081B23E8:
 	thumb_func_end sub_81B239C
 
 	thumb_func_start sub_81B2428
-sub_81B2428: ; 81B2428
+sub_81B2428: @ 81B2428
 	push {r4-r6,lr}
 	sub sp, 0x14
 	lsls r0, 24
@@ -810013,7 +810013,7 @@ _081B2554:
 	thumb_func_end sub_81B2428
 
 	thumb_func_start sub_81B2564
-sub_81B2564: ; 81B2564
+sub_81B2564: @ 81B2564
 	lsls r0, 24
 	ldr r1, =0x0203cec4
 	lsrs r0, 23
@@ -810026,7 +810026,7 @@ sub_81B2564: ; 81B2564
 	thumb_func_end sub_81B2564
 
 	thumb_func_start sub_81B2578
-sub_81B2578: ; 81B2578
+sub_81B2578: @ 81B2578
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -810141,7 +810141,7 @@ _081B2646:
 	thumb_func_end sub_81B2578
 
 	thumb_func_start sub_81B2658
-sub_81B2658: ; 81B2658
+sub_81B2658: @ 81B2658
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r4, [sp, 0x1C]
@@ -810193,7 +810193,7 @@ _081B26B0:
 	thumb_func_end sub_81B2658
 
 	thumb_func_start sub_81B26BC
-sub_81B26BC: ; 81B26BC
+sub_81B26BC: @ 81B26BC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r4, [sp, 0x1C]
@@ -810245,7 +810245,7 @@ _081B2714:
 	thumb_func_end sub_81B26BC
 
 	thumb_func_start sub_81B2720
-sub_81B2720: ; 81B2720
+sub_81B2720: @ 81B2720
 	push {lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -810267,7 +810267,7 @@ sub_81B2720: ; 81B2720
 	thumb_func_end sub_81B2720
 
 	thumb_func_start sub_81B2748
-sub_81B2748: ; 81B2748
+sub_81B2748: @ 81B2748
 	push {r4-r7,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -810559,7 +810559,7 @@ _081B2A24:
 	thumb_func_end sub_81B2748
 
 	thumb_func_start sub_81B2A3C
-sub_81B2A3C: ; 81B2A3C
+sub_81B2A3C: @ 81B2A3C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -810587,7 +810587,7 @@ sub_81B2A3C: ; 81B2A3C
 	thumb_func_end sub_81B2A3C
 
 	thumb_func_start sub_81B2A70
-sub_81B2A70: ; 81B2A70
+sub_81B2A70: @ 81B2A70
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r7, r0, 0
@@ -810633,7 +810633,7 @@ _081B2AC0:
 	thumb_func_end sub_81B2A70
 
 	thumb_func_start sub_81B2AC8
-sub_81B2AC8: ; 81B2AC8
+sub_81B2AC8: @ 81B2AC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -810695,7 +810695,7 @@ _081B2B34:
 	thumb_func_end sub_81B2AC8
 
 	thumb_func_start sub_81B2B40
-sub_81B2B40: ; 81B2B40
+sub_81B2B40: @ 81B2B40
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	adds r6, r1, 0
@@ -810727,7 +810727,7 @@ sub_81B2B40: ; 81B2B40
 	thumb_func_end sub_81B2B40
 
 	thumb_func_start sub_81B2B8C
-sub_81B2B8C: ; 81B2B8C
+sub_81B2B8C: @ 81B2B8C
 	push {r4-r7,lr}
 	sub sp, 0x14
 	adds r6, r0, 0
@@ -810778,7 +810778,7 @@ _081B2BBE:
 	thumb_func_end sub_81B2B8C
 
 	thumb_func_start sub_81B2BF4
-sub_81B2BF4: ; 81B2BF4
+sub_81B2BF4: @ 81B2BF4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -810875,7 +810875,7 @@ _081B2CBA:
 	thumb_func_end sub_81B2BF4
 
 	thumb_func_start sub_81B2CD4
-sub_81B2CD4: ; 81B2CD4
+sub_81B2CD4: @ 81B2CD4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -810928,7 +810928,7 @@ _081B2D2E:
 	thumb_func_end sub_81B2CD4
 
 	thumb_func_start sub_81B2D3C
-sub_81B2D3C: ; 81B2D3C
+sub_81B2D3C: @ 81B2D3C
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
@@ -810957,7 +810957,7 @@ sub_81B2D3C: ; 81B2D3C
 	thumb_func_end sub_81B2D3C
 
 	thumb_func_start sub_81B2D74
-sub_81B2D74: ; 81B2D74
+sub_81B2D74: @ 81B2D74
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -811011,7 +811011,7 @@ _081B2DD0:
 	thumb_func_end sub_81B2D74
 
 	thumb_func_start sub_81B2DDC
-sub_81B2DDC: ; 81B2DDC
+sub_81B2DDC: @ 81B2DDC
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	adds r6, r1, 0
@@ -811043,7 +811043,7 @@ sub_81B2DDC: ; 81B2DDC
 	thumb_func_end sub_81B2DDC
 
 	thumb_func_start sub_81B2E28
-sub_81B2E28: ; 81B2E28
+sub_81B2E28: @ 81B2E28
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -811073,7 +811073,7 @@ _081B2E5C:
 	thumb_func_end sub_81B2E28
 
 	thumb_func_start sub_81B2E64
-sub_81B2E64: ; 81B2E64
+sub_81B2E64: @ 81B2E64
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -811219,7 +811219,7 @@ _081B2F88:
 	thumb_func_end sub_81B2E64
 
 	thumb_func_start sub_81B2FA8
-sub_81B2FA8: ; 81B2FA8
+sub_81B2FA8: @ 81B2FA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -811286,7 +811286,7 @@ _081B3018:
 	thumb_func_end sub_81B2FA8
 
 	thumb_func_start sub_81B302C
-sub_81B302C: ; 81B302C
+sub_81B302C: @ 81B302C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -811307,7 +811307,7 @@ _081B304C:
 	thumb_func_end sub_81B302C
 
 	thumb_func_start display_pokemon_menu_message
-display_pokemon_menu_message: ; 81B3054
+display_pokemon_menu_message: @ 81B3054
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -811420,7 +811420,7 @@ _081B313C:
 	thumb_func_end display_pokemon_menu_message
 
 	thumb_func_start sub_81B314C
-sub_81B314C: ; 81B314C
+sub_81B314C: @ 81B314C
 	push {r4-r7,lr}
 	ldr r7, =0x020244ec
 	movs r6, 0
@@ -811473,7 +811473,7 @@ _081B31AA:
 	thumb_func_end sub_81B314C
 
 	thumb_func_start sub_81B31B0
-sub_81B31B0: ; 81B31B0
+sub_81B31B0: @ 81B31B0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -811634,7 +811634,7 @@ _081B32E2:
 	thumb_func_end sub_81B31B0
 
 	thumb_func_start sub_81B3300
-sub_81B3300: ; 81B3300
+sub_81B3300: @ 81B3300
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -811672,7 +811672,7 @@ sub_81B3300: ; 81B3300
 	thumb_func_end sub_81B3300
 
 	thumb_func_start sub_81B334C
-sub_81B334C: ; 81B334C
+sub_81B334C: @ 81B334C
 	push {lr}
 	ldr r0, =gUnknown_08615968
 	movs r1, 0x4F
@@ -811685,7 +811685,7 @@ sub_81B334C: ; 81B334C
 	thumb_func_end sub_81B334C
 
 	thumb_func_start sub_81B3364
-sub_81B3364: ; 81B3364
+sub_81B3364: @ 81B3364
 	push {r4,lr}
 	ldr r0, =gUnknown_08615970
 	bl AddWindow
@@ -811707,7 +811707,7 @@ sub_81B3364: ; 81B3364
 	thumb_func_end sub_81B3364
 
 	thumb_func_start sub_81B3394
-sub_81B3394: ; 81B3394
+sub_81B3394: @ 81B3394
 	push {r4,lr}
 	ldr r4, =0x0203cec4
 	ldr r0, [r4]
@@ -811723,7 +811723,7 @@ sub_81B3394: ; 81B3394
 	thumb_func_end sub_81B3394
 
 	thumb_func_start sub_81B33B4
-sub_81B33B4: ; 81B33B4
+sub_81B33B4: @ 81B33B4
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -811771,7 +811771,7 @@ _081B3400:
 	thumb_func_end sub_81B33B4
 
 	thumb_func_start sub_81B3414
-sub_81B3414: ; 81B3414
+sub_81B3414: @ 81B3414
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -811913,7 +811913,7 @@ _081B3518:
 	thumb_func_end sub_81B3414
 
 	thumb_func_start sub_81B353C
-sub_81B353C: ; 81B353C
+sub_81B353C: @ 81B353C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, =0x0203cec8
@@ -812013,7 +812013,7 @@ _081B3600:
 	thumb_func_end sub_81B353C
 
 	thumb_func_start sub_81B3608
-sub_81B3608: ; 81B3608
+sub_81B3608: @ 81B3608
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -812111,7 +812111,7 @@ _081B36EC:
 	thumb_func_end sub_81B3608
 
 	thumb_func_start sub_81B36FC
-sub_81B36FC: ; 81B36FC
+sub_81B36FC: @ 81B36FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -812137,7 +812137,7 @@ _081B3720:
 	thumb_func_end sub_81B36FC
 
 	thumb_func_start sub_81B3730
-sub_81B3730: ; 81B3730
+sub_81B3730: @ 81B3730
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -812226,7 +812226,7 @@ _081B37EE:
 	thumb_func_end sub_81B3730
 
 	thumb_func_start sub_81B37FC
-sub_81B37FC: ; 81B37FC
+sub_81B37FC: @ 81B37FC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -812246,7 +812246,7 @@ sub_81B37FC: ; 81B37FC
 	thumb_func_end sub_81B37FC
 
 	thumb_func_start sub_81B3828
-sub_81B3828: ; 81B3828
+sub_81B3828: @ 81B3828
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203cec8
@@ -812290,7 +812290,7 @@ _081B3880:
 	thumb_func_end sub_81B3828
 
 	thumb_func_start sub_81B3894
-sub_81B3894: ; 81B3894
+sub_81B3894: @ 81B3894
 	push {lr}
 	sub sp, 0xC
 	ldr r2, =0x02037fd4
@@ -812322,7 +812322,7 @@ sub_81B3894: ; 81B3894
 	thumb_func_end sub_81B3894
 
 	thumb_func_start brm_switch
-brm_switch: ; 81B38DC
+brm_switch: @ 81B38DC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r6, 24
@@ -812360,7 +812360,7 @@ brm_switch: ; 81B38DC
 	thumb_func_end brm_switch
 
 	thumb_func_start sub_81B3938
-sub_81B3938: ; 81B3938
+sub_81B3938: @ 81B3938
 	push {r4-r7,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -812541,7 +812541,7 @@ _081B3ABA:
 	thumb_func_end sub_81B3938
 
 	thumb_func_start sub_81B3AD8
-sub_81B3AD8: ; 81B3AD8
+sub_81B3AD8: @ 81B3AD8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -812602,7 +812602,7 @@ _081B3B34:
 	thumb_func_end sub_81B3AD8
 
 	thumb_func_start sub_81B3B40
-sub_81B3B40: ; 81B3B40
+sub_81B3B40: @ 81B3B40
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -812704,7 +812704,7 @@ _081B3BFA:
 	thumb_func_end sub_81B3B40
 
 	thumb_func_start sub_81B3C0C
-sub_81B3C0C: ; 81B3C0C
+sub_81B3C0C: @ 81B3C0C
 	push {r4,lr}
 	ldr r4, =0x02020630
 	ldrb r2, [r0, 0xB]
@@ -812748,7 +812748,7 @@ sub_81B3C0C: ; 81B3C0C
 	thumb_func_end sub_81B3C0C
 
 	thumb_func_start sub_81B3C60
-sub_81B3C60: ; 81B3C60
+sub_81B3C60: @ 81B3C60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -812794,7 +812794,7 @@ _081B3CAC:
 	thumb_func_end sub_81B3C60
 
 	thumb_func_start sub_81B3CC0
-sub_81B3CC0: ; 81B3CC0
+sub_81B3CC0: @ 81B3CC0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -812860,7 +812860,7 @@ _081B3D2E:
 	thumb_func_end sub_81B3CC0
 
 	thumb_func_start sub_81B3D48
-sub_81B3D48: ; 81B3D48
+sub_81B3D48: @ 81B3D48
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -812982,7 +812982,7 @@ _081B3E3A:
 	thumb_func_end sub_81B3D48
 
 	thumb_func_start sub_81B3E60
-sub_81B3E60: ; 81B3E60
+sub_81B3E60: @ 81B3E60
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -813058,7 +813058,7 @@ _081B3F08:
 	thumb_func_end sub_81B3E60
 
 	thumb_func_start oamt_swap_pos
-oamt_swap_pos: ; 81B3F10
+oamt_swap_pos: @ 81B3F10
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -813162,7 +813162,7 @@ oamt_swap_pos: ; 81B3F10
 	thumb_func_end oamt_swap_pos
 
 	thumb_func_start swap_pokemon_and_oams
-swap_pokemon_and_oams: ; 81B3FDC
+swap_pokemon_and_oams: @ 81B3FDC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r1, =0x0203cedc
@@ -813231,7 +813231,7 @@ swap_pokemon_and_oams: ; 81B3FDC
 	thumb_func_end swap_pokemon_and_oams
 
 	thumb_func_start sub_81B407C
-sub_81B407C: ; 81B407C
+sub_81B407C: @ 81B407C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -813267,7 +813267,7 @@ sub_81B407C: ; 81B407C
 	thumb_func_end sub_81B407C
 
 	thumb_func_start brm_cancel_1
-brm_cancel_1: ; 81B40D4
+brm_cancel_1: @ 81B40D4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -813308,7 +813308,7 @@ _081B4116:
 	thumb_func_end brm_cancel_1
 
 	thumb_func_start sub_81B4134
-sub_81B4134: ; 81B4134
+sub_81B4134: @ 81B4134
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -813347,7 +813347,7 @@ sub_81B4134: ; 81B4134
 	thumb_func_end sub_81B4134
 
 	thumb_func_start sub_81B4198
-sub_81B4198: ; 81B4198
+sub_81B4198: @ 81B4198
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -813367,7 +813367,7 @@ sub_81B4198: ; 81B4198
 	thumb_func_end sub_81B4198
 
 	thumb_func_start sub_81B41C4
-sub_81B41C4: ; 81B41C4
+sub_81B41C4: @ 81B41C4
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -813390,7 +813390,7 @@ _081B41E8:
 	thumb_func_end sub_81B41C4
 
 	thumb_func_start c2_8123744
-c2_8123744: ; 81B41F0
+c2_8123744: @ 81B41F0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -813489,7 +813489,7 @@ _081B42C0:
 	thumb_func_end c2_8123744
 
 	thumb_func_start sub_81B42D0
-sub_81B42D0: ; 81B42D0
+sub_81B42D0: @ 81B42D0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -813543,7 +813543,7 @@ _081B432C:
 	thumb_func_end sub_81B42D0
 
 	thumb_func_start sub_81B4350
-sub_81B4350: ; 81B4350
+sub_81B4350: @ 81B4350
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -813579,7 +813579,7 @@ _081B4388:
 	thumb_func_end sub_81B4350
 
 	thumb_func_start sub_81B43A8
-sub_81B43A8: ; 81B43A8
+sub_81B43A8: @ 81B43A8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -813604,7 +813604,7 @@ _081B43CC:
 	thumb_func_end sub_81B43A8
 
 	thumb_func_start sub_81B43DC
-sub_81B43DC: ; 81B43DC
+sub_81B43DC: @ 81B43DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -813719,7 +813719,7 @@ _081B44EC:
 	thumb_func_end sub_81B43DC
 
 	thumb_func_start sub_81B44FC
-sub_81B44FC: ; 81B44FC
+sub_81B44FC: @ 81B44FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -813742,7 +813742,7 @@ _081B451C:
 	thumb_func_end sub_81B44FC
 
 	thumb_func_start sub_81B452C
-sub_81B452C: ; 81B452C
+sub_81B452C: @ 81B452C
 	push {lr}
 	ldr r0, =0x0203cec8
 	movs r1, 0x9
@@ -813773,7 +813773,7 @@ sub_81B452C: ; 81B452C
 	thumb_func_end sub_81B452C
 
 	thumb_func_start sub_81B4578
-sub_81B4578: ; 81B4578
+sub_81B4578: @ 81B4578
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -813847,7 +813847,7 @@ _081B4614:
 	thumb_func_end sub_81B4578
 
 	thumb_func_start sub_81B4624
-sub_81B4624: ; 81B4624
+sub_81B4624: @ 81B4624
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -813897,7 +813897,7 @@ _081B468A:
 	thumb_func_end sub_81B4624
 
 	thumb_func_start sub_81B469C
-sub_81B469C: ; 81B469C
+sub_81B469C: @ 81B469C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -813960,7 +813960,7 @@ _081B471C:
 	thumb_func_end sub_81B469C
 
 	thumb_func_start sub_81B4724
-sub_81B4724: ; 81B4724
+sub_81B4724: @ 81B4724
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -814034,7 +814034,7 @@ _081B47BA:
 	thumb_func_end sub_81B4724
 
 	thumb_func_start sub_81B47E0
-sub_81B47E0: ; 81B47E0
+sub_81B47E0: @ 81B47E0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -814105,7 +814105,7 @@ _081B488A:
 	thumb_func_end sub_81B47E0
 
 	thumb_func_start sub_81B48A8
-sub_81B48A8: ; 81B48A8
+sub_81B48A8: @ 81B48A8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -814130,7 +814130,7 @@ _081B48CC:
 	thumb_func_end sub_81B48A8
 
 	thumb_func_start sub_81B48DC
-sub_81B48DC: ; 81B48DC
+sub_81B48DC: @ 81B48DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -814201,7 +814201,7 @@ _081B4978:
 	thumb_func_end sub_81B48DC
 
 	thumb_func_start sub_81B4988
-sub_81B4988: ; 81B4988
+sub_81B4988: @ 81B4988
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -814257,7 +814257,7 @@ _081B49EC:
 	thumb_func_end sub_81B4988
 
 	thumb_func_start sub_81B4A08
-sub_81B4A08: ; 81B4A08
+sub_81B4A08: @ 81B4A08
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -814296,7 +814296,7 @@ sub_81B4A08: ; 81B4A08
 	thumb_func_end sub_81B4A08
 
 	thumb_func_start sub_81B4A6C
-sub_81B4A6C: ; 81B4A6C
+sub_81B4A6C: @ 81B4A6C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -814316,7 +814316,7 @@ sub_81B4A6C: ; 81B4A6C
 	thumb_func_end sub_81B4A6C
 
 	thumb_func_start sub_81B4A98
-sub_81B4A98: ; 81B4A98
+sub_81B4A98: @ 81B4A98
 	push {lr}
 	ldr r0, =0x0203cec8
 	movs r1, 0x9
@@ -814344,7 +814344,7 @@ sub_81B4A98: ; 81B4A98
 	thumb_func_end sub_81B4A98
 
 	thumb_func_start sub_81B4AE0
-sub_81B4AE0: ; 81B4AE0
+sub_81B4AE0: @ 81B4AE0
 	push {lr}
 	sub sp, 0xC
 	ldr r2, =0x02037fd4
@@ -814373,7 +814373,7 @@ sub_81B4AE0: ; 81B4AE0
 	thumb_func_end sub_81B4AE0
 
 	thumb_func_start brm_take_2
-brm_take_2: ; 81B4B20
+brm_take_2: @ 81B4B20
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -814404,7 +814404,7 @@ brm_take_2: ; 81B4B20
 	thumb_func_end brm_take_2
 
 	thumb_func_start sub_81B4B6C
-sub_81B4B6C: ; 81B4B6C
+sub_81B4B6C: @ 81B4B6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -814429,7 +814429,7 @@ _081B4B90:
 	thumb_func_end sub_81B4B6C
 
 	thumb_func_start sub_81B4BA0
-sub_81B4BA0: ; 81B4BA0
+sub_81B4BA0: @ 81B4BA0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -814508,7 +814508,7 @@ _081B4C4C:
 	thumb_func_end sub_81B4BA0
 
 	thumb_func_start sub_81B4C60
-sub_81B4C60: ; 81B4C60
+sub_81B4C60: @ 81B4C60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -814533,7 +814533,7 @@ _081B4C84:
 	thumb_func_end sub_81B4C60
 
 	thumb_func_start sub_81B4C94
-sub_81B4C94: ; 81B4C94
+sub_81B4C94: @ 81B4C94
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -814630,7 +814630,7 @@ _081B4D64:
 	thumb_func_end sub_81B4C94
 
 	thumb_func_start sub_81B4D78
-sub_81B4D78: ; 81B4D78
+sub_81B4D78: @ 81B4D78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -814705,7 +814705,7 @@ _081B4E02:
 	thumb_func_end sub_81B4D78
 
 	thumb_func_start brm_shift_sendout
-brm_shift_sendout: ; 81B4E2C
+brm_shift_sendout: @ 81B4E2C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -814746,7 +814746,7 @@ _081B4E7A:
 	thumb_func_end brm_shift_sendout
 
 	thumb_func_start sub_81B4E8C
-sub_81B4E8C: ; 81B4E8C
+sub_81B4E8C: @ 81B4E8C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -814849,7 +814849,7 @@ _081B4F68:
 	thumb_func_end sub_81B4E8C
 
 	thumb_func_start sub_81B4F88
-sub_81B4F88: ; 81B4F88
+sub_81B4F88: @ 81B4F88
 	push {r4,lr}
 	ldr r4, =0x0203cec8
 	ldrb r0, [r4, 0x9]
@@ -814866,7 +814866,7 @@ sub_81B4F88: ; 81B4F88
 	thumb_func_end sub_81B4F88
 
 	thumb_func_start sub_81B4FA8
-sub_81B4FA8: ; 81B4FA8
+sub_81B4FA8: @ 81B4FA8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -814986,7 +814986,7 @@ _081B5078:
 	thumb_func_end sub_81B4FA8
 
 	thumb_func_start sub_81B50AC
-sub_81B50AC: ; 81B50AC
+sub_81B50AC: @ 81B50AC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -815001,7 +815001,7 @@ sub_81B50AC: ; 81B50AC
 	thumb_func_end sub_81B50AC
 
 	thumb_func_start sub_81B50C8
-sub_81B50C8: ; 81B50C8
+sub_81B50C8: @ 81B50C8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -815110,7 +815110,7 @@ _081B51B0:
 	thumb_func_end sub_81B50C8
 
 	thumb_func_start brm_trade_1
-brm_trade_1: ; 81B51D4
+brm_trade_1: @ 81B51D4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -815217,7 +815217,7 @@ _081B52D4:
 	thumb_func_end brm_trade_1
 
 	thumb_func_start sub_81B52E4
-sub_81B52E4: ; 81B52E4
+sub_81B52E4: @ 81B52E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -815318,7 +815318,7 @@ _081B53E4:
 	thumb_func_end sub_81B52E4
 
 	thumb_func_start sub_81B53FC
-sub_81B53FC: ; 81B53FC
+sub_81B53FC: @ 81B53FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -815343,7 +815343,7 @@ _081B5420:
 	thumb_func_end sub_81B53FC
 
 	thumb_func_start sub_81B5430
-sub_81B5430: ; 81B5430
+sub_81B5430: @ 81B5430
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -815380,7 +815380,7 @@ _081B546A:
 	thumb_func_end sub_81B5430
 
 	thumb_func_start sub_81B5470
-sub_81B5470: ; 81B5470
+sub_81B5470: @ 81B5470
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -815590,7 +815590,7 @@ _081B5664:
 	thumb_func_end sub_81B5470
 
 	thumb_func_start sub_81B5674
-sub_81B5674: ; 81B5674
+sub_81B5674: @ 81B5674
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -815612,7 +815612,7 @@ sub_81B5674: ; 81B5674
 	thumb_func_end sub_81B5674
 
 	thumb_func_start sub_81B56A4
-sub_81B56A4: ; 81B56A4
+sub_81B56A4: @ 81B56A4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -815637,7 +815637,7 @@ _081B56C8:
 	thumb_func_end sub_81B56A4
 
 	thumb_func_start sub_81B56D8
-sub_81B56D8: ; 81B56D8
+sub_81B56D8: @ 81B56D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -815684,7 +815684,7 @@ _081B572A:
 	thumb_func_end sub_81B56D8
 
 	thumb_func_start hm_add_c3_launch_phase_2
-hm_add_c3_launch_phase_2: ; 81B5738
+hm_add_c3_launch_phase_2: @ 81B5738
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =task_launch_hm_phase_2
@@ -815697,7 +815697,7 @@ hm_add_c3_launch_phase_2: ; 81B5738
 	thumb_func_end hm_add_c3_launch_phase_2
 
 	thumb_func_start task_launch_hm_phase_2
-task_launch_hm_phase_2: ; 81B5750
+task_launch_hm_phase_2: @ 81B5750
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -815724,7 +815724,7 @@ _081B577C:
 	thumb_func_end task_launch_hm_phase_2
 
 	thumb_func_start brm_get_selected_species
-brm_get_selected_species: ; 81B578C
+brm_get_selected_species: @ 81B578C
 	push {lr}
 	ldr r0, =0x0203cec8
 	movs r1, 0x9
@@ -815743,7 +815743,7 @@ brm_get_selected_species: ; 81B578C
 	thumb_func_end brm_get_selected_species
 
 	thumb_func_start task_brm_cancel_1_on_keypad_a_or_b
-task_brm_cancel_1_on_keypad_a_or_b: ; 81B57B4
+task_brm_cancel_1_on_keypad_a_or_b: @ 81B57B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -815767,7 +815767,7 @@ _081B57D4:
 	thumb_func_end task_brm_cancel_1_on_keypad_a_or_b
 
 	thumb_func_start sub_81B57DC
-sub_81B57DC: ; 81B57DC
+sub_81B57DC: @ 81B57DC
 	push {lr}
 	ldr r0, =0x00000888
 	bl FlagGet
@@ -815788,7 +815788,7 @@ _081B57FE:
 	thumb_func_end sub_81B57DC
 
 	thumb_func_start hm_surf_run_dp02scr
-hm_surf_run_dp02scr: ; 81B5804
+hm_surf_run_dp02scr: @ 81B5804
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -815803,7 +815803,7 @@ hm_surf_run_dp02scr: ; 81B5804
 	thumb_func_end hm_surf_run_dp02scr
 
 	thumb_func_start sub_81B5820
-sub_81B5820: ; 81B5820
+sub_81B5820: @ 81B5820
 	push {lr}
 	bl PartyHasMonWithSurf
 	lsls r0, 24
@@ -815832,7 +815832,7 @@ _081B585E:
 	thumb_func_end sub_81B5820
 
 	thumb_func_start sub_81B5864
-sub_81B5864: ; 81B5864
+sub_81B5864: @ 81B5864
 	push {lr}
 	movs r0, 0x8
 	bl TestPlayerAvatarFlags
@@ -815851,7 +815851,7 @@ _081B5880:
 	thumb_func_end sub_81B5864
 
 	thumb_func_start sub_81B5884
-sub_81B5884: ; 81B5884
+sub_81B5884: @ 81B5884
 	push {lr}
 	ldr r0, =0x02037318
 	ldrb r0, [r0, 0x17]
@@ -815871,7 +815871,7 @@ _081B58A2:
 	thumb_func_end sub_81B5884
 
 	thumb_func_start sub_81B58A8
-sub_81B58A8: ; 81B58A8
+sub_81B58A8: @ 81B58A8
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -815892,7 +815892,7 @@ sub_81B58A8: ; 81B58A8
 	thumb_func_end sub_81B58A8
 
 	thumb_func_start hm2_waterfall
-hm2_waterfall: ; 81B58D4
+hm2_waterfall: @ 81B58D4
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -815907,7 +815907,7 @@ hm2_waterfall: ; 81B58D4
 	thumb_func_end hm2_waterfall
 
 	thumb_func_start hm_prepare_waterfall
-hm_prepare_waterfall: ; 81B58F0
+hm_prepare_waterfall: @ 81B58F0
 	push {r4,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -815952,7 +815952,7 @@ _081B594E:
 	thumb_func_end hm_prepare_waterfall
 
 	thumb_func_start sub_81B5958
-sub_81B5958: ; 81B5958
+sub_81B5958: @ 81B5958
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r1, =0x02038c08
@@ -815967,7 +815967,7 @@ sub_81B5958: ; 81B5958
 	thumb_func_end sub_81B5958
 
 	thumb_func_start sub_81B5974
-sub_81B5974: ; 81B5974
+sub_81B5974: @ 81B5974
 	push {lr}
 	bl sub_809D1E8
 	ldr r1, =0x02038c08
@@ -815994,8 +815994,8 @@ _081B599E:
 	thumb_func_end sub_81B5974
 
 	thumb_func_start party_menu_icon_anim
-; void party_menu_icon_anim(struct pokemon *mon, int a2, int a3)
-party_menu_icon_anim: ; 81B59B4
+@ void party_menu_icon_anim(struct pokemon *mon, int a2, int a3)
+party_menu_icon_anim: @ 81B59B4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -816049,8 +816049,8 @@ _081B59EA:
 	thumb_func_end party_menu_icon_anim
 
 	thumb_func_start party_menu_link_mon_icon_anim
-; void party_menu_link_mon_icon_anim(u16 speciesId, u32 personality, int a3, char a4, int a5)
-party_menu_link_mon_icon_anim: ; 81B5A2C
+@ void party_menu_link_mon_icon_anim(u16 speciesId, u32 personality, int a3, char a4, int a5)
+party_menu_link_mon_icon_anim: @ 81B5A2C
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r6, r1, 0
@@ -816098,7 +816098,7 @@ _081B5A7A:
 	thumb_func_end party_menu_link_mon_icon_anim
 
 	thumb_func_start sub_81B5A8C
-sub_81B5A8C: ; 81B5A8C
+sub_81B5A8C: @ 81B5A8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -816178,7 +816178,7 @@ _081B5B2C:
 	thumb_func_end sub_81B5A8C
 
 	thumb_func_start sub_81B5B38
-sub_81B5B38: ; 81B5B38
+sub_81B5B38: @ 81B5B38
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -816205,7 +816205,7 @@ sub_81B5B38: ; 81B5B38
 	thumb_func_end sub_81B5B38
 
 	thumb_func_start sub_81B5B6C
-sub_81B5B6C: ; 81B5B6C
+sub_81B5B6C: @ 81B5B6C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -816260,7 +816260,7 @@ _081B5BD0:
 	thumb_func_end sub_81B5B6C
 
 	thumb_func_start sub_81B5BDC
-sub_81B5BDC: ; 81B5BDC
+sub_81B5BDC: @ 81B5BDC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_80D30DC
@@ -816285,7 +816285,7 @@ _081B5C02:
 	thumb_func_end sub_81B5BDC
 
 	thumb_func_start sub_81B5C08
-sub_81B5C08: ; 81B5C08
+sub_81B5C08: @ 81B5C08
 	push {lr}
 	bl sub_80D30DC
 	pop {r0}
@@ -816293,7 +816293,7 @@ sub_81B5C08: ; 81B5C08
 	thumb_func_end sub_81B5C08
 
 	thumb_func_start party_menu_held_item_object
-party_menu_held_item_object: ; 81B5C14
+party_menu_held_item_object: @ 81B5C14
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -816319,7 +816319,7 @@ _081B5C3C:
 	thumb_func_end party_menu_held_item_object
 
 	thumb_func_start party_menu_link_mon_held_item_object
-party_menu_link_mon_held_item_object: ; 81B5C48
+party_menu_link_mon_held_item_object: @ 81B5C48
 	push {r4,r5,lr}
 	adds r4, r2, 0
 	lsls r0, 16
@@ -816356,7 +816356,7 @@ _081B5C84:
 	thumb_func_end party_menu_link_mon_held_item_object
 
 	thumb_func_start sub_81B5C94
-sub_81B5C94: ; 81B5C94
+sub_81B5C94: @ 81B5C94
 	push {r4,lr}
 	adds r4, r1, 0
 	movs r1, 0xC
@@ -816371,7 +816371,7 @@ sub_81B5C94: ; 81B5C94
 	thumb_func_end sub_81B5C94
 
 	thumb_func_start sub_81B5CB0
-sub_81B5CB0: ; 81B5CB0
+sub_81B5CB0: @ 81B5CB0
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -816435,7 +816435,7 @@ _081B5D24:
 	thumb_func_end sub_81B5CB0
 
 	thumb_func_start sub_81B5D30
-sub_81B5D30: ; 81B5D30
+sub_81B5D30: @ 81B5D30
 	push {lr}
 	ldr r0, =gUnknown_08615EB0
 	bl LoadObjectPic
@@ -816447,7 +816447,7 @@ sub_81B5D30: ; 81B5D30
 	thumb_func_end sub_81B5D30
 
 	thumb_func_start sub_81B5D4C
-sub_81B5D4C: ; 81B5D4C
+sub_81B5D4C: @ 81B5D4C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
@@ -816531,7 +816531,7 @@ _081B5DE4:
 	thumb_func_end sub_81B5D4C
 
 	thumb_func_start sub_81B5DF0
-sub_81B5DF0: ; 81B5DF0
+sub_81B5DF0: @ 81B5DF0
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -816592,7 +816592,7 @@ sub_81B5DF0: ; 81B5DF0
 	thumb_func_end sub_81B5DF0
 
 	thumb_func_start sub_81B5E74
-sub_81B5E74: ; 81B5E74
+sub_81B5E74: @ 81B5E74
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x3C]
@@ -816640,7 +816640,7 @@ _081B5EC6:
 	thumb_func_end sub_81B5E74
 
 	thumb_func_start party_menu_pokeball_object
-party_menu_pokeball_object: ; 81B5ECC
+party_menu_pokeball_object: @ 81B5ECC
 	push {r4,lr}
 	adds r4, r1, 0
 	movs r1, 0xB
@@ -816662,7 +816662,7 @@ _081B5EEA:
 	thumb_func_end party_menu_pokeball_object
 
 	thumb_func_start party_menu_link_mon_pokeball_object
-party_menu_link_mon_pokeball_object: ; 81B5EF4
+party_menu_link_mon_pokeball_object: @ 81B5EF4
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 16
@@ -816694,7 +816694,7 @@ _081B5F24:
 	thumb_func_end party_menu_link_mon_pokeball_object
 
 	thumb_func_start sub_81B5F34
-sub_81B5F34: ; 81B5F34
+sub_81B5F34: @ 81B5F34
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -816726,7 +816726,7 @@ sub_81B5F34: ; 81B5F34
 	thumb_func_end sub_81B5F34
 
 	thumb_func_start sub_81B5F74
-sub_81B5F74: ; 81B5F74
+sub_81B5F74: @ 81B5F74
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -816746,7 +816746,7 @@ sub_81B5F74: ; 81B5F74
 	thumb_func_end sub_81B5F74
 
 	thumb_func_start sub_81B5F98
-sub_81B5F98: ; 81B5F98
+sub_81B5F98: @ 81B5F98
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -816765,7 +816765,7 @@ sub_81B5F98: ; 81B5F98
 	thumb_func_end sub_81B5F98
 
 	thumb_func_start sub_81B5FBC
-sub_81B5FBC: ; 81B5FBC
+sub_81B5FBC: @ 81B5FBC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -816828,7 +816828,7 @@ _081B602C:
 	thumb_func_end sub_81B5FBC
 
 	thumb_func_start sub_81B6040
-sub_81B6040: ; 81B6040
+sub_81B6040: @ 81B6040
 	push {lr}
 	ldr r0, =gUnknown_08615EF8
 	bl LoadCompressedObjectPic
@@ -816842,7 +816842,7 @@ sub_81B6040: ; 81B6040
 	thumb_func_end sub_81B6040
 
 	thumb_func_start party_menu_status_condition_object
-party_menu_status_condition_object: ; 81B6064
+party_menu_status_condition_object: @ 81B6064
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -816868,7 +816868,7 @@ _081B608C:
 	thumb_func_end party_menu_status_condition_object
 
 	thumb_func_start party_menu_link_mon_status_condition_object
-party_menu_link_mon_status_condition_object: ; 81B6098
+party_menu_link_mon_status_condition_object: @ 81B6098
 	push {r4,r5,lr}
 	adds r4, r2, 0
 	lsls r0, 16
@@ -816905,8 +816905,8 @@ _081B60D4:
 	thumb_func_end party_menu_link_mon_status_condition_object
 
 	thumb_func_start party_menu_get_status_condition_and_update_object
-; void party_menu_get_status_condition_and_update_object(struct pokemon *mon, void *a2, void *a3)
-party_menu_get_status_condition_and_update_object: ; 81B60E4
+@ void party_menu_get_status_condition_and_update_object(struct pokemon *mon, void *a2, void *a3)
+party_menu_get_status_condition_and_update_object: @ 81B60E4
 	push {r4,lr}
 	adds r4, r1, 0
 	bl sub_81B205C
@@ -816920,8 +816920,8 @@ party_menu_get_status_condition_and_update_object: ; 81B60E4
 	thumb_func_end party_menu_get_status_condition_and_update_object
 
 	thumb_func_start party_menu_update_status_condition_object
-; void party_menu_update_status_condition_object(u8 a1, void *a2)
-party_menu_update_status_condition_object: ; 81B60FC
+@ void party_menu_update_status_condition_object(u8 a1, void *a2)
+party_menu_update_status_condition_object: @ 81B60FC
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -816973,7 +816973,7 @@ _081B6152:
 	thumb_func_end party_menu_update_status_condition_object
 
 	thumb_func_start sub_81B6160
-sub_81B6160: ; 81B6160
+sub_81B6160: @ 81B6160
 	push {lr}
 	ldr r0, =gUnknown_08615FF8
 	bl LoadCompressedObjectPic
@@ -816985,7 +816985,7 @@ sub_81B6160: ; 81B6160
 	thumb_func_end sub_81B6160
 
 	thumb_func_start sub_81B617C
-sub_81B617C: ; 81B617C
+sub_81B617C: @ 81B617C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -817084,7 +817084,7 @@ _081B6230:
 	thumb_func_end sub_81B617C
 
 	thumb_func_start c2_815ABFC
-c2_815ABFC: ; 81B6254
+c2_815ABFC: @ 81B6254
 	push {lr}
 	bl InBattlePyramid
 	lsls r0, 24
@@ -817107,7 +817107,7 @@ _081B6276:
 	thumb_func_end c2_815ABFC
 
 	thumb_func_start sub_81B6280
-sub_81B6280: ; 81B6280
+sub_81B6280: @ 81B6280
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -817140,8 +817140,8 @@ _081B62B2:
 	thumb_func_end sub_81B6280
 
 	thumb_func_start IsHPRecoveryItem
-; bool8 IsHPRecoveryItem(u16 itemId)
-IsHPRecoveryItem: ; 81B62D0
+@ bool8 IsHPRecoveryItem(u16 itemId)
+IsHPRecoveryItem: @ 81B62D0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -817176,8 +817176,8 @@ _081B630A:
 	thumb_func_end IsHPRecoveryItem
 
 	thumb_func_start GetMedicineItemEffectMessage
-; void GetMedicineItemEffectMessage(u16 itemId)
-GetMedicineItemEffectMessage: ; 81B6310
+@ void GetMedicineItemEffectMessage(u16 itemId)
+GetMedicineItemEffectMessage: @ 81B6310
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -817322,8 +817322,8 @@ _081B64C4:
 	thumb_func_end GetMedicineItemEffectMessage
 
 	thumb_func_start UsingHPEVItemOnShedinja
-; bool8 UsingHPEVItemOnShedinja(struct pokemon *mon, u16 itemId)
-UsingHPEVItemOnShedinja: ; 81B64D0
+@ bool8 UsingHPEVItemOnShedinja(struct pokemon *mon, u16 itemId)
+UsingHPEVItemOnShedinja: @ 81B64D0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r0, r1, 16
@@ -817351,8 +817351,8 @@ _081B64FE:
 	thumb_func_end UsingHPEVItemOnShedinja
 
 	thumb_func_start IsBlueYellowRedFlute
-; bool8 IsBlueYellowRedFlute(u16 itemId)
-IsBlueYellowRedFlute: ; 81B6504
+@ bool8 IsBlueYellowRedFlute(u16 itemId)
+IsBlueYellowRedFlute: @ 81B6504
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -817373,8 +817373,8 @@ _081B651C:
 	thumb_func_end IsBlueYellowRedFlute
 
 	thumb_func_start ExecuteTableBasedItemEffect__
-; bool8 ExecuteTableBasedItemEffect__(u8 partyMonIndex, u16 itemId, u8 monMoveIndex)
-ExecuteTableBasedItemEffect__: ; 81B6520
+@ bool8 ExecuteTableBasedItemEffect__(u8 partyMonIndex, u16 itemId, u8 monMoveIndex)
+ExecuteTableBasedItemEffect__: @ 81B6520
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -817423,7 +817423,7 @@ _081B6572:
 	thumb_func_end ExecuteTableBasedItemEffect__
 
 	thumb_func_start ItemUseCB_Medicine
-ItemUseCB_Medicine: ; 81B6588
+ItemUseCB_Medicine: @ 81B6588
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -817605,7 +817605,7 @@ _081B6710:
 	thumb_func_end ItemUseCB_Medicine
 
 	thumb_func_start sub_81B672C
-sub_81B672C: ; 81B672C
+sub_81B672C: @ 81B672C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -817643,7 +817643,7 @@ sub_81B672C: ; 81B672C
 	thumb_func_end sub_81B672C
 
 	thumb_func_start sub_81B6794
-sub_81B6794: ; 81B6794
+sub_81B6794: @ 81B6794
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -817670,7 +817670,7 @@ _081B67BA:
 	thumb_func_end sub_81B6794
 
 	thumb_func_start sub_81B67C8
-sub_81B67C8: ; 81B67C8
+sub_81B67C8: @ 81B67C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -817805,7 +817805,7 @@ _081B68E2:
 	thumb_func_end sub_81B67C8
 
 	thumb_func_start sub_81B691C
-sub_81B691C: ; 81B691C
+sub_81B691C: @ 81B691C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -817872,7 +817872,7 @@ _081B6994:
 	thumb_func_end sub_81B691C
 
 	thumb_func_start option_menu_get_string
-option_menu_get_string: ; 81B699C
+option_menu_get_string: @ 81B699C
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -817928,7 +817928,7 @@ _081B6A08:
 	thumb_func_end option_menu_get_string
 
 	thumb_func_start sub_81B6A10
-sub_81B6A10: ; 81B6A10
+sub_81B6A10: @ 81B6A10
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -818008,7 +818008,7 @@ _081B6A82:
 	thumb_func_end sub_81B6A10
 
 	thumb_func_start ether_effect_related_3
-ether_effect_related_3: ; 81B6AB4
+ether_effect_related_3: @ 81B6AB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818043,7 +818043,7 @@ _081B6AF0:
 	thumb_func_end ether_effect_related_3
 
 	thumb_func_start dp05_ether
-dp05_ether: ; 81B6AFC
+dp05_ether: @ 81B6AFC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818100,7 +818100,7 @@ _081B6B6E:
 	thumb_func_end dp05_ether
 
 	thumb_func_start ether_effect_related_2
-ether_effect_related_2: ; 81B6B80
+ether_effect_related_2: @ 81B6B80
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -818123,7 +818123,7 @@ ether_effect_related_2: ; 81B6B80
 	thumb_func_end ether_effect_related_2
 
 	thumb_func_start sub_81B6BB4
-sub_81B6BB4: ; 81B6BB4
+sub_81B6BB4: @ 81B6BB4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -818148,7 +818148,7 @@ sub_81B6BB4: ; 81B6BB4
 	thumb_func_end sub_81B6BB4
 
 	thumb_func_start ether_effect_related
-ether_effect_related: ; 81B6BEC
+ether_effect_related: @ 81B6BEC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -818230,7 +818230,7 @@ _081B6C7E:
 	thumb_func_end ether_effect_related
 
 	thumb_func_start dp05_pp_up
-dp05_pp_up: ; 81B6CC0
+dp05_pp_up: @ 81B6CC0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -818256,7 +818256,7 @@ dp05_pp_up: ; 81B6CC0
 	thumb_func_end dp05_pp_up
 
 	thumb_func_start ItemIdToBattleMoveId
-ItemIdToBattleMoveId: ; 81B6CFC
+ItemIdToBattleMoveId: @ 81B6CFC
 	lsls r0, 16
 	ldr r1, =0xfedf0000
 	adds r0, r1
@@ -818269,7 +818269,7 @@ ItemIdToBattleMoveId: ; 81B6CFC
 	thumb_func_end ItemIdToBattleMoveId
 
 	thumb_func_start sub_81B6D14
-sub_81B6D14: ; 81B6D14
+sub_81B6D14: @ 81B6D14
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -818299,7 +818299,7 @@ _081B6D40:
 	thumb_func_end sub_81B6D14
 
 	thumb_func_start pokemon_has_move
-pokemon_has_move: ; 81B6D44
+pokemon_has_move: @ 81B6D44
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -818328,7 +818328,7 @@ _081B6D6C:
 	thumb_func_end pokemon_has_move
 
 	thumb_func_start sub_81B6D74
-sub_81B6D74: ; 81B6D74
+sub_81B6D74: @ 81B6D74
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r4, =0x02021fc4
@@ -818346,7 +818346,7 @@ sub_81B6D74: ; 81B6D74
 	thumb_func_end sub_81B6D74
 
 	thumb_func_start sub_81B6D98
-sub_81B6D98: ; 81B6D98
+sub_81B6D98: @ 81B6D98
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -818367,7 +818367,7 @@ sub_81B6D98: ; 81B6D98
 	thumb_func_end sub_81B6D98
 
 	thumb_func_start sub_81B6DC4
-sub_81B6DC4: ; 81B6DC4
+sub_81B6DC4: @ 81B6DC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -818461,7 +818461,7 @@ _081B6E9C:
 	thumb_func_end sub_81B6DC4
 
 	thumb_func_start sub_81B6EB4
-sub_81B6EB4: ; 81B6EB4
+sub_81B6EB4: @ 81B6EB4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -818525,7 +818525,7 @@ _081B6EF0:
 	thumb_func_end sub_81B6EB4
 
 	thumb_func_start sub_81B6F60
-sub_81B6F60: ; 81B6F60
+sub_81B6F60: @ 81B6F60
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818551,7 +818551,7 @@ _081B6F86:
 	thumb_func_end sub_81B6F60
 
 	thumb_func_start sub_81B6F98
-sub_81B6F98: ; 81B6F98
+sub_81B6F98: @ 81B6F98
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818597,7 +818597,7 @@ _081B6FEA:
 	thumb_func_end sub_81B6F98
 
 	thumb_func_start sub_81B6FF4
-sub_81B6FF4: ; 81B6FF4
+sub_81B6FF4: @ 81B6FF4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818622,7 +818622,7 @@ _081B7018:
 	thumb_func_end sub_81B6FF4
 
 	thumb_func_start sub_81B7028
-sub_81B7028: ; 81B7028
+sub_81B7028: @ 81B7028
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818668,7 +818668,7 @@ _081B7080:
 	thumb_func_end sub_81B7028
 
 	thumb_func_start sub_81B7088
-sub_81B7088: ; 81B7088
+sub_81B7088: @ 81B7088
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818691,7 +818691,7 @@ _081B70A8:
 	thumb_func_end sub_81B7088
 
 	thumb_func_start sub_81B70B8
-sub_81B70B8: ; 81B70B8
+sub_81B70B8: @ 81B70B8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x020244ec
@@ -818714,7 +818714,7 @@ sub_81B70B8: ; 81B70B8
 	thumb_func_end sub_81B70B8
 
 	thumb_func_start sub_81B70F0
-sub_81B70F0: ; 81B70F0
+sub_81B70F0: @ 81B70F0
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x7F
@@ -818736,7 +818736,7 @@ sub_81B70F0: ; 81B70F0
 	thumb_func_end sub_81B70F0
 
 	thumb_func_start sub_81B711C
-sub_81B711C: ; 81B711C
+sub_81B711C: @ 81B711C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818766,7 +818766,7 @@ _081B714E:
 	thumb_func_end sub_81B711C
 
 	thumb_func_start sub_81B7154
-sub_81B7154: ; 81B7154
+sub_81B7154: @ 81B7154
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r6, 24
@@ -818814,7 +818814,7 @@ sub_81B7154: ; 81B7154
 	thumb_func_end sub_81B7154
 
 	thumb_func_start sub_81B71D4
-sub_81B71D4: ; 81B71D4
+sub_81B71D4: @ 81B71D4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -818855,7 +818855,7 @@ _081B7220:
 	thumb_func_end sub_81B71D4
 
 	thumb_func_start sub_81B7230
-sub_81B7230: ; 81B7230
+sub_81B7230: @ 81B7230
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -818892,7 +818892,7 @@ sub_81B7230: ; 81B7230
 	thumb_func_end sub_81B7230
 
 	thumb_func_start sub_81B7294
-sub_81B7294: ; 81B7294
+sub_81B7294: @ 81B7294
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -818917,7 +818917,7 @@ _081B72B8:
 	thumb_func_end sub_81B7294
 
 	thumb_func_start sub_81B72C8
-sub_81B72C8: ; 81B72C8
+sub_81B72C8: @ 81B72C8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -819025,7 +819025,7 @@ _081B73C2:
 	thumb_func_end sub_81B72C8
 
 	thumb_func_start sub_81B73E4
-sub_81B73E4: ; 81B73E4
+sub_81B73E4: @ 81B73E4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -819043,7 +819043,7 @@ _081B73FC:
 	thumb_func_end sub_81B73E4
 
 	thumb_func_start dp05_rare_candy
-dp05_rare_candy: ; 81B7404
+dp05_rare_candy: @ 81B7404
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -819167,7 +819167,7 @@ _081B7516:
 	thumb_func_end dp05_rare_candy
 
 	thumb_func_start sub_81B754C
-sub_81B754C: ; 81B754C
+sub_81B754C: @ 81B754C
 	push {r4-r7,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -819228,7 +819228,7 @@ _081B7588:
 	thumb_func_end sub_81B754C
 
 	thumb_func_start sub_81B75D4
-sub_81B75D4: ; 81B75D4
+sub_81B75D4: @ 81B75D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -819272,7 +819272,7 @@ _081B7620:
 	thumb_func_end sub_81B75D4
 
 	thumb_func_start sub_81B7634
-sub_81B7634: ; 81B7634
+sub_81B7634: @ 81B7634
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -819306,7 +819306,7 @@ _081B7668:
 	thumb_func_end sub_81B7634
 
 	thumb_func_start sub_81B767C
-sub_81B767C: ; 81B767C
+sub_81B767C: @ 81B767C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cec4
@@ -819342,7 +819342,7 @@ sub_81B767C: ; 81B767C
 	thumb_func_end sub_81B767C
 
 	thumb_func_start sub_81B76C8
-sub_81B76C8: ; 81B76C8
+sub_81B76C8: @ 81B76C8
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x0203cec4
@@ -819372,7 +819372,7 @@ sub_81B76C8: ; 81B76C8
 	thumb_func_end sub_81B76C8
 
 	thumb_func_start sub_81B7704
-sub_81B7704: ; 81B7704
+sub_81B7704: @ 81B7704
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -819449,7 +819449,7 @@ _081B77A6:
 	thumb_func_end sub_81B7704
 
 	thumb_func_start sub_81B77AC
-sub_81B77AC: ; 81B77AC
+sub_81B77AC: @ 81B77AC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -819497,7 +819497,7 @@ _081B780A:
 	thumb_func_end sub_81B77AC
 
 	thumb_func_start sub_81B7810
-sub_81B7810: ; 81B7810
+sub_81B7810: @ 81B7810
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -819545,7 +819545,7 @@ _081B786E:
 	thumb_func_end sub_81B7810
 
 	thumb_func_start sub_81B787C
-sub_81B787C: ; 81B787C
+sub_81B787C: @ 81B787C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -819598,7 +819598,7 @@ sub_81B787C: ; 81B787C
 	thumb_func_end sub_81B787C
 
 	thumb_func_start sub_81B7910
-sub_81B7910: ; 81B7910
+sub_81B7910: @ 81B7910
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -819651,7 +819651,7 @@ sub_81B7910: ; 81B7910
 	thumb_func_end sub_81B7910
 
 	thumb_func_start sub_81B79A0
-sub_81B79A0: ; 81B79A0
+sub_81B79A0: @ 81B79A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -819684,7 +819684,7 @@ sub_81B79A0: ; 81B79A0
 	thumb_func_end sub_81B79A0
 
 	thumb_func_start sub_81B79E8
-sub_81B79E8: ; 81B79E8
+sub_81B79E8: @ 81B79E8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -819714,7 +819714,7 @@ sub_81B79E8: ; 81B79E8
 	thumb_func_end sub_81B79E8
 
 	thumb_func_start sub_81B7A28
-sub_81B7A28: ; 81B7A28
+sub_81B7A28: @ 81B7A28
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -819837,7 +819837,7 @@ _081B7B2A:
 	thumb_func_end sub_81B7A28
 
 	thumb_func_start task_intro_gamefreak
-task_intro_gamefreak: ; 81B7B4C
+task_intro_gamefreak: @ 81B7B4C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -819919,7 +819919,7 @@ _081B7C0A:
 	thumb_func_end task_intro_gamefreak
 
 	thumb_func_start sub_81B7C10
-sub_81B7C10: ; 81B7C10
+sub_81B7C10: @ 81B7C10
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -819956,7 +819956,7 @@ sub_81B7C10: ; 81B7C10
 	thumb_func_end sub_81B7C10
 
 	thumb_func_start sub_81B7C74
-sub_81B7C74: ; 81B7C74
+sub_81B7C74: @ 81B7C74
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -820003,8 +820003,8 @@ _081B7CE4:
 	thumb_func_end sub_81B7C74
 
 	thumb_func_start GetItemEffectType
-; u8 GetItemEffectType(u16 itemId)
-GetItemEffectType: ; 81B7CEC
+@ u8 GetItemEffectType(u16 itemId)
+GetItemEffectType: @ 81B7CEC
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -820207,7 +820207,7 @@ _081B7E46:
 	thumb_func_end GetItemEffectType
 
 	thumb_func_start sub_81B7E4C
-sub_81B7E4C: ; 81B7E4C
+sub_81B7E4C: @ 81B7E4C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -820299,7 +820299,7 @@ _081B7F1C:
 	thumb_func_end sub_81B7E4C
 
 	thumb_func_start CB2_PartyMenuFromStartMenu
-CB2_PartyMenuFromStartMenu: ; 81B7F34
+CB2_PartyMenuFromStartMenu: @ 81B7F34
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -820320,7 +820320,7 @@ CB2_PartyMenuFromStartMenu: ; 81B7F34
 	thumb_func_end CB2_PartyMenuFromStartMenu
 
 	thumb_func_start sub_81B7F60
-sub_81B7F60: ; 81B7F60
+sub_81B7F60: @ 81B7F60
 	push {lr}
 	sub sp, 0xC
 	bl InBattlePyramid
@@ -820351,7 +820351,7 @@ _081B7F72:
 	thumb_func_end sub_81B7F60
 
 	thumb_func_start sub_81B7FAC
-sub_81B7FAC: ; 81B7FAC
+sub_81B7FAC: @ 81B7FAC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -820420,7 +820420,7 @@ _081B8030:
 	thumb_func_end sub_81B7FAC
 
 	thumb_func_start sub_81B8044
-sub_81B8044: ; 81B8044
+sub_81B8044: @ 81B8044
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -820450,7 +820450,7 @@ _081B8082:
 	thumb_func_end sub_81B8044
 
 	thumb_func_start sub_81B8088
-sub_81B8088: ; 81B8088
+sub_81B8088: @ 81B8088
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -820504,7 +820504,7 @@ _081B80E4:
 	thumb_func_end sub_81B8088
 
 	thumb_func_start sub_81B8104
-sub_81B8104: ; 81B8104
+sub_81B8104: @ 81B8104
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -820536,7 +820536,7 @@ _081B8138:
 	thumb_func_end sub_81B8104
 
 	thumb_func_start sub_81B814C
-sub_81B814C: ; 81B814C
+sub_81B814C: @ 81B814C
 	push {r4-r6,lr}
 	ldr r4, =0x0203cec8
 	movs r0, 0x9
@@ -820574,7 +820574,7 @@ sub_81B814C: ; 81B814C
 	thumb_func_end sub_81B814C
 
 	thumb_func_start sub_81B81A8
-sub_81B81A8: ; 81B81A8
+sub_81B81A8: @ 81B81A8
 	push {r4-r7,lr}
 	sub sp, 0xC
 	ldr r6, =0x0203cec8
@@ -820632,7 +820632,7 @@ _081B8224:
 	thumb_func_end sub_81B81A8
 
 	thumb_func_start sub_81B8230
-sub_81B8230: ; 81B8230
+sub_81B8230: @ 81B8230
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -820681,7 +820681,7 @@ _081B828A:
 	thumb_func_end sub_81B8230
 
 	thumb_func_start sub_81B82A0
-sub_81B82A0: ; 81B82A0
+sub_81B82A0: @ 81B82A0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -820706,7 +820706,7 @@ _081B82C4:
 	thumb_func_end sub_81B82A0
 
 	thumb_func_start sub_81B82D4
-sub_81B82D4: ; 81B82D4
+sub_81B82D4: @ 81B82D4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -820803,7 +820803,7 @@ _081B83A8:
 	thumb_func_end sub_81B82D4
 
 	thumb_func_start sub_81B83B8
-sub_81B83B8: ; 81B83B8
+sub_81B83B8: @ 81B83B8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -820827,7 +820827,7 @@ sub_81B83B8: ; 81B83B8
 	thumb_func_end sub_81B83B8
 
 	thumb_func_start sub_81B83F0
-sub_81B83F0: ; 81B83F0
+sub_81B83F0: @ 81B83F0
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -820851,7 +820851,7 @@ _081B8418:
 	thumb_func_end sub_81B83F0
 
 	thumb_func_start sub_81B841C
-sub_81B841C: ; 81B841C
+sub_81B841C: @ 81B841C
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -820876,7 +820876,7 @@ _081B8440:
 	thumb_func_end sub_81B841C
 
 	thumb_func_start sub_81B8448
-sub_81B8448: ; 81B8448
+sub_81B8448: @ 81B8448
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x6
@@ -820897,7 +820897,7 @@ sub_81B8448: ; 81B8448
 	thumb_func_end sub_81B8448
 
 	thumb_func_start sub_81B8474
-sub_81B8474: ; 81B8474
+sub_81B8474: @ 81B8474
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -820960,7 +820960,7 @@ _081B84F2:
 	thumb_func_end sub_81B8474
 
 	thumb_func_start sub_81B8518
-sub_81B8518: ; 81B8518
+sub_81B8518: @ 81B8518
 	push {lr}
 	sub sp, 0xC
 	bl sub_81B8558
@@ -820986,7 +820986,7 @@ sub_81B8518: ; 81B8518
 	thumb_func_end sub_81B8518
 
 	thumb_func_start sub_81B8558
-sub_81B8558: ; 81B8558
+sub_81B8558: @ 81B8558
 	push {lr}
 	ldr r0, =0x0203cef8
 	movs r1, 0
@@ -820998,7 +820998,7 @@ sub_81B8558: ; 81B8558
 	thumb_func_end sub_81B8558
 
 	thumb_func_start sub_81B856C
-sub_81B856C: ; 81B856C
+sub_81B856C: @ 81B856C
 	push {r4,lr}
 	lsls r0, 24
 	asrs r4, r0, 24
@@ -821033,7 +821033,7 @@ _081B85A4:
 	thumb_func_end sub_81B856C
 
 	thumb_func_start sub_81B85AC
-sub_81B85AC: ; 81B85AC
+sub_81B85AC: @ 81B85AC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -821115,7 +821115,7 @@ _081B864C:
 	thumb_func_end sub_81B85AC
 
 	thumb_func_start sub_81B865C
-sub_81B865C: ; 81B865C
+sub_81B865C: @ 81B865C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -821252,7 +821252,7 @@ _081B8758:
 	thumb_func_end sub_81B865C
 
 	thumb_func_start sub_81B8770
-sub_81B8770: ; 81B8770
+sub_81B8770: @ 81B8770
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -821279,7 +821279,7 @@ _081B8798:
 	thumb_func_end sub_81B8770
 
 	thumb_func_start sub_81B879C
-sub_81B879C: ; 81B879C
+sub_81B879C: @ 81B879C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -821313,7 +821313,7 @@ _081B87E0:
 	thumb_func_end sub_81B879C
 
 	thumb_func_start sub_81B87E8
-sub_81B87E8: ; 81B87E8
+sub_81B87E8: @ 81B87E8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -821347,7 +821347,7 @@ _081B881C:
 	thumb_func_end sub_81B87E8
 
 	thumb_func_start sub_81B8830
-sub_81B8830: ; 81B8830
+sub_81B8830: @ 81B8830
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -821373,7 +821373,7 @@ _081B8854:
 	thumb_func_end sub_81B8830
 
 	thumb_func_start sub_81B885C
-sub_81B885C: ; 81B885C
+sub_81B885C: @ 81B885C
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -821399,7 +821399,7 @@ _081B8880:
 	thumb_func_end sub_81B885C
 
 	thumb_func_start sub_81B8888
-sub_81B8888: ; 81B8888
+sub_81B8888: @ 81B8888
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -821429,7 +821429,7 @@ _081B88B2:
 	thumb_func_end sub_81B8888
 
 	thumb_func_start sub_81B88BC
-sub_81B88BC: ; 81B88BC
+sub_81B88BC: @ 81B88BC
 	push {lr}
 	ldr r0, =0x000040cf
 	bl VarGet
@@ -821463,7 +821463,7 @@ _081B88FA:
 	thumb_func_end sub_81B88BC
 
 	thumb_func_start sub_81B8904
-sub_81B8904: ; 81B8904
+sub_81B8904: @ 81B8904
 	push {lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -821484,7 +821484,7 @@ sub_81B8904: ; 81B8904
 	thumb_func_end sub_81B8904
 
 	thumb_func_start sub_81B892C
-sub_81B892C: ; 81B892C
+sub_81B892C: @ 81B892C
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x4
@@ -821505,7 +821505,7 @@ sub_81B892C: ; 81B892C
 	thumb_func_end sub_81B892C
 
 	thumb_func_start sub_81B8958
-sub_81B8958: ; 81B8958
+sub_81B8958: @ 81B8958
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x1
@@ -821526,7 +821526,7 @@ sub_81B8958: ; 81B8958
 	thumb_func_end sub_81B8958
 
 	thumb_func_start sub_81B8984
-sub_81B8984: ; 81B8984
+sub_81B8984: @ 81B8984
 	push {lr}
 	bl battle_type_is_double
 	lsls r0, 24
@@ -821550,7 +821550,7 @@ _081B89A6:
 	thumb_func_end sub_81B8984
 
 	thumb_func_start sub_81B89AC
-sub_81B89AC: ; 81B89AC
+sub_81B89AC: @ 81B89AC
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -821580,7 +821580,7 @@ sub_81B89AC: ; 81B89AC
 	thumb_func_end sub_81B89AC
 
 	thumb_func_start sub_81B89F0
-sub_81B89F0: ; 81B89F0
+sub_81B89F0: @ 81B89F0
 	push {lr}
 	sub sp, 0xC
 	bl sub_81B8984
@@ -821606,7 +821606,7 @@ sub_81B89F0: ; 81B89F0
 	thumb_func_end sub_81B89F0
 
 	thumb_func_start sub_81B8A2C
-sub_81B8A2C: ; 81B8A2C
+sub_81B8A2C: @ 81B8A2C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x02024550
@@ -821646,7 +821646,7 @@ _081B8A76:
 	thumb_func_end sub_81B8A2C
 
 	thumb_func_start sub_81B8A7C
-sub_81B8A7C: ; 81B8A7C
+sub_81B8A7C: @ 81B8A7C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -821833,7 +821833,7 @@ _081B8C48:
 	thumb_func_end sub_81B8A7C
 
 	thumb_func_start sub_81B8C68
-sub_81B8C68: ; 81B8C68
+sub_81B8C68: @ 81B8C68
 	push {r4,lr}
 	ldr r4, =0x0203cf00
 	bl sub_806D7EC
@@ -821849,7 +821849,7 @@ sub_81B8C68: ; 81B8C68
 	thumb_func_end sub_81B8C68
 
 	thumb_func_start sub_81B8C88
-sub_81B8C88: ; 81B8C88
+sub_81B8C88: @ 81B8C88
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -821966,7 +821966,7 @@ _081B8D58:
 	thumb_func_end sub_81B8C88
 
 	thumb_func_start sub_81B8D64
-sub_81B8D64: ; 81B8D64
+sub_81B8D64: @ 81B8D64
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -821986,7 +821986,7 @@ sub_81B8D64: ; 81B8D64
 	thumb_func_end sub_81B8D64
 
 	thumb_func_start sub_81B8D88
-sub_81B8D88: ; 81B8D88
+sub_81B8D88: @ 81B8D88
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -822116,7 +822116,7 @@ _081B8E72:
 	thumb_func_end sub_81B8D88
 
 	thumb_func_start sub_81B8E80
-sub_81B8E80: ; 81B8E80
+sub_81B8E80: @ 81B8E80
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -822212,7 +822212,7 @@ _081B8F2E:
 	thumb_func_end sub_81B8E80
 
 	thumb_func_start sub_81B8F38
-sub_81B8F38: ; 81B8F38
+sub_81B8F38: @ 81B8F38
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -822241,7 +822241,7 @@ _081B8F60:
 	thumb_func_end sub_81B8F38
 
 	thumb_func_start sub_81B8F6C
-sub_81B8F6C: ; 81B8F6C
+sub_81B8F6C: @ 81B8F6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -822278,7 +822278,7 @@ _081B8FA4:
 	thumb_func_end sub_81B8F6C
 
 	thumb_func_start sub_81B8FB0
-sub_81B8FB0: ; 81B8FB0
+sub_81B8FB0: @ 81B8FB0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -822307,7 +822307,7 @@ sub_81B8FB0: ; 81B8FB0
 	thumb_func_end sub_81B8FB0
 
 	thumb_func_start pokemon_order_func
-pokemon_order_func: ; 81B8FEC
+pokemon_order_func: @ 81B8FEC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -822348,7 +822348,7 @@ _081B902A:
 	thumb_func_end pokemon_order_func
 
 	thumb_func_start pokemon_change_order
-pokemon_change_order: ; 81B9030
+pokemon_change_order: @ 81B9030
 	push {r4-r6,lr}
 	movs r4, 0x96
 	lsls r4, 2
@@ -822387,7 +822387,7 @@ _081B904A:
 	thumb_func_end pokemon_change_order
 
 	thumb_func_start sub_81B9080
-sub_81B9080: ; 81B9080
+sub_81B9080: @ 81B9080
 	push {r4-r6,lr}
 	movs r4, 0x96
 	lsls r4, 2
@@ -822426,7 +822426,7 @@ _081B909A:
 	thumb_func_end sub_81B9080
 
 	thumb_func_start sub_81B90D0
-sub_81B90D0: ; 81B90D0
+sub_81B90D0: @ 81B90D0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -822482,7 +822482,7 @@ _081B9136:
 	thumb_func_end sub_81B90D0
 
 	thumb_func_start sub_81B9140
-sub_81B9140: ; 81B9140
+sub_81B9140: @ 81B9140
 	push {lr}
 	ldr r0, =sub_8059D40
 	bl SetMainCallback2
@@ -822492,7 +822492,7 @@ sub_81B9140: ; 81B9140
 	thumb_func_end sub_81B9140
 
 	thumb_func_start sub_81B9150
-sub_81B9150: ; 81B9150
+sub_81B9150: @ 81B9150
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x7F
@@ -822514,7 +822514,7 @@ sub_81B9150: ; 81B9150
 	thumb_func_end sub_81B9150
 
 	thumb_func_start sub_81B917C
-sub_81B917C: ; 81B917C
+sub_81B917C: @ 81B917C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -822541,7 +822541,7 @@ sub_81B917C: ; 81B917C
 	thumb_func_end sub_81B917C
 
 	thumb_func_start sub_81B91B4
-sub_81B91B4: ; 81B91B4
+sub_81B91B4: @ 81B91B4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -822603,7 +822603,7 @@ _081B9220:
 	thumb_func_end sub_81B91B4
 
 	thumb_func_start sub_81B9240
-sub_81B9240: ; 81B9240
+sub_81B9240: @ 81B9240
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -822629,7 +822629,7 @@ _081B9266:
 	thumb_func_end sub_81B9240
 
 	thumb_func_start sub_81B9270
-sub_81B9270: ; 81B9270
+sub_81B9270: @ 81B9270
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -822650,7 +822650,7 @@ _081B928A:
 	thumb_func_end sub_81B9270
 
 	thumb_func_start sub_81B9294
-sub_81B9294: ; 81B9294
+sub_81B9294: @ 81B9294
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -822720,7 +822720,7 @@ _081B9300:
 	thumb_func_end sub_81B9294
 
 	thumb_func_start sub_81B9328
-sub_81B9328: ; 81B9328
+sub_81B9328: @ 81B9328
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0xF
@@ -822741,7 +822741,7 @@ sub_81B9328: ; 81B9328
 	thumb_func_end sub_81B9328
 
 	thumb_func_start sub_81B9354
-sub_81B9354: ; 81B9354
+sub_81B9354: @ 81B9354
 	push {lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -822766,7 +822766,7 @@ sub_81B9354: ; 81B9354
 	thumb_func_end sub_81B9354
 
 	thumb_func_start sub_81B9390
-sub_81B9390: ; 81B9390
+sub_81B9390: @ 81B9390
 	push {r4,lr}
 	ldr r4, =0x020375e0
 	bl brm_get_pokemon_selection
@@ -822790,7 +822790,7 @@ _081B93A6:
 	thumb_func_end sub_81B9390
 
 	thumb_func_start hm_add_c3_without_phase_2
-hm_add_c3_without_phase_2: ; 81B93C8
+hm_add_c3_without_phase_2: @ 81B93C8
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =task_hm_without_phase_2
@@ -822803,7 +822803,7 @@ hm_add_c3_without_phase_2: ; 81B93C8
 	thumb_func_end hm_add_c3_without_phase_2
 
 	thumb_func_start task_hm_without_phase_2
-task_hm_without_phase_2: ; 81B93E0
+task_hm_without_phase_2: @ 81B93E0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -822822,7 +822822,7 @@ _081B93FE:
 	thumb_func_end task_hm_without_phase_2
 
 	thumb_func_start sub_81B9404
-sub_81B9404: ; 81B9404
+sub_81B9404: @ 81B9404
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0x1
@@ -822837,7 +822837,7 @@ sub_81B9404: ; 81B9404
 	thumb_func_end sub_81B9404
 
 	thumb_func_start sub_81B9424
-sub_81B9424: ; 81B9424
+sub_81B9424: @ 81B9424
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -822872,7 +822872,7 @@ _081B945C:
 	thumb_func_end sub_81B9424
 
 	thumb_func_start sub_81B9470
-sub_81B9470: ; 81B9470
+sub_81B9470: @ 81B9470
 	push {lr}
 	bl brm_get_pokemon_selection
 	ldr r2, =0x02039f24
@@ -822898,7 +822898,7 @@ _081B9486:
 	thumb_func_end sub_81B9470
 
 	thumb_func_start sub_81B94B0
-sub_81B94B0: ; 81B94B0
+sub_81B94B0: @ 81B94B0
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0x1
@@ -822913,7 +822913,7 @@ sub_81B94B0: ; 81B94B0
 	thumb_func_end sub_81B94B0
 
 	thumb_func_start sub_81B94D0
-sub_81B94D0: ; 81B94D0
+sub_81B94D0: @ 81B94D0
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -822948,7 +822948,7 @@ _081B9508:
 	thumb_func_end sub_81B94D0
 
 	thumb_func_start sub_81B951C
-sub_81B951C: ; 81B951C
+sub_81B951C: @ 81B951C
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0x1
@@ -822963,7 +822963,7 @@ sub_81B951C: ; 81B951C
 	thumb_func_end sub_81B951C
 
 	thumb_func_start sub_81B953C
-sub_81B953C: ; 81B953C
+sub_81B953C: @ 81B953C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -822998,7 +822998,7 @@ _081B9574:
 	thumb_func_end sub_81B953C
 
 	thumb_func_start sub_81B9588
-sub_81B9588: ; 81B9588
+sub_81B9588: @ 81B9588
 	push {r4,r5,lr}
 	ldr r5, =0x020375e0
 	bl brm_get_pokemon_selection
@@ -823035,7 +823035,7 @@ _081B95BA:
 	thumb_func_end sub_81B9588
 
 	thumb_func_start sub_81B95E0
-sub_81B95E0: ; 81B95E0
+sub_81B95E0: @ 81B95E0
 	push {r4,r5,lr}
 	ldr r1, =0x020375f0
 	movs r0, 0
@@ -823069,7 +823069,7 @@ _081B9614:
 	thumb_func_end sub_81B95E0
 
 	thumb_func_start sub_81B9620
-sub_81B9620: ; 81B9620
+sub_81B9620: @ 81B9620
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0x1
@@ -823084,7 +823084,7 @@ sub_81B9620: ; 81B9620
 	thumb_func_end sub_81B9620
 
 	thumb_func_start sub_81B9640
-sub_81B9640: ; 81B9640
+sub_81B9640: @ 81B9640
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -823119,7 +823119,7 @@ _081B9678:
 	thumb_func_end sub_81B9640
 
 	thumb_func_start sub_81B968C
-sub_81B968C: ; 81B968C
+sub_81B968C: @ 81B968C
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =0x020244ec
@@ -823144,7 +823144,7 @@ sub_81B968C: ; 81B968C
 	thumb_func_end sub_81B968C
 
 	thumb_func_start sub_81B96D0
-sub_81B96D0: ; 81B96D0
+sub_81B96D0: @ 81B96D0
 	push {r4,r5,lr}
 	ldr r1, =0x020375f0
 	movs r0, 0
@@ -823179,7 +823179,7 @@ _081B96FA:
 	thumb_func_end sub_81B96D0
 
 	thumb_func_start sub_81B9718
-sub_81B9718: ; 81B9718
+sub_81B9718: @ 81B9718
 	push {r4,r5,lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -823212,7 +823212,7 @@ sub_81B9718: ; 81B9718
 	thumb_func_end sub_81B9718
 
 	thumb_func_start sub_81B9770
-sub_81B9770: ; 81B9770
+sub_81B9770: @ 81B9770
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -823263,7 +823263,7 @@ _081B97C4:
 	thumb_func_end sub_81B9770
 
 	thumb_func_start sub_81B97DC
-sub_81B97DC: ; 81B97DC
+sub_81B97DC: @ 81B97DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -823384,7 +823384,7 @@ sub_81B97DC: ; 81B97DC
 	thumb_func_end sub_81B97DC
 
 	thumb_func_start sub_81B98DC
-sub_81B98DC: ; 81B98DC
+sub_81B98DC: @ 81B98DC
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r1, [r0]
@@ -823412,7 +823412,7 @@ _081B9910:
 	thumb_func_end sub_81B98DC
 
 	thumb_func_start sub_81B9918
-sub_81B9918: ; 81B9918
+sub_81B9918: @ 81B9918
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -823482,7 +823482,7 @@ _081B999C:
 	thumb_func_end sub_81B9918
 
 	thumb_func_start sub_81B99B4
-sub_81B99B4: ; 81B99B4
+sub_81B99B4: @ 81B99B4
 	push {lr}
 	ldr r1, =gUnknown_086160B4
 	ldr r0, =0x020375e0
@@ -823497,7 +823497,7 @@ sub_81B99B4: ; 81B99B4
 	thumb_func_end sub_81B99B4
 
 	thumb_func_start sub_81B99D4
-sub_81B99D4: ; 81B99D4
+sub_81B99D4: @ 81B99D4
 	push {lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -823532,7 +823532,7 @@ sub_81B99D4: ; 81B99D4
 	thumb_func_end sub_81B99D4
 
 	thumb_func_start sub_81B9A28
-sub_81B9A28: ; 81B9A28
+sub_81B9A28: @ 81B9A28
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -823545,7 +823545,7 @@ sub_81B9A28: ; 81B9A28
 	thumb_func_end sub_81B9A28
 
 	thumb_func_start sub_81B9A44
-sub_81B9A44: ; 81B9A44
+sub_81B9A44: @ 81B9A44
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0x020375e4
@@ -823558,7 +823558,7 @@ sub_81B9A44: ; 81B9A44
 	thumb_func_end sub_81B9A44
 
 	thumb_func_start sub_81B9A60
-sub_81B9A60: ; 81B9A60
+sub_81B9A60: @ 81B9A60
 	push {r4,lr}
 	ldr r4, =0x02038bca
 	bl GenerateRandomNumber
@@ -823582,7 +823582,7 @@ sub_81B9A60: ; 81B9A60
 	thumb_func_end sub_81B9A60
 
 	thumb_func_start sub_81B9A90
-sub_81B9A90: ; 81B9A90
+sub_81B9A90: @ 81B9A90
 	push {lr}
 	ldr r3, =0x02038bca
 	ldrh r1, [r3]
@@ -823603,7 +823603,7 @@ _081B9AAC:
 	thumb_func_end sub_81B9A90
 
 	thumb_func_start sub_81B9ABC
-sub_81B9ABC: ; 81B9ABC
+sub_81B9ABC: @ 81B9ABC
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -823631,7 +823631,7 @@ sub_81B9ABC: ; 81B9ABC
 	thumb_func_end sub_81B9ABC
 
 	thumb_func_start sub_81B9B00
-sub_81B9B00: ; 81B9B00
+sub_81B9B00: @ 81B9B00
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r4, [r0]
@@ -823648,7 +823648,7 @@ sub_81B9B00: ; 81B9B00
 	thumb_func_end sub_81B9B00
 
 	thumb_func_start sub_81B9B28
-sub_81B9B28: ; 81B9B28
+sub_81B9B28: @ 81B9B28
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -823688,7 +823688,7 @@ _081B9B76:
 	thumb_func_end sub_81B9B28
 
 	thumb_func_start sub_81B9B80
-sub_81B9B80: ; 81B9B80
+sub_81B9B80: @ 81B9B80
 	push {lr}
 	ldr r1, =gUnknown_086160D8
 	ldr r0, =0x020375e0
@@ -823703,7 +823703,7 @@ sub_81B9B80: ; 81B9B80
 	thumb_func_end sub_81B9B80
 
 	thumb_func_start sub_81B9BA0
-sub_81B9BA0: ; 81B9BA0
+sub_81B9BA0: @ 81B9BA0
 	push {lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -823738,7 +823738,7 @@ sub_81B9BA0: ; 81B9BA0
 	thumb_func_end sub_81B9BA0
 
 	thumb_func_start sub_81B9BF4
-sub_81B9BF4: ; 81B9BF4
+sub_81B9BF4: @ 81B9BF4
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -823751,7 +823751,7 @@ sub_81B9BF4: ; 81B9BF4
 	thumb_func_end sub_81B9BF4
 
 	thumb_func_start sub_81B9C10
-sub_81B9C10: ; 81B9C10
+sub_81B9C10: @ 81B9C10
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0x020375e4
@@ -823764,7 +823764,7 @@ sub_81B9C10: ; 81B9C10
 	thumb_func_end sub_81B9C10
 
 	thumb_func_start sub_81B9C2C
-sub_81B9C2C: ; 81B9C2C
+sub_81B9C2C: @ 81B9C2C
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -823792,7 +823792,7 @@ sub_81B9C2C: ; 81B9C2C
 	thumb_func_end sub_81B9C2C
 
 	thumb_func_start sub_81B9C70
-sub_81B9C70: ; 81B9C70
+sub_81B9C70: @ 81B9C70
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r4, [r0]
@@ -823809,7 +823809,7 @@ sub_81B9C70: ; 81B9C70
 	thumb_func_end sub_81B9C70
 
 	thumb_func_start sub_81B9C98
-sub_81B9C98: ; 81B9C98
+sub_81B9C98: @ 81B9C98
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -823849,7 +823849,7 @@ _081B9CE6:
 	thumb_func_end sub_81B9C98
 
 	thumb_func_start sub_81B9CF0
-sub_81B9CF0: ; 81B9CF0
+sub_81B9CF0: @ 81B9CF0
 	push {lr}
 	ldr r0, =0x02021cc4
 	ldr r1, =0x02038bca
@@ -823861,7 +823861,7 @@ sub_81B9CF0: ; 81B9CF0
 	thumb_func_end sub_81B9CF0
 
 	thumb_func_start sub_81B9D08
-sub_81B9D08: ; 81B9D08
+sub_81B9D08: @ 81B9D08
 	push {lr}
 	ldr r1, =gUnknown_086160F8
 	ldr r0, =0x020375e0
@@ -823876,7 +823876,7 @@ sub_81B9D08: ; 81B9D08
 	thumb_func_end sub_81B9D08
 
 	thumb_func_start sub_81B9D28
-sub_81B9D28: ; 81B9D28
+sub_81B9D28: @ 81B9D28
 	push {lr}
 	ldr r1, =0x03005d90
 	ldr r0, [r1]
@@ -823911,7 +823911,7 @@ sub_81B9D28: ; 81B9D28
 	thumb_func_end sub_81B9D28
 
 	thumb_func_start sub_81B9D7C
-sub_81B9D7C: ; 81B9D7C
+sub_81B9D7C: @ 81B9D7C
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -823924,7 +823924,7 @@ sub_81B9D7C: ; 81B9D7C
 	thumb_func_end sub_81B9D7C
 
 	thumb_func_start sub_81B9D98
-sub_81B9D98: ; 81B9D98
+sub_81B9D98: @ 81B9D98
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldr r1, =0x020375e4
@@ -823937,7 +823937,7 @@ sub_81B9D98: ; 81B9D98
 	thumb_func_end sub_81B9D98
 
 	thumb_func_start sub_81B9DB4
-sub_81B9DB4: ; 81B9DB4
+sub_81B9DB4: @ 81B9DB4
 	push {r4,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -823965,7 +823965,7 @@ sub_81B9DB4: ; 81B9DB4
 	thumb_func_end sub_81B9DB4
 
 	thumb_func_start sub_81B9DF8
-sub_81B9DF8: ; 81B9DF8
+sub_81B9DF8: @ 81B9DF8
 	push {r4,r5,lr}
 	ldr r0, =0x03005d90
 	ldr r4, [r0]
@@ -823982,7 +823982,7 @@ sub_81B9DF8: ; 81B9DF8
 	thumb_func_end sub_81B9DF8
 
 	thumb_func_start sub_81B9E20
-sub_81B9E20: ; 81B9E20
+sub_81B9E20: @ 81B9E20
 	push {r4,r5,lr}
 	ldr r4, =0x03005d90
 	ldr r0, [r4]
@@ -824022,7 +824022,7 @@ _081B9E6E:
 	thumb_func_end sub_81B9E20
 
 	thumb_func_start sub_81B9E78
-sub_81B9E78: ; 81B9E78
+sub_81B9E78: @ 81B9E78
 	push {lr}
 	bl zero_player_party_data
 	bl sub_819A4F8
@@ -824031,7 +824031,7 @@ sub_81B9E78: ; 81B9E78
 	thumb_func_end sub_81B9E78
 
 	thumb_func_start sub_81B9E88
-sub_81B9E88: ; 81B9E88
+sub_81B9E88: @ 81B9E88
 	push {lr}
 	bl sub_819DC00
 	pop {r0}
@@ -824039,7 +824039,7 @@ sub_81B9E88: ; 81B9E88
 	thumb_func_end sub_81B9E88
 
 	thumb_func_start sub_81B9E94
-sub_81B9E94: ; 81B9E94
+sub_81B9E94: @ 81B9E94
 	push {lr}
 	movs r2, 0
 	ldr r1, =0x02037318
@@ -824063,7 +824063,7 @@ _081B9EB2:
 	thumb_func_end sub_81B9E94
 
 	thumb_func_start sub_81B9EC0
-sub_81B9EC0: ; 81B9EC0
+sub_81B9EC0: @ 81B9EC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -824252,7 +824252,7 @@ _081BA024:
 	thumb_func_end sub_81B9EC0
 
 	thumb_func_start sub_81BA040
-sub_81BA040: ; 81BA040
+sub_81BA040: @ 81BA040
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -824502,8 +824502,8 @@ _081BA220:
 	thumb_func_end sub_81BA040
 
 	thumb_func_start Font6Func
-; int Font6Func(struct TextPrinter *x)
-Font6Func: ; 81BA250
+@ int Font6Func(struct TextPrinter *x)
+Font6Func: @ 81BA250
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r6, 0
@@ -825025,7 +825025,7 @@ _081BA662:
 	thumb_func_end Font6Func
 
 	thumb_func_start DecompressGlyphFont6
-DecompressGlyphFont6: ; 81BA668
+DecompressGlyphFont6: @ 81BA668
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r2, r0, 19
@@ -825071,7 +825071,7 @@ DecompressGlyphFont6: ; 81BA668
 	thumb_func_end DecompressGlyphFont6
 
 	thumb_func_start GetGlyphWidthFont6
-GetGlyphWidthFont6: ; 81BA6CC
+GetGlyphWidthFont6: @ 81BA6CC
 	movs r0, 0x10
 	bx lr
 	thumb_func_end GetGlyphWidthFont6
@@ -825079,7 +825079,7 @@ GetGlyphWidthFont6: ; 81BA6CC
 	.include "asm/multiboot.s"
 
 	thumb_func_start sub_81BAD84
-sub_81BAD84: ; 81BAD84
+sub_81BAD84: @ 81BAD84
 	push {r4-r6,lr}
 	movs r6, 0x80
 	lsls r6, 19
@@ -825127,12 +825127,12 @@ sub_81BAD84: ; 81BAD84
 	thumb_func_end sub_81BAD84
 
 	thumb_func_start nullsub_77
-nullsub_77: ; 81BADF0
+nullsub_77: @ 81BADF0
 	bx lr
 	thumb_func_end nullsub_77
 
 	thumb_func_start sub_81BADF4
-sub_81BADF4: ; 81BADF4
+sub_81BADF4: @ 81BADF4
 	ldr r1, =0x03005d60
 	ldr r0, =0x02024064
 	ldrb r0, [r0]
@@ -825145,7 +825145,7 @@ sub_81BADF4: ; 81BADF4
 	thumb_func_end sub_81BADF4
 
 	thumb_func_start bx_exec_buffer_A_ch0_tbl3
-bx_exec_buffer_A_ch0_tbl3: ; 81BAE10
+bx_exec_buffer_A_ch0_tbl3: @ 81BAE10
 	push {lr}
 	ldr r2, =0x02024068
 	ldr r1, =gUnknown_0832A328
@@ -825180,7 +825180,7 @@ _081BAE5C:
 	thumb_func_end bx_exec_buffer_A_ch0_tbl3
 
 	thumb_func_start sub_81BAE60
-sub_81BAE60: ; 81BAE60
+sub_81BAE60: @ 81BAE60
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -825205,7 +825205,7 @@ _081BAE84:
 	thumb_func_end sub_81BAE60
 
 	thumb_func_start sub_81BAE98
-sub_81BAE98: ; 81BAE98
+sub_81BAE98: @ 81BAE98
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -825250,7 +825250,7 @@ _081BAEE8:
 	thumb_func_end sub_81BAE98
 
 	thumb_func_start sub_81BAF00
-sub_81BAF00: ; 81BAF00
+sub_81BAF00: @ 81BAF00
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r1, [r4]
@@ -825286,7 +825286,7 @@ _081BAF38:
 	thumb_func_end sub_81BAF00
 
 	thumb_func_start sub_81BAF48
-sub_81BAF48: ; 81BAF48
+sub_81BAF48: @ 81BAF48
 	push {r4-r6,lr}
 	movs r6, 0
 	bl battle_type_is_double
@@ -825385,7 +825385,7 @@ _081BB00A:
 	thumb_func_end sub_81BAF48
 
 	thumb_func_start sub_81BB02C
-sub_81BB02C: ; 81BB02C
+sub_81BB02C: @ 81BB02C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -825573,7 +825573,7 @@ _081BB196:
 	thumb_func_end sub_81BB02C
 
 	thumb_func_start sub_81BB1D4
-sub_81BB1D4: ; 81BB1D4
+sub_81BB1D4: @ 81BB1D4
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r1, =0x020241e4
@@ -825603,7 +825603,7 @@ _081BB202:
 	thumb_func_end sub_81BB1D4
 
 	thumb_func_start bx_t3_healthbar_update
-bx_t3_healthbar_update: ; 81BB214
+bx_t3_healthbar_update: @ 81BB214
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -825653,7 +825653,7 @@ _081BB276:
 	thumb_func_end bx_t3_healthbar_update
 
 	thumb_func_start sub_81BB284
-sub_81BB284: ; 81BB284
+sub_81BB284: @ 81BB284
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -825667,7 +825667,7 @@ _081BB296:
 	thumb_func_end sub_81BB284
 
 	thumb_func_start sub_81BB29C
-sub_81BB29C: ; 81BB29C
+sub_81BB29C: @ 81BB29C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -825835,7 +825835,7 @@ _081BB3FE:
 	thumb_func_end sub_81BB29C
 
 	thumb_func_start sub_81BB414
-sub_81BB414: ; 81BB414
+sub_81BB414: @ 81BB414
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -825927,7 +825927,7 @@ sub_81BB414: ; 81BB414
 	thumb_func_end sub_81BB414
 
 	thumb_func_start sub_81BB4E4
-sub_81BB4E4: ; 81BB4E4
+sub_81BB4E4: @ 81BB4E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -826070,7 +826070,7 @@ _081BB610:
 	thumb_func_end sub_81BB4E4
 
 	thumb_func_start sub_81BB628
-sub_81BB628: ; 81BB628
+sub_81BB628: @ 81BB628
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -826116,7 +826116,7 @@ _081BB65C:
 	thumb_func_end sub_81BB628
 
 	thumb_func_start sub_81BB688
-sub_81BB688: ; 81BB688
+sub_81BB688: @ 81BB688
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -826195,7 +826195,7 @@ _081BB72A:
 	thumb_func_end sub_81BB688
 
 	thumb_func_start sub_81BB740
-sub_81BB740: ; 81BB740
+sub_81BB740: @ 81BB740
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -826227,7 +826227,7 @@ sub_81BB740: ; 81BB740
 	thumb_func_end sub_81BB740
 
 	thumb_func_start sub_81BB78C
-sub_81BB78C: ; 81BB78C
+sub_81BB78C: @ 81BB78C
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x020241e4
@@ -826292,7 +826292,7 @@ _081BB808:
 	thumb_func_end sub_81BB78C
 
 	thumb_func_start sub_81BB828
-sub_81BB828: ; 81BB828
+sub_81BB828: @ 81BB828
 	push {r4-r6,lr}
 	ldr r0, =0x020244d0
 	ldr r0, [r0]
@@ -826339,7 +826339,7 @@ _081BB87C:
 	thumb_func_end sub_81BB828
 
 	thumb_func_start sub_81BB898
-sub_81BB898: ; 81BB898
+sub_81BB898: @ 81BB898
 	push {lr}
 	movs r0, 0
 	bl IsTextPrinterActive
@@ -826353,7 +826353,7 @@ _081BB8AA:
 	thumb_func_end sub_81BB898
 
 	thumb_func_start bx_blink_t3
-bx_blink_t3: ; 81BB8B0
+bx_blink_t3: @ 81BB8B0
 	push {r4,lr}
 	ldr r1, =0x020241e4
 	ldr r0, =0x02024064
@@ -826413,7 +826413,7 @@ _081BB926:
 	thumb_func_end bx_blink_t3
 
 	thumb_func_start sub_81BB92C
-sub_81BB92C: ; 81BB92C
+sub_81BB92C: @ 81BB92C
 	push {r4,lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x03005d70
@@ -826462,7 +826462,7 @@ _081BB97E:
 	thumb_func_end sub_81BB92C
 
 	thumb_func_start dp01t_35_3_free_vram
-dp01t_35_3_free_vram: ; 81BB9A0
+dp01t_35_3_free_vram: @ 81BB9A0
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -826499,7 +826499,7 @@ _081BB9DC:
 	thumb_func_end dp01t_35_3_free_vram
 
 	thumb_func_start sub_81BB9F4
-sub_81BB9F4: ; 81BB9F4
+sub_81BB9F4: @ 81BB9F4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -826596,7 +826596,7 @@ _081BBAB0:
 	thumb_func_end sub_81BB9F4
 
 	thumb_func_start sub_81BBAE8
-sub_81BBAE8: ; 81BBAE8
+sub_81BBAE8: @ 81BBAE8
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r0, [r6]
@@ -826664,7 +826664,7 @@ _081BBB60:
 	thumb_func_end sub_81BBAE8
 
 	thumb_func_start dp01_tbl3_exec_completed
-dp01_tbl3_exec_completed: ; 81BBB8C
+dp01_tbl3_exec_completed: @ 81BBB8C
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x03005d60
@@ -826714,7 +826714,7 @@ _081BBBF2:
 	thumb_func_end dp01_tbl3_exec_completed
 
 	thumb_func_start sub_81BBC04
-sub_81BBC04: ; 81BBC04
+sub_81BBC04: @ 81BBC04
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -826738,7 +826738,7 @@ _081BBC26:
 	thumb_func_end sub_81BBC04
 
 	thumb_func_start bx_80E8A6C
-bx_80E8A6C: ; 81BBC34
+bx_80E8A6C: @ 81BBC34
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r2, [r0]
@@ -826762,7 +826762,7 @@ _081BBC56:
 	thumb_func_end bx_80E8A6C
 
 	thumb_func_start dp01t_00_3_getattr
-dp01t_00_3_getattr: ; 81BBC64
+dp01t_00_3_getattr: @ 81BBC64
 	push {r4-r6,lr}
 	sub sp, 0x100
 	movs r6, 0
@@ -826817,7 +826817,7 @@ _081BBCBE:
 	thumb_func_end dp01t_00_3_getattr
 
 	thumb_func_start dp01_getattr_by_ch1_for_player_pokemon
-dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8
+dp01_getattr_by_ch1_for_player_pokemon: @ 81BBCD8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -827695,7 +827695,7 @@ _081BC46E:
 	thumb_func_end dp01_getattr_by_ch1_for_player_pokemon
 
 	thumb_func_start sub_81BC484
-sub_81BC484: ; 81BC484
+sub_81BC484: @ 81BC484
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -827703,7 +827703,7 @@ sub_81BC484: ; 81BC484
 	thumb_func_end sub_81BC484
 
 	thumb_func_start sub_81BC490
-sub_81BC490: ; 81BC490
+sub_81BC490: @ 81BC490
 	push {r4,r5,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -827746,7 +827746,7 @@ _081BC4DE:
 	thumb_func_end sub_81BC490
 
 	thumb_func_start sub_81BC4E8
-sub_81BC4E8: ; 81BC4E8
+sub_81BC4E8: @ 81BC4E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -828779,7 +828779,7 @@ _081BCEAE:
 	thumb_func_end sub_81BC4E8
 
 	thumb_func_start sub_81BCEE4
-sub_81BCEE4: ; 81BCEE4
+sub_81BCEE4: @ 81BCEE4
 	push {r4-r7,lr}
 	ldr r1, =0x0202406e
 	ldr r7, =0x02024064
@@ -828834,7 +828834,7 @@ _081BCF3C:
 	thumb_func_end sub_81BCEE4
 
 	thumb_func_start sub_81BCF58
-sub_81BCF58: ; 81BCF58
+sub_81BCF58: @ 81BCF58
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -828951,7 +828951,7 @@ sub_81BCF58: ; 81BCF58
 	thumb_func_end sub_81BCF58
 
 	thumb_func_start sub_81BD074
-sub_81BD074: ; 81BD074
+sub_81BD074: @ 81BD074
 	push {r4-r6,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -828997,7 +828997,7 @@ sub_81BD074: ; 81BD074
 	thumb_func_end sub_81BD074
 
 	thumb_func_start sub_81BD0E4
-sub_81BD0E4: ; 81BD0E4
+sub_81BD0E4: @ 81BD0E4
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -829160,7 +829160,7 @@ sub_81BD0E4: ; 81BD0E4
 	thumb_func_end sub_81BD0E4
 
 	thumb_func_start sub_81BD260
-sub_81BD260: ; 81BD260
+sub_81BD260: @ 81BD260
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r6, =0x02024064
@@ -829219,7 +829219,7 @@ _081BD2DE:
 	thumb_func_end sub_81BD260
 
 	thumb_func_start sub_81BD2F0
-sub_81BD2F0: ; 81BD2F0
+sub_81BD2F0: @ 81BD2F0
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -829289,7 +829289,7 @@ _081BD36E:
 	thumb_func_end sub_81BD2F0
 
 	thumb_func_start sub_81BD37C
-sub_81BD37C: ; 81BD37C
+sub_81BD37C: @ 81BD37C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -829531,7 +829531,7 @@ _081BD57C:
 	thumb_func_end sub_81BD37C
 
 	thumb_func_start sub_81BD5BC
-sub_81BD5BC: ; 81BD5BC
+sub_81BD5BC: @ 81BD5BC
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -829539,7 +829539,7 @@ sub_81BD5BC: ; 81BD5BC
 	thumb_func_end sub_81BD5BC
 
 	thumb_func_start sub_81BD5C8
-sub_81BD5C8: ; 81BD5C8
+sub_81BD5C8: @ 81BD5C8
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r4, =0x02024064
@@ -829612,7 +829612,7 @@ sub_81BD5C8: ; 81BD5C8
 	thumb_func_end sub_81BD5C8
 
 	thumb_func_start sub_81BD674
-sub_81BD674: ; 81BD674
+sub_81BD674: @ 81BD674
 	push {r4-r6,lr}
 	ldr r6, =0x020244d0
 	ldr r4, [r6]
@@ -829717,7 +829717,7 @@ _081BD73E:
 	thumb_func_end sub_81BD674
 
 	thumb_func_start sub_81BD760
-sub_81BD760: ; 81BD760
+sub_81BD760: @ 81BD760
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -829725,7 +829725,7 @@ sub_81BD760: ; 81BD760
 	thumb_func_end sub_81BD760
 
 	thumb_func_start sub_81BD76C
-sub_81BD76C: ; 81BD76C
+sub_81BD76C: @ 81BD76C
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -829733,7 +829733,7 @@ sub_81BD76C: ; 81BD76C
 	thumb_func_end sub_81BD76C
 
 	thumb_func_start sub_81BD778
-sub_81BD778: ; 81BD778
+sub_81BD778: @ 81BD778
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -829741,7 +829741,7 @@ sub_81BD778: ; 81BD778
 	thumb_func_end sub_81BD778
 
 	thumb_func_start sub_81BD784
-sub_81BD784: ; 81BD784
+sub_81BD784: @ 81BD784
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -829749,7 +829749,7 @@ sub_81BD784: ; 81BD784
 	thumb_func_end sub_81BD784
 
 	thumb_func_start sub_81BD790
-sub_81BD790: ; 81BD790
+sub_81BD790: @ 81BD790
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r0, [r6]
@@ -829886,7 +829886,7 @@ _081BD8B6:
 	thumb_func_end sub_81BD790
 
 	thumb_func_start bx_move_anim_3
-bx_move_anim_3: ; 81BD8C8
+bx_move_anim_3: @ 81BD8C8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -830070,7 +830070,7 @@ _081BDA3C:
 	thumb_func_end bx_move_anim_3
 
 	thumb_func_start sub_81BDA4C
-sub_81BDA4C: ; 81BDA4C
+sub_81BDA4C: @ 81BDA4C
 	push {r4,lr}
 	ldr r0, =0x02022e14
 	movs r1, 0
@@ -830100,7 +830100,7 @@ sub_81BDA4C: ; 81BDA4C
 	thumb_func_end sub_81BDA4C
 
 	thumb_func_start sub_81BDAA0
-sub_81BDAA0: ; 81BDAA0
+sub_81BDAA0: @ 81BDAA0
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830108,7 +830108,7 @@ sub_81BDAA0: ; 81BDAA0
 	thumb_func_end sub_81BDAA0
 
 	thumb_func_start sub_81BDAAC
-sub_81BDAAC: ; 81BDAAC
+sub_81BDAAC: @ 81BDAAC
 	push {lr}
 	bl sub_8063880
 	bl dp01_tbl3_exec_completed
@@ -830117,7 +830117,7 @@ sub_81BDAAC: ; 81BDAAC
 	thumb_func_end sub_81BDAAC
 
 	thumb_func_start sub_81BDABC
-sub_81BDABC: ; 81BDABC
+sub_81BDABC: @ 81BDABC
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830125,7 +830125,7 @@ sub_81BDABC: ; 81BDABC
 	thumb_func_end sub_81BDABC
 
 	thumb_func_start sub_81BDAC8
-sub_81BDAC8: ; 81BDAC8
+sub_81BDAC8: @ 81BDAC8
 	push {r4-r6,lr}
 	ldr r6, =0x02024064
 	ldrb r4, [r6]
@@ -830197,7 +830197,7 @@ _081BDB3C:
 	thumb_func_end sub_81BDAC8
 
 	thumb_func_start sub_81BDB70
-sub_81BDB70: ; 81BDB70
+sub_81BDB70: @ 81BDB70
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830205,7 +830205,7 @@ sub_81BDB70: ; 81BDB70
 	thumb_func_end sub_81BDB70
 
 	thumb_func_start sub_81BDB7C
-sub_81BDB7C: ; 81BDB7C
+sub_81BDB7C: @ 81BDB7C
 	push {r4-r6,lr}
 	bl sub_8063A90
 	lsls r0, 24
@@ -830267,7 +830267,7 @@ _081BDBD0:
 	thumb_func_end sub_81BDB7C
 
 	thumb_func_start sub_81BDC04
-sub_81BDC04: ; 81BDC04
+sub_81BDC04: @ 81BDC04
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830275,7 +830275,7 @@ sub_81BDC04: ; 81BDC04
 	thumb_func_end sub_81BDC04
 
 	thumb_func_start sub_81BDC10
-sub_81BDC10: ; 81BDC10
+sub_81BDC10: @ 81BDC10
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -830371,7 +830371,7 @@ _081BDCCA:
 	thumb_func_end sub_81BDC10
 
 	thumb_func_start sub_81BDD00
-sub_81BDD00: ; 81BDD00
+sub_81BDD00: @ 81BDD00
 	push {r4-r7,lr}
 	ldr r5, =0x02023064
 	ldr r6, =0x02024064
@@ -830437,7 +830437,7 @@ _081BDD84:
 	thumb_func_end sub_81BDD00
 
 	thumb_func_start sub_81BDD9C
-sub_81BDD9C: ; 81BDD9C
+sub_81BDD9C: @ 81BDD9C
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -830486,7 +830486,7 @@ _081BDDF0:
 	thumb_func_end sub_81BDD9C
 
 	thumb_func_start sub_81BDE14
-sub_81BDE14: ; 81BDE14
+sub_81BDE14: @ 81BDE14
 	push {r4,r5,lr}
 	ldr r5, =0x02024064
 	ldrb r0, [r5]
@@ -830533,7 +830533,7 @@ _081BDE64:
 	thumb_func_end sub_81BDE14
 
 	thumb_func_start sub_81BDE7C
-sub_81BDE7C: ; 81BDE7C
+sub_81BDE7C: @ 81BDE7C
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830541,7 +830541,7 @@ sub_81BDE7C: ; 81BDE7C
 	thumb_func_end sub_81BDE7C
 
 	thumb_func_start sub_81BDE88
-sub_81BDE88: ; 81BDE88
+sub_81BDE88: @ 81BDE88
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830549,7 +830549,7 @@ sub_81BDE88: ; 81BDE88
 	thumb_func_end sub_81BDE88
 
 	thumb_func_start sub_81BDE94
-sub_81BDE94: ; 81BDE94
+sub_81BDE94: @ 81BDE94
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830557,7 +830557,7 @@ sub_81BDE94: ; 81BDE94
 	thumb_func_end sub_81BDE94
 
 	thumb_func_start sub_81BDEA0
-sub_81BDEA0: ; 81BDEA0
+sub_81BDEA0: @ 81BDEA0
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830565,7 +830565,7 @@ sub_81BDEA0: ; 81BDEA0
 	thumb_func_end sub_81BDEA0
 
 	thumb_func_start sub_81BDEAC
-sub_81BDEAC: ; 81BDEAC
+sub_81BDEAC: @ 81BDEAC
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830573,7 +830573,7 @@ sub_81BDEAC: ; 81BDEAC
 	thumb_func_end sub_81BDEAC
 
 	thumb_func_start sub_81BDEB8
-sub_81BDEB8: ; 81BDEB8
+sub_81BDEB8: @ 81BDEB8
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830581,7 +830581,7 @@ sub_81BDEB8: ; 81BDEB8
 	thumb_func_end sub_81BDEB8
 
 	thumb_func_start sub_81BDEC4
-sub_81BDEC4: ; 81BDEC4
+sub_81BDEC4: @ 81BDEC4
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830589,7 +830589,7 @@ sub_81BDEC4: ; 81BDEC4
 	thumb_func_end sub_81BDEC4
 
 	thumb_func_start sub_81BDED0
-sub_81BDED0: ; 81BDED0
+sub_81BDED0: @ 81BDED0
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830597,7 +830597,7 @@ sub_81BDED0: ; 81BDED0
 	thumb_func_end sub_81BDED0
 
 	thumb_func_start sub_81BDEDC
-sub_81BDEDC: ; 81BDEDC
+sub_81BDEDC: @ 81BDEDC
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830605,7 +830605,7 @@ sub_81BDEDC: ; 81BDEDC
 	thumb_func_end sub_81BDEDC
 
 	thumb_func_start sub_81BDEE8
-sub_81BDEE8: ; 81BDEE8
+sub_81BDEE8: @ 81BDEE8
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -830620,7 +830620,7 @@ sub_81BDEE8: ; 81BDEE8
 	thumb_func_end sub_81BDEE8
 
 	thumb_func_start sub_81BDF04
-sub_81BDF04: ; 81BDF04
+sub_81BDF04: @ 81BDF04
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, =0x02023064
@@ -830645,7 +830645,7 @@ sub_81BDF04: ; 81BDF04
 	thumb_func_end sub_81BDF04
 
 	thumb_func_start sub_81BDF3C
-sub_81BDF3C: ; 81BDF3C
+sub_81BDF3C: @ 81BDF3C
 	push {lr}
 	ldr r2, =0x02022d0c
 	ldrb r1, [r2]
@@ -830659,7 +830659,7 @@ sub_81BDF3C: ; 81BDF3C
 	thumb_func_end sub_81BDF3C
 
 	thumb_func_start sub_81BDF54
-sub_81BDF54: ; 81BDF54
+sub_81BDF54: @ 81BDF54
 	push {lr}
 	ldr r3, =0x02022d0c
 	ldr r1, [r3]
@@ -830680,7 +830680,7 @@ sub_81BDF54: ; 81BDF54
 	thumb_func_end sub_81BDF54
 
 	thumb_func_start dp01t_29_3_blink
-dp01t_29_3_blink: ; 81BDF7C
+dp01t_29_3_blink: @ 81BDF7C
 	push {r4,lr}
 	ldr r3, =0x02020630
 	ldr r2, =0x020241e4
@@ -830729,7 +830729,7 @@ _081BDFDA:
 	thumb_func_end dp01t_29_3_blink
 
 	thumb_func_start sub_81BDFEC
-sub_81BDFEC: ; 81BDFEC
+sub_81BDFEC: @ 81BDFEC
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -830737,7 +830737,7 @@ sub_81BDFEC: ; 81BDFEC
 	thumb_func_end sub_81BDFEC
 
 	thumb_func_start sub_81BDFF8
-sub_81BDFF8: ; 81BDFF8
+sub_81BDFF8: @ 81BDFF8
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -830770,7 +830770,7 @@ _081BE00C:
 	thumb_func_end sub_81BDFF8
 
 	thumb_func_start sub_81BE03C
-sub_81BE03C: ; 81BE03C
+sub_81BE03C: @ 81BE03C
 	push {r4,r5,lr}
 	ldr r4, =0x02023064
 	ldr r5, =0x02024064
@@ -830813,7 +830813,7 @@ _081BE08C:
 	thumb_func_end sub_81BE03C
 
 	thumb_func_start sub_81BE098
-sub_81BE098: ; 81BE098
+sub_81BE098: @ 81BE098
 	push {lr}
 	ldr r1, =0x0202406e
 	ldr r0, =0x02024064
@@ -830840,7 +830840,7 @@ sub_81BE098: ; 81BE098
 	thumb_func_end sub_81BE098
 
 	thumb_func_start dp01t_2E_3_battle_intro
-dp01t_2E_3_battle_intro: ; 81BE0D8
+dp01t_2E_3_battle_intro: @ 81BE0D8
 	push {lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -830862,7 +830862,7 @@ dp01t_2E_3_battle_intro: ; 81BE0D8
 	thumb_func_end dp01t_2E_3_battle_intro
 
 	thumb_func_start sub_81BE10C
-sub_81BE10C: ; 81BE10C
+sub_81BE10C: @ 81BE10C
 	push {r4-r6,lr}
 	ldr r6, =0x020241e4
 	ldr r5, =0x02024064
@@ -831042,7 +831042,7 @@ _081BE27E:
 	thumb_func_end sub_81BE10C
 
 	thumb_func_start sub_81BE2C8
-sub_81BE2C8: ; 81BE2C8
+sub_81BE2C8: @ 81BE2C8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -831159,7 +831159,7 @@ _081BE3B0:
 	thumb_func_end sub_81BE2C8
 
 	thumb_func_start dp01t_30_3_80EB11C
-dp01t_30_3_80EB11C: ; 81BE3D4
+dp01t_30_3_80EB11C: @ 81BE3D4
 	push {r4-r6,lr}
 	ldr r1, =0x02023064
 	ldr r0, =0x02024064
@@ -831245,7 +831245,7 @@ _081BE478:
 	thumb_func_end dp01t_30_3_80EB11C
 
 	thumb_func_start sub_81BE498
-sub_81BE498: ; 81BE498
+sub_81BE498: @ 81BE498
 	push {r4,lr}
 	ldr r4, =0x020244d0
 	ldr r0, [r4]
@@ -831281,7 +831281,7 @@ _081BE4D0:
 	thumb_func_end sub_81BE498
 
 	thumb_func_start sub_81BE4E0
-sub_81BE4E0: ; 81BE4E0
+sub_81BE4E0: @ 81BE4E0
 	push {lr}
 	ldr r0, =0x020244d0
 	ldr r1, [r0]
@@ -831315,7 +831315,7 @@ _081BE512:
 	thumb_func_end sub_81BE4E0
 
 	thumb_func_start sub_81BE530
-sub_81BE530: ; 81BE530
+sub_81BE530: @ 81BE530
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -831323,7 +831323,7 @@ sub_81BE530: ; 81BE530
 	thumb_func_end sub_81BE530
 
 	thumb_func_start sub_81BE53C
-sub_81BE53C: ; 81BE53C
+sub_81BE53C: @ 81BE53C
 	push {r4,lr}
 	ldr r4, =0x02024064
 	ldrb r0, [r4]
@@ -831366,7 +831366,7 @@ _081BE582:
 	thumb_func_end sub_81BE53C
 
 	thumb_func_start sub_81BE59C
-sub_81BE59C: ; 81BE59C
+sub_81BE59C: @ 81BE59C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r6, =0x02024064
@@ -831415,7 +831415,7 @@ _081BE5F4:
 	thumb_func_end sub_81BE59C
 
 	thumb_func_start sub_81BE604
-sub_81BE604: ; 81BE604
+sub_81BE604: @ 81BE604
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -831423,7 +831423,7 @@ sub_81BE604: ; 81BE604
 	thumb_func_end sub_81BE604
 
 	thumb_func_start sub_81BE610
-sub_81BE610: ; 81BE610
+sub_81BE610: @ 81BE610
 	push {lr}
 	bl dp01_tbl3_exec_completed
 	pop {r0}
@@ -831431,7 +831431,7 @@ sub_81BE610: ; 81BE610
 	thumb_func_end sub_81BE610
 
 	thumb_func_start sub_81BE61C
-sub_81BE61C: ; 81BE61C
+sub_81BE61C: @ 81BE61C
 	push {r4,lr}
 	ldr r2, =0x0202433a
 	ldr r1, =0x02023064
@@ -831460,12 +831460,12 @@ sub_81BE61C: ; 81BE61C
 	thumb_func_end sub_81BE61C
 
 	thumb_func_start nullsub_128
-nullsub_128: ; 81BE668
+nullsub_128: @ 81BE668
 	bx lr
 	thumb_func_end nullsub_128
 
 	thumb_func_start sub_81BE66C
-sub_81BE66C: ; 81BE66C
+sub_81BE66C: @ 81BE66C
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -831489,7 +831489,7 @@ _081BE692:
 	thumb_func_end sub_81BE66C
 
 	thumb_func_start sub_81BE698
-sub_81BE698: ; 81BE698
+sub_81BE698: @ 81BE698
 	push {lr}
 	ldr r0, =0x0203cf18
 	ldr r0, [r0]
@@ -831501,7 +831501,7 @@ sub_81BE698: ; 81BE698
 	thumb_func_end sub_81BE698
 
 	thumb_func_start sub_81BE6AC
-sub_81BE6AC: ; 81BE6AC
+sub_81BE6AC: @ 81BE6AC
 	ldr r1, =0x0203cf18
 	movs r0, 0
 	str r0, [r1]
@@ -831510,7 +831510,7 @@ sub_81BE6AC: ; 81BE6AC
 	thumb_func_end sub_81BE6AC
 
 	thumb_func_start sub_81BE6B8
-sub_81BE6B8: ; 81BE6B8
+sub_81BE6B8: @ 81BE6B8
 	push {r4,lr}
 	ldr r4, =0x0203cf18
 	ldr r0, [r4]
@@ -831561,7 +831561,7 @@ _081BE718:
 	thumb_func_end sub_81BE6B8
 
 	thumb_func_start sub_81BE72C
-sub_81BE72C: ; 81BE72C
+sub_81BE72C: @ 81BE72C
 	push {r4,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -831611,7 +831611,7 @@ _081BE788:
 	thumb_func_end sub_81BE72C
 
 	thumb_func_start sub_81BE79C
-sub_81BE79C: ; 81BE79C
+sub_81BE79C: @ 81BE79C
 	push {r4,lr}
 	ldr r0, =0x000040cb
 	bl VarGet
@@ -831655,7 +831655,7 @@ _081BE7EE:
 	thumb_func_end sub_81BE79C
 
 	thumb_func_start sub_81BE7F4
-sub_81BE7F4: ; 81BE7F4
+sub_81BE7F4: @ 81BE7F4
 	push {lr}
 	ldr r0, =sub_81BE808
 	movs r1, 0x8
@@ -831666,7 +831666,7 @@ sub_81BE7F4: ; 81BE7F4
 	thumb_func_end sub_81BE7F4
 
 	thumb_func_start sub_81BE808
-sub_81BE808: ; 81BE808
+sub_81BE808: @ 81BE808
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -831734,7 +831734,7 @@ _081BE882:
 	thumb_func_end sub_81BE808
 
 	thumb_func_start sp136_strengh_sound
-sp136_strengh_sound: ; 81BE89C
+sp136_strengh_sound: @ 81BE89C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -831781,7 +831781,7 @@ sp136_strengh_sound: ; 81BE89C
 	thumb_func_end sp136_strengh_sound
 
 	thumb_func_start sub_81BE900
-sub_81BE900: ; 81BE900
+sub_81BE900: @ 81BE900
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -831831,7 +831831,7 @@ _081BE95C:
 	thumb_func_end sub_81BE900
 
 	thumb_func_start sub_81BE968
-sub_81BE968: ; 81BE968
+sub_81BE968: @ 81BE968
 	push {lr}
 	ldr r0, =sub_81BE9C0
 	bl get_task_id_by_function
@@ -831854,7 +831854,7 @@ _081BE988:
 	thumb_func_end sub_81BE968
 
 	thumb_func_start sub_81BE994
-sub_81BE994: ; 81BE994
+sub_81BE994: @ 81BE994
 	push {lr}
 	ldr r0, =gUnknown_08617D94
 	bl LoadObjectPics
@@ -831873,7 +831873,7 @@ sub_81BE994: ; 81BE994
 	thumb_func_end sub_81BE994
 
 	thumb_func_start sub_81BE9C0
-sub_81BE9C0: ; 81BE9C0
+sub_81BE9C0: @ 81BE9C0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -831907,7 +831907,7 @@ _081BE9F0:
 	thumb_func_end sub_81BE9C0
 
 	thumb_func_start sub_81BEA00
-sub_81BEA00: ; 81BEA00
+sub_81BEA00: @ 81BEA00
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -831924,7 +831924,7 @@ sub_81BEA00: ; 81BEA00
 	thumb_func_end sub_81BEA00
 
 	thumb_func_start sub_81BEA20
-sub_81BEA20: ; 81BEA20
+sub_81BEA20: @ 81BEA20
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r5, =gUnknown_08617D64
@@ -832013,7 +832013,7 @@ _081BEA78:
 	thumb_func_end sub_81BEA20
 
 	thumb_func_start sub_81BEAD8
-sub_81BEAD8: ; 81BEAD8
+sub_81BEAD8: @ 81BEAD8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x30]
@@ -832053,7 +832053,7 @@ _081BEB1A:
 	thumb_func_end sub_81BEAD8
 
 	thumb_func_start sub_81BEB24
-sub_81BEB24: ; 81BEB24
+sub_81BEB24: @ 81BEB24
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gUnknown_08617DA4
@@ -832079,7 +832079,7 @@ _081BEB2A:
 	thumb_func_end sub_81BEB24
 
 	thumb_func_start sub_81BEB54
-sub_81BEB54: ; 81BEB54
+sub_81BEB54: @ 81BEB54
 	push {lr}
 	ldr r0, =sub_81BED50
 	movs r1, 0x9
@@ -832090,7 +832090,7 @@ sub_81BEB54: ; 81BEB54
 	thumb_func_end sub_81BEB54
 
 	thumb_func_start sub_81BEB68
-sub_81BEB68: ; 81BEB68
+sub_81BEB68: @ 81BEB68
 	push {lr}
 	ldr r0, =sub_81BEBF4
 	movs r1, 0x9
@@ -832101,7 +832101,7 @@ sub_81BEB68: ; 81BEB68
 	thumb_func_end sub_81BEB68
 
 	thumb_func_start sub_81BEB7C
-sub_81BEB7C: ; 81BEB7C
+sub_81BEB7C: @ 81BEB7C
 	push {lr}
 	ldr r0, =sub_81BF028
 	movs r1, 0x9
@@ -832112,7 +832112,7 @@ sub_81BEB7C: ; 81BEB7C
 	thumb_func_end sub_81BEB7C
 
 	thumb_func_start sub_81BEB90
-sub_81BEB90: ; 81BEB90
+sub_81BEB90: @ 81BEB90
 	push {r4,lr}
 	ldr r4, =0x0203cf14
 	ldr r0, [r4]
@@ -832130,7 +832130,7 @@ sub_81BEB90: ; 81BEB90
 	thumb_func_end sub_81BEB90
 
 	thumb_func_start sub_81BEBB4
-sub_81BEBB4: ; 81BEBB4
+sub_81BEBB4: @ 81BEBB4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -832163,7 +832163,7 @@ _081BEBF0:
 	thumb_func_end sub_81BEBB4
 
 	thumb_func_start sub_81BEBF4
-sub_81BEBF4: ; 81BEBF4
+sub_81BEBF4: @ 81BEBF4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -832307,7 +832307,7 @@ _081BED40:
 	thumb_func_end sub_81BEBF4
 
 	thumb_func_start sub_81BED50
-sub_81BED50: ; 81BED50
+sub_81BED50: @ 81BED50
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -832641,7 +832641,7 @@ _081BF014:
 	thumb_func_end sub_81BED50
 
 	thumb_func_start sub_81BF028
-sub_81BF028: ; 81BF028
+sub_81BF028: @ 81BF028
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -832883,7 +832883,7 @@ _081BF238:
 	thumb_func_end sub_81BF028
 
 	thumb_func_start sub_81BF248
-sub_81BF248: ; 81BF248
+sub_81BF248: @ 81BF248
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -832940,7 +832940,7 @@ _081BF2B0:
 	thumb_func_end sub_81BF248
 
 	thumb_func_start sub_81BF2B8
-sub_81BF2B8: ; 81BF2B8
+sub_81BF2B8: @ 81BF2B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -833043,7 +833043,7 @@ sub_81BF2B8: ; 81BF2B8
 	thumb_func_end sub_81BF2B8
 
 	thumb_func_start sub_81BF384
-sub_81BF384: ; 81BF384
+sub_81BF384: @ 81BF384
 	push {r4,lr}
 	ldr r0, =0x0000ffff
 	bl DisableInterrupts
@@ -833076,7 +833076,7 @@ sub_81BF384: ; 81BF384
 	thumb_func_end sub_81BF384
 
 	thumb_func_start sub_81BF3DC
-sub_81BF3DC: ; 81BF3DC
+sub_81BF3DC: @ 81BF3DC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r1, =0x030012b8
@@ -833279,7 +833279,7 @@ _081BF592:
 	thumb_func_end sub_81BF3DC
 
 	thumb_func_start sub_81BF5A4
-sub_81BF5A4: ; 81BF5A4
+sub_81BF5A4: @ 81BF5A4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -833484,7 +833484,7 @@ sub_81BF5A4: ; 81BF5A4
 	thumb_func_end sub_81BF5A4
 
 	thumb_func_start sub_81BF7A4
-sub_81BF7A4: ; 81BF7A4
+sub_81BF7A4: @ 81BF7A4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, =0x030012b8
@@ -833520,7 +833520,7 @@ _081BF7DC:
 	thumb_func_end sub_81BF7A4
 
 	thumb_func_start sub_81BF7E8
-sub_81BF7E8: ; 81BF7E8
+sub_81BF7E8: @ 81BF7E8
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -833616,7 +833616,7 @@ _081BF87E:
 	thumb_func_end sub_81BF7E8
 
 	thumb_func_start sub_81BF8D8
-sub_81BF8D8: ; 81BF8D8
+sub_81BF8D8: @ 81BF8D8
 	push {lr}
 	movs r0, 0
 	bl HideBg
@@ -833627,7 +833627,7 @@ sub_81BF8D8: ; 81BF8D8
 	thumb_func_end sub_81BF8D8
 
 	thumb_func_start sub_81BF8EC
-sub_81BF8EC: ; 81BF8EC
+sub_81BF8EC: @ 81BF8EC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -833767,7 +833767,7 @@ _081BFA12:
 	thumb_func_end sub_81BF8EC
 
 	thumb_func_start sub_81BFA38
-sub_81BFA38: ; 81BFA38
+sub_81BFA38: @ 81BFA38
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -833803,7 +833803,7 @@ sub_81BFA38: ; 81BFA38
 	thumb_func_end sub_81BFA38
 
 	thumb_func_start sub_81BFA80
-sub_81BFA80: ; 81BFA80
+sub_81BFA80: @ 81BFA80
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, [sp, 0xC]
@@ -833829,7 +833829,7 @@ sub_81BFA80: ; 81BFA80
 	thumb_func_end sub_81BFA80
 
 	thumb_func_start sub_81BFAB4
-sub_81BFAB4: ; 81BFAB4
+sub_81BFAB4: @ 81BFAB4
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -833841,7 +833841,7 @@ sub_81BFAB4: ; 81BFAB4
 	thumb_func_end sub_81BFAB4
 
 	thumb_func_start sub_81BFAD0
-sub_81BFAD0: ; 81BFAD0
+sub_81BFAD0: @ 81BFAD0
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -833851,7 +833851,7 @@ sub_81BFAD0: ; 81BFAD0
 	thumb_func_end sub_81BFAD0
 
 	thumb_func_start sub_81BFAE4
-sub_81BFAE4: ; 81BFAE4
+sub_81BFAE4: @ 81BFAE4
 	push {lr}
 _081BFAE6:
 	bl sub_81221EC
@@ -833875,7 +833875,7 @@ _081BFB0A:
 	thumb_func_end sub_81BFAE4
 
 	thumb_func_start sub_81BFB10
-sub_81BFB10: ; 81BFB10
+sub_81BFB10: @ 81BFB10
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -834190,7 +834190,7 @@ _081BFE1A:
 	thumb_func_end sub_81BFB10
 
 	thumb_func_start sub_81BFE24
-sub_81BFE24: ; 81BFE24
+sub_81BFE24: @ 81BFE24
 	push {r4,lr}
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
@@ -834242,7 +834242,7 @@ sub_81BFE24: ; 81BFE24
 	thumb_func_end sub_81BFE24
 
 	thumb_func_start sub_81BFEB0
-sub_81BFEB0: ; 81BFEB0
+sub_81BFEB0: @ 81BFEB0
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r1, =0x0203cf1c
@@ -834426,7 +834426,7 @@ _081C008E:
 	thumb_func_end sub_81BFEB0
 
 	thumb_func_start sub_81C0098
-sub_81C0098: ; 81C0098
+sub_81C0098: @ 81C0098
 	push {r4,lr}
 	adds r3, r0, 0
 	ldr r0, =0x0203cf1c
@@ -834467,7 +834467,7 @@ _081C00E6:
 	thumb_func_end sub_81C0098
 
 	thumb_func_start sub_81C00F0
-sub_81C00F0: ; 81C00F0
+sub_81C00F0: @ 81C00F0
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -834734,7 +834734,7 @@ _081C0332:
 	thumb_func_end sub_81C00F0
 
 	thumb_func_start sub_81C0348
-sub_81C0348: ; 81C0348
+sub_81C0348: @ 81C0348
 	push {r4-r6,lr}
 	ldr r6, =0x0203cf1c
 	ldr r2, [r6]
@@ -834831,7 +834831,7 @@ _081C0416:
 	thumb_func_end sub_81C0348
 
 	thumb_func_start sub_81C0434
-sub_81C0434: ; 81C0434
+sub_81C0434: @ 81C0434
 	push {lr}
 	bl FreeAllWindowBuffers
 	ldr r0, =0x0203cf1c
@@ -834843,7 +834843,7 @@ sub_81C0434: ; 81C0434
 	thumb_func_end sub_81C0434
 
 	thumb_func_start sub_81C044C
-sub_81C044C: ; 81C044C
+sub_81C044C: @ 81C044C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -834871,7 +834871,7 @@ sub_81C044C: ; 81C044C
 	thumb_func_end sub_81C044C
 
 	thumb_func_start sub_81C0484
-sub_81C0484: ; 81C0484
+sub_81C0484: @ 81C0484
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -834923,7 +834923,7 @@ _081C04EC:
 	thumb_func_end sub_81C0484
 
 	thumb_func_start sub_81C0510
-sub_81C0510: ; 81C0510
+sub_81C0510: @ 81C0510
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -835037,7 +835037,7 @@ _081C05FE:
 	thumb_func_end sub_81C0510
 
 	thumb_func_start sub_81C0604
-sub_81C0604: ; 81C0604
+sub_81C0604: @ 81C0604
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -835153,7 +835153,7 @@ _081C06EE:
 	thumb_func_end sub_81C0604
 
 	thumb_func_start sub_81C0704
-sub_81C0704: ; 81C0704
+sub_81C0704: @ 81C0704
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -835360,7 +835360,7 @@ _081C08F2:
 	thumb_func_end sub_81C0704
 
 	thumb_func_start sub_81C08F8
-sub_81C08F8: ; 81C08F8
+sub_81C08F8: @ 81C08F8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -835451,7 +835451,7 @@ _081C09AE:
 	thumb_func_end sub_81C08F8
 
 	thumb_func_start sub_81C09B4
-sub_81C09B4: ; 81C09B4
+sub_81C09B4: @ 81C09B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -835531,7 +835531,7 @@ _081C0A44:
 	thumb_func_end sub_81C09B4
 
 	thumb_func_start sub_81C0A50
-sub_81C0A50: ; 81C0A50
+sub_81C0A50: @ 81C0A50
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xB
@@ -835563,7 +835563,7 @@ _081C0A86:
 	thumb_func_end sub_81C0A50
 
 	thumb_func_start sub_81C0A8C
-sub_81C0A8C: ; 81C0A8C
+sub_81C0A8C: @ 81C0A8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -835676,7 +835676,7 @@ _081C0B6E:
 	thumb_func_end sub_81C0A8C
 
 	thumb_func_start sub_81C0B8C
-sub_81C0B8C: ; 81C0B8C
+sub_81C0B8C: @ 81C0B8C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -835770,7 +835770,7 @@ _081C0C52:
 	thumb_func_end sub_81C0B8C
 
 	thumb_func_start sub_81C0C68
-sub_81C0C68: ; 81C0C68
+sub_81C0C68: @ 81C0C68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -835808,7 +835808,7 @@ sub_81C0C68: ; 81C0C68
 	thumb_func_end sub_81C0C68
 
 	thumb_func_start sub_81C0CC4
-sub_81C0CC4: ; 81C0CC4
+sub_81C0CC4: @ 81C0CC4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -835868,7 +835868,7 @@ _081C0D34:
 	thumb_func_end sub_81C0CC4
 
 	thumb_func_start sub_81C0D44
-sub_81C0D44: ; 81C0D44
+sub_81C0D44: @ 81C0D44
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -835958,7 +835958,7 @@ _081C0DD0:
 	thumb_func_end sub_81C0D44
 
 	thumb_func_start sub_81C0E24
-sub_81C0E24: ; 81C0E24
+sub_81C0E24: @ 81C0E24
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r1, [r0]
@@ -835977,7 +835977,7 @@ _081C0E3C:
 	thumb_func_end sub_81C0E24
 
 	thumb_func_start sub_81C0E48
-sub_81C0E48: ; 81C0E48
+sub_81C0E48: @ 81C0E48
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -836076,7 +836076,7 @@ _081C0EC4:
 	thumb_func_end sub_81C0E48
 
 	thumb_func_start sub_81C0F44
-sub_81C0F44: ; 81C0F44
+sub_81C0F44: @ 81C0F44
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -836184,7 +836184,7 @@ _081C103A:
 	thumb_func_end sub_81C0F44
 
 	thumb_func_start sub_81C1040
-sub_81C1040: ; 81C1040
+sub_81C1040: @ 81C1040
 	push {lr}
 	movs r1, 0x1
 	ldr r0, =0x0203cf1c
@@ -836213,7 +836213,7 @@ _081C106C:
 	thumb_func_end sub_81C1040
 
 	thumb_func_start sub_81C1070
-sub_81C1070: ; 81C1070
+sub_81C1070: @ 81C1070
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -836394,7 +836394,7 @@ _081C11E6:
 	thumb_func_end sub_81C1070
 
 	thumb_func_start sub_81C11F4
-sub_81C11F4: ; 81C11F4
+sub_81C11F4: @ 81C11F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -836458,7 +836458,7 @@ _081C125E:
 	thumb_func_end sub_81C11F4
 
 	thumb_func_start sub_81C129C
-sub_81C129C: ; 81C129C
+sub_81C129C: @ 81C129C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -836489,7 +836489,7 @@ sub_81C129C: ; 81C129C
 	thumb_func_end sub_81C129C
 
 	thumb_func_start sub_81C12E4
-sub_81C12E4: ; 81C12E4
+sub_81C12E4: @ 81C12E4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -836578,7 +836578,7 @@ _081C13AA:
 	thumb_func_end sub_81C12E4
 
 	thumb_func_start sub_81C13B0
-sub_81C13B0: ; 81C13B0
+sub_81C13B0: @ 81C13B0
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -836688,7 +836688,7 @@ _081C1464:
 	thumb_func_end sub_81C13B0
 
 	thumb_func_start sub_81C14BC
-sub_81C14BC: ; 81C14BC
+sub_81C14BC: @ 81C14BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -836836,7 +836836,7 @@ sub_81C14BC: ; 81C14BC
 	thumb_func_end sub_81C14BC
 
 	thumb_func_start sub_81C15EC
-sub_81C15EC: ; 81C15EC
+sub_81C15EC: @ 81C15EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -836984,7 +836984,7 @@ sub_81C15EC: ; 81C15EC
 	thumb_func_end sub_81C15EC
 
 	thumb_func_start sub_81C171C
-sub_81C171C: ; 81C171C
+sub_81C171C: @ 81C171C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -837006,7 +837006,7 @@ sub_81C171C: ; 81C171C
 	thumb_func_end sub_81C171C
 
 	thumb_func_start sub_81C174C
-sub_81C174C: ; 81C174C
+sub_81C174C: @ 81C174C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -837155,7 +837155,7 @@ _081C189A:
 	thumb_func_end sub_81C174C
 
 	thumb_func_start sub_81C18A8
-sub_81C18A8: ; 81C18A8
+sub_81C18A8: @ 81C18A8
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r2, [r0]
@@ -837192,7 +837192,7 @@ _081C18EE:
 	thumb_func_end sub_81C18A8
 
 	thumb_func_start sub_81C18F4
-sub_81C18F4: ; 81C18F4
+sub_81C18F4: @ 81C18F4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -837225,7 +837225,7 @@ sub_81C18F4: ; 81C18F4
 	thumb_func_end sub_81C18F4
 
 	thumb_func_start sub_81C1940
-sub_81C1940: ; 81C1940
+sub_81C1940: @ 81C1940
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -837478,7 +837478,7 @@ _081C1B74:
 	thumb_func_end sub_81C1940
 
 	thumb_func_start sub_81C1B94
-sub_81C1B94: ; 81C1B94
+sub_81C1B94: @ 81C1B94
 	ldr r0, =0x0203cf21
 	ldrb r0, [r0]
 	bx lr
@@ -837486,7 +837486,7 @@ sub_81C1B94: ; 81C1B94
 	thumb_func_end sub_81C1B94
 
 	thumb_func_start sub_81C1BA0
-sub_81C1BA0: ; 81C1BA0
+sub_81C1BA0: @ 81C1BA0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	movs r0, 0x20
@@ -837625,7 +837625,7 @@ _081C1C78:
 	thumb_func_end sub_81C1BA0
 
 	thumb_func_start sub_81C1CB0
-sub_81C1CB0: ; 81C1CB0
+sub_81C1CB0: @ 81C1CB0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -837747,7 +837747,7 @@ _081C1D8A:
 	thumb_func_end sub_81C1CB0
 
 	thumb_func_start sub_81C1DA4
-sub_81C1DA4: ; 81C1DA4
+sub_81C1DA4: @ 81C1DA4
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -837807,7 +837807,7 @@ _081C1E12:
 	thumb_func_end sub_81C1DA4
 
 	thumb_func_start sub_81C1E20
-sub_81C1E20: ; 81C1E20
+sub_81C1E20: @ 81C1E20
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -837905,7 +837905,7 @@ _081C1EE0:
 	thumb_func_end sub_81C1E20
 
 	thumb_func_start sub_81C1EFC
-sub_81C1EFC: ; 81C1EFC
+sub_81C1EFC: @ 81C1EFC
 	push {r4-r7,lr}
 	lsls r0, 16
 	lsrs r7, r0, 16
@@ -837968,7 +837968,7 @@ _081C1F70:
 	thumb_func_end sub_81C1EFC
 
 	thumb_func_start sub_81C1F80
-sub_81C1F80: ; 81C1F80
+sub_81C1F80: @ 81C1F80
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -838074,7 +838074,7 @@ _081C2058:
 	thumb_func_end sub_81C1F80
 
 	thumb_func_start sub_81C2074
-sub_81C2074: ; 81C2074
+sub_81C2074: @ 81C2074
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -838132,7 +838132,7 @@ _081C20E2:
 	thumb_func_end sub_81C2074
 
 	thumb_func_start sub_81C20F0
-sub_81C20F0: ; 81C20F0
+sub_81C20F0: @ 81C20F0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -838206,7 +838206,7 @@ _081C2180:
 	thumb_func_end sub_81C20F0
 
 	thumb_func_start sub_81C2194
-sub_81C2194: ; 81C2194
+sub_81C2194: @ 81C2194
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r2, 24
@@ -838282,7 +838282,7 @@ _081C221C:
 	thumb_func_end sub_81C2194
 
 	thumb_func_start sub_81C2228
-sub_81C2228: ; 81C2228
+sub_81C2228: @ 81C2228
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
@@ -838323,7 +838323,7 @@ _081C2266:
 	thumb_func_end sub_81C2228
 
 	thumb_func_start sub_81C228C
-sub_81C228C: ; 81C228C
+sub_81C228C: @ 81C228C
 	push {lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -838358,7 +838358,7 @@ _081C22C0:
 	thumb_func_end sub_81C228C
 
 	thumb_func_start sub_81C22CC
-sub_81C22CC: ; 81C22CC
+sub_81C22CC: @ 81C22CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -838514,7 +838514,7 @@ _081C23FE:
 	thumb_func_end sub_81C22CC
 
 	thumb_func_start sub_81C240C
-sub_81C240C: ; 81C240C
+sub_81C240C: @ 81C240C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -838648,7 +838648,7 @@ _081C2510:
 	thumb_func_end sub_81C240C
 
 	thumb_func_start sub_81C2524
-sub_81C2524: ; 81C2524
+sub_81C2524: @ 81C2524
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -838674,7 +838674,7 @@ _081C254E:
 	thumb_func_end sub_81C2524
 
 	thumb_func_start sub_81C2554
-sub_81C2554: ; 81C2554
+sub_81C2554: @ 81C2554
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_0861CC24
 	bl InitWindows
@@ -838712,7 +838712,7 @@ _081C257C:
 	thumb_func_end sub_81C2554
 
 	thumb_func_start sub_81C25A4
-sub_81C25A4: ; 81C25A4
+sub_81C25A4: @ 81C25A4
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r4, [sp, 0x24]
@@ -838747,7 +838747,7 @@ sub_81C25A4: ; 81C25A4
 	thumb_func_end sub_81C25A4
 
 	thumb_func_start sub_81C25E8
-sub_81C25E8: ; 81C25E8
+sub_81C25E8: @ 81C25E8
 	push {lr}
 	movs r0, 0x11
 	movs r1, 0
@@ -838777,7 +838777,7 @@ _081C261C:
 	thumb_func_end sub_81C25E8
 
 	thumb_func_start sub_81C2628
-sub_81C2628: ; 81C2628
+sub_81C2628: @ 81C2628
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -838925,7 +838925,7 @@ _081C26EE:
 	thumb_func_end sub_81C2628
 
 	thumb_func_start sub_81C2794
-sub_81C2794: ; 81C2794
+sub_81C2794: @ 81C2794
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -838957,7 +838957,7 @@ sub_81C2794: ; 81C2794
 	thumb_func_end sub_81C2794
 
 	thumb_func_start sub_81C27DC
-sub_81C27DC: ; 81C27DC
+sub_81C27DC: @ 81C27DC
 	push {lr}
 	sub sp, 0x8
 	lsls r1, 16
@@ -839003,7 +839003,7 @@ _081C282C:
 	thumb_func_end sub_81C27DC
 
 	thumb_func_start sub_81C2838
-sub_81C2838: ; 81C2838
+sub_81C2838: @ 81C2838
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -839031,7 +839031,7 @@ _081C284A:
 	thumb_func_end sub_81C2838
 
 	thumb_func_start sub_81C286C
-sub_81C286C: ; 81C286C
+sub_81C286C: @ 81C286C
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r1, =gUnknown_085EA3CF
@@ -839288,7 +839288,7 @@ _081C2930:
 	thumb_func_end sub_81C286C
 
 	thumb_func_start sub_81C2AFC
-sub_81C2AFC: ; 81C2AFC
+sub_81C2AFC: @ 81C2AFC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -839423,7 +839423,7 @@ _081C2C0A:
 	thumb_func_end sub_81C2AFC
 
 	thumb_func_start sub_81C2C38
-sub_81C2C38: ; 81C2C38
+sub_81C2C38: @ 81C2C38
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -839536,7 +839536,7 @@ _081C2D10:
 	thumb_func_end sub_81C2C38
 
 	thumb_func_start sub_81C2D2C
-sub_81C2D2C: ; 81C2D2C
+sub_81C2D2C: @ 81C2D2C
 	push {r4,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -839565,7 +839565,7 @@ _081C2D56:
 	thumb_func_end sub_81C2D2C
 
 	thumb_func_start sub_81C2D68
-sub_81C2D68: ; 81C2D68
+sub_81C2D68: @ 81C2D68
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -839590,7 +839590,7 @@ _081C2D8C:
 	thumb_func_end sub_81C2D68
 
 	thumb_func_start sub_81C2D9C
-sub_81C2D9C: ; 81C2D9C
+sub_81C2D9C: @ 81C2D9C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -839624,7 +839624,7 @@ _081C2DBA:
 	thumb_func_end sub_81C2D9C
 
 	thumb_func_start sub_81C2DE4
-sub_81C2DE4: ; 81C2DE4
+sub_81C2DE4: @ 81C2DE4
 	push {lr}
 	lsls r0, 24
 	ldr r1, =gUnknown_0861CE64
@@ -839639,7 +839639,7 @@ sub_81C2DE4: ; 81C2DE4
 	thumb_func_end sub_81C2DE4
 
 	thumb_func_start sub_81C2E00
-sub_81C2E00: ; 81C2E00
+sub_81C2E00: @ 81C2E00
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -839666,7 +839666,7 @@ _081C2E3C:
 	thumb_func_end sub_81C2E00
 
 	thumb_func_start sub_81C2E40
-sub_81C2E40: ; 81C2E40
+sub_81C2E40: @ 81C2E40
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -839729,7 +839729,7 @@ _081C2EBE:
 	thumb_func_end sub_81C2E40
 
 	thumb_func_start sub_81C2EC4
-sub_81C2EC4: ; 81C2EC4
+sub_81C2EC4: @ 81C2EC4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	bl sub_81A6BF4
@@ -839798,7 +839798,7 @@ _081C2F54:
 	thumb_func_end sub_81C2EC4
 
 	thumb_func_start sub_81C2F5C
-sub_81C2F5C: ; 81C2F5C
+sub_81C2F5C: @ 81C2F5C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl sub_81A6BF4
@@ -839851,7 +839851,7 @@ _081C2FC0:
 	thumb_func_end sub_81C2F5C
 
 	thumb_func_start sub_81C2FD8
-sub_81C2FD8: ; 81C2FD8
+sub_81C2FD8: @ 81C2FD8
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -839889,7 +839889,7 @@ sub_81C2FD8: ; 81C2FD8
 	thumb_func_end sub_81C2FD8
 
 	thumb_func_start sub_81C302C
-sub_81C302C: ; 81C302C
+sub_81C302C: @ 81C302C
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -839925,7 +839925,7 @@ sub_81C302C: ; 81C302C
 	thumb_func_end sub_81C302C
 
 	thumb_func_start sub_81C307C
-sub_81C307C: ; 81C307C
+sub_81C307C: @ 81C307C
 	push {r4-r6,lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -840037,7 +840037,7 @@ _081C3182:
 	thumb_func_end sub_81C307C
 
 	thumb_func_start sub_81C3194
-sub_81C3194: ; 81C3194
+sub_81C3194: @ 81C3194
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0861CCCC
@@ -840058,7 +840058,7 @@ sub_81C3194: ; 81C3194
 	thumb_func_end sub_81C3194
 
 	thumb_func_start sub_81C31C0
-sub_81C31C0: ; 81C31C0
+sub_81C31C0: @ 81C31C0
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -840079,7 +840079,7 @@ sub_81C31C0: ; 81C31C0
 	thumb_func_end sub_81C31C0
 
 	thumb_func_start sub_81C31F0
-sub_81C31F0: ; 81C31F0
+sub_81C31F0: @ 81C31F0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203cf1c
@@ -840104,7 +840104,7 @@ _081C3202:
 	thumb_func_end sub_81C31F0
 
 	thumb_func_start sub_81C3220
-sub_81C3220: ; 81C3220
+sub_81C3220: @ 81C3220
 	push {r4-r6,lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -840174,7 +840174,7 @@ _081C32B6:
 	thumb_func_end sub_81C3220
 
 	thumb_func_start sub_81C32BC
-sub_81C32BC: ; 81C32BC
+sub_81C32BC: @ 81C32BC
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -840196,7 +840196,7 @@ _081C32DA:
 	thumb_func_end sub_81C32BC
 
 	thumb_func_start sub_81C32E0
-sub_81C32E0: ; 81C32E0
+sub_81C32E0: @ 81C32E0
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -840218,7 +840218,7 @@ _081C32FE:
 	thumb_func_end sub_81C32E0
 
 	thumb_func_start sub_81C3304
-sub_81C3304: ; 81C3304
+sub_81C3304: @ 81C3304
 	push {lr}
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
@@ -840258,7 +840258,7 @@ _081C3356:
 	thumb_func_end sub_81C3304
 
 	thumb_func_start sub_81C335C
-sub_81C335C: ; 81C335C
+sub_81C335C: @ 81C335C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -840308,7 +840308,7 @@ sub_81C335C: ; 81C335C
 	thumb_func_end sub_81C335C
 
 	thumb_func_start sub_81C33CC
-sub_81C33CC: ; 81C33CC
+sub_81C33CC: @ 81C33CC
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r5, =0x02021cc4
@@ -840346,7 +840346,7 @@ sub_81C33CC: ; 81C33CC
 	thumb_func_end sub_81C33CC
 
 	thumb_func_start sub_81C3428
-sub_81C3428: ; 81C3428
+sub_81C3428: @ 81C3428
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -840399,7 +840399,7 @@ _081C346C:
 	thumb_func_end sub_81C3428
 
 	thumb_func_start sub_81C349C
-sub_81C349C: ; 81C349C
+sub_81C349C: @ 81C349C
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -840465,7 +840465,7 @@ _081C3502:
 	thumb_func_end sub_81C349C
 
 	thumb_func_start sub_81C3530
-sub_81C3530: ; 81C3530
+sub_81C3530: @ 81C3530
 	push {lr}
 	bl sub_81C35E4
 	bl sub_81C3690
@@ -840479,7 +840479,7 @@ sub_81C3530: ; 81C3530
 	thumb_func_end sub_81C3530
 
 	thumb_func_start sub_81C3554
-sub_81C3554: ; 81C3554
+sub_81C3554: @ 81C3554
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -840546,7 +840546,7 @@ _081C35DC:
 	thumb_func_end sub_81C3554
 
 	thumb_func_start sub_81C35E4
-sub_81C35E4: ; 81C35E4
+sub_81C35E4: @ 81C35E4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r4, =0x0203cf1c
@@ -840622,7 +840622,7 @@ _081C3650:
 	thumb_func_end sub_81C35E4
 
 	thumb_func_start sub_81C3690
-sub_81C3690: ; 81C3690
+sub_81C3690: @ 81C3690
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -840675,7 +840675,7 @@ _081C36C8:
 	thumb_func_end sub_81C3690
 
 	thumb_func_start sub_81C3710
-sub_81C3710: ; 81C3710
+sub_81C3710: @ 81C3710
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -840755,7 +840755,7 @@ sub_81C3710: ; 81C3710
 	thumb_func_end sub_81C3710
 
 	thumb_func_start sub_81C37D8
-sub_81C37D8: ; 81C37D8
+sub_81C37D8: @ 81C37D8
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0861CCEC
@@ -840777,7 +840777,7 @@ sub_81C37D8: ; 81C37D8
 	thumb_func_end sub_81C37D8
 
 	thumb_func_start sub_81C3808
-sub_81C3808: ; 81C3808
+sub_81C3808: @ 81C3808
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -840829,7 +840829,7 @@ sub_81C3808: ; 81C3808
 	thumb_func_end sub_81C3808
 
 	thumb_func_start sub_81C3890
-sub_81C3890: ; 81C3890
+sub_81C3890: @ 81C3890
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0861CCEC
@@ -840851,7 +840851,7 @@ sub_81C3890: ; 81C3890
 	thumb_func_end sub_81C3890
 
 	thumb_func_start sub_81C38C0
-sub_81C38C0: ; 81C38C0
+sub_81C38C0: @ 81C38C0
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r0, =0x0203cf1c
@@ -840937,7 +840937,7 @@ _081C394A:
 	thumb_func_end sub_81C38C0
 
 	thumb_func_start sub_81C3984
-sub_81C3984: ; 81C3984
+sub_81C3984: @ 81C3984
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C3B08
@@ -840983,7 +840983,7 @@ _081C39EA:
 	thumb_func_end sub_81C3984
 
 	thumb_func_start sub_81C39F0
-sub_81C39F0: ; 81C39F0
+sub_81C39F0: @ 81C39F0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -841104,7 +841104,7 @@ _081C3B02:
 	thumb_func_end sub_81C39F0
 
 	thumb_func_start sub_81C3B08
-sub_81C3B08: ; 81C3B08
+sub_81C3B08: @ 81C3B08
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -841248,7 +841248,7 @@ _081C3C26:
 	thumb_func_end sub_81C3B08
 
 	thumb_func_start sub_81C3C5C
-sub_81C3C5C: ; 81C3C5C
+sub_81C3C5C: @ 81C3C5C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -841327,7 +841327,7 @@ _081C3CFC:
 	thumb_func_end sub_81C3C5C
 
 	thumb_func_start sub_81C3D08
-sub_81C3D08: ; 81C3D08
+sub_81C3D08: @ 81C3D08
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C3B08
@@ -841358,7 +841358,7 @@ _081C3D40:
 	thumb_func_end sub_81C3D08
 
 	thumb_func_start sub_81C3D54
-sub_81C3D54: ; 81C3D54
+sub_81C3D54: @ 81C3D54
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -841453,7 +841453,7 @@ _081C3E26:
 	thumb_func_end sub_81C3D54
 
 	thumb_func_start sub_81C3E2C
-sub_81C3E2C: ; 81C3E2C
+sub_81C3E2C: @ 81C3E2C
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -841503,7 +841503,7 @@ _081C3E82:
 	thumb_func_end sub_81C3E2C
 
 	thumb_func_start sub_81C3E9C
-sub_81C3E9C: ; 81C3E9C
+sub_81C3E9C: @ 81C3E9C
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -841576,7 +841576,7 @@ _081C3F36:
 	thumb_func_end sub_81C3E9C
 
 	thumb_func_start sub_81C3F44
-sub_81C3F44: ; 81C3F44
+sub_81C3F44: @ 81C3F44
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -841696,7 +841696,7 @@ _081C4044:
 	thumb_func_end sub_81C3F44
 
 	thumb_func_start sub_81C4064
-sub_81C4064: ; 81C4064
+sub_81C4064: @ 81C4064
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0861CD14
@@ -841725,7 +841725,7 @@ sub_81C4064: ; 81C4064
 	thumb_func_end sub_81C4064
 
 	thumb_func_start sub_81C40A0
-sub_81C40A0: ; 81C40A0
+sub_81C40A0: @ 81C40A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -841810,7 +841810,7 @@ sub_81C40A0: ; 81C40A0
 	thumb_func_end sub_81C40A0
 
 	thumb_func_start sub_81C4154
-sub_81C4154: ; 81C4154
+sub_81C4154: @ 81C4154
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r0, =gUnknown_0861CD14
@@ -841838,7 +841838,7 @@ sub_81C4154: ; 81C4154
 	thumb_func_end sub_81C4154
 
 	thumb_func_start sub_81C4190
-sub_81C4190: ; 81C4190
+sub_81C4190: @ 81C4190
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, =0x0203cf1c
@@ -841863,7 +841863,7 @@ _081C419A:
 	thumb_func_end sub_81C4190
 
 	thumb_func_start sub_81C41C0
-sub_81C41C0: ; 81C41C0
+sub_81C41C0: @ 81C41C0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -841896,7 +841896,7 @@ _081C41F2:
 	thumb_func_end sub_81C41C0
 
 	thumb_func_start sub_81C4204
-sub_81C4204: ; 81C4204
+sub_81C4204: @ 81C4204
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -841930,7 +841930,7 @@ sub_81C4204: ; 81C4204
 	thumb_func_end sub_81C4204
 
 	thumb_func_start sub_81C424C
-sub_81C424C: ; 81C424C
+sub_81C424C: @ 81C424C
 	push {r4,lr}
 	movs r4, 0x3
 _081C4250:
@@ -841958,7 +841958,7 @@ _081C4268:
 	thumb_func_end sub_81C424C
 
 	thumb_func_start sub_81C4280
-sub_81C4280: ; 81C4280
+sub_81C4280: @ 81C4280
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -841993,7 +841993,7 @@ _081C42C2:
 	thumb_func_end sub_81C4280
 
 	thumb_func_start sub_81C42C8
-sub_81C42C8: ; 81C42C8
+sub_81C42C8: @ 81C42C8
 	push {r4,r5,lr}
 	movs r4, 0x3
 	ldr r5, =0x0203cf1c
@@ -842031,7 +842031,7 @@ _081C42F2:
 	thumb_func_end sub_81C42C8
 
 	thumb_func_start sub_81C4318
-sub_81C4318: ; 81C4318
+sub_81C4318: @ 81C4318
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -842093,7 +842093,7 @@ sub_81C4318: ; 81C4318
 	thumb_func_end sub_81C4318
 
 	thumb_func_start sub_81C43A0
-sub_81C43A0: ; 81C43A0
+sub_81C43A0: @ 81C43A0
 	push {r4,r5,lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -842154,7 +842154,7 @@ _081C4418:
 	thumb_func_end sub_81C43A0
 
 	thumb_func_start sub_81C4420
-sub_81C4420: ; 81C4420
+sub_81C4420: @ 81C4420
 	push {r4-r6,lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -842206,7 +842206,7 @@ _081C4474:
 	thumb_func_end sub_81C4420
 
 	thumb_func_start sub_81C4484
-sub_81C4484: ; 81C4484
+sub_81C4484: @ 81C4484
 	push {r4,r5,lr}
 	ldr r0, =0x0203cf1c
 	ldr r0, [r0]
@@ -842261,7 +842261,7 @@ _081C44E0:
 	thumb_func_end sub_81C4484
 
 	thumb_func_start sub_81C44F0
-sub_81C44F0: ; 81C44F0
+sub_81C44F0: @ 81C44F0
 	push {lr}
 	ldr r0, =0x0203cf1c
 	ldr r1, [r0]
@@ -842317,7 +842317,7 @@ _081C4560:
 	thumb_func_end sub_81C44F0
 
 	thumb_func_start sub_81C4568
-sub_81C4568: ; 81C4568
+sub_81C4568: @ 81C4568
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -842385,7 +842385,7 @@ sub_81C4568: ; 81C4568
 	thumb_func_end sub_81C4568
 
 	thumb_func_start sub_81C45F4
-sub_81C45F4: ; 81C45F4
+sub_81C45F4: @ 81C45F4
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r6, r1, 0
@@ -842552,7 +842552,7 @@ _081C4770:
 	thumb_func_end sub_81C45F4
 
 	thumb_func_start sub_81C4778
-sub_81C4778: ; 81C4778
+sub_81C4778: @ 81C4778
 	push {r4,lr}
 	ldr r0, =0x0203cf1c
 	ldr r1, [r0]
@@ -842584,7 +842584,7 @@ _081C47AE:
 	thumb_func_end sub_81C4778
 
 	thumb_func_start sub_81C47B4
-sub_81C47B4: ; 81C47B4
+sub_81C47B4: @ 81C47B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -842650,7 +842650,7 @@ _081C4836:
 	thumb_func_end sub_81C47B4
 
 	thumb_func_start sub_81C4844
-sub_81C4844: ; 81C4844
+sub_81C4844: @ 81C4844
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203cf1c
@@ -842685,7 +842685,7 @@ _081C487E:
 	thumb_func_end sub_81C4844
 
 	thumb_func_start sub_81C488C
-sub_81C488C: ; 81C488C
+sub_81C488C: @ 81C488C
 	ldr r1, =0x0203cf24
 	strb r0, [r1]
 	bx lr
@@ -842693,7 +842693,7 @@ sub_81C488C: ; 81C488C
 	thumb_func_end sub_81C488C
 
 	thumb_func_start sub_81C4898
-sub_81C4898: ; 81C4898
+sub_81C4898: @ 81C4898
 	push {r4,lr}
 	ldr r4, =0x0203cf24
 	ldrb r0, [r4]
@@ -842710,7 +842710,7 @@ _081C48AA:
 	thumb_func_end sub_81C4898
 
 	thumb_func_start sub_81C48B4
-sub_81C48B4: ; 81C48B4
+sub_81C48B4: @ 81C48B4
 	push {lr}
 	ldr r2, =0x02020630
 	ldr r0, =0x0203cf1c
@@ -842738,7 +842738,7 @@ _081C48EA:
 	thumb_func_end sub_81C48B4
 
 	thumb_func_start sub_81C48F0
-sub_81C48F0: ; 81C48F0
+sub_81C48F0: @ 81C48F0
 	push {r4-r6,lr}
 	ldr r6, =0x02020630
 	ldr r5, =0x0203cf1c
@@ -842804,7 +842804,7 @@ _081C494C:
 	thumb_func_end sub_81C48F0
 
 	thumb_func_start sub_81C4984
-sub_81C4984: ; 81C4984
+sub_81C4984: @ 81C4984
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldr r1, =0x00007533
@@ -842847,7 +842847,7 @@ _081C49CE:
 	thumb_func_end sub_81C4984
 
 	thumb_func_start sub_81C49E0
-sub_81C49E0: ; 81C49E0
+sub_81C49E0: @ 81C49E0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x0203cf1c
@@ -842865,7 +842865,7 @@ sub_81C49E0: ; 81C49E0
 	thumb_func_end sub_81C49E0
 
 	thumb_func_start sub_81C4A08
-sub_81C4A08: ; 81C4A08
+sub_81C4A08: @ 81C4A08
 	push {r4,lr}
 	movs r1, 0x26
 	bl pokemon_getattr
@@ -842919,7 +842919,7 @@ sub_81C4A08: ; 81C4A08
 	thumb_func_end sub_81C4A08
 
 	thumb_func_start sub_81C4A88
-sub_81C4A88: ; 81C4A88
+sub_81C4A88: @ 81C4A88
 	push {r4,r5,lr}
 	ldr r5, =0x0203cf1c
 	ldr r0, [r5]
@@ -842968,7 +842968,7 @@ _081C4AF0:
 	thumb_func_end sub_81C4A88
 
 	thumb_func_start sub_81C4AF8
-sub_81C4AF8: ; 81C4AF8
+sub_81C4AF8: @ 81C4AF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -843082,7 +843082,7 @@ _081C4BD2:
 	thumb_func_end sub_81C4AF8
 
 	thumb_func_start sub_81C4BE4
-sub_81C4BE4: ; 81C4BE4
+sub_81C4BE4: @ 81C4BE4
 	push {lr}
 	adds r3, r0, 0
 	adds r0, 0x2A
@@ -843147,7 +843147,7 @@ _081C4C4A:
 	thumb_func_end sub_81C4BE4
 
 	thumb_func_start sub_81C4C60
-sub_81C4C60: ; 81C4C60
+sub_81C4C60: @ 81C4C60
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -843168,7 +843168,7 @@ _081C4C68:
 	thumb_func_end sub_81C4C60
 
 	thumb_func_start sub_81C4C84
-sub_81C4C84: ; 81C4C84
+sub_81C4C84: @ 81C4C84
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -843243,7 +843243,7 @@ _081C4D02:
 	thumb_func_end sub_81C4C84
 
 	thumb_func_start sub_81C4D18
-sub_81C4D18: ; 81C4D18
+sub_81C4D18: @ 81C4D18
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -843287,7 +843287,7 @@ _081C4D32:
 	thumb_func_end sub_81C4D18
 
 	thumb_func_start sub_81C4D70
-sub_81C4D70: ; 81C4D70
+sub_81C4D70: @ 81C4D70
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -843406,7 +843406,7 @@ _081C4E2E:
 	thumb_func_end sub_81C4D70
 
 	thumb_func_start sub_81C4E90
-sub_81C4E90: ; 81C4E90
+sub_81C4E90: @ 81C4E90
 	push {lr}
 	bl free_temp_tile_data_buffers_if_possible
 	lsls r0, 24
@@ -843427,7 +843427,7 @@ _081C4EAC:
 	thumb_func_end sub_81C4E90
 
 	thumb_func_start sub_81C4EB4
-sub_81C4EB4: ; 81C4EB4
+sub_81C4EB4: @ 81C4EB4
 	push {r4,lr}
 	ldr r4, =0x0203cf28
 	ldr r0, [r4]
@@ -843444,7 +843444,7 @@ _081C4EC6:
 	thumb_func_end sub_81C4EB4
 
 	thumb_func_start sub_81C4ED0
-sub_81C4ED0: ; 81C4ED0
+sub_81C4ED0: @ 81C4ED0
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x0203cf28
@@ -843459,7 +843459,7 @@ sub_81C4ED0: ; 81C4ED0
 	thumb_func_end sub_81C4ED0
 
 	thumb_func_start sub_81C4EEC
-sub_81C4EEC: ; 81C4EEC
+sub_81C4EEC: @ 81C4EEC
 	ldr r1, =0x0203cf30
 	movs r0, 0
 	strh r0, [r1, 0x6]
@@ -843469,7 +843469,7 @@ sub_81C4EEC: ; 81C4EEC
 	thumb_func_end sub_81C4EEC
 
 	thumb_func_start sub_81C4EFC
-sub_81C4EFC: ; 81C4EFC
+sub_81C4EFC: @ 81C4EFC
 	push {lr}
 	ldr r1, =sub_8086194
 	movs r0, 0
@@ -843480,7 +843480,7 @@ sub_81C4EFC: ; 81C4EFC
 	thumb_func_end sub_81C4EFC
 
 	thumb_func_start sub_81C4F10
-sub_81C4F10: ; 81C4F10
+sub_81C4F10: @ 81C4F10
 	push {lr}
 	ldr r1, =sub_8059D50
 	movs r0, 0x1
@@ -843491,7 +843491,7 @@ sub_81C4F10: ; 81C4F10
 	thumb_func_end sub_81C4F10
 
 	thumb_func_start sub_81C4F24
-sub_81C4F24: ; 81C4F24
+sub_81C4F24: @ 81C4F24
 	push {lr}
 	bl script_env_2_enable
 	movs r0, 0x1
@@ -843506,7 +843506,7 @@ sub_81C4F24: ; 81C4F24
 	thumb_func_end sub_81C4F24
 
 	thumb_func_start sub_81C4F44
-sub_81C4F44: ; 81C4F44
+sub_81C4F44: @ 81C4F44
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -843533,7 +843533,7 @@ _081C4F6E:
 	thumb_func_end sub_81C4F44
 
 	thumb_func_start sub_81C4F84
-sub_81C4F84: ; 81C4F84
+sub_81C4F84: @ 81C4F84
 	push {lr}
 	ldr r0, =0x0203cf30
 	ldr r1, [r0]
@@ -843545,7 +843545,7 @@ sub_81C4F84: ; 81C4F84
 	thumb_func_end sub_81C4F84
 
 	thumb_func_start sub_81C4F98
-sub_81C4F98: ; 81C4F98
+sub_81C4F98: @ 81C4F98
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -843598,7 +843598,7 @@ _081C4FBA:
 	thumb_func_end sub_81C4F98
 
 	thumb_func_start sub_81C501C
-sub_81C501C: ; 81C501C
+sub_81C501C: @ 81C501C
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -843610,7 +843610,7 @@ sub_81C501C: ; 81C501C
 	thumb_func_end sub_81C501C
 
 	thumb_func_start sub_81C5038
-sub_81C5038: ; 81C5038
+sub_81C5038: @ 81C5038
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -843620,7 +843620,7 @@ sub_81C5038: ; 81C5038
 	thumb_func_end sub_81C5038
 
 	thumb_func_start sub_81C504C
-sub_81C504C: ; 81C504C
+sub_81C504C: @ 81C504C
 	push {lr}
 _081C504E:
 	bl sub_81221EC
@@ -843644,7 +843644,7 @@ _081C5072:
 	thumb_func_end sub_81C504C
 
 	thumb_func_start sub_81C5078
-sub_81C5078: ; 81C5078
+sub_81C5078: @ 81C5078
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x030022c0
@@ -843796,7 +843796,7 @@ _081C51D6:
 	thumb_func_end sub_81C5078
 
 	thumb_func_start sub_81C51DC
-sub_81C51DC: ; 81C51DC
+sub_81C51DC: @ 81C51DC
 	push {lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -843832,7 +843832,7 @@ sub_81C51DC: ; 81C51DC
 	thumb_func_end sub_81C51DC
 
 	thumb_func_start sub_81C5238
-sub_81C5238: ; 81C5238
+sub_81C5238: @ 81C5238
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =0x0203cf2c
@@ -843926,7 +843926,7 @@ _081C530A:
 	thumb_func_end sub_81C5238
 
 	thumb_func_start sub_81C5314
-sub_81C5314: ; 81C5314
+sub_81C5314: @ 81C5314
 	push {r4-r7,lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -844031,7 +844031,7 @@ _081C5382:
 	thumb_func_end sub_81C5314
 
 	thumb_func_start sub_81C540C
-sub_81C540C: ; 81C540C
+sub_81C540C: @ 81C540C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 16
@@ -844067,7 +844067,7 @@ _081C5458:
 	thumb_func_end sub_81C540C
 
 	thumb_func_start sub_81C5460
-sub_81C5460: ; 81C5460
+sub_81C5460: @ 81C5460
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -844144,7 +844144,7 @@ _081C5504:
 	thumb_func_end sub_81C5460
 
 	thumb_func_start sub_81C5518
-sub_81C5518: ; 81C5518
+sub_81C5518: @ 81C5518
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r1, 0
@@ -844226,7 +844226,7 @@ _081C55B8:
 	thumb_func_end sub_81C5518
 
 	thumb_func_start sub_81C55D8
-sub_81C55D8: ; 81C55D8
+sub_81C55D8: @ 81C55D8
 	push {r4,lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -844289,7 +844289,7 @@ _081C5638:
 	thumb_func_end sub_81C55D8
 
 	thumb_func_start sub_81C5674
-sub_81C5674: ; 81C5674
+sub_81C5674: @ 81C5674
 	push {r4,lr}
 	sub sp, 0x10
 	ldr r4, =0x0203cf2c
@@ -844330,7 +844330,7 @@ _081C56B4:
 	thumb_func_end sub_81C5674
 
 	thumb_func_start sub_81C56CC
-sub_81C56CC: ; 81C56CC
+sub_81C56CC: @ 81C56CC
 	push {r4,lr}
 	ldr r4, =0x0203cf2c
 	ldr r0, [r4]
@@ -844353,7 +844353,7 @@ _081C56EA:
 	thumb_func_end sub_81C56CC
 
 	thumb_func_start sub_81C56F8
-sub_81C56F8: ; 81C56F8
+sub_81C56F8: @ 81C56F8
 	push {r4,lr}
 	ldr r0, =sub_81C5BC8
 	movs r1, 0
@@ -844380,7 +844380,7 @@ sub_81C56F8: ; 81C56F8
 	thumb_func_end sub_81C56F8
 
 	thumb_func_start sub_81C5738
-sub_81C5738: ; 81C5738
+sub_81C5738: @ 81C5738
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -844433,7 +844433,7 @@ sub_81C5738: ; 81C5738
 	thumb_func_end sub_81C5738
 
 	thumb_func_start sub_81C57A8
-sub_81C57A8: ; 81C57A8
+sub_81C57A8: @ 81C57A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -844532,7 +844532,7 @@ _081C5862:
 	thumb_func_end sub_81C57A8
 
 	thumb_func_start sub_81C586C
-sub_81C586C: ; 81C586C
+sub_81C586C: @ 81C586C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -844627,7 +844627,7 @@ _081C58FE:
 	thumb_func_end sub_81C586C
 
 	thumb_func_start sub_81C5924
-sub_81C5924: ; 81C5924
+sub_81C5924: @ 81C5924
 	push {r4-r6,lr}
 	ldr r0, =0x03005d90
 	ldr r2, [r0]
@@ -844698,7 +844698,7 @@ _081C59B2:
 	thumb_func_end sub_81C5924
 
 	thumb_func_start sub_81C59BC
-sub_81C59BC: ; 81C59BC
+sub_81C59BC: @ 81C59BC
 	push {r4,r5,lr}
 	ldr r0, =0x0203cf30
 	ldrh r1, [r0, 0x8]
@@ -844746,7 +844746,7 @@ _081C5A18:
 	thumb_func_end sub_81C59BC
 
 	thumb_func_start sub_81C5A20
-sub_81C5A20: ; 81C5A20
+sub_81C5A20: @ 81C5A20
 	push {r4-r7,lr}
 	ldr r0, =0x0203cf30
 	ldrh r1, [r0, 0x6]
@@ -844804,7 +844804,7 @@ _081C5A80:
 	thumb_func_end sub_81C5A20
 
 	thumb_func_start sub_81C5A98
-sub_81C5A98: ; 81C5A98
+sub_81C5A98: @ 81C5A98
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -844822,7 +844822,7 @@ sub_81C5A98: ; 81C5A98
 	thumb_func_end sub_81C5A98
 
 	thumb_func_start sub_81C5AB8
-sub_81C5AB8: ; 81C5AB8
+sub_81C5AB8: @ 81C5AB8
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -844869,7 +844869,7 @@ _081C5B08:
 	thumb_func_end sub_81C5AB8
 
 	thumb_func_start sub_81C5B14
-sub_81C5B14: ; 81C5B14
+sub_81C5B14: @ 81C5B14
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -844897,7 +844897,7 @@ sub_81C5B14: ; 81C5B14
 	thumb_func_end sub_81C5B14
 
 	thumb_func_start sub_81C5B4C
-sub_81C5B4C: ; 81C5B4C
+sub_81C5B4C: @ 81C5B4C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -844948,7 +844948,7 @@ _081C5BBC:
 	thumb_func_end sub_81C5B4C
 
 	thumb_func_start sub_81C5BC8
-sub_81C5BC8: ; 81C5BC8
+sub_81C5BC8: @ 81C5BC8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -845095,7 +845095,7 @@ _081C5D16:
 	thumb_func_end sub_81C5BC8
 
 	thumb_func_start sub_81C5D20
-sub_81C5D20: ; 81C5D20
+sub_81C5D20: @ 81C5D20
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -845253,7 +845253,7 @@ _081C5E98:
 	thumb_func_end sub_81C5D20
 
 	thumb_func_start sub_81C5EAC
-sub_81C5EAC: ; 81C5EAC
+sub_81C5EAC: @ 81C5EAC
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -845295,7 +845295,7 @@ sub_81C5EAC: ; 81C5EAC
 	thumb_func_end sub_81C5EAC
 
 	thumb_func_start sub_81C5F08
-sub_81C5F08: ; 81C5F08
+sub_81C5F08: @ 81C5F08
 	push {r4-r6,lr}
 	sub sp, 0x14
 	adds r4, r0, 0
@@ -845339,7 +845339,7 @@ sub_81C5F08: ; 81C5F08
 	thumb_func_end sub_81C5F08
 
 	thumb_func_start sub_81C5F68
-sub_81C5F68: ; 81C5F68
+sub_81C5F68: @ 81C5F68
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -845394,7 +845394,7 @@ _081C5FD0:
 	thumb_func_end sub_81C5F68
 
 	thumb_func_start sub_81C5FE4
-sub_81C5FE4: ; 81C5FE4
+sub_81C5FE4: @ 81C5FE4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -845577,7 +845577,7 @@ _081C6160:
 	thumb_func_end sub_81C5FE4
 
 	thumb_func_start sub_81C616C
-sub_81C616C: ; 81C616C
+sub_81C616C: @ 81C616C
 	push {lr}
 	lsls r0, 24
 	asrs r1, r0, 24
@@ -845609,7 +845609,7 @@ _081C61A2:
 	thumb_func_end sub_81C616C
 
 	thumb_func_start sub_81C61A8
-sub_81C61A8: ; 81C61A8
+sub_81C61A8: @ 81C61A8
 	push {lr}
 	ldr r0, =0x0203cf2c
 	ldr r0, [r0]
@@ -845638,7 +845638,7 @@ _081C61DA:
 	thumb_func_end sub_81C61A8
 
 	thumb_func_start sub_81C61E0
-sub_81C61E0: ; 81C61E0
+sub_81C61E0: @ 81C61E0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -845690,7 +845690,7 @@ _081C6252:
 	thumb_func_end sub_81C61E0
 
 	thumb_func_start sub_81C6258
-sub_81C6258: ; 81C6258
+sub_81C6258: @ 81C6258
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -845720,7 +845720,7 @@ sub_81C6258: ; 81C6258
 	thumb_func_end sub_81C6258
 
 	thumb_func_start sub_81C629C
-sub_81C629C: ; 81C629C
+sub_81C629C: @ 81C629C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -845740,7 +845740,7 @@ sub_81C629C: ; 81C629C
 	thumb_func_end sub_81C629C
 
 	thumb_func_start sub_81C62C4
-sub_81C62C4: ; 81C62C4
+sub_81C62C4: @ 81C62C4
 	push {r4-r7,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -845798,7 +845798,7 @@ _081C6334:
 	thumb_func_end sub_81C62C4
 
 	thumb_func_start sub_81C6350
-sub_81C6350: ; 81C6350
+sub_81C6350: @ 81C6350
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -845847,7 +845847,7 @@ sub_81C6350: ; 81C6350
 	thumb_func_end sub_81C6350
 
 	thumb_func_start sub_81C63D0
-sub_81C63D0: ; 81C63D0
+sub_81C63D0: @ 81C63D0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -845872,7 +845872,7 @@ sub_81C63D0: ; 81C63D0
 	thumb_func_end sub_81C63D0
 
 	thumb_func_start sub_81C6404
-sub_81C6404: ; 81C6404
+sub_81C6404: @ 81C6404
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x02021cc4
@@ -845910,7 +845910,7 @@ sub_81C6404: ; 81C6404
 	thumb_func_end sub_81C6404
 
 	thumb_func_start sub_81C645C
-sub_81C645C: ; 81C645C
+sub_81C645C: @ 81C645C
 	push {r4,lr}
 	sub sp, 0xC
 	adds r1, r0, 0
@@ -845948,7 +845948,7 @@ sub_81C645C: ; 81C645C
 	thumb_func_end sub_81C645C
 
 	thumb_func_start sub_81C64B4
-sub_81C64B4: ; 81C64B4
+sub_81C64B4: @ 81C64B4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -846014,7 +846014,7 @@ _081C6544:
 	thumb_func_end sub_81C64B4
 
 	thumb_func_start sub_81C654C
-sub_81C654C: ; 81C654C
+sub_81C654C: @ 81C654C
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -846063,7 +846063,7 @@ sub_81C654C: ; 81C654C
 	thumb_func_end sub_81C654C
 
 	thumb_func_start sub_81C65CC
-sub_81C65CC: ; 81C65CC
+sub_81C65CC: @ 81C65CC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -846112,7 +846112,7 @@ _081C662E:
 	thumb_func_end sub_81C65CC
 
 	thumb_func_start sub_81C6648
-sub_81C6648: ; 81C6648
+sub_81C6648: @ 81C6648
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -846155,7 +846155,7 @@ _081C66A6:
 	thumb_func_end sub_81C6648
 
 	thumb_func_start sub_81C66AC
-sub_81C66AC: ; 81C66AC
+sub_81C66AC: @ 81C66AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -846179,7 +846179,7 @@ sub_81C66AC: ; 81C66AC
 	thumb_func_end sub_81C66AC
 
 	thumb_func_start sub_81C66EC
-sub_81C66EC: ; 81C66EC
+sub_81C66EC: @ 81C66EC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -846201,7 +846201,7 @@ _081C670A:
 	thumb_func_end sub_81C66EC
 
 	thumb_func_start sub_81C6714
-sub_81C6714: ; 81C6714
+sub_81C6714: @ 81C6714
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r5, 24
@@ -846227,7 +846227,7 @@ sub_81C6714: ; 81C6714
 	thumb_func_end sub_81C6714
 
 	thumb_func_start sub_81C674C
-sub_81C674C: ; 81C674C
+sub_81C674C: @ 81C674C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -846263,7 +846263,7 @@ _081C6796:
 	thumb_func_end sub_81C674C
 
 	thumb_func_start sub_81C679C
-sub_81C679C: ; 81C679C
+sub_81C679C: @ 81C679C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -846286,7 +846286,7 @@ _081C67C0:
 	thumb_func_end sub_81C679C
 
 	thumb_func_start sub_81C67CC
-sub_81C67CC: ; 81C67CC
+sub_81C67CC: @ 81C67CC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -846375,7 +846375,7 @@ sub_81C67CC: ; 81C67CC
 	thumb_func_end sub_81C67CC
 
 	thumb_func_start sub_81C68B0
-sub_81C68B0: ; 81C68B0
+sub_81C68B0: @ 81C68B0
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -846454,7 +846454,7 @@ _081C695C:
 	thumb_func_end sub_81C68B0
 
 	thumb_func_start sub_81C6964
-sub_81C6964: ; 81C6964
+sub_81C6964: @ 81C6964
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -846533,7 +846533,7 @@ _081C69FC:
 	thumb_func_end sub_81C6964
 
 	thumb_func_start sub_81C6A14
-sub_81C6A14: ; 81C6A14
+sub_81C6A14: @ 81C6A14
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -846587,7 +846587,7 @@ _081C6A5E:
 	thumb_func_end sub_81C6A14
 
 	thumb_func_start sub_81C6A94
-sub_81C6A94: ; 81C6A94
+sub_81C6A94: @ 81C6A94
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -846732,7 +846732,7 @@ _081C6BC6:
 	thumb_func_end sub_81C6A94
 
 	thumb_func_start sub_81C6BD8
-sub_81C6BD8: ; 81C6BD8
+sub_81C6BD8: @ 81C6BD8
 	push {r4,lr}
 	ldr r0, =gUnknown_0861F328
 	bl InitWindows
@@ -846774,7 +846774,7 @@ _081C6C04:
 	thumb_func_end sub_81C6BD8
 
 	thumb_func_start sub_81C6C3C
-sub_81C6C3C: ; 81C6C3C
+sub_81C6C3C: @ 81C6C3C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -846820,7 +846820,7 @@ sub_81C6C3C: ; 81C6C3C
 	thumb_func_end sub_81C6C3C
 
 	thumb_func_start sub_81C6C94
-sub_81C6C94: ; 81C6C94
+sub_81C6C94: @ 81C6C94
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -846866,7 +846866,7 @@ sub_81C6C94: ; 81C6C94
 	thumb_func_end sub_81C6C94
 
 	thumb_func_start sub_81C6CEC
-sub_81C6CEC: ; 81C6CEC
+sub_81C6CEC: @ 81C6CEC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -846881,7 +846881,7 @@ sub_81C6CEC: ; 81C6CEC
 	thumb_func_end sub_81C6CEC
 
 	thumb_func_start sub_81C6D08
-sub_81C6D08: ; 81C6D08
+sub_81C6D08: @ 81C6D08
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0203cf2c
@@ -846895,7 +846895,7 @@ sub_81C6D08: ; 81C6D08
 	thumb_func_end sub_81C6D08
 
 	thumb_func_start sub_81C6D24
-sub_81C6D24: ; 81C6D24
+sub_81C6D24: @ 81C6D24
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -846928,7 +846928,7 @@ _081C6D58:
 	thumb_func_end sub_81C6D24
 
 	thumb_func_start sub_81C6D6C
-sub_81C6D6C: ; 81C6D6C
+sub_81C6D6C: @ 81C6D6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -846958,7 +846958,7 @@ _081C6D9E:
 	thumb_func_end sub_81C6D6C
 
 	thumb_func_start sub_81C6DAC
-sub_81C6DAC: ; 81C6DAC
+sub_81C6DAC: @ 81C6DAC
 	push {lr}
 	sub sp, 0x10
 	adds r3, r1, 0
@@ -846982,8 +846982,8 @@ sub_81C6DAC: ; 81C6DAC
 	thumb_func_end sub_81C6DAC
 
 	thumb_func_start DisplayItemMessageInBattlePyramid
-; void DisplayItemMessageInBattlePyramid(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
-DisplayItemMessageInBattlePyramid: ; 81C6DD8
+@ void DisplayItemMessageInBattlePyramid(u8 taskId, u8 *str, void ( *callback)(u8 taskId))
+DisplayItemMessageInBattlePyramid: @ 81C6DD8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -847016,7 +847016,7 @@ DisplayItemMessageInBattlePyramid: ; 81C6DD8
 	thumb_func_end DisplayItemMessageInBattlePyramid
 
 	thumb_func_start sub_81C6E1C
-sub_81C6E1C: ; 81C6E1C
+sub_81C6E1C: @ 81C6E1C
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0
@@ -847030,7 +847030,7 @@ sub_81C6E1C: ; 81C6E1C
 	thumb_func_end sub_81C6E1C
 
 	thumb_func_start sub_81C6E38
-sub_81C6E38: ; 81C6E38
+sub_81C6E38: @ 81C6E38
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -847071,7 +847071,7 @@ _081C6E80:
 	thumb_func_end sub_81C6E38
 
 	thumb_func_start sub_81C6E98
-sub_81C6E98: ; 81C6E98
+sub_81C6E98: @ 81C6E98
 	push {r4,lr}
 	sub sp, 0x8
 	movs r0, 0x40
@@ -847107,7 +847107,7 @@ sub_81C6E98: ; 81C6E98
 	thumb_func_end sub_81C6E98
 
 	thumb_func_start sub_81C6EF4
-sub_81C6EF4: ; 81C6EF4
+sub_81C6EF4: @ 81C6EF4
 	push {r4,lr}
 	ldr r0, =0x0203cf2c
 	ldr r4, [r0]
@@ -847126,7 +847126,7 @@ sub_81C6EF4: ; 81C6EF4
 	thumb_func_end sub_81C6EF4
 
 	thumb_func_start sub_81C6F20
-sub_81C6F20: ; 81C6F20
+sub_81C6F20: @ 81C6F20
 	push {r4,lr}
 	ldr r0, =0x0203cf2c
 	ldr r0, [r0]
@@ -847158,7 +847158,7 @@ _081C6F50:
 	thumb_func_end sub_81C6F20
 
 	thumb_func_start sub_81C6F68
-sub_81C6F68: ; 81C6F68
+sub_81C6F68: @ 81C6F68
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x3F
@@ -847180,7 +847180,7 @@ _081C6F84:
 	thumb_func_end sub_81C6F68
 
 	thumb_func_start sub_81C6F90
-sub_81C6F90: ; 81C6F90
+sub_81C6F90: @ 81C6F90
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -847226,7 +847226,7 @@ _081C6FE0:
 	thumb_func_end sub_81C6F90
 
 	thumb_func_start sub_81C6FF8
-sub_81C6FF8: ; 81C6FF8
+sub_81C6FF8: @ 81C6FF8
 	push {lr}
 	lsls r0, 24
 	movs r1, 0x80
@@ -847239,7 +847239,7 @@ sub_81C6FF8: ; 81C6FF8
 	thumb_func_end sub_81C6FF8
 
 	thumb_func_start sub_81C700C
-sub_81C700C: ; 81C700C
+sub_81C700C: @ 81C700C
 	push {lr}
 	ldr r0, =0x0203cf2c
 	ldr r0, [r0]
@@ -847253,7 +847253,7 @@ sub_81C700C: ; 81C700C
 	thumb_func_end sub_81C700C
 
 	thumb_func_start sub_81C7028
-sub_81C7028: ; 81C7028
+sub_81C7028: @ 81C7028
 	push {lr}
 	adds r2, r0, 0
 	lsls r2, 24
@@ -847270,7 +847270,7 @@ sub_81C7028: ; 81C7028
 	thumb_func_end sub_81C7028
 
 	thumb_func_start sub_81C704C
-sub_81C704C: ; 81C704C
+sub_81C704C: @ 81C704C
 	push {lr}
 	adds r3, r0, 0
 	lsls r3, 24
@@ -847292,7 +847292,7 @@ sub_81C704C: ; 81C704C
 	thumb_func_end sub_81C704C
 
 	thumb_func_start sub_81C7078
-sub_81C7078: ; 81C7078
+sub_81C7078: @ 81C7078
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -847335,7 +847335,7 @@ _081C7092:
 	thumb_func_end sub_81C7078
 
 	thumb_func_start sub_81C70D8
-sub_81C70D8: ; 81C70D8
+sub_81C70D8: @ 81C70D8
 	push {lr}
 	ldr r1, =0x0000ffff
 	ands r1, r0
@@ -847371,7 +847371,7 @@ _081C711E:
 	thumb_func_end sub_81C70D8
 
 	thumb_func_start sub_81C7124
-sub_81C7124: ; 81C7124
+sub_81C7124: @ 81C7124
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -847410,7 +847410,7 @@ _081C716A:
 	thumb_func_end sub_81C7124
 
 	thumb_func_start sub_81C7170
-sub_81C7170: ; 81C7170
+sub_81C7170: @ 81C7170
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -847470,7 +847470,7 @@ _081C71DE:
 	thumb_func_end sub_81C7170
 
 	thumb_func_start sub_81C71E4
-sub_81C71E4: ; 81C71E4
+sub_81C71E4: @ 81C71E4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -847523,7 +847523,7 @@ _081C724A:
 	thumb_func_end sub_81C71E4
 
 	thumb_func_start CB2_PokeNav
-CB2_PokeNav: ; 81C7250
+CB2_PokeNav: @ 81C7250
 	push {r4,lr}
 	ldr r4, =0x0203cf40
 	movs r0, 0x5C
@@ -847555,7 +847555,7 @@ _081C7292:
 	thumb_func_end CB2_PokeNav
 
 	thumb_func_start sub_81C72A4
-sub_81C72A4: ; 81C72A4
+sub_81C72A4: @ 81C72A4
 	push {lr}
 	ldr r0, =sub_81C72BC
 	bl SetMainCallback2
@@ -847568,7 +847568,7 @@ sub_81C72A4: ; 81C72A4
 	thumb_func_end sub_81C72A4
 
 	thumb_func_start sub_81C72BC
-sub_81C72BC: ; 81C72BC
+sub_81C72BC: @ 81C72BC
 	push {r4,lr}
 	bl fade_and_return_progress_probably
 	ldr r0, =0x02037fd4
@@ -847612,7 +847612,7 @@ _081C7320:
 	thumb_func_end sub_81C72BC
 
 	thumb_func_start sub_81C7334
-sub_81C7334: ; 81C7334
+sub_81C7334: @ 81C7334
 	push {r4,lr}
 	movs r4, 0
 _081C7338:
@@ -847634,7 +847634,7 @@ _081C7338:
 	thumb_func_end sub_81C7334
 
 	thumb_func_start sub_81C7360
-sub_81C7360: ; 81C7360
+sub_81C7360: @ 81C7360
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r2, 0
@@ -847658,7 +847658,7 @@ _081C736A:
 	thumb_func_end sub_81C7360
 
 	thumb_func_start sub_81C7388
-sub_81C7388: ; 81C7388
+sub_81C7388: @ 81C7388
 	push {r4-r6,lr}
 	movs r5, 0
 _081C738C:
@@ -847722,7 +847722,7 @@ _081C73FA:
 	thumb_func_end sub_81C7388
 
 	thumb_func_start sub_81C7400
-sub_81C7400: ; 81C7400
+sub_81C7400: @ 81C7400
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -847733,7 +847733,7 @@ sub_81C7400: ; 81C7400
 	thumb_func_end sub_81C7400
 
 	thumb_func_start sub_81C7418
-sub_81C7418: ; 81C7418
+sub_81C7418: @ 81C7418
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -847743,7 +847743,7 @@ sub_81C7418: ; 81C7418
 	thumb_func_end sub_81C7418
 
 	thumb_func_start sub_81C742C
-sub_81C742C: ; 81C742C
+sub_81C742C: @ 81C742C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -847883,7 +847883,7 @@ _081C7562:
 	thumb_func_end sub_81C742C
 
 	thumb_func_start sub_81C756C
-sub_81C756C: ; 81C756C
+sub_81C756C: @ 81C756C
 	push {r4-r6,lr}
 	ldr r1, =0xfffe7960
 	adds r6, r0, r1
@@ -847932,7 +847932,7 @@ _081C75CE:
 	thumb_func_end sub_81C756C
 
 	thumb_func_start sub_81C75D4
-sub_81C75D4: ; 81C75D4
+sub_81C75D4: @ 81C75D4
 	push {lr}
 	bl sub_81C786C
 	pop {r1}
@@ -847940,7 +847940,7 @@ sub_81C75D4: ; 81C75D4
 	thumb_func_end sub_81C75D4
 
 	thumb_func_start sub_81C75E0
-sub_81C75E0: ; 81C75E0
+sub_81C75E0: @ 81C75E0
 	push {lr}
 	ldr r0, =0x0203cf40
 	ldr r0, [r0]
@@ -847952,7 +847952,7 @@ sub_81C75E0: ; 81C75E0
 	thumb_func_end sub_81C75E0
 
 	thumb_func_start sub_81C75F4
-sub_81C75F4: ; 81C75F4
+sub_81C75F4: @ 81C75F4
 	push {lr}
 	bl InitKeypadData
 	pop {r0}
@@ -847960,7 +847960,7 @@ sub_81C75F4: ; 81C75F4
 	thumb_func_end sub_81C75F4
 
 	thumb_func_start c3args_set_0toR1_1to0
-c3args_set_0toR1_1to0: ; 81C7600
+c3args_set_0toR1_1to0: @ 81C7600
 	push {lr}
 	bl SetVBlankCallback
 	pop {r0}
@@ -847968,7 +847968,7 @@ c3args_set_0toR1_1to0: ; 81C7600
 	thumb_func_end c3args_set_0toR1_1to0
 
 	thumb_func_start sub_81C760C
-sub_81C760C: ; 81C760C
+sub_81C760C: @ 81C760C
 	push {lr}
 	ldr r0, =sub_81C7418
 	bl SetVBlankCallback
@@ -847978,7 +847978,7 @@ sub_81C760C: ; 81C760C
 	thumb_func_end sub_81C760C
 
 	thumb_func_start sub_81C761C
-sub_81C761C: ; 81C761C
+sub_81C761C: @ 81C761C
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -847996,7 +847996,7 @@ sub_81C761C: ; 81C761C
 	thumb_func_end sub_81C761C
 
 	thumb_func_start sub_81C763C
-sub_81C763C: ; 81C763C
+sub_81C763C: @ 81C763C
 	ldr r1, =0x0203cf40
 	ldr r1, [r1]
 	lsls r0, 2
@@ -848008,7 +848008,7 @@ sub_81C763C: ; 81C763C
 	thumb_func_end sub_81C763C
 
 	thumb_func_start sub_81C7650
-sub_81C7650: ; 81C7650
+sub_81C7650: @ 81C7650
 	push {r4,r5,lr}
 	ldr r5, =0x0203cf40
 	ldr r1, [r5]
@@ -848032,7 +848032,7 @@ _081C7670:
 	thumb_func_end sub_81C7650
 
 	thumb_func_start sub_81C767C
-sub_81C767C: ; 81C767C
+sub_81C767C: @ 81C767C
 	ldr r0, =0x0203cf40
 	ldr r0, [r0]
 	ldrh r0, [r0, 0x8]
@@ -848041,7 +848041,7 @@ sub_81C767C: ; 81C767C
 	thumb_func_end sub_81C767C
 
 	thumb_func_start sub_81C7688
-sub_81C7688: ; 81C7688
+sub_81C7688: @ 81C7688
 	ldr r1, =0x0203cf40
 	ldr r1, [r1]
 	strh r0, [r1, 0x8]
@@ -848050,7 +848050,7 @@ sub_81C7688: ; 81C7688
 	thumb_func_end sub_81C7688
 
 	thumb_func_start sub_81C7694
-sub_81C7694: ; 81C7694
+sub_81C7694: @ 81C7694
 	push {lr}
 	adds r1, r0, 0
 	cmp r1, 0x4
@@ -848066,7 +848066,7 @@ _081C769E:
 	thumb_func_end sub_81C7694
 
 	thumb_func_start sub_81C76AC
-sub_81C76AC: ; 81C76AC
+sub_81C76AC: @ 81C76AC
 	ldr r0, =0x0203cf40
 	ldr r0, [r0]
 	ldrh r0, [r0, 0xA]
@@ -848075,7 +848075,7 @@ sub_81C76AC: ; 81C76AC
 	thumb_func_end sub_81C76AC
 
 	thumb_func_start sub_81C76B8
-sub_81C76B8: ; 81C76B8
+sub_81C76B8: @ 81C76B8
 	ldr r0, =0x0203cf40
 	ldr r0, [r0]
 	ldr r0, [r0, 0xC]
@@ -848084,7 +848084,7 @@ sub_81C76B8: ; 81C76B8
 	thumb_func_end sub_81C76B8
 
 	thumb_func_start sub_81C76C4
-sub_81C76C4: ; 81C76C4
+sub_81C76C4: @ 81C76C4
 	push {r4,lr}
 	ldr r1, =0x0000082c
 	movs r0, 0
@@ -848110,7 +848110,7 @@ _081C76F6:
 	thumb_func_end sub_81C76C4
 
 	thumb_func_start sub_81C76FC
-sub_81C76FC: ; 81C76FC
+sub_81C76FC: @ 81C76FC
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848121,7 +848121,7 @@ sub_81C76FC: ; 81C76FC
 	thumb_func_end sub_81C76FC
 
 	thumb_func_start sub_81C7710
-sub_81C7710: ; 81C7710
+sub_81C7710: @ 81C7710
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x6F
@@ -848141,7 +848141,7 @@ sub_81C7710: ; 81C7710
 	thumb_func_end sub_81C7710
 
 	thumb_func_start sub_81C7738
-sub_81C7738: ; 81C7738
+sub_81C7738: @ 81C7738
 	push {lr}
 	ldr r0, =0x02037fd4
 	ldrb r1, [r0, 0x7]
@@ -848163,7 +848163,7 @@ _081C775E:
 	thumb_func_end sub_81C7738
 
 	thumb_func_start sub_81C7764
-sub_81C7764: ; 81C7764
+sub_81C7764: @ 81C7764
 	push {r4,lr}
 	sub sp, 0x4
 	cmp r0, 0x1
@@ -848255,7 +848255,7 @@ _081C782C:
 	thumb_func_end sub_81C7764
 
 	thumb_func_start sub_81C7834
-sub_81C7834: ; 81C7834
+sub_81C7834: @ 81C7834
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -848271,7 +848271,7 @@ sub_81C7834: ; 81C7834
 	thumb_func_end sub_81C7834
 
 	thumb_func_start sub_81C7850
-sub_81C7850: ; 81C7850
+sub_81C7850: @ 81C7850
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -848287,7 +848287,7 @@ sub_81C7850: ; 81C7850
 	thumb_func_end sub_81C7850
 
 	thumb_func_start sub_81C786C
-sub_81C786C: ; 81C786C
+sub_81C786C: @ 81C786C
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848298,7 +848298,7 @@ sub_81C786C: ; 81C786C
 	thumb_func_end sub_81C786C
 
 	thumb_func_start sub_81C7880
-sub_81C7880: ; 81C7880
+sub_81C7880: @ 81C7880
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848314,7 +848314,7 @@ sub_81C7880: ; 81C7880
 	thumb_func_end sub_81C7880
 
 	thumb_func_start sub_81C78A0
-sub_81C78A0: ; 81C78A0
+sub_81C78A0: @ 81C78A0
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848330,7 +848330,7 @@ sub_81C78A0: ; 81C78A0
 	thumb_func_end sub_81C78A0
 
 	thumb_func_start sub_81C78C0
-sub_81C78C0: ; 81C78C0
+sub_81C78C0: @ 81C78C0
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848341,7 +848341,7 @@ sub_81C78C0: ; 81C78C0
 	thumb_func_end sub_81C78C0
 
 	thumb_func_start atk47_cmd47
-atk47_cmd47: ; 81C78D4
+atk47_cmd47: @ 81C78D4
 	push {lr}
 	cmp r0, 0x1
 	beq _081C78EA
@@ -848383,7 +848383,7 @@ _081C7916:
 	thumb_func_end atk47_cmd47
 
 	thumb_func_start sub_81C791C
-sub_81C791C: ; 81C791C
+sub_81C791C: @ 81C791C
 	push {lr}
 	movs r1, 0xC0
 	lsls r1, 1
@@ -848406,7 +848406,7 @@ _081C793E:
 	thumb_func_end sub_81C791C
 
 	thumb_func_start sub_81C7944
-sub_81C7944: ; 81C7944
+sub_81C7944: @ 81C7944
 	push {lr}
 	lsls r1, 1
 	ldr r3, =0x02037714
@@ -848420,7 +848420,7 @@ sub_81C7944: ; 81C7944
 	thumb_func_end sub_81C7944
 
 	thumb_func_start sub_81C795C
-sub_81C795C: ; 81C795C
+sub_81C795C: @ 81C795C
 	push {r4,lr}
 	adds r4, r0, 0
 	b _081C7974
@@ -848450,7 +848450,7 @@ _081C7988:
 	thumb_func_end sub_81C795C
 
 	thumb_func_start sub_81C7990
-sub_81C7990: ; 81C7990
+sub_81C7990: @ 81C7990
 	push {lr}
 	sub sp, 0x4
 	adds r3, r0, 0
@@ -848472,7 +848472,7 @@ sub_81C7990: ; 81C7990
 	thumb_func_end sub_81C7990
 
 	thumb_func_start sub_81C79BC
-sub_81C79BC: ; 81C79BC
+sub_81C79BC: @ 81C79BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -848605,7 +848605,7 @@ _081C7AAE:
 	thumb_func_end sub_81C79BC
 
 	thumb_func_start sub_81C7AC0
-sub_81C7AC0: ; 81C7AC0
+sub_81C7AC0: @ 81C7AC0
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -848670,7 +848670,7 @@ _081C7B2C:
 	thumb_func_end sub_81C7AC0
 
 	thumb_func_start sub_81C7B34
-sub_81C7B34: ; 81C7B34
+sub_81C7B34: @ 81C7B34
 	ldr r0, =0x02037fd4
 	ldrb r0, [r0, 0x7]
 	lsrs r0, 7
@@ -848679,7 +848679,7 @@ sub_81C7B34: ; 81C7B34
 	thumb_func_end sub_81C7B34
 
 	thumb_func_start sub_81C7B40
-sub_81C7B40: ; 81C7B40
+sub_81C7B40: @ 81C7B40
 	push {lr}
 	ldr r0, =0xfffefffe
 	movs r1, 0x10
@@ -848691,7 +848691,7 @@ sub_81C7B40: ; 81C7B40
 	thumb_func_end sub_81C7B40
 
 	thumb_func_start sub_81C7B54
-sub_81C7B54: ; 81C7B54
+sub_81C7B54: @ 81C7B54
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	cmp r1, 0
@@ -848711,7 +848711,7 @@ _081C7B6C:
 	thumb_func_end sub_81C7B54
 
 	thumb_func_start sub_81C7B74
-sub_81C7B74: ; 81C7B74
+sub_81C7B74: @ 81C7B74
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848733,7 +848733,7 @@ sub_81C7B74: ; 81C7B74
 	thumb_func_end sub_81C7B74
 
 	thumb_func_start sub_81C7BA4
-sub_81C7BA4: ; 81C7BA4
+sub_81C7BA4: @ 81C7BA4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -848764,7 +848764,7 @@ sub_81C7BA4: ; 81C7BA4
 	thumb_func_end sub_81C7BA4
 
 	thumb_func_start sub_81C7BE8
-sub_81C7BE8: ; 81C7BE8
+sub_81C7BE8: @ 81C7BE8
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -848774,7 +848774,7 @@ sub_81C7BE8: ; 81C7BE8
 	thumb_func_end sub_81C7BE8
 
 	thumb_func_start sub_81C7BF8
-sub_81C7BF8: ; 81C7BF8
+sub_81C7BF8: @ 81C7BF8
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -848799,7 +848799,7 @@ sub_81C7BF8: ; 81C7BF8
 	thumb_func_end sub_81C7BF8
 
 	thumb_func_start sub_81C7C28
-sub_81C7C28: ; 81C7C28
+sub_81C7C28: @ 81C7C28
 	push {r4-r6,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848846,7 +848846,7 @@ _081C7C36:
 	thumb_func_end sub_81C7C28
 
 	thumb_func_start sub_81C7C94
-sub_81C7C94: ; 81C7C94
+sub_81C7C94: @ 81C7C94
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848861,7 +848861,7 @@ sub_81C7C94: ; 81C7C94
 	thumb_func_end sub_81C7C94
 
 	thumb_func_start sub_81C7CB4
-sub_81C7CB4: ; 81C7CB4
+sub_81C7CB4: @ 81C7CB4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -848875,7 +848875,7 @@ sub_81C7CB4: ; 81C7CB4
 	thumb_func_end sub_81C7CB4
 
 	thumb_func_start sub_81C7CCC
-sub_81C7CCC: ; 81C7CCC
+sub_81C7CCC: @ 81C7CCC
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848888,7 +848888,7 @@ sub_81C7CCC: ; 81C7CCC
 	thumb_func_end sub_81C7CCC
 
 	thumb_func_start sub_81C7CE4
-sub_81C7CE4: ; 81C7CE4
+sub_81C7CE4: @ 81C7CE4
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -848924,7 +848924,7 @@ sub_81C7CE4: ; 81C7CE4
 	thumb_func_end sub_81C7CE4
 
 	thumb_func_start sub_81C7D28
-sub_81C7D28: ; 81C7D28
+sub_81C7D28: @ 81C7D28
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -849017,7 +849017,7 @@ _081C7D50:
 	thumb_func_end sub_81C7D28
 
 	thumb_func_start sub_81C7DFC
-sub_81C7DFC: ; 81C7DFC
+sub_81C7DFC: @ 81C7DFC
 	push {lr}
 	cmp r0, 0x5
 	bhi _081C7E08
@@ -849032,7 +849032,7 @@ _081C7E0E:
 	thumb_func_end sub_81C7DFC
 
 	thumb_func_start sub_81C7E14
-sub_81C7E14: ; 81C7E14
+sub_81C7E14: @ 81C7E14
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -849066,7 +849066,7 @@ _081C7E3A:
 	thumb_func_end sub_81C7E14
 
 	thumb_func_start sub_81C7E58
-sub_81C7E58: ; 81C7E58
+sub_81C7E58: @ 81C7E58
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -849155,7 +849155,7 @@ _081C7F16:
 	thumb_func_end sub_81C7E58
 
 	thumb_func_start sub_81C7F24
-sub_81C7F24: ; 81C7F24
+sub_81C7F24: @ 81C7F24
 	push {r4-r6,lr}
 	cmp r0, 0x6
 	bhi _081C7F8A
@@ -849209,7 +849209,7 @@ _081C7F8A:
 	thumb_func_end sub_81C7F24
 
 	thumb_func_start sub_81C7FA0
-sub_81C7FA0: ; 81C7FA0
+sub_81C7FA0: @ 81C7FA0
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0x10
@@ -849231,7 +849231,7 @@ _081C7FBE:
 	thumb_func_end sub_81C7FA0
 
 	thumb_func_start sub_81C7FC4
-sub_81C7FC4: ; 81C7FC4
+sub_81C7FC4: @ 81C7FC4
 	push {lr}
 	cmp r0, 0x5
 	bhi _081C7FD2
@@ -849247,7 +849247,7 @@ _081C7FD8:
 	thumb_func_end sub_81C7FC4
 
 	thumb_func_start sub_81C7FDC
-sub_81C7FDC: ; 81C7FDC
+sub_81C7FDC: @ 81C7FDC
 	push {r4,lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -849276,7 +849276,7 @@ _081C7FEC:
 	thumb_func_end sub_81C7FDC
 
 	thumb_func_start sub_81C8010
-sub_81C8010: ; 81C8010
+sub_81C8010: @ 81C8010
 	push {lr}
 	movs r0, 0
 	bl sub_81C763C
@@ -849301,7 +849301,7 @@ _081C8036:
 	thumb_func_end sub_81C8010
 
 	thumb_func_start sub_81C803C
-sub_81C803C: ; 81C803C
+sub_81C803C: @ 81C803C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -849343,7 +849343,7 @@ _081C8064:
 	thumb_func_end sub_81C803C
 
 	thumb_func_start sub_81C8088
-sub_81C8088: ; 81C8088
+sub_81C8088: @ 81C8088
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -849385,7 +849385,7 @@ _081C80B0:
 	thumb_func_end sub_81C8088
 
 	thumb_func_start sub_81C80D4
-sub_81C80D4: ; 81C80D4
+sub_81C80D4: @ 81C80D4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -849419,7 +849419,7 @@ _081C80F6:
 	thumb_func_end sub_81C80D4
 
 	thumb_func_start sub_81C8110
-sub_81C8110: ; 81C8110
+sub_81C8110: @ 81C8110
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -849453,7 +849453,7 @@ _081C8132:
 	thumb_func_end sub_81C8110
 
 	thumb_func_start sub_81C814C
-sub_81C814C: ; 81C814C
+sub_81C814C: @ 81C814C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -849478,7 +849478,7 @@ sub_81C814C: ; 81C814C
 	thumb_func_end sub_81C814C
 
 	thumb_func_start sub_81C817C
-sub_81C817C: ; 81C817C
+sub_81C817C: @ 81C817C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x32]
@@ -849528,7 +849528,7 @@ _081C81CC:
 	thumb_func_end sub_81C817C
 
 	thumb_func_start sub_81C81D4
-sub_81C81D4: ; 81C81D4
+sub_81C81D4: @ 81C81D4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -849565,7 +849565,7 @@ _081C821E:
 	thumb_func_end sub_81C81D4
 
 	thumb_func_start sub_81C8224
-sub_81C8224: ; 81C8224
+sub_81C8224: @ 81C8224
 	push {lr}
 	ldr r0, =sub_81C8254
 	bl sub_81C7124
@@ -849575,7 +849575,7 @@ sub_81C8224: ; 81C8224
 	thumb_func_end sub_81C8224
 
 	thumb_func_start sub_81C8234
-sub_81C8234: ; 81C8234
+sub_81C8234: @ 81C8234
 	push {r4,lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -849591,7 +849591,7 @@ sub_81C8234: ; 81C8234
 	thumb_func_end sub_81C8234
 
 	thumb_func_start sub_81C8254
-sub_81C8254: ; 81C8254
+sub_81C8254: @ 81C8254
 	push {r4,lr}
 	adds r4, r0, 0
 	bl IsDma3ManagerBusyWithBgCopy
@@ -849660,7 +849660,7 @@ _081C82D8:
 	thumb_func_end sub_81C8254
 
 	thumb_func_start sub_81C82E4
-sub_81C82E4: ; 81C82E4
+sub_81C82E4: @ 81C82E4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -849715,7 +849715,7 @@ sub_81C82E4: ; 81C82E4
 	thumb_func_end sub_81C82E4
 
 	thumb_func_start sub_81C835C
-sub_81C835C: ; 81C835C
+sub_81C835C: @ 81C835C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x8]
@@ -849732,7 +849732,7 @@ sub_81C835C: ; 81C835C
 	thumb_func_end sub_81C835C
 
 	thumb_func_start sub_81C837C
-sub_81C837C: ; 81C837C
+sub_81C837C: @ 81C837C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r3, r0, 0
@@ -849759,7 +849759,7 @@ _081C8392:
 	thumb_func_end sub_81C837C
 
 	thumb_func_start sub_81C83AC
-sub_81C83AC: ; 81C83AC
+sub_81C83AC: @ 81C83AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -849788,7 +849788,7 @@ _081C83D6:
 	thumb_func_end sub_81C83AC
 
 	thumb_func_start sub_81C83E0
-sub_81C83E0: ; 81C83E0
+sub_81C83E0: @ 81C83E0
 	push {lr}
 	ldr r0, =sub_81C83F0
 	bl sub_81C7124
@@ -849798,7 +849798,7 @@ sub_81C83E0: ; 81C83E0
 	thumb_func_end sub_81C83E0
 
 	thumb_func_start sub_81C83F0
-sub_81C83F0: ; 81C83F0
+sub_81C83F0: @ 81C83F0
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -849893,7 +849893,7 @@ _081C849C:
 	thumb_func_end sub_81C83F0
 
 	thumb_func_start sub_81C84A4
-sub_81C84A4: ; 81C84A4
+sub_81C84A4: @ 81C84A4
 	push {lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -849909,7 +849909,7 @@ sub_81C84A4: ; 81C84A4
 	thumb_func_end sub_81C84A4
 
 	thumb_func_start sub_81C84C0
-sub_81C84C0: ; 81C84C0
+sub_81C84C0: @ 81C84C0
 	push {lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -849931,7 +849931,7 @@ _081C84DC:
 	thumb_func_end sub_81C84C0
 
 	thumb_func_start sub_81C84E8
-sub_81C84E8: ; 81C84E8
+sub_81C84E8: @ 81C84E8
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -849997,7 +849997,7 @@ _081C854E:
 	thumb_func_end sub_81C84E8
 
 	thumb_func_start sub_81C8568
-sub_81C8568: ; 81C8568
+sub_81C8568: @ 81C8568
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -850027,7 +850027,7 @@ _081C8586:
 	thumb_func_end sub_81C8568
 
 	thumb_func_start sub_81C85A0
-sub_81C85A0: ; 81C85A0
+sub_81C85A0: @ 81C85A0
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x11
@@ -850107,7 +850107,7 @@ _081C862A:
 	thumb_func_end sub_81C85A0
 
 	thumb_func_start sub_81C8630
-sub_81C8630: ; 81C8630
+sub_81C8630: @ 81C8630
 	push {lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850118,7 +850118,7 @@ sub_81C8630: ; 81C8630
 	thumb_func_end sub_81C8630
 
 	thumb_func_start sub_81C8644
-sub_81C8644: ; 81C8644
+sub_81C8644: @ 81C8644
 	push {lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850130,7 +850130,7 @@ sub_81C8644: ; 81C8644
 	thumb_func_end sub_81C8644
 
 	thumb_func_start sub_81C8658
-sub_81C8658: ; 81C8658
+sub_81C8658: @ 81C8658
 	push {lr}
 	bl sub_81C8644
 	adds r1, r0, 0
@@ -850159,7 +850159,7 @@ _081C8686:
 	thumb_func_end sub_81C8658
 
 	thumb_func_start sub_81C868C
-sub_81C868C: ; 81C868C
+sub_81C868C: @ 81C868C
 	push {lr}
 	bl sub_81C8644
 	adds r2, r0, 0
@@ -850196,7 +850196,7 @@ _081C86C8:
 	thumb_func_end sub_81C868C
 
 	thumb_func_start sub_81C86CC
-sub_81C86CC: ; 81C86CC
+sub_81C86CC: @ 81C86CC
 	push {r4,lr}
 	bl sub_81C8644
 	adds r4, r0, 0
@@ -850234,7 +850234,7 @@ _081C8706:
 	thumb_func_end sub_81C86CC
 
 	thumb_func_start sub_81C870C
-sub_81C870C: ; 81C870C
+sub_81C870C: @ 81C870C
 	push {r4,lr}
 	bl sub_81C8644
 	adds r4, r0, 0
@@ -850281,7 +850281,7 @@ _081C8756:
 	thumb_func_end sub_81C870C
 
 	thumb_func_start sub_81C875C
-sub_81C875C: ; 81C875C
+sub_81C875C: @ 81C875C
 	push {lr}
 	bl sub_81C8644
 	adds r1, r0, 0
@@ -850293,7 +850293,7 @@ sub_81C875C: ; 81C875C
 	thumb_func_end sub_81C875C
 
 	thumb_func_start sub_81C8770
-sub_81C8770: ; 81C8770
+sub_81C8770: @ 81C8770
 	push {lr}
 	bl sub_81C8644
 	ldrh r0, [r0]
@@ -850302,7 +850302,7 @@ sub_81C8770: ; 81C8770
 	thumb_func_end sub_81C8770
 
 	thumb_func_start sub_81C877C
-sub_81C877C: ; 81C877C
+sub_81C877C: @ 81C877C
 	push {r4,lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850325,7 +850325,7 @@ sub_81C877C: ; 81C877C
 	thumb_func_end sub_81C877C
 
 	thumb_func_start sub_81C87AC
-sub_81C87AC: ; 81C87AC
+sub_81C87AC: @ 81C87AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -850356,7 +850356,7 @@ sub_81C87AC: ; 81C87AC
 	thumb_func_end sub_81C87AC
 
 	thumb_func_start sub_81C87F0
-sub_81C87F0: ; 81C87F0
+sub_81C87F0: @ 81C87F0
 	push {r4,lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850379,7 +850379,7 @@ sub_81C87F0: ; 81C87F0
 	thumb_func_end sub_81C87F0
 
 	thumb_func_start sub_81C8820
-sub_81C8820: ; 81C8820
+sub_81C8820: @ 81C8820
 	push {lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850393,7 +850393,7 @@ sub_81C8820: ; 81C8820
 	thumb_func_end sub_81C8820
 
 	thumb_func_start sub_81C8838
-sub_81C8838: ; 81C8838
+sub_81C8838: @ 81C8838
 	push {r4,lr}
 	movs r0, 0x11
 	bl sub_81C763C
@@ -850420,7 +850420,7 @@ sub_81C8838: ; 81C8838
 	thumb_func_end sub_81C8838
 
 	thumb_func_start sub_81C8870
-sub_81C8870: ; 81C8870
+sub_81C8870: @ 81C8870
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x11
@@ -850529,7 +850529,7 @@ _081C894E:
 	thumb_func_end sub_81C8870
 
 	thumb_func_start sub_81C8958
-sub_81C8958: ; 81C8958
+sub_81C8958: @ 81C8958
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x11
@@ -850626,7 +850626,7 @@ _081C8A22:
 	thumb_func_end sub_81C8958
 
 	thumb_func_start sub_81C8A28
-sub_81C8A28: ; 81C8A28
+sub_81C8A28: @ 81C8A28
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -850783,7 +850783,7 @@ _081C8B66:
 	thumb_func_end sub_81C8A28
 
 	thumb_func_start sub_81C8B70
-sub_81C8B70: ; 81C8B70
+sub_81C8B70: @ 81C8B70
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -850898,7 +850898,7 @@ _081C8C40:
 	thumb_func_end sub_81C8B70
 
 	thumb_func_start sub_81C8C64
-sub_81C8C64: ; 81C8C64
+sub_81C8C64: @ 81C8C64
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -850941,7 +850941,7 @@ _081C8C9E:
 	thumb_func_end sub_81C8C64
 
 	thumb_func_start sub_81C8CB4
-sub_81C8CB4: ; 81C8CB4
+sub_81C8CB4: @ 81C8CB4
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -851013,7 +851013,7 @@ sub_81C8CB4: ; 81C8CB4
 	thumb_func_end sub_81C8CB4
 
 	thumb_func_start sub_81C8D4C
-sub_81C8D4C: ; 81C8D4C
+sub_81C8D4C: @ 81C8D4C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -851067,7 +851067,7 @@ sub_81C8D4C: ; 81C8D4C
 	thumb_func_end sub_81C8D4C
 
 	thumb_func_start sub_81C8DBC
-sub_81C8DBC: ; 81C8DBC
+sub_81C8DBC: @ 81C8DBC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -851140,7 +851140,7 @@ sub_81C8DBC: ; 81C8DBC
 	thumb_func_end sub_81C8DBC
 
 	thumb_func_start sub_81C8E54
-sub_81C8E54: ; 81C8E54
+sub_81C8E54: @ 81C8E54
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -851202,7 +851202,7 @@ _081C8EC0:
 	thumb_func_end sub_81C8E54
 
 	thumb_func_start sub_81C8ED0
-sub_81C8ED0: ; 81C8ED0
+sub_81C8ED0: @ 81C8ED0
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =gUnknown_0861FBFC
@@ -851222,7 +851222,7 @@ _081C8ED6:
 	thumb_func_end sub_81C8ED0
 
 	thumb_func_start sub_81C8EF8
-sub_81C8EF8: ; 81C8EF8
+sub_81C8EF8: @ 81C8EF8
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -851326,7 +851326,7 @@ sub_81C8EF8: ; 81C8EF8
 	thumb_func_end sub_81C8EF8
 
 	thumb_func_start sub_81C8FE0
-sub_81C8FE0: ; 81C8FE0
+sub_81C8FE0: @ 81C8FE0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x3C]
@@ -851345,7 +851345,7 @@ sub_81C8FE0: ; 81C8FE0
 	thumb_func_end sub_81C8FE0
 
 	thumb_func_start sub_81C9008
-sub_81C9008: ; 81C9008
+sub_81C9008: @ 81C9008
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -851403,7 +851403,7 @@ _081C903A:
 	thumb_func_end sub_81C9008
 
 	thumb_func_start sub_81C9080
-sub_81C9080: ; 81C9080
+sub_81C9080: @ 81C9080
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x11
@@ -851420,7 +851420,7 @@ sub_81C9080: ; 81C9080
 	thumb_func_end sub_81C9080
 
 	thumb_func_start sub_81C90A0
-sub_81C90A0: ; 81C90A0
+sub_81C90A0: @ 81C90A0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -851467,7 +851467,7 @@ _081C90EC:
 	thumb_func_end sub_81C90A0
 
 	thumb_func_start sub_81C90F4
-sub_81C90F4: ; 81C90F4
+sub_81C90F4: @ 81C90F4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x3C
@@ -851515,7 +851515,7 @@ _081C9142:
 	thumb_func_end sub_81C90F4
 
 	thumb_func_start sub_81C9148
-sub_81C9148: ; 81C9148
+sub_81C9148: @ 81C9148
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x11
@@ -851530,7 +851530,7 @@ sub_81C9148: ; 81C9148
 	thumb_func_end sub_81C9148
 
 	thumb_func_start sub_81C9160
-sub_81C9160: ; 81C9160
+sub_81C9160: @ 81C9160
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	ldr r0, [r1]
@@ -851575,7 +851575,7 @@ _081C91A6:
 	thumb_func_end sub_81C9160
 
 	thumb_func_start sub_81C91AC
-sub_81C91AC: ; 81C91AC
+sub_81C91AC: @ 81C91AC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -851665,7 +851665,7 @@ _081C925A:
 	thumb_func_end sub_81C91AC
 
 	thumb_func_start sub_81C9268
-sub_81C9268: ; 81C9268
+sub_81C9268: @ 81C9268
 	push {r4,lr}
 	movs r4, 0
 	movs r0, 0x98
@@ -851690,7 +851690,7 @@ _081C928A:
 	thumb_func_end sub_81C9268
 
 	thumb_func_start sub_81C9298
-sub_81C9298: ; 81C9298
+sub_81C9298: @ 81C9298
 	push {r4,lr}
 	movs r0, 0x1
 	movs r1, 0x10
@@ -851719,7 +851719,7 @@ _081C92C6:
 	thumb_func_end sub_81C9298
 
 	thumb_func_start sub_81C92CC
-sub_81C92CC: ; 81C92CC
+sub_81C92CC: @ 81C92CC
 	push {r4,lr}
 	movs r0, 0x1
 	movs r1, 0x10
@@ -851749,7 +851749,7 @@ _081C92FC:
 	thumb_func_end sub_81C92CC
 
 	thumb_func_start sub_81C9304
-sub_81C9304: ; 81C9304
+sub_81C9304: @ 81C9304
 	push {r4,lr}
 	movs r0, 0x1
 	movs r1, 0x10
@@ -851777,7 +851777,7 @@ _081C9330:
 	thumb_func_end sub_81C9304
 
 	thumb_func_start sub_81C9338
-sub_81C9338: ; 81C9338
+sub_81C9338: @ 81C9338
 	push {lr}
 	movs r0, 0x1
 	movs r1, 0x10
@@ -851804,7 +851804,7 @@ _081C9362:
 	thumb_func_end sub_81C9338
 
 	thumb_func_start sub_81C9368
-sub_81C9368: ; 81C9368
+sub_81C9368: @ 81C9368
 	push {r4,r5,lr}
 	movs r0, 0x1
 	movs r1, 0x10
@@ -851833,7 +851833,7 @@ _081C9396:
 	thumb_func_end sub_81C9368
 
 	thumb_func_start sub_81C939C
-sub_81C939C: ; 81C939C
+sub_81C939C: @ 81C939C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4]
@@ -851874,7 +851874,7 @@ _081C93E0:
 	thumb_func_end sub_81C939C
 
 	thumb_func_start sub_81C93EC
-sub_81C93EC: ; 81C93EC
+sub_81C93EC: @ 81C93EC
 	push {lr}
 	bl sub_81C767C
 	cmp r0, 0x1
@@ -851900,7 +851900,7 @@ _081C9412:
 	thumb_func_end sub_81C93EC
 
 	thumb_func_start sub_81C941C
-sub_81C941C: ; 81C941C
+sub_81C941C: @ 81C941C
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C763C
@@ -851911,7 +851911,7 @@ sub_81C941C: ; 81C941C
 	thumb_func_end sub_81C941C
 
 	thumb_func_start sub_81C9430
-sub_81C9430: ; 81C9430
+sub_81C9430: @ 81C9430
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C7650
@@ -851920,7 +851920,7 @@ sub_81C9430: ; 81C9430
 	thumb_func_end sub_81C9430
 
 	thumb_func_start sub_81C943C
-sub_81C943C: ; 81C943C
+sub_81C943C: @ 81C943C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852031,7 +852031,7 @@ _081C951A:
 	thumb_func_end sub_81C943C
 
 	thumb_func_start sub_81C9520
-sub_81C9520: ; 81C9520
+sub_81C9520: @ 81C9520
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852083,7 +852083,7 @@ _081C9580:
 	thumb_func_end sub_81C9520
 
 	thumb_func_start c2_pre_battle_1
-c2_pre_battle_1: ; 81C9588
+c2_pre_battle_1: @ 81C9588
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852143,7 +852143,7 @@ _081C95F8:
 	thumb_func_end c2_pre_battle_1
 
 	thumb_func_start sub_81C9600
-sub_81C9600: ; 81C9600
+sub_81C9600: @ 81C9600
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852174,7 +852174,7 @@ _081C9634:
 	thumb_func_end sub_81C9600
 
 	thumb_func_start sub_81C963C
-sub_81C963C: ; 81C963C
+sub_81C963C: @ 81C963C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852268,7 +852268,7 @@ _081C96F6:
 	thumb_func_end sub_81C963C
 
 	thumb_func_start sub_81C96FC
-sub_81C96FC: ; 81C96FC
+sub_81C96FC: @ 81C96FC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81C9814
@@ -852340,7 +852340,7 @@ _081C9792:
 	thumb_func_end sub_81C96FC
 
 	thumb_func_start sub_81C9798
-sub_81C9798: ; 81C9798
+sub_81C9798: @ 81C9798
 	push {lr}
 	bl sub_81C97C0
 	movs r0, 0x3
@@ -852349,7 +852349,7 @@ sub_81C9798: ; 81C9798
 	thumb_func_end sub_81C9798
 
 	thumb_func_start sub_81C97A4
-sub_81C97A4: ; 81C97A4
+sub_81C97A4: @ 81C97A4
 	push {lr}
 	bl sub_81C97F8
 	movs r0, 0x5
@@ -852358,7 +852358,7 @@ sub_81C97A4: ; 81C97A4
 	thumb_func_end sub_81C97A4
 
 	thumb_func_start sub_81C97B0
-sub_81C97B0: ; 81C97B0
+sub_81C97B0: @ 81C97B0
 	str r1, [r0, 0x8]
 	ldr r1, =sub_81C97BC
 	str r1, [r0, 0xC]
@@ -852367,13 +852367,13 @@ sub_81C97B0: ; 81C97B0
 	thumb_func_end sub_81C97B0
 
 	thumb_func_start sub_81C97BC
-sub_81C97BC: ; 81C97BC
+sub_81C97BC: @ 81C97BC
 	ldr r0, [r0, 0x8]
 	bx lr
 	thumb_func_end sub_81C97BC
 
 	thumb_func_start sub_81C97C0
-sub_81C97C0: ; 81C97C0
+sub_81C97C0: @ 81C97C0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81C9268
@@ -852400,7 +852400,7 @@ sub_81C97C0: ; 81C97C0
 	thumb_func_end sub_81C97C0
 
 	thumb_func_start sub_81C97F8
-sub_81C97F8: ; 81C97F8
+sub_81C97F8: @ 81C97F8
 	movs r1, 0x3
 	strh r1, [r0]
 	movs r1, 0x1
@@ -852415,7 +852415,7 @@ sub_81C97F8: ; 81C97F8
 	thumb_func_end sub_81C97F8
 
 	thumb_func_start sub_81C9814
-sub_81C9814: ; 81C9814
+sub_81C9814: @ 81C9814
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030022c0
@@ -852480,7 +852480,7 @@ _081C988E:
 	thumb_func_end sub_81C9814
 
 	thumb_func_start sub_81C9894
-sub_81C9894: ; 81C9894
+sub_81C9894: @ 81C9894
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C763C
@@ -852490,7 +852490,7 @@ sub_81C9894: ; 81C9894
 	thumb_func_end sub_81C9894
 
 	thumb_func_start sub_81C98A4
-sub_81C98A4: ; 81C98A4
+sub_81C98A4: @ 81C98A4
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C763C
@@ -852501,7 +852501,7 @@ sub_81C98A4: ; 81C98A4
 	thumb_func_end sub_81C98A4
 
 	thumb_func_start sub_81C98B4
-sub_81C98B4: ; 81C98B4
+sub_81C98B4: @ 81C98B4
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C763C
@@ -852511,7 +852511,7 @@ sub_81C98B4: ; 81C98B4
 	thumb_func_end sub_81C98B4
 
 	thumb_func_start sub_81C98C4
-sub_81C98C4: ; 81C98C4
+sub_81C98C4: @ 81C98C4
 	push {lr}
 	movs r0, 0x1
 	bl sub_81C763C
@@ -852521,7 +852521,7 @@ sub_81C98C4: ; 81C98C4
 	thumb_func_end sub_81C98C4
 
 	thumb_func_start sub_81C98D4
-sub_81C98D4: ; 81C98D4
+sub_81C98D4: @ 81C98D4
 	push {r4,lr}
 	movs r4, 0
 _081C98D8:
@@ -852560,7 +852560,7 @@ _081C991C:
 	thumb_func_end sub_81C98D4
 
 	thumb_func_start sub_81C9924
-sub_81C9924: ; 81C9924
+sub_81C9924: @ 81C9924
 	push {lr}
 	bl sub_81C9958
 	adds r1, r0, 0
@@ -852578,7 +852578,7 @@ _081C993A:
 	thumb_func_end sub_81C9924
 
 	thumb_func_start sub_81C9940
-sub_81C9940: ; 81C9940
+sub_81C9940: @ 81C9940
 	push {lr}
 	bl sub_81C9958
 	adds r1, r0, 0
@@ -852595,7 +852595,7 @@ _081C9954:
 	thumb_func_end sub_81C9940
 
 	thumb_func_start sub_81C9958
-sub_81C9958: ; 81C9958
+sub_81C9958: @ 81C9958
 	push {r4,lr}
 	ldr r1, =0x0000088c
 	movs r0, 0x2
@@ -852620,7 +852620,7 @@ _081C997A:
 	thumb_func_end sub_81C9958
 
 	thumb_func_start sub_81C9990
-sub_81C9990: ; 81C9990
+sub_81C9990: @ 81C9990
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x2
@@ -852642,7 +852642,7 @@ sub_81C9990: ; 81C9990
 	thumb_func_end sub_81C9990
 
 	thumb_func_start sub_81C99C0
-sub_81C99C0: ; 81C99C0
+sub_81C99C0: @ 81C99C0
 	push {lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -852653,7 +852653,7 @@ sub_81C99C0: ; 81C99C0
 	thumb_func_end sub_81C99C0
 
 	thumb_func_start sub_81C99D4
-sub_81C99D4: ; 81C99D4
+sub_81C99D4: @ 81C99D4
 	push {r4,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -852671,7 +852671,7 @@ sub_81C99D4: ; 81C99D4
 	thumb_func_end sub_81C99D4
 
 	thumb_func_start sub_81C99FC
-sub_81C99FC: ; 81C99FC
+sub_81C99FC: @ 81C99FC
 	push {lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -852682,7 +852682,7 @@ sub_81C99FC: ; 81C99FC
 	thumb_func_end sub_81C99FC
 
 	thumb_func_start sub_81C9A10
-sub_81C9A10: ; 81C9A10
+sub_81C9A10: @ 81C9A10
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -852933,7 +852933,7 @@ _081C9C62:
 	thumb_func_end sub_81C9A10
 
 	thumb_func_start sub_81C9C6C
-sub_81C9C6C: ; 81C9C6C
+sub_81C9C6C: @ 81C9C6C
 	push {lr}
 	cmp r0, 0
 	beq _081C9C78
@@ -852966,7 +852966,7 @@ _081C9CA4:
 	thumb_func_end sub_81C9C6C
 
 	thumb_func_start sub_81C9CA8
-sub_81C9CA8: ; 81C9CA8
+sub_81C9CA8: @ 81C9CA8
 	push {lr}
 	cmp r0, 0x1
 	beq _081C9CDC
@@ -853039,7 +853039,7 @@ _081C9D3E:
 	thumb_func_end sub_81C9CA8
 
 	thumb_func_start sub_81C9D44
-sub_81C9D44: ; 81C9D44
+sub_81C9D44: @ 81C9D44
 	push {lr}
 	cmp r0, 0x1
 	beq _081C9D72
@@ -853110,7 +853110,7 @@ _081C9DD4:
 	thumb_func_end sub_81C9D44
 
 	thumb_func_start sub_81C9DD8
-sub_81C9DD8: ; 81C9DD8
+sub_81C9DD8: @ 81C9DD8
 	push {lr}
 	cmp r0, 0x1
 	beq _081C9E04
@@ -853173,7 +853173,7 @@ _081C9E52:
 	thumb_func_end sub_81C9DD8
 
 	thumb_func_start sub_81C9E58
-sub_81C9E58: ; 81C9E58
+sub_81C9E58: @ 81C9E58
 	push {lr}
 	cmp r0, 0x1
 	beq _081C9E86
@@ -853231,7 +853231,7 @@ _081C9EC4:
 	thumb_func_end sub_81C9E58
 
 	thumb_func_start sub_81C9EC8
-sub_81C9EC8: ; 81C9EC8
+sub_81C9EC8: @ 81C9EC8
 	push {lr}
 	cmp r0, 0
 	beq _081C9ED4
@@ -853259,7 +853259,7 @@ _081C9EF2:
 	thumb_func_end sub_81C9EC8
 
 	thumb_func_start sub_81C9EF8
-sub_81C9EF8: ; 81C9EF8
+sub_81C9EF8: @ 81C9EF8
 	push {lr}
 	cmp r0, 0
 	beq _081C9F04
@@ -853287,7 +853287,7 @@ _081C9F22:
 	thumb_func_end sub_81C9EF8
 
 	thumb_func_start sub_81C9F28
-sub_81C9F28: ; 81C9F28
+sub_81C9F28: @ 81C9F28
 	push {lr}
 	cmp r0, 0x1
 	beq _081C9F52
@@ -853364,7 +853364,7 @@ _081C9FBE:
 	thumb_func_end sub_81C9F28
 
 	thumb_func_start sub_81C9FC4
-sub_81C9FC4: ; 81C9FC4
+sub_81C9FC4: @ 81C9FC4
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =gUnknown_086201C4
@@ -853384,7 +853384,7 @@ _081C9FCA:
 	thumb_func_end sub_81C9FC4
 
 	thumb_func_start sub_81C9FEC
-sub_81C9FEC: ; 81C9FEC
+sub_81C9FEC: @ 81C9FEC
 	push {lr}
 	movs r0, 0x3
 	bl FreeObjectTilesByTag
@@ -853409,7 +853409,7 @@ sub_81C9FEC: ; 81C9FEC
 	thumb_func_end sub_81C9FEC
 
 	thumb_func_start sub_81CA02C
-sub_81CA02C: ; 81CA02C
+sub_81CA02C: @ 81CA02C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -853461,7 +853461,7 @@ _081CA054:
 	thumb_func_end sub_81CA02C
 
 	thumb_func_start sub_81CA094
-sub_81CA094: ; 81CA094
+sub_81CA094: @ 81CA094
 	push {r4-r7,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -853490,7 +853490,7 @@ _081CA0AA:
 	thumb_func_end sub_81CA094
 
 	thumb_func_start sub_81CA0C8
-sub_81CA0C8: ; 81CA0C8
+sub_81CA0C8: @ 81CA0C8
 	push {lr}
 	bl sub_81C9894
 	lsls r2, r0, 3
@@ -853509,7 +853509,7 @@ sub_81CA0C8: ; 81CA0C8
 	thumb_func_end sub_81CA0C8
 
 	thumb_func_start sub_81CA0EC
-sub_81CA0EC: ; 81CA0EC
+sub_81CA0EC: @ 81CA0EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -853655,7 +853655,7 @@ _081CA1EC:
 	thumb_func_end sub_81CA0EC
 
 	thumb_func_start sub_81CA20C
-sub_81CA20C: ; 81CA20C
+sub_81CA20C: @ 81CA20C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -853712,7 +853712,7 @@ _081CA264:
 	thumb_func_end sub_81CA20C
 
 	thumb_func_start sub_81CA278
-sub_81CA278: ; 81CA278
+sub_81CA278: @ 81CA278
 	push {r4,r5,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -853765,7 +853765,7 @@ _081CA2B2:
 	thumb_func_end sub_81CA278
 
 	thumb_func_start sub_81CA2DC
-sub_81CA2DC: ; 81CA2DC
+sub_81CA2DC: @ 81CA2DC
 	push {r4-r6,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -853805,7 +853805,7 @@ _081CA316:
 	thumb_func_end sub_81CA2DC
 
 	thumb_func_start sub_81CA324
-sub_81CA324: ; 81CA324
+sub_81CA324: @ 81CA324
 	push {r4,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -853838,7 +853838,7 @@ _081CA356:
 	thumb_func_end sub_81CA324
 
 	thumb_func_start sub_81CA35C
-sub_81CA35C: ; 81CA35C
+sub_81CA35C: @ 81CA35C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -853884,7 +853884,7 @@ _081CA380:
 	thumb_func_end sub_81CA35C
 
 	thumb_func_start sub_81CA3B4
-sub_81CA3B4: ; 81CA3B4
+sub_81CA3B4: @ 81CA3B4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -853953,7 +853953,7 @@ _081CA3C8:
 	thumb_func_end sub_81CA3B4
 
 	thumb_func_start sub_81CA448
-sub_81CA448: ; 81CA448
+sub_81CA448: @ 81CA448
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x1
@@ -853979,7 +853979,7 @@ _081CA458:
 	thumb_func_end sub_81CA448
 
 	thumb_func_start sub_81CA474
-sub_81CA474: ; 81CA474
+sub_81CA474: @ 81CA474
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -854011,7 +854011,7 @@ _081CA4A2:
 	thumb_func_end sub_81CA474
 
 	thumb_func_start sub_81CA4AC
-sub_81CA4AC: ; 81CA4AC
+sub_81CA4AC: @ 81CA4AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x2E]
@@ -854126,7 +854126,7 @@ _081CA578:
 	thumb_func_end sub_81CA4AC
 
 	thumb_func_start sub_81CA580
-sub_81CA580: ; 81CA580
+sub_81CA580: @ 81CA580
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -854224,7 +854224,7 @@ _081CA638:
 	thumb_func_end sub_81CA580
 
 	thumb_func_start sub_81CA640
-sub_81CA640: ; 81CA640
+sub_81CA640: @ 81CA640
 	push {r4,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -854264,7 +854264,7 @@ _081CA690:
 	thumb_func_end sub_81CA640
 
 	thumb_func_start sub_81CA698
-sub_81CA698: ; 81CA698
+sub_81CA698: @ 81CA698
 	push {lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -854275,7 +854275,7 @@ sub_81CA698: ; 81CA698
 	thumb_func_end sub_81CA698
 
 	thumb_func_start sub_81CA6AC
-sub_81CA6AC: ; 81CA6AC
+sub_81CA6AC: @ 81CA6AC
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x2E]
@@ -854305,7 +854305,7 @@ _081CA6DA:
 	thumb_func_end sub_81CA6AC
 
 	thumb_func_start sub_81CA6E0
-sub_81CA6E0: ; 81CA6E0
+sub_81CA6E0: @ 81CA6E0
 	push {r4,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -854329,7 +854329,7 @@ sub_81CA6E0: ; 81CA6E0
 	thumb_func_end sub_81CA6E0
 
 	thumb_func_start sub_81CA714
-sub_81CA714: ; 81CA714
+sub_81CA714: @ 81CA714
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r0, 0x2
@@ -854371,7 +854371,7 @@ sub_81CA714: ; 81CA714
 	thumb_func_end sub_81CA714
 
 	thumb_func_start sub_81CA770
-sub_81CA770: ; 81CA770
+sub_81CA770: @ 81CA770
 	push {r4-r6,lr}
 	sub sp, 0xC
 	movs r0, 0x2
@@ -854409,7 +854409,7 @@ sub_81CA770: ; 81CA770
 	thumb_func_end sub_81CA770
 
 	thumb_func_start sub_81CA7C4
-sub_81CA7C4: ; 81CA7C4
+sub_81CA7C4: @ 81CA7C4
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -854419,7 +854419,7 @@ sub_81CA7C4: ; 81CA7C4
 	thumb_func_end sub_81CA7C4
 
 	thumb_func_start sub_81CA7D4
-sub_81CA7D4: ; 81CA7D4
+sub_81CA7D4: @ 81CA7D4
 	push {r4,lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -854435,7 +854435,7 @@ sub_81CA7D4: ; 81CA7D4
 	thumb_func_end sub_81CA7D4
 
 	thumb_func_start sub_81CA7F4
-sub_81CA7F4: ; 81CA7F4
+sub_81CA7F4: @ 81CA7F4
 	push {lr}
 	movs r0, 0x2
 	bl sub_81C763C
@@ -854446,7 +854446,7 @@ sub_81CA7F4: ; 81CA7F4
 	thumb_func_end sub_81CA7F4
 
 	thumb_func_start sub_81CA808
-sub_81CA808: ; 81CA808
+sub_81CA808: @ 81CA808
 	push {lr}
 	movs r0, 0x3
 	movs r1, 0x80
@@ -854457,7 +854457,7 @@ sub_81CA808: ; 81CA808
 	thumb_func_end sub_81CA808
 
 	thumb_func_start sub_81CA818
-sub_81CA818: ; 81CA818
+sub_81CA818: @ 81CA818
 	push {r4,r5,lr}
 	ldr r0, =sub_81CA8B0
 	movs r1, 0x3
@@ -854482,7 +854482,7 @@ sub_81CA818: ; 81CA818
 	thumb_func_end sub_81CA818
 
 	thumb_func_start sub_81CA850
-sub_81CA850: ; 81CA850
+sub_81CA850: @ 81CA850
 	push {lr}
 	ldr r0, =gUnknown_0861FC86
 	movs r1, 0x31
@@ -854494,7 +854494,7 @@ sub_81CA850: ; 81CA850
 	thumb_func_end sub_81CA850
 
 	thumb_func_start sub_81CA864
-sub_81CA864: ; 81CA864
+sub_81CA864: @ 81CA864
 	push {r4,r5,lr}
 	ldr r0, =sub_81CA8B0
 	movs r1, 0x3
@@ -854519,7 +854519,7 @@ sub_81CA864: ; 81CA864
 	thumb_func_end sub_81CA864
 
 	thumb_func_start sub_81CA89C
-sub_81CA89C: ; 81CA89C
+sub_81CA89C: @ 81CA89C
 	push {lr}
 	ldr r0, =sub_81CA8B0
 	bl is_function_an_active_task
@@ -854531,7 +854531,7 @@ sub_81CA89C: ; 81CA89C
 	thumb_func_end sub_81CA89C
 
 	thumb_func_start sub_81CA8B0
-sub_81CA8B0: ; 81CA8B0
+sub_81CA8B0: @ 81CA8B0
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -854580,7 +854580,7 @@ _081CA908:
 	thumb_func_end sub_81CA8B0
 
 	thumb_func_start sub_81CA914
-sub_81CA914: ; 81CA914
+sub_81CA914: @ 81CA914
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -854591,7 +854591,7 @@ sub_81CA914: ; 81CA914
 	thumb_func_end sub_81CA914
 
 	thumb_func_start titlescreen_0
-titlescreen_0: ; 81CA92C
+titlescreen_0: @ 81CA92C
 	push {lr}
 	movs r0, 0x50
 	movs r1, 0x90
@@ -854630,7 +854630,7 @@ titlescreen_0: ; 81CA92C
 	thumb_func_end titlescreen_0
 
 	thumb_func_start sub_81CA994
-sub_81CA994: ; 81CA994
+sub_81CA994: @ 81CA994
 	push {lr}
 	movs r0, 0x50
 	movs r1, 0
@@ -854652,7 +854652,7 @@ sub_81CA994: ; 81CA994
 	thumb_func_end sub_81CA994
 
 	thumb_func_start sub_81CA9C8
-sub_81CA9C8: ; 81CA9C8
+sub_81CA9C8: @ 81CA9C8
 	push {lr}
 	movs r0, 0x50
 	movs r1, 0
@@ -854662,7 +854662,7 @@ sub_81CA9C8: ; 81CA9C8
 	thumb_func_end sub_81CA9C8
 
 	thumb_func_start sub_81CA9D8
-sub_81CA9D8: ; 81CA9D8
+sub_81CA9D8: @ 81CA9D8
 	push {lr}
 	bl sub_81CAA3C
 	movs r0, 0x50
@@ -854673,7 +854673,7 @@ sub_81CA9D8: ; 81CA9D8
 	thumb_func_end sub_81CA9D8
 
 	thumb_func_start sub_81CA9EC
-sub_81CA9EC: ; 81CA9EC
+sub_81CA9EC: @ 81CA9EC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -854714,7 +854714,7 @@ _081CAA30:
 	thumb_func_end sub_81CA9EC
 
 	thumb_func_start sub_81CAA3C
-sub_81CAA3C: ; 81CAA3C
+sub_81CAA3C: @ 81CAA3C
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -854782,7 +854782,7 @@ sub_81CAA3C: ; 81CAA3C
 	thumb_func_end sub_81CAA3C
 
 	thumb_func_start sub_81CAADC
-sub_81CAADC: ; 81CAADC
+sub_81CAADC: @ 81CAADC
 	push {lr}
 	bl sub_81CA9C8
 	pop {r0}
@@ -854790,7 +854790,7 @@ sub_81CAADC: ; 81CAADC
 	thumb_func_end sub_81CAADC
 
 	thumb_func_start sub_81CAAE8
-sub_81CAAE8: ; 81CAAE8
+sub_81CAAE8: @ 81CAAE8
 	push {r4,lr}
 	movs r1, 0xD4
 	lsls r1, 1
@@ -854820,7 +854820,7 @@ _081CAB1E:
 	thumb_func_end sub_81CAAE8
 
 	thumb_func_start sub_81CAB24
-sub_81CAB24: ; 81CAB24
+sub_81CAB24: @ 81CAB24
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -854831,7 +854831,7 @@ sub_81CAB24: ; 81CAB24
 	thumb_func_end sub_81CAB24
 
 	thumb_func_start sub_81CAB38
-sub_81CAB38: ; 81CAB38
+sub_81CAB38: @ 81CAB38
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C7650
@@ -854840,7 +854840,7 @@ sub_81CAB38: ; 81CAB38
 	thumb_func_end sub_81CAB38
 
 	thumb_func_start sub_81CAB44
-sub_81CAB44: ; 81CAB44
+sub_81CAB44: @ 81CAB44
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r3, =0x030022c0
@@ -854935,14 +854935,14 @@ _081CABF4:
 	thumb_func_end sub_81CAB44
 
 	thumb_func_start sub_81CABFC
-sub_81CABFC: ; 81CABFC
+sub_81CABFC: @ 81CABFC
 	ldr r0, =0x000186a4
 	bx lr
 	.pool
 	thumb_func_end sub_81CABFC
 
 	thumb_func_start sub_81CAC04
-sub_81CAC04: ; 81CAC04
+sub_81CAC04: @ 81CAC04
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x030022c0
@@ -855037,7 +855037,7 @@ _081CACAC:
 	thumb_func_end sub_81CAC04
 
 	thumb_func_start sub_81CACB8
-sub_81CACB8: ; 81CACB8
+sub_81CACB8: @ 81CACB8
 	push {lr}
 	adds r3, r0, 0
 	ldr r2, =0x030022c0
@@ -855075,7 +855075,7 @@ _081CACF0:
 	thumb_func_end sub_81CACB8
 
 	thumb_func_start sub_81CACF8
-sub_81CACF8: ; 81CACF8
+sub_81CACF8: @ 81CACF8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x030022c0
@@ -855098,7 +855098,7 @@ _081CAD16:
 	thumb_func_end sub_81CACF8
 
 	thumb_func_start sub_81CAD20
-sub_81CAD20: ; 81CAD20
+sub_81CAD20: @ 81CAD20
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r0, 0x5
@@ -855225,7 +855225,7 @@ _081CAE02:
 	thumb_func_end sub_81CAD20
 
 	thumb_func_start sub_81CAE08
-sub_81CAE08: ; 81CAE08
+sub_81CAE08: @ 81CAE08
 	push {lr}
 	cmp r0, 0x4D
 	ble _081CAE12
@@ -855246,7 +855246,7 @@ _081CAE24:
 	thumb_func_end sub_81CAE08
 
 	thumb_func_start sub_81CAE28
-sub_81CAE28: ; 81CAE28
+sub_81CAE28: @ 81CAE28
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855256,7 +855256,7 @@ sub_81CAE28: ; 81CAE28
 	thumb_func_end sub_81CAE28
 
 	thumb_func_start sub_81CAE38
-sub_81CAE38: ; 81CAE38
+sub_81CAE38: @ 81CAE38
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855266,7 +855266,7 @@ sub_81CAE38: ; 81CAE38
 	thumb_func_end sub_81CAE38
 
 	thumb_func_start sub_81CAE48
-sub_81CAE48: ; 81CAE48
+sub_81CAE48: @ 81CAE48
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855276,7 +855276,7 @@ sub_81CAE48: ; 81CAE48
 	thumb_func_end sub_81CAE48
 
 	thumb_func_start sub_81CAE58
-sub_81CAE58: ; 81CAE58
+sub_81CAE58: @ 81CAE58
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855289,7 +855289,7 @@ sub_81CAE58: ; 81CAE58
 	thumb_func_end sub_81CAE58
 
 	thumb_func_start sub_81CAE6C
-sub_81CAE6C: ; 81CAE6C
+sub_81CAE6C: @ 81CAE6C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -855313,7 +855313,7 @@ _081CAE8C:
 	thumb_func_end sub_81CAE6C
 
 	thumb_func_start sub_81CAE94
-sub_81CAE94: ; 81CAE94
+sub_81CAE94: @ 81CAE94
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855323,7 +855323,7 @@ sub_81CAE94: ; 81CAE94
 	thumb_func_end sub_81CAE94
 
 	thumb_func_start sub_81CAEA4
-sub_81CAEA4: ; 81CAEA4
+sub_81CAEA4: @ 81CAEA4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -855337,7 +855337,7 @@ sub_81CAEA4: ; 81CAEA4
 	thumb_func_end sub_81CAEA4
 
 	thumb_func_start sub_81CAEBC
-sub_81CAEBC: ; 81CAEBC
+sub_81CAEBC: @ 81CAEBC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -855376,7 +855376,7 @@ _081CAEFE:
 	thumb_func_end sub_81CAEBC
 
 	thumb_func_start sub_81CAF04
-sub_81CAF04: ; 81CAF04
+sub_81CAF04: @ 81CAF04
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -855430,7 +855430,7 @@ _081CAF6C:
 	thumb_func_end sub_81CAF04
 
 	thumb_func_start sub_81CAF78
-sub_81CAF78: ; 81CAF78
+sub_81CAF78: @ 81CAF78
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -855475,7 +855475,7 @@ _081CAFCE:
 	thumb_func_end sub_81CAF78
 
 	thumb_func_start sub_81CAFD8
-sub_81CAFD8: ; 81CAFD8
+sub_81CAFD8: @ 81CAFD8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -855512,7 +855512,7 @@ _081CB012:
 	thumb_func_end sub_81CAFD8
 
 	thumb_func_start sub_81CB01C
-sub_81CB01C: ; 81CB01C
+sub_81CB01C: @ 81CB01C
 	push {lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855522,7 +855522,7 @@ sub_81CB01C: ; 81CB01C
 	thumb_func_end sub_81CB01C
 
 	thumb_func_start sub_81CB02C
-sub_81CB02C: ; 81CB02C
+sub_81CB02C: @ 81CB02C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x5
@@ -855544,7 +855544,7 @@ _081CB048:
 	thumb_func_end sub_81CB02C
 
 	thumb_func_start sub_81CB050
-sub_81CB050: ; 81CB050
+sub_81CB050: @ 81CB050
 	push {r4,lr}
 	sub sp, 0x8
 	adds r2, r0, 0
@@ -855604,7 +855604,7 @@ _081CB0C0:
 	thumb_func_end sub_81CB050
 
 	thumb_func_start sub_81CB0C8
-sub_81CB0C8: ; 81CB0C8
+sub_81CB0C8: @ 81CB0C8
 	push {lr}
 	ldr r1, =gUnknown_085500A4
 	lsls r0, 4
@@ -855620,7 +855620,7 @@ sub_81CB0C8: ; 81CB0C8
 	thumb_func_end sub_81CB0C8
 
 	thumb_func_start sub_81CB0E4
-sub_81CB0E4: ; 81CB0E4
+sub_81CB0E4: @ 81CB0E4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r0, 0x5
@@ -855661,7 +855661,7 @@ _081CB122:
 	thumb_func_end sub_81CB0E4
 
 	thumb_func_start sub_81CB128
-sub_81CB128: ; 81CB128
+sub_81CB128: @ 81CB128
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x5
@@ -855701,7 +855701,7 @@ _081CB164:
 	thumb_func_end sub_81CB128
 
 	thumb_func_start sub_81CB16C
-sub_81CB16C: ; 81CB16C
+sub_81CB16C: @ 81CB16C
 	push {r4,lr}
 	movs r4, 0
 _081CB170:
@@ -855753,7 +855753,7 @@ _081CB1C8:
 	thumb_func_end sub_81CB16C
 
 	thumb_func_start sub_81CB1D0
-sub_81CB1D0: ; 81CB1D0
+sub_81CB1D0: @ 81CB1D0
 	push {r4,lr}
 	movs r0, 0x5
 	bl sub_81C763C
@@ -855818,7 +855818,7 @@ _081CB25A:
 	thumb_func_end sub_81CB1D0
 
 	thumb_func_start sub_81CB260
-sub_81CB260: ; 81CB260
+sub_81CB260: @ 81CB260
 	push {r4,lr}
 	ldr r1, =0x00002048
 	movs r0, 0x6
@@ -855846,7 +855846,7 @@ _081CB296:
 	thumb_func_end sub_81CB260
 
 	thumb_func_start sub_81CB29C
-sub_81CB29C: ; 81CB29C
+sub_81CB29C: @ 81CB29C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -855868,7 +855868,7 @@ sub_81CB29C: ; 81CB29C
 	thumb_func_end sub_81CB29C
 
 	thumb_func_start sub_81CB2CC
-sub_81CB2CC: ; 81CB2CC
+sub_81CB2CC: @ 81CB2CC
 	push {lr}
 	movs r0, 0x6
 	bl sub_81C763C
@@ -855879,7 +855879,7 @@ sub_81CB2CC: ; 81CB2CC
 	thumb_func_end sub_81CB2CC
 
 	thumb_func_start sub_81CB2E0
-sub_81CB2E0: ; 81CB2E0
+sub_81CB2E0: @ 81CB2E0
 	push {r4,lr}
 	movs r0, 0x6
 	bl sub_81C763C
@@ -855900,7 +855900,7 @@ sub_81CB2E0: ; 81CB2E0
 	thumb_func_end sub_81CB2E0
 
 	thumb_func_start sub_81CB310
-sub_81CB310: ; 81CB310
+sub_81CB310: @ 81CB310
 	push {lr}
 	movs r0, 0x6
 	bl sub_81C763C
@@ -855911,7 +855911,7 @@ sub_81CB310: ; 81CB310
 	thumb_func_end sub_81CB310
 
 	thumb_func_start sub_81CB324
-sub_81CB324: ; 81CB324
+sub_81CB324: @ 81CB324
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -856112,7 +856112,7 @@ _081CB506:
 	thumb_func_end sub_81CB324
 
 	thumb_func_start sub_81CB510
-sub_81CB510: ; 81CB510
+sub_81CB510: @ 81CB510
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856181,7 +856181,7 @@ _081CB582:
 	thumb_func_end sub_81CB510
 
 	thumb_func_start sub_81CB588
-sub_81CB588: ; 81CB588
+sub_81CB588: @ 81CB588
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856250,7 +856250,7 @@ _081CB5FA:
 	thumb_func_end sub_81CB588
 
 	thumb_func_start sub_81CB600
-sub_81CB600: ; 81CB600
+sub_81CB600: @ 81CB600
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856319,7 +856319,7 @@ _081CB672:
 	thumb_func_end sub_81CB600
 
 	thumb_func_start sub_81CB678
-sub_81CB678: ; 81CB678
+sub_81CB678: @ 81CB678
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856388,7 +856388,7 @@ _081CB6EA:
 	thumb_func_end sub_81CB678
 
 	thumb_func_start sub_81CB6F0
-sub_81CB6F0: ; 81CB6F0
+sub_81CB6F0: @ 81CB6F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856424,7 +856424,7 @@ _081CB72C:
 	thumb_func_end sub_81CB6F0
 
 	thumb_func_start sub_81CB734
-sub_81CB734: ; 81CB734
+sub_81CB734: @ 81CB734
 	push {r4,lr}
 	movs r0, 0x5
 	bl audio_play
@@ -856444,7 +856444,7 @@ sub_81CB734: ; 81CB734
 	thumb_func_end sub_81CB734
 
 	thumb_func_start sub_81CB75C
-sub_81CB75C: ; 81CB75C
+sub_81CB75C: @ 81CB75C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856480,7 +856480,7 @@ _081CB798:
 	thumb_func_end sub_81CB75C
 
 	thumb_func_start sub_81CB7A0
-sub_81CB7A0: ; 81CB7A0
+sub_81CB7A0: @ 81CB7A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856546,7 +856546,7 @@ _081CB81C:
 	thumb_func_end sub_81CB7A0
 
 	thumb_func_start sub_81CB824
-sub_81CB824: ; 81CB824
+sub_81CB824: @ 81CB824
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856600,7 +856600,7 @@ _081CB882:
 	thumb_func_end sub_81CB824
 
 	thumb_func_start sub_81CB888
-sub_81CB888: ; 81CB888
+sub_81CB888: @ 81CB888
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r0, 0x6
@@ -856688,7 +856688,7 @@ _081CB934:
 	thumb_func_end sub_81CB888
 
 	thumb_func_start sub_81CB93C
-sub_81CB93C: ; 81CB93C
+sub_81CB93C: @ 81CB93C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856757,7 +856757,7 @@ _081CB9C0:
 	thumb_func_end sub_81CB93C
 
 	thumb_func_start sub_81CB9C8
-sub_81CB9C8: ; 81CB9C8
+sub_81CB9C8: @ 81CB9C8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x6
@@ -856833,7 +856833,7 @@ _081CBA62:
 	thumb_func_end sub_81CB9C8
 
 	thumb_func_start sub_81CBA68
-sub_81CBA68: ; 81CBA68
+sub_81CBA68: @ 81CBA68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x6
@@ -856889,7 +856889,7 @@ _081CBACE:
 	thumb_func_end sub_81CBA68
 
 	thumb_func_start sub_81CBAD4
-sub_81CBAD4: ; 81CBAD4
+sub_81CBAD4: @ 81CBAD4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x6
@@ -856965,7 +856965,7 @@ _081CBB6E:
 	thumb_func_end sub_81CBAD4
 
 	thumb_func_start sub_81CBB74
-sub_81CBB74: ; 81CBB74
+sub_81CBB74: @ 81CBB74
 	push {lr}
 	cmp r0, 0
 	beq _081CBB80
@@ -857002,7 +857002,7 @@ _081CBBB4:
 	thumb_func_end sub_81CBB74
 
 	thumb_func_start sub_81CBBB8
-sub_81CBBB8: ; 81CBBB8
+sub_81CBBB8: @ 81CBBB8
 	push {lr}
 	sub sp, 0x18
 	bl sub_81CAE94
@@ -857044,7 +857044,7 @@ sub_81CBBB8: ; 81CBBB8
 	thumb_func_end sub_81CBBB8
 
 	thumb_func_start sub_81CBC1C
-sub_81CBC1C: ; 81CBC1C
+sub_81CBC1C: @ 81CBC1C
 	push {lr}
 	bl sub_81C8234
 	ldr r0, =sub_81CBC64
@@ -857058,7 +857058,7 @@ sub_81CBC1C: ; 81CBC1C
 	thumb_func_end sub_81CBC1C
 
 	thumb_func_start sub_81CBC38
-sub_81CBC38: ; 81CBC38
+sub_81CBC38: @ 81CBC38
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_81CBC64
@@ -857081,7 +857081,7 @@ _081CBC56:
 	thumb_func_end sub_81CBC38
 
 	thumb_func_start sub_81CBC64
-sub_81CBC64: ; 81CBC64
+sub_81CBC64: @ 81CBC64
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -857139,7 +857139,7 @@ _081CBCC8:
 	thumb_func_end sub_81CBC64
 
 	thumb_func_start sub_81CBCEC
-sub_81CBCEC: ; 81CBCEC
+sub_81CBCEC: @ 81CBCEC
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
@@ -857184,7 +857184,7 @@ _081CBD3C:
 	thumb_func_end sub_81CBCEC
 
 	thumb_func_start sub_81CBD48
-sub_81CBD48: ; 81CBD48
+sub_81CBD48: @ 81CBD48
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -857209,7 +857209,7 @@ sub_81CBD48: ; 81CBD48
 	thumb_func_end sub_81CBD48
 
 	thumb_func_start sub_81CBD78
-sub_81CBD78: ; 81CBD78
+sub_81CBD78: @ 81CBD78
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_086227D8
@@ -857238,7 +857238,7 @@ sub_81CBD78: ; 81CBD78
 	thumb_func_end sub_81CBD78
 
 	thumb_func_start sub_81CBDC0
-sub_81CBDC0: ; 81CBDC0
+sub_81CBDC0: @ 81CBDC0
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x12]
@@ -857261,7 +857261,7 @@ sub_81CBDC0: ; 81CBDC0
 	thumb_func_end sub_81CBDC0
 
 	thumb_func_start sub_81CBDF4
-sub_81CBDF4: ; 81CBDF4
+sub_81CBDF4: @ 81CBDF4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -857274,7 +857274,7 @@ sub_81CBDF4: ; 81CBDF4
 	thumb_func_end sub_81CBDF4
 
 	thumb_func_start sub_81CBE0C
-sub_81CBE0C: ; 81CBE0C
+sub_81CBE0C: @ 81CBE0C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -857297,7 +857297,7 @@ sub_81CBE0C: ; 81CBE0C
 	thumb_func_end sub_81CBE0C
 
 	thumb_func_start sub_81CBE38
-sub_81CBE38: ; 81CBE38
+sub_81CBE38: @ 81CBE38
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -857310,7 +857310,7 @@ sub_81CBE38: ; 81CBE38
 	thumb_func_end sub_81CBE38
 
 	thumb_func_start sub_81CBE50
-sub_81CBE50: ; 81CBE50
+sub_81CBE50: @ 81CBE50
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 16
@@ -857339,7 +857339,7 @@ _081CBE68:
 	thumb_func_end sub_81CBE50
 
 	thumb_func_start sub_81CBE88
-sub_81CBE88: ; 81CBE88
+sub_81CBE88: @ 81CBE88
 	push {lr}
 	sub sp, 0xC
 	adds r3, r1, 0
@@ -857364,7 +857364,7 @@ sub_81CBE88: ; 81CBE88
 	thumb_func_end sub_81CBE88
 
 	thumb_func_start sub_81CBEB4
-sub_81CBEB4: ; 81CBEB4
+sub_81CBEB4: @ 81CBEB4
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -857400,7 +857400,7 @@ sub_81CBEB4: ; 81CBEB4
 	thumb_func_end sub_81CBEB4
 
 	thumb_func_start sub_81CBEF8
-sub_81CBEF8: ; 81CBEF8
+sub_81CBEF8: @ 81CBEF8
 	push {r4,r5,lr}
 	sub sp, 0x2C
 	adds r5, r0, 0
@@ -857449,7 +857449,7 @@ _081CBF24:
 	thumb_func_end sub_81CBEF8
 
 	thumb_func_start sub_81CBF60
-sub_81CBF60: ; 81CBF60
+sub_81CBF60: @ 81CBF60
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -857500,7 +857500,7 @@ _081CBFAE:
 	thumb_func_end sub_81CBF60
 
 	thumb_func_start sub_81CBFC4
-sub_81CBFC4: ; 81CBFC4
+sub_81CBFC4: @ 81CBFC4
 	push {r4,lr}
 	adds r4, r0, 0
 	bl IsDma3ManagerBusyWithBgCopy
@@ -857524,7 +857524,7 @@ _081CBFE8:
 	thumb_func_end sub_81CBFC4
 
 	thumb_func_start sub_81CBFF0
-sub_81CBFF0: ; 81CBFF0
+sub_81CBFF0: @ 81CBFF0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81CC330
@@ -857536,7 +857536,7 @@ sub_81CBFF0: ; 81CBFF0
 	thumb_func_end sub_81CBFF0
 
 	thumb_func_start sub_81CC004
-sub_81CC004: ; 81CC004
+sub_81CC004: @ 81CC004
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -857546,7 +857546,7 @@ sub_81CC004: ; 81CC004
 	thumb_func_end sub_81CC004
 
 	thumb_func_start sub_81CC014
-sub_81CC014: ; 81CC014
+sub_81CC014: @ 81CC014
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81CC330
@@ -857562,7 +857562,7 @@ sub_81CC014: ; 81CC014
 	thumb_func_end sub_81CC014
 
 	thumb_func_start sub_81CC034
-sub_81CC034: ; 81CC034
+sub_81CC034: @ 81CC034
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_08622808
@@ -857580,7 +857580,7 @@ sub_81CC034: ; 81CC034
 	thumb_func_end sub_81CC034
 
 	thumb_func_start sub_81CC058
-sub_81CC058: ; 81CC058
+sub_81CC058: @ 81CC058
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x14]
@@ -857612,7 +857612,7 @@ sub_81CC058: ; 81CC058
 	thumb_func_end sub_81CC058
 
 	thumb_func_start sub_81CC09C
-sub_81CC09C: ; 81CC09C
+sub_81CC09C: @ 81CC09C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x14]
@@ -857637,7 +857637,7 @@ sub_81CC09C: ; 81CC09C
 	thumb_func_end sub_81CC09C
 
 	thumb_func_start sub_81CC0D0
-sub_81CC0D0: ; 81CC0D0
+sub_81CC0D0: @ 81CC0D0
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -857647,7 +857647,7 @@ sub_81CC0D0: ; 81CC0D0
 	thumb_func_end sub_81CC0D0
 
 	thumb_func_start sub_81CC0E0
-sub_81CC0E0: ; 81CC0E0
+sub_81CC0E0: @ 81CC0E0
 	push {lr}
 	sub sp, 0xC
 	ldrb r0, [r0, 0x14]
@@ -857667,7 +857667,7 @@ sub_81CC0E0: ; 81CC0E0
 	thumb_func_end sub_81CC0E0
 
 	thumb_func_start sub_81CC104
-sub_81CC104: ; 81CC104
+sub_81CC104: @ 81CC104
 	push {r4,lr}
 	adds r4, r0, 0
 	bl RunTextPrinters
@@ -857681,7 +857681,7 @@ sub_81CC104: ; 81CC104
 	thumb_func_end sub_81CC104
 
 	thumb_func_start sub_81CC11C
-sub_81CC11C: ; 81CC11C
+sub_81CC11C: @ 81CC11C
 	push {lr}
 	sub sp, 0xC
 	ldrb r0, [r0, 0x14]
@@ -857701,7 +857701,7 @@ sub_81CC11C: ; 81CC11C
 	thumb_func_end sub_81CC11C
 
 	thumb_func_start sub_81CC140
-sub_81CC140: ; 81CC140
+sub_81CC140: @ 81CC140
 	push {r4,lr}
 	adds r4, r0, 0
 	bl RunTextPrinters
@@ -857715,7 +857715,7 @@ sub_81CC140: ; 81CC140
 	thumb_func_end sub_81CC140
 
 	thumb_func_start sub_81CC158
-sub_81CC158: ; 81CC158
+sub_81CC158: @ 81CC158
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -857744,7 +857744,7 @@ sub_81CC158: ; 81CC158
 	thumb_func_end sub_81CC158
 
 	thumb_func_start sub_81CC194
-sub_81CC194: ; 81CC194
+sub_81CC194: @ 81CC194
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030022c0
@@ -857780,7 +857780,7 @@ _081CC1C4:
 	thumb_func_end sub_81CC194
 
 	thumb_func_start sub_81CC1DC
-sub_81CC1DC: ; 81CC1DC
+sub_81CC1DC: @ 81CC1DC
 	push {lr}
 	sub sp, 0x8
 	bl sub_81C7CE4
@@ -857801,7 +857801,7 @@ sub_81CC1DC: ; 81CC1DC
 	thumb_func_end sub_81CC1DC
 
 	thumb_func_start sub_81CC204
-sub_81CC204: ; 81CC204
+sub_81CC204: @ 81CC204
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -857811,7 +857811,7 @@ sub_81CC204: ; 81CC204
 	thumb_func_end sub_81CC204
 
 	thumb_func_start sub_81CC214
-sub_81CC214: ; 81CC214
+sub_81CC214: @ 81CC214
 	push {r4-r6,lr}
 	sub sp, 0x8
 	movs r0, 0x6
@@ -857877,7 +857877,7 @@ _081CC224:
 	thumb_func_end sub_81CC214
 
 	thumb_func_start sub_81CC2B4
-sub_81CC2B4: ; 81CC2B4
+sub_81CC2B4: @ 81CC2B4
 	push {r4,lr}
 	movs r0, 0x6
 	bl sub_81C763C
@@ -857906,7 +857906,7 @@ _081CC2D2:
 	thumb_func_end sub_81CC2B4
 
 	thumb_func_start sub_81CC2F0
-sub_81CC2F0: ; 81CC2F0
+sub_81CC2F0: @ 81CC2F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -857937,7 +857937,7 @@ _081CC320:
 	thumb_func_end sub_81CC2F0
 
 	thumb_func_start sub_81CC330
-sub_81CC330: ; 81CC330
+sub_81CC330: @ 81CC330
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x1C]
@@ -857950,7 +857950,7 @@ sub_81CC330: ; 81CC330
 	thumb_func_end sub_81CC330
 
 	thumb_func_start sub_81CC344
-sub_81CC344: ; 81CC344
+sub_81CC344: @ 81CC344
 	ldr r0, [r0, 0x1C]
 	lsls r1, 4
 	strh r1, [r0, 0x26]
@@ -857958,7 +857958,7 @@ sub_81CC344: ; 81CC344
 	thumb_func_end sub_81CC344
 
 	thumb_func_start sub_81CC34C
-sub_81CC34C: ; 81CC34C
+sub_81CC34C: @ 81CC34C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0x2E]
@@ -857981,7 +857981,7 @@ _081CC36C:
 	thumb_func_end sub_81CC34C
 
 	thumb_func_start sub_81CC370
-sub_81CC370: ; 81CC370
+sub_81CC370: @ 81CC370
 	push {lr}
 	ldr r0, =gUnknown_08622850
 	movs r1, 0x2C
@@ -858002,7 +858002,7 @@ sub_81CC370: ; 81CC370
 	thumb_func_end sub_81CC370
 
 	thumb_func_start sub_81CC39C
-sub_81CC39C: ; 81CC39C
+sub_81CC39C: @ 81CC39C
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	bl sub_81C875C
@@ -858055,7 +858055,7 @@ _081CC400:
 	thumb_func_end sub_81CC39C
 
 	thumb_func_start sub_81CC420
-sub_81CC420: ; 81CC420
+sub_81CC420: @ 81CC420
 	ldr r1, [r0, 0x20]
 	ldr r0, =sub_81CC4A4
 	str r0, [r1, 0x1C]
@@ -858064,7 +858064,7 @@ sub_81CC420: ; 81CC420
 	thumb_func_end sub_81CC420
 
 	thumb_func_start sub_81CC42C
-sub_81CC42C: ; 81CC42C
+sub_81CC42C: @ 81CC42C
 	ldr r0, [r0, 0x20]
 	ldr r1, [r0, 0x1C]
 	ldr r0, =DummyObjectCallback
@@ -858077,7 +858077,7 @@ sub_81CC42C: ; 81CC42C
 	thumb_func_end sub_81CC42C
 
 	thumb_func_start sub_81CC440
-sub_81CC440: ; 81CC440
+sub_81CC440: @ 81CC440
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2E
@@ -858130,7 +858130,7 @@ _081CC498:
 	thumb_func_end sub_81CC440
 
 	thumb_func_start sub_81CC4A4
-sub_81CC4A4: ; 81CC4A4
+sub_81CC4A4: @ 81CC4A4
 	push {lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x24]
@@ -858157,7 +858157,7 @@ _081CC4CA:
 	thumb_func_end sub_81CC4A4
 
 	thumb_func_start sub_81CC4D4
-sub_81CC4D4: ; 81CC4D4
+sub_81CC4D4: @ 81CC4D4
 	push {r4,lr}
 	movs r0, 0x3
 	movs r1, 0x14
@@ -858197,7 +858197,7 @@ _081CC51A:
 	thumb_func_end sub_81CC4D4
 
 	thumb_func_start sub_81CC524
-sub_81CC524: ; 81CC524
+sub_81CC524: @ 81CC524
 	push {lr}
 	bl sub_8124658
 	ldr r1, =0x03005d90
@@ -858221,7 +858221,7 @@ sub_81CC524: ; 81CC524
 	thumb_func_end sub_81CC524
 
 	thumb_func_start sub_81CC554
-sub_81CC554: ; 81CC554
+sub_81CC554: @ 81CC554
 	push {lr}
 	movs r0, 0x3
 	bl sub_81C763C
@@ -858232,7 +858232,7 @@ sub_81CC554: ; 81CC554
 	thumb_func_end sub_81CC554
 
 	thumb_func_start sub_81CC568
-sub_81CC568: ; 81CC568
+sub_81CC568: @ 81CC568
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81230AC
@@ -858277,7 +858277,7 @@ _081CC5AE:
 	thumb_func_end sub_81CC568
 
 	thumb_func_start sub_81CC5B4
-sub_81CC5B4: ; 81CC5B4
+sub_81CC5B4: @ 81CC5B4
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x030022c0
@@ -858300,14 +858300,14 @@ _081CC5D2:
 	thumb_func_end sub_81CC5B4
 
 	thumb_func_start sub_81CC5DC
-sub_81CC5DC: ; 81CC5DC
+sub_81CC5DC: @ 81CC5DC
 	ldr r0, =0x000186a1
 	bx lr
 	.pool
 	thumb_func_end sub_81CC5DC
 
 	thumb_func_start sub_81CC5E4
-sub_81CC5E4: ; 81CC5E4
+sub_81CC5E4: @ 81CC5E4
 	push {lr}
 	movs r0, 0x3
 	bl sub_81C763C
@@ -858317,7 +858317,7 @@ sub_81CC5E4: ; 81CC5E4
 	thumb_func_end sub_81CC5E4
 
 	thumb_func_start sub_81CC5F4
-sub_81CC5F4: ; 81CC5F4
+sub_81CC5F4: @ 81CC5F4
 	push {r4,lr}
 	ldr r1, =0x00001948
 	movs r0, 0x4
@@ -858343,7 +858343,7 @@ _081CC626:
 	thumb_func_end sub_81CC5F4
 
 	thumb_func_start sub_81CC62C
-sub_81CC62C: ; 81CC62C
+sub_81CC62C: @ 81CC62C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -858365,7 +858365,7 @@ sub_81CC62C: ; 81CC62C
 	thumb_func_end sub_81CC62C
 
 	thumb_func_start sub_81CC65C
-sub_81CC65C: ; 81CC65C
+sub_81CC65C: @ 81CC65C
 	push {lr}
 	movs r0, 0x4
 	bl sub_81C763C
@@ -858376,7 +858376,7 @@ sub_81CC65C: ; 81CC65C
 	thumb_func_end sub_81CC65C
 
 	thumb_func_start sub_81CC670
-sub_81CC670: ; 81CC670
+sub_81CC670: @ 81CC670
 	push {r4,lr}
 	movs r0, 0x4
 	bl sub_81C763C
@@ -858398,7 +858398,7 @@ sub_81CC670: ; 81CC670
 	thumb_func_end sub_81CC670
 
 	thumb_func_start sub_81CC6A4
-sub_81CC6A4: ; 81CC6A4
+sub_81CC6A4: @ 81CC6A4
 	push {lr}
 	bl copy_pal_bg_faded_to_pal_ram
 	bl LoadOamFromSprites
@@ -858409,7 +858409,7 @@ sub_81CC6A4: ; 81CC6A4
 	thumb_func_end sub_81CC6A4
 
 	thumb_func_start sub_81CC6BC
-sub_81CC6BC: ; 81CC6BC
+sub_81CC6BC: @ 81CC6BC
 	push {lr}
 	movs r0, 0x4
 	bl sub_81C763C
@@ -858420,7 +858420,7 @@ sub_81CC6BC: ; 81CC6BC
 	thumb_func_end sub_81CC6BC
 
 	thumb_func_start sub_81CC6D0
-sub_81CC6D0: ; 81CC6D0
+sub_81CC6D0: @ 81CC6D0
 	push {lr}
 	bl sub_81CC5E4
 	cmp r0, 0
@@ -858441,7 +858441,7 @@ _081CC6EE:
 	thumb_func_end sub_81CC6D0
 
 	thumb_func_start sub_81CC6F4
-sub_81CC6F4: ; 81CC6F4
+sub_81CC6F4: @ 81CC6F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -858588,7 +858588,7 @@ _081CC840:
 	thumb_func_end sub_81CC6F4
 
 	thumb_func_start sub_81CC848
-sub_81CC848: ; 81CC848
+sub_81CC848: @ 81CC848
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -858617,7 +858617,7 @@ _081CC872:
 	thumb_func_end sub_81CC848
 
 	thumb_func_start sub_81CC878
-sub_81CC878: ; 81CC878
+sub_81CC878: @ 81CC878
 	push {lr}
 	cmp r0, 0x1
 	beq _081CC8A2
@@ -858668,7 +858668,7 @@ _081CC8D2:
 	thumb_func_end sub_81CC878
 
 	thumb_func_start sub_81CC8D8
-sub_81CC8D8: ; 81CC8D8
+sub_81CC8D8: @ 81CC8D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -858735,7 +858735,7 @@ _081CC954:
 	thumb_func_end sub_81CC8D8
 
 	thumb_func_start sub_81CC95C
-sub_81CC95C: ; 81CC95C
+sub_81CC95C: @ 81CC95C
 	push {lr}
 	cmp r0, 0x1
 	beq _081CC982
@@ -858787,7 +858787,7 @@ _081CC9BA:
 	thumb_func_end sub_81CC95C
 
 	thumb_func_start sub_81CC9C0
-sub_81CC9C0: ; 81CC9C0
+sub_81CC9C0: @ 81CC9C0
 	push {r4,r5,lr}
 	movs r5, 0
 	ldr r4, =gUnknown_086230F8
@@ -858808,7 +858808,7 @@ _081CC9C6:
 	thumb_func_end sub_81CC9C0
 
 	thumb_func_start sub_81CC9EC
-sub_81CC9EC: ; 81CC9EC
+sub_81CC9EC: @ 81CC9EC
 	push {r4,r5,lr}
 	movs r0, 0x4
 	bl sub_81C763C
@@ -858832,7 +858832,7 @@ _081CCA08:
 	thumb_func_end sub_81CC9EC
 
 	thumb_func_start sub_81CCA1C
-sub_81CCA1C: ; 81CCA1C
+sub_81CCA1C: @ 81CCA1C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -858922,7 +858922,7 @@ _081CCAEA:
 	thumb_func_end sub_81CCA1C
 
 	thumb_func_start sub_81CCAFC
-sub_81CCAFC: ; 81CCAFC
+sub_81CCAFC: @ 81CCAFC
 	push {lr}
 	bl free_temp_tile_data_buffers_if_possible
 	lsls r0, 24
@@ -858932,7 +858932,7 @@ sub_81CCAFC: ; 81CCAFC
 	thumb_func_end sub_81CCAFC
 
 	thumb_func_start sub_81CCB0C
-sub_81CCB0C: ; 81CCB0C
+sub_81CCB0C: @ 81CCB0C
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -859077,7 +859077,7 @@ _081CCC40:
 	thumb_func_end sub_81CCB0C
 
 	thumb_func_start sub_81CCC4C
-sub_81CCC4C: ; 81CCC4C
+sub_81CCC4C: @ 81CCC4C
 	push {lr}
 	bl IsDma3ManagerBusyWithBgCopy
 	lsls r0, 24
@@ -859087,7 +859087,7 @@ sub_81CCC4C: ; 81CCC4C
 	thumb_func_end sub_81CCC4C
 
 	thumb_func_start sub_81CCC5C
-sub_81CCC5C: ; 81CCC5C
+sub_81CCC5C: @ 81CCC5C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =sub_81CCC9C
@@ -859108,7 +859108,7 @@ sub_81CCC5C: ; 81CCC5C
 	thumb_func_end sub_81CCC5C
 
 	thumb_func_start sub_81CCC88
-sub_81CCC88: ; 81CCC88
+sub_81CCC88: @ 81CCC88
 	push {lr}
 	ldr r0, =sub_81CCC9C
 	bl is_function_an_active_task
@@ -859120,7 +859120,7 @@ sub_81CCC88: ; 81CCC88
 	thumb_func_end sub_81CCC88
 
 	thumb_func_start sub_81CCC9C
-sub_81CCC9C: ; 81CCC9C
+sub_81CCC9C: @ 81CCC9C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -859175,7 +859175,7 @@ _081CCD04:
 	thumb_func_end sub_81CCC9C
 
 	thumb_func_start sub_81CCD10
-sub_81CCD10: ; 81CCD10
+sub_81CCD10: @ 81CCD10
 	push {lr}
 	ldr r0, =sub_81CCD34
 	movs r1, 0x1
@@ -859186,7 +859186,7 @@ sub_81CCD10: ; 81CCD10
 	thumb_func_end sub_81CCD10
 
 	thumb_func_start sub_81CCD24
-sub_81CCD24: ; 81CCD24
+sub_81CCD24: @ 81CCD24
 	push {lr}
 	ldr r0, =sub_81CCD34
 	bl sub_81C7124
@@ -859196,7 +859196,7 @@ sub_81CCD24: ; 81CCD24
 	thumb_func_end sub_81CCD24
 
 	thumb_func_start sub_81CCD34
-sub_81CCD34: ; 81CCD34
+sub_81CCD34: @ 81CCD34
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -859227,7 +859227,7 @@ _081CCD62:
 	thumb_func_end sub_81CCD34
 
 	thumb_func_start sub_81CCD70
-sub_81CCD70: ; 81CCD70
+sub_81CCD70: @ 81CCD70
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -859287,7 +859287,7 @@ _081CCDD4:
 	thumb_func_end sub_81CCD70
 
 	thumb_func_start sub_81CCDE8
-sub_81CCDE8: ; 81CCDE8
+sub_81CCDE8: @ 81CCDE8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -859344,7 +859344,7 @@ _081CCE34:
 	thumb_func_end sub_81CCDE8
 
 	thumb_func_start sub_81CCE58
-sub_81CCE58: ; 81CCE58
+sub_81CCE58: @ 81CCE58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -859418,7 +859418,7 @@ _081CCE80:
 	thumb_func_end sub_81CCE58
 
 	thumb_func_start sub_81CCEF4
-sub_81CCEF4: ; 81CCEF4
+sub_81CCEF4: @ 81CCEF4
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldrh r0, [r3, 0x34]
@@ -859491,7 +859491,7 @@ _081CCF70:
 	thumb_func_end sub_81CCEF4
 
 	thumb_func_start sub_81CCF78
-sub_81CCF78: ; 81CCF78
+sub_81CCF78: @ 81CCF78
 	push {r4,lr}
 	movs r0, 0x4
 	bl sub_81C763C
@@ -859515,7 +859515,7 @@ _081CCF92:
 	thumb_func_end sub_81CCF78
 
 	thumb_func_start sub_81CCFA4
-sub_81CCFA4: ; 81CCFA4
+sub_81CCFA4: @ 81CCFA4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r0, 0x4
@@ -859545,7 +859545,7 @@ _081CCFBE:
 	thumb_func_end sub_81CCFA4
 
 	thumb_func_start sub_81CCFD8
-sub_81CCFD8: ; 81CCFD8
+sub_81CCFD8: @ 81CCFD8
 	push {r4,lr}
 	ldr r1, =0x0000678c
 	movs r0, 0xB
@@ -859576,7 +859576,7 @@ _081CD01E:
 	thumb_func_end sub_81CCFD8
 
 	thumb_func_start sub_81CD024
-sub_81CD024: ; 81CD024
+sub_81CD024: @ 81CD024
 	push {r4,lr}
 	ldr r1, =0x0000678c
 	movs r0, 0xB
@@ -859607,7 +859607,7 @@ _081CD06A:
 	thumb_func_end sub_81CD024
 
 	thumb_func_start sub_81CD070
-sub_81CD070: ; 81CD070
+sub_81CD070: @ 81CD070
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -859621,7 +859621,7 @@ sub_81CD070: ; 81CD070
 	thumb_func_end sub_81CD070
 
 	thumb_func_start sub_81CD08C
-sub_81CD08C: ; 81CD08C
+sub_81CD08C: @ 81CD08C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x12
@@ -859681,7 +859681,7 @@ _081CD100:
 	thumb_func_end sub_81CD08C
 
 	thumb_func_start sub_81CD110
-sub_81CD110: ; 81CD110
+sub_81CD110: @ 81CD110
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -859745,7 +859745,7 @@ _081CD18A:
 	thumb_func_end sub_81CD110
 
 	thumb_func_start sub_81CD19C
-sub_81CD19C: ; 81CD19C
+sub_81CD19C: @ 81CD19C
 	push {lr}
 	movs r1, 0xC6
 	lsls r1, 7
@@ -859765,7 +859765,7 @@ _081CD1B6:
 	thumb_func_end sub_81CD19C
 
 	thumb_func_start sub_81CD1C0
-sub_81CD1C0: ; 81CD1C0
+sub_81CD1C0: @ 81CD1C0
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -859785,7 +859785,7 @@ _081CD1DA:
 	thumb_func_end sub_81CD1C0
 
 	thumb_func_start sub_81CD1E4
-sub_81CD1E4: ; 81CD1E4
+sub_81CD1E4: @ 81CD1E4
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x12
@@ -859845,7 +859845,7 @@ _081CD24E:
 	thumb_func_end sub_81CD1E4
 
 	thumb_func_start sub_81CD258
-sub_81CD258: ; 81CD258
+sub_81CD258: @ 81CD258
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -860020,7 +860020,7 @@ _081CD3BA:
 	thumb_func_end sub_81CD258
 
 	thumb_func_start sub_81CD3C4
-sub_81CD3C4: ; 81CD3C4
+sub_81CD3C4: @ 81CD3C4
 	push {r4,lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -860205,7 +860205,7 @@ _081CD53C:
 	thumb_func_end sub_81CD3C4
 
 	thumb_func_start sub_81CD548
-sub_81CD548: ; 81CD548
+sub_81CD548: @ 81CD548
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -860267,7 +860267,7 @@ _081CD5C6:
 	thumb_func_end sub_81CD548
 
 	thumb_func_start sub_81CD5CC
-sub_81CD5CC: ; 81CD5CC
+sub_81CD5CC: @ 81CD5CC
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r2, 16
@@ -860317,7 +860317,7 @@ _081CD612:
 	thumb_func_end sub_81CD5CC
 
 	thumb_func_start sub_81CD624
-sub_81CD624: ; 81CD624
+sub_81CD624: @ 81CD624
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -860569,7 +860569,7 @@ _081CD80E:
 	thumb_func_end sub_81CD624
 
 	thumb_func_start sub_81CD824
-sub_81CD824: ; 81CD824
+sub_81CD824: @ 81CD824
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -860720,7 +860720,7 @@ _081CD95C:
 	thumb_func_end sub_81CD824
 
 	thumb_func_start sub_81CD970
-sub_81CD970: ; 81CD970
+sub_81CD970: @ 81CD970
 	push {r4-r7,lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -860787,7 +860787,7 @@ _081CD9C4:
 	thumb_func_end sub_81CD970
 
 	thumb_func_start sub_81CD9F8
-sub_81CD9F8: ; 81CD9F8
+sub_81CD9F8: @ 81CD9F8
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -860806,7 +860806,7 @@ sub_81CD9F8: ; 81CD9F8
 	thumb_func_end sub_81CD9F8
 
 	thumb_func_start sub_81CDA1C
-sub_81CDA1C: ; 81CDA1C
+sub_81CDA1C: @ 81CDA1C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -860977,7 +860977,7 @@ _081CDB80:
 	thumb_func_end sub_81CDA1C
 
 	thumb_func_start sub_81CDB98
-sub_81CDB98: ; 81CDB98
+sub_81CDB98: @ 81CDB98
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -861066,7 +861066,7 @@ _081CDC3E:
 	thumb_func_end sub_81CDB98
 
 	thumb_func_start sub_81CDC50
-sub_81CDC50: ; 81CDC50
+sub_81CDC50: @ 81CDC50
 	push {lr}
 	movs r0, 0x12
 	bl sub_81C763C
@@ -861076,7 +861076,7 @@ sub_81CDC50: ; 81CDC50
 	thumb_func_end sub_81CDC50
 
 	thumb_func_start sub_81CDC60
-sub_81CDC60: ; 81CDC60
+sub_81CDC60: @ 81CDC60
 	push {lr}
 	movs r0, 0x12
 	bl sub_81C763C
@@ -861086,7 +861086,7 @@ sub_81CDC60: ; 81CDC60
 	thumb_func_end sub_81CDC60
 
 	thumb_func_start sub_81CDC70
-sub_81CDC70: ; 81CDC70
+sub_81CDC70: @ 81CDC70
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861098,7 +861098,7 @@ sub_81CDC70: ; 81CDC70
 	thumb_func_end sub_81CDC70
 
 	thumb_func_start sub_81CDC84
-sub_81CDC84: ; 81CDC84
+sub_81CDC84: @ 81CDC84
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861111,7 +861111,7 @@ sub_81CDC84: ; 81CDC84
 	thumb_func_end sub_81CDC84
 
 	thumb_func_start sub_81CDC9C
-sub_81CDC9C: ; 81CDC9C
+sub_81CDC9C: @ 81CDC9C
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861124,7 +861124,7 @@ sub_81CDC9C: ; 81CDC9C
 	thumb_func_end sub_81CDC9C
 
 	thumb_func_start sub_81CDCB4
-sub_81CDCB4: ; 81CDCB4
+sub_81CDCB4: @ 81CDCB4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -861142,7 +861142,7 @@ sub_81CDCB4: ; 81CDCB4
 	thumb_func_end sub_81CDCB4
 
 	thumb_func_start sub_81CDCD4
-sub_81CDCD4: ; 81CDCD4
+sub_81CDCD4: @ 81CDCD4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -861157,7 +861157,7 @@ sub_81CDCD4: ; 81CDCD4
 	thumb_func_end sub_81CDCD4
 
 	thumb_func_start sub_81CDCEC
-sub_81CDCEC: ; 81CDCEC
+sub_81CDCEC: @ 81CDCEC
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861170,7 +861170,7 @@ sub_81CDCEC: ; 81CDCEC
 	thumb_func_end sub_81CDCEC
 
 	thumb_func_start sub_81CDD04
-sub_81CDD04: ; 81CDD04
+sub_81CDD04: @ 81CDD04
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -861188,7 +861188,7 @@ sub_81CDD04: ; 81CDD04
 	thumb_func_end sub_81CDD04
 
 	thumb_func_start sub_81CDD24
-sub_81CDD24: ; 81CDD24
+sub_81CDD24: @ 81CDD24
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -861208,7 +861208,7 @@ sub_81CDD24: ; 81CDD24
 	thumb_func_end sub_81CDD24
 
 	thumb_func_start sub_81CDD48
-sub_81CDD48: ; 81CDD48
+sub_81CDD48: @ 81CDD48
 	push {lr}
 	movs r0, 0x12
 	bl sub_81C763C
@@ -861221,7 +861221,7 @@ sub_81CDD48: ; 81CDD48
 	thumb_func_end sub_81CDD48
 
 	thumb_func_start sub_81CDD5C
-sub_81CDD5C: ; 81CDD5C
+sub_81CDD5C: @ 81CDD5C
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861241,7 +861241,7 @@ _081CDD76:
 	thumb_func_end sub_81CDD5C
 
 	thumb_func_start sub_81CDD7C
-sub_81CDD7C: ; 81CDD7C
+sub_81CDD7C: @ 81CDD7C
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861270,7 +861270,7 @@ _081CDDA6:
 	thumb_func_end sub_81CDD7C
 
 	thumb_func_start sub_81CDDB0
-sub_81CDDB0: ; 81CDDB0
+sub_81CDDB0: @ 81CDDB0
 	push {lr}
 	movs r0, 0xB
 	bl sub_81C763C
@@ -861289,7 +861289,7 @@ sub_81CDDB0: ; 81CDDB0
 	thumb_func_end sub_81CDDB0
 
 	thumb_func_start sub_81CDDD4
-sub_81CDDD4: ; 81CDDD4
+sub_81CDDD4: @ 81CDDD4
 	push {r4,lr}
 	ldr r1, =0x000038ac
 	movs r0, 0xC
@@ -861325,7 +861325,7 @@ _081CDE26:
 	thumb_func_end sub_81CDDD4
 
 	thumb_func_start sub_81CDE2C
-sub_81CDE2C: ; 81CDE2C
+sub_81CDE2C: @ 81CDE2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -861349,7 +861349,7 @@ sub_81CDE2C: ; 81CDE2C
 	thumb_func_end sub_81CDE2C
 
 	thumb_func_start sub_81CDE64
-sub_81CDE64: ; 81CDE64
+sub_81CDE64: @ 81CDE64
 	push {lr}
 	movs r0, 0xC
 	bl sub_81C763C
@@ -861363,7 +861363,7 @@ sub_81CDE64: ; 81CDE64
 	thumb_func_end sub_81CDE64
 
 	thumb_func_start sub_81CDE80
-sub_81CDE80: ; 81CDE80
+sub_81CDE80: @ 81CDE80
 	push {lr}
 	movs r0, 0xC
 	bl sub_81C763C
@@ -861374,7 +861374,7 @@ sub_81CDE80: ; 81CDE80
 	thumb_func_end sub_81CDE80
 
 	thumb_func_start sub_81CDE94
-sub_81CDE94: ; 81CDE94
+sub_81CDE94: @ 81CDE94
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -861802,7 +861802,7 @@ _081CE2C6:
 	thumb_func_end sub_81CDE94
 
 	thumb_func_start sub_81CE2D0
-sub_81CE2D0: ; 81CE2D0
+sub_81CE2D0: @ 81CE2D0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -861884,7 +861884,7 @@ _081CE376:
 	thumb_func_end sub_81CE2D0
 
 	thumb_func_start sub_81CE37C
-sub_81CE37C: ; 81CE37C
+sub_81CE37C: @ 81CE37C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -862038,7 +862038,7 @@ _081CE4D2:
 	thumb_func_end sub_81CE37C
 
 	thumb_func_start sub_81CE4D8
-sub_81CE4D8: ; 81CE4D8
+sub_81CE4D8: @ 81CE4D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -862160,7 +862160,7 @@ _081CE5DE:
 	thumb_func_end sub_81CE4D8
 
 	thumb_func_start sub_81CE5E4
-sub_81CE5E4: ; 81CE5E4
+sub_81CE5E4: @ 81CE5E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -862262,7 +862262,7 @@ _081CE6B4:
 	thumb_func_end sub_81CE5E4
 
 	thumb_func_start sub_81CE6BC
-sub_81CE6BC: ; 81CE6BC
+sub_81CE6BC: @ 81CE6BC
 	push {lr}
 	cmp r0, 0x1
 	beq _081CE6E6
@@ -862303,7 +862303,7 @@ _081CE6FC:
 	thumb_func_end sub_81CE6BC
 
 	thumb_func_start sub_81CE700
-sub_81CE700: ; 81CE700
+sub_81CE700: @ 81CE700
 	push {lr}
 	cmp r0, 0x1
 	beq _081CE71E
@@ -862339,7 +862339,7 @@ _081CE734:
 	thumb_func_end sub_81CE700
 
 	thumb_func_start sub_81CE738
-sub_81CE738: ; 81CE738
+sub_81CE738: @ 81CE738
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -862354,7 +862354,7 @@ sub_81CE738: ; 81CE738
 	thumb_func_end sub_81CE738
 
 	thumb_func_start sub_81CE754
-sub_81CE754: ; 81CE754
+sub_81CE754: @ 81CE754
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -862579,7 +862579,7 @@ _081CE926:
 	thumb_func_end sub_81CE754
 
 	thumb_func_start sub_81CE934
-sub_81CE934: ; 81CE934
+sub_81CE934: @ 81CE934
 	push {r4,lr}
 	movs r0, 0xC
 	bl sub_81C763C
@@ -862601,7 +862601,7 @@ sub_81CE934: ; 81CE934
 	thumb_func_end sub_81CE934
 
 	thumb_func_start sub_81CE964
-sub_81CE964: ; 81CE964
+sub_81CE964: @ 81CE964
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0x2E
@@ -862626,7 +862626,7 @@ _081CE98A:
 	thumb_func_end sub_81CE964
 
 	thumb_func_start sub_81CE990
-sub_81CE990: ; 81CE990
+sub_81CE990: @ 81CE990
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_81CDC60
@@ -862657,7 +862657,7 @@ _081CE9B2:
 	thumb_func_end sub_81CE990
 
 	thumb_func_start sub_81CE9C8
-sub_81CE9C8: ; 81CE9C8
+sub_81CE9C8: @ 81CE9C8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81CDD7C
@@ -862672,7 +862672,7 @@ sub_81CE9C8: ; 81CE9C8
 	thumb_func_end sub_81CE9C8
 
 	thumb_func_start sub_81CE9E4
-sub_81CE9E4: ; 81CE9E4
+sub_81CE9E4: @ 81CE9E4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -862907,7 +862907,7 @@ _081CEBC6:
 	thumb_func_end sub_81CE9E4
 
 	thumb_func_start sub_81CEBF4
-sub_81CEBF4: ; 81CEBF4
+sub_81CEBF4: @ 81CEBF4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_81CDD5C
@@ -862980,7 +862980,7 @@ _081CEC8E:
 	thumb_func_end sub_81CEBF4
 
 	thumb_func_start sub_81CECA0
-sub_81CECA0: ; 81CECA0
+sub_81CECA0: @ 81CECA0
 	push {r4,lr}
 	movs r0, 0xC
 	bl sub_81C763C
@@ -863025,7 +863025,7 @@ _081CECF0:
 	thumb_func_end sub_81CECA0
 
 	thumb_func_start sub_81CED10
-sub_81CED10: ; 81CED10
+sub_81CED10: @ 81CED10
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xC
@@ -863042,7 +863042,7 @@ sub_81CED10: ; 81CED10
 	thumb_func_end sub_81CED10
 
 	thumb_func_start sub_81CED30
-sub_81CED30: ; 81CED30
+sub_81CED30: @ 81CED30
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -863155,7 +863155,7 @@ _081CEE26:
 	thumb_func_end sub_81CED30
 
 	thumb_func_start sub_81CEE44
-sub_81CEE44: ; 81CEE44
+sub_81CEE44: @ 81CEE44
 	push {r4,lr}
 	bl sub_81CDC70
 	adds r4, r0, 0
@@ -863171,7 +863171,7 @@ sub_81CEE44: ; 81CEE44
 	thumb_func_end sub_81CEE44
 
 	thumb_func_start sub_81CEE68
-sub_81CEE68: ; 81CEE68
+sub_81CEE68: @ 81CEE68
 	push {lr}
 	bl sub_81C760C
 	pop {r0}
@@ -863179,7 +863179,7 @@ sub_81CEE68: ; 81CEE68
 	thumb_func_end sub_81CEE68
 
 	thumb_func_start sub_81CEE74
-sub_81CEE74: ; 81CEE74
+sub_81CEE74: @ 81CEE74
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -863196,7 +863196,7 @@ _081CEE8A:
 	thumb_func_end sub_81CEE74
 
 	thumb_func_start sub_81CEE90
-sub_81CEE90: ; 81CEE90
+sub_81CEE90: @ 81CEE90
 	push {r4,lr}
 	bl sub_81CDC70
 	adds r4, r0, 0
@@ -863223,7 +863223,7 @@ sub_81CEE90: ; 81CEE90
 	thumb_func_end sub_81CEE90
 
 	thumb_func_start sub_81CEEC8
-sub_81CEEC8: ; 81CEEC8
+sub_81CEEC8: @ 81CEEC8
 	push {r4,r5,lr}
 	bl sub_81CDC70
 	adds r5, r0, 0
@@ -863260,7 +863260,7 @@ _081CEF0C:
 	thumb_func_end sub_81CEEC8
 
 	thumb_func_start sub_81CEF14
-sub_81CEF14: ; 81CEF14
+sub_81CEF14: @ 81CEF14
 	push {r4,lr}
 	movs r0, 0xC
 	bl sub_81C763C
@@ -863282,7 +863282,7 @@ _081CEF30:
 	thumb_func_end sub_81CEF14
 
 	thumb_func_start sub_81CEF3C
-sub_81CEF3C: ; 81CEF3C
+sub_81CEF3C: @ 81CEF3C
 	push {r4,lr}
 	movs r0, 0x7
 	movs r1, 0x24
@@ -863322,7 +863322,7 @@ _081CEF92:
 	thumb_func_end sub_81CEF3C
 
 	thumb_func_start sub_81CEF98
-sub_81CEF98: ; 81CEF98
+sub_81CEF98: @ 81CEF98
 	push {r4,lr}
 	movs r0, 0x7
 	movs r1, 0x24
@@ -863355,7 +863355,7 @@ _081CEFD6:
 	thumb_func_end sub_81CEF98
 
 	thumb_func_start sub_81CEFDC
-sub_81CEFDC: ; 81CEFDC
+sub_81CEFDC: @ 81CEFDC
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863366,7 +863366,7 @@ sub_81CEFDC: ; 81CEFDC
 	thumb_func_end sub_81CEFDC
 
 	thumb_func_start sub_81CEFF0
-sub_81CEFF0: ; 81CEFF0
+sub_81CEFF0: @ 81CEFF0
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863383,7 +863383,7 @@ _081CF004:
 	thumb_func_end sub_81CEFF0
 
 	thumb_func_start sub_81CF010
-sub_81CF010: ; 81CF010
+sub_81CF010: @ 81CF010
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x4]
@@ -863401,7 +863401,7 @@ _081CF022:
 	thumb_func_end sub_81CF010
 
 	thumb_func_start sub_81CF030
-sub_81CF030: ; 81CF030
+sub_81CF030: @ 81CF030
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, =0x030022c0
@@ -863472,21 +863472,21 @@ _081CF0A6:
 	thumb_func_end sub_81CF030
 
 	thumb_func_start sub_81CF0B0
-sub_81CF0B0: ; 81CF0B0
+sub_81CF0B0: @ 81CF0B0
 	ldr r0, =0x000186a3
 	bx lr
 	.pool
 	thumb_func_end sub_81CF0B0
 
 	thumb_func_start sub_81CF0B8
-sub_81CF0B8: ; 81CF0B8
+sub_81CF0B8: @ 81CF0B8
 	ldr r0, =0x000186a9
 	bx lr
 	.pool
 	thumb_func_end sub_81CF0B8
 
 	thumb_func_start sub_81CF0C0
-sub_81CF0C0: ; 81CF0C0
+sub_81CF0C0: @ 81CF0C0
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863496,7 +863496,7 @@ sub_81CF0C0: ; 81CF0C0
 	thumb_func_end sub_81CF0C0
 
 	thumb_func_start sub_81CF0D0
-sub_81CF0D0: ; 81CF0D0
+sub_81CF0D0: @ 81CF0D0
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863507,7 +863507,7 @@ sub_81CF0D0: ; 81CF0D0
 	thumb_func_end sub_81CF0D0
 
 	thumb_func_start sub_81CF0E0
-sub_81CF0E0: ; 81CF0E0
+sub_81CF0E0: @ 81CF0E0
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863518,7 +863518,7 @@ sub_81CF0E0: ; 81CF0E0
 	thumb_func_end sub_81CF0E0
 
 	thumb_func_start sub_81CF0F0
-sub_81CF0F0: ; 81CF0F0
+sub_81CF0F0: @ 81CF0F0
 	push {r4,lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863534,7 +863534,7 @@ sub_81CF0F0: ; 81CF0F0
 	thumb_func_end sub_81CF0F0
 
 	thumb_func_start sub_81CF10C
-sub_81CF10C: ; 81CF10C
+sub_81CF10C: @ 81CF10C
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863545,7 +863545,7 @@ sub_81CF10C: ; 81CF10C
 	thumb_func_end sub_81CF10C
 
 	thumb_func_start sub_81CF11C
-sub_81CF11C: ; 81CF11C
+sub_81CF11C: @ 81CF11C
 	push {lr}
 	ldr r2, =gUnknown_086233B4
 	lsls r1, r0, 2
@@ -863558,7 +863558,7 @@ sub_81CF11C: ; 81CF11C
 	thumb_func_end sub_81CF11C
 
 	thumb_func_start sub_81CF134
-sub_81CF134: ; 81CF134
+sub_81CF134: @ 81CF134
 	push {r4-r6,lr}
 	sub sp, 0x4
 	movs r0, 0x7
@@ -863625,7 +863625,7 @@ _081CF1AA:
 	thumb_func_end sub_81CF134
 
 	thumb_func_start sub_81CF1C4
-sub_81CF1C4: ; 81CF1C4
+sub_81CF1C4: @ 81CF1C4
 	push {lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863638,7 +863638,7 @@ sub_81CF1C4: ; 81CF1C4
 	thumb_func_end sub_81CF1C4
 
 	thumb_func_start sub_81CF1D8
-sub_81CF1D8: ; 81CF1D8
+sub_81CF1D8: @ 81CF1D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -863718,7 +863718,7 @@ _081CF26A:
 	thumb_func_end sub_81CF1D8
 
 	thumb_func_start sub_81CF278
-sub_81CF278: ; 81CF278
+sub_81CF278: @ 81CF278
 	push {r4-r6,lr}
 	movs r0, 0x7
 	bl sub_81C763C
@@ -863763,7 +863763,7 @@ _081CF2B8:
 	thumb_func_end sub_81CF278
 
 	thumb_func_start sub_81CF2C4
-sub_81CF2C4: ; 81CF2C4
+sub_81CF2C4: @ 81CF2C4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -863827,7 +863827,7 @@ _081CF318:
 	thumb_func_end sub_81CF2C4
 
 	thumb_func_start sub_81CF330
-sub_81CF330: ; 81CF330
+sub_81CF330: @ 81CF330
 	push {r4,lr}
 	movs r1, 0x81
 	lsls r1, 4
@@ -863856,7 +863856,7 @@ _081CF362:
 	thumb_func_end sub_81CF330
 
 	thumb_func_start sub_81CF368
-sub_81CF368: ; 81CF368
+sub_81CF368: @ 81CF368
 	push {r4,lr}
 	movs r1, 0x81
 	lsls r1, 4
@@ -863884,7 +863884,7 @@ _081CF39A:
 	thumb_func_end sub_81CF368
 
 	thumb_func_start sub_81CF3A0
-sub_81CF3A0: ; 81CF3A0
+sub_81CF3A0: @ 81CF3A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -863906,7 +863906,7 @@ sub_81CF3A0: ; 81CF3A0
 	thumb_func_end sub_81CF3A0
 
 	thumb_func_start sub_81CF3D0
-sub_81CF3D0: ; 81CF3D0
+sub_81CF3D0: @ 81CF3D0
 	push {lr}
 	movs r0, 0x8
 	bl sub_81C763C
@@ -863917,7 +863917,7 @@ sub_81CF3D0: ; 81CF3D0
 	thumb_func_end sub_81CF3D0
 
 	thumb_func_start sub_81CF3E4
-sub_81CF3E4: ; 81CF3E4
+sub_81CF3E4: @ 81CF3E4
 	push {lr}
 	movs r0, 0x8
 	bl sub_81C763C
@@ -863928,7 +863928,7 @@ sub_81CF3E4: ; 81CF3E4
 	thumb_func_end sub_81CF3E4
 
 	thumb_func_start sub_81CF3F8
-sub_81CF3F8: ; 81CF3F8
+sub_81CF3F8: @ 81CF3F8
 	push {r4,lr}
 	movs r0, 0x8
 	bl sub_81C763C
@@ -863944,7 +863944,7 @@ sub_81CF3F8: ; 81CF3F8
 	thumb_func_end sub_81CF3F8
 
 	thumb_func_start sub_81CF418
-sub_81CF418: ; 81CF418
+sub_81CF418: @ 81CF418
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -864092,7 +864092,7 @@ _081CF570:
 	thumb_func_end sub_81CF418
 
 	thumb_func_start sub_81CF578
-sub_81CF578: ; 81CF578
+sub_81CF578: @ 81CF578
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -864160,7 +864160,7 @@ _081CF5E8:
 	thumb_func_end sub_81CF578
 
 	thumb_func_start sub_81CF5F0
-sub_81CF5F0: ; 81CF5F0
+sub_81CF5F0: @ 81CF5F0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -864228,7 +864228,7 @@ _081CF660:
 	thumb_func_end sub_81CF5F0
 
 	thumb_func_start sub_81CF668
-sub_81CF668: ; 81CF668
+sub_81CF668: @ 81CF668
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -864296,7 +864296,7 @@ _081CF6D8:
 	thumb_func_end sub_81CF668
 
 	thumb_func_start sub_81CF6E0
-sub_81CF6E0: ; 81CF6E0
+sub_81CF6E0: @ 81CF6E0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x8
@@ -864364,7 +864364,7 @@ _081CF750:
 	thumb_func_end sub_81CF6E0
 
 	thumb_func_start sub_81CF758
-sub_81CF758: ; 81CF758
+sub_81CF758: @ 81CF758
 	push {lr}
 	cmp r0, 0
 	beq _081CF764
@@ -864399,7 +864399,7 @@ _081CF792:
 	thumb_func_end sub_81CF758
 
 	thumb_func_start sub_81CF798
-sub_81CF798: ; 81CF798
+sub_81CF798: @ 81CF798
 	push {lr}
 	cmp r0, 0
 	beq _081CF7A4
@@ -864427,7 +864427,7 @@ _081CF7C2:
 	thumb_func_end sub_81CF798
 
 	thumb_func_start sub_81CF7C8
-sub_81CF7C8: ; 81CF7C8
+sub_81CF7C8: @ 81CF7C8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_086235B4
@@ -864448,7 +864448,7 @@ sub_81CF7C8: ; 81CF7C8
 	thumb_func_end sub_81CF7C8
 
 	thumb_func_start sub_81CF7F4
-sub_81CF7F4: ; 81CF7F4
+sub_81CF7F4: @ 81CF7F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -864515,7 +864515,7 @@ sub_81CF7F4: ; 81CF7F4
 	thumb_func_end sub_81CF7F4
 
 	thumb_func_start sub_81CF88C
-sub_81CF88C: ; 81CF88C
+sub_81CF88C: @ 81CF88C
 	push {r4,lr}
 	sub sp, 0x18
 	bl sub_81CF0D0
@@ -864556,7 +864556,7 @@ sub_81CF88C: ; 81CF88C
 	thumb_func_end sub_81CF88C
 
 	thumb_func_start sub_81CF8E4
-sub_81CF8E4: ; 81CF8E4
+sub_81CF8E4: @ 81CF8E4
 	push {r4-r7,lr}
 	adds r2, r0, 0
 	adds r6, r1, 0
@@ -864651,7 +864651,7 @@ _081CF97E:
 	thumb_func_end sub_81CF8E4
 
 	thumb_func_start sub_81CF9BC
-sub_81CF9BC: ; 81CF9BC
+sub_81CF9BC: @ 81CF9BC
 	push {r4,lr}
 	movs r0, 0x9
 	movs r1, 0x20
@@ -864685,7 +864685,7 @@ _081CF9FE:
 	thumb_func_end sub_81CF9BC
 
 	thumb_func_start sub_81CFA04
-sub_81CFA04: ; 81CFA04
+sub_81CFA04: @ 81CFA04
 	push {r4,lr}
 	movs r0, 0x9
 	movs r1, 0x20
@@ -864711,7 +864711,7 @@ _081CFA2E:
 	thumb_func_end sub_81CFA04
 
 	thumb_func_start sub_81CFA34
-sub_81CFA34: ; 81CFA34
+sub_81CFA34: @ 81CFA34
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864722,7 +864722,7 @@ sub_81CFA34: ; 81CFA34
 	thumb_func_end sub_81CFA34
 
 	thumb_func_start sub_81CFA48
-sub_81CFA48: ; 81CFA48
+sub_81CFA48: @ 81CFA48
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864739,7 +864739,7 @@ _081CFA5C:
 	thumb_func_end sub_81CFA48
 
 	thumb_func_start sub_81CFA68
-sub_81CFA68: ; 81CFA68
+sub_81CFA68: @ 81CFA68
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [r4, 0x4]
@@ -864757,7 +864757,7 @@ _081CFA7A:
 	thumb_func_end sub_81CFA68
 
 	thumb_func_start sub_81CFA88
-sub_81CFA88: ; 81CFA88
+sub_81CFA88: @ 81CFA88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, =0x030022c0
@@ -864828,21 +864828,21 @@ _081CFAFE:
 	thumb_func_end sub_81CFA88
 
 	thumb_func_start sub_81CFB08
-sub_81CFB08: ; 81CFB08
+sub_81CFB08: @ 81CFB08
 	ldr r0, =0x000186a5
 	bx lr
 	.pool
 	thumb_func_end sub_81CFB08
 
 	thumb_func_start sub_81CFB10
-sub_81CFB10: ; 81CFB10
+sub_81CFB10: @ 81CFB10
 	ldr r0, =0x000186ad
 	bx lr
 	.pool
 	thumb_func_end sub_81CFB10
 
 	thumb_func_start sub_81CFB18
-sub_81CFB18: ; 81CFB18
+sub_81CFB18: @ 81CFB18
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864852,7 +864852,7 @@ sub_81CFB18: ; 81CFB18
 	thumb_func_end sub_81CFB18
 
 	thumb_func_start sub_81CFB28
-sub_81CFB28: ; 81CFB28
+sub_81CFB28: @ 81CFB28
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864863,7 +864863,7 @@ sub_81CFB28: ; 81CFB28
 	thumb_func_end sub_81CFB28
 
 	thumb_func_start sub_81CFB38
-sub_81CFB38: ; 81CFB38
+sub_81CFB38: @ 81CFB38
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864874,7 +864874,7 @@ sub_81CFB38: ; 81CFB38
 	thumb_func_end sub_81CFB38
 
 	thumb_func_start sub_81CFB48
-sub_81CFB48: ; 81CFB48
+sub_81CFB48: @ 81CFB48
 	push {r4,lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864890,7 +864890,7 @@ sub_81CFB48: ; 81CFB48
 	thumb_func_end sub_81CFB48
 
 	thumb_func_start sub_81CFB64
-sub_81CFB64: ; 81CFB64
+sub_81CFB64: @ 81CFB64
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -864901,7 +864901,7 @@ sub_81CFB64: ; 81CFB64
 	thumb_func_end sub_81CFB64
 
 	thumb_func_start sub_81CFB74
-sub_81CFB74: ; 81CFB74
+sub_81CFB74: @ 81CFB74
 	push {lr}
 	ldr r2, =gUnknown_086235D8
 	lsls r1, r0, 2
@@ -864914,7 +864914,7 @@ sub_81CFB74: ; 81CFB74
 	thumb_func_end sub_81CFB74
 
 	thumb_func_start sub_81CFB8C
-sub_81CFB8C: ; 81CFB8C
+sub_81CFB8C: @ 81CFB8C
 	push {r4-r6,lr}
 	sub sp, 0x4
 	movs r0, 0x9
@@ -864987,7 +864987,7 @@ _081CFC10:
 	thumb_func_end sub_81CFB8C
 
 	thumb_func_start sub_81CFC2C
-sub_81CFC2C: ; 81CFC2C
+sub_81CFC2C: @ 81CFC2C
 	push {lr}
 	movs r0, 0x9
 	bl sub_81C763C
@@ -865000,7 +865000,7 @@ sub_81CFC2C: ; 81CFC2C
 	thumb_func_end sub_81CFC2C
 
 	thumb_func_start sub_81CFC40
-sub_81CFC40: ; 81CFC40
+sub_81CFC40: @ 81CFC40
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -865085,7 +865085,7 @@ _081CFCDC:
 	thumb_func_end sub_81CFC40
 
 	thumb_func_start sub_81CFCEC
-sub_81CFCEC: ; 81CFCEC
+sub_81CFCEC: @ 81CFCEC
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -865149,7 +865149,7 @@ _081CFD40:
 	thumb_func_end sub_81CFCEC
 
 	thumb_func_start sub_81CFD58
-sub_81CFD58: ; 81CFD58
+sub_81CFD58: @ 81CFD58
 	push {r4-r6,lr}
 	movs r5, 0
 _081CFD5C:
@@ -865213,7 +865213,7 @@ _081CFDCA:
 	thumb_func_end sub_81CFD58
 
 	thumb_func_start sub_81CFDD0
-sub_81CFDD0: ; 81CFDD0
+sub_81CFDD0: @ 81CFDD0
 	push {r4,lr}
 	movs r1, 0x81
 	lsls r1, 4
@@ -865242,7 +865242,7 @@ _081CFE02:
 	thumb_func_end sub_81CFDD0
 
 	thumb_func_start sub_81CFE08
-sub_81CFE08: ; 81CFE08
+sub_81CFE08: @ 81CFE08
 	push {r4,lr}
 	movs r1, 0x81
 	lsls r1, 4
@@ -865270,7 +865270,7 @@ _081CFE3A:
 	thumb_func_end sub_81CFE08
 
 	thumb_func_start sub_81CFE40
-sub_81CFE40: ; 81CFE40
+sub_81CFE40: @ 81CFE40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -865292,7 +865292,7 @@ sub_81CFE40: ; 81CFE40
 	thumb_func_end sub_81CFE40
 
 	thumb_func_start sub_81CFE70
-sub_81CFE70: ; 81CFE70
+sub_81CFE70: @ 81CFE70
 	push {lr}
 	movs r0, 0xA
 	bl sub_81C763C
@@ -865303,7 +865303,7 @@ sub_81CFE70: ; 81CFE70
 	thumb_func_end sub_81CFE70
 
 	thumb_func_start sub_81CFE84
-sub_81CFE84: ; 81CFE84
+sub_81CFE84: @ 81CFE84
 	push {lr}
 	movs r0, 0xA
 	bl sub_81C763C
@@ -865314,7 +865314,7 @@ sub_81CFE84: ; 81CFE84
 	thumb_func_end sub_81CFE84
 
 	thumb_func_start sub_81CFE98
-sub_81CFE98: ; 81CFE98
+sub_81CFE98: @ 81CFE98
 	push {r4,lr}
 	movs r0, 0xA
 	bl sub_81C763C
@@ -865330,7 +865330,7 @@ sub_81CFE98: ; 81CFE98
 	thumb_func_end sub_81CFE98
 
 	thumb_func_start sub_81CFEB8
-sub_81CFEB8: ; 81CFEB8
+sub_81CFEB8: @ 81CFEB8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -865466,7 +865466,7 @@ _081CFFF4:
 	thumb_func_end sub_81CFEB8
 
 	thumb_func_start sub_81CFFFC
-sub_81CFFFC: ; 81CFFFC
+sub_81CFFFC: @ 81CFFFC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -865534,7 +865534,7 @@ _081D006C:
 	thumb_func_end sub_81CFFFC
 
 	thumb_func_start sub_81D0074
-sub_81D0074: ; 81D0074
+sub_81D0074: @ 81D0074
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -865602,7 +865602,7 @@ _081D00E4:
 	thumb_func_end sub_81D0074
 
 	thumb_func_start sub_81D00EC
-sub_81D00EC: ; 81D00EC
+sub_81D00EC: @ 81D00EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -865670,7 +865670,7 @@ _081D015C:
 	thumb_func_end sub_81D00EC
 
 	thumb_func_start sub_81D0164
-sub_81D0164: ; 81D0164
+sub_81D0164: @ 81D0164
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xA
@@ -865738,7 +865738,7 @@ _081D01D4:
 	thumb_func_end sub_81D0164
 
 	thumb_func_start sub_81D01DC
-sub_81D01DC: ; 81D01DC
+sub_81D01DC: @ 81D01DC
 	push {lr}
 	cmp r0, 0
 	beq _081D01E8
@@ -865773,7 +865773,7 @@ _081D0216:
 	thumb_func_end sub_81D01DC
 
 	thumb_func_start sub_81D021C
-sub_81D021C: ; 81D021C
+sub_81D021C: @ 81D021C
 	push {lr}
 	cmp r0, 0
 	beq _081D0228
@@ -865801,7 +865801,7 @@ _081D0246:
 	thumb_func_end sub_81D021C
 
 	thumb_func_start sub_81D024C
-sub_81D024C: ; 81D024C
+sub_81D024C: @ 81D024C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_086237D4
@@ -865827,7 +865827,7 @@ sub_81D024C: ; 81D024C
 	thumb_func_end sub_81D024C
 
 	thumb_func_start sub_81D0288
-sub_81D0288: ; 81D0288
+sub_81D0288: @ 81D0288
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl sub_81C875C
@@ -865847,7 +865847,7 @@ sub_81D0288: ; 81D0288
 	thumb_func_end sub_81D0288
 
 	thumb_func_start sub_81D02B0
-sub_81D02B0: ; 81D02B0
+sub_81D02B0: @ 81D02B0
 	push {r4,r5,lr}
 	sub sp, 0x1C
 	adds r4, r0, 0
@@ -865889,7 +865889,7 @@ sub_81D02B0: ; 81D02B0
 	thumb_func_end sub_81D02B0
 
 	thumb_func_start sub_81D0304
-sub_81D0304: ; 81D0304
+sub_81D0304: @ 81D0304
 	push {r4,lr}
 	sub sp, 0x18
 	bl sub_81CFB28
@@ -865930,7 +865930,7 @@ sub_81D0304: ; 81D0304
 	thumb_func_end sub_81D0304
 
 	thumb_func_start sub_81D035C
-sub_81D035C: ; 81D035C
+sub_81D035C: @ 81D035C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -866036,7 +866036,7 @@ _081D0402:
 	thumb_func_end sub_81D035C
 
 	thumb_func_start sub_81D0450
-sub_81D0450: ; 81D0450
+sub_81D0450: @ 81D0450
 	push {r4,lr}
 	movs r0, 0xD
 	movs r1, 0x9C
@@ -866073,7 +866073,7 @@ _081D049A:
 	thumb_func_end sub_81D0450
 
 	thumb_func_start sub_81D04A0
-sub_81D04A0: ; 81D04A0
+sub_81D04A0: @ 81D04A0
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866086,7 +866086,7 @@ sub_81D04A0: ; 81D04A0
 	thumb_func_end sub_81D04A0
 
 	thumb_func_start sub_81D04B8
-sub_81D04B8: ; 81D04B8
+sub_81D04B8: @ 81D04B8
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C7650
@@ -866095,7 +866095,7 @@ sub_81D04B8: ; 81D04B8
 	thumb_func_end sub_81D04B8
 
 	thumb_func_start sub_81D04C4
-sub_81D04C4: ; 81D04C4
+sub_81D04C4: @ 81D04C4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, =0x030022c0
@@ -866166,7 +866166,7 @@ _081D053E:
 	thumb_func_end sub_81D04C4
 
 	thumb_func_start sub_81D0548
-sub_81D0548: ; 81D0548
+sub_81D0548: @ 81D0548
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =0x030022c0
@@ -866240,14 +866240,14 @@ _081D05CA:
 	thumb_func_end sub_81D0548
 
 	thumb_func_start sub_81D05D4
-sub_81D05D4: ; 81D05D4
+sub_81D05D4: @ 81D05D4
 	ldr r0, =0x000186ae
 	bx lr
 	.pool
 	thumb_func_end sub_81D05D4
 
 	thumb_func_start sub_81D05DC
-sub_81D05DC: ; 81D05DC
+sub_81D05DC: @ 81D05DC
 	push {r4,lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0xC]
@@ -866287,7 +866287,7 @@ _081D0614:
 	thumb_func_end sub_81D05DC
 
 	thumb_func_start sub_81D061C
-sub_81D061C: ; 81D061C
+sub_81D061C: @ 81D061C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r0, [r2, 0xC]
@@ -866332,7 +866332,7 @@ _081D065E:
 	thumb_func_end sub_81D061C
 
 	thumb_func_start sub_81D0664
-sub_81D0664: ; 81D0664
+sub_81D0664: @ 81D0664
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r4, [r5, 0xC]
@@ -866355,7 +866355,7 @@ _081D0682:
 	thumb_func_end sub_81D0664
 
 	thumb_func_start sub_81D0688
-sub_81D0688: ; 81D0688
+sub_81D0688: @ 81D0688
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r4, [r5, 0xC]
@@ -866392,7 +866392,7 @@ _081D06BE:
 	thumb_func_end sub_81D0688
 
 	thumb_func_start sub_81D06C4
-sub_81D06C4: ; 81D06C4
+sub_81D06C4: @ 81D06C4
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866403,7 +866403,7 @@ sub_81D06C4: ; 81D06C4
 	thumb_func_end sub_81D06C4
 
 	thumb_func_start sub_81D06D4
-sub_81D06D4: ; 81D06D4
+sub_81D06D4: @ 81D06D4
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866414,7 +866414,7 @@ sub_81D06D4: ; 81D06D4
 	thumb_func_end sub_81D06D4
 
 	thumb_func_start sub_81D06E4
-sub_81D06E4: ; 81D06E4
+sub_81D06E4: @ 81D06E4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -866470,7 +866470,7 @@ _081D0752:
 	thumb_func_end sub_81D06E4
 
 	thumb_func_start sub_81D0760
-sub_81D0760: ; 81D0760
+sub_81D0760: @ 81D0760
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -866527,7 +866527,7 @@ _081D07D0:
 	thumb_func_end sub_81D0760
 
 	thumb_func_start sub_81D07D8
-sub_81D07D8: ; 81D07D8
+sub_81D07D8: @ 81D07D8
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866558,7 +866558,7 @@ _081D080A:
 	thumb_func_end sub_81D07D8
 
 	thumb_func_start sub_81D0814
-sub_81D0814: ; 81D0814
+sub_81D0814: @ 81D0814
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -866693,7 +866693,7 @@ _081D0904:
 	thumb_func_end sub_81D0814
 
 	thumb_func_start sub_81D0914
-sub_81D0914: ; 81D0914
+sub_81D0914: @ 81D0914
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xD
@@ -866707,7 +866707,7 @@ sub_81D0914: ; 81D0914
 	thumb_func_end sub_81D0914
 
 	thumb_func_start sub_81D092C
-sub_81D092C: ; 81D092C
+sub_81D092C: @ 81D092C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0xD
@@ -866721,7 +866721,7 @@ sub_81D092C: ; 81D092C
 	thumb_func_end sub_81D092C
 
 	thumb_func_start sub_81D0944
-sub_81D0944: ; 81D0944
+sub_81D0944: @ 81D0944
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866731,7 +866731,7 @@ sub_81D0944: ; 81D0944
 	thumb_func_end sub_81D0944
 
 	thumb_func_start sub_81D0954
-sub_81D0954: ; 81D0954
+sub_81D0954: @ 81D0954
 	push {lr}
 	movs r0, 0xD
 	bl sub_81C763C
@@ -866754,7 +866754,7 @@ _081D0970:
 	thumb_func_end sub_81D0954
 
 	thumb_func_start sub_81D0978
-sub_81D0978: ; 81D0978
+sub_81D0978: @ 81D0978
 	push {r4,lr}
 	ldr r1, =0x0000101c
 	movs r0, 0xE
@@ -866780,7 +866780,7 @@ _081D09AA:
 	thumb_func_end sub_81D0978
 
 	thumb_func_start sub_81D09B0
-sub_81D09B0: ; 81D09B0
+sub_81D09B0: @ 81D09B0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xE
@@ -866802,7 +866802,7 @@ sub_81D09B0: ; 81D09B0
 	thumb_func_end sub_81D09B0
 
 	thumb_func_start sub_81D09E0
-sub_81D09E0: ; 81D09E0
+sub_81D09E0: @ 81D09E0
 	push {lr}
 	movs r0, 0xE
 	bl sub_81C763C
@@ -866813,7 +866813,7 @@ sub_81D09E0: ; 81D09E0
 	thumb_func_end sub_81D09E0
 
 	thumb_func_start sub_81D09F4
-sub_81D09F4: ; 81D09F4
+sub_81D09F4: @ 81D09F4
 	push {r4,lr}
 	movs r0, 0xE
 	bl sub_81C763C
@@ -866852,7 +866852,7 @@ sub_81D09F4: ; 81D09F4
 	thumb_func_end sub_81D09F4
 
 	thumb_func_start sub_81D0A58
-sub_81D0A58: ; 81D0A58
+sub_81D0A58: @ 81D0A58
 	push {lr}
 	movs r0, 0xE
 	bl sub_81C763C
@@ -866863,7 +866863,7 @@ sub_81D0A58: ; 81D0A58
 	thumb_func_end sub_81D0A58
 
 	thumb_func_start sub_81D0A6C
-sub_81D0A6C: ; 81D0A6C
+sub_81D0A6C: @ 81D0A6C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -867065,7 +867065,7 @@ _081D0C4A:
 	thumb_func_end sub_81D0A6C
 
 	thumb_func_start sub_81D0C54
-sub_81D0C54: ; 81D0C54
+sub_81D0C54: @ 81D0C54
 	push {lr}
 	cmp r0, 0
 	beq _081D0C60
@@ -867093,7 +867093,7 @@ _081D0C7E:
 	thumb_func_end sub_81D0C54
 
 	thumb_func_start sub_81D0C84
-sub_81D0C84: ; 81D0C84
+sub_81D0C84: @ 81D0C84
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r0, 0xE
@@ -867173,7 +867173,7 @@ _081D0D26:
 	thumb_func_end sub_81D0C84
 
 	thumb_func_start sub_81D0D2C
-sub_81D0D2C: ; 81D0D2C
+sub_81D0D2C: @ 81D0D2C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xE
@@ -867225,7 +867225,7 @@ _081D0D86:
 	thumb_func_end sub_81D0D2C
 
 	thumb_func_start sub_81D0D8C
-sub_81D0D8C: ; 81D0D8C
+sub_81D0D8C: @ 81D0D8C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xE
@@ -867286,7 +867286,7 @@ _081D0DF8:
 	thumb_func_end sub_81D0D8C
 
 	thumb_func_start sub_81D0E00
-sub_81D0E00: ; 81D0E00
+sub_81D0E00: @ 81D0E00
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0xE
@@ -867338,7 +867338,7 @@ _081D0E5A:
 	thumb_func_end sub_81D0E00
 
 	thumb_func_start sub_81D0E60
-sub_81D0E60: ; 81D0E60
+sub_81D0E60: @ 81D0E60
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_08624BB8
@@ -867356,7 +867356,7 @@ sub_81D0E60: ; 81D0E60
 	thumb_func_end sub_81D0E60
 
 	thumb_func_start sub_81D0E84
-sub_81D0E84: ; 81D0E84
+sub_81D0E84: @ 81D0E84
 	push {r4,r5,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -867404,7 +867404,7 @@ sub_81D0E84: ; 81D0E84
 	thumb_func_end sub_81D0E84
 
 	thumb_func_start sub_81D0EFC
-sub_81D0EFC: ; 81D0EFC
+sub_81D0EFC: @ 81D0EFC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -867501,7 +867501,7 @@ _081D0FB2:
 	thumb_func_end sub_81D0EFC
 
 	thumb_func_start sub_81D0FCC
-sub_81D0FCC: ; 81D0FCC
+sub_81D0FCC: @ 81D0FCC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_08624BC4
@@ -867519,7 +867519,7 @@ sub_81D0FCC: ; 81D0FCC
 	thumb_func_end sub_81D0FCC
 
 	thumb_func_start sub_81D0FF0
-sub_81D0FF0: ; 81D0FF0
+sub_81D0FF0: @ 81D0FF0
 	push {r4-r7,lr}
 	sub sp, 0x10
 	ldrh r7, [r0, 0x8]
@@ -867601,7 +867601,7 @@ _081D104A:
 	thumb_func_end sub_81D0FF0
 
 	thumb_func_start sub_81D10A4
-sub_81D10A4: ; 81D10A4
+sub_81D10A4: @ 81D10A4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_08624BE8
@@ -867622,7 +867622,7 @@ sub_81D10A4: ; 81D10A4
 	thumb_func_end sub_81D10A4
 
 	thumb_func_start sub_81D10D0
-sub_81D10D0: ; 81D10D0
+sub_81D10D0: @ 81D10D0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -867678,7 +867678,7 @@ sub_81D10D0: ; 81D10D0
 	thumb_func_end sub_81D10D0
 
 	thumb_func_start sub_81D1148
-sub_81D1148: ; 81D1148
+sub_81D1148: @ 81D1148
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -867701,7 +867701,7 @@ sub_81D1148: ; 81D1148
 	thumb_func_end sub_81D1148
 
 	thumb_func_start sub_81D1178
-sub_81D1178: ; 81D1178
+sub_81D1178: @ 81D1178
 	push {lr}
 	ldrh r0, [r0, 0x10]
 	bl sub_818D820
@@ -867710,7 +867710,7 @@ sub_81D1178: ; 81D1178
 	thumb_func_end sub_81D1178
 
 	thumb_func_start sub_81D1184
-sub_81D1184: ; 81D1184
+sub_81D1184: @ 81D1184
 	push {lr}
 	sub sp, 0x1C
 	add r1, sp, 0x14
@@ -867750,7 +867750,7 @@ sub_81D1184: ; 81D1184
 	thumb_func_end sub_81D1184
 
 	thumb_func_start sub_81D11D8
-sub_81D11D8: ; 81D11D8
+sub_81D11D8: @ 81D11D8
 	push {lr}
 	ldrh r1, [r0, 0x10]
 	lsls r0, r1, 4
@@ -867769,7 +867769,7 @@ sub_81D11D8: ; 81D11D8
 	thumb_func_end sub_81D11D8
 
 	thumb_func_start sub_81D11FC
-sub_81D11FC: ; 81D11FC
+sub_81D11FC: @ 81D11FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x10]
@@ -867797,7 +867797,7 @@ sub_81D11FC: ; 81D11FC
 	thumb_func_end sub_81D11FC
 
 	thumb_func_start sub_81D1234
-sub_81D1234: ; 81D1234
+sub_81D1234: @ 81D1234
 	ldr r2, =0x02020630
 	ldrh r1, [r0, 0x10]
 	lsls r0, r1, 4
@@ -867816,7 +867816,7 @@ sub_81D1234: ; 81D1234
 	thumb_func_end sub_81D1234
 
 	thumb_func_start sub_81D1258
-sub_81D1258: ; 81D1258
+sub_81D1258: @ 81D1258
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r2, 0
@@ -867840,7 +867840,7 @@ sub_81D1258: ; 81D1258
 	thumb_func_end sub_81D1258
 
 	thumb_func_start sub_81D1284
-sub_81D1284: ; 81D1284
+sub_81D1284: @ 81D1284
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x32]
@@ -867888,7 +867888,7 @@ _081D12D0:
 	thumb_func_end sub_81D1284
 
 	thumb_func_start sub_81D12D8
-sub_81D12D8: ; 81D12D8
+sub_81D12D8: @ 81D12D8
 	push {r4-r6,lr}
 	bl sub_81D1350
 	ldr r5, =0x030012c0
@@ -867946,7 +867946,7 @@ _081D133A:
 	thumb_func_end sub_81D12D8
 
 	thumb_func_start sub_81D1350
-sub_81D1350: ; 81D1350
+sub_81D1350: @ 81D1350
 	push {lr}
 	sub sp, 0x8
 	movs r0, 0x20
@@ -867964,7 +867964,7 @@ sub_81D1350: ; 81D1350
 	thumb_func_end sub_81D1350
 
 	thumb_func_start sub_81D1370
-sub_81D1370: ; 81D1370
+sub_81D1370: @ 81D1370
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -868002,7 +868002,7 @@ sub_81D1370: ; 81D1370
 	thumb_func_end sub_81D1370
 
 	thumb_func_start sub_81D13BC
-sub_81D13BC: ; 81D13BC
+sub_81D13BC: @ 81D13BC
 	push {r4,r5,lr}
 	ldr r2, =gUnknown_08624BF8
 	lsls r1, 2
@@ -868036,7 +868036,7 @@ sub_81D13BC: ; 81D13BC
 	thumb_func_end sub_81D13BC
 
 	thumb_func_start sub_81D13FC
-sub_81D13FC: ; 81D13FC
+sub_81D13FC: @ 81D13FC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, =gUnknown_08624C78
@@ -868068,7 +868068,7 @@ sub_81D13FC: ; 81D13FC
 	thumb_func_end sub_81D13FC
 
 	thumb_func_start sub_81D1448
-sub_81D1448: ; 81D1448
+sub_81D1448: @ 81D1448
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -868150,7 +868150,7 @@ sub_81D1448: ; 81D1448
 	thumb_func_end sub_81D1448
 
 	thumb_func_start sub_81D1500
-sub_81D1500: ; 81D1500
+sub_81D1500: @ 81D1500
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, [r4, 0x14]
@@ -868169,7 +868169,7 @@ sub_81D1500: ; 81D1500
 	thumb_func_end sub_81D1500
 
 	thumb_func_start sub_81D1524
-sub_81D1524: ; 81D1524
+sub_81D1524: @ 81D1524
 	ldr r0, [r0, 0x14]
 	ldr r1, [r0, 0x1C]
 	ldr r0, =DummyObjectCallback
@@ -868182,7 +868182,7 @@ sub_81D1524: ; 81D1524
 	thumb_func_end sub_81D1524
 
 	thumb_func_start sub_81D1538
-sub_81D1538: ; 81D1538
+sub_81D1538: @ 81D1538
 	push {lr}
 	adds r3, r0, 0
 	adds r0, 0x3F
@@ -868215,7 +868215,7 @@ _081D156A:
 	thumb_func_end sub_81D1538
 
 	thumb_func_start sub_81D1574
-sub_81D1574: ; 81D1574
+sub_81D1574: @ 81D1574
 	push {lr}
 	ldrb r0, [r0]
 	cmp r0, 0x5
@@ -868254,7 +868254,7 @@ _081D15B6:
 	thumb_func_end sub_81D1574
 
 	thumb_func_start sub_81D15BC
-sub_81D15BC: ; 81D15BC
+sub_81D15BC: @ 81D15BC
 	ldr r1, =gUnknown_085500A4
 	lsls r0, 4
 	adds r0, r1
@@ -868264,7 +868264,7 @@ sub_81D15BC: ; 81D15BC
 	thumb_func_end sub_81D15BC
 
 	thumb_func_start sub_81D15CC
-sub_81D15CC: ; 81D15CC
+sub_81D15CC: @ 81D15CC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0
@@ -868289,7 +868289,7 @@ _081D15F0:
 	thumb_func_end sub_81D15CC
 
 	thumb_func_start sub_81D15F4
-sub_81D15F4: ; 81D15F4
+sub_81D15F4: @ 81D15F4
 	push {r4,lr}
 	cmp r0, 0x14
 	bhi _081D1620
@@ -868316,7 +868316,7 @@ _081D1622:
 	thumb_func_end sub_81D15F4
 
 	thumb_func_start sub_81D1628
-sub_81D1628: ; 81D1628
+sub_81D1628: @ 81D1628
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2]
@@ -868337,7 +868337,7 @@ _081D1646:
 	thumb_func_end sub_81D1628
 
 	thumb_func_start sub_81D164C
-sub_81D164C: ; 81D164C
+sub_81D164C: @ 81D164C
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2]
@@ -868358,7 +868358,7 @@ _081D166A:
 	thumb_func_end sub_81D164C
 
 	thumb_func_start sub_81D1670
-sub_81D1670: ; 81D1670
+sub_81D1670: @ 81D1670
 	push {lr}
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x2]
@@ -868379,7 +868379,7 @@ _081D168E:
 	thumb_func_end sub_81D1670
 
 	thumb_func_start sub_81D1694
-sub_81D1694: ; 81D1694
+sub_81D1694: @ 81D1694
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x03005d90
@@ -868410,7 +868410,7 @@ _081D16C6:
 	thumb_func_end sub_81D1694
 
 	thumb_func_start sub_81D16CC
-sub_81D16CC: ; 81D16CC
+sub_81D16CC: @ 81D16CC
 	push {lr}
 	ldrh r0, [r0, 0x2]
 	bl FlagGet
@@ -868421,7 +868421,7 @@ sub_81D16CC: ; 81D16CC
 	thumb_func_end sub_81D16CC
 
 	thumb_func_start sub_81D16DC
-sub_81D16DC: ; 81D16DC
+sub_81D16DC: @ 81D16DC
 	push {r4,lr}
 	cmp r0, 0x14
 	bhi _081D170C
@@ -868450,19 +868450,19 @@ _081D170E:
 	thumb_func_end sub_81D16DC
 
 	thumb_func_start sub_81D1714
-sub_81D1714: ; 81D1714
+sub_81D1714: @ 81D1714
 	ldrb r0, [r0, 0x1]
 	bx lr
 	thumb_func_end sub_81D1714
 
 	thumb_func_start sub_81D1718
-sub_81D1718: ; 81D1718
+sub_81D1718: @ 81D1718
 	ldrb r0, [r0, 0x1]
 	bx lr
 	thumb_func_end sub_81D1718
 
 	thumb_func_start sub_81D171C
-sub_81D171C: ; 81D171C
+sub_81D171C: @ 81D171C
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r6, 0
@@ -868492,19 +868492,19 @@ _081D1744:
 	thumb_func_end sub_81D171C
 
 	thumb_func_start sub_81D1750
-sub_81D1750: ; 81D1750
+sub_81D1750: @ 81D1750
 	movs r0, 0xD5
 	bx lr
 	thumb_func_end sub_81D1750
 
 	thumb_func_start sub_81D1754
-sub_81D1754: ; 81D1754
+sub_81D1754: @ 81D1754
 	movs r0, 0xD5
 	bx lr
 	thumb_func_end sub_81D1754
 
 	thumb_func_start sub_81D1758
-sub_81D1758: ; 81D1758
+sub_81D1758: @ 81D1758
 	push {r4,lr}
 	cmp r0, 0x14
 	bhi _081D1784
@@ -868531,13 +868531,13 @@ _081D1786:
 	thumb_func_end sub_81D1758
 
 	thumb_func_start sub_81D178C
-sub_81D178C: ; 81D178C
+sub_81D178C: @ 81D178C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D178C
 
 	thumb_func_start sub_81D1790
-sub_81D1790: ; 81D1790
+sub_81D1790: @ 81D1790
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x4]
@@ -868563,7 +868563,7 @@ _081D17BA:
 	thumb_func_end sub_81D1790
 
 	thumb_func_start sub_81D17C0
-sub_81D17C0: ; 81D17C0
+sub_81D17C0: @ 81D17C0
 	ldr r1, =0x03005d8c
 	ldr r1, [r1]
 	ldr r2, =0x000009ca
@@ -868579,19 +868579,19 @@ sub_81D17C0: ; 81D17C0
 	thumb_func_end sub_81D17C0
 
 	thumb_func_start sub_81D17E0
-sub_81D17E0: ; 81D17E0
+sub_81D17E0: @ 81D17E0
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D17E0
 
 	thumb_func_start sub_81D17E4
-sub_81D17E4: ; 81D17E4
+sub_81D17E4: @ 81D17E4
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D17E4
 
 	thumb_func_start sub_81D17E8
-sub_81D17E8: ; 81D17E8
+sub_81D17E8: @ 81D17E8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	cmp r5, 0x14
@@ -868636,37 +868636,37 @@ _081D1834:
 	thumb_func_end sub_81D17E8
 
 	thumb_func_start sub_81D1840
-sub_81D1840: ; 81D1840
+sub_81D1840: @ 81D1840
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D1840
 
 	thumb_func_start sub_81D1844
-sub_81D1844: ; 81D1844
+sub_81D1844: @ 81D1844
 	movs r0, 0x1
 	bx lr
 	thumb_func_end sub_81D1844
 
 	thumb_func_start sub_81D1848
-sub_81D1848: ; 81D1848
+sub_81D1848: @ 81D1848
 	movs r0, 0x1
 	bx lr
 	thumb_func_end sub_81D1848
 
 	thumb_func_start sub_81D184C
-sub_81D184C: ; 81D184C
+sub_81D184C: @ 81D184C
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D184C
 
 	thumb_func_start sub_81D1850
-sub_81D1850: ; 81D1850
+sub_81D1850: @ 81D1850
 	movs r0, 0
 	bx lr
 	thumb_func_end sub_81D1850
 
 	thumb_func_start sub_81D1854
-sub_81D1854: ; 81D1854
+sub_81D1854: @ 81D1854
 	push {r4,lr}
 	cmp r0, 0x14
 	bhi _081D1880
@@ -868693,37 +868693,37 @@ _081D1882:
 	thumb_func_end sub_81D1854
 
 	thumb_func_start sub_81D1888
-sub_81D1888: ; 81D1888
+sub_81D1888: @ 81D1888
 	movs r0, 0x4E
 	bx lr
 	thumb_func_end sub_81D1888
 
 	thumb_func_start sub_81D188C
-sub_81D188C: ; 81D188C
+sub_81D188C: @ 81D188C
 	ldrh r0, [r0, 0x4]
 	bx lr
 	thumb_func_end sub_81D188C
 
 	thumb_func_start sub_81D1890
-sub_81D1890: ; 81D1890
+sub_81D1890: @ 81D1890
 	ldrh r0, [r0, 0x4]
 	bx lr
 	thumb_func_end sub_81D1890
 
 	thumb_func_start sub_81D1894
-sub_81D1894: ; 81D1894
+sub_81D1894: @ 81D1894
 	movs r0, 0x4E
 	bx lr
 	thumb_func_end sub_81D1894
 
 	thumb_func_start sub_81D1898
-sub_81D1898: ; 81D1898
+sub_81D1898: @ 81D1898
 	movs r0, 0x4E
 	bx lr
 	thumb_func_end sub_81D1898
 
 	thumb_func_start sub_81D189C
-sub_81D189C: ; 81D189C
+sub_81D189C: @ 81D189C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	cmp r0, 0x14
@@ -868749,7 +868749,7 @@ _081D18C2:
 	thumb_func_end sub_81D189C
 
 	thumb_func_start sub_81D18D0
-sub_81D18D0: ; 81D18D0
+sub_81D18D0: @ 81D18D0
 	push {lr}
 	ldr r0, [r0, 0xC]
 	bl sub_81D1920
@@ -868758,7 +868758,7 @@ sub_81D18D0: ; 81D18D0
 	thumb_func_end sub_81D18D0
 
 	thumb_func_start sub_81D18DC
-sub_81D18DC: ; 81D18DC
+sub_81D18DC: @ 81D18DC
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -868778,7 +868778,7 @@ _081D18F8:
 	thumb_func_end sub_81D18DC
 
 	thumb_func_start sub_81D18FC
-sub_81D18FC: ; 81D18FC
+sub_81D18FC: @ 81D18FC
 	push {lr}
 	ldr r0, [r0, 0xC]
 	bl sub_81D1920
@@ -868787,7 +868787,7 @@ sub_81D18FC: ; 81D18FC
 	thumb_func_end sub_81D18FC
 
 	thumb_func_start sub_81D1908
-sub_81D1908: ; 81D1908
+sub_81D1908: @ 81D1908
 	push {lr}
 	ldr r0, [r0, 0xC]
 	bl sub_81D1920
@@ -868796,7 +868796,7 @@ sub_81D1908: ; 81D1908
 	thumb_func_end sub_81D1908
 
 	thumb_func_start sub_81D1914
-sub_81D1914: ; 81D1914
+sub_81D1914: @ 81D1914
 	push {lr}
 	adds r0, r1, 0
 	bl sub_8197080
@@ -868805,7 +868805,7 @@ sub_81D1914: ; 81D1914
 	thumb_func_end sub_81D1914
 
 	thumb_func_start sub_81D1920
-sub_81D1920: ; 81D1920
+sub_81D1920: @ 81D1920
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -868872,7 +868872,7 @@ _081D1984:
 	thumb_func_end sub_81D1920
 
 	thumb_func_start sub_81D199C
-sub_81D199C: ; 81D199C
+sub_81D199C: @ 81D199C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -868981,7 +868981,7 @@ _081D1A5C:
 	thumb_func_end sub_81D199C
 
 	thumb_func_start sub_81D1A78
-sub_81D1A78: ; 81D1A78
+sub_81D1A78: @ 81D1A78
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	adds r6, r2, 0
@@ -869009,7 +869009,7 @@ _081D1AA2:
 	thumb_func_end sub_81D1A78
 
 	thumb_func_start sub_81D1AB0
-sub_81D1AB0: ; 81D1AB0
+sub_81D1AB0: @ 81D1AB0
 	ldr r3, [r0, 0x4]
 	str r3, [r1]
 	ldr r0, [r0, 0x8]
@@ -869018,7 +869018,7 @@ sub_81D1AB0: ; 81D1AB0
 	thumb_func_end sub_81D1AB0
 
 	thumb_func_start sub_81D1ABC
-sub_81D1ABC: ; 81D1ABC
+sub_81D1ABC: @ 81D1ABC
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r0, 0
@@ -869039,7 +869039,7 @@ _081D1AD2:
 	thumb_func_end sub_81D1ABC
 
 	thumb_func_start sub_81D1ADC
-sub_81D1ADC: ; 81D1ADC
+sub_81D1ADC: @ 81D1ADC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -869053,7 +869053,7 @@ sub_81D1ADC: ; 81D1ADC
 	thumb_func_end sub_81D1ADC
 
 	thumb_func_start sub_81D1AF4
-sub_81D1AF4: ; 81D1AF4
+sub_81D1AF4: @ 81D1AF4
 	ldr r3, [r0, 0x4]
 	str r3, [r1]
 	ldr r0, [r0, 0x8]
@@ -869062,7 +869062,7 @@ sub_81D1AF4: ; 81D1AF4
 	thumb_func_end sub_81D1AF4
 
 	thumb_func_start sub_81D1B00
-sub_81D1B00: ; 81D1B00
+sub_81D1B00: @ 81D1B00
 	ldr r3, [r0, 0x4]
 	str r3, [r1]
 	ldr r0, [r0, 0x8]
@@ -869071,7 +869071,7 @@ sub_81D1B00: ; 81D1B00
 	thumb_func_end sub_81D1B00
 
 	thumb_func_start sub_81D1B0C
-sub_81D1B0C: ; 81D1B0C
+sub_81D1B0C: @ 81D1B0C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -869096,7 +869096,7 @@ sub_81D1B0C: ; 81D1B0C
 	thumb_func_end sub_81D1B0C
 
 	thumb_func_start sub_81D1B40
-sub_81D1B40: ; 81D1B40
+sub_81D1B40: @ 81D1B40
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -869174,7 +869174,7 @@ _081D1BC4:
 	thumb_func_end sub_81D1B40
 
 	thumb_func_start sub_81D1BD0
-sub_81D1BD0: ; 81D1BD0
+sub_81D1BD0: @ 81D1BD0
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -869199,7 +869199,7 @@ _081D1BF4:
 	thumb_func_end sub_81D1BD0
 
 	thumb_func_start sub_81D1BF8
-sub_81D1BF8: ; 81D1BF8
+sub_81D1BF8: @ 81D1BF8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -869224,7 +869224,7 @@ _081D1C18:
 	thumb_func_end sub_81D1BF8
 
 	thumb_func_start sub_81D1C20
-sub_81D1C20: ; 81D1C20
+sub_81D1C20: @ 81D1C20
 	push {lr}
 	ldr r0, =0x020375e0
 	ldrh r0, [r0]
@@ -869244,7 +869244,7 @@ _081D1C3C:
 	thumb_func_end sub_81D1C20
 
 	thumb_func_start sub_81D1C44
-sub_81D1C44: ; 81D1C44
+sub_81D1C44: @ 81D1C44
 	push {r4,lr}
 	lsls r0, 24
 	ldr r4, =0x0203cf4c
@@ -869280,7 +869280,7 @@ _081D1C7A:
 	thumb_func_end sub_81D1C44
 
 	thumb_func_start sub_81D1C84
-sub_81D1C84: ; 81D1C84
+sub_81D1C84: @ 81D1C84
 	push {r4-r6,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -869335,7 +869335,7 @@ _081D1CEC:
 	thumb_func_end sub_81D1C84
 
 	thumb_func_start sub_81D1D04
-sub_81D1D04: ; 81D1D04
+sub_81D1D04: @ 81D1D04
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -869358,7 +869358,7 @@ sub_81D1D04: ; 81D1D04
 	thumb_func_end sub_81D1D04
 
 	thumb_func_start sub_81D1D34
-sub_81D1D34: ; 81D1D34
+sub_81D1D34: @ 81D1D34
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0203cf48
@@ -869369,7 +869369,7 @@ sub_81D1D34: ; 81D1D34
 	thumb_func_end sub_81D1D34
 
 	thumb_func_start sub_81D1D44
-sub_81D1D44: ; 81D1D44
+sub_81D1D44: @ 81D1D44
 	push {r4,r5,lr}
 	sub sp, 0x34
 	adds r3, r1, 0
@@ -869427,7 +869427,7 @@ _081D1DAC:
 	thumb_func_end sub_81D1D44
 
 	thumb_func_start sub_81D1DC0
-sub_81D1DC0: ; 81D1DC0
+sub_81D1DC0: @ 81D1DC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -869513,7 +869513,7 @@ _081D1E02:
 	thumb_func_end sub_81D1DC0
 
 	thumb_func_start sub_81D1E7C
-sub_81D1E7C: ; 81D1E7C
+sub_81D1E7C: @ 81D1E7C
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -869527,7 +869527,7 @@ _081D1E8C:
 	thumb_func_end sub_81D1E7C
 
 	thumb_func_start sub_81D1E90
-sub_81D1E90: ; 81D1E90
+sub_81D1E90: @ 81D1E90
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -869554,7 +869554,7 @@ sub_81D1E90: ; 81D1E90
 	thumb_func_end sub_81D1E90
 
 	thumb_func_start sub_81D1EC0
-sub_81D1EC0: ; 81D1EC0
+sub_81D1EC0: @ 81D1EC0
 	push {lr}
 	ldr r0, =0x0203cf4c
 	ldr r0, [r0]
@@ -869565,7 +869565,7 @@ sub_81D1EC0: ; 81D1EC0
 	thumb_func_end sub_81D1EC0
 
 	thumb_func_start sub_81D1ED4
-sub_81D1ED4: ; 81D1ED4
+sub_81D1ED4: @ 81D1ED4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -869658,7 +869658,7 @@ _081D1F1C:
 	thumb_func_end sub_81D1ED4
 
 	thumb_func_start sub_81D1F84
-sub_81D1F84: ; 81D1F84
+sub_81D1F84: @ 81D1F84
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -869781,7 +869781,7 @@ _081D2012:
 	thumb_func_end sub_81D1F84
 
 	thumb_func_start sub_81D2074
-sub_81D2074: ; 81D2074
+sub_81D2074: @ 81D2074
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r0, =0x00000352
@@ -869812,7 +869812,7 @@ _081D20A6:
 	thumb_func_end sub_81D2074
 
 	thumb_func_start sub_81D20AC
-sub_81D20AC: ; 81D20AC
+sub_81D20AC: @ 81D20AC
 	ldr r1, =0x00000355
 	adds r0, r1
 	movs r1, 0
@@ -869822,7 +869822,7 @@ sub_81D20AC: ; 81D20AC
 	thumb_func_end sub_81D20AC
 
 	thumb_func_start sub_81D20BC
-sub_81D20BC: ; 81D20BC
+sub_81D20BC: @ 81D20BC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	ldr r1, =0x00000355
@@ -869864,7 +869864,7 @@ _081D20FC:
 	thumb_func_end sub_81D20BC
 
 	thumb_func_start sub_81D2108
-sub_81D2108: ; 81D2108
+sub_81D2108: @ 81D2108
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -869968,7 +869968,7 @@ _081D21BE:
 	thumb_func_end sub_81D2108
 
 	thumb_func_start sub_81D21DC
-sub_81D21DC: ; 81D21DC
+sub_81D21DC: @ 81D21DC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -870006,7 +870006,7 @@ _081D21E8:
 	thumb_func_end sub_81D21DC
 
 	thumb_func_start sub_81D2230
-sub_81D2230: ; 81D2230
+sub_81D2230: @ 81D2230
 	push {r4-r7,lr}
 	mov r12, r0
 	movs r4, 0
@@ -870045,7 +870045,7 @@ _081D2244:
 	thumb_func_end sub_81D2230
 
 	thumb_func_start sub_81D2278
-sub_81D2278: ; 81D2278
+sub_81D2278: @ 81D2278
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -870340,7 +870340,7 @@ _081D2494:
 	thumb_func_end sub_81D2278
 
 	thumb_func_start sub_81D24A4
-sub_81D24A4: ; 81D24A4
+sub_81D24A4: @ 81D24A4
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -870551,7 +870551,7 @@ _081D2620:
 	thumb_func_end sub_81D24A4
 
 	thumb_func_start sub_81D2634
-sub_81D2634: ; 81D2634
+sub_81D2634: @ 81D2634
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -870706,7 +870706,7 @@ _081D2742:
 	thumb_func_end sub_81D2634
 
 	thumb_func_start sub_81D2754
-sub_81D2754: ; 81D2754
+sub_81D2754: @ 81D2754
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -870816,7 +870816,7 @@ _081D2800:
 	thumb_func_end sub_81D2754
 
 	thumb_func_start sub_81D2824
-sub_81D2824: ; 81D2824
+sub_81D2824: @ 81D2824
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -870884,12 +870884,12 @@ _081D288E:
 	thumb_func_end sub_81D2824
 
 	thumb_func_start nullsub_79
-nullsub_79: ; 81D28C4
+nullsub_79: @ 81D28C4
 	bx lr
 	thumb_func_end nullsub_79
 
 	thumb_func_start sub_81D28C8
-sub_81D28C8: ; 81D28C8
+sub_81D28C8: @ 81D28C8
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
@@ -870918,7 +870918,7 @@ _081D28F4:
 	thumb_func_end sub_81D28C8
 
 	thumb_func_start sub_81D28FC
-sub_81D28FC: ; 81D28FC
+sub_81D28FC: @ 81D28FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -871123,7 +871123,7 @@ _081D2AB6:
 	thumb_func_end sub_81D28FC
 
 	thumb_func_start sub_81D2ACC
-sub_81D2ACC: ; 81D2ACC
+sub_81D2ACC: @ 81D2ACC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -871236,7 +871236,7 @@ _081D2BB8:
 	thumb_func_end sub_81D2ACC
 
 	thumb_func_start sub_81D2BD0
-sub_81D2BD0: ; 81D2BD0
+sub_81D2BD0: @ 81D2BD0
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -871256,7 +871256,7 @@ _081D2BE2:
 	thumb_func_end sub_81D2BD0
 
 	thumb_func_start sub_81D2BF4
-sub_81D2BF4: ; 81D2BF4
+sub_81D2BF4: @ 81D2BF4
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -871291,7 +871291,7 @@ sub_81D2BF4: ; 81D2BF4
 	thumb_func_end sub_81D2BF4
 
 	thumb_func_start sub_81D2C3C
-sub_81D2C3C: ; 81D2C3C
+sub_81D2C3C: @ 81D2C3C
 	push {lr}
 	bl RunTextPrinters
 	movs r0, 0x3
@@ -871303,7 +871303,7 @@ sub_81D2C3C: ; 81D2C3C
 	thumb_func_end sub_81D2C3C
 
 	thumb_func_start sub_81D2C50
-sub_81D2C50: ; 81D2C50
+sub_81D2C50: @ 81D2C50
 	push {lr}
 	ldr r0, =gUnknown_08625540
 	movs r1, 0x1
@@ -871316,7 +871316,7 @@ sub_81D2C50: ; 81D2C50
 	thumb_func_end sub_81D2C50
 
 	thumb_func_start sub_81D2C68
-sub_81D2C68: ; 81D2C68
+sub_81D2C68: @ 81D2C68
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -871371,7 +871371,7 @@ _081D2CCA:
 	thumb_func_end sub_81D2C68
 
 	thumb_func_start sub_81D2CD0
-sub_81D2CD0: ; 81D2CD0
+sub_81D2CD0: @ 81D2CD0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -871583,7 +871583,7 @@ _081D2E70:
 	thumb_func_end sub_81D2CD0
 
 	thumb_func_start sub_81D2E7C
-sub_81D2E7C: ; 81D2E7C
+sub_81D2E7C: @ 81D2E7C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r2, 16
@@ -871633,7 +871633,7 @@ _081D2EC2:
 	thumb_func_end sub_81D2E7C
 
 	thumb_func_start sub_81D2ED4
-sub_81D2ED4: ; 81D2ED4
+sub_81D2ED4: @ 81D2ED4
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -871722,7 +871722,7 @@ _081D2F72:
 	thumb_func_end sub_81D2ED4
 
 	thumb_func_start sub_81D2F78
-sub_81D2F78: ; 81D2F78
+sub_81D2F78: @ 81D2F78
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -871865,7 +871865,7 @@ _081D3086:
 	thumb_func_end sub_81D2F78
 
 	thumb_func_start sub_81D3094
-sub_81D3094: ; 81D3094
+sub_81D3094: @ 81D3094
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -871940,7 +871940,7 @@ _081D311A:
 	thumb_func_end sub_81D3094
 
 	thumb_func_start sub_81D312C
-sub_81D312C: ; 81D312C
+sub_81D312C: @ 81D312C
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1]
@@ -871962,7 +871962,7 @@ _081D3140:
 	thumb_func_end sub_81D312C
 
 	thumb_func_start sub_81D3150
-sub_81D3150: ; 81D3150
+sub_81D3150: @ 81D3150
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1]
@@ -871987,7 +871987,7 @@ _081D3168:
 	thumb_func_end sub_81D3150
 
 	thumb_func_start sub_81D3178
-sub_81D3178: ; 81D3178
+sub_81D3178: @ 81D3178
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	bl sub_81D2074
@@ -872013,7 +872013,7 @@ _081D319C:
 	thumb_func_end sub_81D3178
 
 	thumb_func_start sub_81D31A4
-sub_81D31A4: ; 81D31A4
+sub_81D31A4: @ 81D31A4
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	bl sub_81D2074
@@ -872039,7 +872039,7 @@ _081D31C8:
 	thumb_func_end sub_81D31A4
 
 	thumb_func_start sub_81D31D0
-sub_81D31D0: ; 81D31D0
+sub_81D31D0: @ 81D31D0
 	push {r4-r7,lr}
 	sub sp, 0x20
 	ldr r3, =gUnknown_08625A48
@@ -872075,7 +872075,7 @@ sub_81D31D0: ; 81D31D0
 	thumb_func_end sub_81D31D0
 
 	thumb_func_start sub_81D321C
-sub_81D321C: ; 81D321C
+sub_81D321C: @ 81D321C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -872149,7 +872149,7 @@ _081D327A:
 	thumb_func_end sub_81D321C
 
 	thumb_func_start sub_81D32B0
-sub_81D32B0: ; 81D32B0
+sub_81D32B0: @ 81D32B0
 	push {r4,r5,lr}
 	ldr r2, =gUnknown_08625AC0
 	ldr r4, [r2]
@@ -872168,7 +872168,7 @@ sub_81D32B0: ; 81D32B0
 	thumb_func_end sub_81D32B0
 
 	thumb_func_start sub_81D32D4
-sub_81D32D4: ; 81D32D4
+sub_81D32D4: @ 81D32D4
 	push {lr}
 	adds r1, r0, 0
 	ldrh r0, [r1, 0x30]
@@ -872188,7 +872188,7 @@ _081D32F0:
 	thumb_func_end sub_81D32D4
 
 	thumb_func_start sub_81D32F4
-sub_81D32F4: ; 81D32F4
+sub_81D32F4: @ 81D32F4
 	push {lr}
 	adds r2, r0, 0
 	adds r0, 0x3F
@@ -872208,7 +872208,7 @@ _081D330C:
 	thumb_func_end sub_81D32F4
 
 	thumb_func_start sub_81D3314
-sub_81D3314: ; 81D3314
+sub_81D3314: @ 81D3314
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x36
@@ -872268,7 +872268,7 @@ _081D337E:
 	thumb_func_end sub_81D3314
 
 	thumb_func_start sub_81D338C
-sub_81D338C: ; 81D338C
+sub_81D338C: @ 81D338C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -872334,7 +872334,7 @@ _081D33F0:
 	thumb_func_end sub_81D338C
 
 	thumb_func_start sub_81D3408
-sub_81D3408: ; 81D3408
+sub_81D3408: @ 81D3408
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x38]
@@ -872382,7 +872382,7 @@ _081D3454:
 	thumb_func_end sub_81D3408
 
 	thumb_func_start sub_81D3464
-sub_81D3464: ; 81D3464
+sub_81D3464: @ 81D3464
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -872401,7 +872401,7 @@ _081D346C:
 	thumb_func_end sub_81D3464
 
 	thumb_func_start sub_81D3480
-sub_81D3480: ; 81D3480
+sub_81D3480: @ 81D3480
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -872483,7 +872483,7 @@ _081D34FE:
 	thumb_func_end sub_81D3480
 
 	thumb_func_start sub_81D3520
-sub_81D3520: ; 81D3520
+sub_81D3520: @ 81D3520
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r5, 0
@@ -872509,7 +872509,7 @@ _081D3544:
 	thumb_func_end sub_81D3520
 
 	thumb_func_start sub_81D354C
-sub_81D354C: ; 81D354C
+sub_81D354C: @ 81D354C
 	push {lr}
 	bl sub_81D3520
 	movs r0, 0x68
@@ -872521,7 +872521,7 @@ sub_81D354C: ; 81D354C
 	thumb_func_end sub_81D354C
 
 	thumb_func_start sub_81D3564
-sub_81D3564: ; 81D3564
+sub_81D3564: @ 81D3564
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x30]
@@ -872589,7 +872589,7 @@ _081D35DC:
 	thumb_func_end sub_81D3564
 
 	thumb_func_start sub_81D35E8
-sub_81D35E8: ; 81D35E8
+sub_81D35E8: @ 81D35E8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldrh r0, [r6, 0x38]
@@ -872637,7 +872637,7 @@ _081D3636:
 	thumb_func_end sub_81D35E8
 
 	thumb_func_start sub_81D3640
-sub_81D3640: ; 81D3640
+sub_81D3640: @ 81D3640
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -872796,7 +872796,7 @@ _081D373A:
 	thumb_func_end sub_81D3640
 
 	thumb_func_start sub_81D3784
-sub_81D3784: ; 81D3784
+sub_81D3784: @ 81D3784
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -872928,7 +872928,7 @@ _081D3808:
 	thumb_func_end sub_81D3784
 
 	thumb_func_start sub_81D388C
-sub_81D388C: ; 81D388C
+sub_81D388C: @ 81D388C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -872961,7 +872961,7 @@ sub_81D388C: ; 81D388C
 	thumb_func_end sub_81D388C
 
 	thumb_func_start sub_81D38D4
-sub_81D38D4: ; 81D38D4
+sub_81D38D4: @ 81D38D4
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -872981,7 +872981,7 @@ sub_81D38D4: ; 81D38D4
 	thumb_func_end sub_81D38D4
 
 	thumb_func_start sub_81D38FC
-sub_81D38FC: ; 81D38FC
+sub_81D38FC: @ 81D38FC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0x9C
@@ -873003,7 +873003,7 @@ _081D3918:
 	thumb_func_end sub_81D38FC
 
 	thumb_func_start sub_81D3920
-sub_81D3920: ; 81D3920
+sub_81D3920: @ 81D3920
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldrb r6, [r7]
@@ -873047,7 +873047,7 @@ _081D3966:
 	thumb_func_end sub_81D3920
 
 	thumb_func_start sub_81D396C
-sub_81D396C: ; 81D396C
+sub_81D396C: @ 81D396C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -873073,7 +873073,7 @@ _081D3990:
 	thumb_func_end sub_81D396C
 
 	thumb_func_start sub_81D3998
-sub_81D3998: ; 81D3998
+sub_81D3998: @ 81D3998
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -873214,7 +873214,7 @@ _081D3AA6:
 	thumb_func_end sub_81D3998
 
 	thumb_func_start sub_81D3AB0
-sub_81D3AB0: ; 81D3AB0
+sub_81D3AB0: @ 81D3AB0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x80
@@ -873234,7 +873234,7 @@ sub_81D3AB0: ; 81D3AB0
 	thumb_func_end sub_81D3AB0
 
 	thumb_func_start sub_81D3AD8
-sub_81D3AD8: ; 81D3AD8
+sub_81D3AD8: @ 81D3AD8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -873262,7 +873262,7 @@ _081D3B06:
 	thumb_func_end sub_81D3AD8
 
 	thumb_func_start sub_81D3B0C
-sub_81D3B0C: ; 81D3B0C
+sub_81D3B0C: @ 81D3B0C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x80
@@ -873282,7 +873282,7 @@ sub_81D3B0C: ; 81D3B0C
 	thumb_func_end sub_81D3B0C
 
 	thumb_func_start sub_81D3B34
-sub_81D3B34: ; 81D3B34
+sub_81D3B34: @ 81D3B34
 	push {r4,r5,lr}
 	movs r0, 0x80
 	lsls r0, 5
@@ -873299,7 +873299,7 @@ sub_81D3B34: ; 81D3B34
 	thumb_func_end sub_81D3B34
 
 	thumb_func_start sub_81D3B54
-sub_81D3B54: ; 81D3B54
+sub_81D3B54: @ 81D3B54
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -873368,7 +873368,7 @@ _081D3BC2:
 	thumb_func_end sub_81D3B54
 
 	thumb_func_start sub_81D3BE8
-sub_81D3BE8: ; 81D3BE8
+sub_81D3BE8: @ 81D3BE8
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -873436,7 +873436,7 @@ _081D3C56:
 	thumb_func_end sub_81D3BE8
 
 	thumb_func_start sub_81D3C7C
-sub_81D3C7C: ; 81D3C7C
+sub_81D3C7C: @ 81D3C7C
 	push {r4,lr}
 	ldr r4, =0x04000208
 	movs r3, 0
@@ -873462,7 +873462,7 @@ sub_81D3C7C: ; 81D3C7C
 	thumb_func_end sub_81D3C7C
 
 	thumb_func_start sub_81D3CBC
-sub_81D3CBC: ; 81D3CBC
+sub_81D3CBC: @ 81D3CBC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r5, =0x04000208
@@ -873510,7 +873510,7 @@ _081D3D0A:
 	thumb_func_end sub_81D3CBC
 
 	thumb_func_start sub_81D3D34
-sub_81D3D34: ; 81D3D34
+sub_81D3D34: @ 81D3D34
 	ldr r0, =0x04000134
 	movs r3, 0
 	strh r3, [r0]
@@ -873535,7 +873535,7 @@ sub_81D3D34: ; 81D3D34
 	thumb_func_end sub_81D3D34
 
 	thumb_func_start sub_81D3D70
-sub_81D3D70: ; 81D3D70
+sub_81D3D70: @ 81D3D70
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -873707,7 +873707,7 @@ _081D3ECC:
 	thumb_func_end sub_81D3D70
 
 	thumb_func_start sub_81D3EE8
-sub_81D3EE8: ; 81D3EE8
+sub_81D3EE8: @ 81D3EE8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -873734,7 +873734,7 @@ _081D3F10:
 	thumb_func_end sub_81D3EE8
 
 	thumb_func_start sub_81D3F1C
-sub_81D3F1C: ; 81D3F1C
+sub_81D3F1C: @ 81D3F1C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -873769,7 +873769,7 @@ _081D3F5C:
 	thumb_func_end sub_81D3F1C
 
 	thumb_func_start sub_81D3F68
-sub_81D3F68: ; 81D3F68
+sub_81D3F68: @ 81D3F68
 	ldr r1, =0x0400010c
 	ldr r2, =0x0000fda7
 	adds r0, r2, 0
@@ -873791,7 +873791,7 @@ sub_81D3F68: ; 81D3F68
 	thumb_func_end sub_81D3F68
 
 	thumb_func_start sub_81D3F9C
-sub_81D3F9C: ; 81D3F9C
+sub_81D3F9C: @ 81D3F9C
 	push {lr}
 	bl sub_81D414C
 	bl sub_81D413C
@@ -873800,7 +873800,7 @@ sub_81D3F9C: ; 81D3F9C
 	thumb_func_end sub_81D3F9C
 
 	thumb_func_start sub_81D3FAC
-sub_81D3FAC: ; 81D3FAC
+sub_81D3FAC: @ 81D3FAC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	ldr r2, =0x030012c8
@@ -874004,7 +874004,7 @@ _081D412A:
 	thumb_func_end sub_81D3FAC
 
 	thumb_func_start sub_81D413C
-sub_81D413C: ; 81D413C
+sub_81D413C: @ 81D413C
 	ldr r0, =0x04000128
 	ldrh r1, [r0]
 	movs r2, 0x80
@@ -874015,7 +874015,7 @@ sub_81D413C: ; 81D413C
 	thumb_func_end sub_81D413C
 
 	thumb_func_start sub_81D414C
-sub_81D414C: ; 81D414C
+sub_81D414C: @ 81D414C
 	ldr r2, =0x0400010e
 	ldrh r1, [r2]
 	ldr r0, =0x0000ff7f
@@ -874030,7 +874030,7 @@ sub_81D414C: ; 81D414C
 	thumb_func_end sub_81D414C
 
 	thumb_func_start sub_81D4170
-sub_81D4170: ; 81D4170
+sub_81D4170: @ 81D4170
 	push {r4,lr}
 	ldr r0, =0x04000130
 	ldrh r0, [r0]
@@ -874051,7 +874051,7 @@ sub_81D4170: ; 81D4170
 	thumb_func_end sub_81D4170
 
 	thumb_func_start sub_81D41A0
-sub_81D41A0: ; 81D41A0
+sub_81D41A0: @ 81D41A0
 	ldr r1, =0x030012ec
 	ldr r0, =0x04000208
 	ldrh r0, [r0]
@@ -874077,7 +874077,7 @@ sub_81D41A0: ; 81D41A0
 	thumb_func_end sub_81D41A0
 
 	thumb_func_start sub_81D41F4
-sub_81D41F4: ; 81D41F4
+sub_81D41F4: @ 81D41F4
 	ldr r1, =0x04000208
 	ldr r0, =0x030012ec
 	ldrh r0, [r0]
@@ -874103,7 +874103,7 @@ sub_81D41F4: ; 81D41F4
 	thumb_func_end sub_81D41F4
 
 	thumb_func_start sub_81D4238
-sub_81D4238: ; 81D4238
+sub_81D4238: @ 81D4238
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0
@@ -874119,7 +874119,7 @@ sub_81D4238: ; 81D4238
 	thumb_func_end sub_81D4238
 
 	thumb_func_start sub_81D4258
-sub_81D4258: ; 81D4258
+sub_81D4258: @ 81D4258
 	push {lr}
 	sub sp, 0x4
 	ldr r0, =0x03005d8c
@@ -874138,7 +874138,7 @@ sub_81D4258: ; 81D4258
 	thumb_func_end sub_81D4258
 
 	thumb_func_start sub_81D427C
-sub_81D427C: ; 81D427C
+sub_81D427C: @ 81D427C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -874838,7 +874838,7 @@ _081D4816:
 	thumb_func_end sub_81D427C
 
 	thumb_func_start sub_81D4834
-sub_81D4834: ; 81D4834
+sub_81D4834: @ 81D4834
 	push {r4,lr}
 	lsls r0, 16
 	lsls r1, 16
@@ -874883,7 +874883,7 @@ _081D4888:
 	thumb_func_end sub_81D4834
 
 	thumb_func_start sub_81D4890
-sub_81D4890: ; 81D4890
+sub_81D4890: @ 81D4890
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -875013,7 +875013,7 @@ _081D4988:
 	thumb_func_end sub_81D4890
 
 	thumb_func_start sub_81D4998
-sub_81D4998: ; 81D4998
+sub_81D4998: @ 81D4998
 	push {r4,lr}
 	ldr r4, =0x0000403a
 	adds r0, r4, 0
@@ -875048,8 +875048,8 @@ _081D49E0:
 	thumb_func_end sub_81D4998
 
 	thumb_func_start FieldObjectIsFarawayIslandMew
-; bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
-FieldObjectIsFarawayIslandMew: ; 81D49E8
+@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
+FieldObjectIsFarawayIslandMew: @ 81D49E8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x03005d8c
@@ -875072,7 +875072,7 @@ _081D4A0E:
 	thumb_func_end FieldObjectIsFarawayIslandMew
 
 	thumb_func_start unown_chamber_related
-unown_chamber_related: ; 81D4A14
+unown_chamber_related: @ 81D4A14
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -875104,7 +875104,7 @@ _081D4A52:
 	thumb_func_end unown_chamber_related
 
 	thumb_func_start sub_81D4A58
-sub_81D4A58: ; 81D4A58
+sub_81D4A58: @ 81D4A58
 	push {r4,lr}
 	ldr r4, =0x0000403a
 	adds r0, r4, 0
@@ -875133,7 +875133,7 @@ _081D4A8A:
 	thumb_func_end sub_81D4A58
 
 	thumb_func_start sub_81D4A90
-sub_81D4A90: ; 81D4A90
+sub_81D4A90: @ 81D4A90
 	push {r4-r6,lr}
 	sub sp, 0x4
 	bl sub_81D4258
@@ -875286,7 +875286,7 @@ _081D4BC4:
 	thumb_func_end sub_81D4A90
 
 	thumb_func_start sub_81D4BEC
-sub_81D4BEC: ; 81D4BEC
+sub_81D4BEC: @ 81D4BEC
 	push {lr}
 	ldr r1, =0x0203cf50
 	ldrb r0, [r1]
@@ -875306,7 +875306,7 @@ _081D4C06:
 	thumb_func_end sub_81D4BEC
 
 	thumb_func_start sub_81D4C14
-sub_81D4C14: ; 81D4C14
+sub_81D4C14: @ 81D4C14
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -875342,7 +875342,7 @@ _081D4C52:
 	thumb_func_end sub_81D4C14
 
 	thumb_func_start sub_81D4C58
-sub_81D4C58: ; 81D4C58
+sub_81D4C58: @ 81D4C58
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -875378,7 +875378,7 @@ _081D4C96:
 	thumb_func_end sub_81D4C58
 
 	thumb_func_start sub_81D4C9C
-sub_81D4C9C: ; 81D4C9C
+sub_81D4C9C: @ 81D4C9C
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -875414,7 +875414,7 @@ _081D4CDA:
 	thumb_func_end sub_81D4C9C
 
 	thumb_func_start sub_81D4CE0
-sub_81D4CE0: ; 81D4CE0
+sub_81D4CE0: @ 81D4CE0
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -875450,7 +875450,7 @@ _081D4D1E:
 	thumb_func_end sub_81D4CE0
 
 	thumb_func_start sub_81D4D24
-sub_81D4D24: ; 81D4D24
+sub_81D4D24: @ 81D4D24
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -875471,7 +875471,7 @@ sub_81D4D24: ; 81D4D24
 	thumb_func_end sub_81D4D24
 
 	thumb_func_start sub_81D4D50
-sub_81D4D50: ; 81D4D50
+sub_81D4D50: @ 81D4D50
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -875515,7 +875515,7 @@ sub_81D4D50: ; 81D4D50
 	thumb_func_end sub_81D4D50
 
 	thumb_func_start sub_81D4DB8
-sub_81D4DB8: ; 81D4DB8
+sub_81D4DB8: @ 81D4DB8
 	push {r4,lr}
 	sub sp, 0x4
 	mov r1, sp
@@ -875538,7 +875538,7 @@ sub_81D4DB8: ; 81D4DB8
 	thumb_func_end sub_81D4DB8
 
 	thumb_func_start sub_81D4DE8
-sub_81D4DE8: ; 81D4DE8
+sub_81D4DE8: @ 81D4DE8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -875578,7 +875578,7 @@ _081D4E1C:
 	thumb_func_end sub_81D4DE8
 
 	thumb_func_start sub_81D4E30
-sub_81D4E30: ; 81D4E30
+sub_81D4E30: @ 81D4E30
 	push {lr}
 	ldr r0, =0x0201c000
 	movs r2, 0x80
@@ -875598,7 +875598,7 @@ sub_81D4E30: ; 81D4E30
 	thumb_func_end sub_81D4E30
 
 	thumb_func_start sub_81D4E60
-sub_81D4E60: ; 81D4E60
+sub_81D4E60: @ 81D4E60
 	push {lr}
 	sub sp, 0xC
 	mov r1, sp
@@ -875643,7 +875643,7 @@ _081D4EBA:
 	thumb_func_end sub_81D4E60
 
 	thumb_func_start sub_81D4EC0
-sub_81D4EC0: ; 81D4EC0
+sub_81D4EC0: @ 81D4EC0
 	push {lr}
 	bl sub_800ABBC
 	lsls r0, 24
@@ -875664,7 +875664,7 @@ _081D4EDE:
 	thumb_func_end sub_81D4EC0
 
 	thumb_func_start sub_81D4EE4
-sub_81D4EE4: ; 81D4EE4
+sub_81D4EE4: @ 81D4EE4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -875814,7 +875814,7 @@ _081D500E:
 	thumb_func_end sub_81D4EE4
 
 	thumb_func_start sub_81D5014
-sub_81D5014: ; 81D5014
+sub_81D5014: @ 81D5014
 	push {r4,lr}
 	ldr r0, =sub_81D5084
 	movs r1, 0
@@ -875849,14 +875849,14 @@ sub_81D5014: ; 81D5014
 	thumb_func_end sub_81D5014
 
 	thumb_func_start sub_81D505C
-sub_81D505C: ; 81D505C
+sub_81D505C: @ 81D505C
 	movs r1, 0
 	strh r1, [r0]
 	bx lr
 	thumb_func_end sub_81D505C
 
 	thumb_func_start sub_81D5064
-sub_81D5064: ; 81D5064
+sub_81D5064: @ 81D5064
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -875878,7 +875878,7 @@ _081D5080:
 	thumb_func_end sub_81D5064
 
 	thumb_func_start sub_81D5084
-sub_81D5084: ; 81D5084
+sub_81D5084: @ 81D5084
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -876321,7 +876321,7 @@ _081D548A:
 	thumb_func_end sub_81D5084
 
 	thumb_func_start sp194_trainer_tower
-sp194_trainer_tower: ; 81D5494
+sp194_trainer_tower: @ 81D5494
 	push {lr}
 	bl sub_81D56B0
 	ldr r1, =gUnknown_0862A618
@@ -876338,7 +876338,7 @@ sp194_trainer_tower: ; 81D5494
 	thumb_func_end sp194_trainer_tower
 
 	thumb_func_start sub_81D54BC
-sub_81D54BC: ; 81D54BC
+sub_81D54BC: @ 81D54BC
 	push {r4-r6,lr}
 	ldr r4, =0x03005d90
 	ldr r1, [r4]
@@ -876380,7 +876380,7 @@ _081D54EE:
 	thumb_func_end sub_81D54BC
 
 	thumb_func_start sub_81D5520
-sub_81D5520: ; 81D5520
+sub_81D5520: @ 81D5520
 	ldr r0, =0x02037318
 	ldrb r0, [r0, 0x12]
 	adds r0, 0x61
@@ -876391,7 +876391,7 @@ sub_81D5520: ; 81D5520
 	thumb_func_end sub_81D5520
 
 	thumb_func_start sub_81D5530
-sub_81D5530: ; 81D5530
+sub_81D5530: @ 81D5530
 	lsls r0, 24
 	movs r1, 0xFF
 	lsls r1, 24
@@ -876410,7 +876410,7 @@ sub_81D5530: ; 81D5530
 	thumb_func_end sub_81D5530
 
 	thumb_func_start sub_81D5554
-sub_81D5554: ; 81D5554
+sub_81D5554: @ 81D5554
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -876439,7 +876439,7 @@ _081D556E:
 	thumb_func_end sub_81D5554
 
 	thumb_func_start sub_81D5588
-sub_81D5588: ; 81D5588
+sub_81D5588: @ 81D5588
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -876474,7 +876474,7 @@ sub_81D5588: ; 81D5588
 	thumb_func_end sub_81D5588
 
 	thumb_func_start sub_81D55D0
-sub_81D55D0: ; 81D55D0
+sub_81D55D0: @ 81D55D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -876566,7 +876566,7 @@ _081D560A:
 	thumb_func_end sub_81D55D0
 
 	thumb_func_start sub_81D5694
-sub_81D5694: ; 81D5694
+sub_81D5694: @ 81D5694
 	push {r4,lr}
 	ldr r4, =0x0203cf58
 	ldr r0, [r4]
@@ -876583,7 +876583,7 @@ _081D56A6:
 	thumb_func_end sub_81D5694
 
 	thumb_func_start sub_81D56B0
-sub_81D56B0: ; 81D56B0
+sub_81D56B0: @ 81D56B0
 	push {r4,lr}
 	ldr r4, =0x0203cf54
 	ldr r0, [r4]
@@ -876619,7 +876619,7 @@ _081D56EC:
 	thumb_func_end sub_81D56B0
 
 	thumb_func_start sub_81D5710
-sub_81D5710: ; 81D5710
+sub_81D5710: @ 81D5710
 	push {r4,lr}
 	ldr r4, =0x0203cf54
 	ldr r0, [r4]
@@ -876636,7 +876636,7 @@ _081D5722:
 	thumb_func_end sub_81D5710
 
 	thumb_func_start sub_81D572C
-sub_81D572C: ; 81D572C
+sub_81D572C: @ 81D572C
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -876755,7 +876755,7 @@ _081D580E:
 	thumb_func_end sub_81D572C
 
 	thumb_func_start sub_81D581C
-sub_81D581C: ; 81D581C
+sub_81D581C: @ 81D581C
 	push {r4-r6,lr}
 	bl nullsub_2
 	bl sub_81D3B34
@@ -876837,7 +876837,7 @@ _081D5854:
 	thumb_func_end sub_81D581C
 
 	thumb_func_start sub_81D58D8
-sub_81D58D8: ; 81D58D8
+sub_81D58D8: @ 81D58D8
 	push {lr}
 	bl sub_80008E8
 	ldr r3, =0x020375f0
@@ -876874,7 +876874,7 @@ _081D590A:
 	thumb_func_end sub_81D58D8
 
 	thumb_func_start sub_81D5924
-sub_81D5924: ; 81D5924
+sub_81D5924: @ 81D5924
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -876947,7 +876947,7 @@ _081D59C0:
 	thumb_func_end sub_81D5924
 
 	thumb_func_start sub_81D59D0
-sub_81D59D0: ; 81D59D0
+sub_81D59D0: @ 81D59D0
 	push {r4-r6,lr}
 	ldr r4, =0x03005d8c
 	ldr r2, [r4]
@@ -877014,7 +877014,7 @@ _081D5A4E:
 	thumb_func_end sub_81D59D0
 
 	thumb_func_start sub_81D5A70
-sub_81D5A70: ; 81D5A70
+sub_81D5A70: @ 81D5A70
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r2, [r0]
@@ -877044,7 +877044,7 @@ _081D5AAE:
 	thumb_func_end sub_81D5A70
 
 	thumb_func_start sub_81D5AB4
-sub_81D5AB4: ; 81D5AB4
+sub_81D5AB4: @ 81D5AB4
 	ldr r0, =0x03005d8c
 	ldr r1, [r0]
 	ldr r0, =0x00003d6e
@@ -877058,7 +877058,7 @@ sub_81D5AB4: ; 81D5AB4
 	thumb_func_end sub_81D5AB4
 
 	thumb_func_start sub_81D5AD0
-sub_81D5AD0: ; 81D5AD0
+sub_81D5AD0: @ 81D5AD0
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -877101,7 +877101,7 @@ _081D5B20:
 	thumb_func_end sub_81D5AD0
 
 	thumb_func_start sub_81D5B2C
-sub_81D5B2C: ; 81D5B2C
+sub_81D5B2C: @ 81D5B2C
 	push {r4-r7,lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -877157,7 +877157,7 @@ _081D5B40:
 	thumb_func_end sub_81D5B2C
 
 	thumb_func_start sub_81D5BBC
-sub_81D5BBC: ; 81D5BBC
+sub_81D5BBC: @ 81D5BBC
 	push {lr}
 	bl sub_81D56B0
 	ldr r0, =0x0203cf54
@@ -877186,7 +877186,7 @@ _081D5BF0:
 	thumb_func_end sub_81D5BBC
 
 	thumb_func_start sub_81D5C00
-sub_81D5C00: ; 81D5C00
+sub_81D5C00: @ 81D5C00
 	push {lr}
 	bl sub_81D56B0
 	ldr r1, =0x020375f0
@@ -877199,7 +877199,7 @@ sub_81D5C00: ; 81D5C00
 	thumb_func_end sub_81D5C00
 
 	thumb_func_start sub_81D5C18
-sub_81D5C18: ; 81D5C18
+sub_81D5C18: @ 81D5C18
 	push {lr}
 	ldr r0, =0x000040d6
 	bl VarGet
@@ -877231,7 +877231,7 @@ _081D5C56:
 	thumb_func_end sub_81D5C18
 
 	thumb_func_start sub_81D5C5C
-sub_81D5C5C: ; 81D5C5C
+sub_81D5C5C: @ 81D5C5C
 	push {lr}
 	bl sub_81D5C18
 	lsls r0, 24
@@ -877253,17 +877253,17 @@ _081D5C7A:
 	thumb_func_end sub_81D5C5C
 
 	thumb_func_start nullsub_129
-nullsub_129: ; 81D5C84
+nullsub_129: @ 81D5C84
 	bx lr
 	thumb_func_end nullsub_129
 
 	thumb_func_start nullsub_2
-nullsub_2: ; 81D5C88
+nullsub_2: @ 81D5C88
 	bx lr
 	thumb_func_end nullsub_2
 
 	thumb_func_start sub_81D5C8C
-sub_81D5C8C: ; 81D5C8C
+sub_81D5C8C: @ 81D5C8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -877404,19 +877404,19 @@ _081D5CD6:
 	thumb_func_end sub_81D5C8C
 
 	thumb_func_start free_203F458
-free_203F458: ; 81D5DF0
+free_203F458: @ 81D5DF0
 	ldr r0, [r0]
 	bx lr
 	thumb_func_end free_203F458
 
 	thumb_func_start sub_81D5DF4
-sub_81D5DF4: ; 81D5DF4
+sub_81D5DF4: @ 81D5DF4
 	str r1, [r0]
 	bx lr
 	thumb_func_end sub_81D5DF4
 
 	thumb_func_start sub_81D5DF8
-sub_81D5DF8: ; 81D5DF8
+sub_81D5DF8: @ 81D5DF8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -877565,7 +877565,7 @@ _081D5F0E:
 	thumb_func_end sub_81D5DF8
 
 	thumb_func_start sub_81D5F48
-sub_81D5F48: ; 81D5F48
+sub_81D5F48: @ 81D5F48
 	push {lr}
 	bl sub_81D56B0
 	bl sub_81D5710
@@ -877575,7 +877575,7 @@ sub_81D5F48: ; 81D5F48
 	thumb_func_end sub_81D5F48
 
 	thumb_func_start sub_81D5F58
-sub_81D5F58: ; 81D5F58
+sub_81D5F58: @ 81D5F58
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -877623,7 +877623,7 @@ sub_81D5F58: ; 81D5F58
 	thumb_func_end sub_81D5F58
 
 	thumb_func_start sub_81D5FB4
-sub_81D5FB4: ; 81D5FB4
+sub_81D5FB4: @ 81D5FB4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -877717,7 +877717,7 @@ _081D605E:
 	thumb_func_end sub_81D5FB4
 
 	thumb_func_start InTrainerHill
-InTrainerHill: ; 81D6074
+InTrainerHill: @ 81D6074
 	push {lr}
 	ldr r1, =0x02037318
 	ldr r2, =0xfffffe61
@@ -877738,8 +877738,8 @@ _081D608C:
 	thumb_func_end InTrainerHill
 
 	thumb_func_start GetCurrentTrainerHillMapId
-; u8 GetCurrentTrainerHillMapId()
-GetCurrentTrainerHillMapId: ; 81D609C
+@ u8 GetCurrentTrainerHillMapId()
+GetCurrentTrainerHillMapId: @ 81D609C
 	push {lr}
 	ldr r0, =0x02037318
 	ldrh r2, [r0, 0x12]
@@ -877791,7 +877791,7 @@ _081D60F8:
 	thumb_func_end GetCurrentTrainerHillMapId
 
 	thumb_func_start sub_81D6100
-sub_81D6100: ; 81D6100
+sub_81D6100: @ 81D6100
 	push {lr}
 	ldr r0, =0x02037318
 	ldrh r1, [r0, 0x12]
@@ -877808,7 +877808,7 @@ _081D6110:
 	thumb_func_end sub_81D6100
 
 	thumb_func_start sub_81D6120
-sub_81D6120: ; 81D6120
+sub_81D6120: @ 81D6120
 	push {lr}
 	movs r0, 0x1A
 	movs r1, 0x40
@@ -877821,7 +877821,7 @@ sub_81D6120: ; 81D6120
 	thumb_func_end sub_81D6120
 
 	thumb_func_start sub_81D6134
-sub_81D6134: ; 81D6134
+sub_81D6134: @ 81D6134
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -877861,7 +877861,7 @@ _081D6176:
 	thumb_func_end sub_81D6134
 
 	thumb_func_start battle_init
-battle_init: ; 81D6180
+battle_init: @ 81D6180
 	lsls r0, 24
 	ldr r1, =0x03005d90
 	ldr r1, [r1]
@@ -877875,8 +877875,8 @@ battle_init: ; 81D6180
 	thumb_func_end battle_init
 
 	thumb_func_start GetTrainerHillTrainerFlag
-; u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
-GetTrainerHillTrainerFlag: ; 81D619C
+@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
+GetTrainerHillTrainerFlag: @ 81D619C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -877911,7 +877911,7 @@ GetTrainerHillTrainerFlag: ; 81D619C
 	thumb_func_end GetTrainerHillTrainerFlag
 
 	thumb_func_start sub_81D61E8
-sub_81D61E8: ; 81D61E8
+sub_81D61E8: @ 81D61E8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -878003,14 +878003,14 @@ _081D62A2:
 	thumb_func_end sub_81D61E8
 
 	thumb_func_start sub_81D62AC
-sub_81D62AC: ; 81D62AC
+sub_81D62AC: @ 81D62AC
 	ldr r0, =gUnknown_082C83F0
 	bx lr
 	.pool
 	thumb_func_end sub_81D62AC
 
 	thumb_func_start sub_81D62B4
-sub_81D62B4: ; 81D62B4
+sub_81D62B4: @ 81D62B4
 	push {lr}
 	ldr r0, =0x020375f2
 	ldrh r1, [r0]
@@ -878023,7 +878023,7 @@ sub_81D62B4: ; 81D62B4
 	thumb_func_end sub_81D62B4
 
 	thumb_func_start sub_81D62CC
-sub_81D62CC: ; 81D62CC
+sub_81D62CC: @ 81D62CC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -878111,7 +878111,7 @@ _081D636A:
 	thumb_func_end sub_81D62CC
 
 	thumb_func_start sub_81D6384
-sub_81D6384: ; 81D6384
+sub_81D6384: @ 81D6384
 	push {lr}
 	bl zero_enemy_party_data
 	ldr r0, =0x02038bca
@@ -878124,7 +878124,7 @@ sub_81D6384: ; 81D6384
 	thumb_func_end sub_81D6384
 
 	thumb_func_start sub_81D639C
-sub_81D639C: ; 81D639C
+sub_81D639C: @ 81D639C
 	push {lr}
 	bl zero_enemy_party_data
 	ldr r0, =0x02038bca
@@ -878141,13 +878141,13 @@ sub_81D639C: ; 81D639C
 	thumb_func_end sub_81D639C
 
 	thumb_func_start sub_81D63C4
-sub_81D63C4: ; 81D63C4
+sub_81D63C4: @ 81D63C4
 	movs r0, 0x7
 	bx lr
 	thumb_func_end sub_81D63C4
 
 	thumb_func_start sub_81D63C8
-sub_81D63C8: ; 81D63C8
+sub_81D63C8: @ 81D63C8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -878197,7 +878197,7 @@ _081D6426:
 	thumb_func_end sub_81D63C8
 
 	thumb_func_start sub_81D642C
-sub_81D642C: ; 81D642C
+sub_81D642C: @ 81D642C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -878244,7 +878244,7 @@ sub_81D642C: ; 81D642C
 	thumb_func_end sub_81D642C
 
 	thumb_func_start sub_81D6490
-sub_81D6490: ; 81D6490
+sub_81D6490: @ 81D6490
 	push {r4,lr}
 	bl sub_81D56B0
 	ldr r0, =0x0203cf54
@@ -878259,7 +878259,7 @@ sub_81D6490: ; 81D6490
 	thumb_func_end sub_81D6490
 
 	thumb_func_start sub_81D64AC
-sub_81D64AC: ; 81D64AC
+sub_81D64AC: @ 81D64AC
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	movs r1, 0xEE
@@ -878272,7 +878272,7 @@ sub_81D64AC: ; 81D64AC
 	thumb_func_end sub_81D64AC
 
 	thumb_func_start sub_81D64C0
-sub_81D64C0: ; 81D64C0
+sub_81D64C0: @ 81D64C0
 	push {lr}
 	bl sub_81D6534
 	cmp r0, 0x1
@@ -878288,7 +878288,7 @@ _081D64D4:
 	thumb_func_end sub_81D64C0
 
 	thumb_func_start sub_81D64DC
-sub_81D64DC: ; 81D64DC
+sub_81D64DC: @ 81D64DC
 	ldr r1, =0x020375f0
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -878302,7 +878302,7 @@ sub_81D64DC: ; 81D64DC
 	thumb_func_end sub_81D64DC
 
 	thumb_func_start sub_81D64FC
-sub_81D64FC: ; 81D64FC
+sub_81D64FC: @ 81D64FC
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
 	ldr r0, =0x00000ef9
@@ -878316,7 +878316,7 @@ sub_81D64FC: ; 81D64FC
 	thumb_func_end sub_81D64FC
 
 	thumb_func_start sub_81D6518
-sub_81D6518: ; 81D6518
+sub_81D6518: @ 81D6518
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
 	ldr r0, =0x00000ef9
@@ -878330,7 +878330,7 @@ sub_81D6518: ; 81D6518
 	thumb_func_end sub_81D6518
 
 	thumb_func_start sub_81D6534
-sub_81D6534: ; 81D6534
+sub_81D6534: @ 81D6534
 	push {lr}
 	bl sub_81D5C18
 	lsls r0, 24
@@ -878357,7 +878357,7 @@ _081D6562:
 	thumb_func_end sub_81D6534
 
 	thumb_func_start sub_81D6568
-sub_81D6568: ; 81D6568
+sub_81D6568: @ 81D6568
 	push {lr}
 	ldr r0, =0x03005d8c
 	ldr r0, [r0]
@@ -878383,7 +878383,7 @@ _081D6594:
 	thumb_func_end sub_81D6568
 
 	thumb_func_start sub_81D65A0
-sub_81D65A0: ; 81D65A0
+sub_81D65A0: @ 81D65A0
 	push {r4,r5,lr}
 	ldr r4, =0x03005d8c
 	ldr r2, [r4]
@@ -878414,7 +878414,7 @@ sub_81D65A0: ; 81D65A0
 	thumb_func_end sub_81D65A0
 
 	thumb_func_start sub_81D65E8
-sub_81D65E8: ; 81D65E8
+sub_81D65E8: @ 81D65E8
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -878462,7 +878462,7 @@ _081D662A:
 	thumb_func_end sub_81D65E8
 
 	thumb_func_start sub_81D6640
-sub_81D6640: ; 81D6640
+sub_81D6640: @ 81D6640
 	push {r4,r5,lr}
 	movs r3, 0
 	movs r2, 0
@@ -878569,7 +878569,7 @@ _081D6704:
 	thumb_func_end sub_81D6640
 
 	thumb_func_start sub_81D6720
-sub_81D6720: ; 81D6720
+sub_81D6720: @ 81D6720
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -878604,7 +878604,7 @@ sub_81D6720: ; 81D6720
 	thumb_func_end sub_81D6720
 
 	thumb_func_start sub_81D6774
-sub_81D6774: ; 81D6774
+sub_81D6774: @ 81D6774
 	push {lr}
 	bl SetVBlankHBlankCallbacksToNull
 	bl clear_scheduled_bg_copies_to_vram
@@ -878636,7 +878636,7 @@ sub_81D6774: ; 81D6774
 	thumb_func_end sub_81D6774
 
 	thumb_func_start sub_81D67D0
-sub_81D67D0: ; 81D67D0
+sub_81D67D0: @ 81D67D0
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -878648,7 +878648,7 @@ sub_81D67D0: ; 81D67D0
 	thumb_func_end sub_81D67D0
 
 	thumb_func_start sub_81D67EC
-sub_81D67EC: ; 81D67EC
+sub_81D67EC: @ 81D67EC
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -878658,7 +878658,7 @@ sub_81D67EC: ; 81D67EC
 	thumb_func_end sub_81D67EC
 
 	thumb_func_start sub_81D6800
-sub_81D6800: ; 81D6800
+sub_81D6800: @ 81D6800
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -878686,7 +878686,7 @@ _081D6830:
 	thumb_func_end sub_81D6800
 
 	thumb_func_start sub_81D6840
-sub_81D6840: ; 81D6840
+sub_81D6840: @ 81D6840
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -878745,7 +878745,7 @@ _081D68B2:
 	thumb_func_end sub_81D6840
 
 	thumb_func_start sub_81D68C8
-sub_81D68C8: ; 81D68C8
+sub_81D68C8: @ 81D68C8
 	push {lr}
 	movs r0, 0x48
 	movs r1, 0x3F
@@ -878770,7 +878770,7 @@ sub_81D68C8: ; 81D68C8
 	thumb_func_end sub_81D68C8
 
 	thumb_func_start sub_81D6904
-sub_81D6904: ; 81D6904
+sub_81D6904: @ 81D6904
 	push {lr}
 	movs r0, 0x48
 	movs r1, 0x3F
@@ -878783,7 +878783,7 @@ sub_81D6904: ; 81D6904
 	thumb_func_end sub_81D6904
 
 	thumb_func_start sub_81D691C
-sub_81D691C: ; 81D691C
+sub_81D691C: @ 81D691C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -878836,7 +878836,7 @@ _081D697E:
 	thumb_func_end sub_81D691C
 
 	thumb_func_start sub_81D6984
-sub_81D6984: ; 81D6984
+sub_81D6984: @ 81D6984
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -878903,7 +878903,7 @@ sub_81D6984: ; 81D6984
 	thumb_func_end sub_81D6984
 
 	thumb_func_start sub_81D6A20
-sub_81D6A20: ; 81D6A20
+sub_81D6A20: @ 81D6A20
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -879078,7 +879078,7 @@ _081D6B68:
 	thumb_func_end sub_81D6A20
 
 	thumb_func_start sub_81D6B7C
-sub_81D6B7C: ; 81D6B7C
+sub_81D6B7C: @ 81D6B7C
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -879264,7 +879264,7 @@ sub_81D6B7C: ; 81D6B7C
 	thumb_func_end sub_81D6B7C
 
 	thumb_func_start sub_81D6D20
-sub_81D6D20: ; 81D6D20
+sub_81D6D20: @ 81D6D20
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r3, r4, 0
@@ -879618,7 +879618,7 @@ _081D6FC8:
 	thumb_func_end sub_81D6D20
 
 	thumb_func_start sub_81D6FD0
-sub_81D6FD0: ; 81D6FD0
+sub_81D6FD0: @ 81D6FD0
 	push {lr}
 	bl sub_81D67EC
 	bl sub_80BA0A8
@@ -879627,7 +879627,7 @@ sub_81D6FD0: ; 81D6FD0
 	thumb_func_end sub_81D6FD0
 
 	thumb_func_start sub_81D6FE0
-sub_81D6FE0: ; 81D6FE0
+sub_81D6FE0: @ 81D6FE0
 	push {r4,lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -879678,7 +879678,7 @@ sub_81D6FE0: ; 81D6FE0
 	thumb_func_end sub_81D6FE0
 
 	thumb_func_start sub_81D706C
-sub_81D706C: ; 81D706C
+sub_81D706C: @ 81D706C
 	push {r4,lr}
 	sub sp, 0x4
 	bl reset_temp_tile_data_buffers
@@ -879736,7 +879736,7 @@ _081D7082:
 	thumb_func_end sub_81D706C
 
 	thumb_func_start task_add_00_WIN0V_open_close_above_and_more
-task_add_00_WIN0V_open_close_above_and_more: ; 81D7134
+task_add_00_WIN0V_open_close_above_and_more: @ 81D7134
 	push {r4-r7,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -879830,7 +879830,7 @@ _081D71EE:
 	thumb_func_end task_add_00_WIN0V_open_close_above_and_more
 
 	thumb_func_start sub_81D7228
-sub_81D7228: ; 81D7228
+sub_81D7228: @ 81D7228
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -879997,7 +879997,7 @@ _081D735E:
 	thumb_func_end sub_81D7228
 
 	thumb_func_start sub_81D736C
-sub_81D736C: ; 81D736C
+sub_81D736C: @ 81D736C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -880098,7 +880098,7 @@ _081D742E:
 	thumb_func_end sub_81D736C
 
 	thumb_func_start sub_81D7438
-sub_81D7438: ; 81D7438
+sub_81D7438: @ 81D7438
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0x57
@@ -880130,7 +880130,7 @@ sub_81D7438: ; 81D7438
 	thumb_func_end sub_81D7438
 
 	thumb_func_start sub_81D7480
-sub_81D7480: ; 81D7480
+sub_81D7480: @ 81D7480
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0x57
@@ -880162,7 +880162,7 @@ sub_81D7480: ; 81D7480
 	thumb_func_end sub_81D7480
 
 	thumb_func_start sub_81D74C8
-sub_81D74C8: ; 81D74C8
+sub_81D74C8: @ 81D74C8
 	push {r4,lr}
 	sub sp, 0xC
 	ldr r0, =0x00007fff
@@ -880192,7 +880192,7 @@ sub_81D74C8: ; 81D74C8
 	thumb_func_end sub_81D74C8
 
 	thumb_func_start sub_81D750C
-sub_81D750C: ; 81D750C
+sub_81D750C: @ 81D750C
 	push {lr}
 	movs r1, 0x80
 	lsls r1, 3
@@ -880209,7 +880209,7 @@ sub_81D750C: ; 81D750C
 	thumb_func_end sub_81D750C
 
 	thumb_func_start sub_81D752C
-sub_81D752C: ; 81D752C
+sub_81D752C: @ 81D752C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -880275,7 +880275,7 @@ _081D75A6:
 	thumb_func_end sub_81D752C
 
 	thumb_func_start sub_81D75B4
-sub_81D75B4: ; 81D75B4
+sub_81D75B4: @ 81D75B4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -880311,7 +880311,7 @@ sub_81D75B4: ; 81D75B4
 	thumb_func_end sub_81D75B4
 
 	thumb_func_start sub_81D7600
-sub_81D7600: ; 81D7600
+sub_81D7600: @ 81D7600
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -880354,7 +880354,7 @@ _081D7652:
 	thumb_func_end sub_81D7600
 
 	thumb_func_start sub_81D7664
-sub_81D7664: ; 81D7664
+sub_81D7664: @ 81D7664
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -880421,7 +880421,7 @@ sub_81D7664: ; 81D7664
 	thumb_func_end sub_81D7664
 
 	thumb_func_start sub_81D7700
-sub_81D7700: ; 81D7700
+sub_81D7700: @ 81D7700
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -880598,7 +880598,7 @@ _081D784C:
 	thumb_func_end sub_81D7700
 
 	thumb_func_start sub_81D7860
-sub_81D7860: ; 81D7860
+sub_81D7860: @ 81D7860
 	push {r4,lr}
 	adds r1, r0, 0
 	adds r3, r1, 0
@@ -880647,7 +880647,7 @@ _081D78B0:
 	thumb_func_end sub_81D7860
 
 	thumb_func_start sub_81D78BC
-sub_81D78BC: ; 81D78BC
+sub_81D78BC: @ 81D78BC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -880833,7 +880833,7 @@ sub_81D78BC: ; 81D78BC
 	thumb_func_end sub_81D78BC
 
 	thumb_func_start sub_81D7A60
-sub_81D7A60: ; 81D7A60
+sub_81D7A60: @ 81D7A60
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r3, r4, 0
@@ -881189,7 +881189,7 @@ _081D7D0C:
 	thumb_func_end sub_81D7A60
 
 	thumb_func_start sub_81D7D14
-sub_81D7D14: ; 81D7D14
+sub_81D7D14: @ 81D7D14
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0x2E
@@ -881319,7 +881319,7 @@ _081D7E08:
 	thumb_func_end sub_81D7D14
 
 	thumb_func_start sub_81D7E10
-sub_81D7E10: ; 81D7E10
+sub_81D7E10: @ 81D7E10
 	push {r4,lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -881370,7 +881370,7 @@ sub_81D7E10: ; 81D7E10
 	thumb_func_end sub_81D7E10
 
 	thumb_func_start sub_81D7E9C
-sub_81D7E9C: ; 81D7E9C
+sub_81D7E9C: @ 81D7E9C
 	push {r4,lr}
 	sub sp, 0x4
 	bl reset_temp_tile_data_buffers
@@ -881429,7 +881429,7 @@ _081D7ED0:
 	thumb_func_end sub_81D7E9C
 
 	thumb_func_start sub_81D7F4C
-sub_81D7F4C: ; 81D7F4C
+sub_81D7F4C: @ 81D7F4C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -881474,7 +881474,7 @@ sub_81D7F4C: ; 81D7F4C
 	thumb_func_end sub_81D7F4C
 
 	thumb_func_start sub_81D7FC0
-sub_81D7FC0: ; 81D7FC0
+sub_81D7FC0: @ 81D7FC0
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -881690,7 +881690,7 @@ _081D815A:
 	thumb_func_end sub_81D7FC0
 
 	thumb_func_start sub_81D8164
-sub_81D8164: ; 81D8164
+sub_81D8164: @ 81D8164
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -881719,7 +881719,7 @@ _081D8192:
 	thumb_func_end sub_81D8164
 
 	thumb_func_start sub_81D81A4
-sub_81D81A4: ; 81D81A4
+sub_81D81A4: @ 81D81A4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -881809,7 +881809,7 @@ _081D825A:
 	thumb_func_end sub_81D81A4
 
 	thumb_func_start sub_81D8260
-sub_81D8260: ; 81D8260
+sub_81D8260: @ 81D8260
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0x30
@@ -881853,7 +881853,7 @@ _081D829A:
 	thumb_func_end sub_81D8260
 
 	thumb_func_start sub_81D82B0
-sub_81D82B0: ; 81D82B0
+sub_81D82B0: @ 81D82B0
 	push {r4,lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -881913,7 +881913,7 @@ sub_81D82B0: ; 81D82B0
 	thumb_func_end sub_81D82B0
 
 	thumb_func_start sub_81D8358
-sub_81D8358: ; 81D8358
+sub_81D8358: @ 81D8358
 	push {r4-r7,lr}
 	sub sp, 0xC
 	bl reset_temp_tile_data_buffers
@@ -881992,7 +881992,7 @@ _081D8380:
 	thumb_func_end sub_81D8358
 
 	thumb_func_start sub_81D844C
-sub_81D844C: ; 81D844C
+sub_81D844C: @ 81D844C
 	push {r4,r5,lr}
 	movs r0, 0x6
 	bl GetGpuReg
@@ -882065,7 +882065,7 @@ _081D84E0:
 	thumb_func_end sub_81D844C
 
 	thumb_func_start sub_81D84EC
-sub_81D84EC: ; 81D84EC
+sub_81D84EC: @ 81D84EC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -882122,7 +882122,7 @@ sub_81D84EC: ; 81D84EC
 	thumb_func_end sub_81D84EC
 
 	thumb_func_start sub_81D857C
-sub_81D857C: ; 81D857C
+sub_81D857C: @ 81D857C
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -882250,7 +882250,7 @@ _081D8674:
 	thumb_func_end sub_81D857C
 
 	thumb_func_start sub_81D8684
-sub_81D8684: ; 81D8684
+sub_81D8684: @ 81D8684
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -882281,7 +882281,7 @@ _081D86B8:
 	thumb_func_end sub_81D8684
 
 	thumb_func_start sub_81D86CC
-sub_81D86CC: ; 81D86CC
+sub_81D86CC: @ 81D86CC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -882339,7 +882339,7 @@ sub_81D86CC: ; 81D86CC
 	thumb_func_end sub_81D86CC
 
 	thumb_func_start sub_81D874C
-sub_81D874C: ; 81D874C
+sub_81D874C: @ 81D874C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -882460,7 +882460,7 @@ _081D8818:
 	thumb_func_end sub_81D874C
 
 	thumb_func_start sub_81D8828
-sub_81D8828: ; 81D8828
+sub_81D8828: @ 81D8828
 	push {r4,lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -882520,7 +882520,7 @@ sub_81D8828: ; 81D8828
 	thumb_func_end sub_81D8828
 
 	thumb_func_start sub_81D88D0
-sub_81D88D0: ; 81D88D0
+sub_81D88D0: @ 81D88D0
 	push {r4,lr}
 	sub sp, 0x4
 	bl reset_temp_tile_data_buffers
@@ -882580,7 +882580,7 @@ _081D8904:
 	thumb_func_end sub_81D88D0
 
 	thumb_func_start sub_81D8980
-sub_81D8980: ; 81D8980
+sub_81D8980: @ 81D8980
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -882619,7 +882619,7 @@ sub_81D8980: ; 81D8980
 	thumb_func_end sub_81D8980
 
 	thumb_func_start sub_81D89E0
-sub_81D89E0: ; 81D89E0
+sub_81D89E0: @ 81D89E0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -882743,7 +882743,7 @@ _081D8AC6:
 	thumb_func_end sub_81D89E0
 
 	thumb_func_start sub_81D8AD8
-sub_81D8AD8: ; 81D8AD8
+sub_81D8AD8: @ 81D8AD8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -882785,7 +882785,7 @@ _081D8B1C:
 	thumb_func_end sub_81D8AD8
 
 	thumb_func_start sub_81D8B2C
-sub_81D8B2C: ; 81D8B2C
+sub_81D8B2C: @ 81D8B2C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -882853,7 +882853,7 @@ _081D8BAC:
 	thumb_func_end sub_81D8B2C
 
 	thumb_func_start sub_81D8BB4
-sub_81D8BB4: ; 81D8BB4
+sub_81D8BB4: @ 81D8BB4
 	push {r4,lr}
 	movs r4, 0x80
 	lsls r4, 3
@@ -882881,7 +882881,7 @@ sub_81D8BB4: ; 81D8BB4
 	thumb_func_end sub_81D8BB4
 
 	thumb_func_start sub_81D8BEC
-sub_81D8BEC: ; 81D8BEC
+sub_81D8BEC: @ 81D8BEC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -882915,7 +882915,7 @@ _081D8C26:
 	thumb_func_end sub_81D8BEC
 
 	thumb_func_start sub_81D8C38
-sub_81D8C38: ; 81D8C38
+sub_81D8C38: @ 81D8C38
 	push {r4,lr}
 	bl sub_8121DA0
 	movs r0, 0
@@ -882966,7 +882966,7 @@ sub_81D8C38: ; 81D8C38
 	thumb_func_end sub_81D8C38
 
 	thumb_func_start sub_81D8CC4
-sub_81D8CC4: ; 81D8CC4
+sub_81D8CC4: @ 81D8CC4
 	push {r4,lr}
 	sub sp, 0x4
 	bl reset_temp_tile_data_buffers
@@ -883035,7 +883035,7 @@ _081D8CEA:
 	thumb_func_end sub_81D8CC4
 
 	thumb_func_start sub_81D8DB4
-sub_81D8DB4: ; 81D8DB4
+sub_81D8DB4: @ 81D8DB4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -883121,7 +883121,7 @@ sub_81D8DB4: ; 81D8DB4
 	thumb_func_end sub_81D8DB4
 
 	thumb_func_start sub_81D8E80
-sub_81D8E80: ; 81D8E80
+sub_81D8E80: @ 81D8E80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -883267,7 +883267,7 @@ _081D8FA0:
 	thumb_func_end sub_81D8E80
 
 	thumb_func_start sub_81D8FB0
-sub_81D8FB0: ; 81D8FB0
+sub_81D8FB0: @ 81D8FB0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -883339,7 +883339,7 @@ _081D9024:
 	thumb_func_end sub_81D8FB0
 
 	thumb_func_start sub_81D9034
-sub_81D9034: ; 81D9034
+sub_81D9034: @ 81D9034
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -883392,7 +883392,7 @@ _081D90A0:
 	thumb_func_end sub_81D9034
 
 	thumb_func_start sub_81D90A8
-sub_81D90A8: ; 81D90A8
+sub_81D90A8: @ 81D90A8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -883603,7 +883603,7 @@ sub_81D90A8: ; 81D90A8
 	thumb_func_end sub_81D90A8
 
 	thumb_func_start sub_81D9274
-sub_81D9274: ; 81D9274
+sub_81D9274: @ 81D9274
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -883699,7 +883699,7 @@ sub_81D9274: ; 81D9274
 	thumb_func_end sub_81D9274
 
 	thumb_func_start pokemon_alive_on_battle_side
-pokemon_alive_on_battle_side: ; 81D9338
+pokemon_alive_on_battle_side: @ 81D9338
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r1, [r4, 0x36]
@@ -883781,7 +883781,7 @@ _081D93D2:
 	thumb_func_end pokemon_alive_on_battle_side
 
 	thumb_func_start sub_81D93D8
-sub_81D93D8: ; 81D93D8
+sub_81D93D8: @ 81D93D8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -883815,7 +883815,7 @@ sub_81D93D8: ; 81D93D8
 	thumb_func_end sub_81D93D8
 
 	thumb_func_start sub_81D9420
-sub_81D9420: ; 81D9420
+sub_81D9420: @ 81D9420
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x2B
@@ -883907,7 +883907,7 @@ _081D94C4:
 	thumb_func_end sub_81D9420
 
 	thumb_func_start sub_81D94D4
-sub_81D94D4: ; 81D94D4
+sub_81D94D4: @ 81D94D4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -883948,7 +883948,7 @@ sub_81D94D4: ; 81D94D4
 	thumb_func_end sub_81D94D4
 
 	thumb_func_start sub_81D9528
-sub_81D9528: ; 81D9528
+sub_81D9528: @ 81D9528
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -884073,7 +884073,7 @@ _081D960C:
 	thumb_func_end sub_81D9528
 
 	thumb_func_start sub_81D961C
-sub_81D961C: ; 81D961C
+sub_81D961C: @ 81D961C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0x3C
@@ -884283,7 +884283,7 @@ _081D97D2:
 	thumb_func_end sub_81D961C
 
 	thumb_func_start sub_81D97E0
-sub_81D97E0: ; 81D97E0
+sub_81D97E0: @ 81D97E0
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	movs r0, 0x2E
@@ -884357,7 +884357,7 @@ _081D985C:
 	thumb_func_end sub_81D97E0
 
 	thumb_func_start sub_81D9868
-sub_81D9868: ; 81D9868
+sub_81D9868: @ 81D9868
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r5, 24
@@ -884395,7 +884395,7 @@ sub_81D9868: ; 81D9868
 	thumb_func_end sub_81D9868
 
 	thumb_func_start sub_81D98B4
-sub_81D98B4: ; 81D98B4
+sub_81D98B4: @ 81D98B4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -884532,7 +884532,7 @@ _081D99B4:
 	thumb_func_end sub_81D98B4
 
 	thumb_func_start sub_81D99BC
-sub_81D99BC: ; 81D99BC
+sub_81D99BC: @ 81D99BC
 	push {r4,lr}
 	bl sub_80D2578
 	cmp r0, 0
@@ -884554,7 +884554,7 @@ _081D99DE:
 	thumb_func_end sub_81D99BC
 
 	thumb_func_start walda_maybe
-walda_maybe: ; 81D99E4
+walda_maybe: @ 81D99E4
 	push {r4,lr}
 	sub sp, 0x8
 	ldr r4, =0x02021dc4
@@ -884579,7 +884579,7 @@ walda_maybe: ; 81D99E4
 	thumb_func_end walda_maybe
 
 	thumb_func_start sub_81D9A1C
-sub_81D9A1C: ; 81D9A1C
+sub_81D9A1C: @ 81D9A1C
 	push {r4,r5,lr}
 	ldr r4, =0x020375e0
 	ldr r5, =0x02021dc4
@@ -884630,7 +884630,7 @@ _081D9A68:
 	thumb_func_end sub_81D9A1C
 
 	thumb_func_start sub_81D9A98
-sub_81D9A98: ; 81D9A98
+sub_81D9A98: @ 81D9A98
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -884656,7 +884656,7 @@ _081D9ABC:
 	thumb_func_end sub_81D9A98
 
 	thumb_func_start sub_81D9AC4
-sub_81D9AC4: ; 81D9AC4
+sub_81D9AC4: @ 81D9AC4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -884712,7 +884712,7 @@ _081D9B1E:
 	thumb_func_end sub_81D9AC4
 
 	thumb_func_start sub_81D9B40
-sub_81D9B40: ; 81D9B40
+sub_81D9B40: @ 81D9B40
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -884738,7 +884738,7 @@ _081D9B64:
 	thumb_func_end sub_81D9B40
 
 	thumb_func_start sub_81D9B68
-sub_81D9B68: ; 81D9B68
+sub_81D9B68: @ 81D9B68
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -884885,7 +884885,7 @@ _081D9C80:
 	thumb_func_end sub_81D9B68
 
 	thumb_func_start sub_81D9C90
-sub_81D9C90: ; 81D9C90
+sub_81D9C90: @ 81D9C90
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	mov r12, r1
@@ -884931,7 +884931,7 @@ _081D9CD6:
 	thumb_func_end sub_81D9C90
 
 	thumb_func_start sub_81D9CDC
-sub_81D9CDC: ; 81D9CDC
+sub_81D9CDC: @ 81D9CDC
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
@@ -884960,7 +884960,7 @@ _081D9D04:
 	thumb_func_end sub_81D9CDC
 
 	thumb_func_start sub_81D9D0C
-sub_81D9D0C: ; 81D9D0C
+sub_81D9D0C: @ 81D9D0C
 	push {lr}
 	lsrs r3, r1, 3
 	movs r2, 0x7
@@ -884979,7 +884979,7 @@ _081D9D24:
 	thumb_func_end sub_81D9D0C
 
 	thumb_func_start sub_81D9D28
-sub_81D9D28: ; 81D9D28
+sub_81D9D28: @ 81D9D28
 	lsrs r3, r1, 3
 	movs r2, 0x7
 	ands r2, r1
@@ -884995,7 +884995,7 @@ sub_81D9D28: ; 81D9D28
 	thumb_func_end sub_81D9D28
 
 	thumb_func_start sub_81D9D40
-sub_81D9D40: ; 81D9D40
+sub_81D9D40: @ 81D9D40
 	lsrs r3, r1, 3
 	movs r2, 0x7
 	ands r2, r1
@@ -885012,7 +885012,7 @@ sub_81D9D40: ; 81D9D40
 	thumb_func_end sub_81D9D40
 
 	thumb_func_start sub_81D9D5C
-sub_81D9D5C: ; 81D9D5C
+sub_81D9D5C: @ 81D9D5C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -885057,7 +885057,7 @@ _081D9DA0:
 	thumb_func_end sub_81D9D5C
 
 	thumb_func_start sub_81D9DAC
-sub_81D9DAC: ; 81D9DAC
+sub_81D9DAC: @ 81D9DAC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -885089,7 +885089,7 @@ _081D9DD6:
 	thumb_func_end sub_81D9DAC
 
 	thumb_func_start sub_81D9DE4
-sub_81D9DE4: ; 81D9DE4
+sub_81D9DE4: @ 81D9DE4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -885202,7 +885202,7 @@ _081D9EB4:
 	thumb_func_end sub_81D9DE4
 
 	thumb_func_start sub_81D9F14
-sub_81D9F14: ; 81D9F14
+sub_81D9F14: @ 81D9F14
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -885215,7 +885215,7 @@ sub_81D9F14: ; 81D9F14
 	thumb_func_end sub_81D9F14
 
 	thumb_func_start sub_81D9F30
-sub_81D9F30: ; 81D9F30
+sub_81D9F30: @ 81D9F30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -885228,7 +885228,7 @@ sub_81D9F30: ; 81D9F30
 	thumb_func_end sub_81D9F30
 
 	thumb_func_start sub_81D9F4C
-sub_81D9F4C: ; 81D9F4C
+sub_81D9F4C: @ 81D9F4C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -885241,7 +885241,7 @@ sub_81D9F4C: ; 81D9F4C
 	thumb_func_end sub_81D9F4C
 
 	thumb_func_start sub_81D9F68
-sub_81D9F68: ; 81D9F68
+sub_81D9F68: @ 81D9F68
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -885448,7 +885448,7 @@ _081DA0F6:
 	thumb_func_end sub_81D9F68
 
 	thumb_func_start sub_81DA10C
-sub_81DA10C: ; 81DA10C
+sub_81DA10C: @ 81DA10C
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -885467,7 +885467,7 @@ sub_81DA10C: ; 81DA10C
 	thumb_func_end sub_81DA10C
 
 	thumb_func_start sub_81DA138
-sub_81DA138: ; 81DA138
+sub_81DA138: @ 81DA138
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -885485,7 +885485,7 @@ sub_81DA138: ; 81DA138
 	thumb_func_end sub_81DA138
 
 	thumb_func_start sub_81DA160
-sub_81DA160: ; 81DA160
+sub_81DA160: @ 81DA160
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -885585,7 +885585,7 @@ _081DA224:
 	thumb_func_end sub_81DA160
 
 	thumb_func_start sub_81DA244
-sub_81DA244: ; 81DA244
+sub_81DA244: @ 81DA244
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -885657,7 +885657,7 @@ _081DA2D4:
 	thumb_func_end sub_81DA244
 
 	thumb_func_start sub_81DA2E8
-sub_81DA2E8: ; 81DA2E8
+sub_81DA2E8: @ 81DA2E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -885760,7 +885760,7 @@ _081DA39E:
 	thumb_func_end sub_81DA2E8
 
 	thumb_func_start sub_81DA3B8
-sub_81DA3B8: ; 81DA3B8
+sub_81DA3B8: @ 81DA3B8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -885863,7 +885863,7 @@ _081DA46E:
 	thumb_func_end sub_81DA3B8
 
 	thumb_func_start sub_81DA488
-sub_81DA488: ; 81DA488
+sub_81DA488: @ 81DA488
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -885971,7 +885971,7 @@ _081DA55C:
 	thumb_func_end sub_81DA488
 
 	thumb_func_start sub_81DA57C
-sub_81DA57C: ; 81DA57C
+sub_81DA57C: @ 81DA57C
 	push {lr}
 	ldr r0, =0x00000864
 	bl FlagGet
@@ -886010,7 +886010,7 @@ _081DA5CA:
 	thumb_func_end sub_81DA57C
 
 	thumb_func_start sub_81DA5D4
-sub_81DA5D4: ; 81DA5D4
+sub_81DA5D4: @ 81DA5D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -886139,7 +886139,7 @@ _081DA6BA:
 	thumb_func_end sub_81DA5D4
 
 	thumb_func_start sub_81DA6CC
-sub_81DA6CC: ; 81DA6CC
+sub_81DA6CC: @ 81DA6CC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -886169,7 +886169,7 @@ _081DA6F8:
 	thumb_func_end sub_81DA6CC
 
 	thumb_func_start sub_81DA700
-sub_81DA700: ; 81DA700
+sub_81DA700: @ 81DA700
 	push {lr}
 	sub sp, 0x8
 	add r1, sp, 0x4
@@ -886196,7 +886196,7 @@ sub_81DA700: ; 81DA700
 	thumb_func_end sub_81DA700
 
 	thumb_func_start sub_81DA74C
-sub_81DA74C: ; 81DA74C
+sub_81DA74C: @ 81DA74C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -886322,7 +886322,7 @@ _081DA7F8:
 	thumb_func_end sub_81DA74C
 
 	thumb_func_start sub_81DA848
-sub_81DA848: ; 81DA848
+sub_81DA848: @ 81DA848
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r2, r3, 0
@@ -886386,7 +886386,7 @@ _081DA8B4:
 	thumb_func_end sub_81DA848
 
 	thumb_func_start sub_81DA8BC
-sub_81DA8BC: ; 81DA8BC
+sub_81DA8BC: @ 81DA8BC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -886513,7 +886513,7 @@ _081DA972:
 	thumb_func_end sub_81DA8BC
 
 	thumb_func_start sub_81DA9BC
-sub_81DA9BC: ; 81DA9BC
+sub_81DA9BC: @ 81DA9BC
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrh r0, [r4, 0x32]
@@ -886565,7 +886565,7 @@ _081DAA16:
 	thumb_func_end sub_81DA9BC
 
 	thumb_func_start sub_81DAA20
-sub_81DAA20: ; 81DAA20
+sub_81DAA20: @ 81DAA20
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldr r4, =0x00002e90
@@ -886602,7 +886602,7 @@ sub_81DAA20: ; 81DAA20
 	thumb_func_end sub_81DAA20
 
 	thumb_func_start sub_81DAA74
-sub_81DAA74: ; 81DAA74
+sub_81DAA74: @ 81DAA74
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r2, =0x02020630
@@ -886648,7 +886648,7 @@ _081DAAC6:
 	thumb_func_end sub_81DAA74
 
 	thumb_func_start sub_81DAACC
-sub_81DAACC: ; 81DAACC
+sub_81DAACC: @ 81DAACC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0xA
@@ -886708,7 +886708,7 @@ _081DAB46:
 	thumb_func_end sub_81DAACC
 
 	thumb_func_start sub_81DAB4C
-sub_81DAB4C: ; 81DAB4C
+sub_81DAB4C: @ 81DAB4C
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -886768,7 +886768,7 @@ _081DABB0:
 	thumb_func_end sub_81DAB4C
 
 	thumb_func_start sub_81DABBC
-sub_81DABBC: ; 81DABBC
+sub_81DABBC: @ 81DABBC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl sub_81DAA74
@@ -886787,7 +886787,7 @@ _081DABD2:
 	thumb_func_end sub_81DABBC
 
 	thumb_func_start sub_81DABDC
-sub_81DABDC: ; 81DABDC
+sub_81DABDC: @ 81DABDC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -886815,7 +886815,7 @@ _081DABEE:
 	thumb_func_end sub_81DABDC
 
 	thumb_func_start sub_81DAC14
-sub_81DAC14: ; 81DAC14
+sub_81DAC14: @ 81DAC14
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -886870,7 +886870,7 @@ sub_81DAC14: ; 81DAC14
 	thumb_func_end sub_81DAC14
 
 	thumb_func_start sub_81DAC80
-sub_81DAC80: ; 81DAC80
+sub_81DAC80: @ 81DAC80
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -886894,7 +886894,7 @@ _081DACA4:
 	thumb_func_end sub_81DAC80
 
 	thumb_func_start sub_81DACB4
-sub_81DACB4: ; 81DACB4
+sub_81DACB4: @ 81DACB4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -886922,7 +886922,7 @@ _081DACC6:
 	thumb_func_end sub_81DACB4
 
 	thumb_func_start sub_81DACEC
-sub_81DACEC: ; 81DACEC
+sub_81DACEC: @ 81DACEC
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -886977,7 +886977,7 @@ sub_81DACEC: ; 81DACEC
 	thumb_func_end sub_81DACEC
 
 	thumb_func_start sub_81DAD58
-sub_81DAD58: ; 81DAD58
+sub_81DAD58: @ 81DAD58
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887001,7 +887001,7 @@ _081DAD7C:
 	thumb_func_end sub_81DAD58
 
 	thumb_func_start sub_81DAD8C
-sub_81DAD8C: ; 81DAD8C
+sub_81DAD8C: @ 81DAD8C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887029,7 +887029,7 @@ _081DAD9E:
 	thumb_func_end sub_81DAD8C
 
 	thumb_func_start sub_81DADC4
-sub_81DADC4: ; 81DADC4
+sub_81DADC4: @ 81DADC4
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -887093,7 +887093,7 @@ sub_81DADC4: ; 81DADC4
 	thumb_func_end sub_81DADC4
 
 	thumb_func_start sub_81DAE44
-sub_81DAE44: ; 81DAE44
+sub_81DAE44: @ 81DAE44
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887117,7 +887117,7 @@ _081DAE68:
 	thumb_func_end sub_81DAE44
 
 	thumb_func_start sub_81DAE78
-sub_81DAE78: ; 81DAE78
+sub_81DAE78: @ 81DAE78
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887145,7 +887145,7 @@ _081DAE8A:
 	thumb_func_end sub_81DAE78
 
 	thumb_func_start sub_81DAEB0
-sub_81DAEB0: ; 81DAEB0
+sub_81DAEB0: @ 81DAEB0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -887211,7 +887211,7 @@ sub_81DAEB0: ; 81DAEB0
 	thumb_func_end sub_81DAEB0
 
 	thumb_func_start sub_81DAF34
-sub_81DAF34: ; 81DAF34
+sub_81DAF34: @ 81DAF34
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887235,7 +887235,7 @@ _081DAF58:
 	thumb_func_end sub_81DAF34
 
 	thumb_func_start sub_81DAF68
-sub_81DAF68: ; 81DAF68
+sub_81DAF68: @ 81DAF68
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887263,7 +887263,7 @@ _081DAF7A:
 	thumb_func_end sub_81DAF68
 
 	thumb_func_start sub_81DAFA0
-sub_81DAFA0: ; 81DAFA0
+sub_81DAFA0: @ 81DAFA0
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -887336,7 +887336,7 @@ _081DB01A:
 	thumb_func_end sub_81DAFA0
 
 	thumb_func_start sub_81DB02C
-sub_81DB02C: ; 81DB02C
+sub_81DB02C: @ 81DB02C
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887360,7 +887360,7 @@ _081DB050:
 	thumb_func_end sub_81DB02C
 
 	thumb_func_start sub_81DB060
-sub_81DB060: ; 81DB060
+sub_81DB060: @ 81DB060
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887388,7 +887388,7 @@ _081DB072:
 	thumb_func_end sub_81DB060
 
 	thumb_func_start sub_81DB098
-sub_81DB098: ; 81DB098
+sub_81DB098: @ 81DB098
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -887461,7 +887461,7 @@ _081DB112:
 	thumb_func_end sub_81DB098
 
 	thumb_func_start sub_81DB124
-sub_81DB124: ; 81DB124
+sub_81DB124: @ 81DB124
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887485,7 +887485,7 @@ _081DB148:
 	thumb_func_end sub_81DB124
 
 	thumb_func_start sub_81DB158
-sub_81DB158: ; 81DB158
+sub_81DB158: @ 81DB158
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887513,7 +887513,7 @@ _081DB16A:
 	thumb_func_end sub_81DB158
 
 	thumb_func_start sub_81DB190
-sub_81DB190: ; 81DB190
+sub_81DB190: @ 81DB190
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -887590,7 +887590,7 @@ _081DB212:
 	thumb_func_end sub_81DB190
 
 	thumb_func_start sub_81DB224
-sub_81DB224: ; 81DB224
+sub_81DB224: @ 81DB224
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887614,7 +887614,7 @@ _081DB248:
 	thumb_func_end sub_81DB224
 
 	thumb_func_start sub_81DB258
-sub_81DB258: ; 81DB258
+sub_81DB258: @ 81DB258
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -887642,7 +887642,7 @@ _081DB26A:
 	thumb_func_end sub_81DB258
 
 	thumb_func_start sub_81DB290
-sub_81DB290: ; 81DB290
+sub_81DB290: @ 81DB290
 	push {r4,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -887721,7 +887721,7 @@ _081DB316:
 	thumb_func_end sub_81DB290
 
 	thumb_func_start sub_81DB328
-sub_81DB328: ; 81DB328
+sub_81DB328: @ 81DB328
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =0x02037fd4
@@ -887745,8 +887745,8 @@ _081DB34C:
 	thumb_func_end sub_81DB328
 
 	thumb_func_start GetStringCenterAlignXOffset
-; s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
-GetStringCenterAlignXOffset: ; 81DB35C
+@ s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
+GetStringCenterAlignXOffset: @ 81DB35C
 	push {lr}
 	movs r3, 0
 	bl GetStringCenterAlignXOffsetWithLetterSpacing
@@ -887755,8 +887755,8 @@ GetStringCenterAlignXOffset: ; 81DB35C
 	thumb_func_end GetStringCenterAlignXOffset
 
 	thumb_func_start GetStringRightAlignXOffset
-; s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
-GetStringRightAlignXOffset: ; 81DB368
+@ s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
+GetStringRightAlignXOffset: @ 81DB368
 	push {lr}
 	movs r3, 0
 	bl GetStringWidthDifference
@@ -887765,8 +887765,8 @@ GetStringRightAlignXOffset: ; 81DB368
 	thumb_func_end GetStringRightAlignXOffset
 
 	thumb_func_start GetStringCenterAlignXOffsetWithLetterSpacing
-; s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
-GetStringCenterAlignXOffsetWithLetterSpacing: ; 81DB374
+@ s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
+GetStringCenterAlignXOffsetWithLetterSpacing: @ 81DB374
 	push {lr}
 	bl GetStringWidthDifference
 	lsrs r1, r0, 31
@@ -887777,8 +887777,8 @@ GetStringCenterAlignXOffsetWithLetterSpacing: ; 81DB374
 	thumb_func_end GetStringCenterAlignXOffsetWithLetterSpacing
 
 	thumb_func_start GetStringWidthDifference
-; s32 GetStringWidthDifference(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
-GetStringWidthDifference: ; 81DB384
+@ s32 GetStringWidthDifference(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
+GetStringWidthDifference: @ 81DB384
 	push {r4,lr}
 	adds r4, r2, 0
 	adds r2, r3, 0
@@ -887800,7 +887800,7 @@ _081DB3A0:
 	thumb_func_end GetStringWidthDifference
 
 	thumb_func_start GetMaxWidthInMenuTable
-GetMaxWidthInMenuTable: ; 81DB3A8
+GetMaxWidthInMenuTable: @ 81DB3A8
 	push {r4-r6,lr}
 	movs r6, 0
 	cmp r6, r1
@@ -887829,7 +887829,7 @@ _081DB3CC:
 	thumb_func_end GetMaxWidthInMenuTable
 
 	thumb_func_start sub_81DB3D8
-sub_81DB3D8: ; 81DB3D8
+sub_81DB3D8: @ 81DB3D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -887867,7 +887867,7 @@ _081DB40A:
 	thumb_func_end sub_81DB3D8
 
 	thumb_func_start sub_81DB41C
-sub_81DB41C: ; 81DB41C
+sub_81DB41C: @ 81DB41C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	ldr r1, [r4]
@@ -887913,7 +887913,7 @@ _081DB462:
 	thumb_func_end sub_81DB41C
 
 	thumb_func_start sub_81DB468
-sub_81DB468: ; 81DB468
+sub_81DB468: @ 81DB468
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -887933,7 +887933,7 @@ sub_81DB468: ; 81DB468
 	thumb_func_end sub_81DB468
 
 	thumb_func_start sub_81DB494
-sub_81DB494: ; 81DB494
+sub_81DB494: @ 81DB494
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	adds r5, r2, 0
@@ -887974,7 +887974,7 @@ _081DB4D4:
 	thumb_func_end sub_81DB494
 
 	thumb_func_start sub_81DB4DC
-sub_81DB4DC: ; 81DB4DC
+sub_81DB4DC: @ 81DB4DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -888019,7 +888019,7 @@ _081DB51E:
 	thumb_func_end sub_81DB4DC
 
 	thumb_func_start sub_81DB52C
-sub_81DB52C: ; 81DB52C
+sub_81DB52C: @ 81DB52C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GetStringLength
@@ -888041,7 +888041,7 @@ _081DB54C:
 	thumb_func_end sub_81DB52C
 
 	thumb_func_start sub_81DB554
-sub_81DB554: ; 81DB554
+sub_81DB554: @ 81DB554
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -888091,7 +888091,7 @@ _081DB5A4:
 	thumb_func_end sub_81DB554
 
 	thumb_func_start sub_81DB5AC
-sub_81DB5AC: ; 81DB5AC
+sub_81DB5AC: @ 81DB5AC
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2]
@@ -888129,7 +888129,7 @@ _081DB5E4:
 	thumb_func_end sub_81DB5AC
 
 	thumb_func_start sub_81DB5E8
-sub_81DB5E8: ; 81DB5E8
+sub_81DB5E8: @ 81DB5E8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r2, 0
@@ -888145,7 +888145,7 @@ sub_81DB5E8: ; 81DB5E8
 	thumb_func_end sub_81DB5E8
 
 	thumb_func_start sub_81DB604
-sub_81DB604: ; 81DB604
+sub_81DB604: @ 81DB604
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -888164,7 +888164,7 @@ _081DB61A:
 	thumb_func_end sub_81DB604
 
 	thumb_func_start sub_81DB620
-sub_81DB620: ; 81DB620
+sub_81DB620: @ 81DB620
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r4, r0, 1
diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s
index 13b69dab9..602020c2b 100644
--- a/asm/gpu_bg.s
+++ b/asm/gpu_bg.s
@@ -1,6 +1,6 @@
 	thumb_func_start ResetBgs
-; void ResetBgs()
-ResetBgs: ; 80012F0
+@ void ResetBgs()
+ResetBgs: @ 80012F0
 	push {lr}
 	bl ResetBgControlStructs
 	ldr r1, =0x030008e0
@@ -13,8 +13,8 @@ ResetBgs: ; 80012F0
 	thumb_func_end ResetBgs
 
 	thumb_func_start SetBgModeInternal
-; void SetBgModeInternal(u8 bgMode)
-SetBgModeInternal: ; 8001308
+@ void SetBgModeInternal(u8 bgMode)
+SetBgModeInternal: @ 8001308
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x030008e0
@@ -28,8 +28,8 @@ SetBgModeInternal: ; 8001308
 	thumb_func_end SetBgModeInternal
 
 	thumb_func_start GetBgMode
-; u8 GetBgMode()
-GetBgMode: ; 8001324
+@ u8 GetBgMode()
+GetBgMode: @ 8001324
 	ldr r0, =0x030008e0
 	ldrb r1, [r0, 0x10]
 	movs r0, 0x7
@@ -39,8 +39,8 @@ GetBgMode: ; 8001324
 	thumb_func_end GetBgMode
 
 	thumb_func_start ResetBgControlStructs
-; void ResetBgControlStructs()
-ResetBgControlStructs: ; 8001334
+@ void ResetBgControlStructs()
+ResetBgControlStructs: @ 8001334
 	push {lr}
 	ldr r2, =0x030008e0
 	ldr r0, =gZeroedBgControlStruct
@@ -58,8 +58,8 @@ _08001340:
 	thumb_func_end ResetBgControlStructs
 
 	thumb_func_start Unused_ResetBgControlStruct
-; void Unused_ResetBgControlStruct(u8 bg)
-Unused_ResetBgControlStruct: ; 8001354
+@ void Unused_ResetBgControlStruct(u8 bg)
+Unused_ResetBgControlStruct: @ 8001354
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -82,8 +82,8 @@ _08001372:
 	thumb_func_end Unused_ResetBgControlStruct
 
 	thumb_func_start SetBgControlAttributes
-; void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound)
-SetBgControlAttributes: ; 8001380
+@ void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound)
+SetBgControlAttributes: @ 8001380
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -243,8 +243,8 @@ _08001498:
 	thumb_func_end SetBgControlAttributes
 
 	thumb_func_start GetBgControlAttribute
-; u8 GetBgControlAttribute(u8 bg, u8 attributeId)
-GetBgControlAttribute: ; 80014AC
+@ u8 GetBgControlAttribute(u8 bg, u8 attributeId)
+GetBgControlAttribute: @ 80014AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -337,8 +337,8 @@ _0800155A:
 	thumb_func_end GetBgControlAttribute
 
 	thumb_func_start LoadBgVram
-; u8 LoadBgVram(u8, void *src, u16 size, u16 destOffset, u8 mode)
-LoadBgVram: ; 8001560
+@ u8 LoadBgVram(u8, void *src, u16 size, u16 destOffset, u8 mode)
+LoadBgVram: @ 8001560
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -413,8 +413,8 @@ _080015DE:
 	thumb_func_end LoadBgVram
 
 	thumb_func_start ShowBgInternal
-; void ShowBgInternal(u8 bg)
-ShowBgInternal: ; 80015E8
+@ void ShowBgInternal(u8 bg)
+ShowBgInternal: @ 80015E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -476,8 +476,8 @@ _08001656:
 	thumb_func_end ShowBgInternal
 
 	thumb_func_start HideBgInternal
-; void HideBgInternal(u8 bg)
-HideBgInternal: ; 8001664
+@ void HideBgInternal(u8 bg)
+HideBgInternal: @ 8001664
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -504,8 +504,8 @@ _0800168A:
 	thumb_func_end HideBgInternal
 
 	thumb_func_start SyncBgVisibilityAndMode
-; void SyncBgVisibilityAndMode()
-SyncBgVisibilityAndMode: ; 8001698
+@ void SyncBgVisibilityAndMode()
+SyncBgVisibilityAndMode: @ 8001698
 	push {lr}
 	movs r0, 0
 	bl GetGpuReg
@@ -522,8 +522,8 @@ SyncBgVisibilityAndMode: ; 8001698
 	thumb_func_end SyncBgVisibilityAndMode
 
 	thumb_func_start SetTextModeAndHideBgs
-; void SetTextModeAndHideBgs()
-SetTextModeAndHideBgs: ; 80016BC
+@ void SetTextModeAndHideBgs()
+SetTextModeAndHideBgs: @ 80016BC
 	push {lr}
 	movs r0, 0
 	bl GetGpuReg
@@ -537,8 +537,8 @@ SetTextModeAndHideBgs: ; 80016BC
 	thumb_func_end SetTextModeAndHideBgs
 
 	thumb_func_start SetBgAffineInternal
-; void SetBgAffineInternal(u8 bg, u16 srcCenterX, u16 srcCenterY, u16 dispCenterX, u16 dispCenterY, u16 scaleX, u16 scaleY, u16 rotationAngle)
-SetBgAffineInternal: ; 80016D8
+@ void SetBgAffineInternal(u8 bg, u16 srcCenterX, u16 srcCenterY, u16 dispCenterX, u16 dispCenterY, u16 scaleX, u16 scaleY, u16 rotationAngle)
+SetBgAffineInternal: @ 80016D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -635,8 +635,8 @@ _08001796:
 	thumb_func_end SetBgAffineInternal
 
 	thumb_func_start IsInvalidBg
-; bool8 IsInvalidBg(u8 bg)
-IsInvalidBg: ; 80017A4
+@ bool8 IsInvalidBg(u8 bg)
+IsInvalidBg: @ 80017A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -652,15 +652,15 @@ _080017B4:
 	thumb_func_end IsInvalidBg
 
 	thumb_func_start DummiedOutFireRedLeafGreenTileAllocFunc
-; int DummiedOutFireRedLeafGreenTileAllocFunc()
-DummiedOutFireRedLeafGreenTileAllocFunc: ; 80017B8
+@ int DummiedOutFireRedLeafGreenTileAllocFunc()
+DummiedOutFireRedLeafGreenTileAllocFunc: @ 80017B8
 	movs r0, 0
 	bx lr
 	thumb_func_end DummiedOutFireRedLeafGreenTileAllocFunc
 
 	thumb_func_start ResetBgsAndClearDma3BusyFlags
-; void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable)
-ResetBgsAndClearDma3BusyFlags: ; 80017BC
+@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable)
+ResetBgsAndClearDma3BusyFlags: @ 80017BC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl ResetBgs
@@ -682,8 +682,8 @@ _080017CC:
 	thumb_func_end ResetBgsAndClearDma3BusyFlags
 
 	thumb_func_start InitBgsFromTemplates
-; void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates)
-InitBgsFromTemplates: ; 80017E8
+@ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates)
+InitBgsFromTemplates: @ 80017E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -782,8 +782,8 @@ _08001894:
 	thumb_func_end InitBgsFromTemplates
 
 	thumb_func_start InitBgFromTemplate
-; void InitBgFromTemplate(struct BgTemplate *templates)
-InitBgFromTemplate: ; 80018B0
+@ void InitBgFromTemplate(struct BgTemplate *templates)
+InitBgFromTemplate: @ 80018B0
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r7, r0, 0
@@ -848,8 +848,8 @@ _08001920:
 	thumb_func_end InitBgFromTemplate
 
 	thumb_func_start SetBgMode
-; void SetBgMode(u8 bgMode)
-SetBgMode: ; 8001934
+@ void SetBgMode(u8 bgMode)
+SetBgMode: @ 8001934
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -859,8 +859,8 @@ SetBgMode: ; 8001934
 	thumb_func_end SetBgMode
 
 	thumb_func_start LoadBgTiles
-; u8 LoadBgTiles(u8 bg, void *src, u16 size, u16 destOffset)
-LoadBgTiles: ; 8001944
+@ u8 LoadBgTiles(u8 bg, void *src, u16 size, u16 destOffset)
+LoadBgTiles: @ 8001944
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -950,8 +950,8 @@ _080019E6:
 	thumb_func_end LoadBgTiles
 
 	thumb_func_start LoadBgTilemap
-; u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset)
-LoadBgTilemap: ; 80019FC
+@ u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset)
+LoadBgTilemap: @ 80019FC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -992,8 +992,8 @@ _08001A3E:
 	thumb_func_end LoadBgTilemap
 
 	thumb_func_start Unused_LoadBgPalette
-; u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset)
-Unused_LoadBgPalette: ; 8001A4C
+@ u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset)
+Unused_LoadBgPalette: @ 8001A4C
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	lsls r0, 24
@@ -1062,8 +1062,8 @@ _08001AC8:
 	thumb_func_end Unused_LoadBgPalette
 
 	thumb_func_start IsDma3ManagerBusyWithBgCopy
-; bool8 IsDma3ManagerBusyWithBgCopy()
-IsDma3ManagerBusyWithBgCopy: ; 8001AD4
+@ bool8 IsDma3ManagerBusyWithBgCopy()
+IsDma3ManagerBusyWithBgCopy: @ 8001AD4
 	push {r4-r7,lr}
 	movs r5, 0
 	movs r7, 0x1
@@ -1115,8 +1115,8 @@ _08001B2A:
 	thumb_func_end IsDma3ManagerBusyWithBgCopy
 
 	thumb_func_start ShowBg
-; void ShowBg(u8 bg)
-ShowBg: ; 8001B30
+@ void ShowBg(u8 bg)
+ShowBg: @ 8001B30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1127,8 +1127,8 @@ ShowBg: ; 8001B30
 	thumb_func_end ShowBg
 
 	thumb_func_start HideBg
-; void HideBg(u8 bg)
-HideBg: ; 8001B44
+@ void HideBg(u8 bg)
+HideBg: @ 8001B44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1139,8 +1139,8 @@ HideBg: ; 8001B44
 	thumb_func_end HideBg
 
 	thumb_func_start SetBgAttribute
-; void SetBgAttribute(u8 bg, u8 attributeId, u8 value)
-SetBgAttribute: ; 8001B58
+@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value)
+SetBgAttribute: @ 8001B58
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -1243,8 +1243,8 @@ _08001C12:
 	thumb_func_end SetBgAttribute
 
 	thumb_func_start GetBgAttribute
-; u8 GetBgAttribute(u8 bg, u8 attributeId)
-GetBgAttribute: ; 8001C1C
+@ u8 GetBgAttribute(u8 bg, u8 attributeId)
+GetBgAttribute: @ 8001C1C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1355,8 +1355,8 @@ _08001CFA:
 	thumb_func_end GetBgAttribute
 
 	thumb_func_start ChangeBgX
-; u32 ChangeBgX(u8 bg, u32 value, u8 op)
-ChangeBgX: ; 8001D04
+@ u32 ChangeBgX(u8 bg, u32 value, u8 op)
+ChangeBgX: @ 8001D04
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1509,8 +1509,8 @@ _08001E34:
 	thumb_func_end ChangeBgX
 
 	thumb_func_start GetBgX
-; u32 GetBgX(u8 bg)
-GetBgX: ; 8001E40
+@ u32 GetBgX(u8 bg)
+GetBgX: @ 8001E40
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1541,8 +1541,8 @@ _08001E74:
 	thumb_func_end GetBgX
 
 	thumb_func_start ChangeBgY
-; u32 ChangeBgY(u8 bg, u32 value, u8 op)
-ChangeBgY: ; 8001E7C
+@ u32 ChangeBgY(u8 bg, u32 value, u8 op)
+ChangeBgY: @ 8001E7C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1695,8 +1695,8 @@ _08001FAC:
 	thumb_func_end ChangeBgY
 
 	thumb_func_start ChangeBgY_ScreenOff
-; u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
-ChangeBgY_ScreenOff: ; 8001FB8
+@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op)
+ChangeBgY_ScreenOff: @ 8001FB8
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1849,8 +1849,8 @@ _080020E8:
 	thumb_func_end ChangeBgY_ScreenOff
 
 	thumb_func_start GetBgY
-; u32 GetBgY(u8 bg)
-GetBgY: ; 80020F4
+@ u32 GetBgY(u8 bg)
+GetBgY: @ 80020F4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1881,8 +1881,8 @@ _08002128:
 	thumb_func_end GetBgY
 
 	thumb_func_start SetBgAffine
-; void SetBgAffine(u8 bg, u16 srcCenterX, u16 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle)
-SetBgAffine: ; 8002130
+@ void SetBgAffine(u8 bg, u16 srcCenterX, u16 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle)
+SetBgAffine: @ 8002130
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1917,8 +1917,8 @@ SetBgAffine: ; 8002130
 	thumb_func_end SetBgAffine
 
 	thumb_func_start Unused_AdjustBgMosaic
-; u8 Unused_AdjustBgMosaic(u8 a1, u8 a2)
-Unused_AdjustBgMosaic: ; 8002170
+@ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2)
+Unused_AdjustBgMosaic: @ 8002170
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2039,8 +2039,8 @@ _08002226:
 	thumb_func_end Unused_AdjustBgMosaic
 
 	thumb_func_start SetBgTilemapBuffer
-; void SetBgTilemapBuffer(u8 bg, void *tilemap)
-SetBgTilemapBuffer: ; 8002250
+@ void SetBgTilemapBuffer(u8 bg, void *tilemap)
+SetBgTilemapBuffer: @ 8002250
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -2068,8 +2068,8 @@ _0800227A:
 	thumb_func_end SetBgTilemapBuffer
 
 	thumb_func_start UnsetBgTilemapBuffer
-; void UnsetBgTilemapBuffer(u8 bg)
-UnsetBgTilemapBuffer: ; 8002284
+@ void UnsetBgTilemapBuffer(u8 bg)
+UnsetBgTilemapBuffer: @ 8002284
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2097,8 +2097,8 @@ _080022AE:
 	thumb_func_end UnsetBgTilemapBuffer
 
 	thumb_func_start GetBgTilemapBuffer
-; void *GetBgTilemapBuffer(u8 bg)
-GetBgTilemapBuffer: ; 80022B8
+@ void *GetBgTilemapBuffer(u8 bg)
+GetBgTilemapBuffer: @ 80022B8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2128,8 +2128,8 @@ _080022EA:
 	thumb_func_end GetBgTilemapBuffer
 
 	thumb_func_start CopyToBgTilemapBuffer
-; void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
-CopyToBgTilemapBuffer: ; 80022F0
+@ void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
+CopyToBgTilemapBuffer: @ 80022F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2190,8 +2190,8 @@ _08002358:
 	thumb_func_end CopyToBgTilemapBuffer
 
 	thumb_func_start CopyBgTilemapBufferToVram
-; void CopyBgTilemapBufferToVram(u8 bg)
-CopyBgTilemapBufferToVram: ; 800236C
+@ void CopyBgTilemapBufferToVram(u8 bg)
+CopyBgTilemapBufferToVram: @ 800236C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -2245,8 +2245,8 @@ _080023C8:
 	thumb_func_end CopyBgTilemapBufferToVram
 
 	thumb_func_start CopyToBgTilemapBufferRect
-; void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height)
-CopyToBgTilemapBufferRect: ; 80023D4
+@ void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height)
+CopyToBgTilemapBufferRect: @ 80023D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2382,8 +2382,8 @@ _080024C4:
 	thumb_func_end CopyToBgTilemapBufferRect
 
 	thumb_func_start CopyToBgTilemapBufferRect_ChangePalette
-; void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
-CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8
+@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
+CopyToBgTilemapBufferRect_ChangePalette: @ 80024D8
 	push {r4-r6,lr}
 	sub sp, 0x24
 	ldr r4, [sp, 0x34]
@@ -2420,8 +2420,8 @@ CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8
 	thumb_func_end CopyToBgTilemapBufferRect_ChangePalette
 
 	thumb_func_start CopyRectToBgTilemapBufferRect
-; void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
-CopyRectToBgTilemapBufferRect: ; 800251C
+@ void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
+CopyRectToBgTilemapBufferRect: @ 800251C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2668,8 +2668,8 @@ _080026EE:
 	thumb_func_end CopyRectToBgTilemapBufferRect
 
 	thumb_func_start FillBgTilemapBufferRect_Palette0
-; void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
-FillBgTilemapBufferRect_Palette0: ; 8002704
+@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
+FillBgTilemapBufferRect_Palette0: @ 8002704
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2803,8 +2803,8 @@ _080027F0:
 	thumb_func_end FillBgTilemapBufferRect_Palette0
 
 	thumb_func_start FillBgTilemapBufferRect
-; void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette)
-FillBgTilemapBufferRect: ; 8002804
+@ void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette)
+FillBgTilemapBufferRect: @ 8002804
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r4, [sp, 0x20]
@@ -2837,8 +2837,8 @@ FillBgTilemapBufferRect: ; 8002804
 	thumb_func_end FillBgTilemapBufferRect
 
 	thumb_func_start WriteSequenceToBgTilemapBuffer
-; void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta)
-WriteSequenceToBgTilemapBuffer: ; 8002840
+@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta)
+WriteSequenceToBgTilemapBuffer: @ 8002840
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3051,8 +3051,8 @@ _080029D4:
 	thumb_func_end WriteSequenceToBgTilemapBuffer
 
 	thumb_func_start GetBgMetricTextMode
-; u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
-GetBgMetricTextMode: ; 80029EC
+@ u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
+GetBgMetricTextMode: @ 80029EC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3121,8 +3121,8 @@ _08002A54:
 	thumb_func_end GetBgMetricTextMode
 
 	thumb_func_start GetBgMetricAffineMode
-; u16 GetBgMetricAffineMode(u8 bg, u8 whichMetric)
-GetBgMetricAffineMode: ; 8002A5C
+@ u16 GetBgMetricAffineMode(u8 bg, u8 whichMetric)
+GetBgMetricAffineMode: @ 8002A5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3177,8 +3177,8 @@ _08002AAE:
 	thumb_func_end GetBgMetricAffineMode
 
 	thumb_func_start GetTileMapIndexFromCoords
-; u32 GetTileMapIndexFromCoords(u32 x, u32 y, u32 screenSize, u32 screenWidth, u32 screenHeight)
-GetTileMapIndexFromCoords: ; 8002AB4
+@ u32 GetTileMapIndexFromCoords(u32 x, u32 y, u32 screenSize, u32 screenWidth, u32 screenHeight)
+GetTileMapIndexFromCoords: @ 8002AB4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [sp, 0x8]
@@ -3211,8 +3211,8 @@ _08002AE0:
 	thumb_func_end GetTileMapIndexFromCoords
 
 	thumb_func_start CopyTileMapEntry
-; void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u16 tileOffset, u32 palette2)
-CopyTileMapEntry: ; 8002AEC
+@ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u16 tileOffset, u32 palette2)
+CopyTileMapEntry: @ 8002AEC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -3263,8 +3263,8 @@ _08002B3C:
 	thumb_func_end CopyTileMapEntry
 
 	thumb_func_start GetBgType
-; u16 GetBgType(u8 bg)
-GetBgType: ; 8002B48
+@ u16 GetBgType(u8 bg)
+GetBgType: @ 8002B48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3314,8 +3314,8 @@ _08002B90:
 	thumb_func_end GetBgType
 
 	thumb_func_start IsInvalidBg_
-; bool8 IsInvalidBg_(u8 bg)
-IsInvalidBg_: ; 8002B9C
+@ bool8 IsInvalidBg_(u8 bg)
+IsInvalidBg_: @ 8002B9C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3331,8 +3331,8 @@ _08002BAC:
 	thumb_func_end IsInvalidBg_
 
 	thumb_func_start IsTileMapOutsideWram
-; bool8 IsTileMapOutsideWram(u8 bg)
-IsTileMapOutsideWram: ; 8002BB0
+@ bool8 IsTileMapOutsideWram(u8 bg)
+IsTileMapOutsideWram: @ 8002BB0
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x030008f8
diff --git a/asm/gpu_obj.s b/asm/gpu_obj.s
index 5c5707dfd..cad02cb5b 100644
--- a/asm/gpu_obj.s
+++ b/asm/gpu_obj.s
@@ -1,6 +1,6 @@
 	thumb_func_start ResetAllObjectData
-; void ResetAllObjectData()
-ResetAllObjectData: ; 8006974
+@ void ResetAllObjectData()
+ResetAllObjectData: @ 8006974
 	push {r4,lr}
 	movs r0, 0
 	movs r1, 0x80
@@ -28,8 +28,8 @@ ResetAllObjectData: ; 8006974
 	thumb_func_end ResetAllObjectData
 
 	thumb_func_start CallObjectCallbacks
-; void CallObjectCallbacks()
-CallObjectCallbacks: ; 80069C0
+@ void CallObjectCallbacks()
+CallObjectCallbacks: @ 80069C0
 	push {r4-r7,lr}
 	movs r6, 0
 	movs r7, 0x1
@@ -69,8 +69,8 @@ _080069F6:
 	thumb_func_end CallObjectCallbacks
 
 	thumb_func_start PrepareSpritesForOamLoad
-; void PrepareSpritesForOamLoad()
-PrepareSpritesForOamLoad: ; 8006A0C
+@ void PrepareSpritesForOamLoad()
+PrepareSpritesForOamLoad: @ 8006A0C
 	push {r4,r5,lr}
 	bl UpdateObjectOamCoords
 	bl BuildObjectPriorityList
@@ -102,8 +102,8 @@ PrepareSpritesForOamLoad: ; 8006A0C
 	thumb_func_end PrepareSpritesForOamLoad
 
 	thumb_func_start UpdateObjectOamCoords
-; void UpdateObjectOamCoords()
-UpdateObjectOamCoords: ; 8006A58
+@ void UpdateObjectOamCoords()
+UpdateObjectOamCoords: @ 8006A58
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r7, =0x02020630
@@ -198,8 +198,8 @@ _08006B0A:
 	thumb_func_end UpdateObjectOamCoords
 
 	thumb_func_start BuildObjectPriorityList
-; void BuildObjectPriorityList()
-BuildObjectPriorityList: ; 8006B1C
+@ void BuildObjectPriorityList()
+BuildObjectPriorityList: @ 8006B1C
 	push {r4,lr}
 	movs r2, 0
 	ldr r4, =0x02020630
@@ -232,8 +232,8 @@ _08006B24:
 	thumb_func_end BuildObjectPriorityList
 
 	thumb_func_start SortObjectsByPriority
-; void SortObjectsByPriority()
-SortObjectsByPriority: ; 8006B5C
+@ void SortObjectsByPriority()
+SortObjectsByPriority: @ 8006B5C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -466,8 +466,8 @@ _08006D04:
 	thumb_func_end SortObjectsByPriority
 
 	thumb_func_start CopyTransformationMatricesToSprites
-; void CopyTransformationMatricesToSprites()
-CopyTransformationMatricesToSprites: ; 8006D1C
+@ void CopyTransformationMatricesToSprites()
+CopyTransformationMatricesToSprites: @ 8006D1C
 	push {r4-r6,lr}
 	movs r4, 0
 	ldr r5, =0x030022c0
@@ -507,8 +507,8 @@ _08006D24:
 	thumb_func_end CopyTransformationMatricesToSprites
 
 	thumb_func_start PopulateSprites
-; void PopulateSprites()
-PopulateSprites: ; 8006D68
+@ void PopulateSprites()
+PopulateSprites: @ 8006D68
 	push {r4-r6,lr}
 	sub sp, 0x4
 	movs r4, 0
@@ -576,8 +576,8 @@ _08006DD8:
 	thumb_func_end PopulateSprites
 
 	thumb_func_start AddObjectToFront
-; u8 AddObjectToFront(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
-AddObjectToFront: ; 8006DF4
+@ u8 AddObjectToFront(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
+AddObjectToFront: @ 8006DF4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -623,8 +623,8 @@ _08006E40:
 	thumb_func_end AddObjectToFront
 
 	thumb_func_start AddObjectToBack
-; u8 AddObjectToBack(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
-AddObjectToBack: ; 8006E48
+@ u8 AddObjectToBack(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
+AddObjectToBack: @ 8006E48
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -681,8 +681,8 @@ _08006EA6:
 	thumb_func_end AddObjectToBack
 
 	thumb_func_start obj_add_empty_with_callback
-; int obj_add_empty_with_callback(void ( *func)())
-obj_add_empty_with_callback: ; 8006EB4
+@ int obj_add_empty_with_callback(void ( *func)())
+obj_add_empty_with_callback: @ 8006EB4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, =gUnknown_082EC6AC
@@ -719,8 +719,8 @@ _08006EF6:
 	thumb_func_end obj_add_empty_with_callback
 
 	thumb_func_start AddObject
-; u8 AddObject(u8 index, struct objtemplate *template, u16 x, u16 y, u8 subpriority)
-AddObject: ; 8006EFC
+@ u8 AddObject(u8 index, struct objtemplate *template, u16 x, u16 y, u8 subpriority)
+AddObject: @ 8006EFC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -886,8 +886,8 @@ _08007040:
 	thumb_func_end AddObject
 
 	thumb_func_start AddObjectAndAnimateForOneFrame
-; u8 AddObjectAndAnimateForOneFrame(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
-AddObjectAndAnimateForOneFrame: ; 8007054
+@ u8 AddObjectAndAnimateForOneFrame(struct objtemplate *template, u16 x, u16 y, u8 subpriority)
+AddObjectAndAnimateForOneFrame: @ 8007054
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -964,8 +964,8 @@ _080070D8:
 	thumb_func_end AddObjectAndAnimateForOneFrame
 
 	thumb_func_start RemoveObjectAndFreeTiles
-; void RemoveObjectAndFreeTiles(struct obj *object)
-RemoveObjectAndFreeTiles: ; 80070E8
+@ void RemoveObjectAndFreeTiles(struct obj *object)
+RemoveObjectAndFreeTiles: @ 80070E8
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r0, 0x3E
@@ -1021,8 +1021,8 @@ _08007144:
 	thumb_func_end RemoveObjectAndFreeTiles
 
 	thumb_func_start ResetSpriteRange
-; void ResetSpriteRange(u8 startIndex, u8 endIndex)
-ResetSpriteRange: ; 8007150
+@ void ResetSpriteRange(u8 startIndex, u8 endIndex)
+ResetSpriteRange: @ 8007150
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsls r1, 24
@@ -1052,8 +1052,8 @@ _08007178:
 	thumb_func_end ResetSpriteRange
 
 	thumb_func_start LoadOamFromSprites
-; void LoadOamFromSprites()
-LoadOamFromSprites: ; 8007188
+@ void LoadOamFromSprites()
+LoadOamFromSprites: @ 8007188
 	push {lr}
 	ldr r2, =0x030022c0
 	ldr r1, =0x00000439
@@ -1076,8 +1076,8 @@ _080071A8:
 	thumb_func_end LoadOamFromSprites
 
 	thumb_func_start ClearObjectCopyRequests
-; void ClearObjectCopyRequests()
-ClearObjectCopyRequests: ; 80071B8
+@ void ClearObjectCopyRequests()
+ClearObjectCopyRequests: @ 80071B8
 	push {r4,r5,lr}
 	ldr r0, =0x02021834
 	movs r1, 0
@@ -1109,8 +1109,8 @@ _080071CC:
 	thumb_func_end ClearObjectCopyRequests
 
 	thumb_func_start ResetSpriteTransformationMatrices
-; void ResetSpriteTransformationMatrices()
-ResetSpriteTransformationMatrices: ; 80071F8
+@ void ResetSpriteTransformationMatrices()
+ResetSpriteTransformationMatrices: @ 80071F8
 	push {r4,lr}
 	movs r1, 0
 	ldr r4, =0x02021bc0
@@ -1136,8 +1136,8 @@ _08007204:
 	thumb_func_end ResetSpriteTransformationMatrices
 
 	thumb_func_start SetSpriteTransformationMatrix
-; void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d)
-SetSpriteTransformationMatrix: ; 8007224
+@ void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d)
+SetSpriteTransformationMatrix: @ 8007224
 	push {r4,r5,lr}
 	ldr r5, [sp, 0xC]
 	lsls r0, 24
@@ -1155,8 +1155,8 @@ SetSpriteTransformationMatrix: ; 8007224
 	thumb_func_end SetSpriteTransformationMatrix
 
 	thumb_func_start RemoveObject
-; void RemoveObject(struct obj *object)
-RemoveObject: ; 8007244
+@ void RemoveObject(struct obj *object)
+RemoveObject: @ 8007244
 	push {lr}
 	ldr r1, =gUnknown_082EC64C
 	movs r2, 0x44
@@ -1167,8 +1167,8 @@ RemoveObject: ; 8007244
 	thumb_func_end RemoveObject
 
 	thumb_func_start CalcVecFromObjectCenterToObjectUpperLeft
-; void CalcVecFromObjectCenterToObjectUpperLeft(struct obj *object, u8 shape, u8 size, u8 affineMode)
-CalcVecFromObjectCenterToObjectUpperLeft: ; 8007258
+@ void CalcVecFromObjectCenterToObjectUpperLeft(struct obj *object, u8 shape, u8 size, u8 affineMode)
+CalcVecFromObjectCenterToObjectUpperLeft: @ 8007258
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
@@ -1205,8 +1205,8 @@ _08007286:
 	thumb_func_end CalcVecFromObjectCenterToObjectUpperLeft
 
 	thumb_func_start AllocObjectTiles
-; s16 AllocObjectTiles(u16 numTiles)
-AllocObjectTiles: ; 800729C
+@ s16 AllocObjectTiles(u16 numTiles)
+AllocObjectTiles: @ 800729C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -1356,8 +1356,8 @@ _080073A4:
 	thumb_func_end AllocObjectTiles
 
 	thumb_func_start Unused_ObjectTileAllocationBitArrayOp
-; unsigned int Unused_ObjectTileAllocationBitArrayOp(u16 tileNum, u8 op)
-Unused_ObjectTileAllocationBitArrayOp: ; 80073B8
+@ unsigned int Unused_ObjectTileAllocationBitArrayOp(u16 tileNum, u8 op)
+Unused_ObjectTileAllocationBitArrayOp: @ 80073B8
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -1416,14 +1416,14 @@ _0800741C:
 	thumb_func_end Unused_ObjectTileAllocationBitArrayOp
 
 	thumb_func_start DummyObjectCallback
-; void DummyObjectCallback(struct obj *object)
-DummyObjectCallback: ; 8007428
+@ void DummyObjectCallback(struct obj *object)
+DummyObjectCallback: @ 8007428
 	bx lr
 	thumb_func_end DummyObjectCallback
 
 	thumb_func_start ProcessObjectCopyRequests
-; void ProcessObjectCopyRequests()
-ProcessObjectCopyRequests: ; 800742C
+@ void ProcessObjectCopyRequests()
+ProcessObjectCopyRequests: @ 800742C
 	push {r4-r7,lr}
 	ldr r0, =0x02021834
 	ldrb r0, [r0]
@@ -1469,8 +1469,8 @@ _08007474:
 	thumb_func_end ProcessObjectCopyRequests
 
 	thumb_func_start AddPicToObjectCopyRequests
-; void AddPicToObjectCopyRequests(u16 picIndex, u16 targetTileNum, struct obj_tiles *pics)
-AddPicToObjectCopyRequests: ; 8007488
+@ void AddPicToObjectCopyRequests(u16 picIndex, u16 targetTileNum, struct obj_tiles *pics)
+AddPicToObjectCopyRequests: @ 8007488
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	lsls r0, 16
@@ -1519,8 +1519,8 @@ _080074D8:
 	thumb_func_end AddPicToObjectCopyRequests
 
 	thumb_func_start AddTilesToObjectCopyRequests
-; void AddTilesToObjectCopyRequests(void *src, void *dest, u16 size)
-AddTilesToObjectCopyRequests: ; 80074EC
+@ void AddTilesToObjectCopyRequests(void *src, void *dest, u16 size)
+AddTilesToObjectCopyRequests: @ 80074EC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -1561,8 +1561,8 @@ _0800752C:
 	thumb_func_end AddTilesToObjectCopyRequests
 
 	thumb_func_start Unused_CopyFromObjects
-; void Unused_CopyFromObjects(void *dest)
-Unused_CopyFromObjects: ; 800753C
+@ void Unused_CopyFromObjects(void *dest)
+Unused_CopyFromObjects: @ 800753C
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r3, =0x02020630
@@ -1583,8 +1583,8 @@ _08007546:
 	thumb_func_end Unused_CopyFromObjects
 
 	thumb_func_start Unused_CopyToObjects
-; void Unused_CopyToObjects(void *src)
-Unused_CopyToObjects: ; 8007564
+@ void Unused_CopyToObjects(void *src)
+Unused_CopyToObjects: @ 8007564
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r3, =0x02020630
@@ -1605,8 +1605,8 @@ _0800756E:
 	thumb_func_end Unused_CopyToObjects
 
 	thumb_func_start RemoveAllObjects
-; void RemoveAllObjects()
-RemoveAllObjects: ; 800758C
+@ void RemoveAllObjects()
+RemoveAllObjects: @ 800758C
 	push {r4,r5,lr}
 	movs r4, 0
 _08007590:
@@ -1636,8 +1636,8 @@ _08007590:
 	thumb_func_end RemoveAllObjects
 
 	thumb_func_start FreeObjectTiles
-; void FreeObjectTiles(struct obj *object)
-FreeObjectTiles: ; 80075C8
+@ void FreeObjectTiles(struct obj *object)
+FreeObjectTiles: @ 80075C8
 	push {lr}
 	ldr r2, [r0, 0x14]
 	ldrh r1, [r2]
@@ -1653,8 +1653,8 @@ _080075DA:
 	thumb_func_end FreeObjectTiles
 
 	thumb_func_start FreeObjectPalette
-; void FreeObjectPalette(struct obj *object)
-FreeObjectPalette: ; 80075E4
+@ void FreeObjectPalette(struct obj *object)
+FreeObjectPalette: @ 80075E4
 	push {lr}
 	ldr r0, [r0, 0x14]
 	ldrh r0, [r0, 0x2]
@@ -1664,8 +1664,8 @@ FreeObjectPalette: ; 80075E4
 	thumb_func_end FreeObjectPalette
 
 	thumb_func_start obj_free_rotscale_entry
-; void obj_free_rotscale_entry(struct obj *obj)
-obj_free_rotscale_entry: ; 80075F4
+@ void obj_free_rotscale_entry(struct obj *obj)
+obj_free_rotscale_entry: @ 80075F4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -1691,8 +1691,8 @@ _0800761A:
 	thumb_func_end obj_free_rotscale_entry
 
 	thumb_func_start RemoveObjectAndFreeResources
-; void RemoveObjectAndFreeResources(struct obj *object)
-RemoveObjectAndFreeResources: ; 8007620
+@ void RemoveObjectAndFreeResources(struct obj *object)
+RemoveObjectAndFreeResources: @ 8007620
 	push {r4,lr}
 	adds r4, r0, 0
 	bl FreeObjectTiles
@@ -1708,8 +1708,8 @@ RemoveObjectAndFreeResources: ; 8007620
 	thumb_func_end RemoveObjectAndFreeResources
 
 	thumb_func_start AnimateObject
-; void AnimateObject(struct obj *object)
-AnimateObject: ; 8007640
+@ void AnimateObject(struct obj *object)
+AnimateObject: @ 8007640
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r2, =gUnknown_082EC6C4
@@ -1743,8 +1743,8 @@ _08007676:
 	thumb_func_end AnimateObject
 
 	thumb_func_start BeginObjectImageAnim
-; void BeginObjectImageAnim(struct obj *object)
-BeginObjectImageAnim: ; 8007688
+@ void BeginObjectImageAnim(struct obj *object)
+BeginObjectImageAnim: @ 8007688
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -1866,8 +1866,8 @@ _0800776C:
 	thumb_func_end BeginObjectImageAnim
 
 	thumb_func_start ContinueObjectImageAnim
-; void ContinueObjectImageAnim(struct obj *object)
-ContinueObjectImageAnim: ; 8007778
+@ void ContinueObjectImageAnim(struct obj *object)
+ContinueObjectImageAnim: @ 8007778
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x2C
@@ -1950,8 +1950,8 @@ _0800780E:
 	thumb_func_end ContinueObjectImageAnim
 
 	thumb_func_start ImageAnimCmd_frame
-; void ImageAnimCmd_frame(struct obj *object)
-ImageAnimCmd_frame: ; 8007818
+@ void ImageAnimCmd_frame(struct obj *object)
+ImageAnimCmd_frame: @ 8007818
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -2040,8 +2040,8 @@ _080078BA:
 	thumb_func_end ImageAnimCmd_frame
 
 	thumb_func_start ImageAnimCmd_end
-; void ImageAnimCmd_end(struct obj *object)
-ImageAnimCmd_end: ; 80078C4
+@ void ImageAnimCmd_end(struct obj *object)
+ImageAnimCmd_end: @ 80078C4
 	adds r2, r0, 0
 	adds r2, 0x2B
 	ldrb r1, [r2]
@@ -2056,8 +2056,8 @@ ImageAnimCmd_end: ; 80078C4
 	thumb_func_end ImageAnimCmd_end
 
 	thumb_func_start ImageAnimCmd_jump
-; void ImageAnimCmd_jump(struct obj *object)
-ImageAnimCmd_jump: ; 80078DC
+@ void ImageAnimCmd_jump(struct obj *object)
+ImageAnimCmd_jump: @ 80078DC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -2159,8 +2159,8 @@ _0800799A:
 	thumb_func_end ImageAnimCmd_jump
 
 	thumb_func_start ImageAnimCmd_loop
-; void ImageAnimCmd_loop(struct obj *object)
-ImageAnimCmd_loop: ; 80079A4
+@ void ImageAnimCmd_loop(struct obj *object)
+ImageAnimCmd_loop: @ 80079A4
 	push {lr}
 	adds r1, r0, 0
 	adds r0, 0x2D
@@ -2179,8 +2179,8 @@ _080079BE:
 	thumb_func_end ImageAnimCmd_loop
 
 	thumb_func_start BeginImageAnimLoop
-; void BeginImageAnimLoop(struct obj *object)
-BeginImageAnimLoop: ; 80079C4
+@ void BeginImageAnimLoop(struct obj *object)
+BeginImageAnimLoop: @ 80079C4
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, 0x2A
@@ -2210,8 +2210,8 @@ BeginImageAnimLoop: ; 80079C4
 	thumb_func_end BeginImageAnimLoop
 
 	thumb_func_start ContinueImageAnimLoop
-; void ContinueImageAnimLoop(struct obj *object)
-ContinueImageAnimLoop: ; 80079FC
+@ void ContinueImageAnimLoop(struct obj *object)
+ContinueImageAnimLoop: @ 80079FC
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r1, r4, 0
@@ -2229,8 +2229,8 @@ ContinueImageAnimLoop: ; 80079FC
 	thumb_func_end ContinueImageAnimLoop
 
 	thumb_func_start JumpToTopOfImageAnimLoop
-; void JumpToTopOfImageAnimLoop(struct obj *object)
-JumpToTopOfImageAnimLoop: ; 8007A1C
+@ void JumpToTopOfImageAnimLoop(struct obj *object)
+JumpToTopOfImageAnimLoop: @ 8007A1C
 	push {r4-r7,lr}
 	mov r12, r0
 	adds r0, 0x2D
@@ -2294,8 +2294,8 @@ _08007A88:
 	thumb_func_end JumpToTopOfImageAnimLoop
 
 	thumb_func_start BeginObjectRotScalAnim
-; void BeginObjectRotScalAnim(struct obj *object)
-BeginObjectRotScalAnim: ; 8007A90
+@ void BeginObjectRotScalAnim(struct obj *object)
+BeginObjectRotScalAnim: @ 8007A90
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r0, 0
@@ -2365,8 +2365,8 @@ _08007B12:
 	thumb_func_end BeginObjectRotScalAnim
 
 	thumb_func_start ContinueObjectRotScalAnim
-; void ContinueObjectRotScalAnim(struct obj *object)
-ContinueObjectRotScalAnim: ; 8007B24
+@ void ContinueObjectRotScalAnim(struct obj *object)
+ContinueObjectRotScalAnim: @ 8007B24
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x1]
@@ -2454,8 +2454,8 @@ _08007BC6:
 	thumb_func_end ContinueObjectRotScalAnim
 
 	thumb_func_start sub_8007BD8
-; void sub_8007BD8(u8 index, struct obj *object)
-sub_8007BD8: ; 8007BD8
+@ void sub_8007BD8(u8 index, struct obj *object)
+sub_8007BD8: @ 8007BD8
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r1, 0
@@ -2482,8 +2482,8 @@ _08007C02:
 	thumb_func_end sub_8007BD8
 
 	thumb_func_start RotScalAnimCmd_loop
-; void RotScalAnimCmd_loop(u8 index, struct obj *object)
-RotScalAnimCmd_loop: ; 8007C0C
+@ void RotScalAnimCmd_loop(u8 index, struct obj *object)
+RotScalAnimCmd_loop: @ 8007C0C
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -2511,8 +2511,8 @@ _08007C3C:
 	thumb_func_end RotScalAnimCmd_loop
 
 	thumb_func_start BeginRotScalAnimLoop
-; void BeginRotScalAnimLoop(u8 index, struct obj *object)
-BeginRotScalAnimLoop: ; 8007C40
+@ void BeginRotScalAnimLoop(u8 index, struct obj *object)
+BeginRotScalAnimLoop: @ 8007C40
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -2543,8 +2543,8 @@ BeginRotScalAnimLoop: ; 8007C40
 	thumb_func_end BeginRotScalAnimLoop
 
 	thumb_func_start ContinueRotScalAnimLoop
-; void ContinueRotScalAnimLoop(u8 index, struct obj *object)
-ContinueRotScalAnimLoop: ; 8007C7C
+@ void ContinueRotScalAnimLoop(u8 index, struct obj *object)
+ContinueRotScalAnimLoop: @ 8007C7C
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -2568,8 +2568,8 @@ ContinueRotScalAnimLoop: ; 8007C7C
 	thumb_func_end ContinueRotScalAnimLoop
 
 	thumb_func_start JumpToTopOfRotScalAnimLoop
-; void JumpToTopOfRotScalAnimLoop(u8 index, struct obj *object)
-JumpToTopOfRotScalAnimLoop: ; 8007CAC
+@ void JumpToTopOfRotScalAnimLoop(u8 index, struct obj *object)
+JumpToTopOfRotScalAnimLoop: @ 8007CAC
 	push {r4-r7,lr}
 	mov r12, r1
 	lsls r0, 24
@@ -2628,8 +2628,8 @@ _08007D0C:
 	thumb_func_end JumpToTopOfRotScalAnimLoop
 
 	thumb_func_start RotScalAnimCmd_jump
-; void RotScalAnimCmd_jump(u8 index, struct obj *object)
-RotScalAnimCmd_jump: ; 8007D18
+@ void RotScalAnimCmd_jump(u8 index, struct obj *object)
+RotScalAnimCmd_jump: @ 8007D18
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -2667,8 +2667,8 @@ RotScalAnimCmd_jump: ; 8007D18
 	thumb_func_end RotScalAnimCmd_jump
 
 	thumb_func_start RotScalAnimCmd_end
-; void RotScalAnimCmd_end(u8 index, struct obj *object)
-RotScalAnimCmd_end: ; 8007D64
+@ void RotScalAnimCmd_end(u8 index, struct obj *object)
+RotScalAnimCmd_end: @ 8007D64
 	push {lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -2699,8 +2699,8 @@ RotScalAnimCmd_end: ; 8007D64
 	thumb_func_end RotScalAnimCmd_end
 
 	thumb_func_start RotScalAnimCmd_frame
-; void RotScalAnimCmd_frame(u8 index, struct obj *object)
-RotScalAnimCmd_frame: ; 8007DA0
+@ void RotScalAnimCmd_frame(u8 index, struct obj *object)
+RotScalAnimCmd_frame: @ 8007DA0
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -2728,8 +2728,8 @@ RotScalAnimCmd_frame: ; 8007DA0
 	thumb_func_end RotScalAnimCmd_frame
 
 	thumb_func_start rotscale_set_indirect
-; void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[])
-rotscale_set_indirect: ; 8007DD8
+@ void rotscale_set_indirect(u8 rotscale_entry_index, s16 rotscale_data[])
+rotscale_set_indirect: @ 8007DD8
 	lsls r0, 24
 	ldr r2, =0x02021bc0
 	lsrs r0, 21
@@ -2747,8 +2747,8 @@ rotscale_set_indirect: ; 8007DD8
 	thumb_func_end rotscale_set_indirect
 
 	thumb_func_start obj_get_rotscale_entry_index
-; int obj_get_rotscale_entry_index(struct obj *obj)
-obj_get_rotscale_entry_index: ; 8007DF8
+@ int obj_get_rotscale_entry_index(struct obj *obj)
+obj_get_rotscale_entry_index: @ 8007DF8
 	push {lr}
 	adds r2, r0, 0
 	movs r3, 0
@@ -2769,8 +2769,8 @@ _08007E12:
 	thumb_func_end obj_get_rotscale_entry_index
 
 	thumb_func_start sub_8007E18
-; void sub_8007E18(struct obj *obj, s16 a2, s16 a3)
-sub_8007E18: ; 8007E18
+@ void sub_8007E18(struct obj *obj, s16 a2, s16 a3)
+sub_8007E18: @ 8007E18
 	strh r1, [r0, 0x3A]
 	strh r2, [r0, 0x3C]
 	adds r0, 0x3F
@@ -2782,8 +2782,8 @@ sub_8007E18: ; 8007E18
 	thumb_func_end sub_8007E18
 
 	thumb_func_start sub_8007E28
-; int sub_8007E28(int a1, int a2, int a3)
-sub_8007E28: ; 8007E28
+@ int sub_8007E28(int a1, int a2, int a3)
+sub_8007E28: @ 8007E28
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r2, 0
@@ -2809,8 +2809,8 @@ _08007E3E:
 	thumb_func_end sub_8007E28
 
 	thumb_func_start obj_update_pos2
-; void obj_update_pos2(struct obj *obj, int a2, int a3)
-obj_update_pos2: ; 8007E54
+@ void obj_update_pos2(struct obj *obj, int a2, int a3)
+obj_update_pos2: @ 8007E54
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -2886,8 +2886,8 @@ _08007EDA:
 	thumb_func_end obj_update_pos2
 
 	thumb_func_start obj_set_horizonal_and_vertical_flip
-; void obj_set_horizonal_and_vertical_flip(struct obj *obj, u8 a2, char a3)
-obj_set_horizonal_and_vertical_flip: ; 8007EF0
+@ void obj_set_horizonal_and_vertical_flip(struct obj *obj, u8 a2, char a3)
+obj_set_horizonal_and_vertical_flip: @ 8007EF0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -2948,8 +2948,8 @@ obj_set_horizonal_and_vertical_flip: ; 8007EF0
 	thumb_func_end obj_set_horizonal_and_vertical_flip
 
 	thumb_func_start rotscale_reset_half
-; void rotscale_reset_half(u8 index)
-rotscale_reset_half: ; 8007F64
+@ void rotscale_reset_half(u8 index)
+rotscale_reset_half: @ 8007F64
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03000b70
@@ -2966,8 +2966,8 @@ rotscale_reset_half: ; 8007F64
 	thumb_func_end rotscale_reset_half
 
 	thumb_func_start rotscale_reset_full_1
-; void rotscale_reset_full_1(u8 index, u8 a2)
-rotscale_reset_full_1: ; 8007F80
+@ void rotscale_reset_full_1(u8 index, u8 a2)
+rotscale_reset_full_1: @ 8007F80
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x03000b70
@@ -2990,8 +2990,8 @@ rotscale_reset_full_1: ; 8007F80
 	thumb_func_end rotscale_reset_full_1
 
 	thumb_func_start rotscale_reset_full_2
-; void rotscale_reset_full_2(u8 index)
-rotscale_reset_full_2: ; 8007FA8
+@ void rotscale_reset_full_2(u8 index)
+rotscale_reset_full_2: @ 8007FA8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x03000b70
@@ -3014,8 +3014,8 @@ rotscale_reset_full_2: ; 8007FA8
 	thumb_func_end rotscale_reset_full_2
 
 	thumb_func_start rotscale_frame_apply_absolute
-; void rotscale_frame_apply_absolute(u8 index, int a2)
-rotscale_frame_apply_absolute: ; 8007FD0
+@ void rotscale_frame_apply_absolute(u8 index, int a2)
+rotscale_frame_apply_absolute: @ 8007FD0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x03000b70
@@ -3035,7 +3035,7 @@ rotscale_frame_apply_absolute: ; 8007FD0
 	thumb_func_end rotscale_frame_apply_absolute
 
 	thumb_func_start obj_anim_image_delay_progress
-obj_anim_image_delay_progress: ; 8007FF4
+obj_anim_image_delay_progress: @ 8007FF4
 	push {lr}
 	adds r3, r0, 0
 	adds r3, 0x2C
@@ -3060,8 +3060,8 @@ _08008018:
 	thumb_func_end obj_anim_image_delay_progress
 
 	thumb_func_start obj_anim_rotscale_delay_progress
-; u8 obj_anim_rotscale_delay_progress(struct obj *object, u8 index)
-obj_anim_rotscale_delay_progress: ; 800801C
+@ u8 obj_anim_rotscale_delay_progress(struct obj *object, u8 index)
+obj_anim_rotscale_delay_progress: @ 800801C
 	push {lr}
 	lsls r1, 24
 	lsrs r2, r1, 24
@@ -3089,8 +3089,8 @@ _08008040:
 	thumb_func_end obj_anim_rotscale_delay_progress
 
 	thumb_func_start rotscale_frame_apply_relative_and_sync
-; void rotscale_frame_apply_relative_and_sync(u8 index, int a2)
-rotscale_frame_apply_relative_and_sync: ; 800804C
+@ void rotscale_frame_apply_relative_and_sync(u8 index, int a2)
+rotscale_frame_apply_relative_and_sync: @ 800804C
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r5, r0, 0
@@ -3158,8 +3158,8 @@ rotscale_frame_apply_relative_and_sync: ; 800804C
 	thumb_func_end rotscale_frame_apply_relative_and_sync
 
 	thumb_func_start divide_0x10000_by
-; int divide_0x10000_by(int n)
-divide_0x10000_by: ; 80080E4
+@ int divide_0x10000_by(int n)
+divide_0x10000_by: @ 80080E4
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x80
@@ -3174,8 +3174,8 @@ divide_0x10000_by: ; 80080E4
 	thumb_func_end divide_0x10000_by
 
 	thumb_func_start rotscale_load_frame
-; void rotscale_load_frame(u8 index, struct obj *obj, rotscale_frame *a3)
-rotscale_load_frame: ; 80080FC
+@ void rotscale_load_frame(u8 index, struct obj *obj, rotscale_frame *a3)
+rotscale_load_frame: @ 80080FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3231,7 +3231,7 @@ rotscale_load_frame: ; 80080FC
 	thumb_func_end rotscale_load_frame
 
 	thumb_func_start sub_8008168
-sub_8008168: ; 8008168
+sub_8008168: @ 8008168
 	push {r4,lr}
 	sub sp, 0x8
 	adds r2, r1, 0
@@ -3265,8 +3265,8 @@ _0800819E:
 	thumb_func_end sub_8008168
 
 	thumb_func_start StartObjectImageAnim
-; void StartObjectImageAnim(struct obj *object, u8 whichAnim)
-StartObjectImageAnim: ; 80081A8
+@ void StartObjectImageAnim(struct obj *object, u8 whichAnim)
+StartObjectImageAnim: @ 80081A8
 	adds r2, r0, 0
 	adds r2, 0x2A
 	strb r1, [r2]
@@ -3282,8 +3282,8 @@ StartObjectImageAnim: ; 80081A8
 	thumb_func_end StartObjectImageAnim
 
 	thumb_func_start StartObjectImageAnimIfDifferent
-; void StartObjectImageAnimIfDifferent(struct obj *object, u8 whichAnim)
-StartObjectImageAnimIfDifferent: ; 80081C0
+@ void StartObjectImageAnimIfDifferent(struct obj *object, u8 whichAnim)
+StartObjectImageAnimIfDifferent: @ 80081C0
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -3300,8 +3300,8 @@ _080081D6:
 	thumb_func_end StartObjectImageAnimIfDifferent
 
 	thumb_func_start SeekObjectImageAnim
-; void SeekObjectImageAnim(struct obj *object, u8 cmdIndex)
-SeekObjectImageAnim: ; 80081DC
+@ void SeekObjectImageAnim(struct obj *object, u8 cmdIndex)
+SeekObjectImageAnim: @ 80081DC
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -3366,8 +3366,8 @@ _08008244:
 	thumb_func_end SeekObjectImageAnim
 
 	thumb_func_start StartObjectRotScalAnim
-; void StartObjectRotScalAnim(struct obj *object, u8 whichAnim)
-StartObjectRotScalAnim: ; 8008258
+@ void StartObjectRotScalAnim(struct obj *object, u8 whichAnim)
+StartObjectRotScalAnim: @ 8008258
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -3391,8 +3391,8 @@ StartObjectRotScalAnim: ; 8008258
 	thumb_func_end StartObjectRotScalAnim
 
 	thumb_func_start StartObjectRotScalAnimIfDifferent
-; void StartObjectRotScalAnimIfDifferent(struct obj *object, u8 whichAnim)
-StartObjectRotScalAnimIfDifferent: ; 8008284
+@ void StartObjectRotScalAnimIfDifferent(struct obj *object, u8 whichAnim)
+StartObjectRotScalAnimIfDifferent: @ 8008284
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -3419,7 +3419,7 @@ _080082AC:
 	thumb_func_end StartObjectRotScalAnimIfDifferent
 
 	thumb_func_start sub_80082B8
-sub_80082B8: ; 80082B8
+sub_80082B8: @ 80082B8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
@@ -3448,7 +3448,7 @@ sub_80082B8: ; 80082B8
 	thumb_func_end sub_80082B8
 
 	thumb_func_start sub_80082F0
-sub_80082F0: ; 80082F0
+sub_80082F0: @ 80082F0
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -3475,7 +3475,7 @@ _08008318:
 	thumb_func_end sub_80082F0
 
 	thumb_func_start sub_8008324
-sub_8008324: ; 8008324
+sub_8008324: @ 8008324
 	push {lr}
 	adds r3, r0, 0
 	adds r0, 0x3F
@@ -3522,8 +3522,8 @@ _08008370:
 	thumb_func_end sub_8008324
 
 	thumb_func_start rotscale_reset_all
-; void rotscale_reset_all()
-rotscale_reset_all: ; 800837C
+@ void rotscale_reset_all()
+rotscale_reset_all: @ 800837C
 	push {r4,lr}
 	ldr r1, =0x02021cc0
 	movs r0, 0
@@ -3548,8 +3548,8 @@ _08008390:
 	thumb_func_end rotscale_reset_all
 
 	thumb_func_start rotscale_alloc_entry
-; u8 rotscale_alloc_entry()
-rotscale_alloc_entry: ; 80083B0
+@ u8 rotscale_alloc_entry()
+rotscale_alloc_entry: @ 80083B0
 	push {r4,lr}
 	movs r2, 0
 	movs r1, 0x1
@@ -3582,8 +3582,8 @@ _080083E2:
 	thumb_func_end rotscale_alloc_entry
 
 	thumb_func_start rotscale_free_entry
-; void rotscale_free_entry(u8 rotscale_index)
-rotscale_free_entry: ; 80083E8
+@ void rotscale_free_entry(u8 rotscale_index)
+rotscale_free_entry: @ 80083E8
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -3618,8 +3618,8 @@ _08008406:
 	thumb_func_end rotscale_free_entry
 
 	thumb_func_start obj_alloc_rotscale_entry
-; void obj_alloc_rotscale_entry(struct obj *obj)
-obj_alloc_rotscale_entry: ; 8008428
+@ void obj_alloc_rotscale_entry(struct obj *obj)
+obj_alloc_rotscale_entry: @ 8008428
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	bl rotscale_alloc_entry
@@ -3660,7 +3660,7 @@ _08008470:
 	thumb_func_end obj_alloc_rotscale_entry
 
 	thumb_func_start sub_8008478
-sub_8008478: ; 8008478
+sub_8008478: @ 8008478
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -3721,8 +3721,8 @@ sub_8008478: ; 8008478
 	thumb_func_end sub_8008478
 
 	thumb_func_start LoadObjectPic
-; u16 LoadObjectPic(struct obj_tiles *pic)
-LoadObjectPic: ; 80084F8
+@ u16 LoadObjectPic(struct obj_tiles *pic)
+LoadObjectPic: @ 80084F8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x4]
@@ -3757,8 +3757,8 @@ _08008536:
 	thumb_func_end LoadObjectPic
 
 	thumb_func_start LoadObjectPics
-; void LoadObjectPics(struct obj_tiles *pics)
-LoadObjectPics: ; 800853C
+@ void LoadObjectPics(struct obj_tiles *pics)
+LoadObjectPics: @ 800853C
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -3784,8 +3784,8 @@ _08008560:
 	thumb_func_end LoadObjectPics
 
 	thumb_func_start FreeObjectTilesByTag
-; void FreeObjectTilesByTag(u16 tag)
-FreeObjectTilesByTag: ; 8008568
+@ void FreeObjectTilesByTag(u16 tag)
+FreeObjectTilesByTag: @ 8008568
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3844,8 +3844,8 @@ _080085C6:
 	thumb_func_end FreeObjectTilesByTag
 
 	thumb_func_start FreeAllObjectTiles
-; void FreeAllObjectTiles()
-FreeAllObjectTiles: ; 80085E0
+@ void FreeAllObjectTiles()
+FreeAllObjectTiles: @ 80085E0
 	push {r4-r7,lr}
 	movs r2, 0
 	ldr r7, =0x030009f0
@@ -3877,8 +3877,8 @@ _080085F0:
 	thumb_func_end FreeAllObjectTiles
 
 	thumb_func_start GetObjectTileRangeStartByTag
-; u16 GetObjectTileRangeStartByTag(u16 tag)
-GetObjectTileRangeStartByTag: ; 8008620
+@ u16 GetObjectTileRangeStartByTag(u16 tag)
+GetObjectTileRangeStartByTag: @ 8008620
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -3902,8 +3902,8 @@ _08008642:
 	thumb_func_end GetObjectTileRangeStartByTag
 
 	thumb_func_start IndexOfObjectTilesTag
-; u8 IndexOfObjectTilesTag(u16 tag)
-IndexOfObjectTilesTag: ; 800864C
+@ u8 IndexOfObjectTilesTag(u16 tag)
+IndexOfObjectTilesTag: @ 800864C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -3931,8 +3931,8 @@ _08008674:
 	thumb_func_end IndexOfObjectTilesTag
 
 	thumb_func_start GetTagByObjectTileRangeStart
-; u16 GetTagByObjectTileRangeStart(u16 rangeStart)
-GetTagByObjectTileRangeStart: ; 8008678
+@ u16 GetTagByObjectTileRangeStart(u16 rangeStart)
+GetTagByObjectTileRangeStart: @ 8008678
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -3969,8 +3969,8 @@ _080086B8:
 	thumb_func_end GetTagByObjectTileRangeStart
 
 	thumb_func_start AddObjectTileRange
-; void AddObjectTileRange(u16 tag, u16 start, u16 count)
-AddObjectTileRange: ; 80086C4
+@ void AddObjectTileRange(u16 tag, u16 start, u16 count)
+AddObjectTileRange: @ 80086C4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -4003,8 +4003,8 @@ AddObjectTileRange: ; 80086C4
 	thumb_func_end AddObjectTileRange
 
 	thumb_func_start ResetObjectPaletteAllocator
-; void ResetObjectPaletteAllocator()
-ResetObjectPaletteAllocator: ; 800870C
+@ void ResetObjectPaletteAllocator()
+ResetObjectPaletteAllocator: @ 800870C
 	push {r4,lr}
 	ldr r1, =0x0300301c
 	movs r0, 0
@@ -4031,8 +4031,8 @@ _0800871C:
 	thumb_func_end ResetObjectPaletteAllocator
 
 	thumb_func_start LoadTaggedObjectPalette
-; u8 LoadTaggedObjectPalette(struct TaggedObjectPalette *palette)
-LoadTaggedObjectPalette: ; 8008744
+@ u8 LoadTaggedObjectPalette(struct TaggedObjectPalette *palette)
+LoadTaggedObjectPalette: @ 8008744
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r0, [r5, 0x4]
@@ -4070,8 +4070,8 @@ _0800878A:
 	thumb_func_end LoadTaggedObjectPalette
 
 	thumb_func_start LoadTaggedObjectPalettes
-; void LoadTaggedObjectPalettes(struct TaggedObjectPalette *palettes)
-LoadTaggedObjectPalettes: ; 8008790
+@ void LoadTaggedObjectPalettes(struct TaggedObjectPalette *palettes)
+LoadTaggedObjectPalettes: @ 8008790
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -4099,8 +4099,8 @@ _080087B6:
 	thumb_func_end LoadTaggedObjectPalettes
 
 	thumb_func_start LoadObjectPalette
-; void LoadObjectPalette(void *src, u16 destOffset)
-LoadObjectPalette: ; 80087BC
+@ void LoadObjectPalette(void *src, u16 destOffset)
+LoadObjectPalette: @ 80087BC
 	push {lr}
 	lsls r1, 16
 	movs r2, 0x80
@@ -4114,8 +4114,8 @@ LoadObjectPalette: ; 80087BC
 	thumb_func_end LoadObjectPalette
 
 	thumb_func_start AllocObjectPalette
-; u8 AllocObjectPalette(u16 tag)
-AllocObjectPalette: ; 80087D4
+@ u8 AllocObjectPalette(u16 tag)
+AllocObjectPalette: @ 80087D4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -4141,8 +4141,8 @@ _080087FE:
 	thumb_func_end AllocObjectPalette
 
 	thumb_func_start IndexOfObjectPaletteTag
-; u8 IndexOfObjectPaletteTag(u16 tag)
-IndexOfObjectPaletteTag: ; 8008804
+@ u8 IndexOfObjectPaletteTag(u16 tag)
+IndexOfObjectPaletteTag: @ 8008804
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4174,8 +4174,8 @@ _08008838:
 	thumb_func_end IndexOfObjectPaletteTag
 
 	thumb_func_start GetObjectPaletteTagBySlot
-; u16 GetObjectPaletteTagBySlot(u8 paletteSlot)
-GetObjectPaletteTagBySlot: ; 800883C
+@ u16 GetObjectPaletteTagBySlot(u8 paletteSlot)
+GetObjectPaletteTagBySlot: @ 800883C
 	lsls r0, 24
 	ldr r1, =0x03000cf0
 	lsrs r0, 23
@@ -4186,8 +4186,8 @@ GetObjectPaletteTagBySlot: ; 800883C
 	thumb_func_end GetObjectPaletteTagBySlot
 
 	thumb_func_start FreeObjectPaletteByTag
-; void FreeObjectPaletteByTag(int tag)
-FreeObjectPaletteByTag: ; 800884C
+@ void FreeObjectPaletteByTag(int tag)
+FreeObjectPaletteByTag: @ 800884C
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -4208,8 +4208,8 @@ _08008868:
 	thumb_func_end FreeObjectPaletteByTag
 
 	thumb_func_start SetSpriteOamTables_NoPriorityFromTable
-; void SetSpriteOamTables_NoPriorityFromTable(struct obj *object, u32 spriteOamTables)
-SetSpriteOamTables_NoPriorityFromTable: ; 8008874
+@ void SetSpriteOamTables_NoPriorityFromTable(struct obj *object, u32 spriteOamTables)
+SetSpriteOamTables_NoPriorityFromTable: @ 8008874
 	str r1, [r0, 0x18]
 	adds r0, 0x42
 	movs r1, 0x40
@@ -4218,8 +4218,8 @@ SetSpriteOamTables_NoPriorityFromTable: ; 8008874
 	thumb_func_end SetSpriteOamTables_NoPriorityFromTable
 
 	thumb_func_start AddSprite
-; u8 AddSprite(struct obj *obj, u8 *spriteIndex)
-AddSprite: ; 8008880
+@ u8 AddSprite(struct obj *obj, u8 *spriteIndex)
+AddSprite: @ 8008880
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -4276,8 +4276,8 @@ _080088E0:
 	thumb_func_end AddSprite
 
 	thumb_func_start AddSpritesFromSpriteOamTable
-; u8 AddSpritesFromSpriteOamTable(struct obj *object, struct sprite *sprite, u8 *spriteIndex)
-AddSpritesFromSpriteOamTable: ; 80088EC
+@ u8 AddSpritesFromSpriteOamTable(struct obj *object, struct sprite *sprite, u8 *spriteIndex)
+AddSpritesFromSpriteOamTable: @ 80088EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
diff --git a/asm/libagbbackup.s b/asm/libagbbackup.s
index 7691280a8..e5a48a721 100644
--- a/asm/libagbbackup.s
+++ b/asm/libagbbackup.s
@@ -1,5 +1,5 @@
 	thumb_func_start SwitchFlashBank
-SwitchFlashBank: ; 82E185C
+SwitchFlashBank: @ 82E185C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x0e005555
@@ -18,8 +18,8 @@ SwitchFlashBank: ; 82E185C
 	thumb_func_end SwitchFlashBank
 
 	thumb_func_start ReadFlashID
-; u16 ReadFlashID()
-ReadFlashID: ; 82E1880
+@ u16 ReadFlashID()
+ReadFlashID: @ 82E1880
 	push {r4,r5,lr}
 	sub sp, 0x44
 	mov r0, sp
@@ -87,8 +87,8 @@ _082E1908:
 	thumb_func_end ReadFlashID
 
 	thumb_func_start FlashTimerIntr
-; void FlashTimerIntr()
-FlashTimerIntr: ; 82E191C
+@ void FlashTimerIntr()
+FlashTimerIntr: @ 82E191C
 	push {lr}
 	ldr r1, =0x03001a72
 	ldrh r0, [r1]
@@ -110,8 +110,8 @@ _082E1938:
 	thumb_func_end FlashTimerIntr
 
 	thumb_func_start SetFlashTimerIntr
-; void SetFlashTimerIntr(u8 timer_id, void ( **irq_timer_func)())
-SetFlashTimerIntr: ; 82E1944
+@ void SetFlashTimerIntr(u8 timer_id, void ( **irq_timer_func)())
+SetFlashTimerIntr: @ 82E1944
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -139,7 +139,7 @@ _082E197A:
 	thumb_func_end SetFlashTimerIntr
 
 	thumb_func_start StartFlashTimer
-StartFlashTimer: ; 82E1980
+StartFlashTimer: @ 82E1980
 	push {r4-r6,lr}
 	mov r6, r10
 	mov r5, r9
@@ -209,7 +209,7 @@ StartFlashTimer: ; 82E1980
 	thumb_func_end StartFlashTimer
 
 	thumb_func_start StopFlashTimer
-StopFlashTimer: ; 82E1A28
+StopFlashTimer: @ 82E1A28
 	ldr r3, =0x04000208
 	movs r1, 0
 	strh r1, [r3]
@@ -237,15 +237,15 @@ StopFlashTimer: ; 82E1A28
 	thumb_func_end StopFlashTimer
 
 	thumb_func_start ReadFlash1
-; u8 ReadFlash1(int address)
-ReadFlash1: ; 82E1A6C
+@ u8 ReadFlash1(int address)
+ReadFlash1: @ 82E1A6C
 	ldrb r0, [r0]
 	bx lr
 	thumb_func_end ReadFlash1
 
 	thumb_func_start SetReadFlash1
-; void SetReadFlash1(u8 ( *target_func)(int address))
-SetReadFlash1: ; 82E1A70
+@ void SetReadFlash1(u8 ( *target_func)(int address))
+SetReadFlash1: @ 82E1A70
 	push {lr}
 	adds r2, r0, 0
 	ldr r1, =0x03007844
@@ -276,7 +276,7 @@ _082E1AA4:
 	thumb_func_end SetReadFlash1
 
 	thumb_func_start ReadFlash_Core
-ReadFlash_Core: ; 82E1AB0
+ReadFlash_Core: @ 82E1AB0
 	push {r4,lr}
 	adds r4, r0, 0
 	subs r3, r2, 0x1
@@ -299,7 +299,7 @@ _082E1ACC:
 	thumb_func_end ReadFlash_Core
 
 	thumb_func_start ReadFlash
-ReadFlash: ; 82E1AD4
+ReadFlash: @ 82E1AD4
 	push {r4-r7,lr}
 	sub sp, 0x80
 	adds r5, r1, 0
@@ -371,7 +371,7 @@ _082E1B40:
 	thumb_func_end ReadFlash
 
 	thumb_func_start VerifyFlashSector_Core
-VerifyFlashSector_Core: ; 82E1B70
+VerifyFlashSector_Core: @ 82E1B70
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r3, r1, 0
@@ -402,7 +402,7 @@ _082E1B98:
 	thumb_func_end VerifyFlashSector_Core
 
 	thumb_func_start VerifyFlashSector
-VerifyFlashSector: ; 82E1BA0
+VerifyFlashSector: @ 82E1BA0
 	push {r4,r5,lr}
 	sub sp, 0x100
 	adds r5, r1, 0
@@ -471,7 +471,7 @@ _082E1C08:
 	thumb_func_end VerifyFlashSector
 
 	thumb_func_start VerifyFlashSectorFirstNBytes
-VerifyFlashSectorFirstNBytes: ; 82E1C38
+VerifyFlashSectorFirstNBytes: @ 82E1C38
 	push {r4-r6,lr}
 	sub sp, 0x100
 	adds r5, r1, 0
@@ -541,7 +541,7 @@ _082E1CA0:
 	thumb_func_end VerifyFlashSectorFirstNBytes
 
 	thumb_func_start ProgramFlashSectorsAndVerify
-ProgramFlashSectorsAndVerify: ; 82E1CD0
+ProgramFlashSectorsAndVerify: @ 82E1CD0
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -579,7 +579,7 @@ _082E1D08:
 	thumb_func_end ProgramFlashSectorsAndVerify
 
 	thumb_func_start ProgramFlashSectorsVerifyFirstNBytes
-ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14
+ProgramFlashSectorsVerifyFirstNBytes: @ 82E1D14
 	push {r4-r7,lr}
 	adds r5, r1, 0
 	adds r7, r2, 0
@@ -619,8 +619,8 @@ _082E1D50:
 	thumb_func_end ProgramFlashSectorsVerifyFirstNBytes
 
 	thumb_func_start IdentifyFlash
-; _BOOL2 IdentifyFlash()
-IdentifyFlash: ; 82E1D5C
+@ _BOOL2 IdentifyFlash()
+IdentifyFlash: @ 82E1D5C
 	push {r4,lr}
 	ldr r2, =0x04000204
 	ldrh r0, [r2]
@@ -686,7 +686,7 @@ _082E1D9E:
 	thumb_func_end IdentifyFlash
 
 	thumb_func_start PollingSR_COMMON
-PollingSR_COMMON: ; 82E1DFC
+PollingSR_COMMON: @ 82E1DFC
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -765,7 +765,7 @@ _082E1E88:
 	thumb_func_end PollingSR_COMMON
 
 	thumb_func_start EraseFlashChip
-EraseFlashChip: ; 82E1E9C
+EraseFlashChip: @ 82E1E9C
 	push {r4-r6,lr}
 	sub sp, 0x40
 	ldr r5, =0x04000204
@@ -813,7 +813,7 @@ EraseFlashChip: ; 82E1E9C
 	thumb_func_end EraseFlashChip
 
 	thumb_func_start EraseFlashSector
-EraseFlashSector: ; 82E1F10
+EraseFlashSector: @ 82E1F10
 	push {r4-r7,lr}
 	sub sp, 0x40
 	lsls r0, 16
@@ -903,7 +903,7 @@ _082E1FD0:
 	thumb_func_end EraseFlashSector
 
 	thumb_func_start ProgramFlashByte
-ProgramFlashByte: ; 82E1FE0
+ProgramFlashByte: @ 82E1FE0
 	push {r4-r7,lr}
 	sub sp, 0x40
 	adds r6, r1, 0
@@ -969,7 +969,7 @@ _082E206C:
 	thumb_func_end ProgramFlashByte
 
 	thumb_func_start ProgramFlashByteInternal
-ProgramFlashByteInternal: ; 82E2074
+ProgramFlashByteInternal: @ 82E2074
 	push {r4,lr}
 	ldr r4, =0x0e005555
 	movs r2, 0xAA
@@ -995,7 +995,7 @@ ProgramFlashByteInternal: ; 82E2074
 	thumb_func_end ProgramFlashByteInternal
 
 	thumb_func_start ProgramFlashSector
-ProgramFlashSector: ; 82E20AC
+ProgramFlashSector: @ 82E20AC
 	push {r4-r7,lr}
 	sub sp, 0x40
 	adds r7, r1, 0
diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s
index a0a232be6..cdfc70350 100644
--- a/asm/libagbsyscall.s
+++ b/asm/libagbsyscall.s
@@ -1,86 +1,86 @@
 	thumb_func_start ArcTan2
-ArcTan2: ; 82E7078
+ArcTan2: @ 82E7078
 	swi 0xA
 	bx lr
 	thumb_func_end ArcTan2
 
 	thumb_func_start BgAffineSet
-; void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count)
-BgAffineSet: ; 82E707C
+@ void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count)
+BgAffineSet: @ 82E707C
 	swi 0xE
 	bx lr
 	thumb_func_end BgAffineSet
 
 	thumb_func_start CpuFastSet
-; void CpuFastSet(void *src, void *dest, unsigned int mode)
-CpuFastSet: ; 82E7080
+@ void CpuFastSet(void *src, void *dest, unsigned int mode)
+CpuFastSet: @ 82E7080
 	swi 0xC
 	bx lr
 	thumb_func_end CpuFastSet
 
 	thumb_func_start CpuSet
-; void CpuSet(void *src, void *dest, unsigned int mode)
-CpuSet: ; 82E7084
+@ void CpuSet(void *src, void *dest, unsigned int mode)
+CpuSet: @ 82E7084
 	swi 0xB
 	bx lr
 	thumb_func_end CpuSet
 
 	thumb_func_start Div
-Div: ; 82E7088
+Div: @ 82E7088
 	swi 0x6
 	bx lr
 	thumb_func_end Div
 
 	thumb_func_start LZ77UnCompVram
-; void LZ77UnCompVram(void *src, void *dest)
-LZ77UnCompVram: ; 82E708C
+@ void LZ77UnCompVram(void *src, void *dest)
+LZ77UnCompVram: @ 82E708C
 	swi 0x12
 	bx lr
 	thumb_func_end LZ77UnCompVram
 
 	thumb_func_start LZ77UnCompWram
-; void LZ77UnCompWram(void *src, void *dest)
-LZ77UnCompWram: ; 82E7090
+@ void LZ77UnCompWram(void *src, void *dest)
+LZ77UnCompWram: @ 82E7090
 	swi 0x11
 	bx lr
 	thumb_func_end LZ77UnCompWram
 
 	thumb_func_start MultiBoot
-; s32 MultiBoot(struct MultiBootParam *mp)
-MultiBoot: ; 82E7094
+@ s32 MultiBoot(struct MultiBootParam *mp)
+MultiBoot: @ 82E7094
 	movs r1, 0x1
 	swi 0x25
 	bx lr
 	thumb_func_end MultiBoot
 
 	thumb_func_start ObjAffineSet
-ObjAffineSet: ; 82E709C
+ObjAffineSet: @ 82E709C
 	swi 0xF
 	bx lr
 	thumb_func_end ObjAffineSet
 
 	thumb_func_start RLUnCompVram
-RLUnCompVram: ; 82E70A0
+RLUnCompVram: @ 82E70A0
 	swi 0x15
 	bx lr
 	thumb_func_end RLUnCompVram
 
 	thumb_func_start RLUnCompWram
-RLUnCompWram: ; 82E70A4
+RLUnCompWram: @ 82E70A4
 	swi 0x14
 	bx lr
 	thumb_func_end RLUnCompWram
 
 	thumb_func_start RegisterRamReset
-; void RegisterRamReset(int ResetFlags)
-RegisterRamReset: ; 82E70A8
+@ void RegisterRamReset(int ResetFlags)
+RegisterRamReset: @ 82E70A8
 	swi 0x1
 	bx lr
 	thumb_func_end RegisterRamReset
 
 	thumb_func_start SoftReset
-; void SoftReset()
-SoftReset: ; 82E70AC
+@ void SoftReset()
+SoftReset: @ 82E70AC
 	ldr r3, =0x04000208
 	movs r2, 0
 	strb r2, [r3]
@@ -92,15 +92,15 @@ SoftReset: ; 82E70AC
 	thumb_func_end SoftReset
 
 	thumb_func_start Sqrt
-; s16 Sqrt(int)
-Sqrt: ; 82E70C4
+@ s16 Sqrt(int)
+Sqrt: @ 82E70C4
 	swi 0x8
 	bx lr
 	thumb_func_end Sqrt
 
 	thumb_func_start VBlankIntrWait
-; void VBlankIntrWait()
-VBlankIntrWait: ; 82E70C8
+@ void VBlankIntrWait()
+VBlankIntrWait: @ 82E70C8
 	movs r2, 0
 	swi 0x5
 	bx lr
diff --git a/asm/libgcc.s b/asm/libgcc.s
index acc95a5d1..5d779662a 100644
--- a/asm/libgcc.s
+++ b/asm/libgcc.s
@@ -1,95 +1,95 @@
 	thumb_func_start _call_via_r0
-_call_via_r0: ; 82E70D0
+_call_via_r0: @ 82E70D0
 	bx r0
 	mov r8, r8
 	thumb_func_end _call_via_r0
 
 	thumb_func_start _call_via_r1
-_call_via_r1: ; 82E70D4
+_call_via_r1: @ 82E70D4
 	bx r1
 	mov r8, r8
 	thumb_func_end _call_via_r1
 
 	thumb_func_start _call_via_r2
-_call_via_r2: ; 82E70D8
+_call_via_r2: @ 82E70D8
 	bx r2
 	mov r8, r8
 	thumb_func_end _call_via_r2
 
 	thumb_func_start _call_via_r3
-_call_via_r3: ; 82E70DC
+_call_via_r3: @ 82E70DC
 	bx r3
 	mov r8, r8
 	thumb_func_end _call_via_r3
 
 	thumb_func_start _call_via_r4
-_call_via_r4: ; 82E70E0
+_call_via_r4: @ 82E70E0
 	bx r4
 	mov r8, r8
 	thumb_func_end _call_via_r4
 
 	thumb_func_start _call_via_r5
-_call_via_r5: ; 82E70E4
+_call_via_r5: @ 82E70E4
 	bx r5
 	mov r8, r8
 	thumb_func_end _call_via_r5
 
 	thumb_func_start _call_via_r6
-_call_via_r6: ; 82E70E8
+_call_via_r6: @ 82E70E8
 	bx r6
 	mov r8, r8
 	thumb_func_end _call_via_r6
 
 	thumb_func_start _call_via_r7
-_call_via_r7: ; 82E70EC
+_call_via_r7: @ 82E70EC
 	bx r7
 	mov r8, r8
 	thumb_func_end _call_via_r7
 
 	thumb_func_start _call_via_r8
-_call_via_r8: ; 82E70F0
+_call_via_r8: @ 82E70F0
 	bx r8
 	mov r8, r8
 	thumb_func_end _call_via_r8
 
 	thumb_func_start _call_via_r9
-_call_via_r9: ; 82E70F4
+_call_via_r9: @ 82E70F4
 	bx r9
 	mov r8, r8
 	thumb_func_end _call_via_r9
 
 	thumb_func_start _call_via_sl
-_call_via_sl: ; 82E70F8
+_call_via_sl: @ 82E70F8
 	bx r10
 	mov r8, r8
 	thumb_func_end _call_via_sl
 
 	thumb_func_start _call_via_fp
-_call_via_fp: ; 82E70FC
+_call_via_fp: @ 82E70FC
 	bx r11
 	mov r8, r8
 	thumb_func_end _call_via_fp
 
 	thumb_func_start _call_via_ip
-_call_via_ip: ; 82E7100
+_call_via_ip: @ 82E7100
 	bx r12
 	mov r8, r8
 	thumb_func_end _call_via_ip
 
 	thumb_func_start _call_via_sp
-_call_via_sp: ; 82E7104
+_call_via_sp: @ 82E7104
 	bx sp
 	mov r8, r8
 	thumb_func_end _call_via_sp
 
 	thumb_func_start _call_via_lr
-_call_via_lr: ; 82E7108
+_call_via_lr: @ 82E7108
 	bx lr
 	mov r8, r8
 	thumb_func_end _call_via_lr
 
 	thumb_func_start __divdi3
-__divdi3: ; 82E710C
+__divdi3: @ 82E710C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -643,8 +643,8 @@ _082E753C: .4byte 0x0000ffff
 	thumb_func_end __divdi3
 
 	thumb_func_start __divsi3
-; int __divsi3(int dividend, int divisor)
-__divsi3: ; 82E7540
+@ int __divsi3(int dividend, int divisor)
+__divsi3: @ 82E7540
 	cmp r1, 0
 	beq _082E75C8
 	push {r4}
@@ -733,12 +733,12 @@ _082E75C8:
 	thumb_func_end __divsi3
 
 	thumb_func_start nullsub_1
-nullsub_1: ; 82E75D4
+nullsub_1: @ 82E75D4
 	mov pc, lr
 	thumb_func_end nullsub_1
 
 	thumb_func_start __fixunsdfsi
-__fixunsdfsi: ; 82E75D8
+__fixunsdfsi: @ 82E75D8
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r0, 0
@@ -772,7 +772,7 @@ _082E7618: .4byte 0x00000000
 	thumb_func_end __fixunsdfsi
 
 	thumb_func_start __fixunssfsi
-__fixunssfsi: ; 82E761C
+__fixunssfsi: @ 82E761C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r1, _082E7634
@@ -799,7 +799,7 @@ _082E764C: .4byte 0xcf000000
 	thumb_func_end __fixunssfsi
 
 	thumb_func_start __modsi3
-__modsi3: ; 82E7650
+__modsi3: @ 82E7650
 	movs r3, 0x1
 	cmp r1, 0
 	beq _082E7714
@@ -921,7 +921,7 @@ _082E7714:
 	thumb_func_end __modsi3
 
 	thumb_func_start __muldi3
-__muldi3: ; 82E7720
+__muldi3: @ 82E7720
 	push {r4-r7,lr}
 	sub sp, 0x10
 	str r0, [sp]
@@ -982,7 +982,7 @@ _082E778C: .4byte 0x0000ffff
 	thumb_func_end __muldi3
 
 	thumb_func_start __udivdi3
-__udivdi3: ; 82E7790
+__udivdi3: @ 82E7790
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1485,8 +1485,8 @@ _082E7B64: .4byte 0x0000ffff
 	thumb_func_end __udivdi3
 
 	thumb_func_start __udivsi3
-; unsigned int __udivsi3(unsigned int dividend, unsigned int divisor)
-__udivsi3: ; 82E7B68
+@ unsigned int __udivsi3(unsigned int dividend, unsigned int divisor)
+__udivsi3: @ 82E7B68
 	cmp r1, 0
 	beq _082E7BD6
 	movs r3, 0x1
@@ -1559,8 +1559,8 @@ _082E7BD6:
 	thumb_func_end __udivsi3
 
 	thumb_func_start __umodsi3
-; unsigned int __umodsi3(unsigned int dividend, unsigned int divisor)
-__umodsi3: ; 82E7BE0
+@ unsigned int __umodsi3(unsigned int dividend, unsigned int divisor)
+__umodsi3: @ 82E7BE0
 	cmp r1, 0
 	beq _082E7C96
 	movs r3, 0x1
@@ -1674,7 +1674,7 @@ _082E7C96:
 	thumb_func_end __umodsi3
 
 	thumb_func_start __pack_d
-__pack_d: ; 82E7CA0
+__pack_d: @ 82E7CA0
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r1, r0, 0
@@ -1847,7 +1847,7 @@ _082E7DE4: .4byte 0xffff800f
 	thumb_func_end __pack_d
 
 	thumb_func_start __unpack_d
-__unpack_d: ; 82E7DE8
+__unpack_d: @ 82E7DE8
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r2, r0, 0
@@ -1963,7 +1963,7 @@ _082E7EBC: .4byte 0x10000000
 	thumb_func_end __unpack_d
 
 	thumb_func_start __fpadd_parts_d
-__fpadd_parts_d: ; 82E7EC0
+__fpadd_parts_d: @ 82E7EC0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2305,8 +2305,8 @@ _082E8128: .4byte 0x1fffffff
 	thumb_func_end __fpadd_parts_d
 
 	thumb_func_start __adddf3
-; double __adddf3(double arg_a, double arg_b)
-__adddf3: ; 82E812C
+@ double __adddf3(double arg_a, double arg_b)
+__adddf3: @ 82E812C
 	push {r4,lr}
 	sub sp, 0x4C
 	str r0, [sp, 0x3C]
@@ -2330,7 +2330,7 @@ __adddf3: ; 82E812C
 	thumb_func_end __adddf3
 
 	thumb_func_start __subdf3
-__subdf3: ; 82E815C
+__subdf3: @ 82E815C
 	push {r4,lr}
 	sub sp, 0x4C
 	str r0, [sp, 0x3C]
@@ -2358,7 +2358,7 @@ __subdf3: ; 82E815C
 	thumb_func_end __subdf3
 
 	thumb_func_start __muldf3
-__muldf3: ; 82E8194
+__muldf3: @ 82E8194
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2720,7 +2720,7 @@ _082E8438: .4byte 0x0fffffff
 	thumb_func_end __muldf3
 
 	thumb_func_start __divdf3
-__divdf3: ; 82E843C
+__divdf3: @ 82E843C
 	push {r4-r7,lr}
 	sub sp, 0x48
 	str r0, [sp, 0x28]
@@ -2937,7 +2937,7 @@ _082E85C0: .4byte 0x10000000
 	thumb_func_end __divdf3
 
 	thumb_func_start __fpcmp_parts_d
-__fpcmp_parts_d: ; 82E85C4
+__fpcmp_parts_d: @ 82E85C4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -3094,7 +3094,7 @@ _082E86C0:
 	thumb_func_end __fpcmp_parts_d
 
 	thumb_func_start __cmpdf2
-__cmpdf2: ; 82E86C4
+__cmpdf2: @ 82E86C4
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3116,7 +3116,7 @@ __cmpdf2: ; 82E86C4
 	thumb_func_end __cmpdf2
 
 	thumb_func_start __eqdf2
-__eqdf2: ; 82E86F0
+__eqdf2: @ 82E86F0
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3159,7 +3159,7 @@ _082E8736:
 	thumb_func_end __eqdf2
 
 	thumb_func_start __nedf2
-__nedf2: ; 82E873C
+__nedf2: @ 82E873C
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3202,7 +3202,7 @@ _082E8782:
 	thumb_func_end __nedf2
 
 	thumb_func_start __gtdf2
-__gtdf2: ; 82E8788
+__gtdf2: @ 82E8788
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3246,8 +3246,8 @@ _082E87D0:
 	thumb_func_end __gtdf2
 
 	thumb_func_start __gedf2
-; int __gedf2(double arg_a, double arg_b)
-__gedf2: ; 82E87D4
+@ int __gedf2(double arg_a, double arg_b)
+__gedf2: @ 82E87D4
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3291,7 +3291,7 @@ _082E881C:
 	thumb_func_end __gedf2
 
 	thumb_func_start __ltdf2
-__ltdf2: ; 82E8820
+__ltdf2: @ 82E8820
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3334,7 +3334,7 @@ _082E8866:
 	thumb_func_end __ltdf2
 
 	thumb_func_start __ledf2
-__ledf2: ; 82E886C
+__ledf2: @ 82E886C
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x28]
@@ -3377,7 +3377,7 @@ _082E88B2:
 	thumb_func_end __ledf2
 
 	thumb_func_start __floatsidf
-__floatsidf: ; 82E88B8
+__floatsidf: @ 82E88B8
 	push {r4,r5,lr}
 	sub sp, 0x14
 	adds r2, r0, 0
@@ -3447,8 +3447,8 @@ _082E8930: .4byte 0x0fffffff
 	thumb_func_end __floatsidf
 
 	thumb_func_start __fixdfsi
-; int __fixdfsi(double arg_a)
-__fixdfsi: ; 82E8934
+@ int __fixdfsi(double arg_a)
+__fixdfsi: @ 82E8934
 	push {lr}
 	sub sp, 0x1C
 	str r0, [sp, 0x14]
@@ -3515,7 +3515,7 @@ _082E89A2:
 	thumb_func_end __fixdfsi
 
 	thumb_func_start __negdf2
-__negdf2: ; 82E89A8
+__negdf2: @ 82E89A8
 	push {lr}
 	sub sp, 0x1C
 	str r0, [sp, 0x14]
@@ -3537,7 +3537,7 @@ _082E89C2:
 	thumb_func_end __negdf2
 
 	thumb_func_start __make_dp
-__make_dp: ; 82E89D0
+__make_dp: @ 82E89D0
 	sub sp, 0x4
 	push {r4,lr}
 	sub sp, 0x14
@@ -3559,7 +3559,7 @@ __make_dp: ; 82E89D0
 	thumb_func_end __make_dp
 
 	thumb_func_start __truncdfsf2
-__truncdfsf2: ; 82E89F8
+__truncdfsf2: @ 82E89F8
 	push {r4,r5,lr}
 	sub sp, 0x1C
 	str r0, [sp, 0x14]
@@ -3596,7 +3596,7 @@ _082E8A38: .4byte 0x3fffffff
 	thumb_func_end __truncdfsf2
 
 	thumb_func_start __pack_f
-__pack_f: ; 82E8A3C
+__pack_f: @ 82E8A3C
 	push {r4-r6,lr}
 	ldr r2, [r0, 0xC]
 	ldr r6, [r0, 0x4]
@@ -3702,7 +3702,7 @@ _082E8AF0: .4byte 0x7fffffff
 	thumb_func_end __pack_f
 
 	thumb_func_start __unpack_f
-__unpack_f: ; 82E8AF4
+__unpack_f: @ 82E8AF4
 	push {r4,lr}
 	adds r3, r1, 0
 	ldr r0, [r0]
@@ -3775,7 +3775,7 @@ _082E8B6C:
 	thumb_func_end __unpack_f
 
 	thumb_func_start __fpadd_parts_f
-__fpadd_parts_f: ; 82E8B70
+__fpadd_parts_f: @ 82E8B70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3998,7 +3998,7 @@ _082E8CE4:
 	thumb_func_end __fpadd_parts_f
 
 	thumb_func_start __addsf3
-__addsf3: ; 82E8CEC
+__addsf3: @ 82E8CEC
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x30]
@@ -4020,7 +4020,7 @@ __addsf3: ; 82E8CEC
 	thumb_func_end __addsf3
 
 	thumb_func_start __subsf3
-__subsf3: ; 82E8D18
+__subsf3: @ 82E8D18
 	push {r4,lr}
 	sub sp, 0x38
 	str r0, [sp, 0x30]
@@ -4046,7 +4046,7 @@ __subsf3: ; 82E8D18
 	thumb_func_end __subsf3
 
 	thumb_func_start __mulsf3
-__mulsf3: ; 82E8D4C
+__mulsf3: @ 82E8D4C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -4249,7 +4249,7 @@ _082E8EAC: .4byte 0x3fffffff
 	thumb_func_end __mulsf3
 
 	thumb_func_start __divsf3
-__divsf3: ; 82E8EB0
+__divsf3: @ 82E8EB0
 	push {r4-r6,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4385,7 +4385,7 @@ _082E8F90:
 	thumb_func_end __divsf3
 
 	thumb_func_start __fpcmp_parts_f
-__fpcmp_parts_f: ; 82E8F9C
+__fpcmp_parts_f: @ 82E8F9C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -4528,7 +4528,7 @@ _082E907E:
 	thumb_func_end __fpcmp_parts_f
 
 	thumb_func_start __cmpsf2
-__cmpsf2: ; 82E9080
+__cmpsf2: @ 82E9080
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4548,7 +4548,7 @@ __cmpsf2: ; 82E9080
 	thumb_func_end __cmpsf2
 
 	thumb_func_start __eqsf2
-__eqsf2: ; 82E90A8
+__eqsf2: @ 82E90A8
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4589,7 +4589,7 @@ _082E90EA:
 	thumb_func_end __eqsf2
 
 	thumb_func_start __nesf2
-__nesf2: ; 82E90F0
+__nesf2: @ 82E90F0
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4630,7 +4630,7 @@ _082E9132:
 	thumb_func_end __nesf2
 
 	thumb_func_start __gtsf2
-__gtsf2: ; 82E9138
+__gtsf2: @ 82E9138
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4672,7 +4672,7 @@ _082E917C:
 	thumb_func_end __gtsf2
 
 	thumb_func_start __gesf2
-__gesf2: ; 82E9180
+__gesf2: @ 82E9180
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4714,7 +4714,7 @@ _082E91C4:
 	thumb_func_end __gesf2
 
 	thumb_func_start __ltsf2
-__ltsf2: ; 82E91C8
+__ltsf2: @ 82E91C8
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4755,7 +4755,7 @@ _082E920A:
 	thumb_func_end __ltsf2
 
 	thumb_func_start __lesf2
-__lesf2: ; 82E9210
+__lesf2: @ 82E9210
 	push {r4,lr}
 	sub sp, 0x28
 	str r0, [sp, 0x20]
@@ -4796,7 +4796,7 @@ _082E9252:
 	thumb_func_end __lesf2
 
 	thumb_func_start __floatsisf
-__floatsisf: ; 82E9258
+__floatsisf: @ 82E9258
 	push {lr}
 	sub sp, 0x10
 	adds r1, r0, 0
@@ -4853,7 +4853,7 @@ _082E92B4: .4byte 0x3fffffff
 	thumb_func_end __floatsisf
 
 	thumb_func_start __fixsfsi
-__fixsfsi: ; 82E92B8
+__fixsfsi: @ 82E92B8
 	push {lr}
 	sub sp, 0x14
 	str r0, [sp, 0x10]
@@ -4917,7 +4917,7 @@ _082E931C:
 	thumb_func_end __fixsfsi
 
 	thumb_func_start __negsf2
-__negsf2: ; 82E9320
+__negsf2: @ 82E9320
 	push {lr}
 	sub sp, 0x14
 	str r0, [sp, 0x10]
@@ -4938,7 +4938,7 @@ _082E9338:
 	thumb_func_end __negsf2
 
 	thumb_func_start __make_fp
-__make_fp: ; 82E9344
+__make_fp: @ 82E9344
 	push {lr}
 	sub sp, 0x10
 	str r0, [sp]
@@ -4952,7 +4952,7 @@ __make_fp: ; 82E9344
 	thumb_func_end __make_fp
 
 	thumb_func_start __extendsfdf2
-__extendsfdf2: ; 82E935C
+__extendsfdf2: @ 82E935C
 	push {r4-r6,lr}
 	sub sp, 0x18
 	str r0, [sp, 0x14]
@@ -4976,7 +4976,7 @@ __extendsfdf2: ; 82E935C
 	thumb_func_end __extendsfdf2
 
 	thumb_func_start __lshrdi3
-__lshrdi3: ; 82E9388
+__lshrdi3: @ 82E9388
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	adds r5, r0, 0
@@ -5008,7 +5008,7 @@ _082E93B8:
 	thumb_func_end __lshrdi3
 
 	thumb_func_start __negdi2
-__negdi2: ; 82E93BC
+__negdi2: @ 82E93BC
 	push {r4,lr}
 	negs r2, r0
 	adds r3, r2, 0
@@ -5024,8 +5024,8 @@ _082E93CA:
 	thumb_func_end __negdi2
 
 	thumb_func_start memcpy
-; void *memcpy(void *dest, void *src, int size)
-memcpy: ; 82E93D4
+@ void *memcpy(void *dest, void *src, int size)
+memcpy: @ 82E93D4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r5, 0
@@ -5082,8 +5082,8 @@ _082E942E:
 	thumb_func_end memcpy
 
 	thumb_func_start memset
-; void *memset(void *dest, char c, int size)
-memset: ; 82E9434
+@ void *memset(void *dest, char c, int size)
+memset: @ 82E9434
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -5133,8 +5133,8 @@ _082E947A:
 	thumb_func_end memset
 
 	thumb_func_start strcmp
-; int strcmp(char *s1, char *s2)
-strcmp: ; 82E9488
+@ int strcmp(char *s1, char *s2)
+strcmp: @ 82E9488
 	push {r4,r5,lr}
 	adds r2, r0, 0
 	adds r3, r1, 0
@@ -5188,7 +5188,7 @@ _082E94E0:
 	thumb_func_end strcmp
 
 	thumb_func_start strcat
-strcat: ; 82E94E4
+strcat: @ 82E94E4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r3, r6, 0
diff --git a/asm/libgcnmultiboot.s b/asm/libgcnmultiboot.s
index 08a61d9bf..e6d1b1eae 100644
--- a/asm/libgcnmultiboot.s
+++ b/asm/libgcnmultiboot.s
@@ -1,12 +1,12 @@
-; This library can be used to download and execute a multi-boot image from
-; a GameCube using the JOY Bus protocol over the link cable.
+@ This library can be used to download and execute a multi-boot image from
+@ a GameCube using the JOY Bus protocol over the link cable.
 
 	.set GCMB_STRUCT_BASE_DEST_PTR,       0x20
 	.set GCMB_STRUCT_CUR_DEST_PTR,        0x24
 	.set GCMB_STRUCT_SERIAL_INTR_HANDLER, 0x28
 
 	thumb_func_start GameCubeMultiBoot_Hash
-GameCubeMultiBoot_Hash: ; 82DED70
+GameCubeMultiBoot_Hash: @ 82DED70
 	push {r4,lr}
 	ldr r4, pool_HashVal
 	eors r3, r1
@@ -26,8 +26,8 @@ $skipEor:
 	thumb_func_end GameCubeMultiBoot_Hash
 
 	thumb_func_start GameCubeMultiBoot_Main
-; void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb);
-GameCubeMultiBoot_Main: ; 82DED84
+@ void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb);
+GameCubeMultiBoot_Main: @ 82DED84
 	ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
 	cmp r1, 0
 	beq _082DEDAA
@@ -166,13 +166,13 @@ _082DEE76:
 
 pool_HashVal: .4byte 0xa1c1
 
-pool_Kawa: .ascii "Kawa" ; name of BIOS developer
+pool_Kawa: .ascii "Kawa" @ name of BIOS developer
 
 pool_NintendoLogo: .4byte RomHeaderNintendoLogo
 
 	thumb_func_start GameCubeMultiBoot_ExecuteProgram
-; void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb);
-GameCubeMultiBoot_ExecuteProgram: ; 82DEE84
+@ void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb);
+GameCubeMultiBoot_ExecuteProgram: @ 82DEE84
 	ldrb r1, [r0, 0x2]
 	cmp r1, 0x2
 	bne $unableToExecute
@@ -187,20 +187,20 @@ $unableToExecute:
 	thumb_func_end GameCubeMultiBoot_ExecuteProgram
 
 	thumb_func_start GameCubeMultiBoot_Init
-; void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb);
-GameCubeMultiBoot_Init: ; 82DEE98
+@ void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb);
+GameCubeMultiBoot_Init: @ 82DEE98
 	ldr r3, pool_InterruptRegs
 
-; Save IME register.
+@ Save IME register.
 	ldrh r2, [r3, OFFSET_REG_IME - 0x200]
 
-; Disable interrupts.
+@ Disable interrupts.
 	movs r1, 0
 	strh r1, [r3, OFFSET_REG_IME - 0x200]
 
-; Set the handler to the "Stop" routine.
-; Unless the first command that is received is a device reset command, the
-; "Stop" routine will be executed and no further commands will be processed.
+@ Set the handler to the "Stop" routine.
+@ Unless the first command that is received is a device reset command, the
+@ "Stop" routine will be executed and no further commands will be processed.
 	adr r3, GcMbIntrHandler_Stop
 	str r3, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER]
 
@@ -212,7 +212,7 @@ GameCubeMultiBoot_Init: ; 82DEE98
 	adds r3, r0, 0
 	adds r3, GCMB_STRUCT_BASE_DEST_PTR
 
-; clear all but the last 3 fields of the struct
+@ clear all but the last 3 fields of the struct
 $clearStructLoop:
 	stm r0!, {r1}
 	cmp r0, r3
@@ -226,43 +226,43 @@ $clearStructLoop:
 
 	ldr r3, pool_SerialRegs
 
-; Turn off JOY Bus mode.
+@ Turn off JOY Bus mode.
 	lsls r0, r3, 10
 	strh r0, [r3, OFFSET_REG_RCNT - 0x120]
 
-; Turn on JOY Bus mode.
+@ Turn on JOY Bus mode.
 	movs r0, 0xC0
 	lsls r0, 8
 	strh r0, [r3, OFFSET_REG_RCNT - 0x120]
 
-; Init JOY Bus registers.
+@ Init JOY Bus registers.
 	movs r0, 0x47
 	strh r0, [r3, OFFSET_REG_JOYCNT - 0x120]
 	strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120]
 
 	ldr r3, pool_InterruptRegs
 
-; Acknowledge serial interrupt.
+@ Acknowledge serial interrupt.
 	movs r0, INTR_FLAG_SERIAL
 	strh r0, [r3, OFFSET_REG_IF - 0x200]
 
-; Enable serial interrupt.
+@ Enable serial interrupt.
 	ldrh r1, [r3, OFFSET_REG_IE - 0x200]
 	orrs r1, r0
 	strh r1, [r3, OFFSET_REG_IE - 0x200]
 
-; Restore IME register.
+@ Restore IME register.
 	strh r2, [r3, OFFSET_REG_IME - 0x200]
 
 	bx lr
 	thumb_func_end GameCubeMultiBoot_Init
 
 	non_word_aligned_thumb_func_start GameCubeMultiBoot_HandleSerialInterrupt
-; void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb);
-GameCubeMultiBoot_HandleSerialInterrupt: ; 82DEEE2
+@ void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb);
+GameCubeMultiBoot_HandleSerialInterrupt: @ 82DEEE2
 	ldr r3, pool_SerialRegs
 
-; Acknowledge reset/receive/send flags.
+@ Acknowledge reset/receive/send flags.
 	ldrh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
 	strh r1, [r3, OFFSET_REG_JOYCNT - 0x120]
 
@@ -273,16 +273,16 @@ GameCubeMultiBoot_HandleSerialInterrupt: ; 82DEEE2
 	cmp r2, 0
 	beq GameCubeMultiBoot_HandleSerialInterruptDone
 
-	lsrs r1, 1 ; was a device reset command received?
-	bcs GameCubeMultiBoot_BeginHandshake ; branch if so
+	lsrs r1, 1 @ was a device reset command received?
+	bcs GameCubeMultiBoot_BeginHandshake @ branch if so
 
 	mov pc, r2
 
 	.align 2, 0
 
-; Zero the status and the interrupt handler pointer.
-; Commands from the GameCube will not be processed after this is executed
-; unless GameCubeMultiBoot_Init() is called again.
+@ Zero the status and the interrupt handler pointer.
+@ Commands from the GameCube will not be processed after this is executed
+@ unless GameCubeMultiBoot_Init() is called again.
 GcMbIntrHandler_Stop:
 	movs r2, 0
 	strh r2, [r3, OFFSET_REG_JOYSTAT - 0x120]
@@ -317,27 +317,27 @@ GameCubeMultiBoot_BeginHandshake:
 
 	.align 2, 0
 
-GcMbIntrHandler_CheckGameCodeSent: ; 82DEF24
+GcMbIntrHandler_CheckGameCodeSent: @ 82DEF24
 	lsls r1, 31
-	bcc GcMbIntrHandler_Stop ; stop if send failed
-	bmi GameCubeMultiBoot_CheckHandshakeResponse ; branch if receive is complete
+	bcc GcMbIntrHandler_Stop @ stop if send failed
+	bmi GameCubeMultiBoot_CheckHandshakeResponse @ branch if receive is complete
 
-; If the response hasn't been fully received yet,
-; check again upon the next interrupt.
+@ If the response hasn't been fully received yet,
+@ check again upon the next interrupt.
 	adr r2, GcMbIntrHandler_CheckHandshakeResponse
 	b GameCubeMultiBoot_SetInterruptHandler
 
 	.align 2, 0
 
-GcMbIntrHandler_CheckHandshakeResponse: ; 82DEF30
-	lsrs r1, 1 ; is receive complete?
-	bcc GcMbIntrHandler_Stop ; stop if not
+GcMbIntrHandler_CheckHandshakeResponse: @ 82DEF30
+	lsrs r1, 1 @ is receive complete?
+	bcc GcMbIntrHandler_Stop @ stop if not
 
 GameCubeMultiBoot_CheckHandshakeResponse:
 	ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
 	ldr r2, pool_RubyUSAGameCode
 	cmp r1, r2
-	bne GcMbIntrHandler_Stop ; stop if the GameCube didn't reply with the same game code
+	bne GcMbIntrHandler_Stop @ stop if the GameCube didn't reply with the same game code
 	ldrb r1, [r0, 0x3]
 	strb r1, [r0, 0xB]
 	adr r2, GcMbIntrHandler_82DEF44
@@ -345,9 +345,9 @@ GameCubeMultiBoot_CheckHandshakeResponse:
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEF44: ; 82DEF44
-	lsrs r1, 1 ; is receive complete?
-	bcc GcMbIntrHandler_Stop ; branch if not
+GcMbIntrHandler_82DEF44: @ 82DEF44
+	lsrs r1, 1 @ is receive complete?
+	bcc GcMbIntrHandler_Stop @ branch if not
 	ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
 	lsrs r2, r1, 24
 	cmp r2, 0xDD
@@ -383,18 +383,18 @@ _082DEF72:
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEF84: ; 82DEF84
+GcMbIntrHandler_82DEF84: @ 82DEF84
 	lsls r1, 31
-	bcc GcMbIntrHandler_Stop ; stop if send failed
-	bmi _082DEF94 ; branch if receive is complete
+	bcc GcMbIntrHandler_Stop @ stop if send failed
+	bmi _082DEF94 @ branch if receive is complete
 	adr r2, GcMbIntrHandler_82DEF90
 	b GameCubeMultiBoot_SetInterruptHandler
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEF90: ; 82DEF90
-	lsrs r1, 1 ; is receive complete?
-	bcc GcMbIntrHandler_Stop ; branch if not
+GcMbIntrHandler_82DEF90: @ 82DEF90
+	lsrs r1, 1 @ is receive complete?
+	bcc GcMbIntrHandler_Stop @ branch if not
 _082DEF94:
 	ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
 	ldr r2, _082DF034
@@ -415,9 +415,9 @@ _082DEFA6:
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEFB4: ; 82DEFB4
-	lsrs r1, 1 ; is receive complete?
-	bcc GcMbIntrHandler_Stop ; branch if not
+GcMbIntrHandler_82DEFB4: @ 82DEFB4
+	lsrs r1, 1 @ is receive complete?
+	bcc GcMbIntrHandler_Stop @ branch if not
 	ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR]
 	movs r1, 0x4
 	ands r1, r2
@@ -456,18 +456,18 @@ _082DEFE2:
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEFF0: ; 82DEFF0
+GcMbIntrHandler_82DEFF0: @ 82DEFF0
 	lsls r1, 31
-	bcc _082DEFE2 ; branch if send failed
-	bmi _082DF000 ; branch if receive is complete
+	bcc _082DEFE2 @ branch if send failed
+	bmi _082DF000 @ branch if receive is complete
 	adr r2, GcMbIntrHandler_82DEFFC
 	b GameCubeMultiBoot_SetInterruptHandler
 
 	.align 2, 0
 
-GcMbIntrHandler_82DEFFC: ; 82DEFFC
-	lsrs r1, 1 ; is receive complete?
-	bcc _082DEFE2 ; branch if not
+GcMbIntrHandler_82DEFFC: @ 82DEFFC
+	lsrs r1, 1 @ is receive complete?
+	bcc _082DEFE2 @ branch if not
 
 _082DF000:
 	ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120]
@@ -480,45 +480,45 @@ _082DF000:
 
 	.align 2, 0
 
-GcMbIntrHandler_82DF010: ; 82DF010
+GcMbIntrHandler_82DF010: @ 82DF010
 	b GcMbIntrHandler_Stop
 
 	thumb_func_end GameCubeMultiBoot_HandleSerialInterrupt
 
 	non_word_aligned_thumb_func_start GameCubeMultiBoot_Quit
-; void GameCubeMultiBoot_Quit();
-GameCubeMultiBoot_Quit: ; 82DF012
+@ void GameCubeMultiBoot_Quit();
+GameCubeMultiBoot_Quit: @ 82DF012
 	ldr r3, pool_InterruptRegs
 
-; Save IME register.
+@ Save IME register.
 	ldrh r2, [r3, OFFSET_REG_IME - 0x200]
 
-; Disable interrupts.
+@ Disable interrupts.
 	movs r1, 0
 	strh r1, [r3, OFFSET_REG_IME - 0x200]
 
 	ldr r3, pool_SerialRegs
 
-; Acknowledge all JOYCNT flags.
+@ Acknowledge all JOYCNT flags.
 	movs r0, 0x7
 	strh r0, [r3, OFFSET_REG_JOYCNT - 0x120]
 
-; Turn off JOY Bus mode.
+@ Turn off JOY Bus mode.
 	lsls r0, r3, 10
-	strh r0, [r3, OFFSET_REG_RCNT - 0x120] ; store 0x8000
+	strh r0, [r3, OFFSET_REG_RCNT - 0x120] @ store 0x8000
 
 	ldr r3, pool_InterruptRegs
 
-; Acknowledge serial interrupt.
+@ Acknowledge serial interrupt.
 	movs r0, INTR_FLAG_SERIAL
 	strh r0, [r3, OFFSET_REG_IF - 0x200]
 
-; Disable serial interrupt.
+@ Disable serial interrupt.
 	ldrh r1, [r3, OFFSET_REG_IE - 0x200]
 	bics r1, r0
 	strh r1, [r3, OFFSET_REG_IE - 0x200]
 
-; Restore IME register.
+@ Restore IME register.
 	strh r2, [r3, OFFSET_REG_IME - 0x200]
 
 	bx lr
diff --git a/asm/libmks4agb.s b/asm/libmks4agb.s
index 8ece53c9a..1957f7578 100644
--- a/asm/libmks4agb.s
+++ b/asm/libmks4agb.s
@@ -1,5 +1,5 @@
 	thumb_func_start umul3232H32
-umul3232H32: ; 82DF04C
+umul3232H32: @ 82DF04C
 	adr r2, _082DF050
 	bx r2
 	.arm
@@ -10,7 +10,7 @@ _082DF050:
 	thumb_func_end umul3232H32
 
 	thumb_func_start SoundMain
-SoundMain: ; 82DF05C
+SoundMain: @ 82DF05C
 	ldr r0, _082DF0C8
 	ldr r0, [r0]
 	ldr r2, _082DF0CC
@@ -77,7 +77,7 @@ _082DF0DC: .4byte 0x00000630
 	thumb_func_end SoundMain
 
 	thumb_func_start SoundMainRAM
-SoundMainRAM: ; 82DF0E0
+SoundMainRAM: @ 82DF0E0
 	ldrb r3, [r0, 0x5]
 	cmp r3, 0
 	beq _082DF140
@@ -455,7 +455,7 @@ _082DF498: .4byte 0x68736d53
 	thumb_func_end SoundMainRAM
 
 	arm_func_start sub_82DF49C
-sub_82DF49C: ; 82DF49C
+sub_82DF49C: @ 82DF49C
 	ldr r6, [r4, 0x24]
 	ldrb r0, [r4]
 	tst r0, 0x20
@@ -655,7 +655,7 @@ _082DF72C:
 	arm_func_end sub_82DF49C
 
 	arm_func_start sub_82DF758
-sub_82DF758: ; 82DF758
+sub_82DF758: @ 82DF758
 	stmdb sp!, {r0,r2,r5-r7,lr}
 	mov r0, r3, lsr 6
 	ldr r1, [r4, 0x3C]
@@ -698,7 +698,7 @@ _082DF7E0: .4byte gUnknown_08675A70
 	arm_func_end sub_82DF758
 
 	thumb_func_start SoundMainBTM
-SoundMainBTM: ; 82DF7E4
+SoundMainBTM: @ 82DF7E4
 	mov r12, r4
 	movs r1, 0
 	movs r2, 0
@@ -713,7 +713,7 @@ SoundMainBTM: ; 82DF7E4
 	thumb_func_end SoundMainBTM
 
 	thumb_func_start ClearChain
-ClearChain: ; 82DF7FC
+ClearChain: @ 82DF7FC
 	ldr r3, [r0, 0x2C]
 	cmp r3, 0
 	beq _082DF81A
@@ -737,7 +737,7 @@ _082DF81A:
 	thumb_func_end ClearChain
 
 	thumb_func_start ply_fine
-ply_fine: ; 82DF81C
+ply_fine: @ 82DF81C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	ldr r4, [r5, 0x20]
@@ -766,7 +766,7 @@ _082DF840:
 	thumb_func_end ply_fine
 
 	thumb_func_start MPlyJmpTblCopy
-MPlyJmpTblCopy: ; 82DF84C
+MPlyJmpTblCopy: @ 82DF84C
 	mov r12, lr
 	movs r1, 0x24
 	ldr r2, _082DF87C
@@ -781,12 +781,12 @@ _082DF852:
 	thumb_func_end MPlyJmpTblCopy
 
 	thumb_func_start ldrb_r3_r2
-ldrb_r3_r2: ; 82DF864
+ldrb_r3_r2: @ 82DF864
 	ldrb r3, [r2]
 	thumb_func_end ldrb_r3_r2
 
 	non_word_aligned_thumb_func_start chk_adr_r2
-chk_adr_r2: ; 82DF866
+chk_adr_r2: @ 82DF866
 	push {r0}
 	lsrs r0, r2, 25
 	bne _082DF878
@@ -805,7 +805,7 @@ _082DF87C: .4byte gUnknown_086759E0
 	thumb_func_end chk_adr_r2
 
 	thumb_func_start ld_r3_tp_adr_i
-ld_r3_tp_adr_i: ; 82DF880
+ld_r3_tp_adr_i: @ 82DF880
 	ldr r2, [r1, 0x40]
 _082DF882:
 	adds r3, r2, 0x1
@@ -815,7 +815,7 @@ _082DF882:
 	thumb_func_end ld_r3_tp_adr_i
 
 	thumb_func_start ply_goto
-ply_goto: ; 82DF88C
+ply_goto: @ 82DF88C
 	push {lr}
 _082DF88E:
 	ldr r2, [r1, 0x40]
@@ -835,7 +835,7 @@ _082DF88E:
 	thumb_func_end ply_goto
 
 	thumb_func_start ply_patt
-ply_patt: ; 82DF8AC
+ply_patt: @ 82DF8AC
 	ldrb r2, [r1, 0x2]
 	cmp r2, 0x3
 	bcs _082DF8C4
@@ -853,7 +853,7 @@ _082DF8C4:
 	thumb_func_end ply_patt
 
 	thumb_func_start play_pend
-play_pend: ; 82DF8C8
+play_pend: @ 82DF8C8
 	ldrb r2, [r1, 0x2]
 	cmp r2, 0
 	beq _082DF8DA
@@ -868,7 +868,7 @@ _082DF8DA:
 	thumb_func_end play_pend
 
 	thumb_func_start ply_rept
-ply_rept: ; 82DF8DC
+ply_rept: @ 82DF8DC
 	push {lr}
 	ldr r2, [r1, 0x40]
 	ldrb r3, [r2]
@@ -896,7 +896,7 @@ _082DF8FE:
 	thumb_func_end ply_rept
 
 	thumb_func_start ply_prio
-ply_prio: ; 82DF90C
+ply_prio: @ 82DF90C
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	strb r3, [r1, 0x1D]
@@ -904,7 +904,7 @@ ply_prio: ; 82DF90C
 	thumb_func_end ply_prio
 
 	thumb_func_start ply_tempo
-ply_tempo: ; 82DF918
+ply_tempo: @ 82DF918
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	lsls r3, 1
@@ -917,7 +917,7 @@ ply_tempo: ; 82DF918
 	thumb_func_end ply_tempo
 
 	thumb_func_start ply_keysh
-ply_keysh: ; 82DF92C
+ply_keysh: @ 82DF92C
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	strb r3, [r1, 0xA]
@@ -929,7 +929,7 @@ ply_keysh: ; 82DF92C
 	thumb_func_end ply_keysh
 
 	thumb_func_start ply_voice
-ply_voice: ; 82DF940
+ply_voice: @ 82DF940
 	mov r12, lr
 	ldr r2, [r1, 0x40]
 	ldrb r3, [r2]
@@ -953,7 +953,7 @@ ply_voice: ; 82DF940
 	thumb_func_end ply_voice
 
 	thumb_func_start ply_vol
-ply_vol: ; 82DF970
+ply_vol: @ 82DF970
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	strb r3, [r1, 0x12]
@@ -965,7 +965,7 @@ ply_vol: ; 82DF970
 	thumb_func_end ply_vol
 
 	thumb_func_start ply_pan
-ply_pan: ; 82DF984
+ply_pan: @ 82DF984
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	subs r3, 0x40
@@ -978,7 +978,7 @@ ply_pan: ; 82DF984
 	thumb_func_end ply_pan
 
 	thumb_func_start ply_bend
-ply_bend: ; 82DF998
+ply_bend: @ 82DF998
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	subs r3, 0x40
@@ -991,7 +991,7 @@ ply_bend: ; 82DF998
 	thumb_func_end ply_bend
 
 	thumb_func_start ply_bendr
-ply_bendr: ; 82DF9AC
+ply_bendr: @ 82DF9AC
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	strb r3, [r1, 0xF]
@@ -1003,7 +1003,7 @@ ply_bendr: ; 82DF9AC
 	thumb_func_end ply_bendr
 
 	thumb_func_start ply_lfodl
-ply_lfodl: ; 82DF9C0
+ply_lfodl: @ 82DF9C0
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	strb r3, [r1, 0x1B]
@@ -1011,7 +1011,7 @@ ply_lfodl: ; 82DF9C0
 	thumb_func_end ply_lfodl
 
 	thumb_func_start ply_modt
-ply_modt: ; 82DF9CC
+ply_modt: @ 82DF9CC
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	ldrb r0, [r1, 0x18]
@@ -1027,7 +1027,7 @@ _082DF9E2:
 	thumb_func_end ply_modt
 
 	thumb_func_start ply_tune
-ply_tune: ; 82DF9E4
+ply_tune: @ 82DF9E4
 	mov r12, lr
 	bl ld_r3_tp_adr_i
 	subs r3, 0x40
@@ -1040,7 +1040,7 @@ ply_tune: ; 82DF9E4
 	thumb_func_end ply_tune
 
 	thumb_func_start ply_port
-ply_port: ; 82DF9F8
+ply_port: @ 82DF9F8
 	mov r12, lr
 	ldr r2, [r1, 0x40]
 	ldrb r3, [r2]
@@ -1055,7 +1055,7 @@ _082DFA0C: .4byte 0x04000060
 	thumb_func_end ply_port
 
 	thumb_func_start SoundVSync_rev01
-SoundVSync_rev01: ; 82DFA10
+SoundVSync_rev01: @ 82DFA10
 	ldr r0, _082DFCBC
 	ldr r0, [r0]
 	ldr r2, _082DFCC0
@@ -1098,7 +1098,7 @@ _082DFA58: .4byte 0x84400004
 	thumb_func_end SoundVSync_rev01
 
 	thumb_func_start MPlayMain_rev01
-MPlayMain_rev01: ; 82DFA5C
+MPlayMain_rev01: @ 82DFA5C
 	ldr r2, _082DFCC0
 	ldr r3, [r0, 0x34]
 	cmp r2, r3
@@ -1435,7 +1435,7 @@ _082DFCC0: .4byte 0x68736d53
 	thumb_func_end MPlayMain_rev01
 
 	thumb_func_start TrackStop_rev01
-TrackStop_rev01: ; 82DFCC4
+TrackStop_rev01: @ 82DFCC4
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	ldrb r1, [r5]
@@ -1476,7 +1476,7 @@ _082DFD04: .4byte 0x03007ff0
 	thumb_func_end TrackStop_rev01
 
 	thumb_func_start ChnVolSetAsm
-ChnVolSetAsm: ; 82DFD08
+ChnVolSetAsm: @ 82DFD08
 	ldrb r1, [r4, 0x12]
 	movs r0, 0x14
 	ldrsb r2, [r4, r0]
@@ -1506,7 +1506,7 @@ _082DFD34:
 	thumb_func_end ChnVolSetAsm
 
 	thumb_func_start ply_note_rev01
-ply_note_rev01: ; 82DFD38
+ply_note_rev01: @ 82DFD38
 	push {r4-r7,lr}
 	mov r4, r8
 	mov r5, r9
@@ -1788,7 +1788,7 @@ _082DFF38: .4byte gUnknown_08675C64
 	thumb_func_end ply_note_rev01
 
 	thumb_func_start ply_endtie_rev01
-ply_endtie_rev01: ; 82DFF3C
+ply_endtie_rev01: @ 82DFF3C
 	push {r4,r5}
 	ldr r2, [r1, 0x40]
 	ldrb r3, [r2]
@@ -1829,7 +1829,7 @@ _082DFF78:
 	thumb_func_end ply_endtie_rev01
 
 	thumb_func_start clear_modM
-clear_modM: ; 82DFF7C
+clear_modM: @ 82DFF7C
 	movs r2, 0
 	strb r2, [r1, 0x16]
 	strb r2, [r1, 0x1A]
@@ -1848,7 +1848,7 @@ _082DFF8E:
 	thumb_func_end clear_modM
 
 	thumb_func_start ld_r3_tp_adr_i_rev
-ld_r3_tp_adr_i_rev: ; 82DFF98
+ld_r3_tp_adr_i_rev: @ 82DFF98
 	ldr r2, [r1, 0x40]
 	adds r3, r2, 0x1
 	str r3, [r1, 0x40]
@@ -1857,7 +1857,7 @@ ld_r3_tp_adr_i_rev: ; 82DFF98
 	thumb_func_end ld_r3_tp_adr_i_rev
 
 	thumb_func_start ply_lfos_rev01
-ply_lfos_rev01: ; 82DFFA4
+ply_lfos_rev01: @ 82DFFA4
 	mov r12, lr
 	bl ld_r3_tp_adr_i_rev
 	strb r3, [r1, 0x19]
@@ -1869,7 +1869,7 @@ _082DFFB4:
 	thumb_func_end ply_lfos_rev01
 
 	thumb_func_start ply_mod_rev01
-ply_mod_rev01: ; 82DFFB8
+ply_mod_rev01: @ 82DFFB8
 	mov r12, lr
 	bl ld_r3_tp_adr_i_rev
 	strb r3, [r1, 0x17]
@@ -1881,7 +1881,7 @@ _082DFFC8:
 	thumb_func_end ply_mod_rev01
 
 	thumb_func_start MidiKey2fr
-MidiKey2fr: ; 82DFFCC
+MidiKey2fr: @ 82DFFCC
 	push {r4-r7,lr}
 	mov r12, r0
 	lsls r1, 24
@@ -1933,12 +1933,12 @@ _082E002C: .4byte gUnknown_08675B34
 	thumb_func_end MidiKey2fr
 
 	thumb_func_start DummyFunc
-DummyFunc: ; 82E0030
+DummyFunc: @ 82E0030
 	bx lr
 	thumb_func_end DummyFunc
 
 	thumb_func_start MPlayContinue
-MPlayContinue: ; 82E0034
+MPlayContinue: @ 82E0034
 	adds r2, r0, 0
 	ldr r3, [r2, 0x34]
 	ldr r0, _082E0048
@@ -1956,8 +1956,8 @@ _082E004C: .4byte 0x7fffffff
 	thumb_func_end MPlayContinue
 
 	thumb_func_start MPlayFadeOut
-; void MPlayFadeOut(mplay_table_entry *a1, s16 a2)
-MPlayFadeOut: ; 82E0050
+@ void MPlayFadeOut(mplay_table_entry *a1, s16 a2)
+MPlayFadeOut: @ 82E0050
 	adds r2, r0, 0
 	lsls r1, 16
 	lsrs r1, 16
@@ -1977,7 +1977,7 @@ _082E006C: .4byte 0x68736d53
 	thumb_func_end MPlayFadeOut
 
 	thumb_func_start m4aSoundInit
-m4aSoundInit: ; 82E0070
+m4aSoundInit: @ 82E0070
 	push {r4-r6,lr}
 	ldr r0, _082E00F0
 	movs r1, 0x2
@@ -2055,7 +2055,7 @@ _082E0120: .4byte 0x03007670
 	thumb_func_end m4aSoundInit
 
 	thumb_func_start m4aSoundMain
-m4aSoundMain: ; 82E0124
+m4aSoundMain: @ 82E0124
 	push {lr}
 	bl SoundMain
 	pop {r0}
@@ -2063,7 +2063,7 @@ m4aSoundMain: ; 82E0124
 	thumb_func_end m4aSoundMain
 
 	thumb_func_start m4aSongNumStart
-m4aSongNumStart: ; 82E0130
+m4aSongNumStart: @ 82E0130
 	push {lr}
 	lsls r0, 16
 	ldr r2, _082E0154
@@ -2087,7 +2087,7 @@ _082E0158: .4byte gUnknown_086B49F0
 	thumb_func_end m4aSongNumStart
 
 	thumb_func_start m4aSongNumStartOrChange
-m4aSongNumStartOrChange: ; 82E015C
+m4aSongNumStartOrChange: @ 82E015C
 	push {lr}
 	lsls r0, 16
 	ldr r2, _082E0188
@@ -2128,7 +2128,7 @@ _082E01A4:
 	thumb_func_end m4aSongNumStartOrChange
 
 	thumb_func_start m4aSongNumStartOrContinue
-m4aSongNumStartOrContinue: ; 82E01A8
+m4aSongNumStartOrContinue: @ 82E01A8
 	push {lr}
 	lsls r0, 16
 	ldr r2, _082E01D4
@@ -2172,7 +2172,7 @@ _082E01F8:
 	thumb_func_end m4aSongNumStartOrContinue
 
 	thumb_func_start m4aSongNumStop
-m4aSongNumStop: ; 82E01FC
+m4aSongNumStop: @ 82E01FC
 	push {lr}
 	lsls r0, 16
 	ldr r2, _082E0228
@@ -2200,7 +2200,7 @@ _082E022C: .4byte gUnknown_086B49F0
 	thumb_func_end m4aSongNumStop
 
 	thumb_func_start m4aSongNumContinue
-m4aSongNumContinue: ; 82E0230
+m4aSongNumContinue: @ 82E0230
 	push {lr}
 	lsls r0, 16
 	ldr r2, _082E025C
@@ -2228,7 +2228,7 @@ _082E0260: .4byte gUnknown_086B49F0
 	thumb_func_end m4aSongNumContinue
 
 	thumb_func_start m4aMPlayAllStop
-m4aMPlayAllStop: ; 82E0264
+m4aMPlayAllStop: @ 82E0264
 	push {r4,r5,lr}
 	ldr r0, _082E029C
 	lsls r0, 16
@@ -2264,7 +2264,7 @@ _082E02A4: .4byte 0x030073a0
 	thumb_func_end m4aMPlayAllStop
 
 	thumb_func_start m4aMPlayContinue
-m4aMPlayContinue: ; 82E02A8
+m4aMPlayContinue: @ 82E02A8
 	push {lr}
 	bl MPlayContinue
 	pop {r0}
@@ -2272,7 +2272,7 @@ m4aMPlayContinue: ; 82E02A8
 	thumb_func_end m4aMPlayContinue
 
 	thumb_func_start m4aMPlayAllContinue
-m4aMPlayAllContinue: ; 82E02B2
+m4aMPlayAllContinue: @ 82E02B2
 	push {r4,r5,lr}
 	ldr r0, _082E02EC
 	lsls r0, 16
@@ -2308,8 +2308,8 @@ _082E02F4: .4byte 0x030073a0
 	thumb_func_end m4aMPlayAllContinue
 
 	thumb_func_start m4aMPlayFadeOut
-; void m4aMPlayFadeOut(mplay_table_entry *a1, u16 a2)
-m4aMPlayFadeOut: ; 82E02F8
+@ void m4aMPlayFadeOut(mplay_table_entry *a1, u16 a2)
+m4aMPlayFadeOut: @ 82E02F8
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -2319,7 +2319,7 @@ m4aMPlayFadeOut: ; 82E02F8
 	thumb_func_end m4aMPlayFadeOut
 
 	thumb_func_start sub_82E0308
-sub_82E0308: ; 82E0308
+sub_82E0308: @ 82E0308
 	adds r2, r0, 0
 	lsls r1, 16
 	lsrs r1, 16
@@ -2339,7 +2339,7 @@ _082E0324: .4byte 0x00000101
 	thumb_func_end sub_82E0308
 
 	thumb_func_start sub_82E0328
-sub_82E0328: ; 82E0328
+sub_82E0328: @ 82E0328
 	adds r2, r0, 0
 	lsls r1, 16
 	lsrs r1, 16
@@ -2363,7 +2363,7 @@ _082E034C: .4byte 0x7fffffff
 	thumb_func_end sub_82E0328
 
 	thumb_func_start m4aMPlayImmInit
-m4aMPlayImmInit: ; 82E0350
+m4aMPlayImmInit: @ 82E0350
 	push {r4-r7,lr}
 	ldrb r5, [r0, 0x8]
 	ldr r4, [r0, 0x2C]
@@ -2405,8 +2405,8 @@ _082E0392:
 	thumb_func_end m4aMPlayImmInit
 
 	thumb_func_start MPlayExtender
-; int MPlayExtender(void *dest)
-MPlayExtender: ; 82E0398
+@ int MPlayExtender(void *dest)
+MPlayExtender: @ 82E0398
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -2531,13 +2531,13 @@ _082E04AC: .4byte 0x05000040
 	thumb_func_end MPlayExtender
 
 	thumb_func_start MusicPlayerJumpTableCopy
-MusicPlayerJumpTableCopy: ; 82E04B0
+MusicPlayerJumpTableCopy: @ 82E04B0
 	swi 0x2A
 	bx lr
 	thumb_func_end MusicPlayerJumpTableCopy
 
 	thumb_func_start ClearChain_rev
-ClearChain_rev: ; 82E04B4
+ClearChain_rev: @ 82E04B4
 	push {lr}
 	ldr r1, _082E04C4
 	ldr r1, [r1]
@@ -2549,7 +2549,7 @@ _082E04C4: .4byte 0x030074e8
 	thumb_func_end ClearChain_rev
 
 	thumb_func_start Clear64byte_rev
-Clear64byte_rev: ; 82E04C8
+Clear64byte_rev: @ 82E04C8
 	push {lr}
 	ldr r1, _082E04D8
 	ldr r1, [r1]
@@ -2561,8 +2561,8 @@ _082E04D8: .4byte 0x030074ec
 	thumb_func_end Clear64byte_rev
 
 	thumb_func_start SoundInit_rev01
-; int SoundInit_rev01(void *dest)
-SoundInit_rev01: ; 82E04DC
+@ int SoundInit_rev01(void *dest)
+SoundInit_rev01: @ 82E04DC
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -2674,7 +2674,7 @@ _082E05D0: .4byte 0x68736d53
 	thumb_func_end SoundInit_rev01
 
 	thumb_func_start SampFreqSet_rev01
-SampFreqSet_rev01: ; 82E05D4
+SampFreqSet_rev01: @ 82E05D4
 	push {r4-r6,lr}
 	adds r2, r0, 0
 	ldr r0, _082E0654
@@ -2748,7 +2748,7 @@ _082E0674: .4byte 0x04000006
 	thumb_func_end SampFreqSet_rev01
 
 	thumb_func_start SoundMode_rev01
-SoundMode_rev01: ; 82E0678
+SoundMode_rev01: @ 82E0678
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	ldr r0, _082E0704
@@ -2831,7 +2831,7 @@ _082E070C: .4byte 0x04000089
 	thumb_func_end SoundMode_rev01
 
 	thumb_func_start SoundClear_rev01
-SoundClear_rev01: ; 82E0710
+SoundClear_rev01: @ 82E0710
 	push {r4-r7,lr}
 	ldr r0, _082E075C
 	ldr r6, [r0]
@@ -2879,7 +2879,7 @@ _082E0760: .4byte 0x68736d53
 	thumb_func_end SoundClear_rev01
 
 	thumb_func_start SoundVSyncOff_rev01
-SoundVSyncOff_rev01: ; 82E0764
+SoundVSyncOff_rev01: @ 82E0764
 	push {lr}
 	sub sp, 0x4
 	ldr r0, _082E07C4
@@ -2940,7 +2940,7 @@ _082E07DC: .4byte 0x05000318
 	thumb_func_end SoundVSyncOff_rev01
 
 	thumb_func_start SoundVSyncOn_rev01
-SoundVSyncOn_rev01: ; 82E07E0
+SoundVSyncOn_rev01: @ 82E07E0
 	push {r4,lr}
 	ldr r0, _082E0810
 	ldr r2, [r0]
@@ -2972,7 +2972,7 @@ _082E0818: .4byte 0x040000c6
 	thumb_func_end SoundVSyncOn_rev01
 
 	thumb_func_start MPlayOpen_rev01
-MPlayOpen_rev01: ; 82E081C
+MPlayOpen_rev01: @ 82E081C
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	adds r6, r1, 0
@@ -3037,7 +3037,7 @@ _082E0890: .4byte MPlayMain_rev01
 	thumb_func_end MPlayOpen_rev01
 
 	thumb_func_start MPlayStart_rev01
-MPlayStart_rev01: ; 82E0894
+MPlayStart_rev01: @ 82E0894
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3161,7 +3161,7 @@ _082E0974: .4byte 0x68736d53
 	thumb_func_end MPlayStart_rev01
 
 	thumb_func_start MPlayStop_rev01
-MPlayStop_rev01: ; 82E0978
+MPlayStop_rev01: @ 82E0978
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r1, [r6, 0x34]
@@ -3199,7 +3199,7 @@ _082E09B4: .4byte 0x68736d53
 	thumb_func_end MPlayStop_rev01
 
 	thumb_func_start FadeOutBody_rev01
-FadeOutBody_rev01: ; 82E09B8
+FadeOutBody_rev01: @ 82E09B8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	ldrh r1, [r6, 0x24]
@@ -3311,7 +3311,7 @@ _082E0A7A:
 	thumb_func_end FadeOutBody_rev01
 
 	thumb_func_start TrkVolPitSet_rev01
-TrkVolPitSet_rev01: ; 82E0A80
+TrkVolPitSet_rev01: @ 82E0A80
 	push {r4,lr}
 	adds r2, r1, 0
 	movs r0, 0x1
@@ -3412,7 +3412,7 @@ _082E0B28:
 	thumb_func_end TrkVolPitSet_rev01
 
 	thumb_func_start MidiKey2CgbFr
-MidiKey2CgbFr: ; 82E0B34
+MidiKey2CgbFr: @ 82E0B34
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3504,7 +3504,7 @@ _082E0BD8: .4byte gUnknown_08675C00
 	thumb_func_end MidiKey2CgbFr
 
 	thumb_func_start CgbOscOff
-CgbOscOff: ; 82E0BDC
+CgbOscOff: @ 82E0BDC
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -3554,7 +3554,7 @@ _082E0C28: .4byte 0x04000079
 	thumb_func_end CgbOscOff
 
 	thumb_func_start CgbModVol
-CgbModVol: ; 82E0C2C
+CgbModVol: @ 82E0C2C
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r0, _082E0C5C
@@ -3624,7 +3624,7 @@ _082E0C8C:
 	thumb_func_end CgbModVol
 
 	thumb_func_start CgbSound
-CgbSound: ; 82E0CA8
+CgbSound: @ 82E0CA8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4208,7 +4208,7 @@ _082E10E2:
 	thumb_func_end CgbSound
 
 	thumb_func_start MPlayTempoControl
-MPlayTempoControl: ; 82E10F4
+MPlayTempoControl: @ 82E10F4
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -4232,7 +4232,7 @@ _082E1118: .4byte 0x68736d53
 	thumb_func_end MPlayTempoControl
 
 	thumb_func_start MPlayVolumeControl
-MPlayVolumeControl: ; 82E111C
+MPlayVolumeControl: @ 82E111C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -4292,7 +4292,7 @@ _082E1180: .4byte 0x68736d53
 	thumb_func_end MPlayVolumeControl
 
 	thumb_func_start MPlayPitchControl
-MPlayPitchControl: ; 82E1184
+MPlayPitchControl: @ 82E1184
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4358,7 +4358,7 @@ _082E11F4: .4byte 0x68736d53
 	thumb_func_end MPlayPitchControl
 
 	thumb_func_start MPlayPanpotControl
-MPlayPanpotControl: ; 82E11F8
+MPlayPanpotControl: @ 82E11F8
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -4418,7 +4418,7 @@ _082E125C: .4byte 0x68736d53
 	thumb_func_end MPlayPanpotControl
 
 	thumb_func_start MP_clear_modM
-MP_clear_modM: ; 82E1260
+MP_clear_modM: @ 82E1260
 	adds r1, r0, 0
 	movs r2, 0
 	movs r0, 0
@@ -4439,7 +4439,7 @@ _082E1276:
 	thumb_func_end MP_clear_modM
 
 	thumb_func_start MPlayModDepthSet
-MPlayModDepthSet: ; 82E1280
+MPlayModDepthSet: @ 82E1280
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4503,7 +4503,7 @@ _082E12F0: .4byte 0x68736d53
 	thumb_func_end MPlayModDepthSet
 
 	thumb_func_start MPlayLFOSpeedSet
-MPlayLFOSpeedSet: ; 82E12F4
+MPlayLFOSpeedSet: @ 82E12F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4567,7 +4567,7 @@ _082E1364: .4byte 0x68736d53
 	thumb_func_end MPlayLFOSpeedSet
 
 	thumb_func_start ply_memacc
-ply_memacc: ; 82E1368
+ply_memacc: @ 82E1368
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -4746,7 +4746,7 @@ _082E14BA:
 	thumb_func_end ply_memacc
 
 	thumb_func_start ply_xcmd
-ply_xcmd: ; 82E14C0
+ply_xcmd: @ 82E14C0
 	push {lr}
 	ldr r2, [r1, 0x40]
 	ldrb r3, [r2]
@@ -4764,7 +4764,7 @@ _082E14DC: .4byte gUnknown_08675CCC
 	thumb_func_end ply_xcmd
 
 	thumb_func_start ply_xxx
-ply_xxx: ; 82E14E0
+ply_xxx: @ 82E14E0
 	push {lr}
 	ldr r2, _082E14F0
 	ldr r2, [r2]
@@ -4776,7 +4776,7 @@ _082E14F0: .4byte 0x03007460
 	thumb_func_end ply_xxx
 
 	thumb_func_start ply_xwave
-ply_xwave: ; 82E14F4
+ply_xwave: @ 82E14F4
 	push {r4,lr}
 	ldr r2, [r1, 0x40]
 	ldr r0, _082E152C
@@ -4812,7 +4812,7 @@ _082E1538: .4byte 0x00ffffff
 	thumb_func_end ply_xwave
 
 	thumb_func_start ply_xtype
-ply_xtype: ; 82E153C
+ply_xtype: @ 82E153C
 	ldr r0, [r1, 0x40]
 	ldrb r2, [r0]
 	adds r0, r1, 0
@@ -4825,7 +4825,7 @@ ply_xtype: ; 82E153C
 	thumb_func_end ply_xtype
 
 	thumb_func_start ply_xatta
-ply_xatta: ; 82E1550
+ply_xatta: @ 82E1550
 	ldr r0, [r1, 0x40]
 	ldrb r2, [r0]
 	adds r0, r1, 0
@@ -4838,7 +4838,7 @@ ply_xatta: ; 82E1550
 	thumb_func_end ply_xatta
 
 	thumb_func_start ply_xdeca
-ply_xdeca: ; 82E1564
+ply_xdeca: @ 82E1564
 	ldr r0, [r1, 0x40]
 	ldrb r0, [r0]
 	adds r2, r1, 0
@@ -4851,7 +4851,7 @@ ply_xdeca: ; 82E1564
 	thumb_func_end ply_xdeca
 
 	thumb_func_start ply_xsust
-ply_xsust: ; 82E1578
+ply_xsust: @ 82E1578
 	ldr r0, [r1, 0x40]
 	ldrb r0, [r0]
 	adds r2, r1, 0
@@ -4864,7 +4864,7 @@ ply_xsust: ; 82E1578
 	thumb_func_end ply_xsust
 
 	thumb_func_start ply_xrele
-ply_xrele: ; 82E158C
+ply_xrele: @ 82E158C
 	ldr r0, [r1, 0x40]
 	ldrb r0, [r0]
 	adds r2, r1, 0
@@ -4877,7 +4877,7 @@ ply_xrele: ; 82E158C
 	thumb_func_end ply_xrele
 
 	thumb_func_start ply_xiecv
-ply_xiecv: ; 82E15A0
+ply_xiecv: @ 82E15A0
 	ldr r0, [r1, 0x40]
 	ldrb r2, [r0]
 	strb r2, [r1, 0x1E]
@@ -4887,7 +4887,7 @@ ply_xiecv: ; 82E15A0
 	thumb_func_end ply_xiecv
 
 	thumb_func_start ply_xiecl
-ply_xiecl: ; 82E15AC
+ply_xiecl: @ 82E15AC
 	ldr r0, [r1, 0x40]
 	ldrb r2, [r0]
 	strb r2, [r1, 0x1F]
@@ -4897,7 +4897,7 @@ ply_xiecl: ; 82E15AC
 	thumb_func_end ply_xiecl
 
 	thumb_func_start ply_xleng
-ply_xleng: ; 82E15B8
+ply_xleng: @ 82E15B8
 	ldr r0, [r1, 0x40]
 	ldrb r0, [r0]
 	adds r2, r1, 0
@@ -4910,7 +4910,7 @@ ply_xleng: ; 82E15B8
 	thumb_func_end ply_xleng
 
 	thumb_func_start ply_xswee
-ply_xswee: ; 82E15CC
+ply_xswee: @ 82E15CC
 	ldr r0, [r1, 0x40]
 	ldrb r0, [r0]
 	adds r2, r1, 0
@@ -4923,7 +4923,7 @@ ply_xswee: ; 82E15CC
 	thumb_func_end ply_xswee
 
 	thumb_func_start ply_xcmd0C
-ply_xcmd0C: ; 82E15E0
+ply_xcmd0C: @ 82E15E0
 	push {r4,lr}
 	adds r3, r1, 0
 	ldr r4, [r3, 0x40]
@@ -4963,7 +4963,7 @@ _082E1620:
 	thumb_func_end ply_xcmd0C
 
 	thumb_func_start ply_xcmd0D
-ply_xcmd0D: ; 82E1628
+ply_xcmd0D: @ 82E1628
 	push {r4,lr}
 	ldr r2, [r1, 0x40]
 	ldr r0, _082E1660
@@ -4999,12 +4999,12 @@ _082E166C: .4byte 0x00ffffff
 	thumb_func_end ply_xcmd0D
 
 	thumb_func_start DummyFunc_rev
-DummyFunc_rev: ; 82E1670
+DummyFunc_rev: @ 82E1670
 	bx lr
 	thumb_func_end DummyFunc_rev
 
 	thumb_func_start sub_82E1674
-sub_82E1674: ; 82E1674
+sub_82E1674: @ 82E1674
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -5109,7 +5109,7 @@ _082E1740: .4byte 0x68736d53
 	thumb_func_end sub_82E1674
 
 	thumb_func_start sub_82E1744
-sub_82E1744: ; 82E1744
+sub_82E1744: @ 82E1744
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, _082E1754
@@ -5122,7 +5122,7 @@ _082E1754: .4byte 0x030077b0
 	thumb_func_end sub_82E1744
 
 	thumb_func_start sub_82E1758
-sub_82E1758: ; 82E1758
+sub_82E1758: @ 82E1758
 	ldr r2, _082E176C
 	lsls r0, 24
 	asrs r0, 24
@@ -5137,7 +5137,7 @@ _082E176C: .4byte 0x030077b0
 	thumb_func_end sub_82E1758
 
 	thumb_func_start sub_82E1770
-sub_82E1770: ; 82E1770
+sub_82E1770: @ 82E1770
 	push {r4-r6,lr}
 	lsls r0, 16
 	ldr r3, _082E17A4
@@ -5169,7 +5169,7 @@ _082E17A4: .4byte 0x030077b0
 	thumb_func_end sub_82E1770
 
 	thumb_func_start sub_82E17A8
-sub_82E17A8: ; 82E17A8
+sub_82E17A8: @ 82E17A8
 	ldr r1, _082E17B0
 	strh r0, [r1, 0x2E]
 	bx lr
@@ -5178,7 +5178,7 @@ _082E17B0: .4byte 0x030077b0
 	thumb_func_end sub_82E17A8
 
 	thumb_func_start sub_82E17B4
-sub_82E17B4: ; 82E17B4
+sub_82E17B4: @ 82E17B4
 	ldr r1, _082E17BC
 	adds r1, 0x26
 	strb r0, [r1]
@@ -5188,7 +5188,7 @@ _082E17BC: .4byte 0x030077b0
 	thumb_func_end sub_82E17B4
 
 	thumb_func_start sub_82E17C0
-sub_82E17C0: ; 82E17C0
+sub_82E17C0: @ 82E17C0
 	ldr r1, _082E17C8
 	str r0, [r1, 0x20]
 	bx lr
@@ -5197,7 +5197,7 @@ _082E17C8: .4byte 0x030077b0
 	thumb_func_end sub_82E17C0
 
 	thumb_func_start sub_82E17CC
-sub_82E17CC: ; 82E17CC
+sub_82E17CC: @ 82E17CC
 	ldr r1, [r0, 0x2C]
 	ldr r0, [r1, 0x20]
 	cmp r0, 0
@@ -5214,7 +5214,7 @@ _082E17E0:
 	thumb_func_end sub_82E17CC
 
 	thumb_func_start sub_82E17E4
-sub_82E17E4: ; 82E17E4
+sub_82E17E4: @ 82E17E4
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r0, 0
@@ -5241,7 +5241,7 @@ _082E180C: .4byte 0x030077b0
 	thumb_func_end sub_82E17E4
 
 	thumb_func_start sub_82E1810
-sub_82E1810: ; 82E1810
+sub_82E1810: @ 82E1810
 	ldr r1, _082E1828
 	ldr r2, [r1]
 	cmp r0, 0
@@ -5275,7 +5275,7 @@ _082E184C: .4byte 0x00003302
 	thumb_func_end sub_82E1810
 
 	thumb_func_start sub_82E1850
-sub_82E1850: ; 82E1850
+sub_82E1850: @ 82E1850
 	ldr r1, _082E1858
 	strb r0, [r1, 0x2]
 	bx lr
diff --git a/asm/librfu.s b/asm/librfu.s
index 447d53867..51d56376f 100644
--- a/asm/librfu.s
+++ b/asm/librfu.s
@@ -1,5 +1,5 @@
 	thumb_func_start STWI_init_all
-STWI_init_all: ; 82E2A18
+STWI_init_all: @ 82E2A18
 	push {r4,lr}
 	adds r3, r0, 0
 	lsls r2, 24
@@ -101,7 +101,7 @@ _082E2AEC: .4byte 0x04000200
 	thumb_func_end STWI_init_all
 
 	thumb_func_start STWI_init_timer
-STWI_init_timer: ; 82E2AF0
+STWI_init_timer: @ 82E2AF0
 	push {r4,r5,lr}
 	ldr r2, _082E2B1C
 	str r2, [r0]
@@ -132,7 +132,7 @@ _082E2B28: .4byte 0x04000200
 	thumb_func_end STWI_init_timer
 
 	thumb_func_start AgbRFU_SoftReset
-AgbRFU_SoftReset: ; 82E2B2C
+AgbRFU_SoftReset: @ 82E2B2C
 	push {r4,r5,lr}
 	ldr r5, _082E2BC4
 	movs r1, 0x80
@@ -222,7 +222,7 @@ _082E2BDC: .4byte 0x00005003
 	thumb_func_end AgbRFU_SoftReset
 
 	thumb_func_start STWI_set_MS_mode
-STWI_set_MS_mode: ; 82E2BE0
+STWI_set_MS_mode: @ 82E2BE0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _082E2BF0
@@ -235,7 +235,7 @@ _082E2BF0: .4byte 0x03007868
 	thumb_func_end STWI_set_MS_mode
 
 	thumb_func_start STWI_read_status
-STWI_read_status: ; 82E2BF4
+STWI_read_status: @ 82E2BF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -293,7 +293,7 @@ _082E2C50: .4byte 0x0000ffff
 	thumb_func_end STWI_read_status
 
 	thumb_func_start STWI_init_Callback_M
-STWI_init_Callback_M: ; 82E2C54
+STWI_init_Callback_M: @ 82E2C54
 	push {lr}
 	movs r0, 0
 	bl STWI_set_Callback_M
@@ -302,7 +302,7 @@ STWI_init_Callback_M: ; 82E2C54
 	thumb_func_end STWI_init_Callback_M
 
 	thumb_func_start STWI_init_Callback_S
-STWI_init_Callback_S: ; 82E2C60
+STWI_init_Callback_S: @ 82E2C60
 	push {lr}
 	movs r0, 0
 	bl STWI_set_Callback_S
@@ -311,7 +311,7 @@ STWI_init_Callback_S: ; 82E2C60
 	thumb_func_end STWI_init_Callback_S
 
 	thumb_func_start STWI_set_Callback_M
-STWI_set_Callback_M: ; 82E2C6C
+STWI_set_Callback_M: @ 82E2C6C
 	ldr r1, _082E2C74
 	ldr r1, [r1]
 	str r0, [r1, 0x18]
@@ -321,7 +321,7 @@ _082E2C74: .4byte 0x03007868
 	thumb_func_end STWI_set_Callback_M
 
 	thumb_func_start STWI_set_Callback_S
-STWI_set_Callback_S: ; 82E2C78
+STWI_set_Callback_S: @ 82E2C78
 	ldr r1, _082E2C80
 	ldr r1, [r1]
 	str r0, [r1, 0x1C]
@@ -331,7 +331,7 @@ _082E2C80: .4byte 0x03007868
 	thumb_func_end STWI_set_Callback_S
 
 	thumb_func_start STWI_set_Callback_ID
-STWI_set_Callback_ID: ; 82E2C84
+STWI_set_Callback_ID: @ 82E2C84
 	ldr r1, _082E2C8C
 	ldr r1, [r1]
 	str r0, [r1, 0x20]
@@ -341,7 +341,7 @@ _082E2C8C: .4byte 0x03007868
 	thumb_func_end STWI_set_Callback_ID
 
 	thumb_func_start STWI_poll_CommandEnd
-STWI_poll_CommandEnd: ; 82E2C90
+STWI_poll_CommandEnd: @ 82E2C90
 	push {lr}
 	ldr r0, _082E2CB4
 	ldr r1, [r0]
@@ -366,7 +366,7 @@ _082E2CB4: .4byte 0x03007868
 	thumb_func_end STWI_poll_CommandEnd
 
 	thumb_func_start STWI_send_ResetREQ
-STWI_send_ResetREQ: ; 82E2CB8
+STWI_send_ResetREQ: @ 82E2CB8
 	push {lr}
 	movs r0, 0x10
 	bl STWI_init
@@ -386,7 +386,7 @@ _082E2CD8: .4byte 0x03007868
 	thumb_func_end STWI_send_ResetREQ
 
 	thumb_func_start STWI_send_LinkStatusREQ
-STWI_send_LinkStatusREQ: ; 82E2CDC
+STWI_send_LinkStatusREQ: @ 82E2CDC
 	push {lr}
 	movs r0, 0x11
 	bl STWI_init
@@ -406,7 +406,7 @@ _082E2CFC: .4byte 0x03007868
 	thumb_func_end STWI_send_LinkStatusREQ
 
 	thumb_func_start STWI_send_VersionStatusREQ
-STWI_send_VersionStatusREQ: ; 82E2D00
+STWI_send_VersionStatusREQ: @ 82E2D00
 	push {lr}
 	movs r0, 0x12
 	bl STWI_init
@@ -426,7 +426,7 @@ _082E2D20: .4byte 0x03007868
 	thumb_func_end STWI_send_VersionStatusREQ
 
 	thumb_func_start STWI_send_SystemStatusREQ
-STWI_send_SystemStatusREQ: ; 82E2D24
+STWI_send_SystemStatusREQ: @ 82E2D24
 	push {lr}
 	movs r0, 0x13
 	bl STWI_init
@@ -446,7 +446,7 @@ _082E2D44: .4byte 0x03007868
 	thumb_func_end STWI_send_SystemStatusREQ
 
 	thumb_func_start STWI_send_SlotStatusREQ
-STWI_send_SlotStatusREQ: ; 82E2D48
+STWI_send_SlotStatusREQ: @ 82E2D48
 	push {lr}
 	movs r0, 0x14
 	bl STWI_init
@@ -466,7 +466,7 @@ _082E2D68: .4byte 0x03007868
 	thumb_func_end STWI_send_SlotStatusREQ
 
 	thumb_func_start STWI_send_ConfigStatusREQ
-STWI_send_ConfigStatusREQ: ; 82E2D6C
+STWI_send_ConfigStatusREQ: @ 82E2D6C
 	push {lr}
 	movs r0, 0x15
 	bl STWI_init
@@ -486,7 +486,7 @@ _082E2D8C: .4byte 0x03007868
 	thumb_func_end STWI_send_ConfigStatusREQ
 
 	thumb_func_start STWI_send_GameConfigREQ
-STWI_send_GameConfigREQ: ; 82E2D90
+STWI_send_GameConfigREQ: @ 82E2D90
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -534,7 +534,7 @@ _082E2DE4: .4byte 0x03007868
 	thumb_func_end STWI_send_GameConfigREQ
 
 	thumb_func_start STWI_send_SystemConfigREQ
-STWI_send_SystemConfigREQ: ; 82E2DE8
+STWI_send_SystemConfigREQ: @ 82E2DE8
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -569,7 +569,7 @@ _082E2E24: .4byte 0x03007868
 	thumb_func_end STWI_send_SystemConfigREQ
 
 	thumb_func_start STWI_send_SC_StartREQ
-STWI_send_SC_StartREQ: ; 82E2E28
+STWI_send_SC_StartREQ: @ 82E2E28
 	push {lr}
 	movs r0, 0x19
 	bl STWI_init
@@ -589,7 +589,7 @@ _082E2E48: .4byte 0x03007868
 	thumb_func_end STWI_send_SC_StartREQ
 
 	thumb_func_start STWI_send_SC_PollingREQ
-STWI_send_SC_PollingREQ: ; 82E2E4C
+STWI_send_SC_PollingREQ: @ 82E2E4C
 	push {lr}
 	movs r0, 0x1A
 	bl STWI_init
@@ -609,7 +609,7 @@ _082E2E6C: .4byte 0x03007868
 	thumb_func_end STWI_send_SC_PollingREQ
 
 	thumb_func_start STWI_send_SC_EndREQ
-STWI_send_SC_EndREQ: ; 82E2E70
+STWI_send_SC_EndREQ: @ 82E2E70
 	push {lr}
 	movs r0, 0x1B
 	bl STWI_init
@@ -629,7 +629,7 @@ _082E2E90: .4byte 0x03007868
 	thumb_func_end STWI_send_SC_EndREQ
 
 	thumb_func_start STWI_send_SP_StartREQ
-STWI_send_SP_StartREQ: ; 82E2E94
+STWI_send_SP_StartREQ: @ 82E2E94
 	push {lr}
 	movs r0, 0x1C
 	bl STWI_init
@@ -649,7 +649,7 @@ _082E2EB4: .4byte 0x03007868
 	thumb_func_end STWI_send_SP_StartREQ
 
 	thumb_func_start STWI_send_SP_PollingREQ
-STWI_send_SP_PollingREQ: ; 82E2EB8
+STWI_send_SP_PollingREQ: @ 82E2EB8
 	push {lr}
 	movs r0, 0x1D
 	bl STWI_init
@@ -669,7 +669,7 @@ _082E2ED8: .4byte 0x03007868
 	thumb_func_end STWI_send_SP_PollingREQ
 
 	thumb_func_start STWI_send_SP_EndREQ
-STWI_send_SP_EndREQ: ; 82E2EDC
+STWI_send_SP_EndREQ: @ 82E2EDC
 	push {lr}
 	movs r0, 0x1E
 	bl STWI_init
@@ -689,7 +689,7 @@ _082E2EFC: .4byte 0x03007868
 	thumb_func_end STWI_send_SP_EndREQ
 
 	thumb_func_start STWI_send_CP_StartREQ
-STWI_send_CP_StartREQ: ; 82E2F00
+STWI_send_CP_StartREQ: @ 82E2F00
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -715,7 +715,7 @@ _082E2F2C: .4byte 0x03007868
 	thumb_func_end STWI_send_CP_StartREQ
 
 	thumb_func_start STWI_send_CP_PollingREQ
-STWI_send_CP_PollingREQ: ; 82E2F30
+STWI_send_CP_PollingREQ: @ 82E2F30
 	push {lr}
 	movs r0, 0x20
 	bl STWI_init
@@ -735,7 +735,7 @@ _082E2F50: .4byte 0x03007868
 	thumb_func_end STWI_send_CP_PollingREQ
 
 	thumb_func_start STWI_send_CP_EndREQ
-STWI_send_CP_EndREQ: ; 82E2F54
+STWI_send_CP_EndREQ: @ 82E2F54
 	push {lr}
 	movs r0, 0x21
 	bl STWI_init
@@ -755,7 +755,7 @@ _082E2F74: .4byte 0x03007868
 	thumb_func_end STWI_send_CP_EndREQ
 
 	thumb_func_start STWI_send_DataTxREQ
-STWI_send_DataTxREQ: ; 82E2F78
+STWI_send_DataTxREQ: @ 82E2F78
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r4, r1, 24
@@ -794,7 +794,7 @@ _082E2FBC: .4byte 0x03007868
 	thumb_func_end STWI_send_DataTxREQ
 
 	thumb_func_start STWI_send_DataTxAndChangeREQ
-STWI_send_DataTxAndChangeREQ: ; 82E2FC0
+STWI_send_DataTxAndChangeREQ: @ 82E2FC0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r4, r1, 24
@@ -833,7 +833,7 @@ _082E3004: .4byte 0x03007868
 	thumb_func_end STWI_send_DataTxAndChangeREQ
 
 	thumb_func_start STWI_send_DataRxREQ
-STWI_send_DataRxREQ: ; 82E3008
+STWI_send_DataRxREQ: @ 82E3008
 	push {lr}
 	movs r0, 0x26
 	bl STWI_init
@@ -853,7 +853,7 @@ _082E3028: .4byte 0x03007868
 	thumb_func_end STWI_send_DataRxREQ
 
 	thumb_func_start STWI_send_MS_ChangeREQ
-STWI_send_MS_ChangeREQ: ; 82E302C
+STWI_send_MS_ChangeREQ: @ 82E302C
 	push {lr}
 	movs r0, 0x27
 	bl STWI_init
@@ -873,7 +873,7 @@ _082E304C: .4byte 0x03007868
 	thumb_func_end STWI_send_MS_ChangeREQ
 
 	thumb_func_start STWI_send_DataReadyAndChangeREQ
-STWI_send_DataReadyAndChangeREQ: ; 82E3050
+STWI_send_DataReadyAndChangeREQ: @ 82E3050
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -917,7 +917,7 @@ _082E309C: .4byte 0x03007868
 	thumb_func_end STWI_send_DataReadyAndChangeREQ
 
 	thumb_func_start STWI_send_DisconnectedAndChangeREQ
-STWI_send_DisconnectedAndChangeREQ: ; 82E30A0
+STWI_send_DisconnectedAndChangeREQ: @ 82E30A0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -952,7 +952,7 @@ _082E30DC: .4byte 0x03007868
 	thumb_func_end STWI_send_DisconnectedAndChangeREQ
 
 	thumb_func_start STWI_send_ResumeRetransmitAndChangeREQ
-STWI_send_ResumeRetransmitAndChangeREQ: ; 82E30E0
+STWI_send_ResumeRetransmitAndChangeREQ: @ 82E30E0
 	push {lr}
 	movs r0, 0x37
 	bl STWI_init
@@ -972,7 +972,7 @@ _082E3100: .4byte 0x03007868
 	thumb_func_end STWI_send_ResumeRetransmitAndChangeREQ
 
 	thumb_func_start STWI_send_DisconnectREQ
-STWI_send_DisconnectREQ: ; 82E3104
+STWI_send_DisconnectREQ: @ 82E3104
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -998,7 +998,7 @@ _082E3130: .4byte 0x03007868
 	thumb_func_end STWI_send_DisconnectREQ
 
 	thumb_func_start STWI_send_TestModeREQ
-STWI_send_TestModeREQ: ; 82E3134
+STWI_send_TestModeREQ: @ 82E3134
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -1028,7 +1028,7 @@ _082E3168: .4byte 0x03007868
 	thumb_func_end STWI_send_TestModeREQ
 
 	thumb_func_start STWI_send_CPR_StartREQ
-STWI_send_CPR_StartREQ: ; 82E316C
+STWI_send_CPR_StartREQ: @ 82E316C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -1061,7 +1061,7 @@ _082E31A4: .4byte 0x03007868
 	thumb_func_end STWI_send_CPR_StartREQ
 
 	thumb_func_start STWI_send_CPR_PollingREQ
-STWI_send_CPR_PollingREQ: ; 82E31A8
+STWI_send_CPR_PollingREQ: @ 82E31A8
 	push {lr}
 	movs r0, 0x33
 	bl STWI_init
@@ -1081,7 +1081,7 @@ _082E31C8: .4byte 0x03007868
 	thumb_func_end STWI_send_CPR_PollingREQ
 
 	thumb_func_start STWI_send_CPR_EndREQ
-STWI_send_CPR_EndREQ: ; 82E31CC
+STWI_send_CPR_EndREQ: @ 82E31CC
 	push {lr}
 	movs r0, 0x34
 	bl STWI_init
@@ -1101,7 +1101,7 @@ _082E31EC: .4byte 0x03007868
 	thumb_func_end STWI_send_CPR_EndREQ
 
 	thumb_func_start STWI_send_StopModeREQ
-STWI_send_StopModeREQ: ; 82E31F0
+STWI_send_StopModeREQ: @ 82E31F0
 	push {lr}
 	movs r0, 0x3D
 	bl STWI_init
@@ -1121,7 +1121,7 @@ _082E3210: .4byte 0x03007868
 	thumb_func_end STWI_send_StopModeREQ
 
 	thumb_func_start STWI_intr_timer
-STWI_intr_timer: ; 82E3214
+STWI_intr_timer: @ 82E3214
 	push {r4,lr}
 	ldr r4, _082E322C
 	ldr r1, [r4]
@@ -1172,7 +1172,7 @@ _082E3270:
 	thumb_func_end STWI_intr_timer
 
 	thumb_func_start STWI_set_timer
-STWI_set_timer: ; 82E3278
+STWI_set_timer: @ 82E3278
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -1263,7 +1263,7 @@ _082E3320: .4byte 0x04000208
 	thumb_func_end STWI_set_timer
 
 	thumb_func_start STWI_stop_timer
-STWI_stop_timer: ; 82E3324
+STWI_stop_timer: @ 82E3324
 	ldr r2, _082E3344
 	ldr r0, [r2]
 	movs r1, 0
@@ -1287,7 +1287,7 @@ _082E334C: .4byte 0x04000102
 	thumb_func_end STWI_stop_timer
 
 	thumb_func_start STWI_init
-STWI_init: ; 82E3350
+STWI_init: @ 82E3350
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -1398,7 +1398,7 @@ _082E3424: .4byte 0x00005003
 	thumb_func_end STWI_init
 
 	thumb_func_start STWI_start_Command
-STWI_start_Command: ; 82E3428
+STWI_start_Command: @ 82E3428
 	push {r4,r5,lr}
 	ldr r5, _082E3480
 	ldr r0, [r5]
@@ -1454,7 +1454,7 @@ _082E3498: .4byte 0x00005083
 	thumb_func_end STWI_start_Command
 
 	thumb_func_start STWI_restart_Command
-STWI_restart_Command: ; 82E349C
+STWI_restart_Command: @ 82E349C
 	push {r4,lr}
 	ldr r4, _082E34B4
 	ldr r2, [r4]
@@ -1523,7 +1523,7 @@ _082E3512:
 	thumb_func_end STWI_restart_Command
 
 	thumb_func_start STWI_reset_ClockCounter
-STWI_reset_ClockCounter: ; 82E351C
+STWI_reset_ClockCounter: @ 82E351C
 	ldr r3, _082E3548
 	ldr r1, [r3]
 	movs r0, 0x5
@@ -1553,7 +1553,7 @@ _082E3550: .4byte 0x00005003
 	thumb_func_end STWI_reset_ClockCounter
 
 	arm_func_start IntrSIO32
-IntrSIO32: ; 82E3554
+IntrSIO32: @ 82E3554
 	mov r12, sp
 	stmdb sp!, {r11,r12,lr,pc}
 	ldr r3, _082E35B4
@@ -1585,7 +1585,7 @@ _082E35B4: .4byte 0x03007868
 	arm_func_end IntrSIO32
 
 	arm_func_start sio32intr_clock_master
-sio32intr_clock_master: ; 82E35B8
+sio32intr_clock_master: @ 82E35B8
 	mov r12, sp
 	stmdb sp!, {r4-r6,r11,r12,lr,pc}
 	mov r0, 0x50
@@ -1767,7 +1767,7 @@ _082E3840:
 	arm_func_end sio32intr_clock_master
 
 	arm_func_start sio32intr_clock_slave
-sio32intr_clock_slave: ; 82E3848
+sio32intr_clock_slave: @ 82E3848
 	mov r12, sp
 	stmdb sp!, {r4-r6,r11,r12,lr,pc}
 	ldr r4, _082E3BF4
@@ -2051,7 +2051,7 @@ _082E3C4C:
 	arm_func_end sio32intr_clock_slave
 
 	arm_func_start handshake_wait
-handshake_wait: ; 82E3C54
+handshake_wait: @ 82E3C54
 	mov r12, sp
 	stmdb sp!, {r11,r12,lr,pc}
 	mov r1, 0x128
@@ -2084,7 +2084,7 @@ _082E3CB8: .4byte 0x03007868
 	arm_func_end handshake_wait
 
 	arm_func_start STWI_set_timer_in_RAM
-STWI_set_timer_in_RAM: ; 82E3CBC
+STWI_set_timer_in_RAM: @ 82E3CBC
 	mov r12, sp
 	stmdb sp!, {r4,r5,r11,r12,lr,pc}
 	mov r1, 0x208
@@ -2164,7 +2164,7 @@ _082E3D90:
 	arm_func_end STWI_set_timer_in_RAM
 
 	arm_func_start STWI_stop_timer_in_RAM
-STWI_stop_timer_in_RAM: ; 82E3DCC
+STWI_stop_timer_in_RAM: @ 82E3DCC
 	mov r12, sp
 	stmdb sp!, {r11,r12,lr,pc}
 	mov r1, 0x100
@@ -2189,7 +2189,7 @@ _082E3E18: .4byte 0x03007868
 	arm_func_end STWI_stop_timer_in_RAM
 
 	arm_func_start STWI_init_slave
-STWI_init_slave: ; 82E3E1C
+STWI_init_slave: @ 82E3E1C
 	mov r12, sp
 	stmdb sp!, {r11,r12,lr,pc}
 	ldr r0, _082E3EA4
@@ -2229,22 +2229,22 @@ _082E3EA4: .4byte 0x03007868
 	arm_func_end STWI_init_slave
 
 	arm_func_start sub_82E3EA8
-sub_82E3EA8: ; 82E3EA8
+sub_82E3EA8: @ 82E3EA8
 	bx r2
 	arm_func_end sub_82E3EA8
 
 	arm_func_start sub_82E3EAC
-sub_82E3EAC: ; 82E3EAC
+sub_82E3EAC: @ 82E3EAC
 	bx r1
 	arm_func_end sub_82E3EAC
 
 	arm_func_start sub_82E3EB0
-sub_82E3EB0: ; 82E3EB0
+sub_82E3EB0: @ 82E3EB0
 	bx r0
 	arm_func_end sub_82E3EB0
 
 	thumb_func_start rfu_initializeAPI
-rfu_initializeAPI: ; 82E3EB4
+rfu_initializeAPI: @ 82E3EB4
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	mov r12, r2
@@ -2396,7 +2396,7 @@ _082E3FD8: .4byte 0x0000ffff
 	thumb_func_end rfu_initializeAPI
 
 	thumb_func_start rfu_STC_clearAPIVariables
-rfu_STC_clearAPIVariables: ; 82E3FDC
+rfu_STC_clearAPIVariables: @ 82E3FDC
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, _082E4050
@@ -2462,7 +2462,7 @@ _082E4060: .4byte 0x0100005a
 	thumb_func_end rfu_STC_clearAPIVariables
 
 	thumb_func_start rfu_REQ_PARENT_resumeRetransmitAndChange
-rfu_REQ_PARENT_resumeRetransmitAndChange: ; 82E4064
+rfu_REQ_PARENT_resumeRetransmitAndChange: @ 82E4064
 	push {lr}
 	ldr r0, _082E4074
 	bl STWI_set_Callback_M
@@ -2474,7 +2474,7 @@ _082E4074: .4byte rfu_STC_REQ_callback
 	thumb_func_end rfu_REQ_PARENT_resumeRetransmitAndChange
 
 	thumb_func_start rfu_UNI_PARENT_getDRAC_ACK
-rfu_UNI_PARENT_getDRAC_ACK: ; 82E4078
+rfu_UNI_PARENT_getDRAC_ACK: @ 82E4078
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r0, 0
@@ -2519,7 +2519,7 @@ _082E40BA:
 	thumb_func_end rfu_UNI_PARENT_getDRAC_ACK
 
 	thumb_func_start rfu_setTimerInterrupt
-rfu_setTimerInterrupt: ; 82E40C0
+rfu_setTimerInterrupt: @ 82E40C0
 	push {lr}
 	adds r2, r0, 0
 	adds r0, r1, 0
@@ -2532,7 +2532,7 @@ rfu_setTimerInterrupt: ; 82E40C0
 	thumb_func_end rfu_setTimerInterrupt
 
 	thumb_func_start rfu_getSTWIRecvBuffer
-rfu_getSTWIRecvBuffer: ; 82E40D4
+rfu_getSTWIRecvBuffer: @ 82E40D4
 	ldr r0, _082E40E0
 	ldr r0, [r0]
 	adds r0, 0xDC
@@ -2543,7 +2543,7 @@ _082E40E0: .4byte 0x03007898
 	thumb_func_end rfu_getSTWIRecvBuffer
 
 	thumb_func_start rfu_setMSCCallback
-rfu_setMSCCallback: ; 82E40E4
+rfu_setMSCCallback: @ 82E40E4
 	push {lr}
 	bl STWI_set_Callback_S
 	pop {r0}
@@ -2551,7 +2551,7 @@ rfu_setMSCCallback: ; 82E40E4
 	thumb_func_end rfu_setMSCCallback
 
 	thumb_func_start rfu_setREQCallback
-rfu_setREQCallback: ; 82E40F0
+rfu_setREQCallback: @ 82E40F0
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, _082E4108
@@ -2568,7 +2568,7 @@ _082E4108: .4byte 0x03007898
 	thumb_func_end rfu_setREQCallback
 
 	thumb_func_start rfu_enableREQCallback
-rfu_enableREQCallback: ; 82E410C
+rfu_enableREQCallback: @ 82E410C
 	push {lr}
 	lsls r0, 24
 	cmp r0, 0
@@ -2596,7 +2596,7 @@ _082E4134: .4byte 0x03007894
 	thumb_func_end rfu_enableREQCallback
 
 	thumb_func_start rfu_STC_REQ_callback
-rfu_STC_REQ_callback: ; 82E4138
+rfu_STC_REQ_callback: @ 82E4138
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -2629,7 +2629,7 @@ _082E4174: .4byte 0x03007898
 	thumb_func_end rfu_STC_REQ_callback
 
 	thumb_func_start rfu_CB_defaultCallback
-rfu_CB_defaultCallback: ; 82E4178
+rfu_CB_defaultCallback: @ 82E4178
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2688,7 +2688,7 @@ _082E41E4: .4byte 0x03007890
 	thumb_func_end rfu_CB_defaultCallback
 
 	thumb_func_start rfu_waitREQComplete
-rfu_waitREQComplete: ; 82E41E8
+rfu_waitREQComplete: @ 82E41E8
 	push {lr}
 	bl STWI_poll_CommandEnd
 	ldr r0, _082E41F8
@@ -2701,7 +2701,7 @@ _082E41F8: .4byte 0x03007894
 	thumb_func_end rfu_waitREQComplete
 
 	thumb_func_start rfu_REQ_RFUStatus
-rfu_REQ_RFUStatus: ; 82E41FC
+rfu_REQ_RFUStatus: @ 82E41FC
 	push {lr}
 	ldr r0, _082E420C
 	bl STWI_set_Callback_M
@@ -2713,7 +2713,7 @@ _082E420C: .4byte rfu_STC_REQ_callback
 	thumb_func_end rfu_REQ_RFUStatus
 
 	thumb_func_start rfu_getRFUStatus
-rfu_getRFUStatus: ; 82E4210
+rfu_getRFUStatus: @ 82E4210
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, _082E4228
@@ -2749,7 +2749,7 @@ _082E4246:
 	thumb_func_end rfu_getRFUStatus
 
 	thumb_func_start sub_82E424C
-sub_82E424C: ; 82E424C
+sub_82E424C: @ 82E424C
 	push {lr}
 	ldr r2, _082E4254
 	ldr r3, _082E4258
@@ -2760,7 +2760,7 @@ _082E4258: .4byte 0x030000f0
 	thumb_func_end sub_82E424C
 
 	thumb_func_start sub_82E425C
-sub_82E425C: ; 82E425C
+sub_82E425C: @ 82E425C
 	ldrb r0, [r3]
 	adds r3, 0x1
 	adds r2, 0x1
@@ -2815,7 +2815,7 @@ _082E42BE:
 	thumb_func_end sub_82E425C
 
 	thumb_func_start rfu_REQ_stopMode
-rfu_REQ_stopMode: ; 82E42C4
+rfu_REQ_stopMode: @ 82E42C4
 	push {lr}
 	ldr r0, _082E42E4
 	ldrh r0, [r0]
@@ -2893,7 +2893,7 @@ _082E4368: .4byte 0x04000128
 	thumb_func_end rfu_REQ_stopMode
 
 	thumb_func_start rfu_CB_stopMode
-rfu_CB_stopMode: ; 82E436C
+rfu_CB_stopMode: @ 82E436C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -2919,7 +2919,7 @@ _082E4394: .4byte 0x04000128
 	thumb_func_end rfu_CB_stopMode
 
 	thumb_func_start rfu_REQBN_softReset_and_checkID
-rfu_REQBN_softReset_and_checkID: ; 82E4398
+rfu_REQBN_softReset_and_checkID: @ 82E4398
 	push {lr}
 	ldr r0, _082E43A8
 	ldrh r0, [r0]
@@ -2953,7 +2953,7 @@ _082E43D0: .4byte 0x04000128
 	thumb_func_end rfu_REQBN_softReset_and_checkID
 
 	thumb_func_start rfu_REQ_reset
-rfu_REQ_reset: ; 82E43D4
+rfu_REQ_reset: @ 82E43D4
 	push {lr}
 	ldr r0, _082E43E4
 	bl STWI_set_Callback_M
@@ -2965,7 +2965,7 @@ _082E43E4: .4byte rfu_CB_reset
 	thumb_func_end rfu_REQ_reset
 
 	thumb_func_start rfu_CB_reset
-rfu_CB_reset: ; 82E43E8
+rfu_CB_reset: @ 82E43E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -2985,7 +2985,7 @@ _082E43FC:
 	thumb_func_end rfu_CB_reset
 
 	thumb_func_start rfu_REQ_configSystem
-rfu_REQ_configSystem: ; 82E440C
+rfu_REQ_configSystem: @ 82E440C
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -3038,7 +3038,7 @@ _082E4470: .4byte 0x03007894
 	thumb_func_end rfu_REQ_configSystem
 
 	thumb_func_start rfu_REQ_configGameData
-rfu_REQ_configGameData: ; 82E4474
+rfu_REQ_configGameData: @ 82E4474
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r4, r2, 0
@@ -3114,7 +3114,7 @@ _082E44FC: .4byte rfu_CB_configGameData
 	thumb_func_end rfu_REQ_configGameData
 
 	thumb_func_start rfu_CB_configGameData
-rfu_CB_configGameData: ; 82E4500
+rfu_CB_configGameData: @ 82E4500
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3199,7 +3199,7 @@ _082E4598: .4byte 0x03007890
 	thumb_func_end rfu_CB_configGameData
 
 	thumb_func_start rfu_REQ_startSearchChild
-rfu_REQ_startSearchChild: ; 82E459C
+rfu_REQ_startSearchChild: @ 82E459C
 	push {r4,lr}
 	movs r1, 0
 	ldr r4, _082E45E4
@@ -3252,7 +3252,7 @@ _082E4608: .4byte rfu_CB_startSearchChild
 	thumb_func_end rfu_REQ_startSearchChild
 
 	thumb_func_start rfu_CB_startSearchChild
-rfu_CB_startSearchChild: ; 82E460C
+rfu_CB_startSearchChild: @ 82E460C
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -3276,7 +3276,7 @@ _082E4630: .4byte 0x03007894
 	thumb_func_end rfu_CB_startSearchChild
 
 	thumb_func_start rfu_STC_clearLinkStatus
-rfu_STC_clearLinkStatus: ; 82E4634
+rfu_STC_clearLinkStatus: @ 82E4634
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -3329,7 +3329,7 @@ _082E4694: .4byte 0x01000040
 	thumb_func_end rfu_STC_clearLinkStatus
 
 	thumb_func_start rfu_REQ_pollSearchChild
-rfu_REQ_pollSearchChild: ; 82E4698
+rfu_REQ_pollSearchChild: @ 82E4698
 	push {lr}
 	ldr r0, _082E46A8
 	bl STWI_set_Callback_M
@@ -3341,7 +3341,7 @@ _082E46A8: .4byte rfu_CB_pollAndEndSearchChild
 	thumb_func_end rfu_REQ_pollSearchChild
 
 	thumb_func_start rfu_REQ_endSearchChild
-rfu_REQ_endSearchChild: ; 82E46AC
+rfu_REQ_endSearchChild: @ 82E46AC
 	push {lr}
 	ldr r0, _082E46BC
 	bl STWI_set_Callback_M
@@ -3353,7 +3353,7 @@ _082E46BC: .4byte rfu_CB_pollAndEndSearchChild
 	thumb_func_end rfu_REQ_endSearchChild
 
 	thumb_func_start rfu_CB_pollAndEndSearchChild
-rfu_CB_pollAndEndSearchChild: ; 82E46C0
+rfu_CB_pollAndEndSearchChild: @ 82E46C0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3420,7 +3420,7 @@ _082E4744: .4byte 0x03007894
 	thumb_func_end rfu_CB_pollAndEndSearchChild
 
 	thumb_func_start rfu_STC_readChildList
-rfu_STC_readChildList: ; 82E4748
+rfu_STC_readChildList: @ 82E4748
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3519,7 +3519,7 @@ _082E4800: .4byte 0x03007890
 	thumb_func_end rfu_STC_readChildList
 
 	thumb_func_start rfu_REQ_startSearchParent
-rfu_REQ_startSearchParent: ; 82E4804
+rfu_REQ_startSearchParent: @ 82E4804
 	push {lr}
 	ldr r0, _082E4814
 	bl STWI_set_Callback_M
@@ -3531,7 +3531,7 @@ _082E4814: .4byte rfu_CB_startSearchParent
 	thumb_func_end rfu_REQ_startSearchParent
 
 	thumb_func_start rfu_CB_startSearchParent
-rfu_CB_startSearchParent: ; 82E4818
+rfu_CB_startSearchParent: @ 82E4818
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -3552,7 +3552,7 @@ _082E482E:
 	thumb_func_end rfu_CB_startSearchParent
 
 	thumb_func_start rfu_REQ_pollSearchParent
-rfu_REQ_pollSearchParent: ; 82E483C
+rfu_REQ_pollSearchParent: @ 82E483C
 	push {lr}
 	ldr r0, _082E484C
 	bl STWI_set_Callback_M
@@ -3564,7 +3564,7 @@ _082E484C: .4byte sub_82E4850
 	thumb_func_end rfu_REQ_pollSearchParent
 
 	thumb_func_start sub_82E4850
-sub_82E4850: ; 82E4850
+sub_82E4850: @ 82E4850
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -3584,7 +3584,7 @@ _082E4864:
 	thumb_func_end sub_82E4850
 
 	thumb_func_start rfu_REQ_endSearchParent
-rfu_REQ_endSearchParent: ; 82E4874
+rfu_REQ_endSearchParent: @ 82E4874
 	push {lr}
 	ldr r0, _082E4884
 	bl STWI_set_Callback_M
@@ -3596,7 +3596,7 @@ _082E4884: .4byte rfu_STC_REQ_callback
 	thumb_func_end rfu_REQ_endSearchParent
 
 	thumb_func_start rfu_STC_readParentCandidateList
-rfu_STC_readParentCandidateList: ; 82E4888
+rfu_STC_readParentCandidateList: @ 82E4888
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3740,7 +3740,7 @@ _082E498C:
 	thumb_func_end rfu_STC_readParentCandidateList
 
 	thumb_func_start rfu_REQ_startConnectParent
-rfu_REQ_startConnectParent: ; 82E4998
+rfu_REQ_startConnectParent: @ 82E4998
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -3795,7 +3795,7 @@ _082E49F8:
 	thumb_func_end rfu_REQ_startConnectParent
 
 	thumb_func_start rfu_REQ_pollConnectParent
-rfu_REQ_pollConnectParent: ; 82E4A00
+rfu_REQ_pollConnectParent: @ 82E4A00
 	push {lr}
 	ldr r0, _082E4A10
 	bl STWI_set_Callback_M
@@ -3807,7 +3807,7 @@ _082E4A10: .4byte rfu_CB_pollConnectParent
 	thumb_func_end rfu_REQ_pollConnectParent
 
 	thumb_func_start rfu_CB_pollConnectParent
-rfu_CB_pollConnectParent: ; 82E4A14
+rfu_CB_pollConnectParent: @ 82E4A14
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3952,7 +3952,7 @@ _082E4B30: .4byte 0x03007890
 	thumb_func_end rfu_CB_pollConnectParent
 
 	thumb_func_start rfu_getConnectParentStatus
-rfu_getConnectParentStatus: ; 82E4B34
+rfu_getConnectParentStatus: @ 82E4B34
 	push {lr}
 	adds r3, r0, 0
 	movs r0, 0xFF
@@ -3984,7 +3984,7 @@ _082E4B64:
 	thumb_func_end rfu_getConnectParentStatus
 
 	thumb_func_start rfu_REQ_endConnectParent
-rfu_REQ_endConnectParent: ; 82E4B68
+rfu_REQ_endConnectParent: @ 82E4B68
 	push {lr}
 	ldr r0, _082E4B94
 	bl STWI_set_Callback_M
@@ -4013,7 +4013,7 @@ _082E4B9C: .4byte 0x03007894
 	thumb_func_end rfu_REQ_endConnectParent
 
 	thumb_func_start rfu_syncVBlank
-rfu_syncVBlank: ; 82E4BA0
+rfu_syncVBlank: @ 82E4BA0
 	push {r4,r5,lr}
 	bl rfu_NI_checkCommFailCounter
 	ldr r0, _082E4BE8
@@ -4132,7 +4132,7 @@ _082E4C7A:
 	thumb_func_end rfu_syncVBlank
 
 	thumb_func_start rfu_REQBN_watchLink
-rfu_REQBN_watchLink: ; 82E4C80
+rfu_REQBN_watchLink: @ 82E4C80
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4641,7 +4641,7 @@ _082E5068: .4byte 0x03007898
 	thumb_func_end rfu_REQBN_watchLink
 
 	thumb_func_start rfu_STC_removeLinkData
-rfu_STC_removeLinkData: ; 82E506C
+rfu_STC_removeLinkData: @ 82E506C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -4740,7 +4740,7 @@ _082E5128: .4byte 0x01000010
 	thumb_func_end rfu_STC_removeLinkData
 
 	thumb_func_start rfu_REQ_disconnect
-rfu_REQ_disconnect: ; 82E512C
+rfu_REQ_disconnect: @ 82E512C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -4809,7 +4809,7 @@ _082E51B8: .4byte rfu_CB_disconnect
 	thumb_func_end rfu_REQ_disconnect
 
 	thumb_func_start rfu_CB_disconnect
-rfu_CB_disconnect: ; 82E51BC
+rfu_CB_disconnect: @ 82E51BC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -4919,7 +4919,7 @@ _082E5298: .4byte 0x03007894
 	thumb_func_end rfu_CB_disconnect
 
 	thumb_func_start rfu_REQ_CHILD_startConnectRecovery
-rfu_REQ_CHILD_startConnectRecovery: ; 82E529C
+rfu_REQ_CHILD_startConnectRecovery: @ 82E529C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -4966,7 +4966,7 @@ _082E52F4: .4byte 0x03007890
 	thumb_func_end rfu_REQ_CHILD_startConnectRecovery
 
 	thumb_func_start rfu_REQ_CHILD_pollConnectRecovery
-rfu_REQ_CHILD_pollConnectRecovery: ; 82E52F8
+rfu_REQ_CHILD_pollConnectRecovery: @ 82E52F8
 	push {lr}
 	ldr r0, _082E5308
 	bl STWI_set_Callback_M
@@ -4978,7 +4978,7 @@ _082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery
 	thumb_func_end rfu_REQ_CHILD_pollConnectRecovery
 
 	thumb_func_start rfu_CB_CHILD_pollConnectRecovery
-rfu_CB_CHILD_pollConnectRecovery: ; 82E530C
+rfu_CB_CHILD_pollConnectRecovery: @ 82E530C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -5063,7 +5063,7 @@ _082E53AC: .4byte 0x03007890
 	thumb_func_end rfu_CB_CHILD_pollConnectRecovery
 
 	thumb_func_start rfu_CHILD_getConnectRecoveryStatus
-rfu_CHILD_getConnectRecoveryStatus: ; 82E53B0
+rfu_CHILD_getConnectRecoveryStatus: @ 82E53B0
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0xFF
@@ -5092,7 +5092,7 @@ _082E53DA:
 	thumb_func_end rfu_CHILD_getConnectRecoveryStatus
 
 	thumb_func_start rfu_REQ_CHILD_endConnectRecovery
-rfu_REQ_CHILD_endConnectRecovery: ; 82E53E0
+rfu_REQ_CHILD_endConnectRecovery: @ 82E53E0
 	push {lr}
 	ldr r0, _082E53F0
 	bl STWI_set_Callback_M
@@ -5104,7 +5104,7 @@ _082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery
 	thumb_func_end rfu_REQ_CHILD_endConnectRecovery
 
 	thumb_func_start sub_82E53F4
-sub_82E53F4: ; 82E53F4
+sub_82E53F4: @ 82E53F4
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r6, r1, 0
@@ -5119,7 +5119,7 @@ sub_82E53F4: ; 82E53F4
 	thumb_func_end sub_82E53F4
 
 	non_word_aligned_thumb_func_start sub_82E540A
-sub_82E540A: ; 82E540A
+sub_82E540A: @ 82E540A
 	ldrb r0, [r3]
 	strb r0, [r1]
 	adds r3, 0x1
@@ -5136,7 +5136,7 @@ _082E5418:
 	thumb_func_end sub_82E540A
 
 	thumb_func_start rfu_REQ_changeMasterSlave
-rfu_REQ_changeMasterSlave: ; 82E5424
+rfu_REQ_changeMasterSlave: @ 82E5424
 	push {lr}
 	movs r0, 0x1
 	bl STWI_read_status
@@ -5160,7 +5160,7 @@ _082E544C:
 	thumb_func_end rfu_REQ_changeMasterSlave
 
 	thumb_func_start rfu_getMasterSlave
-rfu_getMasterSlave: ; 82E5450
+rfu_getMasterSlave: @ 82E5450
 	push {lr}
 	movs r0, 0x1
 	bl STWI_read_status
@@ -5193,7 +5193,7 @@ _082E5484: .4byte 0x03007868
 	thumb_func_end rfu_getMasterSlave
 
 	thumb_func_start rfu_clearAllSlot
-rfu_clearAllSlot: ; 82E5488
+rfu_clearAllSlot: @ 82E5488
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -5269,7 +5269,7 @@ _082E5524: .4byte 0x03007894
 	thumb_func_end rfu_clearAllSlot
 
 	thumb_func_start rfu_STC_releaseFrame
-rfu_STC_releaseFrame: ; 82E5528
+rfu_STC_releaseFrame: @ 82E5528
 	push {r4-r6,lr}
 	adds r4, r2, 0
 	lsls r0, 24
@@ -5328,7 +5328,7 @@ _082E5590: .4byte 0x03007890
 	thumb_func_end rfu_STC_releaseFrame
 
 	thumb_func_start rfu_clearSlot
-rfu_clearSlot: ; 82E5594
+rfu_clearSlot: @ 82E5594
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -5557,7 +5557,7 @@ _082E574C: .4byte 0x04000208
 	thumb_func_end rfu_clearSlot
 
 	thumb_func_start rfu_setRecvBuffer
-rfu_setRecvBuffer: ; 82E5750
+rfu_setRecvBuffer: @ 82E5750
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -5612,7 +5612,7 @@ _082E57AC: .4byte 0x03007870
 	thumb_func_end rfu_setRecvBuffer
 
 	thumb_func_start rfu_NI_setSendData
-rfu_NI_setSendData: ; 82E57B0
+rfu_NI_setSendData: @ 82E57B0
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -5637,7 +5637,7 @@ rfu_NI_setSendData: ; 82E57B0
 	thumb_func_end rfu_NI_setSendData
 
 	thumb_func_start rfu_UNI_setSendData
-rfu_UNI_setSendData: ; 82E57DC
+rfu_UNI_setSendData: @ 82E57DC
 	push {lr}
 	sub sp, 0x4
 	adds r3, r1, 0
@@ -5671,7 +5671,7 @@ _082E57FE:
 	thumb_func_end rfu_UNI_setSendData
 
 	thumb_func_start rfu_NI_CHILD_setSendGameName
-rfu_NI_CHILD_setSendGameName: ; 82E5818
+rfu_NI_CHILD_setSendGameName: @ 82E5818
 	push {lr}
 	sub sp, 0x4
 	adds r2, r1, 0
@@ -5700,7 +5700,7 @@ _082E5848: .4byte 0x03007890
 	thumb_func_end rfu_NI_CHILD_setSendGameName
 
 	thumb_func_start rfu_STC_setSendData_org
-rfu_STC_setSendData_org: ; 82E584C
+rfu_STC_setSendData_org: @ 82E584C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -5978,7 +5978,7 @@ _082E5A50: .4byte 0x04000208
 	thumb_func_end rfu_STC_setSendData_org
 
 	thumb_func_start rfu_changeSendTarget
-rfu_changeSendTarget: ; 82E5A54
+rfu_changeSendTarget: @ 82E5A54
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -6167,7 +6167,7 @@ _082E5BAC:
 	thumb_func_end rfu_changeSendTarget
 
 	thumb_func_start rfu_NI_stopReceivingData
-rfu_NI_stopReceivingData: ; 82E5BBC
+rfu_NI_stopReceivingData: @ 82E5BBC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -6232,7 +6232,7 @@ _082E5C30: .4byte 0x04000208
 	thumb_func_end rfu_NI_stopReceivingData
 
 	thumb_func_start rfu_UNI_changeAndReadySendData
-rfu_UNI_changeAndReadySendData: ; 82E5C34
+rfu_UNI_changeAndReadySendData: @ 82E5C34
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	lsls r0, 24
@@ -6312,7 +6312,7 @@ _082E5CC0:
 	thumb_func_end rfu_UNI_changeAndReadySendData
 
 	thumb_func_start rfu_UNI_readySendData
-rfu_UNI_readySendData: ; 82E5CC8
+rfu_UNI_readySendData: @ 82E5CC8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -6337,7 +6337,7 @@ _082E5CF0: .4byte 0x00008024
 	thumb_func_end rfu_UNI_readySendData
 
 	thumb_func_start rfu_UNI_clearRecvNewDataFlag
-rfu_UNI_clearRecvNewDataFlag: ; 82E5CF4
+rfu_UNI_clearRecvNewDataFlag: @ 82E5CF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -6357,7 +6357,7 @@ _082E5D10: .4byte 0x03007870
 	thumb_func_end rfu_UNI_clearRecvNewDataFlag
 
 	thumb_func_start rfu_REQ_sendData
-rfu_REQ_sendData: ; 82E5D14
+rfu_REQ_sendData: @ 82E5D14
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -6514,7 +6514,7 @@ _082E5E54: .4byte rfu_CB_sendData2
 	thumb_func_end rfu_REQ_sendData
 
 	thumb_func_start rfu_CB_sendData
-rfu_CB_sendData: ; 82E5E58
+rfu_CB_sendData: @ 82E5E58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -6593,7 +6593,7 @@ _082E5EEC: .4byte 0x03007890
 	thumb_func_end rfu_CB_sendData
 
 	thumb_func_start rfu_CB_sendData2
-rfu_CB_sendData2: ; 82E5EF0
+rfu_CB_sendData2: @ 82E5EF0
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -6604,7 +6604,7 @@ rfu_CB_sendData2: ; 82E5EF0
 	thumb_func_end rfu_CB_sendData2
 
 	thumb_func_start sub_82E5F00
-sub_82E5F00: ; 82E5F00
+sub_82E5F00: @ 82E5F00
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -6627,7 +6627,7 @@ _082E5F22:
 	thumb_func_end sub_82E5F00
 
 	thumb_func_start rfu_constructSendLLFrame
-rfu_constructSendLLFrame: ; 82E5F28
+rfu_constructSendLLFrame: @ 82E5F28
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -6788,7 +6788,7 @@ _082E605C: .4byte 0x03007898
 	thumb_func_end rfu_constructSendLLFrame
 
 	thumb_func_start rfu_STC_NI_constructLLSF
-rfu_STC_NI_constructLLSF: ; 82E6060
+rfu_STC_NI_constructLLSF: @ 82E6060
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7026,7 +7026,7 @@ _082E6206:
 	thumb_func_end rfu_STC_NI_constructLLSF
 
 	thumb_func_start rfu_STC_UNI_constructLLSF
-rfu_STC_UNI_constructLLSF: ; 82E6220
+rfu_STC_UNI_constructLLSF: @ 82E6220
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -7140,7 +7140,7 @@ _082E62E8:
 	thumb_func_end rfu_STC_UNI_constructLLSF
 
 	thumb_func_start rfu_REQ_recvData
-rfu_REQ_recvData: ; 82E62F4
+rfu_REQ_recvData: @ 82E62F4
 	push {r4,lr}
 	ldr r0, _082E6328
 	ldr r4, [r0]
@@ -7172,7 +7172,7 @@ _082E6330: .4byte rfu_CB_recvData
 	thumb_func_end rfu_REQ_recvData
 
 	thumb_func_start rfu_CB_recvData
-rfu_CB_recvData: ; 82E6334
+rfu_CB_recvData: @ 82E6334
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -7290,7 +7290,7 @@ _082E641C: .4byte 0x03007894
 	thumb_func_end rfu_CB_recvData
 
 	thumb_func_start rfu_STC_PARENT_analyzeRecvPacket
-rfu_STC_PARENT_analyzeRecvPacket: ; 82E6420
+rfu_STC_PARENT_analyzeRecvPacket: @ 82E6420
 	push {r4-r7,lr}
 	sub sp, 0x4
 	ldr r1, _082E64B0
@@ -7373,7 +7373,7 @@ _082E64B4: .4byte 0x03007894
 	thumb_func_end rfu_STC_PARENT_analyzeRecvPacket
 
 	thumb_func_start rfu_STC_CHILD_analyzeRecvPacket
-rfu_STC_CHILD_analyzeRecvPacket: ; 82E64B8
+rfu_STC_CHILD_analyzeRecvPacket: @ 82E64B8
 	push {r4-r6,lr}
 	ldr r0, _082E6508
 	ldr r0, [r0]
@@ -7421,7 +7421,7 @@ _082E650C: .4byte 0x03007894
 	thumb_func_end rfu_STC_CHILD_analyzeRecvPacket
 
 	thumb_func_start rfu_STC_analyzeLLSF
-rfu_STC_analyzeLLSF: ; 82E6510
+rfu_STC_analyzeLLSF: @ 82E6510
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7716,7 +7716,7 @@ _082E6750: .4byte 0x03007890
 	thumb_func_end rfu_STC_analyzeLLSF
 
 	thumb_func_start rfu_STC_UNI_receive
-rfu_STC_UNI_receive: ; 82E6754
+rfu_STC_UNI_receive: @ 82E6754
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r6, r1, 0
@@ -7809,7 +7809,7 @@ _082E6804: .4byte 0x03007894
 	thumb_func_end rfu_STC_UNI_receive
 
 	thumb_func_start rfu_STC_NI_receive_Sender
-rfu_STC_NI_receive_Sender: ; 82E6808
+rfu_STC_NI_receive_Sender: @ 82E6808
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -8061,7 +8061,7 @@ _082E69F0: .4byte 0x03007880
 	thumb_func_end rfu_STC_NI_receive_Sender
 
 	thumb_func_start rfu_STC_NI_receive_Receiver
-rfu_STC_NI_receive_Receiver: ; 82E69F4
+rfu_STC_NI_receive_Receiver: @ 82E69F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -8251,7 +8251,7 @@ _082E6B6C: .4byte 0x03007894
 	thumb_func_end rfu_STC_NI_receive_Receiver
 
 	thumb_func_start rfu_STC_NI_initSlot_asRecvControllData
-rfu_STC_NI_initSlot_asRecvControllData: ; 82E6B70
+rfu_STC_NI_initSlot_asRecvControllData: @ 82E6B70
 	push {r4-r7,lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -8329,7 +8329,7 @@ _082E6BFC: .4byte 0x00008041
 	thumb_func_end rfu_STC_NI_initSlot_asRecvControllData
 
 	thumb_func_start rfu_STC_NI_initSlot_asRecvDataEntity
-rfu_STC_NI_initSlot_asRecvDataEntity: ; 82E6C00
+rfu_STC_NI_initSlot_asRecvDataEntity: @ 82E6C00
 	push {r4-r7,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -8424,7 +8424,7 @@ _082E6CB4: .4byte 0x00008042
 	thumb_func_end rfu_STC_NI_initSlot_asRecvDataEntity
 
 	thumb_func_start rfu_NI_checkCommFailCounter
-rfu_NI_checkCommFailCounter: ; 82E6CB8
+rfu_NI_checkCommFailCounter: @ 82E6CB8
 	push {r4-r7,lr}
 	ldr r2, _082E6D44
 	ldr r0, [r2]
@@ -8507,7 +8507,7 @@ _082E6D50: .4byte 0x03007880
 	thumb_func_end rfu_NI_checkCommFailCounter
 
 	thumb_func_start rfu_REQ_noise
-rfu_REQ_noise: ; 82E6D54
+rfu_REQ_noise: @ 82E6D54
 	push {lr}
 	ldr r0, _082E6D68
 	bl STWI_set_Callback_M
@@ -8521,7 +8521,7 @@ _082E6D68: .4byte rfu_STC_REQ_callback
 	thumb_func_end rfu_REQ_noise
 
 	thumb_func_start sub_82E6D6C
-sub_82E6D6C: ; 82E6D6C
+sub_82E6D6C: @ 82E6D6C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -8610,7 +8610,7 @@ _082E6E1C: .4byte 0x03007868
 	thumb_func_end sub_82E6D6C
 
 	thumb_func_start sub_82E6E20
-sub_82E6E20: ; 82E6E20
+sub_82E6E20: @ 82E6E20
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r3, _082E6E78
@@ -8665,7 +8665,7 @@ _082E6E90: .4byte 0x04000202
 	thumb_func_end sub_82E6E20
 
 	thumb_func_start sub_82E6E94
-sub_82E6E94: ; 82E6E94
+sub_82E6E94: @ 82E6E94
 	push {r4-r7,lr}
 	ldr r0, _082E6EA8
 	ldrb r1, [r0, 0x1]
@@ -8788,7 +8788,7 @@ _082E6F82:
 	thumb_func_end sub_82E6E94
 
 	thumb_func_start sub_82E6F88
-sub_82E6F88: ; 82E6F88
+sub_82E6F88: @ 82E6F88
 	push {r4,r5,lr}
 	ldr r0, _082E6FD0
 	ldr r5, [r0]
@@ -8805,7 +8805,7 @@ sub_82E6F88: ; 82E6F88
 	thumb_func_end sub_82E6F88
 
 	non_word_aligned_thumb_func_start sub_82E6FA2
-sub_82E6FA2: ; 82E6FA2
+sub_82E6FA2: @ 82E6FA2
 	ldrb r2, [r4]
 	lsls r1, r2, 4
 	adds r0, r5, 0
diff --git a/asm/librtc.s b/asm/librtc.s
index 5a1771a56..cabc70f13 100644
--- a/asm/librtc.s
+++ b/asm/librtc.s
@@ -1,6 +1,6 @@
 	thumb_func_start RTC_SetReadWrite
-; void RTC_SetReadWrite()
-RTC_SetReadWrite: ; 82E2150
+@ void RTC_SetReadWrite()
+RTC_SetReadWrite: @ 82E2150
 	push {r7,lr}
 	mov r7, sp
 	bl RTC_SetReadWriteInternal
@@ -14,8 +14,8 @@ RTC_SetReadWrite: ; 82E2150
 	thumb_func_end RTC_SetReadWrite
 
 	thumb_func_start RTC_SetReadOnly
-; void RTC_SetReadOnly()
-RTC_SetReadOnly: ; 82E2168
+@ void RTC_SetReadOnly()
+RTC_SetReadOnly: @ 82E2168
 	push {r7,lr}
 	mov r7, sp
 	bl RTC_SetReadOnlyInternal
@@ -29,8 +29,8 @@ RTC_SetReadOnly: ; 82E2168
 	thumb_func_end RTC_SetReadOnly
 
 	thumb_func_start RTC_Init
-; u8 RTC_Init()
-RTC_Init: ; 82E2180
+@ u8 RTC_Init()
+RTC_Init: @ 82E2180
 	push {r7,lr}
 	sub sp, 0x10
 	mov r7, sp
@@ -144,8 +144,8 @@ _082E224E:
 	thumb_func_end RTC_Init
 
 	thumb_func_start RTC_Reset
-; u8 RTC_Reset()
-RTC_Reset: ; 82E2258
+@ u8 RTC_Reset()
+RTC_Reset: @ 82E2258
 	push {r7,lr}
 	sub sp, 0x10
 	mov r7, sp
@@ -208,8 +208,8 @@ _082E22D4:
 	thumb_func_end RTC_Reset
 
 	thumb_func_start RTC_GetControlReg
-; u8 RTC_GetControlReg(struct RTCInfo *rtc)
-RTC_GetControlReg: ; 82E22DC
+@ u8 RTC_GetControlReg(struct RTCInfo *rtc)
+RTC_GetControlReg: @ 82E22DC
 	push {r4,r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -309,8 +309,8 @@ _082E23A0:
 	thumb_func_end RTC_GetControlReg
 
 	thumb_func_start RTC_SetControlReg
-; u8 RTC_SetControlReg(struct RTCInfo *rtc)
-RTC_SetControlReg: ; 82E23A8
+@ u8 RTC_SetControlReg(struct RTCInfo *rtc)
+RTC_SetControlReg: @ 82E23A8
 	push {r4,r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -391,8 +391,8 @@ _082E2448:
 	thumb_func_end RTC_SetControlReg
 
 	thumb_func_start RTC_GetDateTime
-; u8 RTC_GetDateTime(u8 *rtcDateTime)
-RTC_GetDateTime: ; 82E2450
+@ u8 RTC_GetDateTime(u8 *rtcDateTime)
+RTC_GetDateTime: @ 82E2450
 	push {r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -478,8 +478,8 @@ _082E24F8:
 	thumb_func_end RTC_GetDateTime
 
 	thumb_func_start RTC_SetDateTime
-; u8 RTC_SetDateTime(u8 *rtcDateTime)
-RTC_SetDateTime: ; 82E2500
+@ u8 RTC_SetDateTime(u8 *rtcDateTime)
+RTC_SetDateTime: @ 82E2500
 	push {r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -553,8 +553,8 @@ _082E2594:
 	thumb_func_end RTC_SetDateTime
 
 	thumb_func_start RTC_GetTime
-; u8 RTC_GetTime(u8 *rtcTime)
-RTC_GetTime: ; 82E259C
+@ u8 RTC_GetTime(u8 *rtcTime)
+RTC_GetTime: @ 82E259C
 	push {r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -641,8 +641,8 @@ _082E2648:
 	thumb_func_end RTC_GetTime
 
 	thumb_func_start RTC_SetTime
-; u8 RTC_SetTime(u8 *rtcTime)
-RTC_SetTime: ; 82E2650
+@ u8 RTC_SetTime(u8 *rtcTime)
+RTC_SetTime: @ 82E2650
 	push {r7,lr}
 	sub sp, 0x8
 	mov r7, sp
@@ -717,8 +717,8 @@ _082E26E4:
 	thumb_func_end RTC_SetTime
 
 	thumb_func_start RTC_SetUnknownData
-; u8 RTC_SetUnknownData(struct RTCInfo *rtc)
-RTC_SetUnknownData: ; 82E26EC
+@ u8 RTC_SetUnknownData(struct RTCInfo *rtc)
+RTC_SetUnknownData: @ 82E26EC
 	push {r4,r7,lr}
 	sub sp, 0xC
 	mov r7, sp
@@ -871,8 +871,8 @@ _082E2818:
 	thumb_func_end RTC_SetUnknownData
 
 	thumb_func_start RTC_WriteByte
-; u8 RTC_WriteByte(u8 value)
-RTC_WriteByte: ; 82E2820
+@ u8 RTC_WriteByte(u8 value)
+RTC_WriteByte: @ 82E2820
 	push {r4,r5,r7,lr}
 	sub sp, 0x4
 	mov r7, sp
@@ -960,8 +960,8 @@ _082E28BC:
 	thumb_func_end RTC_WriteByte
 
 	thumb_func_start RTC_WriteByteReversed
-; u8 RTC_WriteByteReversed(u8 value)
-RTC_WriteByteReversed: ; 82E28C4
+@ u8 RTC_WriteByteReversed(u8 value)
+RTC_WriteByteReversed: @ 82E28C4
 	push {r4,r7,lr}
 	sub sp, 0x4
 	mov r7, sp
@@ -1047,8 +1047,8 @@ _082E295C:
 	thumb_func_end RTC_WriteByteReversed
 
 	thumb_func_start RTC_ReadByte
-; u8 RTC_ReadByte()
-RTC_ReadByte: ; 82E2964
+@ u8 RTC_ReadByte()
+RTC_ReadByte: @ 82E2964
 	push {r7,lr}
 	sub sp, 0x4
 	mov r7, sp
@@ -1124,8 +1124,8 @@ _082E29E8:
 	thumb_func_end RTC_ReadByte
 
 	thumb_func_start RTC_SetReadWriteInternal
-; void RTC_SetReadWriteInternal()
-RTC_SetReadWriteInternal: ; 82E29F0
+@ void RTC_SetReadWriteInternal()
+RTC_SetReadWriteInternal: @ 82E29F0
 	push {r7,lr}
 	mov r7, sp
 	ldr r0, =GPIOPortReadWrite
@@ -1138,8 +1138,8 @@ RTC_SetReadWriteInternal: ; 82E29F0
 	thumb_func_end RTC_SetReadWriteInternal
 
 	thumb_func_start RTC_SetReadOnlyInternal
-; void RTC_SetReadOnlyInternal()
-RTC_SetReadOnlyInternal: ; 82E2A04
+@ void RTC_SetReadOnlyInternal()
+RTC_SetReadOnlyInternal: @ 82E2A04
 	push {r7,lr}
 	mov r7, sp
 	ldr r0, =GPIOPortReadWrite
diff --git a/asm/macros.s b/asm/macros.s
index c4e3b6c87..4f0afa734 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -23,16 +23,16 @@
 	.macro obj_pal address, tag
 	.4byte \address
 	.2byte \tag
-	.2byte 0; padding
+	.2byte 0@ padding
 	.endm
 
 	.macro zero_fill count
 	.fill \count
 	.endm
 
-; Berry trees have a table defining the palette slot used for each of their 5
-; stages. However, the first 2 stages always use the same slots regardless of
-; the type of tree and the slots of the last 3 stages always equal each other.
+@ Berry trees have a table defining the palette slot used for each of their 5
+@ stages. However, the first 2 stages always use the same slots regardless of
+@ the type of tree and the slots of the last 3 stages always equal each other.
 	.macro berry_tree_palette_slot_table slot
 	.byte 3, 4, \slot, \slot, \slot
 	.endm
@@ -46,24 +46,24 @@
 	.macro obj_image_anim_frame pic_id, duration, flags = 0
 	.2byte \pic_id
 	.byte (\flags) | (\duration)
-	.byte 0 ; padding
+	.byte 0 @ padding
 	.endm
 
 	.macro obj_image_anim_loop count
 	.2byte 0xfffd
 	.byte \count
-	.byte 0 ; padding
+	.byte 0 @ padding
 	.endm
 
 	.macro obj_image_anim_jump target_index
 	.2byte 0xfffe
 	.byte \target_index
-	.byte 0 ; padding
+	.byte 0 @ padding
 	.endm
 
 	.macro obj_image_anim_end
 	.2byte 0xffff
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.endm
 
 	.macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration
@@ -71,22 +71,22 @@
 	.2byte \delta_y_scale
 	.byte \delta_angle
 	.byte \duration
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.endm
 
 	.macro obj_rot_scal_anim_loop count
 	.2byte 0x7ffd
 	.2byte \count
-	.4byte 0 ; padding
+	.4byte 0 @ padding
 	.endm
 
 	.macro obj_rot_scal_anim_jump target_index
 	.2byte 0x7ffe
 	.2byte \target_index
-	.4byte 0 ; padding
+	.4byte 0 @ padding
 	.endm
 
 	.macro obj_rot_scal_anim_end
 	.2byte 0x7fff
-	.fill 6 ; padding
+	.fill 6 @ padding
 	.endm
diff --git a/asm/macros/event.s b/asm/macros/event.s
index 83853eda7..ee9c42c97 100644
--- a/asm/macros/event.s
+++ b/asm/macros/event.s
@@ -1,359 +1,359 @@
-	; Does nothing.
+	@ Does nothing.
 	.macro snop
 	.byte 0x00
 	.endm
 
-	; Does nothing.
+	@ Does nothing.
 	.macro snop1
 	.byte 0x01
 	.endm
 
-	; Terminates script execution.
+	@ Terminates script execution.
 	.macro end
 	.byte 0x02
 	.endm
 
-	; Jumps back to after the last-executed call statement, and continues script execution from there.
+	@ Jumps back to after the last-executed call statement, and continues script execution from there.
 	.macro return
 	.byte 0x03
 	.endm
 
-	; Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later.
+	@ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later.
 	.macro call destination
 	.byte 0x04
 	.4byte \destination
 	.endm
 
-	; Jumps to destination and continues script execution from there.
+	@ Jumps to destination and continues script execution from there.
 	.macro jump destination
 	.byte 0x05
 	.4byte \destination
 	.endm
 
-	; If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there.
+	@ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there.
 	.macro jumpif condition, destination
 	.byte 0x06
 	.byte \condition
 	.4byte \destination
 	.endm
 
-	; If the result of the last comparison matches condition (see Comparison operators), calls destination.
+	@ If the result of the last comparison matches condition (see Comparison operators), calls destination.
 	.macro callif condition, destination
 	.byte 0x07
 	.byte \condition
 	.4byte \destination
 	.endm
 
-	; Jumps to the standard function at index function.
+	@ Jumps to the standard function at index function.
 	.macro jumpstd function
 	.byte 0x08
 	.byte \function
 	.endm
 
-	; Calls the standard function at index function.
+	@ Calls the standard function at index function.
 	.macro callstd function
 	.byte 0x09
 	.byte \function
 	.endm
 
-	; If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function.
+	@ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function.
 	.macro jumpstdif condition, function
 	.byte 0x0a
 	.byte \condition
 	.byte \function
 	.endm
 
-	; If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function.
+	@ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function.
 	.macro callstdif condition, function
 	.byte 0x0b
 	.byte \condition
 	.byte \function
 	.endm
 
-	; Executes a script stored in a default RAM location.
+	@ Executes a script stored in a default RAM location.
 	.macro jumpram
 	.byte 0x0c
 	.endm
 
-	; Terminates script execution and "resets the script RAM".
+	@ Terminates script execution and "resets the script RAM".
 	.macro die
 	.byte 0x0d
 	.endm
 
-	; Pads the specified value to a dword, and then writes that dword to a predefined address (0x0203AAA8).
+	@ Pads the specified value to a dword, and then writes that dword to a predefined address (0x0203AAA8).
 	.macro setbyte value
 	.byte 0x0e
 	.byte \value
 	.endm
 
-	; Sets the specified script bank to value.
+	@ Sets the specified script bank to value.
 	.macro loadptr destination, value
 	.byte 0x0f
 	.byte \destination
 	.4byte \value
 	.endm
 
-	; Sets the specified script bank to value.
+	@ Sets the specified script bank to value.
 	.macro setbufferbyte destination, value
 	.byte 0x10
 	.byte \destination
 	.byte \value
 	.endm
 
-	; Sets the byte at offset to value.
+	@ Sets the byte at offset to value.
 	.macro writebytetooffset value, offset
 	.byte 0x11
 	.byte \value
 	.4byte \offset
 	.endm
 
-	; Copies the byte value at source into the specified script bank.
+	@ Copies the byte value at source into the specified script bank.
 	.macro loadbytefrompointer destination, source
 	.byte 0x12
 	.byte \destination
 	.4byte \source
 	.endm
 
-	; Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination.
+	@ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination.
 	.macro setptrbyte source, destination
 	.byte 0x13
 	.byte \source
 	.4byte \destination
 	.endm
 
-	; Copies the contents of bank source into bank destination.
+	@ Copies the contents of bank source into bank destination.
 	.macro copybuffers destination, source
 	.byte 0x14
 	.byte \destination
 	.byte \source
 	.endm
 
-	; Copies the byte at source to destination, replacing whatever byte was previously there.
+	@ Copies the byte at source to destination, replacing whatever byte was previously there.
 	.macro copybyte destination, source
 	.byte 0x15
 	.4byte \destination
 	.4byte \source
 	.endm
 
-	; Changes the value of destination to value.
+	@ Changes the value of destination to value.
 	.macro setvar destination, value
 	.byte 0x16
 	.2byte \destination
 	.2byte \value
 	.endm
 
-	; Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000).
+	@ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000).
 	.macro addvar destination, value
 	.byte 0x17
 	.2byte \destination
 	.2byte \value
 	.endm
 
-	; Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF).
+	@ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF).
 	.macro subvar destination, value
 	.byte 0x18
 	.2byte \destination
 	.2byte \value
 	.endm
 
-	; Copies the value of source into destination.
+	@ Copies the value of source into destination.
 	.macro copyvar destination, source
 	.byte 0x19
 	.2byte \destination
 	.2byte \source
 	.endm
 
-	; If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar.
+	@ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar.
 	.macro setorcopyvar destination, source
 	.byte 0x1a
 	.2byte \destination
 	.2byte \source
 	.endm
 
-	; Compares the values of script banks a and b, after forcing the values to bytes.
+	@ Compares the values of script banks a and b, after forcing the values to bytes.
 	.macro comparebuffers byte1, byte2
 	.byte 0x1b
 	.byte \byte1
 	.byte \byte2
 	.endm
 
-	; Compares the least-significant byte of the value of script bank a to a fixed byte value (b).
+	@ Compares the least-significant byte of the value of script bank a to a fixed byte value (b).
 	.macro comparebuffertobyte a, b
 	.byte 0x1c
 	.byte \a
 	.byte \b
 	.endm
 
-	; Compares the least-significant byte of the value of script bank a to the byte located at offset b.
+	@ Compares the least-significant byte of the value of script bank a to the byte located at offset b.
 	.macro comparebuffertoptrbyte a, b
 	.byte 0x1d
 	.byte \a
 	.4byte \b
 	.endm
 
-	; Compares the byte located at offset a to the least-significant byte of the value of script bank b.
+	@ Compares the byte located at offset a to the least-significant byte of the value of script bank b.
 	.macro compareptrbytetobuffer a, b
 	.byte 0x1e
 	.4byte \a
 	.byte \b
 	.endm
 
-	; Compares the byte located at offset a to a fixed byte value (b).
+	@ Compares the byte located at offset a to a fixed byte value (b).
 	.macro compareptrbytetobyte a, b
 	.byte 0x1f
 	.4byte \a
 	.byte \b
 	.endm
 
-	; Compares the byte located at offset a to the byte located at offset b.
+	@ Compares the byte located at offset a to the byte located at offset b.
 	.macro compareptrbytes a, b
 	.byte 0x20
 	.4byte \a
 	.4byte \b
 	.endm
 
-	; Compares the value of a to a fixed word value (b).
+	@ Compares the value of a to a fixed word value (b).
 	.macro compare a, b
 	.byte 0x21
 	.2byte \a
 	.2byte \b
 	.endm
 
-	; Compares the value of a to the value of b.
+	@ Compares the value of a to the value of b.
 	.macro comparevars a, b
 	.byte 0x22
 	.2byte \a
 	.2byte \b
 	.endm
 
-	; Calls the ASM routine stored at code. Script execution is blocked until the ASM returns (bx lr, mov pc, lr, etc.). Remember to add 1 to the offset when calling THUMB code.
+	@ Calls the ASM routine stored at code. Script execution is blocked until the ASM returns (bx lr, mov pc, lr, etc.). Remember to add 1 to the offset when calling THUMB code.
 	.macro callasm code
 	.byte 0x23
 	.4byte \code
 	.endm
 
-	; Replaces a pointer in the script engine RAM with asm_pointer.
+	@ Replaces a pointer in the script engine RAM with asm_pointer.
 	.macro jumpasm asm_pointer
 	.byte 0x24
 	.4byte \asm_pointer
 	.endm
 
-	; Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
+	@ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
 	.macro special function
 	.byte 0x25
 	.2byte \function
 	.endm
 
-	; Calls a special function. That function's output (if any) will be written to the variable you specify.
+	@ Calls a special function. That function's output (if any) will be written to the variable you specify.
 	.macro specialval output, function
 	.byte 0x26
 	.2byte \output
 	.2byte \function
 	.endm
 
-	; Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
+	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
 	.macro waitstate
 	.byte 0x27
 	.endm
 
-	; Blocks script execution for time (frames? milliseconds?).
+	@ Blocks script execution for time (frames? milliseconds?).
 	.macro pause time
 	.byte 0x28
 	.2byte \time
 	.endm
 
-	; Sets a to 1.
+	@ Sets a to 1.
 	.macro setflag a
 	.byte 0x29
 	.2byte \a
 	.endm
 
-	; Sets a to 0.
+	@ Sets a to 0.
 	.macro clearflag a
 	.byte 0x2a
 	.2byte \a
 	.endm
 
-	; Compares a to 1.
+	@ Compares a to 1.
 	.macro checkflag a
 	.byte 0x2b
 	.2byte \a
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro compareflags
 	.byte 0x2c
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro checkdailyflags
 	.byte 0x2d
 	.endm
 
-	; Resets the values of variables 0x8000, 0x8001, and 0x8002. Related to RTC in RSE?
+	@ Resets the values of variables 0x8000, 0x8001, and 0x8002. Related to RTC in RSE?
 	.macro resetvars
 	.byte 0x2e
 	.endm
 
-	; Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones.
+	@ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones.
 	.macro playsfx sound_number
 	.byte 0x2f
 	.2byte \sound_number
 	.endm
 
-	; Blocks script execution until the currently-playing sound (triggered by sound) finishes playing.
+	@ Blocks script execution until the currently-playing sound (triggered by sound) finishes playing.
 	.macro checksound
 	.byte 0x30
 	.endm
 
-	; Plays the specified (fanfare_number) fanfare.
+	@ Plays the specified (fanfare_number) fanfare.
 	.macro fanfare fanfare_number
 	.byte 0x31
 	.2byte \fanfare_number
 	.endm
 
-	; Blocks script execution until all currently-playing fanfares finish.
+	@ Blocks script execution until all currently-playing fanfares finish.
 	.macro waitfanfare
 	.byte 0x32
 	.endm
 
-	; Plays the specified (song_number) song. The byte is apparently supposed to be 0x00.
+	@ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00.
 	.macro playmusic song_number, unknown
 	.byte 0x33
 	.2byte \song_number
 	.byte \unknown
 	.endm
 
-	; Plays the specified (song_number) song.
+	@ Plays the specified (song_number) song.
 	.macro playmusicbattle song_number
 	.byte 0x34
 	.2byte \song_number
 	.endm
 
-	; Crossfades the currently-playing song into the map's default song.
+	@ Crossfades the currently-playing song into the map's default song.
 	.macro fadedefault
 	.byte 0x35
 	.endm
 
-	; Crossfades the currently-playng song into the specified (song_number) song.
+	@ Crossfades the currently-playng song into the specified (song_number) song.
 	.macro fademusic song_number
 	.byte 0x36
 	.2byte \song_number
 	.endm
 
-	; Fades out the currently-playing song.
+	@ Fades out the currently-playing song.
 	.macro fadeout speed
 	.byte 0x37
 	.byte \speed
 	.endm
 
-	; Fades the currently-playing song back in.
+	@ Fades the currently-playing song back in.
 	.macro fadein speed
 	.byte 0x38
 	.byte \speed
 	.endm
 
-	; Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map.
+	@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map.
 	.macro warp bank, map, warp, X, Y
 	.byte 0x39
 	.byte \bank
@@ -363,34 +363,34 @@
 	.2byte \Y
 	.endm
 
-	; Clone of warp that does not play a sound effect.
+	@ Clone of warp that does not play a sound effect.
 	.macro warpmuted
 	.byte 0x3a
 	.endm
 
-	; Clone of warp that uses "a walking effect".
+	@ Clone of warp that uses "a walking effect".
 	.macro warpwalk
 	.byte 0x3b
 	.endm
 
-	; Warps the player to another map using a hole animation.
+	@ Warps the player to another map using a hole animation.
 	.macro warphole bank, map
 	.byte 0x3c
 	.byte \bank
 	.byte \map
 	.endm
 
-	; Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.[source]
+	@ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E.[source]
 	.macro warpteleport
 	.byte 0x3d
 	.endm
 
-	; Clone of warp. Used by an (unused?) Safari Zone script to return the player to the gatehouse and end the Safari Game.
+	@ Clone of warp. Used by an (unused?) Safari Zone script to return the player to the gatehouse and end the Safari Game.
 	.macro warp3
 	.byte 0x3e
 	.endm
 
-	; Sets a default warp place. If a warp tries to send the player to Warp 127 on Map 127.127, they will instead be sent here. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
+	@ Sets a default warp place. If a warp tries to send the player to Warp 127 on Map 127.127, they will instead be sent here. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
 	.macro warpplace bank, map, warp, X, Y
 	.byte 0x3f
 	.byte \bank
@@ -400,122 +400,122 @@
 	.2byte \Y
 	.endm
 
-	; Clone of warp3, except that this writes data to different offsets...
+	@ Clone of warp3, except that this writes data to different offsets...
 	.macro warp4
 	.byte 0x40
 	.endm
 
-	; Clone of warp3, except that this writes data to different offsets...
+	@ Clone of warp3, except that this writes data to different offsets...
 	.macro warp5
 	.byte 0x41
 	.endm
 
-	; Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables.
+	@ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables.
 	.macro getplayerxy X, Y
 	.byte 0x42
 	.2byte \X
 	.2byte \Y
 	.endm
 
-	; Retrieves the number of Pokmon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
+	@ Retrieves the number of Pokmon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
 	.macro countpokemon
 	.byte 0x43
 	.endm
 
-	; Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
+	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000.
 	.macro additem index, quantity
 	.byte 0x44
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; Removes quantity of item index from the player's Bag.
+	@ Removes quantity of item index from the player's Bag.
 	.macro removeitem index, quantity
 	.byte 0x45
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room.
+	@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room.
 	.macro checkitemspace index, quantity
 	.byte 0x46
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item.
+	@ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item.
 	.macro checkitem index, quantity
 	.byte 0x47
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
+	@ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
 	.macro checkitemtype index
 	.byte 0x48
 	.2byte \index
 	.endm
 
-	; Adds a quantity amount of item index to the player's PC. Both arguments can be variables.
+	@ Adds a quantity amount of item index to the player's PC. Both arguments can be variables.
 	.macro addpcitem index, quantity
 	.byte 0x49
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; Checks for quantity amount of item index in the player's PC. Both arguments can be variables.
+	@ Checks for quantity amount of item index in the player's PC. Both arguments can be variables.
 	.macro checkpcitem index, quantity
 	.byte 0x4a
 	.2byte \index
 	.2byte \quantity
 	.endm
 
-	; In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro adddecor a
 	.byte 0x4b
 	.2byte \a
 	.endm
 
-	; In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro removedecor a
 	.byte 0x4c
 	.2byte \a
 	.endm
 
-	; In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro testdecor a
 	.byte 0x4d
 	.2byte \a
 	.endm
 
-	; In FireRed, this command is a nop. (The argument is read, but not used for anything.)
+	@ In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro checkdecor a
 	.byte 0x4e
 	.2byte \a
 	.endm
 
-	; Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open.
+	@ Applies the movement data at movements to the specified (index) Person event. Also closes any standard message boxes that are still open.
 	.macro move index, movements
 	.byte 0x4f
 	.2byte \index
 	.4byte \movements
 	.endm
 
-	; Apparent clone of applymovement. Oddly, it doesn't seem to work at all if applied to any Person other than the player (0xFF), and the X and Y arguments don't seem to do anything.
-	; This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention.
+	@ Apparent clone of applymovement. Oddly, it doesn't seem to work at all if applied to any Person other than the player (0xFF), and the X and Y arguments don't seem to do anything.
+	@ This command in fact uses variables to access the Person event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Person event 3 will have the movements at @move1 applied to them. Thank you Shiny Quagsire for bringing this to my attention.
 	.macro movecoords variable, movements
 	.byte 0x50
 	.2byte \variable
 	.4byte \movements
 	.endm
 
-	; Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing.
+	@ Blocks script execution until the movements being applied to the specified (index) Person event finish. If the specified Person event is 0x0000, then the command will block script execution until all Person events affected by applymovement finish their movements. If the specified Person event is not currently being manipulated with applymovement, then this command does nothing.
 	.macro waitmove index
 	.byte 0x51
 	.2byte \index
 	.endm
 
-	; Apparent clone of waitmovement. Oddly, it doesn't seem to work at all if applied to any Person other than the player (0xFF), and the X and Y arguments don't seem to do anything.
+	@ Apparent clone of waitmovement. Oddly, it doesn't seem to work at all if applied to any Person other than the player (0xFF), and the X and Y arguments don't seem to do anything.
 	.macro waitmovexy index, X, Y
 	.byte 0x52
 	.2byte \index
@@ -523,13 +523,13 @@
 	.byte \Y
 	.endm
 
-	; Attempts to hide the specified (local_ID, a local ID) Person event on the current map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing.
+	@ Attempts to hide the specified (local_ID, a local ID) Person event on the current map, by setting its visibility flag if it has a valid one. If the Person does not have a valid visibility flag, this command does nothing.
 	.macro disappear local_ID
 	.byte 0x53
 	.2byte \local_ID
 	.endm
 
-	; Clone of hidesprite that also moves the Person? Test it!
+	@ Clone of hidesprite that also moves the Person? Test it!
 	.macro disappearxy index, X, Y
 	.byte 0x54
 	.2byte \index
@@ -570,7 +570,7 @@
 	.byte \byte2
 	.endm
 
-	; If the script was called by a Person event, then that Person will turn to face toward the tile that the player is stepping off of.
+	@ If the script was called by a Person event, then that Person will turn to face toward the tile that the player is stepping off of.
 	.macro faceplayer
 	.byte 0x5a
 	.endm
@@ -581,7 +581,7 @@
 	.byte \byte
 	.endm
 
-	; If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
+	@ If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
 	.macro trainerbattle byte, word1, word2, pointer1, pointer2, pointer3, pointer4
 	.byte 0x5c
 	.byte \byte
@@ -593,7 +593,7 @@
 	.4byte \pointer4
 	.endm
 
-	; Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
+	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
 	.macro reptrainerbattle
 	.byte 0x5d
 	.endm
@@ -606,19 +606,19 @@
 	.byte 0x5f
 	.endm
 
-	; Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.)
+	@ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.)
 	.macro checktrainerflag trainer
 	.byte 0x60
 	.2byte \trainer
 	.endm
 
-	; Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
 	.macro cleartrainerflag trainer
 	.byte 0x61
 	.2byte \trainer
 	.endm
 
-	; Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
+	@ Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
 	.macro settrainerflag trainer
 	.byte 0x62
 	.2byte \trainer
@@ -642,55 +642,55 @@
 	.byte \byte
 	.endm
 
-	; If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn.
+	@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn.
 	.macro waittext
 	.byte 0x66
 	.endm
 
-	; Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.)
+	@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.)
 	.macro message text
 	.byte 0x67
 	.4byte \text
 	.endm
 
-	; Holds the current message box open until the player presses a key. The message box is then closed.
+	@ Holds the current message box open until the player presses a key. The message box is then closed.
 	.macro closebutton
 	.byte 0x68
 	.endm
 
-	; Ceases movement for all OWs on-screen.
+	@ Ceases movement for all OWs on-screen.
 	.macro lockall
 	.byte 0x69
 	.endm
 
-	; If the script was called by a Person event, then that Person's movement will cease.
+	@ If the script was called by a Person event, then that Person's movement will cease.
 	.macro lock
 	.byte 0x6a
 	.endm
 
-	; Resumes normal movement for all OWs on-screen, and closes any standard message boxes that are still open.
+	@ Resumes normal movement for all OWs on-screen, and closes any standard message boxes that are still open.
 	.macro releaseall
 	.byte 0x6b
 	.endm
 
-	; If the script was called by a Person event, then that Person's movement will resume. This command also closes any standard message boxes that are still open.
+	@ If the script was called by a Person event, then that Person's movement will resume. This command also closes any standard message boxes that are still open.
 	.macro release
 	.byte 0x6c
 	.endm
 
-	; Blocks script execution until the player presses any key.
+	@ Blocks script execution until the player presses any key.
 	.macro waitbutton
 	.byte 0x6d
 	.endm
 
-	; Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
+	@ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES".
 	.macro yesnobox X, Y
 	.byte 0x6e
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoice X, Y, list, B
 	.byte 0x6f
 	.byte \X
@@ -699,7 +699,7 @@
 	.byte \B
 	.endm
 
-	; Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoicedef X, Y, list, default, B
 	.byte 0x70
 	.byte \X
@@ -709,7 +709,7 @@
 	.byte \B
 	.endm
 
-	; Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
 	.macro multichoicerow X, Y, list, per_row, B
 	.byte 0x71
 	.byte \X
@@ -743,7 +743,7 @@
 	.byte \byte4
 	.endm
 
-	; Displays a box containing the front sprite for the specified (species) Pokmon species.
+	@ Displays a box containing the front sprite for the specified (species) Pokmon species.
 	.macro showpokepic species, X, Y
 	.byte 0x75
 	.2byte \species
@@ -751,24 +751,24 @@
 	.byte \Y
 	.endm
 
-	; Hides all boxes displayed with showpokepic.
+	@ Hides all boxes displayed with showpokepic.
 	.macro hidepokepic
 	.byte 0x76
 	.endm
 
-	; In FireRed, this command is a nop. (The argument is discarded.)
+	@ In FireRed, this command is a nop. (The argument is discarded.)
 	.macro showcontestwinner a
 	.byte 0x77
 	.byte \a
 	.endm
 
-	; Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters.
+	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters.
 	.macro braille text
 	.byte 0x78
 	.4byte \text
 	.endm
 
-	; Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
+	@ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
 	.macro givepokemon species, level, item, unknown1, unknown2, unknown3
 	.byte 0x79
 	.2byte \species
@@ -791,87 +791,87 @@
 	.2byte \word
 	.endm
 
-	; Checks if at least one Pokmon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the Pokmon that knows the move. If not, LASTRESULT is set to 0x0006.
+	@ Checks if at least one Pokmon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the Pokmon that knows the move. If not, LASTRESULT is set to 0x0006.
 	.macro checkattack index
 	.byte 0x7c
 	.2byte \index
 	.endm
 
-	; Writes the name of the Pokmon at index species to the specified buffer.
+	@ Writes the name of the Pokmon at index species to the specified buffer.
 	.macro bufferpoke out, species
 	.byte 0x7d
 	.byte \out
 	.2byte \species
 	.endm
 
-	; Writes the name of the first Pokmon in the player's party to the specified buffer.
+	@ Writes the name of the first Pokmon in the player's party to the specified buffer.
 	.macro bufferfirstpoke out
 	.byte 0x7e
 	.byte \out
 	.endm
 
-	; Writes the name of the Pokmon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
+	@ Writes the name of the Pokmon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer.
 	.macro bufferpartypoke out, slot
 	.byte 0x7f
 	.byte \out
 	.2byte \slot
 	.endm
 
-	; Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
+	@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
 	.macro bufferitem out, item
 	.byte 0x80
 	.byte \out
 	.2byte \item
 	.endm
 
-	; In FireRed, this command is a nop. (The first argument is discarded immediately. The second argument is read, but not used for anything.)
+	@ In FireRed, this command is a nop. (The first argument is discarded immediately. The second argument is read, but not used for anything.)
 	.macro bufferdecor a, b
 	.byte 0x81
 	.byte \a
 	.2byte \b
 	.endm
 
-	; Writes the name of the attack at index attack to the specified buffer.
+	@ Writes the name of the attack at index attack to the specified buffer.
 	.macro bufferattack out, attack
 	.byte 0x82
 	.byte \out
 	.2byte \attack
 	.endm
 
-	; Converts the value of input to a decimal string, and writes that string to the specified buffer.
+	@ Converts the value of input to a decimal string, and writes that string to the specified buffer.
 	.macro buffernum out, input
 	.byte 0x83
 	.byte \out
 	.2byte \input
 	.endm
 
-	; Writes the standard string identified by index to the specified buffer. Specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption (I've observed destruction of the stored player name and crashes when entering/exiting certain menu screens).
+	@ Writes the standard string identified by index to the specified buffer. Specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption (I've observed destruction of the stored player name and crashes when entering/exiting certain menu screens).
 	.macro bufferstd out, index
 	.byte 0x84
 	.byte \out
 	.2byte \index
 	.endm
 
-	; Copies the string at offset to the specified buffer.
+	@ Copies the string at offset to the specified buffer.
 	.macro buffertext out, offset
 	.byte 0x85
 	.byte \out
 	.4byte \offset
 	.endm
 
-	; Opens the Pokemart system, offering the specified products for sale.
+	@ Opens the Pokemart system, offering the specified products for sale.
 	.macro pokemart products
 	.byte 0x86
 	.4byte \products
 	.endm
 
-	; Apparent clone of pokemart.
+	@ Apparent clone of pokemart.
 	.macro pokemartdecor products
 	.byte 0x87
 	.4byte \products
 	.endm
 
-	; Apparent clone of pokemart.
+	@ Apparent clone of pokemart.
 	.macro pokemartbp products
 	.byte 0x88
 	.4byte \products
@@ -882,85 +882,85 @@
 	.2byte \word
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro event_8a
 	.byte 0x8a
 	.endm
 
-	; In FireRed, this command sets the byte at 0x03000EA8 to 0x01. I do not know what that means.
+	@ In FireRed, this command sets the byte at 0x03000EA8 to 0x01. I do not know what that means.
 	.macro choosecontestpkmn
 	.byte 0x8b
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro startcontest
 	.byte 0x8c
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro showcontestresults
 	.byte 0x8d
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro contestlinktransfer
 	.byte 0x8e
 	.endm
 
-	; Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT).
+	@ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT).
 	.macro random limit
 	.byte 0x8f
 	.2byte \limit
 	.endm
 
-	; If check is 0x00, this command adds value to the player's money.
+	@ If check is 0x00, this command adds value to the player's money.
 	.macro givemoney value, check
 	.byte 0x90
 	.4byte \value
 	.byte \check
 	.endm
 
-	; If check is 0x00, this command subtracts value from the player's money.
+	@ If check is 0x00, this command subtracts value from the player's money.
 	.macro paymoney value, check
 	.byte 0x91
 	.4byte \value
 	.byte \check
 	.endm
 
-	; If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not.
+	@ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not.
 	.macro checkmoney value, check
 	.byte 0x92
 	.4byte \value
 	.byte \check
 	.endm
 
-	; Spawns a secondary box showing how much money the player has.
+	@ Spawns a secondary box showing how much money the player has.
 	.macro showmoney X, Y
 	.byte 0x93
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Hides the secondary box spawned by showmoney.
+	@ Hides the secondary box spawned by showmoney.
 	.macro hidemoney X, Y
 	.byte 0x94
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Updates the secondary box spawned by showmoney. (What does it do with its arguments?)
+	@ Updates the secondary box spawned by showmoney. (What does it do with its arguments?)
 	.macro updatemoney X, Y
 	.byte 0x95
 	.byte \X
 	.byte \Y
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro event_96
 	.byte 0x96
 	.endm
 
-	; Fades the screen to black or back, using the specified effect. Effect 0x00 fades in, and effect 0x01 fades out. I don't know if other effects exist.
+	@ Fades the screen to black or back, using the specified effect. Effect 0x00 fades in, and effect 0x01 fades out. I don't know if other effects exist.
 	.macro fadescreen effect
 	.byte 0x97
 	.byte \effect
@@ -987,44 +987,44 @@
 	.4byte \pointer
 	.endm
 
-	; Executes the specified field move animation.
+	@ Executes the specified field move animation.
 	.macro doanimation animation
 	.byte 0x9c
 	.2byte \animation
 	.endm
 
-	; Tells the game which party Pokmon to use for the next field move animation.
+	@ Tells the game which party Pokmon to use for the next field move animation.
 	.macro setanimation animation, slot
 	.byte 0x9d
 	.byte \animation
 	.2byte \slot
 	.endm
 
-	; Blocks script execution until all playing field move animations complete.
+	@ Blocks script execution until all playing field move animations complete.
 	.macro checkanimation animation
 	.byte 0x9e
 	.2byte \animation
 	.endm
 
-	; Sets which healing place the player will return to if all of the Pokmon in their party faint. A list of available healing places can be found on PokeCommunity.
+	@ Sets which healing place the player will return to if all of the Pokmon in their party faint. A list of available healing places can be found on PokeCommunity.
 	.macro sethealplace flightspot
 	.byte 0x9f
 	.2byte \flightspot
 	.endm
 
-	; Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
+	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
 	.macro checkgender
 	.byte 0xa0
 	.endm
 
-	; Plays the specified (species) Pokmon's cry. You can use waitcry to block script execution until the sound finishes.
+	@ Plays the specified (species) Pokmon's cry. You can use waitcry to block script execution until the sound finishes.
 	.macro pokecry species, effect
 	.byte 0xa1
 	.2byte \species
 	.2byte \effect
 	.endm
 
-	; Changes the tile at (X, Y) on the current map.
+	@ Changes the tile at (X, Y) on the current map.
 	.macro setmaptile X, Y, tile_number, tile_attrib
 	.byte 0xa2
 	.2byte \X
@@ -1033,23 +1033,23 @@
 	.2byte \tile_attrib
 	.endm
 
-	; Queues a weather change to the default weather for the map.
+	@ Queues a weather change to the default weather for the map.
 	.macro resetweather
 	.byte 0xa3
 	.endm
 
-	; Queues a weather change to type weather.
+	@ Queues a weather change to type weather.
 	.macro setweather type
 	.byte 0xa4
 	.2byte \type
 	.endm
 
-	; Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather.
+	@ Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather.
 	.macro doweather
 	.byte 0xa5
 	.endm
 
-	; This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors).
+	@ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors).
 	.macro tileeffect subroutine
 	.byte 0xa6
 	.byte \subroutine
@@ -1091,45 +1091,45 @@
 	.byte \byte2
 	.endm
 
-	; Queues the opening of the door tile at (X, Y) with an animation.
+	@ Queues the opening of the door tile at (X, Y) with an animation.
 	.macro setdooropened X, Y
 	.byte 0xac
 	.2byte \X
 	.2byte \Y
 	.endm
 
-	; Queues the closing of the door tile at (X, Y) with an animation.
+	@ Queues the closing of the door tile at (X, Y) with an animation.
 	.macro setdoorclosed X, Y
 	.byte 0xad
 	.2byte \X
 	.2byte \Y
 	.endm
 
-	; Executes the state changes queued with setdooropened, setdoorclosed, setdooropened2, and setdoorclosed2.
+	@ Executes the state changes queued with setdooropened, setdoorclosed, setdooropened2, and setdoorclosed2.
 	.macro doorchange
 	.byte 0xae
 	.endm
 
-	; Queues the opening of the door tile at (X, Y) without an animation.
+	@ Queues the opening of the door tile at (X, Y) without an animation.
 	.macro setdooropened2 X, Y
 	.byte 0xaf
 	.2byte \X
 	.2byte \Y
 	.endm
 
-	; Queues the closing of the door tile at (X, Y) without an animation.
+	@ Queues the closing of the door tile at (X, Y) without an animation.
 	.macro setdoorclosed2 X, Y
 	.byte 0xb0
 	.2byte \X
 	.2byte \Y
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro event_b1
 	.byte 0xb1
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro event_b2
 	.byte 0xb2
 	.endm
@@ -1149,7 +1149,7 @@
 	.2byte \word
 	.endm
 
-	; Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
+	@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
 	.macro setwildbattle species, level, item
 	.byte 0xb6
 	.2byte \species
@@ -1157,7 +1157,7 @@
 	.2byte \item
 	.endm
 
-	; Starts a wild battle against the Pokmon generated by setwildbattle. Blocks script execution until the battle finishes.
+	@ Starts a wild battle against the Pokmon generated by setwildbattle. Blocks script execution until the battle finishes.
 	.macro dowildbattle
 	.byte 0xb7
 	.endm
@@ -1206,126 +1206,126 @@
 	.4byte \pointer
 	.endm
 
-	; Spawns a secondary box showing how many Coins the player has.
+	@ Spawns a secondary box showing how many Coins the player has.
 	.macro showcoins X, Y
 	.byte 0xc0
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Hides the secondary box spawned by showcoins. It doesn't appear to use its arguments, but they are still required.
+	@ Hides the secondary box spawned by showcoins. It doesn't appear to use its arguments, but they are still required.
 	.macro hidecoins X, Y
 	.byte 0xc1
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Updates the secondary box spawned by showcoins. (What does it do with its arguments?)
+	@ Updates the secondary box spawned by showcoins. (What does it do with its arguments?)
 	.macro updatecoins X, Y
 	.byte 0xc2
 	.byte \X
 	.byte \Y
 	.endm
 
-	; Increases the value of the specified hidden variable by 1. The hidden variable's value will not be allowed to exceed 0x00FFFFFF.
+	@ Increases the value of the specified hidden variable by 1. The hidden variable's value will not be allowed to exceed 0x00FFFFFF.
 	.macro inccounter a
 	.byte 0xc3
 	.byte \a
 	.endm
 
-	; Clone of warp... Except that it doesn't appear to have any effect when used in some of FireRed's default level scripts. (If it did, Berry Forest would be impossible to enter...)
+	@ Clone of warp... Except that it doesn't appear to have any effect when used in some of FireRed's default level scripts. (If it did, Berry Forest would be impossible to enter...)
 	.macro warp6
 	.byte 0xc4
 	.endm
 
-	; Blocks script execution until cry finishes.
+	@ Blocks script execution until cry finishes.
 	.macro waitpokecry
 	.byte 0xc5
 	.endm
 
-	; Writes the name of the specified (box) PC box to the specified buffer.
+	@ Writes the name of the specified (box) PC box to the specified buffer.
 	.macro bufferboxname out, box
 	.byte 0xc6
 	.byte \out
 	.2byte \box
 	.endm
 
-	; Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
+	@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
 	.macro textcolor color
 	.byte 0xc7
 	.byte \color
 	.endm
 
-	; The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened.
+	@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened.
 	.macro loadhelp pointer
 	.byte 0xc8
 	.4byte \pointer
 	.endm
 
-	; The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened.
+	@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened.
 	.macro unloadhelp
 	.byte 0xc9
 	.endm
 
-	; After using this command, all standard message boxes will use the signpost frame.
+	@ After using this command, all standard message boxes will use the signpost frame.
 	.macro signmsg
 	.byte 0xca
 	.endm
 
-	; Ends the effects of signmsg, returning message box frames to normal.
+	@ Ends the effects of signmsg, returning message box frames to normal.
 	.macro normalmsg
 	.byte 0xcb
 	.endm
 
-	; Compares the value of a hidden variable to a dword.
+	@ Compares the value of a hidden variable to a dword.
 	.macro comparehiddenvar a, value
 	.byte 0xcc
 	.byte \a
 	.4byte \value
 	.endm
 
-	; Makes the Pokmon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle.
+	@ Makes the Pokmon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle.
 	.macro setobedience slot
 	.byte 0xcd
 	.2byte \slot
 	.endm
 
-	; Checks if the Pokmon in the specified slot of the player's party is obedient. If the Pokmon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokmon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
+	@ Checks if the Pokmon in the specified slot of the player's party is obedient. If the Pokmon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokmon is obedient (or if the specified slot is empty or invalid), 0x0000 is written.
 	.macro checkobedience slot
 	.byte 0xce
 	.2byte \slot
 	.endm
 
-	; Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020370A4.
+	@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020370A4.
 	.macro execram
 	.byte 0xcf
 	.endm
 
-	; Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot.
+	@ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot.
 	.macro setworldflag worldmapflag
 	.byte 0xd0
 	.2byte \worldmapflag
 	.endm
 
-	; Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source]
+	@ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source]
 	.macro warpteleport2
 	.byte 0xd1
 	.endm
 
-	; Changes the location where the player caught the Pokmon in the specified slot of their party. A list of valid catch locations can be found on PokeCommunity.
+	@ Changes the location where the player caught the Pokmon in the specified slot of their party. A list of valid catch locations can be found on PokeCommunity.
 	.macro setcatchlocale slot, location
 	.byte 0xd2
 	.2byte \slot
 	.byte \location
 	.endm
 
-	; Sets variable 0x8004 to a value based on the width of the braille string at text.
+	@ Sets variable 0x8004 to a value based on the width of the braille string at text.
 	.macro braille2 text
 	.byte 0xd3
 	.4byte \text
 	.endm
 
-	; Writes the name of the specified (item) item to the specified buffer. If the specified item is a Berry (0x85 - 0xAE) or Poke Ball (0x4) and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). If the specified item is the Enigma Berry, I have no idea what this command does (but testing showed no pluralization). If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
+	@ Writes the name of the specified (item) item to the specified buffer. If the specified item is a Berry (0x85 - 0xAE) or Poke Ball (0x4) and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). If the specified item is the Enigma Berry, I have no idea what this command does (but testing showed no pluralization). If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
 	.macro storeitems out, item, quantity
 	.byte 0xd4
 	.byte \out
@@ -1333,7 +1333,7 @@
 	.2byte \quantity
 	.endm
 
-	; In FireRed, this command is a nop.
+	@ In FireRed, this command is a nop.
 	.macro event_d5
 	.byte 0xd5
 	.endm
diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.s
index bbdd07043..122392163 100644
--- a/asm/macros/pokemon_data.s
+++ b/asm/macros/pokemon_data.s
@@ -1,14 +1,14 @@
 	.macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset
 	.charmapstr "\category_name", 12
-	.2byte \height ; in decimeters
-	.2byte \width ; in hectograms
+	.2byte \height @ in decimeters
+	.2byte \width @ in hectograms
 	.4byte \text_pointer
-	.2byte 0 ; unused
+	.2byte 0 @ unused
 	.2byte \pokemon_scale
 	.2byte \pokemon_offset
 	.2byte \trainer_scale
 	.2byte \trainer_offset
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.endm
 
 	.macro base_stats hp, attack, defense, speed, sp_attack, sp_defense
@@ -32,7 +32,7 @@
 	.2byte \method
 	.2byte \parameter
 	.2byte \target_species
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.endm
 
 	.macro empty_evo_entries count
@@ -43,7 +43,7 @@
 	.2byte 20000 + \species
 	.endm
 
-; If the min level equals the max level, only one level argument is needed.
+@ If the min level equals the max level, only one level argument is needed.
 	.macro wild_mon species, min_level, max_level
 	.byte \min_level
 
diff --git a/asm/macros/window.s b/asm/macros/window.s
index a52a236c0..04c148114 100644
--- a/asm/macros/window.s
+++ b/asm/macros/window.s
@@ -25,7 +25,7 @@
 	.byte \glyph_height
 	.byte \glyph_spacing
 	.byte \line_spacing
-	.byte \text_color << 4 ; low nybble seems unused
+	.byte \text_color << 4 @ low nybble seems unused
 	.byte (\shadow_color << 4) | \bg_color
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.endm
diff --git a/asm/main.s b/asm/main.s
index 2572cdbbf..fe10dafb0 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -105,8 +105,8 @@ _080004B2:
 	thumb_func_end Main
 
 	thumb_func_start HandleLinkConnectionAndCallMainCallbacks
-; void HandleLinkConnectionAndCallMainCallbacks()
-HandleLinkConnectionAndCallMainCallbacks: ; 80004C4
+@ void HandleLinkConnectionAndCallMainCallbacks()
+HandleLinkConnectionAndCallMainCallbacks: @ 80004C4
 	push {lr}
 	bl HandleLinkConnection
 	lsls r0, 24
@@ -119,8 +119,8 @@ _080004D4:
 	thumb_func_end HandleLinkConnectionAndCallMainCallbacks
 
 	thumb_func_start InitVariablesAndSetCopyrightScreenCallback
-; void InitVariablesAndSetCopyrightScreenCallback()
-InitVariablesAndSetCopyrightScreenCallback: ; 80004D8
+@ void InitVariablesAndSetCopyrightScreenCallback()
+InitVariablesAndSetCopyrightScreenCallback: @ 80004D8
 	push {lr}
 	ldr r2, =0x030022c0
 	movs r0, 0
@@ -143,8 +143,8 @@ InitVariablesAndSetCopyrightScreenCallback: ; 80004D8
 	thumb_func_end InitVariablesAndSetCopyrightScreenCallback
 
 	thumb_func_start CallMainCallbacks
-; void CallMainCallbacks()
-CallMainCallbacks: ; 800051C
+@ void CallMainCallbacks()
+CallMainCallbacks: @ 800051C
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4]
@@ -164,8 +164,8 @@ _08000534:
 	thumb_func_end CallMainCallbacks
 
 	thumb_func_start SetMainCallback2
-; void SetMainCallback2(void ( *func)())
-SetMainCallback2: ; 8000540
+@ void SetMainCallback2(void ( *func)())
+SetMainCallback2: @ 8000540
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x4]
 	movs r0, 0x87
@@ -178,8 +178,8 @@ SetMainCallback2: ; 8000540
 	thumb_func_end SetMainCallback2
 
 	thumb_func_start StartTimer1
-; void StartTimer1()
-StartTimer1: ; 8000554
+@ void StartTimer1()
+StartTimer1: @ 8000554
 	ldr r1, =0x04000106
 	movs r0, 0x80
 	strh r0, [r1]
@@ -188,8 +188,8 @@ StartTimer1: ; 8000554
 	thumb_func_end StartTimer1
 
 	thumb_func_start SeedRngAndSetTrainerId
-; void SeedRngAndSetTrainerId()
-SeedRngAndSetTrainerId: ; 8000560
+@ void SeedRngAndSetTrainerId()
+SeedRngAndSetTrainerId: @ 8000560
 	push {r4,lr}
 	ldr r0, =0x04000104
 	ldrh r4, [r0]
@@ -207,8 +207,8 @@ SeedRngAndSetTrainerId: ; 8000560
 	thumb_func_end SeedRngAndSetTrainerId
 
 	thumb_func_start GetTrainerId
-; u16 GetTrainerId()
-GetTrainerId: ; 8000588
+@ u16 GetTrainerId()
+GetTrainerId: @ 8000588
 	ldr r0, =0x02020000
 	ldrh r0, [r0]
 	bx lr
@@ -216,8 +216,8 @@ GetTrainerId: ; 8000588
 	thumb_func_end GetTrainerId
 
 	thumb_func_start EnableVCountIntrAtLine150
-; void EnableVCountIntrAtLine150()
-EnableVCountIntrAtLine150: ; 8000594
+@ void EnableVCountIntrAtLine150()
+EnableVCountIntrAtLine150: @ 8000594
 	push {lr}
 	movs r0, 0x4
 	bl GetGpuReg
@@ -238,8 +238,8 @@ EnableVCountIntrAtLine150: ; 8000594
 	thumb_func_end EnableVCountIntrAtLine150
 
 	thumb_func_start InitKeypadData
-; void InitKeypadData()
-InitKeypadData: ; 80005BC
+@ void InitKeypadData()
+InitKeypadData: @ 80005BC
 	ldr r1, =0x030026fc
 	movs r0, 0x5
 	strh r0, [r1]
@@ -258,8 +258,8 @@ InitKeypadData: ; 80005BC
 	thumb_func_end InitKeypadData
 
 	thumb_func_start ReadKeypad
-; void ReadKeypad()
-ReadKeypad: ; 80005E4
+@ void ReadKeypad()
+ReadKeypad: @ 80005E4
 	push {lr}
 	ldr r0, =0x04000130
 	ldrh r1, [r0]
@@ -337,8 +337,8 @@ _08000676:
 	thumb_func_end ReadKeypad
 
 	thumb_func_start InitIntrHandlers
-; void InitIntrHandlers()
-InitIntrHandlers: ; 8000684
+@ void InitIntrHandlers()
+InitIntrHandlers: @ 8000684
 	push {r4,r5,lr}
 	ldr r5, =InterruptMain
 	ldr r4, =0x03002750
@@ -377,8 +377,8 @@ _08000690:
 	thumb_func_end InitIntrHandlers
 
 	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
@@ -386,8 +386,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
@@ -395,8 +395,8 @@ SetHBlankCallback: ; 80006FC
 	thumb_func_end SetHBlankCallback
 
 	thumb_func_start SetVCountCallback
-; void SetVCountCallback(void ( *func)())
-SetVCountCallback: ; 8000708
+@ void SetVCountCallback(void ( *func)())
+SetVCountCallback: @ 8000708
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x14]
 	bx lr
@@ -404,8 +404,8 @@ SetVCountCallback: ; 8000708
 	thumb_func_end SetVCountCallback
 
 	thumb_func_start RestoreSerialTimer3IntrHandlers
-; void RestoreSerialTimer3IntrHandlers()
-RestoreSerialTimer3IntrHandlers: ; 8000714
+@ void RestoreSerialTimer3IntrHandlers()
+RestoreSerialTimer3IntrHandlers: @ 8000714
 	ldr r0, =0x03002710
 	ldr r1, =SerialIntr
 	str r1, [r0, 0x4]
@@ -416,8 +416,8 @@ RestoreSerialTimer3IntrHandlers: ; 8000714
 	thumb_func_end RestoreSerialTimer3IntrHandlers
 
 	thumb_func_start SetSerialCallback
-; void SetSerialCallback(void ( *func)())
-SetSerialCallback: ; 800072C
+@ void SetSerialCallback(void ( *func)())
+SetSerialCallback: @ 800072C
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x18]
 	bx lr
@@ -425,8 +425,8 @@ SetSerialCallback: ; 800072C
 	thumb_func_end SetSerialCallback
 
 	thumb_func_start VBlankIntr
-; void VBlankIntr()
-VBlankIntr: ; 8000738
+@ void VBlankIntr()
+VBlankIntr: @ 8000738
 	push {r4,lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
@@ -509,8 +509,8 @@ _080007BE:
 	thumb_func_end VBlankIntr
 
 	thumb_func_start StartFlashMemoryTimer
-; void StartFlashMemoryTimer()
-StartFlashMemoryTimer: ; 8000800
+@ void StartFlashMemoryTimer()
+StartFlashMemoryTimer: @ 8000800
 	push {lr}
 	ldr r1, =0x0300272c
 	movs r0, 0x2
@@ -521,8 +521,8 @@ StartFlashMemoryTimer: ; 8000800
 	thumb_func_end StartFlashMemoryTimer
 
 	thumb_func_start HBlankIntr
-; void HBlankIntr()
-HBlankIntr: ; 8000814
+@ void HBlankIntr()
+HBlankIntr: @ 8000814
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x10]
@@ -546,8 +546,8 @@ _08000822:
 	thumb_func_end HBlankIntr
 
 	thumb_func_start VCountIntr
-; void VCountIntr()
-VCountIntr: ; 8000844
+@ void VCountIntr()
+VCountIntr: @ 8000844
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x14]
@@ -572,8 +572,8 @@ _08000852:
 	thumb_func_end VCountIntr
 
 	thumb_func_start SerialIntr
-; void SerialIntr()
-SerialIntr: ; 8000878
+@ void SerialIntr()
+SerialIntr: @ 8000878
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x18]
@@ -597,14 +597,14 @@ _08000886:
 	thumb_func_end SerialIntr
 
 	thumb_func_start DummyIntrHandler
-; void DummyIntrHandler()
-DummyIntrHandler: ; 80008A8
+@ void DummyIntrHandler()
+DummyIntrHandler: @ 80008A8
 	bx lr
 	thumb_func_end DummyIntrHandler
 
 	thumb_func_start WaitForVBlankIntr
-; void WaitForVBlankIntr()
-WaitForVBlankIntr: ; 80008AC
+@ void WaitForVBlankIntr()
+WaitForVBlankIntr: @ 80008AC
 	push {lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x1C]
@@ -631,7 +631,7 @@ _080008D0:
 	thumb_func_end WaitForVBlankIntr
 
 	thumb_func_start sub_80008DC
-sub_80008DC: ; 80008DC
+sub_80008DC: @ 80008DC
 	ldr r1, =0x0203cf5c
 	str r0, [r1]
 	bx lr
@@ -639,7 +639,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]
@@ -648,8 +648,8 @@ sub_80008E8: ; 80008E8
 	thumb_func_end sub_80008E8
 
 	thumb_func_start Reset
-; void Reset()
-Reset: ; 80008F4
+@ void Reset()
+Reset: @ 80008F4
 	push {r4,lr}
 	ldr r1, =0x04000208
 	movs r0, 0
@@ -696,7 +696,7 @@ Reset: ; 80008F4
 	thumb_func_end Reset
 
 	thumb_func_start sub_8000964
-sub_8000964: ; 8000964
+sub_8000964: @ 8000964
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 00933ced3..9dfc3f5a9 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -1,6 +1,6 @@
 	thumb_func_start CB2_MainMenu
-; void CB2_MainMenu()
-CB2_MainMenu: ; 802F6B0
+@ void CB2_MainMenu()
+CB2_MainMenu: @ 802F6B0
 	push {lr}
 	bl RunActiveTasks
 	bl CallObjectCallbacks
@@ -11,8 +11,8 @@ CB2_MainMenu: ; 802F6B0
 	thumb_func_end CB2_MainMenu
 
 	thumb_func_start VBlankCB_MainMenu
-; void VBlankCB_MainMenu()
-VBlankCB_MainMenu: ; 802F6C8
+@ void VBlankCB_MainMenu()
+VBlankCB_MainMenu: @ 802F6C8
 	push {lr}
 	bl LoadOamFromSprites
 	bl ProcessObjectCopyRequests
@@ -22,8 +22,8 @@ VBlankCB_MainMenu: ; 802F6C8
 	thumb_func_end VBlankCB_MainMenu
 
 	thumb_func_start CB2_InitMainMenu
-; void CB2_InitMainMenu()
-CB2_InitMainMenu: ; 802F6DC
+@ void CB2_InitMainMenu()
+CB2_InitMainMenu: @ 802F6DC
 	push {lr}
 	movs r0, 0
 	bl InitMainMenu
@@ -32,8 +32,8 @@ CB2_InitMainMenu: ; 802F6DC
 	thumb_func_end CB2_InitMainMenu
 
 	thumb_func_start CB2_ReinitMainMenu
-; void CB2_ReinitMainMenu()
-CB2_ReinitMainMenu: ; 802F6E8
+@ void CB2_ReinitMainMenu()
+CB2_ReinitMainMenu: @ 802F6E8
 	push {lr}
 	movs r0, 0x1
 	bl InitMainMenu
@@ -42,8 +42,8 @@ CB2_ReinitMainMenu: ; 802F6E8
 	thumb_func_end CB2_ReinitMainMenu
 
 	thumb_func_start InitMainMenu
-; void InitMainMenu(bool8 affects_palette_maybe)
-InitMainMenu: ; 802F6F4
+@ void InitMainMenu(bool8 affects_palette_maybe)
+InitMainMenu: @ 802F6F4
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -220,8 +220,8 @@ _0802F7FE:
 	thumb_func_end InitMainMenu
 
 	thumb_func_start Task_MainMenuCheckSaveFile
-; void Task_MainMenuCheckSaveFile(u8 taskId)
-Task_MainMenuCheckSaveFile: ; 802F8D8
+@ void Task_MainMenuCheckSaveFile(u8 taskId)
+Task_MainMenuCheckSaveFile: @ 802F8D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -403,8 +403,8 @@ _0802FA4E:
 	thumb_func_end Task_MainMenuCheckSaveFile
 
 	thumb_func_start Task_WaitForSaveFileErrorWindow
-; void Task_WaitForSaveFileErrorWindow(u8 taskId)
-Task_WaitForSaveFileErrorWindow: ; 802FA5C
+@ void Task_WaitForSaveFileErrorWindow(u8 taskId)
+Task_WaitForSaveFileErrorWindow: @ 802FA5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -439,8 +439,8 @@ _0802FA98:
 	thumb_func_end Task_WaitForSaveFileErrorWindow
 
 	thumb_func_start Task_MainMenuCheckBattery
-; void Task_MainMenuCheckBattery(u8 taskId)
-Task_MainMenuCheckBattery: ; 802FAB0
+@ void Task_MainMenuCheckBattery(u8 taskId)
+Task_MainMenuCheckBattery: @ 802FAB0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -505,8 +505,8 @@ _0802FB3C:
 	thumb_func_end Task_MainMenuCheckBattery
 
 	thumb_func_start Task_WaitForBatteryDryErrorWindow
-; void Task_WaitForBatteryDryErrorWindow(u8 taskId)
-Task_WaitForBatteryDryErrorWindow: ; 802FB50
+@ void Task_WaitForBatteryDryErrorWindow(u8 taskId)
+Task_WaitForBatteryDryErrorWindow: @ 802FB50
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -541,8 +541,8 @@ _0802FB8C:
 	thumb_func_end Task_WaitForBatteryDryErrorWindow
 
 	thumb_func_start Task_DisplayMainMenu
-; void Task_DisplayMainMenu(u8 taskId)
-Task_DisplayMainMenu: ; 802FBA4
+@ void Task_DisplayMainMenu(u8 taskId)
+Task_DisplayMainMenu: @ 802FBA4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -1036,8 +1036,8 @@ _0803006C:
 	thumb_func_end Task_DisplayMainMenu
 
 	thumb_func_start Task_HighlightSelectedMainMenuItem
-; void Task_HighlightSelectedMainMenuItem(u8 taskId)
-Task_HighlightSelectedMainMenuItem: ; 80300B0
+@ void Task_HighlightSelectedMainMenuItem(u8 taskId)
+Task_HighlightSelectedMainMenuItem: @ 80300B0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1060,8 +1060,8 @@ Task_HighlightSelectedMainMenuItem: ; 80300B0
 	thumb_func_end Task_HighlightSelectedMainMenuItem
 
 	thumb_func_start HandleMainMenuInput
-; u8 HandleMainMenuInput(u8 taskId)
-HandleMainMenuInput: ; 80300E0
+@ u8 HandleMainMenuInput(u8 taskId)
+HandleMainMenuInput: @ 80300E0
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -1231,8 +1231,8 @@ _08030242:
 	thumb_func_end HandleMainMenuInput
 
 	thumb_func_start Task_HandleMainMenuInput
-; void Task_HandleMainMenuInput(u8 taskId)
-Task_HandleMainMenuInput: ; 803024C
+@ void Task_HandleMainMenuInput(u8 taskId)
+Task_HandleMainMenuInput: @ 803024C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1256,8 +1256,8 @@ _0803026C:
 	thumb_func_end Task_HandleMainMenuInput
 
 	thumb_func_start Task_HandleMainMenuAPressed
-; void Task_HandleMainMenuAPressed(int task_id)
-Task_HandleMainMenuAPressed: ; 803027C
+@ void Task_HandleMainMenuAPressed(int task_id)
+Task_HandleMainMenuAPressed: @ 803027C
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -1570,8 +1570,8 @@ _08030536:
 	thumb_func_end Task_HandleMainMenuAPressed
 
 	thumb_func_start Task_HandleMainMenuBPressed
-; void Task_HandleMainMenuBPressed(u8 taskId)
-Task_HandleMainMenuBPressed: ; 8030544
+@ void Task_HandleMainMenuBPressed(u8 taskId)
+Task_HandleMainMenuBPressed: @ 8030544
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -1613,8 +1613,8 @@ _0803058C:
 	thumb_func_end Task_HandleMainMenuBPressed
 
 	thumb_func_start Task_DisplayMainMenuInvalidActionError
-; void Task_DisplayMainMenuInvalidActionError(u8 taskId)
-Task_DisplayMainMenuInvalidActionError: ; 80305A4
+@ void Task_DisplayMainMenuInvalidActionError(u8 taskId)
+Task_DisplayMainMenuInvalidActionError: @ 80305A4
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -1732,8 +1732,8 @@ _08030688:
 	thumb_func_end Task_DisplayMainMenuInvalidActionError
 
 	thumb_func_start HighlightSelectedMainMenuItem
-; void HighlightSelectedMainMenuItem(u8 a1, u8 selectedMenuItem, u16 a3)
-HighlightSelectedMainMenuItem: ; 8030698
+@ void HighlightSelectedMainMenuItem(u8 a1, u8 selectedMenuItem, u16 a3)
+HighlightSelectedMainMenuItem: @ 8030698
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -1870,8 +1870,8 @@ _080307A4:
 	thumb_func_end HighlightSelectedMainMenuItem
 
 	thumb_func_start task_new_game_prof_birch_speech_1
-; void task_new_game_prof_birch_speech_1(int task_id)
-task_new_game_prof_birch_speech_1: ; 80307B0
+@ void task_new_game_prof_birch_speech_1(int task_id)
+task_new_game_prof_birch_speech_1: @ 80307B0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -1964,7 +1964,7 @@ task_new_game_prof_birch_speech_1: ; 80307B0
 	thumb_func_end task_new_game_prof_birch_speech_1
 
 	thumb_func_start task_new_game_prof_birch_speech_2
-task_new_game_prof_birch_speech_2: ; 80308B0
+task_new_game_prof_birch_speech_2: @ 80308B0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -2024,8 +2024,8 @@ _0803091A:
 	thumb_func_end task_new_game_prof_birch_speech_2
 
 	thumb_func_start task_new_game_prof_birch_speech_3
-; int task_new_game_prof_birch_speech_3()
-task_new_game_prof_birch_speech_3: ; 8030928
+@ int task_new_game_prof_birch_speech_3()
+task_new_game_prof_birch_speech_3: @ 8030928
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2094,7 +2094,7 @@ _080309B6:
 	thumb_func_end task_new_game_prof_birch_speech_3
 
 	thumb_func_start task_new_game_prof_birch_speech_4
-task_new_game_prof_birch_speech_4: ; 80309CC
+task_new_game_prof_birch_speech_4: @ 80309CC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2131,7 +2131,7 @@ _08030A0A:
 	thumb_func_end task_new_game_prof_birch_speech_4
 
 	thumb_func_start task_new_game_prof_birch_speech_5
-task_new_game_prof_birch_speech_5: ; 8030A2C
+task_new_game_prof_birch_speech_5: @ 8030A2C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2159,7 +2159,7 @@ _08030A58:
 	thumb_func_end task_new_game_prof_birch_speech_5
 
 	thumb_func_start sub_8030A70
-sub_8030A70: ; 8030A70
+sub_8030A70: @ 8030A70
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -2232,7 +2232,7 @@ sub_8030A70: ; 8030A70
 	thumb_func_end sub_8030A70
 
 	thumb_func_start sub_8030B14
-sub_8030B14: ; 8030B14
+sub_8030B14: @ 8030B14
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -2323,7 +2323,7 @@ _08030BBA:
 	thumb_func_end sub_8030B14
 
 	thumb_func_start task_new_game_prof_birch_speech_6
-task_new_game_prof_birch_speech_6: ; 8030BCC
+task_new_game_prof_birch_speech_6: @ 8030BCC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2354,7 +2354,7 @@ _08030BFE:
 	thumb_func_end task_new_game_prof_birch_speech_6
 
 	thumb_func_start task_new_game_prof_birch_speech_7
-task_new_game_prof_birch_speech_7: ; 8030C18
+task_new_game_prof_birch_speech_7: @ 8030C18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -2410,7 +2410,7 @@ _08030C7C:
 	thumb_func_end task_new_game_prof_birch_speech_7
 
 	thumb_func_start task_new_game_prof_birch_speech_8
-task_new_game_prof_birch_speech_8: ; 8030C90
+task_new_game_prof_birch_speech_8: @ 8030C90
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2445,7 +2445,7 @@ _08030CC8:
 	thumb_func_end task_new_game_prof_birch_speech_8
 
 	thumb_func_start task_new_game_prof_birch_speech_9
-task_new_game_prof_birch_speech_9: ; 8030CD4
+task_new_game_prof_birch_speech_9: @ 8030CD4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2532,7 +2532,7 @@ _08030D7A:
 	thumb_func_end task_new_game_prof_birch_speech_9
 
 	thumb_func_start task_new_game_prof_birch_speech_10
-task_new_game_prof_birch_speech_10: ; 8030D84
+task_new_game_prof_birch_speech_10: @ 8030D84
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2566,7 +2566,7 @@ _08030DB8:
 	thumb_func_end task_new_game_prof_birch_speech_10
 
 	thumb_func_start task_new_game_prof_birch_speech_11
-task_new_game_prof_birch_speech_11: ; 8030DC8
+task_new_game_prof_birch_speech_11: @ 8030DC8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -2592,7 +2592,7 @@ task_new_game_prof_birch_speech_11: ; 8030DC8
 	thumb_func_end task_new_game_prof_birch_speech_11
 
 	thumb_func_start task_new_game_prof_birch_speech_12
-task_new_game_prof_birch_speech_12: ; 8030E08
+task_new_game_prof_birch_speech_12: @ 8030E08
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2616,7 +2616,7 @@ _08030E2A:
 	thumb_func_end task_new_game_prof_birch_speech_12
 
 	thumb_func_start task_new_game_prof_birch_speech_13
-task_new_game_prof_birch_speech_13: ; 8030E38
+task_new_game_prof_birch_speech_13: @ 8030E38
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -2686,7 +2686,7 @@ _08030EB8:
 	thumb_func_end task_new_game_prof_birch_speech_13
 
 	thumb_func_start sub_8030ED4
-sub_8030ED4: ; 8030ED4
+sub_8030ED4: @ 8030ED4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -2771,7 +2771,7 @@ _08030F72:
 	thumb_func_end sub_8030ED4
 
 	thumb_func_start sub_8030F7C
-sub_8030F7C: ; 8030F7C
+sub_8030F7C: @ 8030F7C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2817,7 +2817,7 @@ _08030FCA:
 	thumb_func_end sub_8030F7C
 
 	thumb_func_start task_new_game_prof_birch_speech_14
-task_new_game_prof_birch_speech_14: ; 8030FD4
+task_new_game_prof_birch_speech_14: @ 8030FD4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -2843,7 +2843,7 @@ task_new_game_prof_birch_speech_14: ; 8030FD4
 	thumb_func_end task_new_game_prof_birch_speech_14
 
 	thumb_func_start task_new_game_prof_birch_speech_15
-task_new_game_prof_birch_speech_15: ; 8031014
+task_new_game_prof_birch_speech_15: @ 8031014
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2866,7 +2866,7 @@ _08031032:
 	thumb_func_end task_new_game_prof_birch_speech_15
 
 	thumb_func_start task_new_game_prof_birch_speech_16
-task_new_game_prof_birch_speech_16: ; 8031040
+task_new_game_prof_birch_speech_16: @ 8031040
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -2905,7 +2905,7 @@ _0803107A:
 	thumb_func_end task_new_game_prof_birch_speech_16
 
 	thumb_func_start task_new_game_prof_birch_speech_17
-task_new_game_prof_birch_speech_17: ; 8031090
+task_new_game_prof_birch_speech_17: @ 8031090
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -2954,7 +2954,7 @@ _080310EC:
 	thumb_func_end task_new_game_prof_birch_speech_17
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_2
-task_new_game_prof_birch_speech_part2_2: ; 8031104
+task_new_game_prof_birch_speech_part2_2: @ 8031104
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -2980,7 +2980,7 @@ task_new_game_prof_birch_speech_part2_2: ; 8031104
 	thumb_func_end task_new_game_prof_birch_speech_part2_2
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_3
-task_new_game_prof_birch_speech_part2_3: ; 8031144
+task_new_game_prof_birch_speech_part2_3: @ 8031144
 	push {r4,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -3014,7 +3014,7 @@ _08031178:
 	thumb_func_end task_new_game_prof_birch_speech_part2_3
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_4
-task_new_game_prof_birch_speech_part2_4: ; 8031188
+task_new_game_prof_birch_speech_part2_4: @ 8031188
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -3084,7 +3084,7 @@ _08031210:
 	thumb_func_end task_new_game_prof_birch_speech_part2_4
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_5
-task_new_game_prof_birch_speech_part2_5: ; 8031220
+task_new_game_prof_birch_speech_part2_5: @ 8031220
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3115,7 +3115,7 @@ _08031250:
 	thumb_func_end task_new_game_prof_birch_speech_part2_5
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_6
-task_new_game_prof_birch_speech_part2_6: ; 8031258
+task_new_game_prof_birch_speech_part2_6: @ 8031258
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -3219,7 +3219,7 @@ _08031320:
 	thumb_func_end task_new_game_prof_birch_speech_part2_6
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_7
-task_new_game_prof_birch_speech_part2_7: ; 803133C
+task_new_game_prof_birch_speech_part2_7: @ 803133C
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -3300,7 +3300,7 @@ _080313D2:
 	thumb_func_end task_new_game_prof_birch_speech_part2_7
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_8
-task_new_game_prof_birch_speech_part2_8: ; 80313E4
+task_new_game_prof_birch_speech_part2_8: @ 80313E4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -3404,7 +3404,7 @@ _080314B0:
 	thumb_func_end task_new_game_prof_birch_speech_part2_8
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_9
-task_new_game_prof_birch_speech_part2_9: ; 80314C4
+task_new_game_prof_birch_speech_part2_9: @ 80314C4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3487,7 +3487,7 @@ _0803155C:
 	thumb_func_end task_new_game_prof_birch_speech_part2_9
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_10
-task_new_game_prof_birch_speech_part2_10: ; 8031580
+task_new_game_prof_birch_speech_part2_10: @ 8031580
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3516,7 +3516,7 @@ _080315AA:
 	thumb_func_end task_new_game_prof_birch_speech_part2_10
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_11
-task_new_game_prof_birch_speech_part2_11: ; 80315BC
+task_new_game_prof_birch_speech_part2_11: @ 80315BC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -3563,7 +3563,7 @@ _0803160A:
 	thumb_func_end task_new_game_prof_birch_speech_part2_11
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_12
-task_new_game_prof_birch_speech_part2_12: ; 8031630
+task_new_game_prof_birch_speech_part2_12: @ 8031630
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3594,7 +3594,7 @@ _08031666:
 	thumb_func_end task_new_game_prof_birch_speech_part2_12
 
 	thumb_func_start new_game_prof_birch_speech_part2_start
-new_game_prof_birch_speech_part2_start: ; 8031678
+new_game_prof_birch_speech_part2_start: @ 8031678
 	push {r4,r5,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -3812,12 +3812,12 @@ _080317E0:
 	thumb_func_end new_game_prof_birch_speech_part2_start
 
 	thumb_func_start nullsub_11
-nullsub_11: ; 80318D4
+nullsub_11: @ 80318D4
 	bx lr
 	thumb_func_end nullsub_11
 
 	thumb_func_start sub_80318D8
-sub_80318D8: ; 80318D8
+sub_80318D8: @ 80318D8
 	movs r2, 0x22
 	ldrsh r1, [r0, r2]
 	lsls r1, 16
@@ -3834,7 +3834,7 @@ sub_80318D8: ; 80318D8
 	thumb_func_end sub_80318D8
 
 	thumb_func_start sub_80318F4
-sub_80318F4: ; 80318F4
+sub_80318F4: @ 80318F4
 	push {lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -3862,8 +3862,8 @@ sub_80318F4: ; 80318F4
 	thumb_func_end sub_80318F4
 
 	thumb_func_start AddBirchSpeechObjects
-; void AddBirchSpeechObjects(u8 taskId)
-AddBirchSpeechObjects: ; 803192C
+@ void AddBirchSpeechObjects(u8 taskId)
+AddBirchSpeechObjects: @ 803192C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4006,7 +4006,7 @@ AddBirchSpeechObjects: ; 803192C
 	thumb_func_end AddBirchSpeechObjects
 
 	thumb_func_start sub_8031A5C
-sub_8031A5C: ; 8031A5C
+sub_8031A5C: @ 8031A5C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -4064,7 +4064,7 @@ _08031AC4:
 	thumb_func_end sub_8031A5C
 
 	thumb_func_start sub_8031ACC
-sub_8031ACC: ; 8031ACC
+sub_8031ACC: @ 8031ACC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -4116,7 +4116,7 @@ sub_8031ACC: ; 8031ACC
 	thumb_func_end sub_8031ACC
 
 	thumb_func_start sub_8031B3C
-sub_8031B3C: ; 8031B3C
+sub_8031B3C: @ 8031B3C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -4174,7 +4174,7 @@ _08031BA4:
 	thumb_func_end sub_8031B3C
 
 	thumb_func_start sub_8031BAC
-sub_8031BAC: ; 8031BAC
+sub_8031BAC: @ 8031BAC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -4227,7 +4227,7 @@ sub_8031BAC: ; 8031BAC
 	thumb_func_end sub_8031BAC
 
 	thumb_func_start sub_8031C1C
-sub_8031C1C: ; 8031C1C
+sub_8031C1C: @ 8031C1C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -4284,7 +4284,7 @@ _08031C7C:
 	thumb_func_end sub_8031C1C
 
 	thumb_func_start sub_8031C88
-sub_8031C88: ; 8031C88
+sub_8031C88: @ 8031C88
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -4316,7 +4316,7 @@ sub_8031C88: ; 8031C88
 	thumb_func_end sub_8031C88
 
 	thumb_func_start sub_8031CC8
-sub_8031CC8: ; 8031CC8
+sub_8031CC8: @ 8031CC8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -4373,7 +4373,7 @@ _08031D28:
 	thumb_func_end sub_8031CC8
 
 	thumb_func_start sub_8031D34
-sub_8031D34: ; 8031D34
+sub_8031D34: @ 8031D34
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -4404,7 +4404,7 @@ sub_8031D34: ; 8031D34
 	thumb_func_end sub_8031D34
 
 	thumb_func_start sub_8031D74
-sub_8031D74: ; 8031D74
+sub_8031D74: @ 8031D74
 	push {lr}
 	ldr r0, =gUnknown_082FF088
 	movs r1, 0xF3
@@ -4431,7 +4431,7 @@ sub_8031D74: ; 8031D74
 	thumb_func_end sub_8031D74
 
 	thumb_func_start sub_8031DB4
-sub_8031DB4: ; 8031DB4
+sub_8031DB4: @ 8031DB4
 	push {lr}
 	bl ProcessMenuInputNoWrapAround
 	lsls r0, 24
@@ -4441,8 +4441,8 @@ sub_8031DB4: ; 8031DB4
 	thumb_func_end sub_8031DB4
 
 	thumb_func_start set_default_player_name
-; void set_default_player_name(int name_id)
-set_default_player_name: ; 8031DC4
+@ void set_default_player_name(int name_id)
+set_default_player_name: @ 8031DC4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -4484,8 +4484,8 @@ _08031DF0:
 	thumb_func_end set_default_player_name
 
 	thumb_func_start CreateMainMenuErrorWindow
-; void CreateMainMenuErrorWindow(u8 *str)
-CreateMainMenuErrorWindow: ; 8031E18
+@ void CreateMainMenuErrorWindow(u8 *str)
+CreateMainMenuErrorWindow: @ 8031E18
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -4525,7 +4525,7 @@ CreateMainMenuErrorWindow: ; 8031E18
 	thumb_func_end CreateMainMenuErrorWindow
 
 	thumb_func_start fmt_savegame
-fmt_savegame: ; 8031E7C
+fmt_savegame: @ 8031E7C
 	push {lr}
 	bl fmt_time
 	bl fmt_pokedex
@@ -4536,7 +4536,7 @@ fmt_savegame: ; 8031E7C
 	thumb_func_end fmt_savegame
 
 	thumb_func_start fmt_time
-fmt_time: ; 8031E94
+fmt_time: @ 8031E94
 	push {r4-r6,lr}
 	sub sp, 0xC
 	ldr r4, =0x02021fc4
@@ -4578,7 +4578,7 @@ fmt_time: ; 8031E94
 	thumb_func_end fmt_time
 
 	thumb_func_start fmt_player
-fmt_player: ; 8031EF8
+fmt_player: @ 8031EF8
 	push {r4-r6,lr}
 	sub sp, 0x2C
 	ldr r4, =0x02021fc4
@@ -4634,7 +4634,7 @@ fmt_player: ; 8031EF8
 	thumb_func_end fmt_player
 
 	thumb_func_start fmt_pokedex
-fmt_pokedex: ; 8031F7C
+fmt_pokedex: @ 8031F7C
 	push {r4-r7,lr}
 	sub sp, 0x2C
 	ldr r0, =0x00000861
@@ -4700,7 +4700,7 @@ _08031FFE:
 	thumb_func_end fmt_pokedex
 
 	thumb_func_start fmt_badges
-fmt_badges: ; 8032014
+fmt_badges: @ 8032014
 	push {r4-r7,lr}
 	sub sp, 0x2C
 	movs r7, 0
@@ -4763,8 +4763,8 @@ _08032030:
 	thumb_func_end fmt_badges
 
 	thumb_func_start LoadMainMenuWindowFrameTiles
-; void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
-LoadMainMenuWindowFrameTiles: ; 80320A4
+@ void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
+LoadMainMenuWindowFrameTiles: @ 80320A4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -4798,8 +4798,8 @@ LoadMainMenuWindowFrameTiles: ; 80320A4
 	thumb_func_end LoadMainMenuWindowFrameTiles
 
 	thumb_func_start DrawMainMenuWindowBorder
-; void DrawMainMenuWindowBorder(struct WindowTemplate *template, u16 baseTileNum)
-DrawMainMenuWindowBorder: ; 80320EC
+@ void DrawMainMenuWindowBorder(struct WindowTemplate *template, u16 baseTileNum)
+DrawMainMenuWindowBorder: @ 80320EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4972,7 +4972,7 @@ DrawMainMenuWindowBorder: ; 80320EC
 	thumb_func_end DrawMainMenuWindowBorder
 
 	thumb_func_start sub_8032250
-sub_8032250: ; 8032250
+sub_8032250: @ 8032250
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -5010,7 +5010,7 @@ sub_8032250: ; 8032250
 	thumb_func_end sub_8032250
 
 	thumb_func_start sub_8032298
-sub_8032298: ; 8032298
+sub_8032298: @ 8032298
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r1, 0
@@ -5049,7 +5049,7 @@ sub_8032298: ; 8032298
 	thumb_func_end sub_8032298
 
 	thumb_func_start sub_80322E0
-sub_80322E0: ; 80322E0
+sub_80322E0: @ 80322E0
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -5077,7 +5077,7 @@ _0803230E:
 	thumb_func_end sub_80322E0
 
 	thumb_func_start sub_8032318
-sub_8032318: ; 8032318
+sub_8032318: @ 8032318
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -5142,7 +5142,7 @@ sub_8032318: ; 8032318
 	thumb_func_end sub_8032318
 
 	thumb_func_start sub_80323A0
-sub_80323A0: ; 80323A0
+sub_80323A0: @ 80323A0
 	push {lr}
 	ldr r0, [r0]
 	subs r0, 0x2
@@ -5165,7 +5165,7 @@ _080323C0:
 	thumb_func_end sub_80323A0
 
 	thumb_func_start sub_80323CC
-sub_80323CC: ; 80323CC
+sub_80323CC: @ 80323CC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -5222,7 +5222,7 @@ sub_80323CC: ; 80323CC
 	thumb_func_end sub_80323CC
 
 	thumb_func_start unknown_rbox_to_vram
-unknown_rbox_to_vram: ; 803243C
+unknown_rbox_to_vram: @ 803243C
 	push {r4,r5,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -5250,7 +5250,7 @@ _0803246A:
 	thumb_func_end unknown_rbox_to_vram
 
 	thumb_func_start sub_8032474
-sub_8032474: ; 8032474
+sub_8032474: @ 8032474
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -5440,7 +5440,7 @@ sub_8032474: ; 8032474
 	thumb_func_end sub_8032474
 
 	thumb_func_start task_new_game_prof_birch_speech_part2_1
-task_new_game_prof_birch_speech_part2_1: ; 803261C
+task_new_game_prof_birch_speech_part2_1: @ 803261C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
diff --git a/asm/malloc.s b/asm/malloc.s
index a66839966..d9cb84e8e 100644
--- a/asm/malloc.s
+++ b/asm/malloc.s
@@ -1,6 +1,6 @@
 	thumb_func_start PutMemBlockHeader
-; void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
-PutMemBlockHeader: ; 8000988
+@ void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
+PutMemBlockHeader: @ 8000988
 	push {r4,lr}
 	movs r4, 0
 	strh r4, [r0]
@@ -16,8 +16,8 @@ PutMemBlockHeader: ; 8000988
 	thumb_func_end PutMemBlockHeader
 
 	thumb_func_start PutFirstMemBlockHeader
-; void PutFirstMemBlockHeader(void *block, u32 size)
-PutFirstMemBlockHeader: ; 80009A4
+@ void PutFirstMemBlockHeader(void *block, u32 size)
+PutFirstMemBlockHeader: @ 80009A4
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r1, 0
@@ -29,8 +29,8 @@ PutFirstMemBlockHeader: ; 80009A4
 	thumb_func_end PutFirstMemBlockHeader
 
 	thumb_func_start AllocInternal
-; void *AllocInternal(struct MemBlock *head, u32 size)
-AllocInternal: ; 80009B8
+@ void *AllocInternal(struct MemBlock *head, u32 size)
+AllocInternal: @ 80009B8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r4, 0
@@ -91,8 +91,8 @@ _08000A18:
 	thumb_func_end AllocInternal
 
 	thumb_func_start FreeInternal
-; void FreeInternal(void *heapStart, void *pointer)
-FreeInternal: ; 8000A20
+@ void FreeInternal(void *heapStart, void *pointer)
+FreeInternal: @ 8000A20
 	push {r4,r5,lr}
 	cmp r1, 0
 	beq _08000A7C
@@ -148,8 +148,8 @@ _08000A7C:
 	thumb_func_end FreeInternal
 
 	thumb_func_start AllocZeroedInternal
-; void *AllocZeroedInternal(void *heapStart, u32 size)
-AllocZeroedInternal: ; 8000A84
+@ void *AllocZeroedInternal(void *heapStart, u32 size)
+AllocZeroedInternal: @ 8000A84
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r1, 0
@@ -184,8 +184,8 @@ _08000AB8:
 	thumb_func_end AllocZeroedInternal
 
 	thumb_func_start CheckMemBlockInternal
-; bool8 CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node)
-CheckMemBlockInternal: ; 8000AC4
+@ bool8 CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node)
+CheckMemBlockInternal: @ 8000AC4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r3, r1, 0
@@ -236,8 +236,8 @@ _08000B16:
 	thumb_func_end CheckMemBlockInternal
 
 	thumb_func_start InitHeap
-; void InitHeap(void *heapStart, u32 heapSize)
-InitHeap: ; 8000B1C
+@ void InitHeap(void *heapStart, u32 heapSize)
+InitHeap: @ 8000B1C
 	push {lr}
 	ldr r2, =0x03000004
 	str r0, [r2]
@@ -250,8 +250,8 @@ InitHeap: ; 8000B1C
 	thumb_func_end InitHeap
 
 	thumb_func_start Alloc
-; void *Alloc(u32 size)
-Alloc: ; 8000B38
+@ void *Alloc(u32 size)
+Alloc: @ 8000B38
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03000004
@@ -263,8 +263,8 @@ Alloc: ; 8000B38
 	thumb_func_end Alloc
 
 	thumb_func_start AllocZeroed
-; void *AllocZeroed(u32 size)
-AllocZeroed: ; 8000B4C
+@ void *AllocZeroed(u32 size)
+AllocZeroed: @ 8000B4C
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03000004
@@ -276,8 +276,8 @@ AllocZeroed: ; 8000B4C
 	thumb_func_end AllocZeroed
 
 	thumb_func_start Free
-; void Free(void *pointer)
-Free: ; 8000B60
+@ void Free(void *pointer)
+Free: @ 8000B60
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03000004
@@ -289,8 +289,8 @@ Free: ; 8000B60
 	thumb_func_end Free
 
 	thumb_func_start CheckMemBlock
-; bool8 CheckMemBlock(void *pointer)
-CheckMemBlock: ; 8000B74
+@ bool8 CheckMemBlock(void *pointer)
+CheckMemBlock: @ 8000B74
 	push {lr}
 	adds r1, r0, 0
 	ldr r0, =0x03000004
@@ -302,8 +302,8 @@ CheckMemBlock: ; 8000B74
 	thumb_func_end CheckMemBlock
 
 	thumb_func_start CheckHeap
-; bool8 CheckHeap()
-CheckHeap: ; 8000B88
+@ bool8 CheckHeap()
+CheckHeap: @ 8000B88
 	push {r4,r5,lr}
 	ldr r0, =0x03000004
 	ldr r4, [r0]
diff --git a/asm/multiboot.s b/asm/multiboot.s
index cecfa8ba7..0600ad5ba 100644
--- a/asm/multiboot.s
+++ b/asm/multiboot.s
@@ -1,6 +1,6 @@
 	thumb_func_start MultiBootInit
-; void MultiBootInit(MultiBootParam *mp)
-MultiBootInit: ; 81BA6D0
+@ void MultiBootInit(MultiBootParam *mp)
+MultiBootInit: @ 81BA6D0
 	adds r2, r0, 0
 	movs r1, 0
 	strb r1, [r2, 0x1E]
@@ -27,8 +27,8 @@ MultiBootInit: ; 81BA6D0
 	thumb_func_end MultiBootInit
 
 	thumb_func_start MultiBootMain
-; int MultiBootMain(MultiBootParam *mp)
-MultiBootMain: ; 81BA70C
+@ int MultiBootMain(MultiBootParam *mp)
+MultiBootMain: @ 81BA70C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -544,8 +544,8 @@ _081BAAEC:
 	thumb_func_end MultiBootMain
 
 	thumb_func_start MultiBootSend
-; int MultiBootSend(MultiBootParam *mp, u16 data)
-MultiBootSend: ; 81BAAFC
+@ int MultiBootSend(MultiBootParam *mp, u16 data)
+MultiBootSend: @ 81BAAFC
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -581,8 +581,8 @@ _081BAB40:
 	thumb_func_end MultiBootSend
 
 	thumb_func_start MultiBootStartProbe
-; void MultiBootStartProbe(MultiBootParam *mp)
-MultiBootStartProbe: ; 81BAB48
+@ void MultiBootStartProbe(MultiBootParam *mp)
+MultiBootStartProbe: @ 81BAB48
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1, 0x18]
@@ -604,8 +604,8 @@ _081BAB66:
 	thumb_func_end MultiBootStartProbe
 
 	thumb_func_start MultiBootStartMaster
-; void MultiBootStartMaster(MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed)
-MultiBootStartMaster: ; 81BAB6C
+@ void MultiBootStartMaster(MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed)
+MultiBootStartMaster: @ 81BAB6C
 	push {r4-r7,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -703,8 +703,8 @@ _081BAC28:
 	thumb_func_end MultiBootStartMaster
 
 	thumb_func_start MultiBootCheckComplete
-; s32 MultiBootCheckComplete(MultiBootParam *mp)
-MultiBootCheckComplete: ; 81BAC30
+@ s32 MultiBootCheckComplete(MultiBootParam *mp)
+MultiBootCheckComplete: @ 81BAC30
 	push {lr}
 	ldrb r0, [r0, 0x18]
 	cmp r0, 0xE9
@@ -719,8 +719,8 @@ _081BAC3E:
 	thumb_func_end MultiBootCheckComplete
 
 	thumb_func_start MultiBootHandShake
-; int MultiBootHandShake(MultiBootParam *mp)
-MultiBootHandShake: ; 81BAC44
+@ int MultiBootHandShake(MultiBootParam *mp)
+MultiBootHandShake: @ 81BAC44
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	ldrb r0, [r3, 0x18]
@@ -847,8 +847,8 @@ _081BAD28:
 	thumb_func_end MultiBootHandShake
 
 	thumb_func_start MultiBootWaitCycles
-; void MultiBootWaitCycles(u32 cycles)
-MultiBootWaitCycles: ; 81BAD30
+@ void MultiBootWaitCycles(u32 cycles)
+MultiBootWaitCycles: @ 81BAD30
 	mov r2, pc
 	lsrs r2, 24
 	movs r1, 0xC
@@ -865,8 +865,8 @@ _081BAD42:
 	thumb_func_end MultiBootWaitCycles
 
 	thumb_func_start MultiBootWaitSendDone
-; void MultiBootWaitSendDone(void)
-MultiBootWaitSendDone: ; 81BAD48
+@ void MultiBootWaitSendDone(void)
+MultiBootWaitSendDone: @ 81BAD48
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r3, =0x04000128
diff --git a/asm/pixel_buffer.s b/asm/pixel_buffer.s
index d353a1d20..9582e494e 100644
--- a/asm/pixel_buffer.s
+++ b/asm/pixel_buffer.s
@@ -1,6 +1,6 @@
 	thumb_func_start BlitBitmapRect4BitWithoutColorKey
-; void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height)
-BlitBitmapRect4BitWithoutColorKey: ; 8002BDC
+@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height)
+BlitBitmapRect4BitWithoutColorKey: @ 8002BDC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -37,8 +37,8 @@ BlitBitmapRect4BitWithoutColorKey: ; 8002BDC
 	thumb_func_end BlitBitmapRect4BitWithoutColorKey
 
 	thumb_func_start BlitBitmapRect4Bit
-; void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey)
-BlitBitmapRect4Bit: ; 8002C20
+@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey)
+BlitBitmapRect4Bit: @ 8002C20
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -292,8 +292,8 @@ _08002DEE:
 	thumb_func_end BlitBitmapRect4Bit
 
 	thumb_func_start FillBitmapRect4Bit
-; void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
-FillBitmapRect4Bit: ; 8002E00
+@ void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
+FillBitmapRect4Bit: @ 8002E00
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -404,8 +404,8 @@ _08002EB6:
 	thumb_func_end FillBitmapRect4Bit
 
 	thumb_func_start BlitBitmapRect4BitTo8Bit
-; void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset)
-BlitBitmapRect4BitTo8Bit: ; 8002EC8
+@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset)
+BlitBitmapRect4BitTo8Bit: @ 8002EC8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -721,8 +721,8 @@ _08003106:
 	thumb_func_end BlitBitmapRect4BitTo8Bit
 
 	thumb_func_start FillBitmapRect8Bit
-; void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
-FillBitmapRect8Bit: ; 8003118
+@ void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
+FillBitmapRect8Bit: @ 8003118
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
diff --git a/asm/rtc.s b/asm/rtc.s
index 3c8a285e9..c9c293d2a 100644
--- a/asm/rtc.s
+++ b/asm/rtc.s
@@ -1,6 +1,6 @@
 	thumb_func_start GameFreakRTC_ClearIME
-; void GameFreakRTC_ClearIME()
-GameFreakRTC_ClearIME: ; 802F0CC
+@ void GameFreakRTC_ClearIME()
+GameFreakRTC_ClearIME: @ 802F0CC
 	ldr r2, =0x03000dce
 	ldr r1, =0x04000208
 	ldrh r0, [r1]
@@ -12,8 +12,8 @@ GameFreakRTC_ClearIME: ; 802F0CC
 	thumb_func_end GameFreakRTC_ClearIME
 
 	thumb_func_start GameFreakRTC_RestoreIME
-; void GameFreakRTC_RestoreIME()
-GameFreakRTC_RestoreIME: ; 802F0E4
+@ void GameFreakRTC_RestoreIME()
+GameFreakRTC_RestoreIME: @ 802F0E4
 	ldr r0, =0x04000208
 	ldr r1, =0x03000dce
 	ldrh r1, [r1]
@@ -23,8 +23,8 @@ GameFreakRTC_RestoreIME: ; 802F0E4
 	thumb_func_end GameFreakRTC_RestoreIME
 
 	thumb_func_start GameFreakRTC_ConvertFromBCD
-; u8 GameFreakRTC_ConvertFromBCD(u8 bcdByte)
-GameFreakRTC_ConvertFromBCD: ; 802F0F8
+@ u8 GameFreakRTC_ConvertFromBCD(u8 bcdByte)
+GameFreakRTC_ConvertFromBCD: @ 802F0F8
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -51,8 +51,8 @@ _0802F11C:
 	thumb_func_end GameFreakRTC_ConvertFromBCD
 
 	thumb_func_start GameFreakRTC_IsLeapYear
-; bool8 GameFreakRTC_IsLeapYear(u32 year)
-GameFreakRTC_IsLeapYear: ; 802F120
+@ bool8 GameFreakRTC_IsLeapYear(u32 year)
+GameFreakRTC_IsLeapYear: @ 802F120
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3
@@ -83,8 +83,8 @@ _0802F14C:
 	thumb_func_end GameFreakRTC_IsLeapYear
 
 	thumb_func_start GameFreakRTC_ConvertYearMonthDayToNumDays
-; u16 GameFreakRTC_ConvertYearMonthDayToNumDays(u8 year, u8 month, u8 dayOfMonth)
-GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154
+@ u16 GameFreakRTC_ConvertYearMonthDayToNumDays(u8 year, u8 month, u8 dayOfMonth)
+GameFreakRTC_ConvertYearMonthDayToNumDays: @ 802F154
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -158,8 +158,8 @@ _0802F1C2:
 	thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays
 
 	thumb_func_start GameFreakRTC_GetNumDaysInternal
-; u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc)
-GameFreakRTC_GetNumDaysInternal: ; 802F1E0
+@ u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc)
+GameFreakRTC_GetNumDaysInternal: @ 802F1E0
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldrb r0, [r6]
@@ -188,8 +188,8 @@ GameFreakRTC_GetNumDaysInternal: ; 802F1E0
 	thumb_func_end GameFreakRTC_GetNumDaysInternal
 
 	thumb_func_start GameFreakRTC_Init
-; void GameFreakRTC_Init()
-GameFreakRTC_Init: ; 802F21C
+@ void GameFreakRTC_Init()
+GameFreakRTC_Init: @ 802F21C
 	push {r4,r5,lr}
 	ldr r5, =0x03000db8
 	movs r0, 0
@@ -232,8 +232,8 @@ _0802F26E:
 	thumb_func_end GameFreakRTC_Init
 
 	thumb_func_start GameFreakRTC_GetErrorFlags
-; u16 GameFreakRTC_GetErrorFlags()
-GameFreakRTC_GetErrorFlags: ; 802F27C
+@ u16 GameFreakRTC_GetErrorFlags()
+GameFreakRTC_GetErrorFlags: @ 802F27C
 	ldr r0, =0x03000db8
 	ldrh r0, [r0]
 	bx lr
@@ -241,8 +241,8 @@ GameFreakRTC_GetErrorFlags: ; 802F27C
 	thumb_func_end GameFreakRTC_GetErrorFlags
 
 	thumb_func_start GameFreakRTC_GetRTCDateTime
-; void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc)
-GameFreakRTC_GetRTCDateTime: ; 802F288
+@ void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc)
+GameFreakRTC_GetRTCDateTime: @ 802F288
 	push {r4,lr}
 	adds r2, r0, 0
 	ldr r0, =0x03000db8
@@ -268,8 +268,8 @@ _0802F2B2:
 	thumb_func_end GameFreakRTC_GetRTCDateTime
 
 	thumb_func_start GameFreakRTC_GetRTCDateTimeInternal
-; void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc)
-GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8
+@ void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc)
+GameFreakRTC_GetRTCDateTimeInternal: @ 802F2B8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GameFreakRTC_ClearIME
@@ -282,8 +282,8 @@ GameFreakRTC_GetRTCDateTimeInternal: ; 802F2B8
 	thumb_func_end GameFreakRTC_GetRTCDateTimeInternal
 
 	thumb_func_start GameFreakRTC_GetControlReg
-; void GameFreakRTC_GetControlReg(struct RTCInfo *rtc)
-GameFreakRTC_GetControlReg: ; 802F2D0
+@ void GameFreakRTC_GetControlReg(struct RTCInfo *rtc)
+GameFreakRTC_GetControlReg: @ 802F2D0
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GameFreakRTC_ClearIME
@@ -296,8 +296,8 @@ GameFreakRTC_GetControlReg: ; 802F2D0
 	thumb_func_end GameFreakRTC_GetControlReg
 
 	thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime
-; void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc)
-GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8
+@ void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc)
+GameFreakRTC_GetControlRegAndRTCDateTime: @ 802F2E8
 	push {r4,lr}
 	adds r4, r0, 0
 	bl GameFreakRTC_GetControlReg
@@ -309,8 +309,8 @@ GameFreakRTC_GetControlRegAndRTCDateTime: ; 802F2E8
 	thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime
 
 	thumb_func_start GameFreakRTC_TestForErrors
-; u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc)
-GameFreakRTC_TestForErrors: ; 802F2FC
+@ u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc)
+GameFreakRTC_TestForErrors: @ 802F2FC
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -441,8 +441,8 @@ _0802F3E6:
 	thumb_func_end GameFreakRTC_TestForErrors
 
 	thumb_func_start GameFreakRTC_Reset
-; void GameFreakRTC_Reset()
-GameFreakRTC_Reset: ; 802F3F8
+@ void GameFreakRTC_Reset()
+GameFreakRTC_Reset: @ 802F3F8
 	push {lr}
 	bl GameFreakRTC_ClearIME
 	bl RTC_Reset
@@ -452,8 +452,8 @@ GameFreakRTC_Reset: ; 802F3F8
 	thumb_func_end GameFreakRTC_Reset
 
 	thumb_func_start GameFreakRTC_FormatDecimalTimeString
-; void GameFreakRTC_FormatDecimalTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
-GameFreakRTC_FormatDecimalTimeString: ; 802F40C
+@ void GameFreakRTC_FormatDecimalTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
+GameFreakRTC_FormatDecimalTimeString: @ 802F40C
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -481,8 +481,8 @@ GameFreakRTC_FormatDecimalTimeString: ; 802F40C
 	thumb_func_end GameFreakRTC_FormatDecimalTimeString
 
 	thumb_func_start GameFreakRTC_FormatHexTimeString
-; void GameFreakRTC_FormatHexTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
-GameFreakRTC_FormatHexTimeString: ; 802F444
+@ void GameFreakRTC_FormatHexTimeString(u8 *dest, s32 hour, s32 minute, s32 second)
+GameFreakRTC_FormatHexTimeString: @ 802F444
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -510,8 +510,8 @@ GameFreakRTC_FormatHexTimeString: ; 802F444
 	thumb_func_end GameFreakRTC_FormatHexTimeString
 
 	thumb_func_start GameFreakRTC_FormatHexTimeStringFromRTCInfo
-; void GameFreakRTC_FormatHexTimeStringFromRTCInfo()
-GameFreakRTC_FormatHexTimeStringFromRTCInfo: ; 802F47C
+@ void GameFreakRTC_FormatHexTimeStringFromRTCInfo()
+GameFreakRTC_FormatHexTimeStringFromRTCInfo: @ 802F47C
 	push {lr}
 	ldr r3, =0x03000dc0
 	ldrb r1, [r3, 0x4]
@@ -524,8 +524,8 @@ GameFreakRTC_FormatHexTimeStringFromRTCInfo: ; 802F47C
 	thumb_func_end GameFreakRTC_FormatHexTimeStringFromRTCInfo
 
 	thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString
-; void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
-GameFreakRTC_FormatDecimalYearMonthDayString: ; 802F494
+@ void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
+GameFreakRTC_FormatDecimalYearMonthDayString: @ 802F494
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -553,8 +553,8 @@ GameFreakRTC_FormatDecimalYearMonthDayString: ; 802F494
 	thumb_func_end GameFreakRTC_FormatDecimalYearMonthDayString
 
 	thumb_func_start GameFreakRTC_FormatHexYearMonthDayString
-; void GameFreakRTC_FormatHexYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
-GameFreakRTC_FormatHexYearMonthDayString: ; 802F4CC
+@ void GameFreakRTC_FormatHexYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth)
+GameFreakRTC_FormatHexYearMonthDayString: @ 802F4CC
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -582,8 +582,8 @@ GameFreakRTC_FormatHexYearMonthDayString: ; 802F4CC
 	thumb_func_end GameFreakRTC_FormatHexYearMonthDayString
 
 	thumb_func_start GameFreakRTC_GetRTCDelta
-; void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime)
-GameFreakRTC_GetRTCDelta: ; 802F504
+@ void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime)
+GameFreakRTC_GetRTCDelta: @ 802F504
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -652,8 +652,8 @@ _0802F582:
 	thumb_func_end GameFreakRTC_GetRTCDelta
 
 	thumb_func_start GameFreakRTC_CalcLocalDateTime
-; void GameFreakRTC_CalcLocalDateTime()
-GameFreakRTC_CalcLocalDateTime: ; 802F588
+@ void GameFreakRTC_CalcLocalDateTime()
+GameFreakRTC_CalcLocalDateTime: @ 802F588
 	push {r4,lr}
 	ldr r4, =0x03000dc0
 	adds r0, r4, 0
@@ -671,8 +671,8 @@ GameFreakRTC_CalcLocalDateTime: ; 802F588
 	thumb_func_end GameFreakRTC_CalcLocalDateTime
 
 	thumb_func_start GameFreakRTC_CalcRTCToLocalDelta_DayZero
-; void GameFreakRTC_CalcRTCToLocalDelta_DayZero(u8 hour, u8 minute)
-GameFreakRTC_CalcRTCToLocalDelta_DayZero: ; 802F5B4
+@ void GameFreakRTC_CalcRTCToLocalDelta_DayZero(u8 hour, u8 minute)
+GameFreakRTC_CalcRTCToLocalDelta_DayZero: @ 802F5B4
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -685,8 +685,8 @@ GameFreakRTC_CalcRTCToLocalDelta_DayZero: ; 802F5B4
 	thumb_func_end GameFreakRTC_CalcRTCToLocalDelta_DayZero
 
 	thumb_func_start GameFreakRTC_CalcRTCToLocalDelta
-; void GameFreakRTC_CalcRTCToLocalDelta(u16 numDays, u8 hour, u8 minute, u8 second)
-GameFreakRTC_CalcRTCToLocalDelta: ; 802F5C8
+@ void GameFreakRTC_CalcRTCToLocalDelta(u16 numDays, u8 hour, u8 minute, u8 second)
+GameFreakRTC_CalcRTCToLocalDelta: @ 802F5C8
 	push {r4,r5,lr}
 	ldr r4, =0x03005cf8
 	strh r0, [r4]
@@ -709,8 +709,8 @@ GameFreakRTC_CalcRTCToLocalDelta: ; 802F5C8
 	thumb_func_end GameFreakRTC_CalcRTCToLocalDelta
 
 	thumb_func_start GameFreakRTC_GetDelta
-; void GameFreakRTC_GetDelta(GameDateTime *delta, GameDateTime *dateTime1, GameDateTime *dateTime2)
-GameFreakRTC_GetDelta: ; 802F5FC
+@ void GameFreakRTC_GetDelta(GameDateTime *delta, GameDateTime *dateTime1, GameDateTime *dateTime2)
+GameFreakRTC_GetDelta: @ 802F5FC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	ldrb r3, [r2, 0x4]
@@ -768,8 +768,8 @@ _0802F65C:
 	thumb_func_end GameFreakRTC_GetDelta
 
 	thumb_func_start GameFreakRTC_GetNumMinutes
-; u16 GameFreakRTC_GetNumMinutes()
-GameFreakRTC_GetNumMinutes: ; 802F664
+@ u16 GameFreakRTC_GetNumMinutes()
+GameFreakRTC_GetNumMinutes: @ 802F664
 	push {r4,lr}
 	ldr r4, =0x03000dc0
 	adds r0, r4, 0
@@ -797,8 +797,8 @@ GameFreakRTC_GetNumMinutes: ; 802F664
 	thumb_func_end GameFreakRTC_GetNumMinutes
 
 	thumb_func_start GameFreakRTC_GetNumDays
-; u16 GameFreakRTC_GetNumDays()
-GameFreakRTC_GetNumDays: ; 802F69C
+@ u16 GameFreakRTC_GetNumDays()
+GameFreakRTC_GetNumDays: @ 802F69C
 	push {lr}
 	ldr r0, =0x03000dc0
 	bl GameFreakRTC_GetNumDaysInternal
diff --git a/asm/string_util.s b/asm/string_util.s
index 84486a211..5bc343735 100644
--- a/asm/string_util.s
+++ b/asm/string_util.s
@@ -1,6 +1,6 @@
 	thumb_func_start CopyString_Limit10
-; u8 *CopyString_Limit10(u8 *dest, u8 *src)
-CopyString_Limit10: ; 8008B10
+@ u8 *CopyString_Limit10(u8 *dest, u8 *src)
+CopyString_Limit10: @ 8008B10
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0xA
@@ -32,8 +32,8 @@ _08008B3C:
 	thumb_func_end CopyString_Limit10
 
 	thumb_func_start GetStringEnd_Limit7
-; u8 *GetStringEnd_Limit7(u8 *s)
-GetStringEnd_Limit7: ; 8008B44
+@ u8 *GetStringEnd_Limit7(u8 *s)
+GetStringEnd_Limit7: @ 8008B44
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r4, 0xA
@@ -61,8 +61,8 @@ _08008B68:
 	thumb_func_end GetStringEnd_Limit7
 
 	thumb_func_start CopyString_Limit7
-; u8 *CopyString_Limit7(u8 *dest, u8 *src)
-CopyString_Limit7: ; 8008B70
+@ u8 *CopyString_Limit7(u8 *dest, u8 *src)
+CopyString_Limit7: @ 8008B70
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0x7
@@ -92,8 +92,8 @@ _08008B98:
 	thumb_func_end CopyString_Limit7
 
 	thumb_func_start CopyString
-; u8 *CopyString(u8 *dest, u8 *src)
-CopyString: ; 8008BA0
+@ u8 *CopyString(u8 *dest, u8 *src)
+CopyString: @ 8008BA0
 	push {lr}
 	adds r3, r0, 0
 	b _08008BAC
@@ -114,8 +114,8 @@ _08008BAC:
 	thumb_func_end CopyString
 
 	thumb_func_start AppendString
-; u8 *AppendString(u8 *dest, u8 *src)
-AppendString: ; 8008BC0
+@ u8 *AppendString(u8 *dest, u8 *src)
+AppendString: @ 8008BC0
 	push {lr}
 	adds r2, r0, 0
 	b _08008BC8
@@ -132,8 +132,8 @@ _08008BC8:
 	thumb_func_end AppendString
 
 	thumb_func_start CopyString_LimitN
-; u8 *CopyString_LimitN(u8 *dest, u8 *src, u8 n)
-CopyString_LimitN: ; 8008BD8
+@ u8 *CopyString_LimitN(u8 *dest, u8 *src, u8 n)
+CopyString_LimitN: @ 8008BD8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -162,8 +162,8 @@ _08008BFE:
 	thumb_func_end CopyString_LimitN
 
 	thumb_func_start AppendString_LimitN
-; u8 *AppendString_LimitN(u8 *dest, u8 *src, u8 n)
-AppendString_LimitN: ; 8008C08
+@ u8 *AppendString_LimitN(u8 *dest, u8 *src, u8 n)
+AppendString_LimitN: @ 8008C08
 	push {lr}
 	adds r3, r0, 0
 	lsls r2, 24
@@ -182,8 +182,8 @@ _08008C14:
 	thumb_func_end AppendString_LimitN
 
 	thumb_func_start GetStringLength
-; u16 GetStringLength(u8 *s)
-GetStringLength: ; 8008C24
+@ u16 GetStringLength(u8 *s)
+GetStringLength: @ 8008C24
 	push {lr}
 	adds r2, r0, 0
 	movs r1, 0
@@ -205,8 +205,8 @@ _08008C3E:
 	thumb_func_end GetStringLength
 
 	thumb_func_start CompareString
-; u8 CompareString(u8 *s1, u8 *s2)
-CompareString: ; 8008C44
+@ u8 CompareString(u8 *s1, u8 *s2)
+CompareString: @ 8008C44
 	push {lr}
 	adds r2, r0, 0
 	b _08008C56
@@ -232,8 +232,8 @@ _08008C64:
 	thumb_func_end CompareString
 
 	thumb_func_start CompareString_LimitN
-; u8 CompareString_LimitN(u8 *s1, u8 *s2, u32 n)
-CompareString_LimitN: ; 8008C68
+@ u8 CompareString_LimitN(u8 *s1, u8 *s2, u32 n)
+CompareString_LimitN: @ 8008C68
 	push {r4,lr}
 	adds r3, r0, 0
 	b _08008C80
@@ -263,8 +263,8 @@ _08008C8E:
 	thumb_func_end CompareString_LimitN
 
 	thumb_func_start IsStringLengthLessThanN
-; bool8 IsStringLengthLessThanN(u8 *s, s32 n)
-IsStringLengthLessThanN: ; 8008C94
+@ bool8 IsStringLengthLessThanN(u8 *s, s32 n)
+IsStringLengthLessThanN: @ 8008C94
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -293,8 +293,8 @@ _08008CBA:
 	thumb_func_end IsStringLengthLessThanN
 
 	thumb_func_start ConvertIntToDecimalString
-; u8 *ConvertIntToDecimalString(u8 *dest, s32 value, u8 mode, u8 numDigits)
-ConvertIntToDecimalString: ; 8008CC0
+@ u8 *ConvertIntToDecimalString(u8 *dest, s32 value, u8 mode, u8 numDigits)
+ConvertIntToDecimalString: @ 8008CC0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -392,8 +392,8 @@ _08008D60:
 	thumb_func_end ConvertIntToDecimalString
 
 	thumb_func_start ConvertUnsignedIntToDecimalString
-; u8 *ConvertUnsignedIntToDecimalString(u8 *dest, u32 value, u8 mode, u8 numDigits)
-ConvertUnsignedIntToDecimalString: ; 8008D70
+@ u8 *ConvertUnsignedIntToDecimalString(u8 *dest, u32 value, u8 mode, u8 numDigits)
+ConvertUnsignedIntToDecimalString: @ 8008D70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -491,8 +491,8 @@ _08008E10:
 	thumb_func_end ConvertUnsignedIntToDecimalString
 
 	thumb_func_start ConvertIntToHexString
-; u8 *ConvertIntToHexString(u8 *dest, s32 value, u8 mode, u8 numDigits)
-ConvertIntToHexString: ; 8008E20
+@ u8 *ConvertIntToHexString(u8 *dest, s32 value, u8 mode, u8 numDigits)
+ConvertIntToHexString: @ 8008E20
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -601,8 +601,8 @@ _08008ECA:
 	thumb_func_end ConvertIntToHexString
 
 	thumb_func_start ExpandStringRefs
-; u8 *ExpandStringRefs(u8 *dest, u8 *src)
-ExpandStringRefs: ; 8008EE0
+@ u8 *ExpandStringRefs(u8 *dest, u8 *src)
+ExpandStringRefs: @ 8008EE0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -705,8 +705,8 @@ _08008FC0:
 	thumb_func_end ExpandStringRefs
 
 	thumb_func_start sub_8008FCC
-; u8 *sub_8008FCC(u8 *dest, u8 *src)
-sub_8008FCC: ; 8008FCC
+@ u8 *sub_8008FCC(u8 *dest, u8 *src)
+sub_8008FCC: @ 8008FCC
 	push {r4-r6,lr}
 	sub sp, 0xC
 	adds r5, r0, 0
@@ -755,16 +755,16 @@ _0800901E:
 	thumb_func_end sub_8008FCC
 
 	thumb_func_start StringRef_GetPossiblyUnusedStringVar
-; u8 *StringRef_GetPossiblyUnusedStringVar()
-StringRef_GetPossiblyUnusedStringVar: ; 800902C
+@ u8 *StringRef_GetPossiblyUnusedStringVar()
+StringRef_GetPossiblyUnusedStringVar: @ 800902C
 	ldr r0, =0x020223ac
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetPossiblyUnusedStringVar
 
 	thumb_func_start StringRef_GetPlayerName
-; u8 *StringRef_GetPlayerName()
-StringRef_GetPlayerName: ; 8009034
+@ u8 *StringRef_GetPlayerName()
+StringRef_GetPlayerName: @ 8009034
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	bx lr
@@ -772,32 +772,32 @@ StringRef_GetPlayerName: ; 8009034
 	thumb_func_end StringRef_GetPlayerName
 
 	thumb_func_start StringRef_GetStringVar1
-; u8 *StringRef_GetStringVar1()
-StringRef_GetStringVar1: ; 8009040
+@ u8 *StringRef_GetStringVar1()
+StringRef_GetStringVar1: @ 8009040
 	ldr r0, =0x02021cc4
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetStringVar1
 
 	thumb_func_start StringRef_GetStringVar2
-; u8 *StringRef_GetStringVar2()
-StringRef_GetStringVar2: ; 8009048
+@ u8 *StringRef_GetStringVar2()
+StringRef_GetStringVar2: @ 8009048
 	ldr r0, =0x02021dc4
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetStringVar2
 
 	thumb_func_start StringRef_GetStringVar3
-; u8 *StringRef_GetStringVar3()
-StringRef_GetStringVar3: ; 8009050
+@ u8 *StringRef_GetStringVar3()
+StringRef_GetStringVar3: @ 8009050
 	ldr r0, =0x02021ec4
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetStringVar3
 
 	thumb_func_start StringRef_GetDummiedOutGenderDependentString
-; u8 *StringRef_GetDummiedOutGenderDependentString()
-StringRef_GetDummiedOutGenderDependentString: ; 8009058
+@ u8 *StringRef_GetDummiedOutGenderDependentString()
+StringRef_GetDummiedOutGenderDependentString: @ 8009058
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -816,8 +816,8 @@ _08009072:
 	thumb_func_end StringRef_GetDummiedOutGenderDependentString
 
 	thumb_func_start StringRef_GetRivalName
-; u8 *StringRef_GetRivalName()
-StringRef_GetRivalName: ; 800907C
+@ u8 *StringRef_GetRivalName()
+StringRef_GetRivalName: @ 800907C
 	push {lr}
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
@@ -836,64 +836,64 @@ _08009096:
 	thumb_func_end StringRef_GetRivalName
 
 	thumb_func_start StringRef_GetEmeraldString
-; u8 *StringRef_GetEmeraldString()
-StringRef_GetEmeraldString: ; 80090A0
+@ u8 *StringRef_GetEmeraldString()
+StringRef_GetEmeraldString: @ 80090A0
 	ldr r0, =gUnknown_085E8229
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetEmeraldString
 
 	thumb_func_start StringRef_GetAquaString
-; u8 *StringRef_GetAquaString()
-StringRef_GetAquaString: ; 80090A8
+@ u8 *StringRef_GetAquaString()
+StringRef_GetAquaString: @ 80090A8
 	ldr r0, =gUnknown_085E8231
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetAquaString
 
 	thumb_func_start StringRef_GetMagmaString
-; u8 *StringRef_GetMagmaString()
-StringRef_GetMagmaString: ; 80090B0
+@ u8 *StringRef_GetMagmaString()
+StringRef_GetMagmaString: @ 80090B0
 	ldr r0, =gUnknown_085E8236
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetMagmaString
 
 	thumb_func_start StringRef_GetArchieString
-; u8 *StringRef_GetArchieString()
-StringRef_GetArchieString: ; 80090B8
+@ u8 *StringRef_GetArchieString()
+StringRef_GetArchieString: @ 80090B8
 	ldr r0, =gUnknown_085E823C
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetArchieString
 
 	thumb_func_start StringRef_GetMaxieString
-; u8 *StringRef_GetMaxieString()
-StringRef_GetMaxieString: ; 80090C0
+@ u8 *StringRef_GetMaxieString()
+StringRef_GetMaxieString: @ 80090C0
 	ldr r0, =gUnknown_085E8243
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetMaxieString
 
 	thumb_func_start StringRef_GetKyogreString
-; u8 *StringRef_GetKyogreString()
-StringRef_GetKyogreString: ; 80090C8
+@ u8 *StringRef_GetKyogreString()
+StringRef_GetKyogreString: @ 80090C8
 	ldr r0, =gUnknown_085E8249
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetKyogreString
 
 	thumb_func_start StringRef_GetGroudonString
-; u8 *StringRef_GetGroudonString()
-StringRef_GetGroudonString: ; 80090D0
+@ u8 *StringRef_GetGroudonString()
+StringRef_GetGroudonString: @ 80090D0
 	ldr r0, =gUnknown_085E8250
 	bx lr
 	.pool
 	thumb_func_end StringRef_GetGroudonString
 
 	thumb_func_start GetExpandedStringRef
-; u8 *GetExpandedStringRef(u8 code)
-GetExpandedStringRef: ; 80090D8
+@ u8 *GetExpandedStringRef(u8 code)
+GetExpandedStringRef: @ 80090D8
 	push {lr}
 	cmp r0, 0xD
 	bhi _080090F0
@@ -913,8 +913,8 @@ _080090F2:
 	thumb_func_end GetExpandedStringRef
 
 	thumb_func_start RepeatChar
-; u8 *RepeatChar(u8 *dest, u8 c, u16 n)
-RepeatChar: ; 80090FC
+@ u8 *RepeatChar(u8 *dest, u8 c, u16 n)
+RepeatChar: @ 80090FC
 	push {lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -941,8 +941,8 @@ _0800911C:
 	thumb_func_end RepeatChar
 
 	thumb_func_start CopyStringPadded
-; u8 *CopyStringPadded(u8 *dest, u8 *src, u8 c, u16 n)
-CopyStringPadded: ; 8009128
+@ u8 *CopyStringPadded(u8 *dest, u8 *src, u8 c, u16 n)
+CopyStringPadded: @ 8009128
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -991,8 +991,8 @@ _0800916C:
 	thumb_func_end CopyStringPadded
 
 	thumb_func_start RepeatStringTerminator
-; u8 *RepeatStringTerminator(u8 *dest, u16 n)
-RepeatStringTerminator: ; 800917C
+@ u8 *RepeatStringTerminator(u8 *dest, u16 n)
+RepeatStringTerminator: @ 800917C
 	push {lr}
 	lsls r2, r1, 16
 	lsrs r2, 16
@@ -1003,8 +1003,8 @@ RepeatStringTerminator: ; 800917C
 	thumb_func_end RepeatStringTerminator
 
 	thumb_func_start CopyString_LimitN_Multibyte
-; u8 *CopyString_LimitN_Multibyte(u8 *dest, u8 *src, u32 n)
-CopyString_LimitN_Multibyte: ; 800918C
+@ u8 *CopyString_LimitN_Multibyte(u8 *dest, u8 *src, u32 n)
+CopyString_LimitN_Multibyte: @ 800918C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r3, r1, 0
@@ -1043,8 +1043,8 @@ _080091BE:
 	thumb_func_end CopyString_LimitN_Multibyte
 
 	thumb_func_start GetStringLength_Multibyte
-; u32 GetStringLength_Multibyte(u8 *s)
-GetStringLength_Multibyte: ; 80091CC
+@ u32 GetStringLength_Multibyte(u8 *s)
+GetStringLength_Multibyte: @ 80091CC
 	push {lr}
 	adds r2, r0, 0
 	movs r3, 0
@@ -1067,8 +1067,8 @@ _080091DE:
 	thumb_func_end GetStringLength_Multibyte
 
 	thumb_func_start WriteColorChangeControlCode
-; u8 *WriteColorChangeControlCode(u8 *dest, u8 colorType, u8 color)
-WriteColorChangeControlCode: ; 80091EC
+@ u8 *WriteColorChangeControlCode(u8 *dest, u8 colorType, u8 color)
+WriteColorChangeControlCode: @ 80091EC
 	push {lr}
 	adds r3, r0, 0
 	lsls r2, 24
@@ -1106,8 +1106,8 @@ _08009218:
 	thumb_func_end WriteColorChangeControlCode
 
 	thumb_func_start sub_8009228
-; bool8 sub_8009228(u8 *s)
-sub_8009228: ; 8009228
+@ bool8 sub_8009228(u8 *s)
+sub_8009228: @ 8009228
 	push {lr}
 	adds r2, r0, 0
 	b _0800923E
@@ -1133,8 +1133,8 @@ _08009248:
 	thumb_func_end sub_8009228
 
 	thumb_func_start sub_800924C
-; bool8 sub_800924C(u8 *s, u32 n)
-sub_800924C: ; 800924C
+@ bool8 sub_800924C(u8 *s, u32 n)
+sub_800924C: @ 800924C
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -1167,8 +1167,8 @@ _08009276:
 	thumb_func_end sub_800924C
 
 	thumb_func_start GetExtendedControlCodeLength
-; u8 GetExtendedControlCodeLength(u8 code)
-GetExtendedControlCodeLength: ; 800927C
+@ u8 GetExtendedControlCodeLength(u8 code)
+GetExtendedControlCodeLength: @ 800927C
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -1185,8 +1185,8 @@ _0800928E:
 	thumb_func_end GetExtendedControlCodeLength
 
 	thumb_func_start SkipExtendedControlCode
-; u8 *SkipExtendedControlCode(u8 *s)
-SkipExtendedControlCode: ; 8009298
+@ u8 *SkipExtendedControlCode(u8 *s)
+SkipExtendedControlCode: @ 8009298
 	push {r4,lr}
 	adds r4, r0, 0
 	b _080092AC
@@ -1208,8 +1208,8 @@ _080092AC:
 	thumb_func_end SkipExtendedControlCode
 
 	thumb_func_start CompareStringWithoutExtendedControlCodes
-; u8 CompareStringWithoutExtendedControlCodes(u8 *s1, u8 *s2)
-CompareStringWithoutExtendedControlCodes: ; 80092BC
+@ u8 CompareStringWithoutExtendedControlCodes(u8 *s1, u8 *s2)
+CompareStringWithoutExtendedControlCodes: @ 80092BC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -1252,8 +1252,8 @@ _080092FE:
 	thumb_func_end CompareStringWithoutExtendedControlCodes
 
 	thumb_func_start StopMusicWhileStringIsPrinted
-; void StopMusicWhileStringIsPrinted(u8 *s, bool8 stopMusic)
-StopMusicWhileStringIsPrinted: ; 8009308
+@ void StopMusicWhileStringIsPrinted(u8 *s, bool8 stopMusic)
+StopMusicWhileStringIsPrinted: @ 8009308
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -1309,8 +1309,8 @@ _08009368:
 	thumb_func_end StopMusicWhileStringIsPrinted
 
 	thumb_func_start StripExtendedControlCodes
-; void StripExtendedControlCodes(u8 *s)
-StripExtendedControlCodes: ; 8009370
+@ void StripExtendedControlCodes(u8 *s)
+StripExtendedControlCodes: @ 8009370
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
diff --git a/asm/task.s b/asm/task.s
index fbfdd1e70..27bfaed69 100644
--- a/asm/task.s
+++ b/asm/task.s
@@ -1,6 +1,6 @@
 	thumb_func_start clear_tasks
-; void clear_tasks()
-clear_tasks: ; 80A8F50
+@ void clear_tasks()
+clear_tasks: @ 80A8F50
 	push {r4-r7,lr}
 	movs r4, 0
 	ldr r6, =0x03005e00
@@ -46,8 +46,8 @@ _080A8F5A:
 	thumb_func_end clear_tasks
 
 	thumb_func_start AddTask
-; int AddTask(void ( *func)(int task_id), u8 priority)
-AddTask: ; 80A8FB0
+@ int AddTask(void ( *func)(int task_id), u8 priority)
+AddTask: @ 80A8FB0
 	push {r4-r7,lr}
 	adds r2, r0, 0
 	lsls r1, 24
@@ -91,8 +91,8 @@ _080A8FFC:
 	thumb_func_end AddTask
 
 	thumb_func_start insert_task_in_order_by_priority
-; void insert_task_in_order_by_priority(int task_id)
-insert_task_in_order_by_priority: ; 80A9004
+@ void insert_task_in_order_by_priority(int task_id)
+insert_task_in_order_by_priority: @ 80A9004
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -173,8 +173,8 @@ _080A9090:
 	thumb_func_end insert_task_in_order_by_priority
 
 	thumb_func_start remove_task
-; void remove_task(int task_id)
-remove_task: ; 80A909C
+@ void remove_task(int task_id)
+remove_task: @ 80A909C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -236,8 +236,8 @@ _080A9106:
 	thumb_func_end remove_task
 
 	thumb_func_start RunActiveTasks
-; void RunActiveTasks()
-RunActiveTasks: ; 80A910C
+@ void RunActiveTasks()
+RunActiveTasks: @ 80A910C
 	push {r4,r5,lr}
 	bl get_first_active_task
 	lsls r0, 24
@@ -263,8 +263,8 @@ _080A9130:
 	thumb_func_end RunActiveTasks
 
 	thumb_func_start get_first_active_task
-; int get_first_active_task()
-get_first_active_task: ; 80A913C
+@ int get_first_active_task()
+get_first_active_task: @ 80A913C
 	push {lr}
 	movs r2, 0
 	ldr r0, =0x03005e00
@@ -299,12 +299,12 @@ _080A916E:
 	thumb_func_end get_first_active_task
 
 	thumb_func_start nullsub_4
-nullsub_4: ; 80A9178
+nullsub_4: @ 80A9178
 	bx lr
 	thumb_func_end nullsub_4
 
 	thumb_func_start set_task_function_and_args_14_15
-set_task_function_and_args_14_15: ; 80A917C
+set_task_function_and_args_14_15: @ 80A917C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -332,7 +332,7 @@ set_task_function_and_args_14_15: ; 80A917C
 	thumb_func_end set_task_function_and_args_14_15
 
 	thumb_func_start set_task_function_to_args_14_15
-set_task_function_to_args_14_15: ; 80A91B0
+set_task_function_to_args_14_15: @ 80A91B0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -360,8 +360,8 @@ set_task_function_to_args_14_15: ; 80A91B0
 	thumb_func_end set_task_function_to_args_14_15
 
 	thumb_func_start is_function_an_active_task
-; int is_function_an_active_task(void ( *func)(int task_id))
-is_function_an_active_task: ; 80A91E4
+@ int is_function_an_active_task(void ( *func)(int task_id))
+is_function_an_active_task: @ 80A91E4
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -394,8 +394,8 @@ _080A9214:
 	thumb_func_end is_function_an_active_task
 
 	thumb_func_start get_task_id_by_function
-; int get_task_id_by_function(void ( *func)(int task_id))
-get_task_id_by_function: ; 80A921C
+@ int get_task_id_by_function(void ( *func)(int task_id))
+get_task_id_by_function: @ 80A921C
 	push {lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -423,7 +423,7 @@ _080A9246:
 	thumb_func_end get_task_id_by_function
 
 	thumb_func_start sub_80A924C
-sub_80A924C: ; 80A924C
+sub_80A924C: @ 80A924C
 	push {lr}
 	movs r2, 0
 	movs r1, 0
@@ -452,7 +452,7 @@ _080A9268:
 	thumb_func_end sub_80A924C
 
 	thumb_func_start set_word_task_arg
-set_word_task_arg: ; 80A927C
+set_word_task_arg: @ 80A927C
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -484,7 +484,7 @@ _080A92AA:
 	thumb_func_end set_word_task_arg
 
 	thumb_func_start get_word_task_arg
-get_word_task_arg: ; 80A92B4
+get_word_task_arg: @ 80A92B4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
diff --git a/asm/text_renderer.s b/asm/text_renderer.s
index 6e5c9a929..bbf719224 100644
--- a/asm/text_renderer.s
+++ b/asm/text_renderer.s
@@ -1,6 +1,6 @@
 	thumb_func_start SetFontsPointer
-; void SetFontsPointer(struct FontInfo *fonts)
-SetFontsPointer: ; 80045A4
+@ void SetFontsPointer(struct FontInfo *fonts)
+SetFontsPointer: @ 80045A4
 	ldr r1, =0x03002f80
 	str r0, [r1]
 	bx lr
@@ -8,8 +8,8 @@ SetFontsPointer: ; 80045A4
 	thumb_func_end SetFontsPointer
 
 	thumb_func_start DeactivateAllTextPrinters
-; void DeactivateAllTextPrinters()
-DeactivateAllTextPrinters: ; 80045B0
+@ void DeactivateAllTextPrinters()
+DeactivateAllTextPrinters: @ 80045B0
 	push {lr}
 	ldr r1, =0x020201b0
 	movs r2, 0
@@ -26,8 +26,8 @@ _080045BA:
 	thumb_func_end DeactivateAllTextPrinters
 
 	thumb_func_start Print
-; u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void ( *callback)(u16, struct TextPrinter *))
-Print: ; 80045D0
+@ u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void ( *callback)(u16, struct TextPrinter *))
+Print: @ 80045D0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -115,8 +115,8 @@ Print: ; 80045D0
 	thumb_func_end Print
 
 	thumb_func_start AddTextPrinter
-; u16 AddTextPrinter(struct TextPrinter *textPrinter, u8 speed, void ( *callback)(u16, struct TextPrinter *))
-AddTextPrinter: ; 800467C
+@ u16 AddTextPrinter(struct TextPrinter *textPrinter, u8 speed, void ( *callback)(u16, struct TextPrinter *))
+AddTextPrinter: @ 800467C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	mov r12, r2
@@ -238,8 +238,8 @@ _08004766:
 	thumb_func_end AddTextPrinter
 
 	thumb_func_start RunTextPrinters
-; void RunTextPrinters()
-RunTextPrinters: ; 8004778
+@ void RunTextPrinters()
+RunTextPrinters: @ 8004778
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -309,8 +309,8 @@ _080047F6:
 	thumb_func_end RunTextPrinters
 
 	thumb_func_start IsTextPrinterActive
-; bool8 IsTextPrinterActive(u8 id)
-IsTextPrinterActive: ; 8004800
+@ bool8 IsTextPrinterActive(u8 id)
+IsTextPrinterActive: @ 8004800
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020201b0
@@ -324,8 +324,8 @@ IsTextPrinterActive: ; 8004800
 	thumb_func_end IsTextPrinterActive
 
 	thumb_func_start RenderFont
-; u16 RenderFont(struct TextPrinter *textPrinter)
-RenderFont: ; 8004818
+@ u16 RenderFont(struct TextPrinter *textPrinter)
+RenderFont: @ 8004818
 	push {r4,lr}
 	adds r4, r0, 0
 _0800481C:
@@ -350,8 +350,8 @@ _0800481C:
 	thumb_func_end RenderFont
 
 	thumb_func_start GenerateFontHalfRowLookupTable
-; void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor)
-GenerateFontHalfRowLookupTable: ; 8004844
+@ void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor)
+GenerateFontHalfRowLookupTable: @ 8004844
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -810,8 +810,8 @@ GenerateFontHalfRowLookupTable: ; 8004844
 	thumb_func_end GenerateFontHalfRowLookupTable
 
 	thumb_func_start SaveTextColors
-; void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
-SaveTextColors: ; 8004BE0
+@ void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
+SaveTextColors: @ 8004BE0
 	ldr r3, =0x030009ea
 	ldrh r3, [r3]
 	strb r3, [r1]
@@ -826,8 +826,8 @@ SaveTextColors: ; 8004BE0
 	thumb_func_end SaveTextColors
 
 	thumb_func_start RestoreTextColors
-; void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
-RestoreTextColors: ; 8004C00
+@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
+RestoreTextColors: @ 8004C00
 	push {lr}
 	ldrb r0, [r0]
 	ldrb r1, [r1]
@@ -838,8 +838,8 @@ RestoreTextColors: ; 8004C00
 	thumb_func_end RestoreTextColors
 
 	thumb_func_start DecompressGlyphTile
-; void DecompressGlyphTile(u16 *src, u32 *dest)
-DecompressGlyphTile: ; 8004C10
+@ void DecompressGlyphTile(u16 *src, u32 *dest)
+DecompressGlyphTile: @ 8004C10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1003,8 +1003,8 @@ DecompressGlyphTile: ; 8004C10
 	thumb_func_end DecompressGlyphTile
 
 	thumb_func_start GetLastTextColor
-; u8 GetLastTextColor(u8 colorType)
-GetLastTextColor: ; 8004D58
+@ u8 GetLastTextColor(u8 colorType)
+GetLastTextColor: @ 8004D58
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1043,8 +1043,8 @@ _08004D9A:
 	thumb_func_end GetLastTextColor
 
 	thumb_func_start CopyGlyphToWindow
-; int CopyGlyphToWindow(struct TextPrinter *x)
-CopyGlyphToWindow: ; 8004DA0
+@ int CopyGlyphToWindow(struct TextPrinter *x)
+CopyGlyphToWindow: @ 8004DA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1746,8 +1746,8 @@ _080052AA:
 	thumb_func_end CopyGlyphToWindow
 
 	thumb_func_start ClearTextSpan
-; void ClearTextSpan(TextPrinter *textPrinter, u32 width)
-ClearTextSpan: ; 80052C8
+@ void ClearTextSpan(TextPrinter *textPrinter, u32 width)
+ClearTextSpan: @ 80052C8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -1799,8 +1799,8 @@ _0800531E:
 	thumb_func_end ClearTextSpan
 
 	thumb_func_start Font0Func
-; int Font0Func(struct TextPrinter *x)
-Font0Func: ; 800533C
+@ int Font0Func(struct TextPrinter *x)
+Font0Func: @ 800533C
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1829,8 +1829,8 @@ _08005360:
 	thumb_func_end Font0Func
 
 	thumb_func_start Font1Func
-; int Font1Func(struct TextPrinter *x)
-Font1Func: ; 8005370
+@ int Font1Func(struct TextPrinter *x)
+Font1Func: @ 8005370
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1861,8 +1861,8 @@ _08005398:
 	thumb_func_end Font1Func
 
 	thumb_func_start Font2Func
-; int Font2Func(struct TextPrinter *x)
-Font2Func: ; 80053A8
+@ int Font2Func(struct TextPrinter *x)
+Font2Func: @ 80053A8
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1893,8 +1893,8 @@ _080053D0:
 	thumb_func_end Font2Func
 
 	thumb_func_start Font3Func
-; int Font3Func(struct TextPrinter *x)
-Font3Func: ; 80053E0
+@ int Font3Func(struct TextPrinter *x)
+Font3Func: @ 80053E0
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1925,8 +1925,8 @@ _08005408:
 	thumb_func_end Font3Func
 
 	thumb_func_start Font4Func
-; int Font4Func(struct TextPrinter *x)
-Font4Func: ; 8005418
+@ int Font4Func(struct TextPrinter *x)
+Font4Func: @ 8005418
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1957,8 +1957,8 @@ _08005440:
 	thumb_func_end Font4Func
 
 	thumb_func_start Font5Func
-; int Font5Func(struct TextPrinter *x)
-Font5Func: ; 8005450
+@ int Font5Func(struct TextPrinter *x)
+Font5Func: @ 8005450
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1989,8 +1989,8 @@ _08005478:
 	thumb_func_end Font5Func
 
 	thumb_func_start Font7Func
-; int Font7Func(struct TextPrinter *x)
-Font7Func: ; 8005488
+@ int Font7Func(struct TextPrinter *x)
+Font7Func: @ 8005488
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -2021,8 +2021,8 @@ _080054B0:
 	thumb_func_end Font7Func
 
 	thumb_func_start Font8Func
-; int Font8Func(struct TextPrinter *x)
-Font8Func: ; 80054C0
+@ int Font8Func(struct TextPrinter *x)
+Font8Func: @ 80054C0
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -2053,8 +2053,8 @@ _080054E8:
 	thumb_func_end Font8Func
 
 	thumb_func_start TextPrinterInitDownArrowCounters
-; void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter)
-TextPrinterInitDownArrowCounters: ; 80054F8
+@ void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter)
+TextPrinterInitDownArrowCounters: @ 80054F8
 	push {lr}
 	adds r2, r0, 0
 	adds r2, 0x14
@@ -2083,8 +2083,8 @@ _08005524:
 	thumb_func_end TextPrinterInitDownArrowCounters
 
 	thumb_func_start TextPrinterDrawDownArrow
-; void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
-TextPrinterDrawDownArrow: ; 8005528
+@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
+TextPrinterDrawDownArrow: @ 8005528
 	push {r4-r7,lr}
 	sub sp, 0x18
 	adds r5, r0, 0
@@ -2191,8 +2191,8 @@ _080055EE:
 	thumb_func_end TextPrinterDrawDownArrow
 
 	thumb_func_start TextPrinterClearDownArrow
-; void TextPrinterClearDownArrow(struct TextPrinter *textPrinter)
-TextPrinterClearDownArrow: ; 8005600
+@ void TextPrinterClearDownArrow(struct TextPrinter *textPrinter)
+TextPrinterClearDownArrow: @ 8005600
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -2219,8 +2219,8 @@ TextPrinterClearDownArrow: ; 8005600
 	thumb_func_end TextPrinterClearDownArrow
 
 	thumb_func_start TextPrinterWaitAutoMode
-; bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
-TextPrinterWaitAutoMode: ; 8005634
+@ bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
+TextPrinterWaitAutoMode: @ 8005634
 	push {lr}
 	adds r1, r0, 0
 	adds r1, 0x14
@@ -2239,8 +2239,8 @@ _0800564A:
 	thumb_func_end TextPrinterWaitAutoMode
 
 	thumb_func_start TextPrinterWaitWithDownArrow
-; bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
-TextPrinterWaitWithDownArrow: ; 8005650
+@ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
+TextPrinterWaitWithDownArrow: @ 8005650
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r4, 0
@@ -2277,8 +2277,8 @@ _0800568E:
 	thumb_func_end TextPrinterWaitWithDownArrow
 
 	thumb_func_start TextPrinterWait
-; bool8 TextPrinterWait(struct TextPrinter *textPrinter)
-TextPrinterWait: ; 800569C
+@ bool8 TextPrinterWait(struct TextPrinter *textPrinter)
+TextPrinterWait: @ 800569C
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r4, 0
@@ -2313,8 +2313,8 @@ _080056D4:
 	thumb_func_end TextPrinterWait
 
 	thumb_func_start DrawDownArrow
-; void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex)
-DrawDownArrow: ; 80056E0
+@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex)
+DrawDownArrow: @ 80056E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2419,8 +2419,8 @@ _0800579A:
 	thumb_func_end DrawDownArrow
 
 	thumb_func_start RenderText
-; u16 RenderText(struct TextPrinter *textPrinter)
-RenderText: ; 80057B4
+@ u16 RenderText(struct TextPrinter *textPrinter)
+RenderText: @ 80057B4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r6, 0
@@ -3146,8 +3146,8 @@ _08005D6E:
 	thumb_func_end RenderText
 
 	thumb_func_start GetStringWidthFixedWidthFont
-; u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
-GetStringWidthFixedWidthFont: ; 8005D74
+@ u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
+GetStringWidthFixedWidthFont: @ 8005D74
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3285,8 +3285,8 @@ _08005E84:
 	thumb_func_end GetStringWidthFixedWidthFont
 
 	thumb_func_start GetFontWidthFunc
-; u8 GetFontWidthFunc(u16 glyphId)
-GetFontWidthFunc: ; 8005EA8
+@ u8 GetFontWidthFunc(u16 glyphId)
+GetFontWidthFunc: @ 8005EA8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3315,8 +3315,8 @@ _08005ED0:
 	thumb_func_end GetFontWidthFunc
 
 	thumb_func_start GetStringWidth
-; s32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
-GetStringWidth: ; 8005ED8
+@ s32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
+GetStringWidth: @ 8005ED8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3628,8 +3628,8 @@ _0800612E:
 	thumb_func_end GetStringWidth
 
 	thumb_func_start RenderTextFont9
-; u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
-RenderTextFont9: ; 8006140
+@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
+RenderTextFont9: @ 8006140
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3819,8 +3819,8 @@ _080062C0:
 	thumb_func_end RenderTextFont9
 
 	thumb_func_start DrawKeypadIcon
-; u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
-DrawKeypadIcon: ; 80062E8
+@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
+DrawKeypadIcon: @ 80062E8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	lsls r0, 24
@@ -3859,8 +3859,8 @@ DrawKeypadIcon: ; 80062E8
 	thumb_func_end DrawKeypadIcon
 
 	thumb_func_start GetKeypadIconTileOffset
-; u8 GetKeypadIconTileOffset(u8 keypadIconId)
-GetKeypadIconTileOffset: ; 8006338
+@ u8 GetKeypadIconTileOffset(u8 keypadIconId)
+GetKeypadIconTileOffset: @ 8006338
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3871,8 +3871,8 @@ GetKeypadIconTileOffset: ; 8006338
 	thumb_func_end GetKeypadIconTileOffset
 
 	thumb_func_start GetKeypadIconWidth
-; u8 GetKeypadIconWidth(u8 keypadIconId)
-GetKeypadIconWidth: ; 8006348
+@ u8 GetKeypadIconWidth(u8 keypadIconId)
+GetKeypadIconWidth: @ 8006348
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3883,8 +3883,8 @@ GetKeypadIconWidth: ; 8006348
 	thumb_func_end GetKeypadIconWidth
 
 	thumb_func_start GetKeypadIconHeight
-; u8 GetKeypadIconHeight(u8 keypadIconId)
-GetKeypadIconHeight: ; 8006358
+@ u8 GetKeypadIconHeight(u8 keypadIconId)
+GetKeypadIconHeight: @ 8006358
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3895,8 +3895,8 @@ GetKeypadIconHeight: ; 8006358
 	thumb_func_end GetKeypadIconHeight
 
 	thumb_func_start SetDefaultFontsPointer
-; void SetDefaultFontsPointer()
-SetDefaultFontsPointer: ; 8006368
+@ void SetDefaultFontsPointer()
+SetDefaultFontsPointer: @ 8006368
 	push {lr}
 	ldr r0, =gFontInfos
 	bl SetFontsPointer
@@ -3906,8 +3906,8 @@ SetDefaultFontsPointer: ; 8006368
 	thumb_func_end SetDefaultFontsPointer
 
 	thumb_func_start GetFontAttribute
-; u8 GetFontAttribute(u8 fontId, u8 attributeId)
-GetFontAttribute: ; 8006378
+@ u8 GetFontAttribute(u8 fontId, u8 attributeId)
+GetFontAttribute: @ 8006378
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -4014,8 +4014,8 @@ _08006456:
 	thumb_func_end GetFontAttribute
 
 	thumb_func_start GetMenuCursorDimensionByFont
-; u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
-GetMenuCursorDimensionByFont: ; 8006460
+@ u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
+GetMenuCursorDimensionByFont: @ 8006460
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -4029,8 +4029,8 @@ GetMenuCursorDimensionByFont: ; 8006460
 	thumb_func_end GetMenuCursorDimensionByFont
 
 	thumb_func_start DecompressGlyphFont0
-; void DecompressGlyphFont0(u16 glyphId, bool8 isJapanese)
-DecompressGlyphFont0: ; 8006478
+@ void DecompressGlyphFont0(u16 glyphId, bool8 isJapanese)
+DecompressGlyphFont0: @ 8006478
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -4118,8 +4118,8 @@ _08006534:
 	thumb_func_end DecompressGlyphFont0
 
 	thumb_func_start GetGlyphWidthFont0
-; u8 GetGlyphWidthFont0(u16 glyphId, bool8 isJapanese)
-GetGlyphWidthFont0: ; 8006540
+@ u8 GetGlyphWidthFont0(u16 glyphId, bool8 isJapanese)
+GetGlyphWidthFont0: @ 8006540
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4138,8 +4138,8 @@ _0800655A:
 	thumb_func_end GetGlyphWidthFont0
 
 	thumb_func_start DecompressGlyphFont7
-; void DecompressGlyphFont7(u16 glyphId, bool8 isJapanese)
-DecompressGlyphFont7: ; 8006560
+@ void DecompressGlyphFont7(u16 glyphId, bool8 isJapanese)
+DecompressGlyphFont7: @ 8006560
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -4227,8 +4227,8 @@ _0800661C:
 	thumb_func_end DecompressGlyphFont7
 
 	thumb_func_start GetGlyphWidthFont7
-; u8 GetGlyphWidthFont7(u16 glyphId, bool8 isJapanese)
-GetGlyphWidthFont7: ; 8006628
+@ u8 GetGlyphWidthFont7(u16 glyphId, bool8 isJapanese)
+GetGlyphWidthFont7: @ 8006628
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4247,8 +4247,8 @@ _08006642:
 	thumb_func_end GetGlyphWidthFont7
 
 	thumb_func_start DecompressGlyphFont8
-; void DecompressGlyphFont8(u16 glyphId, bool8 isJapanese)
-DecompressGlyphFont8: ; 8006648
+@ void DecompressGlyphFont8(u16 glyphId, bool8 isJapanese)
+DecompressGlyphFont8: @ 8006648
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -4336,8 +4336,8 @@ _08006704:
 	thumb_func_end DecompressGlyphFont8
 
 	thumb_func_start GetGlyphWidthFont8
-; u8 GetGlyphWidthFont8(u16 glyphId, bool8 isJapanese)
-GetGlyphWidthFont8: ; 8006710
+@ u8 GetGlyphWidthFont8(u16 glyphId, bool8 isJapanese)
+GetGlyphWidthFont8: @ 8006710
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4356,8 +4356,8 @@ _0800672A:
 	thumb_func_end GetGlyphWidthFont8
 
 	thumb_func_start DecompressGlyphFont2
-; void DecompressGlyphFont2(u16 glyphId, bool8 isJapanese)
-DecompressGlyphFont2: ; 8006730
+@ void DecompressGlyphFont2(u16 glyphId, bool8 isJapanese)
+DecompressGlyphFont2: @ 8006730
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -4459,8 +4459,8 @@ _08006810:
 	thumb_func_end DecompressGlyphFont2
 
 	thumb_func_start GetGlyphWidthFont2
-; u8 GetGlyphWidthFont2(u16 glyphId, bool8 isJapanese)
-GetGlyphWidthFont2: ; 800681C
+@ u8 GetGlyphWidthFont2(u16 glyphId, bool8 isJapanese)
+GetGlyphWidthFont2: @ 800681C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4480,8 +4480,8 @@ _08006832:
 	thumb_func_end GetGlyphWidthFont2
 
 	thumb_func_start DecompressGlyphFont1
-; void DecompressGlyphFont1(u16 glyphId, bool8 isJapanese)
-DecompressGlyphFont1: ; 8006840
+@ void DecompressGlyphFont1(u16 glyphId, bool8 isJapanese)
+DecompressGlyphFont1: @ 8006840
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -4569,8 +4569,8 @@ _080068FC:
 	thumb_func_end DecompressGlyphFont1
 
 	thumb_func_start GetGlyphWidthFont1
-; u8 GetGlyphWidthFont1(u16 glyphId, bool8 isJapanese)
-GetGlyphWidthFont1: ; 8006908
+@ u8 GetGlyphWidthFont1(u16 glyphId, bool8 isJapanese)
+GetGlyphWidthFont1: @ 8006908
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -4589,8 +4589,8 @@ _08006922:
 	thumb_func_end GetGlyphWidthFont1
 
 	thumb_func_start DecompressGlyphFont9
-; void DecompressGlyphFont9(u16 glyphId)
-DecompressGlyphFont9: ; 8006928
+@ void DecompressGlyphFont9(u16 glyphId)
+DecompressGlyphFont9: @ 8006928
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 20
diff --git a/asm/tileset_animation.s b/asm/tileset_animation.s
index 2197fcd83..b99cc857d 100644
--- a/asm/tileset_animation.s
+++ b/asm/tileset_animation.s
@@ -1,6 +1,6 @@
 	thumb_func_start sub_80A0954
-; void sub_80A0954()
-sub_80A0954: ; 80A0954
+@ void sub_80A0954()
+sub_80A0954: @ 80A0954
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =0x03000f34
@@ -19,7 +19,7 @@ sub_80A0954: ; 80A0954
 	thumb_func_end sub_80A0954
 
 	thumb_func_start sub_80A0980
-sub_80A0980: ; 80A0980
+sub_80A0980: @ 80A0980
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -60,7 +60,7 @@ _080A09C0:
 	thumb_func_end sub_80A0980
 
 	thumb_func_start sub_80A09D0
-sub_80A09D0: ; 80A09D0
+sub_80A09D0: @ 80A09D0
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r4, =0x03000f34
@@ -97,7 +97,7 @@ _080A0A02:
 	thumb_func_end sub_80A09D0
 
 	thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset
-cur_mapheader_run_tileset_funcs_after_some_cpuset: ; 80A0A18
+cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 80A0A18
 	push {lr}
 	bl sub_80A0954
 	bl cur_mapheader_run_tileset1_func
@@ -107,7 +107,7 @@ cur_mapheader_run_tileset_funcs_after_some_cpuset: ; 80A0A18
 	thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
 
 	thumb_func_start sub_80A0A2C
-sub_80A0A2C: ; 80A0A2C
+sub_80A0A2C: @ 80A0A2C
 	push {lr}
 	bl cur_mapheader_run_tileset2_func
 	pop {r0}
@@ -115,7 +115,7 @@ sub_80A0A2C: ; 80A0A2C
 	thumb_func_end sub_80A0A2C
 
 	thumb_func_start sub_80A0A38
-sub_80A0A38: ; 80A0A38
+sub_80A0A38: @ 80A0A38
 	push {r4,lr}
 	bl sub_80A0954
 	ldr r2, =0x03000f36
@@ -165,7 +165,7 @@ _080A0A8A:
 	thumb_func_end sub_80A0A38
 
 	thumb_func_start cur_mapheader_run_tileset1_func
-cur_mapheader_run_tileset1_func: ; 80A0AA8
+cur_mapheader_run_tileset1_func: @ 80A0AA8
 	push {lr}
 	ldr r0, =0x03000f36
 	movs r1, 0
@@ -191,7 +191,7 @@ _080A0ACE:
 	thumb_func_end cur_mapheader_run_tileset1_func
 
 	thumb_func_start cur_mapheader_run_tileset2_func
-cur_mapheader_run_tileset2_func: ; 80A0AE4
+cur_mapheader_run_tileset2_func: @ 80A0AE4
 	push {lr}
 	ldr r0, =0x03000f3a
 	movs r1, 0
@@ -217,7 +217,7 @@ _080A0B0A:
 	thumb_func_end cur_mapheader_run_tileset2_func
 
 	thumb_func_start TilesetCb_General
-TilesetCb_General: ; 80A0B20
+TilesetCb_General: @ 80A0B20
 	ldr r1, =0x03000f36
 	movs r0, 0
 	strh r0, [r1]
@@ -234,7 +234,7 @@ TilesetCb_General: ; 80A0B20
 	thumb_func_end TilesetCb_General
 
 	thumb_func_start TilesetCb_InsideBuilding
-TilesetCb_InsideBuilding: ; 80A0B48
+TilesetCb_InsideBuilding: @ 80A0B48
 	ldr r1, =0x03000f36
 	movs r0, 0
 	strh r0, [r1]
@@ -251,7 +251,7 @@ TilesetCb_InsideBuilding: ; 80A0B48
 	thumb_func_end TilesetCb_InsideBuilding
 
 	thumb_func_start sub_80A0B70
-sub_80A0B70: ; 80A0B70
+sub_80A0B70: @ 80A0B70
 	push {r4,r5,lr}
 	lsls r5, r0, 16
 	movs r0, 0xF0
@@ -289,7 +289,7 @@ _080A0BAE:
 	thumb_func_end sub_80A0B70
 
 	thumb_func_start sub_80A0BB4
-sub_80A0BB4: ; 80A0BB4
+sub_80A0BB4: @ 80A0BB4
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xE0
@@ -305,7 +305,7 @@ _080A0BC8:
 	thumb_func_end sub_80A0BB4
 
 	thumb_func_start sub_80A0BCC
-sub_80A0BCC: ; 80A0BCC
+sub_80A0BCC: @ 80A0BCC
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -324,7 +324,7 @@ sub_80A0BCC: ; 80A0BCC
 	thumb_func_end sub_80A0BCC
 
 	thumb_func_start sub_80A0BF4
-sub_80A0BF4: ; 80A0BF4
+sub_80A0BF4: @ 80A0BF4
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -344,7 +344,7 @@ sub_80A0BF4: ; 80A0BF4
 	thumb_func_end sub_80A0BF4
 
 	thumb_func_start sub_80A0C1C
-sub_80A0C1C: ; 80A0C1C
+sub_80A0C1C: @ 80A0C1C
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xE0
@@ -364,7 +364,7 @@ sub_80A0C1C: ; 80A0C1C
 	thumb_func_end sub_80A0C1C
 
 	thumb_func_start sub_80A0C44
-sub_80A0C44: ; 80A0C44
+sub_80A0C44: @ 80A0C44
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -383,7 +383,7 @@ sub_80A0C44: ; 80A0C44
 	thumb_func_end sub_80A0C44
 
 	thumb_func_start TilesetCb_Petalburg
-TilesetCb_Petalburg: ; 80A0C6C
+TilesetCb_Petalburg: @ 80A0C6C
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -399,7 +399,7 @@ TilesetCb_Petalburg: ; 80A0C6C
 	thumb_func_end TilesetCb_Petalburg
 
 	thumb_func_start TilesetCb_Rustboro
-TilesetCb_Rustboro: ; 80A0C94
+TilesetCb_Rustboro: @ 80A0C94
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -415,7 +415,7 @@ TilesetCb_Rustboro: ; 80A0C94
 	thumb_func_end TilesetCb_Rustboro
 
 	thumb_func_start TilesetCb_Dewford
-TilesetCb_Dewford: ; 80A0CC0
+TilesetCb_Dewford: @ 80A0CC0
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -431,7 +431,7 @@ TilesetCb_Dewford: ; 80A0CC0
 	thumb_func_end TilesetCb_Dewford
 
 	thumb_func_start TilesetCb_Slateport
-TilesetCb_Slateport: ; 80A0CEC
+TilesetCb_Slateport: @ 80A0CEC
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -447,7 +447,7 @@ TilesetCb_Slateport: ; 80A0CEC
 	thumb_func_end TilesetCb_Slateport
 
 	thumb_func_start TilesetCb_Mauville
-TilesetCb_Mauville: ; 80A0D18
+TilesetCb_Mauville: @ 80A0D18
 	ldr r1, =0x03000f3a
 	ldr r0, =0x03000f36
 	ldrh r0, [r0]
@@ -464,7 +464,7 @@ TilesetCb_Mauville: ; 80A0D18
 	thumb_func_end TilesetCb_Mauville
 
 	thumb_func_start TilesetCb_Lavaridge
-TilesetCb_Lavaridge: ; 80A0D48
+TilesetCb_Lavaridge: @ 80A0D48
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -480,7 +480,7 @@ TilesetCb_Lavaridge: ; 80A0D48
 	thumb_func_end TilesetCb_Lavaridge
 
 	thumb_func_start TilesetCb_Fallarbor
-TilesetCb_Fallarbor: ; 80A0D74
+TilesetCb_Fallarbor: @ 80A0D74
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -496,7 +496,7 @@ TilesetCb_Fallarbor: ; 80A0D74
 	thumb_func_end TilesetCb_Fallarbor
 
 	thumb_func_start TilesetCb_Fortree
-TilesetCb_Fortree: ; 80A0D9C
+TilesetCb_Fortree: @ 80A0D9C
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -512,7 +512,7 @@ TilesetCb_Fortree: ; 80A0D9C
 	thumb_func_end TilesetCb_Fortree
 
 	thumb_func_start TilesetCb_Lilycove
-TilesetCb_Lilycove: ; 80A0DC4
+TilesetCb_Lilycove: @ 80A0DC4
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -528,7 +528,7 @@ TilesetCb_Lilycove: ; 80A0DC4
 	thumb_func_end TilesetCb_Lilycove
 
 	thumb_func_start TilesetCb_Mossdeep
-TilesetCb_Mossdeep: ; 80A0DEC
+TilesetCb_Mossdeep: @ 80A0DEC
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -544,7 +544,7 @@ TilesetCb_Mossdeep: ; 80A0DEC
 	thumb_func_end TilesetCb_Mossdeep
 
 	thumb_func_start TilesetCb_EverGrande
-TilesetCb_EverGrande: ; 80A0E14
+TilesetCb_EverGrande: @ 80A0E14
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -560,7 +560,7 @@ TilesetCb_EverGrande: ; 80A0E14
 	thumb_func_end TilesetCb_EverGrande
 
 	thumb_func_start TilesetCb_Pacifidlog
-TilesetCb_Pacifidlog: ; 80A0E40
+TilesetCb_Pacifidlog: @ 80A0E40
 	ldr r1, =0x03000f3a
 	ldr r0, =0x03000f36
 	ldrh r0, [r0]
@@ -577,7 +577,7 @@ TilesetCb_Pacifidlog: ; 80A0E40
 	thumb_func_end TilesetCb_Pacifidlog
 
 	thumb_func_start TilesetCb_Sootopolis
-TilesetCb_Sootopolis: ; 80A0E70
+TilesetCb_Sootopolis: @ 80A0E70
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -593,7 +593,7 @@ TilesetCb_Sootopolis: ; 80A0E70
 	thumb_func_end TilesetCb_Sootopolis
 
 	thumb_func_start TilesetCb_BattleFrontierOutsideWest
-TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C
+TilesetCb_BattleFrontierOutsideWest: @ 80A0E9C
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -609,7 +609,7 @@ TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C
 	thumb_func_end TilesetCb_BattleFrontierOutsideWest
 
 	thumb_func_start TilesetCb_BattleFrontierOutsideEast
-TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8
+TilesetCb_BattleFrontierOutsideEast: @ 80A0EC8
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -625,7 +625,7 @@ TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8
 	thumb_func_end TilesetCb_BattleFrontierOutsideEast
 
 	thumb_func_start TilesetCb_Underwater
-TilesetCb_Underwater: ; 80A0EF4
+TilesetCb_Underwater: @ 80A0EF4
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -640,7 +640,7 @@ TilesetCb_Underwater: ; 80A0EF4
 	thumb_func_end TilesetCb_Underwater
 
 	thumb_func_start TilesetCb_SootopolisGym
-TilesetCb_SootopolisGym: ; 80A0F18
+TilesetCb_SootopolisGym: @ 80A0F18
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -655,7 +655,7 @@ TilesetCb_SootopolisGym: ; 80A0F18
 	thumb_func_end TilesetCb_SootopolisGym
 
 	thumb_func_start TilesetCb_Cave
-TilesetCb_Cave: ; 80A0F3C
+TilesetCb_Cave: @ 80A0F3C
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -671,7 +671,7 @@ TilesetCb_Cave: ; 80A0F3C
 	thumb_func_end TilesetCb_Cave
 
 	thumb_func_start TilesetCb_EliteFour
-TilesetCb_EliteFour: ; 80A0F68
+TilesetCb_EliteFour: @ 80A0F68
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -686,7 +686,7 @@ TilesetCb_EliteFour: ; 80A0F68
 	thumb_func_end TilesetCb_EliteFour
 
 	thumb_func_start TilesetCb_MauvilleGym
-TilesetCb_MauvilleGym: ; 80A0F8C
+TilesetCb_MauvilleGym: @ 80A0F8C
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -702,7 +702,7 @@ TilesetCb_MauvilleGym: ; 80A0F8C
 	thumb_func_end TilesetCb_MauvilleGym
 
 	thumb_func_start TilesetCb_BikeShop
-TilesetCb_BikeShop: ; 80A0FB8
+TilesetCb_BikeShop: @ 80A0FB8
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -718,7 +718,7 @@ TilesetCb_BikeShop: ; 80A0FB8
 	thumb_func_end TilesetCb_BikeShop
 
 	thumb_func_start TilesetCb_BattlePyramid
-TilesetCb_BattlePyramid: ; 80A0FE4
+TilesetCb_BattlePyramid: @ 80A0FE4
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -734,7 +734,7 @@ TilesetCb_BattlePyramid: ; 80A0FE4
 	thumb_func_end TilesetCb_BattlePyramid
 
 	thumb_func_start TilesetCb_BattleDome
-TilesetCb_BattleDome: ; 80A1010
+TilesetCb_BattleDome: @ 80A1010
 	ldr r1, =0x03000f3a
 	movs r0, 0
 	strh r0, [r1]
@@ -750,7 +750,7 @@ TilesetCb_BattleDome: ; 80A1010
 	thumb_func_end TilesetCb_BattleDome
 
 	thumb_func_start sub_80A103C
-sub_80A103C: ; 80A103C
+sub_80A103C: @ 80A103C
 	push {r4-r6,lr}
 	lsls r5, r0, 16
 	movs r0, 0xE0
@@ -814,7 +814,7 @@ _080A10B0:
 	thumb_func_end sub_80A103C
 
 	thumb_func_start sub_80A10B8
-sub_80A10B8: ; 80A10B8
+sub_80A10B8: @ 80A10B8
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xE0
@@ -830,7 +830,7 @@ _080A10CC:
 	thumb_func_end sub_80A10B8
 
 	thumb_func_start sub_80A10D0
-sub_80A10D0: ; 80A10D0
+sub_80A10D0: @ 80A10D0
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xF0
@@ -846,7 +846,7 @@ _080A10E4:
 	thumb_func_end sub_80A10D0
 
 	thumb_func_start sub_80A10E8
-sub_80A10E8: ; 80A10E8
+sub_80A10E8: @ 80A10E8
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	movs r0, 0xE0
@@ -907,7 +907,7 @@ _080A1154:
 	thumb_func_end sub_80A10E8
 
 	thumb_func_start sub_80A115C
-sub_80A115C: ; 80A115C
+sub_80A115C: @ 80A115C
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	movs r0, 0xF0
@@ -932,7 +932,7 @@ _080A1180:
 	thumb_func_end sub_80A115C
 
 	thumb_func_start sub_80A1188
-sub_80A1188: ; 80A1188
+sub_80A1188: @ 80A1188
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	movs r0, 0xE0
@@ -993,7 +993,7 @@ _080A11F4:
 	thumb_func_end sub_80A1188
 
 	thumb_func_start sub_80A11FC
-sub_80A11FC: ; 80A11FC
+sub_80A11FC: @ 80A11FC
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	movs r0, 0xF0
@@ -1020,7 +1020,7 @@ _080A1224:
 	thumb_func_end sub_80A11FC
 
 	thumb_func_start sub_80A122C
-sub_80A122C: ; 80A122C
+sub_80A122C: @ 80A122C
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xF0
@@ -1036,7 +1036,7 @@ _080A1240:
 	thumb_func_end sub_80A122C
 
 	thumb_func_start sub_80A1244
-sub_80A1244: ; 80A1244
+sub_80A1244: @ 80A1244
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xF0
@@ -1054,7 +1054,7 @@ _080A125C:
 	thumb_func_end sub_80A1244
 
 	thumb_func_start sub_80A1260
-sub_80A1260: ; 80A1260
+sub_80A1260: @ 80A1260
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xF0
@@ -1071,7 +1071,7 @@ _080A1276:
 	thumb_func_end sub_80A1260
 
 	thumb_func_start sub_80A127C
-sub_80A127C: ; 80A127C
+sub_80A127C: @ 80A127C
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xE0
@@ -1087,7 +1087,7 @@ _080A1290:
 	thumb_func_end sub_80A127C
 
 	thumb_func_start sub_80A1294
-sub_80A1294: ; 80A1294
+sub_80A1294: @ 80A1294
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xE0
@@ -1103,7 +1103,7 @@ _080A12A8:
 	thumb_func_end sub_80A1294
 
 	thumb_func_start sub_80A12AC
-sub_80A12AC: ; 80A12AC
+sub_80A12AC: @ 80A12AC
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1123,7 +1123,7 @@ sub_80A12AC: ; 80A12AC
 	thumb_func_end sub_80A12AC
 
 	thumb_func_start sub_80A12D4
-sub_80A12D4: ; 80A12D4
+sub_80A12D4: @ 80A12D4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1155,7 +1155,7 @@ sub_80A12D4: ; 80A12D4
 	thumb_func_end sub_80A12D4
 
 	thumb_func_start sub_80A131C
-sub_80A131C: ; 80A131C
+sub_80A131C: @ 80A131C
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xC0
@@ -1175,7 +1175,7 @@ sub_80A131C: ; 80A131C
 	thumb_func_end sub_80A131C
 
 	thumb_func_start sub_80A1344
-sub_80A1344: ; 80A1344
+sub_80A1344: @ 80A1344
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xC0
@@ -1194,7 +1194,7 @@ sub_80A1344: ; 80A1344
 	thumb_func_end sub_80A1344
 
 	thumb_func_start sub_80A136C
-sub_80A136C: ; 80A136C
+sub_80A136C: @ 80A136C
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xE0
@@ -1214,7 +1214,7 @@ sub_80A136C: ; 80A136C
 	thumb_func_end sub_80A136C
 
 	thumb_func_start sub_80A1394
-sub_80A1394: ; 80A1394
+sub_80A1394: @ 80A1394
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -1279,7 +1279,7 @@ _080A141C:
 	thumb_func_end sub_80A1394
 
 	thumb_func_start sub_80A1434
-sub_80A1434: ; 80A1434
+sub_80A1434: @ 80A1434
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1310,7 +1310,7 @@ _080A1464:
 	thumb_func_end sub_80A1434
 
 	thumb_func_start sub_80A1470
-sub_80A1470: ; 80A1470
+sub_80A1470: @ 80A1470
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1329,7 +1329,7 @@ sub_80A1470: ; 80A1470
 	thumb_func_end sub_80A1470
 
 	thumb_func_start sub_80A1498
-sub_80A1498: ; 80A1498
+sub_80A1498: @ 80A1498
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1348,7 +1348,7 @@ sub_80A1498: ; 80A1498
 	thumb_func_end sub_80A1498
 
 	thumb_func_start sub_80A14C0
-sub_80A14C0: ; 80A14C0
+sub_80A14C0: @ 80A14C0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1375,7 +1375,7 @@ sub_80A14C0: ; 80A14C0
 	thumb_func_end sub_80A14C0
 
 	thumb_func_start sub_80A14F8
-sub_80A14F8: ; 80A14F8
+sub_80A14F8: @ 80A14F8
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1394,7 +1394,7 @@ sub_80A14F8: ; 80A14F8
 	thumb_func_end sub_80A14F8
 
 	thumb_func_start sub_80A1520
-sub_80A1520: ; 80A1520
+sub_80A1520: @ 80A1520
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1413,7 +1413,7 @@ sub_80A1520: ; 80A1520
 	thumb_func_end sub_80A1520
 
 	thumb_func_start sub_80A1548
-sub_80A1548: ; 80A1548
+sub_80A1548: @ 80A1548
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1432,7 +1432,7 @@ sub_80A1548: ; 80A1548
 	thumb_func_end sub_80A1548
 
 	thumb_func_start sub_80A1570
-sub_80A1570: ; 80A1570
+sub_80A1570: @ 80A1570
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1451,7 +1451,7 @@ sub_80A1570: ; 80A1570
 	thumb_func_end sub_80A1570
 
 	thumb_func_start sub_80A1598
-sub_80A1598: ; 80A1598
+sub_80A1598: @ 80A1598
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1470,7 +1470,7 @@ sub_80A1598: ; 80A1598
 	thumb_func_end sub_80A1598
 
 	thumb_func_start sub_80A15C0
-sub_80A15C0: ; 80A15C0
+sub_80A15C0: @ 80A15C0
 	push {lr}
 	lsls r2, r0, 16
 	lsrs r0, r2, 16
@@ -1486,7 +1486,7 @@ _080A15D4:
 	thumb_func_end sub_80A15C0
 
 	thumb_func_start sub_80A15D8
-sub_80A15D8: ; 80A15D8
+sub_80A15D8: @ 80A15D8
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xE0
@@ -1502,7 +1502,7 @@ _080A15EC:
 	thumb_func_end sub_80A15D8
 
 	thumb_func_start sub_80A15F0
-sub_80A15F0: ; 80A15F0
+sub_80A15F0: @ 80A15F0
 	push {r4,r5,lr}
 	lsls r4, r0, 16
 	lsrs r0, r4, 16
@@ -1527,7 +1527,7 @@ _080A1614:
 	thumb_func_end sub_80A15F0
 
 	thumb_func_start sub_80A161C
-sub_80A161C: ; 80A161C
+sub_80A161C: @ 80A161C
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xC0
@@ -1543,7 +1543,7 @@ _080A1630:
 	thumb_func_end sub_80A161C
 
 	thumb_func_start sub_80A1634
-sub_80A1634: ; 80A1634
+sub_80A1634: @ 80A1634
 	push {r4,lr}
 	lsls r4, r0, 16
 	movs r0, 0xE0
@@ -1563,7 +1563,7 @@ _080A1650:
 	thumb_func_end sub_80A1634
 
 	thumb_func_start sub_80A1658
-sub_80A1658: ; 80A1658
+sub_80A1658: @ 80A1658
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xC0
@@ -1579,7 +1579,7 @@ _080A166C:
 	thumb_func_end sub_80A1658
 
 	thumb_func_start sub_80A1670
-sub_80A1670: ; 80A1670
+sub_80A1670: @ 80A1670
 	push {lr}
 	lsls r1, r0, 16
 	movs r0, 0xC0
@@ -1595,7 +1595,7 @@ _080A1684:
 	thumb_func_end sub_80A1670
 
 	thumb_func_start sub_80A1688
-sub_80A1688: ; 80A1688
+sub_80A1688: @ 80A1688
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1614,7 +1614,7 @@ sub_80A1688: ; 80A1688
 	thumb_func_end sub_80A1688
 
 	thumb_func_start sub_80A16B0
-sub_80A16B0: ; 80A16B0
+sub_80A16B0: @ 80A16B0
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1644,7 +1644,7 @@ sub_80A16B0: ; 80A16B0
 	thumb_func_end sub_80A16B0
 
 	thumb_func_start sub_80A16F8
-sub_80A16F8: ; 80A16F8
+sub_80A16F8: @ 80A16F8
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xC0
@@ -1663,7 +1663,7 @@ sub_80A16F8: ; 80A16F8
 	thumb_func_end sub_80A16F8
 
 	thumb_func_start sub_80A1720
-sub_80A1720: ; 80A1720
+sub_80A1720: @ 80A1720
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1682,7 +1682,7 @@ sub_80A1720: ; 80A1720
 	thumb_func_end sub_80A1720
 
 	thumb_func_start sub_80A1748
-sub_80A1748: ; 80A1748
+sub_80A1748: @ 80A1748
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1702,7 +1702,7 @@ sub_80A1748: ; 80A1748
 	thumb_func_end sub_80A1748
 
 	thumb_func_start sub_80A1770
-sub_80A1770: ; 80A1770
+sub_80A1770: @ 80A1770
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1722,7 +1722,7 @@ sub_80A1770: ; 80A1770
 	thumb_func_end sub_80A1770
 
 	thumb_func_start sub_80A1798
-sub_80A1798: ; 80A1798
+sub_80A1798: @ 80A1798
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xE0
@@ -1742,7 +1742,7 @@ sub_80A1798: ; 80A1798
 	thumb_func_end sub_80A1798
 
 	thumb_func_start sub_80A17C0
-sub_80A17C0: ; 80A17C0
+sub_80A17C0: @ 80A17C0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1763,7 +1763,7 @@ sub_80A17C0: ; 80A17C0
 	thumb_func_end sub_80A17C0
 
 	thumb_func_start sub_80A17EC
-sub_80A17EC: ; 80A17EC
+sub_80A17EC: @ 80A17EC
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1784,7 +1784,7 @@ sub_80A17EC: ; 80A17EC
 	thumb_func_end sub_80A17EC
 
 	thumb_func_start sub_80A1818
-sub_80A1818: ; 80A1818
+sub_80A1818: @ 80A1818
 	push {lr}
 	lsls r0, 16
 	ldr r2, =gUnknown_0852487C
@@ -1826,7 +1826,7 @@ _080A1862:
 	thumb_func_end sub_80A1818
 
 	thumb_func_start sub_80A1884
-sub_80A1884: ; 80A1884
+sub_80A1884: @ 80A1884
 	push {lr}
 	lsls r0, 16
 	ldr r2, =gUnknown_0852487C
diff --git a/asm/window.s b/asm/window.s
index bbeabe6d1..31ecd0ecb 100644
--- a/asm/window.s
+++ b/asm/window.s
@@ -1,11 +1,11 @@
 	thumb_func_start nullsub_8
-nullsub_8: ; 80031BC
+nullsub_8: @ 80031BC
 	bx lr
 	thumb_func_end nullsub_8
 
 	thumb_func_start InitWindows
-; bool16 InitWindows(struct WindowTemplate *templates)
-InitWindows: ; 80031C0
+@ bool16 InitWindows(struct WindowTemplate *templates)
+InitWindows: @ 80031C0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -216,8 +216,8 @@ _08003364:
 	thumb_func_end InitWindows
 
 	thumb_func_start AddWindow
-; u8 AddWindow(struct WindowTemplate *template)
-AddWindow: ; 8003380
+@ u8 AddWindow(struct WindowTemplate *template)
+AddWindow: @ 8003380
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -382,8 +382,8 @@ _080034C0:
 	thumb_func_end AddWindow
 
 	thumb_func_start AddWindowWithoutTileMap
-; int AddWindowWithoutTileMap(struct WindowTemplate *template)
-AddWindowWithoutTileMap: ; 80034D8
+@ int AddWindowWithoutTileMap(struct WindowTemplate *template)
+AddWindowWithoutTileMap: @ 80034D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -462,8 +462,8 @@ _08003564:
 	thumb_func_end AddWindowWithoutTileMap
 
 	thumb_func_start RemoveWindow
-; void RemoveWindow(u8 windowId)
-RemoveWindow: ; 8003574
+@ void RemoveWindow(u8 windowId)
+RemoveWindow: @ 8003574
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -528,8 +528,8 @@ _080035E8:
 	thumb_func_end RemoveWindow
 
 	thumb_func_start FreeAllWindowBuffers
-; void FreeAllWindowBuffers()
-FreeAllWindowBuffers: ; 8003604
+@ void FreeAllWindowBuffers()
+FreeAllWindowBuffers: @ 8003604
 	push {r4-r6,lr}
 	ldr r4, =0x03002f70
 	movs r5, 0x3
@@ -572,8 +572,8 @@ _0800363E:
 	thumb_func_end FreeAllWindowBuffers
 
 	thumb_func_start CopyWindowToVram
-; void CopyWindowToVram(u8 windowId, u8 mode)
-CopyWindowToVram: ; 8003658
+@ void CopyWindowToVram(u8 windowId, u8 mode)
+CopyWindowToVram: @ 8003658
 	push {r4-r6,lr}
 	sub sp, 0xC
 	lsls r0, 24
@@ -640,8 +640,8 @@ _080036CE:
 	thumb_func_end CopyWindowToVram
 
 	thumb_func_start CopyWindowRectToVram
-; void CopyWindowRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
-CopyWindowRectToVram: ; 80036D8
+@ void CopyWindowRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
+CopyWindowRectToVram: @ 80036D8
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r6, r0, 0
@@ -734,8 +734,8 @@ _08003782:
 	thumb_func_end CopyWindowRectToVram
 
 	thumb_func_start PutWindowTilemap
-; void PutWindowTilemap(u8 windowId)
-PutWindowTilemap: ; 800378C
+@ void PutWindowTilemap(u8 windowId)
+PutWindowTilemap: @ 800378C
 	push {r4,lr}
 	sub sp, 0x1C
 	lsls r0, 24
@@ -784,8 +784,8 @@ PutWindowTilemap: ; 800378C
 	thumb_func_end PutWindowTilemap
 
 	thumb_func_start PutWindowRectTilemapOverridePalette
-; void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
-PutWindowRectTilemapOverridePalette: ; 80037EC
+@ void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
+PutWindowRectTilemapOverridePalette: @ 80037EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -879,8 +879,8 @@ _0800388E:
 	thumb_func_end PutWindowRectTilemapOverridePalette
 
 	thumb_func_start ClearWindowTilemap
-; void ClearWindowTilemap(u8 windowId)
-ClearWindowTilemap: ; 80038A4
+@ void ClearWindowTilemap(u8 windowId)
+ClearWindowTilemap: @ 80038A4
 	push {r4,lr}
 	sub sp, 0x18
 	lsls r0, 24
@@ -919,8 +919,8 @@ ClearWindowTilemap: ; 80038A4
 	thumb_func_end ClearWindowTilemap
 
 	thumb_func_start PutWindowRectTilemap
-; void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
-PutWindowRectTilemap: ; 80038F4
+@ void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
+PutWindowRectTilemap: @ 80038F4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1010,8 +1010,8 @@ _0800398E:
 	thumb_func_end PutWindowRectTilemap
 
 	thumb_func_start BlitBitmapToWindow
-; void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
-BlitBitmapToWindow: ; 80039A4
+@ void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
+BlitBitmapToWindow: @ 80039A4
 	push {r4,r5,lr}
 	sub sp, 0x18
 	ldr r4, [sp, 0x24]
@@ -1042,8 +1042,8 @@ BlitBitmapToWindow: ; 80039A4
 	thumb_func_end BlitBitmapToWindow
 
 	thumb_func_start BlitBitmapRectToWindow
-; void BlitBitmapRectToWindow(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
-BlitBitmapRectToWindow: ; 80039DC
+@ void BlitBitmapRectToWindow(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
+BlitBitmapRectToWindow: @ 80039DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1136,8 +1136,8 @@ BlitBitmapRectToWindow: ; 80039DC
 	thumb_func_end BlitBitmapRectToWindow
 
 	thumb_func_start BlitBitmapRectToWindowWithColorKey
-; void BlitBitmapRectToWindowWithColorKey(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 colorKey)
-BlitBitmapRectToWindowWithColorKey: ; 8003A9C
+@ void BlitBitmapRectToWindowWithColorKey(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 colorKey)
+BlitBitmapRectToWindowWithColorKey: @ 8003A9C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1234,8 +1234,8 @@ BlitBitmapRectToWindowWithColorKey: ; 8003A9C
 	thumb_func_end BlitBitmapRectToWindowWithColorKey
 
 	thumb_func_start FillWindowPixelRect
-; void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
-FillWindowPixelRect: ; 8003B64
+@ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
+FillWindowPixelRect: @ 8003B64
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -1302,8 +1302,8 @@ FillWindowPixelRect: ; 8003B64
 	thumb_func_end FillWindowPixelRect
 
 	thumb_func_start CopyToWindowPixelBuffer
-; void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u32 size, u16 tileOffset)
-CopyToWindowPixelBuffer: ; 8003BF0
+@ void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u32 size, u16 tileOffset)
+CopyToWindowPixelBuffer: @ 8003BF0
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1347,8 +1347,8 @@ _08003C3C:
 	thumb_func_end CopyToWindowPixelBuffer
 
 	thumb_func_start FillWindowPixelBuffer
-; void FillWindowPixelBuffer(u8 windowId, u32 fillValue)
-FillWindowPixelBuffer: ; 8003C48
+@ void FillWindowPixelBuffer(u8 windowId, u32 fillValue)
+FillWindowPixelBuffer: @ 8003C48
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -1387,8 +1387,8 @@ FillWindowPixelBuffer: ; 8003C48
 	thumb_func_end FillWindowPixelBuffer
 
 	thumb_func_start ScrollWindow
-; void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
-ScrollWindow: ; 8003C94
+@ void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
+ScrollWindow: @ 8003C94
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1913,8 +1913,8 @@ _08004046:
 	thumb_func_end ScrollWindow
 
 	thumb_func_start CallWindowFunction
-; void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
-CallWindowFunction: ; 8004058
+@ void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
+CallWindowFunction: @ 8004058
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -1955,8 +1955,8 @@ CallWindowFunction: ; 8004058
 	thumb_func_end CallWindowFunction
 
 	thumb_func_start SetWindowAttribute
-; bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
-SetWindowAttribute: ; 80040A8
+@ bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
+SetWindowAttribute: @ 80040A8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -2037,8 +2037,8 @@ _08004144:
 	thumb_func_end SetWindowAttribute
 
 	thumb_func_start GetWindowAttribute
-; u32 GetWindowAttribute(u8 windowId, u8 attributeId)
-GetWindowAttribute: ; 800414C
+@ u32 GetWindowAttribute(u8 windowId, u8 attributeId)
+GetWindowAttribute: @ 800414C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -2143,8 +2143,8 @@ _0800422A:
 	thumb_func_end GetWindowAttribute
 
 	thumb_func_start GetNumActiveWindowsOnBg
-; u8 GetNumActiveWindowsOnBg(u8 bgId)
-GetNumActiveWindowsOnBg: ; 8004230
+@ u8 GetNumActiveWindowsOnBg(u8 bgId)
+GetNumActiveWindowsOnBg: @ 8004230
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2171,13 +2171,13 @@ _08004248:
 	thumb_func_end GetNumActiveWindowsOnBg
 
 	thumb_func_start nullsub_9
-nullsub_9: ; 800425C
+nullsub_9: @ 800425C
 	bx lr
 	thumb_func_end nullsub_9
 
 	thumb_func_start AddWindow8Bit
-; u16 AddWindow8Bit(struct WindowTemplate *template)
-AddWindow8Bit: ; 8004260
+@ u16 AddWindow8Bit(struct WindowTemplate *template)
+AddWindow8Bit: @ 8004260
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2306,8 +2306,8 @@ _08004356:
 	thumb_func_end AddWindow8Bit
 
 	thumb_func_start FillWindowPixelBuffer8Bit
-; void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue)
-FillWindowPixelBuffer8Bit: ; 8004368
+@ void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue)
+FillWindowPixelBuffer8Bit: @ 8004368
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2344,8 +2344,8 @@ _0800439E:
 	thumb_func_end FillWindowPixelBuffer8Bit
 
 	thumb_func_start FillWindowPixelRect8Bit
-; void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
-FillWindowPixelRect8Bit: ; 80043A8
+@ void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
+FillWindowPixelRect8Bit: @ 80043A8
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -2412,8 +2412,8 @@ FillWindowPixelRect8Bit: ; 80043A8
 	thumb_func_end FillWindowPixelRect8Bit
 
 	thumb_func_start BlitBitmapRectToWindow4BitTo8Bit
-; void BlitBitmapRectToWindow4BitTo8Bit(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteOffset)
-BlitBitmapRectToWindow4BitTo8Bit: ; 8004434
+@ void BlitBitmapRectToWindow4BitTo8Bit(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteOffset)
+BlitBitmapRectToWindow4BitTo8Bit: @ 8004434
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2512,8 +2512,8 @@ BlitBitmapRectToWindow4BitTo8Bit: ; 8004434
 	thumb_func_end BlitBitmapRectToWindow4BitTo8Bit
 
 	thumb_func_start CopyWindowToVram8Bit
-; void CopyWindowToVram8Bit(u8 windowId, u8 mode)
-CopyWindowToVram8Bit: ; 8004500
+@ void CopyWindowToVram8Bit(u8 windowId, u8 mode)
+CopyWindowToVram8Bit: @ 8004500
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2572,8 +2572,8 @@ _08004570:
 	thumb_func_end CopyWindowToVram8Bit
 
 	thumb_func_start GetNumActiveWindowsOnBg8Bit
-; int GetNumActiveWindowsOnBg8Bit(int bg_id)
-GetNumActiveWindowsOnBg8Bit: ; 8004578
+@ int GetNumActiveWindowsOnBg8Bit(int bg_id)
+GetNumActiveWindowsOnBg8Bit: @ 8004578
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
diff --git a/data/base_stats.s b/data/base_stats.s
index d99c365a0..d3ed828c2 100644
--- a/data/base_stats.s
+++ b/data/base_stats.s
@@ -1,8636 +1,8636 @@
 	.align 2, 0
 
-gBaseStats: ; 83203CC
-; ??????????
+gBaseStats: @ 83203CC
+@ ??????????
 	.fill 28, 1, 0
 
-; Bulbasaur
+@ Bulbasaur
 	base_stats 45, 49, 49, 45, 65, 65
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 64 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 64 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ivysaur
+@ Ivysaur
 	base_stats 60, 62, 63, 60, 80, 80
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 141 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 141 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Venusaur
+@ Venusaur
 	base_stats 80, 82, 83, 80, 100, 100
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 208 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 208 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Charmander
+@ Charmander
 	base_stats 39, 52, 43, 65, 60, 50
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Charmeleon
+@ Charmeleon
 	base_stats 58, 64, 58, 80, 80, 65
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 142 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 142 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Charizard
+@ Charizard
 	base_stats 78, 84, 78, 100, 109, 85
 	.byte TYPE_FIRE
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 209 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 209 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Squirtle
+@ Squirtle
 	base_stats 44, 48, 65, 43, 50, 64
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 66 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 66 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wartortle
+@ Wartortle
 	base_stats 59, 63, 80, 58, 65, 80
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 143 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 143 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Blastoise
+@ Blastoise
 	base_stats 79, 83, 100, 78, 85, 105
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 210 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 210 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Caterpie
+@ Caterpie
 	base_stats 45, 30, 35, 45, 20, 20
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 255 ; catch rate
-	.byte 53 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 53 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHIELD_DUST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Metapod
+@ Metapod
 	base_stats 50, 20, 55, 30, 25, 25
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 120 ; catch rate
-	.byte 72 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 72 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Butterfree
+@ Butterfree
 	base_stats 60, 45, 50, 70, 80, 80
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 160 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 160 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_SILVER_POWDER
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_COMPOUND_EYES
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Weedle
+@ Weedle
 	base_stats 40, 35, 30, 50, 20, 20
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 255 ; catch rate
-	.byte 52 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 52 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHIELD_DUST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kakuna
+@ Kakuna
 	base_stats 45, 25, 50, 35, 25, 25
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 120 ; catch rate
-	.byte 71 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 71 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Beedrill
+@ Beedrill
 	base_stats 65, 80, 40, 75, 45, 80
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 159 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 159 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_POISON_BARB
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pidgey
+@ Pidgey
 	base_stats 40, 45, 40, 56, 35, 35
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 55 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 55 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pidgeotto
+@ Pidgeotto
 	base_stats 63, 60, 55, 71, 50, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 120 ; catch rate
-	.byte 113 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 113 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pidgeot
+@ Pidgeot
 	base_stats 83, 80, 75, 91, 70, 70
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 172 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 172 @ base exp. yield
 	ev_yield 0, 0, 0, 3, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Rattata
+@ Rattata
 	base_stats 30, 56, 35, 72, 25, 35
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 57 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 57 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_GUTS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Raticate
+@ Raticate
 	base_stats 55, 81, 60, 97, 50, 70
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 127 ; catch rate
-	.byte 116 ; base exp. yield
+	.byte 127 @ catch rate
+	.byte 116 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_GUTS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Spearow
+@ Spearow
 	base_stats 40, 60, 30, 70, 31, 31
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 58 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 58 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Fearow
+@ Fearow
 	base_stats 65, 90, 65, 100, 61, 61
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 90 ; catch rate
-	.byte 162 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 162 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SHARP_BEAK
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ekans
+@ Ekans
 	base_stats 35, 60, 44, 55, 40, 54
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 255 ; catch rate
-	.byte 62 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 62 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_SHED_SKIN
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Arbok
+@ Arbok
 	base_stats 60, 85, 69, 80, 65, 79
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 90 ; catch rate
-	.byte 147 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 147 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_SHED_SKIN
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pikachu
+@ Pikachu
 	base_stats 35, 55, 30, 90, 50, 40
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 190 ; catch rate
-	.byte 82 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 82 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_ORAN_BERRY
 	.2byte ITEM_LIGHT_BALL
-	.byte 127 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 6 ; Safari Zone flee rate
+	.byte 6 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Raichu
+@ Raichu
 	base_stats 60, 90, 55, 100, 90, 80
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 75 ; catch rate
-	.byte 122 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 122 @ base exp. yield
 	ev_yield 0, 0, 0, 3, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_ORAN_BERRY
-	.byte 127 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sandshrew
+@ Sandshrew
 	base_stats 50, 75, 85, 40, 20, 30
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 93 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 93 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_QUICK_CLAW
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sandslash
+@ Sandslash
 	base_stats 75, 100, 110, 65, 45, 55
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 90 ; catch rate
-	.byte 163 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 163 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_QUICK_CLAW
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidoran♀
+@ Nidoran♀
 	base_stats 55, 47, 52, 41, 40, 40
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 235 ; catch rate
-	.byte 59 ; base exp. yield
+	.byte 235 @ catch rate
+	.byte 59 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidorina
+@ Nidorina
 	base_stats 70, 62, 67, 56, 55, 55
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 120 ; catch rate
-	.byte 117 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 117 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidoqueen
+@ Nidoqueen
 	base_stats 90, 82, 87, 76, 75, 85
 	.byte TYPE_POISON
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 194 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 194 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidoran♂
+@ Nidoran♂
 	base_stats 46, 57, 40, 50, 40, 40
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 235 ; catch rate
-	.byte 60 ; base exp. yield
+	.byte 235 @ catch rate
+	.byte 60 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidorino
+@ Nidorino
 	base_stats 61, 72, 57, 65, 55, 55
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 120 ; catch rate
-	.byte 118 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 118 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nidoking
+@ Nidoking
 	base_stats 81, 92, 77, 85, 85, 75
 	.byte TYPE_POISON
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 195 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 195 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Clefairy
+@ Clefairy
 	base_stats 70, 45, 48, 35, 60, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 150 ; catch rate
-	.byte 68 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 68 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_LEPPA_BERRY
 	.2byte ITEM_MOON_STONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 140 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 140 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Clefable
+@ Clefable
 	base_stats 95, 70, 73, 60, 85, 90
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 25 ; catch rate
-	.byte 129 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 129 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_LEPPA_BERRY
 	.2byte ITEM_MOON_STONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 140 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 140 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Vulpix
+@ Vulpix
 	base_stats 38, 41, 40, 65, 50, 65
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 190 ; catch rate
-	.byte 63 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 63 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_FLASH_FIRE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ninetales
+@ Ninetales
 	base_stats 73, 76, 75, 100, 81, 100
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 75 ; catch rate
-	.byte 178 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 178 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 1
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_FLASH_FIRE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Jigglypuff
+@ Jigglypuff
 	base_stats 115, 45, 20, 20, 45, 25
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 170 ; catch rate
-	.byte 76 ; base exp. yield
+	.byte 170 @ catch rate
+	.byte 76 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wigglytuff
+@ Wigglytuff
 	base_stats 140, 70, 45, 45, 75, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 50 ; catch rate
-	.byte 109 ; base exp. yield
+	.byte 50 @ catch rate
+	.byte 109 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Zubat
+@ Zubat
 	base_stats 40, 45, 35, 55, 30, 40
 	.byte TYPE_POISON
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 54 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 54 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Golbat
+@ Golbat
 	base_stats 75, 80, 70, 90, 65, 75
 	.byte TYPE_POISON
 	.byte TYPE_FLYING
-	.byte 90 ; catch rate
-	.byte 171 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 171 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Oddish
+@ Oddish
 	base_stats 45, 50, 55, 30, 75, 65
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 255 ; catch rate
-	.byte 78 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 78 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gloom
+@ Gloom
 	base_stats 60, 65, 70, 40, 85, 75
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 120 ; catch rate
-	.byte 132 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 132 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 6 ; Safari Zone flee rate
+	.byte 6 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Vileplume
+@ Vileplume
 	base_stats 75, 80, 85, 50, 100, 90
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 184 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 184 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Paras
+@ Paras
 	base_stats 35, 70, 55, 25, 45, 55
 	.byte TYPE_BUG
 	.byte TYPE_GRASS
-	.byte 190 ; catch rate
-	.byte 70 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 70 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_TINY_MUSHROOM
 	.2byte ITEM_BIG_MUSHROOM
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_EFFECT_SPORE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Parasect
+@ Parasect
 	base_stats 60, 95, 80, 30, 60, 80
 	.byte TYPE_BUG
 	.byte TYPE_GRASS
-	.byte 75 ; catch rate
-	.byte 128 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 128 @ base exp. yield
 	ev_yield 0, 2, 1, 0, 0, 0
 	.2byte ITEM_TINY_MUSHROOM
 	.2byte ITEM_BIG_MUSHROOM
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_EFFECT_SPORE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Venonat
+@ Venonat
 	base_stats 60, 55, 50, 45, 40, 55
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 190 ; catch rate
-	.byte 75 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 75 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_COMPOUND_EYES
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Venomoth
+@ Venomoth
 	base_stats 70, 65, 60, 90, 90, 75
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 75 ; catch rate
-	.byte 138 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 138 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHIELD_DUST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Diglett
+@ Diglett
 	base_stats 10, 55, 25, 95, 35, 45
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 81 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 81 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_ARENA_TRAP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dugtrio
+@ Dugtrio
 	base_stats 35, 80, 50, 120, 50, 70
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 50 ; catch rate
-	.byte 153 ; base exp. yield
+	.byte 50 @ catch rate
+	.byte 153 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_ARENA_TRAP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Meowth
+@ Meowth
 	base_stats 40, 45, 35, 90, 40, 40
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 69 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 69 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PICKUP
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Persian
+@ Persian
 	base_stats 65, 70, 60, 115, 65, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 90 ; catch rate
-	.byte 148 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 148 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_LIMBER
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Psyduck
+@ Psyduck
 	base_stats 50, 52, 48, 55, 65, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 190 ; catch rate
-	.byte 80 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 80 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_DAMP
 	.byte ABILITY_CLOUD_NINE
-	.byte 6 ; Safari Zone flee rate
+	.byte 6 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Golduck
+@ Golduck
 	base_stats 80, 82, 78, 85, 95, 80
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 75 ; catch rate
-	.byte 174 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 174 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_DAMP
 	.byte ABILITY_CLOUD_NINE
-	.byte 8 ; Safari Zone flee rate
+	.byte 8 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mankey
+@ Mankey
 	base_stats 40, 80, 35, 70, 35, 45
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 190 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_VITAL_SPIRIT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Primeape
+@ Primeape
 	base_stats 65, 105, 60, 95, 60, 70
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 75 ; catch rate
-	.byte 149 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 149 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_VITAL_SPIRIT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Growlithe
+@ Growlithe
 	base_stats 55, 70, 45, 60, 70, 50
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 190 ; catch rate
-	.byte 91 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 91 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Arcanine
+@ Arcanine
 	base_stats 90, 110, 80, 95, 100, 80
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 75 ; catch rate
-	.byte 213 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 213 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Poliwag
+@ Poliwag
 	base_stats 40, 50, 40, 90, 40, 40
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 255 ; catch rate
-	.byte 77 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 77 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_DAMP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Poliwhirl
+@ Poliwhirl
 	base_stats 65, 65, 65, 90, 50, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 120 ; catch rate
-	.byte 131 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 131 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_DAMP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Poliwrath
+@ Poliwrath
 	base_stats 90, 85, 95, 70, 70, 90
 	.byte TYPE_WATER
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 185 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 185 @ base exp. yield
 	ev_yield 0, 0, 3, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_DAMP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Abra
+@ Abra
 	base_stats 25, 20, 15, 90, 105, 55
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 200 ; catch rate
-	.byte 73 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 73 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_TWISTED_SPOON
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_INNER_FOCUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kadabra
+@ Kadabra
 	base_stats 40, 35, 30, 105, 120, 70
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 100 ; catch rate
-	.byte 145 ; base exp. yield
+	.byte 100 @ catch rate
+	.byte 145 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_TWISTED_SPOON
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_INNER_FOCUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Alakazam
+@ Alakazam
 	base_stats 55, 50, 45, 120, 135, 85
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 50 ; catch rate
-	.byte 186 ; base exp. yield
+	.byte 50 @ catch rate
+	.byte 186 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_TWISTED_SPOON
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_INNER_FOCUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Machop
+@ Machop
 	base_stats 70, 80, 50, 35, 35, 35
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 180 ; catch rate
-	.byte 88 ; base exp. yield
+	.byte 180 @ catch rate
+	.byte 88 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Machoke
+@ Machoke
 	base_stats 80, 100, 70, 45, 50, 60
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 90 ; catch rate
-	.byte 146 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 146 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Machamp
+@ Machamp
 	base_stats 90, 130, 80, 55, 65, 85
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 193 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 193 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Bellsprout
+@ Bellsprout
 	base_stats 50, 75, 35, 40, 70, 30
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 255 ; catch rate
-	.byte 84 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 84 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Weepinbell
+@ Weepinbell
 	base_stats 65, 90, 50, 55, 85, 45
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 120 ; catch rate
-	.byte 151 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 151 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Victreebel
+@ Victreebel
 	base_stats 80, 105, 65, 70, 100, 60
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 191 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 191 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tentacool
+@ Tentacool
 	base_stats 40, 40, 35, 70, 50, 100
 	.byte TYPE_WATER
 	.byte TYPE_POISON
-	.byte 190 ; catch rate
-	.byte 105 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 105 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_LIQUID_OOZE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tentacruel
+@ Tentacruel
 	base_stats 80, 70, 65, 100, 80, 120
 	.byte TYPE_WATER
 	.byte TYPE_POISON
-	.byte 60 ; catch rate
-	.byte 205 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 205 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_LIQUID_OOZE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Geodude
+@ Geodude
 	base_stats 40, 80, 100, 20, 30, 30
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 86 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 86 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_EVERSTONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_STURDY
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Graveler
+@ Graveler
 	base_stats 55, 95, 115, 35, 45, 45
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 120 ; catch rate
-	.byte 134 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 134 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_EVERSTONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Golem
+@ Golem
 	base_stats 80, 110, 130, 45, 55, 65
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 177 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 177 @ base exp. yield
 	ev_yield 0, 0, 3, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_EVERSTONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ponyta
+@ Ponyta
 	base_stats 50, 85, 55, 90, 65, 65
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 190 ; catch rate
-	.byte 152 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 152 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Rapidash
+@ Rapidash
 	base_stats 65, 100, 70, 105, 80, 80
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 60 ; catch rate
-	.byte 192 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 192 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slowpoke
+@ Slowpoke
 	base_stats 90, 65, 65, 15, 40, 40
 	.byte TYPE_WATER
 	.byte TYPE_PSYCHIC
-	.byte 190 ; catch rate
-	.byte 99 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 99 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_OWN_TEMPO
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slowbro
+@ Slowbro
 	base_stats 95, 75, 110, 30, 100, 80
 	.byte TYPE_WATER
 	.byte TYPE_PSYCHIC
-	.byte 75 ; catch rate
-	.byte 164 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 164 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_OWN_TEMPO
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magnemite
+@ Magnemite
 	base_stats 25, 35, 70, 45, 95, 55
 	.byte TYPE_ELECTRIC
 	.byte TYPE_STEEL
-	.byte 190 ; catch rate
-	.byte 89 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 89 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_MAGNET_PULL
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magneton
+@ Magneton
 	base_stats 50, 60, 95, 70, 120, 70
 	.byte TYPE_ELECTRIC
 	.byte TYPE_STEEL
-	.byte 60 ; catch rate
-	.byte 161 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 161 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_MAGNET_PULL
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Farfetch'd
+@ Farfetch'd
 	base_stats 52, 65, 55, 60, 58, 62
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 94 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 94 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_STICK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_INNER_FOCUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Doduo
+@ Doduo
 	base_stats 35, 85, 45, 75, 35, 35
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 190 ; catch rate
-	.byte 96 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 96 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SHARP_BEAK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_EARLY_BIRD
-	.byte 8 ; Safari Zone flee rate
+	.byte 8 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dodrio
+@ Dodrio
 	base_stats 60, 110, 70, 100, 60, 60
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 158 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 158 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SHARP_BEAK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_EARLY_BIRD
-	.byte 10 ; Safari Zone flee rate
+	.byte 10 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Seel
+@ Seel
 	base_stats 65, 45, 55, 45, 45, 70
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 190 ; catch rate
-	.byte 100 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 100 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dewgong
+@ Dewgong
 	base_stats 90, 70, 80, 70, 70, 95
 	.byte TYPE_WATER
 	.byte TYPE_ICE
-	.byte 75 ; catch rate
-	.byte 176 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 176 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Grimer
+@ Grimer
 	base_stats 80, 80, 50, 25, 40, 50
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 190 ; catch rate
-	.byte 90 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 90 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NUGGET
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_STENCH
 	.byte ABILITY_STICKY_HOLD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Muk
+@ Muk
 	base_stats 105, 105, 75, 50, 65, 100
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 75 ; catch rate
-	.byte 157 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 157 @ base exp. yield
 	ev_yield 1, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NUGGET
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_STENCH
 	.byte ABILITY_STICKY_HOLD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shellder
+@ Shellder
 	base_stats 30, 65, 100, 40, 45, 25
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 190 ; catch rate
-	.byte 97 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 97 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_PEARL
 	.2byte ITEM_BIG_PEARL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SHELL_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cloyster
+@ Cloyster
 	base_stats 50, 95, 180, 70, 85, 45
 	.byte TYPE_WATER
 	.byte TYPE_ICE
-	.byte 60 ; catch rate
-	.byte 203 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 203 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_PEARL
 	.2byte ITEM_BIG_PEARL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SHELL_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gastly
+@ Gastly
 	base_stats 30, 35, 30, 80, 100, 35
 	.byte TYPE_GHOST
 	.byte TYPE_POISON
-	.byte 190 ; catch rate
-	.byte 95 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 95 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Haunter
+@ Haunter
 	base_stats 45, 50, 45, 95, 115, 55
 	.byte TYPE_GHOST
 	.byte TYPE_POISON
-	.byte 90 ; catch rate
-	.byte 126 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 126 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gengar
+@ Gengar
 	base_stats 60, 65, 60, 110, 130, 75
 	.byte TYPE_GHOST
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 190 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 190 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Onix
+@ Onix
 	base_stats 35, 45, 160, 70, 30, 45
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 108 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 108 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Drowzee
+@ Drowzee
 	base_stats 60, 48, 45, 42, 43, 90
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 190 ; catch rate
-	.byte 102 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 102 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hypno
+@ Hypno
 	base_stats 85, 73, 70, 67, 73, 115
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 75 ; catch rate
-	.byte 165 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 165 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Krabby
+@ Krabby
 	base_stats 30, 105, 90, 50, 25, 25
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 225 ; catch rate
-	.byte 115 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 115 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kingler
+@ Kingler
 	base_stats 55, 130, 115, 75, 50, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 206 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 206 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Voltorb
+@ Voltorb
 	base_stats 40, 30, 50, 100, 55, 55
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 190 ; catch rate
-	.byte 103 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 103 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_STATIC
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Electrode
+@ Electrode
 	base_stats 60, 50, 70, 140, 80, 80
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 60 ; catch rate
-	.byte 150 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 150 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_STATIC
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Exeggcute
+@ Exeggcute
 	base_stats 60, 40, 80, 40, 60, 45
 	.byte TYPE_GRASS
 	.byte TYPE_PSYCHIC
-	.byte 90 ; catch rate
-	.byte 98 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 98 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Exeggutor
+@ Exeggutor
 	base_stats 95, 95, 85, 55, 125, 65
 	.byte TYPE_GRASS
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 212 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 212 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cubone
+@ Cubone
 	base_stats 50, 50, 95, 35, 40, 50
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 190 ; catch rate
-	.byte 87 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 87 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_THICK_CLUB
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_LIGHTNING_ROD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Marowak
+@ Marowak
 	base_stats 60, 80, 110, 45, 50, 80
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 75 ; catch rate
-	.byte 124 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 124 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_THICK_CLUB
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_LIGHTNING_ROD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hitmonlee
+@ Hitmonlee
 	base_stats 50, 120, 53, 87, 35, 110
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 139 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 139 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_LIMBER
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hitmonchan
+@ Hitmonchan
 	base_stats 50, 105, 79, 76, 35, 110
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 140 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 140 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lickitung
+@ Lickitung
 	base_stats 90, 55, 75, 30, 60, 75
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 127 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 127 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_OWN_TEMPO
 	.byte ABILITY_OBLIVIOUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Koffing
+@ Koffing
 	base_stats 40, 65, 95, 35, 60, 45
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 190 ; catch rate
-	.byte 114 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 114 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SMOKE_BALL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Weezing
+@ Weezing
 	base_stats 65, 90, 120, 60, 85, 70
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 60 ; catch rate
-	.byte 173 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 173 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SMOKE_BALL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Rhyhorn
+@ Rhyhorn
 	base_stats 80, 85, 95, 25, 30, 30
 	.byte TYPE_GROUND
 	.byte TYPE_ROCK
-	.byte 120 ; catch rate
-	.byte 135 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 135 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_LIGHTNING_ROD
 	.byte ABILITY_ROCK_HEAD
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Rhydon
+@ Rhydon
 	base_stats 105, 130, 120, 40, 45, 45
 	.byte TYPE_GROUND
 	.byte TYPE_ROCK
-	.byte 60 ; catch rate
-	.byte 204 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 204 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_LIGHTNING_ROD
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Chansey
+@ Chansey
 	base_stats 250, 5, 5, 50, 35, 105
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 30 ; catch rate
-	.byte 255 ; base exp. yield
+	.byte 30 @ catch rate
+	.byte 255 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_LUCKY_EGG
-	.byte 254 ; gender
-	.byte 40 ; egg cycles
-	.byte 140 ; base friendship
+	.byte 254 @ gender
+	.byte 40 @ egg cycles
+	.byte 140 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_SERENE_GRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tangela
+@ Tangela
 	base_stats 65, 55, 115, 60, 100, 40
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 166 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 166 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kangaskhan
+@ Kangaskhan
 	base_stats 105, 95, 80, 90, 40, 80
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 175 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 175 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_EARLY_BIRD
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Horsea
+@ Horsea
 	base_stats 30, 40, 70, 60, 70, 25
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 225 ; catch rate
-	.byte 83 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 83 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Seadra
+@ Seadra
 	base_stats 55, 65, 95, 85, 95, 45
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 75 ; catch rate
-	.byte 155 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 155 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Goldeen
+@ Goldeen
 	base_stats 45, 67, 60, 63, 35, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 225 ; catch rate
-	.byte 111 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 111 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_WATER_VEIL
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Seaking
+@ Seaking
 	base_stats 80, 92, 65, 68, 65, 80
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 170 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 170 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_WATER_VEIL
-	.byte 6 ; Safari Zone flee rate
+	.byte 6 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Staryu
+@ Staryu
 	base_stats 30, 45, 55, 85, 70, 55
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 225 ; catch rate
-	.byte 106 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 106 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_STARDUST
 	.2byte ITEM_STAR_PIECE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_ILLUMINATE
 	.byte ABILITY_NATURAL_CURE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Starmie
+@ Starmie
 	base_stats 60, 75, 85, 115, 100, 85
 	.byte TYPE_WATER
 	.byte TYPE_PSYCHIC
-	.byte 60 ; catch rate
-	.byte 207 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 207 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_STARDUST
 	.2byte ITEM_STAR_PIECE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_ILLUMINATE
 	.byte ABILITY_NATURAL_CURE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mr. mime
+@ Mr. mime
 	base_stats 40, 45, 65, 90, 100, 120
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 136 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 136 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_LEPPA_BERRY
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Scyther
+@ Scyther
 	base_stats 70, 110, 80, 105, 55, 80
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 187 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 187 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Jynx
+@ Jynx
 	base_stats 65, 50, 35, 95, 115, 95
 	.byte TYPE_ICE
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 137 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 137 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_ASPEAR_BERRY
 	.2byte ITEM_ASPEAR_BERRY
-	.byte 254 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Electabuzz
+@ Electabuzz
 	base_stats 65, 83, 57, 105, 95, 85
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 45 ; catch rate
-	.byte 156 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 156 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magmar
+@ Magmar
 	base_stats 65, 95, 57, 93, 100, 85
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 167 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 167 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 63 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_FLAME_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pinsir
+@ Pinsir
 	base_stats 65, 125, 100, 85, 55, 70
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 45 ; catch rate
-	.byte 200 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 200 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_NONE
-	.byte 8 ; Safari Zone flee rate
+	.byte 8 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tauros
+@ Tauros
 	base_stats 75, 100, 95, 110, 40, 70
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 211 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 211 @ base exp. yield
 	ev_yield 0, 1, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magikarp
+@ Magikarp
 	base_stats 20, 10, 55, 80, 15, 20
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 255 ; catch rate
-	.byte 20 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 20 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 5 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 5 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gyarados
+@ Gyarados
 	base_stats 95, 125, 79, 81, 60, 100
 	.byte TYPE_WATER
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 214 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 214 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 5 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 5 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lapras
+@ Lapras
 	base_stats 130, 85, 80, 60, 85, 95
 	.byte TYPE_WATER
 	.byte TYPE_ICE
-	.byte 45 ; catch rate
-	.byte 219 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 219 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ditto
+@ Ditto
 	base_stats 48, 48, 48, 48, 48, 48
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 35 ; catch rate
-	.byte 61 ; base exp. yield
+	.byte 35 @ catch rate
+	.byte 61 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_POWDER
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_DITTO
 	.byte EGG_GROUP_DITTO
 	.byte ABILITY_LIMBER
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Eevee
+@ Eevee
 	base_stats 55, 55, 50, 55, 45, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 92 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 92 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Vaporeon
+@ Vaporeon
 	base_stats 130, 65, 60, 65, 110, 95
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 196 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 196 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Jolteon
+@ Jolteon
 	base_stats 65, 65, 60, 130, 110, 95
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 45 ; catch rate
-	.byte 197 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 197 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_VOLT_ABSORB
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Flareon
+@ Flareon
 	base_stats 65, 130, 60, 65, 95, 110
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 198 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 198 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_FLASH_FIRE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Porygon
+@ Porygon
 	base_stats 65, 60, 70, 40, 85, 75
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 130 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 130 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_TRACE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Omanyte
+@ Omanyte
 	base_stats 35, 40, 100, 35, 90, 55
 	.byte TYPE_ROCK
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 120 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 120 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Omastar
+@ Omastar
 	base_stats 70, 60, 125, 55, 115, 70
 	.byte TYPE_ROCK
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 199 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 199 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kabuto
+@ Kabuto
 	base_stats 30, 80, 90, 55, 55, 45
 	.byte TYPE_ROCK
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 119 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 119 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_BATTLE_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kabutops
+@ Kabutops
 	base_stats 60, 115, 105, 80, 65, 70
 	.byte TYPE_ROCK
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 201 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 201 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_BATTLE_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Aerodactyl
+@ Aerodactyl
 	base_stats 80, 105, 65, 130, 60, 75
 	.byte TYPE_ROCK
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 202 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 202 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_PRESSURE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Snorlax
+@ Snorlax
 	base_stats 160, 110, 65, 30, 65, 110
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 25 ; catch rate
-	.byte 154 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 154 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_LEFTOVERS
 	.2byte ITEM_LEFTOVERS
-	.byte 31 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_IMMUNITY
 	.byte ABILITY_THICK_FAT
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Articuno
+@ Articuno
 	base_stats 90, 85, 100, 85, 95, 125
 	.byte TYPE_ICE
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 215 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 215 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Zapdos
+@ Zapdos
 	base_stats 90, 90, 85, 100, 125, 90
 	.byte TYPE_ELECTRIC
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 216 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 216 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Moltres
+@ Moltres
 	base_stats 90, 100, 90, 90, 125, 85
 	.byte TYPE_FIRE
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 217 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 217 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dratini
+@ Dratini
 	base_stats 41, 64, 45, 50, 50, 50
 	.byte TYPE_DRAGON
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 67 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 67 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dragonair
+@ Dragonair
 	base_stats 61, 84, 65, 70, 70, 70
 	.byte TYPE_DRAGON
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 144 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 144 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dragonite
+@ Dragonite
 	base_stats 91, 134, 95, 80, 100, 100
 	.byte TYPE_DRAGON
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 218 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 218 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mewtwo
+@ Mewtwo
 	base_stats 106, 110, 90, 130, 154, 90
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 220 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 220 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mew
+@ Mew
 	base_stats 100, 100, 100, 100, 100, 100
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 64 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 64 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_LUM_BERRY
 	.2byte ITEM_LUM_BERRY
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 100 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 100 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Chikorita
+@ Chikorita
 	base_stats 45, 49, 65, 45, 49, 65
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 64 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 64 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Bayleef
+@ Bayleef
 	base_stats 60, 62, 80, 60, 63, 80
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 141 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 141 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Meganium
+@ Meganium
 	base_stats 80, 82, 100, 80, 83, 100
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 208 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 208 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cyndaquil
+@ Cyndaquil
 	base_stats 39, 52, 43, 65, 60, 50
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Quilava
+@ Quilava
 	base_stats 58, 64, 58, 80, 80, 65
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 142 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 142 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Typhlosion
+@ Typhlosion
 	base_stats 78, 84, 78, 100, 109, 85
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 209 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 209 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Totodile
+@ Totodile
 	base_stats 50, 65, 64, 43, 44, 48
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 66 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 66 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Croconaw
+@ Croconaw
 	base_stats 65, 80, 80, 58, 59, 63
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 143 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 143 @ base exp. yield
 	ev_yield 0, 1, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Feraligatr
+@ Feraligatr
 	base_stats 85, 105, 100, 78, 79, 83
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 210 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 210 @ base exp. yield
 	ev_yield 0, 2, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sentret
+@ Sentret
 	base_stats 35, 46, 34, 20, 35, 45
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 57 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 57 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_ORAN_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_KEEN_EYE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Furret
+@ Furret
 	base_stats 85, 76, 64, 90, 45, 55
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 90 ; catch rate
-	.byte 116 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 116 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_ORAN_BERRY
 	.2byte ITEM_SITRUS_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_KEEN_EYE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hoothoot
+@ Hoothoot
 	base_stats 60, 30, 30, 50, 36, 56
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 58 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 58 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_KEEN_EYE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Noctowl
+@ Noctowl
 	base_stats 100, 50, 50, 70, 76, 96
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 90 ; catch rate
-	.byte 162 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 162 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_KEEN_EYE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ledyba
+@ Ledyba
 	base_stats 40, 20, 30, 55, 40, 80
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 54 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 54 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_EARLY_BIRD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ledian
+@ Ledian
 	base_stats 55, 35, 50, 85, 55, 110
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 90 ; catch rate
-	.byte 134 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 134 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_EARLY_BIRD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Spinarak
+@ Spinarak
 	base_stats 40, 60, 40, 30, 40, 40
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 255 ; catch rate
-	.byte 54 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 54 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_INSOMNIA
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ariados
+@ Ariados
 	base_stats 70, 90, 70, 40, 60, 60
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 90 ; catch rate
-	.byte 134 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 134 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_INSOMNIA
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Crobat
+@ Crobat
 	base_stats 85, 90, 80, 130, 70, 80
 	.byte TYPE_POISON
 	.byte TYPE_FLYING
-	.byte 90 ; catch rate
-	.byte 204 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 204 @ base exp. yield
 	ev_yield 0, 0, 0, 3, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Chinchou
+@ Chinchou
 	base_stats 75, 38, 38, 67, 56, 56
 	.byte TYPE_WATER
 	.byte TYPE_ELECTRIC
-	.byte 190 ; catch rate
-	.byte 90 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 90 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_YELLOW_SHARD
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_VOLT_ABSORB
 	.byte ABILITY_ILLUMINATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lanturn
+@ Lanturn
 	base_stats 125, 58, 58, 67, 76, 76
 	.byte TYPE_WATER
 	.byte TYPE_ELECTRIC
-	.byte 75 ; catch rate
-	.byte 156 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 156 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_YELLOW_SHARD
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_VOLT_ABSORB
 	.byte ABILITY_ILLUMINATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pichu
+@ Pichu
 	base_stats 20, 40, 15, 60, 35, 35
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 190 ; catch rate
-	.byte 42 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 42 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_ORAN_BERRY
-	.byte 127 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cleffa
+@ Cleffa
 	base_stats 50, 25, 28, 15, 45, 55
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 150 ; catch rate
-	.byte 37 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 37 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_LEPPA_BERRY
 	.2byte ITEM_MOON_STONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 140 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 140 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Igglybuff
+@ Igglybuff
 	base_stats 90, 30, 15, 15, 40, 20
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 170 ; catch rate
-	.byte 39 ; base exp. yield
+	.byte 170 @ catch rate
+	.byte 39 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Togepi
+@ Togepi
 	base_stats 35, 20, 65, 20, 40, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 190 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_HUSTLE
 	.byte ABILITY_SERENE_GRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Togetic
+@ Togetic
 	base_stats 55, 40, 85, 40, 80, 105
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 75 ; catch rate
-	.byte 114 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 114 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_HUSTLE
 	.byte ABILITY_SERENE_GRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Natu
+@ Natu
 	base_stats 40, 50, 45, 70, 70, 45
 	.byte TYPE_PSYCHIC
 	.byte TYPE_FLYING
-	.byte 190 ; catch rate
-	.byte 73 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 73 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_EARLY_BIRD
-	.byte 6 ; Safari Zone flee rate
+	.byte 6 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Xatu
+@ Xatu
 	base_stats 65, 75, 70, 95, 95, 70
 	.byte TYPE_PSYCHIC
 	.byte TYPE_FLYING
-	.byte 75 ; catch rate
-	.byte 171 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 171 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_EARLY_BIRD
-	.byte 8 ; Safari Zone flee rate
+	.byte 8 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mareep
+@ Mareep
 	base_stats 55, 40, 40, 35, 65, 45
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 235 ; catch rate
-	.byte 59 ; base exp. yield
+	.byte 235 @ catch rate
+	.byte 59 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Flaaffy
+@ Flaaffy
 	base_stats 70, 55, 55, 45, 80, 60
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 120 ; catch rate
-	.byte 117 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 117 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ampharos
+@ Ampharos
 	base_stats 90, 75, 75, 55, 115, 90
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 45 ; catch rate
-	.byte 194 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 194 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Bellossom
+@ Bellossom
 	base_stats 75, 80, 85, 50, 90, 100
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 184 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 184 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Marill
+@ Marill
 	base_stats 70, 20, 50, 40, 20, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 190 ; catch rate
-	.byte 58 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 58 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_HUGE_POWER
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Azumarill
+@ Azumarill
 	base_stats 100, 50, 80, 50, 50, 80
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 75 ; catch rate
-	.byte 153 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 153 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_HUGE_POWER
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sudowoodo
+@ Sudowoodo
 	base_stats 70, 100, 115, 30, 30, 65
 	.byte TYPE_ROCK
 	.byte TYPE_ROCK
-	.byte 65 ; catch rate
-	.byte 135 ; base exp. yield
+	.byte 65 @ catch rate
+	.byte 135 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_STURDY
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Politoed
+@ Politoed
 	base_stats 90, 75, 75, 70, 90, 100
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 185 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 185 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_WATER_ABSORB
 	.byte ABILITY_DAMP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hoppip
+@ Hoppip
 	base_stats 35, 35, 40, 50, 35, 55
 	.byte TYPE_GRASS
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Skiploom
+@ Skiploom
 	base_stats 55, 45, 50, 80, 45, 65
 	.byte TYPE_GRASS
 	.byte TYPE_FLYING
-	.byte 120 ; catch rate
-	.byte 136 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 136 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Jumpluff
+@ Jumpluff
 	base_stats 75, 55, 70, 110, 55, 85
 	.byte TYPE_GRASS
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 176 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 176 @ base exp. yield
 	ev_yield 0, 0, 0, 3, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Aipom
+@ Aipom
 	base_stats 55, 70, 55, 85, 40, 55
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 94 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 94 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_PICKUP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sunkern
+@ Sunkern
 	base_stats 30, 30, 30, 30, 30, 30
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 235 ; catch rate
-	.byte 52 ; base exp. yield
+	.byte 235 @ catch rate
+	.byte 52 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sunflora
+@ Sunflora
 	base_stats 75, 75, 55, 30, 105, 85
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 120 ; catch rate
-	.byte 146 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 146 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Yanma
+@ Yanma
 	base_stats 65, 65, 45, 95, 75, 45
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 75 ; catch rate
-	.byte 147 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 147 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SPEED_BOOST
 	.byte ABILITY_COMPOUND_EYES
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wooper
+@ Wooper
 	base_stats 55, 45, 45, 15, 25, 25
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 52 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 52 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_DAMP
 	.byte ABILITY_WATER_ABSORB
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Quagsire
+@ Quagsire
 	base_stats 95, 85, 85, 35, 65, 65
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 90 ; catch rate
-	.byte 137 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 137 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_DAMP
 	.byte ABILITY_WATER_ABSORB
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Espeon
+@ Espeon
 	base_stats 65, 65, 60, 110, 130, 95
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 197 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 197 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Umbreon
+@ Umbreon
 	base_stats 95, 65, 110, 65, 60, 130
 	.byte TYPE_DARK
 	.byte TYPE_DARK
-	.byte 45 ; catch rate
-	.byte 197 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 197 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 35 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 31 @ gender
+	.byte 35 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Murkrow
+@ Murkrow
 	base_stats 60, 85, 42, 91, 85, 42
 	.byte TYPE_DARK
 	.byte TYPE_FLYING
-	.byte 30 ; catch rate
-	.byte 107 ; base exp. yield
+	.byte 30 @ catch rate
+	.byte 107 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slowking
+@ Slowking
 	base_stats 95, 75, 80, 30, 100, 110
 	.byte TYPE_WATER
 	.byte TYPE_PSYCHIC
-	.byte 70 ; catch rate
-	.byte 164 ; base exp. yield
+	.byte 70 @ catch rate
+	.byte 164 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_OWN_TEMPO
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Misdreavus
+@ Misdreavus
 	base_stats 60, 60, 60, 85, 85, 85
 	.byte TYPE_GHOST
 	.byte TYPE_GHOST
-	.byte 45 ; catch rate
-	.byte 147 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 147 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_SPELL_TAG
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Unown
+@ Unown
 	base_stats 48, 72, 48, 48, 72, 48
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 225 ; catch rate
-	.byte 61 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 61 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wobbuffet
+@ Wobbuffet
 	base_stats 190, 33, 58, 33, 33, 58
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 177 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 177 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_SHADOW_TAG
 	.byte ABILITY_NONE
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Girafarig
+@ Girafarig
 	base_stats 70, 80, 65, 85, 90, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_PSYCHIC
-	.byte 60 ; catch rate
-	.byte 149 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 149 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_PERSIM_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_EARLY_BIRD
-	.byte 4 ; Safari Zone flee rate
+	.byte 4 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pineco
+@ Pineco
 	base_stats 50, 65, 90, 15, 35, 35
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 190 ; catch rate
-	.byte 60 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 60 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_STURDY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Forretress
+@ Forretress
 	base_stats 75, 90, 140, 40, 60, 60
 	.byte TYPE_BUG
 	.byte TYPE_STEEL
-	.byte 75 ; catch rate
-	.byte 118 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 118 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_STURDY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dunsparce
+@ Dunsparce
 	base_stats 100, 70, 70, 45, 65, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 190 ; catch rate
-	.byte 75 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 75 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SERENE_GRACE
 	.byte ABILITY_RUN_AWAY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gligar
+@ Gligar
 	base_stats 65, 75, 105, 85, 35, 65
 	.byte TYPE_GROUND
 	.byte TYPE_FLYING
-	.byte 60 ; catch rate
-	.byte 108 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 108 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_SAND_VEIL
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Steelix
+@ Steelix
 	base_stats 75, 85, 200, 30, 55, 65
 	.byte TYPE_STEEL
 	.byte TYPE_GROUND
-	.byte 25 ; catch rate
-	.byte 196 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 196 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Snubbull
+@ Snubbull
 	base_stats 60, 80, 50, 30, 40, 40
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 190 ; catch rate
-	.byte 63 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 63 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_RUN_AWAY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Granbull
+@ Granbull
 	base_stats 90, 120, 75, 45, 60, 60
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 75 ; catch rate
-	.byte 178 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 178 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_INTIMIDATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Qwilfish
+@ Qwilfish
 	base_stats 65, 95, 75, 85, 55, 55
 	.byte TYPE_WATER
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 100 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 100 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_POISON_POINT
 	.byte ABILITY_SWIFT_SWIM
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Scizor
+@ Scizor
 	base_stats 70, 130, 100, 65, 55, 80
 	.byte TYPE_BUG
 	.byte TYPE_STEEL
-	.byte 25 ; catch rate
-	.byte 200 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 200 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shuckle
+@ Shuckle
 	base_stats 20, 10, 230, 5, 10, 230
 	.byte TYPE_BUG
 	.byte TYPE_ROCK
-	.byte 190 ; catch rate
-	.byte 80 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 80 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 1
 	.2byte ITEM_ORAN_BERRY
 	.2byte ITEM_ORAN_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_STURDY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Heracross
+@ Heracross
 	base_stats 80, 125, 75, 85, 40, 95
 	.byte TYPE_BUG
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 200 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 200 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_GUTS
-	.byte 8 ; Safari Zone flee rate
+	.byte 8 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sneasel
+@ Sneasel
 	base_stats 55, 95, 55, 115, 35, 75
 	.byte TYPE_DARK
 	.byte TYPE_ICE
-	.byte 60 ; catch rate
-	.byte 132 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 132 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_QUICK_CLAW
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_KEEN_EYE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Teddiursa
+@ Teddiursa
 	base_stats 60, 80, 50, 40, 50, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 120 ; catch rate
-	.byte 124 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 124 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PICKUP
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ursaring
+@ Ursaring
 	base_stats 90, 130, 75, 55, 75, 75
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 60 ; catch rate
-	.byte 189 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 189 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slugma
+@ Slugma
 	base_stats 40, 40, 40, 20, 70, 40
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 190 ; catch rate
-	.byte 78 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 78 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_MAGMA_ARMOR
 	.byte ABILITY_FLAME_BODY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magcargo
+@ Magcargo
 	base_stats 50, 50, 120, 30, 80, 80
 	.byte TYPE_FIRE
 	.byte TYPE_ROCK
-	.byte 75 ; catch rate
-	.byte 154 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 154 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_MAGMA_ARMOR
 	.byte ABILITY_FLAME_BODY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Swinub
+@ Swinub
 	base_stats 50, 50, 40, 50, 30, 30
 	.byte TYPE_ICE
 	.byte TYPE_GROUND
-	.byte 225 ; catch rate
-	.byte 78 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 78 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Piloswine
+@ Piloswine
 	base_stats 100, 100, 80, 50, 60, 60
 	.byte TYPE_ICE
 	.byte TYPE_GROUND
-	.byte 75 ; catch rate
-	.byte 160 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 160 @ base exp. yield
 	ev_yield 1, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Corsola
+@ Corsola
 	base_stats 55, 55, 85, 35, 65, 85
 	.byte TYPE_WATER
 	.byte TYPE_ROCK
-	.byte 60 ; catch rate
-	.byte 113 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 113 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_RED_SHARD
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_HUSTLE
 	.byte ABILITY_NATURAL_CURE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Remoraid
+@ Remoraid
 	base_stats 35, 65, 35, 65, 65, 35
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 190 ; catch rate
-	.byte 78 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 78 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_HUSTLE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Octillery
+@ Octillery
 	base_stats 75, 105, 75, 45, 105, 75
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 75 ; catch rate
-	.byte 164 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 164 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_SUCTION_CUPS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Delibird
+@ Delibird
 	base_stats 45, 55, 45, 75, 65, 45
 	.byte TYPE_ICE
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 183 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 183 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_VITAL_SPIRIT
 	.byte ABILITY_HUSTLE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mantine
+@ Mantine
 	base_stats 65, 40, 70, 70, 80, 140
 	.byte TYPE_WATER
 	.byte TYPE_FLYING
-	.byte 25 ; catch rate
-	.byte 168 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 168 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_WATER_ABSORB
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Skarmory
+@ Skarmory
 	base_stats 65, 80, 140, 70, 40, 70
 	.byte TYPE_STEEL
 	.byte TYPE_FLYING
-	.byte 25 ; catch rate
-	.byte 168 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 168 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_STURDY
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Houndour
+@ Houndour
 	base_stats 45, 60, 30, 65, 80, 50
 	.byte TYPE_DARK
 	.byte TYPE_FIRE
-	.byte 120 ; catch rate
-	.byte 114 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 114 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_EARLY_BIRD
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Houndoom
+@ Houndoom
 	base_stats 75, 90, 50, 95, 110, 80
 	.byte TYPE_DARK
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 204 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 204 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_EARLY_BIRD
 	.byte ABILITY_FLASH_FIRE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kingdra
+@ Kingdra
 	base_stats 75, 95, 95, 85, 95, 95
 	.byte TYPE_WATER
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 207 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 207 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Phanpy
+@ Phanpy
 	base_stats 90, 60, 60, 40, 40, 40
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 120 ; catch rate
-	.byte 124 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 124 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PICKUP
 	.byte ABILITY_NONE
-	.byte 10 ; Safari Zone flee rate
+	.byte 10 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Donphan
+@ Donphan
 	base_stats 90, 120, 120, 50, 60, 60
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 60 ; catch rate
-	.byte 189 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 189 @ base exp. yield
 	ev_yield 0, 1, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STURDY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Porygon2
+@ Porygon2
 	base_stats 85, 80, 90, 60, 105, 95
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 180 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 180 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_TRACE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Stantler
+@ Stantler
 	base_stats 73, 95, 62, 85, 85, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 165 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 165 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Smeargle
+@ Smeargle
 	base_stats 55, 20, 35, 75, 20, 45
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 106 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 106 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_OWN_TEMPO
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tyrogue
+@ Tyrogue
 	base_stats 35, 35, 35, 35, 35, 35
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 75 ; catch rate
-	.byte 91 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 91 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hitmontop
+@ Hitmontop
 	base_stats 50, 95, 95, 70, 35, 110
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 138 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 138 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Smoochum
+@ Smoochum
 	base_stats 45, 30, 15, 65, 85, 65
 	.byte TYPE_ICE
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 87 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 87 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_ASPEAR_BERRY
 	.2byte ITEM_ASPEAR_BERRY
-	.byte 254 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Elekid
+@ Elekid
 	base_stats 45, 63, 37, 95, 65, 55
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 45 ; catch rate
-	.byte 106 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 106 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_STATIC
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Magby
+@ Magby
 	base_stats 45, 75, 37, 83, 70, 55
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 117 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 117 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 63 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_FLAME_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Miltank
+@ Miltank
 	base_stats 95, 80, 105, 100, 40, 70
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 200 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 200 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_MOOMOO_MILK
 	.2byte ITEM_MOOMOO_MILK
-	.byte 254 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Blissey
+@ Blissey
 	base_stats 255, 10, 10, 55, 75, 135
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 30 ; catch rate
-	.byte 255 ; base exp. yield
+	.byte 30 @ catch rate
+	.byte 255 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_LUCKY_EGG
-	.byte 254 ; gender
-	.byte 40 ; egg cycles
-	.byte 140 ; base friendship
+	.byte 254 @ gender
+	.byte 40 @ egg cycles
+	.byte 140 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_SERENE_GRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Raikou
+@ Raikou
 	base_stats 90, 85, 75, 115, 115, 100
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 3 ; catch rate
-	.byte 216 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 216 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Entei
+@ Entei
 	base_stats 115, 115, 85, 100, 90, 75
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 3 ; catch rate
-	.byte 217 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 217 @ base exp. yield
 	ev_yield 1, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Suicune
+@ Suicune
 	base_stats 100, 75, 115, 85, 90, 115
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 3 ; catch rate
-	.byte 215 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 215 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Larvitar
+@ Larvitar
 	base_stats 50, 64, 50, 41, 45, 50
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 67 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 67 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pupitar
+@ Pupitar
 	base_stats 70, 84, 70, 51, 65, 70
 	.byte TYPE_ROCK
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 144 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 144 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tyranitar
+@ Tyranitar
 	base_stats 100, 134, 110, 61, 95, 100
 	.byte TYPE_ROCK
 	.byte TYPE_DARK
-	.byte 45 ; catch rate
-	.byte 218 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 218 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_SAND_STREAM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lugia
+@ Lugia
 	base_stats 106, 90, 130, 110, 90, 154
 	.byte TYPE_PSYCHIC
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 220 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 220 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ho-Oh
+@ Ho-Oh
 	base_stats 106, 130, 90, 90, 110, 154
 	.byte TYPE_FIRE
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 220 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 220 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_SACRED_ASH
 	.2byte ITEM_SACRED_ASH
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Celebi
+@ Celebi
 	base_stats 100, 100, 100, 100, 100, 100
 	.byte TYPE_PSYCHIC
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 64 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 64 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_LUM_BERRY
 	.2byte ITEM_LUM_BERRY
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 100 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 100 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; ?
+@ ?
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 3 ; catch rate
-	.byte 1 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 1 @ base exp. yield
 	ev_yield 2, 2, 2, 2, 2, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_NONE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Treecko
+@ Treecko
 	base_stats 40, 45, 35, 70, 65, 55
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Grovyle
+@ Grovyle
 	base_stats 50, 65, 45, 95, 85, 65
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 141 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 141 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sceptile
+@ Sceptile
 	base_stats 70, 85, 65, 120, 105, 85
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 208 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 208 @ base exp. yield
 	ev_yield 0, 0, 0, 3, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_OVERGROW
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Torchic
+@ Torchic
 	base_stats 45, 60, 40, 45, 70, 50
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 45 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Combusken
+@ Combusken
 	base_stats 60, 85, 60, 55, 85, 60
 	.byte TYPE_FIRE
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 142 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 142 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Blaziken
+@ Blaziken
 	base_stats 80, 120, 70, 80, 110, 70
 	.byte TYPE_FIRE
 	.byte TYPE_FIGHTING
-	.byte 45 ; catch rate
-	.byte 209 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 209 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_BLAZE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mudkip
+@ Mudkip
 	base_stats 50, 70, 50, 40, 50, 50
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Marshtomp
+@ Marshtomp
 	base_stats 70, 85, 70, 50, 60, 70
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 143 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 143 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Swampert
+@ Swampert
 	base_stats 100, 110, 90, 60, 85, 90
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 45 ; catch rate
-	.byte 210 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 210 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_TORRENT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Poochyena
+@ Poochyena
 	base_stats 35, 55, 35, 35, 30, 30
 	.byte TYPE_DARK
 	.byte TYPE_DARK
-	.byte 255 ; catch rate
-	.byte 55 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 55 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_PECHA_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_RUN_AWAY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mightyena
+@ Mightyena
 	base_stats 70, 90, 70, 70, 60, 60
 	.byte TYPE_DARK
 	.byte TYPE_DARK
-	.byte 127 ; catch rate
-	.byte 128 ; base exp. yield
+	.byte 127 @ catch rate
+	.byte 128 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_PECHA_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Zigzagoon
+@ Zigzagoon
 	base_stats 38, 30, 41, 60, 30, 41
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 60 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 60 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_ORAN_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PICKUP
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Linoone
+@ Linoone
 	base_stats 78, 70, 61, 100, 50, 61
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 90 ; catch rate
-	.byte 128 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 128 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_ORAN_BERRY
 	.2byte ITEM_SITRUS_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PICKUP
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wurmple
+@ Wurmple
 	base_stats 45, 45, 35, 20, 20, 30
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 255 ; catch rate
-	.byte 54 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 54 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHIELD_DUST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Silcoon
+@ Silcoon
 	base_stats 50, 35, 55, 15, 25, 25
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 120 ; catch rate
-	.byte 71 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 71 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Beautifly
+@ Beautifly
 	base_stats 60, 70, 50, 65, 90, 50
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 161 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 161 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SILVER_POWDER
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cascoon
+@ Cascoon
 	base_stats 50, 35, 55, 15, 25, 25
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 120 ; catch rate
-	.byte 72 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 72 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dustox
+@ Dustox
 	base_stats 60, 50, 70, 65, 50, 90
 	.byte TYPE_BUG
 	.byte TYPE_POISON
-	.byte 45 ; catch rate
-	.byte 160 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 160 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_SILVER_POWDER
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SHIELD_DUST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lotad
+@ Lotad
 	base_stats 40, 30, 30, 30, 40, 50
 	.byte TYPE_WATER
 	.byte TYPE_GRASS
-	.byte 255 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_RAIN_DISH
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lombre
+@ Lombre
 	base_stats 60, 50, 50, 50, 60, 70
 	.byte TYPE_WATER
 	.byte TYPE_GRASS
-	.byte 120 ; catch rate
-	.byte 141 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 141 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_RAIN_DISH
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ludicolo
+@ Ludicolo
 	base_stats 80, 70, 70, 70, 90, 100
 	.byte TYPE_WATER
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 181 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 181 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_RAIN_DISH
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Seedot
+@ Seedot
 	base_stats 40, 40, 50, 30, 30, 30
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 255 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_EARLY_BIRD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nuzleaf
+@ Nuzleaf
 	base_stats 70, 70, 40, 60, 60, 40
 	.byte TYPE_GRASS
 	.byte TYPE_DARK
-	.byte 120 ; catch rate
-	.byte 141 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 141 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_EARLY_BIRD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shiftry
+@ Shiftry
 	base_stats 90, 100, 60, 80, 90, 60
 	.byte TYPE_GRASS
 	.byte TYPE_DARK
-	.byte 45 ; catch rate
-	.byte 181 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 181 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_EARLY_BIRD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nincada
+@ Nincada
 	base_stats 31, 45, 90, 40, 30, 30
 	.byte TYPE_BUG
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_COMPOUND_EYES
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ninjask
+@ Ninjask
 	base_stats 61, 90, 45, 160, 50, 50
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 120 ; catch rate
-	.byte 155 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 155 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SPEED_BOOST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shedinja
+@ Shedinja
 	base_stats 1, 90, 45, 40, 30, 30
 	.byte TYPE_BUG
 	.byte TYPE_GHOST
-	.byte 45 ; catch rate
-	.byte 95 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 95 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_WONDER_GUARD
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Taillow
+@ Taillow
 	base_stats 40, 55, 30, 85, 30, 30
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 200 ; catch rate
-	.byte 59 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 59 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Swellow
+@ Swellow
 	base_stats 60, 85, 60, 125, 50, 50
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 162 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 162 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_GUTS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shroomish
+@ Shroomish
 	base_stats 60, 40, 60, 35, 40, 60
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 255 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_EFFECT_SPORE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Breloom
+@ Breloom
 	base_stats 60, 130, 80, 70, 60, 60
 	.byte TYPE_GRASS
 	.byte TYPE_FIGHTING
-	.byte 90 ; catch rate
-	.byte 165 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 165 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_EFFECT_SPORE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Spinda
+@ Spinda
 	base_stats 60, 60, 60, 60, 60, 60
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 85 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 85 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_CHESTO_BERRY
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_OWN_TEMPO
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wingull
+@ Wingull
 	base_stats 40, 30, 30, 85, 55, 30
 	.byte TYPE_WATER
 	.byte TYPE_FLYING
-	.byte 190 ; catch rate
-	.byte 64 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 64 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Pelipper
+@ Pelipper
 	base_stats 60, 50, 100, 65, 85, 70
 	.byte TYPE_WATER
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 164 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 164 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FLYING
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Surskit
+@ Surskit
 	base_stats 40, 30, 32, 65, 50, 52
 	.byte TYPE_BUG
 	.byte TYPE_WATER
-	.byte 200 ; catch rate
-	.byte 63 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 63 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Masquerain
+@ Masquerain
 	base_stats 70, 60, 62, 60, 80, 82
 	.byte TYPE_BUG
 	.byte TYPE_FLYING
-	.byte 75 ; catch rate
-	.byte 128 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 128 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_SILVER_POWDER
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wailmer
+@ Wailmer
 	base_stats 130, 70, 35, 60, 70, 35
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 125 ; catch rate
-	.byte 137 ; base exp. yield
+	.byte 125 @ catch rate
+	.byte 137 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_WATER_VEIL
 	.byte ABILITY_OBLIVIOUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wailord
+@ Wailord
 	base_stats 170, 90, 45, 60, 90, 45
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 206 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 206 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_WATER_VEIL
 	.byte ABILITY_OBLIVIOUS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Skitty
+@ Skitty
 	base_stats 50, 45, 45, 50, 35, 35
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 65 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 65 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_LEPPA_BERRY
-	.byte 191 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Delcatty
+@ Delcatty
 	base_stats 70, 65, 65, 70, 55, 55
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 60 ; catch rate
-	.byte 138 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 138 @ base exp. yield
 	ev_yield 1, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_LEPPA_BERRY
-	.byte 191 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_CUTE_CHARM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kecleon
+@ Kecleon
 	base_stats 60, 90, 70, 40, 60, 120
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 200 ; catch rate
-	.byte 132 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 132 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_PERSIM_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_COLOR_CHANGE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Baltoy
+@ Baltoy
 	base_stats 40, 40, 55, 55, 40, 70
 	.byte TYPE_GROUND
 	.byte TYPE_PSYCHIC
-	.byte 255 ; catch rate
-	.byte 58 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 58 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Claydol
+@ Claydol
 	base_stats 60, 70, 105, 75, 70, 120
 	.byte TYPE_GROUND
 	.byte TYPE_PSYCHIC
-	.byte 90 ; catch rate
-	.byte 189 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 189 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Nosepass
+@ Nosepass
 	base_stats 30, 45, 135, 30, 45, 90
 	.byte TYPE_ROCK
 	.byte TYPE_ROCK
-	.byte 255 ; catch rate
-	.byte 108 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 108 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_STURDY
 	.byte ABILITY_MAGNET_PULL
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Torkoal
+@ Torkoal
 	base_stats 70, 85, 140, 20, 85, 70
 	.byte TYPE_FIRE
 	.byte TYPE_FIRE
-	.byte 90 ; catch rate
-	.byte 161 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 161 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_WHITE_SMOKE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sableye
+@ Sableye
 	base_stats 50, 75, 75, 50, 65, 65
 	.byte TYPE_DARK
 	.byte TYPE_GHOST
-	.byte 45 ; catch rate
-	.byte 98 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 98 @ base exp. yield
 	ev_yield 0, 1, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_KEEN_EYE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Barboach
+@ Barboach
 	base_stats 50, 48, 43, 60, 46, 41
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 190 ; catch rate
-	.byte 92 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 92 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Whiscash
+@ Whiscash
 	base_stats 110, 78, 73, 60, 76, 71
 	.byte TYPE_WATER
 	.byte TYPE_GROUND
-	.byte 75 ; catch rate
-	.byte 158 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 158 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Luvdisc
+@ Luvdisc
 	base_stats 43, 30, 55, 97, 40, 65
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 225 ; catch rate
-	.byte 110 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 110 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_HEART_SCALE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Corphish
+@ Corphish
 	base_stats 43, 80, 65, 35, 50, 35
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 205 ; catch rate
-	.byte 111 ; base exp. yield
+	.byte 205 @ catch rate
+	.byte 111 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Crawdaunt
+@ Crawdaunt
 	base_stats 63, 120, 85, 55, 90, 55
 	.byte TYPE_WATER
 	.byte TYPE_DARK
-	.byte 155 ; catch rate
-	.byte 161 ; base exp. yield
+	.byte 155 @ catch rate
+	.byte 161 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_SHELL_ARMOR
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Feebas
+@ Feebas
 	base_stats 20, 15, 20, 80, 10, 55
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 255 ; catch rate
-	.byte 61 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 61 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Milotic
+@ Milotic
 	base_stats 95, 60, 79, 81, 100, 125
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 213 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 213 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_MARVEL_SCALE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Carvanha
+@ Carvanha
 	base_stats 45, 90, 20, 65, 65, 20
 	.byte TYPE_WATER
 	.byte TYPE_DARK
-	.byte 225 ; catch rate
-	.byte 88 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 88 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_ROUGH_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sharpedo
+@ Sharpedo
 	base_stats 70, 120, 40, 95, 95, 40
 	.byte TYPE_WATER
 	.byte TYPE_DARK
-	.byte 60 ; catch rate
-	.byte 175 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 175 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_2
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_ROUGH_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Trapinch
+@ Trapinch
 	base_stats 45, 100, 45, 10, 45, 45
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 73 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 73 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SOFT_SAND
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_ARENA_TRAP
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Vibrava
+@ Vibrava
 	base_stats 50, 70, 50, 70, 50, 50
 	.byte TYPE_GROUND
 	.byte TYPE_DRAGON
-	.byte 120 ; catch rate
-	.byte 126 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 126 @ base exp. yield
 	ev_yield 0, 1, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_LEVITATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Flygon
+@ Flygon
 	base_stats 80, 100, 80, 100, 80, 80
 	.byte TYPE_GROUND
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 197 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 197 @ base exp. yield
 	ev_yield 0, 1, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_BUG
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_LEVITATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Makuhita
+@ Makuhita
 	base_stats 72, 60, 30, 25, 20, 30
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 180 ; catch rate
-	.byte 87 ; base exp. yield
+	.byte 180 @ catch rate
+	.byte 87 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_GUTS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Hariyama
+@ Hariyama
 	base_stats 144, 120, 60, 50, 40, 60
 	.byte TYPE_FIGHTING
 	.byte TYPE_FIGHTING
-	.byte 200 ; catch rate
-	.byte 184 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 184 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
-	.byte 63 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 63 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_GUTS
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Electrike
+@ Electrike
 	base_stats 40, 45, 40, 65, 65, 40
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 120 ; catch rate
-	.byte 104 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 104 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STATIC
 	.byte ABILITY_LIGHTNING_ROD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Manectric
+@ Manectric
 	base_stats 70, 75, 60, 105, 105, 60
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 45 ; catch rate
-	.byte 168 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 168 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_STATIC
 	.byte ABILITY_LIGHTNING_ROD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Numel
+@ Numel
 	base_stats 60, 60, 40, 35, 65, 45
 	.byte TYPE_FIRE
 	.byte TYPE_GROUND
-	.byte 255 ; catch rate
-	.byte 88 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 88 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Camerupt
+@ Camerupt
 	base_stats 70, 100, 70, 40, 105, 75
 	.byte TYPE_FIRE
 	.byte TYPE_GROUND
-	.byte 150 ; catch rate
-	.byte 175 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 175 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_RAWST_BERRY
 	.2byte ITEM_RAWST_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_MAGMA_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Spheal
+@ Spheal
 	base_stats 70, 40, 50, 25, 55, 50
 	.byte TYPE_ICE
 	.byte TYPE_WATER
-	.byte 255 ; catch rate
-	.byte 75 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 75 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Sealeo
+@ Sealeo
 	base_stats 90, 60, 70, 45, 75, 70
 	.byte TYPE_ICE
 	.byte TYPE_WATER
-	.byte 120 ; catch rate
-	.byte 128 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 128 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Walrein
+@ Walrein
 	base_stats 110, 80, 90, 65, 95, 90
 	.byte TYPE_ICE
 	.byte TYPE_WATER
-	.byte 45 ; catch rate
-	.byte 192 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 192 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cacnea
+@ Cacnea
 	base_stats 50, 85, 40, 35, 85, 40
 	.byte TYPE_GRASS
 	.byte TYPE_GRASS
-	.byte 190 ; catch rate
-	.byte 97 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 97 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_POISON_BARB
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cacturne
+@ Cacturne
 	base_stats 70, 115, 60, 55, 115, 60
 	.byte TYPE_GRASS
 	.byte TYPE_DARK
-	.byte 60 ; catch rate
-	.byte 177 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 177 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_POISON_BARB
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_GRASS
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_SAND_VEIL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Snorunt
+@ Snorunt
 	base_stats 50, 50, 50, 50, 50, 50
 	.byte TYPE_ICE
 	.byte TYPE_ICE
-	.byte 190 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Glalie
+@ Glalie
 	base_stats 80, 80, 80, 80, 80, 80
 	.byte TYPE_ICE
 	.byte TYPE_ICE
-	.byte 75 ; catch rate
-	.byte 187 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 187 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NEVER_MELT_ICE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_INNER_FOCUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lunatone
+@ Lunatone
 	base_stats 70, 55, 65, 70, 95, 85
 	.byte TYPE_ROCK
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 150 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 150 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_MOON_STONE
-	.byte 255 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Solrock
+@ Solrock
 	base_stats 70, 95, 85, 70, 55, 65
 	.byte TYPE_ROCK
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 150 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 150 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SUN_STONE
-	.byte 255 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 255 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Azurill
+@ Azurill
 	base_stats 50, 20, 40, 20, 20, 40
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 150 ; catch rate
-	.byte 33 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 33 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 191 ; gender
-	.byte 10 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 191 @ gender
+	.byte 10 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_HUGE_POWER
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Spoink
+@ Spoink
 	base_stats 60, 25, 35, 60, 70, 80
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 255 ; catch rate
-	.byte 89 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 89 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_OWN_TEMPO
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Grumpig
+@ Grumpig
 	base_stats 80, 45, 65, 80, 90, 110
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 60 ; catch rate
-	.byte 164 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 164 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_THICK_FAT
 	.byte ABILITY_OWN_TEMPO
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Plusle
+@ Plusle
 	base_stats 60, 50, 40, 95, 85, 75
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 200 ; catch rate
-	.byte 120 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 120 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_PLUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Minun
+@ Minun
 	base_stats 60, 40, 50, 95, 75, 85
 	.byte TYPE_ELECTRIC
 	.byte TYPE_ELECTRIC
-	.byte 200 ; catch rate
-	.byte 120 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 120 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_MINUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Mawile
+@ Mawile
 	base_stats 50, 85, 85, 50, 55, 55
 	.byte TYPE_STEEL
 	.byte TYPE_STEEL
-	.byte 45 ; catch rate
-	.byte 98 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 98 @ base exp. yield
 	ev_yield 0, 1, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FAIRY
 	.byte ABILITY_HYPER_CUTTER
 	.byte ABILITY_INTIMIDATE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Meditite
+@ Meditite
 	base_stats 30, 40, 55, 60, 40, 55
 	.byte TYPE_FIGHTING
 	.byte TYPE_PSYCHIC
-	.byte 180 ; catch rate
-	.byte 91 ; base exp. yield
+	.byte 180 @ catch rate
+	.byte 91 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_PURE_POWER
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Medicham
+@ Medicham
 	base_stats 60, 60, 75, 80, 60, 75
 	.byte TYPE_FIGHTING
 	.byte TYPE_PSYCHIC
-	.byte 90 ; catch rate
-	.byte 153 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 153 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_PURE_POWER
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Swablu
+@ Swablu
 	base_stats 45, 40, 60, 50, 40, 75
 	.byte TYPE_NORMAL
 	.byte TYPE_FLYING
-	.byte 255 ; catch rate
-	.byte 74 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 74 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Altaria
+@ Altaria
 	base_stats 75, 70, 90, 80, 70, 105
 	.byte TYPE_DRAGON
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 188 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 188 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_FLYING
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Wynaut
+@ Wynaut
 	base_stats 95, 23, 48, 23, 23, 48
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 125 ; catch rate
-	.byte 44 ; base exp. yield
+	.byte 125 @ catch rate
+	.byte 44 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_SHADOW_TAG
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Duskull
+@ Duskull
 	base_stats 20, 40, 90, 25, 30, 90
 	.byte TYPE_GHOST
 	.byte TYPE_GHOST
-	.byte 190 ; catch rate
-	.byte 97 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 97 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_SPELL_TAG
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Dusclops
+@ Dusclops
 	base_stats 40, 70, 130, 25, 60, 130
 	.byte TYPE_GHOST
 	.byte TYPE_GHOST
-	.byte 90 ; catch rate
-	.byte 179 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 179 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_SPELL_TAG
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Roselia
+@ Roselia
 	base_stats 50, 60, 45, 65, 100, 80
 	.byte TYPE_GRASS
 	.byte TYPE_POISON
-	.byte 150 ; catch rate
-	.byte 152 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 152 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_POISON_BARB
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_NATURAL_CURE
 	.byte ABILITY_POISON_POINT
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slakoth
+@ Slakoth
 	base_stats 60, 60, 60, 30, 35, 35
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 255 ; catch rate
-	.byte 83 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 83 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_TRUANT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Vigoroth
+@ Vigoroth
 	base_stats 80, 80, 80, 90, 55, 55
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 120 ; catch rate
-	.byte 126 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 126 @ base exp. yield
 	ev_yield 0, 0, 0, 2, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_VITAL_SPIRIT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Slaking
+@ Slaking
 	base_stats 150, 160, 100, 100, 95, 65
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 210 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 210 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_TRUANT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gulpin
+@ Gulpin
 	base_stats 70, 43, 53, 40, 43, 53
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 225 ; catch rate
-	.byte 75 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 75 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_BIG_PEARL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LIQUID_OOZE
 	.byte ABILITY_STICKY_HOLD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Swalot
+@ Swalot
 	base_stats 100, 73, 83, 55, 73, 83
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 75 ; catch rate
-	.byte 168 ; base exp. yield
+	.byte 75 @ catch rate
+	.byte 168 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_BIG_PEARL
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LIQUID_OOZE
 	.byte ABILITY_STICKY_HOLD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Tropius
+@ Tropius
 	base_stats 99, 68, 83, 51, 72, 87
 	.byte TYPE_GRASS
 	.byte TYPE_FLYING
-	.byte 200 ; catch rate
-	.byte 169 ; base exp. yield
+	.byte 200 @ catch rate
+	.byte 169 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_GRASS
 	.byte ABILITY_CHLOROPHYLL
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Whismur
+@ Whismur
 	base_stats 64, 51, 23, 28, 51, 23
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 190 ; catch rate
-	.byte 68 ; base exp. yield
+	.byte 190 @ catch rate
+	.byte 68 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_CHESTO_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Loudred
+@ Loudred
 	base_stats 84, 71, 43, 48, 71, 43
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 120 ; catch rate
-	.byte 126 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 126 @ base exp. yield
 	ev_yield 2, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_CHESTO_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Exploud
+@ Exploud
 	base_stats 104, 91, 63, 68, 91, 63
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 184 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 184 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_CHESTO_BERRY
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_SOUNDPROOF
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Clamperl
+@ Clamperl
 	base_stats 35, 64, 85, 32, 74, 55
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 255 ; catch rate
-	.byte 142 ; base exp. yield
+	.byte 255 @ catch rate
+	.byte 142 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_BLUE_SHARD
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_SHELL_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Huntail
+@ Huntail
 	base_stats 55, 104, 105, 52, 94, 75
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 178 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 178 @ base exp. yield
 	ev_yield 0, 1, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gorebyss
+@ Gorebyss
 	base_stats 55, 84, 105, 52, 114, 75
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 60 ; catch rate
-	.byte 178 ; base exp. yield
+	.byte 60 @ catch rate
+	.byte 178 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_1
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Absol
+@ Absol
 	base_stats 65, 130, 60, 75, 75, 60
 	.byte TYPE_DARK
 	.byte TYPE_DARK
-	.byte 30 ; catch rate
-	.byte 174 ; base exp. yield
+	.byte 30 @ catch rate
+	.byte 174 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_MEDIUM_SLOW
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shuppet
+@ Shuppet
 	base_stats 44, 75, 35, 45, 63, 33
 	.byte TYPE_GHOST
 	.byte TYPE_GHOST
-	.byte 225 ; catch rate
-	.byte 97 ; base exp. yield
+	.byte 225 @ catch rate
+	.byte 97 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SPELL_TAG
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Banette
+@ Banette
 	base_stats 64, 115, 65, 65, 83, 63
 	.byte TYPE_GHOST
 	.byte TYPE_GHOST
-	.byte 45 ; catch rate
-	.byte 179 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 179 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_SPELL_TAG
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_INSOMNIA
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Seviper
+@ Seviper
 	base_stats 73, 100, 60, 65, 100, 60
 	.byte TYPE_POISON
 	.byte TYPE_POISON
-	.byte 90 ; catch rate
-	.byte 165 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 165 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_SHED_SKIN
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_BLACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Zangoose
+@ Zangoose
 	base_stats 73, 115, 60, 90, 60, 60
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 90 ; catch rate
-	.byte 165 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 165 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_FIELD
 	.byte EGG_GROUP_FIELD
 	.byte ABILITY_IMMUNITY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Relicanth
+@ Relicanth
 	base_stats 100, 90, 130, 55, 45, 65
 	.byte TYPE_WATER
 	.byte TYPE_ROCK
-	.byte 25 ; catch rate
-	.byte 198 ; base exp. yield
+	.byte 25 @ catch rate
+	.byte 198 @ base exp. yield
 	ev_yield 1, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_GREEN_SHARD
-	.byte 31 ; gender
-	.byte 40 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 40 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_WATER_1
 	.byte EGG_GROUP_WATER_2
 	.byte ABILITY_SWIFT_SWIM
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Aron
+@ Aron
 	base_stats 50, 70, 100, 30, 40, 40
 	.byte TYPE_STEEL
 	.byte TYPE_ROCK
-	.byte 180 ; catch rate
-	.byte 96 ; base exp. yield
+	.byte 180 @ catch rate
+	.byte 96 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_HARD_STONE
-	.byte 127 ; gender
-	.byte 35 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 35 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_STURDY
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lairon
+@ Lairon
 	base_stats 60, 90, 140, 40, 50, 50
 	.byte TYPE_STEEL
 	.byte TYPE_ROCK
-	.byte 90 ; catch rate
-	.byte 152 ; base exp. yield
+	.byte 90 @ catch rate
+	.byte 152 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_HARD_STONE
-	.byte 127 ; gender
-	.byte 35 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 35 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_STURDY
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Aggron
+@ Aggron
 	base_stats 70, 110, 180, 50, 60, 60
 	.byte TYPE_STEEL
 	.byte TYPE_ROCK
-	.byte 45 ; catch rate
-	.byte 205 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 205 @ base exp. yield
 	ev_yield 0, 0, 3, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_HARD_STONE
-	.byte 127 ; gender
-	.byte 35 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 35 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MONSTER
 	.byte EGG_GROUP_MONSTER
 	.byte ABILITY_STURDY
 	.byte ABILITY_ROCK_HEAD
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Castform
+@ Castform
 	base_stats 70, 70, 70, 70, 70, 70
 	.byte TYPE_NORMAL
 	.byte TYPE_NORMAL
-	.byte 45 ; catch rate
-	.byte 145 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 145 @ base exp. yield
 	ev_yield 1, 0, 0, 0, 0, 0
 	.2byte ITEM_MYSTIC_WATER
 	.2byte ITEM_MYSTIC_WATER
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_MEDIUM_FAST
 	.byte EGG_GROUP_FAIRY
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_FORECAST
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Volbeat
+@ Volbeat
 	base_stats 65, 73, 55, 85, 47, 75
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 150 ; catch rate
-	.byte 146 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 146 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 0 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_ILLUMINATE
 	.byte ABILITY_SWARM
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Illumise
+@ Illumise
 	base_stats 65, 47, 55, 85, 73, 75
 	.byte TYPE_BUG
 	.byte TYPE_BUG
-	.byte 150 ; catch rate
-	.byte 146 ; base exp. yield
+	.byte 150 @ catch rate
+	.byte 146 @ base exp. yield
 	ev_yield 0, 0, 0, 1, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 15 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 254 @ gender
+	.byte 15 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FLUCTUATING
 	.byte EGG_GROUP_BUG
 	.byte EGG_GROUP_HUMAN_LIKE
 	.byte ABILITY_OBLIVIOUS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Lileep
+@ Lileep
 	base_stats 66, 41, 77, 23, 61, 87
 	.byte TYPE_ROCK
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 121 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 121 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SUCTION_CUPS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_PURPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Cradily
+@ Cradily
 	base_stats 86, 81, 97, 43, 81, 107
 	.byte TYPE_ROCK
 	.byte TYPE_GRASS
-	.byte 45 ; catch rate
-	.byte 201 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 201 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 2
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_SUCTION_CUPS
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Anorith
+@ Anorith
 	base_stats 45, 95, 50, 75, 40, 50
 	.byte TYPE_ROCK
 	.byte TYPE_BUG
-	.byte 45 ; catch rate
-	.byte 119 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 119 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_BATTLE_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Armaldo
+@ Armaldo
 	base_stats 75, 125, 100, 45, 70, 80
 	.byte TYPE_ROCK
 	.byte TYPE_BUG
-	.byte 45 ; catch rate
-	.byte 200 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 200 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 31 ; gender
-	.byte 30 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 31 @ gender
+	.byte 30 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_ERRATIC
 	.byte EGG_GROUP_WATER_3
 	.byte EGG_GROUP_WATER_3
 	.byte ABILITY_BATTLE_ARMOR
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Ralts
+@ Ralts
 	base_stats 28, 25, 25, 40, 45, 35
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 235 ; catch rate
-	.byte 70 ; base exp. yield
+	.byte 235 @ catch rate
+	.byte 70 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_TRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kirlia
+@ Kirlia
 	base_stats 38, 35, 35, 50, 65, 55
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 120 ; catch rate
-	.byte 140 ; base exp. yield
+	.byte 120 @ catch rate
+	.byte 140 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 2, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_TRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Gardevoir
+@ Gardevoir
 	base_stats 68, 65, 65, 80, 125, 115
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 208 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 208 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 20 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 20 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_SYNCHRONIZE
 	.byte ABILITY_TRACE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Bagon
+@ Bagon
 	base_stats 45, 75, 60, 50, 40, 30
 	.byte TYPE_DRAGON
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 89 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 89 @ base exp. yield
 	ev_yield 0, 1, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_DRAGON
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Shelgon
+@ Shelgon
 	base_stats 65, 95, 100, 50, 60, 50
 	.byte TYPE_DRAGON
 	.byte TYPE_DRAGON
-	.byte 45 ; catch rate
-	.byte 144 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 144 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_DRAGON
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_ROCK_HEAD
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_WHITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Salamence
+@ Salamence
 	base_stats 95, 135, 80, 100, 110, 80
 	.byte TYPE_DRAGON
 	.byte TYPE_FLYING
-	.byte 45 ; catch rate
-	.byte 218 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 218 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_DRAGON_SCALE
-	.byte 127 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 127 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_DRAGON
 	.byte EGG_GROUP_DRAGON
 	.byte ABILITY_INTIMIDATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Beldum
+@ Beldum
 	base_stats 40, 55, 80, 30, 35, 60
 	.byte TYPE_STEEL
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 103 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 103 @ base exp. yield
 	ev_yield 0, 0, 1, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 255 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Metang
+@ Metang
 	base_stats 60, 75, 100, 50, 55, 80
 	.byte TYPE_STEEL
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 153 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 153 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 255 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Metagross
+@ Metagross
 	base_stats 80, 135, 130, 70, 95, 90
 	.byte TYPE_STEEL
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 210 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 210 @ base exp. yield
 	ev_yield 0, 0, 3, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_METAL_COAT
-	.byte 255 ; gender
-	.byte 40 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 40 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_MINERAL
 	.byte EGG_GROUP_MINERAL
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Regirock
+@ Regirock
 	base_stats 80, 100, 200, 50, 50, 100
 	.byte TYPE_ROCK
 	.byte TYPE_ROCK
-	.byte 3 ; catch rate
-	.byte 217 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 217 @ base exp. yield
 	ev_yield 0, 0, 3, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BROWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Regice
+@ Regice
 	base_stats 80, 50, 100, 50, 100, 200
 	.byte TYPE_ICE
 	.byte TYPE_ICE
-	.byte 3 ; catch rate
-	.byte 216 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 216 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Registeel
+@ Registeel
 	base_stats 80, 75, 150, 50, 75, 150
 	.byte TYPE_STEEL
 	.byte TYPE_STEEL
-	.byte 3 ; catch rate
-	.byte 215 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 215 @ base exp. yield
 	ev_yield 0, 0, 2, 0, 0, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 80 ; egg cycles
-	.byte 35 ; base friendship
+	.byte 255 @ gender
+	.byte 80 @ egg cycles
+	.byte 35 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_CLEAR_BODY
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GRAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Kyogre
+@ Kyogre
 	base_stats 100, 100, 90, 90, 150, 140
 	.byte TYPE_WATER
 	.byte TYPE_WATER
-	.byte 5 ; catch rate
-	.byte 218 ; base exp. yield
+	.byte 5 @ catch rate
+	.byte 218 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_DRIZZLE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Groudon
+@ Groudon
 	base_stats 100, 150, 140, 90, 100, 90
 	.byte TYPE_GROUND
 	.byte TYPE_GROUND
-	.byte 5 ; catch rate
-	.byte 218 ; base exp. yield
+	.byte 5 @ catch rate
+	.byte 218 @ base exp. yield
 	ev_yield 0, 3, 0, 0, 0, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_DROUGHT
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Rayquaza
+@ Rayquaza
 	base_stats 105, 150, 90, 95, 150, 90
 	.byte TYPE_DRAGON
 	.byte TYPE_FLYING
-	.byte 3 ; catch rate
-	.byte 220 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 220 @ base exp. yield
 	ev_yield 0, 2, 0, 0, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_AIR_LOCK
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_GREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Latias
+@ Latias
 	base_stats 80, 80, 90, 110, 110, 130
 	.byte TYPE_DRAGON
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 211 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 211 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 0, 3
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 254 ; gender
-	.byte 120 ; egg cycles
-	.byte 90 ; base friendship
+	.byte 254 @ gender
+	.byte 120 @ egg cycles
+	.byte 90 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Latios
+@ Latios
 	base_stats 80, 90, 80, 110, 130, 110
 	.byte TYPE_DRAGON
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 211 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 211 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 3, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 0 ; gender
-	.byte 120 ; egg cycles
-	.byte 90 ; base friendship
+	.byte 0 @ gender
+	.byte 120 @ egg cycles
+	.byte 90 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Jirachi
+@ Jirachi
 	base_stats 100, 100, 100, 100, 100, 100
 	.byte TYPE_STEEL
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 215 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 215 @ base exp. yield
 	ev_yield 3, 0, 0, 0, 0, 0
 	.2byte ITEM_STAR_PIECE
 	.2byte ITEM_STAR_PIECE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 100 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 100 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_SERENE_GRACE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_YELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Deoxys
+@ Deoxys
 	base_stats 50, 150, 50, 150, 150, 50
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 3 ; catch rate
-	.byte 215 ; base exp. yield
+	.byte 3 @ catch rate
+	.byte 215 @ base exp. yield
 	ev_yield 0, 1, 0, 1, 1, 0
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 255 ; gender
-	.byte 120 ; egg cycles
-	.byte 0 ; base friendship
+	.byte 255 @ gender
+	.byte 120 @ egg cycles
+	.byte 0 @ base friendship
 	.byte GROWTH_SLOW
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte EGG_GROUP_UNDISCOVERED
 	.byte ABILITY_PRESSURE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte F_SUMMARY_SCREEN_FLIP_SPRITE | BODY_COLOR_RED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-; Chimecho
+@ Chimecho
 	base_stats 65, 50, 70, 65, 95, 80
 	.byte TYPE_PSYCHIC
 	.byte TYPE_PSYCHIC
-	.byte 45 ; catch rate
-	.byte 147 ; base exp. yield
+	.byte 45 @ catch rate
+	.byte 147 @ base exp. yield
 	ev_yield 0, 0, 0, 0, 1, 1
 	.2byte ITEM_NONE
 	.2byte ITEM_NONE
-	.byte 127 ; gender
-	.byte 25 ; egg cycles
-	.byte 70 ; base friendship
+	.byte 127 @ gender
+	.byte 25 @ egg cycles
+	.byte 70 @ base friendship
 	.byte GROWTH_FAST
 	.byte EGG_GROUP_AMORPHOUS
 	.byte EGG_GROUP_AMORPHOUS
 	.byte ABILITY_LEVITATE
 	.byte ABILITY_NONE
-	.byte 0 ; Safari Zone flee rate
+	.byte 0 @ Safari Zone flee rate
 	.byte BODY_COLOR_BLUE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
diff --git a/data/battle_frontier/battle_arena_move_mind_ratings.s b/data/battle_frontier/battle_arena_move_mind_ratings.s
index a85e17cca..efac113c1 100644
--- a/data/battle_frontier/battle_arena_move_mind_ratings.s
+++ b/data/battle_frontier/battle_arena_move_mind_ratings.s
@@ -1,358 +1,358 @@
 	.align 2, 0
 
-gBattleArenaMoveMindRatings: ; 8611DC0
-	.byte  0 ; -
-	.byte  1 ; Pound
-	.byte  1 ; Karate Chop
-	.byte  1 ; Double Slap
-	.byte  1 ; Comet Punch
-	.byte  1 ; Mega Punch
-	.byte  1 ; Pay Day
-	.byte  1 ; Fire Punch
-	.byte  1 ; Ice Punch
-	.byte  1 ; Thunder Punch
-	.byte  1 ; Scratch
-	.byte  1 ; Vice Grip
-	.byte  1 ; Guillotine
-	.byte  1 ; Razor Wind
-	.byte  0 ; Swords Dance
-	.byte  1 ; Cut
-	.byte  1 ; Gust
-	.byte  1 ; Wing Attack
-	.byte  0 ; Whirlwind
-	.byte  1 ; Fly
-	.byte  1 ; Bind
-	.byte  1 ; Slam
-	.byte  1 ; Vine Whip
-	.byte  1 ; Stomp
-	.byte  1 ; Double Kick
-	.byte  1 ; Mega Kick
-	.byte  1 ; Jump Kick
-	.byte  1 ; Rolling Kick
-	.byte  0 ; Sand-Attack
-	.byte  1 ; Headbutt
-	.byte  1 ; Horn Attack
-	.byte  1 ; Fury Attack
-	.byte  1 ; Horn Drill
-	.byte  1 ; Tackle
-	.byte  1 ; Body Slam
-	.byte  1 ; Wrap
-	.byte  1 ; Take Down
-	.byte  1 ; Thrash
-	.byte  1 ; Double-Edge
-	.byte  0 ; Tail Whip
-	.byte  1 ; Poison Sting
-	.byte  1 ; Twineedle
-	.byte  1 ; Pin Missile
-	.byte  0 ; Leer
-	.byte  1 ; Bite
-	.byte  0 ; Growl
-	.byte  0 ; Roar
-	.byte  0 ; Sing
-	.byte  0 ; Supersonic
-	.byte  1 ; Sonic Boom
-	.byte  0 ; Disable
-	.byte  1 ; Acid
-	.byte  1 ; Ember
-	.byte  1 ; Flamethrower
-	.byte  0 ; Mist
-	.byte  1 ; Water Gun
-	.byte  1 ; Hydro Pump
-	.byte  1 ; Surf
-	.byte  1 ; Ice Beam
-	.byte  1 ; Blizzard
-	.byte  1 ; Psybeam
-	.byte  1 ; Bubble Beam
-	.byte  1 ; Aurora Beam
-	.byte  1 ; Hyper Beam
-	.byte  1 ; Peck
-	.byte  1 ; Drill Peck
-	.byte  1 ; Submission
-	.byte  1 ; Low Kick
-	.byte  0 ; Counter
-	.byte  1 ; Seismic Toss
-	.byte  1 ; Strength
-	.byte  1 ; Absorb
-	.byte  1 ; Mega Drain
-	.byte  0 ; Leech Seed
-	.byte  0 ; Growth
-	.byte  1 ; Razor Leaf
-	.byte  1 ; Solar Beam
-	.byte  0 ; Poison Powder
-	.byte  0 ; Stun Spore
-	.byte  0 ; Sleep Powder
-	.byte  1 ; Petal Dance
-	.byte  0 ; String Shot
-	.byte  1 ; Dragon Rage
-	.byte  1 ; Fire Spin
-	.byte  1 ; Thunder Shock
-	.byte  1 ; Thunderbolt
-	.byte  0 ; Thunder Wave
-	.byte  1 ; Thunder
-	.byte  1 ; Rock Throw
-	.byte  1 ; Earthquake
-	.byte  1 ; Fissure
-	.byte  1 ; Dig
-	.byte  0 ; Toxic
-	.byte  1 ; Confusion
-	.byte  1 ; Psychic
-	.byte  0 ; Hypnosis
-	.byte  0 ; Meditate
-	.byte  0 ; Agility
-	.byte  1 ; Quick Attack
-	.byte  1 ; Rage
-	.byte  0 ; Teleport
-	.byte  1 ; Night Shade
-	.byte  0 ; Mimic
-	.byte  0 ; Screech
-	.byte  0 ; Double Team
-	.byte  0 ; Recover
-	.byte  0 ; Harden
-	.byte  0 ; Minimize
-	.byte  0 ; Smokescreen
-	.byte  0 ; Confuse Ray
-	.byte  0 ; Withdraw
-	.byte  0 ; Defense Curl
-	.byte  0 ; Barrier
-	.byte  0 ; Light Screen
-	.byte  0 ; Haze
-	.byte  0 ; Reflect
-	.byte  0 ; Focus Energy
-	.byte  0 ; Bide
-	.byte  0 ; Metronome
-	.byte  0 ; Mirror Move
-	.byte  1 ; Self-Destruct
-	.byte  1 ; Egg Bomb
-	.byte  1 ; Lick
-	.byte  1 ; Smog
-	.byte  1 ; Sludge
-	.byte  1 ; Bone Club
-	.byte  1 ; Fire Blast
-	.byte  1 ; Waterfall
-	.byte  1 ; Clamp
-	.byte  1 ; Swift
-	.byte  1 ; Skull Bash
-	.byte  1 ; Spike Cannon
-	.byte  1 ; Constrict
-	.byte  0 ; Amnesia
-	.byte  0 ; Kinesis
-	.byte  0 ; Soft-Boiled
-	.byte  1 ; Hi Jump Kick
-	.byte  0 ; Glare
-	.byte  1 ; Dream Eater
-	.byte  0 ; Poison Gas
-	.byte  1 ; Barrage
-	.byte  1 ; Leech Life
-	.byte  0 ; Lovely Kiss
-	.byte  1 ; Sky Attack
-	.byte  0 ; Transform
-	.byte  1 ; Bubble
-	.byte  1 ; Dizzy Punch
-	.byte  0 ; Spore
-	.byte  0 ; Flash
-	.byte  1 ; Psywave
-	.byte  0 ; Splash
-	.byte  0 ; Acid Armor
-	.byte  1 ; Crabhammer
-	.byte  1 ; Explosion
-	.byte  1 ; Fury Swipes
-	.byte  1 ; Bonemerang
-	.byte  0 ; Rest
-	.byte  1 ; Rock Slide
-	.byte  1 ; Hyper Fang
-	.byte  0 ; Sharpen
-	.byte  0 ; Conversion
-	.byte  1 ; Tri Attack
-	.byte  1 ; Super Fang
-	.byte  1 ; Slash
-	.byte  0 ; Substitute
-	.byte  1 ; Struggle
-	.byte  0 ; Sketch
-	.byte  1 ; Triple Kick
-	.byte  1 ; Thief
-	.byte  0 ; Spider Web
-	.byte  0 ; Mind Reader
-	.byte  0 ; Nightmare
-	.byte  1 ; Flame Wheel
-	.byte  1 ; Snore
-	.byte  0 ; Curse
-	.byte  1 ; Flail
-	.byte  0 ; Conversion 2
-	.byte  1 ; Aeroblast
-	.byte  0 ; Cotton Spore
-	.byte  1 ; Reversal
-	.byte  0 ; Spite
-	.byte  1 ; Powder Snow
-	.byte -1 ; Protect
-	.byte  1 ; Mach Punch
-	.byte  0 ; Scary Face
-	.byte  1 ; Faint Attack
-	.byte  0 ; Sweet Kiss
-	.byte  0 ; Belly Drum
-	.byte  1 ; Sludge Bomb
-	.byte  1 ; Mud-Slap
-	.byte  1 ; Octazooka
-	.byte  0 ; Spikes
-	.byte  1 ; Zap Cannon
-	.byte  0 ; Foresight
-	.byte  0 ; Destiny Bond
-	.byte  0 ; Perish Song
-	.byte  1 ; Icy Wind
-	.byte -1 ; Detect
-	.byte  1 ; Bone Rush
-	.byte  0 ; Lock-On
-	.byte  1 ; Outrage
-	.byte  0 ; Sandstorm
-	.byte  1 ; Giga Drain
-	.byte -1 ; Endure
-	.byte  0 ; Charm
-	.byte  1 ; Rollout
-	.byte  1 ; False Swipe
-	.byte  0 ; Swagger
-	.byte  0 ; Milk Drink
-	.byte  1 ; Spark
-	.byte  1 ; Fury Cutter
-	.byte  1 ; Steel Wing
-	.byte  0 ; Mean Look
-	.byte  0 ; Attract
-	.byte  0 ; Sleep Talk
-	.byte  0 ; Heal Bell
-	.byte  1 ; Return
-	.byte  1 ; Present
-	.byte  1 ; Frustration
-	.byte  0 ; Safeguard
-	.byte  0 ; Pain Split
-	.byte  1 ; Sacred Fire
-	.byte  1 ; Magnitude
-	.byte  1 ; Dynamic Punch
-	.byte  1 ; Megahorn
-	.byte  1 ; Dragon Breath
-	.byte  0 ; Baton Pass
-	.byte  0 ; Encore
-	.byte  1 ; Pursuit
-	.byte  1 ; Rapid Spin
-	.byte  0 ; Sweet Scent
-	.byte  1 ; Iron Tail
-	.byte  1 ; Metal Claw
-	.byte  1 ; Vital Throw
-	.byte  0 ; Morning Sun
-	.byte  0 ; Synthesis
-	.byte  0 ; Moonlight
-	.byte  1 ; Hidden Power
-	.byte  1 ; Cross Chop
-	.byte  1 ; Twister
-	.byte  0 ; Rain Dance
-	.byte  0 ; Sunny Day
-	.byte  1 ; Crunch
-	.byte  0 ; Mirror Coat
-	.byte  0 ; Psych Up
-	.byte  1 ; Extreme Speed
-	.byte  1 ; Ancient Power
-	.byte  1 ; Shadow Ball
-	.byte  1 ; Future Sight
-	.byte  1 ; Rock Smash
-	.byte  1 ; Whirlpool
-	.byte  1 ; Beat Up
-	.byte -1 ; Fake Out
-	.byte  1 ; Uproar
-	.byte  0 ; Stockpile
-	.byte  1 ; Spit Up
-	.byte  0 ; Swallow
-	.byte  1 ; Heat Wave
-	.byte  0 ; Hail
-	.byte  0 ; Torment
-	.byte  0 ; Flatter
-	.byte  0 ; Will-O-Wisp
-	.byte  0 ; Memento
-	.byte  1 ; Facade
-	.byte  1 ; Focus Punch
-	.byte  1 ; Smelling Salt
-	.byte  0 ; Follow Me
-	.byte  0 ; Nature Power
-	.byte  0 ; Charge
-	.byte  0 ; Taunt
-	.byte  0 ; Helping Hand
-	.byte  0 ; Trick
-	.byte  0 ; Role Play
-	.byte  0 ; Wish
-	.byte  0 ; Assist
-	.byte  0 ; Ingrain
-	.byte  1 ; Superpower
-	.byte  0 ; Magic Coat
-	.byte  0 ; Recycle
-	.byte  1 ; Revenge
-	.byte  1 ; Brick Break
-	.byte  0 ; Yawn
-	.byte  1 ; Knock Off
-	.byte  1 ; Endeavor
-	.byte  1 ; Eruption
-	.byte  0 ; Skill Swap
-	.byte  0 ; Imprison
-	.byte  0 ; Refresh
-	.byte  0 ; Grudge
-	.byte  0 ; Snatch
-	.byte  1 ; Secret Power
-	.byte  1 ; Dive
-	.byte  1 ; Arm Thrust
-	.byte  0 ; Camouflage
-	.byte  0 ; Tail Glow
-	.byte  1 ; Luster Purge
-	.byte  1 ; Mist Ball
-	.byte  0 ; Feather Dance
-	.byte  0 ; Teeter Dance
-	.byte  1 ; Blaze Kick
-	.byte  0 ; Mud Sport
-	.byte  1 ; Ice Ball
-	.byte  1 ; Needle Arm
-	.byte  0 ; Slack Off
-	.byte  1 ; Hyper Voice
-	.byte  1 ; Poison Fang
-	.byte  1 ; Crush Claw
-	.byte  1 ; Blast Burn
-	.byte  1 ; Hydro Cannon
-	.byte  1 ; Meteor Mash
-	.byte  1 ; Astonish
-	.byte  1 ; Weather Ball
-	.byte  0 ; Aromatherapy
-	.byte  0 ; Fake Tears
-	.byte  1 ; Air Cutter
-	.byte  1 ; Overheat
-	.byte  0 ; Odor Sleuth
-	.byte  1 ; Rock Tomb
-	.byte  1 ; Silver Wind
-	.byte  0 ; Metal Sound
-	.byte  0 ; Grass Whistle
-	.byte  0 ; Tickle
-	.byte  0 ; Cosmic Power
-	.byte  1 ; Water Spout
-	.byte  1 ; Signal Beam
-	.byte  1 ; Shadow Punch
-	.byte  1 ; Extrasensory
-	.byte  1 ; Sky Uppercut
-	.byte  1 ; Sand Tomb
-	.byte  1 ; Sheer Cold
-	.byte  1 ; Muddy Water
-	.byte  1 ; Bullet Seed
-	.byte  1 ; Aerial Ace
-	.byte  1 ; Icicle Spear
-	.byte  0 ; Iron Defense
-	.byte  0 ; Block
-	.byte  0 ; Howl
-	.byte  1 ; Dragon Claw
-	.byte  1 ; Frenzy Plant
-	.byte  0 ; Bulk Up
-	.byte  1 ; Bounce
-	.byte  1 ; Mud Shot
-	.byte  1 ; Poison Tail
-	.byte  1 ; Covet
-	.byte  1 ; Volt Tackle
-	.byte  1 ; Magical Leaf
-	.byte  0 ; Water Sport
-	.byte  0 ; Calm Mind
-	.byte  1 ; Leaf Blade
-	.byte  0 ; Dragon Dance
-	.byte  1 ; Rock Blast
-	.byte  1 ; Shock Wave
-	.byte  1 ; Water Pulse
-	.byte  1 ; Doom Desire
-	.byte  1 ; Psycho Boost
+gBattleArenaMoveMindRatings: @ 8611DC0
+	.byte  0 @ -
+	.byte  1 @ Pound
+	.byte  1 @ Karate Chop
+	.byte  1 @ Double Slap
+	.byte  1 @ Comet Punch
+	.byte  1 @ Mega Punch
+	.byte  1 @ Pay Day
+	.byte  1 @ Fire Punch
+	.byte  1 @ Ice Punch
+	.byte  1 @ Thunder Punch
+	.byte  1 @ Scratch
+	.byte  1 @ Vice Grip
+	.byte  1 @ Guillotine
+	.byte  1 @ Razor Wind
+	.byte  0 @ Swords Dance
+	.byte  1 @ Cut
+	.byte  1 @ Gust
+	.byte  1 @ Wing Attack
+	.byte  0 @ Whirlwind
+	.byte  1 @ Fly
+	.byte  1 @ Bind
+	.byte  1 @ Slam
+	.byte  1 @ Vine Whip
+	.byte  1 @ Stomp
+	.byte  1 @ Double Kick
+	.byte  1 @ Mega Kick
+	.byte  1 @ Jump Kick
+	.byte  1 @ Rolling Kick
+	.byte  0 @ Sand-Attack
+	.byte  1 @ Headbutt
+	.byte  1 @ Horn Attack
+	.byte  1 @ Fury Attack
+	.byte  1 @ Horn Drill
+	.byte  1 @ Tackle
+	.byte  1 @ Body Slam
+	.byte  1 @ Wrap
+	.byte  1 @ Take Down
+	.byte  1 @ Thrash
+	.byte  1 @ Double-Edge
+	.byte  0 @ Tail Whip
+	.byte  1 @ Poison Sting
+	.byte  1 @ Twineedle
+	.byte  1 @ Pin Missile
+	.byte  0 @ Leer
+	.byte  1 @ Bite
+	.byte  0 @ Growl
+	.byte  0 @ Roar
+	.byte  0 @ Sing
+	.byte  0 @ Supersonic
+	.byte  1 @ Sonic Boom
+	.byte  0 @ Disable
+	.byte  1 @ Acid
+	.byte  1 @ Ember
+	.byte  1 @ Flamethrower
+	.byte  0 @ Mist
+	.byte  1 @ Water Gun
+	.byte  1 @ Hydro Pump
+	.byte  1 @ Surf
+	.byte  1 @ Ice Beam
+	.byte  1 @ Blizzard
+	.byte  1 @ Psybeam
+	.byte  1 @ Bubble Beam
+	.byte  1 @ Aurora Beam
+	.byte  1 @ Hyper Beam
+	.byte  1 @ Peck
+	.byte  1 @ Drill Peck
+	.byte  1 @ Submission
+	.byte  1 @ Low Kick
+	.byte  0 @ Counter
+	.byte  1 @ Seismic Toss
+	.byte  1 @ Strength
+	.byte  1 @ Absorb
+	.byte  1 @ Mega Drain
+	.byte  0 @ Leech Seed
+	.byte  0 @ Growth
+	.byte  1 @ Razor Leaf
+	.byte  1 @ Solar Beam
+	.byte  0 @ Poison Powder
+	.byte  0 @ Stun Spore
+	.byte  0 @ Sleep Powder
+	.byte  1 @ Petal Dance
+	.byte  0 @ String Shot
+	.byte  1 @ Dragon Rage
+	.byte  1 @ Fire Spin
+	.byte  1 @ Thunder Shock
+	.byte  1 @ Thunderbolt
+	.byte  0 @ Thunder Wave
+	.byte  1 @ Thunder
+	.byte  1 @ Rock Throw
+	.byte  1 @ Earthquake
+	.byte  1 @ Fissure
+	.byte  1 @ Dig
+	.byte  0 @ Toxic
+	.byte  1 @ Confusion
+	.byte  1 @ Psychic
+	.byte  0 @ Hypnosis
+	.byte  0 @ Meditate
+	.byte  0 @ Agility
+	.byte  1 @ Quick Attack
+	.byte  1 @ Rage
+	.byte  0 @ Teleport
+	.byte  1 @ Night Shade
+	.byte  0 @ Mimic
+	.byte  0 @ Screech
+	.byte  0 @ Double Team
+	.byte  0 @ Recover
+	.byte  0 @ Harden
+	.byte  0 @ Minimize
+	.byte  0 @ Smokescreen
+	.byte  0 @ Confuse Ray
+	.byte  0 @ Withdraw
+	.byte  0 @ Defense Curl
+	.byte  0 @ Barrier
+	.byte  0 @ Light Screen
+	.byte  0 @ Haze
+	.byte  0 @ Reflect
+	.byte  0 @ Focus Energy
+	.byte  0 @ Bide
+	.byte  0 @ Metronome
+	.byte  0 @ Mirror Move
+	.byte  1 @ Self-Destruct
+	.byte  1 @ Egg Bomb
+	.byte  1 @ Lick
+	.byte  1 @ Smog
+	.byte  1 @ Sludge
+	.byte  1 @ Bone Club
+	.byte  1 @ Fire Blast
+	.byte  1 @ Waterfall
+	.byte  1 @ Clamp
+	.byte  1 @ Swift
+	.byte  1 @ Skull Bash
+	.byte  1 @ Spike Cannon
+	.byte  1 @ Constrict
+	.byte  0 @ Amnesia
+	.byte  0 @ Kinesis
+	.byte  0 @ Soft-Boiled
+	.byte  1 @ Hi Jump Kick
+	.byte  0 @ Glare
+	.byte  1 @ Dream Eater
+	.byte  0 @ Poison Gas
+	.byte  1 @ Barrage
+	.byte  1 @ Leech Life
+	.byte  0 @ Lovely Kiss
+	.byte  1 @ Sky Attack
+	.byte  0 @ Transform
+	.byte  1 @ Bubble
+	.byte  1 @ Dizzy Punch
+	.byte  0 @ Spore
+	.byte  0 @ Flash
+	.byte  1 @ Psywave
+	.byte  0 @ Splash
+	.byte  0 @ Acid Armor
+	.byte  1 @ Crabhammer
+	.byte  1 @ Explosion
+	.byte  1 @ Fury Swipes
+	.byte  1 @ Bonemerang
+	.byte  0 @ Rest
+	.byte  1 @ Rock Slide
+	.byte  1 @ Hyper Fang
+	.byte  0 @ Sharpen
+	.byte  0 @ Conversion
+	.byte  1 @ Tri Attack
+	.byte  1 @ Super Fang
+	.byte  1 @ Slash
+	.byte  0 @ Substitute
+	.byte  1 @ Struggle
+	.byte  0 @ Sketch
+	.byte  1 @ Triple Kick
+	.byte  1 @ Thief
+	.byte  0 @ Spider Web
+	.byte  0 @ Mind Reader
+	.byte  0 @ Nightmare
+	.byte  1 @ Flame Wheel
+	.byte  1 @ Snore
+	.byte  0 @ Curse
+	.byte  1 @ Flail
+	.byte  0 @ Conversion 2
+	.byte  1 @ Aeroblast
+	.byte  0 @ Cotton Spore
+	.byte  1 @ Reversal
+	.byte  0 @ Spite
+	.byte  1 @ Powder Snow
+	.byte -1 @ Protect
+	.byte  1 @ Mach Punch
+	.byte  0 @ Scary Face
+	.byte  1 @ Faint Attack
+	.byte  0 @ Sweet Kiss
+	.byte  0 @ Belly Drum
+	.byte  1 @ Sludge Bomb
+	.byte  1 @ Mud-Slap
+	.byte  1 @ Octazooka
+	.byte  0 @ Spikes
+	.byte  1 @ Zap Cannon
+	.byte  0 @ Foresight
+	.byte  0 @ Destiny Bond
+	.byte  0 @ Perish Song
+	.byte  1 @ Icy Wind
+	.byte -1 @ Detect
+	.byte  1 @ Bone Rush
+	.byte  0 @ Lock-On
+	.byte  1 @ Outrage
+	.byte  0 @ Sandstorm
+	.byte  1 @ Giga Drain
+	.byte -1 @ Endure
+	.byte  0 @ Charm
+	.byte  1 @ Rollout
+	.byte  1 @ False Swipe
+	.byte  0 @ Swagger
+	.byte  0 @ Milk Drink
+	.byte  1 @ Spark
+	.byte  1 @ Fury Cutter
+	.byte  1 @ Steel Wing
+	.byte  0 @ Mean Look
+	.byte  0 @ Attract
+	.byte  0 @ Sleep Talk
+	.byte  0 @ Heal Bell
+	.byte  1 @ Return
+	.byte  1 @ Present
+	.byte  1 @ Frustration
+	.byte  0 @ Safeguard
+	.byte  0 @ Pain Split
+	.byte  1 @ Sacred Fire
+	.byte  1 @ Magnitude
+	.byte  1 @ Dynamic Punch
+	.byte  1 @ Megahorn
+	.byte  1 @ Dragon Breath
+	.byte  0 @ Baton Pass
+	.byte  0 @ Encore
+	.byte  1 @ Pursuit
+	.byte  1 @ Rapid Spin
+	.byte  0 @ Sweet Scent
+	.byte  1 @ Iron Tail
+	.byte  1 @ Metal Claw
+	.byte  1 @ Vital Throw
+	.byte  0 @ Morning Sun
+	.byte  0 @ Synthesis
+	.byte  0 @ Moonlight
+	.byte  1 @ Hidden Power
+	.byte  1 @ Cross Chop
+	.byte  1 @ Twister
+	.byte  0 @ Rain Dance
+	.byte  0 @ Sunny Day
+	.byte  1 @ Crunch
+	.byte  0 @ Mirror Coat
+	.byte  0 @ Psych Up
+	.byte  1 @ Extreme Speed
+	.byte  1 @ Ancient Power
+	.byte  1 @ Shadow Ball
+	.byte  1 @ Future Sight
+	.byte  1 @ Rock Smash
+	.byte  1 @ Whirlpool
+	.byte  1 @ Beat Up
+	.byte -1 @ Fake Out
+	.byte  1 @ Uproar
+	.byte  0 @ Stockpile
+	.byte  1 @ Spit Up
+	.byte  0 @ Swallow
+	.byte  1 @ Heat Wave
+	.byte  0 @ Hail
+	.byte  0 @ Torment
+	.byte  0 @ Flatter
+	.byte  0 @ Will-O-Wisp
+	.byte  0 @ Memento
+	.byte  1 @ Facade
+	.byte  1 @ Focus Punch
+	.byte  1 @ Smelling Salt
+	.byte  0 @ Follow Me
+	.byte  0 @ Nature Power
+	.byte  0 @ Charge
+	.byte  0 @ Taunt
+	.byte  0 @ Helping Hand
+	.byte  0 @ Trick
+	.byte  0 @ Role Play
+	.byte  0 @ Wish
+	.byte  0 @ Assist
+	.byte  0 @ Ingrain
+	.byte  1 @ Superpower
+	.byte  0 @ Magic Coat
+	.byte  0 @ Recycle
+	.byte  1 @ Revenge
+	.byte  1 @ Brick Break
+	.byte  0 @ Yawn
+	.byte  1 @ Knock Off
+	.byte  1 @ Endeavor
+	.byte  1 @ Eruption
+	.byte  0 @ Skill Swap
+	.byte  0 @ Imprison
+	.byte  0 @ Refresh
+	.byte  0 @ Grudge
+	.byte  0 @ Snatch
+	.byte  1 @ Secret Power
+	.byte  1 @ Dive
+	.byte  1 @ Arm Thrust
+	.byte  0 @ Camouflage
+	.byte  0 @ Tail Glow
+	.byte  1 @ Luster Purge
+	.byte  1 @ Mist Ball
+	.byte  0 @ Feather Dance
+	.byte  0 @ Teeter Dance
+	.byte  1 @ Blaze Kick
+	.byte  0 @ Mud Sport
+	.byte  1 @ Ice Ball
+	.byte  1 @ Needle Arm
+	.byte  0 @ Slack Off
+	.byte  1 @ Hyper Voice
+	.byte  1 @ Poison Fang
+	.byte  1 @ Crush Claw
+	.byte  1 @ Blast Burn
+	.byte  1 @ Hydro Cannon
+	.byte  1 @ Meteor Mash
+	.byte  1 @ Astonish
+	.byte  1 @ Weather Ball
+	.byte  0 @ Aromatherapy
+	.byte  0 @ Fake Tears
+	.byte  1 @ Air Cutter
+	.byte  1 @ Overheat
+	.byte  0 @ Odor Sleuth
+	.byte  1 @ Rock Tomb
+	.byte  1 @ Silver Wind
+	.byte  0 @ Metal Sound
+	.byte  0 @ Grass Whistle
+	.byte  0 @ Tickle
+	.byte  0 @ Cosmic Power
+	.byte  1 @ Water Spout
+	.byte  1 @ Signal Beam
+	.byte  1 @ Shadow Punch
+	.byte  1 @ Extrasensory
+	.byte  1 @ Sky Uppercut
+	.byte  1 @ Sand Tomb
+	.byte  1 @ Sheer Cold
+	.byte  1 @ Muddy Water
+	.byte  1 @ Bullet Seed
+	.byte  1 @ Aerial Ace
+	.byte  1 @ Icicle Spear
+	.byte  0 @ Iron Defense
+	.byte  0 @ Block
+	.byte  0 @ Howl
+	.byte  1 @ Dragon Claw
+	.byte  1 @ Frenzy Plant
+	.byte  0 @ Bulk Up
+	.byte  1 @ Bounce
+	.byte  1 @ Mud Shot
+	.byte  1 @ Poison Tail
+	.byte  1 @ Covet
+	.byte  1 @ Volt Tackle
+	.byte  1 @ Magical Leaf
+	.byte  0 @ Water Sport
+	.byte  0 @ Calm Mind
+	.byte  1 @ Leaf Blade
+	.byte  0 @ Dragon Dance
+	.byte  1 @ Rock Blast
+	.byte  1 @ Shock Wave
+	.byte  1 @ Water Pulse
+	.byte  1 @ Doom Desire
+	.byte  1 @ Psycho Boost
diff --git a/data/battle_frontier/battle_factory_style_move_lists.s b/data/battle_frontier/battle_factory_style_move_lists.s
index 5d49aa7ce..8e340066c 100644
--- a/data/battle_frontier/battle_factory_style_move_lists.s
+++ b/data/battle_frontier/battle_factory_style_move_lists.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gBattleFactoryStyleRequiredMoveCounts: ; 8611FC0
+gBattleFactoryStyleRequiredMoveCounts: @ 8611FC0
 	.byte 3
 	.byte 3
 	.byte 3
@@ -11,7 +11,7 @@ gBattleFactoryStyleRequiredMoveCounts: ; 8611FC0
 
 	.align 2, 0
 
-gBattleFactoryStyleMoveList_TotalPreparation: ; 8611FC8
+gBattleFactoryStyleMoveList_TotalPreparation: @ 8611FC8
 	.2byte MOVE_SWORDS_DANCE
 	.2byte MOVE_GROWTH
 	.2byte MOVE_MEDITATE
@@ -41,7 +41,7 @@ gBattleFactoryStyleMoveList_TotalPreparation: ; 8611FC8
 	.2byte MOVE_DRAGON_DANCE
 	.2byte 0
 
-gBattleFactoryStyleMoveList_ImpossibleToPredict: ; 8612000
+gBattleFactoryStyleMoveList_ImpossibleToPredict: @ 8612000
 	.2byte MOVE_MIMIC
 	.2byte MOVE_METRONOME
 	.2byte MOVE_MIRROR_MOVE
@@ -58,7 +58,7 @@ gBattleFactoryStyleMoveList_ImpossibleToPredict: ; 8612000
 	.2byte MOVE_CAMOUFLAGE
 	.2byte 0
 
-gBattleFactoryStyleMoveList_WeakeningTheFoe: ; 861201E
+gBattleFactoryStyleMoveList_WeakeningTheFoe: @ 861201E
 	.2byte MOVE_SAND_ATTACK
 	.2byte MOVE_TAIL_WHIP
 	.2byte MOVE_LEER
@@ -80,7 +80,7 @@ gBattleFactoryStyleMoveList_WeakeningTheFoe: ; 861201E
 	.2byte MOVE_TICKLE
 	.2byte 0
 
-gBattleFactoryStyleMoveList_HighRiskHighReturn: ; 8612046
+gBattleFactoryStyleMoveList_HighRiskHighReturn: @ 8612046
 	.2byte MOVE_GUILLOTINE
 	.2byte MOVE_HORN_DRILL
 	.2byte MOVE_DOUBLE_EDGE
@@ -109,7 +109,7 @@ gBattleFactoryStyleMoveList_HighRiskHighReturn: ; 8612046
 	.2byte MOVE_VOLT_TACKLE
 	.2byte 0
 
-gBattleFactoryStyleMoveList_Endurance: ; 861207C
+gBattleFactoryStyleMoveList_Endurance: @ 861207C
 	.2byte MOVE_MIST
 	.2byte MOVE_RECOVER
 	.2byte MOVE_LIGHT_SCREEN
@@ -139,7 +139,7 @@ gBattleFactoryStyleMoveList_Endurance: ; 861207C
 	.2byte MOVE_WATER_SPORT
 	.2byte 0
 
-gBattleFactoryStyleMoveList_SlowAndSteady: ; 86120B4
+gBattleFactoryStyleMoveList_SlowAndSteady: @ 86120B4
 	.2byte MOVE_SING
 	.2byte MOVE_SUPERSONIC
 	.2byte MOVE_DISABLE
@@ -174,7 +174,7 @@ gBattleFactoryStyleMoveList_SlowAndSteady: ; 86120B4
 	.2byte MOVE_BLOCK
 	.2byte 0
 
-gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: ; 86120F6
+gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: @ 86120F6
 	.2byte MOVE_SANDSTORM
 	.2byte MOVE_RAIN_DANCE
 	.2byte MOVE_SUNNY_DAY
@@ -184,7 +184,7 @@ gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: ; 86120F6
 
 	.align 2, 0
 
-gBattleFactoryStyleMoveListPointers: ; 8612104
+gBattleFactoryStyleMoveListPointers: @ 8612104
 	.4byte gBattleFactoryStyleMoveList_TotalPreparation
 	.4byte gBattleFactoryStyleMoveList_SlowAndSteady
 	.4byte gBattleFactoryStyleMoveList_Endurance
diff --git a/data/battle_frontier/battle_frontier_held_items.s b/data/battle_frontier/battle_frontier_held_items.s
index 0d06bc1cc..e1cb51845 100644
--- a/data/battle_frontier/battle_frontier_held_items.s
+++ b/data/battle_frontier/battle_frontier_held_items.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gBattleFrontierHeldItems: ; 85CECB0
+gBattleFrontierHeldItems: @ 85CECB0
 	.2byte ITEM_NONE
 	.2byte ITEM_KINGS_ROCK
 	.2byte ITEM_SITRUS_BERRY
diff --git a/data/battle_frontier/battle_frontier_mons.s b/data/battle_frontier/battle_frontier_mons.s
index 06651a460..22ad5606c 100644
--- a/data/battle_frontier/battle_frontier_mons.s
+++ b/data/battle_frontier/battle_frontier_mons.s
@@ -1,6174 +1,6174 @@
 	.align 2, 0
 
-gBattleFrontierMons: ; 85D97BC
-; 0
+gBattleFrontierMons: @ 85D97BC
+@ 0
 	.2byte SPECIES_SUNKERN
 	.2byte MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 1
+@ 1
 	.2byte SPECIES_AZURILL
 	.2byte MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RASH
 
-; 2
+@ 2
 	.2byte SPECIES_CATERPIE
 	.2byte MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 3
+@ 3
 	.2byte SPECIES_WEEDLE
 	.2byte MOVE_POISON_STING, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 4
+@ 4
 	.2byte SPECIES_WURMPLE
 	.2byte MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_POISON_STING, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 5
+@ 5
 	.2byte SPECIES_RALTS
 	.2byte MOVE_CONFUSION, MOVE_IMPRISON, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 6
+@ 6
 	.2byte SPECIES_MAGIKARP
 	.2byte MOVE_FLAIL, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 7
+@ 7
 	.2byte SPECIES_FEEBAS
 	.2byte MOVE_FLAIL, MOVE_MIRROR_COAT, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 8
+@ 8
 	.2byte SPECIES_METAPOD
 	.2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 9
+@ 9
 	.2byte SPECIES_KAKUNA
 	.2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 10
+@ 10
 	.2byte SPECIES_PICHU
 	.2byte MOVE_SWEET_KISS, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_SHOCK_WAVE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RASH
 
-; 11
+@ 11
 	.2byte SPECIES_SILCOON
 	.2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 12
+@ 12
 	.2byte SPECIES_CASCOON
 	.2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 13
+@ 13
 	.2byte SPECIES_IGGLYBUFF
 	.2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_SEISMIC_TOSS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 14
+@ 14
 	.2byte SPECIES_WOOPER
 	.2byte MOVE_YAWN, MOVE_DIG, MOVE_WATER_PULSE, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 15
+@ 15
 	.2byte SPECIES_TYROGUE
 	.2byte MOVE_MACH_PUNCH, MOVE_PROTECT, MOVE_DOUBLE_TEAM, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 16
+@ 16
 	.2byte SPECIES_SENTRET
 	.2byte MOVE_QUICK_ATTACK, MOVE_FOLLOW_ME, MOVE_HELPING_HAND, MOVE_ASSIST
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 17
+@ 17
 	.2byte SPECIES_CLEFFA
 	.2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_METRONOME
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SERIOUS
 
-; 18
+@ 18
 	.2byte SPECIES_SEEDOT
 	.2byte MOVE_BULLET_SEED, MOVE_BIDE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 19
+@ 19
 	.2byte SPECIES_LOTAD
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_SUNNY_DAY, MOVE_MEGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 20
+@ 20
 	.2byte SPECIES_POOCHYENA
 	.2byte MOVE_CRUNCH, MOVE_SWAGGER, MOVE_ROAR, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 21
+@ 21
 	.2byte SPECIES_SHEDINJA
 	.2byte MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_SILVER_WIND, MOVE_GRUDGE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_NAIVE
 
-; 22
+@ 22
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_FAKE_OUT, MOVE_SEISMIC_TOSS, MOVE_DETECT, MOVE_WHIRLWIND
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 23
+@ 23
 	.2byte SPECIES_WHISMUR
 	.2byte MOVE_UPROAR, MOVE_SWAGGER, MOVE_BODY_SLAM, MOVE_SMELLING_SALT
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 24
+@ 24
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_SWIFT, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 25
+@ 25
 	.2byte SPECIES_ZUBAT
 	.2byte MOVE_POISON_FANG, MOVE_WHIRLWIND, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 26
+@ 26
 	.2byte SPECIES_TOGEPI
 	.2byte MOVE_RETURN, MOVE_YAWN, MOVE_WISH, MOVE_SWEET_KISS
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 27
+@ 27
 	.2byte SPECIES_SPINARAK
 	.2byte MOVE_SIGNAL_BEAM, MOVE_NIGHT_SHADE, MOVE_SPIDER_WEB, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 28
+@ 28
 	.2byte SPECIES_MARILL
 	.2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_LIGHT_SCREEN, MOVE_RETURN
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 29
+@ 29
 	.2byte SPECIES_HOPPIP
 	.2byte MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_STUN_SPORE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_LAX
 
-; 30
+@ 30
 	.2byte SPECIES_SLUGMA
 	.2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_YAWN, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 31
+@ 31
 	.2byte SPECIES_SWINUB
 	.2byte MOVE_ICY_WIND, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_GENTLE
 
-; 32
+@ 32
 	.2byte SPECIES_SMEARGLE
 	.2byte MOVE_EXTREME_SPEED, MOVE_FAKE_OUT, MOVE_QUICK_ATTACK, MOVE_MACH_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 33
+@ 33
 	.2byte SPECIES_PIDGEY
 	.2byte MOVE_GUST, MOVE_SAND_ATTACK, MOVE_WHIRLWIND, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 34
+@ 34
 	.2byte SPECIES_RATTATA
 	.2byte MOVE_HYPER_FANG, MOVE_PURSUIT, MOVE_QUICK_ATTACK, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 35
+@ 35
 	.2byte SPECIES_WYNAUT
 	.2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_JOLLY
 
-; 36
+@ 36
 	.2byte SPECIES_SKITTY
 	.2byte MOVE_SING, MOVE_ATTRACT, MOVE_CHARM, MOVE_DOUBLE_SLAP
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 37
+@ 37
 	.2byte SPECIES_SPEAROW
 	.2byte MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_MIRROR_MOVE, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 38
+@ 38
 	.2byte SPECIES_HOOTHOOT
 	.2byte MOVE_CONFUSION, MOVE_HYPNOSIS, MOVE_SUPERSONIC, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 39
+@ 39
 	.2byte SPECIES_DIGLETT
 	.2byte MOVE_MAGNITUDE, MOVE_SLASH, MOVE_ROCK_TOMB, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAIVE
 
-; 40
+@ 40
 	.2byte SPECIES_LEDYBA
 	.2byte MOVE_PSYBEAM, MOVE_AGILITY, MOVE_BATON_PASS, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 41
+@ 41
 	.2byte SPECIES_NINCADA
 	.2byte MOVE_MUD_SLAP, MOVE_DIG, MOVE_TOXIC, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 42
+@ 42
 	.2byte SPECIES_SURSKIT
 	.2byte MOVE_BUBBLE_BEAM, MOVE_RAIN_DANCE, MOVE_SWEET_SCENT, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 43
+@ 43
 	.2byte SPECIES_JIGGLYPUFF
 	.2byte MOVE_SING, MOVE_WISH, MOVE_MIMIC, MOVE_DOUBLE_SLAP
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 44
+@ 44
 	.2byte SPECIES_TAILLOW
 	.2byte MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 45
+@ 45
 	.2byte SPECIES_WINGULL
 	.2byte MOVE_WATER_PULSE, MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 46
+@ 46
 	.2byte SPECIES_NIDORAN_M
 	.2byte MOVE_DOUBLE_KICK, MOVE_POISON_STING, MOVE_DISABLE, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 47
+@ 47
 	.2byte SPECIES_NIDORAN_F
 	.2byte MOVE_CRUNCH, MOVE_DOUBLE_KICK, MOVE_FLATTER, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 48
+@ 48
 	.2byte SPECIES_KIRLIA
 	.2byte MOVE_CONFUSION, MOVE_WILL_O_WISP, MOVE_FUTURE_SIGHT, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 49
+@ 49
 	.2byte SPECIES_MAREEP
 	.2byte MOVE_SHOCK_WAVE, MOVE_FLASH, MOVE_REFLECT, MOVE_COTTON_SPORE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 50
+@ 50
 	.2byte SPECIES_MEDITITE
 	.2byte MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 51
+@ 51
 	.2byte SPECIES_SLAKOTH
 	.2byte MOVE_YAWN, MOVE_SCRATCH, MOVE_ENCORE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 52
+@ 52
 	.2byte SPECIES_PARAS
 	.2byte MOVE_SPORE, MOVE_LEECH_LIFE, MOVE_SLASH, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 53
+@ 53
 	.2byte SPECIES_EKANS
 	.2byte MOVE_ACID, MOVE_DIG, MOVE_SCREECH, MOVE_TORMENT
 	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 54
+@ 54
 	.2byte SPECIES_DITTO
 	.2byte MOVE_TRANSFORM, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_METAL_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 55
+@ 55
 	.2byte SPECIES_BARBOACH
 	.2byte MOVE_MAGNITUDE, MOVE_WATER_PULSE, MOVE_SPARK, MOVE_FUTURE_SIGHT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BASHFUL
 
-; 56
+@ 56
 	.2byte SPECIES_MEOWTH
 	.2byte MOVE_SLASH, MOVE_BITE, MOVE_SCREECH, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 57
+@ 57
 	.2byte SPECIES_PINECO
 	.2byte MOVE_SELF_DESTRUCT, MOVE_TAKE_DOWN, MOVE_REFLECT, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 58
+@ 58
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_TOXIC, MOVE_DIG, MOVE_SANDSTORM, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SERIOUS
 
-; 59
+@ 59
 	.2byte SPECIES_SPHEAL
 	.2byte MOVE_ICE_BALL, MOVE_WATER_PULSE, MOVE_HAIL, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 60
+@ 60
 	.2byte SPECIES_HORSEA
 	.2byte MOVE_WATER_GUN, MOVE_AGILITY, MOVE_ICY_WIND, MOVE_TWISTER
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 61
+@ 61
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_SPORE, MOVE_BULLET_SEED, MOVE_LEECH_SEED, MOVE_HEADBUTT
 	.byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 62
+@ 62
 	.2byte SPECIES_SHUPPET
 	.2byte MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_GRUDGE, MOVE_KNOCK_OFF
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RASH
 
-; 63
+@ 63
 	.2byte SPECIES_DUSKULL
 	.2byte MOVE_SKILL_SWAP, MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 64
+@ 64
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 65
+@ 65
 	.2byte SPECIES_VULPIX
 	.2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 66
+@ 66
 	.2byte SPECIES_PIKACHU
 	.2byte MOVE_THUNDER_PUNCH, MOVE_THUNDER_WAVE, MOVE_DOUBLE_TEAM, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LIGHT_BALL
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 67
+@ 67
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 68
+@ 68
 	.2byte SPECIES_POLIWAG
 	.2byte MOVE_HYPNOSIS, MOVE_ICY_WIND, MOVE_WATER_GUN, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 69
+@ 69
 	.2byte SPECIES_BELLSPROUT
 	.2byte MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_STUN_SPORE, MOVE_WRAP
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_LAX
 
-; 70
+@ 70
 	.2byte SPECIES_GEODUDE
 	.2byte MOVE_MAGNITUDE, MOVE_ROCK_BLAST, MOVE_STRENGTH, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 71
+@ 71
 	.2byte SPECIES_DRATINI
 	.2byte MOVE_OUTRAGE, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_PULSE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 72
+@ 72
 	.2byte SPECIES_SNUBBULL
 	.2byte MOVE_BITE, MOVE_CHARM, MOVE_SWAGGER, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 73
+@ 73
 	.2byte SPECIES_REMORAID
 	.2byte MOVE_BUBBLE_BEAM, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 74
+@ 74
 	.2byte SPECIES_LARVITAR
 	.2byte MOVE_THRASH, MOVE_ROCK_SLIDE, MOVE_DIG, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 75
+@ 75
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_PSYBEAM, MOVE_ANCIENT_POWER, MOVE_LIGHT_SCREEN, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 76
+@ 76
 	.2byte SPECIES_SNORUNT
 	.2byte MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_LEER, MOVE_BITE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 77
+@ 77
 	.2byte SPECIES_BAGON
 	.2byte MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 78
+@ 78
 	.2byte SPECIES_BELDUM
 	.2byte MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 79
+@ 79
 	.2byte SPECIES_GULPIN
 	.2byte MOVE_TOXIC, MOVE_YAWN, MOVE_PAIN_SPLIT, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SERIOUS
 
-; 80
+@ 80
 	.2byte SPECIES_VENONAT
 	.2byte MOVE_PSYBEAM, MOVE_SUPERSONIC, MOVE_STUN_SPORE, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 81
+@ 81
 	.2byte SPECIES_MANKEY
 	.2byte MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SCREECH, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 82
+@ 82
 	.2byte SPECIES_MACHOP
 	.2byte MOVE_SEISMIC_TOSS, MOVE_REVENGE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 83
+@ 83
 	.2byte SPECIES_SHELLDER
 	.2byte MOVE_ICICLE_SPEAR, MOVE_SUPERSONIC, MOVE_CLAMP, MOVE_WITHDRAW
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 84
+@ 84
 	.2byte SPECIES_SMOOCHUM
 	.2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_MUD_SLAP, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 85
+@ 85
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_MAGNITUDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 86
+@ 86
 	.2byte SPECIES_CARVANHA
 	.2byte MOVE_BITE, MOVE_SCREECH, MOVE_SCARY_FACE, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 87
+@ 87
 	.2byte SPECIES_CORPHISH
 	.2byte MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 88
+@ 88
 	.2byte SPECIES_CHARMANDER
 	.2byte MOVE_FIRE_SPIN, MOVE_METAL_CLAW, MOVE_SMOKESCREEN, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 89
+@ 89
 	.2byte SPECIES_CYNDAQUIL
 	.2byte MOVE_EMBER, MOVE_SWIFT, MOVE_QUICK_ATTACK, MOVE_SMOKESCREEN
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 90
+@ 90
 	.2byte SPECIES_ABRA
 	.2byte MOVE_MIMIC, MOVE_METRONOME, MOVE_FLASH, MOVE_SEISMIC_TOSS
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 91
+@ 91
 	.2byte SPECIES_DODUO
 	.2byte MOVE_FURY_ATTACK, MOVE_UPROAR, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 92
+@ 92
 	.2byte SPECIES_GASTLY
 	.2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_NIGHT_SHADE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 93
+@ 93
 	.2byte SPECIES_SWABLU
 	.2byte MOVE_TAKE_DOWN, MOVE_DREAM_EATER, MOVE_SING, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 94
+@ 94
 	.2byte SPECIES_TREECKO
 	.2byte MOVE_BULLET_SEED, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_LONELY
 
-; 95
+@ 95
 	.2byte SPECIES_TORCHIC
 	.2byte MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 96
+@ 96
 	.2byte SPECIES_MUDKIP
 	.2byte MOVE_WHIRLPOOL, MOVE_ENDEAVOR, MOVE_MUD_SPORT, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 97
+@ 97
 	.2byte SPECIES_SQUIRTLE
 	.2byte MOVE_WATER_PULSE, MOVE_BITE, MOVE_WITHDRAW, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 98
+@ 98
 	.2byte SPECIES_TOTODILE
 	.2byte MOVE_SLASH, MOVE_WATER_PULSE, MOVE_SCREECH, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 99
+@ 99
 	.2byte SPECIES_SLOWPOKE
 	.2byte MOVE_CONFUSION, MOVE_DISABLE, MOVE_WATER_PULSE, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 100
+@ 100
 	.2byte SPECIES_BULBASAUR
 	.2byte MOVE_RAZOR_LEAF, MOVE_SWEET_SCENT, MOVE_SLEEP_POWDER, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 101
+@ 101
 	.2byte SPECIES_CHIKORITA
 	.2byte MOVE_SECRET_POWER, MOVE_BULLET_SEED, MOVE_MUD_SLAP, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 102
+@ 102
 	.2byte SPECIES_ODDISH
 	.2byte MOVE_ACID, MOVE_STUN_SPORE, MOVE_SWEET_SCENT, MOVE_MOONLIGHT
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 103
+@ 103
 	.2byte SPECIES_PSYDUCK
 	.2byte MOVE_CONFUSION, MOVE_FURY_SWIPES, MOVE_AERIAL_ACE, MOVE_DISABLE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HASTY
 
-; 104
+@ 104
 	.2byte SPECIES_CUBONE
 	.2byte MOVE_BONE_CLUB, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 105
+@ 105
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_WATERFALL, MOVE_FURY_ATTACK, MOVE_AGILITY, MOVE_PSYBEAM
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 106
+@ 106
 	.2byte SPECIES_NATU
 	.2byte MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 107
+@ 107
 	.2byte SPECIES_CLEFAIRY
 	.2byte MOVE_FOLLOW_ME, MOVE_RETURN, MOVE_ENCORE, MOVE_SING
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 108
+@ 108
 	.2byte SPECIES_MAGNEMITE
 	.2byte MOVE_SHOCK_WAVE, MOVE_SUPERSONIC, MOVE_METAL_SOUND, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_GENTLE
 
-; 109
+@ 109
 	.2byte SPECIES_SEEL
 	.2byte MOVE_AURORA_BEAM, MOVE_DIVE, MOVE_BODY_SLAM, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 110
+@ 110
 	.2byte SPECIES_GRIMER
 	.2byte MOVE_SLUDGE, MOVE_ROCK_TOMB, MOVE_ACID_ARMOR, MOVE_MINIMIZE
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 111
+@ 111
 	.2byte SPECIES_KRABBY
 	.2byte MOVE_CRABHAMMER, MOVE_MUD_SHOT, MOVE_FLAIL, MOVE_KNOCK_OFF
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 112
+@ 112
 	.2byte SPECIES_EXEGGCUTE
 	.2byte MOVE_CONFUSION, MOVE_ANCIENT_POWER, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 113
+@ 113
 	.2byte SPECIES_EEVEE
 	.2byte MOVE_CHARM, MOVE_ATTRACT, MOVE_FLAIL, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 114
+@ 114
 	.2byte SPECIES_DROWZEE
 	.2byte MOVE_CONFUSION, MOVE_HEADBUTT, MOVE_DISABLE, MOVE_BARRIER
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 115
+@ 115
 	.2byte SPECIES_VOLTORB
 	.2byte MOVE_SPARK, MOVE_SCREECH, MOVE_ROLLOUT, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 116
+@ 116
 	.2byte SPECIES_CHINCHOU
 	.2byte MOVE_SPARK, MOVE_DIVE, MOVE_CONFUSE_RAY, MOVE_TAKE_DOWN
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 117
+@ 117
 	.2byte SPECIES_TEDDIURSA
 	.2byte MOVE_SECRET_POWER, MOVE_FAKE_TEARS, MOVE_FAINT_ATTACK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 118
+@ 118
 	.2byte SPECIES_DELIBIRD
 	.2byte MOVE_PRESENT, MOVE_ICE_BALL, MOVE_AERIAL_ACE, MOVE_HAIL
 	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 119
+@ 119
 	.2byte SPECIES_HOUNDOUR
 	.2byte MOVE_CRUNCH, MOVE_EMBER, MOVE_ROAR, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 120
+@ 120
 	.2byte SPECIES_PHANPY
 	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_ROCK_TOMB, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 121
+@ 121
 	.2byte SPECIES_SPOINK
 	.2byte MOVE_PSYWAVE, MOVE_BOUNCE, MOVE_MAGIC_COAT, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 122
+@ 122
 	.2byte SPECIES_ARON
 	.2byte MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_METAL_SOUND, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 123
+@ 123
 	.2byte SPECIES_LUVDISC
 	.2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_DIVE, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 124
+@ 124
 	.2byte SPECIES_TENTACOOL
 	.2byte MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER, MOVE_WRAP
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 125
+@ 125
 	.2byte SPECIES_CACNEA
 	.2byte MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_COTTON_SPORE, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 126
+@ 126
 	.2byte SPECIES_UNOWN
 	.2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 127
+@ 127
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_SLUDGE, MOVE_SMOKESCREEN, MOVE_TORMENT, MOVE_HAZE
 	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 128
+@ 128
 	.2byte SPECIES_STARYU
 	.2byte MOVE_BUBBLE_BEAM, MOVE_MINIMIZE, MOVE_SWIFT, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 129
+@ 129
 	.2byte SPECIES_SKIPLOOM
 	.2byte MOVE_MEGA_DRAIN, MOVE_CONFUSION, MOVE_COTTON_SPORE, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 130
+@ 130
 	.2byte SPECIES_NUZLEAF
 	.2byte MOVE_EXTRASENSORY, MOVE_FAKE_OUT, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 131
+@ 131
 	.2byte SPECIES_LOMBRE
 	.2byte MOVE_WATER_PULSE, MOVE_FAKE_OUT, MOVE_BRICK_BREAK, MOVE_ABSORB
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 132
+@ 132
 	.2byte SPECIES_VIBRAVA
 	.2byte MOVE_DRAGON_BREATH, MOVE_DIG, MOVE_SCREECH, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 133
+@ 133
 	.2byte SPECIES_RHYHORN
 	.2byte MOVE_ROCK_BLAST, MOVE_DIG, MOVE_SCARY_FACE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 134
+@ 134
 	.2byte SPECIES_CLAMPERL
 	.2byte MOVE_DIVE, MOVE_TOXIC, MOVE_IRON_DEFENSE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 135
+@ 135
 	.2byte SPECIES_PIDGEOTTO
 	.2byte MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_FEATHER_DANCE, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 136
+@ 136
 	.2byte SPECIES_GROWLITHE
 	.2byte MOVE_FLAME_WHEEL, MOVE_BITE, MOVE_ROAR, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 137
+@ 137
 	.2byte SPECIES_FARFETCH_D
 	.2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_STICK
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 138
+@ 138
 	.2byte SPECIES_OMANYTE
 	.2byte MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_TICKLE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 139
+@ 139
 	.2byte SPECIES_KABUTO
 	.2byte MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SAND_ATTACK, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 140
+@ 140
 	.2byte SPECIES_LILEEP
 	.2byte MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_INGRAIN, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 141
+@ 141
 	.2byte SPECIES_ANORITH
 	.2byte MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_ANCIENT_POWER, MOVE_WATER_GUN
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 142
+@ 142
 	.2byte SPECIES_AIPOM
 	.2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 143
+@ 143
 	.2byte SPECIES_ELEKID
 	.2byte MOVE_THUNDER_PUNCH, MOVE_QUICK_ATTACK, MOVE_SWIFT, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAIVE
 
-; 144
+@ 144
 	.2byte SPECIES_LOUDRED
 	.2byte MOVE_STOMP, MOVE_HOWL, MOVE_ASTONISH, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 145
+@ 145
 	.2byte SPECIES_SPINDA
 	.2byte MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 146
+@ 146
 	.2byte SPECIES_NIDORINA
 	.2byte MOVE_DOUBLE_KICK, MOVE_BITE, MOVE_AERIAL_ACE, MOVE_FLATTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 147
+@ 147
 	.2byte SPECIES_NIDORINO
 	.2byte MOVE_DOUBLE_KICK, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_FLATTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 148
+@ 148
 	.2byte SPECIES_FLAAFFY
 	.2byte MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_COTTON_SPORE, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MILD
 
-; 149
+@ 149
 	.2byte SPECIES_MAGBY
 	.2byte MOVE_FIRE_PUNCH, MOVE_SMOKESCREEN, MOVE_CONFUSE_RAY, MOVE_SMOG
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 150
+@ 150
 	.2byte SPECIES_NOSEPASS
 	.2byte MOVE_ROCK_SLIDE, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 151
+@ 151
 	.2byte SPECIES_CORSOLA
 	.2byte MOVE_BUBBLE_BEAM, MOVE_MIRROR_COAT, MOVE_ATTRACT, MOVE_ANCIENT_POWER
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 152
+@ 152
 	.2byte SPECIES_MAWILE
 	.2byte MOVE_CRUNCH, MOVE_FAKE_TEARS, MOVE_IRON_DEFENSE, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 153
+@ 153
 	.2byte SPECIES_BUTTERFREE
 	.2byte MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_WHIRLWIND
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 154
+@ 154
 	.2byte SPECIES_BEEDRILL
 	.2byte MOVE_TWINEEDLE, MOVE_PURSUIT, MOVE_ENDEAVOR, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 155
+@ 155
 	.2byte SPECIES_POLIWHIRL
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_SLAP, MOVE_ICY_WIND, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 156
+@ 156
 	.2byte SPECIES_ONIX
 	.2byte MOVE_ROCK_SLIDE, MOVE_BIND, MOVE_DRAGON_BREATH, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 157
+@ 157
 	.2byte SPECIES_BEAUTIFLY
 	.2byte MOVE_SILVER_WIND, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_WHIRLWIND
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 158
+@ 158
 	.2byte SPECIES_DUSTOX
 	.2byte MOVE_SILVER_WIND, MOVE_TOXIC, MOVE_PSYBEAM, MOVE_WHIRLWIND
 	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 159
+@ 159
 	.2byte SPECIES_LEDIAN
 	.2byte MOVE_COMET_PUNCH, MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BASHFUL
 
-; 160
+@ 160
 	.2byte SPECIES_ARIADOS
 	.2byte MOVE_SIGNAL_BEAM, MOVE_SPIDER_WEB, MOVE_NIGHT_SHADE, MOVE_TOXIC
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SERIOUS
 
-; 161
+@ 161
 	.2byte SPECIES_YANMA
 	.2byte MOVE_SIGNAL_BEAM, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_DETECT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RELAXED
 
-; 162
+@ 162
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SECRET_POWER, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_HEAL_BELL
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 163
+@ 163
 	.2byte SPECIES_SABLEYE
 	.2byte MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_KNOCK_OFF, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 164
+@ 164
 	.2byte SPECIES_LICKITUNG
 	.2byte MOVE_SLAM, MOVE_BRICK_BREAK, MOVE_LICK, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 165
+@ 165
 	.2byte SPECIES_WEEPINBELL
 	.2byte MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_WRAP, MOVE_SWEET_SCENT
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 166
+@ 166
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_MAGNITUDE, MOVE_ROCK_THROW, MOVE_DEFENSE_CURL, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 167
+@ 167
 	.2byte SPECIES_GLOOM
 	.2byte MOVE_PETAL_DANCE, MOVE_ACID, MOVE_STUN_SPORE, MOVE_MOONLIGHT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 168
+@ 168
 	.2byte SPECIES_PORYGON
 	.2byte MOVE_PSYBEAM, MOVE_ICY_WIND, MOVE_RECYCLE, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 169
+@ 169
 	.2byte SPECIES_KADABRA
 	.2byte MOVE_CONFUSION, MOVE_ROLE_PLAY, MOVE_FUTURE_SIGHT, MOVE_DISABLE
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 170
+@ 170
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_WHIRLPOOL, MOVE_ROAR, MOVE_DEFENSE_CURL, MOVE_ROLLOUT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 171
+@ 171
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_TOXIC, MOVE_GRASS_WHISTLE, MOVE_COTTON_SPORE
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 172
+@ 172
 	.2byte SPECIES_VOLBEAT
 	.2byte MOVE_SILVER_WIND, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 173
+@ 173
 	.2byte SPECIES_ILLUMISE
 	.2byte MOVE_SILVER_WIND, MOVE_WISH, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 174
+@ 174
 	.2byte SPECIES_IVYSAUR
 	.2byte MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SWEET_SCENT, MOVE_FURY_CUTTER
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 175
+@ 175
 	.2byte SPECIES_CHARMELEON
 	.2byte MOVE_SLASH, MOVE_FIRE_SPIN, MOVE_SWORDS_DANCE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 176
+@ 176
 	.2byte SPECIES_WARTORTLE
 	.2byte MOVE_WATER_PULSE, MOVE_BITE, MOVE_MUD_SLAP, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 177
+@ 177
 	.2byte SPECIES_PARASECT
 	.2byte MOVE_SLASH, MOVE_PSYBEAM, MOVE_STUN_SPORE, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RASH
 
-; 178
+@ 178
 	.2byte SPECIES_MACHOKE
 	.2byte MOVE_LOW_KICK, MOVE_ROCK_TOMB, MOVE_FORESIGHT, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 179
+@ 179
 	.2byte SPECIES_HAUNTER
 	.2byte MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_SPITE, MOVE_GRUDGE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RASH
 
-; 180
+@ 180
 	.2byte SPECIES_BAYLEEF
 	.2byte MOVE_RAZOR_LEAF, MOVE_TOXIC, MOVE_SAFEGUARD, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 181
+@ 181
 	.2byte SPECIES_QUILAVA
 	.2byte MOVE_FLAME_WHEEL, MOVE_FURY_SWIPES, MOVE_SWIFT, MOVE_SMOKESCREEN
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 182
+@ 182
 	.2byte SPECIES_CROCONAW
 	.2byte MOVE_SLASH, MOVE_WATER_PULSE, MOVE_BITE, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 183
+@ 183
 	.2byte SPECIES_TOGETIC
 	.2byte MOVE_AERIAL_ACE, MOVE_MAGICAL_LEAF, MOVE_WISH, MOVE_FOLLOW_ME
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 184
+@ 184
 	.2byte SPECIES_MURKROW
 	.2byte MOVE_FAINT_ATTACK, MOVE_FLY, MOVE_TORMENT, MOVE_TAUNT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 185
+@ 185
 	.2byte SPECIES_WOBBUFFET
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 186
+@ 186
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 187
+@ 187
 	.2byte SPECIES_MINUN
 	.2byte MOVE_SPARK, MOVE_CHARM, MOVE_ENCORE, MOVE_HELPING_HAND
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 188
+@ 188
 	.2byte SPECIES_GROVYLE
 	.2byte MOVE_FURY_CUTTER, MOVE_ENDEAVOR, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 189
+@ 189
 	.2byte SPECIES_COMBUSKEN
 	.2byte MOVE_EMBER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 190
+@ 190
 	.2byte SPECIES_MARSHTOMP
 	.2byte MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ROCK_TOMB, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 191
+@ 191
 	.2byte SPECIES_PONYTA
 	.2byte MOVE_FIRE_SPIN, MOVE_BOUNCE, MOVE_QUICK_ATTACK, MOVE_TAIL_WHIP
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 192
+@ 192
 	.2byte SPECIES_AZUMARILL
 	.2byte MOVE_BUBBLE_BEAM, MOVE_FACADE, MOVE_DIG, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 193
+@ 193
 	.2byte SPECIES_SUDOWOODO
 	.2byte MOVE_ROCK_SLIDE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM, MOVE_BLOCK
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 194
+@ 194
 	.2byte SPECIES_MAGCARGO
 	.2byte MOVE_ROCK_SLIDE, MOVE_EMBER, MOVE_ACID_ARMOR, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 195
+@ 195
 	.2byte SPECIES_PUPITAR
 	.2byte MOVE_DIG, MOVE_BITE, MOVE_SCARY_FACE, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 196
+@ 196
 	.2byte SPECIES_SEALEO
 	.2byte MOVE_ICE_BALL, MOVE_HAIL, MOVE_SNORE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 197
+@ 197
 	.2byte SPECIES_RATICATE
 	.2byte MOVE_ENDEAVOR, MOVE_PURSUIT, MOVE_SCARY_FACE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAIVE
 
-; 198
+@ 198
 	.2byte SPECIES_MASQUERAIN
 	.2byte MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ICY_WIND, MOVE_STUN_SPORE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_RELAXED
 
-; 199
+@ 199
 	.2byte SPECIES_FURRET
 	.2byte MOVE_SLAM, MOVE_PROTECT, MOVE_HELPING_HAND, MOVE_FOLLOW_ME
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_SERIOUS
 
-; 200
+@ 200
 	.2byte SPECIES_DUNSPARCE
 	.2byte MOVE_HEADBUTT, MOVE_GLARE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 201
+@ 201
 	.2byte SPECIES_DRAGONAIR
 	.2byte MOVE_DRAGON_BREATH, MOVE_LEER, MOVE_WRAP, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 202
+@ 202
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_BITE, MOVE_POISON_FANG, MOVE_TAUNT, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_TIMID
 
-; 203
+@ 203
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_SECRET_POWER, MOVE_SAND_ATTACK, MOVE_COVET, MOVE_TICKLE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 204
+@ 204
 	.2byte SPECIES_CASTFORM
 	.2byte MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HASTY
 
-; 205
+@ 205
 	.2byte SPECIES_SHELGON
 	.2byte MOVE_HEADBUTT, MOVE_DRAGON_BREATH, MOVE_PROTECT, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 206
+@ 206
 	.2byte SPECIES_METANG
 	.2byte MOVE_METAL_CLAW, MOVE_CONFUSION, MOVE_PURSUIT, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 207
+@ 207
 	.2byte SPECIES_WIGGLYTUFF
 	.2byte MOVE_SING, MOVE_DISABLE, MOVE_WISH, MOVE_SECRET_POWER
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RELAXED
 
-; 208
+@ 208
 	.2byte SPECIES_SUNFLORA
 	.2byte MOVE_PETAL_DANCE, MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 209
+@ 209
 	.2byte SPECIES_CHIMECHO
 	.2byte MOVE_PSYWAVE, MOVE_TAKE_DOWN, MOVE_HEAL_BELL, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 210
+@ 210
 	.2byte SPECIES_GLIGAR
 	.2byte MOVE_METAL_CLAW, MOVE_DIG, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HASTY
 
-; 211
+@ 211
 	.2byte SPECIES_QWILFISH
 	.2byte MOVE_BUBBLE_BEAM, MOVE_PIN_MISSILE, MOVE_SPIKES, MOVE_MINIMIZE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_IMPISH
 
-; 212
+@ 212
 	.2byte SPECIES_SNEASEL
 	.2byte MOVE_FAINT_ATTACK, MOVE_FAKE_OUT, MOVE_ICY_WIND, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 213
+@ 213
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_STOCKPILE, MOVE_SWALLOW
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 214
+@ 214
 	.2byte SPECIES_SWELLOW
 	.2byte MOVE_FLY, MOVE_ENDEAVOR, MOVE_FACADE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 215
+@ 215
 	.2byte SPECIES_LAIRON
 	.2byte MOVE_METAL_CLAW, MOVE_ROCK_TOMB, MOVE_IRON_DEFENSE, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_METAL_COAT
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 216
+@ 216
 	.2byte SPECIES_TANGELA
 	.2byte MOVE_MEGA_DRAIN, MOVE_SLAM, MOVE_TOXIC, MOVE_BIND
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 217
+@ 217
 	.2byte SPECIES_ARBOK
 	.2byte MOVE_POISON_FANG, MOVE_DIG, MOVE_BITE, MOVE_GLARE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 218
+@ 218
 	.2byte SPECIES_PERSIAN
 	.2byte MOVE_FAKE_OUT, MOVE_SLASH, MOVE_TORMENT, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 219
+@ 219
 	.2byte SPECIES_SEADRA
 	.2byte MOVE_AURORA_BEAM, MOVE_SMOKESCREEN, MOVE_WATER_GUN, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 220
+@ 220
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_SECRET_POWER, MOVE_PSYBEAM, MOVE_MAGIC_COAT, MOVE_SEISMIC_TOSS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAIVE
 
-; 221
+@ 221
 	.2byte SPECIES_VIGOROTH
 	.2byte MOVE_SLASH, MOVE_COUNTER, MOVE_ENCORE, MOVE_UPROAR
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 222
+@ 222
 	.2byte SPECIES_LUNATONE
 	.2byte MOVE_CONFUSION, MOVE_COSMIC_POWER, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 223
+@ 223
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_CONFUSION, MOVE_FIRE_SPIN, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 224
+@ 224
 	.2byte SPECIES_NOCTOWL
 	.2byte MOVE_CONFUSION, MOVE_AERIAL_ACE, MOVE_FAINT_ATTACK, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 225
+@ 225
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_CRUSH_CLAW, MOVE_ROCK_SLIDE, MOVE_SWIFT, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 226
+@ 226
 	.2byte SPECIES_VENOMOTH
 	.2byte MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_SLEEP_POWDER, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 227
+@ 227
 	.2byte SPECIES_CHANSEY
 	.2byte MOVE_METRONOME, MOVE_REFRESH, MOVE_DEFENSE_CURL, MOVE_MINIMIZE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RELAXED
 
-; 228
+@ 228
 	.2byte SPECIES_SEAKING
 	.2byte MOVE_WATER_PULSE, MOVE_PSYBEAM, MOVE_SWIFT, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 229
+@ 229
 	.2byte SPECIES_JUMPLUFF
 	.2byte MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 230
+@ 230
 	.2byte SPECIES_PILOSWINE
 	.2byte MOVE_DIG, MOVE_ANCIENT_POWER, MOVE_HAIL, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 231
+@ 231
 	.2byte SPECIES_GOLBAT
 	.2byte MOVE_AIR_CUTTER, MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 232
+@ 232
 	.2byte SPECIES_PRIMEAPE
 	.2byte MOVE_KARATE_CHOP, MOVE_COUNTER, MOVE_SWAGGER, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 233
+@ 233
 	.2byte SPECIES_HITMONLEE
 	.2byte MOVE_ROLLING_KICK, MOVE_BRICK_BREAK, MOVE_FOCUS_ENERGY, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 234
+@ 234
 	.2byte SPECIES_HITMONCHAN
 	.2byte MOVE_MACH_PUNCH, MOVE_SKY_UPPERCUT, MOVE_DETECT, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 235
+@ 235
 	.2byte SPECIES_GIRAFARIG
 	.2byte MOVE_PSYBEAM, MOVE_STOMP, MOVE_WISH, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 236
+@ 236
 	.2byte SPECIES_HITMONTOP
 	.2byte MOVE_TRIPLE_KICK, MOVE_DIG, MOVE_MACH_PUNCH, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 237
+@ 237
 	.2byte SPECIES_BANETTE
 	.2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SPITE, MOVE_KNOCK_OFF
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 238
+@ 238
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_ENDURE, MOVE_DIG
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MILD
 
-; 239
+@ 239
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_BITE, MOVE_GLARE, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 240
+@ 240
 	.2byte SPECIES_ZANGOOSE
 	.2byte MOVE_SLASH, MOVE_DOUBLE_KICK, MOVE_ROAR, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 241
+@ 241
 	.2byte SPECIES_CAMERUPT
 	.2byte MOVE_MAGNITUDE, MOVE_PROTECT, MOVE_SANDSTORM, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 242
+@ 242
 	.2byte SPECIES_SHARPEDO
 	.2byte MOVE_SLASH, MOVE_BITE, MOVE_WATER_PULSE, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 243
+@ 243
 	.2byte SPECIES_TROPIUS
 	.2byte MOVE_MAGICAL_LEAF, MOVE_WHIRLWIND, MOVE_AERIAL_ACE, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 244
+@ 244
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SHOCK_WAVE, MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_LONELY
 
-; 245
+@ 245
 	.2byte SPECIES_MANTINE
 	.2byte MOVE_BUBBLE_BEAM, MOVE_AERIAL_ACE, MOVE_RAIN_DANCE, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 246
+@ 246
 	.2byte SPECIES_STANTLER
 	.2byte MOVE_EXTRASENSORY, MOVE_CONFUSE_RAY, MOVE_STOMP, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 247
+@ 247
 	.2byte SPECIES_ABSOL
 	.2byte MOVE_BITE, MOVE_RAZOR_WIND, MOVE_FUTURE_SIGHT, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 248
+@ 248
 	.2byte SPECIES_SWALOT
 	.2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_SLUDGE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIRKY
 
-; 249
+@ 249
 	.2byte SPECIES_CRAWDAUNT
 	.2byte MOVE_BUBBLE_BEAM, MOVE_VICE_GRIP, MOVE_KNOCK_OFF, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 250
+@ 250
 	.2byte SPECIES_PIDGEOT
 	.2byte MOVE_AERIAL_ACE, MOVE_FEATHER_DANCE, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 251
+@ 251
 	.2byte SPECIES_GRUMPIG
 	.2byte MOVE_PSYBEAM, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT, MOVE_MAGIC_COAT
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 252
+@ 252
 	.2byte SPECIES_TORKOAL
 	.2byte MOVE_EMBER, MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 253
+@ 253
 	.2byte SPECIES_KINGLER
 	.2byte MOVE_CRABHAMMER, MOVE_METAL_CLAW, MOVE_MUD_SHOT, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 254
+@ 254
 	.2byte SPECIES_CACTURNE
 	.2byte MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_ACID, MOVE_MEGA_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_HASTY
 
-; 255
+@ 255
 	.2byte SPECIES_BELLOSSOM
 	.2byte MOVE_PETAL_DANCE, MOVE_SAFEGUARD, MOVE_SUNNY_DAY, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 256
+@ 256
 	.2byte SPECIES_OCTILLERY
 	.2byte MOVE_OCTAZOOKA, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_ROCK_BLAST
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 257
+@ 257
 	.2byte SPECIES_HUNTAIL
 	.2byte MOVE_WHIRLPOOL, MOVE_SCARY_FACE, MOVE_MUD_SLAP, MOVE_BITE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 258
+@ 258
 	.2byte SPECIES_GOREBYSS
 	.2byte MOVE_WHIRLPOOL, MOVE_AMNESIA, MOVE_ICY_WIND, MOVE_CONFUSION
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 259
+@ 259
 	.2byte SPECIES_RELICANTH
 	.2byte MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_HARDEN, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 260
+@ 260
 	.2byte SPECIES_OMASTAR
 	.2byte MOVE_BUBBLE_BEAM, MOVE_SPIKE_CANNON, MOVE_TICKLE, MOVE_ANCIENT_POWER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 261
+@ 261
 	.2byte SPECIES_KABUTOPS
 	.2byte MOVE_SLASH, MOVE_DIG, MOVE_FURY_CUTTER, MOVE_KNOCK_OFF
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 262
+@ 262
 	.2byte SPECIES_POLIWRATH
 	.2byte MOVE_SUBMISSION, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_BUBBLE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 263
+@ 263
 	.2byte SPECIES_SCYTHER
 	.2byte MOVE_FURY_CUTTER, MOVE_AERIAL_ACE, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 264
+@ 264
 	.2byte SPECIES_PINSIR
 	.2byte MOVE_SUBMISSION, MOVE_FOCUS_ENERGY, MOVE_SWORDS_DANCE, MOVE_REVENGE
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 265
+@ 265
 	.2byte SPECIES_POLITOED
 	.2byte MOVE_DIVE, MOVE_DIG, MOVE_HYPNOSIS, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RELAXED
 
-; 266
+@ 266
 	.2byte SPECIES_CLOYSTER
 	.2byte MOVE_AURORA_BEAM, MOVE_SPIKE_CANNON, MOVE_SUPERSONIC, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 267
+@ 267
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_FAKE_TEARS, MOVE_SING, MOVE_THUNDERBOLT, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 268
+@ 268
 	.2byte SPECIES_SABLEYE
 	.2byte MOVE_SHADOW_BALL, MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 269
+@ 269
 	.2byte SPECIES_LICKITUNG
 	.2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 270
+@ 270
 	.2byte SPECIES_WEEPINBELL
 	.2byte MOVE_SLUDGE_BOMB, MOVE_RAZOR_LEAF, MOVE_SLEEP_POWDER, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIRKY
 
-; 271
+@ 271
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 272
+@ 272
 	.2byte SPECIES_GLOOM
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SLUDGE_BOMB, MOVE_MOONLIGHT
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 273
+@ 273
 	.2byte SPECIES_PORYGON
 	.2byte MOVE_TRI_ATTACK, MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 274
+@ 274
 	.2byte SPECIES_KADABRA
 	.2byte MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_REFLECT, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 275
+@ 275
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_WATER_SPOUT, MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 276
+@ 276
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_GRASS_WHISTLE, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 277
+@ 277
 	.2byte SPECIES_VOLBEAT
 	.2byte MOVE_SIGNAL_BEAM, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_TAIL_GLOW
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 278
+@ 278
 	.2byte SPECIES_ILLUMISE
 	.2byte MOVE_SILVER_WIND, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 279
+@ 279
 	.2byte SPECIES_IVYSAUR
 	.2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_LEECH_SEED
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 280
+@ 280
 	.2byte SPECIES_CHARMELEON
 	.2byte MOVE_FLAMETHROWER, MOVE_SLASH, MOVE_ANCIENT_POWER, MOVE_DRAGON_RAGE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 281
+@ 281
 	.2byte SPECIES_WARTORTLE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAPID_SPIN, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 282
+@ 282
 	.2byte SPECIES_PARASECT
 	.2byte MOVE_SPORE, MOVE_GIGA_DRAIN, MOVE_DIG, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 283
+@ 283
 	.2byte SPECIES_MACHOKE
 	.2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FORESIGHT, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 284
+@ 284
 	.2byte SPECIES_HAUNTER
 	.2byte MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 285
+@ 285
 	.2byte SPECIES_BAYLEEF
 	.2byte MOVE_GIGA_DRAIN, MOVE_BODY_SLAM, MOVE_GRASS_WHISTLE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 286
+@ 286
 	.2byte SPECIES_QUILAVA
 	.2byte MOVE_FLAMETHROWER, MOVE_CRUSH_CLAW, MOVE_BODY_SLAM, MOVE_SMOKESCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 287
+@ 287
 	.2byte SPECIES_CROCONAW
 	.2byte MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_DIG
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 288
+@ 288
 	.2byte SPECIES_TOGETIC
 	.2byte MOVE_RETURN, MOVE_SWEET_KISS, MOVE_AERIAL_ACE, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 289
+@ 289
 	.2byte SPECIES_MURKROW
 	.2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 290
+@ 290
 	.2byte SPECIES_WOBBUFFET
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_ENCORE, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_CAREFUL
 
-; 291
+@ 291
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_SEISMIC_TOSS, MOVE_WISH
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 292
+@ 292
 	.2byte SPECIES_MINUN
 	.2byte MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_CHARM, MOVE_WISH
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 293
+@ 293
 	.2byte SPECIES_GROVYLE
 	.2byte MOVE_GIGA_DRAIN, MOVE_CRUSH_CLAW, MOVE_SCREECH, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 294
+@ 294
 	.2byte SPECIES_COMBUSKEN
 	.2byte MOVE_FLAMETHROWER, MOVE_SKY_UPPERCUT, MOVE_SLASH, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 295
+@ 295
 	.2byte SPECIES_MARSHTOMP
 	.2byte MOVE_MUDDY_WATER, MOVE_EARTHQUAKE, MOVE_MUD_SLAP, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 296
+@ 296
 	.2byte SPECIES_PONYTA
 	.2byte MOVE_FLAMETHROWER, MOVE_BODY_SLAM, MOVE_DOUBLE_KICK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 297
+@ 297
 	.2byte SPECIES_AZUMARILL
 	.2byte MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_IRON_TAIL, MOVE_DIG
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 298
+@ 298
 	.2byte SPECIES_SUDOWOODO
 	.2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_SELF_DESTRUCT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 299
+@ 299
 	.2byte SPECIES_MAGCARGO
 	.2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 300
+@ 300
 	.2byte SPECIES_PUPITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 301
+@ 301
 	.2byte SPECIES_SEALEO
 	.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 302
+@ 302
 	.2byte SPECIES_RATICATE
 	.2byte MOVE_SUPER_FANG, MOVE_HYPER_FANG, MOVE_SHADOW_BALL, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 303
+@ 303
 	.2byte SPECIES_MASQUERAIN
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 304
+@ 304
 	.2byte SPECIES_FURRET
 	.2byte MOVE_TRICK, MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_FOLLOW_ME
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 305
+@ 305
 	.2byte SPECIES_DUNSPARCE
 	.2byte MOVE_ICE_BEAM, MOVE_ROCK_TOMB, MOVE_BITE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 306
+@ 306
 	.2byte SPECIES_DRAGONAIR
 	.2byte MOVE_RETURN, MOVE_REST, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 307
+@ 307
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIRKY
 
-; 308
+@ 308
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_TRICK, MOVE_FRUSTRATION, MOVE_THUNDER_WAVE, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 309
+@ 309
 	.2byte SPECIES_CASTFORM
 	.2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 310
+@ 310
 	.2byte SPECIES_SHELGON
 	.2byte MOVE_FRUSTRATION, MOVE_DRAGON_DANCE, MOVE_CRUNCH, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 311
+@ 311
 	.2byte SPECIES_METANG
 	.2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_BODY_SLAM, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 312
+@ 312
 	.2byte SPECIES_WIGGLYTUFF
 	.2byte MOVE_FAKE_TEARS, MOVE_SING, MOVE_DREAM_EATER, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 313
+@ 313
 	.2byte SPECIES_SUNFLORA
 	.2byte MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_GROWTH, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 314
+@ 314
 	.2byte SPECIES_CHIMECHO
 	.2byte MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEAL_BELL
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 315
+@ 315
 	.2byte SPECIES_GLIGAR
 	.2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_GUILLOTINE, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 316
+@ 316
 	.2byte SPECIES_QWILFISH
 	.2byte MOVE_REVENGE, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 317
+@ 317
 	.2byte SPECIES_SNEASEL
 	.2byte MOVE_CRUSH_CLAW, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 318
+@ 318
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_AERIAL_ACE, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 319
+@ 319
 	.2byte SPECIES_SWELLOW
 	.2byte MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PURSUIT, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 320
+@ 320
 	.2byte SPECIES_LAIRON
 	.2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 321
+@ 321
 	.2byte SPECIES_TANGELA
 	.2byte MOVE_GIGA_DRAIN, MOVE_STUN_SPORE, MOVE_REST, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 322
+@ 322
 	.2byte SPECIES_ARBOK
 	.2byte MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_GLARE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 323
+@ 323
 	.2byte SPECIES_PERSIAN
 	.2byte MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_ROAR, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 324
+@ 324
 	.2byte SPECIES_SEADRA
 	.2byte MOVE_HYDRO_PUMP, MOVE_FRUSTRATION, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 325
+@ 325
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_TRICK, MOVE_BRICK_BREAK, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 326
+@ 326
 	.2byte SPECIES_VIGOROTH
 	.2byte MOVE_CRUSH_CLAW, MOVE_REVERSAL, MOVE_ENDURE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 327
+@ 327
 	.2byte SPECIES_LUNATONE
 	.2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_CALM_MIND
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 328
+@ 328
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COSMIC_POWER, MOVE_OVERHEAT
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 329
+@ 329
 	.2byte SPECIES_NOCTOWL
 	.2byte MOVE_PSYCHIC, MOVE_FAINT_ATTACK, MOVE_AERIAL_ACE, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 330
+@ 330
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUSH_CLAW, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 331
+@ 331
 	.2byte SPECIES_VENOMOTH
 	.2byte MOVE_SIGNAL_BEAM, MOVE_PSYCHIC, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 332
+@ 332
 	.2byte SPECIES_CHANSEY
 	.2byte MOVE_SEISMIC_TOSS, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_SOFT_BOILED
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_RELAXED
 
-; 333
+@ 333
 	.2byte SPECIES_SEAKING
 	.2byte MOVE_HORN_DRILL, MOVE_MEGAHORN, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 334
+@ 334
 	.2byte SPECIES_JUMPLUFF
 	.2byte MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 335
+@ 335
 	.2byte SPECIES_PILOSWINE
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_ADAMANT
 
-; 336
+@ 336
 	.2byte SPECIES_GOLBAT
 	.2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 337
+@ 337
 	.2byte SPECIES_PRIMEAPE
 	.2byte MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_OVERHEAT, MOVE_BULK_UP
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 338
+@ 338
 	.2byte SPECIES_HITMONLEE
 	.2byte MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_FORESIGHT, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 339
+@ 339
 	.2byte SPECIES_HITMONCHAN
 	.2byte MOVE_DYNAMIC_PUNCH, MOVE_MACH_PUNCH, MOVE_DETECT, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 340
+@ 340
 	.2byte SPECIES_GIRAFARIG
 	.2byte MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 341
+@ 341
 	.2byte SPECIES_HITMONTOP
 	.2byte MOVE_DOUBLE_EDGE, MOVE_SEISMIC_TOSS, MOVE_ROCK_SLIDE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 342
+@ 342
 	.2byte SPECIES_BANETTE
 	.2byte MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCREECH, MOVE_WILL_O_WISP
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_ADAMANT
 
-; 343
+@ 343
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_SLASH, MOVE_SHADOW_BALL, MOVE_SWORDS_DANCE, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 344
+@ 344
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 345
+@ 345
 	.2byte SPECIES_ZANGOOSE
 	.2byte MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 346
+@ 346
 	.2byte SPECIES_CAMERUPT
 	.2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_BODY_SLAM, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 347
+@ 347
 	.2byte SPECIES_SHARPEDO
 	.2byte MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 348
+@ 348
 	.2byte SPECIES_TROPIUS
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 349
+@ 349
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 350
+@ 350
 	.2byte SPECIES_MANTINE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 351
+@ 351
 	.2byte SPECIES_STANTLER
 	.2byte MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 352
+@ 352
 	.2byte SPECIES_ABSOL
 	.2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_IRON_TAIL
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 353
+@ 353
 	.2byte SPECIES_SWALOT
 	.2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_BODY_SLAM, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 354
+@ 354
 	.2byte SPECIES_CRAWDAUNT
 	.2byte MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 355
+@ 355
 	.2byte SPECIES_PIDGEOT
 	.2byte MOVE_RETURN, MOVE_AERIAL_ACE, MOVE_STEEL_WING, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 356
+@ 356
 	.2byte SPECIES_GRUMPIG
 	.2byte MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 357
+@ 357
 	.2byte SPECIES_TORKOAL
 	.2byte MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_SMOKESCREEN, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 358
+@ 358
 	.2byte SPECIES_KINGLER
 	.2byte MOVE_GUILLOTINE, MOVE_ROCK_TOMB, MOVE_FLAIL, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 359
+@ 359
 	.2byte SPECIES_CACTURNE
 	.2byte MOVE_MEGA_KICK, MOVE_TEETER_DANCE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_HARDY
 
-; 360
+@ 360
 	.2byte SPECIES_BELLOSSOM
 	.2byte MOVE_SOLAR_BEAM, MOVE_ATTRACT, MOVE_SUNNY_DAY, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 361
+@ 361
 	.2byte SPECIES_OCTILLERY
 	.2byte MOVE_OCTAZOOKA, MOVE_FIRE_BLAST, MOVE_THUNDER_WAVE, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 362
+@ 362
 	.2byte SPECIES_HUNTAIL
 	.2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 363
+@ 363
 	.2byte SPECIES_GOREBYSS
 	.2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_PSYCHIC, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 364
+@ 364
 	.2byte SPECIES_RELICANTH
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 365
+@ 365
 	.2byte SPECIES_OMASTAR
 	.2byte MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 366
+@ 366
 	.2byte SPECIES_KABUTOPS
 	.2byte MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_FLAIL, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 367
+@ 367
 	.2byte SPECIES_POLIWRATH
 	.2byte MOVE_BRICK_BREAK, MOVE_HYPNOSIS, MOVE_REST, MOVE_BELLY_DRUM
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 368
+@ 368
 	.2byte SPECIES_SCYTHER
 	.2byte MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 369
+@ 369
 	.2byte SPECIES_PINSIR
 	.2byte MOVE_GUILLOTINE, MOVE_SWORDS_DANCE, MOVE_FLAIL, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 370
+@ 370
 	.2byte SPECIES_POLITOED
 	.2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_MUD_SLAP, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 371
+@ 371
 	.2byte SPECIES_CLOYSTER
 	.2byte MOVE_DIVE, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 372
+@ 372
 	.2byte SPECIES_DUGTRIO
 	.2byte MOVE_EARTHQUAKE, MOVE_TRI_ATTACK, MOVE_SLASH, MOVE_SAND_TOMB
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 373
+@ 373
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_HI_JUMP_KICK, MOVE_CALM_MIND, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 374
+@ 374
 	.2byte SPECIES_MISDREAVUS
 	.2byte MOVE_PAIN_SPLIT, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 375
+@ 375
 	.2byte SPECIES_FEAROW
 	.2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_FACADE, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 376
+@ 376
 	.2byte SPECIES_GRANBULL
 	.2byte MOVE_MEGA_KICK, MOVE_SMELLING_SALT, MOVE_THUNDER_WAVE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 377
+@ 377
 	.2byte SPECIES_JYNX
 	.2byte MOVE_ICE_BEAM, MOVE_FAKE_OUT, MOVE_LOVELY_KISS, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 378
+@ 378
 	.2byte SPECIES_DUSCLOPS
 	.2byte MOVE_WILL_O_WISP, MOVE_SEISMIC_TOSS, MOVE_PAIN_SPLIT, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 379
+@ 379
 	.2byte SPECIES_DODRIO
 	.2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 380
+@ 380
 	.2byte SPECIES_MR_MIME
 	.2byte MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_FAKE_OUT, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 381
+@ 381
 	.2byte SPECIES_LANTURN
 	.2byte MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 382
+@ 382
 	.2byte SPECIES_BRELOOM
 	.2byte MOVE_SKY_UPPERCUT, MOVE_MACH_PUNCH, MOVE_HEADBUTT, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 383
+@ 383
 	.2byte SPECIES_FORRETRESS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SPIKES
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 384
+@ 384
 	.2byte SPECIES_WHISCASH
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 385
+@ 385
 	.2byte SPECIES_XATU
 	.2byte MOVE_DRILL_PECK, MOVE_NIGHT_SHADE, MOVE_WISH, MOVE_FUTURE_SIGHT
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 386
+@ 386
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_STEEL_WING, MOVE_AIR_CUTTER, MOVE_COUNTER, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 387
+@ 387
 	.2byte SPECIES_MAROWAK
 	.2byte MOVE_BONEMERANG, MOVE_ROCK_SLIDE, MOVE_ICY_WIND, MOVE_HEADBUTT
 	.byte BATTLE_FRONTIER_ITEM_THICK_CLUB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 388
+@ 388
 	.2byte SPECIES_QUAGSIRE
 	.2byte MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 389
+@ 389
 	.2byte SPECIES_CLEFABLE
 	.2byte MOVE_METRONOME, MOVE_DOUBLE_TEAM, MOVE_REFLECT, MOVE_FOLLOW_ME
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BRAVE
 
-; 390
+@ 390
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 391
+@ 391
 	.2byte SPECIES_RAICHU
 	.2byte MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 392
+@ 392
 	.2byte SPECIES_DEWGONG
 	.2byte MOVE_ICE_BEAM, MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 393
+@ 393
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_THUNDERBOLT, MOVE_FLASH, MOVE_QUICK_ATTACK, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 394
+@ 394
 	.2byte SPECIES_VILEPLUME
 	.2byte MOVE_SLUDGE_BOMB, MOVE_PETAL_DANCE, MOVE_MOONLIGHT, MOVE_AROMATHERAPY
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 395
+@ 395
 	.2byte SPECIES_VICTREEBEL
 	.2byte MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_SWEET_SCENT, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 396
+@ 396
 	.2byte SPECIES_ELECTRODE
 	.2byte MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_LIGHT_SCREEN, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 397
+@ 397
 	.2byte SPECIES_EXPLOUD
 	.2byte MOVE_HYPER_VOICE, MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 398
+@ 398
 	.2byte SPECIES_SHIFTRY
 	.2byte MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 399
+@ 399
 	.2byte SPECIES_GLALIE
 	.2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_HAIL, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 400
+@ 400
 	.2byte SPECIES_LUDICOLO
 	.2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 401
+@ 401
 	.2byte SPECIES_HYPNO
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_HYPNOSIS
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 402
+@ 402
 	.2byte SPECIES_GOLEM
 	.2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_COUNTER, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 403
+@ 403
 	.2byte SPECIES_RHYDON
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 404
+@ 404
 	.2byte SPECIES_ALAKAZAM
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 405
+@ 405
 	.2byte SPECIES_WEEZING
 	.2byte MOVE_SLUDGE_BOMB, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_SMOKESCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 406
+@ 406
 	.2byte SPECIES_KANGASKHAN
 	.2byte MOVE_DIZZY_PUNCH, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 407
+@ 407
 	.2byte SPECIES_ELECTABUZZ
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 408
+@ 408
 	.2byte SPECIES_TAUROS
 	.2byte MOVE_EARTHQUAKE, MOVE_THRASH, MOVE_SWAGGER, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 409
+@ 409
 	.2byte SPECIES_SLOWBRO
 	.2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_HEADBUTT, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 410
+@ 410
 	.2byte SPECIES_SLOWKING
 	.2byte MOVE_PSYCHIC, MOVE_BRICK_BREAK, MOVE_AMNESIA, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 411
+@ 411
 	.2byte SPECIES_MILTANK
 	.2byte MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_MILK_DRINK
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 412
+@ 412
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_REFRESH, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 413
+@ 413
 	.2byte SPECIES_NIDOQUEEN
 	.2byte MOVE_SLUDGE_BOMB, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 414
+@ 414
 	.2byte SPECIES_NIDOKING
 	.2byte MOVE_HORN_DRILL, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 415
+@ 415
 	.2byte SPECIES_MAGMAR
 	.2byte MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 416
+@ 416
 	.2byte SPECIES_CRADILY
 	.2byte MOVE_GIGA_DRAIN, MOVE_ROCK_SLIDE, MOVE_BARRIER, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 417
+@ 417
 	.2byte SPECIES_ARMALDO
 	.2byte MOVE_SLASH, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 418
+@ 418
 	.2byte SPECIES_GOLDUCK
 	.2byte MOVE_HYDRO_PUMP, MOVE_DIG, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 419
+@ 419
 	.2byte SPECIES_RAPIDASH
 	.2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIET
 
-; 420
+@ 420
 	.2byte SPECIES_MUK
 	.2byte MOVE_SLUDGE_BOMB, MOVE_BODY_SLAM, MOVE_SCREECH, MOVE_MINIMIZE
 	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 421
+@ 421
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_CONFUSE_RAY, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 422
+@ 422
 	.2byte SPECIES_AMPHAROS
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 423
+@ 423
 	.2byte SPECIES_SCIZOR
 	.2byte MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_COUNTER, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 424
+@ 424
 	.2byte SPECIES_HERACROSS
 	.2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_ROCK_TOMB, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 425
+@ 425
 	.2byte SPECIES_URSARING
 	.2byte MOVE_MEGA_KICK, MOVE_CRUNCH, MOVE_AERIAL_ACE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 426
+@ 426
 	.2byte SPECIES_HOUNDOOM
 	.2byte MOVE_FLAMETHROWER, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_WILL_O_WISP
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 427
+@ 427
 	.2byte SPECIES_DONPHAN
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 428
+@ 428
 	.2byte SPECIES_CLAYDOL
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 429
+@ 429
 	.2byte SPECIES_WAILORD
 	.2byte MOVE_SURF, MOVE_ICY_WIND, MOVE_BODY_SLAM, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 430
+@ 430
 	.2byte SPECIES_NINETALES
 	.2byte MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 431
+@ 431
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 432
+@ 432
 	.2byte SPECIES_SHUCKLE
 	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BRAVE
 
-; 433
+@ 433
 	.2byte SPECIES_STEELIX
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_ROCK_TOMB, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 434
+@ 434
 	.2byte SPECIES_TENTACRUEL
 	.2byte MOVE_SLUDGE_BOMB, MOVE_ICY_WIND, MOVE_BARRIER, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_IMPISH
 
-; 435
+@ 435
 	.2byte SPECIES_AERODACTYL
 	.2byte MOVE_ANCIENT_POWER, MOVE_DRAGON_BREATH, MOVE_AERIAL_ACE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 436
+@ 436
 	.2byte SPECIES_PORYGON2
 	.2byte MOVE_TRI_ATTACK, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 437
+@ 437
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_MAGICAL_LEAF, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 438
+@ 438
 	.2byte SPECIES_EXEGGUTOR
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 439
+@ 439
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 440
+@ 440
 	.2byte SPECIES_FLYGON
 	.2byte MOVE_EARTHQUAKE, MOVE_STEEL_WING, MOVE_FAINT_ATTACK, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 441
+@ 441
 	.2byte SPECIES_VENUSAUR
 	.2byte MOVE_GIGA_DRAIN, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SLEEP_POWDER
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 442
+@ 442
 	.2byte SPECIES_VAPOREON
 	.2byte MOVE_SURF, MOVE_ROAR, MOVE_BITE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 443
+@ 443
 	.2byte SPECIES_JOLTEON
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 444
+@ 444
 	.2byte SPECIES_FLAREON
 	.2byte MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_BITE, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 445
+@ 445
 	.2byte SPECIES_MEGANIUM
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 446
+@ 446
 	.2byte SPECIES_ESPEON
 	.2byte MOVE_PSYCHIC, MOVE_CHARM, MOVE_CALM_MIND, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 447
+@ 447
 	.2byte SPECIES_UMBREON
 	.2byte MOVE_CONFUSE_RAY, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 448
+@ 448
 	.2byte SPECIES_BLASTOISE
 	.2byte MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE, MOVE_SEISMIC_TOSS
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 449
+@ 449
 	.2byte SPECIES_FERALIGATR
 	.2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_AERIAL_ACE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 450
+@ 450
 	.2byte SPECIES_AGGRON
 	.2byte MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 451
+@ 451
 	.2byte SPECIES_BLAZIKEN
 	.2byte MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_DOUBLE_KICK, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 452
+@ 452
 	.2byte SPECIES_WALREIN
 	.2byte MOVE_BLIZZARD, MOVE_HAIL, MOVE_YAWN, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 453
+@ 453
 	.2byte SPECIES_SCEPTILE
 	.2byte MOVE_LEAF_BLADE, MOVE_LEECH_SEED, MOVE_AERIAL_ACE, MOVE_DETECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 454
+@ 454
 	.2byte SPECIES_CHARIZARD
 	.2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_ROAR, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 455
+@ 455
 	.2byte SPECIES_TYPHLOSION
 	.2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SMOKESCREEN, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 456
+@ 456
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_SURF, MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_SING
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 457
+@ 457
 	.2byte SPECIES_CROBAT
 	.2byte MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_ASTONISH, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 458
+@ 458
 	.2byte SPECIES_SWAMPERT
 	.2byte MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REST, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 459
+@ 459
 	.2byte SPECIES_GYARADOS
 	.2byte MOVE_RETURN, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 460
+@ 460
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 461
+@ 461
 	.2byte SPECIES_KINGDRA
 	.2byte MOVE_HYDRO_PUMP, MOVE_DRAGON_BREATH, MOVE_ICY_WIND, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 462
+@ 462
 	.2byte SPECIES_BLISSEY
 	.2byte MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_SING, MOVE_SOFT_BOILED
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 463
+@ 463
 	.2byte SPECIES_MILOTIC
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 464
+@ 464
 	.2byte SPECIES_ARCANINE
 	.2byte MOVE_FLAMETHROWER, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 465
+@ 465
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_HEADBUTT, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 466
+@ 466
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_METEOR_MASH, MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 467
+@ 467
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_YAWN, MOVE_BULK_UP, MOVE_SWAGGER, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 468
+@ 468
 	.2byte SPECIES_DUGTRIO
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_TRI_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 469
+@ 469
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_PSYCHIC, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 470
+@ 470
 	.2byte SPECIES_MAROWAK
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_THICK_CLUB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 471
+@ 471
 	.2byte SPECIES_QUAGSIRE
 	.2byte MOVE_CURSE, MOVE_ATTRACT, MOVE_YAWN, MOVE_ANCIENT_POWER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_SASSY
 
-; 472
+@ 472
 	.2byte SPECIES_MISDREAVUS
 	.2byte MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 473
+@ 473
 	.2byte SPECIES_FEAROW
 	.2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_ATTRACT, MOVE_PURSUIT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 474
+@ 474
 	.2byte SPECIES_GRANBULL
 	.2byte MOVE_OVERHEAT, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_QUIET
 
-; 475
+@ 475
 	.2byte SPECIES_JYNX
 	.2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_LOVELY_KISS, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 476
+@ 476
 	.2byte SPECIES_DUSCLOPS
 	.2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 477
+@ 477
 	.2byte SPECIES_DODRIO
 	.2byte MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_FAINT_ATTACK, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 478
+@ 478
 	.2byte SPECIES_MR_MIME
 	.2byte MOVE_BATON_PASS, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_PSYCHIC
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 479
+@ 479
 	.2byte SPECIES_LANTURN
 	.2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 480
+@ 480
 	.2byte SPECIES_BRELOOM
 	.2byte MOVE_GIGA_DRAIN, MOVE_LEECH_SEED, MOVE_FOCUS_PUNCH, MOVE_SPORE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 481
+@ 481
 	.2byte SPECIES_FORRETRESS
 	.2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_COUNTER, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 482
+@ 482
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_SPIKES, MOVE_ROAR, MOVE_DRILL_PECK, MOVE_TOXIC
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 483
+@ 483
 	.2byte SPECIES_WHISCASH
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_SPARK, MOVE_FUTURE_SIGHT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 484
+@ 484
 	.2byte SPECIES_XATU
 	.2byte MOVE_FLY, MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 485
+@ 485
 	.2byte SPECIES_CLEFABLE
 	.2byte MOVE_METEOR_MASH, MOVE_COSMIC_POWER, MOVE_DOUBLE_TEAM, MOVE_FOLLOW_ME
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 486
+@ 486
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_CROSS_CHOP, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 487
+@ 487
 	.2byte SPECIES_RAICHU
 	.2byte MOVE_THUNDERBOLT, MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 488
+@ 488
 	.2byte SPECIES_DEWGONG
 	.2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_ENCORE, MOVE_DISABLE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 489
+@ 489
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 490
+@ 490
 	.2byte SPECIES_VILEPLUME
 	.2byte MOVE_INGRAIN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 491
+@ 491
 	.2byte SPECIES_VICTREEBEL
 	.2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_SERIOUS
 
-; 492
+@ 492
 	.2byte SPECIES_ELECTRODE
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 493
+@ 493
 	.2byte SPECIES_EXPLOUD
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 494
+@ 494
 	.2byte SPECIES_SHIFTRY
 	.2byte MOVE_LEECH_SEED, MOVE_DIG, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_IMPISH
 
-; 495
+@ 495
 	.2byte SPECIES_GLALIE
 	.2byte MOVE_EXPLOSION, MOVE_ENDURE, MOVE_BODY_SLAM, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 496
+@ 496
 	.2byte SPECIES_LUDICOLO
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 497
+@ 497
 	.2byte SPECIES_HYPNO
 	.2byte MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_DREAM_EATER, MOVE_PSYCHIC
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 498
+@ 498
 	.2byte SPECIES_GOLEM
 	.2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 499
+@ 499
 	.2byte SPECIES_RHYDON
 	.2byte MOVE_EARTHQUAKE, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 500
+@ 500
 	.2byte SPECIES_ALAKAZAM
 	.2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 501
+@ 501
 	.2byte SPECIES_WEEZING
 	.2byte MOVE_MEMENTO, MOVE_SLUDGE_BOMB, MOVE_FACADE, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 502
+@ 502
 	.2byte SPECIES_KANGASKHAN
 	.2byte MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 503
+@ 503
 	.2byte SPECIES_ELECTABUZZ
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 504
+@ 504
 	.2byte SPECIES_TAUROS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 505
+@ 505
 	.2byte SPECIES_SLOWBRO
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_MODEST
 
-; 506
+@ 506
 	.2byte SPECIES_SLOWKING
 	.2byte MOVE_YAWN, MOVE_THUNDER_WAVE, MOVE_SURF, MOVE_PSYCHIC
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 507
+@ 507
 	.2byte SPECIES_MILTANK
 	.2byte MOVE_FOCUS_PUNCH, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 508
+@ 508
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_PERISH_SONG, MOVE_DRAGON_BREATH, MOVE_PURSUIT, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 509
+@ 509
 	.2byte SPECIES_NIDOQUEEN
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 510
+@ 510
 	.2byte SPECIES_NIDOKING
 	.2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 511
+@ 511
 	.2byte SPECIES_MAGMAR
 	.2byte MOVE_FIRE_BLAST, MOVE_SMOKESCREEN, MOVE_THUNDER_PUNCH, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 512
+@ 512
 	.2byte SPECIES_CRADILY
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 513
+@ 513
 	.2byte SPECIES_ARMALDO
 	.2byte MOVE_IRON_TAIL, MOVE_ANCIENT_POWER, MOVE_BRICK_BREAK, MOVE_KNOCK_OFF
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 514
+@ 514
 	.2byte SPECIES_GOLDUCK
 	.2byte MOVE_CROSS_CHOP, MOVE_SURF, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 515
+@ 515
 	.2byte SPECIES_RAPIDASH
 	.2byte MOVE_FIRE_BLAST, MOVE_BOUNCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 516
+@ 516
 	.2byte SPECIES_MUK
 	.2byte MOVE_CURSE, MOVE_REST, MOVE_SLUDGE_BOMB, MOVE_DYNAMIC_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 517
+@ 517
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 518
+@ 518
 	.2byte SPECIES_AMPHAROS
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_FOCUS_PUNCH, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 519
+@ 519
 	.2byte SPECIES_SCIZOR
 	.2byte MOVE_SILVER_WIND, MOVE_STEEL_WING, MOVE_SWORDS_DANCE, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 520
+@ 520
 	.2byte SPECIES_HERACROSS
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_BULK_UP
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 521
+@ 521
 	.2byte SPECIES_URSARING
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 522
+@ 522
 	.2byte SPECIES_HOUNDOOM
 	.2byte MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_ROAR, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 523
+@ 523
 	.2byte SPECIES_DONPHAN
 	.2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 524
+@ 524
 	.2byte SPECIES_CLAYDOL
 	.2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_COSMIC_POWER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 525
+@ 525
 	.2byte SPECIES_WAILORD
 	.2byte MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_CURSE, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 526
+@ 526
 	.2byte SPECIES_NINETALES
 	.2byte MOVE_HEAT_WAVE, MOVE_BODY_SLAM, MOVE_GRUDGE, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 527
+@ 527
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_BULK_UP, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 528
+@ 528
 	.2byte SPECIES_SHUCKLE
 	.2byte MOVE_SANDSTORM, MOVE_DIG, MOVE_FLASH, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_CAREFUL
 
-; 529
+@ 529
 	.2byte SPECIES_STEELIX
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_SANDSTORM, MOVE_BLOCK
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 530
+@ 530
 	.2byte SPECIES_TENTACRUEL
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 531
+@ 531
 	.2byte SPECIES_AERODACTYL
 	.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 532
+@ 532
 	.2byte SPECIES_PORYGON2
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 533
+@ 533
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 534
+@ 534
 	.2byte SPECIES_EXEGGUTOR
 	.2byte MOVE_RETURN, MOVE_CURSE, MOVE_SLEEP_POWDER, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 535
+@ 535
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 536
+@ 536
 	.2byte SPECIES_FLYGON
 	.2byte MOVE_SOLAR_BEAM, MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 537
+@ 537
 	.2byte SPECIES_VENUSAUR
 	.2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 538
+@ 538
 	.2byte SPECIES_VAPOREON
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 539
+@ 539
 	.2byte SPECIES_JOLTEON
 	.2byte MOVE_THUNDERBOLT, MOVE_DIG, MOVE_DOUBLE_KICK, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 540
+@ 540
 	.2byte SPECIES_FLAREON
 	.2byte MOVE_CURSE, MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 541
+@ 541
 	.2byte SPECIES_MEGANIUM
 	.2byte MOVE_LEECH_SEED, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_GRASS_WHISTLE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 542
+@ 542
 	.2byte SPECIES_ESPEON
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_CALM_MIND, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 543
+@ 543
 	.2byte SPECIES_UMBREON
 	.2byte MOVE_CURSE, MOVE_SCREECH, MOVE_DOUBLE_TEAM, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 544
+@ 544
 	.2byte SPECIES_BLASTOISE
 	.2byte MOVE_HYDRO_PUMP, MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 545
+@ 545
 	.2byte SPECIES_FERALIGATR
 	.2byte MOVE_SURF, MOVE_DRAGON_CLAW, MOVE_BRICK_BREAK, MOVE_SCARY_FACE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 546
+@ 546
 	.2byte SPECIES_AGGRON
 	.2byte MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 547
+@ 547
 	.2byte SPECIES_BLAZIKEN
 	.2byte MOVE_BLAZE_KICK, MOVE_MEGA_KICK, MOVE_THUNDER_PUNCH, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 548
+@ 548
 	.2byte SPECIES_WALREIN
 	.2byte MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 549
+@ 549
 	.2byte SPECIES_SCEPTILE
 	.2byte MOVE_LEAF_BLADE, MOVE_THUNDER_PUNCH, MOVE_ATTRACT, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 550
+@ 550
 	.2byte SPECIES_CHARIZARD
 	.2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE, MOVE_SMOKESCREEN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 551
+@ 551
 	.2byte SPECIES_TYPHLOSION
 	.2byte MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 552
+@ 552
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_TIMID
 
-; 553
+@ 553
 	.2byte SPECIES_CROBAT
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 554
+@ 554
 	.2byte SPECIES_SWAMPERT
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 555
+@ 555
 	.2byte SPECIES_GYARADOS
 	.2byte MOVE_HYDRO_PUMP, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_BLIZZARD
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 556
+@ 556
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 557
+@ 557
 	.2byte SPECIES_KINGDRA
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 558
+@ 558
 	.2byte SPECIES_BLISSEY
 	.2byte MOVE_SEISMIC_TOSS, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 559
+@ 559
 	.2byte SPECIES_MILOTIC
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_SAFEGUARD, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 560
+@ 560
 	.2byte SPECIES_ARCANINE
 	.2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_CRUNCH, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 561
+@ 561
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_SWAGGER, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 562
+@ 562
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_PSYCH_UP, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 563
+@ 563
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_YAWN, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_ADAMANT
 
-; 564
+@ 564
 	.2byte SPECIES_DUGTRIO
 	.2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_FISSURE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 565
+@ 565
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_DYNAMIC_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_HARDY
 
-; 566
+@ 566
 	.2byte SPECIES_MISDREAVUS
 	.2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 567
+@ 567
 	.2byte SPECIES_FEAROW
 	.2byte MOVE_DRILL_PECK, MOVE_RETURN, MOVE_STEEL_WING, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 568
+@ 568
 	.2byte SPECIES_GRANBULL
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 569
+@ 569
 	.2byte SPECIES_JYNX
 	.2byte MOVE_DREAM_EATER, MOVE_LOVELY_KISS, MOVE_ATTRACT, MOVE_SUBSTITUTE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 570
+@ 570
 	.2byte SPECIES_DUSCLOPS
 	.2byte MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 571
+@ 571
 	.2byte SPECIES_DODRIO
 	.2byte MOVE_DOUBLE_EDGE, MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 572
+@ 572
 	.2byte SPECIES_MR_MIME
 	.2byte MOVE_TRICK, MOVE_TORMENT, MOVE_PSYCHIC, MOVE_THUNDERBOLT
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 573
+@ 573
 	.2byte SPECIES_LANTURN
 	.2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_CONFUSE_RAY, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 574
+@ 574
 	.2byte SPECIES_BRELOOM
 	.2byte MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SPORE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 575
+@ 575
 	.2byte SPECIES_FORRETRESS
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_ZAP_CANNON
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 576
+@ 576
 	.2byte SPECIES_WHISCASH
 	.2byte MOVE_SLEEP_TALK, MOVE_REST, MOVE_SURF, MOVE_FISSURE
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_HARDY
 
-; 577
+@ 577
 	.2byte SPECIES_XATU
 	.2byte MOVE_DRILL_PECK, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 578
+@ 578
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_TOXIC, MOVE_CURSE, MOVE_REST, MOVE_FLY
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 579
+@ 579
 	.2byte SPECIES_MAROWAK
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_THICK_CLUB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 580
+@ 580
 	.2byte SPECIES_QUAGSIRE
 	.2byte MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 581
+@ 581
 	.2byte SPECIES_CLEFABLE
 	.2byte MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_FLAMETHROWER, MOVE_MAGICAL_LEAF
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 582
+@ 582
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 583
+@ 583
 	.2byte SPECIES_RAICHU
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_IRON_TAIL, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 584
+@ 584
 	.2byte SPECIES_DEWGONG
 	.2byte MOVE_HORN_DRILL, MOVE_SHEER_COLD, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 585
+@ 585
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_THUNDER_WAVE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 586
+@ 586
 	.2byte SPECIES_VILEPLUME
 	.2byte MOVE_ATTRACT, MOVE_STUN_SPORE, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 587
+@ 587
 	.2byte SPECIES_VICTREEBEL
 	.2byte MOVE_STUN_SPORE, MOVE_INGRAIN, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 588
+@ 588
 	.2byte SPECIES_ELECTRODE
 	.2byte MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 589
+@ 589
 	.2byte SPECIES_EXPLOUD
 	.2byte MOVE_OVERHEAT, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_EXTRASENSORY
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 590
+@ 590
 	.2byte SPECIES_SHIFTRY
 	.2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 591
+@ 591
 	.2byte SPECIES_GLALIE
 	.2byte MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 592
+@ 592
 	.2byte SPECIES_LUDICOLO
 	.2byte MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 593
+@ 593
 	.2byte SPECIES_HYPNO
 	.2byte MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_MEGA_KICK, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 594
+@ 594
 	.2byte SPECIES_GOLEM
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 595
+@ 595
 	.2byte SPECIES_RHYDON
 	.2byte MOVE_MEGAHORN, MOVE_CRUSH_CLAW, MOVE_EARTHQUAKE, MOVE_HORN_DRILL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 596
+@ 596
 	.2byte SPECIES_ALAKAZAM
 	.2byte MOVE_TRICK, MOVE_DISABLE, MOVE_PSYCHIC, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 597
+@ 597
 	.2byte SPECIES_WEEZING
 	.2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 598
+@ 598
 	.2byte SPECIES_KANGASKHAN
 	.2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 599
+@ 599
 	.2byte SPECIES_ELECTABUZZ
 	.2byte MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDERBOLT, MOVE_CROSS_CHOP
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 600
+@ 600
 	.2byte SPECIES_TAUROS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 601
+@ 601
 	.2byte SPECIES_SLOWBRO
 	.2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_QUIET
 
-; 602
+@ 602
 	.2byte SPECIES_SLOWKING
 	.2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 603
+@ 603
 	.2byte SPECIES_MILTANK
 	.2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 604
+@ 604
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_SING, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 605
+@ 605
 	.2byte SPECIES_NIDOQUEEN
 	.2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_CRUNCH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 606
+@ 606
 	.2byte SPECIES_NIDOKING
 	.2byte MOVE_HORN_DRILL, MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 607
+@ 607
 	.2byte SPECIES_MAGMAR
 	.2byte MOVE_MEGA_KICK, MOVE_CROSS_CHOP, MOVE_IRON_TAIL, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_IMPISH
 
-; 608
+@ 608
 	.2byte SPECIES_CRADILY
 	.2byte MOVE_SUBSTITUTE, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 609
+@ 609
 	.2byte SPECIES_ARMALDO
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_SWORDS_DANCE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 610
+@ 610
 	.2byte SPECIES_GOLDUCK
 	.2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 611
+@ 611
 	.2byte SPECIES_RAPIDASH
 	.2byte MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_HYPNOSIS
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 612
+@ 612
 	.2byte SPECIES_MUK
 	.2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_QUIET
 
-; 613
+@ 613
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_GIGA_DRAIN, MOVE_SKILL_SWAP
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 614
+@ 614
 	.2byte SPECIES_AMPHAROS
 	.2byte MOVE_THUNDERBOLT, MOVE_MEGA_KICK, MOVE_IRON_TAIL, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 615
+@ 615
 	.2byte SPECIES_SCIZOR
 	.2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY, MOVE_SLASH
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_CAREFUL
 
-; 616
+@ 616
 	.2byte SPECIES_HERACROSS
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 617
+@ 617
 	.2byte SPECIES_URSARING
 	.2byte MOVE_FIRE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_CRUNCH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 618
+@ 618
 	.2byte SPECIES_HOUNDOOM
 	.2byte MOVE_OVERHEAT, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 619
+@ 619
 	.2byte SPECIES_DONPHAN
 	.2byte MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SECRET_POWER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 620
+@ 620
 	.2byte SPECIES_CLAYDOL
 	.2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 621
+@ 621
 	.2byte SPECIES_WAILORD
 	.2byte MOVE_HYDRO_PUMP, MOVE_FISSURE, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 622
+@ 622
 	.2byte SPECIES_NINETALES
 	.2byte MOVE_FIRE_BLAST, MOVE_IRON_TAIL, MOVE_CONFUSE_RAY, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 623
+@ 623
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 624
+@ 624
 	.2byte SPECIES_SHUCKLE
 	.2byte MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_TOXIC, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_CAREFUL
 
-; 625
+@ 625
 	.2byte SPECIES_STEELIX
 	.2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_ROCK_SLIDE, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 626
+@ 626
 	.2byte SPECIES_TENTACRUEL
 	.2byte MOVE_SURF, MOVE_GIGA_DRAIN, MOVE_ICE_BEAM, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 627
+@ 627
 	.2byte SPECIES_AERODACTYL
 	.2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_DRAGON_CLAW
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 628
+@ 628
 	.2byte SPECIES_PORYGON2
 	.2byte MOVE_PSYCHIC, MOVE_TRI_ATTACK, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 629
+@ 629
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH, MOVE_MAGICAL_LEAF
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 630
+@ 630
 	.2byte SPECIES_EXEGGUTOR
 	.2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 631
+@ 631
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 632
+@ 632
 	.2byte SPECIES_FLYGON
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 633
+@ 633
 	.2byte SPECIES_VENUSAUR
 	.2byte MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SLEEP_POWDER
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 634
+@ 634
 	.2byte SPECIES_VAPOREON
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 635
+@ 635
 	.2byte SPECIES_JOLTEON
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_AGILITY, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 636
+@ 636
 	.2byte SPECIES_FLAREON
 	.2byte MOVE_SHADOW_BALL, MOVE_FLAIL, MOVE_ENDURE, MOVE_OVERHEAT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 637
+@ 637
 	.2byte SPECIES_MEGANIUM
 	.2byte MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ENDURE, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 638
+@ 638
 	.2byte SPECIES_ESPEON
 	.2byte MOVE_PSYCHIC, MOVE_BITE, MOVE_WISH, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 639
+@ 639
 	.2byte SPECIES_UMBREON
 	.2byte MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ATTRACT, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 640
+@ 640
 	.2byte SPECIES_BLASTOISE
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 641
+@ 641
 	.2byte SPECIES_FERALIGATR
 	.2byte MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 642
+@ 642
 	.2byte SPECIES_AGGRON
 	.2byte MOVE_SURF, MOVE_THUNDER, MOVE_FIRE_BLAST, MOVE_BLIZZARD
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 643
+@ 643
 	.2byte SPECIES_BLAZIKEN
 	.2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 644
+@ 644
 	.2byte SPECIES_WALREIN
 	.2byte MOVE_SHEER_COLD, MOVE_FISSURE, MOVE_SURF, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 645
+@ 645
 	.2byte SPECIES_SCEPTILE
 	.2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 646
+@ 646
 	.2byte SPECIES_CHARIZARD
 	.2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_BITE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 647
+@ 647
 	.2byte SPECIES_TYPHLOSION
 	.2byte MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_ENDURE, MOVE_REVERSAL
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 648
+@ 648
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 649
+@ 649
 	.2byte SPECIES_CROBAT
 	.2byte MOVE_AIR_CUTTER, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 650
+@ 650
 	.2byte SPECIES_SWAMPERT
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BRAVE
 
-; 651
+@ 651
 	.2byte SPECIES_GYARADOS
 	.2byte MOVE_SURF, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 652
+@ 652
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_ADAMANT
 
-; 653
+@ 653
 	.2byte SPECIES_KINGDRA
 	.2byte MOVE_FLAIL, MOVE_HYDRO_PUMP, MOVE_DRAGON_DANCE, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 654
+@ 654
 	.2byte SPECIES_BLISSEY
 	.2byte MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_CALM_MIND, MOVE_SOFT_BOILED
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 655
+@ 655
 	.2byte SPECIES_MILOTIC
 	.2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ATTRACT, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 656
+@ 656
 	.2byte SPECIES_ARCANINE
 	.2byte MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 657
+@ 657
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 658
+@ 658
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 659
+@ 659
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_ADAMANT
 
-; 660
+@ 660
 	.2byte SPECIES_DUGTRIO
 	.2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FISSURE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 661
+@ 661
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 662
+@ 662
 	.2byte SPECIES_MISDREAVUS
 	.2byte MOVE_DESTINY_BOND, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_TIMID
 
-; 663
+@ 663
 	.2byte SPECIES_FEAROW
 	.2byte MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SKY_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 664
+@ 664
 	.2byte SPECIES_GRANBULL
 	.2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BRAVE
 
-; 665
+@ 665
 	.2byte SPECIES_JYNX
 	.2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_LOVELY_KISS, MOVE_FAKE_TEARS
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 666
+@ 666
 	.2byte SPECIES_DUSCLOPS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 667
+@ 667
 	.2byte SPECIES_DODRIO
 	.2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_DRILL_PECK, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 668
+@ 668
 	.2byte SPECIES_MR_MIME
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 669
+@ 669
 	.2byte SPECIES_LANTURN
 	.2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 670
+@ 670
 	.2byte SPECIES_BRELOOM
 	.2byte MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_SPORE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 671
+@ 671
 	.2byte SPECIES_FORRETRESS
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 672
+@ 672
 	.2byte SPECIES_WHISCASH
 	.2byte MOVE_FISSURE, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 673
+@ 673
 	.2byte SPECIES_XATU
 	.2byte MOVE_PSYCHIC, MOVE_DRILL_PECK, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 674
+@ 674
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_COUNTER, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 675
+@ 675
 	.2byte SPECIES_MAROWAK
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_MEGA_KICK
 	.byte BATTLE_FRONTIER_ITEM_THICK_CLUB
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 676
+@ 676
 	.2byte SPECIES_QUAGSIRE
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_SASSY
 
-; 677
+@ 677
 	.2byte SPECIES_CLEFABLE
 	.2byte MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_SOFT_BOILED
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 678
+@ 678
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 679
+@ 679
 	.2byte SPECIES_RAICHU
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_PROTECT, MOVE_MEGA_KICK
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 680
+@ 680
 	.2byte SPECIES_DEWGONG
 	.2byte MOVE_SHEER_COLD, MOVE_ICE_BEAM, MOVE_SURF, MOVE_SIGNAL_BEAM
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 681
+@ 681
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 682
+@ 682
 	.2byte SPECIES_VILEPLUME
 	.2byte MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 683
+@ 683
 	.2byte SPECIES_VICTREEBEL
 	.2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_SYNTHESIS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 684
+@ 684
 	.2byte SPECIES_ELECTRODE
 	.2byte MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 685
+@ 685
 	.2byte SPECIES_EXPLOUD
 	.2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_OVERHEAT
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 686
+@ 686
 	.2byte SPECIES_SHIFTRY
 	.2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_MEGA_KICK, MOVE_FAKE_OUT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 687
+@ 687
 	.2byte SPECIES_GLALIE
 	.2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 688
+@ 688
 	.2byte SPECIES_LUDICOLO
 	.2byte MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_TOXIC
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 689
+@ 689
 	.2byte SPECIES_HYPNO
 	.2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 690
+@ 690
 	.2byte SPECIES_GOLEM
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 691
+@ 691
 	.2byte SPECIES_RHYDON
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_HORN_DRILL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 692
+@ 692
 	.2byte SPECIES_ALAKAZAM
 	.2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 693
+@ 693
 	.2byte SPECIES_WEEZING
 	.2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FRUSTRATION, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 694
+@ 694
 	.2byte SPECIES_KANGASKHAN
 	.2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 695
+@ 695
 	.2byte SPECIES_ELECTABUZZ
 	.2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_MEGA_KICK, MOVE_CROSS_CHOP
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 696
+@ 696
 	.2byte SPECIES_TAUROS
 	.2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_TOMB, MOVE_THUNDERBOLT, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 697
+@ 697
 	.2byte SPECIES_SLOWBRO
 	.2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_SASSY
 
-; 698
+@ 698
 	.2byte SPECIES_SLOWKING
 	.2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 699
+@ 699
 	.2byte SPECIES_MILTANK
 	.2byte MOVE_DOUBLE_EDGE, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_MILK_DRINK
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 700
+@ 700
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 701
+@ 701
 	.2byte SPECIES_NIDOQUEEN
 	.2byte MOVE_SUPERPOWER, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 702
+@ 702
 	.2byte SPECIES_NIDOKING
 	.2byte MOVE_MEGAHORN, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_THUNDER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 703
+@ 703
 	.2byte SPECIES_MAGMAR
 	.2byte MOVE_FLAMETHROWER, MOVE_PSYCHIC, MOVE_CROSS_CHOP, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 704
+@ 704
 	.2byte SPECIES_CRADILY
 	.2byte MOVE_TOXIC, MOVE_INGRAIN, MOVE_MIRROR_COAT, MOVE_GIGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 705
+@ 705
 	.2byte SPECIES_ARMALDO
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 706
+@ 706
 	.2byte SPECIES_GOLDUCK
 	.2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 707
+@ 707
 	.2byte SPECIES_RAPIDASH
 	.2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_DOUBLE_KICK
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 708
+@ 708
 	.2byte SPECIES_MUK
 	.2byte MOVE_SLUDGE_BOMB, MOVE_BRICK_BREAK, MOVE_GIGA_DRAIN, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BRAVE
 
-; 709
+@ 709
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 710
+@ 710
 	.2byte SPECIES_AMPHAROS
 	.2byte MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_THUNDER_WAVE, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 711
+@ 711
 	.2byte SPECIES_SCIZOR
 	.2byte MOVE_SILVER_WIND, MOVE_SWORDS_DANCE, MOVE_AGILITY, MOVE_BATON_PASS
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 712
+@ 712
 	.2byte SPECIES_HERACROSS
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_REVERSAL, MOVE_ENDURE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 713
+@ 713
 	.2byte SPECIES_URSARING
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 714
+@ 714
 	.2byte SPECIES_HOUNDOOM
 	.2byte MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_CRUNCH, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 715
+@ 715
 	.2byte SPECIES_DONPHAN
 	.2byte MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_IRON_TAIL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 716
+@ 716
 	.2byte SPECIES_CLAYDOL
 	.2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 717
+@ 717
 	.2byte SPECIES_WAILORD
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_FISSURE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 718
+@ 718
 	.2byte SPECIES_NINETALES
 	.2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 719
+@ 719
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 720
+@ 720
 	.2byte SPECIES_SHUCKLE
 	.2byte MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_WRAP, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_CAREFUL
 
-; 721
+@ 721
 	.2byte SPECIES_STEELIX
 	.2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 722
+@ 722
 	.2byte SPECIES_TENTACRUEL
 	.2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 723
+@ 723
 	.2byte SPECIES_AERODACTYL
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_BITE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 724
+@ 724
 	.2byte SPECIES_PORYGON2
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 725
+@ 725
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 726
+@ 726
 	.2byte SPECIES_EXEGGUTOR
 	.2byte MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 727
+@ 727
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 728
+@ 728
 	.2byte SPECIES_FLYGON
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_DOUBLE_EDGE, MOVE_CRUNCH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 729
+@ 729
 	.2byte SPECIES_VENUSAUR
 	.2byte MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 730
+@ 730
 	.2byte SPECIES_VAPOREON
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 731
+@ 731
 	.2byte SPECIES_JOLTEON
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_TIMID
 
-; 732
+@ 732
 	.2byte SPECIES_FLAREON
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 733
+@ 733
 	.2byte SPECIES_MEGANIUM
 	.2byte MOVE_GIGA_DRAIN, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 734
+@ 734
 	.2byte SPECIES_ESPEON
 	.2byte MOVE_PSYCHIC, MOVE_BITE, MOVE_ATTRACT, MOVE_CALM_MIND
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 735
+@ 735
 	.2byte SPECIES_UMBREON
 	.2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 736
+@ 736
 	.2byte SPECIES_BLASTOISE
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 737
+@ 737
 	.2byte SPECIES_FERALIGATR
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 738
+@ 738
 	.2byte SPECIES_AGGRON
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 739
+@ 739
 	.2byte SPECIES_BLAZIKEN
 	.2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_THUNDER_PUNCH, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 740
+@ 740
 	.2byte SPECIES_WALREIN
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 741
+@ 741
 	.2byte SPECIES_SCEPTILE
 	.2byte MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_THUNDER_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 742
+@ 742
 	.2byte SPECIES_CHARIZARD
 	.2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 743
+@ 743
 	.2byte SPECIES_TYPHLOSION
 	.2byte MOVE_OVERHEAT, MOVE_THUNDER_PUNCH, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 744
+@ 744
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_PSYCHIC
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 745
+@ 745
 	.2byte SPECIES_CROBAT
 	.2byte MOVE_SLUDGE_BOMB, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 746
+@ 746
 	.2byte SPECIES_SWAMPERT
 	.2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 747
+@ 747
 	.2byte SPECIES_GYARADOS
 	.2byte MOVE_RETURN, MOVE_EARTHQUAKE, MOVE_DRAGON_DANCE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 748
+@ 748
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 749
+@ 749
 	.2byte SPECIES_KINGDRA
 	.2byte MOVE_DOUBLE_EDGE, MOVE_ICE_BEAM, MOVE_DRAGON_DANCE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 750
+@ 750
 	.2byte SPECIES_BLISSEY
 	.2byte MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_COUNTER, MOVE_SOFT_BOILED
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BOLD
 
-; 751
+@ 751
 	.2byte SPECIES_MILOTIC
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 752
+@ 752
 	.2byte SPECIES_ARCANINE
 	.2byte MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 753
+@ 753
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 754
+@ 754
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 755
+@ 755
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_MODEST
 
-; 756
+@ 756
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_ICE_BEAM, MOVE_WATER_PULSE, MOVE_ICY_WIND, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 757
+@ 757
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 758
+@ 758
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_FLAMETHROWER, MOVE_AERIAL_ACE, MOVE_MUD_SLAP, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 759
+@ 759
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 760
+@ 760
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 761
+@ 761
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_SURF, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 762
+@ 762
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 763
+@ 763
 	.2byte SPECIES_REGICE
 	.2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_AMNESIA, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 764
+@ 764
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_METAL_CLAW, MOVE_CURSE, MOVE_AMNESIA, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 765
+@ 765
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 766
+@ 766
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 767
+@ 767
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_BLIZZARD, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 768
+@ 768
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DRILL_PECK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 769
+@ 769
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_OVERHEAT, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 770
+@ 770
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 771
+@ 771
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 772
+@ 772
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_TOXIC, MOVE_DIVE, MOVE_DOUBLE_TEAM, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 773
+@ 773
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 774
+@ 774
 	.2byte SPECIES_REGICE
 	.2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 775
+@ 775
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 776
+@ 776
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 777
+@ 777
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 778
+@ 778
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_ICE_BEAM, MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 779
+@ 779
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_SUBSTITUTE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 780
+@ 780
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_DOUBLE_TEAM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 781
+@ 781
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 782
+@ 782
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_EDGE, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 783
+@ 783
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 784
+@ 784
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_CURSE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 785
+@ 785
 	.2byte SPECIES_REGICE
 	.2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 786
+@ 786
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_ANCIENT_POWER, MOVE_AMNESIA, MOVE_COUNTER, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 787
+@ 787
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 788
+@ 788
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 789
+@ 789
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 790
+@ 790
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 791
+@ 791
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 792
+@ 792
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDERBOLT, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 793
+@ 793
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 794
+@ 794
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BITE, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 795
+@ 795
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 796
+@ 796
 	.2byte SPECIES_REGICE
 	.2byte MOVE_ICE_BEAM, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 797
+@ 797
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 798
+@ 798
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_MIST_BALL, MOVE_SHADOW_BALL, MOVE_CHARM, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 799
+@ 799
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 800
+@ 800
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 801
+@ 801
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 802
+@ 802
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 803
+@ 803
 	.2byte SPECIES_GENGAR
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 804
+@ 804
 	.2byte SPECIES_URSARING
 	.2byte MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 805
+@ 805
 	.2byte SPECIES_URSARING
 	.2byte MOVE_HYPER_BEAM, MOVE_YAWN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 806
+@ 806
 	.2byte SPECIES_URSARING
 	.2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BULK_UP
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 807
+@ 807
 	.2byte SPECIES_URSARING
 	.2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 808
+@ 808
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 809
+@ 809
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_ROCK_TOMB
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 810
+@ 810
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 811
+@ 811
 	.2byte SPECIES_MACHAMP
 	.2byte MOVE_REVENGE, MOVE_ROCK_SLIDE, MOVE_FACADE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 812
+@ 812
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ENDURE, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 813
+@ 813
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 814
+@ 814
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 815
+@ 815
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_ATTRACT, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 816
+@ 816
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_RECOVER, MOVE_LIGHT_SCREEN
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 817
+@ 817
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 818
+@ 818
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 819
+@ 819
 	.2byte SPECIES_STARMIE
 	.2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_COSMIC_POWER, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 820
+@ 820
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 821
+@ 821
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 822
+@ 822
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_REST, MOVE_SLEEP_TALK
 	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 823
+@ 823
 	.2byte SPECIES_LAPRAS
 	.2byte MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_SING, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 824
+@ 824
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 825
+@ 825
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 826
+@ 826
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 827
+@ 827
 	.2byte SPECIES_SNORLAX
 	.2byte MOVE_RETURN, MOVE_SHADOW_BALL, MOVE_BELLY_DRUM, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 828
+@ 828
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 829
+@ 829
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_HEADBUTT, MOVE_AERIAL_ACE, MOVE_CRUNCH, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 830
+@ 830
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 831
+@ 831
 	.2byte SPECIES_SALAMENCE
 	.2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 832
+@ 832
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 833
+@ 833
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 834
+@ 834
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 835
+@ 835
 	.2byte SPECIES_METAGROSS
 	.2byte MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 836
+@ 836
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_HYPER_BEAM, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 837
+@ 837
 	.2byte SPECIES_REGIROCK
 	.2byte MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, MOVE_EXPLOSION
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 838
+@ 838
 	.2byte SPECIES_REGICE
 	.2byte MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 839
+@ 839
 	.2byte SPECIES_REGICE
 	.2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_SLEEP_TALK, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 840
+@ 840
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 841
+@ 841
 	.2byte SPECIES_REGISTEEL
 	.2byte MOVE_SUPERPOWER, MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 842
+@ 842
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 843
+@ 843
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_MIST_BALL, MOVE_DRAGON_CLAW, MOVE_ATTRACT, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 844
+@ 844
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 845
+@ 845
 	.2byte SPECIES_LATIAS
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 846
+@ 846
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 847
+@ 847
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_LUSTER_PURGE, MOVE_SHADOW_BALL, MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 848
+@ 848
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_DRAGON_DANCE, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 849
+@ 849
 	.2byte SPECIES_LATIOS
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 850
+@ 850
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 851
+@ 851
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 852
+@ 852
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_HYPER_BEAM, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 853
+@ 853
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_HYPER_BEAM, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 854
+@ 854
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_OUTRAGE, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 855
+@ 855
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_FLAMETHROWER
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 856
+@ 856
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 857
+@ 857
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_BRICK_BREAK
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 858
+@ 858
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_THUNDER, MOVE_SURF, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 859
+@ 859
 	.2byte SPECIES_DRAGONITE
 	.2byte MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 860
+@ 860
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_THUNDERBOLT, MOVE_SURF
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 861
+@ 861
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_THUNDERBOLT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 862
+@ 862
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 863
+@ 863
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_CRUNCH, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 864
+@ 864
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 865
+@ 865
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 866
+@ 866
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 867
+@ 867
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 868
+@ 868
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 869
+@ 869
 	.2byte SPECIES_TYRANITAR
 	.2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 870
+@ 870
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_AGILITY, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 871
+@ 871
 	.2byte SPECIES_ARTICUNO
 	.2byte MOVE_ICE_BEAM, MOVE_AERIAL_ACE, MOVE_REFLECT, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 872
+@ 872
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 873
+@ 873
 	.2byte SPECIES_ZAPDOS
 	.2byte MOVE_THUNDER, MOVE_DRILL_PECK, MOVE_RAIN_DANCE, MOVE_DOUBLE_EDGE
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 874
+@ 874
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_SWAGGER, MOVE_FACADE
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_DOCILE
 
-; 875
+@ 875
 	.2byte SPECIES_MOLTRES
 	.2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_DOCILE
 
-; 876
+@ 876
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDERBOLT, MOVE_DOUBLE_EDGE, MOVE_ROAR, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 877
+@ 877
 	.2byte SPECIES_RAIKOU
 	.2byte MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_SUBSTITUTE, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 878
+@ 878
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FIRE_BLAST, MOVE_DOUBLE_EDGE, MOVE_ENDURE, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 879
+@ 879
 	.2byte SPECIES_ENTEI
 	.2byte MOVE_FLAMETHROWER, MOVE_CALM_MIND, MOVE_ROAR, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 880
+@ 880
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 881
+@ 881
 	.2byte SPECIES_SUICUNE
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
diff --git a/data/battle_frontier/battle_frontier_trainer_mons.s b/data/battle_frontier/battle_frontier_trainer_mons.s
index e70b28816..190c8258c 100644
--- a/data/battle_frontier/battle_frontier_trainer_mons.s
+++ b/data/battle_frontier/battle_frontier_trainer_mons.s
@@ -1,6 +1,6 @@
 	.align 1, 0
 
-gBattleFrontierTrainerMons_Brady: ; 85CED2E
+gBattleFrontierTrainerMons_Brady: @ 85CED2E
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -65,7 +65,7 @@ gBattleFrontierTrainerMons_Brady: ; 85CED2E
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Conner: ; 85CEDAC
+gBattleFrontierTrainerMons_Conner: @ 85CEDAC
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -130,7 +130,7 @@ gBattleFrontierTrainerMons_Conner: ; 85CEDAC
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bradley: ; 85CEE2A
+gBattleFrontierTrainerMons_Bradley: @ 85CEE2A
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -195,7 +195,7 @@ gBattleFrontierTrainerMons_Bradley: ; 85CEE2A
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Cybil: ; 85CEEA8
+gBattleFrontierTrainerMons_Cybil: @ 85CEEA8
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -260,7 +260,7 @@ gBattleFrontierTrainerMons_Cybil: ; 85CEEA8
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rodette: ; 85CEF26
+gBattleFrontierTrainerMons_Rodette: @ 85CEF26
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -325,7 +325,7 @@ gBattleFrontierTrainerMons_Rodette: ; 85CEF26
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Peggy: ; 85CEFA4
+gBattleFrontierTrainerMons_Peggy: @ 85CEFA4
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -390,7 +390,7 @@ gBattleFrontierTrainerMons_Peggy: ; 85CEFA4
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Keith: ; 85CF022
+gBattleFrontierTrainerMons_Keith: @ 85CF022
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -437,7 +437,7 @@ gBattleFrontierTrainerMons_Keith: ; 85CF022
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Grayson: ; 85CF07C
+gBattleFrontierTrainerMons_Grayson: @ 85CF07C
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -484,7 +484,7 @@ gBattleFrontierTrainerMons_Grayson: ; 85CF07C
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Glenn: ; 85CF0D6
+gBattleFrontierTrainerMons_Glenn: @ 85CF0D6
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -531,7 +531,7 @@ gBattleFrontierTrainerMons_Glenn: ; 85CF0D6
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Liliana: ; 85CF130
+gBattleFrontierTrainerMons_Liliana: @ 85CF130
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -578,7 +578,7 @@ gBattleFrontierTrainerMons_Liliana: ; 85CF130
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Elise: ; 85CF18A
+gBattleFrontierTrainerMons_Elise: @ 85CF18A
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -625,7 +625,7 @@ gBattleFrontierTrainerMons_Elise: ; 85CF18A
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Zoey: ; 85CF1E4
+gBattleFrontierTrainerMons_Zoey: @ 85CF1E4
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -672,7 +672,7 @@ gBattleFrontierTrainerMons_Zoey: ; 85CF1E4
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Manuel: ; 85CF23E
+gBattleFrontierTrainerMons_Manuel: @ 85CF23E
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -712,7 +712,7 @@ gBattleFrontierTrainerMons_Manuel: ; 85CF23E
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Russ: ; 85CF28A
+gBattleFrontierTrainerMons_Russ: @ 85CF28A
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -752,7 +752,7 @@ gBattleFrontierTrainerMons_Russ: ; 85CF28A
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dustin: ; 85CF2D6
+gBattleFrontierTrainerMons_Dustin: @ 85CF2D6
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -792,7 +792,7 @@ gBattleFrontierTrainerMons_Dustin: ; 85CF2D6
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Tina: ; 85CF322
+gBattleFrontierTrainerMons_Tina: @ 85CF322
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -832,7 +832,7 @@ gBattleFrontierTrainerMons_Tina: ; 85CF322
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gillian: ; 85CF36E
+gBattleFrontierTrainerMons_Gillian: @ 85CF36E
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -872,7 +872,7 @@ gBattleFrontierTrainerMons_Gillian: ; 85CF36E
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Zoe: ; 85CF3BA
+gBattleFrontierTrainerMons_Zoe: @ 85CF3BA
 	.2byte 5
 	.2byte 20
 	.2byte 21
@@ -912,7 +912,7 @@ gBattleFrontierTrainerMons_Zoe: ; 85CF3BA
 	.2byte 160
 	.2byte -1
 
-gBattleFrontierTrainerMons_Chen: ; 85CF406
+gBattleFrontierTrainerMons_Chen: @ 85CF406
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -966,7 +966,7 @@ gBattleFrontierTrainerMons_Chen: ; 85CF406
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Al: ; 85CF46E
+gBattleFrontierTrainerMons_Al: @ 85CF46E
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -1020,7 +1020,7 @@ gBattleFrontierTrainerMons_Al: ; 85CF46E
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Mitch: ; 85CF4D6
+gBattleFrontierTrainerMons_Mitch: @ 85CF4D6
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -1074,7 +1074,7 @@ gBattleFrontierTrainerMons_Mitch: ; 85CF4D6
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Anne: ; 85CF53E
+gBattleFrontierTrainerMons_Anne: @ 85CF53E
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -1128,7 +1128,7 @@ gBattleFrontierTrainerMons_Anne: ; 85CF53E
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alize: ; 85CF5A6
+gBattleFrontierTrainerMons_Alize: @ 85CF5A6
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -1182,7 +1182,7 @@ gBattleFrontierTrainerMons_Alize: ; 85CF5A6
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lauren: ; 85CF60E
+gBattleFrontierTrainerMons_Lauren: @ 85CF60E
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -1236,7 +1236,7 @@ gBattleFrontierTrainerMons_Lauren: ; 85CF60E
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kipp: ; 85CF676
+gBattleFrontierTrainerMons_Kipp: @ 85CF676
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1271,7 +1271,7 @@ gBattleFrontierTrainerMons_Kipp: ; 85CF676
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jason: ; 85CF6B8
+gBattleFrontierTrainerMons_Jason: @ 85CF6B8
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1306,7 +1306,7 @@ gBattleFrontierTrainerMons_Jason: ; 85CF6B8
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_John: ; 85CF6FA
+gBattleFrontierTrainerMons_John: @ 85CF6FA
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1341,7 +1341,7 @@ gBattleFrontierTrainerMons_John: ; 85CF6FA
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ann: ; 85CF73C
+gBattleFrontierTrainerMons_Ann: @ 85CF73C
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1376,7 +1376,7 @@ gBattleFrontierTrainerMons_Ann: ; 85CF73C
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_Eileen: ; 85CF77E
+gBattleFrontierTrainerMons_Eileen: @ 85CF77E
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1411,7 +1411,7 @@ gBattleFrontierTrainerMons_Eileen: ; 85CF77E
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_Carlie: ; 85CF7C0
+gBattleFrontierTrainerMons_Carlie: @ 85CF7C0
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -1446,7 +1446,7 @@ gBattleFrontierTrainerMons_Carlie: ; 85CF7C0
 	.2byte 121
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gordon: ; 85CF802
+gBattleFrontierTrainerMons_Gordon: @ 85CF802
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -1499,7 +1499,7 @@ gBattleFrontierTrainerMons_Gordon: ; 85CF802
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ayden: ; 85CF868
+gBattleFrontierTrainerMons_Ayden: @ 85CF868
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -1552,7 +1552,7 @@ gBattleFrontierTrainerMons_Ayden: ; 85CF868
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marco: ; 85CF8CE
+gBattleFrontierTrainerMons_Marco: @ 85CF8CE
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -1605,7 +1605,7 @@ gBattleFrontierTrainerMons_Marco: ; 85CF8CE
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Cierra: ; 85CF934
+gBattleFrontierTrainerMons_Cierra: @ 85CF934
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -1655,7 +1655,7 @@ gBattleFrontierTrainerMons_Cierra: ; 85CF934
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marcy: ; 85CF994
+gBattleFrontierTrainerMons_Marcy: @ 85CF994
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -1705,7 +1705,7 @@ gBattleFrontierTrainerMons_Marcy: ; 85CF994
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kathy: ; 85CF9F4
+gBattleFrontierTrainerMons_Kathy: @ 85CF9F4
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -1755,7 +1755,7 @@ gBattleFrontierTrainerMons_Kathy: ; 85CF9F4
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Peyton: ; 85CFA54
+gBattleFrontierTrainerMons_Peyton: @ 85CFA54
 	.2byte 84
 	.2byte 85
 	.2byte 87
@@ -1794,7 +1794,7 @@ gBattleFrontierTrainerMons_Peyton: ; 85CFA54
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Julian: ; 85CFA9E
+gBattleFrontierTrainerMons_Julian: @ 85CFA9E
 	.2byte 84
 	.2byte 85
 	.2byte 87
@@ -1833,7 +1833,7 @@ gBattleFrontierTrainerMons_Julian: ; 85CFA9E
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Quinn: ; 85CFAE8
+gBattleFrontierTrainerMons_Quinn: @ 85CFAE8
 	.2byte 84
 	.2byte 85
 	.2byte 87
@@ -1872,7 +1872,7 @@ gBattleFrontierTrainerMons_Quinn: ; 85CFAE8
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Haylee: ; 85CFB32
+gBattleFrontierTrainerMons_Haylee: @ 85CFB32
 	.2byte 1
 	.2byte 5
 	.2byte 6
@@ -1916,7 +1916,7 @@ gBattleFrontierTrainerMons_Haylee: ; 85CFB32
 	.2byte 79
 	.2byte -1
 
-gBattleFrontierTrainerMons_Amanda: ; 85CFB86
+gBattleFrontierTrainerMons_Amanda: @ 85CFB86
 	.2byte 1
 	.2byte 5
 	.2byte 6
@@ -1960,7 +1960,7 @@ gBattleFrontierTrainerMons_Amanda: ; 85CFB86
 	.2byte 79
 	.2byte -1
 
-gBattleFrontierTrainerMons_Stacy: ; 85CFBDA
+gBattleFrontierTrainerMons_Stacy: @ 85CFBDA
 	.2byte 1
 	.2byte 5
 	.2byte 6
@@ -2004,7 +2004,7 @@ gBattleFrontierTrainerMons_Stacy: ; 85CFBDA
 	.2byte 79
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rafael: ; 85CFC2E
+gBattleFrontierTrainerMons_Rafael: @ 85CFC2E
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -2069,7 +2069,7 @@ gBattleFrontierTrainerMons_Rafael: ; 85CFC2E
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Oliver: ; 85CFCAC
+gBattleFrontierTrainerMons_Oliver: @ 85CFCAC
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -2116,7 +2116,7 @@ gBattleFrontierTrainerMons_Oliver: ; 85CFCAC
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Payton: ; 85CFD06
+gBattleFrontierTrainerMons_Payton: @ 85CFD06
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -2170,7 +2170,7 @@ gBattleFrontierTrainerMons_Payton: ; 85CFD06
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Pamela: ; 85CFD6E
+gBattleFrontierTrainerMons_Pamela: @ 85CFD6E
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -2235,7 +2235,7 @@ gBattleFrontierTrainerMons_Pamela: ; 85CFD6E
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Eliza: ; 85CFDEC
+gBattleFrontierTrainerMons_Eliza: @ 85CFDEC
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -2282,7 +2282,7 @@ gBattleFrontierTrainerMons_Eliza: ; 85CFDEC
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marisa: ; 85CFE46
+gBattleFrontierTrainerMons_Marisa: @ 85CFE46
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -2336,7 +2336,7 @@ gBattleFrontierTrainerMons_Marisa: ; 85CFE46
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lewis: ; 85CFEAE
+gBattleFrontierTrainerMons_Lewis: @ 85CFEAE
 	.2byte 2
 	.2byte 3
 	.2byte 4
@@ -2364,7 +2364,7 @@ gBattleFrontierTrainerMons_Lewis: ; 85CFEAE
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Yoshi: ; 85CFEE2
+gBattleFrontierTrainerMons_Yoshi: @ 85CFEE2
 	.2byte 2
 	.2byte 3
 	.2byte 4
@@ -2392,7 +2392,7 @@ gBattleFrontierTrainerMons_Yoshi: ; 85CFEE2
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Destin: ; 85CFF16
+gBattleFrontierTrainerMons_Destin: @ 85CFF16
 	.2byte 2
 	.2byte 3
 	.2byte 4
@@ -2418,7 +2418,7 @@ gBattleFrontierTrainerMons_Destin: ; 85CFF16
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Keon: ; 85CFF46
+gBattleFrontierTrainerMons_Keon: @ 85CFF46
 	.2byte 5
 	.2byte 21
 	.2byte 25
@@ -2469,7 +2469,7 @@ gBattleFrontierTrainerMons_Keon: ; 85CFF46
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Stuart: ; 85CFFA8
+gBattleFrontierTrainerMons_Stuart: @ 85CFFA8
 	.2byte 5
 	.2byte 21
 	.2byte 25
@@ -2520,7 +2520,7 @@ gBattleFrontierTrainerMons_Stuart: ; 85CFFA8
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nestor: ; 85D000A
+gBattleFrontierTrainerMons_Nestor: @ 85D000A
 	.2byte 5
 	.2byte 21
 	.2byte 25
@@ -2571,7 +2571,7 @@ gBattleFrontierTrainerMons_Nestor: ; 85D000A
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Derrick: ; 85D006C
+gBattleFrontierTrainerMons_Derrick: @ 85D006C
 	.2byte 21
 	.2byte 27
 	.2byte 29
@@ -2604,7 +2604,7 @@ gBattleFrontierTrainerMons_Derrick: ; 85D006C
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bryson: ; 85D00AA
+gBattleFrontierTrainerMons_Bryson: @ 85D00AA
 	.2byte 21
 	.2byte 27
 	.2byte 29
@@ -2637,7 +2637,7 @@ gBattleFrontierTrainerMons_Bryson: ; 85D00AA
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Clayton: ; 85D00E8
+gBattleFrontierTrainerMons_Clayton: @ 85D00E8
 	.2byte 21
 	.2byte 27
 	.2byte 29
@@ -2670,7 +2670,7 @@ gBattleFrontierTrainerMons_Clayton: ; 85D00E8
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Trenton: ; 85D0126
+gBattleFrontierTrainerMons_Trenton: @ 85D0126
 	.2byte 6
 	.2byte 7
 	.2byte 55
@@ -2692,7 +2692,7 @@ gBattleFrontierTrainerMons_Trenton: ; 85D0126
 	.2byte 151
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jenson: ; 85D014E
+gBattleFrontierTrainerMons_Jenson: @ 85D014E
 	.2byte 6
 	.2byte 7
 	.2byte 55
@@ -2714,7 +2714,7 @@ gBattleFrontierTrainerMons_Jenson: ; 85D014E
 	.2byte 151
 	.2byte -1
 
-gBattleFrontierTrainerMons_Wesley: ; 85D0176
+gBattleFrontierTrainerMons_Wesley: @ 85D0176
 	.2byte 6
 	.2byte 7
 	.2byte 55
@@ -2736,7 +2736,7 @@ gBattleFrontierTrainerMons_Wesley: ; 85D0176
 	.2byte 151
 	.2byte -1
 
-gBattleFrontierTrainerMons_Anton: ; 85D019E
+gBattleFrontierTrainerMons_Anton: @ 85D019E
 	.2byte 31
 	.2byte 39
 	.2byte 58
@@ -2761,7 +2761,7 @@ gBattleFrontierTrainerMons_Anton: ; 85D019E
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lawson: ; 85D01CC
+gBattleFrontierTrainerMons_Lawson: @ 85D01CC
 	.2byte 31
 	.2byte 39
 	.2byte 58
@@ -2786,7 +2786,7 @@ gBattleFrontierTrainerMons_Lawson: ; 85D01CC
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Sammy: ; 85D01FA
+gBattleFrontierTrainerMons_Sammy: @ 85D01FA
 	.2byte 31
 	.2byte 39
 	.2byte 58
@@ -2811,7 +2811,7 @@ gBattleFrontierTrainerMons_Sammy: ; 85D01FA
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Arnie: ; 85D0228
+gBattleFrontierTrainerMons_Arnie: @ 85D0228
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -2876,7 +2876,7 @@ gBattleFrontierTrainerMons_Arnie: ; 85D0228
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Adrian: ; 85D02A6
+gBattleFrontierTrainerMons_Adrian: @ 85D02A6
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -2923,7 +2923,7 @@ gBattleFrontierTrainerMons_Adrian: ; 85D02A6
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Tristan: ; 85D0300
+gBattleFrontierTrainerMons_Tristan: @ 85D0300
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -2977,7 +2977,7 @@ gBattleFrontierTrainerMons_Tristan: ; 85D0300
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Juliana: ; 85D0368
+gBattleFrontierTrainerMons_Juliana: @ 85D0368
 	.2byte 0
 	.2byte 14
 	.2byte 19
@@ -2996,7 +2996,7 @@ gBattleFrontierTrainerMons_Juliana: ; 85D0368
 	.2byte 193
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rylee: ; 85D038A
+gBattleFrontierTrainerMons_Rylee: @ 85D038A
 	.2byte 0
 	.2byte 14
 	.2byte 19
@@ -3015,7 +3015,7 @@ gBattleFrontierTrainerMons_Rylee: ; 85D038A
 	.2byte 193
 	.2byte -1
 
-gBattleFrontierTrainerMons_Chelsea: ; 85D03AC
+gBattleFrontierTrainerMons_Chelsea: @ 85D03AC
 	.2byte 0
 	.2byte 14
 	.2byte 19
@@ -3034,7 +3034,7 @@ gBattleFrontierTrainerMons_Chelsea: ; 85D03AC
 	.2byte 193
 	.2byte -1
 
-gBattleFrontierTrainerMons_Danela: ; 85D03CE
+gBattleFrontierTrainerMons_Danela: @ 85D03CE
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -3099,7 +3099,7 @@ gBattleFrontierTrainerMons_Danela: ; 85D03CE
 	.2byte 65
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lizbeth: ; 85D044C
+gBattleFrontierTrainerMons_Lizbeth: @ 85D044C
 	.2byte 66
 	.2byte 67
 	.2byte 68
@@ -3146,7 +3146,7 @@ gBattleFrontierTrainerMons_Lizbeth: ; 85D044C
 	.2byte 109
 	.2byte -1
 
-gBattleFrontierTrainerMons_Amelia: ; 85D04A6
+gBattleFrontierTrainerMons_Amelia: @ 85D04A6
 	.2byte 110
 	.2byte 111
 	.2byte 112
@@ -3200,7 +3200,7 @@ gBattleFrontierTrainerMons_Amelia: ; 85D04A6
 	.2byte 161
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jillian: ; 85D050E
+gBattleFrontierTrainerMons_Jillian: @ 85D050E
 	.2byte 0
 	.2byte 5
 	.2byte 18
@@ -3232,7 +3232,7 @@ gBattleFrontierTrainerMons_Jillian: ; 85D050E
 	.2byte 140
 	.2byte -1
 
-gBattleFrontierTrainerMons_Abbie: ; 85D054A
+gBattleFrontierTrainerMons_Abbie: @ 85D054A
 	.2byte 0
 	.2byte 5
 	.2byte 18
@@ -3264,7 +3264,7 @@ gBattleFrontierTrainerMons_Abbie: ; 85D054A
 	.2byte 140
 	.2byte -1
 
-gBattleFrontierTrainerMons_Briana: ; 85D0586
+gBattleFrontierTrainerMons_Briana: @ 85D0586
 	.2byte 0
 	.2byte 5
 	.2byte 18
@@ -3296,7 +3296,7 @@ gBattleFrontierTrainerMons_Briana: ; 85D0586
 	.2byte 140
 	.2byte -1
 
-gBattleFrontierTrainerMons_Antonio: ; 85D05C2
+gBattleFrontierTrainerMons_Antonio: @ 85D05C2
 	.2byte 5
 	.2byte 10
 	.2byte 20
@@ -3330,7 +3330,7 @@ gBattleFrontierTrainerMons_Antonio: ; 85D05C2
 	.2byte 152
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jaden: ; 85D0602
+gBattleFrontierTrainerMons_Jaden: @ 85D0602
 	.2byte 5
 	.2byte 10
 	.2byte 20
@@ -3364,7 +3364,7 @@ gBattleFrontierTrainerMons_Jaden: ; 85D0602
 	.2byte 152
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dakota: ; 85D0642
+gBattleFrontierTrainerMons_Dakota: @ 85D0642
 	.2byte 5
 	.2byte 10
 	.2byte 20
@@ -3398,7 +3398,7 @@ gBattleFrontierTrainerMons_Dakota: ; 85D0642
 	.2byte 152
 	.2byte -1
 
-gBattleFrontierTrainerMons_Brayden: ; 85D0682
+gBattleFrontierTrainerMons_Brayden: @ 85D0682
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -3435,7 +3435,7 @@ gBattleFrontierTrainerMons_Brayden: ; 85D0682
 	.2byte 145
 	.2byte -1
 
-gBattleFrontierTrainerMons_Corson: ; 85D06C8
+gBattleFrontierTrainerMons_Corson: @ 85D06C8
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -3472,7 +3472,7 @@ gBattleFrontierTrainerMons_Corson: ; 85D06C8
 	.2byte 145
 	.2byte -1
 
-gBattleFrontierTrainerMons_Trevin: ; 85D070E
+gBattleFrontierTrainerMons_Trevin: @ 85D070E
 	.2byte 1
 	.2byte 13
 	.2byte 16
@@ -3509,7 +3509,7 @@ gBattleFrontierTrainerMons_Trevin: ; 85D070E
 	.2byte 145
 	.2byte -1
 
-gBattleFrontierTrainerMons_Patrick: ; 85D0754
+gBattleFrontierTrainerMons_Patrick: @ 85D0754
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -3544,7 +3544,7 @@ gBattleFrontierTrainerMons_Patrick: ; 85D0754
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kaden: ; 85D0796
+gBattleFrontierTrainerMons_Kaden: @ 85D0796
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -3579,7 +3579,7 @@ gBattleFrontierTrainerMons_Kaden: ; 85D0796
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Maxwell: ; 85D07D8
+gBattleFrontierTrainerMons_Maxwell: @ 85D07D8
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -3614,7 +3614,7 @@ gBattleFrontierTrainerMons_Maxwell: ; 85D07D8
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Daryl: ; 85D081A
+gBattleFrontierTrainerMons_Daryl: @ 85D081A
 	.2byte 15
 	.2byte 22
 	.2byte 31
@@ -3644,7 +3644,7 @@ gBattleFrontierTrainerMons_Daryl: ; 85D081A
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kenneth: ; 85D0852
+gBattleFrontierTrainerMons_Kenneth: @ 85D0852
 	.2byte 15
 	.2byte 22
 	.2byte 31
@@ -3674,7 +3674,7 @@ gBattleFrontierTrainerMons_Kenneth: ; 85D0852
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rich: ; 85D088A
+gBattleFrontierTrainerMons_Rich: @ 85D088A
 	.2byte 15
 	.2byte 22
 	.2byte 31
@@ -3704,7 +3704,7 @@ gBattleFrontierTrainerMons_Rich: ; 85D088A
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Caden: ; 85D08C2
+gBattleFrontierTrainerMons_Caden: @ 85D08C2
 	.2byte 30
 	.2byte 62
 	.2byte 63
@@ -3728,7 +3728,7 @@ gBattleFrontierTrainerMons_Caden: ; 85D08C2
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marlon: ; 85D08EE
+gBattleFrontierTrainerMons_Marlon: @ 85D08EE
 	.2byte 30
 	.2byte 62
 	.2byte 63
@@ -3752,7 +3752,7 @@ gBattleFrontierTrainerMons_Marlon: ; 85D08EE
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nash: ; 85D091A
+gBattleFrontierTrainerMons_Nash: @ 85D091A
 	.2byte 30
 	.2byte 62
 	.2byte 63
@@ -3776,7 +3776,7 @@ gBattleFrontierTrainerMons_Nash: ; 85D091A
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Robby: ; 85D0946
+gBattleFrontierTrainerMons_Robby: @ 85D0946
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -3823,7 +3823,7 @@ gBattleFrontierTrainerMons_Robby: ; 85D0946
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Reece: ; 85D09A0
+gBattleFrontierTrainerMons_Reece: @ 85D09A0
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -3870,7 +3870,7 @@ gBattleFrontierTrainerMons_Reece: ; 85D09A0
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kathryn: ; 85D09FA
+gBattleFrontierTrainerMons_Kathryn: @ 85D09FA
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -3917,7 +3917,7 @@ gBattleFrontierTrainerMons_Kathryn: ; 85D09FA
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ellen: ; 85D0A54
+gBattleFrontierTrainerMons_Ellen: @ 85D0A54
 	.2byte 1
 	.2byte 13
 	.2byte 15
@@ -3964,7 +3964,7 @@ gBattleFrontierTrainerMons_Ellen: ; 85D0A54
 	.2byte 156
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ramon: ; 85D0AAE
+gBattleFrontierTrainerMons_Ramon: @ 85D0AAE
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -3999,7 +3999,7 @@ gBattleFrontierTrainerMons_Ramon: ; 85D0AAE
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Arthur: ; 85D0AF0
+gBattleFrontierTrainerMons_Arthur: @ 85D0AF0
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -4034,7 +4034,7 @@ gBattleFrontierTrainerMons_Arthur: ; 85D0AF0
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alondra: ; 85D0B32
+gBattleFrontierTrainerMons_Alondra: @ 85D0B32
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -4069,7 +4069,7 @@ gBattleFrontierTrainerMons_Alondra: ; 85D0B32
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Adriana: ; 85D0B74
+gBattleFrontierTrainerMons_Adriana: @ 85D0B74
 	.2byte 15
 	.2byte 22
 	.2byte 50
@@ -4104,7 +4104,7 @@ gBattleFrontierTrainerMons_Adriana: ; 85D0B74
 	.2byte 155
 	.2byte -1
 
-gBattleFrontierTrainerMons_Malik: ; 85D0BB6
+gBattleFrontierTrainerMons_Malik: @ 85D0BB6
 	.2byte 10
 	.2byte 15
 	.2byte 22
@@ -4136,7 +4136,7 @@ gBattleFrontierTrainerMons_Malik: ; 85D0BB6
 	.2byte 152
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jill: ; 85D0BF2
+gBattleFrontierTrainerMons_Jill: @ 85D0BF2
 	.2byte 10
 	.2byte 15
 	.2byte 22
@@ -4168,7 +4168,7 @@ gBattleFrontierTrainerMons_Jill: ; 85D0BF2
 	.2byte 152
 	.2byte -1
 
-gBattleFrontierTrainerMons_Erik: ; 85D0C2E
+gBattleFrontierTrainerMons_Erik: @ 85D0C2E
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4205,7 +4205,7 @@ gBattleFrontierTrainerMons_Erik: ; 85D0C2E
 	.2byte 263
 	.2byte -1
 
-gBattleFrontierTrainerMons_Yazmin: ; 85D0C74
+gBattleFrontierTrainerMons_Yazmin: @ 85D0C74
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4242,7 +4242,7 @@ gBattleFrontierTrainerMons_Yazmin: ; 85D0C74
 	.2byte 263
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jamal: ; 85D0CBA
+gBattleFrontierTrainerMons_Jamal: @ 85D0CBA
 	.2byte 170
 	.2byte 176
 	.2byte 178
@@ -4276,7 +4276,7 @@ gBattleFrontierTrainerMons_Jamal: ; 85D0CBA
 	.2byte 266
 	.2byte -1
 
-gBattleFrontierTrainerMons_Leslie: ; 85D0CFA
+gBattleFrontierTrainerMons_Leslie: @ 85D0CFA
 	.2byte 170
 	.2byte 176
 	.2byte 178
@@ -4310,7 +4310,7 @@ gBattleFrontierTrainerMons_Leslie: ; 85D0CFA
 	.2byte 266
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dave: ; 85D0D3A
+gBattleFrontierTrainerMons_Dave: @ 85D0D3A
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4344,7 +4344,7 @@ gBattleFrontierTrainerMons_Dave: ; 85D0D3A
 	.2byte 250
 	.2byte -1
 
-gBattleFrontierTrainerMons_Carlo: ; 85D0D7A
+gBattleFrontierTrainerMons_Carlo: @ 85D0D7A
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4378,7 +4378,7 @@ gBattleFrontierTrainerMons_Carlo: ; 85D0D7A
 	.2byte 250
 	.2byte -1
 
-gBattleFrontierTrainerMons_Emilia: ; 85D0DBA
+gBattleFrontierTrainerMons_Emilia: @ 85D0DBA
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4412,7 +4412,7 @@ gBattleFrontierTrainerMons_Emilia: ; 85D0DBA
 	.2byte 250
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dalia: ; 85D0DFA
+gBattleFrontierTrainerMons_Dalia: @ 85D0DFA
 	.2byte 162
 	.2byte 164
 	.2byte 168
@@ -4446,7 +4446,7 @@ gBattleFrontierTrainerMons_Dalia: ; 85D0DFA
 	.2byte 250
 	.2byte -1
 
-gBattleFrontierTrainerMons_Hitomi: ; 85D0E3A
+gBattleFrontierTrainerMons_Hitomi: @ 85D0E3A
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4489,7 +4489,7 @@ gBattleFrontierTrainerMons_Hitomi: ; 85D0E3A
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ricardo: ; 85D0E8C
+gBattleFrontierTrainerMons_Ricardo: @ 85D0E8C
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4532,7 +4532,7 @@ gBattleFrontierTrainerMons_Ricardo: ; 85D0E8C
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Shizuka: ; 85D0EDE
+gBattleFrontierTrainerMons_Shizuka: @ 85D0EDE
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4575,7 +4575,7 @@ gBattleFrontierTrainerMons_Shizuka: ; 85D0EDE
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Joana: ; 85D0F30
+gBattleFrontierTrainerMons_Joana: @ 85D0F30
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4618,7 +4618,7 @@ gBattleFrontierTrainerMons_Joana: ; 85D0F30
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kelly: ; 85D0F82
+gBattleFrontierTrainerMons_Kelly: @ 85D0F82
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4661,7 +4661,7 @@ gBattleFrontierTrainerMons_Kelly: ; 85D0F82
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rayna: ; 85D0FD4
+gBattleFrontierTrainerMons_Rayna: @ 85D0FD4
 	.2byte 164
 	.2byte 166
 	.2byte 175
@@ -4704,7 +4704,7 @@ gBattleFrontierTrainerMons_Rayna: ; 85D0FD4
 	.2byte 262
 	.2byte -1
 
-gBattleFrontierTrainerMons_Evan: ; 85D1026
+gBattleFrontierTrainerMons_Evan: @ 85D1026
 	.2byte 162
 	.2byte 163
 	.2byte 164
@@ -4745,7 +4745,7 @@ gBattleFrontierTrainerMons_Evan: ; 85D1026
 	.2byte 199
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jordan: ; 85D1074
+gBattleFrontierTrainerMons_Jordan: @ 85D1074
 	.2byte 200
 	.2byte 201
 	.2byte 202
@@ -4785,7 +4785,7 @@ gBattleFrontierTrainerMons_Jordan: ; 85D1074
 	.2byte 236
 	.2byte -1
 
-gBattleFrontierTrainerMons_Joel: ; 85D10C0
+gBattleFrontierTrainerMons_Joel: @ 85D10C0
 	.2byte 237
 	.2byte 238
 	.2byte 239
@@ -4818,7 +4818,7 @@ gBattleFrontierTrainerMons_Joel: ; 85D10C0
 	.2byte 266
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kristen: ; 85D10FE
+gBattleFrontierTrainerMons_Kristen: @ 85D10FE
 	.2byte 162
 	.2byte 163
 	.2byte 164
@@ -4859,7 +4859,7 @@ gBattleFrontierTrainerMons_Kristen: ; 85D10FE
 	.2byte 199
 	.2byte -1
 
-gBattleFrontierTrainerMons_Selphy: ; 85D114C
+gBattleFrontierTrainerMons_Selphy: @ 85D114C
 	.2byte 200
 	.2byte 201
 	.2byte 202
@@ -4899,7 +4899,7 @@ gBattleFrontierTrainerMons_Selphy: ; 85D114C
 	.2byte 236
 	.2byte -1
 
-gBattleFrontierTrainerMons_Chloe: ; 85D1198
+gBattleFrontierTrainerMons_Chloe: @ 85D1198
 	.2byte 237
 	.2byte 238
 	.2byte 239
@@ -4932,7 +4932,7 @@ gBattleFrontierTrainerMons_Chloe: ; 85D1198
 	.2byte 266
 	.2byte -1
 
-gBattleFrontierTrainerMons_Norton: ; 85D11D6
+gBattleFrontierTrainerMons_Norton: @ 85D11D6
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -4968,7 +4968,7 @@ gBattleFrontierTrainerMons_Norton: ; 85D11D6
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lukas: ; 85D121A
+gBattleFrontierTrainerMons_Lukas: @ 85D121A
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -5004,7 +5004,7 @@ gBattleFrontierTrainerMons_Lukas: ; 85D121A
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Zach: ; 85D125E
+gBattleFrontierTrainerMons_Zach: @ 85D125E
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -5040,7 +5040,7 @@ gBattleFrontierTrainerMons_Zach: ; 85D125E
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kaitlyn: ; 85D12A2
+gBattleFrontierTrainerMons_Kaitlyn: @ 85D12A2
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -5076,7 +5076,7 @@ gBattleFrontierTrainerMons_Kaitlyn: ; 85D12A2
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Breanna: ; 85D12E6
+gBattleFrontierTrainerMons_Breanna: @ 85D12E6
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -5112,7 +5112,7 @@ gBattleFrontierTrainerMons_Breanna: ; 85D12E6
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kendra: ; 85D132A
+gBattleFrontierTrainerMons_Kendra: @ 85D132A
 	.2byte 267
 	.2byte 268
 	.2byte 273
@@ -5148,7 +5148,7 @@ gBattleFrontierTrainerMons_Kendra: ; 85D132A
 	.2byte 370
 	.2byte -1
 
-gBattleFrontierTrainerMons_Molly: ; 85D136E
+gBattleFrontierTrainerMons_Molly: @ 85D136E
 	.2byte 268
 	.2byte 270
 	.2byte 272
@@ -5178,7 +5178,7 @@ gBattleFrontierTrainerMons_Molly: ; 85D136E
 	.2byte 359
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jazmin: ; 85D13A6
+gBattleFrontierTrainerMons_Jazmin: @ 85D13A6
 	.2byte 268
 	.2byte 270
 	.2byte 272
@@ -5208,7 +5208,7 @@ gBattleFrontierTrainerMons_Jazmin: ; 85D13A6
 	.2byte 359
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kelsey: ; 85D13DE
+gBattleFrontierTrainerMons_Kelsey: @ 85D13DE
 	.2byte 268
 	.2byte 270
 	.2byte 272
@@ -5238,7 +5238,7 @@ gBattleFrontierTrainerMons_Kelsey: ; 85D13DE
 	.2byte 359
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jalen: ; 85D1416
+gBattleFrontierTrainerMons_Jalen: @ 85D1416
 	.2byte 269
 	.2byte 271
 	.2byte 275
@@ -5272,7 +5272,7 @@ gBattleFrontierTrainerMons_Jalen: ; 85D1416
 	.2byte 357
 	.2byte -1
 
-gBattleFrontierTrainerMons_Griffen: ; 85D1456
+gBattleFrontierTrainerMons_Griffen: @ 85D1456
 	.2byte 269
 	.2byte 271
 	.2byte 275
@@ -5306,7 +5306,7 @@ gBattleFrontierTrainerMons_Griffen: ; 85D1456
 	.2byte 357
 	.2byte -1
 
-gBattleFrontierTrainerMons_Xander: ; 85D1496
+gBattleFrontierTrainerMons_Xander: @ 85D1496
 	.2byte 269
 	.2byte 271
 	.2byte 275
@@ -5340,7 +5340,7 @@ gBattleFrontierTrainerMons_Xander: ; 85D1496
 	.2byte 357
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marvin: ; 85D14D6
+gBattleFrontierTrainerMons_Marvin: @ 85D14D6
 	.2byte 267
 	.2byte 268
 	.2byte 269
@@ -5381,7 +5381,7 @@ gBattleFrontierTrainerMons_Marvin: ; 85D14D6
 	.2byte 304
 	.2byte -1
 
-gBattleFrontierTrainerMons_Brennan: ; 85D1524
+gBattleFrontierTrainerMons_Brennan: @ 85D1524
 	.2byte 305
 	.2byte 306
 	.2byte 307
@@ -5421,7 +5421,7 @@ gBattleFrontierTrainerMons_Brennan: ; 85D1524
 	.2byte 341
 	.2byte -1
 
-gBattleFrontierTrainerMons_Baley: ; 85D1570
+gBattleFrontierTrainerMons_Baley: @ 85D1570
 	.2byte 159
 	.2byte 160
 	.2byte 161
@@ -5443,7 +5443,7 @@ gBattleFrontierTrainerMons_Baley: ; 85D1570
 	.2byte 369
 	.2byte -1
 
-gBattleFrontierTrainerMons_Zackary: ; 85D1598
+gBattleFrontierTrainerMons_Zackary: @ 85D1598
 	.2byte 271
 	.2byte 283
 	.2byte 294
@@ -5468,7 +5468,7 @@ gBattleFrontierTrainerMons_Zackary: ; 85D1598
 	.2byte 366
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gabriel: ; 85D15C6
+gBattleFrontierTrainerMons_Gabriel: @ 85D15C6
 	.2byte 342
 	.2byte 343
 	.2byte 344
@@ -5501,7 +5501,7 @@ gBattleFrontierTrainerMons_Gabriel: ; 85D15C6
 	.2byte 371
 	.2byte -1
 
-gBattleFrontierTrainerMons_Emily: ; 85D1604
+gBattleFrontierTrainerMons_Emily: @ 85D1604
 	.2byte 272
 	.2byte 301
 	.2byte 309
@@ -5516,7 +5516,7 @@ gBattleFrontierTrainerMons_Emily: ; 85D1604
 	.2byte 365
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jordyn: ; 85D161E
+gBattleFrontierTrainerMons_Jordyn: @ 85D161E
 	.2byte 267
 	.2byte 269
 	.2byte 270
@@ -5550,7 +5550,7 @@ gBattleFrontierTrainerMons_Jordyn: ; 85D161E
 	.2byte 355
 	.2byte -1
 
-gBattleFrontierTrainerMons_Sofia: ; 85D165E
+gBattleFrontierTrainerMons_Sofia: @ 85D165E
 	.2byte 270
 	.2byte 272
 	.2byte 274
@@ -5571,7 +5571,7 @@ gBattleFrontierTrainerMons_Sofia: ; 85D165E
 	.2byte 360
 	.2byte -1
 
-gBattleFrontierTrainerMons_Braden: ; 85D1684
+gBattleFrontierTrainerMons_Braden: @ 85D1684
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -5607,7 +5607,7 @@ gBattleFrontierTrainerMons_Braden: ; 85D1684
 	.2byte 404
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kayden: ; 85D16C8
+gBattleFrontierTrainerMons_Kayden: @ 85D16C8
 	.2byte 405
 	.2byte 406
 	.2byte 407
@@ -5643,7 +5643,7 @@ gBattleFrontierTrainerMons_Kayden: ; 85D16C8
 	.2byte 437
 	.2byte -1
 
-gBattleFrontierTrainerMons_Cooper: ; 85D170C
+gBattleFrontierTrainerMons_Cooper: @ 85D170C
 	.2byte 438
 	.2byte 439
 	.2byte 440
@@ -5676,7 +5676,7 @@ gBattleFrontierTrainerMons_Cooper: ; 85D170C
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Julia: ; 85D174A
+gBattleFrontierTrainerMons_Julia: @ 85D174A
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -5712,7 +5712,7 @@ gBattleFrontierTrainerMons_Julia: ; 85D174A
 	.2byte 404
 	.2byte -1
 
-gBattleFrontierTrainerMons_Amara: ; 85D178E
+gBattleFrontierTrainerMons_Amara: @ 85D178E
 	.2byte 405
 	.2byte 406
 	.2byte 407
@@ -5748,7 +5748,7 @@ gBattleFrontierTrainerMons_Amara: ; 85D178E
 	.2byte 437
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lynn: ; 85D17D2
+gBattleFrontierTrainerMons_Lynn: @ 85D17D2
 	.2byte 438
 	.2byte 439
 	.2byte 440
@@ -5781,7 +5781,7 @@ gBattleFrontierTrainerMons_Lynn: ; 85D17D2
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jovan: ; 85D1810
+gBattleFrontierTrainerMons_Jovan: @ 85D1810
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5817,7 +5817,7 @@ gBattleFrontierTrainerMons_Jovan: ; 85D1810
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dominic: ; 85D1854
+gBattleFrontierTrainerMons_Dominic: @ 85D1854
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5853,7 +5853,7 @@ gBattleFrontierTrainerMons_Dominic: ; 85D1854
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nikolas: ; 85D1898
+gBattleFrontierTrainerMons_Nikolas: @ 85D1898
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5889,7 +5889,7 @@ gBattleFrontierTrainerMons_Nikolas: ; 85D1898
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Valeria: ; 85D18DC
+gBattleFrontierTrainerMons_Valeria: @ 85D18DC
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5925,7 +5925,7 @@ gBattleFrontierTrainerMons_Valeria: ; 85D18DC
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Delaney: ; 85D1920
+gBattleFrontierTrainerMons_Delaney: @ 85D1920
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5961,7 +5961,7 @@ gBattleFrontierTrainerMons_Delaney: ; 85D1920
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Meghan: ; 85D1964
+gBattleFrontierTrainerMons_Meghan: @ 85D1964
 	.2byte 238
 	.2byte 331
 	.2byte 343
@@ -5997,7 +5997,7 @@ gBattleFrontierTrainerMons_Meghan: ; 85D1964
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Roberto: ; 85D19A8
+gBattleFrontierTrainerMons_Roberto: @ 85D19A8
 	.2byte 386
 	.2byte 403
 	.2byte 412
@@ -6017,7 +6017,7 @@ gBattleFrontierTrainerMons_Roberto: ; 85D19A8
 	.2byte 465
 	.2byte -1
 
-gBattleFrontierTrainerMons_Damian: ; 85D19CC
+gBattleFrontierTrainerMons_Damian: @ 85D19CC
 	.2byte 386
 	.2byte 403
 	.2byte 412
@@ -6037,7 +6037,7 @@ gBattleFrontierTrainerMons_Damian: ; 85D19CC
 	.2byte 465
 	.2byte -1
 
-gBattleFrontierTrainerMons_Brody: ; 85D19F0
+gBattleFrontierTrainerMons_Brody: @ 85D19F0
 	.2byte 386
 	.2byte 403
 	.2byte 412
@@ -6057,7 +6057,7 @@ gBattleFrontierTrainerMons_Brody: ; 85D19F0
 	.2byte 465
 	.2byte -1
 
-gBattleFrontierTrainerMons_Graham: ; 85D1A14
+gBattleFrontierTrainerMons_Graham: @ 85D1A14
 	.2byte 386
 	.2byte 403
 	.2byte 412
@@ -6077,7 +6077,7 @@ gBattleFrontierTrainerMons_Graham: ; 85D1A14
 	.2byte 465
 	.2byte -1
 
-gBattleFrontierTrainerMons_Tylor: ; 85D1A38
+gBattleFrontierTrainerMons_Tylor: @ 85D1A38
 	.2byte 374
 	.2byte 381
 	.2byte 382
@@ -6102,7 +6102,7 @@ gBattleFrontierTrainerMons_Tylor: ; 85D1A38
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jaren: ; 85D1A66
+gBattleFrontierTrainerMons_Jaren: @ 85D1A66
 	.2byte 374
 	.2byte 381
 	.2byte 382
@@ -6127,7 +6127,7 @@ gBattleFrontierTrainerMons_Jaren: ; 85D1A66
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Cordell: ; 85D1A94
+gBattleFrontierTrainerMons_Cordell: @ 85D1A94
 	.2byte 420
 	.2byte 421
 	.2byte 422
@@ -6178,7 +6178,7 @@ gBattleFrontierTrainerMons_Cordell: ; 85D1A94
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jazlyn: ; 85D1AF6
+gBattleFrontierTrainerMons_Jazlyn: @ 85D1AF6
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -6229,7 +6229,7 @@ gBattleFrontierTrainerMons_Jazlyn: ; 85D1AF6
 	.2byte 419
 	.2byte -1
 
-gBattleFrontierTrainerMons_Zachery: ; 85D1B58
+gBattleFrontierTrainerMons_Zachery: @ 85D1B58
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -6265,7 +6265,7 @@ gBattleFrontierTrainerMons_Zachery: ; 85D1B58
 	.2byte 500
 	.2byte -1
 
-gBattleFrontierTrainerMons_Johan: ; 85D1B9C
+gBattleFrontierTrainerMons_Johan: @ 85D1B9C
 	.2byte 469
 	.2byte 470
 	.2byte 471
@@ -6300,7 +6300,7 @@ gBattleFrontierTrainerMons_Johan: ; 85D1B9C
 	.2byte 500
 	.2byte -1
 
-gBattleFrontierTrainerMons_Shea: ; 85D1BDE
+gBattleFrontierTrainerMons_Shea: @ 85D1BDE
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -6336,7 +6336,7 @@ gBattleFrontierTrainerMons_Shea: ; 85D1BDE
 	.2byte 500
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kaila: ; 85D1C22
+gBattleFrontierTrainerMons_Kaila: @ 85D1C22
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -6372,7 +6372,7 @@ gBattleFrontierTrainerMons_Kaila: ; 85D1C22
 	.2byte 500
 	.2byte -1
 
-gBattleFrontierTrainerMons_Isiah: ; 85D1C66
+gBattleFrontierTrainerMons_Isiah: @ 85D1C66
 	.2byte 501
 	.2byte 502
 	.2byte 503
@@ -6408,7 +6408,7 @@ gBattleFrontierTrainerMons_Isiah: ; 85D1C66
 	.2byte 533
 	.2byte -1
 
-gBattleFrontierTrainerMons_Garrett: ; 85D1CAA
+gBattleFrontierTrainerMons_Garrett: @ 85D1CAA
 	.2byte 501
 	.2byte 502
 	.2byte 503
@@ -6444,7 +6444,7 @@ gBattleFrontierTrainerMons_Garrett: ; 85D1CAA
 	.2byte 533
 	.2byte -1
 
-gBattleFrontierTrainerMons_Haylie: ; 85D1CEE
+gBattleFrontierTrainerMons_Haylie: @ 85D1CEE
 	.2byte 501
 	.2byte 502
 	.2byte 503
@@ -6480,7 +6480,7 @@ gBattleFrontierTrainerMons_Haylie: ; 85D1CEE
 	.2byte 533
 	.2byte -1
 
-gBattleFrontierTrainerMons_Megan: ; 85D1D32
+gBattleFrontierTrainerMons_Megan: @ 85D1D32
 	.2byte 501
 	.2byte 502
 	.2byte 503
@@ -6516,7 +6516,7 @@ gBattleFrontierTrainerMons_Megan: ; 85D1D32
 	.2byte 533
 	.2byte -1
 
-gBattleFrontierTrainerMons_Issac: ; 85D1D76
+gBattleFrontierTrainerMons_Issac: @ 85D1D76
 	.2byte 534
 	.2byte 535
 	.2byte 536
@@ -6549,7 +6549,7 @@ gBattleFrontierTrainerMons_Issac: ; 85D1D76
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Quinton: ; 85D1DB4
+gBattleFrontierTrainerMons_Quinton: @ 85D1DB4
 	.2byte 534
 	.2byte 535
 	.2byte 536
@@ -6582,7 +6582,7 @@ gBattleFrontierTrainerMons_Quinton: ; 85D1DB4
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Salma: ; 85D1DF2
+gBattleFrontierTrainerMons_Salma: @ 85D1DF2
 	.2byte 534
 	.2byte 535
 	.2byte 536
@@ -6615,7 +6615,7 @@ gBattleFrontierTrainerMons_Salma: ; 85D1DF2
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ansley: ; 85D1E30
+gBattleFrontierTrainerMons_Ansley: @ 85D1E30
 	.2byte 534
 	.2byte 535
 	.2byte 536
@@ -6648,7 +6648,7 @@ gBattleFrontierTrainerMons_Ansley: ; 85D1E30
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Holden: ; 85D1E6E
+gBattleFrontierTrainerMons_Holden: @ 85D1E6E
 	.2byte 343
 	.2byte 368
 	.2byte 369
@@ -6674,7 +6674,7 @@ gBattleFrontierTrainerMons_Holden: ; 85D1E6E
 	.2byte 549
 	.2byte -1
 
-gBattleFrontierTrainerMons_Luca: ; 85D1E9E
+gBattleFrontierTrainerMons_Luca: @ 85D1E9E
 	.2byte 343
 	.2byte 368
 	.2byte 369
@@ -6700,7 +6700,7 @@ gBattleFrontierTrainerMons_Luca: ; 85D1E9E
 	.2byte 549
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jamison: ; 85D1ECE
+gBattleFrontierTrainerMons_Jamison: @ 85D1ECE
 	.2byte 282
 	.2byte 331
 	.2byte 343
@@ -6735,7 +6735,7 @@ gBattleFrontierTrainerMons_Jamison: ; 85D1ECE
 	.2byte 553
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gunnar: ; 85D1F10
+gBattleFrontierTrainerMons_Gunnar: @ 85D1F10
 	.2byte 282
 	.2byte 331
 	.2byte 343
@@ -6770,7 +6770,7 @@ gBattleFrontierTrainerMons_Gunnar: ; 85D1F10
 	.2byte 553
 	.2byte -1
 
-gBattleFrontierTrainerMons_Craig: ; 85D1F52
+gBattleFrontierTrainerMons_Craig: @ 85D1F52
 	.2byte 471
 	.2byte 474
 	.2byte 475
@@ -6806,7 +6806,7 @@ gBattleFrontierTrainerMons_Craig: ; 85D1F52
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Pierce: ; 85D1F96
+gBattleFrontierTrainerMons_Pierce: @ 85D1F96
 	.2byte 471
 	.2byte 474
 	.2byte 475
@@ -6842,7 +6842,7 @@ gBattleFrontierTrainerMons_Pierce: ; 85D1F96
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Regina: ; 85D1FDA
+gBattleFrontierTrainerMons_Regina: @ 85D1FDA
 	.2byte 471
 	.2byte 474
 	.2byte 475
@@ -6878,7 +6878,7 @@ gBattleFrontierTrainerMons_Regina: ; 85D1FDA
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alison: ; 85D201E
+gBattleFrontierTrainerMons_Alison: @ 85D201E
 	.2byte 471
 	.2byte 474
 	.2byte 475
@@ -6914,7 +6914,7 @@ gBattleFrontierTrainerMons_Alison: ; 85D201E
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Hank: ; 85D2062
+gBattleFrontierTrainerMons_Hank: @ 85D2062
 	.2byte 277
 	.2byte 278
 	.2byte 282
@@ -6940,7 +6940,7 @@ gBattleFrontierTrainerMons_Hank: ; 85D2062
 	.2byte 624
 	.2byte -1
 
-gBattleFrontierTrainerMons_Earl: ; 85D2092
+gBattleFrontierTrainerMons_Earl: @ 85D2092
 	.2byte 277
 	.2byte 278
 	.2byte 282
@@ -6966,7 +6966,7 @@ gBattleFrontierTrainerMons_Earl: ; 85D2092
 	.2byte 624
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ramiro: ; 85D20C2
+gBattleFrontierTrainerMons_Ramiro: @ 85D20C2
 	.2byte 316
 	.2byte 333
 	.2byte 347
@@ -6984,7 +6984,7 @@ gBattleFrontierTrainerMons_Ramiro: ; 85D20C2
 	.2byte 631
 	.2byte -1
 
-gBattleFrontierTrainerMons_Hunter: ; 85D20E2
+gBattleFrontierTrainerMons_Hunter: @ 85D20E2
 	.2byte 316
 	.2byte 333
 	.2byte 347
@@ -7002,7 +7002,7 @@ gBattleFrontierTrainerMons_Hunter: ; 85D20E2
 	.2byte 631
 	.2byte -1
 
-gBattleFrontierTrainerMons_Aiden: ; 85D2102
+gBattleFrontierTrainerMons_Aiden: @ 85D2102
 	.2byte 564
 	.2byte 575
 	.2byte 576
@@ -7027,7 +7027,7 @@ gBattleFrontierTrainerMons_Aiden: ; 85D2102
 	.2byte 658
 	.2byte -1
 
-gBattleFrontierTrainerMons_Xavier: ; 85D2130
+gBattleFrontierTrainerMons_Xavier: @ 85D2130
 	.2byte 564
 	.2byte 575
 	.2byte 576
@@ -7052,7 +7052,7 @@ gBattleFrontierTrainerMons_Xavier: ; 85D2130
 	.2byte 658
 	.2byte -1
 
-gBattleFrontierTrainerMons_Clinton: ; 85D215E
+gBattleFrontierTrainerMons_Clinton: @ 85D215E
 	.2byte 564
 	.2byte 565
 	.2byte 566
@@ -7103,7 +7103,7 @@ gBattleFrontierTrainerMons_Clinton: ; 85D215E
 	.2byte 611
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jesse: ; 85D21C0
+gBattleFrontierTrainerMons_Jesse: @ 85D21C0
 	.2byte 564
 	.2byte 565
 	.2byte 566
@@ -7154,7 +7154,7 @@ gBattleFrontierTrainerMons_Jesse: ; 85D21C0
 	.2byte 611
 	.2byte -1
 
-gBattleFrontierTrainerMons_Eduardo: ; 85D2222
+gBattleFrontierTrainerMons_Eduardo: @ 85D2222
 	.2byte 268
 	.2byte 307
 	.2byte 317
@@ -7172,7 +7172,7 @@ gBattleFrontierTrainerMons_Eduardo: ; 85D2222
 	.2byte 639
 	.2byte -1
 
-gBattleFrontierTrainerMons_Hal: ; 85D2242
+gBattleFrontierTrainerMons_Hal: @ 85D2242
 	.2byte 268
 	.2byte 307
 	.2byte 317
@@ -7190,7 +7190,7 @@ gBattleFrontierTrainerMons_Hal: ; 85D2242
 	.2byte 639
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gage: ; 85D2262
+gBattleFrontierTrainerMons_Gage: @ 85D2262
 	.2byte 289
 	.2byte 318
 	.2byte 319
@@ -7213,7 +7213,7 @@ gBattleFrontierTrainerMons_Gage: ; 85D2262
 	.2byte 649
 	.2byte -1
 
-gBattleFrontierTrainerMons_Arnold: ; 85D228C
+gBattleFrontierTrainerMons_Arnold: @ 85D228C
 	.2byte 289
 	.2byte 318
 	.2byte 319
@@ -7236,7 +7236,7 @@ gBattleFrontierTrainerMons_Arnold: ; 85D228C
 	.2byte 649
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jarrett: ; 85D22B6
+gBattleFrontierTrainerMons_Jarrett: @ 85D22B6
 	.2byte 565
 	.2byte 573
 	.2byte 576
@@ -7262,7 +7262,7 @@ gBattleFrontierTrainerMons_Jarrett: ; 85D22B6
 	.2byte 655
 	.2byte -1
 
-gBattleFrontierTrainerMons_Garett: ; 85D22E6
+gBattleFrontierTrainerMons_Garett: @ 85D22E6
 	.2byte 565
 	.2byte 573
 	.2byte 576
@@ -7288,7 +7288,7 @@ gBattleFrontierTrainerMons_Garett: ; 85D22E6
 	.2byte 655
 	.2byte -1
 
-gBattleFrontierTrainerMons_Emanuel: ; 85D2316
+gBattleFrontierTrainerMons_Emanuel: @ 85D2316
 	.2byte 564
 	.2byte 565
 	.2byte 574
@@ -7311,7 +7311,7 @@ gBattleFrontierTrainerMons_Emanuel: ; 85D2316
 	.2byte 643
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gustavo: ; 85D2340
+gBattleFrontierTrainerMons_Gustavo: @ 85D2340
 	.2byte 564
 	.2byte 565
 	.2byte 574
@@ -7334,7 +7334,7 @@ gBattleFrontierTrainerMons_Gustavo: ; 85D2340
 	.2byte 643
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kameron: ; 85D236A
+gBattleFrontierTrainerMons_Kameron: @ 85D236A
 	.2byte 568
 	.2byte 581
 	.2byte 589
@@ -7356,7 +7356,7 @@ gBattleFrontierTrainerMons_Kameron: ; 85D236A
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alfredo: ; 85D2392
+gBattleFrontierTrainerMons_Alfredo: @ 85D2392
 	.2byte 568
 	.2byte 581
 	.2byte 589
@@ -7378,7 +7378,7 @@ gBattleFrontierTrainerMons_Alfredo: ; 85D2392
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ruben: ; 85D23BA
+gBattleFrontierTrainerMons_Ruben: @ 85D23BA
 	.2byte 612
 	.2byte 613
 	.2byte 614
@@ -7429,7 +7429,7 @@ gBattleFrontierTrainerMons_Ruben: ; 85D23BA
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lamar: ; 85D241C
+gBattleFrontierTrainerMons_Lamar: @ 85D241C
 	.2byte 612
 	.2byte 613
 	.2byte 614
@@ -7480,7 +7480,7 @@ gBattleFrontierTrainerMons_Lamar: ; 85D241C
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jaxon: ; 85D247E
+gBattleFrontierTrainerMons_Jaxon: @ 85D247E
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -7516,7 +7516,7 @@ gBattleFrontierTrainerMons_Jaxon: ; 85D247E
 	.2byte 692
 	.2byte -1
 
-gBattleFrontierTrainerMons_Logan: ; 85D24C2
+gBattleFrontierTrainerMons_Logan: @ 85D24C2
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -7552,7 +7552,7 @@ gBattleFrontierTrainerMons_Logan: ; 85D24C2
 	.2byte 692
 	.2byte -1
 
-gBattleFrontierTrainerMons_Emilee: ; 85D2506
+gBattleFrontierTrainerMons_Emilee: @ 85D2506
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -7588,7 +7588,7 @@ gBattleFrontierTrainerMons_Emilee: ; 85D2506
 	.2byte 692
 	.2byte -1
 
-gBattleFrontierTrainerMons_Josie: ; 85D254A
+gBattleFrontierTrainerMons_Josie: @ 85D254A
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -7624,7 +7624,7 @@ gBattleFrontierTrainerMons_Josie: ; 85D254A
 	.2byte 692
 	.2byte -1
 
-gBattleFrontierTrainerMons_Armando: ; 85D258E
+gBattleFrontierTrainerMons_Armando: @ 85D258E
 	.2byte 693
 	.2byte 694
 	.2byte 695
@@ -7660,7 +7660,7 @@ gBattleFrontierTrainerMons_Armando: ; 85D258E
 	.2byte 725
 	.2byte -1
 
-gBattleFrontierTrainerMons_Skyler: ; 85D25D2
+gBattleFrontierTrainerMons_Skyler: @ 85D25D2
 	.2byte 693
 	.2byte 694
 	.2byte 695
@@ -7696,7 +7696,7 @@ gBattleFrontierTrainerMons_Skyler: ; 85D25D2
 	.2byte 725
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ruth: ; 85D2616
+gBattleFrontierTrainerMons_Ruth: @ 85D2616
 	.2byte 693
 	.2byte 694
 	.2byte 695
@@ -7732,7 +7732,7 @@ gBattleFrontierTrainerMons_Ruth: ; 85D2616
 	.2byte 725
 	.2byte -1
 
-gBattleFrontierTrainerMons_Melody: ; 85D265A
+gBattleFrontierTrainerMons_Melody: @ 85D265A
 	.2byte 693
 	.2byte 694
 	.2byte 695
@@ -7768,7 +7768,7 @@ gBattleFrontierTrainerMons_Melody: ; 85D265A
 	.2byte 725
 	.2byte -1
 
-gBattleFrontierTrainerMons_Pedro: ; 85D269E
+gBattleFrontierTrainerMons_Pedro: @ 85D269E
 	.2byte 347
 	.2byte 661
 	.2byte 664
@@ -7806,7 +7806,7 @@ gBattleFrontierTrainerMons_Pedro: ; 85D269E
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Erick: ; 85D26E6
+gBattleFrontierTrainerMons_Erick: @ 85D26E6
 	.2byte 347
 	.2byte 661
 	.2byte 664
@@ -7844,7 +7844,7 @@ gBattleFrontierTrainerMons_Erick: ; 85D26E6
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Elaine: ; 85D272E
+gBattleFrontierTrainerMons_Elaine: @ 85D272E
 	.2byte 664
 	.2byte 665
 	.2byte 669
@@ -7880,7 +7880,7 @@ gBattleFrontierTrainerMons_Elaine: ; 85D272E
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Joyce: ; 85D2772
+gBattleFrontierTrainerMons_Joyce: @ 85D2772
 	.2byte 664
 	.2byte 665
 	.2byte 669
@@ -7916,7 +7916,7 @@ gBattleFrontierTrainerMons_Joyce: ; 85D2772
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Todd: ; 85D27B6
+gBattleFrontierTrainerMons_Todd: @ 85D27B6
 	.2byte 267
 	.2byte 273
 	.2byte 305
@@ -7959,7 +7959,7 @@ gBattleFrontierTrainerMons_Todd: ; 85D27B6
 	.2byte 751
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gavin: ; 85D2808
+gBattleFrontierTrainerMons_Gavin: @ 85D2808
 	.2byte 267
 	.2byte 273
 	.2byte 305
@@ -8002,7 +8002,7 @@ gBattleFrontierTrainerMons_Gavin: ; 85D2808
 	.2byte 751
 	.2byte -1
 
-gBattleFrontierTrainerMons_Malory: ; 85D285A
+gBattleFrontierTrainerMons_Malory: @ 85D285A
 	.2byte 267
 	.2byte 273
 	.2byte 305
@@ -8045,7 +8045,7 @@ gBattleFrontierTrainerMons_Malory: ; 85D285A
 	.2byte 751
 	.2byte -1
 
-gBattleFrontierTrainerMons_Esther: ; 85D28AC
+gBattleFrontierTrainerMons_Esther: @ 85D28AC
 	.2byte 267
 	.2byte 273
 	.2byte 305
@@ -8088,7 +8088,7 @@ gBattleFrontierTrainerMons_Esther: ; 85D28AC
 	.2byte 751
 	.2byte -1
 
-gBattleFrontierTrainerMons_Oscar: ; 85D28FE
+gBattleFrontierTrainerMons_Oscar: @ 85D28FE
 	.2byte 726
 	.2byte 727
 	.2byte 728
@@ -8121,7 +8121,7 @@ gBattleFrontierTrainerMons_Oscar: ; 85D28FE
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Wilson: ; 85D293C
+gBattleFrontierTrainerMons_Wilson: @ 85D293C
 	.2byte 726
 	.2byte 727
 	.2byte 728
@@ -8154,7 +8154,7 @@ gBattleFrontierTrainerMons_Wilson: ; 85D293C
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Clare: ; 85D297A
+gBattleFrontierTrainerMons_Clare: @ 85D297A
 	.2byte 726
 	.2byte 727
 	.2byte 728
@@ -8187,7 +8187,7 @@ gBattleFrontierTrainerMons_Clare: ; 85D297A
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Tess: ; 85D29B8
+gBattleFrontierTrainerMons_Tess: @ 85D29B8
 	.2byte 726
 	.2byte 727
 	.2byte 728
@@ -8220,7 +8220,7 @@ gBattleFrontierTrainerMons_Tess: ; 85D29B8
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Leon: ; 85D29F6
+gBattleFrontierTrainerMons_Leon: @ 85D29F6
 	.2byte 420
 	.2byte 421
 	.2byte 422
@@ -8319,7 +8319,7 @@ gBattleFrontierTrainerMons_Leon: ; 85D29F6
 	.2byte 731
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alonzo: ; 85D2AB8
+gBattleFrontierTrainerMons_Alonzo: @ 85D2AB8
 	.2byte 444
 	.2byte 445
 	.2byte 446
@@ -8418,7 +8418,7 @@ gBattleFrontierTrainerMons_Alonzo: ; 85D2AB8
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Vince: ; 85D2B7A
+gBattleFrontierTrainerMons_Vince: @ 85D2B7A
 	.2byte 421
 	.2byte 425
 	.2byte 431
@@ -8521,7 +8521,7 @@ gBattleFrontierTrainerMons_Vince: ; 85D2B7A
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bryon: ; 85D2C44
+gBattleFrontierTrainerMons_Bryon: @ 85D2C44
 	.2byte 756
 	.2byte 757
 	.2byte 758
@@ -8606,7 +8606,7 @@ gBattleFrontierTrainerMons_Bryon: ; 85D2C44
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ava: ; 85D2CEA
+gBattleFrontierTrainerMons_Ava: @ 85D2CEA
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -8705,7 +8705,7 @@ gBattleFrontierTrainerMons_Ava: ; 85D2CEA
 	.2byte 683
 	.2byte -1
 
-gBattleFrontierTrainerMons_Miriam: ; 85D2DAC
+gBattleFrontierTrainerMons_Miriam: @ 85D2DAC
 	.2byte 396
 	.2byte 397
 	.2byte 398
@@ -8804,7 +8804,7 @@ gBattleFrontierTrainerMons_Miriam: ; 85D2DAC
 	.2byte 707
 	.2byte -1
 
-gBattleFrontierTrainerMons_Carrie: ; 85D2E6E
+gBattleFrontierTrainerMons_Carrie: @ 85D2E6E
 	.2byte 421
 	.2byte 425
 	.2byte 431
@@ -8907,7 +8907,7 @@ gBattleFrontierTrainerMons_Carrie: ; 85D2E6E
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gillian2: ; 85D2F38
+gBattleFrontierTrainerMons_Gillian2: @ 85D2F38
 	.2byte 756
 	.2byte 757
 	.2byte 758
@@ -8992,7 +8992,7 @@ gBattleFrontierTrainerMons_Gillian2: ; 85D2F38
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Tyler: ; 85D2FDE
+gBattleFrontierTrainerMons_Tyler: @ 85D2FDE
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -9091,7 +9091,7 @@ gBattleFrontierTrainerMons_Tyler: ; 85D2FDE
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Chaz: ; 85D30A0
+gBattleFrontierTrainerMons_Chaz: @ 85D30A0
 	.2byte 564
 	.2byte 565
 	.2byte 566
@@ -9190,7 +9190,7 @@ gBattleFrontierTrainerMons_Chaz: ; 85D30A0
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nelson: ; 85D3162
+gBattleFrontierTrainerMons_Nelson: @ 85D3162
 	.2byte 756
 	.2byte 757
 	.2byte 758
@@ -9275,7 +9275,7 @@ gBattleFrontierTrainerMons_Nelson: ; 85D3162
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Shania: ; 85D3208
+gBattleFrontierTrainerMons_Shania: @ 85D3208
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -9374,7 +9374,7 @@ gBattleFrontierTrainerMons_Shania: ; 85D3208
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Stella: ; 85D32CA
+gBattleFrontierTrainerMons_Stella: @ 85D32CA
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -9473,7 +9473,7 @@ gBattleFrontierTrainerMons_Stella: ; 85D32CA
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dorine: ; 85D338C
+gBattleFrontierTrainerMons_Dorine: @ 85D338C
 	.2byte 756
 	.2byte 757
 	.2byte 758
@@ -9558,7 +9558,7 @@ gBattleFrontierTrainerMons_Dorine: ; 85D338C
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Maddox: ; 85D3432
+gBattleFrontierTrainerMons_Maddox: @ 85D3432
 	.2byte 403
 	.2byte 412
 	.2byte 413
@@ -9657,7 +9657,7 @@ gBattleFrontierTrainerMons_Maddox: ; 85D3432
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Davin: ; 85D34F4
+gBattleFrontierTrainerMons_Davin: @ 85D34F4
 	.2byte 403
 	.2byte 412
 	.2byte 413
@@ -9756,7 +9756,7 @@ gBattleFrontierTrainerMons_Davin: ; 85D34F4
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Trevon: ; 85D35B6
+gBattleFrontierTrainerMons_Trevon: @ 85D35B6
 	.2byte 403
 	.2byte 412
 	.2byte 413
@@ -9855,7 +9855,7 @@ gBattleFrontierTrainerMons_Trevon: ; 85D35B6
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Mateo: ; 85D3678
+gBattleFrontierTrainerMons_Mateo: @ 85D3678
 	.2byte 373
 	.2byte 382
 	.2byte 390
@@ -9914,7 +9914,7 @@ gBattleFrontierTrainerMons_Mateo: ; 85D3678
 	.2byte 811
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bret: ; 85D36EA
+gBattleFrontierTrainerMons_Bret: @ 85D36EA
 	.2byte 373
 	.2byte 382
 	.2byte 390
@@ -9977,7 +9977,7 @@ gBattleFrontierTrainerMons_Bret: ; 85D36EA
 	.2byte 811
 	.2byte -1
 
-gBattleFrontierTrainerMons_Raul: ; 85D3764
+gBattleFrontierTrainerMons_Raul: @ 85D3764
 	.2byte 373
 	.2byte 382
 	.2byte 383
@@ -10036,7 +10036,7 @@ gBattleFrontierTrainerMons_Raul: ; 85D3764
 	.2byte 835
 	.2byte -1
 
-gBattleFrontierTrainerMons_Kay: ; 85D37D6
+gBattleFrontierTrainerMons_Kay: @ 85D37D6
 	.2byte 373
 	.2byte 382
 	.2byte 387
@@ -10095,7 +10095,7 @@ gBattleFrontierTrainerMons_Kay: ; 85D37D6
 	.2byte 811
 	.2byte -1
 
-gBattleFrontierTrainerMons_Elena: ; 85D3848
+gBattleFrontierTrainerMons_Elena: @ 85D3848
 	.2byte 373
 	.2byte 382
 	.2byte 390
@@ -10158,7 +10158,7 @@ gBattleFrontierTrainerMons_Elena: ; 85D3848
 	.2byte 811
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alana: ; 85D38C2
+gBattleFrontierTrainerMons_Alana: @ 85D38C2
 	.2byte 373
 	.2byte 382
 	.2byte 383
@@ -10217,7 +10217,7 @@ gBattleFrontierTrainerMons_Alana: ; 85D38C2
 	.2byte 835
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alexas: ; 85D3934
+gBattleFrontierTrainerMons_Alexas: @ 85D3934
 	.2byte 382
 	.2byte 387
 	.2byte 403
@@ -10320,7 +10320,7 @@ gBattleFrontierTrainerMons_Alexas: ; 85D3934
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Weston: ; 85D39FE
+gBattleFrontierTrainerMons_Weston: @ 85D39FE
 	.2byte 374
 	.2byte 377
 	.2byte 404
@@ -10423,7 +10423,7 @@ gBattleFrontierTrainerMons_Weston: ; 85D39FE
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jasper: ; 85D3AC8
+gBattleFrontierTrainerMons_Jasper: @ 85D3AC8
 	.2byte 378
 	.2byte 388
 	.2byte 400
@@ -10526,7 +10526,7 @@ gBattleFrontierTrainerMons_Jasper: ; 85D3AC8
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nadia: ; 85D3B92
+gBattleFrontierTrainerMons_Nadia: @ 85D3B92
 	.2byte 382
 	.2byte 387
 	.2byte 403
@@ -10629,7 +10629,7 @@ gBattleFrontierTrainerMons_Nadia: ; 85D3B92
 	.2byte 859
 	.2byte -1
 
-gBattleFrontierTrainerMons_Miranda: ; 85D3C5C
+gBattleFrontierTrainerMons_Miranda: @ 85D3C5C
 	.2byte 374
 	.2byte 377
 	.2byte 404
@@ -10732,7 +10732,7 @@ gBattleFrontierTrainerMons_Miranda: ; 85D3C5C
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Emma: ; 85D3D26
+gBattleFrontierTrainerMons_Emma: @ 85D3D26
 	.2byte 378
 	.2byte 388
 	.2byte 400
@@ -10835,7 +10835,7 @@ gBattleFrontierTrainerMons_Emma: ; 85D3D26
 	.2byte 859
 	.2byte -1
 
-gBattleFrontierTrainerMons_Rolando: ; 85D3DF0
+gBattleFrontierTrainerMons_Rolando: @ 85D3DF0
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -10930,7 +10930,7 @@ gBattleFrontierTrainerMons_Rolando: ; 85D3DF0
 	.2byte 875
 	.2byte -1
 
-gBattleFrontierTrainerMons_Stanly: ; 85D3EAA
+gBattleFrontierTrainerMons_Stanly: @ 85D3EAA
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -11025,7 +11025,7 @@ gBattleFrontierTrainerMons_Stanly: ; 85D3EAA
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dario: ; 85D3F64
+gBattleFrontierTrainerMons_Dario: @ 85D3F64
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -11120,7 +11120,7 @@ gBattleFrontierTrainerMons_Dario: ; 85D3F64
 	.2byte 849
 	.2byte -1
 
-gBattleFrontierTrainerMons_Karlee: ; 85D401E
+gBattleFrontierTrainerMons_Karlee: @ 85D401E
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -11215,7 +11215,7 @@ gBattleFrontierTrainerMons_Karlee: ; 85D401E
 	.2byte 875
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jaylin: ; 85D40D8
+gBattleFrontierTrainerMons_Jaylin: @ 85D40D8
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -11310,7 +11310,7 @@ gBattleFrontierTrainerMons_Jaylin: ; 85D40D8
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ingrid: ; 85D4192
+gBattleFrontierTrainerMons_Ingrid: @ 85D4192
 	.2byte 185
 	.2byte 290
 	.2byte 377
@@ -11405,7 +11405,7 @@ gBattleFrontierTrainerMons_Ingrid: ; 85D4192
 	.2byte 845
 	.2byte -1
 
-gBattleFrontierTrainerMons_Delilah: ; 85D424C
+gBattleFrontierTrainerMons_Delilah: @ 85D424C
 	.2byte 347
 	.2byte 352
 	.2byte 374
@@ -11438,7 +11438,7 @@ gBattleFrontierTrainerMons_Delilah: ; 85D424C
 	.2byte 803
 	.2byte -1
 
-gBattleFrontierTrainerMons_Carly: ; 85D428A
+gBattleFrontierTrainerMons_Carly: @ 85D428A
 	.2byte 344
 	.2byte 374
 	.2byte 378
@@ -11494,7 +11494,7 @@ gBattleFrontierTrainerMons_Carly: ; 85D428A
 	.2byte 803
 	.2byte -1
 
-gBattleFrontierTrainerMons_Lexie: ; 85D42F6
+gBattleFrontierTrainerMons_Lexie: @ 85D42F6
 	.2byte 344
 	.2byte 347
 	.2byte 352
@@ -11556,7 +11556,7 @@ gBattleFrontierTrainerMons_Lexie: ; 85D42F6
 	.2byte 803
 	.2byte -1
 
-gBattleFrontierTrainerMons_Miller: ; 85D436E
+gBattleFrontierTrainerMons_Miller: @ 85D436E
 	.2byte 345
 	.2byte 376
 	.2byte 386
@@ -11646,7 +11646,7 @@ gBattleFrontierTrainerMons_Miller: ; 85D436E
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Marv: ; 85D441E
+gBattleFrontierTrainerMons_Marv: @ 85D441E
 	.2byte 345
 	.2byte 568
 	.2byte 578
@@ -11736,7 +11736,7 @@ gBattleFrontierTrainerMons_Marv: ; 85D441E
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Layton: ; 85D44CE
+gBattleFrontierTrainerMons_Layton: @ 85D44CE
 	.2byte 345
 	.2byte 425
 	.2byte 433
@@ -11828,7 +11828,7 @@ gBattleFrontierTrainerMons_Layton: ; 85D44CE
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Brooks: ; 85D4582
+gBattleFrontierTrainerMons_Brooks: @ 85D4582
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -11927,7 +11927,7 @@ gBattleFrontierTrainerMons_Brooks: ; 85D4582
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gregory: ; 85D4644
+gBattleFrontierTrainerMons_Gregory: @ 85D4644
 	.2byte 421
 	.2byte 425
 	.2byte 431
@@ -12030,7 +12030,7 @@ gBattleFrontierTrainerMons_Gregory: ; 85D4644
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Reese: ; 85D470E
+gBattleFrontierTrainerMons_Reese: @ 85D470E
 	.2byte 756
 	.2byte 757
 	.2byte 758
@@ -12123,7 +12123,7 @@ gBattleFrontierTrainerMons_Reese: ; 85D470E
 	.2byte 881
 	.2byte -1
 
-gBattleFrontierTrainerMons_Mason: ; 85D47C4
+gBattleFrontierTrainerMons_Mason: @ 85D47C4
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -12222,7 +12222,7 @@ gBattleFrontierTrainerMons_Mason: ; 85D47C4
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Toby: ; 85D4886
+gBattleFrontierTrainerMons_Toby: @ 85D4886
 	.2byte 564
 	.2byte 565
 	.2byte 566
@@ -12321,7 +12321,7 @@ gBattleFrontierTrainerMons_Toby: ; 85D4886
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dorothy: ; 85D4948
+gBattleFrontierTrainerMons_Dorothy: @ 85D4948
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -12420,7 +12420,7 @@ gBattleFrontierTrainerMons_Dorothy: ; 85D4948
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Piper: ; 85D4A0A
+gBattleFrontierTrainerMons_Piper: @ 85D4A0A
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -12519,7 +12519,7 @@ gBattleFrontierTrainerMons_Piper: ; 85D4A0A
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Finn: ; 85D4ACC
+gBattleFrontierTrainerMons_Finn: @ 85D4ACC
 	.2byte 317
 	.2byte 371
 	.2byte 373
@@ -12602,7 +12602,7 @@ gBattleFrontierTrainerMons_Finn: ; 85D4ACC
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Samir: ; 85D4B6E
+gBattleFrontierTrainerMons_Samir: @ 85D4B6E
 	.2byte 317
 	.2byte 371
 	.2byte 373
@@ -12685,7 +12685,7 @@ gBattleFrontierTrainerMons_Samir: ; 85D4B6E
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Fiona: ; 85D4C10
+gBattleFrontierTrainerMons_Fiona: @ 85D4C10
 	.2byte 317
 	.2byte 371
 	.2byte 373
@@ -12768,7 +12768,7 @@ gBattleFrontierTrainerMons_Fiona: ; 85D4C10
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gloria: ; 85D4CB2
+gBattleFrontierTrainerMons_Gloria: @ 85D4CB2
 	.2byte 317
 	.2byte 371
 	.2byte 373
@@ -12851,7 +12851,7 @@ gBattleFrontierTrainerMons_Gloria: ; 85D4CB2
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Nico: ; 85D4D54
+gBattleFrontierTrainerMons_Nico: @ 85D4D54
 	.2byte 660
 	.2byte 661
 	.2byte 662
@@ -12950,7 +12950,7 @@ gBattleFrontierTrainerMons_Nico: ; 85D4D54
 	.2byte 755
 	.2byte -1
 
-gBattleFrontierTrainerMons_Jeremy: ; 85D4E16
+gBattleFrontierTrainerMons_Jeremy: @ 85D4E16
 	.2byte 564
 	.2byte 565
 	.2byte 566
@@ -13049,7 +13049,7 @@ gBattleFrontierTrainerMons_Jeremy: ; 85D4E16
 	.2byte 659
 	.2byte -1
 
-gBattleFrontierTrainerMons_Caitlin: ; 85D4ED8
+gBattleFrontierTrainerMons_Caitlin: @ 85D4ED8
 	.2byte 468
 	.2byte 469
 	.2byte 470
@@ -13148,7 +13148,7 @@ gBattleFrontierTrainerMons_Caitlin: ; 85D4ED8
 	.2byte 563
 	.2byte -1
 
-gBattleFrontierTrainerMons_Reena: ; 85D4F9A
+gBattleFrontierTrainerMons_Reena: @ 85D4F9A
 	.2byte 372
 	.2byte 373
 	.2byte 374
@@ -13247,7 +13247,7 @@ gBattleFrontierTrainerMons_Reena: ; 85D4F9A
 	.2byte 467
 	.2byte -1
 
-gBattleFrontierTrainerMons_Avery: ; 85D505C
+gBattleFrontierTrainerMons_Avery: @ 85D505C
 	.2byte 21
 	.2byte 238
 	.2byte 282
@@ -13278,7 +13278,7 @@ gBattleFrontierTrainerMons_Avery: ; 85D505C
 	.2byte 720
 	.2byte -1
 
-gBattleFrontierTrainerMons_Liam: ; 85D5096
+gBattleFrontierTrainerMons_Liam: @ 85D5096
 	.2byte 21
 	.2byte 238
 	.2byte 282
@@ -13309,7 +13309,7 @@ gBattleFrontierTrainerMons_Liam: ; 85D5096
 	.2byte 720
 	.2byte -1
 
-gBattleFrontierTrainerMons_Theo: ; 85D50D0
+gBattleFrontierTrainerMons_Theo: @ 85D50D0
 	.2byte 333
 	.2byte 347
 	.2byte 350
@@ -13346,7 +13346,7 @@ gBattleFrontierTrainerMons_Theo: ; 85D50D0
 	.2byte 819
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bailey: ; 85D5116
+gBattleFrontierTrainerMons_Bailey: @ 85D5116
 	.2byte 333
 	.2byte 347
 	.2byte 350
@@ -13383,7 +13383,7 @@ gBattleFrontierTrainerMons_Bailey: ; 85D5116
 	.2byte 819
 	.2byte -1
 
-gBattleFrontierTrainerMons_Hugo: ; 85D515C
+gBattleFrontierTrainerMons_Hugo: @ 85D515C
 	.2byte 383
 	.2byte 386
 	.2byte 402
@@ -13456,7 +13456,7 @@ gBattleFrontierTrainerMons_Hugo: ; 85D515C
 	.2byte 841
 	.2byte -1
 
-gBattleFrontierTrainerMons_Bryce: ; 85D51EA
+gBattleFrontierTrainerMons_Bryce: @ 85D51EA
 	.2byte 383
 	.2byte 386
 	.2byte 402
@@ -13529,7 +13529,7 @@ gBattleFrontierTrainerMons_Bryce: ; 85D51EA
 	.2byte 841
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gideon: ; 85D5278
+gBattleFrontierTrainerMons_Gideon: @ 85D5278
 	.2byte 441
 	.2byte 445
 	.2byte 448
@@ -13568,7 +13568,7 @@ gBattleFrontierTrainerMons_Gideon: ; 85D5278
 	.2byte 746
 	.2byte -1
 
-gBattleFrontierTrainerMons_Triston: ; 85D52C2
+gBattleFrontierTrainerMons_Triston: @ 85D52C2
 	.2byte 441
 	.2byte 445
 	.2byte 448
@@ -13607,7 +13607,7 @@ gBattleFrontierTrainerMons_Triston: ; 85D52C2
 	.2byte 746
 	.2byte -1
 
-gBattleFrontierTrainerMons_Charles: ; 85D530C
+gBattleFrontierTrainerMons_Charles: @ 85D530C
 	.2byte 352
 	.2byte 381
 	.2byte 391
@@ -13669,7 +13669,7 @@ gBattleFrontierTrainerMons_Charles: ; 85D530C
 	.2byte 875
 	.2byte -1
 
-gBattleFrontierTrainerMons_Raymond: ; 85D5384
+gBattleFrontierTrainerMons_Raymond: @ 85D5384
 	.2byte 374
 	.2byte 376
 	.2byte 381
@@ -13707,7 +13707,7 @@ gBattleFrontierTrainerMons_Raymond: ; 85D5384
 	.2byte 847
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dirk: ; 85D53CC
+gBattleFrontierTrainerMons_Dirk: @ 85D53CC
 	.2byte 355
 	.2byte 375
 	.2byte 379
@@ -13771,7 +13771,7 @@ gBattleFrontierTrainerMons_Dirk: ; 85D53CC
 	.2byte 831
 	.2byte -1
 
-gBattleFrontierTrainerMons_Harold: ; 85D5448
+gBattleFrontierTrainerMons_Harold: @ 85D5448
 	.2byte 355
 	.2byte 375
 	.2byte 379
@@ -13835,7 +13835,7 @@ gBattleFrontierTrainerMons_Harold: ; 85D5448
 	.2byte 831
 	.2byte -1
 
-gBattleFrontierTrainerMons_Omar: ; 85D54C4
+gBattleFrontierTrainerMons_Omar: @ 85D54C4
 	.2byte 373
 	.2byte 388
 	.2byte 390
@@ -13918,7 +13918,7 @@ gBattleFrontierTrainerMons_Omar: ; 85D54C4
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Peter: ; 85D5566
+gBattleFrontierTrainerMons_Peter: @ 85D5566
 	.2byte 373
 	.2byte 388
 	.2byte 390
@@ -14001,7 +14001,7 @@ gBattleFrontierTrainerMons_Peter: ; 85D5566
 	.2byte 823
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dev: ; 85D5608
+gBattleFrontierTrainerMons_Dev: @ 85D5608
 	.2byte 372
 	.2byte 387
 	.2byte 402
@@ -14082,7 +14082,7 @@ gBattleFrontierTrainerMons_Dev: ; 85D5608
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Corey: ; 85D56A6
+gBattleFrontierTrainerMons_Corey: @ 85D56A6
 	.2byte 372
 	.2byte 387
 	.2byte 402
@@ -14163,7 +14163,7 @@ gBattleFrontierTrainerMons_Corey: ; 85D56A6
 	.2byte 869
 	.2byte -1
 
-gBattleFrontierTrainerMons_Andre: ; 85D5744
+gBattleFrontierTrainerMons_Andre: @ 85D5744
 	.2byte 374
 	.2byte 378
 	.2byte 415
@@ -14228,7 +14228,7 @@ gBattleFrontierTrainerMons_Andre: ; 85D5744
 	.2byte 859
 	.2byte -1
 
-gBattleFrontierTrainerMons_Ferris: ; 85D57C2
+gBattleFrontierTrainerMons_Ferris: @ 85D57C2
 	.2byte 374
 	.2byte 378
 	.2byte 415
@@ -14293,7 +14293,7 @@ gBattleFrontierTrainerMons_Ferris: ; 85D57C2
 	.2byte 859
 	.2byte -1
 
-gBattleFrontierTrainerMons_Alivia: ; 85D5840
+gBattleFrontierTrainerMons_Alivia: @ 85D5840
 	.2byte 399
 	.2byte 400
 	.2byte 409
@@ -14331,7 +14331,7 @@ gBattleFrontierTrainerMons_Alivia: ; 85D5840
 	.2byte 732
 	.2byte -1
 
-gBattleFrontierTrainerMons_Paige: ; 85D5888
+gBattleFrontierTrainerMons_Paige: @ 85D5888
 	.2byte 399
 	.2byte 400
 	.2byte 409
@@ -14369,7 +14369,7 @@ gBattleFrontierTrainerMons_Paige: ; 85D5888
 	.2byte 732
 	.2byte -1
 
-gBattleFrontierTrainerMons_Anya: ; 85D58D0
+gBattleFrontierTrainerMons_Anya: @ 85D58D0
 	.2byte 442
 	.2byte 443
 	.2byte 444
@@ -14392,7 +14392,7 @@ gBattleFrontierTrainerMons_Anya: ; 85D58D0
 	.2byte 735
 	.2byte -1
 
-gBattleFrontierTrainerMons_Dawn: ; 85D58FA
+gBattleFrontierTrainerMons_Dawn: @ 85D58FA
 	.2byte 377
 	.2byte 381
 	.2byte 410
@@ -14434,7 +14434,7 @@ gBattleFrontierTrainerMons_Dawn: ; 85D58FA
 	.2byte 843
 	.2byte -1
 
-gBattleFrontierTrainerMons_Abby: ; 85D594A
+gBattleFrontierTrainerMons_Abby: @ 85D594A
 	.2byte 185
 	.2byte 290
 	.2byte 313
@@ -14532,7 +14532,7 @@ gBattleFrontierTrainerMons_Abby: ; 85D594A
 	.2byte 819
 	.2byte -1
 
-gBattleFrontierTrainerMons_Gretel: ; 85D5A0A
+gBattleFrontierTrainerMons_Gretel: @ 85D5A0A
 	.2byte 185
 	.2byte 290
 	.2byte 313
diff --git a/data/battle_frontier/battle_frontier_trainers.s b/data/battle_frontier/battle_frontier_trainers.s
index 7d0a37c29..ace63d788 100644
--- a/data/battle_frontier/battle_frontier_trainers.s
+++ b/data/battle_frontier/battle_frontier_trainers.s
@@ -1,24 +1,24 @@
 	.align 2, 0
 
-gBattleFrontierTrainers: ; 85D5ACC
-; 0
+gBattleFrontierTrainers: @ 85D5ACC
+@ 0
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "BRADY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NEVER
 	ec_word GOING
 	ec_word TO
 	ec_word LOSE
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word STRONG
 	ec_word AREN_T
 	ec_word I
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word QUES
 	.2byte -1
@@ -27,24 +27,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Brady
 
-; 1
+@ 1
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "CONNER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LOSING
 	ec_word DOESN_T
 	ec_word BUG
 	ec_word ME
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word A
 	ec_word WIN
 	ec_word IS
 	ec_word JUST
 	ec_word AWESOME
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word DARN
 	ec_word ELLIPSIS
 	ec_word LOSING
@@ -53,24 +53,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ME
 	.4byte gBattleFrontierTrainerMons_Conner
 
-; 2
+@ 2
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "BRADLEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HEY_THERE
 	ec_word EXCL
 	ec_word YOU_RE
 	ec_word MY
 	ec_word OPPONENT
 	ec_word TODAY
-; win speech
+@ win speech
 	ec_word HAHAHA
 	ec_word EXCL
 	.2byte -1
 	ec_word SEE_YA
 	ec_word LATER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word TOMORROW
 	ec_word IS
 	ec_word WHEN
@@ -79,24 +79,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BATTLE
 	.4byte gBattleFrontierTrainerMons_Bradley
 
-; 3
+@ 3
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "CYBIL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word REALLY
 	ec_word NOT_VERY
 	ec_word SCARY
 	ec_word AT
 	ec_word ALL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word SAD
 	ec_word TO
 	ec_word SEE
 	ec_word YOU
 	ec_move2 STRUGGLE
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word CAN_T
 	ec_word BE
@@ -105,24 +105,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Cybil
 
-; 4
+@ 4
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "RODETTE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OH
 	ec_word THIS
 	ec_word IS
 	ec_word SO
 	ec_word EXCITING
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word INCREDIBLE
 	ec_word HOW
 	ec_word STRONG
 	ec_word I_AM
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word OH_DEAR
 	ec_word ELLIPSIS
 	ec_word I_AM
@@ -131,24 +131,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word GOOD
 	.4byte gBattleFrontierTrainerMons_Rodette
 
-; 5
+@ 5
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "PEGGY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GET
 	ec_word READY
 	ec_word TO
 	ec_word BE
 	ec_word DESTROYED
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word HAHAHA
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word I_AM
 	ec_word LOLLING
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word SAD
@@ -157,24 +157,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Peggy
 
-; 6
+@ 6
 	.4byte TRAINER_CLASS_SCHOOL_KID_1
 	.charmapstr "KEITH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word JUST
 	ec_word STUDY
 	ec_word YOU
 	ec_word KNOW
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word DON_T
 	ec_word STUDY
 	ec_word ENOUGH
 	ec_word ELLIPSIS
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -183,24 +183,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Keith
 
-; 7
+@ 7
 	.4byte TRAINER_CLASS_SCHOOL_KID_1
 	.charmapstr "GRAYSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word POKEMON
 	ec_word BATTLE
 	ec_word ISN_T
 	ec_word CHILD_S_PLAY
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word DONE
 	ec_word AREN_T
 	ec_word YOU
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WE
 	ec_word WERE
 	ec_word LIKE
@@ -209,24 +209,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Grayson
 
-; 8
+@ 8
 	.4byte TRAINER_CLASS_SCHOOL_KID_1
 	.charmapstr "GLENN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WOULD
 	ec_word BE
 	ec_word COOL
 	ec_word IF_I_WIN
 	.2byte -1
-; win speech
+@ win speech
 	ec_word COOL
 	ec_word EXCL
 	.2byte -1
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I_AM
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word GOING
@@ -235,24 +235,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word COOL
 	.4byte gBattleFrontierTrainerMons_Glenn
 
-; 9
+@ 9
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "LILIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WON_T
 	ec_word GIVE_UP
 	ec_word UNTIL
 	ec_word I
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word THERE
 	ec_word IS
 	ec_word NO
 	ec_word SURRENDER
 	ec_word IN
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word THAT_S
 	ec_word IT
 	ec_word ELLIPSIS
@@ -261,24 +261,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Liliana
 
-; 10
+@ 10
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "ELISE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word STRATEGY
 	ec_word IS
 	ec_word FROM
 	ec_word MY
 	ec_word FATHER
-; win speech
+@ win speech
 	ec_word I
 	ec_word WIN
 	ec_word EXCL
 	ec_word FATHER
 	ec_word I_VE
 	ec_word WON
-; loss speech
+@ loss speech
 	ec_word FORGIVE
 	ec_word ME
 	ec_word FATHER
@@ -287,24 +287,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOST
 	.4byte gBattleFrontierTrainerMons_Elise
 
-; 11
+@ 11
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "ZOEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word PLEASE
 	ec_word BATTLE
 	ec_word LIKE
 	ec_word YOU
 	ec_word MEAN
 	ec_word IT
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word THANK_YOU
 	ec_word SO
 	ec_word MUCH
-; loss speech
+@ loss speech
 	ec_word WERE
 	ec_word YOU
 	ec_word REALLY
@@ -313,24 +313,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Zoey
 
-; 12
+@ 12
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "MANUEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ME
 	ec_word LOSE
 	ec_word QUES
 	ec_word THAT_S
 	ec_word PREPOSTEROUS
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word NATURALLY
 	ec_word I
 	ec_word WIN
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WAAAH
 	ec_word EXCL
 	.2byte -1
@@ -339,24 +339,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MOTHER
 	.4byte gBattleFrontierTrainerMons_Manuel
 
-; 13
+@ 13
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "RUSS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THEY
 	ec_word ALL
 	ec_word WANT
 	ec_word MY
 	ec_word FABULOUS
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word I
 	ec_word WILL
 	ec_word HAVE
 	ec_word A
 	ec_word POKEMON
 	ec_word PARTY
-; loss speech
+@ loss speech
 	ec_word HOW
 	ec_word COULD
 	ec_word YOU
@@ -365,24 +365,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Russ
 
-; 14
+@ 14
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "DUSTIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word REALLY
 	ec_word LIKE
 	ec_word COOL
 	ec_word POKEMON
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word LIKE
 	ec_word MYSELF
 	ec_word WHEN_I_WIN
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word LIKE
 	ec_word MYSELF
@@ -391,24 +391,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Dustin
 
-; 15
+@ 15
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "TINA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF_I_WIN
 	ec_word YOU
 	ec_word CAN
 	ec_word HAVE
 	ec_word A
 	ec_move2 SWEET_KISS
-; win speech
+@ win speech
 	ec_word HERE_IT_IS
 	ec_word YOUR
 	ec_move2 SWEET_KISS
 	ec_word FROM
 	ec_word MY
 	ec_pokemon2 JYNX
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word WANT
 	ec_word A
@@ -417,24 +417,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word INSTEAD
 	.4byte gBattleFrontierTrainerMons_Tina
 
-; 16
+@ 16
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "GILLIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word GOURMET
 	ec_word THING
 	ec_word IS
 	ec_word SO
 	ec_word YESTERDAY
-; win speech
+@ win speech
 	ec_word POKEMON
 	ec_word NEVER
 	ec_word GO
 	ec_word OUT
 	ec_word OF
 	ec_word FASHION
-; loss speech
+@ loss speech
 	ec_word LOSING
 	ec_word DOESN_T
 	ec_word DISAPPOINT
@@ -443,24 +443,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Gillian
 
-; 17
+@ 17
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "ZOE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word HAVEN_T
 	ec_word A
 	ec_word WORRY
 	ec_word AT
 	ec_word ALL
-; win speech
+@ win speech
 	ec_word LIFE
 	ec_word IS
 	ec_word ALWAYS
 	ec_word GOOD
 	ec_word TO_ME
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WORRY
 	ec_word ABOUT
@@ -469,24 +469,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SKILL
 	.4byte gBattleFrontierTrainerMons_Zoe
 
-; 18
+@ 18
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "CHEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word TOTALLY
 	ec_word READY
 	ec_word TO
 	ec_word ROCK
 	ec_word TODAY
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word READY
 	ec_word TO
 	ec_word GO
 	ec_word ON
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_VE
 	ec_word LOST
 	ec_word MY
@@ -495,24 +495,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TOUGHNESS
 	.4byte gBattleFrontierTrainerMons_Chen
 
-; 19
+@ 19
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "AL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_word LOOK
 	ec_word SAYS
 	ec_word YOU_RE
 	ec_word REALLY
 	ec_word TOUGH
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word ME
 	ec_word WHO_IS
 	ec_word REALLY
 	ec_word TOUGH
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word RIGHT
 	ec_word EXCL
@@ -521,24 +521,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TOUGH
 	.4byte gBattleFrontierTrainerMons_Al
 
-; 20
+@ 20
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "MITCH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MOTHER
 	ec_word NATURE
 	ec_word IS
 	ec_word MY
 	ec_word ALLY
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word WAS
 	ec_word THAT
 	ec_word ENOUGH
 	ec_word FOR
 	ec_word YOU
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word MOTHER
 	ec_word NATURE
 	ec_word DIDN_T
@@ -547,24 +547,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Mitch
 
-; 21
+@ 21
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "ANNE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CAN_T
 	ec_word WAIT
 	ec_word LET_S
 	ec_word BATTLE
 	ec_word NOW
-; win speech
+@ win speech
 	ec_word MY
 	ec_word HAPPINESS
 	ec_word IS
 	ec_word OVERWHELMING
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_VE
 	ec_word DESTROYED
 	ec_word MY
@@ -573,24 +573,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Anne
 
-; 22
+@ 22
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "ALIZE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CUTE
 	ec_word AND
 	ec_word AWFULLY
 	ec_word STRONG
 	ec_word THAT_S
 	ec_word ME
-; win speech
+@ win speech
 	ec_word YUP
 	ec_word I_AM
 	ec_word CUTE
 	ec_word AND
 	ec_word AWFULLY
 	ec_word STRONG
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word WEAK
 	ec_word ELLIPSIS
@@ -599,24 +599,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word CUTE
 	.4byte gBattleFrontierTrainerMons_Alize
 
-; 23
+@ 23
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "LAUREN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word OLD
 	ec_word BUT
 	ec_word I_AM
 	ec_word ALSO
 	ec_word GOOD
-; win speech
+@ win speech
 	ec_word I
 	ec_word SAID
 	ec_word I_WAS
 	ec_word OLD
 	ec_word BUT
 	ec_word GOOD
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word A
 	ec_word WEIRD
@@ -625,24 +625,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Lauren
 
-; 24
+@ 24
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "KIPP$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF_I_WIN
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
 	ec_word GO
 	ec_move2 SURF
-; win speech
+@ win speech
 	ec_word YEAH
 	ec_word EXCL
 	ec_word I_AM
 	ec_word OFF
 	ec_word TO
 	ec_move2 SURF
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word NO
 	ec_word EXCL
@@ -651,24 +651,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Kipp
 
-; 25
+@ 25
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "JASON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word TEACH
 	ec_word ME
 	ec_word A
 	ec_word GOOD
 	ec_word STRATEGY
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word YOUR
 	ec_word GOOD
 	ec_word STRATEGY
 	ec_word QUES_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WOW
 	ec_word THAT
 	ec_word IS
@@ -677,24 +677,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word STRATEGY
 	.4byte gBattleFrontierTrainerMons_Jason
 
-; 26
+@ 26
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "JOHN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word A
 	ec_word PRETTY
 	ec_word NEW
 	ec_word TRAINER
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word NEW
 	ec_word BUT
 	ec_word I
 	ec_word WON
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word NEW
 	ec_word SO
@@ -703,24 +703,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_John
 
-; 27
+@ 27
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "ANN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word SO
 	ec_word EXCITING
 	ec_word IT
 	ec_word REALLY
 	ec_word IS
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word SO
 	ec_word HAPPY
 	ec_word I
 	ec_word CAN
 	ec_word CRY
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SO
 	ec_word SAD
@@ -729,24 +729,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word CRY
 	.4byte gBattleFrontierTrainerMons_Ann
 
-; 28
+@ 28
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "EILEEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word PRETEND
 	ec_word I_AM
 	ec_word AN
 	ec_word ADULT
 	ec_word OK_QUES
-; win speech
+@ win speech
 	ec_word SO
 	ec_word THIS
 	ec_word IS
 	ec_word AN
 	ec_word ADULT
 	ec_word FEELING
-; loss speech
+@ loss speech
 	ec_word AN
 	ec_word ADULT
 	ec_word CAN_T
@@ -755,24 +755,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Eileen
 
-; 29
+@ 29
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "CARLIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word SUMMER
 	ec_word VACATION
 	ec_word IS
 	ec_word FOR
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word MY
 	ec_word SUMMER
 	ec_word VACATION
 	ec_word WILL
 	ec_word BE
 	ec_word AWESOME
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word CAN_T_WIN
 	ec_word LIKE
@@ -781,24 +781,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Carlie
 
-; 30
+@ 30
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "GORDON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word VICTORY
 	ec_word WILL
 	ec_word COME
 	ec_word TO_ME
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word OH_YEAH
 	ec_word EXCL
 	.2byte -1
 	ec_word I
 	ec_word REALLY
 	ec_word WON
-; loss speech
+@ loss speech
 	ec_word NOTHING
 	ec_word IS
 	ec_word WORKING
@@ -807,24 +807,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ME
 	.4byte gBattleFrontierTrainerMons_Gordon
 
-; 31
+@ 31
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "AYDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word I
 	ec_word NEED
 	ec_word A
 	ec_word HOT
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word I
 	ec_word NEED
 	ec_word WATER
 	ec_word TO
 	ec_word COOL
 	ec_word DOWN
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word ME
@@ -833,24 +833,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word COLD
 	.4byte gBattleFrontierTrainerMons_Ayden
 
-; 32
+@ 32
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "MARCO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 SURF
 	ec_word IN
 	ec_word THE
 	ec_word WINTER
 	ec_word TOO
-; win speech
+@ win speech
 	ec_word I
 	ec_word WILL
 	ec_word GO
 	ec_move2 SURF
 	ec_word RIGHT
 	ec_word NOW
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_move2 BEAT_UP
@@ -859,24 +859,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BOARD
 	.4byte gBattleFrontierTrainerMons_Marco
 
-; 33
+@ 33
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "CIERRA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LIKE
 	ec_word TO
 	ec_word SYNCHRONIZE
 	ec_word MY
 	ec_word SWIFT_SWIM
-; win speech
+@ win speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word SYNCHRONIZE
 	ec_word WITH
 	ec_word ME
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -885,24 +885,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Cierra
 
-; 34
+@ 34
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "MARCY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word A
 	ec_word KNOCKOUT
 	ec_word YOU
 	ec_word CAN_T_WIN
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word AFTER
 	ec_word ALL
 	ec_word I_AM
 	ec_word A
 	ec_word KNOCKOUT
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word THAT_S
 	ec_word NOT
 	ec_word THE
@@ -911,24 +911,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MEAN
 	.4byte gBattleFrontierTrainerMons_Marcy
 
-; 35
+@ 35
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "KATHY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_VE
 	ec_word WON
 	ec_word EVERY
 	ec_word MATCH
 	ec_word TODAY
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word SO
 	ec_word GREAT
 	ec_word TO
 	ec_word WIN
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word HUH_QUES
 	ec_word I
 	ec_word SHOULD
@@ -937,24 +937,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOST
 	.4byte gBattleFrontierTrainerMons_Kathy
 
-; 36
+@ 36
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "PEYTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NEVER
 	ec_word DISAPPOINTED
 	ec_word WITH
 	ec_word MY
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word HAPPY
 	ec_word IF
 	ec_word WE
 	ec_word WIN
 	ec_word TOGETHER
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word ADORE
 	ec_word MY
@@ -963,24 +963,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word IF_I_LOSE
 	.4byte gBattleFrontierTrainerMons_Peyton
 
-; 37
+@ 37
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "JULIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word ADORE
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word RIGHT
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word TOTALLY
 	ec_word OUT
 	ec_word OF
 	ec_word THE
 	ec_word QUESTION
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word DO
 	ec_word ADORE
@@ -989,24 +989,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Julian
 
-; 38
+@ 38
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "QUINN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word ARE
 	ec_word BUT
 	ec_word A
 	ec_word DREAM
-; win speech
+@ win speech
 	ec_word THIS
 	ec_word IS
 	ec_word A
 	ec_word BEAUTIFUL
 	ec_word DREAM
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word IS
 	ec_word AN
@@ -1015,24 +1015,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Quinn
 
-; 39
+@ 39
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "HAYLEE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word KNOW
 	ec_word HOW
 	ec_word I_AM
 	ec_word FEELING
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word OVERWHELMING
 	ec_word JOY
 	ec_word OVER
 	ec_word THIS
-; loss speech
+@ loss speech
 	ec_word DESTROYED
 	ec_word IS
 	ec_word THE
@@ -1041,24 +1041,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word FEELING
 	.4byte gBattleFrontierTrainerMons_Haylee
 
-; 40
+@ 40
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "AMANDA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word COME
 	ec_word FROM
 	ec_word A
 	ec_word TRAINER
 	ec_word FAMILY
-; win speech
+@ win speech
 	ec_word I
 	ec_word WILL
 	ec_word TREASURE
 	ec_word THIS
 	ec_word WIN
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
@@ -1067,24 +1067,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word NOW
 	.4byte gBattleFrontierTrainerMons_Amanda
 
-; 41
+@ 41
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "STACY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ALL
 	ec_word POKEMON
 	ec_word HAVE
 	ec_word THEIR
 	ec_word OWN
 	ec_word CUTE_CHARM
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SEE
 	ec_word WHAT
 	ec_word I
 	ec_word MEAN
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word SHOULD
 	ec_word I
 	ec_word NOT
@@ -1093,24 +1093,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Stacy
 
-; 42
+@ 42
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "RAFAEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word EXCL
 	ec_word LET_S
 	ec_word SEE
 	ec_word SOME
 	ec_word SPIRIT
-; win speech
+@ win speech
 	ec_word THAT_S_IT_EXCL
 	ec_word THAT_S
 	ec_word THE
 	ec_word SPIRIT
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WELL
 	ec_word SO
 	ec_word MUCH
@@ -1119,24 +1119,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SPIRIT
 	.4byte gBattleFrontierTrainerMons_Rafael
 
-; 43
+@ 43
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "OLIVER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word GENIUS
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I_AM
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word HOW
 	ec_word A
 	ec_word GENIUS
 	ec_word WORKS
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word MORE
 	ec_word A
@@ -1145,24 +1145,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word I_AM
 	.4byte gBattleFrontierTrainerMons_Oliver
 
-; 44
+@ 44
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "PAYTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word TRAIN
 	ec_word FROM
 	ec_word THE
 	ec_word EGG
 	ec_word UP
-; win speech
+@ win speech
 	ec_word WELL
 	ec_word DONE
 	ec_word EXCL
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word A
 	ec_move2 SOFT_BOILED
@@ -1171,24 +1171,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Payton
 
-; 45
+@ 45
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "PAMELA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ALL
 	ec_word POKEMON
 	ec_word ADORE
 	ec_word A
 	ec_word KIND
 	ec_word TRAINER
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word TOO
 	ec_word BAD
 	ec_word YOU
 	ec_word LOST
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word KIND
 	ec_word AND
@@ -1197,24 +1197,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word STRONG
 	.4byte gBattleFrontierTrainerMons_Pamela
 
-; 46
+@ 46
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "ELIZA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word ADORE
 	ec_word POKEMON
 	ec_word LIKE
 	ec_word MY
 	ec_word CHILDREN
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word SO
 	ec_word HAPPY
 	ec_word FOR
 	ec_word MY
 	ec_word POKEMON
-; loss speech
+@ loss speech
 	ec_word OH_DEAR
 	ec_word I_AM
 	ec_word SO
@@ -1223,24 +1223,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THIS
 	.4byte gBattleFrontierTrainerMons_Eliza
 
-; 47
+@ 47
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "MARISA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word PROMISE
 	ec_word TO
 	ec_word BATTLE
 	ec_word SERIOUSLY
 	.2byte -1
-; win speech
+@ win speech
 	ec_word PROMISE
 	ec_word ME
 	ec_word YOU
 	ec_word WILL
 	ec_word DO
 	ec_word BETTER
-; loss speech
+@ loss speech
 	ec_word PROMISE
 	ec_word ME
 	ec_word ANOTHER
@@ -1249,24 +1249,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Marisa
 
-; 48
+@ 48
 	.4byte TRAINER_CLASS_BUG_CATCHER
 	.charmapstr "LEWIS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A_LITTLE
 	ec_word BUG
 	ec_word IS
 	ec_word SCARY
 	ec_word QUES
 	ec_word HAHAHA
-; win speech
+@ win speech
 	ec_word LOOK
 	ec_word LOOK
 	ec_word EXCL
 	ec_word A
 	ec_word SCARY
 	ec_word BUG
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word A
 	ec_word BUG
@@ -1275,24 +1275,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Lewis
 
-; 49
+@ 49
 	.4byte TRAINER_CLASS_BUG_CATCHER
 	.charmapstr "YOSHI$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word BUG
 	ec_word POKEMON
 	ec_word MAKE
 	ec_word ME
 	ec_word FEELING
 	ec_word LOVEY_DOVEY
-; win speech
+@ win speech
 	ec_word BUG
 	ec_word POKEMON
 	ec_word ARE
 	ec_word THE
 	ec_word BEST
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word IGNORANT
 	ec_word ABOUT
@@ -1301,24 +1301,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Yoshi
 
-; 50
+@ 50
 	.4byte TRAINER_CLASS_BUG_CATCHER
 	.charmapstr "DESTIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word WAY
 	ec_word TOO
 	ec_word HOT
 	ec_word HERE
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word ABOUT
 	ec_word TO
 	ec_move1 OVERHEAT
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word I
 	ec_word NEED
@@ -1327,24 +1327,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Destin
 
-; 51
+@ 51
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "KEON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word FORGIVE
 	ec_word ME
 	ec_word BUT
 	ec_word HERE_I_COME
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word FORGIVE
 	ec_word ME
 	ec_word FOR
 	ec_word MY
 	ec_word OVERWHELMING
 	ec_word POWER
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SORRY
 	ec_word ELLIPSIS
@@ -1353,24 +1353,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Keon
 
-; 52
+@ 52
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "STUART$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word PROMISE
 	ec_word YOU
 	ec_word A
 	ec_word HOT
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word THE
 	ec_word MASTER
 	ec_word OF
 	ec_word COOL
 	ec_word THAT_S
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word SEE
 	ec_word I_AM
@@ -1379,24 +1379,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word COOL
 	.4byte gBattleFrontierTrainerMons_Stuart
 
-; 53
+@ 53
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "NESTOR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SHOW
 	ec_word ME
 	ec_word A
 	ec_word REALLY
 	ec_word SMOOTH
 	ec_word MOVE
-; win speech
+@ win speech
 	ec_word THERE
 	ec_word WAS
 	ec_word NOTHING
 	ec_word SMOOTH
 	ec_word ABOUT
 	ec_word THAT
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word REALLY
 	ec_word ARE
@@ -1405,24 +1405,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Nestor
 
-; 54
+@ 54
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "DERRICK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word SEE
 	ec_word YOU
 	ec_move2 MEDITATE
 	ec_word LIKE
 	ec_word ME
-; win speech
+@ win speech
 	ec_word HOW
 	ec_word I
 	ec_move2 MEDITATE
 	ec_word IS
 	ec_word JUST
 	ec_word BEAUTIFUL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_move2 MEDITATE
@@ -1431,24 +1431,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 CALM_MIND
 	.4byte gBattleFrontierTrainerMons_Derrick
 
-; 55
+@ 55
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "BRYSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move2 POISON_POWDER
 	ec_word IS
 	ec_word IN
 	ec_word OUR
 	ec_move2 COTTON_SPORE
 	ec_word MOVE
-; win speech
+@ win speech
 	ec_word HOW_DO
 	ec_word YOU
 	ec_word LIKE
 	ec_word OUR
 	ec_move2 POISON_POWDER
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 COTTON_SPORE
 	ec_word WAS
@@ -1457,24 +1457,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Bryson
 
-; 56
+@ 56
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "CLAYTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HUH_QUES
 	.2byte -1
 	.2byte -1
 	ec_word WHERE
 	ec_word IS_IT_QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WHERE
 	ec_word IS_IT_QUES
 	ec_word I_VE
 	ec_word LOST
 	ec_word MY
 	ec_word POKENAV
-; loss speech
+@ loss speech
 	ec_word WHERE
 	ec_word IS_IT_QUES
 	ec_word I_VE
@@ -1483,24 +1483,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SENSE
 	.4byte gBattleFrontierTrainerMons_Clayton
 
-; 57
+@ 57
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "TRENTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_OVER
 	ec_word FOR
 	ec_word SOME
 	ec_word TASTY
 	ec_word WATER
 	.2byte -1
-; win speech
+@ win speech
 	ec_word MMM
 	ec_word DO
 	ec_word YOU
 	ec_word WANT
 	ec_word SOME
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word GOT
 	ec_word THIS
@@ -1509,24 +1509,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SHOPPING
 	.4byte gBattleFrontierTrainerMons_Trenton
 
-; 58
+@ 58
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "JENSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word WILL
 	ec_word MAKE
 	ec_word YOU
 	ec_word DOWNCAST
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word DON_T
 	ec_word MAKE
 	ec_word THE
 	ec_move1 CUT
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word THE
 	ec_word TRAINER
@@ -1535,24 +1535,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word DOWNCAST
 	.4byte gBattleFrontierTrainerMons_Jenson
 
-; 59
+@ 59
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "WESLEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_pokemon2 MEW
 	ec_pokemon2 MEW
 	ec_word IS
 	ec_word HOW
 	ec_word I
 	ec_word CRY
-; win speech
+@ win speech
 	ec_word YES
 	ec_word I
 	ec_word KNOW
 	ec_word I_AM
 	ec_word CUTE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_pokemon2 MEW
 	ec_pokemon2 MEW
 	ec_word EXCL
@@ -1561,24 +1561,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Wesley
 
-; 60
+@ 60
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "ANTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GET
 	ec_word READY
 	ec_word FOR
 	ec_word ME
 	ec_word TO
 	ec_move1 THRASH
-; win speech
+@ win speech
 	ec_word WAHAHAHA
 	ec_word EXCL
 	ec_word SORRY
 	ec_word ABOUT
 	ec_word THAT
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word A
 	ec_word TOUGH
@@ -1587,24 +1587,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 SWALLOW
 	.4byte gBattleFrontierTrainerMons_Anton
 
-; 61
+@ 61
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "LAWSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word YOUNG
 	ec_word AT
 	ec_word HEART
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word NOT
 	ec_word COOL
 	ec_word EXCL
 	ec_word NOT
 	ec_word AT
 	ec_word ALL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word OLD
 	ec_word AND
@@ -1613,24 +1613,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Lawson
 
-; 62
+@ 62
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "SAMMY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word PARTY
 	ec_word IS
 	ec_word READY
 	ec_word TO
 	ec_word ROCK
-; win speech
+@ win speech
 	ec_word MY
 	ec_word PARTY
 	ec_word IS
 	ec_word JUST
 	ec_word INCREDIBLE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word CRY
 	ec_word FOR
@@ -1639,24 +1639,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Sammy
 
-; 63
+@ 63
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "ARNIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NO_1
 	ec_word I
 	ec_word HAVE
 	ec_word NO
 	ec_word RIVAL
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SEE
 	ec_word QUES
 	ec_word I
 	ec_word CAN_T
 	ec_word LOSE
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word EXCL
 	ec_word I
@@ -1665,24 +1665,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THIS
 	.4byte gBattleFrontierTrainerMons_Arnie
 
-; 64
+@ 64
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "ADRIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YAHOO
 	ec_word EXCL
 	.2byte -1
 	ec_word YAHOO
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word EXCL
 	.2byte -1
 	ec_word THANK_YOU
 	ec_word EXCL_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word GOOD_BYE
 	ec_word EXCL
 	.2byte -1
@@ -1691,24 +1691,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Adrian
 
-; 65
+@ 65
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "TRISTAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CONFUSED
 	ec_word QUES
 	.2byte -1
 	ec_word I_AM
 	ec_word A
 	ec_word GENIUS
-; win speech
+@ win speech
 	ec_word SEE
 	ec_word QUES
 	.2byte -1
 	ec_word I_AM
 	ec_word A
 	ec_word GENIUS
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word A
@@ -1717,24 +1717,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BATTLE
 	.4byte gBattleFrontierTrainerMons_Tristan
 
-; 66
+@ 66
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "JULIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word THINK
 	ec_word I_AM
 	ec_word SHOPPING
 	ec_word TOO
 	ec_word MUCH
-; win speech
+@ win speech
 	ec_word BUT
 	ec_word I
 	ec_word WANT
 	ec_word A
 	ec_word POKEMON
 	ec_word PLUSH_DOLL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word SO
 	ec_word WANT
@@ -1743,24 +1743,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word PLUSH_DOLL
 	.4byte gBattleFrontierTrainerMons_Juliana
 
-; 67
+@ 67
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "RYLEE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SHOW
 	ec_word ME
 	ec_word THAT
 	ec_word YOU
 	ec_word HAVE
 	ec_word GUTS
-; win speech
+@ win speech
 	ec_word BYE_BYE
 	ec_word EXCL
 	ec_word YOU
 	ec_word HAVE
 	ec_word NO
 	ec_word GUTS
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word GUTSY
 	ec_word ELLIPSIS
@@ -1769,24 +1769,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SUPER
 	.4byte gBattleFrontierTrainerMons_Rylee
 
-; 68
+@ 68
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "CHELSEA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word SERIOUSLY
 	ec_word MEAN
 	ec_word TO
 	ec_word WIN
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word MY
 	ec_word WILL
 	ec_word TO
 	ec_word WIN
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word FAR
 	ec_word TOO_STRONG
@@ -1795,24 +1795,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Chelsea
 
-; 69
+@ 69
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "DANELA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word MUST_BE
 	ec_word MY
 	ec_word OPPONENT
 	ec_word NOW
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word OH_DEAR
 	ec_word TOO_WEAK
 	ec_word EXCL
 	ec_word DON_T
 	ec_word GIVE_UP
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word GOOD
 	ec_word AND
@@ -1821,24 +1821,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word GOOD_BYE
 	.4byte gBattleFrontierTrainerMons_Danela
 
-; 70
+@ 70
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "LIZBETH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF_I_LOSE
 	ec_word YOU
 	ec_word CAN
 	ec_word HAVE
 	ec_word A
 	ec_move2 PRESENT
-; win speech
+@ win speech
 	ec_word HERE_IT_IS
 	ec_word A_LITTLE
 	ec_word PRAISE
 	ec_word AS
 	ec_word YOUR
 	ec_move2 PRESENT
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_move2 PRESENT
 	ec_word QUES_EXCL
@@ -1847,24 +1847,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move1 DOUBLE_SLAP
 	.4byte gBattleFrontierTrainerMons_Lizbeth
 
-; 71
+@ 71
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "AMELIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word BELIEVE
 	ec_word IN
 	ec_word CUTE
 	ec_word FASHION
 	ec_word APPEAL
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word FASHION
 	ec_word SENSE
 	ec_word IS
 	ec_word A
 	ec_word DISASTER
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word AWFUL
 	ec_word EXCL
@@ -1873,24 +1873,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HOME
 	.4byte gBattleFrontierTrainerMons_Amelia
 
-; 72
+@ 72
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "JILLIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WHAT
 	ec_word IS
 	ec_word THAT
 	ec_word I
 	ec_word SMELL
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word THE
 	ec_move1 SWEET_SCENT
 	ec_word OF
 	ec_word TASTY
 	ec_word WATER
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word YOUR
 	ec_word OFFENSIVE
@@ -1899,24 +1899,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WHAT
 	.4byte gBattleFrontierTrainerMons_Jillian
 
-; 73
+@ 73
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "ABBIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word TRY
 	ec_word MY
 	ec_word SECRET
 	ec_move1 AROMATHERAPY
 	ec_word OK_QUES
-; win speech
+@ win speech
 	ec_word MY
 	ec_move1 AROMATHERAPY
 	ec_word IS
 	ec_word TERRIBLE
 	ec_word FOR
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word DIDN_T
 	ec_word YOU
 	ec_word SMELL
@@ -1925,24 +1925,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES_EXCL
 	.4byte gBattleFrontierTrainerMons_Abbie
 
-; 74
+@ 74
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "BRIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word BOY
 	ec_word FRIEND
 	ec_word WORKS
 	ec_word TOO
 	ec_word MUCH
-; win speech
+@ win speech
 	ec_word I
 	ec_word ONLY
 	ec_word MISS
 	ec_word HIM
 	ec_word MORE
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SO
 	ec_word LONESOME
@@ -1951,24 +1951,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Briana
 
-; 75
+@ 75
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "ANTONIO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word KNOW
 	ec_word HOW
 	ec_word TO
 	ec_word GO
 	ec_word GO
-; win speech
+@ win speech
 	ec_word BUT
 	ec_word I
 	ec_word DON_T
 	ec_word LIKE
 	ec_word TO
 	ec_word DANCE
-; loss speech
+@ loss speech
 	ec_word GO
 	ec_word GO
 	ec_word ELLIPSIS
@@ -1977,24 +1977,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ABOUT
 	.4byte gBattleFrontierTrainerMons_Antonio
 
-; 76
+@ 76
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "JADEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HELLO
 	ec_word I
 	ec_word THINK
 	ec_word I
 	ec_word ADORE
 	ec_word YOU
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word MAKE
 	ec_word ME
 	ec_move1 THRASH
 	ec_word IN
 	ec_move2 FRUSTRATION
-; loss speech
+@ loss speech
 	ec_word THIS_IS_IT_EXCL
 	.2byte -1
 	.2byte -1
@@ -2003,24 +2003,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Jaden
 
-; 77
+@ 77
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "DAKOTA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word TO
 	ec_word DANCE
 	ec_word WITH
 	ec_word POWER
-; win speech
+@ win speech
 	ec_word GOT
 	ec_word IT
 	ec_word QUES
 	ec_word DANCE
 	ec_word WITH
 	ec_word POWER
-; loss speech
+@ loss speech
 	ec_word OKAY
 	ec_word YOU
 	ec_word UNDERSTAND
@@ -2029,24 +2029,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Dakota
 
-; 78
+@ 78
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "BRAYDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COLOR_CHANGE
 	ec_word VERSION
 	ec_word TOYS
 	ec_word ARE
 	ec_word USELESS
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word ONLY
 	ec_word COLLECT
 	ec_word NORMAL
 	ec_word VERSION
 	ec_word TOYS
-; loss speech
+@ loss speech
 	ec_word I
 	ec_move2 ATTRACT
 	ec_word COLOR_CHANGE
@@ -2055,24 +2055,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Brayden
 
-; 79
+@ 79
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "CORSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word GET
 	ec_word TO
 	ec_move2 BEAT_UP
 	ec_word ON
 	ec_word YOU
-; win speech
+@ win speech
 	ec_word TOO
 	ec_word EASY
 	ec_word EXCL
 	ec_word I_AM
 	ec_word SO
 	ec_word COOL
-; loss speech
+@ loss speech
 	ec_word WHY
 	ec_word QUES_EXCL
 	.2byte -1
@@ -2081,24 +2081,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Corson
 
-; 80
+@ 80
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "TREVIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THERE
 	ec_word IS
 	ec_word NONE
 	ec_word BETTER
 	ec_word THAN
 	ec_word ME
-; win speech
+@ win speech
 	ec_word YES_SIR_EXCL
 	.2byte -1
 	.2byte -1
 	ec_word I_AM
 	ec_word THE
 	ec_word BEST
-; loss speech
+@ loss speech
 	ec_word SERIOUS
 	ec_word QUES_EXCL
 	.2byte -1
@@ -2107,24 +2107,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Trevin
 
-; 81
+@ 81
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "PATRICK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word PERFECT
 	ec_word EXCL
 	ec_word GIVE_UP
 	ec_word NOW
 	.2byte -1
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_word BE
 	ec_word DISAPPOINTED
 	ec_word I_AM
 	ec_word PERFECT
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word BUT
 	ec_word HOW
 	ec_word QUES
@@ -2133,24 +2133,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Patrick
 
-; 82
+@ 82
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "KADEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WHAT
 	ec_word ARE
 	ec_word YOU
 	ec_word UP
 	ec_word TO
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word WERE
 	ec_word A
 	ec_word SURPRISE
 	ec_word TO_ME
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DON_T
 	ec_word KNOW
@@ -2159,24 +2159,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Kaden
 
-; 83
+@ 83
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "MAXWELL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HEY_THERE
 	ec_word WHO_IS
 	ec_word YOUR
 	ec_word RIVAL
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word MY
 	ec_word RIVAL
 	ec_word IS
 	ec_word MY
 	ec_word GIRL
 	ec_word FRIEND
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word MAKING
 	ec_word YOU
@@ -2185,24 +2185,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Maxwell
 
-; 84
+@ 84
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "DARYL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word ONLY
 	ec_word KNOW
 	ec_word HOW
 	ec_word TO
 	ec_move1 CHARGE
-; win speech
+@ win speech
 	ec_word AM
 	ec_word I
 	ec_word OVERWHELMING
 	ec_word OR
 	ec_word WHAT
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word GOING
 	ec_word TO
@@ -2211,24 +2211,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Daryl
 
-; 85
+@ 85
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "KENNETH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word BETTER
 	ec_word NOT
 	ec_move2 SLACK_OFF
 	ec_word WITH
 	ec_word ME
-; win speech
+@ win speech
 	ec_word DID
 	ec_word MY
 	ec_move2 TAUNT
 	ec_word INTIMIDATE
 	ec_word YOU
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SORRY
 	ec_word ELLIPSIS
@@ -2237,24 +2237,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Kenneth
 
-; 86
+@ 86
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "RICH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_move1 FACADE
 	ec_word DOESN_T
 	ec_move2 TRICK
 	ec_word ME
 	.2byte -1
-; win speech
+@ win speech
 	ec_word SERIOUSLY
 	ec_word ARE
 	ec_word YOU
 	ec_word REALLY
 	ec_word OK_QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word REALLY
 	ec_word TOUGH
@@ -2263,24 +2263,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Rich
 
-; 87
+@ 87
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "CADEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CAN_T
 	ec_word BE
 	ec_word DEFEATED
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word FIRE
 	ec_word EXCL
 	.2byte -1
 	ec_word FIRE
 	ec_word EXCL_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word TIRED
 	ec_word ELLIPSIS
@@ -2289,24 +2289,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HOT
 	.4byte gBattleFrontierTrainerMons_Caden
 
-; 88
+@ 88
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "MARLON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word POKEDEX
 	ec_word IS
 	ec_word A_LITTLE
 	ec_word RADIO
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word A_LITTLE
 	ec_word RADIO
 	ec_word HUH_QUES
 	ec_word THAT_S
 	ec_word TOTALLY
 	ec_word COOL
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word NOT
 	ec_word QUES
@@ -2315,24 +2315,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Marlon
 
-; 89
+@ 89
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "NASH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word ON
 	ec_word FIRE
 	ec_word BABY
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word LEFT
 	ec_word YOU
 	ec_word JUST
 	ec_word AN
 	ec_move2 EMBER
-; loss speech
+@ loss speech
 	ec_word AIYEEH
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -2341,24 +2341,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word PLEASE
 	.4byte gBattleFrontierTrainerMons_Nash
 
-; 90
+@ 90
 	.4byte TRAINER_CLASS_TRIATHLETE_3
 	.charmapstr "ROBBY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HAHAHA
 	ec_word EXCL
 	ec_word HAPPY
 	ec_word TO
 	ec_word MEET_YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word THE
 	ec_word LEADER
 	ec_word WITH
 	ec_word REFRESHING
 	ec_word SERENE_GRACE
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_move1 THRASH
@@ -2367,24 +2367,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Robby
 
-; 91
+@ 91
 	.4byte TRAINER_CLASS_TRIATHLETE_3
 	.charmapstr "REECE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 QUICK_ATTACK
 	ec_word CAN
 	ec_word BEAT
 	ec_word A
 	ec_move2 TELEPORT
-; win speech
+@ win speech
 	ec_word LIKE
 	ec_word I
 	ec_word SAID
 	ec_word I_AM
 	ec_word DARN
 	ec_word FAST
-; loss speech
+@ loss speech
 	ec_word I_WAS
 	ec_word KIDDING
 	ec_word ABOUT
@@ -2393,24 +2393,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THING
 	.4byte gBattleFrontierTrainerMons_Reece
 
-; 92
+@ 92
 	.4byte TRAINER_CLASS_TRIATHLETE_4
 	.charmapstr "KATHRYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word TRAIN
 	ec_word GOOD
 	ec_word ENOUGH
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_move2 TAUNT
 	ec_word ME
 	ec_word LIKE
 	ec_word THAT
 	ec_word OK_QUES
-; loss speech
+@ loss speech
 	ec_word WHY
 	ec_word COULDN_T
 	ec_word I
@@ -2419,24 +2419,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Kathryn
 
-; 93
+@ 93
 	.4byte TRAINER_CLASS_TRIATHLETE_4
 	.charmapstr "ELLEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CRUSH
 	ec_word YOU
 	ec_word LIKE
 	ec_word AN
 	ec_word EGG
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word A
 	ec_word TASTY
 	ec_word VICTORY
 	ec_word FOR
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word TOO
 	ec_word TOUGH
 	ec_word TO
@@ -2445,24 +2445,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Ellen
 
-; 94
+@ 94
 	.4byte TRAINER_CLASS_TRIATHLETE_5
 	.charmapstr "RAMON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OKAY
 	ec_word EXCL
 	.2byte -1
 	ec_word THIS
 	ec_word IS
 	ec_word PERFECTION
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word HAPPY
 	ec_word THAT
 	ec_word I
 	ec_word WON
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word A
 	ec_word SECRET
@@ -2471,24 +2471,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HAPPY
 	.4byte gBattleFrontierTrainerMons_Ramon
 
-; 95
+@ 95
 	.4byte TRAINER_CLASS_TRIATHLETE_5
 	.charmapstr "ARTHUR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HERE_I_COME
 	ec_word FEELING
 	ec_word READY
 	ec_word FOR
 	ec_word IT
 	ec_word ALL
-; win speech
+@ win speech
 	ec_word THAT_S_IT_EXCL
 	.2byte -1
 	.2byte -1
 	ec_word THAT_WAS
 	ec_word FABULOUS
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word NOT
 	ec_word WHAT
@@ -2497,24 +2497,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Arthur
 
-; 96
+@ 96
 	.4byte TRAINER_CLASS_TRIATHLETE_6
 	.charmapstr "ALONDRA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word EVERY
 	ec_word DAY
 	ec_word IS
 	ec_word A
 	ec_word GREAT
 	ec_word DAY
-; win speech
+@ win speech
 	ec_word MY
 	ec_move2 DIVE
 	ec_word WILL
 	ec_word BE
 	ec_word A
 	ec_word LEGEND
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 DIVE
 	ec_word LEFT
@@ -2523,24 +2523,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Alondra
 
-; 97
+@ 97
 	.4byte TRAINER_CLASS_TRIATHLETE_6
 	.charmapstr "ADRIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME
 	ec_word SEE
 	ec_word AN
 	ec_word INCREDIBLE
 	ec_word SWIFT_SWIM
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word MAKE
 	ec_word IT
 	ec_word LOOK
 	ec_word SO
 	ec_word EASY
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_move2 BEAT_UP
@@ -2549,24 +2549,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Adriana
 
-; 98
+@ 98
 	.4byte TRAINER_CLASS_TRIATHLETE_1
 	.charmapstr "MALIK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OH
 	ec_word NOT
 	ec_word ANOTHER
 	ec_word BATTLE
 	ec_word PLEASE
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word I
 	ec_word FINALLY
 	ec_word WON
 	ec_word ELLIPSIS
 	ec_word I_AM
 	ec_word TIRED
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word FINALLY
 	ec_word LOST
@@ -2575,24 +2575,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TIRED
 	.4byte gBattleFrontierTrainerMons_Malik
 
-; 99
+@ 99
 	.4byte TRAINER_CLASS_TRIATHLETE_2
 	.charmapstr "JILL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word THE
 	ec_move2 QUICK_ATTACK
 	ec_word TRAINER
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THE
 	ec_move2 QUICK_ATTACK
 	ec_word TRAINER
 	ec_word WINS
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THE
 	ec_move2 QUICK_ATTACK
 	ec_word TRAINER
@@ -2601,24 +2601,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Jill
 
-; 100
+@ 100
 	.4byte TRAINER_CLASS_TRIATHLETE_3
 	.charmapstr "ERIK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word THE
 	ec_word SPEED_BOOST
 	ec_word HERO
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word FROM
 	ec_word THE
 	ec_word SPEED_BOOST
 	ec_word HERO
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word WAAAH
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -2627,24 +2627,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL_EXCL
 	.4byte gBattleFrontierTrainerMons_Erik
 
-; 101
+@ 101
 	.4byte TRAINER_CLASS_TRIATHLETE_4
 	.charmapstr "YAZMIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WOULD
 	ec_word RATHER
 	ec_word RUN
 	ec_word THAN
 	ec_word BIKE
-; win speech
+@ win speech
 	ec_word YES
 	ec_word I
 	ec_word WOULD
 	ec_word MUCH
 	ec_word RATHER
 	ec_word RUN
-; loss speech
+@ loss speech
 	ec_word BYE_BYE
 	ec_word EXCL
 	ec_word I_AM
@@ -2653,24 +2653,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word RUN_AWAY
 	.4byte gBattleFrontierTrainerMons_Yazmin
 
-; 102
+@ 102
 	.4byte TRAINER_CLASS_TRIATHLETE_5
 	.charmapstr "JAMAL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
 	ec_word BE
 	ec_word A
 	ec_word FATHER
-; win speech
+@ win speech
 	ec_word I
 	ec_word CAN_T
 	ec_word WAIT
 	ec_word FOR
 	ec_word MY
 	ec_word BABY
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word BABY
 	ec_word WILL
@@ -2679,24 +2679,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word AWESOME
 	.4byte gBattleFrontierTrainerMons_Jamal
 
-; 103
+@ 103
 	.4byte TRAINER_CLASS_TRIATHLETE_6
 	.charmapstr "LESLIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
 	ec_word BE
 	ec_word A
 	ec_word MOTHER
-; win speech
+@ win speech
 	ec_word A
 	ec_word BABY
 	ec_word WILL
 	ec_word BE
 	ec_word A_LITTLE
 	ec_word CHALLENGE
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word TOO
 	ec_word HAPPY
@@ -2705,24 +2705,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ANGRY
 	.4byte gBattleFrontierTrainerMons_Leslie
 
-; 104
+@ 104
 	.4byte TRAINER_CLASS_TRIATHLETE_1
 	.charmapstr "DAVE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WHAT
 	ec_word SHOULD
 	ec_word I
 	ec_word DO
 	ec_word TODAY
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I
 	ec_word SHOULD
 	ec_word ENJOY
 	ec_word SOME
 	ec_word SPORTS
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_word GO
@@ -2731,24 +2731,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word GAME
 	.4byte gBattleFrontierTrainerMons_Dave
 
-; 105
+@ 105
 	.4byte TRAINER_CLASS_TRIATHLETE_1
 	.charmapstr "CARLO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HAH
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word YEAH
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word DO
 	ec_word THINGS
 	ec_word AT
 	ec_move1 EXTREME_SPEED
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word LOST
 	ec_word AT
@@ -2757,24 +2757,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Carlo
 
-; 106
+@ 106
 	.4byte TRAINER_CLASS_TRIATHLETE_2
 	.charmapstr "EMILIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ME
 	ec_word WORRY
 	ec_word QUES
 	ec_word I
 	ec_word HAVE
 	ec_word NONE
-; win speech
+@ win speech
 	ec_word AHAHA
 	ec_word SEE
 	ec_word QUES
 	ec_word THAT_WAS
 	ec_word FANTASTIC
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word AHAHA
 	ec_word SEE
 	ec_word QUES
@@ -2783,24 +2783,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Emilia
 
-; 107
+@ 107
 	.4byte TRAINER_CLASS_TRIATHLETE_2
 	.charmapstr "DALIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word BIKE
 	ec_word IS
 	ec_word VERY
 	ec_word EXPENSIVE
 	.2byte -1
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_word COME
 	ec_word NEAR
 	ec_word MY
 	ec_word BIKE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word BIKE
 	ec_word IS
@@ -2809,24 +2809,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word FRIEND
 	.4byte gBattleFrontierTrainerMons_Dalia
 
-; 108
+@ 108
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "HITOMI$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YEAH
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word HAH
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WHAT
 	ec_word QUES_EXCL
 	.2byte -1
 	ec_word I
 	ec_word WON
 	ec_word QUES_EXCL
-; loss speech
+@ loss speech
 	ec_word AIYEEH
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -2835,24 +2835,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL_EXCL
 	.4byte gBattleFrontierTrainerMons_Hitomi
 
-; 109
+@ 109
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "RICARDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word EXCL
 	ec_word PLAY
 	ec_word TIME
 	ec_word IS
 	ec_word OVER
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word OUT
 	ec_word OF
 	ec_word HERE
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word DON_T
 	ec_word HIT
@@ -2861,24 +2861,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Ricardo
 
-; 110
+@ 110
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "SHIZUKA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SHOW
 	ec_word ME
 	ec_word THAT
 	ec_word YOU_RE
 	ec_word SERIOUS
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word WON_T
 	ec_word FORGET
 	ec_word ABOUT
 	ec_word YOU
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word PERFECT
 	ec_word IN
@@ -2887,24 +2887,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Shizuka
 
-; 111
+@ 111
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "JOANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word GOING
 	ec_word TO
 	ec_word LOSE
 	ec_word RIGHT
 	ec_word AWAY
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word THE
 	ec_word WINNER
 	ec_word HEAR
 	ec_word ME
 	ec_move2 ROAR
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word REFUSE
 	ec_word TO
@@ -2913,24 +2913,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move1 OUTRAGE
 	.4byte gBattleFrontierTrainerMons_Joana
 
-; 112
+@ 112
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "KELLY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word NIGHT
 	ec_word SCHOOL
 	ec_word IS
 	ec_word REALLY
 	ec_word SCARY
-; win speech
+@ win speech
 	ec_word A
 	ec_word LADY
 	ec_word GHOST
 	ec_word APPEARS
 	ec_word THERE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THE
 	ec_word HOME
 	ec_word WORK
@@ -2939,24 +2939,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SCARY
 	.4byte gBattleFrontierTrainerMons_Kelly
 
-; 113
+@ 113
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "RAYNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NO_1
 	ec_word WHEN
 	ec_word IT_S
 	ec_word ABOUT
 	ec_word POWER
-; win speech
+@ win speech
 	ec_word UNDERSTAND
 	ec_word MY
 	ec_word POWER
 	ec_word NOW
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word TERRIBLE
 	ec_word ELLIPSIS
 	.2byte -1
@@ -2965,24 +2965,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Rayna
 
-; 114
+@ 114
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "EVAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word EVERY
 	ec_word BATTLE
 	ec_word HAS
 	ec_word A
 	ec_word SMELL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word OH
 	ec_word EXCL
 	ec_word THE
 	ec_move1 SWEET_SCENT
 	ec_word OF
 	ec_word VICTORY
-; loss speech
+@ loss speech
 	ec_word THE
 	ec_word AWFUL
 	ec_word STENCH
@@ -2991,24 +2991,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOSS
 	.4byte gBattleFrontierTrainerMons_Evan
 
-; 115
+@ 115
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "JORDAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GOOD
 	ec_word EXCL
 	.2byte -1
 	ec_word COME_ON
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word BEAT
 	ec_word ME
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word QUES_EXCL
 	.2byte -1
@@ -3017,24 +3017,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Jordan
 
-; 116
+@ 116
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "JOEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word FUFUFU
 	ec_word ELLIPSIS
 	.2byte -1
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word GIGGLE
 	ec_word ELLIPSIS
 	.2byte -1
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word HAHAHA
 	ec_word ELLIPSIS
 	.2byte -1
@@ -3043,24 +3043,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Joel
 
-; 117
+@ 117
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "KRISTEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HAHAHA
 	ec_word ELLIPSIS
 	.2byte -1
 	ec_word A
 	ec_word KID
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word JUST
 	ec_word A_LITTLE
 	ec_word KID
 	ec_word AFTER
 	ec_word ALL
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word A
 	ec_word TOUGH
 	ec_word KID
@@ -3069,24 +3069,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Kristen
 
-; 118
+@ 118
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "SELPHY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HUH_QUES
 	ec_word WHAT
 	ec_word IS_IT_QUES
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word OH
 	ec_word YES
 	ec_word EXCL
 	ec_word WHY
 	ec_word NOT
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word NO
 	ec_word EXCL
@@ -3095,24 +3095,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Selphy
 
-; 119
+@ 119
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "CHLOE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME
 	ec_word WE
 	ec_word WILL
 	ec_word DO
 	ec_word BATTLE
 	ec_word NOW
-; win speech
+@ win speech
 	ec_word MORE
 	ec_word EXCL
 	.2byte -1
 	ec_word ANOTHER
 	ec_word BATTLE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word EXCL
 	.2byte -1
@@ -3121,24 +3121,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ARE
 	.4byte gBattleFrontierTrainerMons_Chloe
 
-; 120
+@ 120
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "NORTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word KNOW
 	ec_word ONLY
 	ec_word YOU
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word EXCUSE_ME
 	ec_word BUT
 	ec_word YOU_RE
 	ec_word A
 	ec_word PUSHOVER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word SOME
 	ec_word KIND
@@ -3147,24 +3147,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Norton
 
-; 121
+@ 121
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "LUKAS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word JOKING
 	ec_word IS
 	ec_word PRETTY
 	ec_word TERRIBLE
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word ROCK_HEAD
 	ec_word EXISTS
 	ec_word TO
 	ec_word SHINE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_word ROCK_HEAD
 	ec_word COME
@@ -3173,24 +3173,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Lukas
 
-; 122
+@ 122
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "ZACH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word AN
 	ec_word EXCELLENT
 	ec_move2 MIMIC
 	ec_word OF
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word HAPPY
 	ec_word LIKE
 	ec_word A_LITTLE
 	ec_pokemon2 TOGEPI
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word ANGRY
 	ec_word LIKE
@@ -3199,24 +3199,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Zach
 
-; 123
+@ 123
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "KAITLYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CRUSH
 	ec_word THINGS
 	ec_word WITH
 	ec_word PSYCHIC
 	ec_word POWER
-; win speech
+@ win speech
 	ec_word MY
 	ec_word VICTORY
 	ec_word WILL
 	ec_word MAKE
 	ec_word THE
 	ec_word NEWS
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word NO
 	ec_word ELLIPSIS
@@ -3225,24 +3225,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word DO
 	.4byte gBattleFrontierTrainerMons_Kaitlyn
 
-; 124
+@ 124
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "BREANNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word WILL
 	ec_word CRUSH
 	ec_word YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word HAVE
 	ec_word SOME
 	ec_word MORE
 	ec_word OF
 	ec_word THIS
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word GUTS
@@ -3251,24 +3251,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Breanna
 
-; 125
+@ 125
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "KENDRA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF
 	ec_word YOU_RE
 	ec_word SMART
 	ec_word STOP
 	ec_word RIGHT
 	ec_word NOW
-; win speech
+@ win speech
 	ec_word I
 	ec_word SAID
 	ec_word THAT
 	ec_word YOU
 	ec_word SHOULD
 	ec_word STOP
-; loss speech
+@ loss speech
 	ec_word WHY
 	ec_word DIDN_T
 	ec_word YOU
@@ -3277,24 +3277,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Kendra
 
-; 126
+@ 126
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "MOLLY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WILL
 	ec_word MY
 	ec_word CUTE_CHARM
 	ec_move2 ATTRACT
 	ec_word YOU
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
 	ec_word MY
 	ec_word TOYS
 	ec_word NOW
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word HOW
 	ec_word COULD
@@ -3303,24 +3303,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Molly
 
-; 127
+@ 127
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "JAZMIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word FORECAST
 	ec_word TERRIBLE
 	ec_word THINGS
 	ec_word FOR
 	ec_word YOU
-; win speech
+@ win speech
 	ec_word THERE
 	ec_word WASN_T
 	ec_word MY
 	ec_word FORECAST
 	ec_word RIGHT
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 FORESIGHT
 	ec_word DIDN_T
@@ -3329,24 +3329,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THIS
 	.4byte gBattleFrontierTrainerMons_Jazmin
 
-; 128
+@ 128
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "KELSEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word HAVEN_T
 	ec_word SLEPT
 	ec_word IN
 	ec_word DAYS
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word MY
 	ec_word SLEEP
 	ec_word WILL
 	ec_word BE
 	ec_word EXCELLENT
 	ec_word NOW
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word DESTROYED
@@ -3355,24 +3355,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Kelsey
 
-; 129
+@ 129
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "JALEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word ALLOW
 	ec_word POKEMON
 	ec_word TO
 	ec_move1 THRASH
-; win speech
+@ win speech
 	ec_word HAHAHA
 	ec_word EXCL
 	ec_word ARE
 	ec_word YOU
 	ec_word ANGRY
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word WHY
 	ec_word IS
 	ec_word THIS
@@ -3381,24 +3381,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Jalen
 
-; 130
+@ 130
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "GRIFFEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 SWALLOW
 	ec_move2 SLUDGE
 	ec_word TO
 	ec_move2 TRANSFORM
 	ec_word MYSELF
-; win speech
+@ win speech
 	ec_word I
 	ec_word HAVE
 	ec_word A
 	ec_move1 GROWTH
 	ec_word OF
 	ec_move2 ACID_ARMOR
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word HAVE
 	ec_word A
@@ -3407,24 +3407,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SUCTION_CUPS
 	.4byte gBattleFrontierTrainerMons_Griffen
 
-; 131
+@ 131
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "XANDER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word GOT
 	ec_word MY
 	ec_word POKEMON
 	ec_word ON
 	ec_word RENTAL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word INCREDIBLE
 	ec_word MY
 	ec_word RENTAL
 	ec_word POKEMON
 	ec_word WON
-; loss speech
+@ loss speech
 	ec_word RENTAL
 	ec_word POKEMON
 	ec_word AREN_T
@@ -3433,24 +3433,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 SCRATCH
 	.4byte gBattleFrontierTrainerMons_Xander
 
-; 132
+@ 132
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "MARVIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word UP
 	ec_word TO
 	ec_word THE
 	ec_word CHALLENGE
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I
 	ec_word DIDN_T
 	ec_word THINK
 	ec_word YOU_RE
 	ec_word GOOD
 	ec_word ENOUGH
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word PERFECT
@@ -3459,24 +3459,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MUCH
 	.4byte gBattleFrontierTrainerMons_Marvin
 
-; 133
+@ 133
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "BRENNAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 WISH
 	ec_word TO
 	ec_word SEE
 	ec_word THE
 	ec_word NEWS
-; win speech
+@ win speech
 	ec_word COMICS
 	ec_word GET
 	ec_word DAMP
 	ec_word FROM
 	ec_word DRIZZLE
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word THE
 	ec_word TIGHT
 	ec_word MONEY
@@ -3485,24 +3485,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES_EXCL
 	.4byte gBattleFrontierTrainerMons_Brennan
 
-; 134
+@ 134
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "BALEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move1 SCREECH
 	ec_word IS
 	ec_word LIKE
 	ec_word MUSIC
 	ec_word TO_ME
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word MY
 	ec_move1 SCREECH
 	ec_word STRATEGY
 	ec_word IS
 	ec_word THE
 	ec_word BEST
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word SOUNDPROOF
 	ec_word QUES
@@ -3511,24 +3511,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Baley
 
-; 135
+@ 135
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "ZACKARY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CAN
 	ec_word YOU
 	ec_move1 DIG
 	ec_word IT
 	ec_word YO
 	ec_word QUES
-; win speech
+@ win speech
 	ec_move2 TAKE_DOWN
 	ec_word TAKE
 	ec_word A
 	ec_move2 DIVE
 	ec_word YO
 	ec_word YO
-; loss speech
+@ loss speech
 	ec_word BREAK
 	ec_word DOWN
 	ec_move2 DIVE
@@ -3537,24 +3537,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ME
 	.4byte gBattleFrontierTrainerMons_Zackary
 
-; 136
+@ 136
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "GABRIEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move2 POUND
 	ec_word THE
 	ec_word THICK_FAT
 	ec_word ON
 	ec_word MY
 	ec_move2 BELLY_DRUM
-; win speech
+@ win speech
 	ec_move2 POUND
 	ec_word MY
 	ec_move2 BELLY_DRUM
 	ec_move2 POUND
 	ec_word MY
 	ec_move2 BELLY_DRUM
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 BELLY_DRUM
 	ec_word WAS
@@ -3563,24 +3563,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Gabriel
 
-; 137
+@ 137
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "EMILY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HOW
 	ec_word ABOUT
 	ec_word A_TINY_BIT
 	ec_word OF
 	ec_move1 HYPNOSIS
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word MY
 	ec_move1 HYPNOSIS
 	ec_word STRATEGY
 	ec_word WORKS
 	ec_word TO
 	ec_word PERFECTION
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move1 HYPNOSIS
 	ec_word STRATEGY
@@ -3589,24 +3589,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Emily
 
-; 138
+@ 138
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "JORDYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word DON_T
 	ec_word KNOW
 	ec_word MY
 	ec_word SECRET
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word AS
 	ec_word I
 	ec_word APPEAR
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word BUT
 	ec_word HOW
 	ec_word DID
@@ -3615,24 +3615,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Jordyn
 
-; 139
+@ 139
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "SOFIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_pokemon1 LOUDRED
 	ec_word PROBABLY
 	ec_word HAS
 	ec_word A
 	ec_move1 SWEET_SCENT
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word THE
 	ec_word FEELING
 	ec_word THAT
 	ec_word I
 	ec_word GET
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WORK
 	ec_word AT
@@ -3641,24 +3641,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Sofia
 
-; 140
+@ 140
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "BRADEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_CHOOSE_YOU
 	ec_word EXCL
 	.2byte -1
 	ec_word THIS_IS_IT_EXCL
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word PRETTY
 	ec_word AWESOME
 	ec_word ABOUT
 	ec_word MYSELF
-; loss speech
+@ loss speech
 	ec_word ALL_RIGHT
 	ec_word EXCL
 	.2byte -1
@@ -3667,24 +3667,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Braden
 
-; 141
+@ 141
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "KAYDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THEY
 	ec_word OVERDO
 	ec_word THAT
 	ec_word GOURMET
 	ec_word THING
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word THAT
 	ec_word GOURMET
 	ec_word THING
 	ec_word ISN_T
 	ec_word FOR
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word HEY
 	ec_word THIS
 	ec_word IS
@@ -3693,24 +3693,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Kayden
 
-; 142
+@ 142
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "COOPER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word SHOULD
 	ec_word ABSOLUTELY
 	ec_word BE
 	ec_word A
 	ec_word PUSHOVER
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word TOO
 	ec_word EXCITING
 	ec_word FOR
 	ec_word ME
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word EXCL
 	.2byte -1
@@ -3719,24 +3719,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SORRY
 	.4byte gBattleFrontierTrainerMons_Cooper
 
-; 143
+@ 143
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "JULIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SPIRIT
 	ec_word ALONE
 	ec_word WON_T
 	ec_word MAKE
 	ec_word YOU
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SHOULD
 	ec_word ACCEPT
 	ec_word THIS
 	ec_word WITH
 	ec_word SERENE_GRACE
-; loss speech
+@ loss speech
 	ec_word FOR_NOW
 	ec_word GOOD_BYE
 	ec_word BUT
@@ -3745,24 +3745,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word OVER
 	.4byte gBattleFrontierTrainerMons_Julia
 
-; 144
+@ 144
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "AMARA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WROOOAAR_EXCL
 	ec_word EXCL_EXCL
 	ec_word I_AM
 	ec_word SO
 	ec_word READY
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word LOSE
 	ec_word MYSELF
 	ec_word IF
 	ec_word IT_S
 	ec_word EXCITING
-; loss speech
+@ loss speech
 	ec_word THAT_S
 	ec_word TOO
 	ec_word MUCH
@@ -3771,24 +3771,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Amara
 
-; 145
+@ 145
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "LYNN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_word SECRET
 	ec_word CAN_T
 	ec_word BE
 	ec_word HIDDEN
 	ec_word FOREVER
-; win speech
+@ win speech
 	ec_word I
 	ec_word KNOW
 	ec_word YOUR
 	ec_word SECRET
 	ec_word NOW
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_move1 SAFEGUARD
@@ -3797,24 +3797,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SECRET
 	.4byte gBattleFrontierTrainerMons_Lynn
 
-; 146
+@ 146
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "JOVAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_word BATTLE
 	ec_word SENSE
 	ec_word IS
 	ec_word SADLY
 	ec_word LACKING
-; win speech
+@ win speech
 	ec_word MY
 	ec_word BATTLE
 	ec_word SENSE
 	ec_word IS
 	ec_word COOL
 	ec_word ISN_T_IT_QUES
-; loss speech
+@ loss speech
 	ec_word I_WAS
 	ec_word MINUS
 	ec_word MY
@@ -3823,24 +3823,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TODAY
 	.4byte gBattleFrontierTrainerMons_Jovan
 
-; 147
+@ 147
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "DOMINIC$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word HAVE
 	ec_word THIS
 	ec_word EXCELLENT
 	ec_word CAMERA
 	.2byte -1
-; win speech
+@ win speech
 	ec_word MY
 	ec_word CAMERA
 	ec_word WAS
 	ec_word AWFULLY
 	ec_word EXPENSIVE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word CAMERA
 	ec_word DOESN_T
@@ -3849,24 +3849,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THING
 	.4byte gBattleFrontierTrainerMons_Dominic
 
-; 148
+@ 148
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "NIKOLAS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 MIMIC
 	ec_word POKEMON
 	ec_word AFTER
 	ec_word EVERY
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word IF_I_WIN
 	ec_word I
 	ec_word PRETEND
 	ec_word I_AM
 	ec_word A
 	ec_pokemon2 TAUROS
-; loss speech
+@ loss speech
 	ec_word IF_I_LOSE
 	ec_word I
 	ec_word PRETEND
@@ -3875,24 +3875,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_pokemon2 MILTANK
 	.4byte gBattleFrontierTrainerMons_Nikolas
 
-; 149
+@ 149
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "VALERIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 WISH
 	ec_word YOU
 	ec_word WOULD
 	ec_word NOT
 	ec_move2 GLARE
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word MEAN
 	ec_word EXCL
 	ec_word I
 	ec_word MEAN
 	ec_word REALLY
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word A
@@ -3901,24 +3901,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Valeria
 
-; 150
+@ 150
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "DELANEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SCHOOL
 	ec_word IS
 	ec_word OVER
 	ec_word TIME
 	ec_word TO
 	ec_word PLAY
-; win speech
+@ win speech
 	ec_word MY
 	ec_word BOY
 	ec_word FRIEND
 	ec_word IS
 	ec_word FROM
 	ec_word SCHOOL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word HAVE
 	ec_word TO
@@ -3927,24 +3927,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WEEK
 	.4byte gBattleFrontierTrainerMons_Delaney
 
-; 151
+@ 151
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "MEGHAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SCHOOL
 	ec_word IS
 	ec_word OUT
 	ec_word TIME
 	ec_word TO
 	ec_word PLAY
-; win speech
+@ win speech
 	ec_word MY
 	ec_word BOY
 	ec_word FRIEND
 	ec_word LIKES
 	ec_word COMICS
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word BACK
 	ec_word TO
@@ -3953,24 +3953,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Meghan
 
-; 152
+@ 152
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "ROBERTO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DRAGON
 	ec_word POKEMON
 	ec_word ARE
 	ec_word INVINCIBLE
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word WEREN_T
 	ec_word BAD
 	ec_word I_WAS
 	ec_word JUST
 	ec_word BETTER
-; loss speech
+@ loss speech
 	ec_word AREN_T
 	ec_word YOU
 	ec_word SATISFIED
@@ -3979,24 +3979,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Roberto
 
-; 153
+@ 153
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "DAMIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word PURE_POWER
 	ec_word IS
 	ec_word MACHINE
 	ec_word LIKE
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word MY
 	ec_move2 MACH_PUNCH
 	ec_word WILL
 	ec_word MAKE
 	ec_word A
 	ec_move1 BRICK_BREAK
-; loss speech
+@ loss speech
 	ec_word ARRGH
 	ec_word EXCL
 	.2byte -1
@@ -4005,24 +4005,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Damian
 
-; 154
+@ 154
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "BRODY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word FASHION
 	ec_word SENSE
 	ec_word SEEMS
 	ec_pokemon1 ODDISH
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word MY
 	ec_word FAMILY
 	ec_word STAY_AT_HOME
 	ec_word LOOK
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word QUESTION
 	ec_word YOUR
@@ -4031,24 +4031,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SERIOUSLY
 	.4byte gBattleFrontierTrainerMons_Brody
 
-; 155
+@ 155
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "GRAHAM$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YEAH
 	ec_word EXCL
 	.2byte -1
 	ec_word YEAH_YEAH
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WAHAHAHA
 	ec_word WAHAHAHA
 	ec_word EXCL
 	ec_word WAHAHAHA
 	ec_word WAHAHAHA
 	ec_word EXCL_EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SORRY
 	ec_word ELLIPSIS
@@ -4057,24 +4057,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BAD
 	.4byte gBattleFrontierTrainerMons_Graham
 
-; 156
+@ 156
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "TYLOR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ARE
 	ec_word YOU
 	ec_word FEELING
 	ec_word MY
 	ec_move2 HEAT_WAVE
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YES
 	ec_word I_AM
 	ec_word ON
 	ec_word FIRE
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word BUT
 	ec_word I_WAS
 	ec_word ON
@@ -4083,24 +4083,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Tylor
 
-; 157
+@ 157
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "JAREN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word FIGHTING
 	ec_word SPIRIT
 	ec_word QUES
 	ec_word ME
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word WANT
 	ec_word MORE
 	ec_word CUTE
 	ec_word POKEMON
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word LOOK
@@ -4109,24 +4109,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Jaren
 
-; 158
+@ 158
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "CORDELL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word BATTLE
 	ec_word IS
 	ec_word DECIDED
 	ec_word ON
 	ec_word SPIRIT
-; win speech
+@ win speech
 	ec_word CAN_T
 	ec_word YOU
 	ec_word ACCEPT
 	ec_word THAT
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_word BE
@@ -4135,24 +4135,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WAY
 	.4byte gBattleFrontierTrainerMons_Cordell
 
-; 159
+@ 159
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "JAZLYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IS
 	ec_word YOUR
 	ec_word POKEDEX
 	ec_word REALLY
 	ec_word AWESOME
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word OH_YEAH
 	ec_word WOW
 	ec_word YOUR
 	ec_word POKEDEX
 	ec_word IS
 	ec_word SUPER
-; loss speech
+@ loss speech
 	ec_word AN
 	ec_word AVANT_GARDE
 	ec_word POKEDEX
@@ -4161,24 +4161,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word AWESOME
 	.4byte gBattleFrontierTrainerMons_Jazlyn
 
-; 160
+@ 160
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "ZACHERY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word HAVE
 	ec_word MY
 	ec_word OWN
 	ec_word PLACE
 	ec_word YEEHAW_EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word AN
 	ec_word EXCITING
 	ec_word TIME
 	ec_word FOR
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word FLATTEN
@@ -4187,24 +4187,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Zachery
 
-; 161
+@ 161
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "JOHAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WINTER
 	ec_word WILL
 	ec_word SOON
 	ec_word BE
 	ec_word HERE
 	.2byte -1
-; win speech
+@ win speech
 	ec_word MY
 	ec_word ALLOWANCE
 	ec_word COULD
 	ec_word USE
 	ec_word A
 	ec_move2 HELPING_HAND
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word ALWAYS
 	ec_word USE
@@ -4213,24 +4213,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word UP
 	.4byte gBattleFrontierTrainerMons_Johan
 
-; 162
+@ 162
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "SHEA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DO
 	ec_word YOU
 	ec_word BATTLE
 	ec_word WITH
 	ec_word BEAUTY
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word BATTLE
 	ec_word IN
 	ec_word AN
 	ec_word UGLY
 	ec_word WAY
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word IS
 	ec_word BEAUTY
@@ -4239,24 +4239,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Shea
 
-; 163
+@ 163
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "KAILA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word THIRSTY
 	ec_word RIGHT
 	ec_word NOW
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word I
 	ec_word COULD
 	ec_word USE
 	ec_word A
 	ec_word COLD
 	ec_word DRINK
-; loss speech
+@ loss speech
 	ec_word THAT
 	ec_word LOSS
 	ec_word IS
@@ -4265,24 +4265,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 SWALLOW
 	.4byte gBattleFrontierTrainerMons_Kaila
 
-; 164
+@ 164
 	.4byte TRAINER_CLASS_SCHOOL_KID_1
 	.charmapstr "ISIAH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word PRETEND
 	ec_word TO
 	ec_word STUDY
 	ec_word A_LOT
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_move2 TRICK
 	ec_word MOTHER
 	ec_word FOR
 	ec_word MY
 	ec_word ALLOWANCE
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DON_T
 	ec_word WANT
@@ -4291,24 +4291,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MORE
 	.4byte gBattleFrontierTrainerMons_Isiah
 
-; 165
+@ 165
 	.4byte TRAINER_CLASS_SCHOOL_KID_1
 	.charmapstr "GARRETT$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word ENJOY
 	ec_word COMICS
 	ec_word AND
 	ec_word THIS
 	ec_word GAME
-; win speech
+@ win speech
 	ec_word I
 	ec_word LIKE
 	ec_word THIS
 	ec_word MUSIC
 	ec_word IDOL
 	ec_word TOO
-; loss speech
+@ loss speech
 	ec_word BUT
 	ec_word I
 	ec_word HAVE
@@ -4317,24 +4317,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MORE
 	.4byte gBattleFrontierTrainerMons_Garrett
 
-; 166
+@ 166
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "HAYLIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WORRY
 	ec_word TOO
 	ec_word MUCH
 	ec_word TO
 	ec_word SLEEP
-; win speech
+@ win speech
 	ec_word A
 	ec_word WIN
 	ec_word GIVES
 	ec_word ME
 	ec_word A
 	ec_move2 CALM_MIND
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word INSOMNIA
 	ec_word WILL
@@ -4343,24 +4343,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Haylie
 
-; 167
+@ 167
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "MEGAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word BELIEVE
 	ec_word IN
 	ec_word AN
 	ec_move1 AROMATHERAPY
 	ec_word BATH
-; win speech
+@ win speech
 	ec_word I
 	ec_word WANT
 	ec_word A
 	ec_word HEALTHY
 	ec_word CLEAR_BODY
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word IF
 	ec_word ONLY
 	ec_move1 AROMATHERAPY
@@ -4369,24 +4369,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXPENSIVE
 	.4byte gBattleFrontierTrainerMons_Megan
 
-; 168
+@ 168
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "ISSAC$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word HOBBY
 	ec_word QUES
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word LIKE
 	ec_word ANY
 	ec_word KIND
 	ec_word OF
 	ec_move2 WATER_SPORT
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DISLIKE
 	ec_word ANY
@@ -4395,24 +4395,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 MUD_SPORT
 	.4byte gBattleFrontierTrainerMons_Issac
 
-; 169
+@ 169
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "QUINTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word SAD
 	ec_word CAUSE
 	ec_word I_AM
 	ec_word TOO_WEAK
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word AREN_T
 	ec_word TOO_STRONG
 	ec_word FOR
 	ec_word ME
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word HEY
 	ec_word WHAT
 	ec_word DID
@@ -4421,24 +4421,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Quinton
 
-; 170
+@ 170
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "SALMA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_VE
 	ec_word GOT
 	ec_word YOUR
 	ec_word HUSTLE
 	ec_word ON
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word WIN
 	ec_word YOU
 	ec_word HUSTLE
 	ec_word ON
 	ec_word OUT
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DON_T
 	ec_word GET
@@ -4447,24 +4447,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOST
 	.4byte gBattleFrontierTrainerMons_Salma
 
-; 171
+@ 171
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "ANSLEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word BORED
 	ec_word ELLIPSIS
 	ec_word DANCE
 	ec_word FOR
 	ec_word ME
-; win speech
+@ win speech
 	ec_word YOU_VE
 	ec_word BORED
 	ec_word ME
 	ec_word SOME
 	ec_word MORE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word TAKE
 	ec_word YOUR
 	ec_move2 FRUSTRATION
@@ -4473,24 +4473,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word PLACE
 	.4byte gBattleFrontierTrainerMons_Ansley
 
-; 172
+@ 172
 	.4byte TRAINER_CLASS_BUG_CATCHER
 	.charmapstr "HOLDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word COMMEMORATE
 	ec_word MY
 	ec_word COOLNESS
 	ec_word IN
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word TOO_WEAK
 	ec_word FOR
 	ec_word ANY
 	ec_word PRAISE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_word BATTLE
 	ec_word SENSE
@@ -4499,24 +4499,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Holden
 
-; 173
+@ 173
 	.4byte TRAINER_CLASS_BUG_CATCHER
 	.charmapstr "LUCA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WE
 	ec_word WILL
 	ec_word HAVE
 	ec_word A
 	ec_word COOL
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word I
 	ec_word WON
 	ec_word IN
 	ec_word A
 	ec_word COOL
 	ec_word WAY
-; loss speech
+@ loss speech
 	ec_word HELLO
 	ec_word QUES
 	ec_word I_AM
@@ -4525,24 +4525,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word KID
 	.4byte gBattleFrontierTrainerMons_Luca
 
-; 174
+@ 174
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "JAMISON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 SECRET_POWER
 	ec_word IS
 	ec_word OVERWHELMING
 	ec_word TO
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word DID
 	ec_word YOU
 	ec_word SEE
 	ec_word THAT
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_word USE
@@ -4551,24 +4551,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ESCAPE
 	.4byte gBattleFrontierTrainerMons_Jamison
 
-; 175
+@ 175
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "GUNNAR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move1 CUT
 	ec_word DOWN
 	ec_word EVERY
 	ec_word OPPONENT
 	.2byte -1
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_move1 GRUDGE
 	ec_word ME
 	ec_word FOR
 	ec_word YOUR
 	ec_word LOSS
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word LOSE
 	ec_word THAT
@@ -4577,24 +4577,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOURS
 	.4byte gBattleFrontierTrainerMons_Gunnar
 
-; 176
+@ 176
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "CRAIG$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CAN_T
 	ec_word WAIT
 	ec_word FOR
 	ec_word MY
 	ec_word TRAIN
-; win speech
+@ win speech
 	ec_word MY
 	ec_word TRAIN
 	ec_word ISN_T
 	ec_word HERE
 	ec_word YET
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word HERE_IT_IS
 	ec_word MY
 	ec_word TRAIN
@@ -4603,24 +4603,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Craig
 
-; 177
+@ 177
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "PIERCE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THERE
 	ec_word WAS
 	ec_word A
 	ec_move2 HEAT_WAVE
 	ec_word LAST
 	ec_word WEEK
-; win speech
+@ win speech
 	ec_word I
 	ec_word CAN_T
 	ec_word TAKE
 	ec_word A
 	ec_move2 HEAT_WAVE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word DIDN_T
 	ec_word IT
 	ec_move1 HAIL
@@ -4629,24 +4629,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Pierce
 
-; 178
+@ 178
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "REGINA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LIKE
 	ec_word TO
 	ec_word PLAY
 	ec_word IN
 	ec_word WATER
-; win speech
+@ win speech
 	ec_word I
 	ec_word REFUSE
 	ec_word TO
 	ec_word COME
 	ec_word OUT
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word NOT
 	ec_word MUCH
@@ -4655,24 +4655,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WATER
 	.4byte gBattleFrontierTrainerMons_Regina
 
-; 179
+@ 179
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "ALISON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word KINDERGARTEN
 	ec_word MAGAZINE
 	ec_word IS
 	ec_word TOO
 	ec_word MUCH
-; win speech
+@ win speech
 	ec_word HOW
 	ec_word TO
 	ec_word BUG
 	ec_word YOUR
 	ec_word TEACHER
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word ENJOY
 	ec_word A
 	ec_word TASTY
@@ -4681,24 +4681,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Alison
 
-; 180
+@ 180
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "HANK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THERE
 	ec_word IS
 	ec_word A
 	ec_word BUG
 	ec_word EVENT
 	ec_word SOON
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word A
 	ec_word BUG
 	ec_word FASHION
 	ec_word SHOW
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word DON_T
 	ec_word YOU
 	ec_word LIKE
@@ -4707,24 +4707,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Hank
 
-; 181
+@ 181
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "EARL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word INVINCIBLE
 	ec_word BUG
 	ec_word TRAINER
 	ec_word IS
 	ec_word HERE
-; win speech
+@ win speech
 	ec_word THE
 	ec_word INVINCIBLE
 	ec_word BUG
 	ec_word TRAINER
 	ec_word AM
 	ec_word I
-; loss speech
+@ loss speech
 	ec_word SEE
 	ec_word HOW
 	ec_word FAST
@@ -4733,24 +4733,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Earl
 
-; 182
+@ 182
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "RAMIRO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WENT
 	ec_word TO
 	ec_word A
 	ec_word FISHING
 	ec_word SCHOOL
-; win speech
+@ win speech
 	ec_word SERIOUSLY
 	ec_word I_AM
 	ec_word IN
 	ec_word THE
 	ec_word FISHING
 	ec_word HALL_OF_FAME
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
@@ -4759,24 +4759,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Ramiro
 
-; 183
+@ 183
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "HUNTER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SHOW
 	ec_word ME
 	ec_word A
 	ec_word TOTALLY
 	ec_word COOL
 	ec_move1 CROSS_CHOP
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word TOO_WEAK
 	ec_word TO
 	ec_word DO
 	ec_word A
 	ec_move1 CROSS_CHOP
-; loss speech
+@ loss speech
 	ec_word WAS
 	ec_word IT
 	ec_word A
@@ -4785,24 +4785,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Hunter
 
-; 184
+@ 184
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "AIDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word WORK
 	ec_word IS
 	ec_word MAKING
 	ec_word ME
 	ec_word HEALTHY
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SEE
 	ec_word QUES
 	ec_word I_AM
 	ec_word HEALTHY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word MORE
 	ec_word HEALTHY
@@ -4811,24 +4811,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Aiden
 
-; 185
+@ 185
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "XAVIER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HEY_THERE
 	ec_word EXCL
 	.2byte -1
 	ec_word LOOK
 	ec_word LOOK
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_word GOOD_BYE
 	ec_word AND
 	ec_word THANK_YOU
 	ec_word THAT_WAS
 	ec_word FUNNY
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WOWEE
 	ec_word EXCL
 	.2byte -1
@@ -4837,24 +4837,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL_EXCL
 	.4byte gBattleFrontierTrainerMons_Xavier
 
-; 186
+@ 186
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "CLINTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WANT
 	ec_word TO
 	ec_word SEE
 	ec_word MY
 	ec_move1 HYPNOSIS
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_move2 FURY_SWIPES
 	ec_word YOUR
 	ec_move1 STRENGTH
 	ec_word YOUNG
 	ec_word TRAINER
-; loss speech
+@ loss speech
 	ec_word TCH
 	ec_word ELLIPSIS
 	.2byte -1
@@ -4863,24 +4863,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Clinton
 
-; 187
+@ 187
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "JESSE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word BATTLE
 	ec_word IS
 	ec_word FOR
 	ec_word MY
 	ec_word MOTHER
-; win speech
+@ win speech
 	ec_word MOTHER
 	ec_word WILL
 	ec_word BE
 	ec_word HAPPY
 	ec_word FOR
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WANT
 	ec_word MY
@@ -4889,24 +4889,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Jesse
 
-; 188
+@ 188
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "EDUARDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OUR
 	ec_word MUSIC
 	ec_word WILL
 	ec_word PLAY
 	ec_word ALL
 	ec_word NIGHT
-; win speech
+@ win speech
 	ec_word NIGHTTIME
 	ec_word IS
 	ec_word WHEN
 	ec_word I
 	ec_word PLAY
 	ec_word BEST
-; loss speech
+@ loss speech
 	ec_word LET_S
 	ec_word PARTY
 	ec_word UNTIL
@@ -4915,24 +4915,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Eduardo
 
-; 189
+@ 189
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "HAL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word TRENDY
 	ec_word AREN_T
 	ec_word I
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word HIP_AND
 	ec_word HAPPENING
 	ec_word OH_YEAH
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word ALWAYS
 	ec_word TRENDY
@@ -4941,24 +4941,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MUCH
 	.4byte gBattleFrontierTrainerMons_Hal
 
-; 190
+@ 190
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "GAGE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HERE_IT_IS
 	ec_word A
 	ec_word FLYING
 	ec_word TYPE
 	ec_word HIDDEN
 	ec_word MOVE
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word A
 	ec_word FLYING
 	ec_word TYPE
 	ec_word VICTORY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word IF_I_LOSE
 	ec_word I
 	ec_word JUST
@@ -4967,24 +4967,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Gage
 
-; 191
+@ 191
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "ARNOLD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word WEIRD
 	ec_word FROM
 	ec_word A
 	ec_word DREAM
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_move1 SCARY_FACE
 	ec_word WAS
 	ec_word IN
 	ec_word MY
 	ec_word DREAM
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word INCREDIBLE
 	ec_word DREAM
@@ -4993,24 +4993,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WEIRD
 	.4byte gBattleFrontierTrainerMons_Arnold
 
-; 192
+@ 192
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "JARRETT$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word LET_S
 	ec_word DANCE
 	ec_word LIKE
 	ec_word IT_S
 	ec_word YESTERDAY
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word LIKE
 	ec_word HOW
 	ec_word I
 	ec_word DANCE
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word DON_T
 	ec_word APPRECIATE
@@ -5019,24 +5019,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word DANCE
 	.4byte gBattleFrontierTrainerMons_Jarrett
 
-; 193
+@ 193
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "GARETT$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word GIRL
 	ec_word GIVES
 	ec_word ME
 	ec_word A_LITTLE
 	ec_move2 SWEET_KISS
-; win speech
+@ win speech
 	ec_word MY
 	ec_word GIRL
 	ec_word FRIEND
 	ec_word IS
 	ec_word MY
 	ec_word TREASURE
-; loss speech
+@ loss speech
 	ec_word A
 	ec_word TREASURE
 	ec_word ISN_T
@@ -5045,24 +5045,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word MONEY
 	.4byte gBattleFrontierTrainerMons_Garett
 
-; 194
+@ 194
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "EMANUEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SMARTNESS
 	ec_word ALONE
 	ec_word WON_T
 	ec_word MAKE
 	ec_word YOU
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word NOT_VERY
 	ec_word SMART
 	ec_word BUT
 	ec_word I
 	ec_word WON
-; loss speech
+@ loss speech
 	ec_word HOW
 	ec_word DID
 	ec_word YOU
@@ -5071,24 +5071,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Emanuel
 
-; 195
+@ 195
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "GUSTAVO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move1 CHARGE
 	ec_word EXCL
 	.2byte -1
 	ec_move1 CHARGE
 	ec_word EXCL_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word SURRENDER
 	ec_word QUES
 	.2byte -1
 	ec_word SO
 	ec_word SOON
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word MAKE
@@ -5097,24 +5097,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YET
 	.4byte gBattleFrontierTrainerMons_Gustavo
 
-; 196
+@ 196
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "KAMERON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word TAKE_THAT
 	ec_word EXCL
 	ec_word IT_S
 	ec_word MY
 	ec_word FIERY
 	ec_move2 TRICK
-; win speech
+@ win speech
 	ec_word DID
 	ec_word MY
 	ec_word FIERY
 	ec_move2 TRICK
 	ec_move1 ASTONISH
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word DIDN_T
 	ec_word FALL
@@ -5123,24 +5123,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 TRICK
 	.4byte gBattleFrontierTrainerMons_Kameron
 
-; 197
+@ 197
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "ALFREDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word FIERY
 	ec_word GOURMET
 	ec_word AM
 	ec_word I
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word A
 	ec_word TASTY
 	ec_word GOURMET
 	ec_word VICTORY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word A
 	ec_word DISASTER
@@ -5149,24 +5149,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Alfredo
 
-; 198
+@ 198
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "RUBEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CAN_T
 	ec_word WAIT
 	ec_word TO
 	ec_word GET
 	ec_word GOING
-; win speech
+@ win speech
 	ec_word GET
 	ec_word GOING
 	ec_word EXCL
 	ec_word THIS
 	ec_word IS
 	ec_word GOOD_BYE
-; loss speech
+@ loss speech
 	ec_word I_VE
 	ec_word GOT
 	ec_word TO
@@ -5175,24 +5175,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Ruben
 
-; 199
+@ 199
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "LAMAR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_move2 PRESENT
 	ec_word FOR
 	ec_word ME
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word MMM
 	ec_word THIS
 	ec_word IS
 	ec_word QUITE
 	ec_word TASTY
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word IT_S
 	ec_word A
@@ -5201,24 +5201,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Lamar
 
-; 200
+@ 200
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "JAXON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word SHELL_ARMOR
 	ec_word IS
 	ec_word WHAT
 	ec_word I
 	ec_word WANT
-; win speech
+@ win speech
 	ec_word MY
 	ec_word FATHER
 	ec_word AND
 	ec_word MOTHER
 	ec_word WON_T
 	ec_word ACCEPT
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word I
 	ec_word NEED
@@ -5227,24 +5227,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Jaxon
 
-; 201
+@ 201
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "LOGAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF_I_LOSE
 	ec_word I
 	ec_word WILL
 	ec_word STUDY
 	ec_word FOR
 	ec_word SCHOOL
-; win speech
+@ win speech
 	ec_word ME
 	ec_word STUDY
 	ec_word QUES
 	ec_word NOT_VERY
 	ec_word LIKELY_TO
 	ec_word SEE
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word THANKS
 	ec_word I_AM
@@ -5253,24 +5253,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SLEEP
 	.4byte gBattleFrontierTrainerMons_Logan
 
-; 202
+@ 202
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "EMILEE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IS
 	ec_word THIS
 	ec_word KIND
 	ec_word OF
 	ec_word BATTLE
 	ec_word OK_QUES
-; win speech
+@ win speech
 	ec_word LET_S
 	ec_word GO
 	ec_word FOR
 	ec_word AN
 	ec_move1 ICY_WIND
 	ec_move2 SURF
-; loss speech
+@ loss speech
 	ec_word HOW
 	ec_word ABOUT
 	ec_word A
@@ -5279,24 +5279,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Emilee
 
-; 203
+@ 203
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "JOSIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word POKEMON
 	ec_word FASHION
 	ec_word CONTEST
 	ec_word IS
 	ec_word PRETTY
-; win speech
+@ win speech
 	ec_word I
 	ec_word REALLY
 	ec_word LIKE
 	ec_word MODE
 	ec_word FASHION
 	ec_word THINGS
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word TOTALLY
 	ec_word LACKING
@@ -5305,24 +5305,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SENSE
 	.4byte gBattleFrontierTrainerMons_Josie
 
-; 204
+@ 204
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "ARMANDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word NEED
 	ec_word MORE
 	ec_word GRASS
 	ec_word TYPE
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word TRADE
 	ec_word ME
 	ec_word A
 	ec_word GRASS
 	ec_word POKEMON
 	ec_word PLEASE
-; loss speech
+@ loss speech
 	ec_word THERE
 	ec_word AREN_T
 	ec_word ENOUGH
@@ -5331,24 +5331,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word POKEMON
 	.4byte gBattleFrontierTrainerMons_Armando
 
-; 205
+@ 205
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "SKYLER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move2 INGRAIN
 	ec_word IS
 	ec_word MY
 	ec_word CHOICE
 	ec_word BATTLE
 	ec_word MOVE
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word MOVE
 	ec_word ME
 	ec_word NOW
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_move1 CUT
 	ec_word ME
@@ -5357,24 +5357,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Skyler
 
-; 206
+@ 206
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "RUTH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
 	ec_word ENJOY
 	ec_word THIS
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word MUCH
 	ec_word TOO
 	ec_word EASY
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word STOP
 	ec_word I
@@ -5383,24 +5383,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THIS
 	.4byte gBattleFrontierTrainerMons_Ruth
 
-; 207
+@ 207
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "MELODY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 WISH
 	ec_word SUNDAY
 	ec_word IS
 	ec_word A
 	ec_move2 SUNNY_DAY
-; win speech
+@ win speech
 	ec_word SUNDAY
 	ec_word SEEMS
 	ec_word FOREVER
 	ec_word TO
 	ec_word COME
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word THE
 	ec_word FORECAST
 	ec_word SAYS
@@ -5409,24 +5409,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move1 HAIL
 	.4byte gBattleFrontierTrainerMons_Melody
 
-; 208
+@ 208
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "PEDRO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word SWIFT_SWIM
 	ec_word WILL
 	ec_word DO
 	ec_word YOU
 	ec_word GOOD
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word HOW
 	ec_word I
 	ec_word SINK
 	ec_word AN
 	ec_word OPPONENT
-; loss speech
+@ loss speech
 	ec_word UH_OH
 	ec_word EXCL
 	.2byte -1
@@ -5435,24 +5435,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Pedro
 
-; 209
+@ 209
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "ERICK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WILL
 	ec_move2 TACKLE
 	ec_word YOU
 	ec_word DOWN
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_word YOU
 	ec_word RUN_AWAY
 	ec_word YOU
 	ec_word LOSER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DIDN_T
 	ec_word THINK
@@ -5461,24 +5461,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move1 COUNTER
 	.4byte gBattleFrontierTrainerMons_Erick
 
-; 210
+@ 210
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "ELAINE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word HEROINE
 	ec_word ADVENTURE
 	ec_word ISN_T
 	ec_word GOING
 	ec_word WELL
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word EXCL
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I
 	ec_word NEED
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word KNOW
 	ec_word I_AM
@@ -5487,24 +5487,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HEROINE
 	.4byte gBattleFrontierTrainerMons_Elaine
 
-; 211
+@ 211
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "JOYCE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word MAKE
 	ec_word ME
 	ec_word GO
 	ec_word AHAHA
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word LALALA
 	ec_word NO
 	ec_word LOSING
 	ec_word FOR
 	ec_word ME
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word LALALA
 	ec_word ELLIPSIS
 	.2byte -1
@@ -5513,24 +5513,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Joyce
 
-; 212
+@ 212
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "TODD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word A
 	ec_word LIGHTNINGROD
 	ec_word FOR
 	ec_word MY
 	ec_word POWER
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word ALL
 	ec_word YOU
 	ec_word COULD
 	ec_move1 ABSORB
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_move2 REFLECT
 	ec_word MY
@@ -5539,24 +5539,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Todd
 
-; 213
+@ 213
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "GAVIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WILL
 	ec_move1 BIDE
 	ec_word MY
 	ec_word TIME
 	.2byte -1
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word OVER
 	ec_word SO
 	ec_word SOON
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word MISTAKE
 	ec_word WAS
@@ -5565,24 +5565,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Gavin
 
-; 214
+@ 214
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "MALORY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word PROMISE
 	ec_word TO
 	ec_word SHOW
 	ec_word ME
 	ec_word CUTE
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word GIGGLE
 	ec_word ELLIPSIS
 	.2byte -1
 	ec_word THANK_YOU
 	ec_word SO
 	ec_word MUCH
-; loss speech
+@ loss speech
 	ec_word TCH
 	ec_word YOUR
 	ec_word POKEMON
@@ -5591,24 +5591,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word NICE
 	.4byte gBattleFrontierTrainerMons_Malory
 
-; 215
+@ 215
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "ESTHER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word A
 	ec_word NICE
 	ec_move2 PRESENT
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word PLEASE
 	ec_word GET
 	ec_word ME
 	ec_word A
 	ec_word POKEMON
 	ec_word GAME
-; loss speech
+@ loss speech
 	ec_word MESSAGE
 	ec_word CARDS
 	ec_word MAKE
@@ -5617,24 +5617,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 PRESENT
 	.4byte gBattleFrontierTrainerMons_Esther
 
-; 216
+@ 216
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "OSCAR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word SEE
 	ec_word YOUR
 	ec_word POWER
 	ec_word IN
 	ec_word FULL
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word NOT
 	ec_word YOUR
 	ec_word FULL
 	ec_word POWER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word NOT
 	ec_word FUNNY
 	ec_word ELLIPSIS
@@ -5643,24 +5643,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Oscar
 
-; 217
+@ 217
 	.4byte TRAINER_CLASS_PKMN_BREEDER_2
 	.charmapstr "WILSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WORK
 	ec_word IS
 	ec_word MAKING
 	ec_word ME
 	ec_word AN
 	ec_word EARLY_BIRD
-; win speech
+@ win speech
 	ec_word ALL
 	ec_word WORK
 	ec_word AND
 	ec_word NO
 	ec_word PLAY
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_move1 ENDURE
 	ec_word IS
 	ec_word ALL
@@ -5669,24 +5669,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word DO
 	.4byte gBattleFrontierTrainerMons_Wilson
 
-; 218
+@ 218
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "CLARE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YAY
 	ec_word EXCL
 	ec_word A
 	ec_word TOUGH
 	ec_word TRAINER
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word AWW
 	ec_word EXCL
 	ec_word A
 	ec_word WIMPY
 	ec_word TRAINER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word COOL
 	ec_word EXCL
 	ec_word A
@@ -5695,24 +5695,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Clare
 
-; 219
+@ 219
 	.4byte TRAINER_CLASS_PKMN_BREEDER_1
 	.charmapstr "TESS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WANT
 	ec_word SOME
 	ec_pokemon1 GULPIN
 	ec_word DESIGN
 	ec_word SWEETS
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word THEY_RE
 	ec_word A
 	ec_word SECRET
 	ec_word POKEMON
 	ec_word GOURMET
 	ec_word ITEM
-; loss speech
+@ loss speech
 	ec_word THEY_RE
 	ec_word TASTY
 	ec_word EXCL
@@ -5721,24 +5721,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Tess
 
-; 220
+@ 220
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "LEON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word BETTER
 	ec_word THAN
 	ec_word ANY
 	ec_word OTHER
 	ec_word TRAINER
-; win speech
+@ win speech
 	ec_word I
 	ec_word DID
 	ec_word IT
 	ec_move2 JUMP_KICK
 	ec_word FOR
 	ec_word JOY
-; loss speech
+@ loss speech
 	ec_word BACK
 	ec_word HOME
 	ec_word I
@@ -5747,24 +5747,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Leon
 
-; 221
+@ 221
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "ALONZO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_VE
 	ec_word NOT
 	ec_word LOST
 	ec_word ONCE
 	ec_word YET
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word SAD
 	ec_word LOOK
 	ec_word BECOMES
 	ec_word YOU
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DON_T
 	ec_word BELIEVE
@@ -5773,24 +5773,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Alonzo
 
-; 222
+@ 222
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "VINCE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word TOP
 	ec_word TRAINER
 	ec_word THAT_S
 	ec_word ME
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THE
 	ec_word TOP
 	ec_word RANK
 	ec_word BELONGS_TO
 	ec_word ME
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_word APPEAL
@@ -5799,24 +5799,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Vince
 
-; 223
+@ 223
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "BRYON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 BARRAGE
 	ec_word WILL
 	ec_move2 SLAM
 	ec_word YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word DIDN_T
 	ec_word COUNT_ON
 	ec_word ANY
 	ec_word LESS
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word JUST
 	ec_word DON_T
@@ -5825,24 +5825,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Bryon
 
-; 224
+@ 224
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "AVA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word A
 	ec_word TREASURE
 	ec_word OF
 	ec_word THIS
 	ec_word WORLD
-; win speech
+@ win speech
 	ec_word MY
 	ec_word WORLD
 	ec_word IS
 	ec_word FULL
 	ec_word OF
 	ec_word WONDER
-; loss speech
+@ loss speech
 	ec_word WHY
 	ec_word ARE
 	ec_word YOU
@@ -5851,24 +5851,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Ava
 
-; 225
+@ 225
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "MIRIAM$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OH
 	ec_word A
 	ec_word TRAINER
 	ec_word WITH
 	ec_word A
 	ec_move1 SCARY_FACE
-; win speech
+@ win speech
 	ec_word AHAHA
 	ec_word YOU
 	ec_word ONLY
 	ec_word LOOK
 	ec_word SCARY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word AIYEEH
 	ec_word EXCL
 	ec_word YOU
@@ -5877,24 +5877,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SCARY
 	.4byte gBattleFrontierTrainerMons_Miriam
 
-; 226
+@ 226
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "CARRIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WILL
 	ec_word SHOW
 	ec_word YOU
 	ec_word GUTSY
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word ALL
 	ec_word ABOUT
 	ec_word GUTS
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word NO
 	ec_word ELLIPSIS
@@ -5903,24 +5903,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Carrie
 
-; 227
+@ 227
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "GILLIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word SEEK
 	ec_word A
 	ec_word TRULY
 	ec_word GREAT
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word I
 	ec_word NEED
 	ec_word A_LOT
 	ec_word BETTER
 	ec_word BATTLE
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word A_LITTLE
 	ec_word TOO
@@ -5929,24 +5929,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TAKE
 	.4byte gBattleFrontierTrainerMons_Gillian2
 
-; 228
+@ 228
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "TYLER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YO
 	ec_word EXCL
 	.2byte -1
 	ec_word LET_S
 	ec_word GO
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_word YO
 	ec_word EXCL
 	.2byte -1
 	ec_word I
 	ec_word WON
 	ec_word YO
-; loss speech
+@ loss speech
 	ec_word YO
 	ec_word EXCL
 	.2byte -1
@@ -5955,24 +5955,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YO
 	.4byte gBattleFrontierTrainerMons_Tyler
 
-; 229
+@ 229
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "CHAZ$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word HAVE
 	ec_word TOO
 	ec_word MUCH
 	ec_word POWER
-; win speech
+@ win speech
 	ec_word THEY
 	ec_word HAVE
 	ec_word MORE
 	ec_word POWER
 	ec_word NOW
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YEAH
 	ec_move2 TAKE_DOWN
 	ec_word THEIR
@@ -5981,24 +5981,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word PLEASE
 	.4byte gBattleFrontierTrainerMons_Chaz
 
-; 230
+@ 230
 	.4byte TRAINER_CLASS_PKMN_RANGER_1
 	.charmapstr "NELSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WELL_THEN
 	ec_word WILL
 	ec_word THIS
 	ec_word POKEMON
 	ec_word WORK
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I
 	ec_word SEE
 	ec_word THAT
 	ec_word IT
 	ec_word WAS
 	ec_word TOO_STRONG
-; loss speech
+@ loss speech
 	ec_word IT
 	ec_word DIDN_T
 	ec_word MATCH_UP
@@ -6007,24 +6007,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THINK
 	.4byte gBattleFrontierTrainerMons_Nelson
 
-; 231
+@ 231
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "SHANIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ALL
 	ec_word MY
 	ec_word POKEMON
 	ec_word ABSOLUTELY
 	ec_word ADORE
 	ec_word ME
-; win speech
+@ win speech
 	ec_word HAPPINESS
 	ec_word IS
 	ec_word A
 	ec_word POKEMON
 	ec_word WITH
 	ec_word CUTE_CHARM
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word SO
 	ec_word MEAN
@@ -6033,24 +6033,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word POKEMON
 	.4byte gBattleFrontierTrainerMons_Shania
 
-; 232
+@ 232
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "STELLA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
 	ec_word SEE
 	ec_word YOUR
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word WELL
 	ec_word AREN_T
 	ec_word THEY
 	ec_word BORING
 	ec_word QUES
 	ec_word AHAHA
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
@@ -6059,24 +6059,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ALL_RIGHT
 	.4byte gBattleFrontierTrainerMons_Stella
 
-; 233
+@ 233
 	.4byte TRAINER_CLASS_PKMN_RANGER_2
 	.charmapstr "DORINE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word YOUNG
 	ec_word AND
 	ec_word STRONG
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word SEE
 	ec_word QUES
 	ec_word AREN_T
 	ec_word I
 	ec_word GOOD
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word ISN_T
 	ec_word WORKING
@@ -6085,24 +6085,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ALL
 	.4byte gBattleFrontierTrainerMons_Dorine
 
-; 234
+@ 234
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "MADDOX$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DRAGON
 	ec_word POKEMON
 	ec_word ARE
 	ec_word MY
 	ec_word NO_1
 	ec_word CHOICE
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word NO
 	ec_word SECRET
 	ec_word DRAGON
 	ec_word POKEMON
 	ec_word WIN
-; loss speech
+@ loss speech
 	ec_word DRAGON
 	ec_word POKEMON
 	ec_word SHOULD
@@ -6111,24 +6111,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Maddox
 
-; 235
+@ 235
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "DAVIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word HEAR
 	ec_word YOU
 	ec_move2 ROAR
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WROOOAAR_EXCL
 	.2byte -1
 	.2byte -1
 	ec_word VICTORY
 	ec_word EXCL_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WROOOAAR_EXCL
 	.2byte -1
 	.2byte -1
@@ -6137,24 +6137,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Davin
 
-; 236
+@ 236
 	.4byte TRAINER_CLASS_DRAGON_TAMER
 	.charmapstr "TREVON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word LIVING
 	ec_word ONLY
 	ec_word WITH
 	ec_word DRAGON
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word THE
 	ec_word WAY
 	ec_word I_AM
 	ec_word LIVING
 	ec_word IS
 	ec_word PERFECT
-; loss speech
+@ loss speech
 	ec_word YOU_VE
 	ec_word DESTROYED
 	ec_word THE
@@ -6163,24 +6163,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LIVING
 	.4byte gBattleFrontierTrainerMons_Trevon
 
-; 237
+@ 237
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "MATEO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word SHOULD
 	ec_word BE
 	ec_word OVER
 	ec_word SOON
 	ec_word ENOUGH
-; win speech
+@ win speech
 	ec_word WELL
 	ec_word THAT
 	ec_word DIDN_T
 	ec_word TAKE
 	ec_word VERY
 	ec_word MUCH
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word CAN_T
 	ec_word LOSE
@@ -6189,24 +6189,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Mateo
 
-; 238
+@ 238
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "BRET$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LIKE
 	ec_word ROCK_SOLID
 	ec_word POKEMON
 	ec_word THE
 	ec_word BEST
-; win speech
+@ win speech
 	ec_word TOUGHNESS
 	ec_word IS
 	ec_word THE
 	ec_word WAY
 	ec_word TO
 	ec_word GO
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word ALSO
 	ec_word HAVE
@@ -6215,24 +6215,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word COLLECTION
 	.4byte gBattleFrontierTrainerMons_Bret
 
-; 239
+@ 239
 	.4byte TRAINER_CLASS_BLACK_BELT
 	.charmapstr "RAUL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word REJECT
 	ec_word EVERY
 	ec_word WEAK
 	ec_word TRAINER
 	.2byte -1
-; win speech
+@ win speech
 	ec_word HUMPH
 	ec_word EXCL
 	ec_word ANOTHER
 	ec_word WEAK
 	ec_word TRAINER
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word THERE
 	ec_word IS
 	ec_word NOTHING
@@ -6241,24 +6241,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Raul
 
-; 240
+@ 240
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "KAY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word AND
 	ec_word YET
 	ec_word ANOTHER
 	ec_word BATTLE
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word WON
 	ec_word BUT
 	ec_word I_AM
 	ec_word TIRED
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word GOOD
 	ec_word IT_S
 	ec_word OVER
@@ -6267,24 +6267,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Kay
 
-; 241
+@ 241
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "ELENA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word BATTLE
 	ec_word GIRL
 	ec_word THAT_S
 	ec_word ME
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word ISN_T
 	ec_word A
 	ec_word BATTLE
 	ec_word GIRL
 	ec_word AWESOME
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word DISLIKE
 	ec_word A
@@ -6293,24 +6293,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Elena
 
-; 242
+@ 242
 	.4byte TRAINER_CLASS_BATTLE_GIRL
 	.charmapstr "ALANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word EAT
 	ec_word MY
 	ec_word INVINCIBLE
 	ec_word ATTACK
 	ec_word YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word MUCH
 	ec_word TO
 	ec_word LEARN
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word SO
 	ec_word MUCH
 	ec_word FOR
@@ -6319,24 +6319,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ATTACK
 	.4byte gBattleFrontierTrainerMons_Alana
 
-; 243
+@ 243
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "ALEXAS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GOOD
 	ec_word TO
 	ec_word MEET_YOU
 	ec_word YOUNG
 	ec_word TRAINER
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word WAHAHAHA
 	ec_word EXCL
 	.2byte -1
 	ec_word GIVE
 	ec_word IT
 	ec_word UP
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word ARE
 	ec_word A
@@ -6345,24 +6345,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word KID
 	.4byte gBattleFrontierTrainerMons_Alexas
 
-; 244
+@ 244
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "WESTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word PLAY
 	ec_word DOWN
 	ec_word ALL_RIGHT
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word FAR
 	ec_word TOO
 	ec_word EASY
 	ec_word TO
 	ec_word ATTACK
-; loss speech
+@ loss speech
 	ec_word WELL
 	ec_word WELL
 	ec_word ELLIPSIS
@@ -6371,24 +6371,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Weston
 
-; 245
+@ 245
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "JASPER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word OLD
 	ec_word I_AM
 	ec_word SKILLED
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word SKILLED
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I_AM
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word SHOCKED
 	ec_word EXCL
@@ -6397,24 +6397,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word GO
 	.4byte gBattleFrontierTrainerMons_Jasper
 
-; 246
+@ 246
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "NADIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word BEAT
 	ec_word ME
 	ec_word DOWN
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word HAH
 	ec_word EXCL
 	.2byte -1
 	ec_word I
 	ec_word BEAT
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_move2 BEAT_UP
 	ec_word AND
@@ -6423,24 +6423,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Nadia
 
-; 247
+@ 247
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "MIRANDA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WELL
 	ec_word WELL
 	.2byte -1
 	ec_word LET_S
 	ec_word START
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WHAT
 	ec_word QUES
 	ec_word DONE
 	ec_word SO
 	ec_word SOON
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word WELL
 	ec_word I
 	ec_word SEE
@@ -6449,24 +6449,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TOO_WEAK
 	.4byte gBattleFrontierTrainerMons_Miranda
 
-; 248
+@ 248
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "EMMA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_VE
 	ec_word BEEN
 	ec_word HEARING
 	ec_word ABOUT
 	ec_word YOU
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I
 	ec_word THINK
 	ec_word I_VE
 	ec_word MISHEARD
 	ec_word THINGS
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word I_VE
 	ec_word BEEN
@@ -6475,24 +6475,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word RIGHT
 	.4byte gBattleFrontierTrainerMons_Emma
 
-; 249
+@ 249
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "ROLANDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word A
 	ec_word SUPER
 	ec_word POKEMON
 	ec_word HERO
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word WAS
 	ec_word THAT
 	ec_word ENOUGH
 	ec_word FOR
 	ec_word YOU
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word SHOULD
 	ec_word NOT
@@ -6501,24 +6501,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HERO
 	.4byte gBattleFrontierTrainerMons_Rolando
 
-; 250
+@ 250
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "STANLY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word SHOULD
 	ec_word BE
 	ec_word AN
 	ec_word EASY
 	ec_word MATCH
-; win speech
+@ win speech
 	ec_word IT
 	ec_word REALLY
 	ec_word WAS
 	ec_word EASY
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word ARE
 	ec_word YOU
 	ec_word HAPPY
@@ -6527,24 +6527,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Stanly
 
-; 251
+@ 251
 	.4byte TRAINER_CLASS_PSYCHIC_1
 	.charmapstr "DARIO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 FORESIGHT
 	ec_word SAYS
 	ec_word I
 	ec_word WILL
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word MY
 	ec_move2 FORESIGHT
 	ec_word HAS
 	ec_word BEEN
 	ec_word PERFECT
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DIDN_T
 	ec_word SEE
@@ -6553,24 +6553,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Dario
 
-; 252
+@ 252
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "KARLEE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SOMETHING
 	ec_word GOOD
 	ec_word WILL
 	ec_word COME
 	ec_word OF
 	ec_word THIS
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SEE
 	ec_word QUES
 	ec_word FANTASTIC
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THAT
 	ec_word SOMETHING
 	ec_word GOOD
@@ -6579,24 +6579,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Karlee
 
-; 253
+@ 253
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "JAYLIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word EVERY
 	ec_word TRAINER
 	ec_word HAS
 	ec_word BEEN
 	ec_word TOO_WEAK
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word MAKING
 	ec_word ME
 	ec_move1 YAWN
 	ec_word THAT
 	ec_word BATTLE
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word SLEPT
 	ec_word AND
@@ -6605,24 +6605,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOST
 	.4byte gBattleFrontierTrainerMons_Jaylin
 
-; 254
+@ 254
 	.4byte TRAINER_CLASS_PSYCHIC_2
 	.charmapstr "INGRID$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word A
 	ec_word VERY
 	ec_word MEAN
 	ec_word TRAINER
-; win speech
+@ win speech
 	ec_word WASN_T
 	ec_word THAT
 	ec_word A
 	ec_word GOOD
 	ec_word MATCH
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word LOST
 	ec_word CAUSE
@@ -6631,24 +6631,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Ingrid
 
-; 255
+@ 255
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "DELILAH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DON_T
 	ec_move1 GRUDGE
 	ec_word ME
 	ec_word IF_I_WIN
 	ec_word OK_QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word SORRY
 	ec_word TO
 	ec_word SEE
 	ec_word YOU
 	ec_word ANGRY
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word HAVE
 	ec_word A
@@ -6657,24 +6657,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Delilah
 
-; 256
+@ 256
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "CARLY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WILL
 	ec_word SCATTER
 	ec_word SOME
 	ec_move2 POISON_POWDER
 	ec_word ABOUT
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word SCARY
 	ec_word HOW
 	ec_word MY
 	ec_word STRATEGY
 	ec_word WORKS
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DISLIKE
 	ec_word YOU
@@ -6683,24 +6683,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word POKEMON
 	.4byte gBattleFrontierTrainerMons_Carly
 
-; 257
+@ 257
 	.4byte TRAINER_CLASS_HEX_MANIAC
 	.charmapstr "LEXIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WANT
 	ec_word TO
 	ec_word SEE
 	ec_word SCARY
 	ec_word POKEMON
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word WASN_T
 	ec_word THAT
 	ec_word SCARY
 	ec_word EH_QUES
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word MORE
 	ec_word SCARY
@@ -6709,24 +6709,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word POKEMON
 	.4byte gBattleFrontierTrainerMons_Lexie
 
-; 258
+@ 258
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "MILLER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HELLO
 	ec_word QUES
 	.2byte -1
 	ec_word HELLO
 	ec_word QUES_EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word HELLO
 	ec_word MOTHER
 	ec_word EXCL
 	ec_word I
 	ec_word WON
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word PHONE
 	ec_word ISN_T
@@ -6735,24 +6735,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Miller
 
-; 259
+@ 259
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "MARV$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word CAN
 	ec_word LOSE
 	ec_word YOUR
 	ec_move1 SWAGGER
 	ec_word NOW
-; win speech
+@ win speech
 	ec_word THERE
 	ec_word IS
 	ec_word NO
 	ec_move1 SWAGGER
 	ec_word LEFT
 	ec_word EH_QUES
-; loss speech
+@ loss speech
 	ec_word GO
 	ec_word ON
 	ec_move1 SWAGGER
@@ -6761,24 +6761,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WANT
 	.4byte gBattleFrontierTrainerMons_Marv
 
-; 260
+@ 260
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "LAYTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word KNOW
 	ec_word I_AM
 	ec_word TOTALLY
 	ec_word COOL
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word CAN
 	ec_word LOOK
 	ec_word UP
 	ec_word TO
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word COOL
 	ec_word EXCL
@@ -6787,24 +6787,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Layton
 
-; 261
+@ 261
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "BROOKS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word IS
 	ec_word A
 	ec_word HIGH
 	ec_word LEVEL
 	ec_word BATTLE
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word HIGH
 	ec_word LEVEL
 	ec_word AND
 	ec_word EXCITING
 	ec_word TOO
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word TOO
 	ec_word HIGH
@@ -6813,24 +6813,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Brooks
 
-; 262
+@ 262
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "GREGORY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word THAT
 	ec_word OLD
 	ec_word YET
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WHO
 	ec_word SAYS
 	ec_word I_AM
 	ec_word TOO
 	ec_word OLD
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word I_AM
 	ec_word REALLY
@@ -6839,24 +6839,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word OLD
 	.4byte gBattleFrontierTrainerMons_Gregory
 
-; 263
+@ 263
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "REESE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_VE
 	ec_word A
 	ec_word COUPLE
 	ec_word THINGS
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_word DIET
 	ec_word PLAY
 	ec_word SPORTS
 	ec_word INSTEAD
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word INSTEAD
 	ec_word OF
 	ec_word TELEVISION
@@ -6865,24 +6865,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BOOK
 	.4byte gBattleFrontierTrainerMons_Reese
 
-; 264
+@ 264
 	.4byte TRAINER_CLASS_TRIATHLETE_3
 	.charmapstr "MASON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word PLEASE
 	ec_word DON_T
 	ec_word MAKE
 	ec_word THIS
 	ec_word SCARY
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word ELLIPSIS
 	.2byte -1
 	ec_word I_AM
 	ec_word HAPPY
 	ec_word NOW
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word DISAPPOINTED
 	ec_word ELLIPSIS
@@ -6891,24 +6891,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Mason
 
-; 265
+@ 265
 	.4byte TRAINER_CLASS_TRIATHLETE_3
 	.charmapstr "TOBY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LISTEN
 	ec_word UP
 	.2byte -1
 	ec_word I
 	ec_word ALWAYS
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word A
 	ec_word GENIUS
 	ec_word OR
 	ec_word WHAT
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word CAN
 	ec_word BEAT
@@ -6917,24 +6917,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SMARTNESS
 	.4byte gBattleFrontierTrainerMons_Toby
 
-; 266
+@ 266
 	.4byte TRAINER_CLASS_TRIATHLETE_4
 	.charmapstr "DOROTHY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word SPORTS
 	ec_word WORLD
 	ec_word SHOULD
 	ec_word ACCEPT
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word THANK_YOU
 	ec_word EXCL
 	ec_word THAT
 	ec_word WIN
 	ec_word WAS
 	ec_word REFRESHING
-; loss speech
+@ loss speech
 	ec_word THANK_YOU
 	ec_word EXCL
 	ec_word THAT
@@ -6943,24 +6943,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word REFRESHING
 	.4byte gBattleFrontierTrainerMons_Dorothy
 
-; 267
+@ 267
 	.4byte TRAINER_CLASS_TRIATHLETE_4
 	.charmapstr "PIPER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word YOU
 	ec_word NEED
 	ec_word A
 	ec_word SPEED_BOOST
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word NEED
 	ec_word TO
 	ec_word SHOW
 	ec_word MORE
 	ec_word GUTS
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word YOU
 	ec_word EXCL
@@ -6969,24 +6969,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Piper
 
-; 268
+@ 268
 	.4byte TRAINER_CLASS_TRIATHLETE_5
 	.charmapstr "FINN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word NOT
 	ec_word ANOTHER
 	ec_word TRAINER
 	ec_word BATTLE
 	ec_word ELLIPSIS
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WON_T
 	ec_word THIS
 	ec_word EVER
 	ec_word END
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word FINALLY
 	ec_word GET
@@ -6995,24 +6995,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word A_LITTLE
 	.4byte gBattleFrontierTrainerMons_Finn
 
-; 269
+@ 269
 	.4byte TRAINER_CLASS_TRIATHLETE_5
 	.charmapstr "SAMIR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_move2 DIVE
 	ec_word BELOW
 	ec_word THE
 	ec_move2 SURF
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YAHOO
 	ec_word TAKE
 	ec_word A
 	ec_move2 DIVE
 	ec_word YOU
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
@@ -7021,24 +7021,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Samir
 
-; 270
+@ 270
 	.4byte TRAINER_CLASS_TRIATHLETE_6
 	.charmapstr "FIONA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DID
 	ec_word YOU
 	ec_word LIMBER
 	ec_word UP
 	ec_word BEFORE
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word NEED
 	ec_word TO
 	ec_word BE
 	ec_word MORE
 	ec_word READY
-; loss speech
+@ loss speech
 	ec_word BEING
 	ec_word LIMBER
 	ec_word DIDN_T
@@ -7047,24 +7047,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ME
 	.4byte gBattleFrontierTrainerMons_Fiona
 
-; 271
+@ 271
 	.4byte TRAINER_CLASS_TRIATHLETE_6
 	.charmapstr "GLORIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LIKE
 	ec_word TO
 	ec_word ATTACK
 	ec_word WITH
 	ec_word SUCTION_CUPS
-; win speech
+@ win speech
 	ec_word GIGGLE
 	ec_word ELLIPSIS
 	ec_word IT_S
 	ec_word OVER
 	ec_word FOR
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DON_T
 	ec_word GET
@@ -7073,24 +7073,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word WORK
 	.4byte gBattleFrontierTrainerMons_Gloria
 
-; 272
+@ 272
 	.4byte TRAINER_CLASS_TRIATHLETE_1
 	.charmapstr "NICO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LIKE
 	ec_word A
 	ec_move1 SONIC_BOOM
 	ec_word I_VE_ARRIVED
 	.2byte -1
 	.2byte -1
-; win speech
+@ win speech
 	ec_word SORRY
 	ec_word TO
 	ec_word MAKE
 	ec_word YOU
 	ec_word SO
 	ec_word DOWNCAST
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word WITH
@@ -7099,24 +7099,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SPEED_BOOST
 	.4byte gBattleFrontierTrainerMons_Nico
 
-; 273
+@ 273
 	.4byte TRAINER_CLASS_TRIATHLETE_1
 	.charmapstr "JEREMY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word POKEMON
 	ec_word MASTER
 	ec_word THAT_S
 	ec_word MY
 	ec_word DREAM
-; win speech
+@ win speech
 	ec_word MY
 	ec_word DREAM
 	ec_word ISN_T
 	ec_word FAR
 	ec_word OFF
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word I
 	ec_word DREAM
@@ -7125,24 +7125,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Jeremy
 
-; 274
+@ 274
 	.4byte TRAINER_CLASS_TRIATHLETE_2
 	.charmapstr "CAITLIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DON_T
 	ec_word YOU
 	ec_word THINK
 	ec_word I_AM
 	ec_word CUTE
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word THERE
 	ec_word IS
 	ec_word MORE
 	ec_word TO_ME
 	ec_word THAN
 	ec_word CUTENESS
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word CUTE_CHARM
 	ec_word DOESN_T
@@ -7151,24 +7151,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Caitlin
 
-; 275
+@ 275
 	.4byte TRAINER_CLASS_TRIATHLETE_2
 	.charmapstr "REENA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word ALWAYS
 	ec_word HAPPY
 	ec_word HAPPY
 	ec_word HAPPY
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word OH
 	ec_word YAY
 	ec_word EXCL
 	ec_word YAHOO
 	ec_word FOR
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word YAHOO
 	ec_word EXCL
 	ec_word I_AM
@@ -7177,24 +7177,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word YOU
 	.4byte gBattleFrontierTrainerMons_Reena
 
-; 276
+@ 276
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "AVERY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_VE
 	ec_word GOT
 	ec_word A_LOT
 	ec_word OF
 	ec_word BUG
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word MY
 	ec_word BUG
 	ec_word POKEMON
 	ec_word ARE
 	ec_word ALL
 	ec_word UNBELIEVABLE
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word BUG
 	ec_word POKEMON
@@ -7203,24 +7203,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word UPSIDE_DOWN
 	.4byte gBattleFrontierTrainerMons_Avery
 
-; 277
+@ 277
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "LIAM$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WE
 	ec_word REALLY
 	ec_word DISLIKE
 	ec_word FIRE
 	ec_word AND
 	ec_word FLYING
-; win speech
+@ win speech
 	ec_word BUG
 	ec_word POKEMON
 	ec_word AREN_T
 	ec_word BAD
 	ec_word HEY_QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word KNOW
 	ec_word WHAT
@@ -7229,24 +7229,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word HEY_QUES
 	.4byte gBattleFrontierTrainerMons_Liam
 
-; 278
+@ 278
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "THEO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word FISHING
 	ec_word IS
 	ec_word MY
 	ec_word CHOICE
 	ec_word IN
 	ec_word LIFE
-; win speech
+@ win speech
 	ec_word WATER
 	ec_word POKEMON
 	ec_move2 ATTRACT
 	ec_word ME
 	ec_word WITHOUT
 	ec_word END
-; loss speech
+@ loss speech
 	ec_word DON_T
 	ec_word COUNT_ON
 	ec_word THAT
@@ -7255,24 +7255,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TIME
 	.4byte gBattleFrontierTrainerMons_Theo
 
-; 279
+@ 279
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "BAILEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word AN
 	ec_word ADULT
 	ec_word I
 	ec_word BATTLE
 	ec_word EASY
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word AN
 	ec_word ADULT
 	ec_word I
 	ec_move2 SWALLOW
 	ec_word JOY
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word AN
 	ec_word ADULT
@@ -7281,24 +7281,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 FRUSTRATION
 	.4byte gBattleFrontierTrainerMons_Bailey
 
-; 280
+@ 280
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "HUGO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word TRY
 	ec_word THE
 	ec_word BEST
 	ec_word I
 	ec_word CAN
-; win speech
+@ win speech
 	ec_word I
 	ec_word CAN_WIN
 	ec_word IF
 	ec_word I
 	ec_word TRY
 	ec_word ENOUGH
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DID
 	ec_word TRY
@@ -7307,24 +7307,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Hugo
 
-; 281
+@ 281
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "BRYCE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_WAS
 	ec_word ON
 	ec_word VACATION
 	ec_word UNTIL
 	ec_word ONLY
 	ec_word YESTERDAY
-; win speech
+@ win speech
 	ec_word I
 	ec_word HAVEN_T
 	ec_word LOST
 	ec_word MY
 	ec_word SKILL
 	ec_word YET
-; loss speech
+@ loss speech
 	ec_word THAT_S
 	ec_word IT
 	ec_word ELLIPSIS
@@ -7333,24 +7333,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SLEEP
 	.4byte gBattleFrontierTrainerMons_Bryce
 
-; 282
+@ 282
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "GIDEON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WHAT_S_UP_QUES
 	ec_word YOU
 	ec_word THINK
 	ec_word I_AM
 	ec_word SCARY
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word COOL
 	ec_word BUT
 	ec_word NOT
 	ec_word SCARY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word LOOK
 	ec_word AT
 	ec_word MY
@@ -7359,24 +7359,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word SENSE
 	.4byte gBattleFrontierTrainerMons_Gideon
 
-; 283
+@ 283
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "TRISTON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WOULD
 	ec_word RATHER
 	ec_word LOOK
 	ec_word AT
 	ec_word POKEMON
-; win speech
+@ win speech
 	ec_word HUH_QUES
 	ec_word YOU
 	ec_word MEAN
 	ec_word I
 	ec_word WON
 	ec_word QUES_EXCL
-; loss speech
+@ loss speech
 	ec_word SEE
 	ec_word QUES
 	.2byte -1
@@ -7385,24 +7385,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word LOSE
 	.4byte gBattleFrontierTrainerMons_Triston
 
-; 284
+@ 284
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "CHARLES$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word HOPELESS
 	ec_word TO
 	ec_move2 STRUGGLE
 	ec_word WITH
 	ec_word ME
-; win speech
+@ win speech
 	ec_move1 SUBMISSION
 	ec_word WAS
 	ec_word YOUR
 	ec_word ONLY
 	ec_word CHOICE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word DOWN
@@ -7411,24 +7411,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Charles
 
-; 285
+@ 285
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "RAYMOND$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WANT
 	ec_word TO
 	ec_word HEAR
 	ec_word MY
 	ec_word SONG
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word SATISFIED
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I_AM
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word SATISFIED
 	ec_word IS
 	ec_word WHAT
@@ -7437,24 +7437,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word BE
 	.4byte gBattleFrontierTrainerMons_Raymond
 
-; 286
+@ 286
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "DIRK$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word FLYING
 	ec_word POKEMON
 	ec_word ARE
 	ec_word ABOVE
 	ec_word THE
 	ec_move2 REST
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word CAN_T_WIN
 	ec_word EXCL
 	ec_word FLYING
 	ec_word POKEMON
 	ec_word RULE
-; loss speech
+@ loss speech
 	ec_word AREN_T
 	ec_word THERE
 	ec_word MORE
@@ -7463,24 +7463,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Dirk
 
-; 287
+@ 287
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "HAROLD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word APPEAL
 	ec_word TO
 	ec_word YOU
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word DO
 	ec_word LIKE
 	ec_word MY
 	ec_word POKEMON
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word SO
 	ec_word YOU
 	ec_word DISLIKE
@@ -7489,24 +7489,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Harold
 
-; 288
+@ 288
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "OMAR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_ME_WIN
 	ec_word IN
 	ec_move1 RETURN
 	ec_word FOR
 	ec_word A
 	ec_move2 PRESENT
-; win speech
+@ win speech
 	ec_word HERE
 	ec_word YOU
 	ec_word ARE
 	ec_word SOME
 	ec_move2 TOXIC
 	ec_word SWEETS
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_move2 PRESENT
 	ec_word QUES
@@ -7515,24 +7515,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES_EXCL
 	.4byte gBattleFrontierTrainerMons_Omar
 
-; 289
+@ 289
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "PETER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word BRAG
 	ec_word ABOUT
 	ec_word MY
 	ec_word HAPPINESS
 	ec_word OK_QUES
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word TO
 	ec_word LISTEN
 	ec_word TO_ME
 	ec_word BRAG
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word DISAPPOINTED
 	ec_word YOU
@@ -7541,24 +7541,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word TO_ME
 	.4byte gBattleFrontierTrainerMons_Peter
 
-; 290
+@ 290
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "DEV$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word LET_S
 	ec_word GET
 	ec_word A
 	ec_word MOVE
 	ec_word ON
-; win speech
+@ win speech
 	ec_word I
 	ec_word GET
 	ec_word TO
 	ec_word NAP
 	ec_word AFTER
 	ec_word THAT
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -7567,24 +7567,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word THAT
 	.4byte gBattleFrontierTrainerMons_Dev
 
-; 291
+@ 291
 	.4byte TRAINER_CLASS_HIKER
 	.charmapstr "COREY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word TEACH
 	ec_word YOU
 	ec_word HOW
 	ec_word TOUGH
 	ec_word I_AM
-; win speech
+@ win speech
 	ec_word LOOK
 	ec_word AT
 	ec_word ME
 	ec_word MAKE
 	ec_word A
 	ec_move1 BRICK_BREAK
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 FRUSTRATION
 	ec_word IS
@@ -7593,24 +7593,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_move2 ERUPTION
 	.4byte gBattleFrontierTrainerMons_Corey
 
-; 292
+@ 292
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "ANDRE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word NOW
 	ec_word THIS
 	ec_word IS
 	ec_word A
 	ec_word PERFECT
 	ec_word FLAME_BODY
-; win speech
+@ win speech
 	ec_word LOOK
 	ec_word AT
 	ec_word MY
 	ec_word FIERY
 	ec_word DANCE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word WANT
 	ec_word AN
@@ -7619,24 +7619,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word QUES
 	.4byte gBattleFrontierTrainerMons_Andre
 
-; 293
+@ 293
 	.4byte TRAINER_CLASS_KINDLER
 	.charmapstr "FERRIS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NO_1
 	ec_word IN
 	ec_word THE
 	ec_word OLD
 	ec_word CLASS
-; win speech
+@ win speech
 	ec_word NO_1
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word I_AM
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word NO_1
@@ -7645,24 +7645,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ELLIPSIS
 	.4byte gBattleFrontierTrainerMons_Ferris
 
-; 294
+@ 294
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "ALIVIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word GIDDY
 	ec_word SO
 	ec_word SHOULD
 	ec_word YOU
-; win speech
+@ win speech
 	ec_word IT
 	ec_word WAS
 	ec_word ALL
 	ec_word TOGETHER
 	ec_word TOO
 	ec_word EASY
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WILL
 	ec_word GIDDY
@@ -7671,24 +7671,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word AWAY
 	.4byte gBattleFrontierTrainerMons_Alivia
 
-; 295
+@ 295
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "PAIGE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LET_S
 	ec_word ENJOY
 	ec_word OUR
 	ec_word BATTLE
 	ec_word TOGETHER
 	.2byte -1
-; win speech
+@ win speech
 	ec_word THAT_S_IT_EXCL
 	.2byte -1
 	.2byte -1
 	ec_word THANK_YOU
 	ec_word VERY
 	ec_word MUCH
-; loss speech
+@ loss speech
 	ec_word THAT_S_IT_EXCL
 	.2byte -1
 	.2byte -1
@@ -7697,24 +7697,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word ON
 	.4byte gBattleFrontierTrainerMons_Paige
 
-; 296
+@ 296
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "ANYA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DISLIKE
 	ec_word OH
 	ec_word SO
 	ec_word PRETTY
 	ec_word FASHION
-; win speech
+@ win speech
 	ec_word FASHION
 	ec_word SHOULD
 	ec_word MATCH
 	ec_word THE
 	ec_word PERSON
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word PRETTY
 	ec_word COULD
 	ec_word BE
@@ -7723,24 +7723,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Anya
 
-; 297
+@ 297
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "DAWN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word GO
 	ec_word ALL
 	ec_word OUT
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word DON_T
 	ec_word BE
 	ec_word A
 	ec_word BABY
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word WON
 	ec_word EXCL
@@ -7749,24 +7749,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	ec_word EXCL
 	.4byte gBattleFrontierTrainerMons_Dawn
 
-; 298
+@ 298
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "ABBY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LIKE
 	ec_word A
 	ec_word TRAINER
 	ec_word THAT_S
 	ec_word REFRESHING
-; win speech
+@ win speech
 	ec_word VICTORY
 	ec_word HAS
 	ec_word A
 	ec_move1 SWEET_SCENT
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WHAT
 	ec_word AN
 	ec_word AWFUL
@@ -7775,24 +7775,24 @@ gBattleFrontierTrainers: ; 85D5ACC
 	.2byte -1
 	.4byte gBattleFrontierTrainerMons_Abby
 
-; 299
+@ 299
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "GRETEL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word CAUSE
 	ec_move1 OUTRAGE
 	ec_word AS
 	ec_word A
 	ec_word TRAINER
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word ONLY
 	ec_word NATURAL
 	ec_word SEE_YA
 	ec_word BYE_BYE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word IT_S
 	ec_word HARD
 	ec_word TO
diff --git a/data/battle_frontier/battle_pyramid_level_50_wild_mons.s b/data/battle_frontier/battle_pyramid_level_50_wild_mons.s
index e4d61dfe0..709f61830 100644
--- a/data/battle_frontier/battle_pyramid_level_50_wild_mons.s
+++ b/data/battle_frontier/battle_pyramid_level_50_wild_mons.s
@@ -1,988 +1,988 @@
 	.align 2, 0
 
-gBattlePyramidLevel50WildMons_Round1: ; 86126B0
-; 0
+gBattlePyramidLevel50WildMons_Round1: @ 86126B0
+@ 0
 	.2byte SPECIES_PLUSLE
-	.byte 35 ; base level
-	.byte 2 ; unknown
+	.byte 35 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_MINUN
-	.byte 35 ; base level
-	.byte 2 ; unknown
+	.byte 35 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PIKACHU
-	.byte 37 ; base level
-	.byte 2 ; unknown
+	.byte 37 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_ELECTABUZZ
-	.byte 37 ; base level
-	.byte 2 ; unknown
+	.byte 37 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_VILEPLUME
-	.byte 39 ; base level
-	.byte 2 ; unknown
+	.byte 39 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_MANECTRIC
-	.byte 39 ; base level
-	.byte 2 ; unknown
+	.byte 39 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_BRELOOM
-	.byte 40 ; base level
-	.byte 2 ; unknown
+	.byte 40 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH
 
-; 7
+@ 7
 	.2byte SPECIES_JOLTEON
-	.byte 40 ; base level
-	.byte 2 ; unknown
+	.byte 40 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK
 
-gBattlePyramidLevel50WildMons_Round2: ; 8612710
-; 0
+gBattlePyramidLevel50WildMons_Round2: @ 8612710
+@ 0
 	.2byte SPECIES_GULPIN
-	.byte 36 ; base level
-	.byte 2 ; unknown
+	.byte 36 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_ROSELIA
-	.byte 36 ; base level
-	.byte 2 ; unknown
+	.byte 36 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE
 
-; 2
+@ 2
 	.2byte SPECIES_BUTTERFREE
-	.byte 38 ; base level
-	.byte 2 ; unknown
+	.byte 38 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SEVIPER
-	.byte 38 ; base level
-	.byte 2 ; unknown
+	.byte 38 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL
 
-; 4
+@ 4
 	.2byte SPECIES_SKARMORY
-	.byte 40 ; base level
-	.byte 2 ; unknown
+	.byte 40 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_LUDICOLO
-	.byte 40 ; base level
-	.byte 1 ; unknown
+	.byte 40 @ base level
+	.byte 1 @ unknown
 	.2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE
 
-; 6
+@ 6
 	.2byte SPECIES_CROBAT
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round3: ; 8612770
-; 0
+gBattlePyramidLevel50WildMons_Round3: @ 8612770
+@ 0
 	.2byte SPECIES_GROWLITHE
-	.byte 37 ; base level
-	.byte 2 ; unknown
+	.byte 37 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_VULPIX
-	.byte 37 ; base level
-	.byte 2 ; unknown
+	.byte 37 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_MAGCARGO
-	.byte 39 ; base level
-	.byte 1 ; unknown
+	.byte 39 @ base level
+	.byte 1 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_NINETALES
-	.byte 39 ; base level
-	.byte 2 ; unknown
+	.byte 39 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_MEDICHAM
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_WEEZING
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_DUSCLOPS
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH
 
-; 7
+@ 7
 	.2byte SPECIES_HOUNDOOM
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT
 
-gBattlePyramidLevel50WildMons_Round4: ; 86127D0
-; 0
+gBattlePyramidLevel50WildMons_Round4: @ 86127D0
+@ 0
 	.2byte SPECIES_DUNSPARCE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_BANETTE
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_MISDREAVUS
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_NINETALES
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_ABSOL
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 5
+@ 5
 	.2byte SPECIES_DUSCLOPS
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL
 
-; 6
+@ 6
 	.2byte SPECIES_SHEDINJA
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round5: ; 8612830
-; 0
+gBattlePyramidLevel50WildMons_Round5: @ 8612830
+@ 0
 	.2byte SPECIES_HAUNTER
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_CHIMECHO
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT
 
-; 2
+@ 2
 	.2byte SPECIES_SOLROCK
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC
 
-; 3
+@ 3
 	.2byte SPECIES_MISDREAVUS
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT
 
-; 4
+@ 4
 	.2byte SPECIES_CLAYDOL
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC
 
-; 5
+@ 5
 	.2byte SPECIES_WEEZING
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_FLYGON
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE
 
-gBattlePyramidLevel50WildMons_Round6: ; 8612890
-; 0
+gBattlePyramidLevel50WildMons_Round6: @ 8612890
+@ 0
 	.2byte SPECIES_DIGLETT
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_TRAPINCH
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_WYNAUT
-	.byte 42 ; base level
-	.byte 0 ; unknown
+	.byte 42 @ base level
+	.byte 0 @ unknown
 	.2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT
 
-; 3
+@ 3
 	.2byte SPECIES_DIGLETT
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC
 
-; 4
+@ 4
 	.2byte SPECIES_TRAPINCH
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT
 
-; 5
+@ 5
 	.2byte SPECIES_WYNAUT
-	.byte 44 ; base level
-	.byte 0 ; unknown
+	.byte 44 @ base level
+	.byte 0 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WOBBUFFET
-	.byte 45 ; base level
-	.byte 0 ; unknown
+	.byte 45 @ base level
+	.byte 0 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_DUGTRIO
-	.byte 45 ; base level
-	.byte 1 ; unknown
+	.byte 45 @ base level
+	.byte 1 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT
 
-gBattlePyramidLevel50WildMons_Round7: ; 86128F0
-; 0
+gBattlePyramidLevel50WildMons_Round7: @ 86128F0
+@ 0
 	.2byte SPECIES_GLALIE
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SNEASEL
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_DEWGONG
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_PILOSWINE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_JYNX
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_CLOYSTER
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WALREIN
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_LAPRAS
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC
 
-gBattlePyramidLevel50WildMons_Round8: ; 8612950
-; 0
+gBattlePyramidLevel50WildMons_Round8: @ 8612950
+@ 0
 	.2byte SPECIES_WEEZING
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_ELECTRODE
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_GENGAR
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_GOLEM
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_PINECO
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_SOLROCK
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_FORRETRESS
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_SHIFTRY
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT
 
-gBattlePyramidLevel50WildMons_Round9: ; 86129B0
-; 0
+gBattlePyramidLevel50WildMons_Round9: @ 86129B0
+@ 0
 	.2byte SPECIES_WOBBUFFET
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND
 
-; 1
+@ 1
 	.2byte SPECIES_METANG
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC
 
-; 2
+@ 2
 	.2byte SPECIES_EXEGGUTOR
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SLOWKING
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER
 
-; 4
+@ 4
 	.2byte SPECIES_XATU
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING
 
-; 5
+@ 5
 	.2byte SPECIES_ALAKAZAM
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC
 
-; 6
+@ 6
 	.2byte SPECIES_STARMIE
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM
 
-; 7
+@ 7
 	.2byte SPECIES_ESPEON
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round10: ; 8612A10
-; 0
+gBattlePyramidLevel50WildMons_Round10: @ 8612A10
+@ 0
 	.2byte SPECIES_GOLEM
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_STEELIX
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_OMASTAR
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_LUNATONE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_SHUCKLE
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_ARMALDO
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_CRADILY
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_AERODACTYL
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round11: ; 8612A70
-; 0
+gBattlePyramidLevel50WildMons_Round11: @ 8612A70
+@ 0
 	.2byte SPECIES_POLIWRATH
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_HARIYAMA
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_BRELOOM
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_MEDICHAM
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH
 
-; 4
+@ 4
 	.2byte SPECIES_HITMONCHAN
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH
 
-; 5
+@ 5
 	.2byte SPECIES_HITMONLEE
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_HERACROSS
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE
 
-; 7
+@ 7
 	.2byte SPECIES_MACHAMP
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS
 
-gBattlePyramidLevel50WildMons_Round12: ; 8612AD0
-; 0
+gBattlePyramidLevel50WildMons_Round12: @ 8612AD0
+@ 0
 	.2byte SPECIES_QUAGSIRE
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_TROPIUS
-	.byte 41 ; base level
-	.byte 2 ; unknown
+	.byte 41 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PUPITAR
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_LAPRAS
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_CACTURNE
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_FLAREON
-	.byte 44 ; base level
-	.byte 2 ; unknown
+	.byte 44 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WALREIN
-	.byte 45 ; base level
-	.byte 2 ; unknown
+	.byte 45 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_GYARADOS
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round13: ; 8612B30
-; 0
+gBattlePyramidLevel50WildMons_Round13: @ 8612B30
+@ 0
 	.2byte SPECIES_PINECO
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SHUCKLE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_VENOMOTH
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC
 
-; 3
+@ 3
 	.2byte SPECIES_SCIZOR
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT
 
-; 4
+@ 4
 	.2byte SPECIES_HERACROSS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE
 
-; 5
+@ 5
 	.2byte SPECIES_FORRETRESS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_ARMALDO
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_SHEDINJA
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE
 
-gBattlePyramidLevel50WildMons_Round14: ; 8612B90
-; 0
+gBattlePyramidLevel50WildMons_Round14: @ 8612B90
+@ 0
 	.2byte SPECIES_SABLEYE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SNEASEL
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK
 
-; 2
+@ 2
 	.2byte SPECIES_CRAWDAUNT
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SHIFTRY
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN
 
-; 4
+@ 4
 	.2byte SPECIES_CACTURNE
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_ABSOL
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_HOUNDOOM
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 7
+@ 7
 	.2byte SPECIES_UMBREON
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK
 
-gBattlePyramidLevel50WildMons_Round15: ; 8612BF0
-; 0
+gBattlePyramidLevel50WildMons_Round15: @ 8612BF0
+@ 0
 	.2byte SPECIES_OCTILLERY
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_DEWGONG
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PELIPPER
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_QUAGSIRE
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_LUDICOLO
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM
 
-; 5
+@ 5
 	.2byte SPECIES_SLOWKING
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_STARMIE
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD
 
-; 7
+@ 7
 	.2byte SPECIES_BLASTOISE
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE
 
-gBattlePyramidLevel50WildMons_Round16: ; 8612C50
-; 0
+gBattlePyramidLevel50WildMons_Round16: @ 8612C50
+@ 0
 	.2byte SPECIES_DUSKULL
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 1
+@ 1
 	.2byte SPECIES_HAUNTER
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL
 
-; 2
+@ 2
 	.2byte SPECIES_BANETTE
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_MISDREAVUS
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_SABLEYE
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE
 
-; 5
+@ 5
 	.2byte SPECIES_DUSCLOPS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_SHEDINJA
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE
 
-gBattlePyramidLevel50WildMons_Round17: ; 8612CB0
-; 0
+gBattlePyramidLevel50WildMons_Round17: @ 8612CB0
+@ 0
 	.2byte SPECIES_MAWILE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_MAGNETON
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_STEELIX
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SCIZOR
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_FORRETRESS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_SKARMORY
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT
 
-; 6
+@ 6
 	.2byte SPECIES_AGGRON
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM
 
-; 7
+@ 7
 	.2byte SPECIES_METAGROSS
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK
 
-gBattlePyramidLevel50WildMons_Round18: ; 8612D10
-; 0
+gBattlePyramidLevel50WildMons_Round18: @ 8612D10
+@ 0
 	.2byte SPECIES_DRAGONAIR
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_VIBRAVA
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING
 
-; 2
+@ 2
 	.2byte SPECIES_ALTARIA
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT
 
-; 3
+@ 3
 	.2byte SPECIES_FLYGON
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_AERODACTYL
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_GYARADOS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE
 
-; 6
+@ 6
 	.2byte SPECIES_KINGDRA
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_CHARIZARD
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL
 
-gBattlePyramidLevel50WildMons_Round19: ; 8612D70
-; 0
+gBattlePyramidLevel50WildMons_Round19: @ 8612D70
+@ 0
 	.2byte SPECIES_ARCANINE
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_POLIWRATH
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_RAICHU
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_VAPOREON
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_JOLTEON
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_FLAREON
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_NINETALES
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_STARMIE
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC
 
-gBattlePyramidLevel50WildMons_Round20: ; 8612DD0
-; 0
+gBattlePyramidLevel50WildMons_Round20: @ 8612DD0
+@ 0
 	.2byte SPECIES_KANGASKHAN
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH
 
-; 1
+@ 1
 	.2byte SPECIES_SWELLOW
-	.byte 42 ; base level
-	.byte 2 ; unknown
+	.byte 42 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_URSARING
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT
 
-; 3
+@ 3
 	.2byte SPECIES_PORYGON2
-	.byte 46 ; base level
-	.byte 2 ; unknown
+	.byte 46 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
 
-; 4
+@ 4
 	.2byte SPECIES_TAUROS
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT
 
-; 5
+@ 5
 	.2byte SPECIES_FEAROW
-	.byte 48 ; base level
-	.byte 2 ; unknown
+	.byte 48 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT
 
-; 6
+@ 6
 	.2byte SPECIES_SNORLAX
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE
 
-; 7
+@ 7
 	.2byte SPECIES_SLAKING
-	.byte 50 ; base level
-	.byte 2 ; unknown
+	.byte 50 @ base level
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
 
 	.align 2, 0
 
-gBattlePyramidLevel50WildMonPointers: ; 8612E30
+gBattlePyramidLevel50WildMonPointers: @ 8612E30
 	.4byte gBattlePyramidLevel50WildMons_Round1
 	.4byte gBattlePyramidLevel50WildMons_Round2
 	.4byte gBattlePyramidLevel50WildMons_Round3
diff --git a/data/battle_frontier/battle_pyramid_open_level_wild_mons.s b/data/battle_frontier/battle_pyramid_open_level_wild_mons.s
index 274aefe66..0450f4e52 100644
--- a/data/battle_frontier/battle_pyramid_open_level_wild_mons.s
+++ b/data/battle_frontier/battle_pyramid_open_level_wild_mons.s
@@ -1,988 +1,988 @@
 	.align 2, 0
 
-gBattlePyramidOpenLevelWildMons_Round1: ; 8612E80
-; 0
+gBattlePyramidOpenLevelWildMons_Round1: @ 8612E80
+@ 0
 	.2byte SPECIES_PLUSLE
-	.byte 15 ; base level difference
-	.byte 2 ; unknown
+	.byte 15 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_MINUN
-	.byte 15 ; base level difference
-	.byte 2 ; unknown
+	.byte 15 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PIKACHU
-	.byte 13 ; base level difference
-	.byte 2 ; unknown
+	.byte 13 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_ELECTABUZZ
-	.byte 13 ; base level difference
-	.byte 2 ; unknown
+	.byte 13 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_VILEPLUME
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_MANECTRIC
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_BRELOOM
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH
 
-; 7
+@ 7
 	.2byte SPECIES_JOLTEON
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK
 
-gBattlePyramidOpenLevelWildMons_Round2: ; 8612EE0
-; 0
+gBattlePyramidOpenLevelWildMons_Round2: @ 8612EE0
+@ 0
 	.2byte SPECIES_GULPIN
-	.byte 14 ; base level difference
-	.byte 2 ; unknown
+	.byte 14 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_ROSELIA
-	.byte 14 ; base level difference
-	.byte 2 ; unknown
+	.byte 14 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE
 
-; 2
+@ 2
 	.2byte SPECIES_BUTTERFREE
-	.byte 12 ; base level difference
-	.byte 2 ; unknown
+	.byte 12 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SEVIPER
-	.byte 12 ; base level difference
-	.byte 2 ; unknown
+	.byte 12 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL
 
-; 4
+@ 4
 	.2byte SPECIES_SKARMORY
-	.byte 7 ; base level difference
-	.byte 2 ; unknown
+	.byte 7 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_LUDICOLO
-	.byte 7 ; base level difference
-	.byte 1 ; unknown
+	.byte 7 @ base level difference
+	.byte 1 @ unknown
 	.2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE
 
-; 6
+@ 6
 	.2byte SPECIES_CROBAT
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round3: ; 8612F40
-; 0
+gBattlePyramidOpenLevelWildMons_Round3: @ 8612F40
+@ 0
 	.2byte SPECIES_GROWLITHE
-	.byte 13 ; base level difference
-	.byte 2 ; unknown
+	.byte 13 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_VULPIX
-	.byte 13 ; base level difference
-	.byte 2 ; unknown
+	.byte 13 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_MAGCARGO
-	.byte 11 ; base level difference
-	.byte 1 ; unknown
+	.byte 11 @ base level difference
+	.byte 1 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_NINETALES
-	.byte 11 ; base level difference
-	.byte 2 ; unknown
+	.byte 11 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_MEDICHAM
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_WEEZING
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_DUSCLOPS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH
 
-; 7
+@ 7
 	.2byte SPECIES_HOUNDOOM
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT
 
-gBattlePyramidOpenLevelWildMons_Round4: ; 8612FA0
-; 0
+gBattlePyramidOpenLevelWildMons_Round4: @ 8612FA0
+@ 0
 	.2byte SPECIES_DUNSPARCE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_BANETTE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_MISDREAVUS
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_NINETALES
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_ABSOL
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 5
+@ 5
 	.2byte SPECIES_DUSCLOPS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL
 
-; 6
+@ 6
 	.2byte SPECIES_SHEDINJA
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round5: ; 8613000
-; 0
+gBattlePyramidOpenLevelWildMons_Round5: @ 8613000
+@ 0
 	.2byte SPECIES_HAUNTER
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_CHIMECHO
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT
 
-; 2
+@ 2
 	.2byte SPECIES_SOLROCK
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC
 
-; 3
+@ 3
 	.2byte SPECIES_MISDREAVUS
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT
 
-; 4
+@ 4
 	.2byte SPECIES_CLAYDOL
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC
 
-; 5
+@ 5
 	.2byte SPECIES_WEEZING
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_FLYGON
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE
 
-gBattlePyramidOpenLevelWildMons_Round6: ; 8613060
-; 0
+gBattlePyramidOpenLevelWildMons_Round6: @ 8613060
+@ 0
 	.2byte SPECIES_DIGLETT
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_TRAPINCH
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_WYNAUT
-	.byte 8 ; base level difference
-	.byte 0 ; unknown
+	.byte 8 @ base level difference
+	.byte 0 @ unknown
 	.2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT
 
-; 3
+@ 3
 	.2byte SPECIES_DIGLETT
-	.byte 8 ; base level difference
-	.byte 1 ; unknown
+	.byte 8 @ base level difference
+	.byte 1 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC
 
-; 4
+@ 4
 	.2byte SPECIES_TRAPINCH
-	.byte 6 ; base level difference
-	.byte 1 ; unknown
+	.byte 6 @ base level difference
+	.byte 1 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT
 
-; 5
+@ 5
 	.2byte SPECIES_WYNAUT
-	.byte 6 ; base level difference
-	.byte 0 ; unknown
+	.byte 6 @ base level difference
+	.byte 0 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WOBBUFFET
-	.byte 5 ; base level difference
-	.byte 0 ; unknown
+	.byte 5 @ base level difference
+	.byte 0 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_DUGTRIO
-	.byte 5 ; base level difference
-	.byte 1 ; unknown
+	.byte 5 @ base level difference
+	.byte 1 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT
 
-gBattlePyramidOpenLevelWildMons_Round7: ; 86130C0
-; 0
+gBattlePyramidOpenLevelWildMons_Round7: @ 86130C0
+@ 0
 	.2byte SPECIES_GLALIE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SNEASEL
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_DEWGONG
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_PILOSWINE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_JYNX
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_CLOYSTER
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WALREIN
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_LAPRAS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC
 
-gBattlePyramidOpenLevelWildMons_Round8: ; 8613120
-; 0
+gBattlePyramidOpenLevelWildMons_Round8: @ 8613120
+@ 0
 	.2byte SPECIES_WEEZING
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_ELECTRODE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_GENGAR
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_GOLEM
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_PINECO
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_SOLROCK
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_FORRETRESS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_SHIFTRY
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT
 
-gBattlePyramidOpenLevelWildMons_Round9: ; 8613180
-; 0
+gBattlePyramidOpenLevelWildMons_Round9: @ 8613180
+@ 0
 	.2byte SPECIES_WOBBUFFET
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND
 
-; 1
+@ 1
 	.2byte SPECIES_METANG
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC
 
-; 2
+@ 2
 	.2byte SPECIES_EXEGGUTOR
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SLOWKING
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER
 
-; 4
+@ 4
 	.2byte SPECIES_XATU
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING
 
-; 5
+@ 5
 	.2byte SPECIES_ALAKAZAM
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC
 
-; 6
+@ 6
 	.2byte SPECIES_STARMIE
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM
 
-; 7
+@ 7
 	.2byte SPECIES_ESPEON
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round10: ; 86131E0
-; 0
+gBattlePyramidOpenLevelWildMons_Round10: @ 86131E0
+@ 0
 	.2byte SPECIES_GOLEM
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_STEELIX
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_OMASTAR
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_LUNATONE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_SHUCKLE
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_ARMALDO
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_CRADILY
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_AERODACTYL
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round11: ; 8613240
-; 0
+gBattlePyramidOpenLevelWildMons_Round11: @ 8613240
+@ 0
 	.2byte SPECIES_POLIWRATH
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_HARIYAMA
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_BRELOOM
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_MEDICHAM
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH
 
-; 4
+@ 4
 	.2byte SPECIES_HITMONCHAN
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH
 
-; 5
+@ 5
 	.2byte SPECIES_HITMONLEE
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_HERACROSS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE
 
-; 7
+@ 7
 	.2byte SPECIES_MACHAMP
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS
 
-gBattlePyramidOpenLevelWildMons_Round12: ; 86132A0
-; 0
+gBattlePyramidOpenLevelWildMons_Round12: @ 86132A0
+@ 0
 	.2byte SPECIES_QUAGSIRE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_TROPIUS
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PUPITAR
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_LAPRAS
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_CACTURNE
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_FLAREON
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_WALREIN
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_GYARADOS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round13: ; 8613300
-; 0
+gBattlePyramidOpenLevelWildMons_Round13: @ 8613300
+@ 0
 	.2byte SPECIES_PINECO
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SHUCKLE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_VENOMOTH
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC
 
-; 3
+@ 3
 	.2byte SPECIES_SCIZOR
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT
 
-; 4
+@ 4
 	.2byte SPECIES_HERACROSS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE
 
-; 5
+@ 5
 	.2byte SPECIES_FORRETRESS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_ARMALDO
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_SHEDINJA
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE
 
-gBattlePyramidOpenLevelWildMons_Round14: ; 8613360
-; 0
+gBattlePyramidOpenLevelWildMons_Round14: @ 8613360
+@ 0
 	.2byte SPECIES_SABLEYE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_SNEASEL
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK
 
-; 2
+@ 2
 	.2byte SPECIES_CRAWDAUNT
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SHIFTRY
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN
 
-; 4
+@ 4
 	.2byte SPECIES_CACTURNE
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_ABSOL
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_HOUNDOOM
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 7
+@ 7
 	.2byte SPECIES_UMBREON
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK
 
-gBattlePyramidOpenLevelWildMons_Round15: ; 86133C0
-; 0
+gBattlePyramidOpenLevelWildMons_Round15: @ 86133C0
+@ 0
 	.2byte SPECIES_OCTILLERY
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_DEWGONG
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_PELIPPER
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_QUAGSIRE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_LUDICOLO
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM
 
-; 5
+@ 5
 	.2byte SPECIES_SLOWKING
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_STARMIE
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD
 
-; 7
+@ 7
 	.2byte SPECIES_BLASTOISE
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE
 
-gBattlePyramidOpenLevelWildMons_Round16: ; 8613420
-; 0
+gBattlePyramidOpenLevelWildMons_Round16: @ 8613420
+@ 0
 	.2byte SPECIES_DUSKULL
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT
 
-; 1
+@ 1
 	.2byte SPECIES_HAUNTER
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL
 
-; 2
+@ 2
 	.2byte SPECIES_BANETTE
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_MISDREAVUS
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_SABLEYE
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE
 
-; 5
+@ 5
 	.2byte SPECIES_DUSCLOPS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_SHEDINJA
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT
 
-; 7
+@ 7
 	.2byte SPECIES_GENGAR
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE
 
-gBattlePyramidOpenLevelWildMons_Round17: ; 8613480
-; 0
+gBattlePyramidOpenLevelWildMons_Round17: @ 8613480
+@ 0
 	.2byte SPECIES_MAWILE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_MAGNETON
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_STEELIX
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_SCIZOR
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_FORRETRESS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_SKARMORY
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT
 
-; 6
+@ 6
 	.2byte SPECIES_AGGRON
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM
 
-; 7
+@ 7
 	.2byte SPECIES_METAGROSS
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK
 
-gBattlePyramidOpenLevelWildMons_Round18: ; 86134E0
-; 0
+gBattlePyramidOpenLevelWildMons_Round18: @ 86134E0
+@ 0
 	.2byte SPECIES_DRAGONAIR
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_VIBRAVA
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING
 
-; 2
+@ 2
 	.2byte SPECIES_ALTARIA
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT
 
-; 3
+@ 3
 	.2byte SPECIES_FLYGON
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_AERODACTYL
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_GYARADOS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE
 
-; 6
+@ 6
 	.2byte SPECIES_KINGDRA
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_CHARIZARD
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL
 
-gBattlePyramidOpenLevelWildMons_Round19: ; 8613540
-; 0
+gBattlePyramidOpenLevelWildMons_Round19: @ 8613540
+@ 0
 	.2byte SPECIES_ARCANINE
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE
 
-; 1
+@ 1
 	.2byte SPECIES_POLIWRATH
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_RAICHU
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE
 
-; 3
+@ 3
 	.2byte SPECIES_VAPOREON
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE
 
-; 4
+@ 4
 	.2byte SPECIES_JOLTEON
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE
 
-; 5
+@ 5
 	.2byte SPECIES_FLAREON
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE
 
-; 6
+@ 6
 	.2byte SPECIES_NINETALES
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE
 
-; 7
+@ 7
 	.2byte SPECIES_STARMIE
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC
 
-gBattlePyramidOpenLevelWildMons_Round20: ; 86135A0
-; 0
+gBattlePyramidOpenLevelWildMons_Round20: @ 86135A0
+@ 0
 	.2byte SPECIES_KANGASKHAN
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH
 
-; 1
+@ 1
 	.2byte SPECIES_SWELLOW
-	.byte 10 ; base level difference
-	.byte 2 ; unknown
+	.byte 10 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE
 
-; 2
+@ 2
 	.2byte SPECIES_URSARING
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT
 
-; 3
+@ 3
 	.2byte SPECIES_PORYGON2
-	.byte 8 ; base level difference
-	.byte 2 ; unknown
+	.byte 8 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
 
-; 4
+@ 4
 	.2byte SPECIES_TAUROS
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT
 
-; 5
+@ 5
 	.2byte SPECIES_FEAROW
-	.byte 6 ; base level difference
-	.byte 2 ; unknown
+	.byte 6 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT
 
-; 6
+@ 6
 	.2byte SPECIES_SNORLAX
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE
 
-; 7
+@ 7
 	.2byte SPECIES_SLAKING
-	.byte 5 ; base level difference
-	.byte 2 ; unknown
+	.byte 5 @ base level difference
+	.byte 2 @ unknown
 	.2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM
 
 	.align 2, 0
 
-gBattlePyramidOpenLevelWildMonPointers: ; 8613600
+gBattlePyramidOpenLevelWildMonPointers: @ 8613600
 	.4byte gBattlePyramidOpenLevelWildMons_Round1
 	.4byte gBattlePyramidOpenLevelWildMons_Round2
 	.4byte gBattlePyramidOpenLevelWildMons_Round3
diff --git a/data/battle_frontier/fallarbor_battle_tent_mons.s b/data/battle_frontier/fallarbor_battle_tent_mons.s
index 92000a977..ab00cad99 100644
--- a/data/battle_frontier/fallarbor_battle_tent_mons.s
+++ b/data/battle_frontier/fallarbor_battle_tent_mons.s
@@ -1,315 +1,315 @@
 	.align 2, 0
 
-gFallarborBattleTentMons: ; 85DF69C
-; 0
+gFallarborBattleTentMons: @ 85DF69C
+@ 0
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 1
+@ 1
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_SASSY
 
-; 2
+@ 2
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 3
+@ 3
 	.2byte SPECIES_POOCHYENA
 	.2byte MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION
 	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 4
+@ 4
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM
 	.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_MODEST
 
-; 5
+@ 5
 	.2byte SPECIES_MAGIKARP
 	.2byte MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 6
+@ 6
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 7
+@ 7
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 8
+@ 8
 	.2byte SPECIES_MACHOKE
 	.2byte MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAIVE
 
-; 9
+@ 9
 	.2byte SPECIES_NINCADA
 	.2byte MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_SERIOUS
 
-; 10
+@ 10
 	.2byte SPECIES_BEAUTIFLY
 	.2byte MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 11
+@ 11
 	.2byte SPECIES_DUSTOX
 	.2byte MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_DOCILE
 
-; 12
+@ 12
 	.2byte SPECIES_ILLUMISE
 	.2byte MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 13
+@ 13
 	.2byte SPECIES_VOLBEAT
 	.2byte MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW
 	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 14
+@ 14
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 15
+@ 15
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE
 	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 16
+@ 16
 	.2byte SPECIES_ARON
 	.2byte MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 17
+@ 17
 	.2byte SPECIES_ARON
 	.2byte MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_GENTLE
 
-; 18
+@ 18
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HASTY
 
-; 19
+@ 19
 	.2byte SPECIES_MAGNEMITE
 	.2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 20
+@ 20
 	.2byte SPECIES_VOLTORB
 	.2byte MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM
 	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 21
+@ 21
 	.2byte SPECIES_WHISMUR
 	.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 22
+@ 22
 	.2byte SPECIES_LOUDRED
 	.2byte MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 23
+@ 23
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 24
+@ 24
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 25
+@ 25
 	.2byte SPECIES_SWABLU
 	.2byte MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 26
+@ 26
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT
 	.byte BATTLE_FRONTIER_ITEM_METAL_COAT
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 27
+@ 27
 	.2byte SPECIES_GOLBAT
 	.2byte MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 28
+@ 28
 	.2byte SPECIES_WINGULL
 	.2byte MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 29
+@ 29
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN
 	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 30
+@ 30
 	.2byte SPECIES_BARBOACH
 	.2byte MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 31
+@ 31
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIET
 
-; 32
+@ 32
 	.2byte SPECIES_MARILL
 	.2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 33
+@ 33
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HASTY
 
-; 34
+@ 34
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 35
+@ 35
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH
 	.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 36
+@ 36
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 37
+@ 37
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 38
+@ 38
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 39
+@ 39
 	.2byte SPECIES_SWALOT
 	.2byte MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 40
+@ 40
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 41
+@ 41
 	.2byte SPECIES_KIRLIA
 	.2byte MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 42
+@ 42
 	.2byte SPECIES_LOMBRE
 	.2byte MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BASHFUL
 
-; 43
+@ 43
 	.2byte SPECIES_NUZLEAF
 	.2byte MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 44
+@ 44
 	.2byte SPECIES_CACNEA
 	.2byte MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
diff --git a/data/battle_frontier/fallarbor_battle_tent_trainer_mons.s b/data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
index f86e131cc..22f874ecc 100644
--- a/data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
+++ b/data/battle_frontier/fallarbor_battle_tent_trainer_mons.s
@@ -1,6 +1,6 @@
 	.align 1, 0
 
-gFallarborBattleTentTrainerMons_Amber: ; 85DEEF8
+gFallarborBattleTentTrainerMons_Amber: @ 85DEEF8
 	.2byte 39
 	.2byte 40
 	.2byte 41
@@ -9,7 +9,7 @@ gFallarborBattleTentTrainerMons_Amber: ; 85DEEF8
 	.2byte 44
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Javier: ; 85DEF06
+gFallarborBattleTentTrainerMons_Javier: @ 85DEF06
 	.2byte 6
 	.2byte 35
 	.2byte 36
@@ -18,7 +18,7 @@ gFallarborBattleTentTrainerMons_Javier: ; 85DEF06
 	.2byte 44
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Natalie: ; 85DEF14
+gFallarborBattleTentTrainerMons_Natalie: @ 85DEF14
 	.2byte 5
 	.2byte 29
 	.2byte 30
@@ -26,7 +26,7 @@ gFallarborBattleTentTrainerMons_Natalie: ; 85DEF14
 	.2byte 34
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Treve: ; 85DEF20
+gFallarborBattleTentTrainerMons_Treve: @ 85DEF20
 	.2byte 28
 	.2byte 29
 	.2byte 30
@@ -34,7 +34,7 @@ gFallarborBattleTentTrainerMons_Treve: ; 85DEF20
 	.2byte 33
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Arianna: ; 85DEF2C
+gFallarborBattleTentTrainerMons_Arianna: @ 85DEF2C
 	.2byte 18
 	.2byte 23
 	.2byte 24
@@ -42,7 +42,7 @@ gFallarborBattleTentTrainerMons_Arianna: ; 85DEF2C
 	.2byte 44
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Jadyn: ; 85DEF38
+gFallarborBattleTentTrainerMons_Jadyn: @ 85DEF38
 	.2byte 0
 	.2byte 22
 	.2byte 24
@@ -51,7 +51,7 @@ gFallarborBattleTentTrainerMons_Jadyn: ; 85DEF38
 	.2byte 39
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Gerardo: ; 85DEF46
+gFallarborBattleTentTrainerMons_Gerardo: @ 85DEF46
 	.2byte 6
 	.2byte 18
 	.2byte 23
@@ -59,7 +59,7 @@ gFallarborBattleTentTrainerMons_Gerardo: ; 85DEF46
 	.2byte 29
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Jonn: ; 85DEF52
+gFallarborBattleTentTrainerMons_Jonn: @ 85DEF52
 	.2byte 16
 	.2byte 17
 	.2byte 21
@@ -67,7 +67,7 @@ gFallarborBattleTentTrainerMons_Jonn: ; 85DEF52
 	.2byte 37
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Esteban: ; 85DEF5E
+gFallarborBattleTentTrainerMons_Esteban: @ 85DEF5E
 	.2byte 5
 	.2byte 28
 	.2byte 30
@@ -75,7 +75,7 @@ gFallarborBattleTentTrainerMons_Esteban: ; 85DEF5E
 	.2byte 42
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Jameson: ; 85DEF6A
+gFallarborBattleTentTrainerMons_Jameson: @ 85DEF6A
 	.2byte 1
 	.2byte 2
 	.2byte 3
@@ -83,7 +83,7 @@ gFallarborBattleTentTrainerMons_Jameson: ; 85DEF6A
 	.2byte 9
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Alanzo: ; 85DEF76
+gFallarborBattleTentTrainerMons_Alanzo: @ 85DEF76
 	.2byte 9
 	.2byte 10
 	.2byte 11
@@ -93,7 +93,7 @@ gFallarborBattleTentTrainerMons_Alanzo: ; 85DEF76
 	.2byte 15
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Howard: ; 85DEF86
+gFallarborBattleTentTrainerMons_Howard: @ 85DEF86
 	.2byte 18
 	.2byte 23
 	.2byte 31
@@ -101,7 +101,7 @@ gFallarborBattleTentTrainerMons_Howard: ; 85DEF86
 	.2byte 43
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Conrad: ; 85DEF92
+gFallarborBattleTentTrainerMons_Conrad: @ 85DEF92
 	.2byte 18
 	.2byte 19
 	.2byte 20
@@ -109,7 +109,7 @@ gFallarborBattleTentTrainerMons_Conrad: ; 85DEF92
 	.2byte 22
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Makenna: ; 85DEF9E
+gFallarborBattleTentTrainerMons_Makenna: @ 85DEF9E
 	.2byte 4
 	.2byte 21
 	.2byte 25
@@ -117,7 +117,7 @@ gFallarborBattleTentTrainerMons_Makenna: ; 85DEF9E
 	.2byte 40
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Brayan: ; 85DEFAA
+gFallarborBattleTentTrainerMons_Brayan: @ 85DEFAA
 	.2byte 0
 	.2byte 4
 	.2byte 6
@@ -127,7 +127,7 @@ gFallarborBattleTentTrainerMons_Brayan: ; 85DEFAA
 	.2byte 28
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Mariana: ; 85DEFBA
+gFallarborBattleTentTrainerMons_Mariana: @ 85DEFBA
 	.2byte 0
 	.2byte 4
 	.2byte 13
@@ -137,7 +137,7 @@ gFallarborBattleTentTrainerMons_Mariana: ; 85DEFBA
 	.2byte 37
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Sheldon: ; 85DEFCA
+gFallarborBattleTentTrainerMons_Sheldon: @ 85DEFCA
 	.2byte 2
 	.2byte 3
 	.2byte 21
@@ -145,7 +145,7 @@ gFallarborBattleTentTrainerMons_Sheldon: ; 85DEFCA
 	.2byte 39
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Gianna: ; 85DEFD6
+gFallarborBattleTentTrainerMons_Gianna: @ 85DEFD6
 	.2byte 1
 	.2byte 2
 	.2byte 30
@@ -153,7 +153,7 @@ gFallarborBattleTentTrainerMons_Gianna: ; 85DEFD6
 	.2byte 41
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Yahir: ; 85DEFE2
+gFallarborBattleTentTrainerMons_Yahir: @ 85DEFE2
 	.2byte 4
 	.2byte 8
 	.2byte 15
@@ -162,7 +162,7 @@ gFallarborBattleTentTrainerMons_Yahir: ; 85DEFE2
 	.2byte 24
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Britney: ; 85DEFF0
+gFallarborBattleTentTrainerMons_Britney: @ 85DEFF0
 	.2byte 4
 	.2byte 7
 	.2byte 14
@@ -171,7 +171,7 @@ gFallarborBattleTentTrainerMons_Britney: ; 85DEFF0
 	.2byte 43
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Hecter: ; 85DEFFE
+gFallarborBattleTentTrainerMons_Hecter: @ 85DEFFE
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -180,7 +180,7 @@ gFallarborBattleTentTrainerMons_Hecter: ; 85DEFFE
 	.2byte 35
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Tannor: ; 85DF00C
+gFallarborBattleTentTrainerMons_Tannor: @ 85DF00C
 	.2byte 5
 	.2byte 30
 	.2byte 31
@@ -188,7 +188,7 @@ gFallarborBattleTentTrainerMons_Tannor: ; 85DF00C
 	.2byte 34
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Benji: ; 85DF018
+gFallarborBattleTentTrainerMons_Benji: @ 85DF018
 	.2byte 25
 	.2byte 26
 	.2byte 27
@@ -196,7 +196,7 @@ gFallarborBattleTentTrainerMons_Benji: ; 85DF018
 	.2byte 29
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Rory: ; 85DF024
+gFallarborBattleTentTrainerMons_Rory: @ 85DF024
 	.2byte 9
 	.2byte 11
 	.2byte 14
@@ -205,7 +205,7 @@ gFallarborBattleTentTrainerMons_Rory: ; 85DF024
 	.2byte 39
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Eleanor: ; 85DF032
+gFallarborBattleTentTrainerMons_Eleanor: @ 85DF032
 	.2byte 23
 	.2byte 28
 	.2byte 31
@@ -215,7 +215,7 @@ gFallarborBattleTentTrainerMons_Eleanor: ; 85DF032
 	.2byte 44
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Evelyn: ; 85DF042
+gFallarborBattleTentTrainerMons_Evelyn: @ 85DF042
 	.2byte 29
 	.2byte 31
 	.2byte 32
@@ -223,7 +223,7 @@ gFallarborBattleTentTrainerMons_Evelyn: ; 85DF042
 	.2byte 34
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Arielle: ; 85DF04E
+gFallarborBattleTentTrainerMons_Arielle: @ 85DF04E
 	.2byte 1
 	.2byte 3
 	.2byte 38
@@ -231,7 +231,7 @@ gFallarborBattleTentTrainerMons_Arielle: ; 85DF04E
 	.2byte 41
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Connar: ; 85DF05A
+gFallarborBattleTentTrainerMons_Connar: @ 85DF05A
 	.2byte 7
 	.2byte 8
 	.2byte 28
@@ -240,7 +240,7 @@ gFallarborBattleTentTrainerMons_Connar: ; 85DF05A
 	.2byte 32
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Maurice: ; 85DF068
+gFallarborBattleTentTrainerMons_Maurice: @ 85DF068
 	.2byte 4
 	.2byte 5
 	.2byte 6
@@ -248,7 +248,7 @@ gFallarborBattleTentTrainerMons_Maurice: ; 85DF068
 	.2byte 13
 	.2byte -1
 
-gFallarborBattleTentTrainerMons_Kianna: ; 85DF074
+gFallarborBattleTentTrainerMons_Kianna: @ 85DF074
 	.2byte 22
 	.2byte 24
 	.2byte 26
diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.s b/data/battle_frontier/fallarbor_battle_tent_trainers.s
index 3d76270c0..96ced04b6 100644
--- a/data/battle_frontier/fallarbor_battle_tent_trainers.s
+++ b/data/battle_frontier/fallarbor_battle_tent_trainers.s
@@ -1,24 +1,24 @@
 	.align 2, 0
 
-gFallarborBattleTentTrainers: ; 85DF084
-; 0
+gFallarborBattleTentTrainers: @ 85DF084
+@ 0
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "AMBER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word HAVE
 	ec_word TO
 	ec_word DIET
 	ec_word EVERY
 	ec_word DAY
-; win speech
+@ win speech
 	ec_word A
 	ec_move1 NIGHTMARE
 	ec_word OF
 	ec_word SWEETS
 	ec_word SHOCKED
 	ec_word ME
-; loss speech
+@ loss speech
 	ec_word IF
 	ec_word YOU
 	ec_word GIVE_UP
@@ -27,24 +27,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word LOSE
 	.4byte gFallarborBattleTentTrainerMons_Amber
 
-; 1
+@ 1
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "JAVIER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word NEVER
 	ec_word EVER
 	ec_word HAVE
 	ec_word ENOUGH
 	ec_word MONEY
-; win speech
+@ win speech
 	ec_word I
 	ec_word WON
 	ec_word BUT
 	ec_word I
 	ec_word NEED
 	ec_word MONEY
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word MONEY
@@ -53,24 +53,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word BIKE
 	.4byte gFallarborBattleTentTrainerMons_Javier
 
-; 2
+@ 2
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "NATALIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word WAY
 	ec_word I
 	ec_word BATTLE
 	ec_word IS
 	ec_word WEIRD
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word MUCH
 	ec_word TOO_WEAK
 	ec_word FOR
 	ec_word THIS
 	ec_word PLACE
-; loss speech
+@ loss speech
 	ec_word GIVE_ME
 	ec_word AN
 	ec_word EASY
@@ -79,24 +79,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word TIME
 	.4byte gFallarborBattleTentTrainerMons_Natalie
 
-; 3
+@ 3
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "TREVE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LOOK
 	ec_word AT
 	ec_word MY
 	ec_move2 METRONOME
 	ec_word AND
 	ec_word SLEEP
-; win speech
+@ win speech
 	ec_word YEAH
 	ec_word EXCL
 	ec_move1 HYPNOSIS
 	ec_word IS
 	ec_word TOTALLY
 	ec_word GREAT
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move1 HYPNOSIS
 	ec_word DIDN_T
@@ -105,24 +105,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	.2byte -1
 	.4byte gFallarborBattleTentTrainerMons_Treve
 
-; 4
+@ 4
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "ARIANNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IF_I_WIN
 	ec_word GIVE_ME
 	ec_word POKEMON
 	ec_word FOR
 	ec_word MY
 	ec_word COLLECTION
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
 	ec_word TOO_WEAK
 	ec_word TO
 	ec_word COLLECT
-; loss speech
+@ loss speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
@@ -131,24 +131,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ELLIPSIS
 	.4byte gFallarborBattleTentTrainerMons_Arianna
 
-; 5
+@ 5
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "JADYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word NAME
 	ec_word IS
 	ec_word REALLY
 	ec_word A
 	ec_word MYSTERY
-; win speech
+@ win speech
 	ec_word MY
 	ec_word NAME
 	ec_word GOES
 	ec_word ON
 	ec_word A
 	ec_word MYSTERY
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word NAME
 	ec_word QUES
@@ -157,24 +157,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word MOTHER
 	.4byte gFallarborBattleTentTrainerMons_Jadyn
 
-; 6
+@ 6
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "GERARDO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word THE
 	ec_word BEST
 	ec_word HERO
 	ec_word EVER
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word SEE
 	ec_word WHAT
 	ec_word I
 	ec_word MEAN
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word HUH_QUES
 	ec_word YOU
 	ec_word WERE
@@ -183,24 +183,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	.2byte -1
 	.4byte gFallarborBattleTentTrainerMons_Gerardo
 
-; 7
+@ 7
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "JONN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_word WORLD
 	ec_move2 SUPERPOWER
 	ec_move2 STOMP
 	ec_word CONTEST
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word NO_1
 	ec_word EXCL_EXCL
 	ec_word HEAR
 	ec_word ME
 	ec_move2 ROAR
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word GIVE_UP
 	ec_word EXCL
@@ -209,24 +209,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word EXCL
 	.4byte gFallarborBattleTentTrainerMons_Jonn
 
-; 8
+@ 8
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "ESTEBAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word A
 	ec_word GOOD
 	ec_word TRAINER
 	ec_word QUES
 	ec_word UNBELIEVABLE
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word SOME
 	ec_word PUSHOVER
 	ec_word OF
 	ec_word A
 	ec_word TRAINER
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word MUCH
 	ec_word TOO
@@ -235,24 +235,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ME
 	.4byte gFallarborBattleTentTrainerMons_Esteban
 
-; 9
+@ 9
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "JAMESON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word POKEMON
 	ec_word ARE
 	ec_word SILKY
 	ec_word SMOOTH
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word MY
 	ec_word SILKY
 	ec_word SMOOTH
 	ec_word POKEMON
 	ec_word RULE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word POKEMON
 	ec_move2 STRUGGLE
@@ -261,24 +261,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word STICKY_HOLD
 	.4byte gFallarborBattleTentTrainerMons_Jameson
 
-; 10
+@ 10
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "ALANZO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move2 FORESIGHT
 	ec_word IS
 	ec_word A
 	ec_word POWER
 	ec_word I
 	ec_word HAVE
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word OBLIVIOUS
 	ec_word ABOUT
 	ec_move2 FORESIGHT
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 FORESIGHT
 	ec_word IS
@@ -287,24 +287,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word EXCL
 	.4byte gFallarborBattleTentTrainerMons_Alanzo
 
-; 11
+@ 11
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "HOWARD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word CAN_T
 	ec_word BEAT
 	ec_word ME
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word COULDN_T
 	ec_word WIN
 	ec_word COULD
 	ec_word YOU
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word WOULD
 	ec_word GO
@@ -313,24 +313,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ELLIPSIS
 	.4byte gFallarborBattleTentTrainerMons_Howard
 
-; 12
+@ 12
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "CONRAD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
 	ec_word PRETTY
 	ec_word WILD
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word WHOAH
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word LET_S
 	ec_word DANCE
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word MUSIC
 	ec_word WILL
@@ -339,24 +339,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ELLIPSIS
 	.4byte gFallarborBattleTentTrainerMons_Conrad
 
-; 13
+@ 13
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "MAKENNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SHOW
 	ec_word ME
 	ec_word THAT
 	ec_word YOU
 	ec_word MEAN
 	ec_word IT
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word WHY
 	ec_word I
 	ec_word STUDY
 	ec_word EVERY
 	ec_word DAY
-; loss speech
+@ loss speech
 	ec_word AWW
 	ec_word I
 	ec_word STUDY
@@ -365,24 +365,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word TOO
 	.4byte gFallarborBattleTentTrainerMons_Makenna
 
-; 14
+@ 14
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "BRAYAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CAN
 	ec_word YOU
 	ec_word SEE
 	ec_word MY
 	ec_word POWER
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word HOW
 	ec_word BORING
 	ec_word ELLIPSIS
 	ec_word THIS
 	ec_word IS
 	ec_word GOOD_BYE
-; loss speech
+@ loss speech
 	ec_word AM
 	ec_word I
 	ec_word THE
@@ -391,24 +391,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word QUES
 	.4byte gFallarborBattleTentTrainerMons_Brayan
 
-; 15
+@ 15
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "MARIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word LIE
 	ec_word CAN
 	ec_word BE
 	ec_word KIND
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word THIS
 	ec_word IS
 	ec_word LIKE
 	ec_word THE
 	ec_word SUNDAY
 	ec_word COMICS
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word IS
 	ec_word LIKE
@@ -417,24 +417,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word MOVIE
 	.4byte gFallarborBattleTentTrainerMons_Mariana
 
-; 16
+@ 16
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "SHELDON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_word POKEMON
 	ec_word TEACHER
 	ec_word GETS
 	ec_word NO
 	ec_move2 REST
-; win speech
+@ win speech
 	ec_word MY
 	ec_word SMARTNESS
 	ec_word GETS
 	ec_word ME
 	ec_word EASY
 	ec_word WINS
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word HAVE
 	ec_word TO
@@ -443,24 +443,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word BYE_BYE
 	.4byte gFallarborBattleTentTrainerMons_Sheldon
 
-; 17
+@ 17
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "GIANNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word AHAHA
 	ec_word YES
 	ec_word EXCL
 	ec_word LOVEY_DOVEY
 	ec_word POKEMON
 	ec_word WORLD
-; win speech
+@ win speech
 	ec_word MY
 	ec_word SHINE
 	ec_word IS
 	ec_word MAKING
 	ec_word THINGS
 	ec_word BETTER
-; loss speech
+@ loss speech
 	ec_word DO
 	ec_word YOU
 	ec_word DISLIKE
@@ -469,24 +469,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	.2byte -1
 	.4byte gFallarborBattleTentTrainerMons_Gianna
 
-; 18
+@ 18
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "YAHIR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word COME_ON
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word NEED
 	ec_word TO
 	ec_word TRAIN
 	ec_word A_LOT
 	ec_word MORE
-; loss speech
+@ loss speech
 	ec_word NOT
 	ec_word ENOUGH
 	ec_word ELLIPSIS
@@ -495,24 +495,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ENOUGH
 	.4byte gFallarborBattleTentTrainerMons_Yahir
 
-; 19
+@ 19
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "BRITNEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT
 	ec_word SEEMS
 	ec_word THAT
 	ec_word YOU_RE
 	ec_word QUITE
 	ec_word GOOD
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word A
 	ec_word LUKEWARM
 	ec_word TALENT
 	ec_word AT
 	ec_word BEST
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word A
 	ec_word COOL
@@ -521,24 +521,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word THIS
 	.4byte gFallarborBattleTentTrainerMons_Britney
 
-; 20
+@ 20
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "HECTER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 HIDDEN_POWER
 	ec_word IS
 	ec_word EXCITING
 	ec_word ME
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word YEEHAW_EXCL
 	ec_word LET_S
 	ec_word HAVE
 	ec_word A
 	ec_move2 HIDDEN_POWER
 	ec_word PARTY
-; loss speech
+@ loss speech
 	ec_word WAAAH
 	ec_word EXCL
 	ec_word DON_T
@@ -547,24 +547,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ME
 	.4byte gFallarborBattleTentTrainerMons_Hecter
 
-; 21
+@ 21
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "TANNOR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word HAVE
 	ec_word GOT
 	ec_word TO
 	ec_word BE
 	ec_word JOKING
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word THE
 	ec_word BEST
 	ec_word AT
 	ec_word BEING
 	ec_word FUNNY
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word WEREN_T
 	ec_word BEING
@@ -573,24 +573,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ALL
 	.4byte gFallarborBattleTentTrainerMons_Tannor
 
-; 22
+@ 22
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "BENJI$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word DON_T
 	ec_word THINK
 	ec_word VERY
 	ec_word FAST
 	ec_word HUH_QUES
-; win speech
+@ win speech
 	ec_word SORRY
 	ec_word EXCL
 	ec_word I
 	ec_word DIDN_T
 	ec_word MEAN
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word LEFT
 	ec_word ME
@@ -599,24 +599,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word ELLIPSIS
 	.4byte gFallarborBattleTentTrainerMons_Benji
 
-; 23
+@ 23
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "RORY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DON_T
 	ec_word CAUSE
 	ec_word AN
 	ec_move1 UPROAR
 	ec_word YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word DON_T
 	ec_word NEED
 	ec_word AN
 	ec_move1 UPROAR
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
@@ -625,24 +625,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_move1 UPROAR
 	.4byte gFallarborBattleTentTrainerMons_Rory
 
-; 24
+@ 24
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "ELEANOR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word REALLY
 	ec_word WANT
 	ec_word TO
 	ec_word PARTY
 	.2byte -1
-; win speech
+@ win speech
 	ec_word A
 	ec_word TRENDY
 	ec_word PARTY
 	ec_word WOULD
 	ec_word BE
 	ec_word REFRESHING
-; loss speech
+@ loss speech
 	ec_word DON_T
 	ec_word YOU
 	ec_word LIKE
@@ -651,24 +651,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word QUES
 	.4byte gFallarborBattleTentTrainerMons_Eleanor
 
-; 25
+@ 25
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "EVELYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word PC
 	ec_word IS
 	ec_word MY
 	ec_word SECRET_BASE
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word ALL
 	ec_word SECRET
 	ec_word ON
 	ec_word MY
 	ec_word PC
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word EXCL
 	.2byte -1
@@ -677,24 +677,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word THIS
 	.4byte gFallarborBattleTentTrainerMons_Evelyn
 
-; 26
+@ 26
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "ARIELLE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word NOT_VERY
 	ec_word PRETTY
 	ec_word BUT
 	ec_word I
 	ec_word TRY
-; win speech
+@ win speech
 	ec_word WE_RE
 	ec_word NOT_VERY
 	ec_word PRETTY
 	ec_word BUT
 	ec_word WE_RE
 	ec_word GREAT
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word PRETTY
 	ec_word MEAN
@@ -703,24 +703,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word EXCL
 	.4byte gFallarborBattleTentTrainerMons_Arielle
 
-; 27
+@ 27
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "CONNAR$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word STRONG
 	ec_word ENOUGH
 	ec_word FOR
 	ec_word THIS
-; win speech
+@ win speech
 	ec_word DO
 	ec_word YOU
 	ec_word THINK
 	ec_word YOU_RE
 	ec_word OK_QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word GOOD_BYE
 	ec_word AND
 	ec_word THANK_YOU
@@ -729,24 +729,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	.2byte -1
 	.4byte gFallarborBattleTentTrainerMons_Connar
 
-; 28
+@ 28
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "MAURICE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THERE
 	ec_word IS
 	ec_word NO
 	ec_word RADIO
 	ec_word OR
 	ec_word TELEVISION
-; win speech
+@ win speech
 	ec_word BUT
 	ec_word THERE
 	ec_word IS
 	ec_word A_LOT
 	ec_word OF
 	ec_word POKEMON
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word CAN_T
 	ec_word ENJOY
@@ -755,24 +755,24 @@ gFallarborBattleTentTrainers: ; 85DF084
 	ec_word MONEY
 	.4byte gFallarborBattleTentTrainerMons_Maurice
 
-; 29
+@ 29
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "KIANNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
 	ec_word GO
 	ec_word DEPT_STORE
 	ec_word SHOPPING
-; win speech
+@ win speech
 	ec_word I
 	ec_word DISLIKE
 	ec_word SHOPPING
 	ec_word ALONE
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WANT
 	ec_word TO
 	ec_word GO
diff --git a/data/battle_frontier/slateport_battle_tent_mons.s b/data/battle_frontier/slateport_battle_tent_mons.s
index f25b8939e..794985765 100644
--- a/data/battle_frontier/slateport_battle_tent_mons.s
+++ b/data/battle_frontier/slateport_battle_tent_mons.s
@@ -1,490 +1,490 @@
 	.align 2, 0
 
-gSlateportBattleTentMons: ; 85DE02C
-; 0
+gSlateportBattleTentMons: @ 85DE02C
+@ 0
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE
 	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 1
+@ 1
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 2
+@ 2
 	.2byte SPECIES_BEAUTIFLY
 	.2byte MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 3
+@ 3
 	.2byte SPECIES_DUSTOX
 	.2byte MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST
 	.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 4
+@ 4
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 5
+@ 5
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 6
+@ 6
 	.2byte SPECIES_MARILL
 	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 7
+@ 7
 	.2byte SPECIES_WINGULL
 	.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING
 	.byte BATTLE_FRONTIER_ITEM_METAL_COAT
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAIVE
 
-; 8
+@ 8
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 9
+@ 9
 	.2byte SPECIES_CACNEA
 	.2byte MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SPEED
 	.4byte NATURE_JOLLY
 
-; 10
+@ 10
 	.2byte SPECIES_LOMBRE
 	.2byte MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB
 	.byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 11
+@ 11
 	.2byte SPECIES_LOTAD
 	.2byte MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_DOCILE
 
-; 12
+@ 12
 	.2byte SPECIES_SEEDOT
 	.2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 13
+@ 13
 	.2byte SPECIES_NUZLEAF
 	.2byte MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 14
+@ 14
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 15
+@ 15
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 16
+@ 16
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 17
+@ 17
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAIVE
 
-; 18
+@ 18
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE
 	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 19
+@ 19
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG
 	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 20
+@ 20
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 21
+@ 21
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_CALM
 
-; 22
+@ 22
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_MODEST
 
-; 23
+@ 23
 	.2byte SPECIES_VOLTORB
 	.2byte MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
 	.4byte NATURE_MILD
 
-; 24
+@ 24
 	.2byte SPECIES_ARON
 	.2byte MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 25
+@ 25
 	.2byte SPECIES_ARON
 	.2byte MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 26
+@ 26
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 27
+@ 27
 	.2byte SPECIES_CACNEA
 	.2byte MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_TIMID
 
-; 28
+@ 28
 	.2byte SPECIES_TAILLOW
 	.2byte MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 29
+@ 29
 	.2byte SPECIES_SWELLOW
 	.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 30
+@ 30
 	.2byte SPECIES_GOLBAT
 	.2byte MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY
 	.byte BATTLE_FRONTIER_ITEM_SPELL_TAG
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_TIMID
 
-; 31
+@ 31
 	.2byte SPECIES_LOUDRED
 	.2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 32
+@ 32
 	.2byte SPECIES_SPINDA
 	.2byte MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 33
+@ 33
 	.2byte SPECIES_MAGNEMITE
 	.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_SERIOUS
 
-; 34
+@ 34
 	.2byte SPECIES_WHISMUR
 	.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 35
+@ 35
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 36
+@ 36
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_MODEST
 
-; 37
+@ 37
 	.2byte SPECIES_BARBOACH
 	.2byte MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN
 	.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 38
+@ 38
 	.2byte SPECIES_TENTACOOL
 	.2byte MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER
 	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 39
+@ 39
 	.2byte SPECIES_VIGOROTH
 	.2byte MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN
 	.byte BATTLE_FRONTIER_ITEM_AGUAV_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 40
+@ 40
 	.2byte SPECIES_MAGIKARP
 	.2byte MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 41
+@ 41
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 42
+@ 42
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE
 	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 43
+@ 43
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 44
+@ 44
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 45
+@ 45
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MODEST
 
-; 46
+@ 46
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED
 	.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
 	.byte F_EV_SPREAD_ATTACK
 	.4byte NATURE_BRAVE
 
-; 47
+@ 47
 	.2byte SPECIES_LOMBRE
 	.2byte MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_LONELY
 
-; 48
+@ 48
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 49
+@ 49
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BRAVE
 
-; 50
+@ 50
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 51
+@ 51
 	.2byte SPECIES_WINGULL
 	.2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND
 	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 52
+@ 52
 	.2byte SPECIES_MARILL
 	.2byte MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN
 	.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 53
+@ 53
 	.2byte SPECIES_SKITTY
 	.2byte MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 54
+@ 54
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_BRAVE
 
-; 55
+@ 55
 	.2byte SPECIES_GOLBAT
 	.2byte MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_HARDY
 
-; 56
+@ 56
 	.2byte SPECIES_RALTS
 	.2byte MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER
 	.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_TIMID
 
-; 57
+@ 57
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL
 	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
 	.byte 0
 	.4byte NATURE_HARDY
 
-; 58
+@ 58
 	.2byte SPECIES_SWALOT
 	.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_IMPISH
 
-; 59
+@ 59
 	.2byte SPECIES_VOLBEAT
 	.2byte MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 60
+@ 60
 	.2byte SPECIES_ILLUMISE
 	.2byte MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT
 	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 61
+@ 61
 	.2byte SPECIES_KADABRA
 	.2byte MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 62
+@ 62
 	.2byte SPECIES_KIRLIA
 	.2byte MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_CAREFUL
 
-; 63
+@ 63
 	.2byte SPECIES_BRELOOM
 	.2byte MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAIVE
 
-; 64
+@ 64
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL
 	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_LONELY
 
-; 65
+@ 65
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MILD
 
-; 66
+@ 66
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_APICOT_BERRY
 	.byte F_EV_SPREAD_SPEED
 	.4byte NATURE_TIMID
 
-; 67
+@ 67
 	.2byte SPECIES_SWABLU
 	.2byte MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_JOLLY
 
-; 68
+@ 68
 	.2byte SPECIES_MACHOP
 	.2byte MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT
 	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 69
+@ 69
 	.2byte SPECIES_MACHOKE
 	.2byte MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT
 	.byte BATTLE_FRONTIER_ITEM_NONE
diff --git a/data/battle_frontier/slateport_battle_tent_trainer_mons.s b/data/battle_frontier/slateport_battle_tent_trainer_mons.s
index f56ee4c9b..a56d26762 100644
--- a/data/battle_frontier/slateport_battle_tent_trainer_mons.s
+++ b/data/battle_frontier/slateport_battle_tent_trainer_mons.s
@@ -1,6 +1,6 @@
 	.align 1, 0
 
-gSlateportBattleTentTrainerMons_Jolie: ; 85DD70C
+gSlateportBattleTentTrainerMons_Jolie: @ 85DD70C
 	.2byte 9
 	.2byte 10
 	.2byte 13
@@ -14,7 +14,7 @@ gSlateportBattleTentTrainerMons_Jolie: ; 85DD70C
 	.2byte 63
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Malachi: ; 85DD724
+gSlateportBattleTentTrainerMons_Malachi: @ 85DD724
 	.2byte 9
 	.2byte 16
 	.2byte 17
@@ -28,7 +28,7 @@ gSlateportBattleTentTrainerMons_Malachi: ; 85DD724
 	.2byte 53
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Kelsie: ; 85DD73C
+gSlateportBattleTentTrainerMons_Kelsie: @ 85DD73C
 	.2byte 4
 	.2byte 5
 	.2byte 6
@@ -42,7 +42,7 @@ gSlateportBattleTentTrainerMons_Kelsie: ; 85DD73C
 	.2byte 53
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Davon: ; 85DD754
+gSlateportBattleTentTrainerMons_Davon: @ 85DD754
 	.2byte 4
 	.2byte 5
 	.2byte 6
@@ -57,7 +57,7 @@ gSlateportBattleTentTrainerMons_Davon: ; 85DD754
 	.2byte 50
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Glenda: ; 85DD76E
+gSlateportBattleTentTrainerMons_Glenda: @ 85DD76E
 	.2byte 0
 	.2byte 1
 	.2byte 17
@@ -73,7 +73,7 @@ gSlateportBattleTentTrainerMons_Glenda: ; 85DD76E
 	.2byte 66
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Helena: ; 85DD78A
+gSlateportBattleTentTrainerMons_Helena: @ 85DD78A
 	.2byte 18
 	.2byte 19
 	.2byte 21
@@ -87,7 +87,7 @@ gSlateportBattleTentTrainerMons_Helena: ; 85DD78A
 	.2byte 63
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Rodolfo: ; 85DD7A2
+gSlateportBattleTentTrainerMons_Rodolfo: @ 85DD7A2
 	.2byte 0
 	.2byte 1
 	.2byte 4
@@ -103,7 +103,7 @@ gSlateportBattleTentTrainerMons_Rodolfo: ; 85DD7A2
 	.2byte 62
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Davion: ; 85DD7BE
+gSlateportBattleTentTrainerMons_Davion: @ 85DD7BE
 	.2byte 17
 	.2byte 23
 	.2byte 24
@@ -120,7 +120,7 @@ gSlateportBattleTentTrainerMons_Davion: ; 85DD7BE
 	.2byte 69
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Kendall: ; 85DD7DC
+gSlateportBattleTentTrainerMons_Kendall: @ 85DD7DC
 	.2byte 4
 	.2byte 7
 	.2byte 8
@@ -137,7 +137,7 @@ gSlateportBattleTentTrainerMons_Kendall: ; 85DD7DC
 	.2byte 63
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Colten: ; 85DD7FA
+gSlateportBattleTentTrainerMons_Colten: @ 85DD7FA
 	.2byte 0
 	.2byte 2
 	.2byte 12
@@ -152,7 +152,7 @@ gSlateportBattleTentTrainerMons_Colten: ; 85DD7FA
 	.2byte 57
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Irvin: ; 85DD814
+gSlateportBattleTentTrainerMons_Irvin: @ 85DD814
 	.2byte 0
 	.2byte 1
 	.2byte 2
@@ -168,7 +168,7 @@ gSlateportBattleTentTrainerMons_Irvin: ; 85DD814
 	.2byte 60
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Shaun: ; 85DD830
+gSlateportBattleTentTrainerMons_Shaun: @ 85DD830
 	.2byte 17
 	.2byte 18
 	.2byte 19
@@ -184,7 +184,7 @@ gSlateportBattleTentTrainerMons_Shaun: ; 85DD830
 	.2byte 69
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Kyler: ; 85DD84C
+gSlateportBattleTentTrainerMons_Kyler: @ 85DD84C
 	.2byte 22
 	.2byte 23
 	.2byte 28
@@ -199,7 +199,7 @@ gSlateportBattleTentTrainerMons_Kyler: ; 85DD84C
 	.2byte 67
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Maggie: ; 85DD866
+gSlateportBattleTentTrainerMons_Maggie: @ 85DD866
 	.2byte 10
 	.2byte 13
 	.2byte 17
@@ -213,7 +213,7 @@ gSlateportBattleTentTrainerMons_Maggie: ; 85DD866
 	.2byte 63
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Stephon: ; 85DD87E
+gSlateportBattleTentTrainerMons_Stephon: @ 85DD87E
 	.2byte 8
 	.2byte 10
 	.2byte 16
@@ -227,7 +227,7 @@ gSlateportBattleTentTrainerMons_Stephon: ; 85DD87E
 	.2byte 68
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Rebecca: ; 85DD896
+gSlateportBattleTentTrainerMons_Rebecca: @ 85DD896
 	.2byte 8
 	.2byte 13
 	.2byte 21
@@ -241,7 +241,7 @@ gSlateportBattleTentTrainerMons_Rebecca: ; 85DD896
 	.2byte 68
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Reggie: ; 85DD8AE
+gSlateportBattleTentTrainerMons_Reggie: @ 85DD8AE
 	.2byte 6
 	.2byte 7
 	.2byte 17
@@ -256,7 +256,7 @@ gSlateportBattleTentTrainerMons_Reggie: ; 85DD8AE
 	.2byte 65
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Janae: ; 85DD8C8
+gSlateportBattleTentTrainerMons_Janae: @ 85DD8C8
 	.2byte 0
 	.2byte 1
 	.2byte 27
@@ -271,7 +271,7 @@ gSlateportBattleTentTrainerMons_Janae: ; 85DD8C8
 	.2byte 65
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Caiden: ; 85DD8E2
+gSlateportBattleTentTrainerMons_Caiden: @ 85DD8E2
 	.2byte 10
 	.2byte 14
 	.2byte 15
@@ -287,7 +287,7 @@ gSlateportBattleTentTrainerMons_Caiden: ; 85DD8E2
 	.2byte 69
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Kirsten: ; 85DD8FE
+gSlateportBattleTentTrainerMons_Kirsten: @ 85DD8FE
 	.2byte 10
 	.2byte 16
 	.2byte 18
@@ -303,7 +303,7 @@ gSlateportBattleTentTrainerMons_Kirsten: ; 85DD8FE
 	.2byte 69
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Kurtis: ; 85DD91A
+gSlateportBattleTentTrainerMons_Kurtis: @ 85DD91A
 	.2byte 0
 	.2byte 1
 	.2byte 36
@@ -317,7 +317,7 @@ gSlateportBattleTentTrainerMons_Kurtis: ; 85DD91A
 	.2byte 68
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Stefan: ; 85DD932
+gSlateportBattleTentTrainerMons_Stefan: @ 85DD932
 	.2byte 4
 	.2byte 5
 	.2byte 21
@@ -331,7 +331,7 @@ gSlateportBattleTentTrainerMons_Stefan: ; 85DD932
 	.2byte 65
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Avery: ; 85DD94A
+gSlateportBattleTentTrainerMons_Avery: @ 85DD94A
 	.2byte 2
 	.2byte 3
 	.2byte 7
@@ -345,7 +345,7 @@ gSlateportBattleTentTrainerMons_Avery: ; 85DD94A
 	.2byte 67
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Dwane: ; 85DD962
+gSlateportBattleTentTrainerMons_Dwane: @ 85DD962
 	.2byte 14
 	.2byte 15
 	.2byte 30
@@ -359,7 +359,7 @@ gSlateportBattleTentTrainerMons_Dwane: ; 85DD962
 	.2byte 63
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Mckenna: ; 85DD97A
+gSlateportBattleTentTrainerMons_Mckenna: @ 85DD97A
 	.2byte 27
 	.2byte 29
 	.2byte 30
@@ -373,7 +373,7 @@ gSlateportBattleTentTrainerMons_Mckenna: ; 85DD97A
 	.2byte 67
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Camryn: ; 85DD992
+gSlateportBattleTentTrainerMons_Camryn: @ 85DD992
 	.2byte 5
 	.2byte 6
 	.2byte 7
@@ -388,7 +388,7 @@ gSlateportBattleTentTrainerMons_Camryn: ; 85DD992
 	.2byte 44
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Natasha: ; 85DD9AC
+gSlateportBattleTentTrainerMons_Natasha: @ 85DD9AC
 	.2byte 1
 	.2byte 3
 	.2byte 4
@@ -402,7 +402,7 @@ gSlateportBattleTentTrainerMons_Natasha: ; 85DD9AC
 	.2byte 51
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Austyn: ; 85DD9C4
+gSlateportBattleTentTrainerMons_Austyn: @ 85DD9C4
 	.2byte 25
 	.2byte 31
 	.2byte 35
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainerMons_Austyn: ; 85DD9C4
 	.2byte 69
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Donovan: ; 85DD9DE
+gSlateportBattleTentTrainerMons_Donovan: @ 85DD9DE
 	.2byte 10
 	.2byte 16
 	.2byte 17
@@ -434,7 +434,7 @@ gSlateportBattleTentTrainerMons_Donovan: ; 85DD9DE
 	.2byte 65
 	.2byte -1
 
-gSlateportBattleTentTrainerMons_Tamia: ; 85DD9FC
+gSlateportBattleTentTrainerMons_Tamia: @ 85DD9FC
 	.2byte 2
 	.2byte 6
 	.2byte 9
diff --git a/data/battle_frontier/slateport_battle_tent_trainers.s b/data/battle_frontier/slateport_battle_tent_trainers.s
index 1a2d67435..087244e2f 100644
--- a/data/battle_frontier/slateport_battle_tent_trainers.s
+++ b/data/battle_frontier/slateport_battle_tent_trainers.s
@@ -1,24 +1,24 @@
 	.align 2, 0
 
-gSlateportBattleTentTrainers: ; 85DDA14
-; 0
+gSlateportBattleTentTrainers: @ 85DDA14
+@ 0
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "JOLIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word WHAT
 	ec_word WILL
 	ec_word I
 	ec_word BE
 	ec_word TOMORROW
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word LIKE
 	ec_word IT_S
 	ec_word FRIDAY
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word FEELING
 	ec_word LIKE
@@ -27,24 +27,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word ELLIPSIS
 	.4byte gSlateportBattleTentTrainerMons_Jolie
 
-; 1
+@ 1
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "MALACHI$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word BAD
 	ec_word NEWS
 	ec_word EXCL
 	ec_word IT_S
 	ec_word A
 	ec_move1 SAND_TOMB
-; win speech
+@ win speech
 	ec_word YEEHAW_EXCL
 	.2byte -1
 	.2byte -1
 	ec_word I_VE
 	ec_word DONE
 	ec_word IT
-; loss speech
+@ loss speech
 	ec_word I_VE
 	ec_word LOST
 	ec_word IN
@@ -53,24 +53,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word ELLIPSIS
 	.4byte gSlateportBattleTentTrainerMons_Malachi
 
-; 2
+@ 2
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "KELSIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GO
 	ec_word EXCL_EXCL
 	ec_word MY
 	ec_word BATH
 	ec_word POKEMON
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_word YAHOO
 	ec_word EXCL_EXCL
 	ec_word MY
 	ec_word BATH
 	ec_word POKEMON
 	ec_word EXCL_EXCL
-; loss speech
+@ loss speech
 	ec_word GWAH
 	ec_word EXCL_EXCL
 	ec_word MY
@@ -79,24 +79,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word EXCL_EXCL
 	.4byte gSlateportBattleTentTrainerMons_Kelsie
 
-; 3
+@ 3
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "DAVON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YEAH_YEAH
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word GREAT
 	ec_move1 WHIRLPOOL
 	ec_word ISN_T_IT_QUES
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word LIKE
 	ec_word A
 	ec_move1 WHIRLPOOL
 	ec_word YEAH_YEAH
 	ec_word EXCL_EXCL
-; loss speech
+@ loss speech
 	ec_word DON_T
 	ec_word GET
 	ec_move2 BEAT_UP
@@ -105,24 +105,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_move1 WHIRLPOOL
 	.4byte gSlateportBattleTentTrainerMons_Davon
 
-; 4
+@ 4
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "GLENDA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word CONVERSATION
 	ec_word CAN
 	ec_word WAIT
 	ec_word UNTIL
 	ec_word I
 	ec_word WIN
-; win speech
+@ win speech
 	ec_word FABULOUS
 	ec_word EXCL
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
 	ec_word ROCK
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word EXCL
 	.2byte -1
@@ -131,24 +131,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word SERIOUS
 	.4byte gSlateportBattleTentTrainerMons_Glenda
 
-; 5
+@ 5
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "HELENA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DOES
 	ec_word MY
 	ec_word BEAUTY
 	ec_word INTIMIDATE
 	ec_word YOU
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word SO
 	ec_word SORRY
 	ec_word BUT
 	ec_word YOU_RE
 	ec_word BORING
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word DO
 	ec_word SO
@@ -157,24 +157,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word EXCL
 	.4byte gSlateportBattleTentTrainerMons_Helena
 
-; 6
+@ 6
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "RODOLFO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GO
 	ec_word GET
 	ec_word A
 	ec_pokemon1 WHISCASH
 	ec_word FOR
 	ec_word ME
-; win speech
+@ win speech
 	ec_word AWW
 	ec_word YOU
 	ec_word DON_T
 	ec_word HAVE
 	ec_word A
 	ec_pokemon1 WHISCASH
-; loss speech
+@ loss speech
 	ec_word PLEASE
 	ec_word I
 	ec_word NEED
@@ -183,24 +183,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word BADLY
 	.4byte gSlateportBattleTentTrainerMons_Rodolfo
 
-; 7
+@ 7
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "DAVION$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word GRAAAH
 	ec_word GRAAAH
 	ec_word EXCL_EXCL
 	ec_word GRAAAH
 	ec_word GRAAAH
 	ec_word EXCL_EXCL
-; win speech
+@ win speech
 	ec_move2 ROAR
 	ec_word EXCL
 	.2byte -1
 	ec_move2 ROAR
 	ec_word EXCL_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word URGH
 	ec_word WAAAH
 	ec_word EXCL_EXCL
@@ -209,24 +209,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Davion
 
-; 8
+@ 8
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "KENDALL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A_LITTLE
 	ec_move2 PETAL_DANCE
 	ec_word TO
 	ec_word PLEASE
 	ec_word YOU
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word I
 	ec_word DO
 	ec_word THIS
 	ec_word ONLY
 	ec_word FOR
 	ec_word WORK
-; loss speech
+@ loss speech
 	ec_word HOW
 	ec_word COULD
 	ec_word YOU
@@ -235,24 +235,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word QUES
 	.4byte gSlateportBattleTentTrainerMons_Kendall
 
-; 9
+@ 9
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "COLTEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
 	ec_word GO
 	ec_word RUN
 	ec_word AROUND
-; win speech
+@ win speech
 	ec_word YAY
 	ec_word EXCL
 	ec_word WANT
 	ec_word TO
 	ec_word RUN
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word A
 	ec_word SWIFT_SWIM
 	ec_word WOULD
@@ -261,24 +261,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word TOO
 	.4byte gSlateportBattleTentTrainerMons_Colten
 
-; 10
+@ 10
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "IRVIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HAVE
 	ec_word A
 	ec_word LOOK
 	ec_word AT
 	ec_word MY
 	ec_move1 CONFUSE_RAY
-; win speech
+@ win speech
 	ec_word YAHOO
 	ec_word MY
 	ec_move1 CONFUSE_RAY
 	ec_word IS
 	ec_word THE
 	ec_word BEST
-; loss speech
+@ loss speech
 	ec_word GWAH
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -287,24 +287,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word EXCL
 	.4byte gSlateportBattleTentTrainerMons_Irvin
 
-; 11
+@ 11
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "SHAUN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LISTEN
 	ec_word ELLIPSIS
 	ec_word YOU
 	ec_word AREN_T
 	ec_word VERY
 	ec_word GOOD
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SEE
 	ec_word QUES
 	ec_word I
 	ec_word WAS
 	ec_word RIGHT
-; loss speech
+@ loss speech
 	ec_word YES
 	ec_word YES
 	ec_word ELLIPSIS
@@ -313,24 +313,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word SOMETHING
 	.4byte gSlateportBattleTentTrainerMons_Shaun
 
-; 12
+@ 12
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "KYLER$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word YAY
-; loss speech
+@ loss speech
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
 	ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS
@@ -339,24 +339,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word WOW
 	.4byte gSlateportBattleTentTrainerMons_Kyler
 
-; 13
+@ 13
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "MAGGIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_pokemon1 VULPIX
 	ec_pokemon1 XATU
 	ec_pokemon2 UMBREON
 	ec_word ELLIPSIS
 	ec_word UM
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_pokemon1 NOSEPASS
 	ec_word ELLIPSIS
 	ec_word UM
 	ec_pokemon1 SEVIPER
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_pokemon1 NOSEPASS
 	ec_word ELLIPSIS
 	ec_word UM
@@ -365,24 +365,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word UH_OH
 	.4byte gSlateportBattleTentTrainerMons_Maggie
 
-; 14
+@ 14
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "STEPHON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word TO
 	ec_word ENJOY
 	ec_word AN
 	ec_word EGG
-; win speech
+@ win speech
 	ec_word I
 	ec_word WILL
 	ec_word ENJOY
 	ec_word THIS
 	ec_word TASTY
 	ec_word VICTORY
-; loss speech
+@ loss speech
 	ec_word AWFUL
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -391,24 +391,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word EXCL_EXCL
 	.4byte gSlateportBattleTentTrainerMons_Stephon
 
-; 15
+@ 15
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "REBECCA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THAT
 	ec_word EGG
 	ec_word HAS
 	ec_word A
 	ec_word TASTY
 	ec_word SHINE
-; win speech
+@ win speech
 	ec_word I
 	ec_word CAN_T
 	ec_word EXCL
 	ec_word SMELL
 	ec_word THAT
 	ec_word STENCH
-; loss speech
+@ loss speech
 	ec_word YOU
 	ec_word CAN_T
 	ec_word MAKE
@@ -417,24 +417,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word ELLIPSIS
 	.4byte gSlateportBattleTentTrainerMons_Rebecca
 
-; 16
+@ 16
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "REGGIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word POKEMON
 	ec_word COME
 	ec_word BEFORE
 	ec_word MONEY
 	ec_word OR
 	ec_word FAMILY
-; win speech
+@ win speech
 	ec_word THAT_S
 	ec_word WHAT
 	ec_word IS
 	ec_word MAKING
 	ec_word ME
 	ec_word STRONG
-; loss speech
+@ loss speech
 	ec_word THAT_S
 	ec_word WHY
 	ec_word I_AM
@@ -443,24 +443,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word ELLIPSIS
 	.4byte gSlateportBattleTentTrainerMons_Reggie
 
-; 17
+@ 17
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "JANAE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word JUST
 	ec_word ADORE
 	ec_word YOUR
 	ec_word TOUGH
 	ec_word LOOK
-; win speech
+@ win speech
 	ec_word I
 	ec_word LIKE
 	ec_word HOW
 	ec_word YOU
 	ec_move2 STRUGGLE
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word A
 	ec_word MEAN
@@ -469,24 +469,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word TRAINER
 	.4byte gSlateportBattleTentTrainerMons_Janae
 
-; 18
+@ 18
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "CAIDEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_move2 CURSE
 	ec_word WILL
 	ec_word BREAK
 	ec_word YOUR
 	ec_word SPIRIT
-; win speech
+@ win speech
 	ec_move2 CURSE
 	ec_word QUES
 	ec_word IT_S
 	ec_word A
 	ec_word LIE
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_move2 CURSE
 	ec_word WILL
@@ -495,24 +495,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Caiden
 
-; 19
+@ 19
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "KIRSTEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word HUH_QUES
 	ec_word A
 	ec_word BATTLE
 	ec_word YOU
 	ec_word SAID
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word HUH_QUES
 	ec_word STRONG
 	ec_word BUT
 	ec_word NOT
 	ec_word STRONG
 	ec_word ENOUGH
-; loss speech
+@ loss speech
 	ec_word HUH_QUES
 	ec_word I
 	ec_word SURRENDER
@@ -521,24 +521,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_move1 STRENGTH
 	.4byte gSlateportBattleTentTrainerMons_Kirsten
 
-; 20
+@ 20
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "KURTIS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word SORRY
 	ec_word YOU_RE
 	ec_word GOING
 	ec_word TO
 	ec_word GET
 	ec_move2 BEAT_UP
-; win speech
+@ win speech
 	ec_word I
 	ec_word SAID
 	ec_word WE
 	ec_word WOULD
 	ec_move2 POUND
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word HOW
 	ec_word DID
 	ec_word I
@@ -547,24 +547,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word QUES
 	.4byte gSlateportBattleTentTrainerMons_Kurtis
 
-; 21
+@ 21
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "STEFAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word ONLY
 	ec_word WANT
 	ec_word CUTE
 	ec_word POKEMON
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WHAT
 	ec_word IS
 	ec_word IT
 	ec_word TO
 	ec_word YOU
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word KIND
 	ec_word OF
@@ -573,24 +573,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Stefan
 
-; 22
+@ 22
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "AVERY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word TOYS
 	ec_word EXCL
 	ec_word I
 	ec_word NEED
 	ec_word MORE
 	ec_word TOYS
-; win speech
+@ win speech
 	ec_word I
 	ec_word NEED
 	ec_word SOME
 	ec_word EASY
 	ec_word MONEY
 	ec_word FAST
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -599,24 +599,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word MONEY
 	.4byte gSlateportBattleTentTrainerMons_Avery
 
-; 23
+@ 23
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "DWANE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MMM
 	ec_word TASTY
 	ec_word ELLIPSIS
 	ec_word WONDER
 	ec_word WHAT
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word MMM
 	ec_word MMM
 	ec_word ELLIPSIS
 	ec_word YOU
 	ec_word DON_T
 	ec_word KNOW
-; loss speech
+@ loss speech
 	ec_word MMM
 	ec_word MMM
 	ec_word ELLIPSIS
@@ -625,24 +625,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Dwane
 
-; 24
+@ 24
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "MCKENNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DISLIKE
 	ec_word SMALL
 	ec_word TALK
 	ec_word LET_S
 	ec_word GO
-; win speech
+@ win speech
 	ec_word YUP
 	ec_word THAT_S
 	ec_word THAT
 	.2byte -1
 	.2byte -1
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word KTHX_BYE
 	.2byte -1
 	.2byte -1
@@ -651,24 +651,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Mckenna
 
-; 25
+@ 25
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "CAMRYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MR
 	ec_word JUDGE
 	ec_word YOU
 	ec_word HAVE
 	ec_word OUR
 	ec_word TRUST
-; win speech
+@ win speech
 	ec_word YES_SIR_EXCL
 	ec_word WE_RE
 	ec_word NO_1
 	ec_word IN
 	ec_word THIS
 	ec_word CONTEST
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WON_T
 	ec_word GIVE_UP
@@ -677,24 +677,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word DREAM
 	.4byte gSlateportBattleTentTrainerMons_Camryn
 
-; 26
+@ 26
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "NATASHA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_OVER
 	ec_word TO
 	ec_word MY
 	ec_word PLACE
 	ec_word OK_QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word COME_ON
 	ec_word OVER
 	ec_word IT
 	ec_word WILL
 	ec_word BE
 	ec_word GREAT
-; loss speech
+@ loss speech
 	ec_word AWW
 	ec_word WON_T
 	ec_word YOU
@@ -703,24 +703,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	.2byte -1
 	.4byte gSlateportBattleTentTrainerMons_Natasha
 
-; 27
+@ 27
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "AUSTYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DON_T
 	ec_word CARE
 	ec_word HOW
 	ec_word WE
 	ec_word MATCH_UP
-; win speech
+@ win speech
 	ec_word HAH
 	ec_word BACK
 	ec_word TO
 	ec_word SCHOOL
 	ec_word FOR
 	ec_word YOU
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -729,24 +729,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word LESSONS
 	.4byte gSlateportBattleTentTrainerMons_Austyn
 
-; 28
+@ 28
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "DONOVAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OH
 	ec_word I_AM
 	ec_word FEELING
 	ec_word SLIMY
 	ec_word ALL
 	ec_word OVER
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word GOING
 	ec_word DOWN
 	ec_word THE
 	ec_move2 MEGA_DRAIN
 	ec_word HAHAHA
-; loss speech
+@ loss speech
 	ec_word I_AM
 	ec_word NATURALLY
 	ec_word SLIMY
@@ -755,24 +755,24 @@ gSlateportBattleTentTrainers: ; 85DDA14
 	ec_word I_AM
 	.4byte gSlateportBattleTentTrainerMons_Donovan
 
-; 29
+@ 29
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "TAMIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word ANGRY
 	ec_word WITH
 	ec_word MY
 	ec_word FATHER
 	ec_word ELLIPSIS
-; win speech
+@ win speech
 	ec_word I
 	ec_word REALLY
 	ec_word DISLIKE
 	ec_word MY
 	ec_word FATHER
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word JUST
 	ec_word SO
diff --git a/data/battle_frontier/verdanturf_battle_tent_mons.s b/data/battle_frontier/verdanturf_battle_tent_mons.s
index c6d2d3719..67dfdf420 100644
--- a/data/battle_frontier/verdanturf_battle_tent_mons.s
+++ b/data/battle_frontier/verdanturf_battle_tent_mons.s
@@ -1,315 +1,315 @@
 	.align 2, 0
 
-gVerdanturfBattleTentMons: ; 85DEC28
-; 0
+gVerdanturfBattleTentMons: @ 85DEC28
+@ 0
 	.2byte SPECIES_POOCHYENA
 	.2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL
 	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 1
+@ 1
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT
 	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_ADAMANT
 
-; 2
+@ 2
 	.2byte SPECIES_DUSTOX
 	.2byte MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
 	.4byte NATURE_MODEST
 
-; 3
+@ 3
 	.2byte SPECIES_TAILLOW
 	.2byte MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL
 	.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 4
+@ 4
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH
 	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_RASH
 
-; 5
+@ 5
 	.2byte SPECIES_MACHOP
 	.2byte MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE
 	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_LONELY
 
-; 6
+@ 6
 	.2byte SPECIES_MAGIKARP
 	.2byte MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE
 	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
 	.byte F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 7
+@ 7
 	.2byte SPECIES_BARBOACH
 	.2byte MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK
 	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
 	.byte F_EV_SPREAD_SPEED
 	.4byte NATURE_HASTY
 
-; 8
+@ 8
 	.2byte SPECIES_WINGULL
 	.2byte MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_IMPISH
 
-; 9
+@ 9
 	.2byte SPECIES_ARON
 	.2byte MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_HARDY
 
-; 10
+@ 10
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_SASSY
 
-; 11
+@ 11
 	.2byte SPECIES_SWALOT
 	.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA
 	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 12
+@ 12
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND
 	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIET
 
-; 13
+@ 13
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 14
+@ 14
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE
 	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_SASSY
 
-; 15
+@ 15
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 16
+@ 16
 	.2byte SPECIES_SWABLU
 	.2byte MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_MILD
 
-; 17
+@ 17
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM
 	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_GENTLE
 
-; 18
+@ 18
 	.2byte SPECIES_LOTAD
 	.2byte MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 19
+@ 19
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL
 	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
 	.4byte NATURE_RELAXED
 
-; 20
+@ 20
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_IMPISH
 
-; 21
+@ 21
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER
 	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_LONELY
 
-; 22
+@ 22
 	.2byte SPECIES_SKARMORY
 	.2byte MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_MACHO_BRACE
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BASHFUL
 
-; 23
+@ 23
 	.2byte SPECIES_SWELLOW
 	.2byte MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
 	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_NAUGHTY
 
-; 24
+@ 24
 	.2byte SPECIES_GOLDEEN
 	.2byte MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_GENTLE
 
-; 25
+@ 25
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_MILD
 
-; 26
+@ 26
 	.2byte SPECIES_NUZLEAF
 	.2byte MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF
 	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_BOLD
 
-; 27
+@ 27
 	.2byte SPECIES_ARON
 	.2byte MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_MODEST
 
-; 28
+@ 28
 	.2byte SPECIES_MIGHTYENA
 	.2byte MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 29
+@ 29
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE
 	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_ADAMANT
 
-; 30
+@ 30
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_IMPISH
 
-; 31
+@ 31
 	.2byte SPECIES_KADABRA
 	.2byte MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS
 	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
 	.4byte NATURE_QUIET
 
-; 32
+@ 32
 	.2byte SPECIES_VOLTORB
 	.2byte MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_BASHFUL
 
-; 33
+@ 33
 	.2byte SPECIES_MAGNEMITE
 	.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE
 	.byte BATTLE_FRONTIER_ITEM_MAGNET
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_SERIOUS
 
-; 34
+@ 34
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
 	.byte 0
 	.4byte NATURE_BRAVE
 
-; 35
+@ 35
 	.2byte SPECIES_LOUDRED
 	.2byte MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH
 	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_CALM
 
-; 36
+@ 36
 	.2byte SPECIES_MARILL
 	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_JOLLY
 
-; 37
+@ 37
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK
 	.byte BATTLE_FRONTIER_ITEM_NONE
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_NAUGHTY
 
-; 38
+@ 38
 	.2byte SPECIES_TENTACOOL
 	.2byte MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 39
+@ 39
 	.2byte SPECIES_VIGOROTH
 	.2byte MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER
 	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
 	.4byte NATURE_QUIRKY
 
-; 40
+@ 40
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT
 	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
 	.byte F_EV_SPREAD_HP
 	.4byte NATURE_RELAXED
 
-; 41
+@ 41
 	.2byte SPECIES_ILLUMISE
 	.2byte MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE
 	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
 	.4byte NATURE_QUIRKY
 
-; 42
+@ 42
 	.2byte SPECIES_MACHOKE
 	.2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST
 	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
 	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
 	.4byte NATURE_CALM
 
-; 43
+@ 43
 	.2byte SPECIES_WHISMUR
 	.2byte MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR
 	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
 	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
 	.4byte NATURE_QUIRKY
 
-; 44
+@ 44
 	.2byte SPECIES_CACNEA
 	.2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH
 	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
diff --git a/data/battle_frontier/verdanturf_battle_tent_trainer_mons.s b/data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
index dc2c618be..a2379a4ee 100644
--- a/data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
+++ b/data/battle_frontier/verdanturf_battle_tent_trainer_mons.s
@@ -1,6 +1,6 @@
 	.align 1, 0
 
-gVerdanturfBattleTentTrainerMons_Brenna: ; 85DE48C
+gVerdanturfBattleTentTrainerMons_Brenna: @ 85DE48C
 	.2byte 4
 	.2byte 11
 	.2byte 13
@@ -8,7 +8,7 @@ gVerdanturfBattleTentTrainerMons_Brenna: ; 85DE48C
 	.2byte 26
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Dilan: ; 85DE498
+gVerdanturfBattleTentTrainerMons_Dilan: @ 85DE498
 	.2byte 30
 	.2byte 37
 	.2byte 13
@@ -16,7 +16,7 @@ gVerdanturfBattleTentTrainerMons_Dilan: ; 85DE498
 	.2byte 42
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Eliana: ; 85DE4A4
+gVerdanturfBattleTentTrainerMons_Eliana: @ 85DE4A4
 	.2byte 6
 	.2byte 7
 	.2byte 17
@@ -24,7 +24,7 @@ gVerdanturfBattleTentTrainerMons_Eliana: ; 85DE4A4
 	.2byte 40
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Markus: ; 85DE4B0
+gVerdanturfBattleTentTrainerMons_Markus: @ 85DE4B0
 	.2byte 6
 	.2byte 7
 	.2byte 18
@@ -32,7 +32,7 @@ gVerdanturfBattleTentTrainerMons_Markus: ; 85DE4B0
 	.2byte 38
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Caitlyn: ; 85DE4BC
+gVerdanturfBattleTentTrainerMons_Caitlyn: @ 85DE4BC
 	.2byte 0
 	.2byte 12
 	.2byte 25
@@ -41,7 +41,7 @@ gVerdanturfBattleTentTrainerMons_Caitlyn: ; 85DE4BC
 	.2byte 44
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Desiree: ; 85DE4CA
+gVerdanturfBattleTentTrainerMons_Desiree: @ 85DE4CA
 	.2byte 8
 	.2byte 12
 	.2byte 21
@@ -49,7 +49,7 @@ gVerdanturfBattleTentTrainerMons_Desiree: ; 85DE4CA
 	.2byte 31
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Ronald: ; 85DE4D6
+gVerdanturfBattleTentTrainerMons_Ronald: @ 85DE4D6
 	.2byte 1
 	.2byte 20
 	.2byte 23
@@ -57,7 +57,7 @@ gVerdanturfBattleTentTrainerMons_Ronald: ; 85DE4D6
 	.2byte 32
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Ashten: ; 85DE4E2
+gVerdanturfBattleTentTrainerMons_Ashten: @ 85DE4E2
 	.2byte 9
 	.2byte 12
 	.2byte 27
@@ -65,7 +65,7 @@ gVerdanturfBattleTentTrainerMons_Ashten: ; 85DE4E2
 	.2byte 43
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Gerard: ; 85DE4EE
+gVerdanturfBattleTentTrainerMons_Gerard: @ 85DE4EE
 	.2byte 36
 	.2byte 7
 	.2byte 34
@@ -73,7 +73,7 @@ gVerdanturfBattleTentTrainerMons_Gerard: ; 85DE4EE
 	.2byte 40
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Bradly: ; 85DE4FA
+gVerdanturfBattleTentTrainerMons_Bradly: @ 85DE4FA
 	.2byte 26
 	.2byte 3
 	.2byte 0
@@ -81,7 +81,7 @@ gVerdanturfBattleTentTrainerMons_Bradly: ; 85DE4FA
 	.2byte 17
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Dennis: ; 85DE506
+gVerdanturfBattleTentTrainerMons_Dennis: @ 85DE506
 	.2byte 14
 	.2byte 37
 	.2byte 2
@@ -89,7 +89,7 @@ gVerdanturfBattleTentTrainerMons_Dennis: ; 85DE506
 	.2byte 27
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Prestin: ; 85DE512
+gVerdanturfBattleTentTrainerMons_Prestin: @ 85DE512
 	.2byte 31
 	.2byte 28
 	.2byte 22
@@ -99,7 +99,7 @@ gVerdanturfBattleTentTrainerMons_Prestin: ; 85DE512
 	.2byte 41
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Ernesto: ; 85DE522
+gVerdanturfBattleTentTrainerMons_Ernesto: @ 85DE522
 	.2byte 33
 	.2byte 32
 	.2byte 25
@@ -107,7 +107,7 @@ gVerdanturfBattleTentTrainerMons_Ernesto: ; 85DE522
 	.2byte 34
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Nala: ; 85DE52E
+gVerdanturfBattleTentTrainerMons_Nala: @ 85DE52E
 	.2byte 1
 	.2byte 4
 	.2byte 8
@@ -117,7 +117,7 @@ gVerdanturfBattleTentTrainerMons_Nala: ; 85DE52E
 	.2byte 34
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Darnell: ; 85DE53E
+gVerdanturfBattleTentTrainerMons_Darnell: @ 85DE53E
 	.2byte 0
 	.2byte 29
 	.2byte 35
@@ -126,7 +126,7 @@ gVerdanturfBattleTentTrainerMons_Darnell: ; 85DE53E
 	.2byte 43
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Ashlyn: ; 85DE54C
+gVerdanturfBattleTentTrainerMons_Ashlyn: @ 85DE54C
 	.2byte 29
 	.2byte 36
 	.2byte 32
@@ -136,7 +136,7 @@ gVerdanturfBattleTentTrainerMons_Ashlyn: ; 85DE54C
 	.2byte 44
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Addison: ; 85DE55C
+gVerdanturfBattleTentTrainerMons_Addison: @ 85DE55C
 	.2byte 0
 	.2byte 1
 	.2byte 16
@@ -144,7 +144,7 @@ gVerdanturfBattleTentTrainerMons_Addison: ; 85DE55C
 	.2byte 6
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Justine: ; 85DE568
+gVerdanturfBattleTentTrainerMons_Justine: @ 85DE568
 	.2byte 0
 	.2byte 1
 	.2byte 16
@@ -152,7 +152,7 @@ gVerdanturfBattleTentTrainerMons_Justine: ; 85DE568
 	.2byte 18
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Tyson: ; 85DE574
+gVerdanturfBattleTentTrainerMons_Tyson: @ 85DE574
 	.2byte 5
 	.2byte 15
 	.2byte 22
@@ -162,7 +162,7 @@ gVerdanturfBattleTentTrainerMons_Tyson: ; 85DE574
 	.2byte 43
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Laila: ; 85DE584
+gVerdanturfBattleTentTrainerMons_Laila: @ 85DE584
 	.2byte 5
 	.2byte 15
 	.2byte 19
@@ -171,7 +171,7 @@ gVerdanturfBattleTentTrainerMons_Laila: ; 85DE584
 	.2byte 43
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Waren: ; 85DE592
+gVerdanturfBattleTentTrainerMons_Waren: @ 85DE592
 	.2byte 0
 	.2byte 9
 	.2byte 10
@@ -179,7 +179,7 @@ gVerdanturfBattleTentTrainerMons_Waren: ; 85DE592
 	.2byte 23
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Tobias: ; 85DE59E
+gVerdanturfBattleTentTrainerMons_Tobias: @ 85DE59E
 	.2byte 6
 	.2byte 7
 	.2byte 24
@@ -187,7 +187,7 @@ gVerdanturfBattleTentTrainerMons_Tobias: ; 85DE59E
 	.2byte 40
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Josiah: ; 85DE5AA
+gVerdanturfBattleTentTrainerMons_Josiah: @ 85DE5AA
 	.2byte 8
 	.2byte 16
 	.2byte 23
@@ -195,7 +195,7 @@ gVerdanturfBattleTentTrainerMons_Josiah: ; 85DE5AA
 	.2byte 3
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Dion: ; 85DE5B6
+gVerdanturfBattleTentTrainerMons_Dion: @ 85DE5B6
 	.2byte 14
 	.2byte 2
 	.2byte 11
@@ -204,7 +204,7 @@ gVerdanturfBattleTentTrainerMons_Dion: ; 85DE5B6
 	.2byte 38
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Kenzie: ; 85DE5C4
+gVerdanturfBattleTentTrainerMons_Kenzie: @ 85DE5C4
 	.2byte 18
 	.2byte 10
 	.2byte 16
@@ -213,7 +213,7 @@ gVerdanturfBattleTentTrainerMons_Kenzie: ; 85DE5C4
 	.2byte 27
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Lillian: ; 85DE5D2
+gVerdanturfBattleTentTrainerMons_Lillian: @ 85DE5D2
 	.2byte 24
 	.2byte 34
 	.2byte 36
@@ -221,7 +221,7 @@ gVerdanturfBattleTentTrainerMons_Lillian: ; 85DE5D2
 	.2byte 5
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Lesley: ; 85DE5DE
+gVerdanturfBattleTentTrainerMons_Lesley: @ 85DE5DE
 	.2byte 26
 	.2byte 0
 	.2byte 18
@@ -229,7 +229,7 @@ gVerdanturfBattleTentTrainerMons_Lesley: ; 85DE5DE
 	.2byte 25
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Marquis: ; 85DE5EA
+gVerdanturfBattleTentTrainerMons_Marquis: @ 85DE5EA
 	.2byte 24
 	.2byte 34
 	.2byte 5
@@ -238,7 +238,7 @@ gVerdanturfBattleTentTrainerMons_Marquis: ; 85DE5EA
 	.2byte 42
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Freddy: ; 85DE5F8
+gVerdanturfBattleTentTrainerMons_Freddy: @ 85DE5F8
 	.2byte 18
 	.2byte 21
 	.2byte 26
@@ -246,7 +246,7 @@ gVerdanturfBattleTentTrainerMons_Freddy: ; 85DE5F8
 	.2byte 41
 	.2byte -1
 
-gVerdanturfBattleTentTrainerMons_Cecilia: ; 85DE604
+gVerdanturfBattleTentTrainerMons_Cecilia: @ 85DE604
 	.2byte 23
 	.2byte 26
 	.2byte 27
diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.s b/data/battle_frontier/verdanturf_battle_tent_trainers.s
index dde4744ee..e20d00b2a 100644
--- a/data/battle_frontier/verdanturf_battle_tent_trainers.s
+++ b/data/battle_frontier/verdanturf_battle_tent_trainers.s
@@ -1,24 +1,24 @@
 	.align 2, 0
 
-gVerdanturfBattleTentTrainers: ; 85DE610
-; 0
+gVerdanturfBattleTentTrainers: @ 85DE610
+@ 0
 	.4byte TRAINER_CLASS_AROMA_LADY
 	.charmapstr "BRENNA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word NO
 	ec_word DAYS
 	ec_word GO
 	ec_word WITHOUT
 	ec_word MY
 	ec_move1 FAKE_TEARS
-; win speech
+@ win speech
 	ec_word OH
 	ec_word THAT_WAS
 	ec_word SO
 	ec_word REFRESHING
 	ec_word EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word ALL
 	ec_word I
 	ec_word EVER
@@ -27,24 +27,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_move1 TORMENT
 	.4byte gVerdanturfBattleTentTrainerMons_Brenna
 
-; 1
+@ 1
 	.4byte TRAINER_CLASS_RUIN_MANIAC
 	.charmapstr "DILAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word DON_T
 	ec_word KNOW
 	ec_word HOW
 	ec_word BORED
 	ec_word I_AM
-; win speech
+@ win speech
 	ec_word LOSING
 	ec_word ISN_T
 	ec_word EXCITING
 	ec_word AT
 	ec_word ALL
 	ec_word ELLIPSIS
-; loss speech
+@ loss speech
 	ec_word EXCITING
 	ec_word EXCL_EXCL
 	ec_word BYE_BYE
@@ -53,24 +53,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word BORED
 	.4byte gVerdanturfBattleTentTrainerMons_Dilan
 
-; 2
+@ 2
 	.4byte TRAINER_CLASS_TUBER_1
 	.charmapstr "ELIANA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word GOING
 	ec_word ON
 	ec_word A
 	ec_word VACATION
 	ec_word SOON
-; win speech
+@ win speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
 	ec_word GET
 	ec_word SOME
 	ec_word MONEY
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word SLEEP
 	ec_word UNTIL
@@ -79,24 +79,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word HOME
 	.4byte gVerdanturfBattleTentTrainerMons_Eliana
 
-; 3
+@ 3
 	.4byte TRAINER_CLASS_TUBER_2
 	.charmapstr "MARKUS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word SMART
 	ec_word EXCL
 	ec_word IF_I_LOSE
 	ec_word I
 	ec_move1 SELF_DESTRUCT
-; win speech
+@ win speech
 	ec_word IT_S
 	ec_word A
 	ec_word NON_STOP
 	ec_move2 EXPLOSION
 	ec_word OF
 	ec_word JOY
-; loss speech
+@ loss speech
 	ec_word I_VE
 	ec_word LOST
 	ec_word ELLIPSIS
@@ -105,24 +105,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_move1 SELF_DESTRUCT
 	.4byte gVerdanturfBattleTentTrainerMons_Markus
 
-; 4
+@ 4
 	.4byte TRAINER_CLASS_LADY
 	.charmapstr "CAITLYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I_AM
 	ec_word BORED
 	ec_word OF
 	ec_word BEING
 	ec_word AN
 	ec_word IDOL
-; win speech
+@ win speech
 	ec_word A
 	ec_word BATTLE
 	ec_word IS
 	ec_word BEST
 	ec_word FOR
 	ec_word HAPPINESS
-; loss speech
+@ loss speech
 	ec_word LOSING
 	ec_word DOESN_T
 	ec_word BUG
@@ -131,24 +131,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word ALL
 	.4byte gVerdanturfBattleTentTrainerMons_Caitlyn
 
-; 5
+@ 5
 	.4byte TRAINER_CLASS_BEAUTY
 	.charmapstr "DESIREE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DOESN_T
 	ec_word MY
 	ec_word BEAUTY
 	ec_move1 ASTONISH
 	ec_word YOU
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word DID
 	ec_word I
 	ec_word INTIMIDATE
 	ec_word YOU
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word MY
 	ec_word BEAUTY
 	ec_word DID
@@ -157,24 +157,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word YOU
 	.4byte gVerdanturfBattleTentTrainerMons_Desiree
 
-; 6
+@ 6
 	.4byte TRAINER_CLASS_RICH_BOY
 	.charmapstr "RONALD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word COME_ON
 	ec_word I
 	ec_word WILL
 	ec_word BATTLE
 	ec_word SERIOUSLY
 	.2byte -1
-; win speech
+@ win speech
 	ec_word GIVE_UP
 	ec_word QUES
 	.2byte -1
 	ec_word THAT_S
 	ec_word REALLY
 	ec_word WEAK
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word NEED
 	ec_word TO
@@ -183,24 +183,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_move2 BATON_PASS
 	.4byte gVerdanturfBattleTentTrainerMons_Ronald
 
-; 7
+@ 7
 	.4byte TRAINER_CLASS_POKEMANIAC
 	.charmapstr "ASHTEN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word OH_YEAH
 	ec_word ANOTHER
 	ec_word EXCITING
 	ec_word BATTLE
 	ec_word EXCL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_word POKEMON
 	ec_word ARE
 	ec_word WIMPY
 	ec_word AND
 	ec_word BORING
-; loss speech
+@ loss speech
 	ec_word THAT_WAS
 	ec_word AN
 	ec_word EXCITING
@@ -209,24 +209,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word EXCL
 	.4byte gVerdanturfBattleTentTrainerMons_Ashten
 
-; 8
+@ 8
 	.4byte TRAINER_CLASS_SWIMMER_M
 	.charmapstr "GERARD$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word LOOK
 	ec_word AT
 	ec_word MY
 	ec_word SUPER
 	ec_move2 TEETER_DANCE
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THAT_WAS
 	ec_word HARD
 	ec_word ELLIPSIS
 	ec_word AM
 	ec_word I
 	ec_word OK_QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WON_T
 	ec_word FORGIVE
@@ -235,24 +235,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word THAT
 	.4byte gVerdanturfBattleTentTrainerMons_Gerard
 
-; 9
+@ 9
 	.4byte TRAINER_CLASS_CAMPER
 	.charmapstr "BRADLY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word LONESOME
 	ec_word BUT
 	ec_word I
 	ec_word VACATION
 	ec_word ALONE
-; win speech
+@ win speech
 	ec_word I
 	ec_word WILL
 	ec_move1 WITHDRAW
 	ec_word INSIDE
 	ec_word MY
 	ec_word SHELL_ARMOR
-; loss speech
+@ loss speech
 	ec_word OH
 	ec_word ELLIPSIS
 	.2byte -1
@@ -261,24 +261,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word ALWAYS
 	.4byte gVerdanturfBattleTentTrainerMons_Bradly
 
-; 10
+@ 10
 	.4byte TRAINER_CLASS_BUG_MANIAC
 	.charmapstr "DENNIS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word ARE
 	ec_word YOU
 	ec_word REALLY
 	ec_word STRONG
 	ec_word QUES
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WAHAHAHA
 	ec_word EXCL
 	.2byte -1
 	ec_word WAHAHAHA
 	ec_word EXCL_EXCL
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word NICE
 	ec_word GOING
 	ec_word EXCL
@@ -287,24 +287,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word CHILD_S_PLAY
 	.4byte gVerdanturfBattleTentTrainerMons_Dennis
 
-; 11
+@ 11
 	.4byte TRAINER_CLASS_GENTLEMAN
 	.charmapstr "PRESTIN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word IS
 	ec_word A
 	ec_move1 NIGHTMARE
 	ec_word FOR
 	ec_word YOU
-; win speech
+@ win speech
 	ec_word FORGIVE
 	ec_word ME
 	ec_word ELLIPSIS
 	ec_word IT_S
 	ec_word A
 	ec_word DREAM
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word WANT
 	ec_word TO
@@ -313,24 +313,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word THIS
 	.4byte gVerdanturfBattleTentTrainerMons_Prestin
 
-; 12
+@ 12
 	.4byte TRAINER_CLASS_GUITARIST
 	.charmapstr "ERNESTO$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THIS
 	ec_word PARTY
 	ec_word GOES
 	ec_word ON
 	ec_word FOREVER
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word THE
 	ec_word MUSIC
 	ec_word PLAYS
 	ec_word ON
 	ec_word WITHOUT
 	ec_word END
-; loss speech
+@ loss speech
 	ec_word NO
 	ec_word EXCL
 	ec_word THE
@@ -339,24 +339,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word STOP
 	.4byte gVerdanturfBattleTentTrainerMons_Ernesto
 
-; 13
+@ 13
 	.4byte TRAINER_CLASS_SCHOOL_KID_2
 	.charmapstr "NALA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WANT
 	ec_word THE
 	ec_word WORLD
 	ec_word MOVIE
 	ec_word COLLECTION
-; win speech
+@ win speech
 	ec_word I
 	ec_word DON_T
 	ec_word LIKE
 	ec_word RADIO
 	ec_word VERY
 	ec_word MUCH
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word REFUSE
 	ec_word TO
@@ -365,24 +365,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word EXCL
 	.4byte gVerdanturfBattleTentTrainerMons_Nala
 
-; 14
+@ 14
 	.4byte TRAINER_CLASS_COOLTRAINER_1
 	.charmapstr "DARNELL$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word WILL
 	ec_word GO_EASY
 	ec_word ON
 	ec_word YOU
 	.2byte -1
-; win speech
+@ win speech
 	ec_word YOUR
 	ec_move2 FRUSTRATION
 	ec_word SHOULD
 	ec_word BE
 	ec_word HIDDEN
 	ec_word AWAY
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word TOO
 	ec_word MUCH
@@ -391,24 +391,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word ELLIPSIS
 	.4byte gVerdanturfBattleTentTrainerMons_Darnell
 
-; 15
+@ 15
 	.4byte TRAINER_CLASS_COOLTRAINER_2
 	.charmapstr "ASHLYN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word LOOK
 	ec_word TOUGH
 	ec_word DO
 	ec_word I
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word I_AM
 	ec_word NOT
 	ec_word OVER
 	ec_word YOUR
 	ec_move2 TAUNT
 	ec_word YET
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word MEAN
 	ec_word EXCL_EXCL
@@ -417,24 +417,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	.2byte -1
 	.4byte gVerdanturfBattleTentTrainerMons_Ashlyn
 
-; 16
+@ 16
 	.4byte TRAINER_CLASS_POKEFAN_1
 	.charmapstr "ADDISON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YES
 	ec_word EXCL
 	.2byte -1
 	ec_word MY
 	ec_word POKEMON
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word WELL
 	ec_word WASN_T
 	ec_word THAT
 	ec_word EASY
 	ec_word QUES
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word WAAAH
 	ec_word EXCL
 	.2byte -1
@@ -443,24 +443,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word QUES
 	.4byte gVerdanturfBattleTentTrainerMons_Addison
 
-; 17
+@ 17
 	.4byte TRAINER_CLASS_POKEFAN_2
 	.charmapstr "JUSTINE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YES
 	ec_word EXCL
 	.2byte -1
 	ec_word COME_ON
 	ec_word I_AM
 	ec_word READY
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word JUST
 	ec_word NOT
 	ec_word GOOD
 	ec_word ENOUGH
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word WOWEE
 	ec_word EXCL_EXCL
 	.2byte -1
@@ -469,24 +469,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	.2byte -1
 	.4byte gVerdanturfBattleTentTrainerMons_Justine
 
-; 18
+@ 18
 	.4byte TRAINER_CLASS_EXPERT_1
 	.charmapstr "TYSON$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU_RE
 	ec_word GOING
 	ec_word TO
 	ec_word PRESSURE
 	ec_word ME
 	ec_word QUES
-; win speech
+@ win speech
 	ec_word WHAT
 	ec_word QUES
 	ec_word YOU_RE
 	ec_word MUCH
 	ec_word TOO_WEAK
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word DOESN_T
 	ec_word MAKE
@@ -495,24 +495,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word EXCL
 	.4byte gVerdanturfBattleTentTrainerMons_Tyson
 
-; 19
+@ 19
 	.4byte TRAINER_CLASS_EXPERT_2
 	.charmapstr "LAILA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word A
 	ec_move2 STRUGGLE
 	ec_word ISN_T
 	ec_word VERY
 	ec_word COOL
 	.2byte -1
-; win speech
+@ win speech
 	ec_word NOPE
 	ec_word NOT_VERY
 	ec_word COOL
 	ec_word AT
 	ec_word ALL
 	ec_word EXCL
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word NOT
 	ec_word COOL
@@ -521,24 +521,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word WON
 	.4byte gVerdanturfBattleTentTrainerMons_Laila
 
-; 20
+@ 20
 	.4byte TRAINER_CLASS_YOUNGSTER
 	.charmapstr "WAREN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word DANGER
 	ec_word EXCL
 	.2byte -1
 	ec_word I
 	ec_word SENSE
 	ec_word DANGER
-; win speech
+@ win speech
 	ec_word DID
 	ec_word YOU
 	ec_word BELIEVE
 	ec_word MY
 	ec_word LIE
 	ec_word QUES_EXCL
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word REALLY
 	ec_word DID
@@ -547,24 +547,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word ELLIPSIS
 	.4byte gVerdanturfBattleTentTrainerMons_Waren
 
-; 21
+@ 21
 	.4byte TRAINER_CLASS_FISHERMAN
 	.charmapstr "TOBIAS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_move2 BARRIER
 	ec_word EXCL_EXCL
 	.2byte -1
 	ec_word NOW
 	ec_word COME_ON
 	ec_word EXCL
-; win speech
+@ win speech
 	ec_word HUH_QUES
 	ec_word YOU
 	ec_word MEAN
 	ec_word I
 	ec_word WON
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word SHOULD
 	ec_word KNOW
@@ -573,24 +573,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word HOPELESS
 	.4byte gVerdanturfBattleTentTrainerMons_Tobias
 
-; 22
+@ 22
 	.4byte TRAINER_CLASS_BIRD_KEEPER
 	.charmapstr "JOSIAH$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word PROMISE
 	ec_word TO
 	ec_move1 FLY
 	ec_word IF_I_LOSE
 	.2byte -1
-; win speech
+@ win speech
 	ec_word TOO_WEAK
 	ec_word ELLIPSIS
 	.2byte -1
 	ec_word YOU
 	ec_move1 FLY
 	ec_word INSTEAD
-; loss speech
+@ loss speech
 	ec_word I
 	ec_word PROMISE
 	ec_word TO
@@ -599,24 +599,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word SOON
 	.4byte gVerdanturfBattleTentTrainerMons_Josiah
 
-; 23
+@ 23
 	.4byte TRAINER_CLASS_NINJA_BOY
 	.charmapstr "DION$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word IT_S
 	ec_word TRENDY
 	ec_word UM
 	ec_word BATTLE
 	ec_word SOMETHING
 	.2byte -1
-; win speech
+@ win speech
 	ec_word WAS
 	ec_word IT
 	ec_word ELLIPSIS
 	ec_word BATTLE
 	ec_word DATE
 	ec_word QUES
-; loss speech
+@ loss speech
 	ec_word WAS
 	ec_word IT
 	ec_word ELLIPSIS
@@ -625,24 +625,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word QUES
 	.4byte gVerdanturfBattleTentTrainerMons_Dion
 
-; 24
+@ 24
 	.4byte TRAINER_CLASS_PARASOL_LADY
 	.charmapstr "KENZIE$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word THE
 	ec_move1 MORNING_SUN
 	ec_word GIVES
 	ec_word ME
 	ec_move1 STRENGTH
 	.2byte -1
-; win speech
+@ win speech
 	ec_word BUT
 	ec_word I
 	ec_word LIKE
 	ec_move2 MOONLIGHT
 	ec_word TOO
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word YOU_RE
 	ec_word LIKE
 	ec_word A
@@ -651,24 +651,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word ELLIPSIS
 	.4byte gVerdanturfBattleTentTrainerMons_Kenzie
 
-; 25
+@ 25
 	.4byte TRAINER_CLASS_SWIMMER_F
 	.charmapstr "LILLIAN$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word DO
 	ec_word THINGS
 	ec_word AT
 	ec_word MY
 	ec_word OWN_TEMPO
-; win speech
+@ win speech
 	ec_word I
 	ec_word WON
 	ec_word QUES
 	ec_word WHAT
 	ec_word A
 	ec_word SURPRISE
-; loss speech
+@ loss speech
 	ec_word AWW
 	ec_word ELLIPSIS
 	ec_word I
@@ -677,24 +677,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word NAP
 	.4byte gVerdanturfBattleTentTrainerMons_Lillian
 
-; 26
+@ 26
 	.4byte TRAINER_CLASS_PICNICKER
 	.charmapstr "LESLEY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word YOU
 	ec_word SHOULD
 	ec_word NOT
 	ec_word BE
 	ec_word LOLLING
 	ec_word ABOUT
-; win speech
+@ win speech
 	ec_word YOU
 	ec_word SHOULD
 	ec_word GET
 	ec_word UP
 	ec_word EARLIER
 	.2byte -1
-; loss speech
+@ loss speech
 	ec_word THIS
 	ec_word SHOULD
 	ec_word NOT
@@ -703,24 +703,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word EXCL
 	.4byte gVerdanturfBattleTentTrainerMons_Lesley
 
-; 27
+@ 27
 	.4byte TRAINER_CLASS_SAILOR
 	.charmapstr "MARQUIS$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word NONE
 	ec_word OF
 	ec_word THIS
 	ec_word IS
 	ec_word MAKING
 	ec_word SENSE
-; win speech
+@ win speech
 	ec_word SEE
 	ec_word QUES
 	ec_word THIS
 	ec_word JUST
 	ec_word ISN_T
 	ec_word NORMAL
-; loss speech
+@ loss speech
 	ec_word SHOULD
 	ec_word I
 	ec_word CAUSE
@@ -729,24 +729,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word QUES
 	.4byte gVerdanturfBattleTentTrainerMons_Marquis
 
-; 28
+@ 28
 	.4byte TRAINER_CLASS_COLLECTOR
 	.charmapstr "FREDDY$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word I
 	ec_word ADORE
 	ec_word THIS
 	ec_word CUTE
 	ec_word TELEVISION
 	ec_word IDOL
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word SO
 	ec_word FUNNY
 	ec_word WHEN
 	ec_word YOU_RE
 	ec_word ANGRY
-; loss speech
+@ loss speech
 	ec_word LATE
 	ec_word NIGHT
 	ec_word TELEVISION
@@ -755,24 +755,24 @@ gVerdanturfBattleTentTrainers: ; 85DE610
 	ec_word LIFE
 	.4byte gVerdanturfBattleTentTrainerMons_Freddy
 
-; 29
+@ 29
 	.4byte TRAINER_CLASS_LASS
 	.charmapstr "CECILIA$", 8
-; pre-battle speech
+@ pre-battle speech
 	ec_word MY
 	ec_word FABULOUS
 	ec_word CUTENESS
 	ec_word IS
 	ec_word IN
 	ec_word FASHION
-; win speech
+@ win speech
 	ec_word YOU_RE
 	ec_word NO
 	ec_word MATCH
 	ec_word FOR
 	ec_word MY
 	ec_word CUTE_CHARM
-; loss speech
+@ loss speech
 	ec_word DON_T
 	ec_word YOU
 	ec_word HAVE
diff --git a/data/battle_moves.s b/data/battle_moves.s
index 710149b56..99c17e383 100644
--- a/data/battle_moves.s
+++ b/data/battle_moves.s
@@ -1,3907 +1,3907 @@
 	.align 2, 0
 
-gBattleMoves: ; 831C898
-; -
-	.byte 0x00 ; effect
-	.byte 0 ; power
+gBattleMoves: @ 831C898
+@ -
+	.byte 0x00 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 0 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 0 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Pound
-	.byte 0x00 ; effect
-	.byte 40 ; power
+@ Pound
+	.byte 0x00 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Karate Chop
-	.byte 0x2b ; effect
-	.byte 50 ; power
+@ Karate Chop
+	.byte 0x2b @ effect
+	.byte 50 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Double Slap
-	.byte 0x1d ; effect
-	.byte 15 ; power
+@ Double Slap
+	.byte 0x1d @ effect
+	.byte 15 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Comet Punch
-	.byte 0x1d ; effect
-	.byte 18 ; power
+@ Comet Punch
+	.byte 0x1d @ effect
+	.byte 18 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mega Punch
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Mega Punch
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Pay Day
-	.byte 0x22 ; effect
-	.byte 40 ; power
+@ Pay Day
+	.byte 0x22 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fire Punch
-	.byte 0x04 ; effect
-	.byte 75 ; power
+@ Fire Punch
+	.byte 0x04 @ effect
+	.byte 75 @ power
 	.byte TYPE_FIRE
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Ice Punch
-	.byte 0x05 ; effect
-	.byte 75 ; power
+@ Ice Punch
+	.byte 0x05 @ effect
+	.byte 75 @ power
 	.byte TYPE_ICE
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Thunder Punch
-	.byte 0x06 ; effect
-	.byte 75 ; power
+@ Thunder Punch
+	.byte 0x06 @ effect
+	.byte 75 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Scratch
-	.byte 0x00 ; effect
-	.byte 40 ; power
+@ Scratch
+	.byte 0x00 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Vice Grip
-	.byte 0x00 ; effect
-	.byte 55 ; power
+@ Vice Grip
+	.byte 0x00 @ effect
+	.byte 55 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Guillotine
-	.byte 0x26 ; effect
-	.byte 1 ; power
+@ Guillotine
+	.byte 0x26 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 30 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 30 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Razor Wind
-	.byte 0x27 ; effect
-	.byte 80 ; power
+@ Razor Wind
+	.byte 0x27 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Swords Dance
-	.byte 0x32 ; effect
-	.byte 0 ; power
+@ Swords Dance
+	.byte 0x32 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Cut
-	.byte 0x00 ; effect
-	.byte 50 ; power
+@ Cut
+	.byte 0x00 @ effect
+	.byte 50 @ power
 	.byte TYPE_NORMAL
-	.byte 95 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Gust
-	.byte 0x95 ; effect
-	.byte 40 ; power
+@ Gust
+	.byte 0x95 @ effect
+	.byte 40 @ power
 	.byte TYPE_FLYING
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Wing Attack
-	.byte 0x00 ; effect
-	.byte 60 ; power
+@ Wing Attack
+	.byte 0x00 @ effect
+	.byte 60 @ power
 	.byte TYPE_FLYING
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Whirlwind
-	.byte 0x1c ; effect
-	.byte 0 ; power
+@ Whirlwind
+	.byte 0x1c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte -6 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte -6 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fly
-	.byte 0x9b ; effect
-	.byte 70 ; power
+@ Fly
+	.byte 0x9b @ effect
+	.byte 70 @ power
 	.byte TYPE_FLYING
-	.byte 95 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Bind
-	.byte 0x2a ; effect
-	.byte 15 ; power
+@ Bind
+	.byte 0x2a @ effect
+	.byte 15 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Slam
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Slam
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Vine Whip
-	.byte 0x00 ; effect
-	.byte 35 ; power
+@ Vine Whip
+	.byte 0x00 @ effect
+	.byte 35 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Stomp
-	.byte 0x96 ; effect
-	.byte 65 ; power
+@ Stomp
+	.byte 0x96 @ effect
+	.byte 65 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Double Kick
-	.byte 0x2c ; effect
-	.byte 30 ; power
+@ Double Kick
+	.byte 0x2c @ effect
+	.byte 30 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mega Kick
-	.byte 0x00 ; effect
-	.byte 120 ; power
+@ Mega Kick
+	.byte 0x00 @ effect
+	.byte 120 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Jump Kick
-	.byte 0x2d ; effect
-	.byte 70 ; power
+@ Jump Kick
+	.byte 0x2d @ effect
+	.byte 70 @ power
 	.byte TYPE_FIGHTING
-	.byte 95 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Rolling Kick
-	.byte 0x1f ; effect
-	.byte 60 ; power
+@ Rolling Kick
+	.byte 0x1f @ effect
+	.byte 60 @ power
 	.byte TYPE_FIGHTING
-	.byte 85 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sand-Attack
-	.byte 0x17 ; effect
-	.byte 0 ; power
+@ Sand-Attack
+	.byte 0x17 @ effect
+	.byte 0 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Headbutt
-	.byte 0x1f ; effect
-	.byte 70 ; power
+@ Headbutt
+	.byte 0x1f @ effect
+	.byte 70 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Horn Attack
-	.byte 0x00 ; effect
-	.byte 65 ; power
+@ Horn Attack
+	.byte 0x00 @ effect
+	.byte 65 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Fury Attack
-	.byte 0x1d ; effect
-	.byte 15 ; power
+@ Fury Attack
+	.byte 0x1d @ effect
+	.byte 15 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Horn Drill
-	.byte 0x26 ; effect
-	.byte 1 ; power
+@ Horn Drill
+	.byte 0x26 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 30 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 30 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Tackle
-	.byte 0x00 ; effect
-	.byte 35 ; power
+@ Tackle
+	.byte 0x00 @ effect
+	.byte 35 @ power
 	.byte TYPE_NORMAL
-	.byte 95 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Body Slam
-	.byte 0x06 ; effect
-	.byte 85 ; power
+@ Body Slam
+	.byte 0x06 @ effect
+	.byte 85 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Wrap
-	.byte 0x2a ; effect
-	.byte 15 ; power
+@ Wrap
+	.byte 0x2a @ effect
+	.byte 15 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Take Down
-	.byte 0x30 ; effect
-	.byte 90 ; power
+@ Take Down
+	.byte 0x30 @ effect
+	.byte 90 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Thrash
-	.byte 0x1b ; effect
-	.byte 90 ; power
+@ Thrash
+	.byte 0x1b @ effect
+	.byte 90 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte F_TARGET_RANDOM
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Double-Edge
-	.byte 0xc6 ; effect
-	.byte 120 ; power
+@ Double-Edge
+	.byte 0xc6 @ effect
+	.byte 120 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Tail Whip
-	.byte 0x13 ; effect
-	.byte 0 ; power
+@ Tail Whip
+	.byte 0x13 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Poison Sting
-	.byte 0x02 ; effect
-	.byte 15 ; power
+@ Poison Sting
+	.byte 0x02 @ effect
+	.byte 15 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Twineedle
-	.byte 0x4d ; effect
-	.byte 25 ; power
+@ Twineedle
+	.byte 0x4d @ effect
+	.byte 25 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Pin Missile
-	.byte 0x1d ; effect
-	.byte 14 ; power
+@ Pin Missile
+	.byte 0x1d @ effect
+	.byte 14 @ power
 	.byte TYPE_BUG
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Leer
-	.byte 0x13 ; effect
-	.byte 0 ; power
+@ Leer
+	.byte 0x13 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Bite
-	.byte 0x1f ; effect
-	.byte 60 ; power
+@ Bite
+	.byte 0x1f @ effect
+	.byte 60 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Growl
-	.byte 0x12 ; effect
-	.byte 0 ; power
+@ Growl
+	.byte 0x12 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Roar
-	.byte 0x1c ; effect
-	.byte 0 ; power
+@ Roar
+	.byte 0x1c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte -6 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte -6 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sing
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Sing
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 55 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 55 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Supersonic
-	.byte 0x31 ; effect
-	.byte 0 ; power
+@ Supersonic
+	.byte 0x31 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 55 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 55 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sonic Boom
-	.byte 0x82 ; effect
-	.byte 1 ; power
+@ Sonic Boom
+	.byte 0x82 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Disable
-	.byte 0x56 ; effect
-	.byte 0 ; power
+@ Disable
+	.byte 0x56 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 55 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 55 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Acid
-	.byte 0x45 ; effect
-	.byte 40 ; power
+@ Acid
+	.byte 0x45 @ effect
+	.byte 40 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 10 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Ember
-	.byte 0x04 ; effect
-	.byte 40 ; power
+@ Ember
+	.byte 0x04 @ effect
+	.byte 40 @ power
 	.byte TYPE_FIRE
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Flamethrower
-	.byte 0x04 ; effect
-	.byte 95 ; power
+@ Flamethrower
+	.byte 0x04 @ effect
+	.byte 95 @ power
 	.byte TYPE_FIRE
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mist
-	.byte 0x2e ; effect
-	.byte 0 ; power
+@ Mist
+	.byte 0x2e @ effect
+	.byte 0 @ power
 	.byte TYPE_ICE
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Water Gun
-	.byte 0x00 ; effect
-	.byte 40 ; power
+@ Water Gun
+	.byte 0x00 @ effect
+	.byte 40 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hydro Pump
-	.byte 0x00 ; effect
-	.byte 120 ; power
+@ Hydro Pump
+	.byte 0x00 @ effect
+	.byte 120 @ power
 	.byte TYPE_WATER
-	.byte 80 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Surf
-	.byte 0x00 ; effect
-	.byte 95 ; power
+@ Surf
+	.byte 0x00 @ effect
+	.byte 95 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Ice Beam
-	.byte 0x05 ; effect
-	.byte 95 ; power
+@ Ice Beam
+	.byte 0x05 @ effect
+	.byte 95 @ power
 	.byte TYPE_ICE
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Blizzard
-	.byte 0x05 ; effect
-	.byte 120 ; power
+@ Blizzard
+	.byte 0x05 @ effect
+	.byte 120 @ power
 	.byte TYPE_ICE
-	.byte 70 ; accuracy
-	.byte 5 ; PP
-	.byte 10 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 5 @ PP
+	.byte 10 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Psybeam
-	.byte 0x4c ; effect
-	.byte 65 ; power
+@ Psybeam
+	.byte 0x4c @ effect
+	.byte 65 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Bubble Beam
-	.byte 0x46 ; effect
-	.byte 65 ; power
+@ Bubble Beam
+	.byte 0x46 @ effect
+	.byte 65 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Aurora Beam
-	.byte 0x44 ; effect
-	.byte 65 ; power
+@ Aurora Beam
+	.byte 0x44 @ effect
+	.byte 65 @ power
 	.byte TYPE_ICE
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hyper Beam
-	.byte 0x50 ; effect
-	.byte 150 ; power
+@ Hyper Beam
+	.byte 0x50 @ effect
+	.byte 150 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Peck
-	.byte 0x00 ; effect
-	.byte 35 ; power
+@ Peck
+	.byte 0x00 @ effect
+	.byte 35 @ power
 	.byte TYPE_FLYING
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Drill Peck
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Drill Peck
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_FLYING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Submission
-	.byte 0x30 ; effect
-	.byte 80 ; power
+@ Submission
+	.byte 0x30 @ effect
+	.byte 80 @ power
 	.byte TYPE_FIGHTING
-	.byte 80 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Low Kick
-	.byte 0xc4 ; effect
-	.byte 1 ; power
+@ Low Kick
+	.byte 0xc4 @ effect
+	.byte 1 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Counter
-	.byte 0x59 ; effect
-	.byte 1 ; power
+@ Counter
+	.byte 0x59 @ effect
+	.byte 1 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte -5 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT ; misc. flags
+	.byte -5 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags
 
-; Seismic Toss
-	.byte 0x57 ; effect
-	.byte 1 ; power
+@ Seismic Toss
+	.byte 0x57 @ effect
+	.byte 1 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Strength
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Strength
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Absorb
-	.byte 0x03 ; effect
-	.byte 20 ; power
+@ Absorb
+	.byte 0x03 @ effect
+	.byte 20 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mega Drain
-	.byte 0x03 ; effect
-	.byte 40 ; power
+@ Mega Drain
+	.byte 0x03 @ effect
+	.byte 40 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Leech Seed
-	.byte 0x54 ; effect
-	.byte 0 ; power
+@ Leech Seed
+	.byte 0x54 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Growth
-	.byte 0x0d ; effect
-	.byte 0 ; power
+@ Growth
+	.byte 0x0d @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Razor Leaf
-	.byte 0x2b ; effect
-	.byte 55 ; power
+@ Razor Leaf
+	.byte 0x2b @ effect
+	.byte 55 @ power
 	.byte TYPE_GRASS
-	.byte 95 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Solar Beam
-	.byte 0x97 ; effect
-	.byte 120 ; power
+@ Solar Beam
+	.byte 0x97 @ effect
+	.byte 120 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Poison Powder
-	.byte 0x42 ; effect
-	.byte 0 ; power
+@ Poison Powder
+	.byte 0x42 @ effect
+	.byte 0 @ power
 	.byte TYPE_POISON
-	.byte 75 ; accuracy
-	.byte 35 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 35 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Stun Spore
-	.byte 0x43 ; effect
-	.byte 0 ; power
+@ Stun Spore
+	.byte 0x43 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 75 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sleep Powder
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Sleep Powder
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 75 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Petal Dance
-	.byte 0x1b ; effect
-	.byte 70 ; power
+@ Petal Dance
+	.byte 0x1b @ effect
+	.byte 70 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte F_TARGET_RANDOM
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; String Shot
-	.byte 0x14 ; effect
-	.byte 0 ; power
+@ String Shot
+	.byte 0x14 @ effect
+	.byte 0 @ power
 	.byte TYPE_BUG
-	.byte 95 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dragon Rage
-	.byte 0x29 ; effect
-	.byte 1 ; power
+@ Dragon Rage
+	.byte 0x29 @ effect
+	.byte 1 @ power
 	.byte TYPE_DRAGON
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fire Spin
-	.byte 0x2a ; effect
-	.byte 15 ; power
+@ Fire Spin
+	.byte 0x2a @ effect
+	.byte 15 @ power
 	.byte TYPE_FIRE
-	.byte 70 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Thunder Shock
-	.byte 0x06 ; effect
-	.byte 40 ; power
+@ Thunder Shock
+	.byte 0x06 @ effect
+	.byte 40 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Thunderbolt
-	.byte 0x06 ; effect
-	.byte 95 ; power
+@ Thunderbolt
+	.byte 0x06 @ effect
+	.byte 95 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Thunder Wave
-	.byte 0x43 ; effect
-	.byte 0 ; power
+@ Thunder Wave
+	.byte 0x43 @ effect
+	.byte 0 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Thunder
-	.byte 0x98 ; effect
-	.byte 120 ; power
+@ Thunder
+	.byte 0x98 @ effect
+	.byte 120 @ power
 	.byte TYPE_ELECTRIC
-	.byte 70 ; accuracy
-	.byte 10 ; PP
-	.byte 30 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 10 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Rock Throw
-	.byte 0x00 ; effect
-	.byte 50 ; power
+@ Rock Throw
+	.byte 0x00 @ effect
+	.byte 50 @ power
 	.byte TYPE_ROCK
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Earthquake
-	.byte 0x93 ; effect
-	.byte 100 ; power
+@ Earthquake
+	.byte 0x93 @ effect
+	.byte 100 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ALL_EXCEPT_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fissure
-	.byte 0x26 ; effect
-	.byte 1 ; power
+@ Fissure
+	.byte 0x26 @ effect
+	.byte 1 @ power
 	.byte TYPE_GROUND
-	.byte 30 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 30 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dig
-	.byte 0x9b ; effect
-	.byte 60 ; power
+@ Dig
+	.byte 0x9b @ effect
+	.byte 60 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Toxic
-	.byte 0x21 ; effect
-	.byte 0 ; power
+@ Toxic
+	.byte 0x21 @ effect
+	.byte 0 @ power
 	.byte TYPE_POISON
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Confusion
-	.byte 0x4c ; effect
-	.byte 50 ; power
+@ Confusion
+	.byte 0x4c @ effect
+	.byte 50 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Psychic
-	.byte 0x48 ; effect
-	.byte 90 ; power
+@ Psychic
+	.byte 0x48 @ effect
+	.byte 90 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hypnosis
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Hypnosis
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 60 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 60 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Meditate
-	.byte 0x0a ; effect
-	.byte 0 ; power
+@ Meditate
+	.byte 0x0a @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Agility
-	.byte 0x34 ; effect
-	.byte 0 ; power
+@ Agility
+	.byte 0x34 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Quick Attack
-	.byte 0x67 ; effect
-	.byte 40 ; power
+@ Quick Attack
+	.byte 0x67 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 1 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 1 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Rage
-	.byte 0x51 ; effect
-	.byte 20 ; power
+@ Rage
+	.byte 0x51 @ effect
+	.byte 20 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Teleport
-	.byte 0x99 ; effect
-	.byte 0 ; power
+@ Teleport
+	.byte 0x99 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Night Shade
-	.byte 0x57 ; effect
-	.byte 1 ; power
+@ Night Shade
+	.byte 0x57 @ effect
+	.byte 1 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mimic
-	.byte 0x52 ; effect
-	.byte 0 ; power
+@ Mimic
+	.byte 0x52 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Screech
-	.byte 0x3b ; effect
-	.byte 0 ; power
+@ Screech
+	.byte 0x3b @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Double Team
-	.byte 0x10 ; effect
-	.byte 0 ; power
+@ Double Team
+	.byte 0x10 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Recover
-	.byte 0x20 ; effect
-	.byte 0 ; power
+@ Recover
+	.byte 0x20 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Harden
-	.byte 0x0b ; effect
-	.byte 0 ; power
+@ Harden
+	.byte 0x0b @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Minimize
-	.byte 0x6c ; effect
-	.byte 0 ; power
+@ Minimize
+	.byte 0x6c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Smokescreen
-	.byte 0x17 ; effect
-	.byte 0 ; power
+@ Smokescreen
+	.byte 0x17 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Confuse Ray
-	.byte 0x31 ; effect
-	.byte 0 ; power
+@ Confuse Ray
+	.byte 0x31 @ effect
+	.byte 0 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Withdraw
-	.byte 0x0b ; effect
-	.byte 0 ; power
+@ Withdraw
+	.byte 0x0b @ effect
+	.byte 0 @ power
 	.byte TYPE_WATER
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Defense Curl
-	.byte 0x9c ; effect
-	.byte 0 ; power
+@ Defense Curl
+	.byte 0x9c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Barrier
-	.byte 0x33 ; effect
-	.byte 0 ; power
+@ Barrier
+	.byte 0x33 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Light Screen
-	.byte 0x23 ; effect
-	.byte 0 ; power
+@ Light Screen
+	.byte 0x23 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Haze
-	.byte 0x19 ; effect
-	.byte 0 ; power
+@ Haze
+	.byte 0x19 @ effect
+	.byte 0 @ power
 	.byte TYPE_ICE
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Reflect
-	.byte 0x41 ; effect
-	.byte 0 ; power
+@ Reflect
+	.byte 0x41 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Focus Energy
-	.byte 0x2f ; effect
-	.byte 0 ; power
+@ Focus Energy
+	.byte 0x2f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Bide
-	.byte 0x1a ; effect
-	.byte 1 ; power
+@ Bide
+	.byte 0x1a @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Metronome
-	.byte 0x53 ; effect
-	.byte 0 ; power
+@ Metronome
+	.byte 0x53 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Mirror Move
-	.byte 0x09 ; effect
-	.byte 0 ; power
+@ Mirror Move
+	.byte 0x09 @ effect
+	.byte 0 @ power
 	.byte TYPE_FLYING
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Self-Destruct
-	.byte 0x07 ; effect
-	.byte 200 ; power
+@ Self-Destruct
+	.byte 0x07 @ effect
+	.byte 200 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ALL_EXCEPT_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Egg Bomb
-	.byte 0x00 ; effect
-	.byte 100 ; power
+@ Egg Bomb
+	.byte 0x00 @ effect
+	.byte 100 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Lick
-	.byte 0x06 ; effect
-	.byte 20 ; power
+@ Lick
+	.byte 0x06 @ effect
+	.byte 20 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Smog
-	.byte 0x02 ; effect
-	.byte 20 ; power
+@ Smog
+	.byte 0x02 @ effect
+	.byte 20 @ power
 	.byte TYPE_POISON
-	.byte 70 ; accuracy
-	.byte 20 ; PP
-	.byte 40 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 20 @ PP
+	.byte 40 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sludge
-	.byte 0x02 ; effect
-	.byte 65 ; power
+@ Sludge
+	.byte 0x02 @ effect
+	.byte 65 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Bone Club
-	.byte 0x1f ; effect
-	.byte 65 ; power
+@ Bone Club
+	.byte 0x1f @ effect
+	.byte 65 @ power
 	.byte TYPE_GROUND
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 10 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fire Blast
-	.byte 0x04 ; effect
-	.byte 120 ; power
+@ Fire Blast
+	.byte 0x04 @ effect
+	.byte 120 @ power
 	.byte TYPE_FIRE
-	.byte 85 ; accuracy
-	.byte 5 ; PP
-	.byte 10 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 5 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Waterfall
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Waterfall
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Clamp
-	.byte 0x2a ; effect
-	.byte 35 ; power
+@ Clamp
+	.byte 0x2a @ effect
+	.byte 35 @ power
 	.byte TYPE_WATER
-	.byte 75 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Swift
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Swift
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Skull Bash
-	.byte 0x91 ; effect
-	.byte 100 ; power
+@ Skull Bash
+	.byte 0x91 @ effect
+	.byte 100 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Spike Cannon
-	.byte 0x1d ; effect
-	.byte 20 ; power
+@ Spike Cannon
+	.byte 0x1d @ effect
+	.byte 20 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Constrict
-	.byte 0x46 ; effect
-	.byte 10 ; power
+@ Constrict
+	.byte 0x46 @ effect
+	.byte 10 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 35 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 35 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Amnesia
-	.byte 0x36 ; effect
-	.byte 0 ; power
+@ Amnesia
+	.byte 0x36 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Kinesis
-	.byte 0x17 ; effect
-	.byte 0 ; power
+@ Kinesis
+	.byte 0x17 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 80 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Soft-Boiled
-	.byte 0x9d ; effect
-	.byte 0 ; power
+@ Soft-Boiled
+	.byte 0x9d @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Hi Jump Kick
-	.byte 0x2d ; effect
-	.byte 85 ; power
+@ Hi Jump Kick
+	.byte 0x2d @ effect
+	.byte 85 @ power
 	.byte TYPE_FIGHTING
-	.byte 90 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Glare
-	.byte 0x43 ; effect
-	.byte 0 ; power
+@ Glare
+	.byte 0x43 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dream Eater
-	.byte 0x08 ; effect
-	.byte 100 ; power
+@ Dream Eater
+	.byte 0x08 @ effect
+	.byte 100 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Poison Gas
-	.byte 0x42 ; effect
-	.byte 0 ; power
+@ Poison Gas
+	.byte 0x42 @ effect
+	.byte 0 @ power
 	.byte TYPE_POISON
-	.byte 55 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 55 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Barrage
-	.byte 0x1d ; effect
-	.byte 15 ; power
+@ Barrage
+	.byte 0x1d @ effect
+	.byte 15 @ power
 	.byte TYPE_NORMAL
-	.byte 85 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Leech Life
-	.byte 0x03 ; effect
-	.byte 20 ; power
+@ Leech Life
+	.byte 0x03 @ effect
+	.byte 20 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Lovely Kiss
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Lovely Kiss
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sky Attack
-	.byte 0x4b ; effect
-	.byte 140 ; power
+@ Sky Attack
+	.byte 0x4b @ effect
+	.byte 140 @ power
 	.byte TYPE_FLYING
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 30 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Transform
-	.byte 0x39 ; effect
-	.byte 0 ; power
+@ Transform
+	.byte 0x39 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Bubble
-	.byte 0x46 ; effect
-	.byte 20 ; power
+@ Bubble
+	.byte 0x46 @ effect
+	.byte 20 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 10 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dizzy Punch
-	.byte 0x4c ; effect
-	.byte 70 ; power
+@ Dizzy Punch
+	.byte 0x4c @ effect
+	.byte 70 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Spore
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Spore
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Flash
-	.byte 0x17 ; effect
-	.byte 0 ; power
+@ Flash
+	.byte 0x17 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 70 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Psywave
-	.byte 0x58 ; effect
-	.byte 1 ; power
+@ Psywave
+	.byte 0x58 @ effect
+	.byte 1 @ power
 	.byte TYPE_PSYCHIC
-	.byte 80 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Splash
-	.byte 0x55 ; effect
-	.byte 0 ; power
+@ Splash
+	.byte 0x55 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Acid Armor
-	.byte 0x33 ; effect
-	.byte 0 ; power
+@ Acid Armor
+	.byte 0x33 @ effect
+	.byte 0 @ power
 	.byte TYPE_POISON
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Crabhammer
-	.byte 0x2b ; effect
-	.byte 90 ; power
+@ Crabhammer
+	.byte 0x2b @ effect
+	.byte 90 @ power
 	.byte TYPE_WATER
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Explosion
-	.byte 0x07 ; effect
-	.byte 250 ; power
+@ Explosion
+	.byte 0x07 @ effect
+	.byte 250 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ALL_EXCEPT_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fury Swipes
-	.byte 0x1d ; effect
-	.byte 18 ; power
+@ Fury Swipes
+	.byte 0x1d @ effect
+	.byte 18 @ power
 	.byte TYPE_NORMAL
-	.byte 80 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Bonemerang
-	.byte 0x2c ; effect
-	.byte 50 ; power
+@ Bonemerang
+	.byte 0x2c @ effect
+	.byte 50 @ power
 	.byte TYPE_GROUND
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Rest
-	.byte 0x25 ; effect
-	.byte 0 ; power
+@ Rest
+	.byte 0x25 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Rock Slide
-	.byte 0x1f ; effect
-	.byte 75 ; power
+@ Rock Slide
+	.byte 0x1f @ effect
+	.byte 75 @ power
 	.byte TYPE_ROCK
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 30 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 30 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hyper Fang
-	.byte 0x1f ; effect
-	.byte 80 ; power
+@ Hyper Fang
+	.byte 0x1f @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sharpen
-	.byte 0x0a ; effect
-	.byte 0 ; power
+@ Sharpen
+	.byte 0x0a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Conversion
-	.byte 0x1e ; effect
-	.byte 0 ; power
+@ Conversion
+	.byte 0x1e @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Tri Attack
-	.byte 0x24 ; effect
-	.byte 80 ; power
+@ Tri Attack
+	.byte 0x24 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Super Fang
-	.byte 0x28 ; effect
-	.byte 1 ; power
+@ Super Fang
+	.byte 0x28 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Slash
-	.byte 0x2b ; effect
-	.byte 70 ; power
+@ Slash
+	.byte 0x2b @ effect
+	.byte 70 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Substitute
-	.byte 0x4f ; effect
-	.byte 0 ; power
+@ Substitute
+	.byte 0x4f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Struggle
-	.byte 0x30 ; effect
-	.byte 50 ; power
+@ Struggle
+	.byte 0x30 @ effect
+	.byte 50 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 1 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 1 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sketch
-	.byte 0x5f ; effect
-	.byte 0 ; power
+@ Sketch
+	.byte 0x5f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 1 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 1 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Triple Kick
-	.byte 0x68 ; effect
-	.byte 10 ; power
+@ Triple Kick
+	.byte 0x68 @ effect
+	.byte 10 @ power
 	.byte TYPE_FIGHTING
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Thief
-	.byte 0x69 ; effect
-	.byte 40 ; power
+@ Thief
+	.byte 0x69 @ effect
+	.byte 40 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Spider Web
-	.byte 0x6a ; effect
-	.byte 0 ; power
+@ Spider Web
+	.byte 0x6a @ effect
+	.byte 0 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mind Reader
-	.byte 0x5e ; effect
-	.byte 0 ; power
+@ Mind Reader
+	.byte 0x5e @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Nightmare
-	.byte 0x6b ; effect
-	.byte 0 ; power
+@ Nightmare
+	.byte 0x6b @ effect
+	.byte 0 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Flame Wheel
-	.byte 0x7d ; effect
-	.byte 60 ; power
+@ Flame Wheel
+	.byte 0x7d @ effect
+	.byte 60 @ power
 	.byte TYPE_FIRE
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Snore
-	.byte 0x5c ; effect
-	.byte 40 ; power
+@ Snore
+	.byte 0x5c @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Curse
-	.byte 0x6d ; effect
-	.byte 0 ; power
+@ Curse
+	.byte 0x6d @ effect
+	.byte 0 @ power
 	.byte TYPE_UNKNOWN
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Flail
-	.byte 0x63 ; effect
-	.byte 1 ; power
+@ Flail
+	.byte 0x63 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Conversion 2
-	.byte 0x5d ; effect
-	.byte 0 ; power
+@ Conversion 2
+	.byte 0x5d @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Aeroblast
-	.byte 0x2b ; effect
-	.byte 100 ; power
+@ Aeroblast
+	.byte 0x2b @ effect
+	.byte 100 @ power
 	.byte TYPE_FLYING
-	.byte 95 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Cotton Spore
-	.byte 0x3c ; effect
-	.byte 0 ; power
+@ Cotton Spore
+	.byte 0x3c @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 85 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Reversal
-	.byte 0x63 ; effect
-	.byte 1 ; power
+@ Reversal
+	.byte 0x63 @ effect
+	.byte 1 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Spite
-	.byte 0x64 ; effect
-	.byte 0 ; power
+@ Spite
+	.byte 0x64 @ effect
+	.byte 0 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Powder Snow
-	.byte 0x05 ; effect
-	.byte 40 ; power
+@ Powder Snow
+	.byte 0x05 @ effect
+	.byte 40 @ power
 	.byte TYPE_ICE
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Protect
-	.byte 0x6f ; effect
-	.byte 0 ; power
+@ Protect
+	.byte 0x6f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 3 ; priority
-	.4byte 0 ; misc. flags
+	.byte 3 @ priority
+	.4byte 0 @ misc. flags
 
-; Mach Punch
-	.byte 0x67 ; effect
-	.byte 40 ; power
+@ Mach Punch
+	.byte 0x67 @ effect
+	.byte 40 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 1 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 1 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Scary Face
-	.byte 0x3c ; effect
-	.byte 0 ; power
+@ Scary Face
+	.byte 0x3c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Faint Attack
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Faint Attack
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_DARK
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sweet Kiss
-	.byte 0x31 ; effect
-	.byte 0 ; power
+@ Sweet Kiss
+	.byte 0x31 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 75 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Belly Drum
-	.byte 0x8e ; effect
-	.byte 0 ; power
+@ Belly Drum
+	.byte 0x8e @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Sludge Bomb
-	.byte 0x02 ; effect
-	.byte 90 ; power
+@ Sludge Bomb
+	.byte 0x02 @ effect
+	.byte 90 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mud-Slap
-	.byte 0x49 ; effect
-	.byte 20 ; power
+@ Mud-Slap
+	.byte 0x49 @ effect
+	.byte 20 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Octazooka
-	.byte 0x49 ; effect
-	.byte 65 ; power
+@ Octazooka
+	.byte 0x49 @ effect
+	.byte 65 @ power
 	.byte TYPE_WATER
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 50 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Spikes
-	.byte 0x70 ; effect
-	.byte 0 ; power
+@ Spikes
+	.byte 0x70 @ effect
+	.byte 0 @ power
 	.byte TYPE_GROUND
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ENEMY_SIDE
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Zap Cannon
-	.byte 0x06 ; effect
-	.byte 100 ; power
+@ Zap Cannon
+	.byte 0x06 @ effect
+	.byte 100 @ power
 	.byte TYPE_ELECTRIC
-	.byte 50 ; accuracy
-	.byte 5 ; PP
-	.byte 100 ; side effect chance
+	.byte 50 @ accuracy
+	.byte 5 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Foresight
-	.byte 0x71 ; effect
-	.byte 0 ; power
+@ Foresight
+	.byte 0x71 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Destiny Bond
-	.byte 0x62 ; effect
-	.byte 0 ; power
+@ Destiny Bond
+	.byte 0x62 @ effect
+	.byte 0 @ power
 	.byte TYPE_GHOST
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Perish Song
-	.byte 0x72 ; effect
-	.byte 0 ; power
+@ Perish Song
+	.byte 0x72 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Icy Wind
-	.byte 0x46 ; effect
-	.byte 55 ; power
+@ Icy Wind
+	.byte 0x46 @ effect
+	.byte 55 @ power
 	.byte TYPE_ICE
-	.byte 95 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Detect
-	.byte 0x6f ; effect
-	.byte 0 ; power
+@ Detect
+	.byte 0x6f @ effect
+	.byte 0 @ power
 	.byte TYPE_FIGHTING
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 3 ; priority
-	.4byte 0 ; misc. flags
+	.byte 3 @ priority
+	.4byte 0 @ misc. flags
 
-; Bone Rush
-	.byte 0x1d ; effect
-	.byte 25 ; power
+@ Bone Rush
+	.byte 0x1d @ effect
+	.byte 25 @ power
 	.byte TYPE_GROUND
-	.byte 80 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Lock-On
-	.byte 0x5e ; effect
-	.byte 0 ; power
+@ Lock-On
+	.byte 0x5e @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Outrage
-	.byte 0x1b ; effect
-	.byte 90 ; power
+@ Outrage
+	.byte 0x1b @ effect
+	.byte 90 @ power
 	.byte TYPE_DRAGON
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte F_TARGET_RANDOM
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sandstorm
-	.byte 0x73 ; effect
-	.byte 0 ; power
+@ Sandstorm
+	.byte 0x73 @ effect
+	.byte 0 @ power
 	.byte TYPE_ROCK
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Giga Drain
-	.byte 0x03 ; effect
-	.byte 60 ; power
+@ Giga Drain
+	.byte 0x03 @ effect
+	.byte 60 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Endure
-	.byte 0x74 ; effect
-	.byte 0 ; power
+@ Endure
+	.byte 0x74 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 3 ; priority
-	.4byte 0 ; misc. flags
+	.byte 3 @ priority
+	.4byte 0 @ misc. flags
 
-; Charm
-	.byte 0x3a ; effect
-	.byte 0 ; power
+@ Charm
+	.byte 0x3a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Rollout
-	.byte 0x75 ; effect
-	.byte 30 ; power
+@ Rollout
+	.byte 0x75 @ effect
+	.byte 30 @ power
 	.byte TYPE_ROCK
-	.byte 90 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; False Swipe
-	.byte 0x65 ; effect
-	.byte 40 ; power
+@ False Swipe
+	.byte 0x65 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Swagger
-	.byte 0x76 ; effect
-	.byte 0 ; power
+@ Swagger
+	.byte 0x76 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Milk Drink
-	.byte 0x9d ; effect
-	.byte 0 ; power
+@ Milk Drink
+	.byte 0x9d @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Spark
-	.byte 0x06 ; effect
-	.byte 65 ; power
+@ Spark
+	.byte 0x06 @ effect
+	.byte 65 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Fury Cutter
-	.byte 0x77 ; effect
-	.byte 10 ; power
+@ Fury Cutter
+	.byte 0x77 @ effect
+	.byte 10 @ power
 	.byte TYPE_BUG
-	.byte 95 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Steel Wing
-	.byte 0x8a ; effect
-	.byte 70 ; power
+@ Steel Wing
+	.byte 0x8a @ effect
+	.byte 70 @ power
 	.byte TYPE_STEEL
-	.byte 90 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mean Look
-	.byte 0x6a ; effect
-	.byte 0 ; power
+@ Mean Look
+	.byte 0x6a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Attract
-	.byte 0x78 ; effect
-	.byte 0 ; power
+@ Attract
+	.byte 0x78 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sleep Talk
-	.byte 0x61 ; effect
-	.byte 0 ; power
+@ Sleep Talk
+	.byte 0x61 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Heal Bell
-	.byte 0x66 ; effect
-	.byte 0 ; power
+@ Heal Bell
+	.byte 0x66 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Return
-	.byte 0x79 ; effect
-	.byte 1 ; power
+@ Return
+	.byte 0x79 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Present
-	.byte 0x7a ; effect
-	.byte 1 ; power
+@ Present
+	.byte 0x7a @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Frustration
-	.byte 0x7b ; effect
-	.byte 1 ; power
+@ Frustration
+	.byte 0x7b @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Safeguard
-	.byte 0x7c ; effect
-	.byte 0 ; power
+@ Safeguard
+	.byte 0x7c @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Pain Split
-	.byte 0x5b ; effect
-	.byte 0 ; power
+@ Pain Split
+	.byte 0x5b @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sacred Fire
-	.byte 0x7d ; effect
-	.byte 100 ; power
+@ Sacred Fire
+	.byte 0x7d @ effect
+	.byte 100 @ power
 	.byte TYPE_FIRE
-	.byte 95 ; accuracy
-	.byte 5 ; PP
-	.byte 50 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 5 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Magnitude
-	.byte 0x7e ; effect
-	.byte 1 ; power
+@ Magnitude
+	.byte 0x7e @ effect
+	.byte 1 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ALL_EXCEPT_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dynamic Punch
-	.byte 0x4c ; effect
-	.byte 100 ; power
+@ Dynamic Punch
+	.byte 0x4c @ effect
+	.byte 100 @ power
 	.byte TYPE_FIGHTING
-	.byte 50 ; accuracy
-	.byte 5 ; PP
-	.byte 100 ; side effect chance
+	.byte 50 @ accuracy
+	.byte 5 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Megahorn
-	.byte 0x00 ; effect
-	.byte 120 ; power
+@ Megahorn
+	.byte 0x00 @ effect
+	.byte 120 @ power
 	.byte TYPE_BUG
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Dragon Breath
-	.byte 0x06 ; effect
-	.byte 60 ; power
+@ Dragon Breath
+	.byte 0x06 @ effect
+	.byte 60 @ power
 	.byte TYPE_DRAGON
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Baton Pass
-	.byte 0x7f ; effect
-	.byte 0 ; power
+@ Baton Pass
+	.byte 0x7f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Encore
-	.byte 0x5a ; effect
-	.byte 0 ; power
+@ Encore
+	.byte 0x5a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Pursuit
-	.byte 0x80 ; effect
-	.byte 40 ; power
+@ Pursuit
+	.byte 0x80 @ effect
+	.byte 40 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Rapid Spin
-	.byte 0x81 ; effect
-	.byte 20 ; power
+@ Rapid Spin
+	.byte 0x81 @ effect
+	.byte 20 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sweet Scent
-	.byte 0x18 ; effect
-	.byte 0 ; power
+@ Sweet Scent
+	.byte 0x18 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Iron Tail
-	.byte 0x45 ; effect
-	.byte 100 ; power
+@ Iron Tail
+	.byte 0x45 @ effect
+	.byte 100 @ power
 	.byte TYPE_STEEL
-	.byte 75 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Metal Claw
-	.byte 0x8b ; effect
-	.byte 50 ; power
+@ Metal Claw
+	.byte 0x8b @ effect
+	.byte 50 @ power
 	.byte TYPE_STEEL
-	.byte 95 ; accuracy
-	.byte 35 ; PP
-	.byte 10 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 35 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Vital Throw
-	.byte 0x4e ; effect
-	.byte 70 ; power
+@ Vital Throw
+	.byte 0x4e @ effect
+	.byte 70 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte -1 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte -1 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Morning Sun
-	.byte 0x84 ; effect
-	.byte 0 ; power
+@ Morning Sun
+	.byte 0x84 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Synthesis
-	.byte 0x85 ; effect
-	.byte 0 ; power
+@ Synthesis
+	.byte 0x85 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Moonlight
-	.byte 0x86 ; effect
-	.byte 0 ; power
+@ Moonlight
+	.byte 0x86 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Hidden Power
-	.byte 0x87 ; effect
-	.byte 1 ; power
+@ Hidden Power
+	.byte 0x87 @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Cross Chop
-	.byte 0x2b ; effect
-	.byte 100 ; power
+@ Cross Chop
+	.byte 0x2b @ effect
+	.byte 100 @ power
 	.byte TYPE_FIGHTING
-	.byte 80 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Twister
-	.byte 0x92 ; effect
-	.byte 40 ; power
+@ Twister
+	.byte 0x92 @ effect
+	.byte 40 @ power
 	.byte TYPE_DRAGON
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 20 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Rain Dance
-	.byte 0x88 ; effect
-	.byte 0 ; power
+@ Rain Dance
+	.byte 0x88 @ effect
+	.byte 0 @ power
 	.byte TYPE_WATER
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Sunny Day
-	.byte 0x89 ; effect
-	.byte 0 ; power
+@ Sunny Day
+	.byte 0x89 @ effect
+	.byte 0 @ power
 	.byte TYPE_FIRE
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Crunch
-	.byte 0x48 ; effect
-	.byte 80 ; power
+@ Crunch
+	.byte 0x48 @ effect
+	.byte 80 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mirror Coat
-	.byte 0x90 ; effect
-	.byte 1 ; power
+@ Mirror Coat
+	.byte 0x90 @ effect
+	.byte 1 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte -5 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE ; misc. flags
+	.byte -5 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
 
-; Psych Up
-	.byte 0x8f ; effect
-	.byte 0 ; power
+@ Psych Up
+	.byte 0x8f @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Extreme Speed
-	.byte 0x67 ; effect
-	.byte 80 ; power
+@ Extreme Speed
+	.byte 0x67 @ effect
+	.byte 80 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 1 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 1 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Ancient Power
-	.byte 0x8c ; effect
-	.byte 60 ; power
+@ Ancient Power
+	.byte 0x8c @ effect
+	.byte 60 @ power
 	.byte TYPE_ROCK
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Shadow Ball
-	.byte 0x48 ; effect
-	.byte 80 ; power
+@ Shadow Ball
+	.byte 0x48 @ effect
+	.byte 80 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Future Sight
-	.byte 0x94 ; effect
-	.byte 80 ; power
+@ Future Sight
+	.byte 0x94 @ effect
+	.byte 80 @ power
 	.byte TYPE_PSYCHIC
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Rock Smash
-	.byte 0x45 ; effect
-	.byte 20 ; power
+@ Rock Smash
+	.byte 0x45 @ effect
+	.byte 20 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 50 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Whirlpool
-	.byte 0x2a ; effect
-	.byte 15 ; power
+@ Whirlpool
+	.byte 0x2a @ effect
+	.byte 15 @ power
 	.byte TYPE_WATER
-	.byte 70 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Beat Up
-	.byte 0x9a ; effect
-	.byte 10 ; power
+@ Beat Up
+	.byte 0x9a @ effect
+	.byte 10 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Fake Out
-	.byte 0x9e ; effect
-	.byte 40 ; power
+@ Fake Out
+	.byte 0x9e @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 1 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 1 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Uproar
-	.byte 0x9f ; effect
-	.byte 50 ; power
+@ Uproar
+	.byte 0x9f @ effect
+	.byte 50 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte F_TARGET_RANDOM
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Stockpile
-	.byte 0xa0 ; effect
-	.byte 0 ; power
+@ Stockpile
+	.byte 0xa0 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Spit Up
-	.byte 0xa1 ; effect
-	.byte 100 ; power
+@ Spit Up
+	.byte 0xa1 @ effect
+	.byte 100 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Swallow
-	.byte 0xa2 ; effect
-	.byte 0 ; power
+@ Swallow
+	.byte 0xa2 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Heat Wave
-	.byte 0x04 ; effect
-	.byte 100 ; power
+@ Heat Wave
+	.byte 0x04 @ effect
+	.byte 100 @ power
 	.byte TYPE_FIRE
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 10 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 10 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hail
-	.byte 0xa4 ; effect
-	.byte 0 ; power
+@ Hail
+	.byte 0xa4 @ effect
+	.byte 0 @ power
 	.byte TYPE_ICE
-	.byte 0 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Torment
-	.byte 0xa5 ; effect
-	.byte 0 ; power
+@ Torment
+	.byte 0xa5 @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Flatter
-	.byte 0xa6 ; effect
-	.byte 0 ; power
+@ Flatter
+	.byte 0xa6 @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Will-O-Wisp
-	.byte 0xa7 ; effect
-	.byte 0 ; power
+@ Will-O-Wisp
+	.byte 0xa7 @ effect
+	.byte 0 @ power
 	.byte TYPE_FIRE
-	.byte 75 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 75 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Memento
-	.byte 0xa8 ; effect
-	.byte 0 ; power
+@ Memento
+	.byte 0xa8 @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Facade
-	.byte 0xa9 ; effect
-	.byte 70 ; power
+@ Facade
+	.byte 0xa9 @ effect
+	.byte 70 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Focus Punch
-	.byte 0xaa ; effect
-	.byte 150 ; power
+@ Focus Punch
+	.byte 0xaa @ effect
+	.byte 150 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte -3 ; priority
-	.4byte F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte -3 @ priority
+	.4byte F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Smelling Salt
-	.byte 0xab ; effect
-	.byte 60 ; power
+@ Smelling Salt
+	.byte 0xab @ effect
+	.byte 60 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Follow Me
-	.byte 0xac ; effect
-	.byte 0 ; power
+@ Follow Me
+	.byte 0xac @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 3 ; priority
-	.4byte 0 ; misc. flags
+	.byte 3 @ priority
+	.4byte 0 @ misc. flags
 
-; Nature Power
-	.byte 0xad ; effect
-	.byte 0 ; power
+@ Nature Power
+	.byte 0xad @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 95 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Charge
-	.byte 0xae ; effect
-	.byte 0 ; power
+@ Charge
+	.byte 0xae @ effect
+	.byte 0 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Taunt
-	.byte 0xaf ; effect
-	.byte 0 ; power
+@ Taunt
+	.byte 0xaf @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Helping Hand
-	.byte 0xb0 ; effect
-	.byte 0 ; power
+@ Helping Hand
+	.byte 0xb0 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 5 ; priority
-	.4byte 0 ; misc. flags
+	.byte 5 @ priority
+	.4byte 0 @ misc. flags
 
-; Trick
-	.byte 0xb1 ; effect
-	.byte 0 ; power
+@ Trick
+	.byte 0xb1 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Role Play
-	.byte 0xb2 ; effect
-	.byte 0 ; power
+@ Role Play
+	.byte 0xb2 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Wish
-	.byte 0xb3 ; effect
-	.byte 0 ; power
+@ Wish
+	.byte 0xb3 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Assist
-	.byte 0xb4 ; effect
-	.byte 0 ; power
+@ Assist
+	.byte 0xb4 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Ingrain
-	.byte 0xb5 ; effect
-	.byte 0 ; power
+@ Ingrain
+	.byte 0xb5 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Superpower
-	.byte 0xb6 ; effect
-	.byte 120 ; power
+@ Superpower
+	.byte 0xb6 @ effect
+	.byte 120 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Magic Coat
-	.byte 0xb7 ; effect
-	.byte 0 ; power
+@ Magic Coat
+	.byte 0xb7 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 4 ; priority
-	.4byte 0 ; misc. flags
+	.byte 4 @ priority
+	.4byte 0 @ misc. flags
 
-; Recycle
-	.byte 0xb8 ; effect
-	.byte 0 ; power
+@ Recycle
+	.byte 0xb8 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Revenge
-	.byte 0xb9 ; effect
-	.byte 60 ; power
+@ Revenge
+	.byte 0xb9 @ effect
+	.byte 60 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte -4 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte -4 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Brick Break
-	.byte 0xba ; effect
-	.byte 75 ; power
+@ Brick Break
+	.byte 0xba @ effect
+	.byte 75 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Yawn
-	.byte 0xbb ; effect
-	.byte 0 ; power
+@ Yawn
+	.byte 0xbb @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Knock Off
-	.byte 0xbc ; effect
-	.byte 20 ; power
+@ Knock Off
+	.byte 0xbc @ effect
+	.byte 20 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Endeavor
-	.byte 0xbd ; effect
-	.byte 1 ; power
+@ Endeavor
+	.byte 0xbd @ effect
+	.byte 1 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Eruption
-	.byte 0xbe ; effect
-	.byte 150 ; power
+@ Eruption
+	.byte 0xbe @ effect
+	.byte 150 @ power
 	.byte TYPE_FIRE
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Skill Swap
-	.byte 0xbf ; effect
-	.byte 0 ; power
+@ Skill Swap
+	.byte 0xbf @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Imprison
-	.byte 0xc0 ; effect
-	.byte 0 ; power
+@ Imprison
+	.byte 0xc0 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Refresh
-	.byte 0xc1 ; effect
-	.byte 0 ; power
+@ Refresh
+	.byte 0xc1 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Grudge
-	.byte 0xc2 ; effect
-	.byte 0 ; power
+@ Grudge
+	.byte 0xc2 @ effect
+	.byte 0 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Snatch
-	.byte 0xc3 ; effect
-	.byte 0 ; power
+@ Snatch
+	.byte 0xc3 @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_SPECIAL
-	.byte 4 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE ; misc. flags
+	.byte 4 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
 
-; Secret Power
-	.byte 0xc5 ; effect
-	.byte 70 ; power
+@ Secret Power
+	.byte 0xc5 @ effect
+	.byte 70 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Dive
-	.byte 0x9b ; effect
-	.byte 60 ; power
+@ Dive
+	.byte 0x9b @ effect
+	.byte 60 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Arm Thrust
-	.byte 0x1d ; effect
-	.byte 15 ; power
+@ Arm Thrust
+	.byte 0x1d @ effect
+	.byte 15 @ power
 	.byte TYPE_FIGHTING
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Camouflage
-	.byte 0xd5 ; effect
-	.byte 0 ; power
+@ Camouflage
+	.byte 0xd5 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Tail Glow
-	.byte 0x35 ; effect
-	.byte 0 ; power
+@ Tail Glow
+	.byte 0x35 @ effect
+	.byte 0 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Luster Purge
-	.byte 0x48 ; effect
-	.byte 70 ; power
+@ Luster Purge
+	.byte 0x48 @ effect
+	.byte 70 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 50 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Mist Ball
-	.byte 0x47 ; effect
-	.byte 70 ; power
+@ Mist Ball
+	.byte 0x47 @ effect
+	.byte 70 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 50 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Feather Dance
-	.byte 0x3a ; effect
-	.byte 0 ; power
+@ Feather Dance
+	.byte 0x3a @ effect
+	.byte 0 @ power
 	.byte TYPE_FLYING
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Teeter Dance
-	.byte 0xc7 ; effect
-	.byte 0 ; power
+@ Teeter Dance
+	.byte 0xc7 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_ALL_EXCEPT_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Blaze Kick
-	.byte 0xc8 ; effect
-	.byte 85 ; power
+@ Blaze Kick
+	.byte 0xc8 @ effect
+	.byte 85 @ power
 	.byte TYPE_FIRE
-	.byte 90 ; accuracy
-	.byte 10 ; PP
-	.byte 10 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 10 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mud Sport
-	.byte 0xc9 ; effect
-	.byte 0 ; power
+@ Mud Sport
+	.byte 0xc9 @ effect
+	.byte 0 @ power
 	.byte TYPE_GROUND
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Ice Ball
-	.byte 0x75 ; effect
-	.byte 30 ; power
+@ Ice Ball
+	.byte 0x75 @ effect
+	.byte 30 @ power
 	.byte TYPE_ICE
-	.byte 90 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Needle Arm
-	.byte 0x96 ; effect
-	.byte 60 ; power
+@ Needle Arm
+	.byte 0x96 @ effect
+	.byte 60 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Slack Off
-	.byte 0x20 ; effect
-	.byte 0 ; power
+@ Slack Off
+	.byte 0x20 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Hyper Voice
-	.byte 0x00 ; effect
-	.byte 90 ; power
+@ Hyper Voice
+	.byte 0x00 @ effect
+	.byte 90 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Poison Fang
-	.byte 0xca ; effect
-	.byte 50 ; power
+@ Poison Fang
+	.byte 0xca @ effect
+	.byte 50 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Crush Claw
-	.byte 0x45 ; effect
-	.byte 75 ; power
+@ Crush Claw
+	.byte 0x45 @ effect
+	.byte 75 @ power
 	.byte TYPE_NORMAL
-	.byte 95 ; accuracy
-	.byte 10 ; PP
-	.byte 50 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 10 @ PP
+	.byte 50 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Blast Burn
-	.byte 0x50 ; effect
-	.byte 150 ; power
+@ Blast Burn
+	.byte 0x50 @ effect
+	.byte 150 @ power
 	.byte TYPE_FIRE
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Hydro Cannon
-	.byte 0x50 ; effect
-	.byte 150 ; power
+@ Hydro Cannon
+	.byte 0x50 @ effect
+	.byte 150 @ power
 	.byte TYPE_WATER
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Meteor Mash
-	.byte 0x8b ; effect
-	.byte 100 ; power
+@ Meteor Mash
+	.byte 0x8b @ effect
+	.byte 100 @ power
 	.byte TYPE_STEEL
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 20 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Astonish
-	.byte 0x96 ; effect
-	.byte 30 ; power
+@ Astonish
+	.byte 0x96 @ effect
+	.byte 30 @ power
 	.byte TYPE_GHOST
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 30 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Weather Ball
-	.byte 0xcb ; effect
-	.byte 50 ; power
+@ Weather Ball
+	.byte 0xcb @ effect
+	.byte 50 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Aromatherapy
-	.byte 0x66 ; effect
-	.byte 0 ; power
+@ Aromatherapy
+	.byte 0x66 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 0 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Fake Tears
-	.byte 0x3e ; effect
-	.byte 0 ; power
+@ Fake Tears
+	.byte 0x3e @ effect
+	.byte 0 @ power
 	.byte TYPE_DARK
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Air Cutter
-	.byte 0x2b ; effect
-	.byte 55 ; power
+@ Air Cutter
+	.byte 0x2b @ effect
+	.byte 55 @ power
 	.byte TYPE_FLYING
-	.byte 95 ; accuracy
-	.byte 25 ; PP
-	.byte 0 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 25 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Overheat
-	.byte 0xcc ; effect
-	.byte 140 ; power
+@ Overheat
+	.byte 0xcc @ effect
+	.byte 140 @ power
 	.byte TYPE_FIRE
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 100 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Odor Sleuth
-	.byte 0x71 ; effect
-	.byte 0 ; power
+@ Odor Sleuth
+	.byte 0x71 @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Rock Tomb
-	.byte 0x46 ; effect
-	.byte 50 ; power
+@ Rock Tomb
+	.byte 0x46 @ effect
+	.byte 50 @ power
 	.byte TYPE_ROCK
-	.byte 80 ; accuracy
-	.byte 10 ; PP
-	.byte 100 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 10 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Silver Wind
-	.byte 0x8c ; effect
-	.byte 60 ; power
+@ Silver Wind
+	.byte 0x8c @ effect
+	.byte 60 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Metal Sound
-	.byte 0x3e ; effect
-	.byte 0 ; power
+@ Metal Sound
+	.byte 0x3e @ effect
+	.byte 0 @ power
 	.byte TYPE_STEEL
-	.byte 85 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Grass Whistle
-	.byte 0x01 ; effect
-	.byte 0 ; power
+@ Grass Whistle
+	.byte 0x01 @ effect
+	.byte 0 @ power
 	.byte TYPE_GRASS
-	.byte 55 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 55 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Tickle
-	.byte 0xcd ; effect
-	.byte 0 ; power
+@ Tickle
+	.byte 0xcd @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Cosmic Power
-	.byte 0xce ; effect
-	.byte 0 ; power
+@ Cosmic Power
+	.byte 0xce @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Water Spout
-	.byte 0xbe ; effect
-	.byte 150 ; power
+@ Water Spout
+	.byte 0xbe @ effect
+	.byte 150 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Signal Beam
-	.byte 0x4c ; effect
-	.byte 75 ; power
+@ Signal Beam
+	.byte 0x4c @ effect
+	.byte 75 @ power
 	.byte TYPE_BUG
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Shadow Punch
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Shadow Punch
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_GHOST
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Extrasensory
-	.byte 0x96 ; effect
-	.byte 80 ; power
+@ Extrasensory
+	.byte 0x96 @ effect
+	.byte 80 @ power
 	.byte TYPE_PSYCHIC
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sky Uppercut
-	.byte 0xcf ; effect
-	.byte 85 ; power
+@ Sky Uppercut
+	.byte 0xcf @ effect
+	.byte 85 @ power
 	.byte TYPE_FIGHTING
-	.byte 90 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Sand Tomb
-	.byte 0x2a ; effect
-	.byte 15 ; power
+@ Sand Tomb
+	.byte 0x2a @ effect
+	.byte 15 @ power
 	.byte TYPE_GROUND
-	.byte 70 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 70 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Sheer Cold
-	.byte 0x26 ; effect
-	.byte 1 ; power
+@ Sheer Cold
+	.byte 0x26 @ effect
+	.byte 1 @ power
 	.byte TYPE_ICE
-	.byte 30 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 30 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Muddy Water
-	.byte 0x49 ; effect
-	.byte 95 ; power
+@ Muddy Water
+	.byte 0x49 @ effect
+	.byte 95 @ power
 	.byte TYPE_WATER
-	.byte 85 ; accuracy
-	.byte 10 ; PP
-	.byte 30 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 10 @ PP
+	.byte 30 @ side effect chance
 	.byte F_TARGET_BOTH_ENEMIES
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Bullet Seed
-	.byte 0x1d ; effect
-	.byte 10 ; power
+@ Bullet Seed
+	.byte 0x1d @ effect
+	.byte 10 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Aerial Ace
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Aerial Ace
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_FLYING
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Icicle Spear
-	.byte 0x1d ; effect
-	.byte 10 ; power
+@ Icicle Spear
+	.byte 0x1d @ effect
+	.byte 10 @ power
 	.byte TYPE_ICE
-	.byte 100 ; accuracy
-	.byte 30 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 30 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Iron Defense
-	.byte 0x33 ; effect
-	.byte 0 ; power
+@ Iron Defense
+	.byte 0x33 @ effect
+	.byte 0 @ power
 	.byte TYPE_STEEL
-	.byte 0 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Block
-	.byte 0x6a ; effect
-	.byte 0 ; power
+@ Block
+	.byte 0x6a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Howl
-	.byte 0x0a ; effect
-	.byte 0 ; power
+@ Howl
+	.byte 0x0a @ effect
+	.byte 0 @ power
 	.byte TYPE_NORMAL
-	.byte 0 ; accuracy
-	.byte 40 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 40 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Dragon Claw
-	.byte 0x00 ; effect
-	.byte 80 ; power
+@ Dragon Claw
+	.byte 0x00 @ effect
+	.byte 80 @ power
 	.byte TYPE_DRAGON
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Frenzy Plant
-	.byte 0x50 ; effect
-	.byte 150 ; power
+@ Frenzy Plant
+	.byte 0x50 @ effect
+	.byte 150 @ power
 	.byte TYPE_GRASS
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Bulk Up
-	.byte 0xd0 ; effect
-	.byte 0 ; power
+@ Bulk Up
+	.byte 0xd0 @ effect
+	.byte 0 @ power
 	.byte TYPE_FIGHTING
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Bounce
-	.byte 0x9b ; effect
-	.byte 85 ; power
+@ Bounce
+	.byte 0x9b @ effect
+	.byte 85 @ power
 	.byte TYPE_FLYING
-	.byte 85 ; accuracy
-	.byte 5 ; PP
-	.byte 30 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 5 @ PP
+	.byte 30 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Mud Shot
-	.byte 0x46 ; effect
-	.byte 55 ; power
+@ Mud Shot
+	.byte 0x46 @ effect
+	.byte 55 @ power
 	.byte TYPE_GROUND
-	.byte 95 ; accuracy
-	.byte 15 ; PP
-	.byte 100 ; side effect chance
+	.byte 95 @ accuracy
+	.byte 15 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Poison Tail
-	.byte 0xd1 ; effect
-	.byte 50 ; power
+@ Poison Tail
+	.byte 0xd1 @ effect
+	.byte 50 @ power
 	.byte TYPE_POISON
-	.byte 100 ; accuracy
-	.byte 25 ; PP
-	.byte 10 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 25 @ PP
+	.byte 10 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Covet
-	.byte 0x69 ; effect
-	.byte 40 ; power
+@ Covet
+	.byte 0x69 @ effect
+	.byte 40 @ power
 	.byte TYPE_NORMAL
-	.byte 100 ; accuracy
-	.byte 40 ; PP
-	.byte 100 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 40 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Volt Tackle
-	.byte 0xc6 ; effect
-	.byte 120 ; power
+@ Volt Tackle
+	.byte 0xc6 @ effect
+	.byte 120 @ power
 	.byte TYPE_ELECTRIC
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Magical Leaf
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Magical Leaf
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_GRASS
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Water Sport
-	.byte 0xd2 ; effect
-	.byte 0 ; power
+@ Water Sport
+	.byte 0xd2 @ effect
+	.byte 0 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Calm Mind
-	.byte 0xd3 ; effect
-	.byte 0 ; power
+@ Calm Mind
+	.byte 0xd3 @ effect
+	.byte 0 @ power
 	.byte TYPE_PSYCHIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Leaf Blade
-	.byte 0x2b ; effect
-	.byte 70 ; power
+@ Leaf Blade
+	.byte 0x2b @ effect
+	.byte 70 @ power
 	.byte TYPE_GRASS
-	.byte 100 ; accuracy
-	.byte 15 ; PP
-	.byte 0 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 15 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
-; Dragon Dance
-	.byte 0xd4 ; effect
-	.byte 0 ; power
+@ Dragon Dance
+	.byte 0xd4 @ effect
+	.byte 0 @ power
 	.byte TYPE_DRAGON
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte F_TARGET_USER
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_SNATCH ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
-; Rock Blast
-	.byte 0x1d ; effect
-	.byte 25 ; power
+@ Rock Blast
+	.byte 0x1d @ effect
+	.byte 25 @ power
 	.byte TYPE_ROCK
-	.byte 80 ; accuracy
-	.byte 10 ; PP
-	.byte 0 ; side effect chance
+	.byte 80 @ accuracy
+	.byte 10 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Shock Wave
-	.byte 0x11 ; effect
-	.byte 60 ; power
+@ Shock Wave
+	.byte 0x11 @ effect
+	.byte 60 @ power
 	.byte TYPE_ELECTRIC
-	.byte 0 ; accuracy
-	.byte 20 ; PP
-	.byte 0 ; side effect chance
+	.byte 0 @ accuracy
+	.byte 20 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Water Pulse
-	.byte 0x4c ; effect
-	.byte 60 ; power
+@ Water Pulse
+	.byte 0x4c @ effect
+	.byte 60 @ power
 	.byte TYPE_WATER
-	.byte 100 ; accuracy
-	.byte 20 ; PP
-	.byte 20 ; side effect chance
+	.byte 100 @ accuracy
+	.byte 20 @ PP
+	.byte 20 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
-; Doom Desire
-	.byte 0x94 ; effect
-	.byte 120 ; power
+@ Doom Desire
+	.byte 0x94 @ effect
+	.byte 120 @ power
 	.byte TYPE_STEEL
-	.byte 85 ; accuracy
-	.byte 5 ; PP
-	.byte 0 ; side effect chance
+	.byte 85 @ accuracy
+	.byte 5 @ PP
+	.byte 0 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte 0 ; misc. flags
+	.byte 0 @ priority
+	.4byte 0 @ misc. flags
 
-; Psycho Boost
-	.byte 0xcc ; effect
-	.byte 140 ; power
+@ Psycho Boost
+	.byte 0xcc @ effect
+	.byte 140 @ power
 	.byte TYPE_PSYCHIC
-	.byte 90 ; accuracy
-	.byte 5 ; PP
-	.byte 100 ; side effect chance
+	.byte 90 @ accuracy
+	.byte 5 @ PP
+	.byte 100 @ side effect chance
 	.byte TARGET_SELECTED_POKEMON
-	.byte 0 ; priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT ; misc. flags
+	.byte 0 @ priority
+	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
diff --git a/data/berries.s b/data/berries.s
index e6bda4d70..82b1b0c93 100644
--- a/data/berries.s
+++ b/data/berries.s
@@ -1,690 +1,690 @@
 	.align 2, 0
 
-gBerries: ; 858A670
+gBerries: @ 858A670
 	.charmapstr "CHERI$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 20 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 20 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Cheri
 	.4byte gBerryDescriptionPart2_Cheri
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "CHESTO$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 80 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 80 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Chesto
 	.4byte gBerryDescriptionPart2_Chesto
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "PECHA$", 7
 	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 40 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 40 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Pecha
 	.4byte gBerryDescriptionPart2_Pecha
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "RAWST$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 32 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 32 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Rawst
 	.4byte gBerryDescriptionPart2_Rawst
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "ASPEAR$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 50 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 50 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Aspear
 	.4byte gBerryDescriptionPart2_Aspear
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "LEPPA$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 28 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 28 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Leppa
 	.4byte gBerryDescriptionPart2_Leppa
-	.byte 4 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 4 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "ORAN$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 35 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 35 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Oran
 	.4byte gBerryDescriptionPart2_Oran
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "PERSIM$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 47 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 47 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Persim
 	.4byte gBerryDescriptionPart2_Persim
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "LUM$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 34 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 34 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Lum
 	.4byte gBerryDescriptionPart2_Lum
-	.byte 12 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 12 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "SITRUS$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 95 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 95 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Sitrus
 	.4byte gBerryDescriptionPart2_Sitrus
-	.byte 6 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "FIGY$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 100 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 100 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Figy
 	.4byte gBerryDescriptionPart2_Figy
-	.byte 6 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "WIKI$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 115 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 115 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Wiki
 	.4byte gBerryDescriptionPart2_Wiki
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "MAGO$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 126 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 126 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Mago
 	.4byte gBerryDescriptionPart2_Mago
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "AGUAV$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 64 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 64 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Aguav
 	.4byte gBerryDescriptionPart2_Aguav
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "IAPAPA$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 223 ; size (in millimeters)
-	.byte 3 ; max yield
-	.byte 2 ; min yield
+	.2byte 223 @ size (in millimeters)
+	.byte 3 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Iapapa
 	.4byte gBerryDescriptionPart2_Iapapa
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 25 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 25 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "RAZZ$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 120 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 3 ; min yield
+	.2byte 120 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 3 @ min yield
 	.4byte gBerryDescriptionPart1_Razz
 	.4byte gBerryDescriptionPart2_Razz
-	.byte 1 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 1 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "BLUK$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 108 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 3 ; min yield
+	.2byte 108 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 3 @ min yield
 	.4byte gBerryDescriptionPart1_Bluk
 	.4byte gBerryDescriptionPart2_Bluk
-	.byte 1 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 1 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "NANAB$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 77 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 3 ; min yield
+	.2byte 77 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 3 @ min yield
 	.4byte gBerryDescriptionPart1_Nanab
 	.4byte gBerryDescriptionPart2_Nanab
-	.byte 1 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 1 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "WEPEAR$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 74 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 3 ; min yield
+	.2byte 74 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 3 @ min yield
 	.4byte gBerryDescriptionPart1_Wepear
 	.4byte gBerryDescriptionPart2_Wepear
-	.byte 1 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 1 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "PINAP$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 80 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 3 ; min yield
+	.2byte 80 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 3 @ min yield
 	.4byte gBerryDescriptionPart1_Pinap
 	.4byte gBerryDescriptionPart2_Pinap
-	.byte 1 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 1 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "POMEG$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 135 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 2 ; min yield
+	.2byte 135 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Pomeg
 	.4byte gBerryDescriptionPart2_Pomeg
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "KELPSY$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 150 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 2 ; min yield
+	.2byte 150 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Kelpsy
 	.4byte gBerryDescriptionPart2_Kelpsy
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "QUALOT$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 110 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 2 ; min yield
+	.2byte 110 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Qualot
 	.4byte gBerryDescriptionPart2_Qualot
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "HONDEW$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 162 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 2 ; min yield
+	.2byte 162 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Hondew
 	.4byte gBerryDescriptionPart2_Hondew
-	.byte 3 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "GREPA$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 149 ; size (in millimeters)
-	.byte 6 ; max yield
-	.byte 2 ; min yield
+	.2byte 149 @ size (in millimeters)
+	.byte 6 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Grepa
 	.4byte gBerryDescriptionPart2_Grepa
-	.byte 3 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 20 ; smoothness
-	.byte 0 ; padding
+	.byte 3 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 20 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "TAMATO$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 200 ; size (in millimeters)
-	.byte 4 ; max yield
-	.byte 2 ; min yield
+	.2byte 200 @ size (in millimeters)
+	.byte 4 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Tamato
 	.4byte gBerryDescriptionPart2_Tamato
-	.byte 6 ; stage duration (in hours)
-	.byte 20 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 20 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "CORNN$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 75 ; size (in millimeters)
-	.byte 4 ; max yield
-	.byte 2 ; min yield
+	.2byte 75 @ size (in millimeters)
+	.byte 4 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Cornn
 	.4byte gBerryDescriptionPart2_Cornn
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 20 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 20 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "MAGOST$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 140 ; size (in millimeters)
-	.byte 4 ; max yield
-	.byte 2 ; min yield
+	.2byte 140 @ size (in millimeters)
+	.byte 4 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Magost
 	.4byte gBerryDescriptionPart2_Magost
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 20 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 20 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "RABUTA$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 226 ; size (in millimeters)
-	.byte 4 ; max yield
-	.byte 2 ; min yield
+	.2byte 226 @ size (in millimeters)
+	.byte 4 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Rabuta
 	.4byte gBerryDescriptionPart2_Rabuta
-	.byte 6 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 20 ; bitter
-	.byte 10 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 20 @ bitter
+	.byte 10 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "NOMEL$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 285 ; size (in millimeters)
-	.byte 4 ; max yield
-	.byte 2 ; min yield
+	.2byte 285 @ size (in millimeters)
+	.byte 4 @ max yield
+	.byte 2 @ min yield
 	.4byte gBerryDescriptionPart1_Nomel
 	.4byte gBerryDescriptionPart2_Nomel
-	.byte 6 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 20 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 6 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 20 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "SPELON$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 133 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 133 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Spelon
 	.4byte gBerryDescriptionPart2_Spelon
-	.byte 18 ; stage duration (in hours)
-	.byte 40 ; spicy
-	.byte 10 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 70 ; smoothness
-	.byte 0 ; padding
+	.byte 18 @ stage duration (in hours)
+	.byte 40 @ spicy
+	.byte 10 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 70 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "PAMTRE$", 7
 	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 244 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 244 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Pamtre
 	.4byte gBerryDescriptionPart2_Pamtre
-	.byte 18 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 40 ; dry
-	.byte 10 ; sweet
-	.byte 0 ; bitter
-	.byte 0 ; sour
-	.byte 70 ; smoothness
-	.byte 0 ; padding
+	.byte 18 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 40 @ dry
+	.byte 10 @ sweet
+	.byte 0 @ bitter
+	.byte 0 @ sour
+	.byte 70 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "WATMEL$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 250 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 250 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Watmel
 	.4byte gBerryDescriptionPart2_Watmel
-	.byte 18 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 40 ; sweet
-	.byte 10 ; bitter
-	.byte 0 ; sour
-	.byte 70 ; smoothness
-	.byte 0 ; padding
+	.byte 18 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 40 @ sweet
+	.byte 10 @ bitter
+	.byte 0 @ sour
+	.byte 70 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "DURIN$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 280 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 280 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Durin
 	.4byte gBerryDescriptionPart2_Durin
-	.byte 18 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 40 ; bitter
-	.byte 10 ; sour
-	.byte 70 ; smoothness
-	.byte 0 ; padding
+	.byte 18 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 40 @ bitter
+	.byte 10 @ sour
+	.byte 70 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "BELUE$", 7
 	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 300 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 300 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Belue
 	.4byte gBerryDescriptionPart2_Belue
-	.byte 18 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 40 ; sour
-	.byte 70 ; smoothness
-	.byte 0 ; padding
+	.byte 18 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 40 @ sour
+	.byte 70 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "LIECHI$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 111 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 111 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Liechi
 	.4byte gBerryDescriptionPart2_Liechi
-	.byte 24 ; stage duration (in hours)
-	.byte 40 ; spicy
-	.byte 0 ; dry
-	.byte 40 ; sweet
-	.byte 0 ; bitter
-	.byte 10 ; sour
-	.byte 80 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 40 @ spicy
+	.byte 0 @ dry
+	.byte 40 @ sweet
+	.byte 0 @ bitter
+	.byte 10 @ sour
+	.byte 80 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "GANLON$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 33 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 33 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Ganlon
 	.4byte gBerryDescriptionPart2_Ganlon
-	.byte 24 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 40 ; dry
-	.byte 0 ; sweet
-	.byte 40 ; bitter
-	.byte 0 ; sour
-	.byte 80 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 40 @ dry
+	.byte 0 @ sweet
+	.byte 40 @ bitter
+	.byte 0 @ sour
+	.byte 80 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "SALAC$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 95 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 95 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Salac
 	.4byte gBerryDescriptionPart2_Salac
-	.byte 24 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 0 ; dry
-	.byte 40 ; sweet
-	.byte 0 ; bitter
-	.byte 40 ; sour
-	.byte 80 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 0 @ dry
+	.byte 40 @ sweet
+	.byte 0 @ bitter
+	.byte 40 @ sour
+	.byte 80 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "PETAYA$", 7
 	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 237 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 237 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Petaya
 	.4byte gBerryDescriptionPart2_Petaya
-	.byte 24 ; stage duration (in hours)
-	.byte 40 ; spicy
-	.byte 0 ; dry
-	.byte 0 ; sweet
-	.byte 40 ; bitter
-	.byte 0 ; sour
-	.byte 80 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 40 @ spicy
+	.byte 0 @ dry
+	.byte 0 @ sweet
+	.byte 40 @ bitter
+	.byte 0 @ sour
+	.byte 80 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "APICOT$", 7
 	.byte BERRY_FIRMNESS_HARD
-	.2byte 75 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 75 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Apicot
 	.4byte gBerryDescriptionPart2_Apicot
-	.byte 24 ; stage duration (in hours)
-	.byte 0 ; spicy
-	.byte 40 ; dry
-	.byte 0 ; sweet
-	.byte 0 ; bitter
-	.byte 40 ; sour
-	.byte 80 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 0 @ spicy
+	.byte 40 @ dry
+	.byte 0 @ sweet
+	.byte 0 @ bitter
+	.byte 40 @ sour
+	.byte 80 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "LANSAT$", 7
 	.byte BERRY_FIRMNESS_SOFT
-	.2byte 97 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 97 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Lansat
 	.4byte gBerryDescriptionPart2_Lansat
-	.byte 24 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "STARF$", 7
 	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 153 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 153 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Starf
 	.4byte gBerryDescriptionPart2_Starf
-	.byte 24 ; stage duration (in hours)
-	.byte 10 ; spicy
-	.byte 10 ; dry
-	.byte 10 ; sweet
-	.byte 10 ; bitter
-	.byte 10 ; sour
-	.byte 30 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 10 @ spicy
+	.byte 10 @ dry
+	.byte 10 @ sweet
+	.byte 10 @ bitter
+	.byte 10 @ sour
+	.byte 30 @ smoothness
+	.byte 0 @ padding
 
 	.charmapstr "ENIGMA$", 7
 	.byte BERRY_FIRMNESS_UNKNOWN
-	.2byte 0 ; size (in millimeters)
-	.byte 2 ; max yield
-	.byte 1 ; min yield
+	.2byte 0 @ size (in millimeters)
+	.byte 2 @ max yield
+	.byte 1 @ min yield
 	.4byte gBerryDescriptionPart1_Enigma
 	.4byte gBerryDescriptionPart2_Enigma
-	.byte 24 ; stage duration (in hours)
-	.byte 40 ; spicy
-	.byte 40 ; dry
-	.byte 40 ; sweet
-	.byte 40 ; bitter
-	.byte 40 ; sour
-	.byte 40 ; smoothness
-	.byte 0 ; padding
+	.byte 24 @ stage duration (in hours)
+	.byte 40 @ spicy
+	.byte 40 @ dry
+	.byte 40 @ sweet
+	.byte 40 @ bitter
+	.byte 40 @ sour
+	.byte 40 @ smoothness
+	.byte 0 @ padding
diff --git a/data/contest_effect_function_table.s b/data/contest_effect_function_table.s
index ca59f4c72..051d7d5a2 100644
--- a/data/contest_effect_function_table.s
+++ b/data/contest_effect_function_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gContestEffectFunctionTable: ; 858CECC
+gContestEffectFunctionTable: @ 858CECC
 	.4byte ContestEffectFunc_080E547C
 	.4byte ContestEffectFunc_080E5480
 	.4byte ContestEffectFunc_080E54B0
diff --git a/data/contest_effects.s b/data/contest_effects.s
index 51d01cd8c..a4284d37f 100644
--- a/data/contest_effects.s
+++ b/data/contest_effects.s
@@ -1,290 +1,290 @@
 	.align 2, 0
 
-gContestEffects: ; 858CDCC
-; 0x00
-	.byte 0 ; effect type
-	.byte 40 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x01
-	.byte 0 ; effect type
-	.byte 60 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x02
-	.byte 0 ; effect type
-	.byte 80 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x03
-	.byte 0 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x04
-	.byte 1 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x05
-	.byte 1 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x06
-	.byte 1 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x07
-	.byte 1 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x08
-	.byte 2 ; effect type
-	.byte 30 ; appeal
-	.byte 20 ; jam
-	.byte 0 ; padding
-
-; 0x09
-	.byte 3 ; effect type
-	.byte 30 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x0a
-	.byte 2 ; effect type
-	.byte 20 ; appeal
-	.byte 30 ; jam
-	.byte 0 ; padding
-
-; 0x0b
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 20 ; jam
-	.byte 0 ; padding
-
-; 0x0c
-	.byte 2 ; effect type
-	.byte 10 ; appeal
-	.byte 40 ; jam
-	.byte 0 ; padding
-
-; 0x0d
-	.byte 3 ; effect type
-	.byte 10 ; appeal
-	.byte 30 ; jam
-	.byte 0 ; padding
-
-; 0x0e
-	.byte 2 ; effect type
-	.byte 30 ; appeal
-	.byte 20 ; jam
-	.byte 0 ; padding
-
-; 0x0f
-	.byte 3 ; effect type
-	.byte 30 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x10
-	.byte 4 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x11
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x12
-	.byte 3 ; effect type
-	.byte 40 ; appeal
-	.byte 40 ; jam
-	.byte 0 ; padding
-
-; 0x13
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x14
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x15
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x16
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x17
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x18
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x19
-	.byte 4 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x1a
-	.byte 4 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x1b
-	.byte 4 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x1c
-	.byte 3 ; effect type
-	.byte 30 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x1d
-	.byte 5 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x1e
-	.byte 5 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x1f
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x20
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x21
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x22
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x23
-	.byte 5 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x24
-	.byte 5 ; effect type
-	.byte 20 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x25
-	.byte 5 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x26
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x27
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x28
-	.byte 6 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x29
-	.byte 6 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x2a
-	.byte 6 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x2b
-	.byte 6 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x2c
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x2d
-	.byte 3 ; effect type
-	.byte 20 ; appeal
-	.byte 10 ; jam
-	.byte 0 ; padding
-
-; 0x2e
-	.byte 5 ; effect type
-	.byte 10 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
-
-; 0x2f
-	.byte 4 ; effect type
-	.byte 30 ; appeal
-	.byte 0 ; jam
-	.byte 0 ; padding
+gContestEffects: @ 858CDCC
+@ 0x00
+	.byte 0 @ effect type
+	.byte 40 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x01
+	.byte 0 @ effect type
+	.byte 60 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x02
+	.byte 0 @ effect type
+	.byte 80 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x03
+	.byte 0 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x04
+	.byte 1 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x05
+	.byte 1 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x06
+	.byte 1 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x07
+	.byte 1 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x08
+	.byte 2 @ effect type
+	.byte 30 @ appeal
+	.byte 20 @ jam
+	.byte 0 @ padding
+
+@ 0x09
+	.byte 3 @ effect type
+	.byte 30 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x0a
+	.byte 2 @ effect type
+	.byte 20 @ appeal
+	.byte 30 @ jam
+	.byte 0 @ padding
+
+@ 0x0b
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 20 @ jam
+	.byte 0 @ padding
+
+@ 0x0c
+	.byte 2 @ effect type
+	.byte 10 @ appeal
+	.byte 40 @ jam
+	.byte 0 @ padding
+
+@ 0x0d
+	.byte 3 @ effect type
+	.byte 10 @ appeal
+	.byte 30 @ jam
+	.byte 0 @ padding
+
+@ 0x0e
+	.byte 2 @ effect type
+	.byte 30 @ appeal
+	.byte 20 @ jam
+	.byte 0 @ padding
+
+@ 0x0f
+	.byte 3 @ effect type
+	.byte 30 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x10
+	.byte 4 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x11
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x12
+	.byte 3 @ effect type
+	.byte 40 @ appeal
+	.byte 40 @ jam
+	.byte 0 @ padding
+
+@ 0x13
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x14
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x15
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x16
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x17
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x18
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x19
+	.byte 4 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x1a
+	.byte 4 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x1b
+	.byte 4 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x1c
+	.byte 3 @ effect type
+	.byte 30 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x1d
+	.byte 5 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x1e
+	.byte 5 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x1f
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x20
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x21
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x22
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x23
+	.byte 5 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x24
+	.byte 5 @ effect type
+	.byte 20 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x25
+	.byte 5 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x26
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x27
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x28
+	.byte 6 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x29
+	.byte 6 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x2a
+	.byte 6 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x2b
+	.byte 6 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x2c
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x2d
+	.byte 3 @ effect type
+	.byte 20 @ appeal
+	.byte 10 @ jam
+	.byte 0 @ padding
+
+@ 0x2e
+	.byte 5 @ effect type
+	.byte 10 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
+
+@ 0x2f
+	.byte 4 @ effect type
+	.byte 30 @ appeal
+	.byte 0 @ jam
+	.byte 0 @ padding
diff --git a/data/contest_moves.s b/data/contest_moves.s
index d8ec9e0e3..4ed5ebbe7 100644
--- a/data/contest_moves.s
+++ b/data/contest_moves.s
@@ -1,2487 +1,2487 @@
 	.align 2, 0
 
-gContestMoves: ; 858C2B4
-; -
-	.byte 0x00 ; effect ID
+gContestMoves: @ 858C2B4
+@ -
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Pound
-	.byte 0x00 ; effect ID
+@ Pound
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_POUND ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_POUND @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Karate Chop
-	.byte 0x25 ; effect ID
+@ Karate Chop
+	.byte 0x25 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Double Slap
-	.byte 0x11 ; effect ID
+@ Double Slap
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_POUND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_POUND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Comet Punch
-	.byte 0x23 ; effect ID
+@ Comet Punch
+	.byte 0x23 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mega Punch
-	.byte 0x00 ; effect ID
+@ Mega Punch
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Pay Day
-	.byte 0x2e ; effect ID
+@ Pay Day
+	.byte 0x2e @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fire Punch
-	.byte 0x00 ; effect ID
+@ Fire Punch
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_FIRE_PUNCH ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_FIRE_PUNCH @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ice Punch
-	.byte 0x00 ; effect ID
+@ Ice Punch
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_ICE_PUNCH ; combo starter ID
-	.byte COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_ICE_PUNCH @ combo starter ID
+	.byte COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thunder Punch
-	.byte 0x00 ; effect ID
+@ Thunder Punch
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_THUNDER_PUNCH ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_THUNDER_PUNCH @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Scratch
-	.byte 0x00 ; effect ID
+@ Scratch
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SCRATCH ; combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SCRATCH @ combo starter ID
+	.byte COMBO_STARTER_LEER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Vice Grip
-	.byte 0x00 ; effect ID
+@ Vice Grip
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_VICE_GRIP ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_VICE_GRIP @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Guillotine
-	.byte 0x2d ; effect ID
+@ Guillotine
+	.byte 0x2d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Razor Wind
-	.byte 0x25 ; effect ID
+@ Razor Wind
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Swords Dance
-	.byte 0x26 ; effect ID
+@ Swords Dance
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SWORDS_DANCE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SWORDS_DANCE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Cut
-	.byte 0x2d ; effect ID
+@ Cut
+	.byte 0x2d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Gust
-	.byte 0x2b ; effect ID
+@ Gust
+	.byte 0x2b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Wing Attack
-	.byte 0x23 ; effect ID
+@ Wing Attack
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Whirlwind
-	.byte 0x2b ; effect ID
+@ Whirlwind
+	.byte 0x2b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fly
-	.byte 0x05 ; effect ID
+@ Fly
+	.byte 0x05 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bind
-	.byte 0x2f ; effect ID
+@ Bind
+	.byte 0x2f @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Slam
-	.byte 0x13 ; effect ID
+@ Slam
+	.byte 0x13 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_POUND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_POUND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Vine Whip
-	.byte 0x00 ; effect ID
+@ Vine Whip
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Stomp
-	.byte 0x0c ; effect ID
+@ Stomp
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, COMBO_STARTER_LEER, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, COMBO_STARTER_LEER, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Double Kick
-	.byte 0x23 ; effect ID
+@ Double Kick
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mega Kick
-	.byte 0x00 ; effect ID
+@ Mega Kick
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Jump Kick
-	.byte 0x01 ; effect ID
+@ Jump Kick
+	.byte 0x01 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rolling Kick
-	.byte 0x0d ; effect ID
+@ Rolling Kick
+	.byte 0x0d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sand-Attack
-	.byte 0x11 ; effect ID
+@ Sand-Attack
+	.byte 0x11 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SAND_ATTACK ; combo starter ID
-	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SAND_ATTACK @ combo starter ID
+	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Headbutt
-	.byte 0x0a ; effect ID
+@ Headbutt
+	.byte 0x0a @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Horn Attack
-	.byte 0x00 ; effect ID
+@ Horn Attack
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_HORN_ATTACK ; combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_HORN_ATTACK @ combo starter ID
+	.byte COMBO_STARTER_LEER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fury Attack
-	.byte 0x11 ; effect ID
+@ Fury Attack
+	.byte 0x11 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Horn Drill
-	.byte 0x2d ; effect ID
+@ Horn Drill
+	.byte 0x2d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_HORN_ATTACK, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_HORN_ATTACK, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Tackle
-	.byte 0x00 ; effect ID
+@ Tackle
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Body Slam
-	.byte 0x0c ; effect ID
+@ Body Slam
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Wrap
-	.byte 0x2f ; effect ID
+@ Wrap
+	.byte 0x2f @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Take Down
-	.byte 0x01 ; effect ID
+@ Take Down
+	.byte 0x01 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thrash
-	.byte 0x12 ; effect ID
+@ Thrash
+	.byte 0x12 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Double-Edge
-	.byte 0x01 ; effect ID
+@ Double-Edge
+	.byte 0x01 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Tail Whip
-	.byte 0x1e ; effect ID
+@ Tail Whip
+	.byte 0x1e @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Poison Sting
-	.byte 0x0a ; effect ID
+@ Poison Sting
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Twineedle
-	.byte 0x0a ; effect ID
+@ Twineedle
+	.byte 0x0a @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Pin Missile
-	.byte 0x11 ; effect ID
+@ Pin Missile
+	.byte 0x11 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Leer
-	.byte 0x2f ; effect ID
+@ Leer
+	.byte 0x2f @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_LEER ; combo starter ID
-	.byte COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_LEER @ combo starter ID
+	.byte COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bite
-	.byte 0x0d ; effect ID
+@ Bite
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Growl
-	.byte 0x1e ; effect ID
+@ Growl
+	.byte 0x1e @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Roar
-	.byte 0x2b ; effect ID
+@ Roar
+	.byte 0x2b @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sing
-	.byte 0x1a ; effect ID
+@ Sing
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SING ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SING @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Supersonic
-	.byte 0x2b ; effect ID
+@ Supersonic
+	.byte 0x2b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sonic Boom
-	.byte 0x23 ; effect ID
+@ Sonic Boom
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Disable
-	.byte 0x1a ; effect ID
+@ Disable
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Acid
-	.byte 0x0c ; effect ID
+@ Acid
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ember
-	.byte 0x00 ; effect ID
+@ Ember
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Flamethrower
-	.byte 0x00 ; effect ID
+@ Flamethrower
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mist
-	.byte 0x05 ; effect ID
+@ Mist
+	.byte 0x05 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Water Gun
-	.byte 0x00 ; effect ID
+@ Water Gun
+	.byte 0x00 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hydro Pump
-	.byte 0x00 ; effect ID
+@ Hydro Pump
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Surf
-	.byte 0x25 ; effect ID
+@ Surf
+	.byte 0x25 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SURF ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SURF @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ice Beam
-	.byte 0x13 ; effect ID
+@ Ice Beam
+	.byte 0x13 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Blizzard
-	.byte 0x00 ; effect ID
+@ Blizzard
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Psybeam
-	.byte 0x2b ; effect ID
+@ Psybeam
+	.byte 0x2b @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bubble Beam
-	.byte 0x0d ; effect ID
+@ Bubble Beam
+	.byte 0x0d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Aurora Beam
-	.byte 0x13 ; effect ID
+@ Aurora Beam
+	.byte 0x13 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hyper Beam
-	.byte 0x12 ; effect ID
+@ Hyper Beam
+	.byte 0x12 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Peck
-	.byte 0x00 ; effect ID
+@ Peck
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_PECK ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_PECK @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Drill Peck
-	.byte 0x00 ; effect ID
+@ Drill Peck
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_PECK, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_PECK, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Submission
-	.byte 0x01 ; effect ID
+@ Submission
+	.byte 0x01 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Low Kick
-	.byte 0x0c ; effect ID
+@ Low Kick
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Counter
-	.byte 0x04 ; effect ID
+@ Counter
+	.byte 0x04 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Seismic Toss
-	.byte 0x13 ; effect ID
+@ Seismic Toss
+	.byte 0x13 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Strength
-	.byte 0x13 ; effect ID
+@ Strength
+	.byte 0x13 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Absorb
-	.byte 0x0a ; effect ID
+@ Absorb
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mega Drain
-	.byte 0x0c ; effect ID
+@ Mega Drain
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Leech Seed
-	.byte 0x0b ; effect ID
+@ Leech Seed
+	.byte 0x0b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Growth
-	.byte 0x26 ; effect ID
+@ Growth
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_GROWTH ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_GROWTH @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Razor Leaf
-	.byte 0x25 ; effect ID
+@ Razor Leaf
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Solar Beam
-	.byte 0x00 ; effect ID
+@ Solar Beam
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Poison Powder
-	.byte 0x1b ; effect ID
+@ Poison Powder
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Stun Spore
-	.byte 0x2d ; effect ID
+@ Stun Spore
+	.byte 0x2d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sleep Powder
-	.byte 0x0d ; effect ID
+@ Sleep Powder
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Petal Dance
-	.byte 0x12 ; effect ID
+@ Petal Dance
+	.byte 0x12 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; String Shot
-	.byte 0x0a ; effect ID
+@ String Shot
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_STRING_SHOT ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_STRING_SHOT @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dragon Rage
-	.byte 0x21 ; effect ID
+@ Dragon Rage
+	.byte 0x21 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_RAGE ; combo starter ID
-	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DRAGON_RAGE @ combo starter ID
+	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fire Spin
-	.byte 0x2f ; effect ID
+@ Fire Spin
+	.byte 0x2f @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thunder Shock
-	.byte 0x00 ; effect ID
+@ Thunder Shock
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thunderbolt
-	.byte 0x00 ; effect ID
+@ Thunderbolt
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thunder Wave
-	.byte 0x2d ; effect ID
+@ Thunder Wave
+	.byte 0x2d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thunder
-	.byte 0x0b ; effect ID
+@ Thunder
+	.byte 0x0b @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rock Throw
-	.byte 0x23 ; effect ID
+@ Rock Throw
+	.byte 0x23 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_ROCK_THROW ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_ROCK_THROW @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Earthquake
-	.byte 0x0d ; effect ID
+@ Earthquake
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_EARTHQUAKE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_EARTHQUAKE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fissure
-	.byte 0x2d ; effect ID
+@ Fissure
+	.byte 0x2d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_EARTHQUAKE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_EARTHQUAKE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dig
-	.byte 0x05 ; effect ID
+@ Dig
+	.byte 0x05 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Toxic
-	.byte 0x1b ; effect ID
+@ Toxic
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Confusion
-	.byte 0x0a ; effect ID
+@ Confusion
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CONFUSION ; combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_CONFUSION @ combo starter ID
+	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Psychic
-	.byte 0x0d ; effect ID
+@ Psychic
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_PSYCHIC ; combo starter ID
-	.byte COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_PSYCHIC @ combo starter ID
+	.byte COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hypnosis
-	.byte 0x0d ; effect ID
+@ Hypnosis
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_HYPNOSIS ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_HYPNOSIS @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Meditate
-	.byte 0x26 ; effect ID
+@ Meditate
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Agility
-	.byte 0x28 ; effect ID
+@ Agility
+	.byte 0x28 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Quick Attack
-	.byte 0x28 ; effect ID
+@ Quick Attack
+	.byte 0x28 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rage
-	.byte 0x03 ; effect ID
+@ Rage
+	.byte 0x03 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_RAGE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_RAGE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Teleport
-	.byte 0x05 ; effect ID
+@ Teleport
+	.byte 0x05 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Night Shade
-	.byte 0x13 ; effect ID
+@ Night Shade
+	.byte 0x13 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mimic
-	.byte 0x20 ; effect ID
+@ Mimic
+	.byte 0x20 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Screech
-	.byte 0x0d ; effect ID
+@ Screech
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Double Team
-	.byte 0x04 ; effect ID
+@ Double Team
+	.byte 0x04 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DOUBLE_TEAM ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DOUBLE_TEAM @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Recover
-	.byte 0x13 ; effect ID
+@ Recover
+	.byte 0x13 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Harden
-	.byte 0x04 ; effect ID
+@ Harden
+	.byte 0x04 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_HARDEN ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_HARDEN @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Minimize
-	.byte 0x04 ; effect ID
+@ Minimize
+	.byte 0x04 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Smokescreen
-	.byte 0x10 ; effect ID
+@ Smokescreen
+	.byte 0x10 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SMOG, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SMOG, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Confuse Ray
-	.byte 0x2b ; effect ID
+@ Confuse Ray
+	.byte 0x2b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Withdraw
-	.byte 0x05 ; effect ID
+@ Withdraw
+	.byte 0x05 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Defense Curl
-	.byte 0x04 ; effect ID
+@ Defense Curl
+	.byte 0x04 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_DEFENSE_CURL ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DEFENSE_CURL @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Barrier
-	.byte 0x05 ; effect ID
+@ Barrier
+	.byte 0x05 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Light Screen
-	.byte 0x05 ; effect ID
+@ Light Screen
+	.byte 0x05 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Haze
-	.byte 0x1b ; effect ID
+@ Haze
+	.byte 0x1b @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Reflect
-	.byte 0x05 ; effect ID
+@ Reflect
+	.byte 0x05 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Focus Energy
-	.byte 0x0d ; effect ID
+@ Focus Energy
+	.byte 0x0d @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_FOCUS_ENERGY ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_FOCUS_ENERGY @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bide
-	.byte 0x05 ; effect ID
+@ Bide
+	.byte 0x05 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Metronome
-	.byte 0x03 ; effect ID
+@ Metronome
+	.byte 0x03 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mirror Move
-	.byte 0x20 ; effect ID
+@ Mirror Move
+	.byte 0x20 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Self-Destruct
-	.byte 0x02 ; effect ID
+@ Self-Destruct
+	.byte 0x02 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Egg Bomb
-	.byte 0x00 ; effect ID
+@ Egg Bomb
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SOFT_BOILED, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SOFT_BOILED, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Lick
-	.byte 0x0c ; effect ID
+@ Lick
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Smog
-	.byte 0x0d ; effect ID
+@ Smog
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SMOG ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SMOG @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sludge
-	.byte 0x0c ; effect ID
+@ Sludge
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SLUDGE ; combo starter ID
-	.byte COMBO_STARTER_SLUDGE_BOMB, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SLUDGE @ combo starter ID
+	.byte COMBO_STARTER_SLUDGE_BOMB, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bone Club
-	.byte 0x11 ; effect ID
+@ Bone Club
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONE_CLUB ; combo starter ID
-	.byte COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_BONE_CLUB @ combo starter ID
+	.byte COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fire Blast
-	.byte 0x00 ; effect ID
+@ Fire Blast
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Waterfall
-	.byte 0x1e ; effect ID
+@ Waterfall
+	.byte 0x1e @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Clamp
-	.byte 0x2f ; effect ID
+@ Clamp
+	.byte 0x2f @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Swift
-	.byte 0x1d ; effect ID
+@ Swift
+	.byte 0x1d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Skull Bash
-	.byte 0x0c ; effect ID
+@ Skull Bash
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spike Cannon
-	.byte 0x11 ; effect ID
+@ Spike Cannon
+	.byte 0x11 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Constrict
-	.byte 0x0a ; effect ID
+@ Constrict
+	.byte 0x0a @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Amnesia
-	.byte 0x26 ; effect ID
+@ Amnesia
+	.byte 0x26 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Kinesis
-	.byte 0x2f ; effect ID
+@ Kinesis
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_KINESIS ; combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_KINESIS @ combo starter ID
+	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Soft-Boiled
-	.byte 0x00 ; effect ID
+@ Soft-Boiled
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SOFT_BOILED ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SOFT_BOILED @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hi Jump Kick
-	.byte 0x01 ; effect ID
+@ Hi Jump Kick
+	.byte 0x01 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Glare
-	.byte 0x0d ; effect ID
+@ Glare
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_LEER, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dream Eater
-	.byte 0x0b ; effect ID
+@ Dream Eater
+	.byte 0x0b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Poison Gas
-	.byte 0x1b ; effect ID
+@ Poison Gas
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Barrage
-	.byte 0x23 ; effect ID
+@ Barrage
+	.byte 0x23 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Leech Life
-	.byte 0x0a ; effect ID
+@ Leech Life
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Lovely Kiss
-	.byte 0x0d ; effect ID
+@ Lovely Kiss
+	.byte 0x0d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sky Attack
-	.byte 0x25 ; effect ID
+@ Sky Attack
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Transform
-	.byte 0x03 ; effect ID
+@ Transform
+	.byte 0x03 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bubble
-	.byte 0x0b ; effect ID
+@ Bubble
+	.byte 0x0b @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dizzy Punch
-	.byte 0x0c ; effect ID
+@ Dizzy Punch
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spore
-	.byte 0x0d ; effect ID
+@ Spore
+	.byte 0x0d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Flash
-	.byte 0x10 ; effect ID
+@ Flash
+	.byte 0x10 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Psywave
-	.byte 0x2d ; effect ID
+@ Psywave
+	.byte 0x2d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Splash
-	.byte 0x1e ; effect ID
+@ Splash
+	.byte 0x1e @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Acid Armor
-	.byte 0x26 ; effect ID
+@ Acid Armor
+	.byte 0x26 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Crabhammer
-	.byte 0x25 ; effect ID
+@ Crabhammer
+	.byte 0x25 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Explosion
-	.byte 0x02 ; effect ID
+@ Explosion
+	.byte 0x02 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fury Swipes
-	.byte 0x11 ; effect ID
+@ Fury Swipes
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SCRATCH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SCRATCH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bonemerang
-	.byte 0x00 ; effect ID
+@ Bonemerang
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONEMERANG ; combo starter ID
-	.byte COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_BONEMERANG @ combo starter ID
+	.byte COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rest
-	.byte 0x04 ; effect ID
+@ Rest
+	.byte 0x04 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_REST ; combo starter ID
-	.byte COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_REST @ combo starter ID
+	.byte COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rock Slide
-	.byte 0x0d ; effect ID
+@ Rock Slide
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hyper Fang
-	.byte 0x0c ; effect ID
+@ Hyper Fang
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sharpen
-	.byte 0x26 ; effect ID
+@ Sharpen
+	.byte 0x26 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Conversion
-	.byte 0x23 ; effect ID
+@ Conversion
+	.byte 0x23 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Tri Attack
-	.byte 0x0b ; effect ID
+@ Tri Attack
+	.byte 0x0b @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Super Fang
-	.byte 0x2d ; effect ID
+@ Super Fang
+	.byte 0x2d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Slash
-	.byte 0x25 ; effect ID
+@ Slash
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Substitute
-	.byte 0x04 ; effect ID
+@ Substitute
+	.byte 0x04 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Struggle
-	.byte 0x00 ; effect ID
+@ Struggle
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sketch
-	.byte 0x20 ; effect ID
+@ Sketch
+	.byte 0x20 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Triple Kick
-	.byte 0x00 ; effect ID
+@ Triple Kick
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Thief
-	.byte 0x1f ; effect ID
+@ Thief
+	.byte 0x1f @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spider Web
-	.byte 0x1a ; effect ID
+@ Spider Web
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_STRING_SHOT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_STRING_SHOT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mind Reader
-	.byte 0x2f ; effect ID
+@ Mind Reader
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_MIND_READER ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_MIND_READER @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Nightmare
-	.byte 0x0d ; effect ID
+@ Nightmare
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_HYPNOSIS, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_HYPNOSIS, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Flame Wheel
-	.byte 0x00 ; effect ID
+@ Flame Wheel
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Snore
-	.byte 0x00 ; effect ID
+@ Snore
+	.byte 0x00 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_REST, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_REST, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Curse
-	.byte 0x29 ; effect ID
+@ Curse
+	.byte 0x29 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_CURSE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_CURSE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Flail
-	.byte 0x21 ; effect ID
+@ Flail
+	.byte 0x21 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Conversion 2
-	.byte 0x23 ; effect ID
+@ Conversion 2
+	.byte 0x23 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Aeroblast
-	.byte 0x25 ; effect ID
+@ Aeroblast
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Cotton Spore
-	.byte 0x11 ; effect ID
+@ Cotton Spore
+	.byte 0x11 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Reversal
-	.byte 0x1e ; effect ID
+@ Reversal
+	.byte 0x1e @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spite
-	.byte 0x21 ; effect ID
+@ Spite
+	.byte 0x21 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Powder Snow
-	.byte 0x00 ; effect ID
+@ Powder Snow
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_POWDER_SNOW ; combo starter ID
-	.byte COMBO_STARTER_HAIL, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_POWDER_SNOW @ combo starter ID
+	.byte COMBO_STARTER_HAIL, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Protect
-	.byte 0x05 ; effect ID
+@ Protect
+	.byte 0x05 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_HARDEN, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_HARDEN, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mach Punch
-	.byte 0x28 ; effect ID
+@ Mach Punch
+	.byte 0x28 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Scary Face
-	.byte 0x11 ; effect ID
+@ Scary Face
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SCARY_FACE ; combo starter ID
-	.byte COMBO_STARTER_RAGE, COMBO_STARTER_LEER, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SCARY_FACE @ combo starter ID
+	.byte COMBO_STARTER_RAGE, COMBO_STARTER_LEER, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Faint Attack
-	.byte 0x1d ; effect ID
+@ Faint Attack
+	.byte 0x1d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sweet Kiss
-	.byte 0x1a ; effect ID
+@ Sweet Kiss
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Belly Drum
-	.byte 0x26 ; effect ID
+@ Belly Drum
+	.byte 0x26 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_BELLY_DRUM ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_BELLY_DRUM @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sludge Bomb
-	.byte 0x11 ; effect ID
+@ Sludge Bomb
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SLUDGE_BOMB ; combo starter ID
-	.byte COMBO_STARTER_SLUDGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SLUDGE_BOMB @ combo starter ID
+	.byte COMBO_STARTER_SLUDGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mud-Slap
-	.byte 0x11 ; effect ID
+@ Mud-Slap
+	.byte 0x11 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_MUD_SLAP ; combo starter ID
-	.byte COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_MUD_SLAP @ combo starter ID
+	.byte COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Octazooka
-	.byte 0x11 ; effect ID
+@ Octazooka
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spikes
-	.byte 0x1a ; effect ID
+@ Spikes
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Zap Cannon
-	.byte 0x00 ; effect ID
+@ Zap Cannon
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Foresight
-	.byte 0x1b ; effect ID
+@ Foresight
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Destiny Bond
-	.byte 0x02 ; effect ID
+@ Destiny Bond
+	.byte 0x02 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Perish Song
-	.byte 0x2d ; effect ID
+@ Perish Song
+	.byte 0x2d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Icy Wind
-	.byte 0x0d ; effect ID
+@ Icy Wind
+	.byte 0x0d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Detect
-	.byte 0x04 ; effect ID
+@ Detect
+	.byte 0x04 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bone Rush
-	.byte 0x00 ; effect ID
+@ Bone Rush
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONE_RUSH ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_BONE_RUSH @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Lock-On
-	.byte 0x2f ; effect ID
+@ Lock-On
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_LOCK_ON ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_LOCK_ON @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Outrage
-	.byte 0x12 ; effect ID
+@ Outrage
+	.byte 0x12 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sandstorm
-	.byte 0x2b ; effect ID
+@ Sandstorm
+	.byte 0x2b @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SANDSTORM ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SANDSTORM @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Giga Drain
-	.byte 0x11 ; effect ID
+@ Giga Drain
+	.byte 0x11 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Endure
-	.byte 0x04 ; effect ID
+@ Endure
+	.byte 0x04 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_ENDURE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_ENDURE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Charm
-	.byte 0x13 ; effect ID
+@ Charm
+	.byte 0x13 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_CHARM ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_CHARM @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rollout
-	.byte 0x2f ; effect ID
+@ Rollout
+	.byte 0x2f @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; False Swipe
-	.byte 0x0d ; effect ID
+@ False Swipe
+	.byte 0x0d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Swagger
-	.byte 0x1d ; effect ID
+@ Swagger
+	.byte 0x1d @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Milk Drink
-	.byte 0x23 ; effect ID
+@ Milk Drink
+	.byte 0x23 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spark
-	.byte 0x0c ; effect ID
+@ Spark
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fury Cutter
-	.byte 0x03 ; effect ID
+@ Fury Cutter
+	.byte 0x03 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Steel Wing
-	.byte 0x23 ; effect ID
+@ Steel Wing
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mean Look
-	.byte 0x1a ; effect ID
+@ Mean Look
+	.byte 0x1a @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_MEAN_LOOK ; combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_MEAN_LOOK @ combo starter ID
+	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Attract
-	.byte 0x1a ; effect ID
+@ Attract
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sleep Talk
-	.byte 0x03 ; effect ID
+@ Sleep Talk
+	.byte 0x03 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_REST, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_REST, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Heal Bell
-	.byte 0x1e ; effect ID
+@ Heal Bell
+	.byte 0x1e @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Return
-	.byte 0x2c ; effect ID
+@ Return
+	.byte 0x2c @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Present
-	.byte 0x03 ; effect ID
+@ Present
+	.byte 0x03 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Frustration
-	.byte 0x2c ; effect ID
+@ Frustration
+	.byte 0x2c @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Safeguard
-	.byte 0x05 ; effect ID
+@ Safeguard
+	.byte 0x05 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Pain Split
-	.byte 0x0c ; effect ID
+@ Pain Split
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sacred Fire
-	.byte 0x00 ; effect ID
+@ Sacred Fire
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Magnitude
-	.byte 0x2e ; effect ID
+@ Magnitude
+	.byte 0x2e @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dynamic Punch
-	.byte 0x11 ; effect ID
+@ Dynamic Punch
+	.byte 0x11 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Megahorn
-	.byte 0x23 ; effect ID
+@ Megahorn
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dragon Breath
-	.byte 0x0d ; effect ID
+@ Dragon Breath
+	.byte 0x0d @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_BREATH ; combo starter ID
-	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DRAGON_BREATH @ combo starter ID
+	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Baton Pass
-	.byte 0x1a ; effect ID
+@ Baton Pass
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Encore
-	.byte 0x1a ; effect ID
+@ Encore
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Pursuit
-	.byte 0x2d ; effect ID
+@ Pursuit
+	.byte 0x2d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rapid Spin
-	.byte 0x04 ; effect ID
+@ Rapid Spin
+	.byte 0x04 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sweet Scent
-	.byte 0x0d ; effect ID
+@ Sweet Scent
+	.byte 0x0d @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SWEET_SCENT ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SWEET_SCENT @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Iron Tail
-	.byte 0x0c ; effect ID
+@ Iron Tail
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Metal Claw
-	.byte 0x00 ; effect ID
+@ Metal Claw
+	.byte 0x00 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_METAL_SOUND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_METAL_SOUND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Vital Throw
-	.byte 0x29 ; effect ID
+@ Vital Throw
+	.byte 0x29 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Morning Sun
-	.byte 0x22 ; effect ID
+@ Morning Sun
+	.byte 0x22 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Synthesis
-	.byte 0x22 ; effect ID
+@ Synthesis
+	.byte 0x22 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Moonlight
-	.byte 0x22 ; effect ID
+@ Moonlight
+	.byte 0x22 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hidden Power
-	.byte 0x03 ; effect ID
+@ Hidden Power
+	.byte 0x03 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Cross Chop
-	.byte 0x25 ; effect ID
+@ Cross Chop
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Twister
-	.byte 0x2b ; effect ID
+@ Twister
+	.byte 0x2b @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rain Dance
-	.byte 0x2e ; effect ID
+@ Rain Dance
+	.byte 0x2e @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_RAIN_DANCE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_RAIN_DANCE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sunny Day
-	.byte 0x2e ; effect ID
+@ Sunny Day
+	.byte 0x2e @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SUNNY_DAY ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_SUNNY_DAY @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Crunch
-	.byte 0x0c ; effect ID
+@ Crunch
+	.byte 0x0c @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mirror Coat
-	.byte 0x04 ; effect ID
+@ Mirror Coat
+	.byte 0x04 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Psych Up
-	.byte 0x23 ; effect ID
+@ Psych Up
+	.byte 0x23 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Extreme Speed
-	.byte 0x28 ; effect ID
+@ Extreme Speed
+	.byte 0x28 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ancient Power
-	.byte 0x26 ; effect ID
+@ Ancient Power
+	.byte 0x26 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Shadow Ball
-	.byte 0x10 ; effect ID
+@ Shadow Ball
+	.byte 0x10 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Future Sight
-	.byte 0x2f ; effect ID
+@ Future Sight
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rock Smash
-	.byte 0x27 ; effect ID
+@ Rock Smash
+	.byte 0x27 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Whirlpool
-	.byte 0x2f ; effect ID
+@ Whirlpool
+	.byte 0x2f @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Beat Up
-	.byte 0x2d ; effect ID
+@ Beat Up
+	.byte 0x2d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fake Out
-	.byte 0x13 ; effect ID
+@ Fake Out
+	.byte 0x13 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_FAKE_OUT ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_FAKE_OUT @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Uproar
-	.byte 0x2b ; effect ID
+@ Uproar
+	.byte 0x2b @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Stockpile
-	.byte 0x04 ; effect ID
+@ Stockpile
+	.byte 0x04 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_STOCKPILE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_STOCKPILE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Spit Up
-	.byte 0x00 ; effect ID
+@ Spit Up
+	.byte 0x00 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Swallow
-	.byte 0x26 ; effect ID
+@ Swallow
+	.byte 0x26 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Heat Wave
-	.byte 0x00 ; effect ID
+@ Heat Wave
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hail
-	.byte 0x0d ; effect ID
+@ Hail
+	.byte 0x0d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_HAIL ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_HAIL @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Torment
-	.byte 0x1a ; effect ID
+@ Torment
+	.byte 0x1a @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Flatter
-	.byte 0x1a ; effect ID
+@ Flatter
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Will-O-Wisp
-	.byte 0x0c ; effect ID
+@ Will-O-Wisp
+	.byte 0x0c @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Memento
-	.byte 0x02 ; effect ID
+@ Memento
+	.byte 0x02 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Facade
-	.byte 0x1e ; effect ID
+@ Facade
+	.byte 0x1e @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Focus Punch
-	.byte 0x29 ; effect ID
+@ Focus Punch
+	.byte 0x29 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Smelling Salt
-	.byte 0x0a ; effect ID
+@ Smelling Salt
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Follow Me
-	.byte 0x2f ; effect ID
+@ Follow Me
+	.byte 0x2f @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Nature Power
-	.byte 0x2e ; effect ID
+@ Nature Power
+	.byte 0x2e @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Charge
-	.byte 0x23 ; effect ID
+@ Charge
+	.byte 0x23 @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CHARGE ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_CHARGE @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Taunt
-	.byte 0x1a ; effect ID
+@ Taunt
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_TAUNT ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_TAUNT @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Helping Hand
-	.byte 0x1a ; effect ID
+@ Helping Hand
+	.byte 0x1a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Trick
-	.byte 0x23 ; effect ID
+@ Trick
+	.byte 0x23 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Role Play
-	.byte 0x1f ; effect ID
+@ Role Play
+	.byte 0x1f @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Wish
-	.byte 0x2f ; effect ID
+@ Wish
+	.byte 0x2f @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Assist
-	.byte 0x22 ; effect ID
+@ Assist
+	.byte 0x22 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ingrain
-	.byte 0x05 ; effect ID
+@ Ingrain
+	.byte 0x05 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Superpower
-	.byte 0x01 ; effect ID
+@ Superpower
+	.byte 0x01 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Magic Coat
-	.byte 0x05 ; effect ID
+@ Magic Coat
+	.byte 0x05 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Recycle
-	.byte 0x03 ; effect ID
+@ Recycle
+	.byte 0x03 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Revenge
-	.byte 0x29 ; effect ID
+@ Revenge
+	.byte 0x29 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Brick Break
-	.byte 0x0c ; effect ID
+@ Brick Break
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Yawn
-	.byte 0x1a ; effect ID
+@ Yawn
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_YAWN ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_YAWN @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Knock Off
-	.byte 0x0c ; effect ID
+@ Knock Off
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Endeavor
-	.byte 0x1e ; effect ID
+@ Endeavor
+	.byte 0x1e @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Eruption
-	.byte 0x21 ; effect ID
+@ Eruption
+	.byte 0x21 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Skill Swap
-	.byte 0x1f ; effect ID
+@ Skill Swap
+	.byte 0x1f @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Imprison
-	.byte 0x1b ; effect ID
+@ Imprison
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Refresh
-	.byte 0x26 ; effect ID
+@ Refresh
+	.byte 0x26 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Grudge
-	.byte 0x21 ; effect ID
+@ Grudge
+	.byte 0x21 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Snatch
-	.byte 0x2d ; effect ID
+@ Snatch
+	.byte 0x2d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Secret Power
-	.byte 0x27 ; effect ID
+@ Secret Power
+	.byte 0x27 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dive
-	.byte 0x04 ; effect ID
+@ Dive
+	.byte 0x04 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_DIVE ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DIVE @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Arm Thrust
-	.byte 0x11 ; effect ID
+@ Arm Thrust
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Camouflage
-	.byte 0x25 ; effect ID
+@ Camouflage
+	.byte 0x25 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Tail Glow
-	.byte 0x26 ; effect ID
+@ Tail Glow
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Luster Purge
-	.byte 0x0a ; effect ID
+@ Luster Purge
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mist Ball
-	.byte 0x0c ; effect ID
+@ Mist Ball
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Feather Dance
-	.byte 0x1e ; effect ID
+@ Feather Dance
+	.byte 0x1e @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Teeter Dance
-	.byte 0x12 ; effect ID
+@ Teeter Dance
+	.byte 0x12 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Blaze Kick
-	.byte 0x00 ; effect ID
+@ Blaze Kick
+	.byte 0x00 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mud Sport
-	.byte 0x00 ; effect ID
+@ Mud Sport
+	.byte 0x00 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_MUD_SPORT ; combo starter ID
-	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_MUD_SPORT @ combo starter ID
+	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Ice Ball
-	.byte 0x2f ; effect ID
+@ Ice Ball
+	.byte 0x2f @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Needle Arm
-	.byte 0x0c ; effect ID
+@ Needle Arm
+	.byte 0x0c @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Slack Off
-	.byte 0x21 ; effect ID
+@ Slack Off
+	.byte 0x21 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_YAWN, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_YAWN, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hyper Voice
-	.byte 0x0d ; effect ID
+@ Hyper Voice
+	.byte 0x0d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Poison Fang
-	.byte 0x1b ; effect ID
+@ Poison Fang
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Crush Claw
-	.byte 0x0c ; effect ID
+@ Crush Claw
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Blast Burn
-	.byte 0x12 ; effect ID
+@ Blast Burn
+	.byte 0x12 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Hydro Cannon
-	.byte 0x12 ; effect ID
+@ Hydro Cannon
+	.byte 0x12 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Meteor Mash
-	.byte 0x23 ; effect ID
+@ Meteor Mash
+	.byte 0x23 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Astonish
-	.byte 0x0a ; effect ID
+@ Astonish
+	.byte 0x0a @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Weather Ball
-	.byte 0x00 ; effect ID
+@ Weather Ball
+	.byte 0x00 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Aromatherapy
-	.byte 0x1e ; effect ID
+@ Aromatherapy
+	.byte 0x1e @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Fake Tears
-	.byte 0x1e ; effect ID
+@ Fake Tears
+	.byte 0x1e @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Air Cutter
-	.byte 0x13 ; effect ID
+@ Air Cutter
+	.byte 0x13 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Overheat
-	.byte 0x01 ; effect ID
+@ Overheat
+	.byte 0x01 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Odor Sleuth
-	.byte 0x1b ; effect ID
+@ Odor Sleuth
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rock Tomb
-	.byte 0x2f ; effect ID
+@ Rock Tomb
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Silver Wind
-	.byte 0x26 ; effect ID
+@ Silver Wind
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Metal Sound
-	.byte 0x0d ; effect ID
+@ Metal Sound
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_METAL_SOUND ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_METAL_SOUND @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Grass Whistle
-	.byte 0x0d ; effect ID
+@ Grass Whistle
+	.byte 0x0d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Tickle
-	.byte 0x1b ; effect ID
+@ Tickle
+	.byte 0x1b @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Cosmic Power
-	.byte 0x26 ; effect ID
+@ Cosmic Power
+	.byte 0x26 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Water Spout
-	.byte 0x21 ; effect ID
+@ Water Spout
+	.byte 0x21 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Signal Beam
-	.byte 0x2b ; effect ID
+@ Signal Beam
+	.byte 0x2b @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Shadow Punch
-	.byte 0x1d ; effect ID
+@ Shadow Punch
+	.byte 0x1d @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Extrasensory
-	.byte 0x0c ; effect ID
+@ Extrasensory
+	.byte 0x0c @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sky Uppercut
-	.byte 0x13 ; effect ID
+@ Sky Uppercut
+	.byte 0x13 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sand Tomb
-	.byte 0x2f ; effect ID
+@ Sand Tomb
+	.byte 0x2f @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_SANDSTORM, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_SANDSTORM, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Sheer Cold
-	.byte 0x2d ; effect ID
+@ Sheer Cold
+	.byte 0x2d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Muddy Water
-	.byte 0x11 ; effect ID
+@ Muddy Water
+	.byte 0x11 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bullet Seed
-	.byte 0x2d ; effect ID
+@ Bullet Seed
+	.byte 0x2d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Aerial Ace
-	.byte 0x1d ; effect ID
+@ Aerial Ace
+	.byte 0x1d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Icicle Spear
-	.byte 0x13 ; effect ID
+@ Icicle Spear
+	.byte 0x13 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Iron Defense
-	.byte 0x05 ; effect ID
+@ Iron Defense
+	.byte 0x05 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Block
-	.byte 0x1a ; effect ID
+@ Block
+	.byte 0x1a @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Howl
-	.byte 0x26 ; effect ID
+@ Howl
+	.byte 0x26 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dragon Claw
-	.byte 0x13 ; effect ID
+@ Dragon Claw
+	.byte 0x13 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Frenzy Plant
-	.byte 0x12 ; effect ID
+@ Frenzy Plant
+	.byte 0x12 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bulk Up
-	.byte 0x26 ; effect ID
+@ Bulk Up
+	.byte 0x26 @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Bounce
-	.byte 0x05 ; effect ID
+@ Bounce
+	.byte 0x05 @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Mud Shot
-	.byte 0x0d ; effect ID
+@ Mud Shot
+	.byte 0x0d @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Poison Tail
-	.byte 0x1b ; effect ID
+@ Poison Tail
+	.byte 0x1b @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Covet
-	.byte 0x1f ; effect ID
+@ Covet
+	.byte 0x1f @ effect ID
 	.byte CONTEST_CUTE
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Volt Tackle
-	.byte 0x01 ; effect ID
+@ Volt Tackle
+	.byte 0x01 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Magical Leaf
-	.byte 0x1d ; effect ID
+@ Magical Leaf
+	.byte 0x1d @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Water Sport
-	.byte 0x00 ; effect ID
+@ Water Sport
+	.byte 0x00 @ effect ID
 	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_WATER_SPORT ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_WATER_SPORT @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Calm Mind
-	.byte 0x04 ; effect ID
+@ Calm Mind
+	.byte 0x04 @ effect ID
 	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CALM_MIND ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_CALM_MIND @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Leaf Blade
-	.byte 0x25 ; effect ID
+@ Leaf Blade
+	.byte 0x25 @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Dragon Dance
-	.byte 0x26 ; effect ID
+@ Dragon Dance
+	.byte 0x26 @ effect ID
 	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_DANCE ; combo starter ID
-	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte COMBO_STARTER_DRAGON_DANCE @ combo starter ID
+	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Rock Blast
-	.byte 0x23 ; effect ID
+@ Rock Blast
+	.byte 0x23 @ effect ID
 	.byte CONTEST_TOUGH
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Shock Wave
-	.byte 0x1d ; effect ID
+@ Shock Wave
+	.byte 0x1d @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Water Pulse
-	.byte 0x2b ; effect ID
+@ Water Pulse
+	.byte 0x2b @ effect ID
 	.byte CONTEST_BEAUTY
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Doom Desire
-	.byte 0x2f ; effect ID
+@ Doom Desire
+	.byte 0x2f @ effect ID
 	.byte CONTEST_COOL
-	.byte 0 ; combo starter ID
-	.byte 0, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte 0, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
 
-; Psycho Boost
-	.byte 0x01 ; effect ID
+@ Psycho Boost
+	.byte 0x01 @ effect ID
 	.byte CONTEST_SMART
-	.byte 0 ; combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 ; moves this move can follow to make a combo
-	.byte 0 ; padding
+	.byte 0 @ combo starter ID
+	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ moves this move can follow to make a combo
+	.byte 0 @ padding
diff --git a/data/data1.s b/data/data1.s
index bbd82abe2..5d3aa509c 100644
--- a/data/data1.s
+++ b/data/data1.s
@@ -1,1242 +1,1242 @@
-; the first big chunk of data
+@ the first big chunk of data
 
-; 81DB67C
+@ 81DB67C
 	.include "data/event_script_command_function_table.s"
 
-gUnknown_081DBA08: ; 81DBA08
+gUnknown_081DBA08: @ 81DBA08
 	.incbin "base_emerald.gba", 0x1dba08, 0x4
 
-gUnknown_081DBA0C: ; 81DBA0C
+gUnknown_081DBA0C: @ 81DBA0C
 	.incbin "base_emerald.gba", 0x1dba0c, 0x58
 
-gUnknown_081DBA64: ; 81DBA64
+gUnknown_081DBA64: @ 81DBA64
 	.incbin "base_emerald.gba", 0x1dba64, 0x83c
 
-gUnknown_081DC2A0: ; 81DC2A0
+gUnknown_081DC2A0: @ 81DC2A0
 	.incbin "base_emerald.gba", 0x1dc2a0, 0x2c
 
-gUnknown_081DC2CC: ; 81DC2CC
+gUnknown_081DC2CC: @ 81DC2CC
 	.incbin "base_emerald.gba", 0x1dc2cc, 0x34ee
 
-gUnknown_081DF7BA: ; 81DF7BA
+gUnknown_081DF7BA: @ 81DF7BA
 	.incbin "base_emerald.gba", 0x1df7ba, 0x69a3
 
-gUnknown_081E615D: ; 81E615D
+gUnknown_081E615D: @ 81E615D
 	.incbin "base_emerald.gba", 0x1e615d, 0xe88f
 
-gUnknown_081F49EC: ; 81F49EC
+gUnknown_081F49EC: @ 81F49EC
 	.incbin "base_emerald.gba", 0x1f49ec, 0x3c21
 
-gUnknown_081F860D: ; 81F860D
+gUnknown_081F860D: @ 81F860D
 	.incbin "base_emerald.gba", 0x1f860d, 0x32
 
-gUnknown_081F863F: ; 81F863F
+gUnknown_081F863F: @ 81F863F
 	.incbin "base_emerald.gba", 0x1f863f, 0xf14
 
-gUnknown_081F9553: ; 81F9553
+gUnknown_081F9553: @ 81F9553
 	.incbin "base_emerald.gba", 0x1f9553, 0x3c
 
-gUnknown_081F958F: ; 81F958F
+gUnknown_081F958F: @ 81F958F
 	.incbin "base_emerald.gba", 0x1f958f, 0xf47
 
-gUnknown_081FA4D6: ; 81FA4D6
+gUnknown_081FA4D6: @ 81FA4D6
 	.incbin "base_emerald.gba", 0x1fa4d6, 0x18ba5
 
-gUnknown_0821307B: ; 821307B
+gUnknown_0821307B: @ 821307B
 	.incbin "base_emerald.gba", 0x21307b, 0x110dd
 
-gUnknown_08224158: ; 8224158
+gUnknown_08224158: @ 8224158
 	.incbin "base_emerald.gba", 0x224158, 0xf
 
-gUnknown_08224167: ; 8224167
+gUnknown_08224167: @ 8224167
 	.incbin "base_emerald.gba", 0x224167, 0xe
 
-gUnknown_08224175: ; 8224175
+gUnknown_08224175: @ 8224175
 	.incbin "base_emerald.gba", 0x224175, 0x14d3a
 
-gUnknown_08238EAF: ; 8238EAF
+gUnknown_08238EAF: @ 8238EAF
 	.incbin "base_emerald.gba", 0x238eaf, 0x54a
 
-gUnknown_082393F9: ; 82393F9
+gUnknown_082393F9: @ 82393F9
 	.incbin "base_emerald.gba", 0x2393f9, 0x20c2
 
-gUnknown_0823B4BB: ; 823B4BB
+gUnknown_0823B4BB: @ 823B4BB
 	.incbin "base_emerald.gba", 0x23b4bb, 0x2d
 
-gUnknown_0823B4E8: ; 823B4E8
+gUnknown_0823B4E8: @ 823B4E8
 	.incbin "base_emerald.gba", 0x23b4e8, 0xa1
 
-gUnknown_0823B589: ; 823B589
+gUnknown_0823B589: @ 823B589
 	.incbin "base_emerald.gba", 0x23b589, 0x60
 
-gUnknown_0823B5E9: ; 823B5E9
+gUnknown_0823B5E9: @ 823B5E9
 	.incbin "base_emerald.gba", 0x23b5e9, 0x9b
 
-gUnknown_0823B684: ; 823B684
+gUnknown_0823B684: @ 823B684
 	.incbin "base_emerald.gba", 0x23b684, 0x8
 
-gUnknown_0823B68C: ; 823B68C
+gUnknown_0823B68C: @ 823B68C
 	.incbin "base_emerald.gba", 0x23b68c, 0x9c4
 
-gUnknown_0823C050: ; 823C050
+gUnknown_0823C050: @ 823C050
 	.incbin "base_emerald.gba", 0x23c050, 0x6431
 
-gUnknown_08242481: ; 8242481
+gUnknown_08242481: @ 8242481
 	.incbin "base_emerald.gba", 0x242481, 0x87b
 
-gUnknown_08242CFC: ; 8242CFC
+gUnknown_08242CFC: @ 8242CFC
 	.incbin "base_emerald.gba", 0x242cfc, 0x6a91
 
-gUnknown_0824978D: ; 824978D
+gUnknown_0824978D: @ 824978D
 	.incbin "base_emerald.gba", 0x24978d, 0xe
 
-gUnknown_0824979B: ; 824979B
+gUnknown_0824979B: @ 824979B
 	.incbin "base_emerald.gba", 0x24979b, 0x944d
 
-gUnknown_08252BE8: ; 8252BE8
+gUnknown_08252BE8: @ 8252BE8
 	.incbin "base_emerald.gba", 0x252be8, 0x67
 
-gUnknown_08252C4F: ; 8252C4F
+gUnknown_08252C4F: @ 8252C4F
 	.incbin "base_emerald.gba", 0x252c4f, 0x1b
 
-gUnknown_08252C6A: ; 8252C6A
+gUnknown_08252C6A: @ 8252C6A
 	.incbin "base_emerald.gba", 0x252c6a, 0x1e
 
-gUnknown_08252C88: ; 8252C88
+gUnknown_08252C88: @ 8252C88
 	.incbin "base_emerald.gba", 0x252c88, 0x1f
 
-gUnknown_08252CA7: ; 8252CA7
+gUnknown_08252CA7: @ 8252CA7
 	.incbin "base_emerald.gba", 0x252ca7, 0x54
 
-gUnknown_08252CFB: ; 8252CFB
+gUnknown_08252CFB: @ 8252CFB
 	.incbin "base_emerald.gba", 0x252cfb, 0x151e0
 
-gUnknown_08267EDB: ; 8267EDB
+gUnknown_08267EDB: @ 8267EDB
 	.incbin "base_emerald.gba", 0x267edb, 0x234f
 
-gUnknown_0826A22A: ; 826A22A
+gUnknown_0826A22A: @ 826A22A
 	.incbin "base_emerald.gba", 0x26a22a, 0x712a
 
-gUnknown_08271354: ; 8271354
+gUnknown_08271354: @ 8271354
 	.incbin "base_emerald.gba", 0x271354, 0xe
 
-gUnknown_08271362: ; 8271362
+gUnknown_08271362: @ 8271362
 	.incbin "base_emerald.gba", 0x271362, 0x28
 
-gUnknown_0827138A: ; 827138A
+gUnknown_0827138A: @ 827138A
 	.incbin "base_emerald.gba", 0x27138a, 0x38
 
-gUnknown_082713C2: ; 82713C2
+gUnknown_082713C2: @ 82713C2
 	.incbin "base_emerald.gba", 0x2713c2, 0xf
 
-gUnknown_082713D1: ; 82713D1
+gUnknown_082713D1: @ 82713D1
 	.incbin "base_emerald.gba", 0x2713d1, 0x27
 
-gUnknown_082713F8: ; 82713F8
+gUnknown_082713F8: @ 82713F8
 	.incbin "base_emerald.gba", 0x2713f8, 0x1e6
 
-gUnknown_082715DE: ; 82715DE
+gUnknown_082715DE: @ 82715DE
 	.incbin "base_emerald.gba", 0x2715de, 0x279
 
-gUnknown_08271857: ; 8271857
+gUnknown_08271857: @ 8271857
 	.incbin "base_emerald.gba", 0x271857, 0xb
 
-gUnknown_08271862: ; 8271862
+gUnknown_08271862: @ 8271862
 	.incbin "base_emerald.gba", 0x271862, 0x455
 
-gUnknown_08271CB7: ; 8271CB7
+gUnknown_08271CB7: @ 8271CB7
 	.incbin "base_emerald.gba", 0x271cb7, 0xdb
 
-gUnknown_08271D92: ; 8271D92
+gUnknown_08271D92: @ 8271D92
 	.incbin "base_emerald.gba", 0x271d92, 0x10e
 
-gUnknown_08271EA0: ; 8271EA0
+gUnknown_08271EA0: @ 8271EA0
 	.incbin "base_emerald.gba", 0x271ea0, 0x1ef
 
-gUnknown_0827208F: ; 827208F
+gUnknown_0827208F: @ 827208F
 	.incbin "base_emerald.gba", 0x27208f, 0x53f
 
-gUnknown_082725CE: ; 82725CE
+gUnknown_082725CE: @ 82725CE
 	.incbin "base_emerald.gba", 0x2725ce, 0x9
 
-gUnknown_082725D7: ; 82725D7
+gUnknown_082725D7: @ 82725D7
 	.incbin "base_emerald.gba", 0x2725d7, 0x9
 
-gUnknown_082725E0: ; 82725E0
+gUnknown_082725E0: @ 82725E0
 	.incbin "base_emerald.gba", 0x2725e0, 0x9
 
-gUnknown_082725E9: ; 82725E9
+gUnknown_082725E9: @ 82725E9
 	.incbin "base_emerald.gba", 0x2725e9, 0x9
 
-gUnknown_082725F2: ; 82725F2
+gUnknown_082725F2: @ 82725F2
 	.incbin "base_emerald.gba", 0x2725f2, 0x9
 
-gUnknown_082725FB: ; 82725FB
+gUnknown_082725FB: @ 82725FB
 	.incbin "base_emerald.gba", 0x2725fb, 0x9
 
-gUnknown_08272604: ; 8272604
+gUnknown_08272604: @ 8272604
 	.incbin "base_emerald.gba", 0x272604, 0x6b
 
-gUnknown_0827266F: ; 827266F
+gUnknown_0827266F: @ 827266F
 	.incbin "base_emerald.gba", 0x27266f, 0x1044
 
-gUnknown_082736B3: ; 82736B3
+gUnknown_082736B3: @ 82736B3
 	.incbin "base_emerald.gba", 0x2736b3, 0x9
 
-gUnknown_082736BC: ; 82736BC
+gUnknown_082736BC: @ 82736BC
 	.incbin "base_emerald.gba", 0x2736bc, 0x15f
 
-gUnknown_0827381B: ; 827381B
+gUnknown_0827381B: @ 827381B
 	.incbin "base_emerald.gba", 0x27381b, 0x504
 
-gUnknown_08273D1F: ; 8273D1F
+gUnknown_08273D1F: @ 8273D1F
 	.incbin "base_emerald.gba", 0x273d1f, 0x5c7
 
-gUnknown_082742E6: ; 82742E6
+gUnknown_082742E6: @ 82742E6
 	.incbin "base_emerald.gba", 0x2742e6, 0x13
 
-gUnknown_082742F9: ; 82742F9
+gUnknown_082742F9: @ 82742F9
 	.incbin "base_emerald.gba", 0x2742f9, 0x189
 
-gUnknown_08274482: ; 8274482
+gUnknown_08274482: @ 8274482
 	.incbin "base_emerald.gba", 0x274482, 0x3e
 
-gUnknown_082744C0: ; 82744C0
+gUnknown_082744C0: @ 82744C0
 	.incbin "base_emerald.gba", 0x2744c0, 0x4a6
 
-gUnknown_08274966: ; 8274966
+gUnknown_08274966: @ 8274966
 	.incbin "base_emerald.gba", 0x274966, 0x1be
 
-gUnknown_08274B24: ; 8274B24
+gUnknown_08274B24: @ 8274B24
 	.incbin "base_emerald.gba", 0x274b24, 0x1ef
 
-gUnknown_08274D13: ; 8274D13
+gUnknown_08274D13: @ 8274D13
 	.incbin "base_emerald.gba", 0x274d13, 0x162
 
-gUnknown_08274E75: ; 8274E75
+gUnknown_08274E75: @ 8274E75
 	.incbin "base_emerald.gba", 0x274e75, 0x189
 
-gUnknown_08274FFE: ; 8274FFE
+gUnknown_08274FFE: @ 8274FFE
 	.incbin "base_emerald.gba", 0x274ffe, 0x1e3
 
-gUnknown_082751E1: ; 82751E1
+gUnknown_082751E1: @ 82751E1
 	.incbin "base_emerald.gba", 0x2751e1, 0x186
 
-gUnknown_08275367: ; 8275367
+gUnknown_08275367: @ 8275367
 	.incbin "base_emerald.gba", 0x275367, 0x18f
 
-gUnknown_082754F6: ; 82754F6
+gUnknown_082754F6: @ 82754F6
 	.incbin "base_emerald.gba", 0x2754f6, 0x1d1
 
-gUnknown_082756C7: ; 82756C7
+gUnknown_082756C7: @ 82756C7
 	.incbin "base_emerald.gba", 0x2756c7, 0x205
 
-gUnknown_082758CC: ; 82758CC
+gUnknown_082758CC: @ 82758CC
 	.incbin "base_emerald.gba", 0x2758cc, 0x125
 
-gUnknown_082759F1: ; 82759F1
+gUnknown_082759F1: @ 82759F1
 	.incbin "base_emerald.gba", 0x2759f1, 0x95
 
-gUnknown_08275A86: ; 8275A86
+gUnknown_08275A86: @ 8275A86
 	.incbin "base_emerald.gba", 0x275a86, 0x59
 
-gUnknown_08275ADF: ; 8275ADF
+gUnknown_08275ADF: @ 8275ADF
 	.incbin "base_emerald.gba", 0x275adf, 0x59
 
-gUnknown_08275B38: ; 8275B38
+gUnknown_08275B38: @ 8275B38
 	.incbin "base_emerald.gba", 0x275b38, 0x7f
 
-gUnknown_08275BB7: ; 8275BB7
+gUnknown_08275BB7: @ 8275BB7
 	.incbin "base_emerald.gba", 0x275bb7, 0x155
 
-gUnknown_08275D0C: ; 8275D0C
+gUnknown_08275D0C: @ 8275D0C
 	.incbin "base_emerald.gba", 0x275d0c, 0x13
 
-gUnknown_08275D1F: ; 8275D1F
+gUnknown_08275D1F: @ 8275D1F
 	.incbin "base_emerald.gba", 0x275d1f, 0xf
 
-gUnknown_08275D2E: ; 8275D2E
+gUnknown_08275D2E: @ 8275D2E
 	.incbin "base_emerald.gba", 0x275d2e, 0x974
 
-gUnknown_082766A2: ; 82766A2
+gUnknown_082766A2: @ 82766A2
 	.incbin "base_emerald.gba", 0x2766a2, 0x4
 
-gUnknown_082766A6: ; 82766A6
+gUnknown_082766A6: @ 82766A6
 	.incbin "base_emerald.gba", 0x2766a6, 0xcbf
 
-gUnknown_08277365: ; 8277365
+gUnknown_08277365: @ 8277365
 	.incbin "base_emerald.gba", 0x277365, 0xf
 
-gUnknown_08277374: ; 8277374
+gUnknown_08277374: @ 8277374
 	.incbin "base_emerald.gba", 0x277374, 0xa
 
-gUnknown_0827737E: ; 827737E
+gUnknown_0827737E: @ 827737E
 	.incbin "base_emerald.gba", 0x27737e, 0xa
 
-gUnknown_08277388: ; 8277388
+gUnknown_08277388: @ 8277388
 	.incbin "base_emerald.gba", 0x277388, 0x1b
 
-gUnknown_082773A3: ; 82773A3
+gUnknown_082773A3: @ 82773A3
 	.incbin "base_emerald.gba", 0x2773a3, 0x1b
 
-gUnknown_082773BE: ; 82773BE
+gUnknown_082773BE: @ 82773BE
 	.incbin "base_emerald.gba", 0x2773be, 0x1b
 
-gUnknown_082773D9: ; 82773D9
+gUnknown_082773D9: @ 82773D9
 	.incbin "base_emerald.gba", 0x2773d9, 0x1c
 
-gUnknown_082773F5: ; 82773F5
+gUnknown_082773F5: @ 82773F5
 	.incbin "base_emerald.gba", 0x2773f5, 0xa
 
-gUnknown_082773FF: ; 82773FF
+gUnknown_082773FF: @ 82773FF
 	.incbin "base_emerald.gba", 0x2773ff, 0x1e
 
-gUnknown_0827741D: ; 827741D
+gUnknown_0827741D: @ 827741D
 	.incbin "base_emerald.gba", 0x27741d, 0x15
 
-gUnknown_08277432: ; 8277432
+gUnknown_08277432: @ 8277432
 	.incbin "base_emerald.gba", 0x277432, 0x15
 
-gUnknown_08277447: ; 8277447
+gUnknown_08277447: @ 8277447
 	.incbin "base_emerald.gba", 0x277447, 0x15
 
-gUnknown_0827745C: ; 827745C
+gUnknown_0827745C: @ 827745C
 	.incbin "base_emerald.gba", 0x27745c, 0x22
 
-gUnknown_0827747E: ; 827747E
+gUnknown_0827747E: @ 827747E
 	.incbin "base_emerald.gba", 0x27747e, 0xf
 
-gUnknown_0827748D: ; 827748D
+gUnknown_0827748D: @ 827748D
 	.incbin "base_emerald.gba", 0x27748d, 0xf
 
-gUnknown_0827749C: ; 827749C
+gUnknown_0827749C: @ 827749C
 	.incbin "base_emerald.gba", 0x27749c, 0x53
 
-gUnknown_082774EF: ; 82774EF
+gUnknown_082774EF: @ 82774EF
 	.incbin "base_emerald.gba", 0x2774ef, 0x1a
 
-gUnknown_08277509: ; 8277509
+gUnknown_08277509: @ 8277509
 	.incbin "base_emerald.gba", 0x277509, 0xa
 
-gUnknown_08277513: ; 8277513
+gUnknown_08277513: @ 8277513
 	.incbin "base_emerald.gba", 0x277513, 0x677
 
-gUnknown_08277B8A: ; 8277B8A
+gUnknown_08277B8A: @ 8277B8A
 	.incbin "base_emerald.gba", 0x277b8a, 0x507
 
-gUnknown_08278091: ; 8278091
+gUnknown_08278091: @ 8278091
 	.incbin "base_emerald.gba", 0x278091, 0x22
 
-gUnknown_082780B3: ; 82780B3
+gUnknown_082780B3: @ 82780B3
 	.incbin "base_emerald.gba", 0x2780b3, 0x3f
 
-gUnknown_082780F2: ; 82780F2
+gUnknown_082780F2: @ 82780F2
 	.incbin "base_emerald.gba", 0x2780f2, 0x3f
 
-gUnknown_08278131: ; 8278131
+gUnknown_08278131: @ 8278131
 	.incbin "base_emerald.gba", 0x278131, 0x4a51
 
-; 827CB82
+@ 827CB82
 	.include "data/text/contest_text.s"
 
-gUnknown_0827D507: ; 827D507
+gUnknown_0827D507: @ 827D507
 	.incbin "base_emerald.gba", 0x27d507, 0x2a
 
-gUnknown_0827D531: ; 827D531
+gUnknown_0827D531: @ 827D531
 	.incbin "base_emerald.gba", 0x27d531, 0x29
 
-gUnknown_0827D55A: ; 827D55A
+gUnknown_0827D55A: @ 827D55A
 	.incbin "base_emerald.gba", 0x27d55a, 0x15
 
-gUnknown_0827D56F: ; 827D56F
+gUnknown_0827D56F: @ 827D56F
 	.incbin "base_emerald.gba", 0x27d56f, 0x28
 
-gUnknown_0827D597: ; 827D597
+gUnknown_0827D597: @ 827D597
 	.incbin "base_emerald.gba", 0x27d597, 0xd67
 
-gUnknown_0827E2FE: ; 827E2FE
+gUnknown_0827E2FE: @ 827E2FE
 	.incbin "base_emerald.gba", 0x27e2fe, 0x30
 
-gUnknown_0827E32E: ; 827E32E
+gUnknown_0827E32E: @ 827E32E
 	.incbin "base_emerald.gba", 0x27e32e, 0x2d
 
-gUnknown_0827E35B: ; 827E35B
+gUnknown_0827E35B: @ 827E35B
 	.incbin "base_emerald.gba", 0x27e35b, 0x32
 
-gUnknown_0827E38D: ; 827E38D
+gUnknown_0827E38D: @ 827E38D
 	.incbin "base_emerald.gba", 0x27e38d, 0x1fd
 
-gUnknown_0827E58A: ; 827E58A
+gUnknown_0827E58A: @ 827E58A
 	.incbin "base_emerald.gba", 0x27e58a, 0x159
 
-gUnknown_0827E6E3: ; 827E6E3
+gUnknown_0827E6E3: @ 827E6E3
 	.incbin "base_emerald.gba", 0x27e6e3, 0x34
 
-gUnknown_0827E717: ; 827E717
+gUnknown_0827E717: @ 827E717
 	.incbin "base_emerald.gba", 0x27e717, 0x25
 
-gUnknown_0827E73C: ; 827E73C
+gUnknown_0827E73C: @ 827E73C
 	.incbin "base_emerald.gba", 0x27e73c, 0x2e
 
-gUnknown_0827E76A: ; 827E76A
+gUnknown_0827E76A: @ 827E76A
 	.incbin "base_emerald.gba", 0x27e76a, 0x29
 
-gUnknown_0827E793: ; 827E793
+gUnknown_0827E793: @ 827E793
 	.incbin "base_emerald.gba", 0x27e793, 0x57
 
-gUnknown_0827E7EA: ; 827E7EA
+gUnknown_0827E7EA: @ 827E7EA
 	.incbin "base_emerald.gba", 0x27e7ea, 0x2d
 
-gUnknown_0827E817: ; 827E817
+gUnknown_0827E817: @ 827E817
 	.incbin "base_emerald.gba", 0x27e817, 0x20
 
-gUnknown_0827E837: ; 827E837
+gUnknown_0827E837: @ 827E837
 	.incbin "base_emerald.gba", 0x27e837, 0x8
 
-gUnknown_0827E83F: ; 827E83F
+gUnknown_0827E83F: @ 827E83F
 	.incbin "base_emerald.gba", 0x27e83f, 0x8
 
-gUnknown_0827E847: ; 827E847
+gUnknown_0827E847: @ 827E847
 	.incbin "base_emerald.gba", 0x27e847, 0x9
 
-gUnknown_0827E850: ; 827E850
+gUnknown_0827E850: @ 827E850
 	.incbin "base_emerald.gba", 0x27e850, 0xa
 
-gUnknown_0827E85A: ; 827E85A
+gUnknown_0827E85A: @ 827E85A
 	.incbin "base_emerald.gba", 0x27e85a, 0x80
 
-gUnknown_0827E8DA: ; 827E8DA
+gUnknown_0827E8DA: @ 827E8DA
 	.incbin "base_emerald.gba", 0x27e8da, 0x132
 
-gUnknown_0827EA0C: ; 827EA0C
+gUnknown_0827EA0C: @ 827EA0C
 	.incbin "base_emerald.gba", 0x27ea0c, 0x3ff
 
-gUnknown_0827EE0B: ; 827EE0B
+gUnknown_0827EE0B: @ 827EE0B
 	.incbin "base_emerald.gba", 0x27ee0b, 0x118fa
 
-gUnknown_08290705: ; 8290705
+gUnknown_08290705: @ 8290705
 	.incbin "base_emerald.gba", 0x290705, 0xeb
 
-gUnknown_082907F0: ; 82907F0
+gUnknown_082907F0: @ 82907F0
 	.incbin "base_emerald.gba", 0x2907f0, 0x10d
 
-gUnknown_082908FD: ; 82908FD
+gUnknown_082908FD: @ 82908FD
 	.incbin "base_emerald.gba", 0x2908fd, 0x14c
 
-gUnknown_08290A49: ; 8290A49
+gUnknown_08290A49: @ 8290A49
 	.incbin "base_emerald.gba", 0x290a49, 0x3a
 
-gUnknown_08290A83: ; 8290A83
+gUnknown_08290A83: @ 8290A83
 	.incbin "base_emerald.gba", 0x290a83, 0x8c
 
-gUnknown_08290B0F: ; 8290B0F
+gUnknown_08290B0F: @ 8290B0F
 	.incbin "base_emerald.gba", 0x290b0f, 0x4b
 
-gUnknown_08290B5A: ; 8290B5A
+gUnknown_08290B5A: @ 8290B5A
 	.incbin "base_emerald.gba", 0x290b5a, 0x154
 
-gUnknown_08290CAE: ; 8290CAE
+gUnknown_08290CAE: @ 8290CAE
 	.incbin "base_emerald.gba", 0x290cae, 0x1312
 
-gUnknown_08291FC0: ; 8291FC0
+gUnknown_08291FC0: @ 8291FC0
 	.incbin "base_emerald.gba", 0x291fc0, 0x738
 
-gUnknown_082926F8: ; 82926F8
+gUnknown_082926F8: @ 82926F8
 	.incbin "base_emerald.gba", 0x2926f8, 0x6ed
 
-gUnknown_08292DE5: ; 8292DE5
+gUnknown_08292DE5: @ 8292DE5
 	.incbin "base_emerald.gba", 0x292de5, 0x1518
 
-gUnknown_082942FD: ; 82942FD
+gUnknown_082942FD: @ 82942FD
 	.incbin "base_emerald.gba", 0x2942fd, 0x4
 
-gUnknown_08294301: ; 8294301
+gUnknown_08294301: @ 8294301
 	.incbin "base_emerald.gba", 0x294301, 0x10829
 
-gUnknown_082A4B2A: ; 82A4B2A
+gUnknown_082A4B2A: @ 82A4B2A
 	.incbin "base_emerald.gba", 0x2a4b2a, 0x22
 
-gUnknown_082A4B4C: ; 82A4B4C
+gUnknown_082A4B4C: @ 82A4B4C
 	.incbin "base_emerald.gba", 0x2a4b4c, 0x23
 
-gUnknown_082A4B6F: ; 82A4B6F
+gUnknown_082A4B6F: @ 82A4B6F
 	.incbin "base_emerald.gba", 0x2a4b6f, 0x1b
 
-gUnknown_082A4B8A: ; 82A4B8A
+gUnknown_082A4B8A: @ 82A4B8A
 	.incbin "base_emerald.gba", 0x2a4b8a, 0x11
 
-gUnknown_082A4B9B: ; 82A4B9B
+gUnknown_082A4B9B: @ 82A4B9B
 	.incbin "base_emerald.gba", 0x2a4b9b, 0x11
 
-gUnknown_082A4BAC: ; 82A4BAC
+gUnknown_082A4BAC: @ 82A4BAC
 	.incbin "base_emerald.gba", 0x2a4bac, 0xf66
 
-gUnknown_082A5B12: ; 82A5B12
+gUnknown_082A5B12: @ 82A5B12
 	.incbin "base_emerald.gba", 0x2a5b12, 0x3c
 
-gUnknown_082A5B4E: ; 82A5B4E
+gUnknown_082A5B4E: @ 82A5B4E
 	.incbin "base_emerald.gba", 0x2a5b4e, 0x1d
 
-gUnknown_082A5B6B: ; 82A5B6B
+gUnknown_082A5B6B: @ 82A5B6B
 	.incbin "base_emerald.gba", 0x2a5b6b, 0x1e
 
-gUnknown_082A5B89: ; 82A5B89
+gUnknown_082A5B89: @ 82A5B89
 	.incbin "base_emerald.gba", 0x2a5b89, 0x42
 
-gUnknown_082A5BCB: ; 82A5BCB
+gUnknown_082A5BCB: @ 82A5BCB
 	.incbin "base_emerald.gba", 0x2a5bcb, 0xc
 
-gUnknown_082A5BD7: ; 82A5BD7
+gUnknown_082A5BD7: @ 82A5BD7
 	.incbin "base_emerald.gba", 0x2a5bd7, 0x9
 
-gUnknown_082A5BE0: ; 82A5BE0
+gUnknown_082A5BE0: @ 82A5BE0
 	.incbin "base_emerald.gba", 0x2a5be0, 0xf
 
-gUnknown_082A5BEF: ; 82A5BEF
+gUnknown_082A5BEF: @ 82A5BEF
 	.incbin "base_emerald.gba", 0x2a5bef, 0x15
 
-gUnknown_082A5C04: ; 82A5C04
+gUnknown_082A5C04: @ 82A5C04
 	.incbin "base_emerald.gba", 0x2a5c04, 0xf
 
-gUnknown_082A5C13: ; 82A5C13
+gUnknown_082A5C13: @ 82A5C13
 	.incbin "base_emerald.gba", 0x2a5c13, 0xe
 
-gUnknown_082A5C21: ; 82A5C21
+gUnknown_082A5C21: @ 82A5C21
 	.incbin "base_emerald.gba", 0x2a5c21, 0x40
 
-gUnknown_082A5C61: ; 82A5C61
+gUnknown_082A5C61: @ 82A5C61
 	.incbin "base_emerald.gba", 0x2a5c61, 0x3b
 
-gUnknown_082A5C9C: ; 82A5C9C
+gUnknown_082A5C9C: @ 82A5C9C
 	.incbin "base_emerald.gba", 0x2a5c9c, 0x90
 
-gUnknown_082A5D2C: ; 82A5D2C
+gUnknown_082A5D2C: @ 82A5D2C
 	.incbin "base_emerald.gba", 0x2a5d2c, 0x40
 
-gUnknown_082A5D6C: ; 82A5D6C
+gUnknown_082A5D6C: @ 82A5D6C
 	.incbin "base_emerald.gba", 0x2a5d6c, 0x3f
 
-gUnknown_082A5DAB: ; 82A5DAB
+gUnknown_082A5DAB: @ 82A5DAB
 	.incbin "base_emerald.gba", 0x2a5dab, 0x46
 
-gUnknown_082A5DF1: ; 82A5DF1
+gUnknown_082A5DF1: @ 82A5DF1
 	.incbin "base_emerald.gba", 0x2a5df1, 0x43
 
-gUnknown_082A5E34: ; 82A5E34
+gUnknown_082A5E34: @ 82A5E34
 	.incbin "base_emerald.gba", 0x2a5e34, 0x4f
 
-gUnknown_082A5E83: ; 82A5E83
+gUnknown_082A5E83: @ 82A5E83
 	.incbin "base_emerald.gba", 0x2a5e83, 0x36
 
-gUnknown_082A5EB9: ; 82A5EB9
+gUnknown_082A5EB9: @ 82A5EB9
 	.incbin "base_emerald.gba", 0x2a5eb9, 0x3b
 
-gUnknown_082A5EF4: ; 82A5EF4
+gUnknown_082A5EF4: @ 82A5EF4
 	.incbin "base_emerald.gba", 0x2a5ef4, 0x45
 
-gUnknown_082A5F39: ; 82A5F39
+gUnknown_082A5F39: @ 82A5F39
 	.incbin "base_emerald.gba", 0x2a5f39, 0x49
 
-gUnknown_082A5F82: ; 82A5F82
+gUnknown_082A5F82: @ 82A5F82
 	.incbin "base_emerald.gba", 0x2a5f82, 0x37
 
-gUnknown_082A5FB9: ; 82A5FB9
+gUnknown_082A5FB9: @ 82A5FB9
 	.incbin "base_emerald.gba", 0x2a5fb9, 0x5f
 
-gUnknown_082A6018: ; 82A6018
+gUnknown_082A6018: @ 82A6018
 	.incbin "base_emerald.gba", 0x2a6018, 0x49
 
-gUnknown_082A6061: ; 82A6061
+gUnknown_082A6061: @ 82A6061
 	.incbin "base_emerald.gba", 0x2a6061, 0x3b
 
-gUnknown_082A609C: ; 82A609C
+gUnknown_082A609C: @ 82A609C
 	.incbin "base_emerald.gba", 0x2a609c, 0x39
 
-gUnknown_082A60D5: ; 82A60D5
+gUnknown_082A60D5: @ 82A60D5
 	.incbin "base_emerald.gba", 0x2a60d5, 0x4f
 
-gUnknown_082A6124: ; 82A6124
+gUnknown_082A6124: @ 82A6124
 	.incbin "base_emerald.gba", 0x2a6124, 0x4b
 
-gUnknown_082A616F: ; 82A616F
+gUnknown_082A616F: @ 82A616F
 	.incbin "base_emerald.gba", 0x2a616f, 0x67
 
-gUnknown_082A61D6: ; 82A61D6
+gUnknown_082A61D6: @ 82A61D6
 	.incbin "base_emerald.gba", 0x2a61d6, 0x64
 
-gUnknown_082A623A: ; 82A623A
+gUnknown_082A623A: @ 82A623A
 	.incbin "base_emerald.gba", 0x2a623a, 0x4d
 
-gUnknown_082A6287: ; 82A6287
+gUnknown_082A6287: @ 82A6287
 	.incbin "base_emerald.gba", 0x2a6287, 0x42
 
-gUnknown_082A62C9: ; 82A62C9
+gUnknown_082A62C9: @ 82A62C9
 	.incbin "base_emerald.gba", 0x2a62c9, 0x49
 
-gUnknown_082A6312: ; 82A6312
+gUnknown_082A6312: @ 82A6312
 	.incbin "base_emerald.gba", 0x2a6312, 0x2b
 
-gUnknown_082A633D: ; 82A633D
+gUnknown_082A633D: @ 82A633D
 	.incbin "base_emerald.gba", 0x2a633d, 0x1ffa
 
-gUnknown_082A8337: ; 82A8337
+gUnknown_082A8337: @ 82A8337
 	.incbin "base_emerald.gba", 0x2a8337, 0x19
 
-gUnknown_082A8350: ; 82A8350
+gUnknown_082A8350: @ 82A8350
 	.incbin "base_emerald.gba", 0x2a8350, 0x20043
 
-gUnknown_082C8393: ; 82C8393
+gUnknown_082C8393: @ 82C8393
 	.incbin "base_emerald.gba", 0x2c8393, 0x5d
 
-gUnknown_082C83F0: ; 82C83F0
+gUnknown_082C83F0: @ 82C83F0
 	.incbin "base_emerald.gba", 0x2c83f0, 0x46
 
-gUnknown_082C8436: ; 82C8436
+gUnknown_082C8436: @ 82C8436
 	.incbin "base_emerald.gba", 0x2c8436, 0x37e
 
-gUnknown_082C87B4: ; 82C87B4
+gUnknown_082C87B4: @ 82C87B4
 	.incbin "base_emerald.gba", 0x2c87b4, 0x21
 
-gUnknown_082C87D5: ; 82C87D5
+gUnknown_082C87D5: @ 82C87D5
 	.incbin "base_emerald.gba", 0x2c87d5, 0x3b
 
-gUnknown_082C8810: ; 82C8810
+gUnknown_082C8810: @ 82C8810
 	.incbin "base_emerald.gba", 0x2c8810, 0x22
 
-gUnknown_082C8832: ; 82C8832
+gUnknown_082C8832: @ 82C8832
 	.incbin "base_emerald.gba", 0x2c8832, 0x13
 
-gUnknown_082C8845: ; 82C8845
+gUnknown_082C8845: @ 82C8845
 	.incbin "base_emerald.gba", 0x2c8845, 0xe5
 
-gUnknown_082C892A: ; 82C892A
+gUnknown_082C892A: @ 82C892A
 	.incbin "base_emerald.gba", 0x2c892a, 0x2f
 
-gUnknown_082C8959: ; 82C8959
+gUnknown_082C8959: @ 82C8959
 	.incbin "base_emerald.gba", 0x2c8959, 0x22
 
-gUnknown_082C897B: ; 82C897B
+gUnknown_082C897B: @ 82C897B
 	.incbin "base_emerald.gba", 0x2c897b, 0xa4
 
-gUnknown_082C8A1F: ; 82C8A1F
+gUnknown_082C8A1F: @ 82C8A1F
 	.incbin "base_emerald.gba", 0x2c8a1f, 0x1b1
 
-gUnknown_082C8BD0: ; 82C8BD0
+gUnknown_082C8BD0: @ 82C8BD0
 	.incbin "base_emerald.gba", 0x2c8bd0, 0xd
 
-gUnknown_082C8BDD: ; 82C8BDD
+gUnknown_082C8BDD: @ 82C8BDD
 	.incbin "base_emerald.gba", 0x2c8bdd, 0x22
 
-gUnknown_082C8BFF: ; 82C8BFF
+gUnknown_082C8BFF: @ 82C8BFF
 	.incbin "base_emerald.gba", 0x2c8bff, 0x1d
 
-gUnknown_082C8C1C: ; 82C8C1C
+gUnknown_082C8C1C: @ 82C8C1C
 	.incbin "base_emerald.gba", 0x2c8c1c, 0xe
 
-gUnknown_082C8C2A: ; 82C8C2A
+gUnknown_082C8C2A: @ 82C8C2A
 	.incbin "base_emerald.gba", 0x2c8c2a, 0x50
 
-gUnknown_082C8C7A: ; 82C8C7A
+gUnknown_082C8C7A: @ 82C8C7A
 	.incbin "base_emerald.gba", 0x2c8c7a, 0xea
 
-gUnknown_082C8D64: ; 82C8D64
+gUnknown_082C8D64: @ 82C8D64
 	.incbin "base_emerald.gba", 0x2c8d64, 0x8
 
-gUnknown_082C8D6C: ; 82C8D6C
+gUnknown_082C8D6C: @ 82C8D6C
 	.incbin "base_emerald.gba", 0x2c8d6c, 0x590
 
-gUnknown_082C92FC: ; 82C92FC
+gUnknown_082C92FC: @ 82C92FC
 	.incbin "base_emerald.gba", 0x2c92fc, 0x24
 
-gUnknown_082C9320: ; 82C9320
+gUnknown_082C9320: @ 82C9320
 	.incbin "base_emerald.gba", 0x2c9320, 0x5c
 
-gUnknown_082C937C: ; 82C937C
+gUnknown_082C937C: @ 82C937C
 	.incbin "base_emerald.gba", 0x2c937c, 0xf32c
 
-gUnknown_082D86A8: ; 82D86A8
+gUnknown_082D86A8: @ 82D86A8
 	.incbin "base_emerald.gba", 0x2d86a8, 0x388
 
-gUnknown_082D8A30: ; 82D8A30
+gUnknown_082D8A30: @ 82D8A30
 	.incbin "base_emerald.gba", 0x2d8a30, 0x1e
 
-gUnknown_082D8A4E: ; 82D8A4E
+gUnknown_082D8A4E: @ 82D8A4E
 	.incbin "base_emerald.gba", 0x2d8a4e, 0x12
 
-gUnknown_082D8A60: ; 82D8A60
+gUnknown_082D8A60: @ 82D8A60
 	.incbin "base_emerald.gba", 0x2d8a60, 0x274
 
-gUnknown_082D8CD4: ; 82D8CD4
+gUnknown_082D8CD4: @ 82D8CD4
 	.incbin "base_emerald.gba", 0x2d8cd4, 0x91
 
-gUnknown_082D8D65: ; 82D8D65
+gUnknown_082D8D65: @ 82D8D65
 	.incbin "base_emerald.gba", 0x2d8d65, 0x6fd
 
-gUnknown_082D9462: ; 82D9462
+gUnknown_082D9462: @ 82D9462
 	.incbin "base_emerald.gba", 0x2d9462, 0xa7f
 
-gUnknown_082D9EE1: ; 82D9EE1
+gUnknown_082D9EE1: @ 82D9EE1
 	.incbin "base_emerald.gba", 0x2d9ee1, 0x1a
 
-gUnknown_082D9EFB: ; 82D9EFB
+gUnknown_082D9EFB: @ 82D9EFB
 	.incbin "base_emerald.gba", 0x2d9efb, 0x21
 
-gUnknown_082D9F1C: ; 82D9F1C
+gUnknown_082D9F1C: @ 82D9F1C
 	.incbin "base_emerald.gba", 0x2d9f1c, 0x88e
 
-gUnknown_082DA7AA: ; 82DA7AA
+gUnknown_082DA7AA: @ 82DA7AA
 	.incbin "base_emerald.gba", 0x2da7aa, 0xd
 
-gUnknown_082DA7B7: ; 82DA7B7
+gUnknown_082DA7B7: @ 82DA7B7
 	.incbin "base_emerald.gba", 0x2da7b7, 0xd
 
-gUnknown_082DA7C4: ; 82DA7C4
+gUnknown_082DA7C4: @ 82DA7C4
 	.incbin "base_emerald.gba", 0x2da7c4, 0x9
 
-gUnknown_082DA7CD: ; 82DA7CD
+gUnknown_082DA7CD: @ 82DA7CD
 	.incbin "base_emerald.gba", 0x2da7cd, 0x160
 
-gUnknown_082DA92D: ; 82DA92D
+gUnknown_082DA92D: @ 82DA92D
 	.incbin "base_emerald.gba", 0x2da92d, 0x3d
 
-gUnknown_082DA96A: ; 82DA96A
+gUnknown_082DA96A: @ 82DA96A
 	.incbin "base_emerald.gba", 0x2da96a, 0x3
 
-gUnknown_082DA96D: ; 82DA96D
+gUnknown_082DA96D: @ 82DA96D
 	.incbin "base_emerald.gba", 0x2da96d, 0x9e
 
-gUnknown_082DAA0B: ; 82DAA0B
+gUnknown_082DAA0B: @ 82DAA0B
 	.incbin "base_emerald.gba", 0x2daa0b, 0x2a
 
-gUnknown_082DAA35: ; 82DAA35
+gUnknown_082DAA35: @ 82DAA35
 	.incbin "base_emerald.gba", 0x2daa35, 0x52
 
-gUnknown_082DAA87: ; 82DAA87
+gUnknown_082DAA87: @ 82DAA87
 	.incbin "base_emerald.gba", 0x2daa87, 0x54
 
-gUnknown_082DAADB: ; 82DAADB
+gUnknown_082DAADB: @ 82DAADB
 	.incbin "base_emerald.gba", 0x2daadb, 0xe
 
-gUnknown_082DAAE9: ; 82DAAE9
+gUnknown_082DAAE9: @ 82DAAE9
 	.incbin "base_emerald.gba", 0x2daae9, 0x7
 
-gUnknown_082DAAF0: ; 82DAAF0
+gUnknown_082DAAF0: @ 82DAAF0
 	.incbin "base_emerald.gba", 0x2daaf0, 0x7
 
-gUnknown_082DAAF7: ; 82DAAF7
+gUnknown_082DAAF7: @ 82DAAF7
 	.incbin "base_emerald.gba", 0x2daaf7, 0x7
 
-gUnknown_082DAAFE: ; 82DAAFE
+gUnknown_082DAAFE: @ 82DAAFE
 	.incbin "base_emerald.gba", 0x2daafe, 0x4
 
-gUnknown_082DAB02: ; 82DAB02
+gUnknown_082DAB02: @ 82DAB02
 	.incbin "base_emerald.gba", 0x2dab02, 0x9
 
-gUnknown_082DAB0B: ; 82DAB0B
+gUnknown_082DAB0B: @ 82DAB0B
 	.incbin "base_emerald.gba", 0x2dab0b, 0x6
 
-gUnknown_082DAB11: ; 82DAB11
+gUnknown_082DAB11: @ 82DAB11
 	.incbin "base_emerald.gba", 0x2dab11, 0x4
 
-gUnknown_082DAB15: ; 82DAB15
+gUnknown_082DAB15: @ 82DAB15
 	.incbin "base_emerald.gba", 0x2dab15, 0xa4
 
-gUnknown_082DABB9: ; 82DABB9
+gUnknown_082DABB9: @ 82DABB9
 	.incbin "base_emerald.gba", 0x2dabb9, 0x4
 
-gUnknown_082DABBD: ; 82DABBD
+gUnknown_082DABBD: @ 82DABBD
 	.incbin "base_emerald.gba", 0x2dabbd, 0x6f
 
-gUnknown_082DAC2C: ; 82DAC2C
+gUnknown_082DAC2C: @ 82DAC2C
 	.incbin "base_emerald.gba", 0x2dac2c, 0x1b
 
-gUnknown_082DAC47: ; 82DAC47
+gUnknown_082DAC47: @ 82DAC47
 	.incbin "base_emerald.gba", 0x2dac47, 0x82
 
-gUnknown_082DACC9: ; 82DACC9
+gUnknown_082DACC9: @ 82DACC9
 	.incbin "base_emerald.gba", 0x2dacc9, 0x9
 
-gUnknown_082DACD2: ; 82DACD2
+gUnknown_082DACD2: @ 82DACD2
 	.incbin "base_emerald.gba", 0x2dacd2, 0xe
 
-gUnknown_082DACE0: ; 82DACE0
+gUnknown_082DACE0: @ 82DACE0
 	.incbin "base_emerald.gba", 0x2dace0, 0x7
 
-gUnknown_082DACE7: ; 82DACE7
+gUnknown_082DACE7: @ 82DACE7
 	.incbin "base_emerald.gba", 0x2dace7, 0x13
 
-gUnknown_082DACFA: ; 82DACFA
+gUnknown_082DACFA: @ 82DACFA
 	.incbin "base_emerald.gba", 0x2dacfa, 0x11
 
-gUnknown_082DAD0B: ; 82DAD0B
+gUnknown_082DAD0B: @ 82DAD0B
 	.incbin "base_emerald.gba", 0x2dad0b, 0xa
 
-gUnknown_082DAD15: ; 82DAD15
+gUnknown_082DAD15: @ 82DAD15
 	.incbin "base_emerald.gba", 0x2dad15, 0x5c
 
-gUnknown_082DAD71: ; 82DAD71
+gUnknown_082DAD71: @ 82DAD71
 	.incbin "base_emerald.gba", 0x2dad71, 0xb
 
-gUnknown_082DAD7C: ; 82DAD7C
+gUnknown_082DAD7C: @ 82DAD7C
 	.incbin "base_emerald.gba", 0x2dad7c, 0x48
 
-gUnknown_082DADC4: ; 82DADC4
+gUnknown_082DADC4: @ 82DADC4
 	.incbin "base_emerald.gba", 0x2dadc4, 0x14
 
-gUnknown_082DADD8: ; 82DADD8
+gUnknown_082DADD8: @ 82DADD8
 	.incbin "base_emerald.gba", 0x2dadd8, 0x2b
 
-gUnknown_082DAE03: ; 82DAE03
+gUnknown_082DAE03: @ 82DAE03
 	.incbin "base_emerald.gba", 0x2dae03, 0xa
 
-gUnknown_082DAE0D: ; 82DAE0D
+gUnknown_082DAE0D: @ 82DAE0D
 	.incbin "base_emerald.gba", 0x2dae0d, 0x7
 
-gUnknown_082DAE14: ; 82DAE14
+gUnknown_082DAE14: @ 82DAE14
 	.incbin "base_emerald.gba", 0x2dae14, 0xb
 
-gUnknown_082DAE1F: ; 82DAE1F
+gUnknown_082DAE1F: @ 82DAE1F
 	.incbin "base_emerald.gba", 0x2dae1f, 0x4
 
-gUnknown_082DAE23: ; 82DAE23
+gUnknown_082DAE23: @ 82DAE23
 	.incbin "base_emerald.gba", 0x2dae23, 0x7
 
-gUnknown_082DAE2A: ; 82DAE2A
+gUnknown_082DAE2A: @ 82DAE2A
 	.incbin "base_emerald.gba", 0x2dae2a, 0xd
 
-gUnknown_082DAE37: ; 82DAE37
+gUnknown_082DAE37: @ 82DAE37
 	.incbin "base_emerald.gba", 0x2dae37, 0x7
 
-gUnknown_082DAE3E: ; 82DAE3E
+gUnknown_082DAE3E: @ 82DAE3E
 	.incbin "base_emerald.gba", 0x2dae3e, 0x1b
 
-gUnknown_082DAE59: ; 82DAE59
+gUnknown_082DAE59: @ 82DAE59
 	.incbin "base_emerald.gba", 0x2dae59, 0x37
 
-gUnknown_082DAE90: ; 82DAE90
+gUnknown_082DAE90: @ 82DAE90
 	.incbin "base_emerald.gba", 0x2dae90, 0x37
 
-gUnknown_082DAEC7: ; 82DAEC7
+gUnknown_082DAEC7: @ 82DAEC7
 	.incbin "base_emerald.gba", 0x2daec7, 0x3e
 
-gUnknown_082DAF05: ; 82DAF05
+gUnknown_082DAF05: @ 82DAF05
 	.incbin "base_emerald.gba", 0x2daf05, 0x1b
 
-gUnknown_082DAF20: ; 82DAF20
+gUnknown_082DAF20: @ 82DAF20
 	.incbin "base_emerald.gba", 0x2daf20, 0x7
 
-gUnknown_082DAF27: ; 82DAF27
+gUnknown_082DAF27: @ 82DAF27
 	.incbin "base_emerald.gba", 0x2daf27, 0x9c
 
-gUnknown_082DAFC3: ; 82DAFC3
+gUnknown_082DAFC3: @ 82DAFC3
 	.incbin "base_emerald.gba", 0x2dafc3, 0x2
 
-gUnknown_082DAFC5: ; 82DAFC5
+gUnknown_082DAFC5: @ 82DAFC5
 	.incbin "base_emerald.gba", 0x2dafc5, 0x11
 
-gUnknown_082DAFD6: ; 82DAFD6
+gUnknown_082DAFD6: @ 82DAFD6
 	.incbin "base_emerald.gba", 0x2dafd6, 0x7
 
-gUnknown_082DAFDD: ; 82DAFDD
+gUnknown_082DAFDD: @ 82DAFDD
 	.incbin "base_emerald.gba", 0x2dafdd, 0x7
 
-gUnknown_082DAFE4: ; 82DAFE4
+gUnknown_082DAFE4: @ 82DAFE4
 	.incbin "base_emerald.gba", 0x2dafe4, 0x8e
 
-gUnknown_082DB072: ; 82DB072
+gUnknown_082DB072: @ 82DB072
 	.incbin "base_emerald.gba", 0x2db072, 0x4
 
-gUnknown_082DB076: ; 82DB076
+gUnknown_082DB076: @ 82DB076
 	.incbin "base_emerald.gba", 0x2db076, 0x4
 
-gUnknown_082DB07A: ; 82DB07A
+gUnknown_082DB07A: @ 82DB07A
 	.incbin "base_emerald.gba", 0x2db07a, 0xf
 
-gUnknown_082DB089: ; 82DB089
+gUnknown_082DB089: @ 82DB089
 	.incbin "base_emerald.gba", 0x2db089, 0xf
 
-gUnknown_082DB098: ; 82DB098
+gUnknown_082DB098: @ 82DB098
 	.incbin "base_emerald.gba", 0x2db098, 0x8
 
-gUnknown_082DB0A0: ; 82DB0A0
+gUnknown_082DB0A0: @ 82DB0A0
 	.incbin "base_emerald.gba", 0x2db0a0, 0x4
 
-gUnknown_082DB0A4: ; 82DB0A4
+gUnknown_082DB0A4: @ 82DB0A4
 	.incbin "base_emerald.gba", 0x2db0a4, 0xb
 
-gUnknown_082DB0AF: ; 82DB0AF
+gUnknown_082DB0AF: @ 82DB0AF
 	.incbin "base_emerald.gba", 0x2db0af, 0x8
 
-gUnknown_082DB0B7: ; 82DB0B7
+gUnknown_082DB0B7: @ 82DB0B7
 	.incbin "base_emerald.gba", 0x2db0b7, 0x37
 
-gUnknown_082DB0EE: ; 82DB0EE
+gUnknown_082DB0EE: @ 82DB0EE
 	.incbin "base_emerald.gba", 0x2db0ee, 0x29
 
-gUnknown_082DB117: ; 82DB117
+gUnknown_082DB117: @ 82DB117
 	.incbin "base_emerald.gba", 0x2db117, 0x51
 
-gUnknown_082DB168: ; 82DB168
+gUnknown_082DB168: @ 82DB168
 	.incbin "base_emerald.gba", 0x2db168, 0xe
 
-gUnknown_082DB176: ; 82DB176
+gUnknown_082DB176: @ 82DB176
 	.incbin "base_emerald.gba", 0x2db176, 0xb
 
-gUnknown_082DB181: ; 82DB181
+gUnknown_082DB181: @ 82DB181
 	.incbin "base_emerald.gba", 0x2db181, 0x4
 
-gUnknown_082DB185: ; 82DB185
+gUnknown_082DB185: @ 82DB185
 	.incbin "base_emerald.gba", 0x2db185, 0x8
 
-gUnknown_082DB18D: ; 82DB18D
+gUnknown_082DB18D: @ 82DB18D
 	.incbin "base_emerald.gba", 0x2db18d, 0x7
 
-gUnknown_082DB194: ; 82DB194
+gUnknown_082DB194: @ 82DB194
 	.incbin "base_emerald.gba", 0x2db194, 0x18
 
-gUnknown_082DB1AC: ; 82DB1AC
+gUnknown_082DB1AC: @ 82DB1AC
 	.incbin "base_emerald.gba", 0x2db1ac, 0x1b
 
-gUnknown_082DB1C7: ; 82DB1C7
+gUnknown_082DB1C7: @ 82DB1C7
 	.incbin "base_emerald.gba", 0x2db1c7, 0x7
 
-gUnknown_082DB1CE: ; 82DB1CE
+gUnknown_082DB1CE: @ 82DB1CE
 	.incbin "base_emerald.gba", 0x2db1ce, 0x7
 
-gUnknown_082DB1D5: ; 82DB1D5
+gUnknown_082DB1D5: @ 82DB1D5
 	.incbin "base_emerald.gba", 0x2db1d5, 0x2a
 
-gUnknown_082DB1FF: ; 82DB1FF
+gUnknown_082DB1FF: @ 82DB1FF
 	.incbin "base_emerald.gba", 0x2db1ff, 0x14
 
-gUnknown_082DB213: ; 82DB213
+gUnknown_082DB213: @ 82DB213
 	.incbin "base_emerald.gba", 0x2db213, 0xd
 
-gUnknown_082DB220: ; 82DB220
+gUnknown_082DB220: @ 82DB220
 	.incbin "base_emerald.gba", 0x2db220, 0x14
 
-gUnknown_082DB234: ; 82DB234
+gUnknown_082DB234: @ 82DB234
 	.incbin "base_emerald.gba", 0x2db234, 0x9
 
-gUnknown_082DB23D: ; 82DB23D
+gUnknown_082DB23D: @ 82DB23D
 	.incbin "base_emerald.gba", 0x2db23d, 0x22
 
-gUnknown_082DB25F: ; 82DB25F
+gUnknown_082DB25F: @ 82DB25F
 	.incbin "base_emerald.gba", 0x2db25f, 0xb
 
-gUnknown_082DB26A: ; 82DB26A
+gUnknown_082DB26A: @ 82DB26A
 	.incbin "base_emerald.gba", 0x2db26a, 0xd
 
-gUnknown_082DB277: ; 82DB277
+gUnknown_082DB277: @ 82DB277
 	.incbin "base_emerald.gba", 0x2db277, 0xb
 
-gUnknown_082DB282: ; 82DB282
+gUnknown_082DB282: @ 82DB282
 	.incbin "base_emerald.gba", 0x2db282, 0x9
 
-gUnknown_082DB28B: ; 82DB28B
+gUnknown_082DB28B: @ 82DB28B
 	.incbin "base_emerald.gba", 0x2db28b, 0x10
 
-gUnknown_082DB29B: ; 82DB29B
+gUnknown_082DB29B: @ 82DB29B
 	.incbin "base_emerald.gba", 0x2db29b, 0xb
 
-gUnknown_082DB2A6: ; 82DB2A6
+gUnknown_082DB2A6: @ 82DB2A6
 	.incbin "base_emerald.gba", 0x2db2a6, 0x9
 
-gUnknown_082DB2AF: ; 82DB2AF
+gUnknown_082DB2AF: @ 82DB2AF
 	.incbin "base_emerald.gba", 0x2db2af, 0xe
 
-gUnknown_082DB2BD: ; 82DB2BD
+gUnknown_082DB2BD: @ 82DB2BD
 	.incbin "base_emerald.gba", 0x2db2bd, 0x43
 
-gUnknown_082DB300: ; 82DB300
+gUnknown_082DB300: @ 82DB300
 	.incbin "base_emerald.gba", 0x2db300, 0x7
 
-gUnknown_082DB307: ; 82DB307
+gUnknown_082DB307: @ 82DB307
 	.incbin "base_emerald.gba", 0x2db307, 0x7
 
-gUnknown_082DB30E: ; 82DB30E
+gUnknown_082DB30E: @ 82DB30E
 	.incbin "base_emerald.gba", 0x2db30e, 0x12
 
-gUnknown_082DB320: ; 82DB320
+gUnknown_082DB320: @ 82DB320
 	.incbin "base_emerald.gba", 0x2db320, 0x7
 
-gUnknown_082DB327: ; 82DB327
+gUnknown_082DB327: @ 82DB327
 	.incbin "base_emerald.gba", 0x2db327, 0xd
 
-gUnknown_082DB334: ; 82DB334
+gUnknown_082DB334: @ 82DB334
 	.incbin "base_emerald.gba", 0x2db334, 0xb
 
-gUnknown_082DB33F: ; 82DB33F
+gUnknown_082DB33F: @ 82DB33F
 	.incbin "base_emerald.gba", 0x2db33f, 0x11
 
-gUnknown_082DB350: ; 82DB350
+gUnknown_082DB350: @ 82DB350
 	.incbin "base_emerald.gba", 0x2db350, 0x11
 
-gUnknown_082DB361: ; 82DB361
+gUnknown_082DB361: @ 82DB361
 	.incbin "base_emerald.gba", 0x2db361, 0x17
 
-gUnknown_082DB378: ; 82DB378
+gUnknown_082DB378: @ 82DB378
 	.incbin "base_emerald.gba", 0x2db378, 0xaa
 
-gUnknown_082DB422: ; 82DB422
+gUnknown_082DB422: @ 82DB422
 	.incbin "base_emerald.gba", 0x2db422, 0xe
 
-gUnknown_082DB430: ; 82DB430
+gUnknown_082DB430: @ 82DB430
 	.incbin "base_emerald.gba", 0x2db430, 0x14
 
-gUnknown_082DB444: ; 82DB444
+gUnknown_082DB444: @ 82DB444
 	.incbin "base_emerald.gba", 0x2db444, 0xe
 
-gUnknown_082DB452: ; 82DB452
+gUnknown_082DB452: @ 82DB452
 	.incbin "base_emerald.gba", 0x2db452, 0xa
 
-gUnknown_082DB45C: ; 82DB45C
+gUnknown_082DB45C: @ 82DB45C
 	.incbin "base_emerald.gba", 0x2db45c, 0x14
 
-gUnknown_082DB470: ; 82DB470
+gUnknown_082DB470: @ 82DB470
 	.incbin "base_emerald.gba", 0x2db470, 0x14
 
-gUnknown_082DB484: ; 82DB484
+gUnknown_082DB484: @ 82DB484
 	.incbin "base_emerald.gba", 0x2db484, 0x25
 
-gUnknown_082DB4A9: ; 82DB4A9
+gUnknown_082DB4A9: @ 82DB4A9
 	.incbin "base_emerald.gba", 0x2db4a9, 0xf
 
-gUnknown_082DB4B8: ; 82DB4B8
+gUnknown_082DB4B8: @ 82DB4B8
 	.incbin "base_emerald.gba", 0x2db4b8, 0x9
 
-gUnknown_082DB4C1: ; 82DB4C1
+gUnknown_082DB4C1: @ 82DB4C1
 	.incbin "base_emerald.gba", 0x2db4c1, 0x69
 
-gUnknown_082DB52A: ; 82DB52A
+gUnknown_082DB52A: @ 82DB52A
 	.incbin "base_emerald.gba", 0x2db52a, 0x14
 
-gUnknown_082DB53E: ; 82DB53E
+gUnknown_082DB53E: @ 82DB53E
 	.incbin "base_emerald.gba", 0x2db53e, 0x14
 
-gUnknown_082DB552: ; 82DB552
+gUnknown_082DB552: @ 82DB552
 	.incbin "base_emerald.gba", 0x2db552, 0xe
 
-gUnknown_082DB560: ; 82DB560
+gUnknown_082DB560: @ 82DB560
 	.incbin "base_emerald.gba", 0x2db560, 0xe
 
-gUnknown_082DB56E: ; 82DB56E
+gUnknown_082DB56E: @ 82DB56E
 	.incbin "base_emerald.gba", 0x2db56e, 0x1
 
-gUnknown_082DB56F: ; 82DB56F
+gUnknown_082DB56F: @ 82DB56F
 	.incbin "base_emerald.gba", 0x2db56f, 0x22
 
-gUnknown_082DB591: ; 82DB591
+gUnknown_082DB591: @ 82DB591
 	.incbin "base_emerald.gba", 0x2db591, 0x1
 
-gUnknown_082DB592: ; 82DB592
+gUnknown_082DB592: @ 82DB592
 	.incbin "base_emerald.gba", 0x2db592, 0x15
 
-gUnknown_082DB5A7: ; 82DB5A7
+gUnknown_082DB5A7: @ 82DB5A7
 	.incbin "base_emerald.gba", 0x2db5a7, 0x1
 
-gUnknown_082DB5A8: ; 82DB5A8
+gUnknown_082DB5A8: @ 82DB5A8
 	.incbin "base_emerald.gba", 0x2db5a8, 0x1f
 
-gUnknown_082DB5C7: ; 82DB5C7
+gUnknown_082DB5C7: @ 82DB5C7
 	.incbin "base_emerald.gba", 0x2db5c7, 0xa
 
-gUnknown_082DB5D1: ; 82DB5D1
+gUnknown_082DB5D1: @ 82DB5D1
 	.incbin "base_emerald.gba", 0x2db5d1, 0xc
 
-gUnknown_082DB5DD: ; 82DB5DD
+gUnknown_082DB5DD: @ 82DB5DD
 	.incbin "base_emerald.gba", 0x2db5dd, 0xc
 
-gUnknown_082DB5E9: ; 82DB5E9
+gUnknown_082DB5E9: @ 82DB5E9
 	.incbin "base_emerald.gba", 0x2db5e9, 0xc
 
-gUnknown_082DB5F5: ; 82DB5F5
+gUnknown_082DB5F5: @ 82DB5F5
 	.incbin "base_emerald.gba", 0x2db5f5, 0xe
 
-gUnknown_082DB603: ; 82DB603
+gUnknown_082DB603: @ 82DB603
 	.incbin "base_emerald.gba", 0x2db603, 0x1c
 
-gUnknown_082DB61F: ; 82DB61F
+gUnknown_082DB61F: @ 82DB61F
 	.incbin "base_emerald.gba", 0x2db61f, 0x10
 
-gUnknown_082DB62F: ; 82DB62F
+gUnknown_082DB62F: @ 82DB62F
 	.incbin "base_emerald.gba", 0x2db62f, 0x10
 
-gUnknown_082DB63F: ; 82DB63F
+gUnknown_082DB63F: @ 82DB63F
 	.incbin "base_emerald.gba", 0x2db63f, 0xe
 
-gUnknown_082DB64D: ; 82DB64D
+gUnknown_082DB64D: @ 82DB64D
 	.incbin "base_emerald.gba", 0x2db64d, 0x7
 
-gUnknown_082DB654: ; 82DB654
+gUnknown_082DB654: @ 82DB654
 	.incbin "base_emerald.gba", 0x2db654, 0x1b
 
-gUnknown_082DB66F: ; 82DB66F
+gUnknown_082DB66F: @ 82DB66F
 	.incbin "base_emerald.gba", 0x2db66f, 0xd
 
-gUnknown_082DB67C: ; 82DB67C
+gUnknown_082DB67C: @ 82DB67C
 	.incbin "base_emerald.gba", 0x2db67c, 0x3
 
-gUnknown_082DB67F: ; 82DB67F
+gUnknown_082DB67F: @ 82DB67F
 	.incbin "base_emerald.gba", 0x2db67f, 0x3
 
-gUnknown_082DB682: ; 82DB682
+gUnknown_082DB682: @ 82DB682
 	.incbin "base_emerald.gba", 0x2db682, 0xa
 
-gUnknown_082DB68C: ; 82DB68C
+gUnknown_082DB68C: @ 82DB68C
 	.incbin "base_emerald.gba", 0x2db68c, 0x9
 
-gUnknown_082DB695: ; 82DB695
+gUnknown_082DB695: @ 82DB695
 	.incbin "base_emerald.gba", 0x2db695, 0x10
 
-gUnknown_082DB6A5: ; 82DB6A5
+gUnknown_082DB6A5: @ 82DB6A5
 	.incbin "base_emerald.gba", 0x2db6a5, 0x8
 
-gUnknown_082DB6AD: ; 82DB6AD
+gUnknown_082DB6AD: @ 82DB6AD
 	.incbin "base_emerald.gba", 0x2db6ad, 0x2c
 
-gUnknown_082DB6D9: ; 82DB6D9
+gUnknown_082DB6D9: @ 82DB6D9
 	.incbin "base_emerald.gba", 0x2db6d9, 0x17
 
-gUnknown_082DB6F0: ; 82DB6F0
+gUnknown_082DB6F0: @ 82DB6F0
 	.incbin "base_emerald.gba", 0x2db6f0, 0xb
 
-gUnknown_082DB6FB: ; 82DB6FB
+gUnknown_082DB6FB: @ 82DB6FB
 	.incbin "base_emerald.gba", 0x2db6fb, 0xb
 
-gUnknown_082DB706: ; 82DB706
+gUnknown_082DB706: @ 82DB706
 	.incbin "base_emerald.gba", 0x2db706, 0x6
 
-gUnknown_082DB70C: ; 82DB70C
+gUnknown_082DB70C: @ 82DB70C
 	.incbin "base_emerald.gba", 0x2db70c, 0x12
 
-gUnknown_082DB71E: ; 82DB71E
+gUnknown_082DB71E: @ 82DB71E
 	.incbin "base_emerald.gba", 0x2db71e, 0x6
 
-gUnknown_082DB724: ; 82DB724
+gUnknown_082DB724: @ 82DB724
 	.incbin "base_emerald.gba", 0x2db724, 0x12
 
-gUnknown_082DB736: ; 82DB736
+gUnknown_082DB736: @ 82DB736
 	.incbin "base_emerald.gba", 0x2db736, 0x6
 
-gUnknown_082DB73C: ; 82DB73C
+gUnknown_082DB73C: @ 82DB73C
 	.incbin "base_emerald.gba", 0x2db73c, 0x12
 
-gUnknown_082DB74E: ; 82DB74E
+gUnknown_082DB74E: @ 82DB74E
 	.incbin "base_emerald.gba", 0x2db74e, 0x6
 
-gUnknown_082DB754: ; 82DB754
+gUnknown_082DB754: @ 82DB754
 	.incbin "base_emerald.gba", 0x2db754, 0x12
 
-gUnknown_082DB766: ; 82DB766
+gUnknown_082DB766: @ 82DB766
 	.incbin "base_emerald.gba", 0x2db766, 0x6
 
-gUnknown_082DB76C: ; 82DB76C
+gUnknown_082DB76C: @ 82DB76C
 	.incbin "base_emerald.gba", 0x2db76c, 0x12
 
-gUnknown_082DB77E: ; 82DB77E
+gUnknown_082DB77E: @ 82DB77E
 	.incbin "base_emerald.gba", 0x2db77e, 0x6
 
-gUnknown_082DB784: ; 82DB784
+gUnknown_082DB784: @ 82DB784
 	.incbin "base_emerald.gba", 0x2db784, 0x10
 
-gUnknown_082DB794: ; 82DB794
+gUnknown_082DB794: @ 82DB794
 	.incbin "base_emerald.gba", 0x2db794, 0x6
 
-gUnknown_082DB79A: ; 82DB79A
+gUnknown_082DB79A: @ 82DB79A
 	.incbin "base_emerald.gba", 0x2db79a, 0x14
 
-gUnknown_082DB7AE: ; 82DB7AE
+gUnknown_082DB7AE: @ 82DB7AE
 	.incbin "base_emerald.gba", 0x2db7ae, 0x6
 
-gUnknown_082DB7B4: ; 82DB7B4
+gUnknown_082DB7B4: @ 82DB7B4
 	.incbin "base_emerald.gba", 0x2db7b4, 0x10
 
-gUnknown_082DB7C4: ; 82DB7C4
+gUnknown_082DB7C4: @ 82DB7C4
 	.incbin "base_emerald.gba", 0x2db7c4, 0x1d
 
-gUnknown_082DB7E1: ; 82DB7E1
+gUnknown_082DB7E1: @ 82DB7E1
 	.incbin "base_emerald.gba", 0x2db7e1, 0x10
 
-gUnknown_082DB7F1: ; 82DB7F1
+gUnknown_082DB7F1: @ 82DB7F1
 	.incbin "base_emerald.gba", 0x2db7f1, 0x6
 
-gUnknown_082DB7F7: ; 82DB7F7
+gUnknown_082DB7F7: @ 82DB7F7
 	.incbin "base_emerald.gba", 0x2db7f7, 0x1b
 
-gUnknown_082DB812: ; 82DB812
+gUnknown_082DB812: @ 82DB812
 	.incbin "base_emerald.gba", 0x2db812, 0x4
 
-gUnknown_082DB816: ; 82DB816
+gUnknown_082DB816: @ 82DB816
 	.incbin "base_emerald.gba", 0x2db816, 0xe
 
-gUnknown_082DB824: ; 82DB824
+gUnknown_082DB824: @ 82DB824
 	.incbin "base_emerald.gba", 0x2db824, 0x2a
 
-gUnknown_082DB84E: ; 82DB84E
+gUnknown_082DB84E: @ 82DB84E
 	.incbin "base_emerald.gba", 0x2db84e, 0x1b
 
-gUnknown_082DB869: ; 82DB869
+gUnknown_082DB869: @ 82DB869
 	.incbin "base_emerald.gba", 0x2db869, 0x10
 
-gUnknown_082DB879: ; 82DB879
+gUnknown_082DB879: @ 82DB879
 	.incbin "base_emerald.gba", 0x2db879, 0x4
 
-gUnknown_082DB87D: ; 82DB87D
+gUnknown_082DB87D: @ 82DB87D
 	.incbin "base_emerald.gba", 0x2db87d, 0x4
 
-gUnknown_082DB881: ; 82DB881
+gUnknown_082DB881: @ 82DB881
 	.incbin "base_emerald.gba", 0x2db881, 0x3d
 
-gUnknown_082DB8BE: ; 82DB8BE
+gUnknown_082DB8BE: @ 82DB8BE
 	.incbin "base_emerald.gba", 0x2db8be, 0x35
 
-gUnknown_082DB8F3: ; 82DB8F3
+gUnknown_082DB8F3: @ 82DB8F3
 	.incbin "base_emerald.gba", 0x2db8f3, 0xc7
 
-gUnknown_082DB9BA: ; 82DB9BA
+gUnknown_082DB9BA: @ 82DB9BA
 	.incbin "base_emerald.gba", 0x2db9ba, 0x7
 
-gUnknown_082DB9C1: ; 82DB9C1
+gUnknown_082DB9C1: @ 82DB9C1
 	.incbin "base_emerald.gba", 0x2db9c1, 0x7
 
-gUnknown_082DB9C8: ; 82DB9C8
+gUnknown_082DB9C8: @ 82DB9C8
 	.incbin "base_emerald.gba", 0x2db9c8, 0xc
 
-; 82DB9D4
+@ 82DB9D4
 	.include "data/field_effect_scripts.s"
 
 	.align 2, 0
 
-gUnknown_082DBD08: ; 82DBD08
+gUnknown_082DBD08: @ 82DBD08
 	.incbin "base_emerald.gba", 0x2dbd08, 0x34
 
-gUnknown_082DBD3C: ; 82DBD3C
+gUnknown_082DBD3C: @ 82DBD3C
 	.incbin "base_emerald.gba", 0x2dbd3c, 0x18
 
-gUnknown_082DBD54: ; 82DBD54
+gUnknown_082DBD54: @ 82DBD54
 	.incbin "base_emerald.gba", 0x2dbd54, 0x4
 
-gUnknown_082DBD58: ; 82DBD58
+gUnknown_082DBD58: @ 82DBD58
 	.incbin "base_emerald.gba", 0x2dbd58, 0x2c
 
-gUnknown_082DBD84: ; 82DBD84
+gUnknown_082DBD84: @ 82DBD84
 	.incbin "base_emerald.gba", 0x2dbd84, 0x46
 
-gUnknown_082DBDCA: ; 82DBDCA
+gUnknown_082DBDCA: @ 82DBDCA
 	.incbin "base_emerald.gba", 0x2dbdca, 0xa
 
-gUnknown_082DBDD4: ; 82DBDD4
+gUnknown_082DBDD4: @ 82DBDD4
 	.incbin "base_emerald.gba", 0x2dbdd4, 0x2e
 
-gUnknown_082DBE02: ; 82DBE02
+gUnknown_082DBE02: @ 82DBE02
 	.incbin "base_emerald.gba", 0x2dbe02, 0xf6
 
-gUnknown_082DBEF8: ; 82DBEF8
+gUnknown_082DBEF8: @ 82DBEF8
 	.incbin "base_emerald.gba", 0x2dbef8, 0x2458
 
-gUnknown_082DE350: ; 82DE350
+gUnknown_082DE350: @ 82DE350
 	.incbin "base_emerald.gba", 0x2de350, 0x9dc
 
-gUnknown_082DED2C: ; 82DED2C
+gUnknown_082DED2C: @ 82DED2C
 	.incbin "base_emerald.gba", 0x2ded2c, 0x44
diff --git a/data/data2.s b/data/data2.s
index 38dbdf53a..37d6bbe84 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1,21 +1,21 @@
-; the second big chunk of data
+@ the second big chunk of data
 
 	.align 2, 0
 
-gUnknown_82E9530: ; 82E9530
+gUnknown_82E9530: @ 82E9530
 	.byte 3
 
-gUnknown_82E9531: ; 82E9531
+gUnknown_82E9531: @ 82E9531
 	.byte 2
 
 	.align 2, 0
 
-; compile time
+@ compile time
 	.asciz "2005 02 21 11:10"
 
 	.align 2, 0
 
-gRomInterruptTable: ; 82E9548
+gRomInterruptTable: @ 82E9548
 	.4byte VCountIntr
 	.4byte SerialIntr
 	.4byte Timer3Intr
@@ -31,13 +31,13 @@ gRomInterruptTable: ; 82E9548
 	.4byte DummyIntrHandler
 	.4byte DummyIntrHandler
 
-gZeroedBgControlStruct: ; 82E9580
+gZeroedBgControlStruct: @ 82E9580
 	.4byte 0
 
-gDummyWindowTemplate: ; 82E9584
+gDummyWindowTemplate: @ 82E9584
 	window_template -1, 0, 0, 0, 0, 0, 0
 
-gFontHalfRowOffsets: ; 82E958C
+gFontHalfRowOffsets: @ 82E958C
 	.byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
 	.byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09
 	.byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12
@@ -55,22 +55,22 @@ gFontHalfRowOffsets: ; 82E958C
 	.byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12
 	.byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
 
-gDownArrowTiles: ; 82E968C
+gDownArrowTiles: @ 82E968C
 	.incbin "base_emerald.gba", 0x2e968c, 0xc0
 
-gDarkDownArrowTiles: ; 82E974C
+gDarkDownArrowTiles: @ 82E974C
 	.incbin "base_emerald.gba", 0x2e974c, 0xc0
 
-; Seemingly unreferenced data. It contains some kind of arrow graphics.
+@ Seemingly unreferenced data. It contains some kind of arrow graphics.
 	.incbin "base_emerald.gba", 0x2e980c, 0x500
 
-gDownArrowYCoords: ; 82E9D0C
+gDownArrowYCoords: @ 82E9D0C
 	.byte 0, 1, 2, 1
 
-gWindowVerticalScrollSpeeds: ; 82E9D10
+gWindowVerticalScrollSpeeds: @ 82E9D10
 	.byte 1, 2, 4, 0
 
-gGlyphWidthFuncs: ; 82E9D14
+gGlyphWidthFuncs: @ 82E9D14
 	glyph_width_func 0, GetGlyphWidthFont0+1
 	glyph_width_func 1, GetGlyphWidthFont1+1
 	glyph_width_func 2, GetGlyphWidthFont2+1
@@ -81,7 +81,7 @@ gGlyphWidthFuncs: ; 82E9D14
 	glyph_width_func 7, GetGlyphWidthFont7+1
 	glyph_width_func 8, GetGlyphWidthFont8+1
 
-gKeypadIcons: ; 82E9D5C
+gKeypadIcons: @ 82E9D5C
 	keypad_icon  0x0,  8, 12
 	keypad_icon  0x1,  8, 12
 	keypad_icon  0x2, 16, 12
@@ -96,10 +96,10 @@ gKeypadIcons: ; 82E9D5C
 	keypad_icon 0x21,  8, 12
 	keypad_icon 0x22,  8, 12
 
-gKeypadIconTiles: ; 82E9D90
+gKeypadIconTiles: @ 82E9D90
 	.incbin "base_emerald.gba", 0x2e9d90, 0x800
 
-gFontInfos: ; 82EA590
+gFontInfos: @ 82EA590
 	font_info Font0Func+1, 5, 12, 0, 0, 2,  3, 1
 	font_info Font1Func+1, 6, 16, 0, 0, 2,  3, 1
 	font_info Font2Func+1, 6, 14, 0, 0, 2,  3, 1
@@ -111,7 +111,7 @@ gFontInfos: ; 82EA590
 	font_info Font8Func+1, 5,  8, 0, 0, 2,  3, 1
 	font_info           0, 8,  8, 0, 0, 1, 15, 2
 
-gMenuCursorDimensions: ; 82EA608
+gMenuCursorDimensions: @ 82EA608
 	.byte 8, 12
 	.byte 8, 15
 	.byte 8, 14
@@ -125,3310 +125,3310 @@ gMenuCursorDimensions: ; 82EA608
 
 	.align 2, 0
 
-gFont9JapaneseGlyphs: ; 82EA61C
+gFont9JapaneseGlyphs: @ 82EA61C
 	.incbin "data/graphics/fonts/font9.hwjpnfont"
 
-; Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems
-; to be unreferenced there too.
+@ Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems
+@ to be unreferenced there too.
 	.incbin "base_emerald.gba", 0x2ec61c, 0x18
 
-gUnknown_082EC634: ; 82EC634
+gUnknown_082EC634: @ 82EC634
 	.incbin "base_emerald.gba", 0x2ec634, 0x18
 
-gUnknown_082EC64C: ; 82EC64C
+gUnknown_082EC64C: @ 82EC64C
 	.incbin "base_emerald.gba", 0x2ec64c, 0x44
 
-; off-screen and low priority relative to background
-gDefaultOamAttributes: ; 82EC690
-	.2byte 160 ; Y
-	.2byte 304 ; X
-	.2byte 3 << 10 ; priority
+@ off-screen and low priority relative to background
+gDefaultOamAttributes: @ 82EC690
+	.2byte 160 @ Y
+	.2byte 304 @ X
+	.2byte 3 << 10 @ priority
 
 	.align 2, 0
 
-gDummyObjectImageAnim: ; 82EC698
+gDummyObjectImageAnim: @ 82EC698
 	obj_image_anim_end
 
 	.align 2, 0
 
-gDummyObjectImageAnimTable: ; 82EC69C
+gDummyObjectImageAnimTable: @ 82EC69C
 	.4byte gDummyObjectImageAnim
 
 	.align 2, 0
 
-gDummyObjectRotScalAnim: ; 82EC6A0
+gDummyObjectRotScalAnim: @ 82EC6A0
 	obj_rot_scal_anim_end
 
 	.align 2, 0
 
-gDummyObjectRotScalAnimTable: ; 82EC6A8
+gDummyObjectRotScalAnimTable: @ 82EC6A8
 	.4byte gDummyObjectRotScalAnim
 
-gUnknown_082EC6AC: ; 82EC6AC
+gUnknown_082EC6AC: @ 82EC6AC
 	.incbin "base_emerald.gba", 0x2ec6ac, 0x18
 
-gUnknown_082EC6C4: ; 82EC6C4
+gUnknown_082EC6C4: @ 82EC6C4
 	.incbin "base_emerald.gba", 0x2ec6c4, 0x8
 
-gUnknown_082EC6CC: ; 82EC6CC
+gUnknown_082EC6CC: @ 82EC6CC
 	.incbin "base_emerald.gba", 0x2ec6cc, 0x8
 
-gUnknown_082EC6D4: ; 82EC6D4
+gUnknown_082EC6D4: @ 82EC6D4
 	.incbin "base_emerald.gba", 0x2ec6d4, 0x10
 
-gUnknown_082EC6E4: ; 82EC6E4
+gUnknown_082EC6E4: @ 82EC6E4
 	.incbin "base_emerald.gba", 0x2ec6e4, 0x10
 
-gUnknown_082EC6F4: ; 82EC6F4
+gUnknown_082EC6F4: @ 82EC6F4
 	.incbin "base_emerald.gba", 0x2ec6f4, 0x60
 
-gUnknown_082EC754: ; 82EC754
+gUnknown_082EC754: @ 82EC754
 	.incbin "base_emerald.gba", 0x2ec754, 0x70
 
-gUnknown_82EC7C4: ; 82EC7C4
+gUnknown_82EC7C4: @ 82EC7C4
 	.2byte 0x0100
 	.2byte 0x0200
 	.2byte 0x0400
 	.2byte 0x0800
 
-gUnknown_82EC7CC: ; 82EC7CC
+gUnknown_82EC7CC: @ 82EC7CC
 	.2byte 0x0001
 	.2byte 0x0002
 	.2byte 0x0004
 	.2byte 0x0008
 
-; 82EC7D4
+@ 82EC7D4
 	.include "data/string_util.s"
 
 	.align 2, 0
 
-gUnknown_082EC86C: ; 82EC86C
+gUnknown_082EC86C: @ 82EC86C
 	.incbin "base_emerald.gba", 0x2ec86c, 0x20
 
-gUnknown_082EC88C: ; 82EC88C
+gUnknown_082EC88C: @ 82EC88C
 	.incbin "base_emerald.gba", 0x2ec88c, 0x4a8
 
-gUnknown_082ECD34: ; 82ECD34
+gUnknown_082ECD34: @ 82ECD34
 	.incbin "base_emerald.gba", 0x2ecd34, 0x1ec
 
-gUnknown_082ECF20: ; 82ECF20
+gUnknown_082ECF20: @ 82ECF20
 	.incbin "base_emerald.gba", 0x2ecf20, 0x20
 
-gUnknown_082ECF40: ; 82ECF40
+gUnknown_082ECF40: @ 82ECF40
 	.incbin "base_emerald.gba", 0x2ecf40, 0x228
 
-gUnknown_082ED168: ; 82ED168
+gUnknown_082ED168: @ 82ED168
 	.incbin "base_emerald.gba", 0x2ed168, 0x40
 
-gUnknown_082ED1A8: ; 82ED1A8
+gUnknown_082ED1A8: @ 82ED1A8
 	.incbin "base_emerald.gba", 0x2ed1a8, 0x28
 
-gUnknown_082ED1D0: ; 82ED1D0
+gUnknown_082ED1D0: @ 82ED1D0
 	.incbin "base_emerald.gba", 0x2ed1d0, 0x4
 
-gUnknown_082ED1D4: ; 82ED1D4
+gUnknown_082ED1D4: @ 82ED1D4
 	.incbin "base_emerald.gba", 0x2ed1d4, 0x10
 
-gUnknown_082ED1E4: ; 82ED1E4
+gUnknown_082ED1E4: @ 82ED1E4
 	.incbin "base_emerald.gba", 0x2ed1e4, 0x18
 
-gUnknown_082ED1FC: ; 82ED1FC
+gUnknown_082ED1FC: @ 82ED1FC
 	.incbin "base_emerald.gba", 0x2ed1fc, 0x8
 
-gUnknown_082ED204: ; 82ED204
+gUnknown_082ED204: @ 82ED204
 	.incbin "base_emerald.gba", 0x2ed204, 0x20
 
-gUnknown_082ED224: ; 82ED224
+gUnknown_082ED224: @ 82ED224
 	.incbin "base_emerald.gba", 0x2ed224, 0x14c
 
-gUnknown_082ED370: ; 82ED370
+gUnknown_082ED370: @ 82ED370
 	.incbin "base_emerald.gba", 0x2ed370, 0x100
 
-gUnknown_082ED470: ; 82ED470
+gUnknown_082ED470: @ 82ED470
 	.incbin "base_emerald.gba", 0x2ed470, 0x100
 
-gUnknown_082ED570: ; 82ED570
+gUnknown_082ED570: @ 82ED570
 	.incbin "base_emerald.gba", 0x2ed570, 0x70
 
-gUnknown_082ED5E0: ; 82ED5E0
+gUnknown_082ED5E0: @ 82ED5E0
 	.incbin "base_emerald.gba", 0x2ed5e0, 0x8
 
-gUnknown_082ED5E8: ; 82ED5E8
+gUnknown_082ED5E8: @ 82ED5E8
 	.incbin "base_emerald.gba", 0x2ed5e8, 0x8
 
-gUnknown_082ED5F0: ; 82ED5F0
+gUnknown_082ED5F0: @ 82ED5F0
 	.incbin "base_emerald.gba", 0x2ed5f0, 0x18
 
-gUnknown_082ED608: ; 82ED608
+gUnknown_082ED608: @ 82ED608
 	.incbin "base_emerald.gba", 0x2ed608, 0x18
 
-gUnknown_082ED620: ; 82ED620
+gUnknown_082ED620: @ 82ED620
 	.incbin "base_emerald.gba", 0x2ed620, 0x8
 
-gUnknown_082ED628: ; 82ED628
+gUnknown_082ED628: @ 82ED628
 	.incbin "base_emerald.gba", 0x2ed628, 0x64
 
-gUnknown_082ED68C: ; 82ED68C
+gUnknown_082ED68C: @ 82ED68C
 	.incbin "base_emerald.gba", 0x2ed68c, 0x9
 
-gUnknown_082ED695: ; 82ED695
+gUnknown_082ED695: @ 82ED695
 	.incbin "base_emerald.gba", 0x2ed695, 0x10
 
-gUnknown_082ED6A5: ; 82ED6A5
+gUnknown_082ED6A5: @ 82ED6A5
 	.incbin "base_emerald.gba", 0x2ed6a5, 0x13
 
-gUnknown_082ED6B8: ; 82ED6B8
+gUnknown_082ED6B8: @ 82ED6B8
 	.incbin "base_emerald.gba", 0x2ed6b8, 0x28
 
-gUnknown_082ED6E0: ; 82ED6E0
+gUnknown_082ED6E0: @ 82ED6E0
 	.incbin "base_emerald.gba", 0x2ed6e0, 0x100
 
-gUnknown_082ED7E0: ; 82ED7E0
+gUnknown_082ED7E0: @ 82ED7E0
 	.incbin "base_emerald.gba", 0x2ed7e0, 0xc
 
-gUnknown_082ED7EC: ; 82ED7EC
+gUnknown_082ED7EC: @ 82ED7EC
 	.incbin "base_emerald.gba", 0x2ed7ec, 0x10
 
-gUnknown_082ED7FC: ; 82ED7FC
+gUnknown_082ED7FC: @ 82ED7FC
 	.incbin "base_emerald.gba", 0x2ed7fc, 0x18
 
-gUnknown_082ED814: ; 82ED814
+gUnknown_082ED814: @ 82ED814
 	.incbin "base_emerald.gba", 0x2ed814, 0x18
 
-gUnknown_082ED82C: ; 82ED82C
+gUnknown_082ED82C: @ 82ED82C
 	.incbin "base_emerald.gba", 0x2ed82c, 0x1f
 
-gUnknown_082ED84B: ; 82ED84B
+gUnknown_082ED84B: @ 82ED84B
 	.incbin "base_emerald.gba", 0x2ed84b, 0x10
 
-gUnknown_082ED85B: ; 82ED85B
+gUnknown_082ED85B: @ 82ED85B
 	.incbin "base_emerald.gba", 0x2ed85b, 0xd
 
-gUnknown_082ED868: ; 82ED868
+gUnknown_082ED868: @ 82ED868
 	.incbin "base_emerald.gba", 0x2ed868, 0x60
 
-gUnknown_082ED8C8: ; 82ED8C8
+gUnknown_082ED8C8: @ 82ED8C8
 	.incbin "base_emerald.gba", 0x2ed8c8, 0x4
 
-gUnknown_082ED8CC: ; 82ED8CC
+gUnknown_082ED8CC: @ 82ED8CC
 	.incbin "base_emerald.gba", 0x2ed8cc, 0x4
 
-gUnknown_082ED8D0: ; 82ED8D0
+gUnknown_082ED8D0: @ 82ED8D0
 	.incbin "base_emerald.gba", 0x2ed8d0, 0x28
 
-gUnknown_082ED8F8: ; 82ED8F8
+gUnknown_082ED8F8: @ 82ED8F8
 	.incbin "base_emerald.gba", 0x2ed8f8, 0x68
 
-gUnknown_082ED960: ; 82ED960
+gUnknown_082ED960: @ 82ED960
 	.incbin "base_emerald.gba", 0x2ed960, 0x30
 
-gUnknown_082ED990: ; 82ED990
+gUnknown_082ED990: @ 82ED990
 	.incbin "base_emerald.gba", 0x2ed990, 0x1d0
 
-gUnknown_082EDB60: ; 82EDB60
+gUnknown_082EDB60: @ 82EDB60
 	.incbin "base_emerald.gba", 0x2edb60, 0x64
 
-gUnknown_082EDBC4: ; 82EDBC4
+gUnknown_082EDBC4: @ 82EDBC4
 	.incbin "base_emerald.gba", 0x2edbc4, 0x24
 
-gUnknown_082EDBE8: ; 82EDBE8
+gUnknown_082EDBE8: @ 82EDBE8
 	.incbin "base_emerald.gba", 0x2edbe8, 0x24
 
-gUnknown_082EDC0C: ; 82EDC0C
+gUnknown_082EDC0C: @ 82EDC0C
 	.incbin "base_emerald.gba", 0x2edc0c, 0x28
 
-gUnknown_082EDC34: ; 82EDC34
+gUnknown_082EDC34: @ 82EDC34
 	.incbin "base_emerald.gba", 0x2edc34, 0x28
 
-gUnknown_082EDC5C: ; 82EDC5C
+gUnknown_082EDC5C: @ 82EDC5C
 	.incbin "base_emerald.gba", 0x2edc5c, 0x1c
 
-gUnknown_082EDC78: ; 82EDC78
+gUnknown_082EDC78: @ 82EDC78
 	.incbin "base_emerald.gba", 0x2edc78, 0x24
 
-gUnknown_082EDC9C: ; 82EDC9C
+gUnknown_082EDC9C: @ 82EDC9C
 	.incbin "base_emerald.gba", 0x2edc9c, 0xb4
 
-gUnknown_082EDD50: ; 82EDD50
+gUnknown_082EDD50: @ 82EDD50
 	.incbin "base_emerald.gba", 0x2edd50, 0x8
 
-gUnknown_082EDD58: ; 82EDD58
+gUnknown_082EDD58: @ 82EDD58
 	.incbin "base_emerald.gba", 0x2edd58, 0x6c
 
-gUnknown_082EDDC4: ; 82EDDC4
+gUnknown_082EDDC4: @ 82EDDC4
 	.incbin "base_emerald.gba", 0x2eddc4, 0x30
 
-gUnknown_082EDDF4: ; 82EDDF4
+gUnknown_082EDDF4: @ 82EDDF4
 	.incbin "base_emerald.gba", 0x2eddf4, 0x18
 
-gUnknown_082EDE0C: ; 82EDE0C
+gUnknown_082EDE0C: @ 82EDE0C
 	.incbin "base_emerald.gba", 0x2ede0c, 0x3c
 
-gUnknown_082EDE48: ; 82EDE48
+gUnknown_082EDE48: @ 82EDE48
 	.incbin "base_emerald.gba", 0x2ede48, 0x1c
 
-gUnknown_082EDE64: ; 82EDE64
+gUnknown_082EDE64: @ 82EDE64
 	.incbin "base_emerald.gba", 0x2ede64, 0x38
 
-gUnknown_082EDE9C: ; 82EDE9C
+gUnknown_082EDE9C: @ 82EDE9C
 	.incbin "base_emerald.gba", 0x2ede9c, 0x28
 
-gUnknown_082EDEC4: ; 82EDEC4
+gUnknown_082EDEC4: @ 82EDEC4
 	.incbin "base_emerald.gba", 0x2edec4, 0x40
 
-gUnknown_082EDF04: ; 82EDF04
+gUnknown_082EDF04: @ 82EDF04
 	.incbin "base_emerald.gba", 0x2edf04, 0x3c
 
-gUnknown_082EDF40: ; 82EDF40
+gUnknown_082EDF40: @ 82EDF40
 	.incbin "base_emerald.gba", 0x2edf40, 0x40
 
-gUnknown_082EDF80: ; 82EDF80
+gUnknown_082EDF80: @ 82EDF80
 	.incbin "base_emerald.gba", 0x2edf80, 0x84
 
-gUnknown_082EE004: ; 82EE004
+gUnknown_082EE004: @ 82EE004
 	.incbin "base_emerald.gba", 0x2ee004, 0x178
 
-gUnknown_082EE17C: ; 82EE17C
+gUnknown_082EE17C: @ 82EE17C
 	.incbin "base_emerald.gba", 0x2ee17c, 0xd0
 
-gUnknown_082EE24C: ; 82EE24C
+gUnknown_082EE24C: @ 82EE24C
 	.incbin "base_emerald.gba", 0x2ee24c, 0xd8
 
-gUnknown_082EE324: ; 82EE324
+gUnknown_082EE324: @ 82EE324
 	.incbin "base_emerald.gba", 0x2ee324, 0x54
 
-gUnknown_082EE378: ; 82EE378
+gUnknown_082EE378: @ 82EE378
 	.incbin "base_emerald.gba", 0x2ee378, 0x8
 
-gUnknown_082EE380: ; 82EE380
+gUnknown_082EE380: @ 82EE380
 	.incbin "base_emerald.gba", 0x2ee380, 0x5c
 
-gUnknown_082EE3DC: ; 82EE3DC
+gUnknown_082EE3DC: @ 82EE3DC
 	.incbin "base_emerald.gba", 0x2ee3dc, 0x54
 
-gUnknown_082EE430: ; 82EE430
+gUnknown_082EE430: @ 82EE430
 	.incbin "base_emerald.gba", 0x2ee430, 0x4c
 
-gUnknown_082EE47C: ; 82EE47C
+gUnknown_082EE47C: @ 82EE47C
 	.incbin "base_emerald.gba", 0x2ee47c, 0x74
 
-gUnknown_082EE4F0: ; 82EE4F0
+gUnknown_082EE4F0: @ 82EE4F0
 	.incbin "base_emerald.gba", 0x2ee4f0, 0x54
 
-gUnknown_082EE544: ; 82EE544
+gUnknown_082EE544: @ 82EE544
 	.incbin "base_emerald.gba", 0x2ee544, 0x1c
 
-gUnknown_082EE560: ; 82EE560
+gUnknown_082EE560: @ 82EE560
 	.incbin "base_emerald.gba", 0x2ee560, 0x1c
 
-gUnknown_082EE57C: ; 82EE57C
+gUnknown_082EE57C: @ 82EE57C
 	.incbin "base_emerald.gba", 0x2ee57c, 0x1c
 
-gUnknown_082EE598: ; 82EE598
+gUnknown_082EE598: @ 82EE598
 	.incbin "base_emerald.gba", 0x2ee598, 0x120
 
-gUnknown_082EE6B8: ; 82EE6B8
+gUnknown_082EE6B8: @ 82EE6B8
 	.incbin "base_emerald.gba", 0x2ee6b8, 0x10
 
-gUnknown_082EE6C8: ; 82EE6C8
+gUnknown_082EE6C8: @ 82EE6C8
 	.incbin "base_emerald.gba", 0x2ee6c8, 0x164
 
-gUnknown_082EE82C: ; 82EE82C
+gUnknown_082EE82C: @ 82EE82C
 	.incbin "base_emerald.gba", 0x2ee82c, 0x158
 
-gUnknown_082EE984: ; 82EE984
+gUnknown_082EE984: @ 82EE984
 	.incbin "base_emerald.gba", 0x2ee984, 0xe4
 
-gUnknown_082EEA68: ; 82EEA68
+gUnknown_082EEA68: @ 82EEA68
 	.incbin "base_emerald.gba", 0x2eea68, 0xa0
 
-gUnknown_082EEB08: ; 82EEB08
+gUnknown_082EEB08: @ 82EEB08
 	.incbin "base_emerald.gba", 0x2eeb08, 0x78
 
-gUnknown_082EEB80: ; 82EEB80
+gUnknown_082EEB80: @ 82EEB80
 	.incbin "base_emerald.gba", 0x2eeb80, 0x8
 
-gUnknown_082EEB88: ; 82EEB88
+gUnknown_082EEB88: @ 82EEB88
 	.incbin "base_emerald.gba", 0x2eeb88, 0x48
 
-gUnknown_082EEBD0: ; 82EEBD0
+gUnknown_082EEBD0: @ 82EEBD0
 	.incbin "base_emerald.gba", 0x2eebd0, 0x44
 
-gUnknown_082EEC14: ; 82EEC14
+gUnknown_082EEC14: @ 82EEC14
 	.incbin "base_emerald.gba", 0x2eec14, 0x88
 
-gUnknown_082EEC9C: ; 82EEC9C
+gUnknown_082EEC9C: @ 82EEC9C
 	.incbin "base_emerald.gba", 0x2eec9c, 0xa0
 
-gUnknown_082EED3C: ; 82EED3C
+gUnknown_082EED3C: @ 82EED3C
 	.incbin "base_emerald.gba", 0x2eed3c, 0x170
 
-gUnknown_082EEEAC: ; 82EEEAC
+gUnknown_082EEEAC: @ 82EEEAC
 	.incbin "base_emerald.gba", 0x2eeeac, 0x164
 
-gUnknown_082EF010: ; 82EF010
+gUnknown_082EF010: @ 82EF010
 	.incbin "base_emerald.gba", 0x2ef010, 0xf0
 
-gUnknown_082EF100: ; 82EF100
+gUnknown_082EF100: @ 82EF100
 	.incbin "base_emerald.gba", 0x2ef100, 0xcc
 
-gUnknown_082EF1CC: ; 82EF1CC
+gUnknown_082EF1CC: @ 82EF1CC
 	.incbin "base_emerald.gba", 0x2ef1cc, 0x20
 
-gUnknown_082EF1EC: ; 82EF1EC
+gUnknown_082EF1EC: @ 82EF1EC
 	.incbin "base_emerald.gba", 0x2ef1ec, 0x20
 
-gUnknown_082EF20C: ; 82EF20C
+gUnknown_082EF20C: @ 82EF20C
 	.incbin "base_emerald.gba", 0x2ef20c, 0x8c
 
-gUnknown_082EF298: ; 82EF298
+gUnknown_082EF298: @ 82EF298
 	.incbin "base_emerald.gba", 0x2ef298, 0x1e4
 
-gUnknown_082EF47C: ; 82EF47C
+gUnknown_082EF47C: @ 82EF47C
 	.incbin "base_emerald.gba", 0x2ef47c, 0x48
 
-gUnknown_082EF4C4: ; 82EF4C4
+gUnknown_082EF4C4: @ 82EF4C4
 	.incbin "base_emerald.gba", 0x2ef4c4, 0x38
 
-gUnknown_082EF4FC: ; 82EF4FC
+gUnknown_082EF4FC: @ 82EF4FC
 	.incbin "base_emerald.gba", 0x2ef4fc, 0x24
 
-gUnknown_082EF520: ; 82EF520
+gUnknown_082EF520: @ 82EF520
 	.incbin "base_emerald.gba", 0x2ef520, 0x24
 
-gUnknown_082EF544: ; 82EF544
+gUnknown_082EF544: @ 82EF544
 	.incbin "base_emerald.gba", 0x2ef544, 0x20
 
-gUnknown_082EF564: ; 82EF564
+gUnknown_082EF564: @ 82EF564
 	.incbin "base_emerald.gba", 0x2ef564, 0x2c
 
-gUnknown_082EF590: ; 82EF590
+gUnknown_082EF590: @ 82EF590
 	.incbin "base_emerald.gba", 0x2ef590, 0x28
 
-gUnknown_082EF5B8: ; 82EF5B8
+gUnknown_082EF5B8: @ 82EF5B8
 	.incbin "base_emerald.gba", 0x2ef5b8, 0xa4
 
-gUnknown_082EF65C: ; 82EF65C
+gUnknown_082EF65C: @ 82EF65C
 	.incbin "base_emerald.gba", 0x2ef65c, 0x88
 
-gUnknown_082EF6E4: ; 82EF6E4
+gUnknown_082EF6E4: @ 82EF6E4
 	.incbin "base_emerald.gba", 0x2ef6e4, 0x34
 
-gUnknown_082EF718: ; 82EF718
+gUnknown_082EF718: @ 82EF718
 	.incbin "base_emerald.gba", 0x2ef718, 0x98
 
-gUnknown_082EF7B0: ; 82EF7B0
+gUnknown_082EF7B0: @ 82EF7B0
 	.incbin "base_emerald.gba", 0x2ef7b0, 0x20
 
-gUnknown_082EF7D0: ; 82EF7D0
+gUnknown_082EF7D0: @ 82EF7D0
 	.incbin "base_emerald.gba", 0x2ef7d0, 0xc
 
-gUnknown_082EF7DC: ; 82EF7DC
+gUnknown_082EF7DC: @ 82EF7DC
 	.incbin "base_emerald.gba", 0x2ef7dc, 0x1c
 
-gUnknown_082EF7F8: ; 82EF7F8
+gUnknown_082EF7F8: @ 82EF7F8
 	.incbin "base_emerald.gba", 0x2ef7f8, 0x378
 
-gUnknown_082EFB70: ; 82EFB70
+gUnknown_082EFB70: @ 82EFB70
 	.incbin "base_emerald.gba", 0x2efb70, 0x58
 
-gUnknown_082EFBC8: ; 82EFBC8
+gUnknown_082EFBC8: @ 82EFBC8
 	.incbin "base_emerald.gba", 0x2efbc8, 0x74
 
-gUnknown_082EFC3C: ; 82EFC3C
+gUnknown_082EFC3C: @ 82EFC3C
 	.incbin "base_emerald.gba", 0x2efc3c, 0x18
 
-gUnknown_082EFC54: ; 82EFC54
+gUnknown_082EFC54: @ 82EFC54
 	.incbin "base_emerald.gba", 0x2efc54, 0x3c
 
-gUnknown_082EFC90: ; 82EFC90
+gUnknown_082EFC90: @ 82EFC90
 	.incbin "base_emerald.gba", 0x2efc90, 0xc8
 
-gUnknown_082EFD58: ; 82EFD58
+gUnknown_082EFD58: @ 82EFD58
 	.incbin "base_emerald.gba", 0x2efd58, 0x3c
 
-gUnknown_082EFD94: ; 82EFD94
+gUnknown_082EFD94: @ 82EFD94
 	.incbin "base_emerald.gba", 0x2efd94, 0x1bc
 
-gUnknown_082EFF50: ; 82EFF50
+gUnknown_082EFF50: @ 82EFF50
 	.incbin "base_emerald.gba", 0x2eff50, 0x14
 
-gUnknown_082EFF64: ; 82EFF64
+gUnknown_082EFF64: @ 82EFF64
 	.incbin "base_emerald.gba", 0x2eff64, 0x40
 
-gUnknown_082EFFA4: ; 82EFFA4
+gUnknown_082EFFA4: @ 82EFFA4
 	.incbin "base_emerald.gba", 0x2effa4, 0x74
 
-gUnknown_082F0018: ; 82F0018
+gUnknown_082F0018: @ 82F0018
 	.incbin "base_emerald.gba", 0x2f0018, 0x8
 
-gUnknown_082F0020: ; 82F0020
+gUnknown_082F0020: @ 82F0020
 	.incbin "base_emerald.gba", 0x2f0020, 0x28
 
-gUnknown_082F0048: ; 82F0048
+gUnknown_082F0048: @ 82F0048
 	.incbin "base_emerald.gba", 0x2f0048, 0x74
 
-gUnknown_082F00BC: ; 82F00BC
+gUnknown_082F00BC: @ 82F00BC
 	.incbin "base_emerald.gba", 0x2f00bc, 0x8
 
-gUnknown_082F00C4: ; 82F00C4
+gUnknown_082F00C4: @ 82F00C4
 	.incbin "base_emerald.gba", 0x2f00c4, 0x58
 
-gUnknown_082F011C: ; 82F011C
+gUnknown_082F011C: @ 82F011C
 	.incbin "base_emerald.gba", 0x2f011c, 0x8
 
-gUnknown_082F0124: ; 82F0124
+gUnknown_082F0124: @ 82F0124
 	.incbin "base_emerald.gba", 0x2f0124, 0x8
 
-gUnknown_082F012C: ; 82F012C
+gUnknown_082F012C: @ 82F012C
 	.incbin "base_emerald.gba", 0x2f012c, 0x30
 
-gUnknown_082F015C: ; 82F015C
+gUnknown_082F015C: @ 82F015C
 	.incbin "base_emerald.gba", 0x2f015c, 0x18
 
-gUnknown_082F0174: ; 82F0174
+gUnknown_082F0174: @ 82F0174
 	.incbin "base_emerald.gba", 0x2f0174, 0x8
 
-gUnknown_082F017C: ; 82F017C
+gUnknown_082F017C: @ 82F017C
 	.incbin "base_emerald.gba", 0x2f017c, 0x88
 
-gUnknown_082F0204: ; 82F0204
+gUnknown_082F0204: @ 82F0204
 	.incbin "base_emerald.gba", 0x2f0204, 0x18
 
-gUnknown_082F021C: ; 82F021C
+gUnknown_082F021C: @ 82F021C
 	.incbin "base_emerald.gba", 0x2f021c, 0x28
 
-gUnknown_082F0244: ; 82F0244
+gUnknown_082F0244: @ 82F0244
 	.incbin "base_emerald.gba", 0x2f0244, 0x18
 
-gUnknown_082F025C: ; 82F025C
+gUnknown_082F025C: @ 82F025C
 	.incbin "base_emerald.gba", 0x2f025c, 0x20
 
-gUnknown_082F027C: ; 82F027C
+gUnknown_082F027C: @ 82F027C
 	.incbin "base_emerald.gba", 0x2f027c, 0x18
 
-gUnknown_082F0294: ; 82F0294
+gUnknown_082F0294: @ 82F0294
 	.incbin "base_emerald.gba", 0x2f0294, 0x98
 
-gUnknown_082F032C: ; 82F032C
+gUnknown_082F032C: @ 82F032C
 	.incbin "base_emerald.gba", 0x2f032c, 0x18
 
-gUnknown_082F0344: ; 82F0344
+gUnknown_082F0344: @ 82F0344
 	.incbin "base_emerald.gba", 0x2f0344, 0x8
 
-gUnknown_082F034C: ; 82F034C
+gUnknown_082F034C: @ 82F034C
 	.incbin "base_emerald.gba", 0x2f034c, 0x58
 
-gUnknown_082F03A4: ; 82F03A4
+gUnknown_082F03A4: @ 82F03A4
 	.incbin "base_emerald.gba", 0x2f03a4, 0xb8
 
-gUnknown_082F045C: ; 82F045C
+gUnknown_082F045C: @ 82F045C
 	.incbin "base_emerald.gba", 0x2f045c, 0x7c
 
-gUnknown_082F04D8: ; 82F04D8
+gUnknown_082F04D8: @ 82F04D8
 	.incbin "base_emerald.gba", 0x2f04d8, 0x58
 
-gUnknown_082F0530: ; 82F0530
+gUnknown_082F0530: @ 82F0530
 	.incbin "base_emerald.gba", 0x2f0530, 0x18
 
-gUnknown_082F0548: ; 82F0548
+gUnknown_082F0548: @ 82F0548
 	.incbin "base_emerald.gba", 0x2f0548, 0x20
 
-gUnknown_082F0568: ; 82F0568
+gUnknown_082F0568: @ 82F0568
 	.incbin "base_emerald.gba", 0x2f0568, 0x30
 
-gUnknown_082F0598: ; 82F0598
+gUnknown_082F0598: @ 82F0598
 	.incbin "base_emerald.gba", 0x2f0598, 0x10
 
-gUnknown_082F05A8: ; 82F05A8
+gUnknown_082F05A8: @ 82F05A8
 	.incbin "base_emerald.gba", 0x2f05a8, 0x20
 
-gUnknown_082F05C8: ; 82F05C8
+gUnknown_082F05C8: @ 82F05C8
 	.incbin "base_emerald.gba", 0x2f05c8, 0x8
 
-gUnknown_082F05D0: ; 82F05D0
+gUnknown_082F05D0: @ 82F05D0
 	.incbin "base_emerald.gba", 0x2f05d0, 0x8
 
-gUnknown_082F05D8: ; 82F05D8
+gUnknown_082F05D8: @ 82F05D8
 	.incbin "base_emerald.gba", 0x2f05d8, 0x8
 
-gUnknown_082F05E0: ; 82F05E0
+gUnknown_082F05E0: @ 82F05E0
 	.incbin "base_emerald.gba", 0x2f05e0, 0x8
 
-gUnknown_082F05E8: ; 82F05E8
+gUnknown_082F05E8: @ 82F05E8
 	.incbin "base_emerald.gba", 0x2f05e8, 0x8
 
-gUnknown_082F05F0: ; 82F05F0
+gUnknown_082F05F0: @ 82F05F0
 	.incbin "base_emerald.gba", 0x2f05f0, 0x8
 
-gUnknown_082F05F8: ; 82F05F8
+gUnknown_082F05F8: @ 82F05F8
 	.incbin "base_emerald.gba", 0x2f05f8, 0x8
 
-gUnknown_082F0600: ; 82F0600
+gUnknown_082F0600: @ 82F0600
 	.incbin "base_emerald.gba", 0x2f0600, 0x8
 
-gUnknown_082F0608: ; 82F0608
+gUnknown_082F0608: @ 82F0608
 	.incbin "base_emerald.gba", 0x2f0608, 0x18
 
-gUnknown_082F0620: ; 82F0620
+gUnknown_082F0620: @ 82F0620
 	.incbin "base_emerald.gba", 0x2f0620, 0x18
 
-gUnknown_082F0638: ; 82F0638
+gUnknown_082F0638: @ 82F0638
 	.incbin "base_emerald.gba", 0x2f0638, 0x78
 
-gUnknown_082F06B0: ; 82F06B0
+gUnknown_082F06B0: @ 82F06B0
 	.incbin "base_emerald.gba", 0x2f06b0, 0x18
 
-gUnknown_082F06C8: ; 82F06C8
+gUnknown_082F06C8: @ 82F06C8
 	.incbin "base_emerald.gba", 0x2f06c8, 0x18
 
-gUnknown_082F06E0: ; 82F06E0
+gUnknown_082F06E0: @ 82F06E0
 	.incbin "base_emerald.gba", 0x2f06e0, 0x18
 
-gUnknown_082F06F8: ; 82F06F8
+gUnknown_082F06F8: @ 82F06F8
 	.incbin "base_emerald.gba", 0x2f06f8, 0x28
 
-gUnknown_082F0720: ; 82F0720
+gUnknown_082F0720: @ 82F0720
 	.incbin "base_emerald.gba", 0x2f0720, 0x8
 
-gUnknown_082F0728: ; 82F0728
+gUnknown_082F0728: @ 82F0728
 	.incbin "base_emerald.gba", 0x2f0728, 0x4
 
-gUnknown_082F072C: ; 82F072C
+gUnknown_082F072C: @ 82F072C
 	.incbin "base_emerald.gba", 0x2f072c, 0x14
 
-gUnknown_082F0740: ; 82F0740
+gUnknown_082F0740: @ 82F0740
 	.incbin "base_emerald.gba", 0x2f0740, 0x20
 
-gUnknown_082F0760: ; 82F0760
+gUnknown_082F0760: @ 82F0760
 	.incbin "base_emerald.gba", 0x2f0760, 0xa
 
-gUnknown_082F076A: ; 82F076A
+gUnknown_082F076A: @ 82F076A
 	.incbin "base_emerald.gba", 0x2f076a, 0x5
 
-gUnknown_082F076F: ; 82F076F
+gUnknown_082F076F: @ 82F076F
 	.incbin "base_emerald.gba", 0x2f076f, 0x5
 
-gUnknown_082F0774: ; 82F0774
+gUnknown_082F0774: @ 82F0774
 	.incbin "base_emerald.gba", 0x2f0774, 0x18
 
-gUnknown_082F078C: ; 82F078C
+gUnknown_082F078C: @ 82F078C
 	.incbin "base_emerald.gba", 0x2f078c, 0x2
 
-gUnknown_082F078E: ; 82F078E
+gUnknown_082F078E: @ 82F078E
 	.incbin "base_emerald.gba", 0x2f078e, 0x2
 
-gUnknown_082F0790: ; 82F0790
+gUnknown_082F0790: @ 82F0790
 	.incbin "base_emerald.gba", 0x2f0790, 0x200
 
-gUnknown_082F0990: ; 82F0990
+gUnknown_082F0990: @ 82F0990
 	.incbin "base_emerald.gba", 0x2f0990, 0x210
 
-gUnknown_082F0BA0: ; 82F0BA0
+gUnknown_082F0BA0: @ 82F0BA0
 	.incbin "base_emerald.gba", 0x2f0ba0, 0x194
 
-gUnknown_082F0D34: ; 82F0D34
+gUnknown_082F0D34: @ 82F0D34
 	.incbin "base_emerald.gba", 0x2f0d34, 0x8
 
-gUnknown_082F0D3C: ; 82F0D3C
+gUnknown_082F0D3C: @ 82F0D3C
 	.incbin "base_emerald.gba", 0x2f0d3c, 0x20
 
-gUnknown_082F0D5C: ; 82F0D5C
+gUnknown_082F0D5C: @ 82F0D5C
 	.incbin "base_emerald.gba", 0x2f0d5c, 0x14
 
-gUnknown_082F0D70: ; 82F0D70
+gUnknown_082F0D70: @ 82F0D70
 	.incbin "base_emerald.gba", 0x2f0d70, 0x60
 
-gUnknown_082F0DD0: ; 82F0DD0
+gUnknown_082F0DD0: @ 82F0DD0
 	.incbin "base_emerald.gba", 0x2f0dd0, 0x4
 
-gUnknown_082F0DD4: ; 82F0DD4
+gUnknown_082F0DD4: @ 82F0DD4
 	.incbin "base_emerald.gba", 0x2f0dd4, 0x10
 
-gUnknown_082F0DE4: ; 82F0DE4
+gUnknown_082F0DE4: @ 82F0DE4
 	.incbin "base_emerald.gba", 0x2f0de4, 0x4
 
-gUnknown_082F0DE8: ; 82F0DE8
+gUnknown_082F0DE8: @ 82F0DE8
 	.incbin "base_emerald.gba", 0x2f0de8, 0x28
 
-gUnknown_082F0E10: ; 82F0E10
+gUnknown_082F0E10: @ 82F0E10
 	.incbin "base_emerald.gba", 0x2f0e10, 0x8
 
-gUnknown_082F0E18: ; 82F0E18
+gUnknown_082F0E18: @ 82F0E18
 	.incbin "base_emerald.gba", 0x2f0e18, 0x4
 
-gUnknown_082F0E1C: ; 82F0E1C
+gUnknown_082F0E1C: @ 82F0E1C
 	.incbin "base_emerald.gba", 0x2f0e1c, 0xee4
 
-gUnknown_082F1D00: ; 82F1D00
+gUnknown_082F1D00: @ 82F1D00
 	.incbin "base_emerald.gba", 0x2f1d00, 0x8
 
-gUnknown_082F1D08: ; 82F1D08
+gUnknown_082F1D08: @ 82F1D08
 	.incbin "base_emerald.gba", 0x2f1d08, 0x40
 
-gUnknown_082F1D48: ; 82F1D48
+gUnknown_082F1D48: @ 82F1D48
 	.incbin "base_emerald.gba", 0x2f1d48, 0x18
 
-gUnknown_082F1D60: ; 82F1D60
+gUnknown_082F1D60: @ 82F1D60
 	.incbin "base_emerald.gba", 0x2f1d60, 0x80
 
-gUnknown_082F1DE0: ; 82F1DE0
+gUnknown_082F1DE0: @ 82F1DE0
 	.incbin "base_emerald.gba", 0x2f1de0, 0x8
 
-gUnknown_082F1DE8: ; 82F1DE8
+gUnknown_082F1DE8: @ 82F1DE8
 	.incbin "base_emerald.gba", 0x2f1de8, 0x10
 
-gUnknown_082F1DF8: ; 82F1DF8
+gUnknown_082F1DF8: @ 82F1DF8
 	.incbin "base_emerald.gba", 0x2f1df8, 0x6d0
 
-gUnknown_082F24C8: ; 82F24C8
+gUnknown_082F24C8: @ 82F24C8
 	.incbin "base_emerald.gba", 0x2f24c8, 0x80
 
-gUnknown_082F2548: ; 82F2548
+gUnknown_082F2548: @ 82F2548
 	.incbin "base_emerald.gba", 0x2f2548, 0x14
 
-gUnknown_082F255C: ; 82F255C
+gUnknown_082F255C: @ 82F255C
 	.incbin "base_emerald.gba", 0x2f255c, 0x3c
 
-gUnknown_082F2598: ; 82F2598
+gUnknown_082F2598: @ 82F2598
 	.incbin "base_emerald.gba", 0x2f2598, 0x3f4
 
-gUnknown_082F298C: ; 82F298C
+gUnknown_082F298C: @ 82F298C
 	.incbin "base_emerald.gba", 0x2f298c, 0x60
 
-gUnknown_082F29EC: ; 82F29EC
+gUnknown_082F29EC: @ 82F29EC
 	.incbin "base_emerald.gba", 0x2f29ec, 0x90
 
-gUnknown_082F2A7C: ; 82F2A7C
+gUnknown_082F2A7C: @ 82F2A7C
 	.incbin "base_emerald.gba", 0x2f2a7c, 0x28
 
-gUnknown_082F2AA4: ; 82F2AA4
+gUnknown_082F2AA4: @ 82F2AA4
 	.incbin "base_emerald.gba", 0x2f2aa4, 0x4
 
-gUnknown_082F2AA8: ; 82F2AA8
+gUnknown_082F2AA8: @ 82F2AA8
 	.incbin "base_emerald.gba", 0x2f2aa8, 0x100
 
-gUnknown_082F2BA8: ; 82F2BA8
+gUnknown_082F2BA8: @ 82F2BA8
 	.incbin "base_emerald.gba", 0x2f2ba8, 0x78
 
-gUnknown_082F2C20: ; 82F2C20
+gUnknown_082F2C20: @ 82F2C20
 	.incbin "base_emerald.gba", 0x2f2c20, 0x20
 
-gUnknown_082F2C40: ; 82F2C40
+gUnknown_082F2C40: @ 82F2C40
 	.incbin "base_emerald.gba", 0x2f2c40, 0x20
 
-gUnknown_082F2C60: ; 82F2C60
+gUnknown_082F2C60: @ 82F2C60
 	.incbin "base_emerald.gba", 0x2f2c60, 0x10
 
-gUnknown_082F2C70: ; 82F2C70
+gUnknown_082F2C70: @ 82F2C70
 	.incbin "base_emerald.gba", 0x2f2c70, 0x28
 
-gUnknown_082F2C98: ; 82F2C98
+gUnknown_082F2C98: @ 82F2C98
 	.incbin "base_emerald.gba", 0x2f2c98, 0xa8
 
-gUnknown_082F2D40: ; 82F2D40
+gUnknown_082F2D40: @ 82F2D40
 	.incbin "base_emerald.gba", 0x2f2d40, 0x84
 
-gUnknown_082F2DC4: ; 82F2DC4
+gUnknown_082F2DC4: @ 82F2DC4
 	.incbin "base_emerald.gba", 0x2f2dc4, 0x4
 
-gUnknown_082F2DC8: ; 82F2DC8
+gUnknown_082F2DC8: @ 82F2DC8
 	.incbin "base_emerald.gba", 0x2f2dc8, 0x2a
 
-gUnknown_082F2DF2: ; 82F2DF2
+gUnknown_082F2DF2: @ 82F2DF2
 	.incbin "base_emerald.gba", 0x2f2df2, 0x342
 
-gUnknown_082F3134: ; 82F3134
+gUnknown_082F3134: @ 82F3134
 	.incbin "base_emerald.gba", 0x2f3134, 0x28
 
-gUnknown_082F315C: ; 82F315C
+gUnknown_082F315C: @ 82F315C
 	.incbin "base_emerald.gba", 0x2f315c, 0x40
 
-gUnknown_082F319C: ; 82F319C
+gUnknown_082F319C: @ 82F319C
 	.incbin "base_emerald.gba", 0x2f319c, 0x20
 
-gUnknown_082F31BC: ; 82F31BC
+gUnknown_082F31BC: @ 82F31BC
 	.incbin "base_emerald.gba", 0x2f31bc, 0x18
 
-gUnknown_082F31D4: ; 82F31D4
+gUnknown_082F31D4: @ 82F31D4
 	.incbin "base_emerald.gba", 0x2f31d4, 0x58
 
-gUnknown_082F322C: ; 82F322C
+gUnknown_082F322C: @ 82F322C
 	.incbin "base_emerald.gba", 0x2f322c, 0x18
 
-gUnknown_082F3244: ; 82F3244
+gUnknown_082F3244: @ 82F3244
 	.incbin "base_emerald.gba", 0x2f3244, 0x18
 
-gUnknown_082F325C: ; 82F325C
+gUnknown_082F325C: @ 82F325C
 	.incbin "base_emerald.gba", 0x2f325c, 0x8
 
-gUnknown_082F3264: ; 82F3264
+gUnknown_082F3264: @ 82F3264
 	.incbin "base_emerald.gba", 0x2f3264, 0x8
 
-gUnknown_082F326C: ; 82F326C
+gUnknown_082F326C: @ 82F326C
 	.incbin "base_emerald.gba", 0x2f326c, 0x24
 
-gUnknown_082F3290: ; 82F3290
+gUnknown_082F3290: @ 82F3290
 	.incbin "base_emerald.gba", 0x2f3290, 0x14
 
-gUnknown_082F32A4: ; 82F32A4
+gUnknown_082F32A4: @ 82F32A4
 	.incbin "base_emerald.gba", 0x2f32a4, 0x24
 
-gUnknown_082F32C8: ; 82F32C8
+gUnknown_082F32C8: @ 82F32C8
 	.incbin "base_emerald.gba", 0x2f32c8, 0x4
 
-gUnknown_082F32CC: ; 82F32CC
+gUnknown_082F32CC: @ 82F32CC
 	.incbin "base_emerald.gba", 0x2f32cc, 0xc
 
-gUnknown_082F32D8: ; 82F32D8
+gUnknown_082F32D8: @ 82F32D8
 	.incbin "base_emerald.gba", 0x2f32d8, 0x3
 
-gUnknown_082F32DB: ; 82F32DB
+gUnknown_082F32DB: @ 82F32DB
 	.incbin "base_emerald.gba", 0x2f32db, 0x3
 
-gUnknown_082F32DE: ; 82F32DE
+gUnknown_082F32DE: @ 82F32DE
 	.incbin "base_emerald.gba", 0x2f32de, 0x3
 
-gUnknown_082F32E1: ; 82F32E1
+gUnknown_082F32E1: @ 82F32E1
 	.incbin "base_emerald.gba", 0x2f32e1, 0x6
 
-gUnknown_082F32E7: ; 82F32E7
+gUnknown_082F32E7: @ 82F32E7
 	.incbin "base_emerald.gba", 0x2f32e7, 0x5
 
-gUnknown_082F32EC: ; 82F32EC
+gUnknown_082F32EC: @ 82F32EC
 	.incbin "base_emerald.gba", 0x2f32ec, 0x8
 
-gUnknown_082F32F4: ; 82F32F4
+gUnknown_082F32F4: @ 82F32F4
 	.incbin "base_emerald.gba", 0x2f32f4, 0x50
 
-gUnknown_082F3344: ; 82F3344
+gUnknown_082F3344: @ 82F3344
 	.incbin "base_emerald.gba", 0x2f3344, 0x8
 
-gUnknown_082F334C: ; 82F334C
+gUnknown_082F334C: @ 82F334C
 	.incbin "base_emerald.gba", 0x2f334c, 0x940
 
-gUnknown_082F3C8C: ; 82F3C8C
+gUnknown_082F3C8C: @ 82F3C8C
 	.incbin "base_emerald.gba", 0x2f3c8c, 0x130
 
-gUnknown_082F3DBC: ; 82F3DBC
+gUnknown_082F3DBC: @ 82F3DBC
 	.incbin "base_emerald.gba", 0x2f3dbc, 0x198
 
-gUnknown_082F3F54: ; 82F3F54
+gUnknown_082F3F54: @ 82F3F54
 	.incbin "base_emerald.gba", 0x2f3f54, 0x228
 
-gUnknown_082F417C: ; 82F417C
+gUnknown_082F417C: @ 82F417C
 	.incbin "base_emerald.gba", 0x2f417c, 0x14
 
-gUnknown_082F4190: ; 82F4190
+gUnknown_082F4190: @ 82F4190
 	.incbin "base_emerald.gba", 0x2f4190, 0x3c
 
-gUnknown_082F41CC: ; 82F41CC
+gUnknown_082F41CC: @ 82F41CC
 	.incbin "base_emerald.gba", 0x2f41cc, 0x1
 
-gUnknown_082F41CD: ; 82F41CD
+gUnknown_082F41CD: @ 82F41CD
 	.incbin "base_emerald.gba", 0x2f41cd, 0x5
 
-gUnknown_082F41D2: ; 82F41D2
+gUnknown_082F41D2: @ 82F41D2
 	.incbin "base_emerald.gba", 0x2f41d2, 0x1
 
-gUnknown_082F41D3: ; 82F41D3
+gUnknown_082F41D3: @ 82F41D3
 	.incbin "base_emerald.gba", 0x2f41d3, 0x15
 
-gUnknown_082F41E8: ; 82F41E8
+gUnknown_082F41E8: @ 82F41E8
 	.incbin "base_emerald.gba", 0x2f41e8, 0xc
 
-gUnknown_082F41F4: ; 82F41F4
+gUnknown_082F41F4: @ 82F41F4
 	.incbin "base_emerald.gba", 0x2f41f4, 0x28
 
-gUnknown_082F421C: ; 82F421C
+gUnknown_082F421C: @ 82F421C
 	.incbin "base_emerald.gba", 0x2f421c, 0xf0
 
-gUnknown_082F430C: ; 82F430C
+gUnknown_082F430C: @ 82F430C
 	.incbin "base_emerald.gba", 0x2f430c, 0x18
 
-gUnknown_082F4324: ; 82F4324
+gUnknown_082F4324: @ 82F4324
 	.incbin "base_emerald.gba", 0x2f4324, 0x18
 
-gUnknown_082F433C: ; 82F433C
+gUnknown_082F433C: @ 82F433C
 	.incbin "base_emerald.gba", 0x2f433c, 0x18
 
-gUnknown_082F4354: ; 82F4354
+gUnknown_082F4354: @ 82F4354
 	.incbin "base_emerald.gba", 0x2f4354, 0x18
 
-gUnknown_082F436C: ; 82F436C
+gUnknown_082F436C: @ 82F436C
 	.incbin "base_emerald.gba", 0x2f436c, 0x18
 
-gUnknown_082F4384: ; 82F4384
+gUnknown_082F4384: @ 82F4384
 	.incbin "base_emerald.gba", 0x2f4384, 0x30
 
-gUnknown_082F43B4: ; 82F43B4
+gUnknown_082F43B4: @ 82F43B4
 	.incbin "base_emerald.gba", 0x2f43b4, 0x18
 
-gUnknown_082F43CC: ; 82F43CC
+gUnknown_082F43CC: @ 82F43CC
 	.incbin "base_emerald.gba", 0x2f43cc, 0x68
 
-gUnknown_082F4434: ; 82F4434
+gUnknown_082F4434: @ 82F4434
 	.incbin "base_emerald.gba", 0x2f4434, 0x10
 
-gUnknown_082F4444: ; 82F4444
+gUnknown_082F4444: @ 82F4444
 	.incbin "base_emerald.gba", 0x2f4444, 0x4
 
-gUnknown_082F4448: ; 82F4448
+gUnknown_082F4448: @ 82F4448
 	.incbin "base_emerald.gba", 0x2f4448, 0x54
 
-gUnknown_082F449C: ; 82F449C
+gUnknown_082F449C: @ 82F449C
 	.incbin "base_emerald.gba", 0x2f449c, 0x113
 
-gUnknown_082F45AF: ; 82F45AF
+gUnknown_082F45AF: @ 82F45AF
 	.incbin "base_emerald.gba", 0x2f45af, 0x4b
 
-gUnknown_082F45FA: ; 82F45FA
+gUnknown_082F45FA: @ 82F45FA
 	.incbin "base_emerald.gba", 0x2f45fa, 0x4e
 
-gUnknown_082F4648: ; 82F4648
+gUnknown_082F4648: @ 82F4648
 	.incbin "base_emerald.gba", 0x2f4648, 0x37
 
-gUnknown_082F467F: ; 82F467F
+gUnknown_082F467F: @ 82F467F
 	.incbin "base_emerald.gba", 0x2f467f, 0x3409
 
-gUnknown_082F7A88: ; 82F7A88
+gUnknown_082F7A88: @ 82F7A88
 	.incbin "base_emerald.gba", 0x2f7a88, 0xc
 
-gUnknown_082F7A94: ; 82F7A94
+gUnknown_082F7A94: @ 82F7A94
 	.incbin "base_emerald.gba", 0x2f7a94, 0x8
 
-gUnknown_082F7A9C: ; 82F7A9C
+gUnknown_082F7A9C: @ 82F7A9C
 	.incbin "base_emerald.gba", 0x2f7a9c, 0x8
 
-gUnknown_082F7AA4: ; 82F7AA4
+gUnknown_082F7AA4: @ 82F7AA4
 	.incbin "base_emerald.gba", 0x2f7aa4, 0x20
 
-gUnknown_082F7AC4: ; 82F7AC4
+gUnknown_082F7AC4: @ 82F7AC4
 	.incbin "base_emerald.gba", 0x2f7ac4, 0x30
 
-gUnknown_082F7AF4: ; 82F7AF4
+gUnknown_082F7AF4: @ 82F7AF4
 	.incbin "base_emerald.gba", 0x2f7af4, 0x30
 
-gUnknown_082F7B24: ; 82F7B24
+gUnknown_082F7B24: @ 82F7B24
 	.incbin "base_emerald.gba", 0x2f7b24, 0x8
 
-gUnknown_082F7B2C: ; 82F7B2C
+gUnknown_082F7B2C: @ 82F7B2C
 	.incbin "base_emerald.gba", 0x2f7b2c, 0x8
 
-gUnknown_082F7B34: ; 82F7B34
+gUnknown_082F7B34: @ 82F7B34
 	.incbin "base_emerald.gba", 0x2f7b34, 0xc
 
-gUnknown_082F7B40: ; 82F7B40
+gUnknown_082F7B40: @ 82F7B40
 	.incbin "base_emerald.gba", 0x2f7b40, 0x4
 
-gUnknown_082F7B44: ; 82F7B44
+gUnknown_082F7B44: @ 82F7B44
 	.incbin "base_emerald.gba", 0x2f7b44, 0x6
 
-gUnknown_082F7B4A: ; 82F7B4A
+gUnknown_082F7B4A: @ 82F7B4A
 	.incbin "base_emerald.gba", 0x2f7b4a, 0x6
 
-gUnknown_082F7B50: ; 82F7B50
+gUnknown_082F7B50: @ 82F7B50
 	.incbin "base_emerald.gba", 0x2f7b50, 0x40
 
-gUnknown_082F7B90: ; 82F7B90
+gUnknown_082F7B90: @ 82F7B90
 	.incbin "base_emerald.gba", 0x2f7b90, 0x14
 
-gUnknown_082F7BA4: ; 82F7BA4
+gUnknown_082F7BA4: @ 82F7BA4
 	.incbin "base_emerald.gba", 0x2f7ba4, 0x18
 
-gUnknown_082F7BBC: ; 82F7BBC
+gUnknown_082F7BBC: @ 82F7BBC
 	.incbin "base_emerald.gba", 0x2f7bbc, 0x10
 
-gUnknown_082F7BCC: ; 82F7BCC
+gUnknown_082F7BCC: @ 82F7BCC
 	.incbin "base_emerald.gba", 0x2f7bcc, 0x8
 
-gUnknown_082F7BD4: ; 82F7BD4
+gUnknown_082F7BD4: @ 82F7BD4
 	.incbin "base_emerald.gba", 0x2f7bd4, 0x10
 
-gUnknown_082F7BE4: ; 82F7BE4
+gUnknown_082F7BE4: @ 82F7BE4
 	.incbin "base_emerald.gba", 0x2f7be4, 0x8
 
-gUnknown_082F7BEC: ; 82F7BEC
+gUnknown_082F7BEC: @ 82F7BEC
 	.incbin "base_emerald.gba", 0x2f7bec, 0x204
 
-gUnknown_082F7DF0: ; 82F7DF0
+gUnknown_082F7DF0: @ 82F7DF0
 	.incbin "base_emerald.gba", 0x2f7df0, 0xc0
 
-gUnknown_082F7EB0: ; 82F7EB0
+gUnknown_082F7EB0: @ 82F7EB0
 	.incbin "base_emerald.gba", 0x2f7eb0, 0x1d4
 
-gUnknown_082F8084: ; 82F8084
+gUnknown_082F8084: @ 82F8084
 	.incbin "base_emerald.gba", 0x2f8084, 0x890
 
-gUnknown_082F8914: ; 82F8914
+gUnknown_082F8914: @ 82F8914
 	.incbin "base_emerald.gba", 0x2f8914, 0xdcc
 
-gUnknown_082F96E0: ; 82F96E0
+gUnknown_082F96E0: @ 82F96E0
 	.incbin "base_emerald.gba", 0x2f96e0, 0x94
 
-gUnknown_082F9774: ; 82F9774
+gUnknown_082F9774: @ 82F9774
 	.incbin "base_emerald.gba", 0x2f9774, 0x148
 
-gUnknown_082F98BC: ; 82F98BC
+gUnknown_082F98BC: @ 82F98BC
 	.incbin "base_emerald.gba", 0x2f98bc, 0x121c
 
-gUnknown_082FAAD8: ; 82FAAD8
+gUnknown_082FAAD8: @ 82FAAD8
 	.incbin "base_emerald.gba", 0x2faad8, 0x26c
 
-gUnknown_082FAD44: ; 82FAD44
+gUnknown_082FAD44: @ 82FAD44
 	.incbin "base_emerald.gba", 0x2fad44, 0x250
 
-gUnknown_082FAF94: ; 82FAF94
+gUnknown_082FAF94: @ 82FAF94
 	.incbin "base_emerald.gba", 0x2faf94, 0x24c
 
-gUnknown_082FB1E0: ; 82FB1E0
+gUnknown_082FB1E0: @ 82FB1E0
 	.incbin "base_emerald.gba", 0x2fb1e0, 0x48
 
-gUnknown_082FB228: ; 82FB228
+gUnknown_082FB228: @ 82FB228
 	.incbin "base_emerald.gba", 0x2fb228, 0xb0
 
-gUnknown_082FB2D8: ; 82FB2D8
+gUnknown_082FB2D8: @ 82FB2D8
 	.incbin "base_emerald.gba", 0x2fb2d8, 0x8
 
-gUnknown_082FB2E0: ; 82FB2E0
+gUnknown_082FB2E0: @ 82FB2E0
 	.incbin "base_emerald.gba", 0x2fb2e0, 0x8
 
-gUnknown_082FB2E8: ; 82FB2E8
+gUnknown_082FB2E8: @ 82FB2E8
 	.incbin "base_emerald.gba", 0x2fb2e8, 0x8
 
-gUnknown_082FB2F0: ; 82FB2F0
+gUnknown_082FB2F0: @ 82FB2F0
 	.incbin "base_emerald.gba", 0x2fb2f0, 0x24
 
-gUnknown_082FB314: ; 82FB314
+gUnknown_082FB314: @ 82FB314
 	.incbin "base_emerald.gba", 0x2fb314, 0x8
 
-gUnknown_082FB31C: ; 82FB31C
+gUnknown_082FB31C: @ 82FB31C
 	.incbin "base_emerald.gba", 0x2fb31c, 0x8
 
-gUnknown_082FB324: ; 82FB324
+gUnknown_082FB324: @ 82FB324
 	.incbin "base_emerald.gba", 0x2fb324, 0x18
 
-gUnknown_082FB33C: ; 82FB33C
+gUnknown_082FB33C: @ 82FB33C
 	.incbin "base_emerald.gba", 0x2fb33c, 0x18
 
-gUnknown_082FB354: ; 82FB354
+gUnknown_082FB354: @ 82FB354
 	.incbin "base_emerald.gba", 0x2fb354, 0x2
 
-gUnknown_082FB356: ; 82FB356
+gUnknown_082FB356: @ 82FB356
 	.incbin "base_emerald.gba", 0x2fb356, 0xa
 
-gUnknown_082FB360: ; 82FB360
+gUnknown_082FB360: @ 82FB360
 	.incbin "base_emerald.gba", 0x2fb360, 0x8
 
-gUnknown_082FB368: ; 82FB368
+gUnknown_082FB368: @ 82FB368
 	.incbin "base_emerald.gba", 0x2fb368, 0x18
 
-gUnknown_082FB380: ; 82FB380
+gUnknown_082FB380: @ 82FB380
 	.incbin "base_emerald.gba", 0x2fb380, 0x3
 
-gUnknown_082FB383: ; 82FB383
+gUnknown_082FB383: @ 82FB383
 	.incbin "base_emerald.gba", 0x2fb383, 0x45
 
-gUnknown_082FB3C8: ; 82FB3C8
+gUnknown_082FB3C8: @ 82FB3C8
 	.incbin "base_emerald.gba", 0x2fb3c8, 0x14
 
-gUnknown_082FB3DC: ; 82FB3DC
+gUnknown_082FB3DC: @ 82FB3DC
 	.incbin "base_emerald.gba", 0x2fb3dc, 0x14
 
-gUnknown_082FB3F0: ; 82FB3F0
+gUnknown_082FB3F0: @ 82FB3F0
 	.incbin "base_emerald.gba", 0x2fb3f0, 0x8
 
-gUnknown_082FB3F8: ; 82FB3F8
+gUnknown_082FB3F8: @ 82FB3F8
 	.incbin "base_emerald.gba", 0x2fb3f8, 0xa
 
-gUnknown_082FB402: ; 82FB402
+gUnknown_082FB402: @ 82FB402
 	.incbin "base_emerald.gba", 0x2fb402, 0xa
 
-gUnknown_082FB40C: ; 82FB40C
+gUnknown_082FB40C: @ 82FB40C
 	.incbin "base_emerald.gba", 0x2fb40c, 0x50
 
-gUnknown_082FB45C: ; 82FB45C
+gUnknown_082FB45C: @ 82FB45C
 	.incbin "base_emerald.gba", 0x2fb45c, 0x8
 
-gUnknown_082FB464: ; 82FB464
+gUnknown_082FB464: @ 82FB464
 	.incbin "base_emerald.gba", 0x2fb464, 0x190
 
-gUnknown_082FB5F4: ; 82FB5F4
+gUnknown_082FB5F4: @ 82FB5F4
 	.incbin "base_emerald.gba", 0x2fb5f4, 0x24
 
-gUnknown_082FB618: ; 82FB618
+gUnknown_082FB618: @ 82FB618
 	.incbin "base_emerald.gba", 0x2fb618, 0x24
 
-gUnknown_082FB63C: ; 82FB63C
+gUnknown_082FB63C: @ 82FB63C
 	.incbin "base_emerald.gba", 0x2fb63c, 0x10
 
-gUnknown_082FB64C: ; 82FB64C
+gUnknown_082FB64C: @ 82FB64C
 	.incbin "base_emerald.gba", 0x2fb64c, 0x8
 
-gUnknown_082FB654: ; 82FB654
+gUnknown_082FB654: @ 82FB654
 	.incbin "base_emerald.gba", 0x2fb654, 0x8
 
-gUnknown_082FB65C: ; 82FB65C
+gUnknown_082FB65C: @ 82FB65C
 	.incbin "base_emerald.gba", 0x2fb65c, 0x90
 
-gUnknown_082FB6EC: ; 82FB6EC
+gUnknown_082FB6EC: @ 82FB6EC
 	.incbin "base_emerald.gba", 0x2fb6ec, 0x18
 
-gUnknown_082FB704: ; 82FB704
+gUnknown_082FB704: @ 82FB704
 	.incbin "base_emerald.gba", 0x2fb704, 0x10
 
-gUnknown_082FB714: ; 82FB714
+gUnknown_082FB714: @ 82FB714
 	.incbin "base_emerald.gba", 0x2fb714, 0x6f4
 
-gUnknown_082FBE08: ; 82FBE08
+gUnknown_082FBE08: @ 82FBE08
 	.incbin "base_emerald.gba", 0x2fbe08, 0x28
 
-gUnknown_082FBE30: ; 82FBE30
+gUnknown_082FBE30: @ 82FBE30
 	.incbin "base_emerald.gba", 0x2fbe30, 0x10
 
-gUnknown_082FBE40: ; 82FBE40
+gUnknown_082FBE40: @ 82FBE40
 	.incbin "base_emerald.gba", 0x2fbe40, 0x18
 
-gUnknown_082FBE58: ; 82FBE58
+gUnknown_082FBE58: @ 82FBE58
 	.incbin "base_emerald.gba", 0x2fbe58, 0x50
 
-gUnknown_082FBEA8: ; 82FBEA8
+gUnknown_082FBEA8: @ 82FBEA8
 	.incbin "base_emerald.gba", 0x2fbea8, 0x10
 
-gUnknown_082FBEB8: ; 82FBEB8
+gUnknown_082FBEB8: @ 82FBEB8
 	.incbin "base_emerald.gba", 0x2fbeb8, 0x154
 
-gUnknown_082FC00C: ; 82FC00C
+gUnknown_082FC00C: @ 82FC00C
 	.incbin "base_emerald.gba", 0x2fc00c, 0x18
 
-gUnknown_082FC024: ; 82FC024
+gUnknown_082FC024: @ 82FC024
 	.incbin "base_emerald.gba", 0x2fc024, 0x20
 
-gUnknown_082FC044: ; 82FC044
+gUnknown_082FC044: @ 82FC044
 	.incbin "base_emerald.gba", 0x2fc044, 0x20
 
-gUnknown_082FC064: ; 82FC064
+gUnknown_082FC064: @ 82FC064
 	.incbin "base_emerald.gba", 0x2fc064, 0x22c
 
-gUnknown_082FC290: ; 82FC290
+gUnknown_082FC290: @ 82FC290
 	.incbin "base_emerald.gba", 0x2fc290, 0x1b0
 
-gUnknown_082FC440: ; 82FC440
+gUnknown_082FC440: @ 82FC440
 	.incbin "base_emerald.gba", 0x2fc440, 0x20
 
-gUnknown_082FC460: ; 82FC460
+gUnknown_082FC460: @ 82FC460
 	.incbin "base_emerald.gba", 0x2fc460, 0x950
 
-gUnknown_082FCDB0: ; 82FCDB0
+gUnknown_082FCDB0: @ 82FCDB0
 	.incbin "base_emerald.gba", 0x2fcdb0, 0x3b8
 
-gUnknown_082FD168: ; 82FD168
+gUnknown_082FD168: @ 82FD168
 	.incbin "base_emerald.gba", 0x2fd168, 0x20
 
-gUnknown_082FD188: ; 82FD188
+gUnknown_082FD188: @ 82FD188
 	.incbin "base_emerald.gba", 0x2fd188, 0xab0
 
-gUnknown_082FDC38: ; 82FDC38
+gUnknown_082FDC38: @ 82FDC38
 	.incbin "base_emerald.gba", 0x2fdc38, 0x52c
 
-gUnknown_082FE164: ; 82FE164
+gUnknown_082FE164: @ 82FE164
 	.incbin "base_emerald.gba", 0x2fe164, 0x10
 
-gUnknown_082FE174: ; 82FE174
+gUnknown_082FE174: @ 82FE174
 	.incbin "base_emerald.gba", 0x2fe174, 0x18
 
-gUnknown_082FE18C: ; 82FE18C
+gUnknown_082FE18C: @ 82FE18C
 	.incbin "base_emerald.gba", 0x2fe18c, 0x50
 
-gUnknown_082FE1DC: ; 82FE1DC
+gUnknown_082FE1DC: @ 82FE1DC
 	.incbin "base_emerald.gba", 0x2fe1dc, 0x3
 
-gUnknown_082FE1DF: ; 82FE1DF
+gUnknown_082FE1DF: @ 82FE1DF
 	.incbin "base_emerald.gba", 0x2fe1df, 0xd
 
-gUnknown_082FE1EC: ; 82FE1EC
+gUnknown_082FE1EC: @ 82FE1EC
 	.incbin "base_emerald.gba", 0x2fe1ec, 0x8
 
-gUnknown_082FE1F4: ; 82FE1F4
+gUnknown_082FE1F4: @ 82FE1F4
 	.incbin "base_emerald.gba", 0x2fe1f4, 0x40
 
-gUnknown_082FE234: ; 82FE234
+gUnknown_082FE234: @ 82FE234
 	.incbin "base_emerald.gba", 0x2fe234, 0x2c
 
-gUnknown_082FE260: ; 82FE260
+gUnknown_082FE260: @ 82FE260
 	.incbin "base_emerald.gba", 0x2fe260, 0x10
 
-gUnknown_082FE270: ; 82FE270
+gUnknown_082FE270: @ 82FE270
 	.incbin "base_emerald.gba", 0x2fe270, 0x8
 
-gUnknown_082FE278: ; 82FE278
+gUnknown_082FE278: @ 82FE278
 	.incbin "base_emerald.gba", 0x2fe278, 0x450
 
-gUnknown_082FE6C8: ; 82FE6C8
+gUnknown_082FE6C8: @ 82FE6C8
 	.incbin "base_emerald.gba", 0x2fe6c8, 0x10
 
-gUnknown_082FE6D8: ; 82FE6D8
+gUnknown_082FE6D8: @ 82FE6D8
 	.incbin "base_emerald.gba", 0x2fe6d8, 0x58
 
-gUnknown_082FE730: ; 82FE730
+gUnknown_082FE730: @ 82FE730
 	.incbin "base_emerald.gba", 0x2fe730, 0x18
 
-gUnknown_082FE748: ; 82FE748
+gUnknown_082FE748: @ 82FE748
 	.incbin "base_emerald.gba", 0x2fe748, 0x484
 
-gUnknown_082FEBCC: ; 82FEBCC
+gUnknown_082FEBCC: @ 82FEBCC
 	.incbin "base_emerald.gba", 0x2febcc, 0x8
 
-gUnknown_082FEBD4: ; 82FEBD4
+gUnknown_082FEBD4: @ 82FEBD4
 	.incbin "base_emerald.gba", 0x2febd4, 0xbc
 
-gUnknown_082FEC90: ; 82FEC90
+gUnknown_082FEC90: @ 82FEC90
 	.incbin "base_emerald.gba", 0x2fec90, 0x18
 
-gUnknown_082FECA8: ; 82FECA8
+gUnknown_082FECA8: @ 82FECA8
 	.incbin "base_emerald.gba", 0x2feca8, 0x18
 
-; 82FECC0
+@ 82FECC0
 	.include "data/rtc.s"
 
-gUnknown_082FECFC: ; 82FECFC
+gUnknown_082FECFC: @ 82FECFC
 	.incbin "base_emerald.gba", 0x2fecfc, 0x40
 
-gUnknown_082FED3C: ; 82FED3C
+gUnknown_082FED3C: @ 82FED3C
 	.incbin "base_emerald.gba", 0x2fed3c, 0x1b4
 
-gUnknown_082FEEF0: ; 82FEEF0
+gUnknown_082FEEF0: @ 82FEEF0
 	.incbin "base_emerald.gba", 0x2feef0, 0x128
 
-gUnknown_082FF018: ; 82FF018
+gUnknown_082FF018: @ 82FF018
 	.incbin "base_emerald.gba", 0x2ff018, 0x2
 
-gUnknown_082FF01A: ; 82FF01A
+gUnknown_082FF01A: @ 82FF01A
 	.incbin "base_emerald.gba", 0x2ff01a, 0xe
 
-gUnknown_082FF028: ; 82FF028
+gUnknown_082FF028: @ 82FF028
 	.incbin "base_emerald.gba", 0x2ff028, 0x10
 
-gUnknown_082FF038: ; 82FF038
+gUnknown_082FF038: @ 82FF038
 	.incbin "base_emerald.gba", 0x2ff038, 0x10
 
-gUnknown_082FF048: ; 82FF048
+gUnknown_082FF048: @ 82FF048
 	.incbin "base_emerald.gba", 0x2ff048, 0x28
 
-gUnknown_082FF070: ; 82FF070
+gUnknown_082FF070: @ 82FF070
 	.incbin "base_emerald.gba", 0x2ff070, 0x10
 
-gUnknown_082FF080: ; 82FF080
+gUnknown_082FF080: @ 82FF080
 	.incbin "base_emerald.gba", 0x2ff080, 0x8
 
-gUnknown_082FF088: ; 82FF088
+gUnknown_082FF088: @ 82FF088
 	.incbin "base_emerald.gba", 0x2ff088, 0x18
 
-gUnknown_082FF0A0: ; 82FF0A0
+gUnknown_082FF0A0: @ 82FF0A0
 	.incbin "base_emerald.gba", 0x2ff0a0, 0x20
 
-gUnknown_082FF0C0: ; 82FF0C0
+gUnknown_082FF0C0: @ 82FF0C0
 	.incbin "base_emerald.gba", 0x2ff0c0, 0x20
 
-gUnknown_082FF0E0: ; 82FF0E0
+gUnknown_082FF0E0: @ 82FF0E0
 	.incbin "base_emerald.gba", 0x2ff0e0, 0x3
 
-gUnknown_082FF0E3: ; 82FF0E3
+gUnknown_082FF0E3: @ 82FF0E3
 	.incbin "base_emerald.gba", 0x2ff0e3, 0x5
 
-gUnknown_082FF0E8: ; 82FF0E8
+gUnknown_082FF0E8: @ 82FF0E8
 	.incbin "base_emerald.gba", 0x2ff0e8, 0x8
 
-gUnknown_082FF0F0: ; 82FF0F0
+gUnknown_082FF0F0: @ 82FF0F0
 	.incbin "base_emerald.gba", 0x2ff0f0, 0x4
 
-gUnknown_082FF0F4: ; 82FF0F4
+gUnknown_082FF0F4: @ 82FF0F4
 	.incbin "base_emerald.gba", 0x2ff0f4, 0x20
 
-gUnknown_082FF114: ; 82FF114
+gUnknown_082FF114: @ 82FF114
 	.incbin "base_emerald.gba", 0x2ff114, 0x4
 
-gUnknown_082FF118: ; 82FF118
+gUnknown_082FF118: @ 82FF118
 	.incbin "base_emerald.gba", 0x2ff118, 0x10
 
-gUnknown_082FF128: ; 82FF128
+gUnknown_082FF128: @ 82FF128
 	.incbin "base_emerald.gba", 0x2ff128, 0x50
 
-gUnknown_082FF178: ; 82FF178
+gUnknown_082FF178: @ 82FF178
 	.incbin "base_emerald.gba", 0x2ff178, 0x50
 
-gUnknown_082FF1C8: ; 82FF1C8
+gUnknown_082FF1C8: @ 82FF1C8
 	.incbin "base_emerald.gba", 0x2ff1c8, 0x450
 
-gUnknown_082FF618: ; 82FF618
+gUnknown_082FF618: @ 82FF618
 	.incbin "base_emerald.gba", 0x2ff618, 0x7c
 
-gUnknown_082FF694: ; 82FF694
+gUnknown_082FF694: @ 82FF694
 	.incbin "base_emerald.gba", 0x2ff694, 0x2c
 
-gUnknown_082FF6C0: ; 82FF6C0
+gUnknown_082FF6C0: @ 82FF6C0
 	.incbin "base_emerald.gba", 0x2ff6c0, 0x4c
 
-gUnknown_082FF70C: ; 82FF70C
+gUnknown_082FF70C: @ 82FF70C
 	.incbin "base_emerald.gba", 0x2ff70c, 0x162c
 
-gUnknown_08300D38: ; 8300D38
+gUnknown_08300D38: @ 8300D38
 	.incbin "base_emerald.gba", 0x300d38, 0x6e0
 
-; 8301418
+@ 8301418
 	.include "data/graphics/pokemon/mon_still_front_pic_table.s"
 
-gUnknown_083021D8: ; 83021D8
+gUnknown_083021D8: @ 83021D8
 	.incbin "base_emerald.gba", 0x3021d8, 0x6e0
 
-; 83028B8
+@ 83028B8
 	.include "data/graphics/pokemon/mon_back_pic_table.s"
 
-; 8303678
+@ 8303678
 	.include "data/graphics/pokemon/mon_palette_table.s"
 
-; 8304438
+@ 8304438
 	.include "data/graphics/pokemon/mon_shiny_palette_table.s"
 
-; 83051F8
+@ 83051F8
 	.incbin "base_emerald.gba", 0x3051f8, 0x174
 
-gUnknown_0830536C: ; 830536C
+gUnknown_0830536C: @ 830536C
 	.incbin "base_emerald.gba", 0x30536c, 0x174
 
-gUnknown_083054E0: ; 83054E0
+gUnknown_083054E0: @ 83054E0
 	.incbin "base_emerald.gba", 0x3054e0, 0x174
 
-; 8305654
+@ 8305654
 	.include "data/graphics/trainers/trainer_front_pic_table.s"
 
-; 830593C
+@ 830593C
 	.include "data/graphics/trainers/trainer_front_pic_palette_table.s"
 
-; 8305C24
+@ 8305C24
 	.incbin "base_emerald.gba", 0x305c24, 0xe8
 
-gUnknown_08305D0C: ; 8305D0C
+gUnknown_08305D0C: @ 8305D0C
 	.incbin "base_emerald.gba", 0x305d0c, 0x20
 
-gUnknown_08305D2C: ; 8305D2C
+gUnknown_08305D2C: @ 8305D2C
 	.incbin "base_emerald.gba", 0x305d2c, 0x20
 
-; 8305D4C
+@ 8305D4C
 	.include "data/graphics/trainers/trainer_back_pic_table.s"
 
-; 8305D8C
+@ 8305D8C
 	.include "data/graphics/trainers/trainer_back_pic_palette_table.s"
 
-gUnknown_08305DCC: ; 8305DCC
+gUnknown_08305DCC: @ 8305DCC
 	.incbin "base_emerald.gba", 0x305dcc, 0x3ce0
 
-gUnknown_08309AAC: ; 8309AAC
+gUnknown_08309AAC: @ 8309AAC
 	.incbin "base_emerald.gba", 0x309aac, 0x6e0
 
-; 830A18C
+@ 830A18C
 	.include "data/graphics/pokemon/mon_front_pic_table.s"
 
-; 830AF4C
+@ 830AF4C
 	.incbin "base_emerald.gba", 0x30af4c, 0x6e0
 
-; 830B62C
+@ 830B62C
 	.include "data/trainer_parties.s"
 
-; 830FCD4
+@ 830FCD4
 	.include "data/text/trainer_class_names.s"
 
-; 8310030
+@ 8310030
 	.include "data/trainers.s"
 
-; 83185C8
+@ 83185C8
 	.include "data/text/species_names.s"
 
-; 831977C
+@ 831977C
 	.include "data/text/move_names.s"
 
 	.incbin "base_emerald.gba", 0x31a983, 0x4d
 
-gUnknown_0831A9D0: ; 831A9D0
+gUnknown_0831A9D0: @ 831A9D0
 	.incbin "base_emerald.gba", 0x31a9d0, 0x18
 
-gUnknown_0831A9E8: ; 831A9E8
+gUnknown_0831A9E8: @ 831A9E8
 	.incbin "base_emerald.gba", 0x31a9e8, 0x18
 
-gUnknown_0831AA00: ; 831AA00
+gUnknown_0831AA00: @ 831AA00
 	.incbin "base_emerald.gba", 0x31aa00, 0x8
 
-gUnknown_0831AA08: ; 831AA08
+gUnknown_0831AA08: @ 831AA08
 	.incbin "base_emerald.gba", 0x31aa08, 0x198
 
-gUnknown_0831ABA0: ; 831ABA0
+gUnknown_0831ABA0: @ 831ABA0
 	.incbin "base_emerald.gba", 0x31aba0, 0x8
 
-gUnknown_0831ABA8: ; 831ABA8
+gUnknown_0831ABA8: @ 831ABA8
 	.incbin "base_emerald.gba", 0x31aba8, 0xc8
 
-gUnknown_0831AC70: ; 831AC70
+gUnknown_0831AC70: @ 831AC70
 	.incbin "base_emerald.gba", 0x31ac70, 0x18
 
-gUnknown_0831AC88: ; 831AC88
+gUnknown_0831AC88: @ 831AC88
 	.incbin "base_emerald.gba", 0x31ac88, 0x18
 
-gUnknown_0831ACA0: ; 831ACA0
+gUnknown_0831ACA0: @ 831ACA0
 	.incbin "base_emerald.gba", 0x31aca0, 0x40
 
-gUnknown_0831ACE0: ; 831ACE0
+gUnknown_0831ACE0: @ 831ACE0
 	.incbin "base_emerald.gba", 0x31ace0, 0x8
 
-gUnknown_0831ACE8: ; 831ACE8
+gUnknown_0831ACE8: @ 831ACE8
 	.incbin "base_emerald.gba", 0x31ace8, 0x150
 
-; 831AE38
+@ 831AE38
 	.include "data/text/type_names.s"
 
 	.align 2, 0
 
-gUnknown_0831AEB8: ; 831AEB8
+gUnknown_0831AEB8: @ 831AEB8
 	.incbin "base_emerald.gba", 0x31aeb8, 0xe0
 
-; 831AF98
+@ 831AF98
 	.include "data/text/ability_descriptions.s"
 
-; 831B6DB
+@ 831B6DB
 	.include "data/text/ability_names.s"
 
-; 831BAD4
+@ 831BAD4
 	.include "data/text/ability_description_pointers.s"
 
-gUnknown_0831BC0C: ; 831BC0C
+gUnknown_0831BC0C: @ 831BC0C
 	.incbin "base_emerald.gba", 0x31bc0c, 0x38
 
-gUnknown_0831BC44: ; 831BC44
+gUnknown_0831BC44: @ 831BC44
 	.incbin "base_emerald.gba", 0x31bc44, 0x2c
 
-gUnknown_0831BC70: ; 831BC70
+gUnknown_0831BC70: @ 831BC70
 	.incbin "base_emerald.gba", 0x31bc70, 0x8
 
-gUnknown_0831BC78: ; 831BC78
+gUnknown_0831BC78: @ 831BC78
 	.incbin "base_emerald.gba", 0x31bc78, 0x8
 
-gUnknown_0831BC80: ; 831BC80
+gUnknown_0831BC80: @ 831BC80
 	.incbin "base_emerald.gba", 0x31bc80, 0x8
 
-gUnknown_0831BC88: ; 831BC88
+gUnknown_0831BC88: @ 831BC88
 	.incbin "base_emerald.gba", 0x31bc88, 0x8
 
-gUnknown_0831BC90: ; 831BC90
+gUnknown_0831BC90: @ 831BC90
 	.incbin "base_emerald.gba", 0x31bc90, 0x8
 
-gUnknown_0831BC98: ; 831BC98
+gUnknown_0831BC98: @ 831BC98
 	.incbin "base_emerald.gba", 0x31bc98, 0x8
 
-gUnknown_0831BCA0: ; 831BCA0
+gUnknown_0831BCA0: @ 831BCA0
 	.incbin "base_emerald.gba", 0x31bca0, 0x8
 
-gUnknown_0831BCA8: ; 831BCA8
+gUnknown_0831BCA8: @ 831BCA8
 	.incbin "base_emerald.gba", 0x31bca8, 0x38
 
-gUnknown_0831BCE0: ; 831BCE0
+gUnknown_0831BCE0: @ 831BCE0
 	.incbin "base_emerald.gba", 0x31bce0, 0xf
 
-gUnknown_0831BCEF: ; 831BCEF
+gUnknown_0831BCEF: @ 831BCEF
 	.incbin "base_emerald.gba", 0x31bcef, 0x4
 
-gUnknown_0831BCF3: ; 831BCF3
+gUnknown_0831BCF3: @ 831BCF3
 	.incbin "base_emerald.gba", 0x31bcf3, 0x5
 
-gUnknown_0831BCF8: ; 831BCF8
+gUnknown_0831BCF8: @ 831BCF8
 	.incbin "base_emerald.gba", 0x31bcf8, 0x18
 
-gUnknown_0831BD10: ; 831BD10
+gUnknown_0831BD10: @ 831BD10
 	.incbin "base_emerald.gba", 0x31bd10, 0x3e4
 
-gUnknown_0831C0F4: ; 831C0F4
+gUnknown_0831C0F4: @ 831C0F4
 	.incbin "base_emerald.gba", 0x31c0f4, 0x34
 
-gUnknown_0831C128: ; 831C128
+gUnknown_0831C128: @ 831C128
 	.incbin "base_emerald.gba", 0x31c128, 0xc
 
-gUnknown_0831C134: ; 831C134
+gUnknown_0831C134: @ 831C134
 	.incbin "base_emerald.gba", 0x31c134, 0xf0
 
-gUnknown_0831C224: ; 831C224
+gUnknown_0831C224: @ 831C224
 	.incbin "base_emerald.gba", 0x31c224, 0xa4
 
-gUnknown_0831C2C8: ; 831C2C8
+gUnknown_0831C2C8: @ 831C2C8
 	.incbin "base_emerald.gba", 0x31c2c8, 0x20
 
-gUnknown_0831C2E8: ; 831C2E8
+gUnknown_0831C2E8: @ 831C2E8
 	.incbin "base_emerald.gba", 0x31c2e8, 0xd8
 
-gUnknown_0831C3C0: ; 831C3C0
+gUnknown_0831C3C0: @ 831C3C0
 	.incbin "base_emerald.gba", 0x31c3c0, 0x18
 
-gUnknown_0831C3D8: ; 831C3D8
+gUnknown_0831C3D8: @ 831C3D8
 	.incbin "base_emerald.gba", 0x31c3d8, 0x8
 
-gUnknown_0831C3E0: ; 831C3E0
+gUnknown_0831C3E0: @ 831C3E0
 	.incbin "base_emerald.gba", 0x31c3e0, 0x28
 
-gUnknown_0831C408: ; 831C408
+gUnknown_0831C408: @ 831C408
 	.incbin "base_emerald.gba", 0x31c408, 0xc
 
-gUnknown_0831C414: ; 831C414
+gUnknown_0831C414: @ 831C414
 	.incbin "base_emerald.gba", 0x31c414, 0x14
 
-gUnknown_0831C428: ; 831C428
+gUnknown_0831C428: @ 831C428
 	.incbin "base_emerald.gba", 0x31c428, 0x18
 
-; 831C440
+@ 831C440
 	.include "data/pickup_items.s"
 
-gUnknown_0831C483: ; 831C483
+gUnknown_0831C483: @ 831C483
 	.incbin "base_emerald.gba", 0x31c483, 0xa
 
-gUnknown_0831C48D: ; 831C48D
+gUnknown_0831C48D: @ 831C48D
 	.incbin "base_emerald.gba", 0x31c48d, 0x7
 
-gUnknown_0831C494: ; 831C494
+gUnknown_0831C494: @ 831C494
 	.incbin "base_emerald.gba", 0x31c494, 0x64
 
-gUnknown_0831C4F8: ; 831C4F8
+gUnknown_0831C4F8: @ 831C4F8
 	.incbin "base_emerald.gba", 0x31c4f8, 0x1c
 
-gUnknown_0831C514: ; 831C514
+gUnknown_0831C514: @ 831C514
 	.incbin "base_emerald.gba", 0x31c514, 0xe4
 
-gUnknown_0831C5F8: ; 831C5F8
+gUnknown_0831C5F8: @ 831C5F8
 	.incbin "base_emerald.gba", 0x31c5f8, 0xc
 
-gUnknown_0831C604: ; 831C604
+gUnknown_0831C604: @ 831C604
 	.incbin "base_emerald.gba", 0x31c604, 0x1c
 
-gUnknown_0831C620: ; 831C620
+gUnknown_0831C620: @ 831C620
 	.incbin "base_emerald.gba", 0x31c620, 0x8
 
-gUnknown_0831C628: ; 831C628
+gUnknown_0831C628: @ 831C628
 	.incbin "base_emerald.gba", 0x31c628, 0x60
 
-gUnknown_0831C688: ; 831C688
+gUnknown_0831C688: @ 831C688
 	.incbin "base_emerald.gba", 0x31c688, 0x18
 
-gUnknown_0831C6A0: ; 831C6A0
+gUnknown_0831C6A0: @ 831C6A0
 	.incbin "base_emerald.gba", 0x31c6a0, 0x10
 
-gUnknown_0831C6B0: ; 831C6B0
+gUnknown_0831C6B0: @ 831C6B0
 	.incbin "base_emerald.gba", 0x31c6b0, 0x18
 
-gUnknown_0831C6C8: ; 831C6C8
+gUnknown_0831C6C8: @ 831C6C8
 	.incbin "base_emerald.gba", 0x31c6c8, 0xec
 
-gUnknown_0831C7B4: ; 831C7B4
+gUnknown_0831C7B4: @ 831C7B4
 	.incbin "base_emerald.gba", 0x31c7b4, 0xe4
 
-; 831C898
+@ 831C898
 	.include "data/battle_moves.s"
 
 	.incbin "base_emerald.gba", 0x31d93c, 0x10
 
-; 831D94C
+@ 831D94C
 	.include "data/pokedex_order.s"
 
-; 831E2F0
+@ 831E2F0
 	.include "data/spinda_spot_graphics.s"
 
-; 831E380
+@ 831E380
 	.include "data/item_effect_info.s"
 
-; 831E818
+@ 831E818
 	.include "data/nature_stat_table.s"
 
-; 831E898
+@ 831E898
 	.include "data/tm_hm_learnsets.s"
 
-; 831F578
+@ 831F578
 	.include "data/trainer_pic_indices.s"
 
-; 831F5CA
+@ 831F5CA
 	.include "data/trainer_class_name_indices.s"
 
-gUnknown_0831F61C: ; 831F61C
+gUnknown_0831F61C: @ 831F61C
 	.incbin "base_emerald.gba", 0x31f61c, 0x110
 
-; 831F72C
+@ 831F72C
 	.include "data/experience_tables.s"
 
-; 83203CC
+@ 83203CC
 	.include "data/base_stats.s"
 
-; 83230DC
+@ 83230DC
 	.include "data/level_up_learnsets.s"
 
-; 832531C
+@ 832531C
 	.include "data/evolution_table.s"
 
-; 832937C
+@ 832937C
 	.include "data/level_up_learnset_pointers.s"
 
-gUnknown_083299EC: ; 83299EC
+gUnknown_083299EC: @ 83299EC
 	.incbin "base_emerald.gba", 0x3299ec, 0x19b
 
-gUnknown_08329B87: ; 8329B87
+gUnknown_08329B87: @ 8329B87
 	.incbin "base_emerald.gba", 0x329b87, 0x19b
 
-gUnknown_08329D22: ; 8329D22
+gUnknown_08329D22: @ 8329D22
 	.incbin "base_emerald.gba", 0x329d22, 0x4
 
-gUnknown_08329D26: ; 8329D26
+gUnknown_08329D26: @ 8329D26
 	.incbin "base_emerald.gba", 0x329d26, 0x4
 
-gUnknown_08329D2A: ; 8329D2A
+gUnknown_08329D2A: @ 8329D2A
 	.incbin "base_emerald.gba", 0x329d2a, 0x4
 
-gUnknown_08329D2E: ; 8329D2E
+gUnknown_08329D2E: @ 8329D2E
 	.incbin "base_emerald.gba", 0x329d2e, 0x1a
 
-gUnknown_08329D48: ; 8329D48
+gUnknown_08329D48: @ 8329D48
 	.incbin "base_emerald.gba", 0x329d48, 0xc
 
-gUnknown_08329D54: ; 8329D54
+gUnknown_08329D54: @ 8329D54
 	.incbin "base_emerald.gba", 0x329d54, 0x20
 
-gUnknown_08329D74: ; 8329D74
+gUnknown_08329D74: @ 8329D74
 	.incbin "base_emerald.gba", 0x329d74, 0x24
 
-gUnknown_08329D98: ; 8329D98
+gUnknown_08329D98: @ 8329D98
 	.incbin "base_emerald.gba", 0x329d98, 0x60
 
-gUnknown_08329DF8: ; 8329DF8
+gUnknown_08329DF8: @ 8329DF8
 	.incbin "base_emerald.gba", 0x329df8, 0xc0
 
-gUnknown_08329EB8: ; 8329EB8
+gUnknown_08329EB8: @ 8329EB8
 	.incbin "base_emerald.gba", 0x329eb8, 0xa
 
-gUnknown_08329EC2: ; 8329EC2
+gUnknown_08329EC2: @ 8329EC2
 	.incbin "base_emerald.gba", 0x329ec2, 0x6
 
-gUnknown_08329EC8: ; 8329EC8
+gUnknown_08329EC8: @ 8329EC8
 	.incbin "base_emerald.gba", 0x329ec8, 0x6
 
-gUnknown_08329ECE: ; 8329ECE
+gUnknown_08329ECE: @ 8329ECE
 	.incbin "base_emerald.gba", 0x329ece, 0x1c
 
-gUnknown_08329EEA: ; 8329EEA
+gUnknown_08329EEA: @ 8329EEA
 	.incbin "base_emerald.gba", 0x329eea, 0x12
 
-gUnknown_08329EFC: ; 8329EFC
+gUnknown_08329EFC: @ 8329EFC
 	.incbin "base_emerald.gba", 0x329efc, 0x2
 
-gUnknown_08329EFE: ; 8329EFE
+gUnknown_08329EFE: @ 8329EFE
 	.incbin "base_emerald.gba", 0x329efe, 0x2a
 
-gUnknown_08329F28: ; 8329F28
+gUnknown_08329F28: @ 8329F28
 	.incbin "base_emerald.gba", 0x329f28, 0x18
 
-gUnknown_08329F40: ; 8329F40
+gUnknown_08329F40: @ 8329F40
 	.incbin "base_emerald.gba", 0x329f40, 0x280
 
-gUnknown_0832A1C0: ; 832A1C0
+gUnknown_0832A1C0: @ 832A1C0
 	.incbin "base_emerald.gba", 0x32a1c0, 0x168
 
-gUnknown_0832A328: ; 832A328
+gUnknown_0832A328: @ 832A328
 	.incbin "base_emerald.gba", 0x32a328, 0x80
 
-gUnknown_0832A3A8: ; 832A3A8
+gUnknown_0832A3A8: @ 832A3A8
 	.incbin "base_emerald.gba", 0x32a3a8, 0x18
 
-gUnknown_0832A3C0: ; 832A3C0
+gUnknown_0832A3C0: @ 832A3C0
 	.incbin "base_emerald.gba", 0x32a3c0, 0x18
 
-gUnknown_0832A3D8: ; 832A3D8
+gUnknown_0832A3D8: @ 832A3D8
 	.incbin "base_emerald.gba", 0x32a3d8, 0xa00
 
-; 832ADD8
+@ 832ADD8
 	.include "data/egg_moves.s"
 
 	.align 2, 0
 
-gUnknown_0832B6C0: ; 832B6C0
+gUnknown_0832B6C0: @ 832B6C0
 	.incbin "base_emerald.gba", 0x32b6c0, 0x20
 
-gUnknown_0832B6E0: ; 832B6E0
+gUnknown_0832B6E0: @ 832B6E0
 	.incbin "base_emerald.gba", 0x32b6e0, 0x18
 
-gUnknown_0832B6F8: ; 832B6F8
+gUnknown_0832B6F8: @ 832B6F8
 	.incbin "base_emerald.gba", 0x32b6f8, 0x10
 
-gEggName: ; 832B708
-	.charmapstr "タマゴ$" ; "tamago" ("egg" in Japanese)
+gEggName: @ 832B708
+	.charmapstr "タマゴ$" @ "tamago" ("egg" in Japanese)
 
-; 832B70C
+@ 832B70C
 	.incbin "base_emerald.gba", 0x32b70c, 0x8d8
 
-gUnknown_0832BFE4: ; 832BFE4
+gUnknown_0832BFE4: @ 832BFE4
 	.incbin "base_emerald.gba", 0x32bfe4, 0x8
 
-gUnknown_0832BFEC: ; 832BFEC
+gUnknown_0832BFEC: @ 832BFEC
 	.incbin "base_emerald.gba", 0x32bfec, 0x8
 
-gUnknown_0832BFF4: ; 832BFF4
+gUnknown_0832BFF4: @ 832BFF4
 	.incbin "base_emerald.gba", 0x32bff4, 0x8
 
-gUnknown_0832BFFC: ; 832BFFC
+gUnknown_0832BFFC: @ 832BFFC
 	.incbin "base_emerald.gba", 0x32bffc, 0x50
 
-gUnknown_0832C04C: ; 832C04C
+gUnknown_0832C04C: @ 832C04C
 	.incbin "base_emerald.gba", 0x32c04c, 0x18
 
-gUnknown_0832C064: ; 832C064
+gUnknown_0832C064: @ 832C064
 	.incbin "base_emerald.gba", 0x32c064, 0x8
 
-gUnknown_0832C06C: ; 832C06C
+gUnknown_0832C06C: @ 832C06C
 	.incbin "base_emerald.gba", 0x32c06c, 0x10
 
-gUnknown_0832C07C: ; 832C07C
+gUnknown_0832C07C: @ 832C07C
 	.incbin "base_emerald.gba", 0x32c07c, 0x8
 
-gUnknown_0832C084: ; 832C084
+gUnknown_0832C084: @ 832C084
 	.incbin "base_emerald.gba", 0x32c084, 0x4c
 
-gUnknown_0832C0D0: ; 832C0D0
+gUnknown_0832C0D0: @ 832C0D0
 	.incbin "base_emerald.gba", 0x32c0d0, 0x8
 
-gUnknown_0832C0D8: ; 832C0D8
+gUnknown_0832C0D8: @ 832C0D8
 	.incbin "base_emerald.gba", 0x32c0d8, 0x8
 
-gUnknown_0832C0E0: ; 832C0E0
+gUnknown_0832C0E0: @ 832C0E0
 	.incbin "base_emerald.gba", 0x32c0e0, 0x8
 
-gUnknown_0832C0E8: ; 832C0E8
+gUnknown_0832C0E8: @ 832C0E8
 	.incbin "base_emerald.gba", 0x32c0e8, 0x8
 
-gUnknown_0832C0F0: ; 832C0F0
+gUnknown_0832C0F0: @ 832C0F0
 	.incbin "base_emerald.gba", 0x32c0f0, 0x8
 
-gUnknown_0832C0F8: ; 832C0F8
+gUnknown_0832C0F8: @ 832C0F8
 	.incbin "base_emerald.gba", 0x32c0f8, 0x8
 
-gUnknown_0832C100: ; 832C100
+gUnknown_0832C100: @ 832C100
 	.incbin "base_emerald.gba", 0x32c100, 0x8
 
-gUnknown_0832C108: ; 832C108
+gUnknown_0832C108: @ 832C108
 	.incbin "base_emerald.gba", 0x32c108, 0x20
 
-gUnknown_0832C128: ; 832C128
+gUnknown_0832C128: @ 832C128
 	.incbin "base_emerald.gba", 0x32c128, 0x18
 
-gUnknown_0832C140: ; 832C140
+gUnknown_0832C140: @ 832C140
 	.incbin "base_emerald.gba", 0x32c140, 0x30
 
-gUnknown_0832C170: ; 832C170
+gUnknown_0832C170: @ 832C170
 	.incbin "base_emerald.gba", 0x32c170, 0x30
 
-gUnknown_0832C1A0: ; 832C1A0
+gUnknown_0832C1A0: @ 832C1A0
 	.incbin "base_emerald.gba", 0x32c1a0, 0x20
 
-gUnknown_0832C1C0: ; 832C1C0
+gUnknown_0832C1C0: @ 832C1C0
 	.incbin "base_emerald.gba", 0x32c1c0, 0xcc
 
-gUnknown_0832C28C: ; 832C28C
+gUnknown_0832C28C: @ 832C28C
 	.incbin "base_emerald.gba", 0x32c28c, 0x38
 
-gUnknown_0832C2C4: ; 832C2C4
+gUnknown_0832C2C4: @ 832C2C4
 	.incbin "base_emerald.gba", 0x32c2c4, 0x8
 
-gUnknown_0832C2CC: ; 832C2CC
+gUnknown_0832C2CC: @ 832C2CC
 	.incbin "base_emerald.gba", 0x32c2cc, 0x68
 
-gUnknown_0832C334: ; 832C334
+gUnknown_0832C334: @ 832C334
 	.incbin "base_emerald.gba", 0x32c334, 0x8
 
-gUnknown_0832C33C: ; 832C33C
+gUnknown_0832C33C: @ 832C33C
 	.incbin "base_emerald.gba", 0x32c33c, 0x8
 
-gUnknown_0832C344: ; 832C344
+gUnknown_0832C344: @ 832C344
 	.incbin "base_emerald.gba", 0x32c344, 0x8
 
-gUnknown_0832C34C: ; 832C34C
+gUnknown_0832C34C: @ 832C34C
 	.incbin "base_emerald.gba", 0x32c34c, 0x18
 
-gUnknown_0832C364: ; 832C364
+gUnknown_0832C364: @ 832C364
 	.incbin "base_emerald.gba", 0x32c364, 0x30
 
-gUnknown_0832C394: ; 832C394
+gUnknown_0832C394: @ 832C394
 	.incbin "base_emerald.gba", 0x32c394, 0x30
 
-gUnknown_0832C3C4: ; 832C3C4
+gUnknown_0832C3C4: @ 832C3C4
 	.incbin "base_emerald.gba", 0x32c3c4, 0x14
 
-gUnknown_0832C3D8: ; 832C3D8
+gUnknown_0832C3D8: @ 832C3D8
 	.incbin "base_emerald.gba", 0x32c3d8, 0x14
 
-gUnknown_0832C3EC: ; 832C3EC
+gUnknown_0832C3EC: @ 832C3EC
 	.incbin "base_emerald.gba", 0x32c3ec, 0xc
 
-gUnknown_0832C3F8: ; 832C3F8
+gUnknown_0832C3F8: @ 832C3F8
 	.incbin "base_emerald.gba", 0x32c3f8, 0x8
 
-gUnknown_0832C400: ; 832C400
+gUnknown_0832C400: @ 832C400
 	.incbin "base_emerald.gba", 0x32c400, 0x60
 
-gUnknown_0832C460: ; 832C460
+gUnknown_0832C460: @ 832C460
 	.incbin "base_emerald.gba", 0x32c460, 0x128
 
-gUnknown_0832C588: ; 832C588
+gUnknown_0832C588: @ 832C588
 	.incbin "base_emerald.gba", 0x32c588, 0x138
 
-gUnknown_0832C6C0: ; 832C6C0
+gUnknown_0832C6C0: @ 832C6C0
 	.incbin "base_emerald.gba", 0x32c6c0, 0x1fe
 
-gUnknown_0832C8BE: ; 832C8BE
+gUnknown_0832C8BE: @ 832C8BE
 	.incbin "base_emerald.gba", 0x32c8be, 0x1fe
 
-gUnknown_0832CABC: ; 832CABC
+gUnknown_0832CABC: @ 832CABC
 	.incbin "base_emerald.gba", 0x32cabc, 0x800
 
-gUnknown_0832D2BC: ; 832D2BC
+gUnknown_0832D2BC: @ 832D2BC
 	.incbin "base_emerald.gba", 0x32d2bc, 0x800
 
-gUnknown_0832DABC: ; 832DABC
+gUnknown_0832DABC: @ 832DABC
 	.incbin "base_emerald.gba", 0x32dabc, 0xb
 
-gUnknown_0832DAC7: ; 832DAC7
+gUnknown_0832DAC7: @ 832DAC7
 	.incbin "base_emerald.gba", 0x32dac7, 0x2
 
-gUnknown_0832DAC9: ; 832DAC9
+gUnknown_0832DAC9: @ 832DAC9
 	.incbin "base_emerald.gba", 0x32dac9, 0x2
 
-gUnknown_0832DACB: ; 832DACB
+gUnknown_0832DACB: @ 832DACB
 	.incbin "base_emerald.gba", 0x32dacb, 0x7
 
-gUnknown_0832DAD2: ; 832DAD2
+gUnknown_0832DAD2: @ 832DAD2
 	.incbin "base_emerald.gba", 0x32dad2, 0xd
 
-gUnknown_0832DADF: ; 832DADF
+gUnknown_0832DADF: @ 832DADF
 	.incbin "base_emerald.gba", 0x32dadf, 0x6
 
-gUnknown_0832DAE5: ; 832DAE5
+gUnknown_0832DAE5: @ 832DAE5
 	.incbin "base_emerald.gba", 0x32dae5, 0x157
 
-gUnknown_0832DC3C: ; 832DC3C
+gUnknown_0832DC3C: @ 832DC3C
 	.incbin "base_emerald.gba", 0x32dc3c, 0x8
 
-gUnknown_0832DC44: ; 832DC44
+gUnknown_0832DC44: @ 832DC44
 	.incbin "base_emerald.gba", 0x32dc44, 0x50
 
-gUnknown_0832DC94: ; 832DC94
+gUnknown_0832DC94: @ 832DC94
 	.incbin "base_emerald.gba", 0x32dc94, 0x18
 
-gUnknown_0832DCAC: ; 832DCAC
+gUnknown_0832DCAC: @ 832DCAC
 	.incbin "base_emerald.gba", 0x32dcac, 0x38
 
-gUnknown_0832DCE4: ; 832DCE4
+gUnknown_0832DCE4: @ 832DCE4
 	.incbin "base_emerald.gba", 0x32dce4, 0x8
 
-gUnknown_0832DCEC: ; 832DCEC
+gUnknown_0832DCEC: @ 832DCEC
 	.incbin "base_emerald.gba", 0x32dcec, 0x138
 
-gUnknown_0832DE24: ; 832DE24
+gUnknown_0832DE24: @ 832DE24
 	.incbin "base_emerald.gba", 0x32de24, 0x1a
 
-gUnknown_0832DE3E: ; 832DE3E
+gUnknown_0832DE3E: @ 832DE3E
 	.incbin "base_emerald.gba", 0x32de3e, 0x18
 
-gUnknown_0832DE56: ; 832DE56
+gUnknown_0832DE56: @ 832DE56
 	.incbin "base_emerald.gba", 0x32de56, 0x3e
 
-gUnknown_0832DE94: ; 832DE94
+gUnknown_0832DE94: @ 832DE94
 	.incbin "base_emerald.gba", 0x32de94, 0x18
 
-gUnknown_0832DEAC: ; 832DEAC
+gUnknown_0832DEAC: @ 832DEAC
 	.incbin "base_emerald.gba", 0x32deac, 0x10
 
-gUnknown_0832DEBC: ; 832DEBC
+gUnknown_0832DEBC: @ 832DEBC
 	.incbin "base_emerald.gba", 0x32debc, 0x24
 
-gUnknown_0832DEE0: ; 832DEE0
+gUnknown_0832DEE0: @ 832DEE0
 	.incbin "base_emerald.gba", 0x32dee0, 0x4
 
-gUnknown_0832DEE4: ; 832DEE4
+gUnknown_0832DEE4: @ 832DEE4
 	.incbin "base_emerald.gba", 0x32dee4, 0x10
 
-gUnknown_0832DEF4: ; 832DEF4
+gUnknown_0832DEF4: @ 832DEF4
 	.incbin "base_emerald.gba", 0x32def4, 0x98
 
-gUnknown_0832DF8C: ; 832DF8C
+gUnknown_0832DF8C: @ 832DF8C
 	.incbin "base_emerald.gba", 0x32df8c, 0x8
 
-gUnknown_0832DF94: ; 832DF94
+gUnknown_0832DF94: @ 832DF94
 	.incbin "base_emerald.gba", 0x32df94, 0x5
 
-gUnknown_0832DF99: ; 832DF99
+gUnknown_0832DF99: @ 832DF99
 	.incbin "base_emerald.gba", 0x32df99, 0x2027
 
-gUnknown_0832FFC0: ; 832FFC0
+gUnknown_0832FFC0: @ 832FFC0
 	.incbin "base_emerald.gba", 0x32ffc0, 0x1fa0
 
-gUnknown_08331F60: ; 8331F60
+gUnknown_08331F60: @ 8331F60
 	.incbin "base_emerald.gba", 0x331f60, 0x1000
 
-gUnknown_08332F60: ; 8332F60
+gUnknown_08332F60: @ 8332F60
 	.incbin "base_emerald.gba", 0x332f60, 0x2840
 
-gUnknown_083357A0: ; 83357A0
+gUnknown_083357A0: @ 83357A0
 	.incbin "base_emerald.gba", 0x3357a0, 0x100
 
-gUnknown_083358A0: ; 83358A0
+gUnknown_083358A0: @ 83358A0
 	.incbin "base_emerald.gba", 0x3358a0, 0x100
 
-gUnknown_083359A0: ; 83359A0
+gUnknown_083359A0: @ 83359A0
 	.incbin "base_emerald.gba", 0x3359a0, 0x1000
 
-gUnknown_083369A0: ; 83369A0
+gUnknown_083369A0: @ 83369A0
 	.incbin "base_emerald.gba", 0x3369a0, 0x1000
 
-gUnknown_083379A0: ; 83379A0
+gUnknown_083379A0: @ 83379A0
 	.incbin "base_emerald.gba", 0x3379a0, 0x100
 
-gUnknown_08337AA0: ; 8337AA0
+gUnknown_08337AA0: @ 8337AA0
 	.incbin "base_emerald.gba", 0x337aa0, 0x200
 
-gUnknown_08337CA0: ; 8337CA0
+gUnknown_08337CA0: @ 8337CA0
 	.incbin "base_emerald.gba", 0x337ca0, 0x200
 
-gUnknown_08337EA0: ; 8337EA0
+gUnknown_08337EA0: @ 8337EA0
 	.incbin "base_emerald.gba", 0x337ea0, 0x20
 
-gUnknown_08337EC0: ; 8337EC0
+gUnknown_08337EC0: @ 8337EC0
 	.incbin "base_emerald.gba", 0x337ec0, 0x690
 
-gUnknown_08338550: ; 8338550
+gUnknown_08338550: @ 8338550
 	.incbin "base_emerald.gba", 0x338550, 0x7c8
 
-gUnknown_08338D18: ; 8338D18
+gUnknown_08338D18: @ 8338D18
 	.incbin "base_emerald.gba", 0x338d18, 0x8
 
-gUnknown_08338D20: ; 8338D20
+gUnknown_08338D20: @ 8338D20
 	.incbin "base_emerald.gba", 0x338d20, 0x8
 
-gUnknown_08338D28: ; 8338D28
+gUnknown_08338D28: @ 8338D28
 	.incbin "base_emerald.gba", 0x338d28, 0x48
 
-gUnknown_08338D70: ; 8338D70
+gUnknown_08338D70: @ 8338D70
 	.incbin "base_emerald.gba", 0x338d70, 0x8
 
-gUnknown_08338D78: ; 8338D78
+gUnknown_08338D78: @ 8338D78
 	.incbin "base_emerald.gba", 0x338d78, 0x8
 
-gUnknown_08338D80: ; 8338D80
+gUnknown_08338D80: @ 8338D80
 	.incbin "base_emerald.gba", 0x338d80, 0x8
 
-gUnknown_08338D88: ; 8338D88
+gUnknown_08338D88: @ 8338D88
 	.incbin "base_emerald.gba", 0x338d88, 0x38
 
-gUnknown_08338DC0: ; 8338DC0
+gUnknown_08338DC0: @ 8338DC0
 	.incbin "base_emerald.gba", 0x338dc0, 0x8
 
-gUnknown_08338DC8: ; 8338DC8
+gUnknown_08338DC8: @ 8338DC8
 	.incbin "base_emerald.gba", 0x338dc8, 0x2c
 
-gUnknown_08338DF4: ; 8338DF4
+gUnknown_08338DF4: @ 8338DF4
 	.incbin "base_emerald.gba", 0x338df4, 0x8
 
-gUnknown_08338DFC: ; 8338DFC
+gUnknown_08338DFC: @ 8338DFC
 	.incbin "base_emerald.gba", 0x338dfc, 0x70
 
-gUnknown_08338E6C: ; 8338E6C
+gUnknown_08338E6C: @ 8338E6C
 	.incbin "base_emerald.gba", 0x338e6c, 0x8
 
-gUnknown_08338E74: ; 8338E74
+gUnknown_08338E74: @ 8338E74
 	.incbin "base_emerald.gba", 0x338e74, 0x18
 
-gUnknown_08338E8C: ; 8338E8C
+gUnknown_08338E8C: @ 8338E8C
 	.incbin "base_emerald.gba", 0x338e8c, 0x18
 
-gUnknown_08338EA4: ; 8338EA4
+gUnknown_08338EA4: @ 8338EA4
 	.incbin "base_emerald.gba", 0x338ea4, 0x28
 
-gUnknown_08338ECC: ; 8338ECC
+gUnknown_08338ECC: @ 8338ECC
 	.incbin "base_emerald.gba", 0x338ecc, 0x4
 
-gUnknown_08338ED0: ; 8338ED0
+gUnknown_08338ED0: @ 8338ED0
 	.incbin "base_emerald.gba", 0x338ed0, 0xf0
 
-gUnknown_08338FC0: ; 8338FC0
+gUnknown_08338FC0: @ 8338FC0
 	.incbin "base_emerald.gba", 0x338fc0, 0x3c
 
-gUnknown_08338FFC: ; 8338FFC
+gUnknown_08338FFC: @ 8338FFC
 	.incbin "base_emerald.gba", 0x338ffc, 0x10
 
-gUnknown_0833900C: ; 833900C
+gUnknown_0833900C: @ 833900C
 	.incbin "base_emerald.gba", 0x33900c, 0x8
 
-gUnknown_08339014: ; 8339014
+gUnknown_08339014: @ 8339014
 	.incbin "base_emerald.gba", 0x339014, 0x10
 
-gUnknown_08339024: ; 8339024
+gUnknown_08339024: @ 8339024
 	.incbin "base_emerald.gba", 0x339024, 0x6c
 
-gUnknown_08339090: ; 8339090
+gUnknown_08339090: @ 8339090
 	.incbin "base_emerald.gba", 0x339090, 0x44
 
-gUnknown_083390D4: ; 83390D4
+gUnknown_083390D4: @ 83390D4
 	.incbin "base_emerald.gba", 0x3390d4, 0x20
 
-gUnknown_083390F4: ; 83390F4
+gUnknown_083390F4: @ 83390F4
 	.incbin "base_emerald.gba", 0x3390f4, 0x400
 
-gUnknown_083394F4: ; 83394F4
+gUnknown_083394F4: @ 83394F4
 	.incbin "base_emerald.gba", 0x3394f4, 0x246
 
-gUnknown_0833973A: ; 833973A
+gUnknown_0833973A: @ 833973A
 	.incbin "base_emerald.gba", 0x33973a, 0x61
 
-gUnknown_0833979B: ; 833979B
+gUnknown_0833979B: @ 833979B
 	.incbin "base_emerald.gba", 0x33979b, 0x2
 
-gUnknown_0833979D: ; 833979D
+gUnknown_0833979D: @ 833979D
 	.incbin "base_emerald.gba", 0x33979d, 0x33
 
-gUnknown_083397D0: ; 83397D0
+gUnknown_083397D0: @ 83397D0
 	.incbin "base_emerald.gba", 0x3397d0, 0x4a
 
-gUnknown_0833981A: ; 833981A
+gUnknown_0833981A: @ 833981A
 	.incbin "base_emerald.gba", 0x33981a, 0x17
 
-gUnknown_08339831: ; 8339831
+gUnknown_08339831: @ 8339831
 	.incbin "base_emerald.gba", 0x339831, 0x27
 
-gUnknown_08339858: ; 8339858
+gUnknown_08339858: @ 8339858
 	.incbin "base_emerald.gba", 0x339858, 0x3e
 
-gUnknown_08339896: ; 8339896
+gUnknown_08339896: @ 8339896
 	.incbin "base_emerald.gba", 0x339896, 0x1a
 
-gUnknown_083398B0: ; 83398B0
+gUnknown_083398B0: @ 83398B0
 	.incbin "base_emerald.gba", 0x3398b0, 0x2d
 
-gUnknown_083398DD: ; 83398DD
+gUnknown_083398DD: @ 83398DD
 	.incbin "base_emerald.gba", 0x3398dd, 0x18
 
-gUnknown_083398F5: ; 83398F5
+gUnknown_083398F5: @ 83398F5
 	.incbin "base_emerald.gba", 0x3398f5, 0x1f
 
-gUnknown_08339914: ; 8339914
+gUnknown_08339914: @ 8339914
 	.incbin "base_emerald.gba", 0x339914, 0x7
 
-gUnknown_0833991B: ; 833991B
+gUnknown_0833991B: @ 833991B
 	.incbin "base_emerald.gba", 0x33991b, 0x6
 
-gUnknown_08339921: ; 8339921
+gUnknown_08339921: @ 8339921
 	.incbin "base_emerald.gba", 0x339921, 0x7
 
-gUnknown_08339928: ; 8339928
+gUnknown_08339928: @ 8339928
 	.incbin "base_emerald.gba", 0x339928, 0x6
 
-gUnknown_0833992E: ; 833992E
+gUnknown_0833992E: @ 833992E
 	.incbin "base_emerald.gba", 0x33992e, 0xe
 
-gUnknown_0833993C: ; 833993C
+gUnknown_0833993C: @ 833993C
 	.incbin "base_emerald.gba", 0x33993c, 0x5
 
-gUnknown_08339941: ; 8339941
+gUnknown_08339941: @ 8339941
 	.incbin "base_emerald.gba", 0x339941, 0x2
 
-gUnknown_08339943: ; 8339943
+gUnknown_08339943: @ 8339943
 	.incbin "base_emerald.gba", 0x339943, 0x4
 
-gUnknown_08339947: ; 8339947
+gUnknown_08339947: @ 8339947
 	.incbin "base_emerald.gba", 0x339947, 0x8
 
-gUnknown_0833994F: ; 833994F
+gUnknown_0833994F: @ 833994F
 	.incbin "base_emerald.gba", 0x33994f, 0xe
 
-gUnknown_0833995D: ; 833995D
+gUnknown_0833995D: @ 833995D
 	.incbin "base_emerald.gba", 0x33995d, 0x13
 
-gUnknown_08339970: ; 8339970
+gUnknown_08339970: @ 8339970
 	.incbin "base_emerald.gba", 0x339970, 0x4
 
-gUnknown_08339974: ; 8339974
+gUnknown_08339974: @ 8339974
 	.incbin "base_emerald.gba", 0x339974, 0xc
 
-gUnknown_08339980: ; 8339980
+gUnknown_08339980: @ 8339980
 	.incbin "base_emerald.gba", 0x339980, 0x38
 
-gUnknown_083399B8: ; 83399B8
+gUnknown_083399B8: @ 83399B8
 	.incbin "base_emerald.gba", 0x3399b8, 0x8
 
-gUnknown_083399C0: ; 83399C0
+gUnknown_083399C0: @ 83399C0
 	.incbin "base_emerald.gba", 0x3399c0, 0x8
 
-gUnknown_083399C8: ; 83399C8
+gUnknown_083399C8: @ 83399C8
 	.incbin "base_emerald.gba", 0x3399c8, 0x8
 
-gUnknown_083399D0: ; 83399D0
+gUnknown_083399D0: @ 83399D0
 	.incbin "base_emerald.gba", 0x3399d0, 0xc
 
-gUnknown_083399DC: ; 83399DC
+gUnknown_083399DC: @ 83399DC
 	.incbin "base_emerald.gba", 0x3399dc, 0x8
 
-gUnknown_083399E4: ; 83399E4
+gUnknown_083399E4: @ 83399E4
 	.incbin "base_emerald.gba", 0x3399e4, 0x3
 
-gUnknown_083399E7: ; 83399E7
+gUnknown_083399E7: @ 83399E7
 	.incbin "base_emerald.gba", 0x3399e7, 0x5
 
-gUnknown_083399EC: ; 83399EC
+gUnknown_083399EC: @ 83399EC
 	.incbin "base_emerald.gba", 0x3399ec, 0xd4
 
-gUnknown_08339AC0: ; 8339AC0
+gUnknown_08339AC0: @ 8339AC0
 	.incbin "base_emerald.gba", 0x339ac0, 0x8
 
-gUnknown_08339AC8: ; 8339AC8
+gUnknown_08339AC8: @ 8339AC8
 	.incbin "base_emerald.gba", 0x339ac8, 0x8
 
-gUnknown_08339AD0: ; 8339AD0
+gUnknown_08339AD0: @ 8339AD0
 	.incbin "base_emerald.gba", 0x339ad0, 0x8
 
-gUnknown_08339AD8: ; 8339AD8
+gUnknown_08339AD8: @ 8339AD8
 	.incbin "base_emerald.gba", 0x339ad8, 0x60
 
-gUnknown_08339B38: ; 8339B38
+gUnknown_08339B38: @ 8339B38
 	.incbin "base_emerald.gba", 0x339b38, 0x8
 
-gUnknown_08339B40: ; 8339B40
+gUnknown_08339B40: @ 8339B40
 	.incbin "base_emerald.gba", 0x339b40, 0x98
 
-gUnknown_08339BD8: ; 8339BD8
+gUnknown_08339BD8: @ 8339BD8
 	.incbin "base_emerald.gba", 0x339bd8, 0x8
 
-gUnknown_08339BE0: ; 8339BE0
+gUnknown_08339BE0: @ 8339BE0
 	.incbin "base_emerald.gba", 0x339be0, 0x44
 
-gUnknown_08339C24: ; 8339C24
+gUnknown_08339C24: @ 8339C24
 	.incbin "base_emerald.gba", 0x339c24, 0x8
 
-gUnknown_08339C2C: ; 8339C2C
+gUnknown_08339C2C: @ 8339C2C
 	.incbin "base_emerald.gba", 0x339c2c, 0x2c
 
-gUnknown_08339C58: ; 8339C58
+gUnknown_08339C58: @ 8339C58
 	.incbin "base_emerald.gba", 0x339c58, 0x8
 
-gUnknown_08339C60: ; 8339C60
+gUnknown_08339C60: @ 8339C60
 	.incbin "base_emerald.gba", 0x339c60, 0x18
 
-gUnknown_08339C78: ; 8339C78
+gUnknown_08339C78: @ 8339C78
 	.incbin "base_emerald.gba", 0x339c78, 0x28
 
-gUnknown_08339CA0: ; 8339CA0
+gUnknown_08339CA0: @ 8339CA0
 	.incbin "base_emerald.gba", 0x339ca0, 0x1e
 
-gUnknown_08339CBE: ; 8339CBE
+gUnknown_08339CBE: @ 8339CBE
 	.incbin "base_emerald.gba", 0x339cbe, 0x5
 
-gUnknown_08339CC3: ; 8339CC3
+gUnknown_08339CC3: @ 8339CC3
 	.incbin "base_emerald.gba", 0x339cc3, 0x5
 
-gUnknown_08339CC8: ; 8339CC8
+gUnknown_08339CC8: @ 8339CC8
 	.incbin "base_emerald.gba", 0x339cc8, 0x4c
 
-gUnknown_08339D14: ; 8339D14
+gUnknown_08339D14: @ 8339D14
 	.incbin "base_emerald.gba", 0x339d14, 0x8
 
-gUnknown_08339D1C: ; 8339D1C
+gUnknown_08339D1C: @ 8339D1C
 	.incbin "base_emerald.gba", 0x339d1c, 0x20
 
-gUnknown_08339D3C: ; 8339D3C
+gUnknown_08339D3C: @ 8339D3C
 	.incbin "base_emerald.gba", 0x339d3c, 0x28
 
-gUnknown_08339D64: ; 8339D64
+gUnknown_08339D64: @ 8339D64
 	.incbin "base_emerald.gba", 0x339d64, 0x48
 
-gUnknown_08339DAC: ; 8339DAC
+gUnknown_08339DAC: @ 8339DAC
 	.incbin "base_emerald.gba", 0x339dac, 0x10
 
-gUnknown_08339DBC: ; 8339DBC
+gUnknown_08339DBC: @ 8339DBC
 	.incbin "base_emerald.gba", 0x339dbc, 0xc
 
-gUnknown_08339DC8: ; 8339DC8
+gUnknown_08339DC8: @ 8339DC8
 	.incbin "base_emerald.gba", 0x339dc8, 0xc
 
-gUnknown_08339DD4: ; 8339DD4
+gUnknown_08339DD4: @ 8339DD4
 	.incbin "base_emerald.gba", 0x339dd4, 0x2c
 
-gUnknown_08339E00: ; 8339E00
+gUnknown_08339E00: @ 8339E00
 	.incbin "base_emerald.gba", 0x339e00, 0x8
 
-; 8339E08
+@ 8339E08
 	.include "data/graphics/tilesets/tileset_graphics.s"
 
-; 83960F0
+@ 83960F0
 	.include "data/graphics/tilesets/metatiles.s"
 
-; 83DF704
+@ 83DF704
 	.include "data/graphics/tilesets/tilesets.s"
 
-; 83DFE14
+@ 83DFE14
 	.incbin "base_emerald.gba", 0x3dfe14, 0xa1fc0
 
-gUnknown_08481DD4: ; 8481DD4
+gUnknown_08481DD4: @ 8481DD4
 	.incbin "base_emerald.gba", 0x481dd4, 0x47a4
 
-gUnknown_08486578: ; 8486578
+gUnknown_08486578: @ 8486578
 	.incbin "base_emerald.gba", 0x486578, 0x980
 
-gUnknown_08486EF8: ; 8486EF8
+gUnknown_08486EF8: @ 8486EF8
 	.incbin "base_emerald.gba", 0x486ef8, 0x4
 
-gUnknown_08486EFC: ; 8486EFC
+gUnknown_08486EFC: @ 8486EFC
 	.incbin "base_emerald.gba", 0x486efc, 0x10090
 
-gUnknown_08496F8C: ; 8496F8C
+gUnknown_08496F8C: @ 8496F8C
 	.incbin "base_emerald.gba", 0x496f8c, 0x14
 
-gUnknown_08496FA0: ; 8496FA0
+gUnknown_08496FA0: @ 8496FA0
 	.incbin "base_emerald.gba", 0x496fa0, 0x14
 
-gUnknown_08496FB4: ; 8496FB4
+gUnknown_08496FB4: @ 8496FB4
 	.incbin "base_emerald.gba", 0x496fb4, 0x1c0
 
-gUnknown_08497174: ; 8497174
+gUnknown_08497174: @ 8497174
 	.incbin "base_emerald.gba", 0x497174, 0x288
 
-gUnknown_084973FC: ; 84973FC
+gUnknown_084973FC: @ 84973FC
 	.incbin "base_emerald.gba", 0x4973fc, 0x48
 
-gUnknown_08497444: ; 8497444
+gUnknown_08497444: @ 8497444
 	.incbin "base_emerald.gba", 0x497444, 0x4c
 
-gUnknown_08497490: ; 8497490
+gUnknown_08497490: @ 8497490
 	.incbin "base_emerald.gba", 0x497490, 0xc
 
-gUnknown_0849749C: ; 849749C
+gUnknown_0849749C: @ 849749C
 	.incbin "base_emerald.gba", 0x49749c, 0x14
 
-gUnknown_084974B0: ; 84974B0
+gUnknown_084974B0: @ 84974B0
 	.incbin "base_emerald.gba", 0x4974b0, 0x8
 
-gUnknown_084974B8: ; 84974B8
+gUnknown_084974B8: @ 84974B8
 	.incbin "base_emerald.gba", 0x4974b8, 0x20
 
-gUnknown_084974D8: ; 84974D8
+gUnknown_084974D8: @ 84974D8
 	.incbin "base_emerald.gba", 0x4974d8, 0x10
 
-gUnknown_084974E8: ; 84974E8
+gUnknown_084974E8: @ 84974E8
 	.incbin "base_emerald.gba", 0x4974e8, 0x10
 
-gUnknown_084974F8: ; 84974F8
+gUnknown_084974F8: @ 84974F8
 	.incbin "base_emerald.gba", 0x4974f8, 0x10
 
-gUnknown_08497508: ; 8497508
+gUnknown_08497508: @ 8497508
 	.incbin "base_emerald.gba", 0x497508, 0x2
 
-gUnknown_0849750A: ; 849750A
+gUnknown_0849750A: @ 849750A
 	.incbin "base_emerald.gba", 0x49750a, 0x2
 
-gUnknown_0849750C: ; 849750C
+gUnknown_0849750C: @ 849750C
 	.incbin "base_emerald.gba", 0x49750c, 0x14
 
-gUnknown_08497520: ; 8497520
+gUnknown_08497520: @ 8497520
 	.incbin "base_emerald.gba", 0x497520, 0x10
 
-gUnknown_08497530: ; 8497530
+gUnknown_08497530: @ 8497530
 	.incbin "base_emerald.gba", 0x497530, 0xc
 
-gUnknown_0849753C: ; 849753C
+gUnknown_0849753C: @ 849753C
 	.incbin "base_emerald.gba", 0x49753c, 0x4
 
-gUnknown_08497540: ; 8497540
+gUnknown_08497540: @ 8497540
 	.incbin "base_emerald.gba", 0x497540, 0x10
 
-gUnknown_08497550: ; 8497550
+gUnknown_08497550: @ 8497550
 	.incbin "base_emerald.gba", 0x497550, 0x4
 
-gUnknown_08497554: ; 8497554
+gUnknown_08497554: @ 8497554
 	.incbin "base_emerald.gba", 0x497554, 0x8
 
-gUnknown_0849755C: ; 849755C
+gUnknown_0849755C: @ 849755C
 	.incbin "base_emerald.gba", 0x49755c, 0x40
 
-gUnknown_0849759C: ; 849759C
+gUnknown_0849759C: @ 849759C
 	.incbin "base_emerald.gba", 0x49759c, 0x6
 
-gUnknown_084975A2: ; 84975A2
+gUnknown_084975A2: @ 84975A2
 	.incbin "base_emerald.gba", 0x4975a2, 0x6
 
-gUnknown_084975A8: ; 84975A8
+gUnknown_084975A8: @ 84975A8
 	.incbin "base_emerald.gba", 0x4975a8, 0x2
 
-gUnknown_084975AA: ; 84975AA
+gUnknown_084975AA: @ 84975AA
 	.incbin "base_emerald.gba", 0x4975aa, 0x6
 
-gUnknown_084975B0: ; 84975B0
+gUnknown_084975B0: @ 84975B0
 	.incbin "base_emerald.gba", 0x4975b0, 0xc
 
-gUnknown_084975BC: ; 84975BC
+gUnknown_084975BC: @ 84975BC
 	.incbin "base_emerald.gba", 0x4975bc, 0x8
 
-gUnknown_084975C4: ; 84975C4
+gUnknown_084975C4: @ 84975C4
 	.incbin "base_emerald.gba", 0x4975c4, 0x10
 
-gUnknown_084975D4: ; 84975D4
+gUnknown_084975D4: @ 84975D4
 	.incbin "base_emerald.gba", 0x4975d4, 0x18
 
-gUnknown_084975EC: ; 84975EC
+gUnknown_084975EC: @ 84975EC
 	.incbin "base_emerald.gba", 0x4975ec, 0xc
 
-; 84975F8
+@ 84975F8
 	.include "data/graphics/field_objects/field_object_graphics.s"
 
-gUnknown_08505438: ; 8505438
+gUnknown_08505438: @ 8505438
 	.incbin "base_emerald.gba", 0x505438, 0x144
 
-gUnknown_0850557C: ; 850557C
+gUnknown_0850557C: @ 850557C
 	.incbin "base_emerald.gba", 0x50557c, 0x51
 
-gUnknown_085055CD: ; 85055CD
+gUnknown_085055CD: @ 85055CD
 	.incbin "base_emerald.gba", 0x5055cd, 0x53
 
-; 8505620
+@ 8505620
 	.include "data/graphics/field_objects/field_object_graphics_info_pointers.s"
 
-; 85059F8
+@ 85059F8
 	.include "data/graphics/field_objects/field_effect_object_template_pointers.s"
 
-; 8505A8C
+@ 8505A8C
 	.include "data/graphics/field_objects/field_object_pic_tables.s"
 
-; 85089FC
+@ 85089FC
 	.include "data/graphics/field_objects/field_object_anims.s"
 
-gUnknown_085094AC: ; 85094AC
+gUnknown_085094AC: @ 85094AC
 	.incbin "base_emerald.gba", 0x5094ac, 0x40
 
-; 85094EC
+@ 85094EC
 	.include "data/graphics/field_objects/field_object_oam.s"
 
-; 8509954
+@ 8509954
 	.include "data/graphics/field_objects/field_object_graphics_info.s"
 
-gUnknown_0850BBC8: ; 850BBC8
+gUnknown_0850BBC8: @ 850BBC8
 	.incbin "base_emerald.gba", 0x50bbc8, 0x138
 
-gUnknown_0850BD00: ; 850BD00
+gUnknown_0850BD00: @ 850BD00
 	.incbin "base_emerald.gba", 0x50bd00, 0x78
 
-gUnknown_0850BD78: ; 850BD78
+gUnknown_0850BD78: @ 850BD78
 	.incbin "base_emerald.gba", 0x50bd78, 0xc0
 
-gUnknown_0850BE38: ; 850BE38
+gUnknown_0850BE38: @ 850BE38
 	.incbin "base_emerald.gba", 0x50be38, 0x10
 
-; 850BE48
+@ 850BE48
 	.include "data/graphics/field_objects/berry_tree_graphics_tables.s"
 
-; 850C9C0
+@ 850C9C0
 	.include "data/graphics/field_objects/field_effect_objects.s"
 
 	.incbin "base_emerald.gba", 0x50d6d4, 0x8
 
-gUnknown_0850D6DC: ; 850D6DC
+gUnknown_0850D6DC: @ 850D6DC
 	.incbin "base_emerald.gba", 0x50d6dc, 0x10
 
-gUnknown_0850D6EC: ; 850D6EC
+gUnknown_0850D6EC: @ 850D6EC
 	.incbin "base_emerald.gba", 0x50d6ec, 0x8
 
-gUnknown_0850D6F4: ; 850D6F4
+gUnknown_0850D6F4: @ 850D6F4
 	.incbin "base_emerald.gba", 0x50d6f4, 0x1c
 
-gUnknown_0850D710: ; 850D710
+gUnknown_0850D710: @ 850D710
 	.incbin "base_emerald.gba", 0x50d710, 0x4
 
-gUnknown_0850D714: ; 850D714
+gUnknown_0850D714: @ 850D714
 	.incbin "base_emerald.gba", 0x50d714, 0x2c
 
-gUnknown_0850D740: ; 850D740
+gUnknown_0850D740: @ 850D740
 	.incbin "base_emerald.gba", 0x50d740, 0x14
 
-gUnknown_0850D754: ; 850D754
+gUnknown_0850D754: @ 850D754
 	.incbin "base_emerald.gba", 0x50d754, 0x1c
 
-gUnknown_0850D770: ; 850D770
+gUnknown_0850D770: @ 850D770
 	.incbin "base_emerald.gba", 0x50d770, 0x4
 
-gUnknown_0850D774: ; 850D774
+gUnknown_0850D774: @ 850D774
 	.incbin "base_emerald.gba", 0x50d774, 0x1c
 
-gUnknown_0850D790: ; 850D790
+gUnknown_0850D790: @ 850D790
 	.incbin "base_emerald.gba", 0x50d790, 0x4
 
-gUnknown_0850D794: ; 850D794
+gUnknown_0850D794: @ 850D794
 	.incbin "base_emerald.gba", 0x50d794, 0xc
 
-gUnknown_0850D7A0: ; 850D7A0
+gUnknown_0850D7A0: @ 850D7A0
 	.incbin "base_emerald.gba", 0x50d7a0, 0x14
 
-gUnknown_0850D7B4: ; 850D7B4
+gUnknown_0850D7B4: @ 850D7B4
 	.incbin "base_emerald.gba", 0x50d7b4, 0x14
 
-gUnknown_0850D7C8: ; 850D7C8
+gUnknown_0850D7C8: @ 850D7C8
 	.incbin "base_emerald.gba", 0x50d7c8, 0x14
 
-gUnknown_0850D7DC: ; 850D7DC
+gUnknown_0850D7DC: @ 850D7DC
 	.incbin "base_emerald.gba", 0x50d7dc, 0x14
 
-gUnknown_0850D7F0: ; 850D7F0
+gUnknown_0850D7F0: @ 850D7F0
 	.incbin "base_emerald.gba", 0x50d7f0, 0x4
 
-gUnknown_0850D7F4: ; 850D7F4
+gUnknown_0850D7F4: @ 850D7F4
 	.incbin "base_emerald.gba", 0x50d7f4, 0x14
 
-gUnknown_0850D808: ; 850D808
+gUnknown_0850D808: @ 850D808
 	.incbin "base_emerald.gba", 0x50d808, 0x4
 
-gUnknown_0850D80C: ; 850D80C
+gUnknown_0850D80C: @ 850D80C
 	.incbin "base_emerald.gba", 0x50d80c, 0x14
 
-gUnknown_0850D820: ; 850D820
+gUnknown_0850D820: @ 850D820
 	.incbin "base_emerald.gba", 0x50d820, 0x4
 
-gUnknown_0850D824: ; 850D824
+gUnknown_0850D824: @ 850D824
 	.incbin "base_emerald.gba", 0x50d824, 0x14
 
-gUnknown_0850D838: ; 850D838
+gUnknown_0850D838: @ 850D838
 	.incbin "base_emerald.gba", 0x50d838, 0x4
 
-gUnknown_0850D83C: ; 850D83C
+gUnknown_0850D83C: @ 850D83C
 	.incbin "base_emerald.gba", 0x50d83c, 0x14
 
-gUnknown_0850D850: ; 850D850
+gUnknown_0850D850: @ 850D850
 	.incbin "base_emerald.gba", 0x50d850, 0x4
 
-gUnknown_0850D854: ; 850D854
+gUnknown_0850D854: @ 850D854
 	.incbin "base_emerald.gba", 0x50d854, 0x14
 
-gUnknown_0850D868: ; 850D868
+gUnknown_0850D868: @ 850D868
 	.incbin "base_emerald.gba", 0x50d868, 0x4
 
-gUnknown_0850D86C: ; 850D86C
+gUnknown_0850D86C: @ 850D86C
 	.incbin "base_emerald.gba", 0x50d86c, 0x14
 
-gUnknown_0850D880: ; 850D880
+gUnknown_0850D880: @ 850D880
 	.incbin "base_emerald.gba", 0x50d880, 0x4
 
-gUnknown_0850D884: ; 850D884
+gUnknown_0850D884: @ 850D884
 	.incbin "base_emerald.gba", 0x50d884, 0x14
 
-gUnknown_0850D898: ; 850D898
+gUnknown_0850D898: @ 850D898
 	.incbin "base_emerald.gba", 0x50d898, 0x4
 
-gUnknown_0850D89C: ; 850D89C
+gUnknown_0850D89C: @ 850D89C
 	.incbin "base_emerald.gba", 0x50d89c, 0x10
 
-gUnknown_0850D8AC: ; 850D8AC
+gUnknown_0850D8AC: @ 850D8AC
 	.incbin "base_emerald.gba", 0x50d8ac, 0x8
 
-gUnknown_0850D8B4: ; 850D8B4
+gUnknown_0850D8B4: @ 850D8B4
 	.incbin "base_emerald.gba", 0x50d8b4, 0x10
 
-gUnknown_0850D8C4: ; 850D8C4
+gUnknown_0850D8C4: @ 850D8C4
 	.incbin "base_emerald.gba", 0x50d8c4, 0x8
 
-gUnknown_0850D8CC: ; 850D8CC
+gUnknown_0850D8CC: @ 850D8CC
 	.incbin "base_emerald.gba", 0x50d8cc, 0x10
 
-gUnknown_0850D8DC: ; 850D8DC
+gUnknown_0850D8DC: @ 850D8DC
 	.incbin "base_emerald.gba", 0x50d8dc, 0xc
 
-gUnknown_0850D8E8: ; 850D8E8
+gUnknown_0850D8E8: @ 850D8E8
 	.incbin "base_emerald.gba", 0x50d8e8, 0x4
 
-gUnknown_0850D8EC: ; 850D8EC
+gUnknown_0850D8EC: @ 850D8EC
 	.incbin "base_emerald.gba", 0x50d8ec, 0xc
 
-gUnknown_0850D8F8: ; 850D8F8
+gUnknown_0850D8F8: @ 850D8F8
 	.incbin "base_emerald.gba", 0x50d8f8, 0x4
 
-gUnknown_0850D8FC: ; 850D8FC
+gUnknown_0850D8FC: @ 850D8FC
 	.incbin "base_emerald.gba", 0x50d8fc, 0xc
 
-gUnknown_0850D908: ; 850D908
+gUnknown_0850D908: @ 850D908
 	.incbin "base_emerald.gba", 0x50d908, 0x4
 
-gUnknown_0850D90C: ; 850D90C
+gUnknown_0850D90C: @ 850D90C
 	.incbin "base_emerald.gba", 0x50d90c, 0xc
 
-gUnknown_0850D918: ; 850D918
+gUnknown_0850D918: @ 850D918
 	.incbin "base_emerald.gba", 0x50d918, 0x4
 
-gUnknown_0850D91C: ; 850D91C
+gUnknown_0850D91C: @ 850D91C
 	.incbin "base_emerald.gba", 0x50d91c, 0xc
 
-gUnknown_0850D928: ; 850D928
+gUnknown_0850D928: @ 850D928
 	.incbin "base_emerald.gba", 0x50d928, 0x4
 
-gUnknown_0850D92C: ; 850D92C
+gUnknown_0850D92C: @ 850D92C
 	.incbin "base_emerald.gba", 0x50d92c, 0xc
 
-gUnknown_0850D938: ; 850D938
+gUnknown_0850D938: @ 850D938
 	.incbin "base_emerald.gba", 0x50d938, 0x4
 
-gUnknown_0850D93C: ; 850D93C
+gUnknown_0850D93C: @ 850D93C
 	.incbin "base_emerald.gba", 0x50d93c, 0xc
 
-gUnknown_0850D948: ; 850D948
+gUnknown_0850D948: @ 850D948
 	.incbin "base_emerald.gba", 0x50d948, 0xc
 
-gUnknown_0850D954: ; 850D954
+gUnknown_0850D954: @ 850D954
 	.incbin "base_emerald.gba", 0x50d954, 0x4
 
-gUnknown_0850D958: ; 850D958
+gUnknown_0850D958: @ 850D958
 	.incbin "base_emerald.gba", 0x50d958, 0xc
 
-gUnknown_0850D964: ; 850D964
+gUnknown_0850D964: @ 850D964
 	.incbin "base_emerald.gba", 0x50d964, 0x4
 
-gUnknown_0850D968: ; 850D968
+gUnknown_0850D968: @ 850D968
 	.incbin "base_emerald.gba", 0x50d968, 0xc
 
-gUnknown_0850D974: ; 850D974
+gUnknown_0850D974: @ 850D974
 	.incbin "base_emerald.gba", 0x50d974, 0x4
 
-gUnknown_0850D978: ; 850D978
+gUnknown_0850D978: @ 850D978
 	.incbin "base_emerald.gba", 0x50d978, 0xc
 
-gUnknown_0850D984: ; 850D984
+gUnknown_0850D984: @ 850D984
 	.incbin "base_emerald.gba", 0x50d984, 0x4
 
-gUnknown_0850D988: ; 850D988
+gUnknown_0850D988: @ 850D988
 	.incbin "base_emerald.gba", 0x50d988, 0xc
 
-gUnknown_0850D994: ; 850D994
+gUnknown_0850D994: @ 850D994
 	.incbin "base_emerald.gba", 0x50d994, 0x4
 
-gUnknown_0850D998: ; 850D998
+gUnknown_0850D998: @ 850D998
 	.incbin "base_emerald.gba", 0x50d998, 0xc
 
-gUnknown_0850D9A4: ; 850D9A4
+gUnknown_0850D9A4: @ 850D9A4
 	.incbin "base_emerald.gba", 0x50d9a4, 0x4
 
-gUnknown_0850D9A8: ; 850D9A8
+gUnknown_0850D9A8: @ 850D9A8
 	.incbin "base_emerald.gba", 0x50d9a8, 0xc
 
-gUnknown_0850D9B4: ; 850D9B4
+gUnknown_0850D9B4: @ 850D9B4
 	.incbin "base_emerald.gba", 0x50d9b4, 0x4
 
-gUnknown_0850D9B8: ; 850D9B8
+gUnknown_0850D9B8: @ 850D9B8
 	.incbin "base_emerald.gba", 0x50d9b8, 0xc
 
-gUnknown_0850D9C4: ; 850D9C4
+gUnknown_0850D9C4: @ 850D9C4
 	.incbin "base_emerald.gba", 0x50d9c4, 0x4
 
-gUnknown_0850D9C8: ; 850D9C8
+gUnknown_0850D9C8: @ 850D9C8
 	.incbin "base_emerald.gba", 0x50d9c8, 0xc
 
-gUnknown_0850D9D4: ; 850D9D4
+gUnknown_0850D9D4: @ 850D9D4
 	.incbin "base_emerald.gba", 0x50d9d4, 0x4
 
-gUnknown_0850D9D8: ; 850D9D8
+gUnknown_0850D9D8: @ 850D9D8
 	.incbin "base_emerald.gba", 0x50d9d8, 0xc
 
-gUnknown_0850D9E4: ; 850D9E4
+gUnknown_0850D9E4: @ 850D9E4
 	.incbin "base_emerald.gba", 0x50d9e4, 0x4
 
-gUnknown_0850D9E8: ; 850D9E8
+gUnknown_0850D9E8: @ 850D9E8
 	.incbin "base_emerald.gba", 0x50d9e8, 0xc
 
-gUnknown_0850D9F4: ; 850D9F4
+gUnknown_0850D9F4: @ 850D9F4
 	.incbin "base_emerald.gba", 0x50d9f4, 0x4
 
-gUnknown_0850D9F8: ; 850D9F8
+gUnknown_0850D9F8: @ 850D9F8
 	.incbin "base_emerald.gba", 0x50d9f8, 0xc
 
-gUnknown_0850DA04: ; 850DA04
+gUnknown_0850DA04: @ 850DA04
 	.incbin "base_emerald.gba", 0x50da04, 0x4
 
-gUnknown_0850DA08: ; 850DA08
+gUnknown_0850DA08: @ 850DA08
 	.incbin "base_emerald.gba", 0x50da08, 0xc
 
-gUnknown_0850DA14: ; 850DA14
+gUnknown_0850DA14: @ 850DA14
 	.incbin "base_emerald.gba", 0x50da14, 0x4
 
-gUnknown_0850DA18: ; 850DA18
+gUnknown_0850DA18: @ 850DA18
 	.incbin "base_emerald.gba", 0x50da18, 0xc
 
-gUnknown_0850DA24: ; 850DA24
+gUnknown_0850DA24: @ 850DA24
 	.incbin "base_emerald.gba", 0x50da24, 0x4
 
-gUnknown_0850DA28: ; 850DA28
+gUnknown_0850DA28: @ 850DA28
 	.incbin "base_emerald.gba", 0x50da28, 0xc
 
-gUnknown_0850DA34: ; 850DA34
+gUnknown_0850DA34: @ 850DA34
 	.incbin "base_emerald.gba", 0x50da34, 0x4
 
-gUnknown_0850DA38: ; 850DA38
+gUnknown_0850DA38: @ 850DA38
 	.incbin "base_emerald.gba", 0x50da38, 0xc
 
-gUnknown_0850DA44: ; 850DA44
+gUnknown_0850DA44: @ 850DA44
 	.incbin "base_emerald.gba", 0x50da44, 0x4
 
-gUnknown_0850DA48: ; 850DA48
+gUnknown_0850DA48: @ 850DA48
 	.incbin "base_emerald.gba", 0x50da48, 0xc
 
-gUnknown_0850DA54: ; 850DA54
+gUnknown_0850DA54: @ 850DA54
 	.incbin "base_emerald.gba", 0x50da54, 0x4
 
-gUnknown_0850DA58: ; 850DA58
+gUnknown_0850DA58: @ 850DA58
 	.incbin "base_emerald.gba", 0x50da58, 0xc
 
-gUnknown_0850DA64: ; 850DA64
+gUnknown_0850DA64: @ 850DA64
 	.incbin "base_emerald.gba", 0x50da64, 0x2c
 
-gUnknown_0850DA90: ; 850DA90
+gUnknown_0850DA90: @ 850DA90
 	.incbin "base_emerald.gba", 0x50da90, 0xc
 
-gUnknown_0850DA9C: ; 850DA9C
+gUnknown_0850DA9C: @ 850DA9C
 	.incbin "base_emerald.gba", 0x50da9c, 0x4
 
-gUnknown_0850DAA0: ; 850DAA0
+gUnknown_0850DAA0: @ 850DAA0
 	.incbin "base_emerald.gba", 0x50daa0, 0x8
 
-gUnknown_0850DAA8: ; 850DAA8
+gUnknown_0850DAA8: @ 850DAA8
 	.incbin "base_emerald.gba", 0x50daa8, 0x8
 
-gUnknown_0850DAB0: ; 850DAB0
+gUnknown_0850DAB0: @ 850DAB0
 	.incbin "base_emerald.gba", 0x50dab0, 0x8
 
-gUnknown_0850DAB8: ; 850DAB8
+gUnknown_0850DAB8: @ 850DAB8
 	.incbin "base_emerald.gba", 0x50dab8, 0x8
 
-gUnknown_0850DAC0: ; 850DAC0
+gUnknown_0850DAC0: @ 850DAC0
 	.incbin "base_emerald.gba", 0x50dac0, 0xc
 
-gUnknown_0850DACC: ; 850DACC
+gUnknown_0850DACC: @ 850DACC
 	.incbin "base_emerald.gba", 0x50dacc, 0x9
 
-gUnknown_0850DAD5: ; 850DAD5
+gUnknown_0850DAD5: @ 850DAD5
 	.incbin "base_emerald.gba", 0x50dad5, 0x9
 
-gUnknown_0850DADE: ; 850DADE
+gUnknown_0850DADE: @ 850DADE
 	.incbin "base_emerald.gba", 0x50dade, 0x9
 
-gUnknown_0850DAE7: ; 850DAE7
+gUnknown_0850DAE7: @ 850DAE7
 	.incbin "base_emerald.gba", 0x50dae7, 0x9
 
-gUnknown_0850DAF0: ; 850DAF0
+gUnknown_0850DAF0: @ 850DAF0
 	.incbin "base_emerald.gba", 0x50daf0, 0x9
 
-gUnknown_0850DAF9: ; 850DAF9
+gUnknown_0850DAF9: @ 850DAF9
 	.incbin "base_emerald.gba", 0x50daf9, 0x9
 
-gUnknown_0850DB02: ; 850DB02
+gUnknown_0850DB02: @ 850DB02
 	.incbin "base_emerald.gba", 0x50db02, 0x9
 
-gUnknown_0850DB0B: ; 850DB0B
+gUnknown_0850DB0B: @ 850DB0B
 	.incbin "base_emerald.gba", 0x50db0b, 0x9
 
-gUnknown_0850DB14: ; 850DB14
+gUnknown_0850DB14: @ 850DB14
 	.incbin "base_emerald.gba", 0x50db14, 0x9
 
-gUnknown_0850DB1D: ; 850DB1D
+gUnknown_0850DB1D: @ 850DB1D
 	.incbin "base_emerald.gba", 0x50db1d, 0x9
 
-gUnknown_0850DB26: ; 850DB26
+gUnknown_0850DB26: @ 850DB26
 	.incbin "base_emerald.gba", 0x50db26, 0x9
 
-gUnknown_0850DB2F: ; 850DB2F
+gUnknown_0850DB2F: @ 850DB2F
 	.incbin "base_emerald.gba", 0x50db2f, 0x9
 
-gUnknown_0850DB38: ; 850DB38
+gUnknown_0850DB38: @ 850DB38
 	.incbin "base_emerald.gba", 0x50db38, 0x9
 
-gUnknown_0850DB41: ; 850DB41
+gUnknown_0850DB41: @ 850DB41
 	.incbin "base_emerald.gba", 0x50db41, 0x9
 
-gUnknown_0850DB4A: ; 850DB4A
+gUnknown_0850DB4A: @ 850DB4A
 	.incbin "base_emerald.gba", 0x50db4a, 0x9
 
-gUnknown_0850DB53: ; 850DB53
+gUnknown_0850DB53: @ 850DB53
 	.incbin "base_emerald.gba", 0x50db53, 0x9
 
-gUnknown_0850DB5C: ; 850DB5C
+gUnknown_0850DB5C: @ 850DB5C
 	.incbin "base_emerald.gba", 0x50db5c, 0x10
 
-gUnknown_0850DB6C: ; 850DB6C
+gUnknown_0850DB6C: @ 850DB6C
 	.incbin "base_emerald.gba", 0x50db6c, 0x10
 
-gUnknown_0850DB7C: ; 850DB7C
+gUnknown_0850DB7C: @ 850DB7C
 	.incbin "base_emerald.gba", 0x50db7c, 0x24
 
-gUnknown_0850DBA0: ; 850DBA0
+gUnknown_0850DBA0: @ 850DBA0
 	.incbin "base_emerald.gba", 0x50dba0, 0x5
 
-gUnknown_0850DBA5: ; 850DBA5
+gUnknown_0850DBA5: @ 850DBA5
 	.incbin "base_emerald.gba", 0x50dba5, 0x5
 
-gUnknown_0850DBAA: ; 850DBAA
+gUnknown_0850DBAA: @ 850DBAA
 	.incbin "base_emerald.gba", 0x50dbaa, 0x5
 
-gUnknown_0850DBAF: ; 850DBAF
+gUnknown_0850DBAF: @ 850DBAF
 	.incbin "base_emerald.gba", 0x50dbaf, 0x5
 
-gUnknown_0850DBB4: ; 850DBB4
+gUnknown_0850DBB4: @ 850DBB4
 	.incbin "base_emerald.gba", 0x50dbb4, 0x5
 
-gUnknown_0850DBB9: ; 850DBB9
+gUnknown_0850DBB9: @ 850DBB9
 	.incbin "base_emerald.gba", 0x50dbb9, 0x5
 
-gUnknown_0850DBBE: ; 850DBBE
+gUnknown_0850DBBE: @ 850DBBE
 	.incbin "base_emerald.gba", 0x50dbbe, 0x5
 
-gUnknown_0850DBC3: ; 850DBC3
+gUnknown_0850DBC3: @ 850DBC3
 	.incbin "base_emerald.gba", 0x50dbc3, 0x5
 
-gUnknown_0850DBC8: ; 850DBC8
+gUnknown_0850DBC8: @ 850DBC8
 	.incbin "base_emerald.gba", 0x50dbc8, 0x5
 
-gUnknown_0850DBCD: ; 850DBCD
+gUnknown_0850DBCD: @ 850DBCD
 	.incbin "base_emerald.gba", 0x50dbcd, 0x5
 
-gUnknown_0850DBD2: ; 850DBD2
+gUnknown_0850DBD2: @ 850DBD2
 	.incbin "base_emerald.gba", 0x50dbd2, 0x5
 
-gUnknown_0850DBD7: ; 850DBD7
+gUnknown_0850DBD7: @ 850DBD7
 	.incbin "base_emerald.gba", 0x50dbd7, 0x5
 
-gUnknown_0850DBDC: ; 850DBDC
+gUnknown_0850DBDC: @ 850DBDC
 	.incbin "base_emerald.gba", 0x50dbdc, 0x5
 
-gUnknown_0850DBE1: ; 850DBE1
+gUnknown_0850DBE1: @ 850DBE1
 	.incbin "base_emerald.gba", 0x50dbe1, 0x5
 
-gUnknown_0850DBE6: ; 850DBE6
+gUnknown_0850DBE6: @ 850DBE6
 	.incbin "base_emerald.gba", 0x50dbe6, 0x5
 
-gUnknown_0850DBEB: ; 850DBEB
+gUnknown_0850DBEB: @ 850DBEB
 	.incbin "base_emerald.gba", 0x50dbeb, 0x5
 
-gUnknown_0850DBF0: ; 850DBF0
+gUnknown_0850DBF0: @ 850DBF0
 	.incbin "base_emerald.gba", 0x50dbf0, 0x5
 
-gUnknown_0850DBF5: ; 850DBF5
+gUnknown_0850DBF5: @ 850DBF5
 	.incbin "base_emerald.gba", 0x50dbf5, 0x5
 
-gUnknown_0850DBFA: ; 850DBFA
+gUnknown_0850DBFA: @ 850DBFA
 	.incbin "base_emerald.gba", 0x50dbfa, 0x5
 
-gUnknown_0850DBFF: ; 850DBFF
+gUnknown_0850DBFF: @ 850DBFF
 	.incbin "base_emerald.gba", 0x50dbff, 0x5
 
-gUnknown_0850DC04: ; 850DC04
+gUnknown_0850DC04: @ 850DC04
 	.incbin "base_emerald.gba", 0x50dc04, 0x5
 
-gUnknown_0850DC09: ; 850DC09
+gUnknown_0850DC09: @ 850DC09
 	.incbin "base_emerald.gba", 0x50dc09, 0x5
 
-gUnknown_0850DC0E: ; 850DC0E
+gUnknown_0850DC0E: @ 850DC0E
 	.incbin "base_emerald.gba", 0x50dc0e, 0x5
 
-gUnknown_0850DC13: ; 850DC13
+gUnknown_0850DC13: @ 850DC13
 	.incbin "base_emerald.gba", 0x50dc13, 0x5
 
-gUnknown_0850DC18: ; 850DC18
+gUnknown_0850DC18: @ 850DC18
 	.incbin "base_emerald.gba", 0x50dc18, 0x5
 
-gUnknown_0850DC1D: ; 850DC1D
+gUnknown_0850DC1D: @ 850DC1D
 	.incbin "base_emerald.gba", 0x50dc1d, 0x5
 
-gUnknown_0850DC22: ; 850DC22
+gUnknown_0850DC22: @ 850DC22
 	.incbin "base_emerald.gba", 0x50dc22, 0x5
 
-gUnknown_0850DC27: ; 850DC27
+gUnknown_0850DC27: @ 850DC27
 	.incbin "base_emerald.gba", 0x50dc27, 0x8
 
-gUnknown_0850DC2F: ; 850DC2F
+gUnknown_0850DC2F: @ 850DC2F
 	.incbin "base_emerald.gba", 0x50dc2f, 0x10
 
-gUnknown_0850DC3F: ; 850DC3F
+gUnknown_0850DC3F: @ 850DC3F
 	.incbin "base_emerald.gba", 0x50dc3f, 0x11
 
-gUnknown_0850DC50: ; 850DC50
+gUnknown_0850DC50: @ 850DC50
 	.incbin "base_emerald.gba", 0x50dc50, 0x298
 
-gUnknown_0850DEE8: ; 850DEE8
+gUnknown_0850DEE8: @ 850DEE8
 	.incbin "base_emerald.gba", 0x50dee8, 0xd4
 
-gUnknown_0850DFBC: ; 850DFBC
+gUnknown_0850DFBC: @ 850DFBC
 	.incbin "base_emerald.gba", 0x50dfbc, 0x6
 
-gUnknown_0850DFC2: ; 850DFC2
+gUnknown_0850DFC2: @ 850DFC2
 	.incbin "base_emerald.gba", 0x50dfc2, 0x61a
 
-gUnknown_0850E5DC: ; 850E5DC
+gUnknown_0850E5DC: @ 850E5DC
 	.incbin "base_emerald.gba", 0x50e5dc, 0x8
 
-gUnknown_0850E5E4: ; 850E5E4
+gUnknown_0850E5E4: @ 850E5E4
 	.incbin "base_emerald.gba", 0x50e5e4, 0x18
 
-gUnknown_0850E5FC: ; 850E5FC
+gUnknown_0850E5FC: @ 850E5FC
 	.incbin "base_emerald.gba", 0x50e5fc, 0x18
 
-gUnknown_0850E614: ; 850E614
+gUnknown_0850E614: @ 850E614
 	.incbin "base_emerald.gba", 0x50e614, 0x10
 
-gUnknown_0850E624: ; 850E624
+gUnknown_0850E624: @ 850E624
 	.incbin "base_emerald.gba", 0x50e624, 0x10
 
-gUnknown_0850E634: ; 850E634
+gUnknown_0850E634: @ 850E634
 	.incbin "base_emerald.gba", 0x50e634, 0x10
 
-gUnknown_0850E644: ; 850E644
+gUnknown_0850E644: @ 850E644
 	.incbin "base_emerald.gba", 0x50e644, 0x10
 
-gUnknown_0850E654: ; 850E654
+gUnknown_0850E654: @ 850E654
 	.incbin "base_emerald.gba", 0x50e654, 0xc
 
-gUnknown_0850E660: ; 850E660
+gUnknown_0850E660: @ 850E660
 	.incbin "base_emerald.gba", 0x50e660, 0x4
 
-gUnknown_0850E664: ; 850E664
+gUnknown_0850E664: @ 850E664
 	.incbin "base_emerald.gba", 0x50e664, 0x10
 
-gUnknown_0850E674: ; 850E674
+gUnknown_0850E674: @ 850E674
 	.incbin "base_emerald.gba", 0x50e674, 0xe0
 
-gUnknown_0850E754: ; 850E754
+gUnknown_0850E754: @ 850E754
 	.incbin "base_emerald.gba", 0x50e754, 0x14
 
-gUnknown_0850E768: ; 850E768
+gUnknown_0850E768: @ 850E768
 	.incbin "base_emerald.gba", 0x50e768, 0xa
 
-gUnknown_0850E772: ; 850E772
+gUnknown_0850E772: @ 850E772
 	.incbin "base_emerald.gba", 0x50e772, 0x48
 
-gUnknown_0850E7BA: ; 850E7BA
+gUnknown_0850E7BA: @ 850E7BA
 	.incbin "base_emerald.gba", 0x50e7ba, 0x7a
 
-gUnknown_0850E834: ; 850E834
+gUnknown_0850E834: @ 850E834
 	.incbin "base_emerald.gba", 0x50e834, 0xc
 
-gUnknown_0850E840: ; 850E840
+gUnknown_0850E840: @ 850E840
 	.incbin "base_emerald.gba", 0x50e840, 0x6
 
-gUnknown_0850E846: ; 850E846
+gUnknown_0850E846: @ 850E846
 	.incbin "base_emerald.gba", 0x50e846, 0x4
 
-gUnknown_0850E84A: ; 850E84A
+gUnknown_0850E84A: @ 850E84A
 	.incbin "base_emerald.gba", 0x50e84a, 0x6
 
-gUnknown_0850E850: ; 850E850
+gUnknown_0850E850: @ 850E850
 	.incbin "base_emerald.gba", 0x50e850, 0x2c
 
-gUnknown_0850E87C: ; 850E87C
+gUnknown_0850E87C: @ 850E87C
 	.incbin "base_emerald.gba", 0x50e87c, 0x1680
 
-gUnknown_0850FEFC: ; 850FEFC
+gUnknown_0850FEFC: @ 850FEFC
 	.incbin "base_emerald.gba", 0x50fefc, 0x280
 
-gUnknown_0851017C: ; 851017C
+gUnknown_0851017C: @ 851017C
 	.incbin "base_emerald.gba", 0x51017c, 0xa0
 
-gUnknown_0851021C: ; 851021C
+gUnknown_0851021C: @ 851021C
 	.incbin "base_emerald.gba", 0x51021c, 0xa0
 
-gUnknown_085102BC: ; 85102BC
+gUnknown_085102BC: @ 85102BC
 	.incbin "base_emerald.gba", 0x5102bc, 0x4
 
-gUnknown_085102C0: ; 85102C0
+gUnknown_085102C0: @ 85102C0
 	.incbin "base_emerald.gba", 0x5102c0, 0x14
 
-gUnknown_085102D4: ; 85102D4
+gUnknown_085102D4: @ 85102D4
 	.incbin "base_emerald.gba", 0x5102d4, 0xc
 
-gUnknown_085102E0: ; 85102E0
+gUnknown_085102E0: @ 85102E0
 	.incbin "base_emerald.gba", 0x5102e0, 0x68
 
-gUnknown_08510348: ; 8510348
+gUnknown_08510348: @ 8510348
 	.incbin "base_emerald.gba", 0x510348, 0x20
 
-gUnknown_08510368: ; 8510368
+gUnknown_08510368: @ 8510368
 	.incbin "base_emerald.gba", 0x510368, 0x20
 
-gUnknown_08510388: ; 8510388
+gUnknown_08510388: @ 8510388
 	.incbin "base_emerald.gba", 0x510388, 0x20
 
-gUnknown_085103A8: ; 85103A8
+gUnknown_085103A8: @ 85103A8
 	.incbin "base_emerald.gba", 0x5103a8, 0x20
 
-gUnknown_085103C8: ; 85103C8
+gUnknown_085103C8: @ 85103C8
 	.incbin "base_emerald.gba", 0x5103c8, 0x34
 
-gUnknown_085103FC: ; 85103FC
+gUnknown_085103FC: @ 85103FC
 	.incbin "base_emerald.gba", 0x5103fc, 0x8
 
-gUnknown_08510404: ; 8510404
+gUnknown_08510404: @ 8510404
 	.incbin "base_emerald.gba", 0x510404, 0x4
 
-gUnknown_08510408: ; 8510408
+gUnknown_08510408: @ 8510408
 	.incbin "base_emerald.gba", 0x510408, 0x14
 
-gUnknown_0851041C: ; 851041C
+gUnknown_0851041C: @ 851041C
 	.incbin "base_emerald.gba", 0x51041c, 0x4
 
-gUnknown_08510420: ; 8510420
+gUnknown_08510420: @ 8510420
 	.incbin "base_emerald.gba", 0x510420, 0xa4
 
-gUnknown_085104C4: ; 85104C4
+gUnknown_085104C4: @ 85104C4
 	.incbin "base_emerald.gba", 0x5104c4, 0x2c
 
-gUnknown_085104F0: ; 85104F0
+gUnknown_085104F0: @ 85104F0
 	.incbin "base_emerald.gba", 0x5104f0, 0x18
 
-gUnknown_08510508: ; 8510508
+gUnknown_08510508: @ 8510508
 	.incbin "base_emerald.gba", 0x510508, 0x8
 
-gUnknown_08510510: ; 8510510
+gUnknown_08510510: @ 8510510
 	.incbin "base_emerald.gba", 0x510510, 0x20
 
-gUnknown_08510530: ; 8510530
+gUnknown_08510530: @ 8510530
 	.incbin "base_emerald.gba", 0x510530, 0x8
 
-gUnknown_08510538: ; 8510538
+gUnknown_08510538: @ 8510538
 	.incbin "base_emerald.gba", 0x510538, 0x8
 
-gUnknown_08510540: ; 8510540
+gUnknown_08510540: @ 8510540
 	.incbin "base_emerald.gba", 0x510540, 0x68
 
-gUnknown_085105A8: ; 85105A8
+gUnknown_085105A8: @ 85105A8
 	.incbin "base_emerald.gba", 0x5105a8, 0x4
 
-gUnknown_085105AC: ; 85105AC
+gUnknown_085105AC: @ 85105AC
 	.incbin "base_emerald.gba", 0x5105ac, 0x10
 
-gUnknown_085105BC: ; 85105BC
+gUnknown_085105BC: @ 85105BC
 	.incbin "base_emerald.gba", 0x5105bc, 0x1a8
 
-gUnknown_08510764: ; 8510764
+gUnknown_08510764: @ 8510764
 	.incbin "base_emerald.gba", 0x510764, 0xb60
 
-gUnknown_085112C4: ; 85112C4
+gUnknown_085112C4: @ 85112C4
 	.incbin "base_emerald.gba", 0x5112c4, 0x908
 
-gUnknown_08511BCC: ; 8511BCC
+gUnknown_08511BCC: @ 8511BCC
 	.incbin "base_emerald.gba", 0x511bcc, 0x9a8
 
-gUnknown_08512574: ; 8512574
+gUnknown_08512574: @ 8512574
 	.incbin "base_emerald.gba", 0x512574, 0x8e0
 
-gUnknown_08512E54: ; 8512E54
+gUnknown_08512E54: @ 8512E54
 	.incbin "base_emerald.gba", 0x512e54, 0x320
 
-gUnknown_08513174: ; 8513174
+gUnknown_08513174: @ 8513174
 	.incbin "base_emerald.gba", 0x513174, 0x510
 
-gUnknown_08513684: ; 8513684
+gUnknown_08513684: @ 8513684
 	.incbin "base_emerald.gba", 0x513684, 0x210
 
-gUnknown_08513894: ; 8513894
+gUnknown_08513894: @ 8513894
 	.incbin "base_emerald.gba", 0x513894, 0xb50
 
-gUnknown_085143E4: ; 85143E4
+gUnknown_085143E4: @ 85143E4
 	.incbin "base_emerald.gba", 0x5143e4, 0x210
 
-gUnknown_085145F4: ; 85145F4
+gUnknown_085145F4: @ 85145F4
 	.incbin "base_emerald.gba", 0x5145f4, 0x810
 
-gUnknown_08514E04: ; 8514E04
+gUnknown_08514E04: @ 8514E04
 	.incbin "base_emerald.gba", 0x514e04, 0x540
 
-gUnknown_08515344: ; 8515344
+gUnknown_08515344: @ 8515344
 	.incbin "base_emerald.gba", 0x515344, 0x20
 
-gUnknown_08515364: ; 8515364
+gUnknown_08515364: @ 8515364
 	.incbin "base_emerald.gba", 0x515364, 0x20
 
-gUnknown_08515384: ; 8515384
+gUnknown_08515384: @ 8515384
 	.incbin "base_emerald.gba", 0x515384, 0x30
 
-gUnknown_085153B4: ; 85153B4
+gUnknown_085153B4: @ 85153B4
 	.incbin "base_emerald.gba", 0x5153b4, 0x30
 
-gUnknown_085153E4: ; 85153E4
+gUnknown_085153E4: @ 85153E4
 	.incbin "base_emerald.gba", 0x5153e4, 0x10
 
-gUnknown_085153F4: ; 85153F4
+gUnknown_085153F4: @ 85153F4
 	.incbin "base_emerald.gba", 0x5153f4, 0x410
 
-gUnknown_08515804: ; 8515804
+gUnknown_08515804: @ 8515804
 	.incbin "base_emerald.gba", 0x515804, 0x20
 
-gUnknown_08515824: ; 8515824
+gUnknown_08515824: @ 8515824
 	.incbin "base_emerald.gba", 0x515824, 0x140
 
-gUnknown_08515964: ; 8515964
+gUnknown_08515964: @ 8515964
 	.incbin "base_emerald.gba", 0x515964, 0x428
 
-gUnknown_08515D8C: ; 8515D8C
+gUnknown_08515D8C: @ 8515D8C
 	.incbin "base_emerald.gba", 0x515d8c, 0x430
 
-gUnknown_085161BC: ; 85161BC
+gUnknown_085161BC: @ 85161BC
 	.incbin "base_emerald.gba", 0x5161bc, 0x20
 
-gUnknown_085161DC: ; 85161DC
+gUnknown_085161DC: @ 85161DC
 	.incbin "base_emerald.gba", 0x5161dc, 0x320
 
-gUnknown_085164FC: ; 85164FC
+gUnknown_085164FC: @ 85164FC
 	.incbin "base_emerald.gba", 0x5164fc, 0x310
 
-gUnknown_0851680C: ; 851680C
+gUnknown_0851680C: @ 851680C
 	.incbin "base_emerald.gba", 0x51680c, 0x310
 
-gUnknown_08516B1C: ; 8516B1C
+gUnknown_08516B1C: @ 8516B1C
 	.incbin "base_emerald.gba", 0x516b1c, 0x210
 
-gUnknown_08516D2C: ; 8516D2C
+gUnknown_08516D2C: @ 8516D2C
 	.incbin "base_emerald.gba", 0x516d2c, 0x110
 
-gUnknown_08516E3C: ; 8516E3C
+gUnknown_08516E3C: @ 8516E3C
 	.incbin "base_emerald.gba", 0x516e3c, 0xc08
 
-gUnknown_08517A44: ; 8517A44
+gUnknown_08517A44: @ 8517A44
 	.incbin "base_emerald.gba", 0x517a44, 0xc
 
-gUnknown_08517A50: ; 8517A50
+gUnknown_08517A50: @ 8517A50
 	.incbin "base_emerald.gba", 0x517a50, 0x1ac
 
-gUnknown_08517BFC: ; 8517BFC
+gUnknown_08517BFC: @ 8517BFC
 	.incbin "base_emerald.gba", 0x517bfc, 0x10
 
-gUnknown_08517C0C: ; 8517C0C
+gUnknown_08517C0C: @ 8517C0C
 	.incbin "base_emerald.gba", 0x517c0c, 0x428
 
-gUnknown_08518034: ; 8518034
+gUnknown_08518034: @ 8518034
 	.incbin "base_emerald.gba", 0x518034, 0x268
 
-gUnknown_0851829C: ; 851829C
+gUnknown_0851829C: @ 851829C
 	.incbin "base_emerald.gba", 0x51829c, 0x8028
 
-gUnknown_085202C4: ; 85202C4
+gUnknown_085202C4: @ 85202C4
 	.incbin "base_emerald.gba", 0x5202c4, 0x45a0
 
-gUnknown_08524864: ; 8524864
+gUnknown_08524864: @ 8524864
 	.incbin "base_emerald.gba", 0x524864, 0xc
 
-gUnknown_08524870: ; 8524870
+gUnknown_08524870: @ 8524870
 	.incbin "base_emerald.gba", 0x524870, 0xc
 
-gUnknown_0852487C: ; 852487C
+gUnknown_0852487C: @ 852487C
 	.incbin "base_emerald.gba", 0x52487c, 0x10
 
-gUnknown_0852488C: ; 852488C
+gUnknown_0852488C: @ 852488C
 	.incbin "base_emerald.gba", 0x52488c, 0x10
 
-gUnknown_0852489C: ; 852489C
+gUnknown_0852489C: @ 852489C
 	.incbin "base_emerald.gba", 0x52489c, 0x20
 
-gUnknown_085248BC: ; 85248BC
+gUnknown_085248BC: @ 85248BC
 	.incbin "base_emerald.gba", 0x5248bc, 0x288
 
-gUnknown_08524B44: ; 8524B44
+gUnknown_08524B44: @ 8524B44
 	.incbin "base_emerald.gba", 0x524b44, 0x1d0
 
-gUnknown_08524D14: ; 8524D14
+gUnknown_08524D14: @ 8524D14
 	.incbin "base_emerald.gba", 0x524d14, 0x270
 
-gUnknown_08524F84: ; 8524F84
+gUnknown_08524F84: @ 8524F84
 	.incbin "base_emerald.gba", 0x524f84, 0x308
 
-gUnknown_0852528C: ; 852528C
+gUnknown_0852528C: @ 852528C
 	.incbin "base_emerald.gba", 0x52528c, 0x120
 
-gUnknown_085253AC: ; 85253AC
+gUnknown_085253AC: @ 85253AC
 	.incbin "base_emerald.gba", 0x5253ac, 0x270
 
-gUnknown_0852561C: ; 852561C
+gUnknown_0852561C: @ 852561C
 	.incbin "base_emerald.gba", 0x52561c, 0x270
 
-gUnknown_0852588C: ; 852588C
+gUnknown_0852588C: @ 852588C
 	.incbin "base_emerald.gba", 0x52588c, 0x308
 
-gUnknown_08525B94: ; 8525B94
+gUnknown_08525B94: @ 8525B94
 	.incbin "base_emerald.gba", 0x525b94, 0x120
 
-gUnknown_08525CB4: ; 8525CB4
+gUnknown_08525CB4: @ 8525CB4
 	.incbin "base_emerald.gba", 0x525cb4, 0xa0
 
-gUnknown_08525D54: ; 8525D54
+gUnknown_08525D54: @ 8525D54
 	.incbin "base_emerald.gba", 0x525d54, 0x144
 
-gUnknown_08525E98: ; 8525E98
+gUnknown_08525E98: @ 8525E98
 	.incbin "base_emerald.gba", 0x525e98, 0xc0
 
-gUnknown_08525F58: ; 8525F58
+gUnknown_08525F58: @ 8525F58
 	.incbin "base_emerald.gba", 0x525f58, 0x20
 
-gUnknown_08525F78: ; 8525F78
+gUnknown_08525F78: @ 8525F78
 	.incbin "base_emerald.gba", 0x525f78, 0x10
 
-gUnknown_08525F88: ; 8525F88
+gUnknown_08525F88: @ 8525F88
 	.incbin "base_emerald.gba", 0x525f88, 0x4
 
-gUnknown_08525F8C: ; 8525F8C
+gUnknown_08525F8C: @ 8525F8C
 	.incbin "base_emerald.gba", 0x525f8c, 0x4
 
-gUnknown_08525F90: ; 8525F90
+gUnknown_08525F90: @ 8525F90
 	.incbin "base_emerald.gba", 0x525f90, 0x30
 
-gUnknown_08525FC0: ; 8525FC0
+gUnknown_08525FC0: @ 8525FC0
 	.incbin "base_emerald.gba", 0x525fc0, 0x18f80
 
-gUnknown_0853EF40: ; 853EF40
+gUnknown_0853EF40: @ 853EF40
 	.incbin "base_emerald.gba", 0x53ef40, 0x8
 
-gUnknown_0853EF48: ; 853EF48
+gUnknown_0853EF48: @ 853EF48
 	.incbin "base_emerald.gba", 0x53ef48, 0x18
 
-gUnknown_0853EF60: ; 853EF60
+gUnknown_0853EF60: @ 853EF60
 	.incbin "base_emerald.gba", 0x53ef60, 0xf8
 
-gTitleScreenRayquazaTiles: ; 853F058
+gTitleScreenRayquazaTiles: @ 853F058
 	.incbin "data/graphics/title_screen/rayquaza.4bpp.lz"
 
 	.align 2, 0
 
-gUnknown_0853F83C: ; 853F83C
+gUnknown_0853F83C: @ 853F83C
 	.incbin "base_emerald.gba", 0x53f83c, 0x450
 
-gTitleScreenCloudsTiles: ; 853FC8C
+gTitleScreenCloudsTiles: @ 853FC8C
 	.incbin "data/graphics/title_screen/clouds.4bpp.lz"
 
 	.align 2, 0
 
-gUnknown_0853FF70: ; 853FF70
+gUnknown_0853FF70: @ 853FF70
 	.incbin "base_emerald.gba", 0x53ff70, 0xa8
 
-gUnknown_08540018: ; 8540018
+gUnknown_08540018: @ 8540018
 	.incbin "base_emerald.gba", 0x540018, 0x18
 
-gUnknown_08540030: ; 8540030
+gUnknown_08540030: @ 8540030
 	.incbin "base_emerald.gba", 0x540030, 0x18
 
-gUnknown_08540048: ; 8540048
+gUnknown_08540048: @ 8540048
 	.incbin "base_emerald.gba", 0x540048, 0x90
 
-gUnknown_085400D8: ; 85400D8
+gUnknown_085400D8: @ 85400D8
 	.incbin "base_emerald.gba", 0x5400d8, 0x18
 
-gUnknown_085400F0: ; 85400F0
+gUnknown_085400F0: @ 85400F0
 	.incbin "base_emerald.gba", 0x5400f0, 0x10
 
-gUnknown_08540100: ; 8540100
+gUnknown_08540100: @ 8540100
 	.incbin "base_emerald.gba", 0x540100, 0x24
 
-gUnknown_08540124: ; 8540124
+gUnknown_08540124: @ 8540124
 	.incbin "base_emerald.gba", 0x540124, 0x18
 
-gUnknown_0854013C: ; 854013C
+gUnknown_0854013C: @ 854013C
 	.incbin "base_emerald.gba", 0x54013c, 0x10
 
-gUnknown_0854014C: ; 854014C
+gUnknown_0854014C: @ 854014C
 	.incbin "base_emerald.gba", 0x54014c, 0xc000
 
-gUnknown_0854C14C: ; 854C14C
+gUnknown_0854C14C: @ 854C14C
 	.incbin "base_emerald.gba", 0x54c14c, 0x4
 
-gUnknown_0854C150: ; 854C150
+gUnknown_0854C150: @ 854C150
 	.incbin "base_emerald.gba", 0x54c150, 0xf0
 
-gUnknown_0854C240: ; 854C240
+gUnknown_0854C240: @ 854C240
 	.incbin "base_emerald.gba", 0x54c240, 0x10
 
-gUnknown_0854C250: ; 854C250
+gUnknown_0854C250: @ 854C250
 	.incbin "base_emerald.gba", 0x54c250, 0x20
 
-gUnknown_0854C270: ; 854C270
+gUnknown_0854C270: @ 854C270
 	.incbin "base_emerald.gba", 0x54c270, 0x20
 
-gUnknown_0854C290: ; 854C290
+gUnknown_0854C290: @ 854C290
 	.incbin "base_emerald.gba", 0x54c290, 0x20
 
-gUnknown_0854C2B0: ; 854C2B0
+gUnknown_0854C2B0: @ 854C2B0
 	.incbin "base_emerald.gba", 0x54c2b0, 0x820
 
-gUnknown_0854CAD0: ; 854CAD0
+gUnknown_0854CAD0: @ 854CAD0
 	.incbin "base_emerald.gba", 0x54cad0, 0x3080
 
-gUnknown_0854FB50: ; 854FB50
+gUnknown_0854FB50: @ 854FB50
 	.incbin "base_emerald.gba", 0x54fb50, 0xc
 
-gUnknown_0854FB5C: ; 854FB5C
+gUnknown_0854FB5C: @ 854FB5C
 	.incbin "base_emerald.gba", 0x54fb5c, 0x1c
 
-gUnknown_0854FB78: ; 854FB78
+gUnknown_0854FB78: @ 854FB78
 	.incbin "base_emerald.gba", 0x54fb78, 0x18
 
-gUnknown_0854FB90: ; 854FB90
+gUnknown_0854FB90: @ 854FB90
 	.incbin "base_emerald.gba", 0x54fb90, 0x9c
 
-gUnknown_0854FC2C: ; 854FC2C
+gUnknown_0854FC2C: @ 854FC2C
 	.incbin "base_emerald.gba", 0x54fc2c, 0x18
 
-gUnknown_0854FC44: ; 854FC44
+gUnknown_0854FC44: @ 854FC44
 	.incbin "base_emerald.gba", 0x54fc44, 0x8
 
-gUnknown_0854FC4C: ; 854FC4C
+gUnknown_0854FC4C: @ 854FC4C
 	.incbin "base_emerald.gba", 0x54fc4c, 0x8
 
-gUnknown_0854FC54: ; 854FC54
+gUnknown_0854FC54: @ 854FC54
 	.incbin "base_emerald.gba", 0x54fc54, 0x38
 
-gUnknown_0854FC8C: ; 854FC8C
+gUnknown_0854FC8C: @ 854FC8C
 	.incbin "base_emerald.gba", 0x54fc8c, 0x8c
 
-gUnknown_0854FD18: ; 854FD18
+gUnknown_0854FD18: @ 854FD18
 	.incbin "base_emerald.gba", 0x54fd18, 0x18
 
-gUnknown_0854FD30: ; 854FD30
+gUnknown_0854FD30: @ 854FD30
 	.incbin "base_emerald.gba", 0x54fd30, 0x8
 
-gUnknown_0854FD38: ; 854FD38
+gUnknown_0854FD38: @ 854FD38
 	.incbin "base_emerald.gba", 0x54fd38, 0x20
 
-gUnknown_0854FD58: ; 854FD58
+gUnknown_0854FD58: @ 854FD58
 	.incbin "base_emerald.gba", 0x54fd58, 0x18
 
-gUnknown_0854FD70: ; 854FD70
+gUnknown_0854FD70: @ 854FD70
 	.incbin "base_emerald.gba", 0x54fd70, 0x1c
 
-gUnknown_0854FD8C: ; 854FD8C
+gUnknown_0854FD8C: @ 854FD8C
 	.incbin "base_emerald.gba", 0x54fd8c, 0x38
 
-gUnknown_0854FDC4: ; 854FDC4
+gUnknown_0854FDC4: @ 854FDC4
 	.incbin "base_emerald.gba", 0x54fdc4, 0x18
 
-gUnknown_0854FDDC: ; 854FDDC
+gUnknown_0854FDDC: @ 854FDDC
 	.incbin "base_emerald.gba", 0x54fddc, 0x8
 
-gUnknown_0854FDE4: ; 854FDE4
+gUnknown_0854FDE4: @ 854FDE4
 	.incbin "base_emerald.gba", 0x54fde4, 0xc
 
-gUnknown_0854FDF0: ; 854FDF0
+gUnknown_0854FDF0: @ 854FDF0
 	.incbin "base_emerald.gba", 0x54fdf0, 0x8
 
-gUnknown_0854FDF8: ; 854FDF8
+gUnknown_0854FDF8: @ 854FDF8
 	.incbin "base_emerald.gba", 0x54fdf8, 0x8
 
-gUnknown_0854FE00: ; 854FE00
+gUnknown_0854FE00: @ 854FE00
 	.incbin "base_emerald.gba", 0x54fe00, 0x44
 
-gUnknown_0854FE44: ; 854FE44
+gUnknown_0854FE44: @ 854FE44
 	.incbin "base_emerald.gba", 0x54fe44, 0x18
 
-gUnknown_0854FE5C: ; 854FE5C
+gUnknown_0854FE5C: @ 854FE5C
 	.incbin "base_emerald.gba", 0x54fe5c, 0x4
 
-gUnknown_0854FE60: ; 854FE60
+gUnknown_0854FE60: @ 854FE60
 	.incbin "base_emerald.gba", 0x54fe60, 0x4
 
-gUnknown_0854FE64: ; 854FE64
+gUnknown_0854FE64: @ 854FE64
 	.incbin "base_emerald.gba", 0x54fe64, 0x14
 
-gUnknown_0854FE78: ; 854FE78
+gUnknown_0854FE78: @ 854FE78
 	.incbin "base_emerald.gba", 0x54fe78, 0x4
 
-gUnknown_0854FE7C: ; 854FE7C
+gUnknown_0854FE7C: @ 854FE7C
 	.incbin "base_emerald.gba", 0x54fe7c, 0xc
 
-gUnknown_0854FE88: ; 854FE88
+gUnknown_0854FE88: @ 854FE88
 	.incbin "base_emerald.gba", 0x54fe88, 0x8
 
-gUnknown_0854FE90: ; 854FE90
+gUnknown_0854FE90: @ 854FE90
 	.incbin "base_emerald.gba", 0x54fe90, 0x8
 
-gUnknown_0854FE98: ; 854FE98
+gUnknown_0854FE98: @ 854FE98
 	.incbin "base_emerald.gba", 0x54fe98, 0xc
 
-gUnknown_0854FEA4: ; 854FEA4
+gUnknown_0854FEA4: @ 854FEA4
 	.incbin "base_emerald.gba", 0x54fea4, 0x3
 
-gUnknown_0854FEA7: ; 854FEA7
+gUnknown_0854FEA7: @ 854FEA7
 	.incbin "base_emerald.gba", 0x54fea7, 0x5
 
-gUnknown_0854FEAC: ; 854FEAC
+gUnknown_0854FEAC: @ 854FEAC
 	.incbin "base_emerald.gba", 0x54feac, 0x48
 
-gUnknown_0854FEF4: ; 854FEF4
+gUnknown_0854FEF4: @ 854FEF4
 	.incbin "base_emerald.gba", 0x54fef4, 0x48
 
-gUnknown_0854FF3C: ; 854FF3C
+gUnknown_0854FF3C: @ 854FF3C
 	.incbin "base_emerald.gba", 0x54ff3c, 0x48
 
-gUnknown_0854FF84: ; 854FF84
+gUnknown_0854FF84: @ 854FF84
 	.incbin "base_emerald.gba", 0x54ff84, 0x48
 
-gUnknown_0854FFCC: ; 854FFCC
+gUnknown_0854FFCC: @ 854FFCC
 	.incbin "base_emerald.gba", 0x54ffcc, 0x48
 
-gUnknown_08550014: ; 8550014
+gUnknown_08550014: @ 8550014
 	.incbin "base_emerald.gba", 0x550014, 0x48
 
-gUnknown_0855005C: ; 855005C
+gUnknown_0855005C: @ 855005C
 	.incbin "base_emerald.gba", 0x55005c, 0x48
 
-gUnknown_085500A4: ; 85500A4
+gUnknown_085500A4: @ 85500A4
 	.incbin "base_emerald.gba", 0x5500a4, 0x4e0
 
-gUnknown_08550584: ; 8550584
+gUnknown_08550584: @ 8550584
 	.incbin "base_emerald.gba", 0x550584, 0x10
 
-gUnknown_08550594: ; 8550594
+gUnknown_08550594: @ 8550594
 	.incbin "base_emerald.gba", 0x550594, 0x8
 
-gUnknown_0855059C: ; 855059C
+gUnknown_0855059C: @ 855059C
 	.incbin "base_emerald.gba", 0x55059c, 0x190
 
-gUnknown_0855072C: ; 855072C
+gUnknown_0855072C: @ 855072C
 	.incbin "base_emerald.gba", 0x55072c, 0x10
 
-gUnknown_0855073C: ; 855073C
+gUnknown_0855073C: @ 855073C
 	.incbin "base_emerald.gba", 0x55073c, 0x30
 
-gUnknown_0855076C: ; 855076C
+gUnknown_0855076C: @ 855076C
 	.incbin "base_emerald.gba", 0x55076c, 0x48
 
-gUnknown_085507B4: ; 85507B4
+gUnknown_085507B4: @ 85507B4
 	.incbin "base_emerald.gba", 0x5507b4, 0x18
 
-gUnknown_085507CC: ; 85507CC
+gUnknown_085507CC: @ 85507CC
 	.incbin "base_emerald.gba", 0x5507cc, 0x18
 
-; 85507E4
+@ 85507E4
 	.include "data/wild_mons.s"
 
 	.incbin "base_emerald.gba", 0x55370c, 0x188
 
-gUnknown_08553894: ; 8553894
+gUnknown_08553894: @ 8553894
 	.incbin "base_emerald.gba", 0x553894, 0x180
 
-gUnknown_08553A14: ; 8553A14
+gUnknown_08553A14: @ 8553A14
 	.incbin "base_emerald.gba", 0x553a14, 0x64
 
-gUnknown_08553A78: ; 8553A78
+gUnknown_08553A78: @ 8553A78
 	.incbin "base_emerald.gba", 0x553a78, 0x4
 
-gUnknown_08553A7C: ; 8553A7C
+gUnknown_08553A7C: @ 8553A7C
 	.incbin "base_emerald.gba", 0x553a7c, 0x14
 
 	.align 2, 0
 
-gNewGameBirchPic: ; 8553A90
+gNewGameBirchPic: @ 8553A90
 	.incbin "data/graphics/new_game/birch.4bpp"
 
 	.incbin "base_emerald.gba", 0x554290, 0x66c0
 
 	.align 2, 0
 
-gNewGameBirchPalette: ; 855A950
+gNewGameBirchPalette: @ 855A950
 	.incbin "data/graphics/new_game/birch.gbapal"
 
 	.align 2, 0
@@ -3437,47 +3437,47 @@ gNewGameBirchPalette: ; 855A950
 
 	.align 2, 0
 
-gFieldEffectObjectPalette4: ; 855A990
+gFieldEffectObjectPalette4: @ 855A990
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_04.gbapal"
 
 	.incbin "base_emerald.gba", 0x55a9b0, 0x480
 
 	.align 2, 0
 
-gFieldEffectObjectPalette5: ; 855AE30
+gFieldEffectObjectPalette5: @ 855AE30
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_05.gbapal"
 
-gUnknown_0855AE50: ; 855AE50
+gUnknown_0855AE50: @ 855AE50
 	.incbin "base_emerald.gba", 0x55ae50, 0x200
 
-gUnknown_0855B050: ; 855B050
+gUnknown_0855B050: @ 855B050
 	.incbin "base_emerald.gba", 0x55b050, 0x20
 
-gUnknown_0855B070: ; 855B070
+gUnknown_0855B070: @ 855B070
 	.incbin "base_emerald.gba", 0x55b070, 0x280
 
-gUnknown_0855B2F0: ; 855B2F0
+gUnknown_0855B2F0: @ 855B2F0
 	.incbin "base_emerald.gba", 0x55b2f0, 0x80
 
-gUnknown_0855B370: ; 855B370
+gUnknown_0855B370: @ 855B370
 	.incbin "base_emerald.gba", 0x55b370, 0x20
 
-gUnknown_0855B390: ; 855B390
+gUnknown_0855B390: @ 855B390
 	.incbin "base_emerald.gba", 0x55b390, 0x280
 
-gUnknown_0855B610: ; 855B610
+gUnknown_0855B610: @ 855B610
 	.incbin "base_emerald.gba", 0x55b610, 0x20
 
-gUnknown_0855B630: ; 855B630
+gUnknown_0855B630: @ 855B630
 	.incbin "base_emerald.gba", 0x55b630, 0xbc0
 
-gUnknown_0855C1F0: ; 855C1F0
+gUnknown_0855C1F0: @ 855C1F0
 	.incbin "base_emerald.gba", 0x55c1f0, 0x20
 
 	.align 2, 0
 
-; TODO: something else uses these too
-gNewGameBirchOamAttributes: ; 855C210
+@ TODO: something else uses these too
+gNewGameBirchOamAttributes: @ 855C210
 	.4byte OAM_SIZE_64x64
 	.2byte 0
 
@@ -3487,30 +3487,30 @@ gNewGameBirchOamAttributes: ; 855C210
 
 	.align 2, 0
 
-gNewGameBirchPicTable: ; 855C228
+gNewGameBirchPicTable: @ 855C228
 	obj_tiles gNewGameBirchPic, 0x800
 
 	.align 2, 0
 
-gNewGameBirchObjectPaletteInfo: ; 855C230
+gNewGameBirchObjectPaletteInfo: @ 855C230
 	obj_pal gNewGameBirchPalette, 0x1006
 
 	.align 2, 0
 
-gNewGameBirchImageAnim: ; 855C238
+gNewGameBirchImageAnim: @ 855C238
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gNewGameBirchImageAnimTable: ; 855C240
+gNewGameBirchImageAnimTable: @ 855C240
 	.4byte gNewGameBirchImageAnim
 
 	.align 2, 0
 
-gNewGameBirchObjectTemplate: ; 855C244
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1006 ; palette tag
+gNewGameBirchObjectTemplate: @ 855C244
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1006 @ palette tag
 	.4byte gNewGameBirchOamAttributes
 	.4byte gNewGameBirchImageAnimTable
 	.4byte gNewGameBirchPicTable
@@ -3519,1056 +3519,1056 @@ gNewGameBirchObjectTemplate: ; 855C244
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo4: ; 855C25C
+gFieldEffectObjectPaletteInfo4: @ 855C25C
 	obj_pal gFieldEffectObjectPalette4, 0x1007
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo5: ; 855C264
+gFieldEffectObjectPaletteInfo5: @ 855C264
 	obj_pal gFieldEffectObjectPalette5, 0x1010
 
 	.incbin "base_emerald.gba", 0x55c26c, 0x40
 
-gUnknown_0855C2AC: ; 855C2AC
+gUnknown_0855C2AC: @ 855C2AC
 	.incbin "base_emerald.gba", 0x55c2ac, 0x18
 
-gUnknown_0855C2C4: ; 855C2C4
+gUnknown_0855C2C4: @ 855C2C4
 	.incbin "base_emerald.gba", 0x55c2c4, 0x40
 
-gUnknown_0855C304: ; 855C304
+gUnknown_0855C304: @ 855C304
 	.incbin "base_emerald.gba", 0x55c304, 0x18
 
-gUnknown_0855C31C: ; 855C31C
+gUnknown_0855C31C: @ 855C31C
 	.incbin "base_emerald.gba", 0x55c31c, 0x18
 
-gUnknown_0855C334: ; 855C334
+gUnknown_0855C334: @ 855C334
 	.incbin "base_emerald.gba", 0x55c334, 0x18
 
-gUnknown_0855C34C: ; 855C34C
+gUnknown_0855C34C: @ 855C34C
 	.incbin "base_emerald.gba", 0x55c34c, 0x18
 
-gUnknown_0855C364: ; 855C364
+gUnknown_0855C364: @ 855C364
 	.incbin "base_emerald.gba", 0x55c364, 0x10
 
-gUnknown_0855C374: ; 855C374
+gUnknown_0855C374: @ 855C374
 	.incbin "base_emerald.gba", 0x55c374, 0x10
 
-gUnknown_0855C384: ; 855C384
+gUnknown_0855C384: @ 855C384
 	.incbin "base_emerald.gba", 0x55c384, 0x20
 
-gUnknown_0855C3A4: ; 855C3A4
+gUnknown_0855C3A4: @ 855C3A4
 	.incbin "base_emerald.gba", 0x55c3a4, 0x18
 
-gUnknown_0855C3BC: ; 855C3BC
+gUnknown_0855C3BC: @ 855C3BC
 	.incbin "base_emerald.gba", 0x55c3bc, 0x4
 
-gUnknown_0855C3C0: ; 855C3C0
+gUnknown_0855C3C0: @ 855C3C0
 	.incbin "base_emerald.gba", 0x55c3c0, 0x4
 
-gUnknown_0855C3C4: ; 855C3C4
+gUnknown_0855C3C4: @ 855C3C4
 	.incbin "base_emerald.gba", 0x55c3c4, 0x4
 
-gUnknown_0855C3C8: ; 855C3C8
+gUnknown_0855C3C8: @ 855C3C8
 	.incbin "base_emerald.gba", 0x55c3c8, 0x1c
 
-gUnknown_0855C3E4: ; 855C3E4
+gUnknown_0855C3E4: @ 855C3E4
 	.incbin "base_emerald.gba", 0x55c3e4, 0x18
 
-gUnknown_0855C3FC: ; 855C3FC
+gUnknown_0855C3FC: @ 855C3FC
 	.incbin "base_emerald.gba", 0x55c3fc, 0x1c
 
-gUnknown_0855C418: ; 855C418
+gUnknown_0855C418: @ 855C418
 	.incbin "base_emerald.gba", 0x55c418, 0x14
 
-gUnknown_0855C42C: ; 855C42C
+gUnknown_0855C42C: @ 855C42C
 	.incbin "base_emerald.gba", 0x55c42c, 0xc
 
-gUnknown_0855C438: ; 855C438
+gUnknown_0855C438: @ 855C438
 	.incbin "base_emerald.gba", 0x55c438, 0x18
 
-gUnknown_0855C450: ; 855C450
+gUnknown_0855C450: @ 855C450
 	.incbin "base_emerald.gba", 0x55c450, 0x10
 
-gUnknown_0855C460: ; 855C460
+gUnknown_0855C460: @ 855C460
 	.incbin "base_emerald.gba", 0x55c460, 0x14
 
-gUnknown_0855C474: ; 855C474
+gUnknown_0855C474: @ 855C474
 	.incbin "base_emerald.gba", 0x55c474, 0x8
 
-gUnknown_0855C47C: ; 855C47C
+gUnknown_0855C47C: @ 855C47C
 	.incbin "base_emerald.gba", 0x55c47c, 0x8
 
-gUnknown_0855C484: ; 855C484
+gUnknown_0855C484: @ 855C484
 	.incbin "base_emerald.gba", 0x55c484, 0x8
 
-gUnknown_0855C48C: ; 855C48C
+gUnknown_0855C48C: @ 855C48C
 	.incbin "base_emerald.gba", 0x55c48c, 0x10
 
-gUnknown_0855C49C: ; 855C49C
+gUnknown_0855C49C: @ 855C49C
 	.incbin "base_emerald.gba", 0x55c49c, 0xc
 
-gUnknown_0855C4A8: ; 855C4A8
+gUnknown_0855C4A8: @ 855C4A8
 	.incbin "base_emerald.gba", 0x55c4a8, 0x1c
 
-gUnknown_0855C4C4: ; 855C4C4
+gUnknown_0855C4C4: @ 855C4C4
 	.incbin "base_emerald.gba", 0x55c4c4, 0x1c
 
-gUnknown_0855C4E0: ; 855C4E0
+gUnknown_0855C4E0: @ 855C4E0
 	.incbin "base_emerald.gba", 0x55c4e0, 0x14
 
-gUnknown_0855C4F4: ; 855C4F4
+gUnknown_0855C4F4: @ 855C4F4
 	.incbin "base_emerald.gba", 0x55c4f4, 0x54
 
-gUnknown_0855C548: ; 855C548
+gUnknown_0855C548: @ 855C548
 	.incbin "base_emerald.gba", 0x55c548, 0x8
 
-gUnknown_0855C550: ; 855C550
+gUnknown_0855C550: @ 855C550
 	.incbin "base_emerald.gba", 0x55c550, 0x1c
 
-gUnknown_0855C56C: ; 855C56C
+gUnknown_0855C56C: @ 855C56C
 	.incbin "base_emerald.gba", 0x55c56c, 0x24
 
-gUnknown_0855C590: ; 855C590
+gUnknown_0855C590: @ 855C590
 	.incbin "base_emerald.gba", 0x55c590, 0x5c
 
-gUnknown_0855C5EC: ; 855C5EC
+gUnknown_0855C5EC: @ 855C5EC
 	.incbin "base_emerald.gba", 0x55c5ec, 0x18
 
-gUnknown_0855C604: ; 855C604
+gUnknown_0855C604: @ 855C604
 	.incbin "base_emerald.gba", 0x55c604, 0x60
 
-gUnknown_0855C664: ; 855C664
+gUnknown_0855C664: @ 855C664
 	.incbin "base_emerald.gba", 0x55c664, 0x1c
 
-gUnknown_0855C680: ; 855C680
+gUnknown_0855C680: @ 855C680
 	.incbin "base_emerald.gba", 0x55c680, 0x18
 
-gUnknown_0855C698: ; 855C698
+gUnknown_0855C698: @ 855C698
 	.incbin "base_emerald.gba", 0x55c698, 0x8
 
-gUnknown_0855C6A0: ; 855C6A0
+gUnknown_0855C6A0: @ 855C6A0
 	.incbin "base_emerald.gba", 0x55c6a0, 0x4
 
-gUnknown_0855C6A4: ; 855C6A4
+gUnknown_0855C6A4: @ 855C6A4
 	.incbin "base_emerald.gba", 0x55c6a4, 0x336
 
-gUnknown_0855C9DA: ; 855C9DA
+gUnknown_0855C9DA: @ 855C9DA
 	.incbin "base_emerald.gba", 0x55c9da, 0x304
 
-gUnknown_0855CCDE: ; 855CCDE
+gUnknown_0855CCDE: @ 855CCDE
 	.incbin "base_emerald.gba", 0x55ccde, 0x4b6
 
-gUnknown_0855D194: ; 855D194
+gUnknown_0855D194: @ 855D194
 	.incbin "base_emerald.gba", 0x55d194, 0x18
 
-gUnknown_0855D1AC: ; 855D1AC
+gUnknown_0855D1AC: @ 855D1AC
 	.incbin "base_emerald.gba", 0x55d1ac, 0x18
 
-gUnknown_0855D1C4: ; 855D1C4
+gUnknown_0855D1C4: @ 855D1C4
 	.incbin "base_emerald.gba", 0x55d1c4, 0x18
 
-gUnknown_0855D1DC: ; 855D1DC
+gUnknown_0855D1DC: @ 855D1DC
 	.incbin "base_emerald.gba", 0x55d1dc, 0x18
 
-gUnknown_0855D1F4: ; 855D1F4
+gUnknown_0855D1F4: @ 855D1F4
 	.incbin "base_emerald.gba", 0x55d1f4, 0x18
 
-gUnknown_0855D20C: ; 855D20C
+gUnknown_0855D20C: @ 855D20C
 	.incbin "base_emerald.gba", 0x55d20c, 0x18
 
-gUnknown_0855D224: ; 855D224
+gUnknown_0855D224: @ 855D224
 	.incbin "base_emerald.gba", 0x55d224, 0x18
 
-gUnknown_0855D23C: ; 855D23C
+gUnknown_0855D23C: @ 855D23C
 	.incbin "base_emerald.gba", 0x55d23c, 0x18
 
-gUnknown_0855D254: ; 855D254
+gUnknown_0855D254: @ 855D254
 	.incbin "base_emerald.gba", 0x55d254, 0x18
 
-gUnknown_0855D26C: ; 855D26C
+gUnknown_0855D26C: @ 855D26C
 	.incbin "base_emerald.gba", 0x55d26c, 0x10
 
-gUnknown_0855D27C: ; 855D27C
+gUnknown_0855D27C: @ 855D27C
 	.incbin "base_emerald.gba", 0x55d27c, 0x10
 
-gUnknown_0855D28C: ; 855D28C
+gUnknown_0855D28C: @ 855D28C
 	.incbin "base_emerald.gba", 0x55d28c, 0x5
 
-gUnknown_0855D291: ; 855D291
+gUnknown_0855D291: @ 855D291
 	.incbin "base_emerald.gba", 0x55d291, 0x7
 
-gUnknown_0855D298: ; 855D298
+gUnknown_0855D298: @ 855D298
 	.incbin "base_emerald.gba", 0x55d298, 0x10
 
-gUnknown_0855D2A8: ; 855D2A8
+gUnknown_0855D2A8: @ 855D2A8
 	.incbin "base_emerald.gba", 0x55d2a8, 0x10
 
-gUnknown_0855D2B8: ; 855D2B8
+gUnknown_0855D2B8: @ 855D2B8
 	.incbin "base_emerald.gba", 0x55d2b8, 0x6
 
-gUnknown_0855D2BE: ; 855D2BE
+gUnknown_0855D2BE: @ 855D2BE
 	.incbin "base_emerald.gba", 0x55d2be, 0x40
 
-gUnknown_0855D2FE: ; 855D2FE
+gUnknown_0855D2FE: @ 855D2FE
 	.incbin "base_emerald.gba", 0x55d2fe, 0xe
 
-gUnknown_0855D30C: ; 855D30C
+gUnknown_0855D30C: @ 855D30C
 	.charmapstr "$"
 
-; 855D30D
+@ 855D30D
 	.include "data/text/pokedex_text.s"
 
-; 856B5B0
+@ 856B5B0
 	.include "data/pokedex_entries.s"
 
-gUnknown_0856E610: ; 856E610
+gUnknown_0856E610: @ 856E610
 	.incbin "base_emerald.gba", 0x56e610, 0x20
 
-gUnknown_0856E630: ; 856E630
+gUnknown_0856E630: @ 856E630
 	.incbin "base_emerald.gba", 0x56e630, 0x10
 
-gUnknown_0856E640: ; 856E640
+gUnknown_0856E640: @ 856E640
 	.incbin "base_emerald.gba", 0x56e640, 0x28
 
-gUnknown_0856E668: ; 856E668
+gUnknown_0856E668: @ 856E668
 	.incbin "base_emerald.gba", 0x56e668, 0x8
 
-gUnknown_0856E670: ; 856E670
+gUnknown_0856E670: @ 856E670
 	.incbin "base_emerald.gba", 0x56e670, 0x18
 
-gUnknown_0856E688: ; 856E688
+gUnknown_0856E688: @ 856E688
 	.incbin "base_emerald.gba", 0x56e688, 0xc
 
-; 856E694
+@ 856E694
 	.include "data/graphics/pokemon/mon_footprint_table.s"
 
-gUnknown_0856ED08: ; 856ED08
+gUnknown_0856ED08: @ 856ED08
 	.incbin "base_emerald.gba", 0x56ed08, 0x28
 
-gUnknown_0856ED30: ; 856ED30
+gUnknown_0856ED30: @ 856ED30
 	.incbin "base_emerald.gba", 0x56ed30, 0x18
 
-gUnknown_0856ED48: ; 856ED48
+gUnknown_0856ED48: @ 856ED48
 	.incbin "base_emerald.gba", 0x56ed48, 0x54
 
-gUnknown_0856ED9C: ; 856ED9C
+gUnknown_0856ED9C: @ 856ED9C
 	.incbin "base_emerald.gba", 0x56ed9c, 0x1c
 
-gUnknown_0856EDB8: ; 856EDB8
+gUnknown_0856EDB8: @ 856EDB8
 	.incbin "base_emerald.gba", 0x56edb8, 0x1c
 
-gUnknown_0856EDD4: ; 856EDD4
+gUnknown_0856EDD4: @ 856EDD4
 	.incbin "base_emerald.gba", 0x56edd4, 0x1c
 
-gUnknown_0856EDF0: ; 856EDF0
+gUnknown_0856EDF0: @ 856EDF0
 	.incbin "base_emerald.gba", 0x56edf0, 0x1c
 
-gUnknown_0856EE0C: ; 856EE0C
+gUnknown_0856EE0C: @ 856EE0C
 	.incbin "base_emerald.gba", 0x56ee0c, 0x18
 
-gUnknown_0856EE24: ; 856EE24
+gUnknown_0856EE24: @ 856EE24
 	.incbin "base_emerald.gba", 0x56ee24, 0x38
 
-gUnknown_0856EE5C: ; 856EE5C
+gUnknown_0856EE5C: @ 856EE5C
 	.incbin "base_emerald.gba", 0x56ee5c, 0x58
 
-gUnknown_0856EEB4: ; 856EEB4
+gUnknown_0856EEB4: @ 856EEB4
 	.incbin "base_emerald.gba", 0x56eeb4, 0x60
 
-gUnknown_0856EF14: ; 856EF14
+gUnknown_0856EF14: @ 856EF14
 	.incbin "base_emerald.gba", 0x56ef14, 0x98
 
-gUnknown_0856EFAC: ; 856EFAC
+gUnknown_0856EFAC: @ 856EFAC
 	.incbin "base_emerald.gba", 0x56efac, 0x2
 
-gUnknown_0856EFAE: ; 856EFAE
+gUnknown_0856EFAE: @ 856EFAE
 	.incbin "base_emerald.gba", 0x56efae, 0x6
 
-gUnknown_0856EFB4: ; 856EFB4
+gUnknown_0856EFB4: @ 856EFB4
 	.incbin "base_emerald.gba", 0x56efb4, 0x14
 
-gUnknown_0856EFC8: ; 856EFC8
+gUnknown_0856EFC8: @ 856EFC8
 	.incbin "base_emerald.gba", 0x56efc8, 0x30
 
-gUnknown_0856EFF8: ; 856EFF8
+gUnknown_0856EFF8: @ 856EFF8
 	.incbin "base_emerald.gba", 0x56eff8, 0x10
 
-gUnknown_0856F008: ; 856F008
+gUnknown_0856F008: @ 856F008
 	.incbin "base_emerald.gba", 0x56f008, 0x10
 
-gUnknown_0856F018: ; 856F018
+gUnknown_0856F018: @ 856F018
 	.incbin "base_emerald.gba", 0x56f018, 0x494
 
-gUnknown_0856F4AC: ; 856F4AC
+gUnknown_0856F4AC: @ 856F4AC
 	.incbin "base_emerald.gba", 0x56f4ac, 0x20
 
-gUnknown_0856F4CC: ; 856F4CC
+gUnknown_0856F4CC: @ 856F4CC
 	.incbin "base_emerald.gba", 0x56f4cc, 0x20
 
-gUnknown_0856F4EC: ; 856F4EC
+gUnknown_0856F4EC: @ 856F4EC
 	.incbin "base_emerald.gba", 0x56f4ec, 0x20
 
-gUnknown_0856F50C: ; 856F50C
+gUnknown_0856F50C: @ 856F50C
 	.incbin "base_emerald.gba", 0x56f50c, 0x20
 
-gUnknown_0856F52C: ; 856F52C
+gUnknown_0856F52C: @ 856F52C
 	.incbin "base_emerald.gba", 0x56f52c, 0x20
 
-gUnknown_0856F54C: ; 856F54C
+gUnknown_0856F54C: @ 856F54C
 	.incbin "base_emerald.gba", 0x56f54c, 0x20
 
-gUnknown_0856F56C: ; 856F56C
+gUnknown_0856F56C: @ 856F56C
 	.incbin "base_emerald.gba", 0x56f56c, 0x20
 
-gUnknown_0856F58C: ; 856F58C
+gUnknown_0856F58C: @ 856F58C
 	.incbin "base_emerald.gba", 0x56f58c, 0x20
 
-gUnknown_0856F5AC: ; 856F5AC
+gUnknown_0856F5AC: @ 856F5AC
 	.incbin "base_emerald.gba", 0x56f5ac, 0x20
 
-gUnknown_0856F5CC: ; 856F5CC
+gUnknown_0856F5CC: @ 856F5CC
 	.incbin "base_emerald.gba", 0x56f5cc, 0x248
 
-gUnknown_0856F814: ; 856F814
+gUnknown_0856F814: @ 856F814
 	.incbin "base_emerald.gba", 0x56f814, 0x2a0
 
-gUnknown_0856FAB4: ; 856FAB4
+gUnknown_0856FAB4: @ 856FAB4
 	.incbin "base_emerald.gba", 0x56fab4, 0x10
 
-gUnknown_0856FAC4: ; 856FAC4
+gUnknown_0856FAC4: @ 856FAC4
 	.incbin "base_emerald.gba", 0x56fac4, 0x20
 
-gUnknown_0856FAE4: ; 856FAE4
+gUnknown_0856FAE4: @ 856FAE4
 	.incbin "base_emerald.gba", 0x56fae4, 0x14
 
-gUnknown_0856FAF8: ; 856FAF8
+gUnknown_0856FAF8: @ 856FAF8
 	.incbin "base_emerald.gba", 0x56faf8, 0x14
 
-gUnknown_0856FB0C: ; 856FB0C
+gUnknown_0856FB0C: @ 856FB0C
 	.incbin "base_emerald.gba", 0x56fb0c, 0x3
 
-gUnknown_0856FB0F: ; 856FB0F
+gUnknown_0856FB0F: @ 856FB0F
 	.incbin "base_emerald.gba", 0x56fb0f, 0x9
 
-gUnknown_0856FB18: ; 856FB18
+gUnknown_0856FB18: @ 856FB18
 	.incbin "base_emerald.gba", 0x56fb18, 0x8
 
-gUnknown_0856FB20: ; 856FB20
+gUnknown_0856FB20: @ 856FB20
 	.incbin "base_emerald.gba", 0x56fb20, 0x8
 
-gUnknown_0856FB28: ; 856FB28
+gUnknown_0856FB28: @ 856FB28
 	.incbin "base_emerald.gba", 0x56fb28, 0x18
 
-gUnknown_0856FB40: ; 856FB40
+gUnknown_0856FB40: @ 856FB40
 	.incbin "base_emerald.gba", 0x56fb40, 0x8
 
-gUnknown_0856FB48: ; 856FB48
+gUnknown_0856FB48: @ 856FB48
 	.incbin "base_emerald.gba", 0x56fb48, 0x2
 
-gUnknown_0856FB4A: ; 856FB4A
+gUnknown_0856FB4A: @ 856FB4A
 	.incbin "base_emerald.gba", 0x56fb4a, 0x2
 
-gUnknown_0856FB4C: ; 856FB4C
+gUnknown_0856FB4C: @ 856FB4C
 	.incbin "base_emerald.gba", 0x56fb4c, 0x9
 
-gUnknown_0856FB55: ; 856FB55
+gUnknown_0856FB55: @ 856FB55
 	.incbin "base_emerald.gba", 0x56fb55, 0x2
 
-gUnknown_0856FB57: ; 856FB57
+gUnknown_0856FB57: @ 856FB57
 	.incbin "base_emerald.gba", 0x56fb57, 0x5
 
-gUnknown_0856FB5C: ; 856FB5C
+gUnknown_0856FB5C: @ 856FB5C
 	.incbin "base_emerald.gba", 0x56fb5c, 0xc
 
-gUnknown_0856FB68: ; 856FB68
+gUnknown_0856FB68: @ 856FB68
 	.incbin "base_emerald.gba", 0x56fb68, 0x6
 
-gUnknown_0856FB6E: ; 856FB6E
+gUnknown_0856FB6E: @ 856FB6E
 	.incbin "base_emerald.gba", 0x56fb6e, 0x6
 
-gUnknown_0856FB74: ; 856FB74
+gUnknown_0856FB74: @ 856FB74
 	.incbin "base_emerald.gba", 0x56fb74, 0x4
 
-gUnknown_0856FB78: ; 856FB78
+gUnknown_0856FB78: @ 856FB78
 	.incbin "base_emerald.gba", 0x56fb78, 0x44
 
-gUnknown_0856FBBC: ; 856FBBC
+gUnknown_0856FBBC: @ 856FBBC
 	.incbin "base_emerald.gba", 0x56fbbc, 0x1244
 
-gUnknown_08570E00: ; 8570E00
+gUnknown_08570E00: @ 8570E00
 	.incbin "base_emerald.gba", 0x570e00, 0x260
 
-gUnknown_08571060: ; 8571060
+gUnknown_08571060: @ 8571060
 	.incbin "base_emerald.gba", 0x571060, 0x260
 
-gUnknown_085712C0: ; 85712C0
+gUnknown_085712C0: @ 85712C0
 	.incbin "base_emerald.gba", 0x5712c0, 0x38
 
-gUnknown_085712F8: ; 85712F8
+gUnknown_085712F8: @ 85712F8
 	.incbin "base_emerald.gba", 0x5712f8, 0xe8
 
-gUnknown_085713E0: ; 85713E0
+gUnknown_085713E0: @ 85713E0
 	.incbin "base_emerald.gba", 0x5713e0, 0x8
 
-gUnknown_085713E8: ; 85713E8
+gUnknown_085713E8: @ 85713E8
 	.incbin "base_emerald.gba", 0x5713e8, 0xc
 
-gUnknown_085713F4: ; 85713F4
+gUnknown_085713F4: @ 85713F4
 	.incbin "base_emerald.gba", 0x5713f4, 0xc
 
-gUnknown_08571400: ; 8571400
+gUnknown_08571400: @ 8571400
 	.incbin "base_emerald.gba", 0x571400, 0x28
 
-gUnknown_08571428: ; 8571428
+gUnknown_08571428: @ 8571428
 	.incbin "base_emerald.gba", 0x571428, 0x20
 
-gUnknown_08571448: ; 8571448
+gUnknown_08571448: @ 8571448
 	.incbin "base_emerald.gba", 0x571448, 0x3
 
-gUnknown_0857144B: ; 857144B
+gUnknown_0857144B: @ 857144B
 	.incbin "base_emerald.gba", 0x57144b, 0x3
 
-gUnknown_0857144E: ; 857144E
+gUnknown_0857144E: @ 857144E
 	.incbin "base_emerald.gba", 0x57144e, 0x6
 
-gUnknown_08571454: ; 8571454
+gUnknown_08571454: @ 8571454
 	.incbin "base_emerald.gba", 0x571454, 0x68
 
-gUnknown_085714BC: ; 85714BC
+gUnknown_085714BC: @ 85714BC
 	.incbin "base_emerald.gba", 0x5714bc, 0x18
 
-gUnknown_085714D4: ; 85714D4
+gUnknown_085714D4: @ 85714D4
 	.incbin "base_emerald.gba", 0x5714d4, 0x10
 
-gUnknown_085714E4: ; 85714E4
+gUnknown_085714E4: @ 85714E4
 	.incbin "base_emerald.gba", 0x5714e4, 0xd0
 
-gUnknown_085715B4: ; 85715B4
+gUnknown_085715B4: @ 85715B4
 	.incbin "base_emerald.gba", 0x5715b4, 0x30
 
-gUnknown_085715E4: ; 85715E4
+gUnknown_085715E4: @ 85715E4
 	.incbin "base_emerald.gba", 0x5715e4, 0x18
 
-gUnknown_085715FC: ; 85715FC
+gUnknown_085715FC: @ 85715FC
 	.incbin "base_emerald.gba", 0x5715fc, 0x18
 
-gUnknown_08571614: ; 8571614
+gUnknown_08571614: @ 8571614
 	.incbin "base_emerald.gba", 0x571614, 0x3c
 
-gUnknown_08571650: ; 8571650
+gUnknown_08571650: @ 8571650
 	.incbin "base_emerald.gba", 0x571650, 0x70
 
-gUnknown_085716C0: ; 85716C0
+gUnknown_085716C0: @ 85716C0
 	.incbin "base_emerald.gba", 0x5716c0, 0x28
 
-gUnknown_085716E8: ; 85716E8
+gUnknown_085716E8: @ 85716E8
 	.incbin "base_emerald.gba", 0x5716e8, 0x28
 
-gUnknown_08571710: ; 8571710
+gUnknown_08571710: @ 8571710
 	.incbin "base_emerald.gba", 0x571710, 0x24
 
-gUnknown_08571734: ; 8571734
+gUnknown_08571734: @ 8571734
 	.incbin "base_emerald.gba", 0x571734, 0x3
 
-gUnknown_08571737: ; 8571737
+gUnknown_08571737: @ 8571737
 	.incbin "base_emerald.gba", 0x571737, 0x5
 
-gUnknown_0857173C: ; 857173C
+gUnknown_0857173C: @ 857173C
 	.incbin "base_emerald.gba", 0x57173c, 0x20
 
-gUnknown_0857175C: ; 857175C
+gUnknown_0857175C: @ 857175C
 	.incbin "base_emerald.gba", 0x57175c, 0x800
 
-gUnknown_08571F5C: ; 8571F5C
+gUnknown_08571F5C: @ 8571F5C
 	.incbin "base_emerald.gba", 0x571f5c, 0x180
 
-gUnknown_085720DC: ; 85720DC
+gUnknown_085720DC: @ 85720DC
 	.incbin "base_emerald.gba", 0x5720dc, 0x98
 
-gUnknown_08572174: ; 8572174
+gUnknown_08572174: @ 8572174
 	.incbin "base_emerald.gba", 0x572174, 0x12c
 
-gUnknown_085722A0: ; 85722A0
+gUnknown_085722A0: @ 85722A0
 	.incbin "base_emerald.gba", 0x5722a0, 0xfc
 
-gUnknown_0857239C: ; 857239C
+gUnknown_0857239C: @ 857239C
 	.incbin "base_emerald.gba", 0x57239c, 0x40
 
-gUnknown_085723DC: ; 85723DC
+gUnknown_085723DC: @ 85723DC
 	.incbin "base_emerald.gba", 0x5723dc, 0x20
 
-gUnknown_085723FC: ; 85723FC
+gUnknown_085723FC: @ 85723FC
 	.incbin "base_emerald.gba", 0x5723fc, 0x20
 
-gUnknown_0857241C: ; 857241C
+gUnknown_0857241C: @ 857241C
 	.incbin "base_emerald.gba", 0x57241c, 0x20
 
-gUnknown_0857243C: ; 857243C
+gUnknown_0857243C: @ 857243C
 	.incbin "base_emerald.gba", 0x57243c, 0x20
 
-gUnknown_0857245C: ; 857245C
+gUnknown_0857245C: @ 857245C
 	.incbin "base_emerald.gba", 0x57245c, 0x48
 
-gUnknown_085724A4: ; 85724A4
+gUnknown_085724A4: @ 85724A4
 	.incbin "base_emerald.gba", 0x5724a4, 0x18
 
-gUnknown_085724BC: ; 85724BC
+gUnknown_085724BC: @ 85724BC
 	.incbin "base_emerald.gba", 0x5724bc, 0x238
 
-gUnknown_085726F4: ; 85726F4
+gUnknown_085726F4: @ 85726F4
 	.incbin "base_emerald.gba", 0x5726f4, 0x20
 
-gUnknown_08572714: ; 8572714
+gUnknown_08572714: @ 8572714
 	.incbin "base_emerald.gba", 0x572714, 0x20
 
-gUnknown_08572734: ; 8572734
+gUnknown_08572734: @ 8572734
 	.incbin "base_emerald.gba", 0x572734, 0x10
 
-gUnknown_08572744: ; 8572744
+gUnknown_08572744: @ 8572744
 	.incbin "base_emerald.gba", 0x572744, 0x8
 
-gUnknown_0857274C: ; 857274C
+gUnknown_0857274C: @ 857274C
 	.incbin "base_emerald.gba", 0x57274c, 0x8
 
-gUnknown_08572754: ; 8572754
+gUnknown_08572754: @ 8572754
 	.incbin "base_emerald.gba", 0x572754, 0x18
 
-gUnknown_0857276C: ; 857276C
+gUnknown_0857276C: @ 857276C
 	.incbin "base_emerald.gba", 0x57276c, 0xf8
 
-gUnknown_08572864: ; 8572864
+gUnknown_08572864: @ 8572864
 	.incbin "base_emerald.gba", 0x572864, 0x58
 
-gUnknown_085728BC: ; 85728BC
+gUnknown_085728BC: @ 85728BC
 	.incbin "base_emerald.gba", 0x5728bc, 0x18
 
-gUnknown_085728D4: ; 85728D4
+gUnknown_085728D4: @ 85728D4
 	.incbin "base_emerald.gba", 0x5728d4, 0x48
 
-gUnknown_0857291C: ; 857291C
+gUnknown_0857291C: @ 857291C
 	.incbin "base_emerald.gba", 0x57291c, 0x4c58
 
-gUnknown_08577574: ; 8577574
+gUnknown_08577574: @ 8577574
 	.incbin "base_emerald.gba", 0x577574, 0x44
 
-gUnknown_085775B8: ; 85775B8
+gUnknown_085775B8: @ 85775B8
 	.incbin "base_emerald.gba", 0x5775b8, 0x398c
 
-gUnknown_0857AF44: ; 857AF44
+gUnknown_0857AF44: @ 857AF44
 	.incbin "base_emerald.gba", 0x57af44, 0xc0
 
-gUnknown_0857B004: ; 857B004
+gUnknown_0857B004: @ 857B004
 	.incbin "base_emerald.gba", 0x57b004, 0x7c
 
-gUnknown_0857B080: ; 857B080
+gUnknown_0857B080: @ 857B080
 	.incbin "base_emerald.gba", 0x57b080, 0x28
 
-gUnknown_0857B0A8: ; 857B0A8
+gUnknown_0857B0A8: @ 857B0A8
 	.incbin "base_emerald.gba", 0x57b0a8, 0x38
 
-gUnknown_0857B0E0: ; 857B0E0
+gUnknown_0857B0E0: @ 857B0E0
 	.incbin "base_emerald.gba", 0x57b0e0, 0x8b8
 
-gUnknown_0857B998: ; 857B998
+gUnknown_0857B998: @ 857B998
 	.incbin "base_emerald.gba", 0x57b998, 0xc
 
-gUnknown_0857B9A4: ; 857B9A4
+gUnknown_0857B9A4: @ 857B9A4
 	.incbin "base_emerald.gba", 0x57b9a4, 0x18
 
-gUnknown_0857B9BC: ; 857B9BC
+gUnknown_0857B9BC: @ 857B9BC
 	.incbin "base_emerald.gba", 0x57b9bc, 0x28
 
-gUnknown_0857B9E4: ; 857B9E4
+gUnknown_0857B9E4: @ 857B9E4
 	.incbin "base_emerald.gba", 0x57b9e4, 0x18
 
-gUnknown_0857B9FC: ; 857B9FC
+gUnknown_0857B9FC: @ 857B9FC
 	.incbin "base_emerald.gba", 0x57b9fc, 0x54
 
-gUnknown_0857BA50: ; 857BA50
+gUnknown_0857BA50: @ 857BA50
 	.incbin "base_emerald.gba", 0x57ba50, 0x18
 
-gUnknown_0857BA68: ; 857BA68
+gUnknown_0857BA68: @ 857BA68
 	.incbin "base_emerald.gba", 0x57ba68, 0x18
 
-gUnknown_0857BA80: ; 857BA80
+gUnknown_0857BA80: @ 857BA80
 	.incbin "base_emerald.gba", 0x57ba80, 0x9c
 
-gUnknown_0857BB1C: ; 857BB1C
+gUnknown_0857BB1C: @ 857BB1C
 	.incbin "base_emerald.gba", 0x57bb1c, 0x8
 
-gUnknown_0857BB24: ; 857BB24
+gUnknown_0857BB24: @ 857BB24
 	.incbin "base_emerald.gba", 0x57bb24, 0x14c
 
-gUnknown_0857BC70: ; 857BC70
+gUnknown_0857BC70: @ 857BC70
 	.incbin "base_emerald.gba", 0x57bc70, 0x18
 
-gUnknown_0857BC88: ; 857BC88
+gUnknown_0857BC88: @ 857BC88
 	.incbin "base_emerald.gba", 0x57bc88, 0x20
 
-; 857BCA8
+@ 857BCA8
 	.include "data/graphics/pokemon/mon_icon_table.s"
 
-; 857C388
+@ 857C388
 	.include "data/graphics/pokemon/mon_icon_palette_indices.s"
 
-; 857C540
+@ 857C540
 	.include "data/graphics/pokemon/mon_icon_palette_table.s"
 
-gUnknown_0857C570: ; 857C570
+gUnknown_0857C570: @ 857C570
 	.incbin "base_emerald.gba", 0x57c570, 0x44
 
-gUnknown_0857C5B4: ; 857C5B4
+gUnknown_0857C5B4: @ 857C5B4
 	.incbin "base_emerald.gba", 0x57c5b4, 0x34
 
-gUnknown_0857C5E8: ; 857C5E8
+gUnknown_0857C5E8: @ 857C5E8
 	.incbin "base_emerald.gba", 0x57c5e8, 0x8
 
-gUnknown_0857C5F0: ; 857C5F0
+gUnknown_0857C5F0: @ 857C5F0
 	.incbin "base_emerald.gba", 0x57c5f0, 0x18
 
-gUnknown_0857C608: ; 857C608
+gUnknown_0857C608: @ 857C608
 	.incbin "base_emerald.gba", 0x57c608, 0x2
 
-gUnknown_0857C60A: ; 857C60A
+gUnknown_0857C60A: @ 857C60A
 	.incbin "base_emerald.gba", 0x57c60a, 0x5a
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo6: ; 857C664
+gFieldEffectObjectPaletteInfo6: @ 857C664
 	obj_pal gFieldEffectObjectPalette6, 0x1000
 
-gUnknown_0857C66C: ; 857C66C
+gUnknown_0857C66C: @ 857C66C
 	.incbin "base_emerald.gba", 0x57c66c, 0x18
 
-gUnknown_0857C684: ; 857C684
+gUnknown_0857C684: @ 857C684
 	.incbin "base_emerald.gba", 0x57c684, 0x1680
 
-gUnknown_0857DD04: ; 857DD04
+gUnknown_0857DD04: @ 857DD04
 	.incbin "base_emerald.gba", 0x57dd04, 0x1680
 
-gUnknown_0857F384: ; 857F384
+gUnknown_0857F384: @ 857F384
 	.incbin "base_emerald.gba", 0x57f384, 0xc0
 
-gUnknown_0857F444: ; 857F444
+gUnknown_0857F444: @ 857F444
 	.incbin "base_emerald.gba", 0x57f444, 0x20
 
-gUnknown_0857F464: ; 857F464
+gUnknown_0857F464: @ 857F464
 	.incbin "base_emerald.gba", 0x57f464, 0xe0
 
-gUnknown_0857F544: ; 857F544
+gUnknown_0857F544: @ 857F544
 	.incbin "base_emerald.gba", 0x57f544, 0x5f0
 
-gUnknown_0857FB34: ; 857FB34
+gUnknown_0857FB34: @ 857FB34
 	.incbin "base_emerald.gba", 0x57fb34, 0x8
 
-gUnknown_0857FB3C: ; 857FB3C
+gUnknown_0857FB3C: @ 857FB3C
 	.incbin "base_emerald.gba", 0x57fb3c, 0x8
 
-gUnknown_0857FB44: ; 857FB44
+gUnknown_0857FB44: @ 857FB44
 	.incbin "base_emerald.gba", 0x57fb44, 0x8
 
-gUnknown_0857FB4C: ; 857FB4C
+gUnknown_0857FB4C: @ 857FB4C
 	.incbin "base_emerald.gba", 0x57fb4c, 0x4c
 
-gUnknown_0857FB98: ; 857FB98
+gUnknown_0857FB98: @ 857FB98
 	.incbin "base_emerald.gba", 0x57fb98, 0x4
 
-gUnknown_0857FB9C: ; 857FB9C
+gUnknown_0857FB9C: @ 857FB9C
 	.incbin "base_emerald.gba", 0x57fb9c, 0x4
 
-gUnknown_0857FBA0: ; 857FBA0
+gUnknown_0857FBA0: @ 857FBA0
 	.incbin "base_emerald.gba", 0x57fba0, 0x8
 
-gUnknown_0857FBA8: ; 857FBA8
+gUnknown_0857FBA8: @ 857FBA8
 	.incbin "base_emerald.gba", 0x57fba8, 0x8
 
-gUnknown_0857FBB0: ; 857FBB0
+gUnknown_0857FBB0: @ 857FBB0
 	.incbin "base_emerald.gba", 0x57fbb0, 0x3c
 
-gUnknown_0857FBEC: ; 857FBEC
+gUnknown_0857FBEC: @ 857FBEC
 	.incbin "base_emerald.gba", 0x57fbec, 0x90
 
-gUnknown_0857FC7C: ; 857FC7C
+gUnknown_0857FC7C: @ 857FC7C
 	.incbin "base_emerald.gba", 0x57fc7c, 0x18
 
-; 857FC94
+@ 857FC94
 	.include "data/graphics/berries/berry_pic_table.s"
 
-gUnknown_0857FDEC: ; 857FDEC
+gUnknown_0857FDEC: @ 857FDEC
 	.incbin "base_emerald.gba", 0x57fdec, 0x8
 
-gUnknown_0857FDF4: ; 857FDF4
+gUnknown_0857FDF4: @ 857FDF4
 	.incbin "base_emerald.gba", 0x57fdf4, 0x1c
 
-gUnknown_0857FE10: ; 857FE10
+gUnknown_0857FE10: @ 857FE10
 	.incbin "base_emerald.gba", 0x57fe10, 0x90
 
-; 857FEA0
+@ 857FEA0
 	.include "data/text/item_descriptions.s"
 
-; 85839A0
+@ 85839A0
 	.include "data/items.s"
 
-gUnknown_08587A6C: ; 8587A6C
+gUnknown_08587A6C: @ 8587A6C
 	.incbin "base_emerald.gba", 0x587a6c, 0x4
 
-gUnknown_08587A70: ; 8587A70
+gUnknown_08587A70: @ 8587A70
 	.incbin "base_emerald.gba", 0x587a70, 0x4
 
-gUnknown_08587A74: ; 8587A74
+gUnknown_08587A74: @ 8587A74
 	.incbin "base_emerald.gba", 0x587a74, 0x5c
 
-gUnknown_08587AD0: ; 8587AD0
+gUnknown_08587AD0: @ 8587AD0
 	.incbin "base_emerald.gba", 0x587ad0, 0x18
 
-gUnknown_08587AE8: ; 8587AE8
+gUnknown_08587AE8: @ 8587AE8
 	.incbin "base_emerald.gba", 0x587ae8, 0x20
 
-gUnknown_08587B08: ; 8587B08
+gUnknown_08587B08: @ 8587B08
 	.incbin "base_emerald.gba", 0x587b08, 0x10
 
-gUnknown_08587B18: ; 8587B18
+gUnknown_08587B18: @ 8587B18
 	.incbin "base_emerald.gba", 0x587b18, 0x68
 
-gUnknown_08587B80: ; 8587B80
+gUnknown_08587B80: @ 8587B80
 	.incbin "base_emerald.gba", 0x587b80, 0x30
 
-gUnknown_08587BB0: ; 8587BB0
+gUnknown_08587BB0: @ 8587BB0
 	.incbin "base_emerald.gba", 0x587bb0, 0x8
 
-gUnknown_08587BB8: ; 8587BB8
+gUnknown_08587BB8: @ 8587BB8
 	.incbin "base_emerald.gba", 0x587bb8, 0x10
 
-gUnknown_08587BC8: ; 8587BC8
+gUnknown_08587BC8: @ 8587BC8
 	.incbin "base_emerald.gba", 0x587bc8, 0x20
 
-gUnknown_08587BE8: ; 8587BE8
+gUnknown_08587BE8: @ 8587BE8
 	.incbin "base_emerald.gba", 0x587be8, 0x18
 
-gUnknown_08587C00: ; 8587C00
+gUnknown_08587C00: @ 8587C00
 	.incbin "base_emerald.gba", 0x587c00, 0x8
 
-gUnknown_08587C08: ; 8587C08
+gUnknown_08587C08: @ 8587C08
 	.incbin "base_emerald.gba", 0x587c08, 0x8
 
-gUnknown_08587C10: ; 8587C10
+gUnknown_08587C10: @ 8587C10
 	.incbin "base_emerald.gba", 0x587c10, 0x8
 
-gUnknown_08587C18: ; 8587C18
+gUnknown_08587C18: @ 8587C18
 	.incbin "base_emerald.gba", 0x587c18, 0x18
 
-gUnknown_08587C30: ; 8587C30
+gUnknown_08587C30: @ 8587C30
 	.incbin "base_emerald.gba", 0x587c30, 0x20
 
-; 8587C50
+@ 8587C50
 	.include "data/text/contest_text_pointers.s"
 
-; 8587D5C
+@ 8587D5C
 	.incbin "base_emerald.gba", 0x587d5c, 0x34
 
-gUnknown_08587D90: ; 8587D90
+gUnknown_08587D90: @ 8587D90
 	.incbin "base_emerald.gba", 0x587d90, 0x80
 
-gUnknown_08587E10: ; 8587E10
+gUnknown_08587E10: @ 8587E10
 	.incbin "base_emerald.gba", 0x587e10, 0xf8
 
-gUnknown_08587F08: ; 8587F08
+gUnknown_08587F08: @ 8587F08
 	.incbin "base_emerald.gba", 0x587f08, 0x14
 
-gUnknown_08587F1C: ; 8587F1C
+gUnknown_08587F1C: @ 8587F1C
 	.incbin "base_emerald.gba", 0x587f1c, 0x18
 
-gUnknown_08587F34: ; 8587F34
+gUnknown_08587F34: @ 8587F34
 	.incbin "base_emerald.gba", 0x587f34, 0x10
 
-gUnknown_08587F44: ; 8587F44
+gUnknown_08587F44: @ 8587F44
 	.incbin "base_emerald.gba", 0x587f44, 0x60
 
-gUnknown_08587FA4: ; 8587FA4
+gUnknown_08587FA4: @ 8587FA4
 	.incbin "base_emerald.gba", 0x587fa4, 0x100
 
-gUnknown_085880A4: ; 85880A4
+gUnknown_085880A4: @ 85880A4
 	.incbin "base_emerald.gba", 0x5880a4, 0x1740
 
-gUnknown_085897E4: ; 85897E4
+gUnknown_085897E4: @ 85897E4
 	.incbin "base_emerald.gba", 0x5897e4, 0xc0
 
-gUnknown_085898A4: ; 85898A4
+gUnknown_085898A4: @ 85898A4
 	.incbin "base_emerald.gba", 0x5898a4, 0x60
 
-gUnknown_08589904: ; 8589904
+gUnknown_08589904: @ 8589904
 	.incbin "base_emerald.gba", 0x589904, 0x20
 
-gUnknown_08589924: ; 8589924
+gUnknown_08589924: @ 8589924
 	.incbin "base_emerald.gba", 0x589924, 0x68
 
-gUnknown_0858998C: ; 858998C
+gUnknown_0858998C: @ 858998C
 	.incbin "base_emerald.gba", 0x58998c, 0x60
 
-gUnknown_085899EC: ; 85899EC
+gUnknown_085899EC: @ 85899EC
 	.incbin "base_emerald.gba", 0x5899ec, 0x1c
 
-gUnknown_08589A08: ; 8589A08
+gUnknown_08589A08: @ 8589A08
 	.incbin "base_emerald.gba", 0x589a08, 0x8
 
-gUnknown_08589A10: ; 8589A10
+gUnknown_08589A10: @ 8589A10
 	.incbin "base_emerald.gba", 0x589a10, 0x18
 
-gUnknown_08589A28: ; 8589A28
+gUnknown_08589A28: @ 8589A28
 	.incbin "base_emerald.gba", 0x589a28, 0x10
 
-gUnknown_08589A38: ; 8589A38
+gUnknown_08589A38: @ 8589A38
 	.incbin "base_emerald.gba", 0x589a38, 0x10
 
-gUnknown_08589A48: ; 8589A48
+gUnknown_08589A48: @ 8589A48
 	.incbin "base_emerald.gba", 0x589a48, 0x18
 
-gUnknown_08589A60: ; 8589A60
+gUnknown_08589A60: @ 8589A60
 	.incbin "base_emerald.gba", 0x589a60, 0x10
 
-gUnknown_08589A70: ; 8589A70
+gUnknown_08589A70: @ 8589A70
 	.incbin "base_emerald.gba", 0x589a70, 0x38
 
-gUnknown_08589AA8: ; 8589AA8
+gUnknown_08589AA8: @ 8589AA8
 	.incbin "base_emerald.gba", 0x589aa8, 0x8
 
-gUnknown_08589AB0: ; 8589AB0
+gUnknown_08589AB0: @ 8589AB0
 	.incbin "base_emerald.gba", 0x589ab0, 0x3
 
-gUnknown_08589AB3: ; 8589AB3
+gUnknown_08589AB3: @ 8589AB3
 	.incbin "base_emerald.gba", 0x589ab3, 0x7
 
-gUnknown_08589ABA: ; 8589ABA
+gUnknown_08589ABA: @ 8589ABA
 	.incbin "base_emerald.gba", 0x589aba, 0x6
 
-gUnknown_08589AC0: ; 8589AC0
+gUnknown_08589AC0: @ 8589AC0
 	.incbin "base_emerald.gba", 0x589ac0, 0x6
 
-gUnknown_08589AC6: ; 8589AC6
+gUnknown_08589AC6: @ 8589AC6
 	.incbin "base_emerald.gba", 0x589ac6, 0x6
 
-gUnknown_08589ACC: ; 8589ACC
+gUnknown_08589ACC: @ 8589ACC
 	.incbin "base_emerald.gba", 0x589acc, 0x6
 
-gUnknown_08589AD2: ; 8589AD2
+gUnknown_08589AD2: @ 8589AD2
 	.incbin "base_emerald.gba", 0x589ad2, 0x6
 
-gUnknown_08589AD8: ; 8589AD8
+gUnknown_08589AD8: @ 8589AD8
 	.incbin "base_emerald.gba", 0x589ad8, 0x6
 
-gUnknown_08589ADE: ; 8589ADE
+gUnknown_08589ADE: @ 8589ADE
 	.incbin "base_emerald.gba", 0x589ade, 0x6
 
-; 8589AE4
+@ 8589AE4
 	.include "data/text/berry_descriptions.s"
 
-; 858A670
+@ 858A670
 	.include "data/berries.s"
 
-gUnknown_0858AB24: ; 858AB24
+gUnknown_0858AB24: @ 858AB24
 	.incbin "base_emerald.gba", 0x58ab24, 0xac
 
-gUnknown_0858ABD0: ; 858ABD0
+gUnknown_0858ABD0: @ 858ABD0
 	.incbin "base_emerald.gba", 0x58abd0, 0xb90
 
-gUnknown_0858B760: ; 858B760
+gUnknown_0858B760: @ 858B760
 	.incbin "base_emerald.gba", 0x58b760, 0x390
 
-gUnknown_0858BAF0: ; 858BAF0
+gUnknown_0858BAF0: @ 858BAF0
 	.incbin "base_emerald.gba", 0x58baf0, 0x78
 
-gUnknown_0858BB68: ; 858BB68
+gUnknown_0858BB68: @ 858BB68
 	.incbin "base_emerald.gba", 0x58bb68, 0x8
 
-gUnknown_0858BB70: ; 858BB70
+gUnknown_0858BB70: @ 858BB70
 	.incbin "base_emerald.gba", 0x58bb70, 0x10
 
-gUnknown_0858BB80: ; 858BB80
+gUnknown_0858BB80: @ 858BB80
 	.incbin "base_emerald.gba", 0x58bb80, 0x1c
 
-gUnknown_0858BB9C: ; 858BB9C
+gUnknown_0858BB9C: @ 858BB9C
 	.incbin "base_emerald.gba", 0x58bb9c, 0x10
 
-gUnknown_0858BBAC: ; 858BBAC
+gUnknown_0858BBAC: @ 858BBAC
 	.incbin "base_emerald.gba", 0x58bbac, 0x10
 
-gUnknown_0858BBBC: ; 858BBBC
+gUnknown_0858BBBC: @ 858BBBC
 	.incbin "base_emerald.gba", 0x58bbbc, 0x10
 
-gUnknown_0858BBCC: ; 858BBCC
+gUnknown_0858BBCC: @ 858BBCC
 	.incbin "base_emerald.gba", 0x58bbcc, 0x14
 
-gUnknown_0858BBE0: ; 858BBE0
+gUnknown_0858BBE0: @ 858BBE0
 	.incbin "base_emerald.gba", 0x58bbe0, 0xc
 
-gUnknown_0858BBEC: ; 858BBEC
+gUnknown_0858BBEC: @ 858BBEC
 	.incbin "base_emerald.gba", 0x58bbec, 0x18c
 
-gUnknown_0858BD78: ; 858BD78
+gUnknown_0858BD78: @ 858BD78
 	.incbin "base_emerald.gba", 0x58bd78, 0x40
 
-gUnknown_0858BDB8: ; 858BDB8
+gUnknown_0858BDB8: @ 858BDB8
 	.incbin "base_emerald.gba", 0x58bdb8, 0x10
 
-gUnknown_0858BDC8: ; 858BDC8
+gUnknown_0858BDC8: @ 858BDC8
 	.incbin "base_emerald.gba", 0x58bdc8, 0x38
 
-gUnknown_0858BE00: ; 858BE00
+gUnknown_0858BE00: @ 858BE00
 	.incbin "base_emerald.gba", 0x58be00, 0x10
 
-gUnknown_0858BE10: ; 858BE10
+gUnknown_0858BE10: @ 858BE10
 	.incbin "base_emerald.gba", 0x58be10, 0x30
 
-gUnknown_0858BE40: ; 858BE40
+gUnknown_0858BE40: @ 858BE40
 	.incbin "base_emerald.gba", 0x58be40, 0x60
 
-gUnknown_0858BEA0: ; 858BEA0
+gUnknown_0858BEA0: @ 858BEA0
 	.incbin "base_emerald.gba", 0x58bea0, 0x3
 
-gUnknown_0858BEA3: ; 858BEA3
+gUnknown_0858BEA3: @ 858BEA3
 	.incbin "base_emerald.gba", 0x58bea3, 0x18
 
-gUnknown_0858BEBB: ; 858BEBB
+gUnknown_0858BEBB: @ 858BEBB
 	.incbin "base_emerald.gba", 0x58bebb, 0x3
 
-gUnknown_0858BEBE: ; 858BEBE
+gUnknown_0858BEBE: @ 858BEBE
 	.incbin "base_emerald.gba", 0x58bebe, 0x3
 
-gUnknown_0858BEC1: ; 858BEC1
+gUnknown_0858BEC1: @ 858BEC1
 	.incbin "base_emerald.gba", 0x58bec1, 0x3
 
-gUnknown_0858BEC4: ; 858BEC4
+gUnknown_0858BEC4: @ 858BEC4
 	.incbin "base_emerald.gba", 0x58bec4, 0x10
 
-gUnknown_0858BED4: ; 858BED4
+gUnknown_0858BED4: @ 858BED4
 	.incbin "base_emerald.gba", 0x58bed4, 0x8
 
-gUnknown_0858BEDC: ; 858BEDC
+gUnknown_0858BEDC: @ 858BEDC
 	.incbin "base_emerald.gba", 0x58bedc, 0x8
 
-gUnknown_0858BEE4: ; 858BEE4
+gUnknown_0858BEE4: @ 858BEE4
 	.incbin "base_emerald.gba", 0x58bee4, 0x4
 
-gUnknown_0858BEE8: ; 858BEE8
+gUnknown_0858BEE8: @ 858BEE8
 	.incbin "base_emerald.gba", 0x58bee8, 0x10
 
-gUnknown_0858BEF8: ; 858BEF8
+gUnknown_0858BEF8: @ 858BEF8
 	.incbin "base_emerald.gba", 0x58bef8, 0x6
 
-gUnknown_0858BEFE: ; 858BEFE
+gUnknown_0858BEFE: @ 858BEFE
 	.incbin "base_emerald.gba", 0x58befe, 0x6
 
-gUnknown_0858BF04: ; 858BF04
+gUnknown_0858BF04: @ 858BF04
 	.incbin "base_emerald.gba", 0x58bf04, 0x14
 
-gUnknown_0858BF18: ; 858BF18
+gUnknown_0858BF18: @ 858BF18
 	.incbin "base_emerald.gba", 0x58bf18, 0x10
 
-gUnknown_0858BF28: ; 858BF28
+gUnknown_0858BF28: @ 858BF28
 	.incbin "base_emerald.gba", 0x58bf28, 0xc
 
-gUnknown_0858BF34: ; 858BF34
+gUnknown_0858BF34: @ 858BF34
 	.incbin "base_emerald.gba", 0x58bf34, 0xa
 
-gUnknown_0858BF3E: ; 858BF3E
+gUnknown_0858BF3E: @ 858BF3E
 	.incbin "base_emerald.gba", 0x58bf3e, 0xa
 
-gUnknown_0858BF48: ; 858BF48
+gUnknown_0858BF48: @ 858BF48
 	.incbin "base_emerald.gba", 0x58bf48, 0x8
 
-gUnknown_0858BF50: ; 858BF50
+gUnknown_0858BF50: @ 858BF50
 	.incbin "base_emerald.gba", 0x58bf50, 0x8
 
-gUnknown_0858BF58: ; 858BF58
+gUnknown_0858BF58: @ 858BF58
 	.incbin "base_emerald.gba", 0x58bf58, 0x14
 
-gUnknown_0858BF6C: ; 858BF6C
+gUnknown_0858BF6C: @ 858BF6C
 	.incbin "base_emerald.gba", 0x58bf6c, 0x8
 
-gUnknown_0858BF74: ; 858BF74
+gUnknown_0858BF74: @ 858BF74
 	.incbin "base_emerald.gba", 0x58bf74, 0x14
 
-gUnknown_0858BF88: ; 858BF88
+gUnknown_0858BF88: @ 858BF88
 	.incbin "base_emerald.gba", 0x58bf88, 0x4
 
-gUnknown_0858BF8C: ; 858BF8C
+gUnknown_0858BF8C: @ 858BF8C
 	.incbin "base_emerald.gba", 0x58bf8c, 0xc
 
-gUnknown_0858BF98: ; 858BF98
+gUnknown_0858BF98: @ 858BF98
 	.incbin "base_emerald.gba", 0x58bf98, 0xc
 
-gUnknown_0858BFA4: ; 858BFA4
+gUnknown_0858BFA4: @ 858BFA4
 	.incbin "base_emerald.gba", 0x58bfa4, 0x34
 
-gUnknown_0858BFD8: ; 858BFD8
+gUnknown_0858BFD8: @ 858BFD8
 	.incbin "base_emerald.gba", 0x58bfd8, 0x78
 
-gUnknown_0858C050: ; 858C050
+gUnknown_0858C050: @ 858C050
 	.incbin "base_emerald.gba", 0x58c050, 0x8
 
-gUnknown_0858C058: ; 858C058
+gUnknown_0858C058: @ 858C058
 	.incbin "base_emerald.gba", 0x58c058, 0x18
 
-gUnknown_0858C070: ; 858C070
+gUnknown_0858C070: @ 858C070
 	.incbin "base_emerald.gba", 0x58c070, 0x8
 
-gUnknown_0858C078: ; 858C078
+gUnknown_0858C078: @ 858C078
 	.incbin "base_emerald.gba", 0x58c078, 0x48
 
-gUnknown_0858C0C0: ; 858C0C0
+gUnknown_0858C0C0: @ 858C0C0
 	.incbin "base_emerald.gba", 0x58c0c0, 0x18
 
-gUnknown_0858C0D8: ; 858C0D8
+gUnknown_0858C0D8: @ 858C0D8
 	.incbin "base_emerald.gba", 0x58c0d8, 0x18
 
-gUnknown_0858C0F0: ; 858C0F0
+gUnknown_0858C0F0: @ 858C0F0
 	.incbin "base_emerald.gba", 0x58c0f0, 0x18
 
-gUnknown_0858C108: ; 858C108
+gUnknown_0858C108: @ 858C108
 	.incbin "base_emerald.gba", 0x58c108, 0x18
 
-gUnknown_0858C120: ; 858C120
+gUnknown_0858C120: @ 858C120
 	.incbin "base_emerald.gba", 0x58c120, 0x18
 
-gUnknown_0858C138: ; 858C138
+gUnknown_0858C138: @ 858C138
 	.incbin "base_emerald.gba", 0x58c138, 0x18
 
-gUnknown_0858C150: ; 858C150
+gUnknown_0858C150: @ 858C150
 	.incbin "base_emerald.gba", 0x58c150, 0x18
 
-gUnknown_0858C168: ; 858C168
+gUnknown_0858C168: @ 858C168
 	.incbin "base_emerald.gba", 0x58c168, 0x18
 
-gUnknown_0858C180: ; 858C180
+gUnknown_0858C180: @ 858C180
 	.incbin "base_emerald.gba", 0x58c180, 0x18
 
-gUnknown_0858C198: ; 858C198
+gUnknown_0858C198: @ 858C198
 	.incbin "base_emerald.gba", 0x58c198, 0x30
 
-gUnknown_0858C1C8: ; 858C1C8
+gUnknown_0858C1C8: @ 858C1C8
 	.incbin "base_emerald.gba", 0x58c1c8, 0x68
 
-gUnknown_0858C230: ; 858C230
+gUnknown_0858C230: @ 858C230
 	.incbin "base_emerald.gba", 0x58c230, 0x5c
 
-gUnknown_0858C28C: ; 858C28C
+gUnknown_0858C28C: @ 858C28C
 	.incbin "base_emerald.gba", 0x58c28c, 0x18
 
-gUnknown_0858C2A4: ; 858C2A4
+gUnknown_0858C2A4: @ 858C2A4
 	.incbin "base_emerald.gba", 0x58c2a4, 0x8
 
-gUnknown_0858C2AC: ; 858C2AC
+gUnknown_0858C2AC: @ 858C2AC
 	.incbin "base_emerald.gba", 0x58c2ac, 0x8
 
-; 858C2B4
+@ 858C2B4
 	.include "data/contest_moves.s"
 
-; 858CDCC
+@ 858CDCC
 	.include "data/contest_effects.s"
 
-; A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
-; which means "not a combo starter move".
-gComboStarterLookupTable: ; 858CE8C
+@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
+@ which means "not a combo starter move".
+gComboStarterLookupTable: @ 858CE8C
 	.byte 0
 	.rept 62
 	.byte 1
@@ -4576,8741 +4576,8741 @@ gComboStarterLookupTable: ; 858CE8C
 
 	.align 2, 0
 
-; 858CECC
+@ 858CECC
 	.include "data/contest_effect_function_table.s"
 
-gUnknown_0858CF8C: ; 858CF8C
+gUnknown_0858CF8C: @ 858CF8C
 	.incbin "base_emerald.gba", 0x58cf8c, 0x2
 
-gUnknown_0858CF8E: ; 858CF8E
+gUnknown_0858CF8E: @ 858CF8E
 	.incbin "base_emerald.gba", 0x58cf8e, 0x6
 
-gUnknown_0858CF94: ; 858CF94
+gUnknown_0858CF94: @ 858CF94
 	.incbin "base_emerald.gba", 0x58cf94, 0x24
 
-gUnknown_0858CFB8: ; 858CFB8
+gUnknown_0858CFB8: @ 858CFB8
 	.incbin "base_emerald.gba", 0x58cfb8, 0x6
 
-gUnknown_0858CFBE: ; 858CFBE
+gUnknown_0858CFBE: @ 858CFBE
 	.incbin "base_emerald.gba", 0x58cfbe, 0xe
 
-gUnknown_0858CFCC: ; 858CFCC
+gUnknown_0858CFCC: @ 858CFCC
 	.incbin "base_emerald.gba", 0x58cfcc, 0x1c
 
-gUnknown_0858CFE8: ; 858CFE8
+gUnknown_0858CFE8: @ 858CFE8
 	.incbin "base_emerald.gba", 0x58cfe8, 0x60
 
-gUnknown_0858D048: ; 858D048
+gUnknown_0858D048: @ 858D048
 	.incbin "base_emerald.gba", 0x58d048, 0x10
 
-gUnknown_0858D058: ; 858D058
+gUnknown_0858D058: @ 858D058
 	.incbin "base_emerald.gba", 0x58d058, 0x8
 
-gUnknown_0858D060: ; 858D060
+gUnknown_0858D060: @ 858D060
 	.incbin "base_emerald.gba", 0x58d060, 0xc
 
-gUnknown_0858D06C: ; 858D06C
+gUnknown_0858D06C: @ 858D06C
 	.incbin "base_emerald.gba", 0x58d06c, 0x10
 
-gUnknown_0858D07C: ; 858D07C
+gUnknown_0858D07C: @ 858D07C
 	.incbin "base_emerald.gba", 0x58d07c, 0x18
 
-gUnknown_0858D094: ; 858D094
+gUnknown_0858D094: @ 858D094
 	.incbin "base_emerald.gba", 0x58d094, 0x3c
 
-gUnknown_0858D0D0: ; 858D0D0
+gUnknown_0858D0D0: @ 858D0D0
 	.incbin "base_emerald.gba", 0x58d0d0, 0xe
 
-gUnknown_0858D0DE: ; 858D0DE
+gUnknown_0858D0DE: @ 858D0DE
 	.incbin "base_emerald.gba", 0x58d0de, 0xe
 
-gUnknown_0858D0EC: ; 858D0EC
+gUnknown_0858D0EC: @ 858D0EC
 	.incbin "base_emerald.gba", 0x58d0ec, 0x1c
 
-gUnknown_0858D108: ; 858D108
+gUnknown_0858D108: @ 858D108
 	.incbin "base_emerald.gba", 0x58d108, 0x14
 
-gUnknown_0858D11C: ; 858D11C
+gUnknown_0858D11C: @ 858D11C
 	.incbin "base_emerald.gba", 0x58d11c, 0x14
 
-gUnknown_0858D130: ; 858D130
+gUnknown_0858D130: @ 858D130
 	.incbin "base_emerald.gba", 0x58d130, 0x14
 
-gUnknown_0858D144: ; 858D144
+gUnknown_0858D144: @ 858D144
 	.incbin "base_emerald.gba", 0x58d144, 0xc
 
-gUnknown_0858D150: ; 858D150
+gUnknown_0858D150: @ 858D150
 	.incbin "base_emerald.gba", 0x58d150, 0x20
 
-gUnknown_0858D170: ; 858D170
+gUnknown_0858D170: @ 858D170
 	.incbin "base_emerald.gba", 0x58d170, 0x18
 
-gUnknown_0858D188: ; 858D188
+gUnknown_0858D188: @ 858D188
 	.incbin "base_emerald.gba", 0x58d188, 0x14
 
-gUnknown_0858D19C: ; 858D19C
+gUnknown_0858D19C: @ 858D19C
 	.incbin "base_emerald.gba", 0x58d19c, 0x4
 
-gUnknown_0858D1A0: ; 858D1A0
+gUnknown_0858D1A0: @ 858D1A0
 	.incbin "base_emerald.gba", 0x58d1a0, 0x30
 
-gUnknown_0858D1D0: ; 858D1D0
+gUnknown_0858D1D0: @ 858D1D0
 	.incbin "base_emerald.gba", 0x58d1d0, 0x34
 
-gUnknown_0858D204: ; 858D204
+gUnknown_0858D204: @ 858D204
 	.incbin "base_emerald.gba", 0x58d204, 0x24
 
-gUnknown_0858D228: ; 858D228
+gUnknown_0858D228: @ 858D228
 	.incbin "base_emerald.gba", 0x58d228, 0x18
 
-gUnknown_0858D240: ; 858D240
+gUnknown_0858D240: @ 858D240
 	.incbin "base_emerald.gba", 0x58d240, 0x3c
 
-gUnknown_0858D27C: ; 858D27C
+gUnknown_0858D27C: @ 858D27C
 	.incbin "base_emerald.gba", 0x58d27c, 0x84
 
-gUnknown_0858D300: ; 858D300
+gUnknown_0858D300: @ 858D300
 	.incbin "base_emerald.gba", 0x58d300, 0x20
 
-gUnknown_0858D320: ; 858D320
+gUnknown_0858D320: @ 858D320
 	.incbin "base_emerald.gba", 0x58d320, 0x18
 
-gUnknown_0858D338: ; 858D338
+gUnknown_0858D338: @ 858D338
 	.incbin "base_emerald.gba", 0x58d338, 0x4c
 
-gUnknown_0858D384: ; 858D384
+gUnknown_0858D384: @ 858D384
 	.incbin "base_emerald.gba", 0x58d384, 0x10
 
-gUnknown_0858D394: ; 858D394
+gUnknown_0858D394: @ 858D394
 	.incbin "base_emerald.gba", 0x58d394, 0x1c
 
-gUnknown_0858D3B0: ; 858D3B0
+gUnknown_0858D3B0: @ 858D3B0
 	.incbin "base_emerald.gba", 0x58d3b0, 0x8
 
-gUnknown_0858D3B8: ; 858D3B8
+gUnknown_0858D3B8: @ 858D3B8
 	.incbin "base_emerald.gba", 0x58d3b8, 0xc
 
-gUnknown_0858D3C4: ; 858D3C4
+gUnknown_0858D3C4: @ 858D3C4
 	.incbin "base_emerald.gba", 0x58d3c4, 0x2c
 
-gUnknown_0858D3F0: ; 858D3F0
+gUnknown_0858D3F0: @ 858D3F0
 	.incbin "base_emerald.gba", 0x58d3f0, 0x1c
 
-gUnknown_0858D40C: ; 858D40C
+gUnknown_0858D40C: @ 858D40C
 	.incbin "base_emerald.gba", 0x58d40c, 0xc
 
-gUnknown_0858D418: ; 858D418
+gUnknown_0858D418: @ 858D418
 	.incbin "base_emerald.gba", 0x58d418, 0x10
 
-gUnknown_0858D428: ; 858D428
+gUnknown_0858D428: @ 858D428
 	.incbin "base_emerald.gba", 0x58d428, 0x34
 
-gUnknown_0858D45C: ; 858D45C
+gUnknown_0858D45C: @ 858D45C
 	.incbin "base_emerald.gba", 0x58d45c, 0x38
 
-gUnknown_0858D494: ; 858D494
+gUnknown_0858D494: @ 858D494
 	.incbin "base_emerald.gba", 0x58d494, 0x4
 
-gUnknown_0858D498: ; 858D498
+gUnknown_0858D498: @ 858D498
 	.incbin "base_emerald.gba", 0x58d498, 0x1c
 
-gUnknown_0858D4B4: ; 858D4B4
+gUnknown_0858D4B4: @ 858D4B4
 	.incbin "base_emerald.gba", 0x58d4b4, 0x30
 
-gUnknown_0858D4E4: ; 858D4E4
+gUnknown_0858D4E4: @ 858D4E4
 	.incbin "base_emerald.gba", 0x58d4e4, 0x40
 
-gUnknown_0858D524: ; 858D524
+gUnknown_0858D524: @ 858D524
 	.incbin "base_emerald.gba", 0x58d524, 0x4c
 
-gUnknown_0858D570: ; 858D570
+gUnknown_0858D570: @ 858D570
 	.incbin "base_emerald.gba", 0x58d570, 0x24
 
-gUnknown_0858D594: ; 858D594
+gUnknown_0858D594: @ 858D594
 	.incbin "base_emerald.gba", 0x58d594, 0xac
 
-gUnknown_0858D640: ; 858D640
+gUnknown_0858D640: @ 858D640
 	.incbin "base_emerald.gba", 0x58d640, 0x2c
 
-gUnknown_0858D66C: ; 858D66C
+gUnknown_0858D66C: @ 858D66C
 	.incbin "base_emerald.gba", 0x58d66c, 0x24
 
-gUnknown_0858D690: ; 858D690
+gUnknown_0858D690: @ 858D690
 	.incbin "base_emerald.gba", 0x58d690, 0x20
 
-gUnknown_0858D6B0: ; 858D6B0
+gUnknown_0858D6B0: @ 858D6B0
 	.incbin "base_emerald.gba", 0x58d6b0, 0x20
 
-gUnknown_0858D6D0: ; 858D6D0
+gUnknown_0858D6D0: @ 858D6D0
 	.incbin "base_emerald.gba", 0x58d6d0, 0x128
 
-gUnknown_0858D7F8: ; 858D7F8
+gUnknown_0858D7F8: @ 858D7F8
 	.incbin "base_emerald.gba", 0x58d7f8, 0x18
 
-gUnknown_0858D810: ; 858D810
+gUnknown_0858D810: @ 858D810
 	.incbin "base_emerald.gba", 0x58d810, 0x40
 
-gUnknown_0858D850: ; 858D850
+gUnknown_0858D850: @ 858D850
 	.incbin "base_emerald.gba", 0x58d850, 0x10
 
-gUnknown_0858D860: ; 858D860
+gUnknown_0858D860: @ 858D860
 	.incbin "base_emerald.gba", 0x58d860, 0x18
 
-gUnknown_0858D878: ; 858D878
+gUnknown_0858D878: @ 858D878
 	.incbin "base_emerald.gba", 0x58d878, 0x8
 
-gUnknown_0858D880: ; 858D880
+gUnknown_0858D880: @ 858D880
 	.incbin "base_emerald.gba", 0x58d880, 0x8
 
-gUnknown_0858D888: ; 858D888
+gUnknown_0858D888: @ 858D888
 	.incbin "base_emerald.gba", 0x58d888, 0x10
 
-gUnknown_0858D898: ; 858D898
+gUnknown_0858D898: @ 858D898
 	.incbin "base_emerald.gba", 0x58d898, 0x30
 
-gUnknown_0858D8C8: ; 858D8C8
+gUnknown_0858D8C8: @ 858D8C8
 	.incbin "base_emerald.gba", 0x58d8c8, 0x18
 
-gUnknown_0858D8E0: ; 858D8E0
+gUnknown_0858D8E0: @ 858D8E0
 	.incbin "base_emerald.gba", 0x58d8e0, 0x8
 
-gUnknown_0858D8E8: ; 858D8E8
+gUnknown_0858D8E8: @ 858D8E8
 	.incbin "base_emerald.gba", 0x58d8e8, 0x4
 
-gUnknown_0858D8EC: ; 858D8EC
+gUnknown_0858D8EC: @ 858D8EC
 	.incbin "base_emerald.gba", 0x58d8ec, 0x4
 
-gUnknown_0858D8F0: ; 858D8F0
+gUnknown_0858D8F0: @ 858D8F0
 	.incbin "base_emerald.gba", 0x58d8f0, 0x80
 
-gUnknown_0858D970: ; 858D970
+gUnknown_0858D970: @ 858D970
 	.incbin "base_emerald.gba", 0x58d970, 0x2a8
 
 	.align 2, 0
 
-gFieldEffectObjectPalette7: ; 858DC18
+gFieldEffectObjectPalette7: @ 858DC18
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_07.gbapal"
 
 	.incbin "base_emerald.gba", 0x58dc38, 0x580
 
 	.align 2, 0
 
-gFieldEffectObjectPalette8: ; 858E1B8
+gFieldEffectObjectPalette8: @ 858E1B8
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_08.gbapal"
 
 	.incbin "base_emerald.gba", 0x58e1d8, 0x428
 
-gUnknown_0858E600: ; 858E600
+gUnknown_0858E600: @ 858E600
 	.incbin "base_emerald.gba", 0x58e600, 0x18
 
-gUnknown_0858E618: ; 858E618
+gUnknown_0858E618: @ 858E618
 	.incbin "base_emerald.gba", 0x58e618, 0x18
 
-gUnknown_0858E630: ; 858E630
+gUnknown_0858E630: @ 858E630
 	.incbin "base_emerald.gba", 0x58e630, 0x18
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo7: ; 858E648
+gFieldEffectObjectPaletteInfo7: @ 858E648
 	obj_pal gFieldEffectObjectPalette7, 0x1003
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo8: ; 858E650
+gFieldEffectObjectPaletteInfo8: @ 858E650
 	obj_pal gFieldEffectObjectPalette8, 0x1008
 
 	.incbin "base_emerald.gba", 0x58e658, 0x34
 
-gUnknown_0858E68C: ; 858E68C
+gUnknown_0858E68C: @ 858E68C
 	.incbin "base_emerald.gba", 0x58e68c, 0x18
 
 	.align 2, 0
 
-; This uses one of the secret base palettes, so there is no
-; "field_effect_object_palette_09.pal" file.
-gFieldEffectObjectPaletteInfo9: ; 858E6A4
+@ This uses one of the secret base palettes, so there is no
+@ "field_effect_object_palette_09.pal" file.
+gFieldEffectObjectPaletteInfo9: @ 858E6A4
 	obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
 
 	.incbin "base_emerald.gba", 0x58e6ac, 0x1b8
 
-gUnknown_0858E864: ; 858E864
+gUnknown_0858E864: @ 858E864
 	.incbin "base_emerald.gba", 0x58e864, 0x1c
 
-gUnknown_0858E880: ; 858E880
+gUnknown_0858E880: @ 858E880
 	.incbin "base_emerald.gba", 0x58e880, 0x18
 
-gUnknown_0858E898: ; 858E898
+gUnknown_0858E898: @ 858E898
 	.incbin "base_emerald.gba", 0x58e898, 0x13
 
-gUnknown_0858E8AB: ; 858E8AB
+gUnknown_0858E8AB: @ 858E8AB
 	.incbin "base_emerald.gba", 0x58e8ab, 0x2
 
-gUnknown_0858E8AD: ; 858E8AD
+gUnknown_0858E8AD: @ 858E8AD
 	.incbin "base_emerald.gba", 0x58e8ad, 0x3
 
-gUnknown_0858E8B0: ; 858E8B0
+gUnknown_0858E8B0: @ 858E8B0
 	.incbin "base_emerald.gba", 0x58e8b0, 0x40
 
-gUnknown_0858E8F0: ; 858E8F0
+gUnknown_0858E8F0: @ 858E8F0
 	.incbin "base_emerald.gba", 0x58e8f0, 0x3468
 
-gUnknown_08591D58: ; 8591D58
+gUnknown_08591D58: @ 8591D58
 	.incbin "base_emerald.gba", 0x591d58, 0x270
 
-gUnknown_08591FC8: ; 8591FC8
+gUnknown_08591FC8: @ 8591FC8
 	.incbin "base_emerald.gba", 0x591fc8, 0x18
 
-gUnknown_08591FE0: ; 8591FE0
+gUnknown_08591FE0: @ 8591FE0
 	.incbin "base_emerald.gba", 0x591fe0, 0x18
 
-gUnknown_08591FF8: ; 8591FF8
+gUnknown_08591FF8: @ 8591FF8
 	.incbin "base_emerald.gba", 0x591ff8, 0x10
 
-gUnknown_08592008: ; 8592008
+gUnknown_08592008: @ 8592008
 	.incbin "base_emerald.gba", 0x592008, 0x10
 
-gUnknown_08592018: ; 8592018
+gUnknown_08592018: @ 8592018
 	.incbin "base_emerald.gba", 0x592018, 0x10
 
-gUnknown_08592028: ; 8592028
+gUnknown_08592028: @ 8592028
 	.incbin "base_emerald.gba", 0x592028, 0x10
 
-gUnknown_08592038: ; 8592038
+gUnknown_08592038: @ 8592038
 	.incbin "base_emerald.gba", 0x592038, 0x20
 
-gUnknown_08592058: ; 8592058
+gUnknown_08592058: @ 8592058
 	.incbin "base_emerald.gba", 0x592058, 0x20
 
-gUnknown_08592078: ; 8592078
+gUnknown_08592078: @ 8592078
 	.incbin "base_emerald.gba", 0x592078, 0x60
 
-gUnknown_085920D8: ; 85920D8
+gUnknown_085920D8: @ 85920D8
 	.incbin "base_emerald.gba", 0x5920d8, 0xc
 
-gUnknown_085920E4: ; 85920E4
+gUnknown_085920E4: @ 85920E4
 	.incbin "base_emerald.gba", 0x5920e4, 0x4
 
-gUnknown_085920E8: ; 85920E8
+gUnknown_085920E8: @ 85920E8
 	.incbin "base_emerald.gba", 0x5920e8, 0x128
 
-gUnknown_08592210: ; 8592210
+gUnknown_08592210: @ 8592210
 	.incbin "base_emerald.gba", 0x592210, 0x4f0
 
-gUnknown_08592700: ; 8592700
+gUnknown_08592700: @ 8592700
 	.incbin "base_emerald.gba", 0x592700, 0x78
 
-gUnknown_08592778: ; 8592778
+gUnknown_08592778: @ 8592778
 	.incbin "base_emerald.gba", 0x592778, 0x100
 
-gUnknown_08592878: ; 8592878
+gUnknown_08592878: @ 8592878
 	.incbin "base_emerald.gba", 0x592878, 0x458
 
-gUnknown_08592CD0: ; 8592CD0
+gUnknown_08592CD0: @ 8592CD0
 	.incbin "base_emerald.gba", 0x592cd0, 0x1ec
 
-gUnknown_08592EBC: ; 8592EBC
+gUnknown_08592EBC: @ 8592EBC
 	.incbin "base_emerald.gba", 0x592ebc, 0x30
 
-gUnknown_08592EEC: ; 8592EEC
+gUnknown_08592EEC: @ 8592EEC
 	.incbin "base_emerald.gba", 0x592eec, 0x134
 
-gUnknown_08593020: ; 8593020
+gUnknown_08593020: @ 8593020
 	.incbin "base_emerald.gba", 0x593020, 0xf4
 
-gUnknown_08593114: ; 8593114
+gUnknown_08593114: @ 8593114
 	.incbin "base_emerald.gba", 0x593114, 0x29c
 
-gUnknown_085933B0: ; 85933B0
+gUnknown_085933B0: @ 85933B0
 	.incbin "base_emerald.gba", 0x5933b0, 0xf0
 
-gUnknown_085934A0: ; 85934A0
+gUnknown_085934A0: @ 85934A0
 	.incbin "base_emerald.gba", 0x5934a0, 0x148
 
-gUnknown_085935E8: ; 85935E8
+gUnknown_085935E8: @ 85935E8
 	.incbin "base_emerald.gba", 0x5935e8, 0x20
 
-gUnknown_08593608: ; 8593608
+gUnknown_08593608: @ 8593608
 	.incbin "base_emerald.gba", 0x593608, 0x9c
 
-gUnknown_085936A4: ; 85936A4
+gUnknown_085936A4: @ 85936A4
 	.incbin "base_emerald.gba", 0x5936a4, 0x20c
 
-gUnknown_085938B0: ; 85938B0
+gUnknown_085938B0: @ 85938B0
 	.incbin "base_emerald.gba", 0x5938b0, 0x2c
 
-gUnknown_085938DC: ; 85938DC
+gUnknown_085938DC: @ 85938DC
 	.incbin "base_emerald.gba", 0x5938dc, 0x18
 
-gUnknown_085938F4: ; 85938F4
+gUnknown_085938F4: @ 85938F4
 	.incbin "base_emerald.gba", 0x5938f4, 0x5c
 
-gUnknown_08593950: ; 8593950
+gUnknown_08593950: @ 8593950
 	.incbin "base_emerald.gba", 0x593950, 0x38
 
-gUnknown_08593988: ; 8593988
+gUnknown_08593988: @ 8593988
 	.incbin "base_emerald.gba", 0x593988, 0x210
 
-gUnknown_08593B98: ; 8593B98
+gUnknown_08593B98: @ 8593B98
 	.incbin "base_emerald.gba", 0x593b98, 0x1488
 
-gUnknown_08595020: ; 8595020
+gUnknown_08595020: @ 8595020
 	.incbin "base_emerald.gba", 0x595020, 0x248
 
-gUnknown_08595268: ; 8595268
+gUnknown_08595268: @ 8595268
 	.incbin "base_emerald.gba", 0x595268, 0xa8
 
-gUnknown_08595310: ; 8595310
+gUnknown_08595310: @ 8595310
 	.incbin "base_emerald.gba", 0x595310, 0x2a4
 
-gUnknown_085955B4: ; 85955B4
+gUnknown_085955B4: @ 85955B4
 	.incbin "base_emerald.gba", 0x5955b4, 0x18
 
-gUnknown_085955CC: ; 85955CC
+gUnknown_085955CC: @ 85955CC
 	.incbin "base_emerald.gba", 0x5955cc, 0x2
 
-gUnknown_085955CE: ; 85955CE
+gUnknown_085955CE: @ 85955CE
 	.incbin "base_emerald.gba", 0x5955ce, 0xb6
 
-gUnknown_08595684: ; 8595684
+gUnknown_08595684: @ 8595684
 	.incbin "base_emerald.gba", 0x595684, 0x10
 
-gUnknown_08595694: ; 8595694
+gUnknown_08595694: @ 8595694
 	.incbin "base_emerald.gba", 0x595694, 0x2c
 
-gUnknown_085956C0: ; 85956C0
+gUnknown_085956C0: @ 85956C0
 	.incbin "base_emerald.gba", 0x5956c0, 0x168
 
-gUnknown_08595828: ; 8595828
+gUnknown_08595828: @ 8595828
 	.incbin "base_emerald.gba", 0x595828, 0x18
 
-gUnknown_08595840: ; 8595840
+gUnknown_08595840: @ 8595840
 	.incbin "base_emerald.gba", 0x595840, 0x18
 
-gUnknown_08595858: ; 8595858
+gUnknown_08595858: @ 8595858
 	.incbin "base_emerald.gba", 0x595858, 0x50
 
-gUnknown_085958A8: ; 85958A8
+gUnknown_085958A8: @ 85958A8
 	.incbin "base_emerald.gba", 0x5958a8, 0x158
 
-gUnknown_08595A00: ; 8595A00
+gUnknown_08595A00: @ 8595A00
 	.incbin "base_emerald.gba", 0x595a00, 0x30
 
-gUnknown_08595A30: ; 8595A30
+gUnknown_08595A30: @ 8595A30
 	.incbin "base_emerald.gba", 0x595a30, 0x138
 
-gUnknown_08595B68: ; 8595B68
+gUnknown_08595B68: @ 8595B68
 	.incbin "base_emerald.gba", 0x595b68, 0xf4
 
-gUnknown_08595C5C: ; 8595C5C
+gUnknown_08595C5C: @ 8595C5C
 	.incbin "base_emerald.gba", 0x595c5c, 0x2c
 
-gUnknown_08595C88: ; 8595C88
+gUnknown_08595C88: @ 8595C88
 	.incbin "base_emerald.gba", 0x595c88, 0x2c
 
-gUnknown_08595CB4: ; 8595CB4
+gUnknown_08595CB4: @ 8595CB4
 	.incbin "base_emerald.gba", 0x595cb4, 0x78
 
-gUnknown_08595D2C: ; 8595D2C
+gUnknown_08595D2C: @ 8595D2C
 	.incbin "base_emerald.gba", 0x595d2c, 0xa14
 
-gUnknown_08596740: ; 8596740
+gUnknown_08596740: @ 8596740
 	.incbin "base_emerald.gba", 0x596740, 0x1c
 
-gUnknown_0859675C: ; 859675C
+gUnknown_0859675C: @ 859675C
 	.incbin "base_emerald.gba", 0x59675c, 0x20
 
-gUnknown_0859677C: ; 859677C
+gUnknown_0859677C: @ 859677C
 	.incbin "base_emerald.gba", 0x59677c, 0x18
 
-gUnknown_08596794: ; 8596794
+gUnknown_08596794: @ 8596794
 	.incbin "base_emerald.gba", 0x596794, 0xd0
 
-gUnknown_08596864: ; 8596864
+gUnknown_08596864: @ 8596864
 	.incbin "base_emerald.gba", 0x596864, 0x35c
 
-gUnknown_08596BC0: ; 8596BC0
+gUnknown_08596BC0: @ 8596BC0
 	.incbin "base_emerald.gba", 0x596bc0, 0x50
 
-gUnknown_08596C10: ; 8596C10
+gUnknown_08596C10: @ 8596C10
 	.incbin "base_emerald.gba", 0x596c10, 0x18
 
-gUnknown_08596C28: ; 8596C28
+gUnknown_08596C28: @ 8596C28
 	.incbin "base_emerald.gba", 0x596c28, 0x18
 
-gUnknown_08596C40: ; 8596C40
+gUnknown_08596C40: @ 8596C40
 	.incbin "base_emerald.gba", 0x596c40, 0x178
 
-gUnknown_08596DB8: ; 8596DB8
+gUnknown_08596DB8: @ 8596DB8
 	.incbin "base_emerald.gba", 0x596db8, 0x78
 
-gUnknown_08596E30: ; 8596E30
+gUnknown_08596E30: @ 8596E30
 	.incbin "base_emerald.gba", 0x596e30, 0x528
 
-gUnknown_08597358: ; 8597358
+gUnknown_08597358: @ 8597358
 	.incbin "base_emerald.gba", 0x597358, 0x30
 
-gUnknown_08597388: ; 8597388
+gUnknown_08597388: @ 8597388
 	.incbin "base_emerald.gba", 0x597388, 0x60
 
-gUnknown_085973E8: ; 85973E8
+gUnknown_085973E8: @ 85973E8
 	.incbin "base_emerald.gba", 0x5973e8, 0x30
 
-gUnknown_08597418: ; 8597418
+gUnknown_08597418: @ 8597418
 	.incbin "base_emerald.gba", 0x597418, 0x2
 
-gUnknown_0859741A: ; 859741A
+gUnknown_0859741A: @ 859741A
 	.incbin "base_emerald.gba", 0x59741a, 0x4
 
-gUnknown_0859741E: ; 859741E
+gUnknown_0859741E: @ 859741E
 	.incbin "base_emerald.gba", 0x59741e, 0x6
 
-gUnknown_08597424: ; 8597424
+gUnknown_08597424: @ 8597424
 	.incbin "base_emerald.gba", 0x597424, 0x28
 
-gUnknown_0859744C: ; 859744C
+gUnknown_0859744C: @ 859744C
 	.incbin "base_emerald.gba", 0x59744c, 0x10
 
-gUnknown_0859745C: ; 859745C
+gUnknown_0859745C: @ 859745C
 	.incbin "base_emerald.gba", 0x59745c, 0xc
 
-gUnknown_08597468: ; 8597468
+gUnknown_08597468: @ 8597468
 	.incbin "base_emerald.gba", 0x597468, 0x34
 
-gUnknown_0859749C: ; 859749C
+gUnknown_0859749C: @ 859749C
 	.incbin "base_emerald.gba", 0x59749c, 0x1c
 
-gUnknown_085974B8: ; 85974B8
+gUnknown_085974B8: @ 85974B8
 	.incbin "base_emerald.gba", 0x5974b8, 0x8
 
-gUnknown_085974C0: ; 85974C0
+gUnknown_085974C0: @ 85974C0
 	.incbin "base_emerald.gba", 0x5974c0, 0x70
 
-gUnknown_08597530: ; 8597530
+gUnknown_08597530: @ 8597530
 	.incbin "base_emerald.gba", 0x597530, 0x20
 
-gUnknown_08597550: ; 8597550
+gUnknown_08597550: @ 8597550
 	.incbin "base_emerald.gba", 0x597550, 0x1f8
 
-gUnknown_08597748: ; 8597748
+gUnknown_08597748: @ 8597748
 	.incbin "base_emerald.gba", 0x597748, 0x1c
 
-gUnknown_08597764: ; 8597764
+gUnknown_08597764: @ 8597764
 	.incbin "base_emerald.gba", 0x597764, 0x8
 
-gUnknown_0859776C: ; 859776C
+gUnknown_0859776C: @ 859776C
 	.incbin "base_emerald.gba", 0x59776c, 0x3a8
 
-gUnknown_08597B14: ; 8597B14
+gUnknown_08597B14: @ 8597B14
 	.incbin "base_emerald.gba", 0x597b14, 0x20
 
-gUnknown_08597B34: ; 8597B34
+gUnknown_08597B34: @ 8597B34
 	.incbin "base_emerald.gba", 0x597b34, 0x20
 
-gUnknown_08597B54: ; 8597B54
+gUnknown_08597B54: @ 8597B54
 	.incbin "base_emerald.gba", 0x597b54, 0xc8
 
-gUnknown_08597C1C: ; 8597C1C
+gUnknown_08597C1C: @ 8597C1C
 	.incbin "base_emerald.gba", 0x597c1c, 0x8
 
-gUnknown_08597C24: ; 8597C24
+gUnknown_08597C24: @ 8597C24
 	.incbin "base_emerald.gba", 0x597c24, 0xc
 
-gUnknown_08597C30: ; 8597C30
+gUnknown_08597C30: @ 8597C30
 	.incbin "base_emerald.gba", 0x597c30, 0x24
 
-gUnknown_08597C54: ; 8597C54
+gUnknown_08597C54: @ 8597C54
 	.incbin "base_emerald.gba", 0x597c54, 0x10
 
-gUnknown_08597C64: ; 8597C64
+gUnknown_08597C64: @ 8597C64
 	.incbin "base_emerald.gba", 0x597c64, 0x20
 
-gUnknown_08597C84: ; 8597C84
+gUnknown_08597C84: @ 8597C84
 	.incbin "base_emerald.gba", 0x597c84, 0x8
 
-gUnknown_08597C8C: ; 8597C8C
+gUnknown_08597C8C: @ 8597C8C
 	.incbin "base_emerald.gba", 0x597c8c, 0x4
 
-gUnknown_08597C90: ; 8597C90
+gUnknown_08597C90: @ 8597C90
 	.incbin "base_emerald.gba", 0x597c90, 0x10
 
-gUnknown_08597CA0: ; 8597CA0
+gUnknown_08597CA0: @ 8597CA0
 	.incbin "base_emerald.gba", 0x597ca0, 0x20
 
-gUnknown_08597CC0: ; 8597CC0
+gUnknown_08597CC0: @ 8597CC0
 	.incbin "base_emerald.gba", 0x597cc0, 0x28
 
-gUnknown_08597CE8: ; 8597CE8
+gUnknown_08597CE8: @ 8597CE8
 	.incbin "base_emerald.gba", 0x597ce8, 0x20
 
-gUnknown_08597D08: ; 8597D08
+gUnknown_08597D08: @ 8597D08
 	.incbin "base_emerald.gba", 0x597d08, 0x10
 
-gUnknown_08597D18: ; 8597D18
+gUnknown_08597D18: @ 8597D18
 	.incbin "base_emerald.gba", 0x597d18, 0x50
 
-gUnknown_08597D68: ; 8597D68
+gUnknown_08597D68: @ 8597D68
 	.incbin "base_emerald.gba", 0x597d68, 0x68
 
-gUnknown_08597DD0: ; 8597DD0
+gUnknown_08597DD0: @ 8597DD0
 	.incbin "base_emerald.gba", 0x597dd0, 0x20
 
-gUnknown_08597DF0: ; 8597DF0
+gUnknown_08597DF0: @ 8597DF0
 	.incbin "base_emerald.gba", 0x597df0, 0x40
 
-gUnknown_08597E30: ; 8597E30
+gUnknown_08597E30: @ 8597E30
 	.incbin "base_emerald.gba", 0x597e30, 0x18
 
-gUnknown_08597E48: ; 8597E48
+gUnknown_08597E48: @ 8597E48
 	.incbin "base_emerald.gba", 0x597e48, 0x18
 
-gUnknown_08597E60: ; 8597E60
+gUnknown_08597E60: @ 8597E60
 	.incbin "base_emerald.gba", 0x597e60, 0xc
 
-gUnknown_08597E6C: ; 8597E6C
+gUnknown_08597E6C: @ 8597E6C
 	.incbin "base_emerald.gba", 0x597e6c, 0x30
 
-; 8597E9C
+@ 8597E9C
 	.include "data/text/easy_chat/easy_chat_groups.s"
 
-; 859D0B4
+@ 859D0B4
 	.include "data/text/easy_chat/easy_chat_words_by_letter.s"
 
-; 859E5D4
+@ 859E5D4
 	.include "data/text/easy_chat/easy_chat_group_name_pointers.s"
 
-gUnknown_0859E62C: ; 859E62C
+gUnknown_0859E62C: @ 859E62C
 	.incbin "base_emerald.gba", 0x59e62c, 0x8
 
-gUnknown_0859E634: ; 859E634
+gUnknown_0859E634: @ 859E634
 	.incbin "base_emerald.gba", 0x59e634, 0xc
 
-gUnknown_0859E640: ; 859E640
+gUnknown_0859E640: @ 859E640
 	.incbin "base_emerald.gba", 0x59e640, 0xc
 
-gUnknown_0859E64C: ; 859E64C
+gUnknown_0859E64C: @ 859E64C
 	.incbin "base_emerald.gba", 0x59e64c, 0xc
 
-gUnknown_0859E658: ; 859E658
+gUnknown_0859E658: @ 859E658
 	.incbin "base_emerald.gba", 0x59e658, 0x4
 
-gUnknown_0859E65C: ; 859E65C
+gUnknown_0859E65C: @ 859E65C
 	.incbin "base_emerald.gba", 0x59e65c, 0x20
 
-gUnknown_0859E67C: ; 859E67C
+gUnknown_0859E67C: @ 859E67C
 	.incbin "base_emerald.gba", 0x59e67c, 0x800
 
-gUnknown_0859EE7C: ; 859EE7C
+gUnknown_0859EE7C: @ 859EE7C
 	.incbin "base_emerald.gba", 0x59ee7c, 0x8
 
-gUnknown_0859EE84: ; 859EE84
+gUnknown_0859EE84: @ 859EE84
 	.incbin "base_emerald.gba", 0x59ee84, 0x58
 
-gUnknown_0859EEDC: ; 859EEDC
+gUnknown_0859EEDC: @ 859EEDC
 	.incbin "base_emerald.gba", 0x59eedc, 0x38
 
-gUnknown_0859EF14: ; 859EF14
+gUnknown_0859EF14: @ 859EF14
 	.incbin "base_emerald.gba", 0x59ef14, 0x8
 
-gUnknown_0859EF1C: ; 859EF1C
+gUnknown_0859EF1C: @ 859EF1C
 	.incbin "base_emerald.gba", 0x59ef1c, 0x88
 
-gUnknown_0859EFA4: ; 859EFA4
+gUnknown_0859EFA4: @ 859EFA4
 	.incbin "base_emerald.gba", 0x59efa4, 0x40
 
-gUnknown_0859EFE4: ; 859EFE4
+gUnknown_0859EFE4: @ 859EFE4
 	.incbin "base_emerald.gba", 0x59efe4, 0xc
 
-gUnknown_0859EFF0: ; 859EFF0
+gUnknown_0859EFF0: @ 859EFF0
 	.incbin "base_emerald.gba", 0x59eff0, 0x20
 
-gUnknown_0859F010: ; 859F010
+gUnknown_0859F010: @ 859F010
 	.incbin "base_emerald.gba", 0x59f010, 0x20
 
-gUnknown_0859F030: ; 859F030
+gUnknown_0859F030: @ 859F030
 	.incbin "base_emerald.gba", 0x59f030, 0x18
 
-gUnknown_0859F048: ; 859F048
+gUnknown_0859F048: @ 859F048
 	.incbin "base_emerald.gba", 0x59f048, 0x230
 
-gUnknown_0859F278: ; 859F278
+gUnknown_0859F278: @ 859F278
 	.incbin "base_emerald.gba", 0x59f278, 0x10
 
-gUnknown_0859F288: ; 859F288
+gUnknown_0859F288: @ 859F288
 	.incbin "base_emerald.gba", 0x59f288, 0x8
 
-gUnknown_0859F290: ; 859F290
+gUnknown_0859F290: @ 859F290
 	.incbin "base_emerald.gba", 0x59f290, 0xc
 
-gUnknown_0859F29C: ; 859F29C
+gUnknown_0859F29C: @ 859F29C
 	.incbin "base_emerald.gba", 0x59f29c, 0x10
 
-gUnknown_0859F2AC: ; 859F2AC
+gUnknown_0859F2AC: @ 859F2AC
 	.incbin "base_emerald.gba", 0x59f2ac, 0x4
 
-gUnknown_0859F2B0: ; 859F2B0
+gUnknown_0859F2B0: @ 859F2B0
 	.incbin "base_emerald.gba", 0x59f2b0, 0x8
 
-gUnknown_0859F2B8: ; 859F2B8
+gUnknown_0859F2B8: @ 859F2B8
 	.incbin "base_emerald.gba", 0x59f2b8, 0xfc
 
-gUnknown_0859F3B4: ; 859F3B4
+gUnknown_0859F3B4: @ 859F3B4
 	.incbin "base_emerald.gba", 0x59f3b4, 0xa4
 
-gUnknown_0859F458: ; 859F458
+gUnknown_0859F458: @ 859F458
 	.incbin "base_emerald.gba", 0x59f458, 0xbc
 
-gUnknown_0859F514: ; 859F514
+gUnknown_0859F514: @ 859F514
 	.incbin "base_emerald.gba", 0x59f514, 0x8
 
-gUnknown_0859F51C: ; 859F51C
+gUnknown_0859F51C: @ 859F51C
 	.incbin "base_emerald.gba", 0x59f51c, 0x8
 
-gUnknown_0859F524: ; 859F524
+gUnknown_0859F524: @ 859F524
 	.incbin "base_emerald.gba", 0x59f524, 0x10
 
-gUnknown_0859F534: ; 859F534
+gUnknown_0859F534: @ 859F534
 	.incbin "base_emerald.gba", 0x59f534, 0x8
 
-gUnknown_0859F53C: ; 859F53C
+gUnknown_0859F53C: @ 859F53C
 	.incbin "base_emerald.gba", 0x59f53c, 0xd0
 
-gUnknown_0859F60C: ; 859F60C
+gUnknown_0859F60C: @ 859F60C
 	.incbin "base_emerald.gba", 0x59f60c, 0x44
 
-gUnknown_0859F650: ; 859F650
+gUnknown_0859F650: @ 859F650
 	.incbin "base_emerald.gba", 0x59f650, 0xec
 
-gUnknown_0859F73C: ; 859F73C
+gUnknown_0859F73C: @ 859F73C
 	.incbin "base_emerald.gba", 0x59f73c, 0x40
 
-gUnknown_0859F77C: ; 859F77C
+gUnknown_0859F77C: @ 859F77C
 	.incbin "base_emerald.gba", 0x59f77c, 0xd64
 
-gUnknown_085A04E0: ; 85A04E0
+gUnknown_085A04E0: @ 85A04E0
 	.incbin "base_emerald.gba", 0x5a04e0, 0x34c
 
-gUnknown_085A082C: ; 85A082C
+gUnknown_085A082C: @ 85A082C
 	.incbin "base_emerald.gba", 0x5a082c, 0x20
 
-gUnknown_085A084C: ; 85A084C
+gUnknown_085A084C: @ 85A084C
 	.incbin "base_emerald.gba", 0x5a084c, 0x80
 
-gUnknown_085A08CC: ; 85A08CC
+gUnknown_085A08CC: @ 85A08CC
 	.incbin "base_emerald.gba", 0x5a08cc, 0x20
 
-gUnknown_085A08EC: ; 85A08EC
+gUnknown_085A08EC: @ 85A08EC
 	.incbin "base_emerald.gba", 0x5a08ec, 0x80
 
-gUnknown_085A096C: ; 85A096C
+gUnknown_085A096C: @ 85A096C
 	.incbin "base_emerald.gba", 0x5a096c, 0x1a4
 
-; 85A0B10
+@ 85A0B10
 	.include "data/region_map_entries.s"
 
-gUnknown_085A1B24: ; 85A1B24
+gUnknown_085A1B24: @ 85A1B24
 	.incbin "base_emerald.gba", 0x5a1b24, 0x60
 
-gUnknown_085A1B84: ; 85A1B84
+gUnknown_085A1B84: @ 85A1B84
 	.incbin "base_emerald.gba", 0x5a1b84, 0x6
 
-gUnknown_085A1B8A: ; 85A1B8A
+gUnknown_085A1B8A: @ 85A1B8A
 	.incbin "base_emerald.gba", 0x5a1b8a, 0x22
 
-gUnknown_085A1BAC: ; 85A1BAC
+gUnknown_085A1BAC: @ 85A1BAC
 	.incbin "base_emerald.gba", 0x5a1bac, 0x20
 
-gUnknown_085A1BCC: ; 85A1BCC
+gUnknown_085A1BCC: @ 85A1BCC
 	.incbin "base_emerald.gba", 0x5a1bcc, 0x34
 
-gUnknown_085A1C00: ; 85A1C00
+gUnknown_085A1C00: @ 85A1C00
 	.incbin "base_emerald.gba", 0x5a1c00, 0x8
 
-gUnknown_085A1C08: ; 85A1C08
+gUnknown_085A1C08: @ 85A1C08
 	.incbin "base_emerald.gba", 0x5a1c08, 0x18
 
-gUnknown_085A1C20: ; 85A1C20
+gUnknown_085A1C20: @ 85A1C20
 	.incbin "base_emerald.gba", 0x5a1c20, 0x10
 
-gUnknown_085A1C30: ; 85A1C30
+gUnknown_085A1C30: @ 85A1C30
 	.incbin "base_emerald.gba", 0x5a1c30, 0x4
 
-gUnknown_085A1C34: ; 85A1C34
+gUnknown_085A1C34: @ 85A1C34
 	.incbin "base_emerald.gba", 0x5a1c34, 0x4
 
-gUnknown_085A1C38: ; 85A1C38
+gUnknown_085A1C38: @ 85A1C38
 	.incbin "base_emerald.gba", 0x5a1c38, 0x20
 
-gUnknown_085A1C58: ; 85A1C58
+gUnknown_085A1C58: @ 85A1C58
 	.incbin "base_emerald.gba", 0x5a1c58, 0x38
 
-gUnknown_085A1C90: ; 85A1C90
+gUnknown_085A1C90: @ 85A1C90
 	.incbin "base_emerald.gba", 0x5a1c90, 0xd8
 
-gUnknown_085A1D68: ; 85A1D68
+gUnknown_085A1D68: @ 85A1D68
 	.incbin "base_emerald.gba", 0x5a1d68, 0xd4
 
-gUnknown_085A1E3C: ; 85A1E3C
+gUnknown_085A1E3C: @ 85A1E3C
 	.incbin "base_emerald.gba", 0x5a1e3c, 0xa0
 
-gUnknown_085A1EDC: ; 85A1EDC
+gUnknown_085A1EDC: @ 85A1EDC
 	.incbin "base_emerald.gba", 0x5a1edc, 0x8
 
-gUnknown_085A1EE4: ; 85A1EE4
+gUnknown_085A1EE4: @ 85A1EE4
 	.incbin "base_emerald.gba", 0x5a1ee4, 0xc
 
-gUnknown_085A1EF0: ; 85A1EF0
+gUnknown_085A1EF0: @ 85A1EF0
 	.incbin "base_emerald.gba", 0x5a1ef0, 0x20
 
-gUnknown_085A1F10: ; 85A1F10
+gUnknown_085A1F10: @ 85A1F10
 	.incbin "base_emerald.gba", 0x5a1f10, 0x8
 
-gUnknown_085A1F18: ; 85A1F18
+gUnknown_085A1F18: @ 85A1F18
 	.incbin "base_emerald.gba", 0x5a1f18, 0x64
 
-gUnknown_085A1F7C: ; 85A1F7C
+gUnknown_085A1F7C: @ 85A1F7C
 	.incbin "base_emerald.gba", 0x5a1f7c, 0x18
 
-gUnknown_085A1F94: ; 85A1F94
+gUnknown_085A1F94: @ 85A1F94
 	.incbin "base_emerald.gba", 0x5a1f94, 0x3c74
 
-gUnknown_085A5C08: ; 85A5C08
+gUnknown_085A5C08: @ 85A5C08
 	.incbin "base_emerald.gba", 0x5a5c08, 0x1
 
-gUnknown_085A5C09: ; 85A5C09
+gUnknown_085A5C09: @ 85A5C09
 	.incbin "base_emerald.gba", 0x5a5c09, 0x1b
 
-gUnknown_085A5C24: ; 85A5C24
+gUnknown_085A5C24: @ 85A5C24
 	.incbin "base_emerald.gba", 0x5a5c24, 0xf04
 
-gUnknown_085A6B28: ; 85A6B28
+gUnknown_085A6B28: @ 85A6B28
 	.incbin "base_emerald.gba", 0x5a6b28, 0x20
 
-gUnknown_085A6B48: ; 85A6B48
+gUnknown_085A6B48: @ 85A6B48
 	.incbin "base_emerald.gba", 0x5a6b48, 0x20
 
-gUnknown_085A6B68: ; 85A6B68
+gUnknown_085A6B68: @ 85A6B68
 	.incbin "base_emerald.gba", 0x5a6b68, 0x10
 
-gUnknown_085A6B78: ; 85A6B78
+gUnknown_085A6B78: @ 85A6B78
 	.incbin "base_emerald.gba", 0x5a6b78, 0x18
 
-gUnknown_085A6B90: ; 85A6B90
+gUnknown_085A6B90: @ 85A6B90
 	.incbin "base_emerald.gba", 0x5a6b90, 0x20
 
-gUnknown_085A6BB0: ; 85A6BB0
+gUnknown_085A6BB0: @ 85A6BB0
 	.incbin "base_emerald.gba", 0x5a6bb0, 0x20
 
-gUnknown_085A6BD0: ; 85A6BD0
+gUnknown_085A6BD0: @ 85A6BD0
 	.incbin "base_emerald.gba", 0x5a6bd0, 0x18
 
-gUnknown_085A6BE8: ; 85A6BE8
+gUnknown_085A6BE8: @ 85A6BE8
 	.incbin "base_emerald.gba", 0x5a6be8, 0x5c8
 
-gUnknown_085A71B0: ; 85A71B0
+gUnknown_085A71B0: @ 85A71B0
 	.incbin "base_emerald.gba", 0x5a71b0, 0xa0
 
-gUnknown_085A7250: ; 85A7250
+gUnknown_085A7250: @ 85A7250
 	.incbin "base_emerald.gba", 0x5a7250, 0x3c
 
-gUnknown_085A728C: ; 85A728C
+gUnknown_085A728C: @ 85A728C
 	.incbin "base_emerald.gba", 0x5a728c, 0x18
 
-gUnknown_085A72A4: ; 85A72A4
+gUnknown_085A72A4: @ 85A72A4
 	.incbin "base_emerald.gba", 0x5a72a4, 0x18
 
-gUnknown_085A72BC: ; 85A72BC
+gUnknown_085A72BC: @ 85A72BC
 	.incbin "base_emerald.gba", 0x5a72bc, 0x8
 
-gUnknown_085A72C4: ; 85A72C4
+gUnknown_085A72C4: @ 85A72C4
 	.incbin "base_emerald.gba", 0x5a72c4, 0x8
 
-gUnknown_085A72CC: ; 85A72CC
+gUnknown_085A72CC: @ 85A72CC
 	.incbin "base_emerald.gba", 0x5a72cc, 0x8
 
-gUnknown_085A72D4: ; 85A72D4
+gUnknown_085A72D4: @ 85A72D4
 	.incbin "base_emerald.gba", 0x5a72d4, 0x10
 
-gUnknown_085A72E4: ; 85A72E4
+gUnknown_085A72E4: @ 85A72E4
 	.incbin "base_emerald.gba", 0x5a72e4, 0x8
 
-gUnknown_085A72EC: ; 85A72EC
+gUnknown_085A72EC: @ 85A72EC
 	.incbin "base_emerald.gba", 0x5a72ec, 0x8
 
-gUnknown_085A72F4: ; 85A72F4
+gUnknown_085A72F4: @ 85A72F4
 	.incbin "base_emerald.gba", 0x5a72f4, 0x54
 
-gUnknown_085A7348: ; 85A7348
+gUnknown_085A7348: @ 85A7348
 	.incbin "base_emerald.gba", 0x5a7348, 0x8
 
-gUnknown_085A7350: ; 85A7350
+gUnknown_085A7350: @ 85A7350
 	.incbin "base_emerald.gba", 0x5a7350, 0x88
 
-gUnknown_085A73D8: ; 85A73D8
+gUnknown_085A73D8: @ 85A73D8
 	.incbin "base_emerald.gba", 0x5a73d8, 0x8
 
-gUnknown_085A73E0: ; 85A73E0
+gUnknown_085A73E0: @ 85A73E0
 	.incbin "base_emerald.gba", 0x5a73e0, 0x24
 
-gUnknown_085A7404: ; 85A7404
+gUnknown_085A7404: @ 85A7404
 	.incbin "base_emerald.gba", 0x5a7404, 0x18
 
-gUnknown_085A741C: ; 85A741C
+gUnknown_085A741C: @ 85A741C
 	.incbin "base_emerald.gba", 0x5a741c, 0x8
 
-gUnknown_085A7424: ; 85A7424
+gUnknown_085A7424: @ 85A7424
 	.incbin "base_emerald.gba", 0x5a7424, 0x10
 
-gUnknown_085A7434: ; 85A7434
+gUnknown_085A7434: @ 85A7434
 	.incbin "base_emerald.gba", 0x5a7434, 0x10
 
-gUnknown_085A7444: ; 85A7444
+gUnknown_085A7444: @ 85A7444
 	.incbin "base_emerald.gba", 0x5a7444, 0x8
 
-gUnknown_085A744C: ; 85A744C
+gUnknown_085A744C: @ 85A744C
 	.incbin "base_emerald.gba", 0x5a744c, 0x4
 
-gUnknown_085A7450: ; 85A7450
+gUnknown_085A7450: @ 85A7450
 	.incbin "base_emerald.gba", 0x5a7450, 0x74
 
-gUnknown_085A74C4: ; 85A74C4
+gUnknown_085A74C4: @ 85A74C4
 	.incbin "base_emerald.gba", 0x5a74c4, 0xc
 
-gUnknown_085A74D0: ; 85A74D0
+gUnknown_085A74D0: @ 85A74D0
 	.incbin "base_emerald.gba", 0x5a74d0, 0x14
 
-gUnknown_085A74E4: ; 85A74E4
+gUnknown_085A74E4: @ 85A74E4
 	.incbin "base_emerald.gba", 0x5a74e4, 0xc
 
-gUnknown_085A74F0: ; 85A74F0
+gUnknown_085A74F0: @ 85A74F0
 	.incbin "base_emerald.gba", 0x5a74f0, 0xc
 
-gUnknown_085A74FC: ; 85A74FC
+gUnknown_085A74FC: @ 85A74FC
 	.incbin "base_emerald.gba", 0x5a74fc, 0xc
 
-gUnknown_085A7508: ; 85A7508
+gUnknown_085A7508: @ 85A7508
 	.incbin "base_emerald.gba", 0x5a7508, 0xc
 
-gUnknown_085A7514: ; 85A7514
+gUnknown_085A7514: @ 85A7514
 	.incbin "base_emerald.gba", 0x5a7514, 0xc
 
-gUnknown_085A7520: ; 85A7520
+gUnknown_085A7520: @ 85A7520
 	.incbin "base_emerald.gba", 0x5a7520, 0xc
 
-gUnknown_085A752C: ; 85A752C
+gUnknown_085A752C: @ 85A752C
 	.incbin "base_emerald.gba", 0x5a752c, 0xc
 
-gUnknown_085A7538: ; 85A7538
+gUnknown_085A7538: @ 85A7538
 	.incbin "base_emerald.gba", 0x5a7538, 0xc
 
-gUnknown_085A7544: ; 85A7544
+gUnknown_085A7544: @ 85A7544
 	.incbin "base_emerald.gba", 0x5a7544, 0xc
 
-gUnknown_085A7550: ; 85A7550
+gUnknown_085A7550: @ 85A7550
 	.incbin "base_emerald.gba", 0x5a7550, 0x8
 
-gUnknown_085A7558: ; 85A7558
+gUnknown_085A7558: @ 85A7558
 	.incbin "base_emerald.gba", 0x5a7558, 0x10
 
-gUnknown_085A7568: ; 85A7568
+gUnknown_085A7568: @ 85A7568
 	.incbin "base_emerald.gba", 0x5a7568, 0x2
 
-gUnknown_085A756A: ; 85A756A
+gUnknown_085A756A: @ 85A756A
 	.incbin "base_emerald.gba", 0x5a756a, 0xa
 
-gUnknown_085A7574: ; 85A7574
+gUnknown_085A7574: @ 85A7574
 	.incbin "base_emerald.gba", 0x5a7574, 0x4c
 
-gUnknown_085A75C0: ; 85A75C0
+gUnknown_085A75C0: @ 85A75C0
 	.incbin "base_emerald.gba", 0x5a75c0, 0x4
 
-gUnknown_085A75C4: ; 85A75C4
+gUnknown_085A75C4: @ 85A75C4
 	.incbin "base_emerald.gba", 0x5a75c4, 0x8
 
-gUnknown_085A75CC: ; 85A75CC
+gUnknown_085A75CC: @ 85A75CC
 	.incbin "base_emerald.gba", 0x5a75cc, 0x8
 
-gUnknown_085A75D4: ; 85A75D4
+gUnknown_085A75D4: @ 85A75D4
 	.incbin "base_emerald.gba", 0x5a75d4, 0x3c
 
-gUnknown_085A7610: ; 85A7610
+gUnknown_085A7610: @ 85A7610
 	.incbin "base_emerald.gba", 0x5a7610, 0x4
 
-gUnknown_085A7614: ; 85A7614
+gUnknown_085A7614: @ 85A7614
 	.incbin "base_emerald.gba", 0x5a7614, 0x2
 
-gUnknown_085A7616: ; 85A7616
+gUnknown_085A7616: @ 85A7616
 	.incbin "base_emerald.gba", 0x5a7616, 0x8
 
-gUnknown_085A761E: ; 85A761E
+gUnknown_085A761E: @ 85A761E
 	.incbin "base_emerald.gba", 0x5a761e, 0x8
 
-gUnknown_085A7626: ; 85A7626
+gUnknown_085A7626: @ 85A7626
 	.incbin "base_emerald.gba", 0x5a7626, 0x8
 
-gUnknown_085A762E: ; 85A762E
+gUnknown_085A762E: @ 85A762E
 	.incbin "base_emerald.gba", 0x5a762e, 0x10
 
-gUnknown_085A763E: ; 85A763E
+gUnknown_085A763E: @ 85A763E
 	.incbin "base_emerald.gba", 0x5a763e, 0x10
 
-gUnknown_085A764E: ; 85A764E
+gUnknown_085A764E: @ 85A764E
 	.incbin "base_emerald.gba", 0x5a764e, 0x10
 
-gUnknown_085A765E: ; 85A765E
+gUnknown_085A765E: @ 85A765E
 	.incbin "base_emerald.gba", 0x5a765e, 0x10
 
-gUnknown_085A766E: ; 85A766E
+gUnknown_085A766E: @ 85A766E
 	.incbin "base_emerald.gba", 0x5a766e, 0x3f
 
-gUnknown_085A76AD: ; 85A76AD
+gUnknown_085A76AD: @ 85A76AD
 	.incbin "base_emerald.gba", 0x5a76ad, 0x7
 
-gUnknown_085A76B4: ; 85A76B4
+gUnknown_085A76B4: @ 85A76B4
 	.incbin "base_emerald.gba", 0x5a76b4, 0xc
 
-gUnknown_085A76C0: ; 85A76C0
+gUnknown_085A76C0: @ 85A76C0
 	.incbin "base_emerald.gba", 0x5a76c0, 0x12
 
-gUnknown_085A76D2: ; 85A76D2
+gUnknown_085A76D2: @ 85A76D2
 	.incbin "base_emerald.gba", 0x5a76d2, 0x12
 
-gUnknown_085A76E4: ; 85A76E4
+gUnknown_085A76E4: @ 85A76E4
 	.incbin "base_emerald.gba", 0x5a76e4, 0x1e
 
-gUnknown_085A7702: ; 85A7702
+gUnknown_085A7702: @ 85A7702
 	.incbin "base_emerald.gba", 0x5a7702, 0x66
 
-gUnknown_085A7768: ; 85A7768
+gUnknown_085A7768: @ 85A7768
 	.incbin "base_emerald.gba", 0x5a7768, 0x66
 
-gUnknown_085A77CE: ; 85A77CE
+gUnknown_085A77CE: @ 85A77CE
 	.incbin "base_emerald.gba", 0x5a77ce, 0xa
 
-gUnknown_085A77D8: ; 85A77D8
+gUnknown_085A77D8: @ 85A77D8
 	.incbin "base_emerald.gba", 0x5a77d8, 0x14
 
-gUnknown_085A77EC: ; 85A77EC
+gUnknown_085A77EC: @ 85A77EC
 	.incbin "base_emerald.gba", 0x5a77ec, 0xa
 
-gUnknown_085A77F6: ; 85A77F6
+gUnknown_085A77F6: @ 85A77F6
 	.incbin "base_emerald.gba", 0x5a77f6, 0x8
 
-gUnknown_085A77FE: ; 85A77FE
+gUnknown_085A77FE: @ 85A77FE
 	.incbin "base_emerald.gba", 0x5a77fe, 0x6
 
-gUnknown_085A7804: ; 85A7804
+gUnknown_085A7804: @ 85A7804
 	.incbin "base_emerald.gba", 0x5a7804, 0xa
 
-gUnknown_085A780E: ; 85A780E
+gUnknown_085A780E: @ 85A780E
 	.incbin "base_emerald.gba", 0x5a780e, 0x8
 
-gUnknown_085A7816: ; 85A7816
+gUnknown_085A7816: @ 85A7816
 	.incbin "base_emerald.gba", 0x5a7816, 0x12
 
-gUnknown_085A7828: ; 85A7828
+gUnknown_085A7828: @ 85A7828
 	.incbin "base_emerald.gba", 0x5a7828, 0x12
 
-gUnknown_085A783A: ; 85A783A
+gUnknown_085A783A: @ 85A783A
 	.incbin "base_emerald.gba", 0x5a783a, 0x8e
 
-gUnknown_085A78C8: ; 85A78C8
+gUnknown_085A78C8: @ 85A78C8
 	.incbin "base_emerald.gba", 0x5a78c8, 0x13c
 
-gUnknown_085A7A04: ; 85A7A04
+gUnknown_085A7A04: @ 85A7A04
 	.incbin "base_emerald.gba", 0x5a7a04, 0x1c
 
-gUnknown_085A7A20: ; 85A7A20
+gUnknown_085A7A20: @ 85A7A20
 	.incbin "base_emerald.gba", 0x5a7a20, 0x2c0
 
-gUnknown_085A7CE0: ; 85A7CE0
+gUnknown_085A7CE0: @ 85A7CE0
 	.incbin "base_emerald.gba", 0x5a7ce0, 0x18
 
-gUnknown_085A7CF8: ; 85A7CF8
+gUnknown_085A7CF8: @ 85A7CF8
 	.incbin "base_emerald.gba", 0x5a7cf8, 0x18
 
-gUnknown_085A7D10: ; 85A7D10
+gUnknown_085A7D10: @ 85A7D10
 	.incbin "base_emerald.gba", 0x5a7d10, 0x18
 
-gUnknown_085A7D28: ; 85A7D28
+gUnknown_085A7D28: @ 85A7D28
 	.incbin "base_emerald.gba", 0x5a7d28, 0x18
 
-gUnknown_085A7D40: ; 85A7D40
+gUnknown_085A7D40: @ 85A7D40
 	.incbin "base_emerald.gba", 0x5a7d40, 0x18
 
-gUnknown_085A7D58: ; 85A7D58
+gUnknown_085A7D58: @ 85A7D58
 	.incbin "base_emerald.gba", 0x5a7d58, 0x18
 
-gUnknown_085A7D70: ; 85A7D70
+gUnknown_085A7D70: @ 85A7D70
 	.incbin "base_emerald.gba", 0x5a7d70, 0x18
 
-gUnknown_085A7D88: ; 85A7D88
+gUnknown_085A7D88: @ 85A7D88
 	.incbin "base_emerald.gba", 0x5a7d88, 0x18
 
-gUnknown_085A7DA0: ; 85A7DA0
+gUnknown_085A7DA0: @ 85A7DA0
 	.incbin "base_emerald.gba", 0x5a7da0, 0x18
 
-gUnknown_085A7DB8: ; 85A7DB8
+gUnknown_085A7DB8: @ 85A7DB8
 	.incbin "base_emerald.gba", 0x5a7db8, 0x18
 
-gUnknown_085A7DD0: ; 85A7DD0
+gUnknown_085A7DD0: @ 85A7DD0
 	.incbin "base_emerald.gba", 0x5a7dd0, 0x18
 
-gUnknown_085A7DE8: ; 85A7DE8
+gUnknown_085A7DE8: @ 85A7DE8
 	.incbin "base_emerald.gba", 0x5a7de8, 0x18
 
-gUnknown_085A7E00: ; 85A7E00
+gUnknown_085A7E00: @ 85A7E00
 	.incbin "base_emerald.gba", 0x5a7e00, 0x18
 
-gUnknown_085A7E18: ; 85A7E18
+gUnknown_085A7E18: @ 85A7E18
 	.incbin "base_emerald.gba", 0x5a7e18, 0x18
 
-gUnknown_085A7E30: ; 85A7E30
+gUnknown_085A7E30: @ 85A7E30
 	.incbin "base_emerald.gba", 0x5a7e30, 0x168
 
-gUnknown_085A7F98: ; 85A7F98
+gUnknown_085A7F98: @ 85A7F98
 	.incbin "base_emerald.gba", 0x5a7f98, 0x28
 
-gUnknown_085A7FC0: ; 85A7FC0
+gUnknown_085A7FC0: @ 85A7FC0
 	.incbin "base_emerald.gba", 0x5a7fc0, 0x20
 
-gUnknown_085A7FE0: ; 85A7FE0
+gUnknown_085A7FE0: @ 85A7FE0
 	.incbin "base_emerald.gba", 0x5a7fe0, 0x14
 
-gUnknown_085A7FF4: ; 85A7FF4
+gUnknown_085A7FF4: @ 85A7FF4
 	.incbin "base_emerald.gba", 0x5a7ff4, 0x1c
 
-gUnknown_085A8010: ; 85A8010
+gUnknown_085A8010: @ 85A8010
 	.incbin "base_emerald.gba", 0x5a8010, 0x18
 
-gUnknown_085A8028: ; 85A8028
+gUnknown_085A8028: @ 85A8028
 	.incbin "base_emerald.gba", 0x5a8028, 0x14
 
-gUnknown_085A803C: ; 85A803C
+gUnknown_085A803C: @ 85A803C
 	.incbin "base_emerald.gba", 0x5a803c, 0x228
 
-gUnknown_085A8264: ; 85A8264
+gUnknown_085A8264: @ 85A8264
 	.incbin "base_emerald.gba", 0x5a8264, 0x68
 
-gUnknown_085A82CC: ; 85A82CC
+gUnknown_085A82CC: @ 85A82CC
 	.incbin "base_emerald.gba", 0x5a82cc, 0x68
 
-gUnknown_085A8334: ; 85A8334
+gUnknown_085A8334: @ 85A8334
 	.incbin "base_emerald.gba", 0x5a8334, 0xb0
 
-gUnknown_085A83E4: ; 85A83E4
+gUnknown_085A83E4: @ 85A83E4
 	.incbin "base_emerald.gba", 0x5a83e4, 0x24
 
-gUnknown_085A8408: ; 85A8408
+gUnknown_085A8408: @ 85A8408
 	.incbin "base_emerald.gba", 0x5a8408, 0x14
 
-gUnknown_085A841C: ; 85A841C
+gUnknown_085A841C: @ 85A841C
 	.incbin "base_emerald.gba", 0x5a841c, 0x14
 
-gUnknown_085A8430: ; 85A8430
+gUnknown_085A8430: @ 85A8430
 	.incbin "base_emerald.gba", 0x5a8430, 0x5
 
-gUnknown_085A8435: ; 85A8435
+gUnknown_085A8435: @ 85A8435
 	.incbin "base_emerald.gba", 0x5a8435, 0x6
 
-gUnknown_085A843B: ; 85A843B
+gUnknown_085A843B: @ 85A843B
 	.incbin "base_emerald.gba", 0x5a843b, 0x65
 
-gUnknown_085A84A0: ; 85A84A0
+gUnknown_085A84A0: @ 85A84A0
 	.incbin "base_emerald.gba", 0x5a84a0, 0xc
 
-gUnknown_085A84AC: ; 85A84AC
+gUnknown_085A84AC: @ 85A84AC
 	.incbin "base_emerald.gba", 0x5a84ac, 0x64
 
-gUnknown_085A8510: ; 85A8510
+gUnknown_085A8510: @ 85A8510
 	.incbin "base_emerald.gba", 0x5a8510, 0x10
 
-gUnknown_085A8520: ; 85A8520
+gUnknown_085A8520: @ 85A8520
 	.incbin "base_emerald.gba", 0x5a8520, 0x4
 
-gUnknown_085A8524: ; 85A8524
+gUnknown_085A8524: @ 85A8524
 	.incbin "base_emerald.gba", 0x5a8524, 0x20
 
-gUnknown_085A8544: ; 85A8544
+gUnknown_085A8544: @ 85A8544
 	.incbin "base_emerald.gba", 0x5a8544, 0x48
 
-gUnknown_085A858C: ; 85A858C
+gUnknown_085A858C: @ 85A858C
 	.incbin "base_emerald.gba", 0x5a858c, 0x1154
 
-gUnknown_085A96E0: ; 85A96E0
+gUnknown_085A96E0: @ 85A96E0
 	.incbin "base_emerald.gba", 0x5a96e0, 0x1b8
 
-gUnknown_085A9898: ; 85A9898
+gUnknown_085A9898: @ 85A9898
 	.incbin "base_emerald.gba", 0x5a9898, 0x4
 
-gUnknown_085A989C: ; 85A989C
+gUnknown_085A989C: @ 85A989C
 	.incbin "base_emerald.gba", 0x5a989c, 0x200
 
-gUnknown_085A9A9C: ; 85A9A9C
+gUnknown_085A9A9C: @ 85A9A9C
 	.incbin "base_emerald.gba", 0x5a9a9c, 0x1084
 
-gUnknown_085AAB20: ; 85AAB20
+gUnknown_085AAB20: @ 85AAB20
 	.incbin "base_emerald.gba", 0x5aab20, 0xc30
 
-gUnknown_085AB750: ; 85AB750
+gUnknown_085AB750: @ 85AB750
 	.incbin "base_emerald.gba", 0x5ab750, 0xb38
 
-gUnknown_085AC288: ; 85AC288
+gUnknown_085AC288: @ 85AC288
 	.incbin "base_emerald.gba", 0x5ac288, 0xfb8
 
-gUnknown_085AD240: ; 85AD240
+gUnknown_085AD240: @ 85AD240
 	.incbin "base_emerald.gba", 0x5ad240, 0x1130
 
-gUnknown_085AE370: ; 85AE370
+gUnknown_085AE370: @ 85AE370
 	.incbin "base_emerald.gba", 0x5ae370, 0x604
 
-gUnknown_085AE974: ; 85AE974
+gUnknown_085AE974: @ 85AE974
 	.incbin "base_emerald.gba", 0x5ae974, 0x50c
 
-gUnknown_085AEE80: ; 85AEE80
+gUnknown_085AEE80: @ 85AEE80
 	.incbin "base_emerald.gba", 0x5aee80, 0x50c
 
-gUnknown_085AF38C: ; 85AF38C
+gUnknown_085AF38C: @ 85AF38C
 	.incbin "base_emerald.gba", 0x5af38c, 0x50c
 
-gUnknown_085AF898: ; 85AF898
+gUnknown_085AF898: @ 85AF898
 	.incbin "base_emerald.gba", 0x5af898, 0x50c
 
-gUnknown_085AFDA4: ; 85AFDA4
+gUnknown_085AFDA4: @ 85AFDA4
 	.incbin "base_emerald.gba", 0x5afda4, 0x50c
 
-gUnknown_085B02B0: ; 85B02B0
+gUnknown_085B02B0: @ 85B02B0
 	.incbin "base_emerald.gba", 0x5b02b0, 0x524
 
-gUnknown_085B07D4: ; 85B07D4
+gUnknown_085B07D4: @ 85B07D4
 	.incbin "base_emerald.gba", 0x5b07d4, 0x14
 
-gUnknown_085B07E8: ; 85B07E8
+gUnknown_085B07E8: @ 85B07E8
 	.incbin "base_emerald.gba", 0x5b07e8, 0x4
 
-gUnknown_085B07EC: ; 85B07EC
+gUnknown_085B07EC: @ 85B07EC
 	.incbin "base_emerald.gba", 0x5b07ec, 0x8
 
-gUnknown_085B07F4: ; 85B07F4
+gUnknown_085B07F4: @ 85B07F4
 	.incbin "base_emerald.gba", 0x5b07f4, 0x3c
 
-gUnknown_085B0830: ; 85B0830
+gUnknown_085B0830: @ 85B0830
 	.incbin "base_emerald.gba", 0x5b0830, 0x8
 
-gUnknown_085B0838: ; 85B0838
+gUnknown_085B0838: @ 85B0838
 	.incbin "base_emerald.gba", 0x5b0838, 0x4
 
-gUnknown_085B083C: ; 85B083C
+gUnknown_085B083C: @ 85B083C
 	.incbin "base_emerald.gba", 0x5b083c, 0x18c
 
-gUnknown_085B09C8: ; 85B09C8
+gUnknown_085B09C8: @ 85B09C8
 	.incbin "base_emerald.gba", 0x5b09c8, 0x1c
 
-gUnknown_085B09E4: ; 85B09E4
+gUnknown_085B09E4: @ 85B09E4
 	.incbin "base_emerald.gba", 0x5b09e4, 0x10
 
-gUnknown_085B09F4: ; 85B09F4
+gUnknown_085B09F4: @ 85B09F4
 	.incbin "base_emerald.gba", 0x5b09f4, 0x4
 
-gUnknown_085B09F8: ; 85B09F8
+gUnknown_085B09F8: @ 85B09F8
 	.incbin "base_emerald.gba", 0x5b09f8, 0x8
 
-gUnknown_085B0A00: ; 85B0A00
+gUnknown_085B0A00: @ 85B0A00
 	.incbin "base_emerald.gba", 0x5b0a00, 0x2
 
-gUnknown_085B0A02: ; 85B0A02
+gUnknown_085B0A02: @ 85B0A02
 	.incbin "base_emerald.gba", 0x5b0a02, 0x7e
 
-gUnknown_085B0A80: ; 85B0A80
+gUnknown_085B0A80: @ 85B0A80
 	.incbin "base_emerald.gba", 0x5b0a80, 0x18c
 
-gUnknown_085B0C0C: ; 85B0C0C
+gUnknown_085B0C0C: @ 85B0C0C
 	.incbin "base_emerald.gba", 0x5b0c0c, 0x1f8
 
-gUnknown_085B0E04: ; 85B0E04
+gUnknown_085B0E04: @ 85B0E04
 	.incbin "base_emerald.gba", 0x5b0e04, 0xfc8
 
-gUnknown_085B1DCC: ; 85B1DCC
+gUnknown_085B1DCC: @ 85B1DCC
 	.incbin "base_emerald.gba", 0x5b1dcc, 0x10
 
-gUnknown_085B1DDC: ; 85B1DDC
+gUnknown_085B1DDC: @ 85B1DDC
 	.incbin "base_emerald.gba", 0x5b1ddc, 0x8
 
-gUnknown_085B1DE4: ; 85B1DE4
+gUnknown_085B1DE4: @ 85B1DE4
 	.incbin "base_emerald.gba", 0x5b1de4, 0x8
 
-gUnknown_085B1DEC: ; 85B1DEC
+gUnknown_085B1DEC: @ 85B1DEC
 	.incbin "base_emerald.gba", 0x5b1dec, 0x6
 
-gUnknown_085B1DF2: ; 85B1DF2
+gUnknown_085B1DF2: @ 85B1DF2
 	.incbin "base_emerald.gba", 0x5b1df2, 0x6
 
-gUnknown_085B1DF8: ; 85B1DF8
+gUnknown_085B1DF8: @ 85B1DF8
 	.incbin "base_emerald.gba", 0x5b1df8, 0x8
 
-gUnknown_085B1E00: ; 85B1E00
+gUnknown_085B1E00: @ 85B1E00
 	.incbin "base_emerald.gba", 0x5b1e00, 0xc
 
-gUnknown_085B1E0C: ; 85B1E0C
+gUnknown_085B1E0C: @ 85B1E0C
 	.incbin "base_emerald.gba", 0x5b1e0c, 0x1c
 
-gUnknown_085B1E28: ; 85B1E28
+gUnknown_085B1E28: @ 85B1E28
 	.incbin "base_emerald.gba", 0x5b1e28, 0xa8
 
-gUnknown_085B1ED0: ; 85B1ED0
+gUnknown_085B1ED0: @ 85B1ED0
 	.incbin "base_emerald.gba", 0x5b1ed0, 0x8
 
-gUnknown_085B1ED8: ; 85B1ED8
+gUnknown_085B1ED8: @ 85B1ED8
 	.incbin "base_emerald.gba", 0x5b1ed8, 0x10
 
-gUnknown_085B1EE8: ; 85B1EE8
+gUnknown_085B1EE8: @ 85B1EE8
 	.incbin "base_emerald.gba", 0x5b1ee8, 0x10
 
-gUnknown_085B1EF8: ; 85B1EF8
+gUnknown_085B1EF8: @ 85B1EF8
 	.incbin "base_emerald.gba", 0x5b1ef8, 0x18
 
-gUnknown_085B1F10: ; 85B1F10
+gUnknown_085B1F10: @ 85B1F10
 	.incbin "base_emerald.gba", 0x5b1f10, 0x18
 
-gUnknown_085B1F28: ; 85B1F28
+gUnknown_085B1F28: @ 85B1F28
 	.incbin "base_emerald.gba", 0x5b1f28, 0x18
 
-gUnknown_085B1F40: ; 85B1F40
+gUnknown_085B1F40: @ 85B1F40
 	.incbin "base_emerald.gba", 0x5b1f40, 0x294
 
-gUnknown_085B21D4: ; 85B21D4
+gUnknown_085B21D4: @ 85B21D4
 	.incbin "base_emerald.gba", 0x5b21d4, 0x8
 
-gUnknown_085B21DC: ; 85B21DC
+gUnknown_085B21DC: @ 85B21DC
 	.incbin "base_emerald.gba", 0x5b21dc, 0x18
 
-gUnknown_085B21F4: ; 85B21F4
+gUnknown_085B21F4: @ 85B21F4
 	.incbin "base_emerald.gba", 0x5b21f4, 0x8
 
-gUnknown_085B21FC: ; 85B21FC
+gUnknown_085B21FC: @ 85B21FC
 	.incbin "base_emerald.gba", 0x5b21fc, 0xc
 
-gUnknown_085B2208: ; 85B2208
+gUnknown_085B2208: @ 85B2208
 	.incbin "base_emerald.gba", 0x5b2208, 0x10
 
-gUnknown_085B2218: ; 85B2218
+gUnknown_085B2218: @ 85B2218
 	.incbin "base_emerald.gba", 0x5b2218, 0x38
 
-gUnknown_085B2250: ; 85B2250
+gUnknown_085B2250: @ 85B2250
 	.incbin "base_emerald.gba", 0x5b2250, 0x18
 
-gUnknown_085B2268: ; 85B2268
+gUnknown_085B2268: @ 85B2268
 	.incbin "base_emerald.gba", 0x5b2268, 0x38
 
-gUnknown_085B22A0: ; 85B22A0
+gUnknown_085B22A0: @ 85B22A0
 	.incbin "base_emerald.gba", 0x5b22a0, 0x18
 
-gUnknown_085B22B8: ; 85B22B8
+gUnknown_085B22B8: @ 85B22B8
 	.incbin "base_emerald.gba", 0x5b22b8, 0x18
 
-gUnknown_085B22D0: ; 85B22D0
+gUnknown_085B22D0: @ 85B22D0
 	.incbin "base_emerald.gba", 0x5b22d0, 0x2d0
 
-gUnknown_085B25A0: ; 85B25A0
+gUnknown_085B25A0: @ 85B25A0
 	.incbin "base_emerald.gba", 0x5b25a0, 0x80
 
-gUnknown_085B2620: ; 85B2620
+gUnknown_085B2620: @ 85B2620
 	.incbin "base_emerald.gba", 0x5b2620, 0xc
 
-gUnknown_085B262C: ; 85B262C
+gUnknown_085B262C: @ 85B262C
 	.incbin "base_emerald.gba", 0x5b262c, 0x3c
 
-gUnknown_085B2668: ; 85B2668
+gUnknown_085B2668: @ 85B2668
 	.incbin "base_emerald.gba", 0x5b2668, 0x30
 
-gUnknown_085B2698: ; 85B2698
+gUnknown_085B2698: @ 85B2698
 	.incbin "base_emerald.gba", 0x5b2698, 0x3
 
-gUnknown_085B269B: ; 85B269B
+gUnknown_085B269B: @ 85B269B
 	.incbin "base_emerald.gba", 0x5b269b, 0x2
 
-gUnknown_085B269D: ; 85B269D
+gUnknown_085B269D: @ 85B269D
 	.incbin "base_emerald.gba", 0x5b269d, 0x2
 
-gUnknown_085B269F: ; 85B269F
+gUnknown_085B269F: @ 85B269F
 	.incbin "base_emerald.gba", 0x5b269f, 0x5
 
-gUnknown_085B26A4: ; 85B26A4
+gUnknown_085B26A4: @ 85B26A4
 	.incbin "base_emerald.gba", 0x5b26a4, 0x4c
 
-gUnknown_085B26F0: ; 85B26F0
+gUnknown_085B26F0: @ 85B26F0
 	.incbin "base_emerald.gba", 0x5b26f0, 0x4
 
-gUnknown_085B26F4: ; 85B26F4
+gUnknown_085B26F4: @ 85B26F4
 	.incbin "base_emerald.gba", 0x5b26f4, 0x8
 
-gUnknown_085B26FC: ; 85B26FC
+gUnknown_085B26FC: @ 85B26FC
 	.incbin "base_emerald.gba", 0x5b26fc, 0x8
 
-gUnknown_085B2704: ; 85B2704
+gUnknown_085B2704: @ 85B2704
 	.incbin "base_emerald.gba", 0x5b2704, 0x18
 
-gUnknown_085B271C: ; 85B271C
+gUnknown_085B271C: @ 85B271C
 	.incbin "base_emerald.gba", 0x5b271c, 0x4
 
-gUnknown_085B2720: ; 85B2720
+gUnknown_085B2720: @ 85B2720
 	.incbin "base_emerald.gba", 0x5b2720, 0x28
 
-gUnknown_085B2748: ; 85B2748
+gUnknown_085B2748: @ 85B2748
 	.incbin "base_emerald.gba", 0x5b2748, 0x60
 
-gUnknown_085B27A8: ; 85B27A8
+gUnknown_085B27A8: @ 85B27A8
 	.incbin "base_emerald.gba", 0x5b27a8, 0x8
 
-gUnknown_085B27B0: ; 85B27B0
+gUnknown_085B27B0: @ 85B27B0
 	.incbin "base_emerald.gba", 0x5b27b0, 0x18
 
-gUnknown_085B27C8: ; 85B27C8
+gUnknown_085B27C8: @ 85B27C8
 	.incbin "base_emerald.gba", 0x5b27c8, 0x88
 
-gUnknown_085B2850: ; 85B2850
+gUnknown_085B2850: @ 85B2850
 	.incbin "base_emerald.gba", 0x5b2850, 0x20
 
-gUnknown_085B2870: ; 85B2870
+gUnknown_085B2870: @ 85B2870
 	.incbin "base_emerald.gba", 0x5b2870, 0x20
 
-gUnknown_085B2890: ; 85B2890
+gUnknown_085B2890: @ 85B2890
 	.incbin "base_emerald.gba", 0x5b2890, 0x10
 
-gUnknown_085B28A0: ; 85B28A0
+gUnknown_085B28A0: @ 85B28A0
 	.incbin "base_emerald.gba", 0x5b28a0, 0x10
 
-gUnknown_085B28B0: ; 85B28B0
+gUnknown_085B28B0: @ 85B28B0
 	.incbin "base_emerald.gba", 0x5b28b0, 0x1e0
 
-gUnknown_085B2A90: ; 85B2A90
+gUnknown_085B2A90: @ 85B2A90
 	.incbin "base_emerald.gba", 0x5b2a90, 0xb4
 
-gUnknown_085B2B44: ; 85B2B44
+gUnknown_085B2B44: @ 85B2B44
 	.incbin "base_emerald.gba", 0x5b2b44, 0x18
 
-gUnknown_085B2B5C: ; 85B2B5C
+gUnknown_085B2B5C: @ 85B2B5C
 	.incbin "base_emerald.gba", 0x5b2b5c, 0x4
 
-gUnknown_085B2B60: ; 85B2B60
+gUnknown_085B2B60: @ 85B2B60
 	.incbin "base_emerald.gba", 0x5b2b60, 0x8
 
-gUnknown_085B2B68: ; 85B2B68
+gUnknown_085B2B68: @ 85B2B68
 	.incbin "base_emerald.gba", 0x5b2b68, 0x10
 
-gUnknown_085B2B78: ; 85B2B78
+gUnknown_085B2B78: @ 85B2B78
 	.incbin "base_emerald.gba", 0x5b2b78, 0x6
 
-gUnknown_085B2B7E: ; 85B2B7E
+gUnknown_085B2B7E: @ 85B2B7E
 	.incbin "base_emerald.gba", 0x5b2b7e, 0xa
 
-gUnknown_085B2B88: ; 85B2B88
+gUnknown_085B2B88: @ 85B2B88
 	.incbin "base_emerald.gba", 0x5b2b88, 0xc
 
-gUnknown_085B2B94: ; 85B2B94
+gUnknown_085B2B94: @ 85B2B94
 	.incbin "base_emerald.gba", 0x5b2b94, 0xc
 
-gUnknown_085B2BA0: ; 85B2BA0
+gUnknown_085B2BA0: @ 85B2BA0
 	.incbin "base_emerald.gba", 0x5b2ba0, 0xc
 
-gUnknown_085B2BAC: ; 85B2BAC
+gUnknown_085B2BAC: @ 85B2BAC
 	.incbin "base_emerald.gba", 0x5b2bac, 0x8
 
-gUnknown_085B2BB4: ; 85B2BB4
+gUnknown_085B2BB4: @ 85B2BB4
 	.incbin "base_emerald.gba", 0x5b2bb4, 0x40
 
-gUnknown_085B2BF4: ; 85B2BF4
+gUnknown_085B2BF4: @ 85B2BF4
 	.incbin "base_emerald.gba", 0x5b2bf4, 0x12
 
-gUnknown_085B2C06: ; 85B2C06
+gUnknown_085B2C06: @ 85B2C06
 	.incbin "base_emerald.gba", 0x5b2c06, 0x12
 
-gUnknown_085B2C18: ; 85B2C18
+gUnknown_085B2C18: @ 85B2C18
 	.incbin "base_emerald.gba", 0x5b2c18, 0x9
 
-gUnknown_085B2C21: ; 85B2C21
+gUnknown_085B2C21: @ 85B2C21
 	.incbin "base_emerald.gba", 0x5b2c21, 0x9
 
-gUnknown_085B2C2A: ; 85B2C2A
+gUnknown_085B2C2A: @ 85B2C2A
 	.incbin "base_emerald.gba", 0x5b2c2a, 0x26
 
-gUnknown_085B2C50: ; 85B2C50
+gUnknown_085B2C50: @ 85B2C50
 	.incbin "base_emerald.gba", 0x5b2c50, 0x78
 
-gUnknown_085B2CC8: ; 85B2CC8
+gUnknown_085B2CC8: @ 85B2CC8
 	.incbin "base_emerald.gba", 0x5b2cc8, 0x14
 
-gUnknown_085B2CDC: ; 85B2CDC
+gUnknown_085B2CDC: @ 85B2CDC
 	.incbin "base_emerald.gba", 0x5b2cdc, 0x14
 
-gUnknown_085B2CF0: ; 85B2CF0
+gUnknown_085B2CF0: @ 85B2CF0
 	.incbin "base_emerald.gba", 0x5b2cf0, 0x340
 
-gUnknown_085B3030: ; 85B3030
+gUnknown_085B3030: @ 85B3030
 	.incbin "base_emerald.gba", 0x5b3030, 0x10
 
-gUnknown_085B3040: ; 85B3040
+gUnknown_085B3040: @ 85B3040
 	.incbin "base_emerald.gba", 0x5b3040, 0x64
 
-gUnknown_085B30A4: ; 85B30A4
+gUnknown_085B30A4: @ 85B30A4
 	.incbin "base_emerald.gba", 0x5b30a4, 0x30
 
-gUnknown_085B30D4: ; 85B30D4
+gUnknown_085B30D4: @ 85B30D4
 	.incbin "base_emerald.gba", 0x5b30d4, 0x30
 
-gUnknown_085B3104: ; 85B3104
+gUnknown_085B3104: @ 85B3104
 	.incbin "base_emerald.gba", 0x5b3104, 0x18
 
-gUnknown_085B311C: ; 85B311C
+gUnknown_085B311C: @ 85B311C
 	.incbin "base_emerald.gba", 0x5b311c, 0x8
 
-gUnknown_085B3124: ; 85B3124
+gUnknown_085B3124: @ 85B3124
 	.incbin "base_emerald.gba", 0x5b3124, 0x8
 
-gUnknown_085B312C: ; 85B312C
+gUnknown_085B312C: @ 85B312C
 	.incbin "base_emerald.gba", 0x5b312c, 0x16
 
-gUnknown_085B3142: ; 85B3142
+gUnknown_085B3142: @ 85B3142
 	.incbin "base_emerald.gba", 0x5b3142, 0xc
 
-gUnknown_085B314E: ; 85B314E
+gUnknown_085B314E: @ 85B314E
 	.incbin "base_emerald.gba", 0x5b314e, 0xe
 
-gUnknown_085B315C: ; 85B315C
+gUnknown_085B315C: @ 85B315C
 	.incbin "base_emerald.gba", 0x5b315c, 0x14
 
-gUnknown_085B3170: ; 85B3170
+gUnknown_085B3170: @ 85B3170
 	.incbin "base_emerald.gba", 0x5b3170, 0x2c
 
-gUnknown_085B319C: ; 85B319C
+gUnknown_085B319C: @ 85B319C
 	.incbin "base_emerald.gba", 0x5b319c, 0x18
 
-gUnknown_085B31B4: ; 85B31B4
+gUnknown_085B31B4: @ 85B31B4
 	.incbin "base_emerald.gba", 0x5b31b4, 0x1c
 
-gUnknown_085B31D0: ; 85B31D0
+gUnknown_085B31D0: @ 85B31D0
 	.incbin "base_emerald.gba", 0x5b31d0, 0x28
 
-gUnknown_085B31F8: ; 85B31F8
+gUnknown_085B31F8: @ 85B31F8
 	.incbin "base_emerald.gba", 0x5b31f8, 0x14
 
-gUnknown_085B320C: ; 85B320C
+gUnknown_085B320C: @ 85B320C
 	.incbin "base_emerald.gba", 0x5b320c, 0x14
 
-gUnknown_085B3220: ; 85B3220
+gUnknown_085B3220: @ 85B3220
 	.incbin "base_emerald.gba", 0x5b3220, 0x8
 
-gUnknown_085B3228: ; 85B3228
+gUnknown_085B3228: @ 85B3228
 	.incbin "base_emerald.gba", 0x5b3228, 0x2c
 
-gUnknown_085B3254: ; 85B3254
+gUnknown_085B3254: @ 85B3254
 	.incbin "base_emerald.gba", 0x5b3254, 0x2c
 
-gUnknown_085B3280: ; 85B3280
+gUnknown_085B3280: @ 85B3280
 	.incbin "base_emerald.gba", 0x5b3280, 0x160
 
-gUnknown_085B33E0: ; 85B33E0
+gUnknown_085B33E0: @ 85B33E0
 	.incbin "base_emerald.gba", 0x5b33e0, 0x16
 
-gUnknown_085B33F6: ; 85B33F6
+gUnknown_085B33F6: @ 85B33F6
 	.incbin "base_emerald.gba", 0x5b33f6, 0xa
 
-gUnknown_085B3400: ; 85B3400
+gUnknown_085B3400: @ 85B3400
 	.incbin "base_emerald.gba", 0x5b3400, 0x10
 
-gUnknown_085B3410: ; 85B3410
+gUnknown_085B3410: @ 85B3410
 	.incbin "base_emerald.gba", 0x5b3410, 0x10
 
-gUnknown_085B3420: ; 85B3420
+gUnknown_085B3420: @ 85B3420
 	.incbin "base_emerald.gba", 0x5b3420, 0x24
 
-gUnknown_085B3444: ; 85B3444
+gUnknown_085B3444: @ 85B3444
 	.incbin "base_emerald.gba", 0x5b3444, 0x2c
 
-gUnknown_085B3470: ; 85B3470
+gUnknown_085B3470: @ 85B3470
 	.incbin "base_emerald.gba", 0x5b3470, 0x4
 
-gUnknown_085B3474: ; 85B3474
+gUnknown_085B3474: @ 85B3474
 	.incbin "base_emerald.gba", 0x5b3474, 0x8
 
-gUnknown_085B347C: ; 85B347C
+gUnknown_085B347C: @ 85B347C
 	.incbin "base_emerald.gba", 0x5b347c, 0x8
 
-gUnknown_085B3484: ; 85B3484
+gUnknown_085B3484: @ 85B3484
 	.incbin "base_emerald.gba", 0x5b3484, 0xc0
 
-gUnknown_085B3544: ; 85B3544
+gUnknown_085B3544: @ 85B3544
 	.incbin "base_emerald.gba", 0x5b3544, 0x20
 
-gUnknown_085B3564: ; 85B3564
+gUnknown_085B3564: @ 85B3564
 	.incbin "base_emerald.gba", 0x5b3564, 0x800
 
-gUnknown_085B3D64: ; 85B3D64
+gUnknown_085B3D64: @ 85B3D64
 	.incbin "base_emerald.gba", 0x5b3d64, 0x8
 
-gUnknown_085B3D6C: ; 85B3D6C
+gUnknown_085B3D6C: @ 85B3D6C
 	.incbin "base_emerald.gba", 0x5b3d6c, 0x10
 
-gUnknown_085B3D7C: ; 85B3D7C
+gUnknown_085B3D7C: @ 85B3D7C
 	.incbin "base_emerald.gba", 0x5b3d7c, 0x8
 
-gUnknown_085B3D84: ; 85B3D84
+gUnknown_085B3D84: @ 85B3D84
 	.incbin "base_emerald.gba", 0x5b3d84, 0x8
 
-gUnknown_085B3D8C: ; 85B3D8C
+gUnknown_085B3D8C: @ 85B3D8C
 	.incbin "base_emerald.gba", 0x5b3d8c, 0x8
 
-gUnknown_085B3D94: ; 85B3D94
+gUnknown_085B3D94: @ 85B3D94
 	.incbin "base_emerald.gba", 0x5b3d94, 0x20
 
-gUnknown_085B3DB4: ; 85B3DB4
+gUnknown_085B3DB4: @ 85B3DB4
 	.incbin "base_emerald.gba", 0x5b3db4, 0x134
 
-gUnknown_085B3EE8: ; 85B3EE8
+gUnknown_085B3EE8: @ 85B3EE8
 	.incbin "base_emerald.gba", 0x5b3ee8, 0x2
 
-gUnknown_085B3EEA: ; 85B3EEA
+gUnknown_085B3EEA: @ 85B3EEA
 	.incbin "base_emerald.gba", 0x5b3eea, 0x6
 
-gUnknown_085B3EF0: ; 85B3EF0
+gUnknown_085B3EF0: @ 85B3EF0
 	.incbin "base_emerald.gba", 0x5b3ef0, 0xc
 
-gUnknown_085B3EFC: ; 85B3EFC
+gUnknown_085B3EFC: @ 85B3EFC
 	.incbin "base_emerald.gba", 0x5b3efc, 0x1c
 
-gUnknown_085B3F18: ; 85B3F18
+gUnknown_085B3F18: @ 85B3F18
 	.incbin "base_emerald.gba", 0x5b3f18, 0x100
 
-gUnknown_085B4018: ; 85B4018
+gUnknown_085B4018: @ 85B4018
 	.incbin "base_emerald.gba", 0x5b4018, 0x4
 
-gUnknown_085B401C: ; 85B401C
+gUnknown_085B401C: @ 85B401C
 	.incbin "base_emerald.gba", 0x5b401c, 0x8
 
-gUnknown_085B4024: ; 85B4024
+gUnknown_085B4024: @ 85B4024
 	.incbin "base_emerald.gba", 0x5b4024, 0x10
 
-gUnknown_085B4034: ; 85B4034
+gUnknown_085B4034: @ 85B4034
 	.incbin "base_emerald.gba", 0x5b4034, 0xb8
 
-gUnknown_085B40EC: ; 85B40EC
+gUnknown_085B40EC: @ 85B40EC
 	.incbin "base_emerald.gba", 0x5b40ec, 0x10
 
-gUnknown_085B40FC: ; 85B40FC
+gUnknown_085B40FC: @ 85B40FC
 	.incbin "base_emerald.gba", 0x5b40fc, 0x38
 
-gUnknown_085B4134: ; 85B4134
+gUnknown_085B4134: @ 85B4134
 	.incbin "base_emerald.gba", 0x5b4134, 0x6f8
 
-gUnknown_085B482C: ; 85B482C
+gUnknown_085B482C: @ 85B482C
 	.incbin "base_emerald.gba", 0x5b482c, 0x4e4
 
-gUnknown_085B4D10: ; 85B4D10
+gUnknown_085B4D10: @ 85B4D10
 	.incbin "base_emerald.gba", 0x5b4d10, 0x4d4
 
-gUnknown_085B51E4: ; 85B51E4
+gUnknown_085B51E4: @ 85B51E4
 	.incbin "base_emerald.gba", 0x5b51e4, 0x6a0
 
-gUnknown_085B5884: ; 85B5884
+gUnknown_085B5884: @ 85B5884
 	.incbin "base_emerald.gba", 0x5b5884, 0x40
 
-gUnknown_085B58C4: ; 85B58C4
+gUnknown_085B58C4: @ 85B58C4
 	.incbin "base_emerald.gba", 0x5b58c4, 0x5
 
-gUnknown_085B58C9: ; 85B58C9
+gUnknown_085B58C9: @ 85B58C9
 	.incbin "base_emerald.gba", 0x5b58c9, 0x10
 
-gUnknown_085B58D9: ; 85B58D9
+gUnknown_085B58D9: @ 85B58D9
 	.incbin "base_emerald.gba", 0x5b58d9, 0x323
 
-gUnknown_085B5BFC: ; 85B5BFC
+gUnknown_085B5BFC: @ 85B5BFC
 	.incbin "base_emerald.gba", 0x5b5bfc, 0x200
 
-gUnknown_085B5DFC: ; 85B5DFC
+gUnknown_085B5DFC: @ 85B5DFC
 	.incbin "base_emerald.gba", 0x5b5dfc, 0x1a4
 
-gUnknown_085B5FA0: ; 85B5FA0
+gUnknown_085B5FA0: @ 85B5FA0
 	.incbin "base_emerald.gba", 0x5b5fa0, 0x1a0
 
-gUnknown_085B6140: ; 85B6140
+gUnknown_085B6140: @ 85B6140
 	.incbin "base_emerald.gba", 0x5b6140, 0xc
 
-gUnknown_085B614C: ; 85B614C
+gUnknown_085B614C: @ 85B614C
 	.incbin "base_emerald.gba", 0x5b614c, 0x8
 
-gUnknown_085B6154: ; 85B6154
+gUnknown_085B6154: @ 85B6154
 	.incbin "base_emerald.gba", 0x5b6154, 0xc
 
-gUnknown_085B6160: ; 85B6160
+gUnknown_085B6160: @ 85B6160
 	.incbin "base_emerald.gba", 0x5b6160, 0x184
 
-gUnknown_085B62E4: ; 85B62E4
+gUnknown_085B62E4: @ 85B62E4
 	.incbin "base_emerald.gba", 0x5b62e4, 0x4
 
-gUnknown_085B62E8: ; 85B62E8
+gUnknown_085B62E8: @ 85B62E8
 	.incbin "base_emerald.gba", 0x5b62e8, 0x5c
 
-gUnknown_085B6344: ; 85B6344
+gUnknown_085B6344: @ 85B6344
 	.incbin "base_emerald.gba", 0x5b6344, 0x4
 
-gUnknown_085B6348: ; 85B6348
+gUnknown_085B6348: @ 85B6348
 	.incbin "base_emerald.gba", 0x5b6348, 0x40
 
-gUnknown_085B6388: ; 85B6388
+gUnknown_085B6388: @ 85B6388
 	.incbin "base_emerald.gba", 0x5b6388, 0x68
 
-gUnknown_085B63F0: ; 85B63F0
+gUnknown_085B63F0: @ 85B63F0
 	.incbin "base_emerald.gba", 0x5b63f0, 0x18
 
-gUnknown_085B6408: ; 85B6408
+gUnknown_085B6408: @ 85B6408
 	.incbin "base_emerald.gba", 0x5b6408, 0x8
 
-gUnknown_085B6410: ; 85B6410
+gUnknown_085B6410: @ 85B6410
 	.incbin "base_emerald.gba", 0x5b6410, 0x8
 
-gUnknown_085B6418: ; 85B6418
+gUnknown_085B6418: @ 85B6418
 	.incbin "base_emerald.gba", 0x5b6418, 0x6
 
-gUnknown_085B641E: ; 85B641E
+gUnknown_085B641E: @ 85B641E
 	.incbin "base_emerald.gba", 0x5b641e, 0x4
 
-gUnknown_085B6422: ; 85B6422
+gUnknown_085B6422: @ 85B6422
 	.incbin "base_emerald.gba", 0x5b6422, 0xa
 
-gUnknown_085B642C: ; 85B642C
+gUnknown_085B642C: @ 85B642C
 	.incbin "base_emerald.gba", 0x5b642c, 0x10
 
-gUnknown_085B643C: ; 85B643C
+gUnknown_085B643C: @ 85B643C
 	.incbin "base_emerald.gba", 0x5b643c, 0xc
 
-gUnknown_085B6448: ; 85B6448
+gUnknown_085B6448: @ 85B6448
 	.incbin "base_emerald.gba", 0x5b6448, 0xf3c
 
-gUnknown_085B7384: ; 85B7384
+gUnknown_085B7384: @ 85B7384
 	.incbin "base_emerald.gba", 0x5b7384, 0x98
 
-gUnknown_085B741C: ; 85B741C
+gUnknown_085B741C: @ 85B741C
 	.incbin "base_emerald.gba", 0x5b741c, 0x6c
 
-gUnknown_085B7488: ; 85B7488
+gUnknown_085B7488: @ 85B7488
 	.incbin "base_emerald.gba", 0x5b7488, 0x8
 
-gUnknown_085B7490: ; 85B7490
+gUnknown_085B7490: @ 85B7490
 	.incbin "base_emerald.gba", 0x5b7490, 0x78
 
-gUnknown_085B7508: ; 85B7508
+gUnknown_085B7508: @ 85B7508
 	.incbin "base_emerald.gba", 0x5b7508, 0x60
 
-gUnknown_085B7568: ; 85B7568
+gUnknown_085B7568: @ 85B7568
 	.incbin "base_emerald.gba", 0x5b7568, 0x48
 
-gUnknown_085B75B0: ; 85B75B0
+gUnknown_085B75B0: @ 85B75B0
 	.incbin "base_emerald.gba", 0x5b75b0, 0x60
 
-gUnknown_085B7610: ; 85B7610
+gUnknown_085B7610: @ 85B7610
 	.incbin "base_emerald.gba", 0x5b7610, 0x140
 
-gUnknown_085B7750: ; 85B7750
+gUnknown_085B7750: @ 85B7750
 	.incbin "base_emerald.gba", 0x5b7750, 0x94
 
-gUnknown_085B77E4: ; 85B77E4
+gUnknown_085B77E4: @ 85B77E4
 	.incbin "base_emerald.gba", 0x5b77e4, 0x18
 
-gUnknown_085B77FC: ; 85B77FC
+gUnknown_085B77FC: @ 85B77FC
 	.incbin "base_emerald.gba", 0x5b77fc, 0x18
 
-gUnknown_085B7814: ; 85B7814
+gUnknown_085B7814: @ 85B7814
 	.incbin "base_emerald.gba", 0x5b7814, 0x18
 
-gUnknown_085B782C: ; 85B782C
+gUnknown_085B782C: @ 85B782C
 	.incbin "base_emerald.gba", 0x5b782c, 0x18
 
-gUnknown_085B7844: ; 85B7844
+gUnknown_085B7844: @ 85B7844
 	.incbin "base_emerald.gba", 0x5b7844, 0x20
 
-gUnknown_085B7864: ; 85B7864
+gUnknown_085B7864: @ 85B7864
 	.incbin "base_emerald.gba", 0x5b7864, 0xc4
 
-gUnknown_085B7928: ; 85B7928
+gUnknown_085B7928: @ 85B7928
 	.incbin "base_emerald.gba", 0x5b7928, 0x20
 
-gUnknown_085B7948: ; 85B7948
+gUnknown_085B7948: @ 85B7948
 	.incbin "base_emerald.gba", 0x5b7948, 0x8
 
-gUnknown_085B7950: ; 85B7950
+gUnknown_085B7950: @ 85B7950
 	.incbin "base_emerald.gba", 0x5b7950, 0x28
 
-gUnknown_085B7978: ; 85B7978
+gUnknown_085B7978: @ 85B7978
 	.incbin "base_emerald.gba", 0x5b7978, 0x80
 
-gUnknown_085B79F8: ; 85B79F8
+gUnknown_085B79F8: @ 85B79F8
 	.incbin "base_emerald.gba", 0x5b79f8, 0x18
 
-gUnknown_085B7A10: ; 85B7A10
+gUnknown_085B7A10: @ 85B7A10
 	.incbin "base_emerald.gba", 0x5b7a10, 0x30
 
-gUnknown_085B7A40: ; 85B7A40
+gUnknown_085B7A40: @ 85B7A40
 	.incbin "base_emerald.gba", 0x5b7a40, 0x7c
 
-gUnknown_085B7ABC: ; 85B7ABC
+gUnknown_085B7ABC: @ 85B7ABC
 	.incbin "base_emerald.gba", 0x5b7abc, 0x30
 
-gUnknown_085B7AEC: ; 85B7AEC
+gUnknown_085B7AEC: @ 85B7AEC
 	.incbin "base_emerald.gba", 0x5b7aec, 0x18
 
-gUnknown_085B7B04: ; 85B7B04
+gUnknown_085B7B04: @ 85B7B04
 	.incbin "base_emerald.gba", 0x5b7b04, 0x6
 
-gUnknown_085B7B0A: ; 85B7B0A
+gUnknown_085B7B0A: @ 85B7B0A
 	.incbin "base_emerald.gba", 0x5b7b0a, 0x8
 
-gUnknown_085B7B12: ; 85B7B12
+gUnknown_085B7B12: @ 85B7B12
 	.incbin "base_emerald.gba", 0x5b7b12, 0x8
 
-gUnknown_085B7B1A: ; 85B7B1A
+gUnknown_085B7B1A: @ 85B7B1A
 	.incbin "base_emerald.gba", 0x5b7b1a, 0x14
 
-gUnknown_085B7B2E: ; 85B7B2E
+gUnknown_085B7B2E: @ 85B7B2E
 	.incbin "base_emerald.gba", 0x5b7b2e, 0x18
 
-gUnknown_085B7B46: ; 85B7B46
+gUnknown_085B7B46: @ 85B7B46
 	.incbin "base_emerald.gba", 0x5b7b46, 0x2
 
-gUnknown_085B7B48: ; 85B7B48
+gUnknown_085B7B48: @ 85B7B48
 	.incbin "base_emerald.gba", 0x5b7b48, 0x8d0
 
-gUnknown_085B8418: ; 85B8418
+gUnknown_085B8418: @ 85B8418
 	.incbin "base_emerald.gba", 0x5b8418, 0x20
 
-gUnknown_085B8438: ; 85B8438
+gUnknown_085B8438: @ 85B8438
 	.incbin "base_emerald.gba", 0x5b8438, 0x338
 
-gUnknown_085B8770: ; 85B8770
+gUnknown_085B8770: @ 85B8770
 	.incbin "base_emerald.gba", 0x5b8770, 0x480
 
-gUnknown_085B8BF0: ; 85B8BF0
+gUnknown_085B8BF0: @ 85B8BF0
 	.incbin "base_emerald.gba", 0x5b8bf0, 0x20
 
-gUnknown_085B8C10: ; 85B8C10
+gUnknown_085B8C10: @ 85B8C10
 	.incbin "base_emerald.gba", 0x5b8c10, 0x20
 
-gUnknown_085B8C30: ; 85B8C30
+gUnknown_085B8C30: @ 85B8C30
 	.incbin "base_emerald.gba", 0x5b8c30, 0x2
 
-gUnknown_085B8C32: ; 85B8C32
+gUnknown_085B8C32: @ 85B8C32
 	.incbin "base_emerald.gba", 0x5b8c32, 0x36
 
-gUnknown_085B8C68: ; 85B8C68
+gUnknown_085B8C68: @ 85B8C68
 	.incbin "base_emerald.gba", 0x5b8c68, 0x18
 
-gUnknown_085B8C80: ; 85B8C80
+gUnknown_085B8C80: @ 85B8C80
 	.incbin "base_emerald.gba", 0x5b8c80, 0x10
 
-gUnknown_085B8C90: ; 85B8C90
+gUnknown_085B8C90: @ 85B8C90
 	.incbin "base_emerald.gba", 0x5b8c90, 0x528
 
-gUnknown_085B91B8: ; 85B91B8
+gUnknown_085B91B8: @ 85B91B8
 	.incbin "base_emerald.gba", 0x5b91b8, 0x178
 
-gUnknown_085B9330: ; 85B9330
+gUnknown_085B9330: @ 85B9330
 	.incbin "base_emerald.gba", 0x5b9330, 0x580
 
-gUnknown_085B98B0: ; 85B98B0
+gUnknown_085B98B0: @ 85B98B0
 	.incbin "base_emerald.gba", 0x5b98b0, 0x240
 
-gUnknown_085B9AF0: ; 85B9AF0
+gUnknown_085B9AF0: @ 85B9AF0
 	.incbin "base_emerald.gba", 0x5b9af0, 0x11e0
 
-gUnknown_085BACD0: ; 85BACD0
+gUnknown_085BACD0: @ 85BACD0
 	.incbin "base_emerald.gba", 0x5bacd0, 0x1e0
 
-gUnknown_085BAEB0: ; 85BAEB0
+gUnknown_085BAEB0: @ 85BAEB0
 	.incbin "base_emerald.gba", 0x5baeb0, 0x20
 
-gUnknown_085BAED0: ; 85BAED0
+gUnknown_085BAED0: @ 85BAED0
 	.incbin "base_emerald.gba", 0x5baed0, 0x378
 
-gUnknown_085BB248: ; 85BB248
+gUnknown_085BB248: @ 85BB248
 	.incbin "base_emerald.gba", 0x5bb248, 0x25c
 
-gUnknown_085BB4A4: ; 85BB4A4
+gUnknown_085BB4A4: @ 85BB4A4
 	.incbin "base_emerald.gba", 0x5bb4a4, 0x48c
 
-gUnknown_085BB930: ; 85BB930
+gUnknown_085BB930: @ 85BB930
 	.incbin "base_emerald.gba", 0x5bb930, 0x2e4
 
-gUnknown_085BBC14: ; 85BBC14
+gUnknown_085BBC14: @ 85BBC14
 	.incbin "base_emerald.gba", 0x5bbc14, 0x6a0
 
-gUnknown_085BC2B4: ; 85BC2B4
+gUnknown_085BC2B4: @ 85BC2B4
 	.incbin "base_emerald.gba", 0x5bc2b4, 0x20
 
-gUnknown_085BC2D4: ; 85BC2D4
+gUnknown_085BC2D4: @ 85BC2D4
 	.incbin "base_emerald.gba", 0x5bc2d4, 0x20
 
-gUnknown_085BC2F4: ; 85BC2F4
+gUnknown_085BC2F4: @ 85BC2F4
 	.incbin "base_emerald.gba", 0x5bc2f4, 0x20
 
-gUnknown_085BC314: ; 85BC314
+gUnknown_085BC314: @ 85BC314
 	.incbin "base_emerald.gba", 0x5bc314, 0x800
 
-gUnknown_085BCB14: ; 85BCB14
+gUnknown_085BCB14: @ 85BCB14
 	.incbin "base_emerald.gba", 0x5bcb14, 0x800
 
-gUnknown_085BD314: ; 85BD314
+gUnknown_085BD314: @ 85BD314
 	.incbin "base_emerald.gba", 0x5bd314, 0x820
 
-gUnknown_085BDB34: ; 85BDB34
+gUnknown_085BDB34: @ 85BDB34
 	.incbin "base_emerald.gba", 0x5bdb34, 0x6b4
 
-gUnknown_085BE1E8: ; 85BE1E8
+gUnknown_085BE1E8: @ 85BE1E8
 	.incbin "base_emerald.gba", 0x5be1e8, 0x334
 
-gUnknown_085BE51C: ; 85BE51C
+gUnknown_085BE51C: @ 85BE51C
 	.incbin "base_emerald.gba", 0x5be51c, 0x56c
 
-gUnknown_085BEA88: ; 85BEA88
+gUnknown_085BEA88: @ 85BEA88
 	.incbin "base_emerald.gba", 0x5bea88, 0x318
 
-gUnknown_085BEDA0: ; 85BEDA0
+gUnknown_085BEDA0: @ 85BEDA0
 	.incbin "base_emerald.gba", 0x5beda0, 0x140
 
-gUnknown_085BEEE0: ; 85BEEE0
+gUnknown_085BEEE0: @ 85BEEE0
 	.incbin "base_emerald.gba", 0x5beee0, 0x1c0
 
-gUnknown_085BF0A0: ; 85BF0A0
+gUnknown_085BF0A0: @ 85BF0A0
 	.incbin "base_emerald.gba", 0x5bf0a0, 0x200
 
-gUnknown_085BF2A0: ; 85BF2A0
+gUnknown_085BF2A0: @ 85BF2A0
 	.incbin "base_emerald.gba", 0x5bf2a0, 0x200
 
-gUnknown_085BF4A0: ; 85BF4A0
+gUnknown_085BF4A0: @ 85BF4A0
 	.incbin "base_emerald.gba", 0x5bf4a0, 0xa0
 
-gUnknown_085BF540: ; 85BF540
+gUnknown_085BF540: @ 85BF540
 	.incbin "base_emerald.gba", 0x5bf540, 0x160
 
-gUnknown_085BF6A0: ; 85BF6A0
+gUnknown_085BF6A0: @ 85BF6A0
 	.incbin "base_emerald.gba", 0x5bf6a0, 0x7540
 
-gUnknown_085C6BE0: ; 85C6BE0
+gUnknown_085C6BE0: @ 85C6BE0
 	.incbin "base_emerald.gba", 0x5c6be0, 0x1000
 
-gUnknown_085C7BE0: ; 85C7BE0
+gUnknown_085C7BE0: @ 85C7BE0
 	.incbin "base_emerald.gba", 0x5c7be0, 0x20
 
-gUnknown_085C7C00: ; 85C7C00
+gUnknown_085C7C00: @ 85C7C00
 	.incbin "base_emerald.gba", 0x5c7c00, 0x68c
 
-gUnknown_085C828C: ; 85C828C
+gUnknown_085C828C: @ 85C828C
 	.incbin "base_emerald.gba", 0x5c828c, 0x2ec
 
-gUnknown_085C8578: ; 85C8578
+gUnknown_085C8578: @ 85C8578
 	.incbin "base_emerald.gba", 0x5c8578, 0x20
 
-gUnknown_085C8598: ; 85C8598
+gUnknown_085C8598: @ 85C8598
 	.incbin "base_emerald.gba", 0x5c8598, 0x15c
 
-gUnknown_085C86F4: ; 85C86F4
+gUnknown_085C86F4: @ 85C86F4
 	.incbin "base_emerald.gba", 0x5c86f4, 0x100
 
-gUnknown_085C87F4: ; 85C87F4
+gUnknown_085C87F4: @ 85C87F4
 	.incbin "base_emerald.gba", 0x5c87f4, 0xb0
 
-gUnknown_085C88A4: ; 85C88A4
+gUnknown_085C88A4: @ 85C88A4
 	.incbin "base_emerald.gba", 0x5c88a4, 0x84
 
-gUnknown_085C8928: ; 85C8928
+gUnknown_085C8928: @ 85C8928
 	.incbin "base_emerald.gba", 0x5c8928, 0x20
 
-gUnknown_085C8948: ; 85C8948
+gUnknown_085C8948: @ 85C8948
 	.incbin "base_emerald.gba", 0x5c8948, 0xa8
 
-gUnknown_085C89F0: ; 85C89F0
+gUnknown_085C89F0: @ 85C89F0
 	.incbin "base_emerald.gba", 0x5c89f0, 0xa8
 
-gUnknown_085C8A98: ; 85C8A98
+gUnknown_085C8A98: @ 85C8A98
 	.incbin "base_emerald.gba", 0x5c8a98, 0x10
 
-gUnknown_085C8AA8: ; 85C8AA8
+gUnknown_085C8AA8: @ 85C8AA8
 	.incbin "base_emerald.gba", 0x5c8aa8, 0xc
 
-gUnknown_085C8AB4: ; 85C8AB4
+gUnknown_085C8AB4: @ 85C8AB4
 	.incbin "base_emerald.gba", 0x5c8ab4, 0x8
 
-gUnknown_085C8ABC: ; 85C8ABC
+gUnknown_085C8ABC: @ 85C8ABC
 	.incbin "base_emerald.gba", 0x5c8abc, 0x8
 
-gUnknown_085C8AC4: ; 85C8AC4
+gUnknown_085C8AC4: @ 85C8AC4
 	.incbin "base_emerald.gba", 0x5c8ac4, 0x1c
 
-gUnknown_085C8AE0: ; 85C8AE0
+gUnknown_085C8AE0: @ 85C8AE0
 	.incbin "base_emerald.gba", 0x5c8ae0, 0x1c
 
-gUnknown_085C8AFC: ; 85C8AFC
+gUnknown_085C8AFC: @ 85C8AFC
 	.incbin "base_emerald.gba", 0x5c8afc, 0x18
 
-gUnknown_085C8B14: ; 85C8B14
+gUnknown_085C8B14: @ 85C8B14
 	.incbin "base_emerald.gba", 0x5c8b14, 0x18
 
-gUnknown_085C8B2C: ; 85C8B2C
+gUnknown_085C8B2C: @ 85C8B2C
 	.incbin "base_emerald.gba", 0x5c8b2c, 0x18
 
-gUnknown_085C8B44: ; 85C8B44
+gUnknown_085C8B44: @ 85C8B44
 	.incbin "base_emerald.gba", 0x5c8b44, 0x18
 
-gUnknown_085C8B5C: ; 85C8B5C
+gUnknown_085C8B5C: @ 85C8B5C
 	.incbin "base_emerald.gba", 0x5c8b5c, 0x20
 
-gUnknown_085C8B7C: ; 85C8B7C
+gUnknown_085C8B7C: @ 85C8B7C
 	.incbin "base_emerald.gba", 0x5c8b7c, 0xc
 
-gUnknown_085C8B88: ; 85C8B88
+gUnknown_085C8B88: @ 85C8B88
 	.incbin "base_emerald.gba", 0x5c8b88, 0x4
 
-gUnknown_085C8B8C: ; 85C8B8C
+gUnknown_085C8B8C: @ 85C8B8C
 	.incbin "base_emerald.gba", 0x5c8b8c, 0xa
 
-gUnknown_085C8B96: ; 85C8B96
+gUnknown_085C8B96: @ 85C8B96
 	.incbin "base_emerald.gba", 0x5c8b96, 0x6
 
-gUnknown_085C8B9C: ; 85C8B9C
+gUnknown_085C8B9C: @ 85C8B9C
 	.incbin "base_emerald.gba", 0x5c8b9c, 0x1c
 
-gUnknown_085C8BB8: ; 85C8BB8
+gUnknown_085C8BB8: @ 85C8BB8
 	.incbin "base_emerald.gba", 0x5c8bb8, 0x8
 
-gUnknown_085C8BC0: ; 85C8BC0
+gUnknown_085C8BC0: @ 85C8BC0
 	.incbin "base_emerald.gba", 0x5c8bc0, 0xc
 
-gUnknown_085C8BCC: ; 85C8BCC
+gUnknown_085C8BCC: @ 85C8BCC
 	.incbin "base_emerald.gba", 0x5c8bcc, 0x28
 
-gUnknown_085C8BF4: ; 85C8BF4
+gUnknown_085C8BF4: @ 85C8BF4
 	.incbin "base_emerald.gba", 0x5c8bf4, 0x6
 
-gUnknown_085C8BFA: ; 85C8BFA
+gUnknown_085C8BFA: @ 85C8BFA
 	.incbin "base_emerald.gba", 0x5c8bfa, 0x14
 
-gUnknown_085C8C0E: ; 85C8C0E
+gUnknown_085C8C0E: @ 85C8C0E
 	.incbin "base_emerald.gba", 0x5c8c0e, 0x16
 
-gUnknown_085C8C24: ; 85C8C24
+gUnknown_085C8C24: @ 85C8C24
 	.incbin "base_emerald.gba", 0x5c8c24, 0x1c
 
-gUnknown_085C8C40: ; 85C8C40
+gUnknown_085C8C40: @ 85C8C40
 	.incbin "base_emerald.gba", 0x5c8c40, 0x4
 
-gUnknown_085C8C44: ; 85C8C44
+gUnknown_085C8C44: @ 85C8C44
 	.incbin "base_emerald.gba", 0x5c8c44, 0x4
 
-gUnknown_085C8C48: ; 85C8C48
+gUnknown_085C8C48: @ 85C8C48
 	.incbin "base_emerald.gba", 0x5c8c48, 0xc
 
-gUnknown_085C8C54: ; 85C8C54
+gUnknown_085C8C54: @ 85C8C54
 	.incbin "base_emerald.gba", 0x5c8c54, 0x10
 
-gUnknown_085C8C64: ; 85C8C64
+gUnknown_085C8C64: @ 85C8C64
 	.incbin "base_emerald.gba", 0x5c8c64, 0x2
 
-gUnknown_085C8C66: ; 85C8C66
+gUnknown_085C8C66: @ 85C8C66
 	.incbin "base_emerald.gba", 0x5c8c66, 0x6
 
-gUnknown_085C8C6C: ; 85C8C6C
+gUnknown_085C8C6C: @ 85C8C6C
 	.incbin "base_emerald.gba", 0x5c8c6c, 0xc
 
-gUnknown_085C8C78: ; 85C8C78
+gUnknown_085C8C78: @ 85C8C78
 	.incbin "base_emerald.gba", 0x5c8c78, 0x8
 
-gUnknown_085C8C80: ; 85C8C80
+gUnknown_085C8C80: @ 85C8C80
 	.incbin "base_emerald.gba", 0x5c8c80, 0x4
 
-gUnknown_085C8C84: ; 85C8C84
+gUnknown_085C8C84: @ 85C8C84
 	.incbin "base_emerald.gba", 0x5c8c84, 0xb4
 
-gUnknown_085C8D38: ; 85C8D38
+gUnknown_085C8D38: @ 85C8D38
 	.incbin "base_emerald.gba", 0x5c8d38, 0x8
 
-gUnknown_085C8D40: ; 85C8D40
+gUnknown_085C8D40: @ 85C8D40
 	.incbin "base_emerald.gba", 0x5c8d40, 0x20
 
-gUnknown_085C8D60: ; 85C8D60
+gUnknown_085C8D60: @ 85C8D60
 	.incbin "base_emerald.gba", 0x5c8d60, 0x2c
 
-gUnknown_085C8D8C: ; 85C8D8C
+gUnknown_085C8D8C: @ 85C8D8C
 	.incbin "base_emerald.gba", 0x5c8d8c, 0x14
 
-gUnknown_085C8DA0: ; 85C8DA0
+gUnknown_085C8DA0: @ 85C8DA0
 	.incbin "base_emerald.gba", 0x5c8da0, 0x10
 
-gUnknown_085C8DB0: ; 85C8DB0
+gUnknown_085C8DB0: @ 85C8DB0
 	.incbin "base_emerald.gba", 0x5c8db0, 0xc
 
-gUnknown_085C8DBC: ; 85C8DBC
+gUnknown_085C8DBC: @ 85C8DBC
 	.incbin "base_emerald.gba", 0x5c8dbc, 0x14
 
-gUnknown_085C8DD0: ; 85C8DD0
+gUnknown_085C8DD0: @ 85C8DD0
 	.incbin "base_emerald.gba", 0x5c8dd0, 0x46
 
-gUnknown_085C8E16: ; 85C8E16
+gUnknown_085C8E16: @ 85C8E16
 	.incbin "base_emerald.gba", 0x5c8e16, 0xe
 
-gUnknown_085C8E24: ; 85C8E24
+gUnknown_085C8E24: @ 85C8E24
 	.incbin "base_emerald.gba", 0x5c8e24, 0x44
 
-gUnknown_085C8E68: ; 85C8E68
+gUnknown_085C8E68: @ 85C8E68
 	.incbin "base_emerald.gba", 0x5c8e68, 0x6c
 
 	.align 2, 0
 
-gFieldEffectObjectPalette10: ; 85C8ED4
+gFieldEffectObjectPalette10: @ 85C8ED4
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_10.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo10: ; 85C8EF4
+gFieldEffectObjectPaletteInfo10: @ 85C8EF4
 	obj_pal gFieldEffectObjectPalette10, 0x1009
 
 	.incbin "base_emerald.gba", 0x5c8efc, 0xe0
 
-gUnknown_085C8FDC: ; 85C8FDC
+gUnknown_085C8FDC: @ 85C8FDC
 	.incbin "base_emerald.gba", 0x5c8fdc, 0x14
 
-gUnknown_085C8FF0: ; 85C8FF0
+gUnknown_085C8FF0: @ 85C8FF0
 	.incbin "base_emerald.gba", 0x5c8ff0, 0x30
 
-gUnknown_085C9020: ; 85C9020
+gUnknown_085C9020: @ 85C9020
 	.incbin "base_emerald.gba", 0x5c9020, 0x4b0
 
-gUnknown_085C94D0: ; 85C94D0
+gUnknown_085C94D0: @ 85C94D0
 	.incbin "base_emerald.gba", 0x5c94d0, 0x500
 
-gUnknown_085C99D0: ; 85C99D0
+gUnknown_085C99D0: @ 85C99D0
 	.incbin "base_emerald.gba", 0x5c99d0, 0x18
 
-gUnknown_085C99E8: ; 85C99E8
+gUnknown_085C99E8: @ 85C99E8
 	.incbin "base_emerald.gba", 0x5c99e8, 0x10
 
-gUnknown_085C99F8: ; 85C99F8
+gUnknown_085C99F8: @ 85C99F8
 	.incbin "base_emerald.gba", 0x5c99f8, 0x10
 
-gUnknown_085C9A08: ; 85C9A08
+gUnknown_085C9A08: @ 85C9A08
 	.incbin "base_emerald.gba", 0x5c9a08, 0x14
 
-gUnknown_085C9A1C: ; 85C9A1C
+gUnknown_085C9A1C: @ 85C9A1C
 	.incbin "base_emerald.gba", 0x5c9a1c, 0x14
 
-gUnknown_085C9A30: ; 85C9A30
+gUnknown_085C9A30: @ 85C9A30
 	.incbin "base_emerald.gba", 0x5c9a30, 0x23
 
-gUnknown_085C9A53: ; 85C9A53
+gUnknown_085C9A53: @ 85C9A53
 	.incbin "base_emerald.gba", 0x5c9a53, 0x41
 
-gUnknown_085C9A94: ; 85C9A94
+gUnknown_085C9A94: @ 85C9A94
 	.incbin "base_emerald.gba", 0x5c9a94, 0x990
 
-gUnknown_085CA424: ; 85CA424
+gUnknown_085CA424: @ 85CA424
 	.incbin "base_emerald.gba", 0x5ca424, 0x35
 
-gUnknown_085CA459: ; 85CA459
+gUnknown_085CA459: @ 85CA459
 	.incbin "base_emerald.gba", 0x5ca459, 0xe48
 
-gUnknown_085CB2A1: ; 85CB2A1
+gUnknown_085CB2A1: @ 85CB2A1
 	.incbin "base_emerald.gba", 0x5cb2a1, 0xe9
 
-gUnknown_085CB38A: ; 85CB38A
+gUnknown_085CB38A: @ 85CB38A
 	.incbin "base_emerald.gba", 0x5cb38a, 0x20
 
-gUnknown_085CB3AA: ; 85CB3AA
+gUnknown_085CB3AA: @ 85CB3AA
 	.incbin "base_emerald.gba", 0x5cb3aa, 0x120
 
-gUnknown_085CB4CA: ; 85CB4CA
+gUnknown_085CB4CA: @ 85CB4CA
 	.incbin "base_emerald.gba", 0x5cb4ca, 0x5a
 
-gUnknown_085CB524: ; 85CB524
+gUnknown_085CB524: @ 85CB524
 	.incbin "base_emerald.gba", 0x5cb524, 0x14
 
-gUnknown_085CB538: ; 85CB538
+gUnknown_085CB538: @ 85CB538
 	.incbin "base_emerald.gba", 0x5cb538, 0x17
 
-gUnknown_085CB54F: ; 85CB54F
+gUnknown_085CB54F: @ 85CB54F
 	.incbin "base_emerald.gba", 0x5cb54f, 0x18
 
-gUnknown_085CB567: ; 85CB567
+gUnknown_085CB567: @ 85CB567
 	.incbin "base_emerald.gba", 0x5cb567, 0x1a
 
-gUnknown_085CB581: ; 85CB581
+gUnknown_085CB581: @ 85CB581
 	.incbin "base_emerald.gba", 0x5cb581, 0x25
 
-gUnknown_085CB5A6: ; 85CB5A6
+gUnknown_085CB5A6: @ 85CB5A6
 	.incbin "base_emerald.gba", 0x5cb5a6, 0x2c
 
-gUnknown_085CB5D2: ; 85CB5D2
+gUnknown_085CB5D2: @ 85CB5D2
 	.incbin "base_emerald.gba", 0x5cb5d2, 0xd
 
-gUnknown_085CB5DF: ; 85CB5DF
+gUnknown_085CB5DF: @ 85CB5DF
 	.incbin "base_emerald.gba", 0x5cb5df, 0x44f
 
-gUnknown_085CBA2E: ; 85CBA2E
+gUnknown_085CBA2E: @ 85CBA2E
 	.incbin "base_emerald.gba", 0x5cba2e, 0x119
 
-gUnknown_085CBB47: ; 85CBB47
+gUnknown_085CBB47: @ 85CBB47
 	.incbin "base_emerald.gba", 0x5cbb47, 0x13
 
-gUnknown_085CBB5A: ; 85CBB5A
+gUnknown_085CBB5A: @ 85CBB5A
 	.incbin "base_emerald.gba", 0x5cbb5a, 0x13
 
-gUnknown_085CBB6D: ; 85CBB6D
+gUnknown_085CBB6D: @ 85CBB6D
 	.incbin "base_emerald.gba", 0x5cbb6d, 0x15
 
-gUnknown_085CBB82: ; 85CBB82
+gUnknown_085CBB82: @ 85CBB82
 	.incbin "base_emerald.gba", 0x5cbb82, 0x1a
 
-gUnknown_085CBB9C: ; 85CBB9C
+gUnknown_085CBB9C: @ 85CBB9C
 	.incbin "base_emerald.gba", 0x5cbb9c, 0x1d
 
-gUnknown_085CBBB9: ; 85CBBB9
+gUnknown_085CBBB9: @ 85CBBB9
 	.incbin "base_emerald.gba", 0x5cbbb9, 0x14
 
-gUnknown_085CBBCD: ; 85CBBCD
+gUnknown_085CBBCD: @ 85CBBCD
 	.incbin "base_emerald.gba", 0x5cbbcd, 0x1a
 
-gUnknown_085CBBE7: ; 85CBBE7
+gUnknown_085CBBE7: @ 85CBBE7
 	.incbin "base_emerald.gba", 0x5cbbe7, 0x13
 
-gUnknown_085CBBFA: ; 85CBBFA
+gUnknown_085CBBFA: @ 85CBBFA
 	.incbin "base_emerald.gba", 0x5cbbfa, 0x1a
 
-gUnknown_085CBC14: ; 85CBC14
+gUnknown_085CBC14: @ 85CBC14
 	.incbin "base_emerald.gba", 0x5cbc14, 0x13
 
-gUnknown_085CBC27: ; 85CBC27
+gUnknown_085CBC27: @ 85CBC27
 	.incbin "base_emerald.gba", 0x5cbc27, 0x10
 
-gUnknown_085CBC37: ; 85CBC37
+gUnknown_085CBC37: @ 85CBC37
 	.incbin "base_emerald.gba", 0x5cbc37, 0x17
 
-gUnknown_085CBC4E: ; 85CBC4E
+gUnknown_085CBC4E: @ 85CBC4E
 	.incbin "base_emerald.gba", 0x5cbc4e, 0x20
 
-gUnknown_085CBC6E: ; 85CBC6E
+gUnknown_085CBC6E: @ 85CBC6E
 	.incbin "base_emerald.gba", 0x5cbc6e, 0x10
 
-gUnknown_085CBC7E: ; 85CBC7E
+gUnknown_085CBC7E: @ 85CBC7E
 	.incbin "base_emerald.gba", 0x5cbc7e, 0x10
 
-gUnknown_085CBC8E: ; 85CBC8E
+gUnknown_085CBC8E: @ 85CBC8E
 	.incbin "base_emerald.gba", 0x5cbc8e, 0x8
 
-gUnknown_085CBC96: ; 85CBC96
+gUnknown_085CBC96: @ 85CBC96
 	.incbin "base_emerald.gba", 0x5cbc96, 0xf
 
-gUnknown_085CBCA5: ; 85CBCA5
+gUnknown_085CBCA5: @ 85CBCA5
 	.incbin "base_emerald.gba", 0x5cbca5, 0x8
 
-gUnknown_085CBCAD: ; 85CBCAD
+gUnknown_085CBCAD: @ 85CBCAD
 	.incbin "base_emerald.gba", 0x5cbcad, 0xb
 
-gUnknown_085CBCB8: ; 85CBCB8
+gUnknown_085CBCB8: @ 85CBCB8
 	.incbin "base_emerald.gba", 0x5cbcb8, 0xf
 
-gUnknown_085CBCC7: ; 85CBCC7
+gUnknown_085CBCC7: @ 85CBCC7
 	.incbin "base_emerald.gba", 0x5cbcc7, 0x1e
 
-gUnknown_085CBCE5: ; 85CBCE5
+gUnknown_085CBCE5: @ 85CBCE5
 	.incbin "base_emerald.gba", 0x5cbce5, 0x18
 
-gUnknown_085CBCFD: ; 85CBCFD
+gUnknown_085CBCFD: @ 85CBCFD
 	.incbin "base_emerald.gba", 0x5cbcfd, 0x1e
 
-gUnknown_085CBD1B: ; 85CBD1B
+gUnknown_085CBD1B: @ 85CBD1B
 	.incbin "base_emerald.gba", 0x5cbd1b, 0xf
 
-gUnknown_085CBD2A: ; 85CBD2A
+gUnknown_085CBD2A: @ 85CBD2A
 	.incbin "base_emerald.gba", 0x5cbd2a, 0x13
 
-gUnknown_085CBD3D: ; 85CBD3D
+gUnknown_085CBD3D: @ 85CBD3D
 	.incbin "base_emerald.gba", 0x5cbd3d, 0x15
 
-gUnknown_085CBD52: ; 85CBD52
+gUnknown_085CBD52: @ 85CBD52
 	.incbin "base_emerald.gba", 0x5cbd52, 0x13
 
-gUnknown_085CBD65: ; 85CBD65
+gUnknown_085CBD65: @ 85CBD65
 	.incbin "base_emerald.gba", 0x5cbd65, 0x10
 
-gUnknown_085CBD75: ; 85CBD75
+gUnknown_085CBD75: @ 85CBD75
 	.incbin "base_emerald.gba", 0x5cbd75, 0x10
 
-gUnknown_085CBD85: ; 85CBD85
+gUnknown_085CBD85: @ 85CBD85
 	.incbin "base_emerald.gba", 0x5cbd85, 0x6
 
-gUnknown_085CBD8B: ; 85CBD8B
+gUnknown_085CBD8B: @ 85CBD8B
 	.incbin "base_emerald.gba", 0x5cbd8b, 0x6
 
-gUnknown_085CBD91: ; 85CBD91
+gUnknown_085CBD91: @ 85CBD91
 	.incbin "base_emerald.gba", 0x5cbd91, 0x4
 
-gUnknown_085CBD95: ; 85CBD95
+gUnknown_085CBD95: @ 85CBD95
 	.incbin "base_emerald.gba", 0x5cbd95, 0x5
 
-gUnknown_085CBD9A: ; 85CBD9A
+gUnknown_085CBD9A: @ 85CBD9A
 	.incbin "base_emerald.gba", 0x5cbd9a, 0x4
 
-gUnknown_085CBD9E: ; 85CBD9E
+gUnknown_085CBD9E: @ 85CBD9E
 	.incbin "base_emerald.gba", 0x5cbd9e, 0x5
 
-gUnknown_085CBDA3: ; 85CBDA3
+gUnknown_085CBDA3: @ 85CBDA3
 	.incbin "base_emerald.gba", 0x5cbda3, 0x4
 
-gUnknown_085CBDA7: ; 85CBDA7
+gUnknown_085CBDA7: @ 85CBDA7
 	.incbin "base_emerald.gba", 0x5cbda7, 0x5
 
-gUnknown_085CBDAC: ; 85CBDAC
+gUnknown_085CBDAC: @ 85CBDAC
 	.incbin "base_emerald.gba", 0x5cbdac, 0xb
 
-gUnknown_085CBDB7: ; 85CBDB7
+gUnknown_085CBDB7: @ 85CBDB7
 	.incbin "base_emerald.gba", 0x5cbdb7, 0x2
 
-gUnknown_085CBDB9: ; 85CBDB9
+gUnknown_085CBDB9: @ 85CBDB9
 	.incbin "base_emerald.gba", 0x5cbdb9, 0x2
 
-gUnknown_085CBDBB: ; 85CBDBB
+gUnknown_085CBDBB: @ 85CBDBB
 	.incbin "base_emerald.gba", 0x5cbdbb, 0x2
 
-gUnknown_085CBDBD: ; 85CBDBD
+gUnknown_085CBDBD: @ 85CBDBD
 	.incbin "base_emerald.gba", 0x5cbdbd, 0x2
 
-gUnknown_085CBDBF: ; 85CBDBF
+gUnknown_085CBDBF: @ 85CBDBF
 	.incbin "base_emerald.gba", 0x5cbdbf, 0x41
 
-gUnknown_085CBE00: ; 85CBE00
+gUnknown_085CBE00: @ 85CBE00
 	.incbin "base_emerald.gba", 0x5cbe00, 0x6c
 
-gUnknown_085CBE6C: ; 85CBE6C
+gUnknown_085CBE6C: @ 85CBE6C
 	.incbin "base_emerald.gba", 0x5cbe6c, 0x1a9
 
-gUnknown_085CC015: ; 85CC015
+gUnknown_085CC015: @ 85CC015
 	.incbin "base_emerald.gba", 0x5cc015, 0xa
 
-gUnknown_085CC01F: ; 85CC01F
+gUnknown_085CC01F: @ 85CC01F
 	.incbin "base_emerald.gba", 0x5cc01f, 0x81
 
-gUnknown_085CC0A0: ; 85CC0A0
+gUnknown_085CC0A0: @ 85CC0A0
 	.incbin "base_emerald.gba", 0x5cc0a0, 0xd
 
-gUnknown_085CC0AD: ; 85CC0AD
+gUnknown_085CC0AD: @ 85CC0AD
 	.incbin "base_emerald.gba", 0x5cc0ad, 0x191
 
-gUnknown_085CC23E: ; 85CC23E
+gUnknown_085CC23E: @ 85CC23E
 	.incbin "base_emerald.gba", 0x5cc23e, 0x32
 
-gUnknown_085CC270: ; 85CC270
+gUnknown_085CC270: @ 85CC270
 	.incbin "base_emerald.gba", 0x5cc270, 0x5c4
 
-gUnknown_085CC834: ; 85CC834
+gUnknown_085CC834: @ 85CC834
 	.incbin "base_emerald.gba", 0x5cc834, 0x14e
 
-gUnknown_085CC982: ; 85CC982
+gUnknown_085CC982: @ 85CC982
 	.incbin "base_emerald.gba", 0x5cc982, 0xe
 
-gUnknown_085CC990: ; 85CC990
+gUnknown_085CC990: @ 85CC990
 	.incbin "base_emerald.gba", 0x5cc990, 0x16
 
-gUnknown_085CC9A6: ; 85CC9A6
+gUnknown_085CC9A6: @ 85CC9A6
 	.incbin "base_emerald.gba", 0x5cc9a6, 0x2d
 
-gUnknown_085CC9D3: ; 85CC9D3
+gUnknown_085CC9D3: @ 85CC9D3
 	.incbin "base_emerald.gba", 0x5cc9d3, 0x1b
 
-gUnknown_085CC9EE: ; 85CC9EE
+gUnknown_085CC9EE: @ 85CC9EE
 	.incbin "base_emerald.gba", 0x5cc9ee, 0x5
 
-gUnknown_085CC9F3: ; 85CC9F3
+gUnknown_085CC9F3: @ 85CC9F3
 	.incbin "base_emerald.gba", 0x5cc9f3, 0x11
 
-gUnknown_085CCA04: ; 85CCA04
+gUnknown_085CCA04: @ 85CCA04
 	.incbin "base_emerald.gba", 0x5cca04, 0x11
 
-gUnknown_085CCA15: ; 85CCA15
+gUnknown_085CCA15: @ 85CCA15
 	.incbin "base_emerald.gba", 0x5cca15, 0x14
 
-gUnknown_085CCA29: ; 85CCA29
+gUnknown_085CCA29: @ 85CCA29
 	.incbin "base_emerald.gba", 0x5cca29, 0x11
 
-gUnknown_085CCA3A: ; 85CCA3A
+gUnknown_085CCA3A: @ 85CCA3A
 	.incbin "base_emerald.gba", 0x5cca3a, 0x1a
 
-gUnknown_085CCA54: ; 85CCA54
+gUnknown_085CCA54: @ 85CCA54
 	.incbin "base_emerald.gba", 0x5cca54, 0x1b
 
-gUnknown_085CCA6F: ; 85CCA6F
+gUnknown_085CCA6F: @ 85CCA6F
 	.incbin "base_emerald.gba", 0x5cca6f, 0x4
 
-gUnknown_085CCA73: ; 85CCA73
+gUnknown_085CCA73: @ 85CCA73
 	.incbin "base_emerald.gba", 0x5cca73, 0x48
 
-gUnknown_085CCABB: ; 85CCABB
+gUnknown_085CCABB: @ 85CCABB
 	.incbin "base_emerald.gba", 0x5ccabb, 0xf
 
-gUnknown_085CCACA: ; 85CCACA
+gUnknown_085CCACA: @ 85CCACA
 	.incbin "base_emerald.gba", 0x5ccaca, 0x62
 
-gUnknown_085CCB2C: ; 85CCB2C
+gUnknown_085CCB2C: @ 85CCB2C
 	.incbin "base_emerald.gba", 0x5ccb2c, 0x10
 
-gUnknown_085CCB3C: ; 85CCB3C
+gUnknown_085CCB3C: @ 85CCB3C
 	.incbin "base_emerald.gba", 0x5ccb3c, 0x3d
 
-gUnknown_085CCB79: ; 85CCB79
+gUnknown_085CCB79: @ 85CCB79
 	.incbin "base_emerald.gba", 0x5ccb79, 0x6
 
-gUnknown_085CCB7F: ; 85CCB7F
+gUnknown_085CCB7F: @ 85CCB7F
 	.incbin "base_emerald.gba", 0x5ccb7f, 0x3
 
-gUnknown_085CCB82: ; 85CCB82
+gUnknown_085CCB82: @ 85CCB82
 	.incbin "base_emerald.gba", 0x5ccb82, 0x2
 
-gUnknown_085CCB84: ; 85CCB84
+gUnknown_085CCB84: @ 85CCB84
 	.incbin "base_emerald.gba", 0x5ccb84, 0x2
 
-gUnknown_085CCB86: ; 85CCB86
+gUnknown_085CCB86: @ 85CCB86
 	.incbin "base_emerald.gba", 0x5ccb86, 0x2
 
-gUnknown_085CCB88: ; 85CCB88
+gUnknown_085CCB88: @ 85CCB88
 	.incbin "base_emerald.gba", 0x5ccb88, 0x4
 
-gUnknown_085CCB8C: ; 85CCB8C
+gUnknown_085CCB8C: @ 85CCB8C
 	.incbin "base_emerald.gba", 0x5ccb8c, 0x4
 
-gUnknown_085CCB90: ; 85CCB90
+gUnknown_085CCB90: @ 85CCB90
 	.incbin "base_emerald.gba", 0x5ccb90, 0x8
 
-gUnknown_085CCB98: ; 85CCB98
+gUnknown_085CCB98: @ 85CCB98
 	.incbin "base_emerald.gba", 0x5ccb98, 0x6
 
-gUnknown_085CCB9E: ; 85CCB9E
+gUnknown_085CCB9E: @ 85CCB9E
 	.incbin "base_emerald.gba", 0x5ccb9e, 0x7
 
-gUnknown_085CCBA5: ; 85CCBA5
+gUnknown_085CCBA5: @ 85CCBA5
 	.incbin "base_emerald.gba", 0x5ccba5, 0x8
 
-gUnknown_085CCBAD: ; 85CCBAD
+gUnknown_085CCBAD: @ 85CCBAD
 	.incbin "base_emerald.gba", 0x5ccbad, 0x8
 
-gUnknown_085CCBB5: ; 85CCBB5
+gUnknown_085CCBB5: @ 85CCBB5
 	.incbin "base_emerald.gba", 0x5ccbb5, 0x4
 
-gUnknown_085CCBB9: ; 85CCBB9
+gUnknown_085CCBB9: @ 85CCBB9
 	.incbin "base_emerald.gba", 0x5ccbb9, 0x3
 
-gUnknown_085CCBBC: ; 85CCBBC
+gUnknown_085CCBBC: @ 85CCBBC
 	.incbin "base_emerald.gba", 0x5ccbbc, 0x132
 
-gUnknown_085CCCEE: ; 85CCCEE
+gUnknown_085CCCEE: @ 85CCCEE
 	.incbin "base_emerald.gba", 0x5cccee, 0x32
 
-gUnknown_085CCD20: ; 85CCD20
+gUnknown_085CCD20: @ 85CCD20
 	.incbin "base_emerald.gba", 0x5ccd20, 0x92
 
-gUnknown_085CCDB2: ; 85CCDB2
+gUnknown_085CCDB2: @ 85CCDB2
 	.incbin "base_emerald.gba", 0x5ccdb2, 0x3
 
-gUnknown_085CCDB5: ; 85CCDB5
+gUnknown_085CCDB5: @ 85CCDB5
 	.incbin "base_emerald.gba", 0x5ccdb5, 0x3
 
-gUnknown_085CCDB8: ; 85CCDB8
+gUnknown_085CCDB8: @ 85CCDB8
 	.incbin "base_emerald.gba", 0x5ccdb8, 0x3
 
-gUnknown_085CCDBB: ; 85CCDBB
+gUnknown_085CCDBB: @ 85CCDBB
 	.incbin "base_emerald.gba", 0x5ccdbb, 0x5
 
-gUnknown_085CCDC0: ; 85CCDC0
+gUnknown_085CCDC0: @ 85CCDC0
 	.incbin "base_emerald.gba", 0x5ccdc0, 0x6
 
-gUnknown_085CCDC6: ; 85CCDC6
+gUnknown_085CCDC6: @ 85CCDC6
 	.incbin "base_emerald.gba", 0x5ccdc6, 0x5
 
-gUnknown_085CCDCB: ; 85CCDCB
+gUnknown_085CCDCB: @ 85CCDCB
 	.incbin "base_emerald.gba", 0x5ccdcb, 0x13
 
-gUnknown_085CCDDE: ; 85CCDDE
+gUnknown_085CCDDE: @ 85CCDDE
 	.incbin "base_emerald.gba", 0x5ccdde, 0x26
 
-gUnknown_085CCE04: ; 85CCE04
+gUnknown_085CCE04: @ 85CCE04
 	.incbin "base_emerald.gba", 0x5cce04, 0x13
 
-gUnknown_085CCE17: ; 85CCE17
+gUnknown_085CCE17: @ 85CCE17
 	.incbin "base_emerald.gba", 0x5cce17, 0x21
 
-gUnknown_085CCE38: ; 85CCE38
+gUnknown_085CCE38: @ 85CCE38
 	.incbin "base_emerald.gba", 0x5cce38, 0x1b
 
-gUnknown_085CCE53: ; 85CCE53
+gUnknown_085CCE53: @ 85CCE53
 	.incbin "base_emerald.gba", 0x5cce53, 0x375
 
-gUnknown_085CD1C8: ; 85CD1C8
+gUnknown_085CD1C8: @ 85CD1C8
 	.incbin "base_emerald.gba", 0x5cd1c8, 0x84
 
-gUnknown_085CD24C: ; 85CD24C
+gUnknown_085CD24C: @ 85CD24C
 	.incbin "base_emerald.gba", 0x5cd24c, 0x1b
 
-gUnknown_085CD267: ; 85CD267
+gUnknown_085CD267: @ 85CD267
 	.incbin "base_emerald.gba", 0x5cd267, 0x28
 
-gUnknown_085CD28F: ; 85CD28F
+gUnknown_085CD28F: @ 85CD28F
 	.incbin "base_emerald.gba", 0x5cd28f, 0x3c
 
-gUnknown_085CD2CB: ; 85CD2CB
+gUnknown_085CD2CB: @ 85CD2CB
 	.incbin "base_emerald.gba", 0x5cd2cb, 0x36
 
-gUnknown_085CD301: ; 85CD301
+gUnknown_085CD301: @ 85CD301
 	.incbin "base_emerald.gba", 0x5cd301, 0x17
 
-gUnknown_085CD318: ; 85CD318
+gUnknown_085CD318: @ 85CD318
 	.incbin "base_emerald.gba", 0x5cd318, 0x1e
 
-gUnknown_085CD336: ; 85CD336
+gUnknown_085CD336: @ 85CD336
 	.incbin "base_emerald.gba", 0x5cd336, 0xec
 
-gUnknown_085CD422: ; 85CD422
+gUnknown_085CD422: @ 85CD422
 	.incbin "base_emerald.gba", 0x5cd422, 0x23e
 
-gUnknown_085CD660: ; 85CD660
+gUnknown_085CD660: @ 85CD660
 	.incbin "base_emerald.gba", 0x5cd660, 0x8
 
-gUnknown_085CD668: ; 85CD668
+gUnknown_085CD668: @ 85CD668
 	.incbin "base_emerald.gba", 0x5cd668, 0x4
 
-gUnknown_085CD66C: ; 85CD66C
+gUnknown_085CD66C: @ 85CD66C
 	.incbin "base_emerald.gba", 0x5cd66c, 0x10
 
-gUnknown_085CD67C: ; 85CD67C
+gUnknown_085CD67C: @ 85CD67C
 	.incbin "base_emerald.gba", 0x5cd67c, 0x158
 
-gUnknown_085CD7D4: ; 85CD7D4
+gUnknown_085CD7D4: @ 85CD7D4
 	.incbin "base_emerald.gba", 0x5cd7d4, 0x184
 
-gUnknown_085CD958: ; 85CD958
+gUnknown_085CD958: @ 85CD958
 	.incbin "base_emerald.gba", 0x5cd958, 0x1c4
 
-gUnknown_085CDB1C: ; 85CDB1C
+gUnknown_085CDB1C: @ 85CDB1C
 	.incbin "base_emerald.gba", 0x5cdb1c, 0x14
 
-gUnknown_085CDB30: ; 85CDB30
+gUnknown_085CDB30: @ 85CDB30
 	.incbin "base_emerald.gba", 0x5cdb30, 0x24
 
-gUnknown_085CDB54: ; 85CDB54
+gUnknown_085CDB54: @ 85CDB54
 	.incbin "base_emerald.gba", 0x5cdb54, 0x20
 
-gUnknown_085CDB74: ; 85CDB74
+gUnknown_085CDB74: @ 85CDB74
 	.incbin "base_emerald.gba", 0x5cdb74, 0x28
 
-gUnknown_085CDB9C: ; 85CDB9C
+gUnknown_085CDB9C: @ 85CDB9C
 	.incbin "base_emerald.gba", 0x5cdb9c, 0x30
 
-gUnknown_085CDBCC: ; 85CDBCC
+gUnknown_085CDBCC: @ 85CDBCC
 	.incbin "base_emerald.gba", 0x5cdbcc, 0x18
 
-gUnknown_085CDBE4: ; 85CDBE4
+gUnknown_085CDBE4: @ 85CDBE4
 	.incbin "base_emerald.gba", 0x5cdbe4, 0x2
 
-gUnknown_085CDBE6: ; 85CDBE6
+gUnknown_085CDBE6: @ 85CDBE6
 	.incbin "base_emerald.gba", 0x5cdbe6, 0x4
 
-gUnknown_085CDBEA: ; 85CDBEA
+gUnknown_085CDBEA: @ 85CDBEA
 	.incbin "base_emerald.gba", 0x5cdbea, 0x8
 
-gUnknown_085CDBF2: ; 85CDBF2
+gUnknown_085CDBF2: @ 85CDBF2
 	.incbin "base_emerald.gba", 0x5cdbf2, 0x6
 
-gUnknown_085CDBF8: ; 85CDBF8
+gUnknown_085CDBF8: @ 85CDBF8
 	.incbin "base_emerald.gba", 0x5cdbf8, 0x8
 
-gUnknown_085CDC00: ; 85CDC00
+gUnknown_085CDC00: @ 85CDC00
 	.incbin "base_emerald.gba", 0x5cdc00, 0x38
 
-gUnknown_085CDC38: ; 85CDC38
+gUnknown_085CDC38: @ 85CDC38
 	.incbin "base_emerald.gba", 0x5cdc38, 0x6
 
-gUnknown_085CDC3E: ; 85CDC3E
+gUnknown_085CDC3E: @ 85CDC3E
 	.incbin "base_emerald.gba", 0x5cdc3e, 0x4
 
-gUnknown_085CDC42: ; 85CDC42
+gUnknown_085CDC42: @ 85CDC42
 	.incbin "base_emerald.gba", 0x5cdc42, 0xa
 
-gUnknown_085CDC4C: ; 85CDC4C
+gUnknown_085CDC4C: @ 85CDC4C
 	.incbin "base_emerald.gba", 0x5cdc4c, 0x8
 
-gUnknown_085CDC54: ; 85CDC54
+gUnknown_085CDC54: @ 85CDC54
 	.incbin "base_emerald.gba", 0x5cdc54, 0xc
 
-gUnknown_085CDC60: ; 85CDC60
+gUnknown_085CDC60: @ 85CDC60
 	.incbin "base_emerald.gba", 0x5cdc60, 0xa
 
-gUnknown_085CDC6A: ; 85CDC6A
+gUnknown_085CDC6A: @ 85CDC6A
 	.incbin "base_emerald.gba", 0x5cdc6a, 0x96
 
-gUnknown_085CDD00: ; 85CDD00
+gUnknown_085CDD00: @ 85CDD00
 	.incbin "base_emerald.gba", 0x5cdd00, 0x220
 
-gUnknown_085CDF20: ; 85CDF20
+gUnknown_085CDF20: @ 85CDF20
 	.incbin "base_emerald.gba", 0x5cdf20, 0x380
 
-gUnknown_085CE2A0: ; 85CE2A0
+gUnknown_085CE2A0: @ 85CE2A0
 	.incbin "base_emerald.gba", 0x5ce2a0, 0xb0
 
-gUnknown_085CE350: ; 85CE350
+gUnknown_085CE350: @ 85CE350
 	.incbin "base_emerald.gba", 0x5ce350, 0x38
 
-gUnknown_085CE388: ; 85CE388
+gUnknown_085CE388: @ 85CE388
 	.incbin "base_emerald.gba", 0x5ce388, 0x18
 
-gUnknown_085CE3A0: ; 85CE3A0
+gUnknown_085CE3A0: @ 85CE3A0
 	.incbin "base_emerald.gba", 0x5ce3a0, 0x18
 
-gUnknown_085CE3B8: ; 85CE3B8
+gUnknown_085CE3B8: @ 85CE3B8
 	.incbin "base_emerald.gba", 0x5ce3b8, 0x28
 
-gUnknown_085CE3E0: ; 85CE3E0
+gUnknown_085CE3E0: @ 85CE3E0
 	.incbin "base_emerald.gba", 0x5ce3e0, 0x50
 
-gUnknown_085CE430: ; 85CE430
+gUnknown_085CE430: @ 85CE430
 	.incbin "base_emerald.gba", 0x5ce430, 0x30
 
-gUnknown_085CE460: ; 85CE460
+gUnknown_085CE460: @ 85CE460
 	.incbin "base_emerald.gba", 0x5ce460, 0x2c
 
-gUnknown_085CE48C: ; 85CE48C
+gUnknown_085CE48C: @ 85CE48C
 	.incbin "base_emerald.gba", 0x5ce48c, 0x18
 
-gUnknown_085CE4A4: ; 85CE4A4
+gUnknown_085CE4A4: @ 85CE4A4
 	.incbin "base_emerald.gba", 0x5ce4a4, 0x4
 
-gUnknown_085CE4A8: ; 85CE4A8
+gUnknown_085CE4A8: @ 85CE4A8
 	.incbin "base_emerald.gba", 0x5ce4a8, 0x8
 
-gUnknown_085CE4B0: ; 85CE4B0
+gUnknown_085CE4B0: @ 85CE4B0
 	.incbin "base_emerald.gba", 0x5ce4b0, 0x140
 
-gUnknown_085CE5F0: ; 85CE5F0
+gUnknown_085CE5F0: @ 85CE5F0
 	.incbin "base_emerald.gba", 0x5ce5f0, 0x15c
 
-gUnknown_085CE74C: ; 85CE74C
+gUnknown_085CE74C: @ 85CE74C
 	.incbin "base_emerald.gba", 0x5ce74c, 0x20
 
-gUnknown_085CE76C: ; 85CE76C
+gUnknown_085CE76C: @ 85CE76C
 	.incbin "base_emerald.gba", 0x5ce76c, 0x18
 
-gUnknown_085CE784: ; 85CE784
+gUnknown_085CE784: @ 85CE784
 	.incbin "base_emerald.gba", 0x5ce784, 0x68
 
-gUnknown_085CE7EC: ; 85CE7EC
+gUnknown_085CE7EC: @ 85CE7EC
 	.incbin "base_emerald.gba", 0x5ce7ec, 0x60
 
-gUnknown_085CE84C: ; 85CE84C
+gUnknown_085CE84C: @ 85CE84C
 	.incbin "base_emerald.gba", 0x5ce84c, 0x30
 
-gUnknown_085CE87C: ; 85CE87C
+gUnknown_085CE87C: @ 85CE87C
 	.incbin "base_emerald.gba", 0x5ce87c, 0x14c
 
-gUnknown_085CE9C8: ; 85CE9C8
+gUnknown_085CE9C8: @ 85CE9C8
 	.incbin "base_emerald.gba", 0x5ce9c8, 0x1e8
 
-gUnknown_085CEBB0: ; 85CEBB0
+gUnknown_085CEBB0: @ 85CEBB0
 	.incbin "base_emerald.gba", 0x5cebb0, 0x8
 
-gUnknown_085CEBB8: ; 85CEBB8
+gUnknown_085CEBB8: @ 85CEBB8
 	.incbin "base_emerald.gba", 0x5cebb8, 0x8
 
-gUnknown_085CEBC0: ; 85CEBC0
+gUnknown_085CEBC0: @ 85CEBC0
 	.incbin "base_emerald.gba", 0x5cebc0, 0x10
 
-gUnknown_085CEBD0: ; 85CEBD0
+gUnknown_085CEBD0: @ 85CEBD0
 	.incbin "base_emerald.gba", 0x5cebd0, 0x40
 
-gUnknown_085CEC10: ; 85CEC10
+gUnknown_085CEC10: @ 85CEC10
 	.incbin "base_emerald.gba", 0x5cec10, 0x18
 
-gUnknown_085CEC28: ; 85CEC28
+gUnknown_085CEC28: @ 85CEC28
 	.incbin "base_emerald.gba", 0x5cec28, 0x8
 
-gUnknown_085CEC30: ; 85CEC30
+gUnknown_085CEC30: @ 85CEC30
 	.incbin "base_emerald.gba", 0x5cec30, 0x80
 
-; 85CECB0
+@ 85CECB0
 	.include "data/battle_frontier/battle_frontier_held_items.s"
 
-; 85CED2E
+@ 85CED2E
 	.include "data/battle_frontier/battle_frontier_trainer_mons.s"
 
-; 85D5ACC
+@ 85D5ACC
 	.include "data/battle_frontier/battle_frontier_trainers.s"
 
-; 85D97BC
+@ 85D97BC
 	.include "data/battle_frontier/battle_frontier_mons.s"
 
-gUnknown_085DCEDC: ; 85DCEDC
+gUnknown_085DCEDC: @ 85DCEDC
 	.incbin "base_emerald.gba", 0x5dcedc, 0x1e
 
-gUnknown_085DCEFA: ; 85DCEFA
+gUnknown_085DCEFA: @ 85DCEFA
 	.incbin "base_emerald.gba", 0x5dcefa, 0x14
 
-gUnknown_085DCF0E: ; 85DCF0E
+gUnknown_085DCF0E: @ 85DCF0E
 	.incbin "base_emerald.gba", 0x5dcf0e, 0x1e
 
-gUnknown_085DCF2C: ; 85DCF2C
+gUnknown_085DCF2C: @ 85DCF2C
 	.incbin "base_emerald.gba", 0x5dcf2c, 0x14
 
-gUnknown_085DCF40: ; 85DCF40
+gUnknown_085DCF40: @ 85DCF40
 	.incbin "base_emerald.gba", 0x5dcf40, 0x5c0
 
-gUnknown_085DD500: ; 85DD500
+gUnknown_085DD500: @ 85DD500
 	.incbin "base_emerald.gba", 0x5dd500, 0x190
 
-gUnknown_085DD690: ; 85DD690
+gUnknown_085DD690: @ 85DD690
 	.incbin "base_emerald.gba", 0x5dd690, 0x40
 
-gUnknown_085DD6D0: ; 85DD6D0
+gUnknown_085DD6D0: @ 85DD6D0
 	.incbin "base_emerald.gba", 0x5dd6d0, 0x5
 
-gUnknown_085DD6D5: ; 85DD6D5
+gUnknown_085DD6D5: @ 85DD6D5
 	.incbin "base_emerald.gba", 0x5dd6d5, 0x7
 
-gUnknown_085DD6DC: ; 85DD6DC
+gUnknown_085DD6DC: @ 85DD6DC
 	.incbin "base_emerald.gba", 0x5dd6dc, 0x30
 
-; 85DD70C
+@ 85DD70C
 	.include "data/battle_frontier/slateport_battle_tent_trainer_mons.s"
 
-; 85DDA14
+@ 85DDA14
 	.include "data/battle_frontier/slateport_battle_tent_trainers.s"
 
-; 85DE02C
+@ 85DE02C
 	.include "data/battle_frontier/slateport_battle_tent_mons.s"
 
-; 85DE48C
+@ 85DE48C
 	.include "data/battle_frontier/verdanturf_battle_tent_trainer_mons.s"
 
-; 85DE610
+@ 85DE610
 	.include "data/battle_frontier/verdanturf_battle_tent_trainers.s"
 
-; 85DEC28
+@ 85DEC28
 	.include "data/battle_frontier/verdanturf_battle_tent_mons.s"
 
-; 85DEEF8
+@ 85DEEF8
 	.include "data/battle_frontier/fallarbor_battle_tent_trainer_mons.s"
 
-; 85DF084
+@ 85DF084
 	.include "data/battle_frontier/fallarbor_battle_tent_trainers.s"
 
-; 85DF69C
+@ 85DF69C
 	.include "data/battle_frontier/fallarbor_battle_tent_mons.s"
 
-gUnknown_085DF96C: ; 85DF96C
+gUnknown_085DF96C: @ 85DF96C
 	.incbin "base_emerald.gba", 0x5df96c, 0x40
 
-gUnknown_085DF9AC: ; 85DF9AC
+gUnknown_085DF9AC: @ 85DF9AC
 	.incbin "base_emerald.gba", 0x5df9ac, 0x20
 
-gUnknown_085DF9CC: ; 85DF9CC
+gUnknown_085DF9CC: @ 85DF9CC
 	.incbin "base_emerald.gba", 0x5df9cc, 0x20
 
-gUnknown_085DF9EC: ; 85DF9EC
+gUnknown_085DF9EC: @ 85DF9EC
 	.incbin "base_emerald.gba", 0x5df9ec, 0xa
 
-gUnknown_085DF9F6: ; 85DF9F6
+gUnknown_085DF9F6: @ 85DF9F6
 	.incbin "base_emerald.gba", 0x5df9f6, 0x4
 
-gUnknown_085DF9FA: ; 85DF9FA
+gUnknown_085DF9FA: @ 85DF9FA
 	.incbin "base_emerald.gba", 0x5df9fa, 0x20
 
-gUnknown_085DFA1A: ; 85DFA1A
+gUnknown_085DFA1A: @ 85DFA1A
 	.incbin "base_emerald.gba", 0x5dfa1a, 0x28
 
-gUnknown_085DFA42: ; 85DFA42
+gUnknown_085DFA42: @ 85DFA42
 	.incbin "base_emerald.gba", 0x5dfa42, 0x4
 
-gUnknown_085DFA46: ; 85DFA46
+gUnknown_085DFA46: @ 85DFA46
 	.incbin "base_emerald.gba", 0x5dfa46, 0xc
 
-gUnknown_085DFA52: ; 85DFA52
+gUnknown_085DFA52: @ 85DFA52
 	.incbin "base_emerald.gba", 0x5dfa52, 0xe
 
-gUnknown_085DFA60: ; 85DFA60
+gUnknown_085DFA60: @ 85DFA60
 	.incbin "base_emerald.gba", 0x5dfa60, 0x20
 
-gUnknown_085DFA80: ; 85DFA80
+gUnknown_085DFA80: @ 85DFA80
 	.incbin "base_emerald.gba", 0x5dfa80, 0xe0
 
-gUnknown_085DFB60: ; 85DFB60
+gUnknown_085DFB60: @ 85DFB60
 	.incbin "base_emerald.gba", 0x5dfb60, 0xac
 
-gUnknown_085DFC0C: ; 85DFC0C
+gUnknown_085DFC0C: @ 85DFC0C
 	.incbin "base_emerald.gba", 0x5dfc0c, 0xa4
 
-gUnknown_085DFCB0: ; 85DFCB0
+gUnknown_085DFCB0: @ 85DFCB0
 	.incbin "base_emerald.gba", 0x5dfcb0, 0x14
 
-gUnknown_085DFCC4: ; 85DFCC4
+gUnknown_085DFCC4: @ 85DFCC4
 	.incbin "base_emerald.gba", 0x5dfcc4, 0x5
 
-gUnknown_085DFCC9: ; 85DFCC9
+gUnknown_085DFCC9: @ 85DFCC9
 	.incbin "base_emerald.gba", 0x5dfcc9, 0x3
 
-gUnknown_085DFCCC: ; 85DFCCC
+gUnknown_085DFCCC: @ 85DFCCC
 	.incbin "base_emerald.gba", 0x5dfccc, 0x10
 
-gUnknown_085DFCDC: ; 85DFCDC
+gUnknown_085DFCDC: @ 85DFCDC
 	.incbin "base_emerald.gba", 0x5dfcdc, 0x20
 
-gUnknown_085DFCFC: ; 85DFCFC
+gUnknown_085DFCFC: @ 85DFCFC
 	.incbin "base_emerald.gba", 0x5dfcfc, 0x8
 
-gUnknown_085DFD04: ; 85DFD04
+gUnknown_085DFD04: @ 85DFD04
 	.incbin "base_emerald.gba", 0x5dfd04, 0x14
 
-gUnknown_085DFD18: ; 85DFD18
+gUnknown_085DFD18: @ 85DFD18
 	.incbin "base_emerald.gba", 0x5dfd18, 0x8
 
-gUnknown_085DFD20: ; 85DFD20
+gUnknown_085DFD20: @ 85DFD20
 	.incbin "base_emerald.gba", 0x5dfd20, 0x8
 
-gUnknown_085DFD28: ; 85DFD28
+gUnknown_085DFD28: @ 85DFD28
 	.incbin "base_emerald.gba", 0x5dfd28, 0x34
 
-gUnknown_085DFD5C: ; 85DFD5C
+gUnknown_085DFD5C: @ 85DFD5C
 	.incbin "base_emerald.gba", 0x5dfd5c, 0x44
 
-gUnknown_085DFDA0: ; 85DFDA0
+gUnknown_085DFDA0: @ 85DFDA0
 	.incbin "base_emerald.gba", 0x5dfda0, 0x18
 
-gUnknown_085DFDB8: ; 85DFDB8
+gUnknown_085DFDB8: @ 85DFDB8
 	.incbin "base_emerald.gba", 0x5dfdb8, 0x8
 
-gUnknown_085DFDC0: ; 85DFDC0
+gUnknown_085DFDC0: @ 85DFDC0
 	.incbin "base_emerald.gba", 0x5dfdc0, 0xe4
 
-gUnknown_085DFEA4: ; 85DFEA4
+gUnknown_085DFEA4: @ 85DFEA4
 	.incbin "base_emerald.gba", 0x5dfea4, 0x10
 
-gUnknown_085DFEB4: ; 85DFEB4
+gUnknown_085DFEB4: @ 85DFEB4
 	.incbin "base_emerald.gba", 0x5dfeb4, 0x20
 
-gUnknown_085DFED4: ; 85DFED4
+gUnknown_085DFED4: @ 85DFED4
 	.incbin "base_emerald.gba", 0x5dfed4, 0x4
 
-gUnknown_085DFED8: ; 85DFED8
+gUnknown_085DFED8: @ 85DFED8
 	.incbin "base_emerald.gba", 0x5dfed8, 0x4
 
-gUnknown_085DFEDC: ; 85DFEDC
+gUnknown_085DFEDC: @ 85DFEDC
 	.incbin "base_emerald.gba", 0x5dfedc, 0x20
 
-gUnknown_085DFEFC: ; 85DFEFC
+gUnknown_085DFEFC: @ 85DFEFC
 	.incbin "base_emerald.gba", 0x5dfefc, 0x8
 
-gUnknown_085DFF04: ; 85DFF04
+gUnknown_085DFF04: @ 85DFF04
 	.incbin "base_emerald.gba", 0x5dff04, 0x20
 
-gUnknown_085DFF24: ; 85DFF24
+gUnknown_085DFF24: @ 85DFF24
 	.incbin "base_emerald.gba", 0x5dff24, 0x18
 
-gUnknown_085DFF3C: ; 85DFF3C
+gUnknown_085DFF3C: @ 85DFF3C
 	.incbin "base_emerald.gba", 0x5dff3c, 0x8
 
-gUnknown_085DFF44: ; 85DFF44
+gUnknown_085DFF44: @ 85DFF44
 	.incbin "base_emerald.gba", 0x5dff44, 0x18
 
-gUnknown_085DFF5C: ; 85DFF5C
+gUnknown_085DFF5C: @ 85DFF5C
 	.incbin "base_emerald.gba", 0x5dff5c, 0x28
 
-gUnknown_085DFF84: ; 85DFF84
+gUnknown_085DFF84: @ 85DFF84
 	.incbin "base_emerald.gba", 0x5dff84, 0x8
 
-gUnknown_085DFF8C: ; 85DFF8C
+gUnknown_085DFF8C: @ 85DFF8C
 	.incbin "base_emerald.gba", 0x5dff8c, 0x638
 
-gUnknown_085E05C4: ; 85E05C4
+gUnknown_085E05C4: @ 85E05C4
 	.incbin "base_emerald.gba", 0x5e05c4, 0x200
 
-gUnknown_085E07C4: ; 85E07C4
+gUnknown_085E07C4: @ 85E07C4
 	.incbin "base_emerald.gba", 0x5e07c4, 0x3b4
 
-gUnknown_085E0B78: ; 85E0B78
+gUnknown_085E0B78: @ 85E0B78
 	.incbin "base_emerald.gba", 0x5e0b78, 0x334
 
-gUnknown_085E0EAC: ; 85E0EAC
+gUnknown_085E0EAC: @ 85E0EAC
 	.incbin "base_emerald.gba", 0x5e0eac, 0x2f0
 
-gUnknown_085E119C: ; 85E119C
+gUnknown_085E119C: @ 85E119C
 	.incbin "base_emerald.gba", 0x5e119c, 0x218
 
-gUnknown_085E13B4: ; 85E13B4
+gUnknown_085E13B4: @ 85E13B4
 	.incbin "base_emerald.gba", 0x5e13b4, 0x2170
 
-gUnknown_085E3524: ; 85E3524
+gUnknown_085E3524: @ 85E3524
 	.incbin "base_emerald.gba", 0x5e3524, 0x200
 
-gUnknown_085E3724: ; 85E3724
+gUnknown_085E3724: @ 85E3724
 	.incbin "base_emerald.gba", 0x5e3724, 0x130
 
-gUnknown_085E3854: ; 85E3854
+gUnknown_085E3854: @ 85E3854
 	.incbin "base_emerald.gba", 0x5e3854, 0x1220
 
-gUnknown_085E4A74: ; 85E4A74
+gUnknown_085E4A74: @ 85E4A74
 	.incbin "base_emerald.gba", 0x5e4a74, 0x10
 
-gUnknown_085E4A84: ; 85E4A84
+gUnknown_085E4A84: @ 85E4A84
 	.incbin "base_emerald.gba", 0x5e4a84, 0x34
 
-gUnknown_085E4AB8: ; 85E4AB8
+gUnknown_085E4AB8: @ 85E4AB8
 	.incbin "base_emerald.gba", 0x5e4ab8, 0x18
 
-gUnknown_085E4AD0: ; 85E4AD0
+gUnknown_085E4AD0: @ 85E4AD0
 	.incbin "base_emerald.gba", 0x5e4ad0, 0x18
 
-gUnknown_085E4AE8: ; 85E4AE8
+gUnknown_085E4AE8: @ 85E4AE8
 	.incbin "base_emerald.gba", 0x5e4ae8, 0x20
 
-gUnknown_085E4B08: ; 85E4B08
+gUnknown_085E4B08: @ 85E4B08
 	.incbin "base_emerald.gba", 0x5e4b08, 0x38
 
-gUnknown_085E4B40: ; 85E4B40
+gUnknown_085E4B40: @ 85E4B40
 	.incbin "base_emerald.gba", 0x5e4b40, 0x64
 
-gUnknown_085E4BA4: ; 85E4BA4
+gUnknown_085E4BA4: @ 85E4BA4
 	.incbin "base_emerald.gba", 0x5e4ba4, 0x38
 
-gUnknown_085E4BDC: ; 85E4BDC
+gUnknown_085E4BDC: @ 85E4BDC
 	.incbin "base_emerald.gba", 0x5e4bdc, 0x18
 
-gUnknown_085E4BF4: ; 85E4BF4
+gUnknown_085E4BF4: @ 85E4BF4
 	.incbin "base_emerald.gba", 0x5e4bf4, 0x10
 
-gUnknown_085E4C04: ; 85E4C04
+gUnknown_085E4C04: @ 85E4C04
 	.incbin "base_emerald.gba", 0x5e4c04, 0x48
 
-gUnknown_085E4C4C: ; 85E4C4C
+gUnknown_085E4C4C: @ 85E4C4C
 	.incbin "base_emerald.gba", 0x5e4c4c, 0x18
 
-gUnknown_085E4C64: ; 85E4C64
+gUnknown_085E4C64: @ 85E4C64
 	.incbin "base_emerald.gba", 0x5e4c64, 0x24
 
-gUnknown_085E4C88: ; 85E4C88
+gUnknown_085E4C88: @ 85E4C88
 	.incbin "base_emerald.gba", 0x5e4c88, 0x10
 
-gUnknown_085E4C98: ; 85E4C98
+gUnknown_085E4C98: @ 85E4C98
 	.incbin "base_emerald.gba", 0x5e4c98, 0x10
 
-gUnknown_085E4CA8: ; 85E4CA8
+gUnknown_085E4CA8: @ 85E4CA8
 	.incbin "base_emerald.gba", 0x5e4ca8, 0x6c
 
-gUnknown_085E4D14: ; 85E4D14
+gUnknown_085E4D14: @ 85E4D14
 	.incbin "base_emerald.gba", 0x5e4d14, 0x50
 
-gUnknown_085E4D64: ; 85E4D64
+gUnknown_085E4D64: @ 85E4D64
 	.incbin "base_emerald.gba", 0x5e4d64, 0x60
 
-gUnknown_085E4DC4: ; 85E4DC4
+gUnknown_085E4DC4: @ 85E4DC4
 	.incbin "base_emerald.gba", 0x5e4dc4, 0xd0
 
-gUnknown_085E4E94: ; 85E4E94
+gUnknown_085E4E94: @ 85E4E94
 	.incbin "base_emerald.gba", 0x5e4e94, 0xb4
 
-gUnknown_085E4F48: ; 85E4F48
+gUnknown_085E4F48: @ 85E4F48
 	.incbin "base_emerald.gba", 0x5e4f48, 0x14
 
-gUnknown_085E4F5C: ; 85E4F5C
+gUnknown_085E4F5C: @ 85E4F5C
 	.incbin "base_emerald.gba", 0x5e4f5c, 0x30
 
-gUnknown_085E4F8C: ; 85E4F8C
+gUnknown_085E4F8C: @ 85E4F8C
 	.incbin "base_emerald.gba", 0x5e4f8c, 0x18
 
-gUnknown_085E4FA4: ; 85E4FA4
+gUnknown_085E4FA4: @ 85E4FA4
 	.incbin "base_emerald.gba", 0x5e4fa4, 0x20
 
-gUnknown_085E4FC4: ; 85E4FC4
+gUnknown_085E4FC4: @ 85E4FC4
 	.incbin "base_emerald.gba", 0x5e4fc4, 0x18
 
-gUnknown_085E4FDC: ; 85E4FDC
+gUnknown_085E4FDC: @ 85E4FDC
 	.incbin "base_emerald.gba", 0x5e4fdc, 0x10
 
-gUnknown_085E4FEC: ; 85E4FEC
+gUnknown_085E4FEC: @ 85E4FEC
 	.incbin "base_emerald.gba", 0x5e4fec, 0x10
 
-gUnknown_085E4FFC: ; 85E4FFC
+gUnknown_085E4FFC: @ 85E4FFC
 	.incbin "base_emerald.gba", 0x5e4ffc, 0x34
 
-gUnknown_085E5030: ; 85E5030
+gUnknown_085E5030: @ 85E5030
 	.incbin "base_emerald.gba", 0x5e5030, 0x18
 
-gUnknown_085E5048: ; 85E5048
+gUnknown_085E5048: @ 85E5048
 	.incbin "base_emerald.gba", 0x5e5048, 0x10
 
-gUnknown_085E5058: ; 85E5058
+gUnknown_085E5058: @ 85E5058
 	.incbin "base_emerald.gba", 0x5e5058, 0x10
 
-gUnknown_085E5068: ; 85E5068
+gUnknown_085E5068: @ 85E5068
 	.incbin "base_emerald.gba", 0x5e5068, 0x8
 
-gUnknown_085E5070: ; 85E5070
+gUnknown_085E5070: @ 85E5070
 	.incbin "base_emerald.gba", 0x5e5070, 0x18
 
-gUnknown_085E5088: ; 85E5088
+gUnknown_085E5088: @ 85E5088
 	.incbin "base_emerald.gba", 0x5e5088, 0xc
 
-gUnknown_085E5094: ; 85E5094
+gUnknown_085E5094: @ 85E5094
 	.incbin "base_emerald.gba", 0x5e5094, 0x60
 
-gUnknown_085E50F4: ; 85E50F4
+gUnknown_085E50F4: @ 85E50F4
 	.incbin "base_emerald.gba", 0x5e50f4, 0xc0
 
-gUnknown_085E51B4: ; 85E51B4
+gUnknown_085E51B4: @ 85E51B4
 	.incbin "base_emerald.gba", 0x5e51b4, 0xc
 
-gUnknown_085E51C0: ; 85E51C0
+gUnknown_085E51C0: @ 85E51C0
 	.incbin "base_emerald.gba", 0x5e51c0, 0x30
 
-gUnknown_085E51F0: ; 85E51F0
+gUnknown_085E51F0: @ 85E51F0
 	.incbin "base_emerald.gba", 0x5e51f0, 0x60
 
-gUnknown_085E5250: ; 85E5250
+gUnknown_085E5250: @ 85E5250
 	.incbin "base_emerald.gba", 0x5e5250, 0xc0
 
-gUnknown_085E5310: ; 85E5310
+gUnknown_085E5310: @ 85E5310
 	.incbin "base_emerald.gba", 0x5e5310, 0x64
 
-gUnknown_085E5374: ; 85E5374
+gUnknown_085E5374: @ 85E5374
 	.incbin "base_emerald.gba", 0x5e5374, 0xc
 
-gUnknown_085E5380: ; 85E5380
+gUnknown_085E5380: @ 85E5380
 	.incbin "base_emerald.gba", 0x5e5380, 0x8
 
-gUnknown_085E5388: ; 85E5388
+gUnknown_085E5388: @ 85E5388
 	.incbin "base_emerald.gba", 0x5e5388, 0x4
 
-gUnknown_085E538C: ; 85E538C
+gUnknown_085E538C: @ 85E538C
 	.incbin "base_emerald.gba", 0x5e538c, 0x8
 
-gUnknown_085E5394: ; 85E5394
+gUnknown_085E5394: @ 85E5394
 	.incbin "base_emerald.gba", 0x5e5394, 0x10
 
-gUnknown_085E53A4: ; 85E53A4
+gUnknown_085E53A4: @ 85E53A4
 	.incbin "base_emerald.gba", 0x5e53a4, 0x10
 
-gUnknown_085E53B4: ; 85E53B4
+gUnknown_085E53B4: @ 85E53B4
 	.incbin "base_emerald.gba", 0x5e53b4, 0x6
 
-gUnknown_085E53BA: ; 85E53BA
+gUnknown_085E53BA: @ 85E53BA
 	.incbin "base_emerald.gba", 0x5e53ba, 0x2a
 
-gUnknown_085E53E4: ; 85E53E4
+gUnknown_085E53E4: @ 85E53E4
 	.incbin "base_emerald.gba", 0x5e53e4, 0x18
 
-gUnknown_085E53FC: ; 85E53FC
+gUnknown_085E53FC: @ 85E53FC
 	.incbin "base_emerald.gba", 0x5e53fc, 0xd4
 
-gUnknown_085E54D0: ; 85E54D0
+gUnknown_085E54D0: @ 85E54D0
 	.incbin "base_emerald.gba", 0x5e54d0, 0x18
 
-gUnknown_085E54E8: ; 85E54E8
+gUnknown_085E54E8: @ 85E54E8
 	.incbin "base_emerald.gba", 0x5e54e8, 0x20
 
-gUnknown_085E5508: ; 85E5508
+gUnknown_085E5508: @ 85E5508
 	.incbin "base_emerald.gba", 0x5e5508, 0x1cc
 
-gUnknown_085E56D4: ; 85E56D4
+gUnknown_085E56D4: @ 85E56D4
 	.incbin "base_emerald.gba", 0x5e56d4, 0x1c
 
-gUnknown_085E56F0: ; 85E56F0
+gUnknown_085E56F0: @ 85E56F0
 	.incbin "base_emerald.gba", 0x5e56f0, 0x80
 
-gUnknown_085E5770: ; 85E5770
+gUnknown_085E5770: @ 85E5770
 	.incbin "base_emerald.gba", 0x5e5770, 0x43c
 
-gUnknown_085E5BAC: ; 85E5BAC
+gUnknown_085E5BAC: @ 85E5BAC
 	.incbin "base_emerald.gba", 0x5e5bac, 0xf
 
-gUnknown_085E5BBB: ; 85E5BBB
+gUnknown_085E5BBB: @ 85E5BBB
 	.incbin "base_emerald.gba", 0x5e5bbb, 0xf
 
-gUnknown_085E5BCA: ; 85E5BCA
+gUnknown_085E5BCA: @ 85E5BCA
 	.incbin "base_emerald.gba", 0x5e5bca, 0xf
 
-gUnknown_085E5BD9: ; 85E5BD9
+gUnknown_085E5BD9: @ 85E5BD9
 	.incbin "base_emerald.gba", 0x5e5bd9, 0xf
 
-gUnknown_085E5BE8: ; 85E5BE8
+gUnknown_085E5BE8: @ 85E5BE8
 	.incbin "base_emerald.gba", 0x5e5be8, 0xf0c
 
-gUnknown_085E6AF4: ; 85E6AF4
+gUnknown_085E6AF4: @ 85E6AF4
 	.incbin "base_emerald.gba", 0x5e6af4, 0x474
 
-gUnknown_085E6F68: ; 85E6F68
+gUnknown_085E6F68: @ 85E6F68
 	.incbin "base_emerald.gba", 0x5e6f68, 0x4
 
-gUnknown_085E6F6C: ; 85E6F6C
+gUnknown_085E6F6C: @ 85E6F6C
 	.incbin "base_emerald.gba", 0x5e6f6c, 0x10
 
-gUnknown_085E6F7C: ; 85E6F7C
+gUnknown_085E6F7C: @ 85E6F7C
 	.incbin "base_emerald.gba", 0x5e6f7c, 0x54
 
-gUnknown_085E6FD0: ; 85E6FD0
+gUnknown_085E6FD0: @ 85E6FD0
 	.incbin "base_emerald.gba", 0x5e6fd0, 0x40
 
-gUnknown_085E7010: ; 85E7010
+gUnknown_085E7010: @ 85E7010
 	.incbin "base_emerald.gba", 0x5e7010, 0xc
 
-gUnknown_085E701C: ; 85E701C
+gUnknown_085E701C: @ 85E701C
 	.incbin "base_emerald.gba", 0x5e701c, 0x10
 
-gUnknown_085E702C: ; 85E702C
+gUnknown_085E702C: @ 85E702C
 	.incbin "base_emerald.gba", 0x5e702c, 0x3c
 
-gUnknown_085E7068: ; 85E7068
+gUnknown_085E7068: @ 85E7068
 	.incbin "base_emerald.gba", 0x5e7068, 0x18
 
-gUnknown_085E7080: ; 85E7080
+gUnknown_085E7080: @ 85E7080
 	.incbin "base_emerald.gba", 0x5e7080, 0x8
 
-gUnknown_085E7088: ; 85E7088
+gUnknown_085E7088: @ 85E7088
 	.incbin "base_emerald.gba", 0x5e7088, 0x40
 
-gUnknown_085E70C8: ; 85E70C8
+gUnknown_085E70C8: @ 85E70C8
 	.incbin "base_emerald.gba", 0x5e70c8, 0x73c
 
-gUnknown_085E7804: ; 85E7804
+gUnknown_085E7804: @ 85E7804
 	.incbin "base_emerald.gba", 0x5e7804, 0x9f8
 
-gUnknown_085E81FC: ; 85E81FC
+gUnknown_085E81FC: @ 85E81FC
 	.incbin "base_emerald.gba", 0x5e81fc, 0x8
 
-gUnknown_085E8204: ; 85E8204
+gUnknown_085E8204: @ 85E8204
 	.incbin "base_emerald.gba", 0x5e8204, 0x10
 
-gUnknown_085E8214: ; 85E8214
+gUnknown_085E8214: @ 85E8214
 	.incbin "base_emerald.gba", 0x5e8214, 0x4
 
-gUnknown_085E8218: ; 85E8218
+gUnknown_085E8218: @ 85E8218
 	.incbin "base_emerald.gba", 0x5e8218, 0x1
 
-gUnknown_085E8219: ; 85E8219
+gUnknown_085E8219: @ 85E8219
 	.incbin "base_emerald.gba", 0x5e8219, 0x1
 
-gUnknown_085E821A: ; 85E821A
+gUnknown_085E821A: @ 85E821A
 	.incbin "base_emerald.gba", 0x5e821a, 0xf
 
-gUnknown_085E8229: ; 85E8229
+gUnknown_085E8229: @ 85E8229
 	.incbin "base_emerald.gba", 0x5e8229, 0x8
 
-gUnknown_085E8231: ; 85E8231
+gUnknown_085E8231: @ 85E8231
 	.incbin "base_emerald.gba", 0x5e8231, 0x5
 
-gUnknown_085E8236: ; 85E8236
+gUnknown_085E8236: @ 85E8236
 	.incbin "base_emerald.gba", 0x5e8236, 0x6
 
-gUnknown_085E823C: ; 85E823C
+gUnknown_085E823C: @ 85E823C
 	.incbin "base_emerald.gba", 0x5e823c, 0x7
 
-gUnknown_085E8243: ; 85E8243
+gUnknown_085E8243: @ 85E8243
 	.incbin "base_emerald.gba", 0x5e8243, 0x6
 
-gUnknown_085E8249: ; 85E8249
+gUnknown_085E8249: @ 85E8249
 	.incbin "base_emerald.gba", 0x5e8249, 0x7
 
-gUnknown_085E8250: ; 85E8250
+gUnknown_085E8250: @ 85E8250
 	.incbin "base_emerald.gba", 0x5e8250, 0x8
 
-gUnknown_085E8258: ; 85E8258
+gUnknown_085E8258: @ 85E8258
 	.incbin "base_emerald.gba", 0x5e8258, 0x8
 
-gUnknown_085E8260: ; 85E8260
+gUnknown_085E8260: @ 85E8260
 	.incbin "base_emerald.gba", 0x5e8260, 0x4
 
-gUnknown_085E8264: ; 85E8264
+gUnknown_085E8264: @ 85E8264
 	.incbin "base_emerald.gba", 0x5e8264, 0x4
 
-gUnknown_085E8268: ; 85E8268
+gUnknown_085E8268: @ 85E8268
 	.incbin "base_emerald.gba", 0x5e8268, 0x14
 
-gUnknown_085E827C: ; 85E827C
+gUnknown_085E827C: @ 85E827C
 	.incbin "base_emerald.gba", 0x5e827c, 0x9
 
-gUnknown_085E8285: ; 85E8285
+gUnknown_085E8285: @ 85E8285
 	.incbin "base_emerald.gba", 0x5e8285, 0x9
 
-gUnknown_085E828E: ; 85E828E
+gUnknown_085E828E: @ 85E828E
 	.incbin "base_emerald.gba", 0x5e828e, 0x7
 
-gUnknown_085E8295: ; 85E8295
+gUnknown_085E8295: @ 85E8295
 	.incbin "base_emerald.gba", 0x5e8295, 0xd
 
-gUnknown_085E82A2: ; 85E82A2
+gUnknown_085E82A2: @ 85E82A2
 	.incbin "base_emerald.gba", 0x5e82a2, 0xd
 
-gUnknown_085E82AF: ; 85E82AF
+gUnknown_085E82AF: @ 85E82AF
 	.incbin "base_emerald.gba", 0x5e82af, 0xf
 
-gUnknown_085E82BE: ; 85E82BE
+gUnknown_085E82BE: @ 85E82BE
 	.incbin "base_emerald.gba", 0x5e82be, 0x27
 
-gUnknown_085E82E5: ; 85E82E5
+gUnknown_085E82E5: @ 85E82E5
 	.incbin "base_emerald.gba", 0x5e82e5, 0x43
 
-gUnknown_085E8328: ; 85E8328
+gUnknown_085E8328: @ 85E8328
 	.incbin "base_emerald.gba", 0x5e8328, 0x9a
 
-gUnknown_085E83C2: ; 85E83C2
+gUnknown_085E83C2: @ 85E83C2
 	.incbin "base_emerald.gba", 0x5e83c2, 0x43
 
-gUnknown_085E8405: ; 85E8405
+gUnknown_085E8405: @ 85E8405
 	.incbin "base_emerald.gba", 0x5e8405, 0x3b
 
-gUnknown_085E8440: ; 85E8440
+gUnknown_085E8440: @ 85E8440
 	.incbin "base_emerald.gba", 0x5e8440, 0x13
 
-gUnknown_085E8453: ; 85E8453
+gUnknown_085E8453: @ 85E8453
 	.incbin "base_emerald.gba", 0x5e8453, 0x7b
 
-gUnknown_085E84CE: ; 85E84CE
+gUnknown_085E84CE: @ 85E84CE
 	.incbin "base_emerald.gba", 0x5e84ce, 0x8e
 
-gUnknown_085E855C: ; 85E855C
+gUnknown_085E855C: @ 85E855C
 	.incbin "base_emerald.gba", 0x5e855c, 0x18
 
-gUnknown_085E8574: ; 85E8574
+gUnknown_085E8574: @ 85E8574
 	.incbin "base_emerald.gba", 0x5e8574, 0x14
 
-gUnknown_085E8588: ; 85E8588
+gUnknown_085E8588: @ 85E8588
 	.incbin "base_emerald.gba", 0x5e8588, 0x10a
 
-gUnknown_085E8692: ; 85E8692
+gUnknown_085E8692: @ 85E8692
 	.incbin "base_emerald.gba", 0x5e8692, 0x26
 
-gUnknown_085E86B8: ; 85E86B8
+gUnknown_085E86B8: @ 85E86B8
 	.incbin "base_emerald.gba", 0x5e86b8, 0xe
 
-gUnknown_085E86C6: ; 85E86C6
+gUnknown_085E86C6: @ 85E86C6
 	.incbin "base_emerald.gba", 0x5e86c6, 0xa
 
-gUnknown_085E86D0: ; 85E86D0
+gUnknown_085E86D0: @ 85E86D0
 	.incbin "base_emerald.gba", 0x5e86d0, 0x4b
 
-gUnknown_085E871B: ; 85E871B
+gUnknown_085E871B: @ 85E871B
 	.incbin "base_emerald.gba", 0x5e871b, 0x8
 
-gUnknown_085E8723: ; 85E8723
+gUnknown_085E8723: @ 85E8723
 	.incbin "base_emerald.gba", 0x5e8723, 0x12
 
-gUnknown_085E8735: ; 85E8735
+gUnknown_085E8735: @ 85E8735
 	.incbin "base_emerald.gba", 0x5e8735, 0x20
 
-gUnknown_085E8755: ; 85E8755
+gUnknown_085E8755: @ 85E8755
 	.incbin "base_emerald.gba", 0x5e8755, 0x3
 
-gUnknown_085E8758: ; 85E8758
+gUnknown_085E8758: @ 85E8758
 	.incbin "base_emerald.gba", 0x5e8758, 0x3
 
-gUnknown_085E875B: ; 85E875B
+gUnknown_085E875B: @ 85E875B
 	.incbin "base_emerald.gba", 0x5e875b, 0x18
 
-gUnknown_085E8773: ; 85E8773
+gUnknown_085E8773: @ 85E8773
 	.incbin "base_emerald.gba", 0x5e8773, 0x12
 
-gUnknown_085E8785: ; 85E8785
+gUnknown_085E8785: @ 85E8785
 	.incbin "base_emerald.gba", 0x5e8785, 0x3b5
 
-gUnknown_085E8B3A: ; 85E8B3A
+gUnknown_085E8B3A: @ 85E8B3A
 	.incbin "base_emerald.gba", 0x5e8b3a, 0x4
 
-gUnknown_085E8B3E: ; 85E8B3E
+gUnknown_085E8B3E: @ 85E8B3E
 	.incbin "base_emerald.gba", 0x5e8b3e, 0x9e
 
-gUnknown_085E8BDC: ; 85E8BDC
+gUnknown_085E8BDC: @ 85E8BDC
 	.incbin "base_emerald.gba", 0x5e8bdc, 0x24
 
-gUnknown_085E8C00: ; 85E8C00
+gUnknown_085E8C00: @ 85E8C00
 	.incbin "base_emerald.gba", 0x5e8c00, 0x14
 
-gUnknown_085E8C14: ; 85E8C14
+gUnknown_085E8C14: @ 85E8C14
 	.incbin "base_emerald.gba", 0x5e8c14, 0x22
 
-gUnknown_085E8C36: ; 85E8C36
+gUnknown_085E8C36: @ 85E8C36
 	.incbin "base_emerald.gba", 0x5e8c36, 0x5
 
-gUnknown_085E8C3B: ; 85E8C3B
+gUnknown_085E8C3B: @ 85E8C3B
 	.incbin "base_emerald.gba", 0x5e8c3b, 0xd
 
-gUnknown_085E8C48: ; 85E8C48
+gUnknown_085E8C48: @ 85E8C48
 	.incbin "base_emerald.gba", 0x5e8c48, 0x5
 
-gUnknown_085E8C4D: ; 85E8C4D
+gUnknown_085E8C4D: @ 85E8C4D
 	.incbin "base_emerald.gba", 0x5e8c4d, 0x6
 
-gUnknown_085E8C53: ; 85E8C53
+gUnknown_085E8C53: @ 85E8C53
 	.incbin "base_emerald.gba", 0x5e8c53, 0x3d
 
-gUnknown_085E8C90: ; 85E8C90
+gUnknown_085E8C90: @ 85E8C90
 	.incbin "base_emerald.gba", 0x5e8c90, 0x24
 
-gUnknown_085E8CB4: ; 85E8CB4
+gUnknown_085E8CB4: @ 85E8CB4
 	.incbin "base_emerald.gba", 0x5e8cb4, 0x2f
 
-gUnknown_085E8CE3: ; 85E8CE3
+gUnknown_085E8CE3: @ 85E8CE3
 	.incbin "base_emerald.gba", 0x5e8ce3, 0xd
 
-gUnknown_085E8CF0: ; 85E8CF0
+gUnknown_085E8CF0: @ 85E8CF0
 	.incbin "base_emerald.gba", 0x5e8cf0, 0x7
 
-gUnknown_085E8CF7: ; 85E8CF7
+gUnknown_085E8CF7: @ 85E8CF7
 	.incbin "base_emerald.gba", 0x5e8cf7, 0xc
 
-gUnknown_085E8D03: ; 85E8D03
+gUnknown_085E8D03: @ 85E8D03
 	.incbin "base_emerald.gba", 0x5e8d03, 0x23
 
-gUnknown_085E8D26: ; 85E8D26
+gUnknown_085E8D26: @ 85E8D26
 	.incbin "base_emerald.gba", 0x5e8d26, 0xe
 
-gUnknown_085E8D34: ; 85E8D34
+gUnknown_085E8D34: @ 85E8D34
 	.incbin "base_emerald.gba", 0x5e8d34, 0x4
 
-gUnknown_085E8D38: ; 85E8D38
+gUnknown_085E8D38: @ 85E8D38
 	.incbin "base_emerald.gba", 0x5e8d38, 0x6
 
-gUnknown_085E8D3E: ; 85E8D3E
+gUnknown_085E8D3E: @ 85E8D3E
 	.incbin "base_emerald.gba", 0x5e8d3e, 0x2
 
-gUnknown_085E8D40: ; 85E8D40
+gUnknown_085E8D40: @ 85E8D40
 	.incbin "base_emerald.gba", 0x5e8d40, 0x2
 
-gUnknown_085E8D42: ; 85E8D42
+gUnknown_085E8D42: @ 85E8D42
 	.incbin "base_emerald.gba", 0x5e8d42, 0x3
 
-gUnknown_085E8D45: ; 85E8D45
+gUnknown_085E8D45: @ 85E8D45
 	.incbin "base_emerald.gba", 0x5e8d45, 0x4
 
-gUnknown_085E8D49: ; 85E8D49
+gUnknown_085E8D49: @ 85E8D49
 	.incbin "base_emerald.gba", 0x5e8d49, 0x2
 
-gUnknown_085E8D4B: ; 85E8D4B
+gUnknown_085E8D4B: @ 85E8D4B
 	.incbin "base_emerald.gba", 0x5e8d4b, 0x2
 
-gUnknown_085E8D4D: ; 85E8D4D
+gUnknown_085E8D4D: @ 85E8D4D
 	.incbin "base_emerald.gba", 0x5e8d4d, 0x2
 
-gUnknown_085E8D4F: ; 85E8D4F
+gUnknown_085E8D4F: @ 85E8D4F
 	.incbin "base_emerald.gba", 0x5e8d4f, 0xa
 
-gUnknown_085E8D59: ; 85E8D59
+gUnknown_085E8D59: @ 85E8D59
 	.incbin "base_emerald.gba", 0x5e8d59, 0x5
 
-gUnknown_085E8D5E: ; 85E8D5E
+gUnknown_085E8D5E: @ 85E8D5E
 	.incbin "base_emerald.gba", 0x5e8d5e, 0x2
 
-gUnknown_085E8D60: ; 85E8D60
+gUnknown_085E8D60: @ 85E8D60
 	.incbin "base_emerald.gba", 0x5e8d60, 0x2
 
-gUnknown_085E8D62: ; 85E8D62
+gUnknown_085E8D62: @ 85E8D62
 	.incbin "base_emerald.gba", 0x5e8d62, 0x1e
 
-gUnknown_085E8D80: ; 85E8D80
+gUnknown_085E8D80: @ 85E8D80
 	.incbin "base_emerald.gba", 0x5e8d80, 0x20
 
-gUnknown_085E8DA0: ; 85E8DA0
+gUnknown_085E8DA0: @ 85E8DA0
 	.incbin "base_emerald.gba", 0x5e8da0, 0xb
 
-gUnknown_085E8DAB: ; 85E8DAB
+gUnknown_085E8DAB: @ 85E8DAB
 	.incbin "base_emerald.gba", 0x5e8dab, 0x9
 
-gUnknown_085E8DB4: ; 85E8DB4
+gUnknown_085E8DB4: @ 85E8DB4
 	.incbin "base_emerald.gba", 0x5e8db4, 0xa
 
-gUnknown_085E8DBE: ; 85E8DBE
+gUnknown_085E8DBE: @ 85E8DBE
 	.incbin "base_emerald.gba", 0x5e8dbe, 0x10
 
-gUnknown_085E8DCE: ; 85E8DCE
+gUnknown_085E8DCE: @ 85E8DCE
 	.incbin "base_emerald.gba", 0x5e8dce, 0x1b
 
-gUnknown_085E8DE9: ; 85E8DE9
+gUnknown_085E8DE9: @ 85E8DE9
 	.incbin "base_emerald.gba", 0x5e8de9, 0x15
 
-gUnknown_085E8DFE: ; 85E8DFE
+gUnknown_085E8DFE: @ 85E8DFE
 	.incbin "base_emerald.gba", 0x5e8dfe, 0x13
 
-gUnknown_085E8E11: ; 85E8E11
+gUnknown_085E8E11: @ 85E8E11
 	.incbin "base_emerald.gba", 0x5e8e11, 0x16
 
-gUnknown_085E8E27: ; 85E8E27
+gUnknown_085E8E27: @ 85E8E27
 	.incbin "base_emerald.gba", 0x5e8e27, 0x1b
 
-gUnknown_085E8E42: ; 85E8E42
+gUnknown_085E8E42: @ 85E8E42
 	.incbin "base_emerald.gba", 0x5e8e42, 0x18
 
-gUnknown_085E8E5A: ; 85E8E5A
+gUnknown_085E8E5A: @ 85E8E5A
 	.incbin "base_emerald.gba", 0x5e8e5a, 0x14
 
-gUnknown_085E8E6E: ; 85E8E6E
+gUnknown_085E8E6E: @ 85E8E6E
 	.incbin "base_emerald.gba", 0x5e8e6e, 0x20
 
-gUnknown_085E8E8E: ; 85E8E8E
+gUnknown_085E8E8E: @ 85E8E8E
 	.incbin "base_emerald.gba", 0x5e8e8e, 0x2b
 
-gUnknown_085E8EB9: ; 85E8EB9
+gUnknown_085E8EB9: @ 85E8EB9
 	.incbin "base_emerald.gba", 0x5e8eb9, 0x27
 
-gUnknown_085E8EE0: ; 85E8EE0
+gUnknown_085E8EE0: @ 85E8EE0
 	.incbin "base_emerald.gba", 0x5e8ee0, 0x19
 
-gUnknown_085E8EF9: ; 85E8EF9
+gUnknown_085E8EF9: @ 85E8EF9
 	.incbin "base_emerald.gba", 0x5e8ef9, 0x15
 
-gUnknown_085E8F0E: ; 85E8F0E
+gUnknown_085E8F0E: @ 85E8F0E
 	.incbin "base_emerald.gba", 0x5e8f0e, 0x23
 
-gUnknown_085E8F31: ; 85E8F31
+gUnknown_085E8F31: @ 85E8F31
 	.incbin "base_emerald.gba", 0x5e8f31, 0x3d
 
-gUnknown_085E8F6E: ; 85E8F6E
+gUnknown_085E8F6E: @ 85E8F6E
 	.incbin "base_emerald.gba", 0x5e8f6e, 0x25
 
-gUnknown_085E8F93: ; 85E8F93
+gUnknown_085E8F93: @ 85E8F93
 	.incbin "base_emerald.gba", 0x5e8f93, 0x48
 
-gUnknown_085E8FDB: ; 85E8FDB
+gUnknown_085E8FDB: @ 85E8FDB
 	.incbin "base_emerald.gba", 0x5e8fdb, 0x27
 
-gUnknown_085E9002: ; 85E9002
+gUnknown_085E9002: @ 85E9002
 	.incbin "base_emerald.gba", 0x5e9002, 0x24
 
-gUnknown_085E9026: ; 85E9026
+gUnknown_085E9026: @ 85E9026
 	.incbin "base_emerald.gba", 0x5e9026, 0x11
 
-gUnknown_085E9037: ; 85E9037
+gUnknown_085E9037: @ 85E9037
 	.incbin "base_emerald.gba", 0x5e9037, 0x10
 
-gUnknown_085E9047: ; 85E9047
+gUnknown_085E9047: @ 85E9047
 	.incbin "base_emerald.gba", 0x5e9047, 0x11
 
-gUnknown_085E9058: ; 85E9058
+gUnknown_085E9058: @ 85E9058
 	.incbin "base_emerald.gba", 0x5e9058, 0x28
 
-gUnknown_085E9080: ; 85E9080
+gUnknown_085E9080: @ 85E9080
 	.incbin "base_emerald.gba", 0x5e9080, 0x12
 
-gUnknown_085E9092: ; 85E9092
+gUnknown_085E9092: @ 85E9092
 	.incbin "base_emerald.gba", 0x5e9092, 0x34
 
-gUnknown_085E90C6: ; 85E90C6
+gUnknown_085E90C6: @ 85E90C6
 	.incbin "base_emerald.gba", 0x5e90c6, 0x2e
 
-gUnknown_085E90F4: ; 85E90F4
+gUnknown_085E90F4: @ 85E90F4
 	.incbin "base_emerald.gba", 0x5e90f4, 0x31
 
-gUnknown_085E9125: ; 85E9125
+gUnknown_085E9125: @ 85E9125
 	.incbin "base_emerald.gba", 0x5e9125, 0x13
 
-gUnknown_085E9138: ; 85E9138
+gUnknown_085E9138: @ 85E9138
 	.incbin "base_emerald.gba", 0x5e9138, 0x48
 
-gUnknown_085E9180: ; 85E9180
+gUnknown_085E9180: @ 85E9180
 	.incbin "base_emerald.gba", 0x5e9180, 0x30
 
-gUnknown_085E91B0: ; 85E91B0
+gUnknown_085E91B0: @ 85E91B0
 	.incbin "base_emerald.gba", 0x5e91b0, 0x10
 
-gUnknown_085E91C0: ; 85E91C0
+gUnknown_085E91C0: @ 85E91C0
 	.incbin "base_emerald.gba", 0x5e91c0, 0x3c
 
-gUnknown_085E91FC: ; 85E91FC
+gUnknown_085E91FC: @ 85E91FC
 	.incbin "base_emerald.gba", 0x5e91fc, 0x14
 
-gUnknown_085E9210: ; 85E9210
+gUnknown_085E9210: @ 85E9210
 	.incbin "base_emerald.gba", 0x5e9210, 0xa
 
-gUnknown_085E921A: ; 85E921A
+gUnknown_085E921A: @ 85E921A
 	.incbin "base_emerald.gba", 0x5e921a, 0xb
 
-gUnknown_085E9225: ; 85E9225
+gUnknown_085E9225: @ 85E9225
 	.incbin "base_emerald.gba", 0x5e9225, 0x7
 
-gUnknown_085E922C: ; 85E922C
+gUnknown_085E922C: @ 85E922C
 	.incbin "base_emerald.gba", 0x5e922c, 0x7
 
-gUnknown_085E9233: ; 85E9233
+gUnknown_085E9233: @ 85E9233
 	.incbin "base_emerald.gba", 0x5e9233, 0x7
 
-; 85E923A
+@ 85E923A
 	.include "data/text/berry_firmness_strings.s"
 
-gUnknown_085E9263: ; 85E9263
+gUnknown_085E9263: @ 85E9263
 	.incbin "base_emerald.gba", 0x5e9263, 0x8
 
-gUnknown_085E926B: ; 85E926B
+gUnknown_085E926B: @ 85E926B
 	.incbin "base_emerald.gba", 0x5e926b, 0xb2
 
-gUnknown_085E931D: ; 85E931D
+gUnknown_085E931D: @ 85E931D
 	.incbin "base_emerald.gba", 0x5e931d, 0x6
 
-gUnknown_085E9323: ; 85E9323
+gUnknown_085E9323: @ 85E9323
 	.incbin "base_emerald.gba", 0x5e9323, 0x4
 
-gUnknown_085E9327: ; 85E9327
+gUnknown_085E9327: @ 85E9327
 	.incbin "base_emerald.gba", 0x5e9327, 0x6
 
-gUnknown_085E932D: ; 85E932D
+gUnknown_085E932D: @ 85E932D
 	.incbin "base_emerald.gba", 0x5e932d, 0x7
 
-gUnknown_085E9334: ; 85E9334
+gUnknown_085E9334: @ 85E9334
 	.incbin "base_emerald.gba", 0x5e9334, 0x10
 
-gUnknown_085E9344: ; 85E9344
+gUnknown_085E9344: @ 85E9344
 	.incbin "base_emerald.gba", 0x5e9344, 0xb
 
-gUnknown_085E934F: ; 85E934F
+gUnknown_085E934F: @ 85E934F
 	.incbin "base_emerald.gba", 0x5e934f, 0x4
 
-gUnknown_085E9353: ; 85E9353
+gUnknown_085E9353: @ 85E9353
 	.incbin "base_emerald.gba", 0x5e9353, 0x14
 
-gUnknown_085E9367: ; 85E9367
+gUnknown_085E9367: @ 85E9367
 	.incbin "base_emerald.gba", 0x5e9367, 0x18
 
-gUnknown_085E937F: ; 85E937F
+gUnknown_085E937F: @ 85E937F
 	.incbin "base_emerald.gba", 0x5e937f, 0x11
 
-gUnknown_085E9390: ; 85E9390
+gUnknown_085E9390: @ 85E9390
 	.incbin "base_emerald.gba", 0x5e9390, 0x19
 
-gUnknown_085E93A9: ; 85E93A9
+gUnknown_085E93A9: @ 85E93A9
 	.incbin "base_emerald.gba", 0x5e93a9, 0x2c
 
-gUnknown_085E93D5: ; 85E93D5
+gUnknown_085E93D5: @ 85E93D5
 	.incbin "base_emerald.gba", 0x5e93d5, 0xb
 
-gUnknown_085E93E0: ; 85E93E0
+gUnknown_085E93E0: @ 85E93E0
 	.incbin "base_emerald.gba", 0x5e93e0, 0xf
 
-gUnknown_085E93EF: ; 85E93EF
+gUnknown_085E93EF: @ 85E93EF
 	.incbin "base_emerald.gba", 0x5e93ef, 0x28
 
-gUnknown_085E9417: ; 85E9417
+gUnknown_085E9417: @ 85E9417
 	.incbin "base_emerald.gba", 0x5e9417, 0x28
 
-gUnknown_085E943F: ; 85E943F
+gUnknown_085E943F: @ 85E943F
 	.incbin "base_emerald.gba", 0x5e943f, 0x29
 
-gUnknown_085E9468: ; 85E9468
+gUnknown_085E9468: @ 85E9468
 	.incbin "base_emerald.gba", 0x5e9468, 0x2b
 
-gUnknown_085E9493: ; 85E9493
+gUnknown_085E9493: @ 85E9493
 	.incbin "base_emerald.gba", 0x5e9493, 0x32
 
-gUnknown_085E94C5: ; 85E94C5
+gUnknown_085E94C5: @ 85E94C5
 	.incbin "base_emerald.gba", 0x5e94c5, 0x22
 
-gUnknown_085E94E7: ; 85E94E7
+gUnknown_085E94E7: @ 85E94E7
 	.incbin "base_emerald.gba", 0x5e94e7, 0x29
 
-gUnknown_085E9510: ; 85E9510
+gUnknown_085E9510: @ 85E9510
 	.incbin "base_emerald.gba", 0x5e9510, 0x29
 
-gUnknown_085E9539: ; 85E9539
+gUnknown_085E9539: @ 85E9539
 	.incbin "base_emerald.gba", 0x5e9539, 0x1f
 
-gUnknown_085E9558: ; 85E9558
+gUnknown_085E9558: @ 85E9558
 	.incbin "base_emerald.gba", 0x5e9558, 0x27
 
-gUnknown_085E957F: ; 85E957F
+gUnknown_085E957F: @ 85E957F
 	.incbin "base_emerald.gba", 0x5e957f, 0x1c
 
-gUnknown_085E959B: ; 85E959B
+gUnknown_085E959B: @ 85E959B
 	.incbin "base_emerald.gba", 0x5e959b, 0x2c
 
-gUnknown_085E95C7: ; 85E95C7
+gUnknown_085E95C7: @ 85E95C7
 	.incbin "base_emerald.gba", 0x5e95c7, 0x23
 
-gUnknown_085E95EA: ; 85E95EA
+gUnknown_085E95EA: @ 85E95EA
 	.incbin "base_emerald.gba", 0x5e95ea, 0x25
 
-gUnknown_085E960F: ; 85E960F
+gUnknown_085E960F: @ 85E960F
 	.incbin "base_emerald.gba", 0x5e960f, 0x20
 
-gUnknown_085E962F: ; 85E962F
+gUnknown_085E962F: @ 85E962F
 	.incbin "base_emerald.gba", 0x5e962f, 0x25
 
-gUnknown_085E9654: ; 85E9654
+gUnknown_085E9654: @ 85E9654
 	.incbin "base_emerald.gba", 0x5e9654, 0x23
 
-gUnknown_085E9677: ; 85E9677
+gUnknown_085E9677: @ 85E9677
 	.incbin "base_emerald.gba", 0x5e9677, 0x25
 
-gUnknown_085E969C: ; 85E969C
+gUnknown_085E969C: @ 85E969C
 	.incbin "base_emerald.gba", 0x5e969c, 0x47
 
-gUnknown_085E96E3: ; 85E96E3
+gUnknown_085E96E3: @ 85E96E3
 	.incbin "base_emerald.gba", 0x5e96e3, 0x3
 
-gUnknown_085E96E6: ; 85E96E6
+gUnknown_085E96E6: @ 85E96E6
 	.incbin "base_emerald.gba", 0x5e96e6, 0x8
 
-gUnknown_085E96EE: ; 85E96EE
+gUnknown_085E96EE: @ 85E96EE
 	.incbin "base_emerald.gba", 0x5e96ee, 0x8
 
-gUnknown_085E96F6: ; 85E96F6
+gUnknown_085E96F6: @ 85E96F6
 	.incbin "base_emerald.gba", 0x5e96f6, 0x1c
 
-gUnknown_085E9712: ; 85E9712
+gUnknown_085E9712: @ 85E9712
 	.incbin "base_emerald.gba", 0x5e9712, 0x26
 
-gUnknown_085E9738: ; 85E9738
+gUnknown_085E9738: @ 85E9738
 	.incbin "base_emerald.gba", 0x5e9738, 0x1c
 
-gUnknown_085E9754: ; 85E9754
+gUnknown_085E9754: @ 85E9754
 	.incbin "base_emerald.gba", 0x5e9754, 0x1b
 
-gUnknown_085E976F: ; 85E976F
+gUnknown_085E976F: @ 85E976F
 	.incbin "base_emerald.gba", 0x5e976f, 0x20
 
-gUnknown_085E978F: ; 85E978F
+gUnknown_085E978F: @ 85E978F
 	.incbin "base_emerald.gba", 0x5e978f, 0x23
 
-gUnknown_085E97B2: ; 85E97B2
+gUnknown_085E97B2: @ 85E97B2
 	.incbin "base_emerald.gba", 0x5e97b2, 0x33
 
-gUnknown_085E97E5: ; 85E97E5
+gUnknown_085E97E5: @ 85E97E5
 	.incbin "base_emerald.gba", 0x5e97e5, 0x17
 
-gUnknown_085E97FC: ; 85E97FC
+gUnknown_085E97FC: @ 85E97FC
 	.incbin "base_emerald.gba", 0x5e97fc, 0x34
 
-gUnknown_085E9830: ; 85E9830
+gUnknown_085E9830: @ 85E9830
 	.incbin "base_emerald.gba", 0x5e9830, 0x25
 
-gUnknown_085E9855: ; 85E9855
+gUnknown_085E9855: @ 85E9855
 	.incbin "base_emerald.gba", 0x5e9855, 0x22
 
-gUnknown_085E9877: ; 85E9877
+gUnknown_085E9877: @ 85E9877
 	.incbin "base_emerald.gba", 0x5e9877, 0x20
 
-gUnknown_085E9897: ; 85E9897
+gUnknown_085E9897: @ 85E9897
 	.incbin "base_emerald.gba", 0x5e9897, 0x1d
 
-gUnknown_085E98B4: ; 85E98B4
+gUnknown_085E98B4: @ 85E98B4
 	.incbin "base_emerald.gba", 0x5e98b4, 0x38
 
-gUnknown_085E98EC: ; 85E98EC
+gUnknown_085E98EC: @ 85E98EC
 	.incbin "base_emerald.gba", 0x5e98ec, 0x2f
 
-gUnknown_085E991B: ; 85E991B
+gUnknown_085E991B: @ 85E991B
 	.incbin "base_emerald.gba", 0x5e991b, 0x1f
 
-gUnknown_085E993A: ; 85E993A
+gUnknown_085E993A: @ 85E993A
 	.incbin "base_emerald.gba", 0x5e993a, 0x46
 
-gUnknown_085E9980: ; 85E9980
+gUnknown_085E9980: @ 85E9980
 	.incbin "base_emerald.gba", 0x5e9980, 0x1d
 
-gUnknown_085E999D: ; 85E999D
+gUnknown_085E999D: @ 85E999D
 	.incbin "base_emerald.gba", 0x5e999d, 0x1b
 
-gUnknown_085E99B8: ; 85E99B8
+gUnknown_085E99B8: @ 85E99B8
 	.incbin "base_emerald.gba", 0x5e99b8, 0x23
 
-gUnknown_085E99DB: ; 85E99DB
+gUnknown_085E99DB: @ 85E99DB
 	.incbin "base_emerald.gba", 0x5e99db, 0x2d
 
-gUnknown_085E9A08: ; 85E9A08
+gUnknown_085E9A08: @ 85E9A08
 	.incbin "base_emerald.gba", 0x5e9a08, 0x38
 
-gUnknown_085E9A40: ; 85E9A40
+gUnknown_085E9A40: @ 85E9A40
 	.incbin "base_emerald.gba", 0x5e9a40, 0x29
 
-gUnknown_085E9A69: ; 85E9A69
+gUnknown_085E9A69: @ 85E9A69
 	.incbin "base_emerald.gba", 0x5e9a69, 0x3c
 
-gUnknown_085E9AA5: ; 85E9AA5
+gUnknown_085E9AA5: @ 85E9AA5
 	.incbin "base_emerald.gba", 0x5e9aa5, 0xf
 
-gUnknown_085E9AB4: ; 85E9AB4
+gUnknown_085E9AB4: @ 85E9AB4
 	.incbin "base_emerald.gba", 0x5e9ab4, 0x35
 
-gUnknown_085E9AE9: ; 85E9AE9
+gUnknown_085E9AE9: @ 85E9AE9
 	.incbin "base_emerald.gba", 0x5e9ae9, 0x74
 
-gUnknown_085E9B5D: ; 85E9B5D
+gUnknown_085E9B5D: @ 85E9B5D
 	.incbin "base_emerald.gba", 0x5e9b5d, 0x19
 
-gUnknown_085E9B76: ; 85E9B76
+gUnknown_085E9B76: @ 85E9B76
 	.incbin "base_emerald.gba", 0x5e9b76, 0x20
 
-gUnknown_085E9B96: ; 85E9B96
+gUnknown_085E9B96: @ 85E9B96
 	.incbin "base_emerald.gba", 0x5e9b96, 0x22
 
-gUnknown_085E9BB8: ; 85E9BB8
+gUnknown_085E9BB8: @ 85E9BB8
 	.incbin "base_emerald.gba", 0x5e9bb8, 0x48
 
-gUnknown_085E9C00: ; 85E9C00
+gUnknown_085E9C00: @ 85E9C00
 	.incbin "base_emerald.gba", 0x5e9c00, 0x17
 
-gUnknown_085E9C17: ; 85E9C17
+gUnknown_085E9C17: @ 85E9C17
 	.incbin "base_emerald.gba", 0x5e9c17, 0x27
 
-gUnknown_085E9C3E: ; 85E9C3E
+gUnknown_085E9C3E: @ 85E9C3E
 	.incbin "base_emerald.gba", 0x5e9c3e, 0x21
 
-gUnknown_085E9C5F: ; 85E9C5F
+gUnknown_085E9C5F: @ 85E9C5F
 	.incbin "base_emerald.gba", 0x5e9c5f, 0x1d
 
-gUnknown_085E9C7C: ; 85E9C7C
+gUnknown_085E9C7C: @ 85E9C7C
 	.incbin "base_emerald.gba", 0x5e9c7c, 0xe
 
-gUnknown_085E9C8A: ; 85E9C8A
+gUnknown_085E9C8A: @ 85E9C8A
 	.incbin "base_emerald.gba", 0x5e9c8a, 0x18
 
-gUnknown_085E9CA2: ; 85E9CA2
+gUnknown_085E9CA2: @ 85E9CA2
 	.incbin "base_emerald.gba", 0x5e9ca2, 0x15
 
-gUnknown_085E9CB7: ; 85E9CB7
+gUnknown_085E9CB7: @ 85E9CB7
 	.incbin "base_emerald.gba", 0x5e9cb7, 0x29
 
-gUnknown_085E9CE0: ; 85E9CE0
+gUnknown_085E9CE0: @ 85E9CE0
 	.incbin "base_emerald.gba", 0x5e9ce0, 0x15
 
-gUnknown_085E9CF5: ; 85E9CF5
+gUnknown_085E9CF5: @ 85E9CF5
 	.incbin "base_emerald.gba", 0x5e9cf5, 0x15
 
-gUnknown_085E9D0A: ; 85E9D0A
+gUnknown_085E9D0A: @ 85E9D0A
 	.incbin "base_emerald.gba", 0x5e9d0a, 0x1b
 
-gUnknown_085E9D25: ; 85E9D25
+gUnknown_085E9D25: @ 85E9D25
 	.incbin "base_emerald.gba", 0x5e9d25, 0x20
 
-gUnknown_085E9D45: ; 85E9D45
+gUnknown_085E9D45: @ 85E9D45
 	.incbin "base_emerald.gba", 0x5e9d45, 0x28
 
-gUnknown_085E9D6D: ; 85E9D6D
+gUnknown_085E9D6D: @ 85E9D6D
 	.incbin "base_emerald.gba", 0x5e9d6d, 0x23
 
-gUnknown_085E9D90: ; 85E9D90
+gUnknown_085E9D90: @ 85E9D90
 	.incbin "base_emerald.gba", 0x5e9d90, 0x2e
 
-gUnknown_085E9DBE: ; 85E9DBE
+gUnknown_085E9DBE: @ 85E9DBE
 	.incbin "base_emerald.gba", 0x5e9dbe, 0x23
 
-gUnknown_085E9DE1: ; 85E9DE1
+gUnknown_085E9DE1: @ 85E9DE1
 	.incbin "base_emerald.gba", 0x5e9de1, 0x1f
 
-gUnknown_085E9E00: ; 85E9E00
+gUnknown_085E9E00: @ 85E9E00
 	.incbin "base_emerald.gba", 0x5e9e00, 0x14
 
-gUnknown_085E9E14: ; 85E9E14
+gUnknown_085E9E14: @ 85E9E14
 	.incbin "base_emerald.gba", 0x5e9e14, 0x2da
 
-gUnknown_085EA0EE: ; 85EA0EE
+gUnknown_085EA0EE: @ 85EA0EE
 	.incbin "base_emerald.gba", 0x5ea0ee, 0x22
 
-gUnknown_085EA110: ; 85EA110
+gUnknown_085EA110: @ 85EA110
 	.incbin "base_emerald.gba", 0x5ea110, 0x16
 
-gUnknown_085EA126: ; 85EA126
+gUnknown_085EA126: @ 85EA126
 	.incbin "base_emerald.gba", 0x5ea126, 0x13
 
-gUnknown_085EA139: ; 85EA139
+gUnknown_085EA139: @ 85EA139
 	.incbin "base_emerald.gba", 0x5ea139, 0x1c
 
-gUnknown_085EA155: ; 85EA155
+gUnknown_085EA155: @ 85EA155
 	.incbin "base_emerald.gba", 0x5ea155, 0x16
 
-gUnknown_085EA16B: ; 85EA16B
+gUnknown_085EA16B: @ 85EA16B
 	.incbin "base_emerald.gba", 0x5ea16b, 0x2b
 
-gUnknown_085EA196: ; 85EA196
+gUnknown_085EA196: @ 85EA196
 	.incbin "base_emerald.gba", 0x5ea196, 0x34
 
-gUnknown_085EA1CA: ; 85EA1CA
+gUnknown_085EA1CA: @ 85EA1CA
 	.incbin "base_emerald.gba", 0x5ea1ca, 0x3
 
-gUnknown_085EA1CD: ; 85EA1CD
+gUnknown_085EA1CD: @ 85EA1CD
 	.incbin "base_emerald.gba", 0x5ea1cd, 0x1b
 
-gUnknown_085EA1E8: ; 85EA1E8
+gUnknown_085EA1E8: @ 85EA1E8
 	.incbin "base_emerald.gba", 0x5ea1e8, 0x28
 
-gUnknown_085EA210: ; 85EA210
+gUnknown_085EA210: @ 85EA210
 	.incbin "base_emerald.gba", 0x5ea210, 0x24
 
-gUnknown_085EA234: ; 85EA234
+gUnknown_085EA234: @ 85EA234
 	.incbin "base_emerald.gba", 0x5ea234, 0x108
 
-gUnknown_085EA33C: ; 85EA33C
+gUnknown_085EA33C: @ 85EA33C
 	.incbin "base_emerald.gba", 0x5ea33c, 0x7
 
-gUnknown_085EA343: ; 85EA343
+gUnknown_085EA343: @ 85EA343
 	.incbin "base_emerald.gba", 0x5ea343, 0x8
 
-gUnknown_085EA34B: ; 85EA34B
+gUnknown_085EA34B: @ 85EA34B
 	.incbin "base_emerald.gba", 0x5ea34b, 0x8
 
-gUnknown_085EA353: ; 85EA353
+gUnknown_085EA353: @ 85EA353
 	.incbin "base_emerald.gba", 0x5ea353, 0x8
 
-gUnknown_085EA35B: ; 85EA35B
+gUnknown_085EA35B: @ 85EA35B
 	.incbin "base_emerald.gba", 0x5ea35b, 0x6
 
-gUnknown_085EA361: ; 85EA361
+gUnknown_085EA361: @ 85EA361
 	.incbin "base_emerald.gba", 0x5ea361, 0x4
 
-gUnknown_085EA365: ; 85EA365
+gUnknown_085EA365: @ 85EA365
 	.incbin "base_emerald.gba", 0x5ea365, 0x4
 
-gUnknown_085EA369: ; 85EA369
+gUnknown_085EA369: @ 85EA369
 	.incbin "base_emerald.gba", 0x5ea369, 0xf
 
-gUnknown_085EA378: ; 85EA378
+gUnknown_085EA378: @ 85EA378
 	.incbin "base_emerald.gba", 0x5ea378, 0x6
 
-gUnknown_085EA37E: ; 85EA37E
+gUnknown_085EA37E: @ 85EA37E
 	.incbin "base_emerald.gba", 0x5ea37e, 0x6
 
-gUnknown_085EA384: ; 85EA384
+gUnknown_085EA384: @ 85EA384
 	.incbin "base_emerald.gba", 0x5ea384, 0x9
 
-gUnknown_085EA38D: ; 85EA38D
+gUnknown_085EA38D: @ 85EA38D
 	.incbin "base_emerald.gba", 0x5ea38d, 0x7
 
-gUnknown_085EA394: ; 85EA394
+gUnknown_085EA394: @ 85EA394
 	.incbin "base_emerald.gba", 0x5ea394, 0x4
 
-gUnknown_085EA398: ; 85EA398
+gUnknown_085EA398: @ 85EA398
 	.incbin "base_emerald.gba", 0x5ea398, 0x7
 
-gUnknown_085EA39F: ; 85EA39F
+gUnknown_085EA39F: @ 85EA39F
 	.incbin "base_emerald.gba", 0x5ea39f, 0xc
 
-gUnknown_085EA3AB: ; 85EA3AB
+gUnknown_085EA3AB: @ 85EA3AB
 	.incbin "base_emerald.gba", 0x5ea3ab, 0x9
 
-gUnknown_085EA3B4: ; 85EA3B4
+gUnknown_085EA3B4: @ 85EA3B4
 	.incbin "base_emerald.gba", 0x5ea3b4, 0xc
 
-gUnknown_085EA3C0: ; 85EA3C0
+gUnknown_085EA3C0: @ 85EA3C0
 	.incbin "base_emerald.gba", 0x5ea3c0, 0x8
 
-gUnknown_085EA3C8: ; 85EA3C8
+gUnknown_085EA3C8: @ 85EA3C8
 	.incbin "base_emerald.gba", 0x5ea3c8, 0x7
 
-gUnknown_085EA3CF: ; 85EA3CF
+gUnknown_085EA3CF: @ 85EA3CF
 	.incbin "base_emerald.gba", 0x5ea3cf, 0xd
 
-gUnknown_085EA3DC: ; 85EA3DC
+gUnknown_085EA3DC: @ 85EA3DC
 	.incbin "base_emerald.gba", 0x5ea3dc, 0xf
 
-gUnknown_085EA3EB: ; 85EA3EB
+gUnknown_085EA3EB: @ 85EA3EB
 	.incbin "base_emerald.gba", 0x5ea3eb, 0xd
 
-gUnknown_085EA3F8: ; 85EA3F8
+gUnknown_085EA3F8: @ 85EA3F8
 	.incbin "base_emerald.gba", 0x5ea3f8, 0xe
 
-gUnknown_085EA406: ; 85EA406
+gUnknown_085EA406: @ 85EA406
 	.incbin "base_emerald.gba", 0x5ea406, 0x5
 
-gUnknown_085EA40B: ; 85EA40B
+gUnknown_085EA40B: @ 85EA40B
 	.incbin "base_emerald.gba", 0x5ea40b, 0x37
 
-gUnknown_085EA442: ; 85EA442
+gUnknown_085EA442: @ 85EA442
 	.incbin "base_emerald.gba", 0x5ea442, 0x33
 
-gUnknown_085EA475: ; 85EA475
+gUnknown_085EA475: @ 85EA475
 	.incbin "base_emerald.gba", 0x5ea475, 0x2d
 
-gUnknown_085EA4A2: ; 85EA4A2
+gUnknown_085EA4A2: @ 85EA4A2
 	.incbin "base_emerald.gba", 0x5ea4a2, 0x29
 
-gUnknown_085EA4CB: ; 85EA4CB
+gUnknown_085EA4CB: @ 85EA4CB
 	.incbin "base_emerald.gba", 0x5ea4cb, 0x21
 
-gUnknown_085EA4EC: ; 85EA4EC
+gUnknown_085EA4EC: @ 85EA4EC
 	.incbin "base_emerald.gba", 0x5ea4ec, 0x2a
 
-gUnknown_085EA516: ; 85EA516
+gUnknown_085EA516: @ 85EA516
 	.incbin "base_emerald.gba", 0x5ea516, 0x2e
 
-gUnknown_085EA544: ; 85EA544
+gUnknown_085EA544: @ 85EA544
 	.incbin "base_emerald.gba", 0x5ea544, 0x26
 
-gUnknown_085EA56A: ; 85EA56A
+gUnknown_085EA56A: @ 85EA56A
 	.incbin "base_emerald.gba", 0x5ea56a, 0x3e
 
-gUnknown_085EA5A8: ; 85EA5A8
+gUnknown_085EA5A8: @ 85EA5A8
 	.incbin "base_emerald.gba", 0x5ea5a8, 0x33
 
-gUnknown_085EA5DB: ; 85EA5DB
+gUnknown_085EA5DB: @ 85EA5DB
 	.incbin "base_emerald.gba", 0x5ea5db, 0x10
 
-gUnknown_085EA5EB: ; 85EA5EB
+gUnknown_085EA5EB: @ 85EA5EB
 	.incbin "base_emerald.gba", 0x5ea5eb, 0x2c
 
-gUnknown_085EA617: ; 85EA617
+gUnknown_085EA617: @ 85EA617
 	.incbin "base_emerald.gba", 0x5ea617, 0x30
 
-gUnknown_085EA647: ; 85EA647
+gUnknown_085EA647: @ 85EA647
 	.incbin "base_emerald.gba", 0x5ea647, 0x31
 
-gUnknown_085EA678: ; 85EA678
+gUnknown_085EA678: @ 85EA678
 	.incbin "base_emerald.gba", 0x5ea678, 0x33
 
-gUnknown_085EA6AB: ; 85EA6AB
+gUnknown_085EA6AB: @ 85EA6AB
 	.incbin "base_emerald.gba", 0x5ea6ab, 0x2c
 
-gUnknown_085EA6D7: ; 85EA6D7
+gUnknown_085EA6D7: @ 85EA6D7
 	.incbin "base_emerald.gba", 0x5ea6d7, 0x2b
 
-gUnknown_085EA702: ; 85EA702
+gUnknown_085EA702: @ 85EA702
 	.incbin "base_emerald.gba", 0x5ea702, 0x2d
 
-gUnknown_085EA72F: ; 85EA72F
+gUnknown_085EA72F: @ 85EA72F
 	.incbin "base_emerald.gba", 0x5ea72f, 0x8
 
-gUnknown_085EA737: ; 85EA737
+gUnknown_085EA737: @ 85EA737
 	.incbin "base_emerald.gba", 0x5ea737, 0x2b
 
-gUnknown_085EA762: ; 85EA762
+gUnknown_085EA762: @ 85EA762
 	.incbin "base_emerald.gba", 0x5ea762, 0x23
 
-gUnknown_085EA785: ; 85EA785
+gUnknown_085EA785: @ 85EA785
 	.incbin "base_emerald.gba", 0x5ea785, 0x43
 
-gUnknown_085EA7C8: ; 85EA7C8
+gUnknown_085EA7C8: @ 85EA7C8
 	.incbin "base_emerald.gba", 0x5ea7c8, 0x75
 
-gUnknown_085EA83D: ; 85EA83D
+gUnknown_085EA83D: @ 85EA83D
 	.incbin "base_emerald.gba", 0x5ea83d, 0x4e
 
-gUnknown_085EA88B: ; 85EA88B
+gUnknown_085EA88B: @ 85EA88B
 	.incbin "base_emerald.gba", 0x5ea88b, 0x5
 
-gUnknown_085EA890: ; 85EA890
+gUnknown_085EA890: @ 85EA890
 	.incbin "base_emerald.gba", 0x5ea890, 0x7
 
-gUnknown_085EA897: ; 85EA897
+gUnknown_085EA897: @ 85EA897
 	.incbin "base_emerald.gba", 0x5ea897, 0xf
 
-gUnknown_085EA8A6: ; 85EA8A6
+gUnknown_085EA8A6: @ 85EA8A6
 	.incbin "base_emerald.gba", 0x5ea8a6, 0x19
 
-gUnknown_085EA8BF: ; 85EA8BF
+gUnknown_085EA8BF: @ 85EA8BF
 	.incbin "base_emerald.gba", 0x5ea8bf, 0x13
 
-gUnknown_085EA8D2: ; 85EA8D2
+gUnknown_085EA8D2: @ 85EA8D2
 	.incbin "base_emerald.gba", 0x5ea8d2, 0x18
 
-gUnknown_085EA8EA: ; 85EA8EA
+gUnknown_085EA8EA: @ 85EA8EA
 	.incbin "base_emerald.gba", 0x5ea8ea, 0x47
 
-gUnknown_085EA931: ; 85EA931
+gUnknown_085EA931: @ 85EA931
 	.incbin "base_emerald.gba", 0x5ea931, 0x7d
 
-gUnknown_085EA9AE: ; 85EA9AE
+gUnknown_085EA9AE: @ 85EA9AE
 	.incbin "base_emerald.gba", 0x5ea9ae, 0x32
 
-gUnknown_085EA9E0: ; 85EA9E0
+gUnknown_085EA9E0: @ 85EA9E0
 	.incbin "base_emerald.gba", 0x5ea9e0, 0x34
 
-gUnknown_085EAA14: ; 85EAA14
+gUnknown_085EAA14: @ 85EAA14
 	.incbin "base_emerald.gba", 0x5eaa14, 0x29
 
-gUnknown_085EAA3D: ; 85EAA3D
+gUnknown_085EAA3D: @ 85EAA3D
 	.incbin "base_emerald.gba", 0x5eaa3d, 0x25
 
-gUnknown_085EAA62: ; 85EAA62
+gUnknown_085EAA62: @ 85EAA62
 	.incbin "base_emerald.gba", 0x5eaa62, 0x1f
 
-gUnknown_085EAA81: ; 85EAA81
+gUnknown_085EAA81: @ 85EAA81
 	.incbin "base_emerald.gba", 0x5eaa81, 0x22
 
-gUnknown_085EAAA3: ; 85EAAA3
+gUnknown_085EAAA3: @ 85EAAA3
 	.incbin "base_emerald.gba", 0x5eaaa3, 0x22
 
-gUnknown_085EAAC5: ; 85EAAC5
+gUnknown_085EAAC5: @ 85EAAC5
 	.incbin "base_emerald.gba", 0x5eaac5, 0x27
 
-gUnknown_085EAAEC: ; 85EAAEC
+gUnknown_085EAAEC: @ 85EAAEC
 	.incbin "base_emerald.gba", 0x5eaaec, 0x62
 
-gUnknown_085EAB4E: ; 85EAB4E
+gUnknown_085EAB4E: @ 85EAB4E
 	.incbin "base_emerald.gba", 0x5eab4e, 0x15
 
-gUnknown_085EAB63: ; 85EAB63
+gUnknown_085EAB63: @ 85EAB63
 	.incbin "base_emerald.gba", 0x5eab63, 0xe
 
-gUnknown_085EAB71: ; 85EAB71
+gUnknown_085EAB71: @ 85EAB71
 	.incbin "base_emerald.gba", 0x5eab71, 0x60
 
-gUnknown_085EABD1: ; 85EABD1
+gUnknown_085EABD1: @ 85EABD1
 	.incbin "base_emerald.gba", 0x5eabd1, 0x16
 
-gUnknown_085EABE7: ; 85EABE7
+gUnknown_085EABE7: @ 85EABE7
 	.incbin "base_emerald.gba", 0x5eabe7, 0x22
 
-gUnknown_085EAC09: ; 85EAC09
+gUnknown_085EAC09: @ 85EAC09
 	.incbin "base_emerald.gba", 0x5eac09, 0x19
 
-gUnknown_085EAC22: ; 85EAC22
+gUnknown_085EAC22: @ 85EAC22
 	.incbin "base_emerald.gba", 0x5eac22, 0x29
 
-gUnknown_085EAC4B: ; 85EAC4B
+gUnknown_085EAC4B: @ 85EAC4B
 	.incbin "base_emerald.gba", 0x5eac4b, 0x18
 
-gUnknown_085EAC63: ; 85EAC63
+gUnknown_085EAC63: @ 85EAC63
 	.incbin "base_emerald.gba", 0x5eac63, 0x2a
 
-gUnknown_085EAC8D: ; 85EAC8D
+gUnknown_085EAC8D: @ 85EAC8D
 	.incbin "base_emerald.gba", 0x5eac8d, 0x28
 
-gUnknown_085EACB5: ; 85EACB5
+gUnknown_085EACB5: @ 85EACB5
 	.incbin "base_emerald.gba", 0x5eacb5, 0x13
 
-gUnknown_085EACC8: ; 85EACC8
+gUnknown_085EACC8: @ 85EACC8
 	.incbin "base_emerald.gba", 0x5eacc8, 0x3c
 
-gUnknown_085EAD04: ; 85EAD04
+gUnknown_085EAD04: @ 85EAD04
 	.incbin "base_emerald.gba", 0x5ead04, 0x4
 
-gUnknown_085EAD08: ; 85EAD08
+gUnknown_085EAD08: @ 85EAD08
 	.incbin "base_emerald.gba", 0x5ead08, 0x4
 
-gUnknown_085EAD0C: ; 85EAD0C
+gUnknown_085EAD0C: @ 85EAD0C
 	.incbin "base_emerald.gba", 0x5ead0c, 0x8
 
-gUnknown_085EAD14: ; 85EAD14
+gUnknown_085EAD14: @ 85EAD14
 	.incbin "base_emerald.gba", 0x5ead14, 0x7
 
-gUnknown_085EAD1B: ; 85EAD1B
+gUnknown_085EAD1B: @ 85EAD1B
 	.incbin "base_emerald.gba", 0x5ead1b, 0x7
 
-gUnknown_085EAD22: ; 85EAD22
+gUnknown_085EAD22: @ 85EAD22
 	.incbin "base_emerald.gba", 0x5ead22, 0x7
 
-gUnknown_085EAD29: ; 85EAD29
+gUnknown_085EAD29: @ 85EAD29
 	.incbin "base_emerald.gba", 0x5ead29, 0x7
 
-gUnknown_085EAD30: ; 85EAD30
+gUnknown_085EAD30: @ 85EAD30
 	.incbin "base_emerald.gba", 0x5ead30, 0x132
 
-gUnknown_085EAE62: ; 85EAE62
+gUnknown_085EAE62: @ 85EAE62
 	.incbin "base_emerald.gba", 0x5eae62, 0x4
 
-gUnknown_085EAE66: ; 85EAE66
+gUnknown_085EAE66: @ 85EAE66
 	.incbin "base_emerald.gba", 0x5eae66, 0x4b
 
-gUnknown_085EAEB1: ; 85EAEB1
+gUnknown_085EAEB1: @ 85EAEB1
 	.incbin "base_emerald.gba", 0x5eaeb1, 0x7
 
-gUnknown_085EAEB8: ; 85EAEB8
+gUnknown_085EAEB8: @ 85EAEB8
 	.incbin "base_emerald.gba", 0x5eaeb8, 0x230
 
-gUnknown_085EB0E8: ; 85EB0E8
+gUnknown_085EB0E8: @ 85EB0E8
 	.incbin "base_emerald.gba", 0x5eb0e8, 0x5
 
-gUnknown_085EB0ED: ; 85EB0ED
+gUnknown_085EB0ED: @ 85EB0ED
 	.incbin "base_emerald.gba", 0x5eb0ed, 0x7
 
-gUnknown_085EB0F4: ; 85EB0F4
+gUnknown_085EB0F4: @ 85EB0F4
 	.incbin "base_emerald.gba", 0x5eb0f4, 0x5
 
-gUnknown_085EB0F9: ; 85EB0F9
+gUnknown_085EB0F9: @ 85EB0F9
 	.incbin "base_emerald.gba", 0x5eb0f9, 0x6
 
-gUnknown_085EB0FF: ; 85EB0FF
+gUnknown_085EB0FF: @ 85EB0FF
 	.incbin "base_emerald.gba", 0x5eb0ff, 0x6a
 
-gUnknown_085EB169: ; 85EB169
+gUnknown_085EB169: @ 85EB169
 	.incbin "base_emerald.gba", 0x5eb169, 0xd
 
-gUnknown_085EB176: ; 85EB176
+gUnknown_085EB176: @ 85EB176
 	.incbin "base_emerald.gba", 0x5eb176, 0xd
 
-gUnknown_085EB183: ; 85EB183
+gUnknown_085EB183: @ 85EB183
 	.incbin "base_emerald.gba", 0x5eb183, 0x8
 
-gUnknown_085EB18B: ; 85EB18B
+gUnknown_085EB18B: @ 85EB18B
 	.incbin "base_emerald.gba", 0x5eb18b, 0xd
 
-gUnknown_085EB198: ; 85EB198
+gUnknown_085EB198: @ 85EB198
 	.incbin "base_emerald.gba", 0x5eb198, 0xc4
 
-gUnknown_085EB25C: ; 85EB25C
+gUnknown_085EB25C: @ 85EB25C
 	.incbin "base_emerald.gba", 0x5eb25c, 0x8
 
-gUnknown_085EB264: ; 85EB264
+gUnknown_085EB264: @ 85EB264
 	.incbin "base_emerald.gba", 0x5eb264, 0x8
 
-gUnknown_085EB26C: ; 85EB26C
+gUnknown_085EB26C: @ 85EB26C
 	.incbin "base_emerald.gba", 0x5eb26c, 0x4
 
-gUnknown_085EB270: ; 85EB270
+gUnknown_085EB270: @ 85EB270
 	.incbin "base_emerald.gba", 0x5eb270, 0x9
 
-gUnknown_085EB279: ; 85EB279
+gUnknown_085EB279: @ 85EB279
 	.incbin "base_emerald.gba", 0x5eb279, 0x5
 
-gUnknown_085EB27E: ; 85EB27E
+gUnknown_085EB27E: @ 85EB27E
 	.incbin "base_emerald.gba", 0x5eb27e, 0x7
 
-gUnknown_085EB285: ; 85EB285
+gUnknown_085EB285: @ 85EB285
 	.incbin "base_emerald.gba", 0x5eb285, 0x34a
 
-gUnknown_085EB5CF: ; 85EB5CF
+gUnknown_085EB5CF: @ 85EB5CF
 	.incbin "base_emerald.gba", 0x5eb5cf, 0xb
 
-gUnknown_085EB5DA: ; 85EB5DA
+gUnknown_085EB5DA: @ 85EB5DA
 	.incbin "base_emerald.gba", 0x5eb5da, 0xb
 
-gUnknown_085EB5E5: ; 85EB5E5
+gUnknown_085EB5E5: @ 85EB5E5
 	.incbin "base_emerald.gba", 0x5eb5e5, 0x9
 
-gUnknown_085EB5EE: ; 85EB5EE
+gUnknown_085EB5EE: @ 85EB5EE
 	.incbin "base_emerald.gba", 0x5eb5ee, 0xb
 
-gUnknown_085EB5F9: ; 85EB5F9
+gUnknown_085EB5F9: @ 85EB5F9
 	.incbin "base_emerald.gba", 0x5eb5f9, 0x8
 
-gUnknown_085EB601: ; 85EB601
+gUnknown_085EB601: @ 85EB601
 	.incbin "base_emerald.gba", 0x5eb601, 0x9
 
-gUnknown_085EB60A: ; 85EB60A
+gUnknown_085EB60A: @ 85EB60A
 	.incbin "base_emerald.gba", 0x5eb60a, 0x4
 
-gUnknown_085EB60E: ; 85EB60E
+gUnknown_085EB60E: @ 85EB60E
 	.incbin "base_emerald.gba", 0x5eb60e, 0x97
 
-gUnknown_085EB6A5: ; 85EB6A5
+gUnknown_085EB6A5: @ 85EB6A5
 	.incbin "base_emerald.gba", 0x5eb6a5, 0x8
 
-gUnknown_085EB6AD: ; 85EB6AD
+gUnknown_085EB6AD: @ 85EB6AD
 	.incbin "base_emerald.gba", 0x5eb6ad, 0x13d
 
-gUnknown_085EB7EA: ; 85EB7EA
+gUnknown_085EB7EA: @ 85EB7EA
 	.incbin "base_emerald.gba", 0x5eb7ea, 0x49f
 
-gUnknown_085EBC89: ; 85EBC89
+gUnknown_085EBC89: @ 85EBC89
 	.incbin "base_emerald.gba", 0x5ebc89, 0x24
 
-gUnknown_085EBCAD: ; 85EBCAD
+gUnknown_085EBCAD: @ 85EBCAD
 	.incbin "base_emerald.gba", 0x5ebcad, 0x14
 
-gUnknown_085EBCC1: ; 85EBCC1
+gUnknown_085EBCC1: @ 85EBCC1
 	.incbin "base_emerald.gba", 0x5ebcc1, 0x89
 
-gUnknown_085EBD4A: ; 85EBD4A
+gUnknown_085EBD4A: @ 85EBD4A
 	.incbin "base_emerald.gba", 0x5ebd4a, 0x115
 
-gUnknown_085EBE5F: ; 85EBE5F
+gUnknown_085EBE5F: @ 85EBE5F
 	.incbin "base_emerald.gba", 0x5ebe5f, 0xf
 
-gUnknown_085EBE6E: ; 85EBE6E
+gUnknown_085EBE6E: @ 85EBE6E
 	.incbin "base_emerald.gba", 0x5ebe6e, 0x11f
 
-gUnknown_085EBF8D: ; 85EBF8D
+gUnknown_085EBF8D: @ 85EBF8D
 	.incbin "base_emerald.gba", 0x5ebf8d, 0x8
 
-gUnknown_085EBF95: ; 85EBF95
+gUnknown_085EBF95: @ 85EBF95
 	.incbin "base_emerald.gba", 0x5ebf95, 0x39
 
-gUnknown_085EBFCE: ; 85EBFCE
+gUnknown_085EBFCE: @ 85EBFCE
 	.incbin "base_emerald.gba", 0x5ebfce, 0x9
 
-gUnknown_085EBFD7: ; 85EBFD7
+gUnknown_085EBFD7: @ 85EBFD7
 	.incbin "base_emerald.gba", 0x5ebfd7, 0x38
 
-gUnknown_085EC00F: ; 85EC00F
+gUnknown_085EC00F: @ 85EC00F
 	.incbin "base_emerald.gba", 0x5ec00f, 0x1a
 
-gUnknown_085EC029: ; 85EC029
+gUnknown_085EC029: @ 85EC029
 	.incbin "base_emerald.gba", 0x5ec029, 0x7
 
-gUnknown_085EC030: ; 85EC030
+gUnknown_085EC030: @ 85EC030
 	.incbin "base_emerald.gba", 0x5ec030, 0x376
 
-gUnknown_085EC3A6: ; 85EC3A6
+gUnknown_085EC3A6: @ 85EC3A6
 	.incbin "base_emerald.gba", 0x5ec3a6, 0xe
 
-gUnknown_085EC3B4: ; 85EC3B4
+gUnknown_085EC3B4: @ 85EC3B4
 	.incbin "base_emerald.gba", 0x5ec3b4, 0x5c
 
-gUnknown_085EC410: ; 85EC410
+gUnknown_085EC410: @ 85EC410
 	.incbin "base_emerald.gba", 0x5ec410, 0x1f
 
-gUnknown_085EC42F: ; 85EC42F
+gUnknown_085EC42F: @ 85EC42F
 	.incbin "base_emerald.gba", 0x5ec42f, 0x9a
 
-gUnknown_085EC4C9: ; 85EC4C9
+gUnknown_085EC4C9: @ 85EC4C9
 	.incbin "base_emerald.gba", 0x5ec4c9, 0x20
 
-gUnknown_085EC4E9: ; 85EC4E9
+gUnknown_085EC4E9: @ 85EC4E9
 	.incbin "base_emerald.gba", 0x5ec4e9, 0x37
 
-gUnknown_085EC520: ; 85EC520
+gUnknown_085EC520: @ 85EC520
 	.incbin "base_emerald.gba", 0x5ec520, 0x152
 
-gUnknown_085EC672: ; 85EC672
+gUnknown_085EC672: @ 85EC672
 	.incbin "base_emerald.gba", 0x5ec672, 0x16
 
-gUnknown_085EC688: ; 85EC688
+gUnknown_085EC688: @ 85EC688
 	.incbin "base_emerald.gba", 0x5ec688, 0x20
 
-gUnknown_085EC6A8: ; 85EC6A8
+gUnknown_085EC6A8: @ 85EC6A8
 	.incbin "base_emerald.gba", 0x5ec6a8, 0xa
 
-gUnknown_085EC6B2: ; 85EC6B2
+gUnknown_085EC6B2: @ 85EC6B2
 	.incbin "base_emerald.gba", 0x5ec6b2, 0x54
 
-gUnknown_085EC706: ; 85EC706
+gUnknown_085EC706: @ 85EC706
 	.incbin "base_emerald.gba", 0x5ec706, 0x21
 
-gUnknown_085EC727: ; 85EC727
+gUnknown_085EC727: @ 85EC727
 	.incbin "base_emerald.gba", 0x5ec727, 0x1c
 
-gUnknown_085EC743: ; 85EC743
+gUnknown_085EC743: @ 85EC743
 	.incbin "base_emerald.gba", 0x5ec743, 0xf
 
-gUnknown_085EC752: ; 85EC752
+gUnknown_085EC752: @ 85EC752
 	.incbin "base_emerald.gba", 0x5ec752, 0x13
 
-gUnknown_085EC765: ; 85EC765
+gUnknown_085EC765: @ 85EC765
 	.incbin "base_emerald.gba", 0x5ec765, 0x3b
 
-gUnknown_085EC7A0: ; 85EC7A0
+gUnknown_085EC7A0: @ 85EC7A0
 	.incbin "base_emerald.gba", 0x5ec7a0, 0x41
 
-gUnknown_085EC7E1: ; 85EC7E1
+gUnknown_085EC7E1: @ 85EC7E1
 	.incbin "base_emerald.gba", 0x5ec7e1, 0xe
 
-gUnknown_085EC7EF: ; 85EC7EF
+gUnknown_085EC7EF: @ 85EC7EF
 	.incbin "base_emerald.gba", 0x5ec7ef, 0x11
 
-gUnknown_085EC800: ; 85EC800
+gUnknown_085EC800: @ 85EC800
 	.incbin "base_emerald.gba", 0x5ec800, 0x16
 
-gUnknown_085EC816: ; 85EC816
+gUnknown_085EC816: @ 85EC816
 	.incbin "base_emerald.gba", 0x5ec816, 0x59
 
-gUnknown_085EC86F: ; 85EC86F
+gUnknown_085EC86F: @ 85EC86F
 	.incbin "base_emerald.gba", 0x5ec86f, 0x65
 
-gUnknown_085EC8D4: ; 85EC8D4
+gUnknown_085EC8D4: @ 85EC8D4
 	.incbin "base_emerald.gba", 0x5ec8d4, 0x43
 
-gUnknown_085EC917: ; 85EC917
+gUnknown_085EC917: @ 85EC917
 	.incbin "base_emerald.gba", 0x5ec917, 0x38
 
-gUnknown_085EC94F: ; 85EC94F
+gUnknown_085EC94F: @ 85EC94F
 	.incbin "base_emerald.gba", 0x5ec94f, 0x53
 
-gUnknown_085EC9A2: ; 85EC9A2
+gUnknown_085EC9A2: @ 85EC9A2
 	.incbin "base_emerald.gba", 0x5ec9a2, 0x30
 
-gUnknown_085EC9D2: ; 85EC9D2
+gUnknown_085EC9D2: @ 85EC9D2
 	.incbin "base_emerald.gba", 0x5ec9d2, 0x6
 
-gUnknown_085EC9D8: ; 85EC9D8
+gUnknown_085EC9D8: @ 85EC9D8
 	.incbin "base_emerald.gba", 0x5ec9d8, 0xc
 
-gUnknown_085EC9E4: ; 85EC9E4
+gUnknown_085EC9E4: @ 85EC9E4
 	.incbin "base_emerald.gba", 0x5ec9e4, 0x8
 
-gUnknown_085EC9EC: ; 85EC9EC
+gUnknown_085EC9EC: @ 85EC9EC
 	.incbin "base_emerald.gba", 0x5ec9ec, 0x21
 
-gUnknown_085ECA0D: ; 85ECA0D
+gUnknown_085ECA0D: @ 85ECA0D
 	.incbin "base_emerald.gba", 0x5eca0d, 0x15
 
-gUnknown_085ECA22: ; 85ECA22
+gUnknown_085ECA22: @ 85ECA22
 	.incbin "base_emerald.gba", 0x5eca22, 0x16
 
-gUnknown_085ECA38: ; 85ECA38
+gUnknown_085ECA38: @ 85ECA38
 	.incbin "base_emerald.gba", 0x5eca38, 0x17
 
-gUnknown_085ECA4F: ; 85ECA4F
+gUnknown_085ECA4F: @ 85ECA4F
 	.incbin "base_emerald.gba", 0x5eca4f, 0x3b
 
-gUnknown_085ECA8A: ; 85ECA8A
+gUnknown_085ECA8A: @ 85ECA8A
 	.incbin "base_emerald.gba", 0x5eca8a, 0x10
 
-gUnknown_085ECA9A: ; 85ECA9A
+gUnknown_085ECA9A: @ 85ECA9A
 	.incbin "base_emerald.gba", 0x5eca9a, 0xd
 
-gUnknown_085ECAA7: ; 85ECAA7
+gUnknown_085ECAA7: @ 85ECAA7
 	.incbin "base_emerald.gba", 0x5ecaa7, 0x31
 
-gUnknown_085ECAD8: ; 85ECAD8
+gUnknown_085ECAD8: @ 85ECAD8
 	.incbin "base_emerald.gba", 0x5ecad8, 0x34
 
-gUnknown_085ECB0C: ; 85ECB0C
+gUnknown_085ECB0C: @ 85ECB0C
 	.incbin "base_emerald.gba", 0x5ecb0c, 0x6
 
-gUnknown_085ECB12: ; 85ECB12
+gUnknown_085ECB12: @ 85ECB12
 	.incbin "base_emerald.gba", 0x5ecb12, 0x9
 
-gUnknown_085ECB1B: ; 85ECB1B
+gUnknown_085ECB1B: @ 85ECB1B
 	.incbin "base_emerald.gba", 0x5ecb1b, 0x5
 
-gUnknown_085ECB20: ; 85ECB20
+gUnknown_085ECB20: @ 85ECB20
 	.incbin "base_emerald.gba", 0x5ecb20, 0xa
 
-gUnknown_085ECB2A: ; 85ECB2A
+gUnknown_085ECB2A: @ 85ECB2A
 	.incbin "base_emerald.gba", 0x5ecb2a, 0xa
 
-gUnknown_085ECB34: ; 85ECB34
+gUnknown_085ECB34: @ 85ECB34
 	.incbin "base_emerald.gba", 0x5ecb34, 0x6
 
-gUnknown_085ECB3A: ; 85ECB3A
+gUnknown_085ECB3A: @ 85ECB3A
 	.incbin "base_emerald.gba", 0x5ecb3a, 0x4
 
-gUnknown_085ECB3E: ; 85ECB3E
+gUnknown_085ECB3E: @ 85ECB3E
 	.incbin "base_emerald.gba", 0x5ecb3e, 0xa
 
-gUnknown_085ECB48: ; 85ECB48
+gUnknown_085ECB48: @ 85ECB48
 	.incbin "base_emerald.gba", 0x5ecb48, 0x6
 
-gUnknown_085ECB4E: ; 85ECB4E
+gUnknown_085ECB4E: @ 85ECB4E
 	.incbin "base_emerald.gba", 0x5ecb4e, 0x4
 
-gUnknown_085ECB52: ; 85ECB52
+gUnknown_085ECB52: @ 85ECB52
 	.incbin "base_emerald.gba", 0x5ecb52, 0x6
 
-gUnknown_085ECB58: ; 85ECB58
+gUnknown_085ECB58: @ 85ECB58
 	.incbin "base_emerald.gba", 0x5ecb58, 0x7
 
-gUnknown_085ECB5F: ; 85ECB5F
+gUnknown_085ECB5F: @ 85ECB5F
 	.incbin "base_emerald.gba", 0x5ecb5f, 0x5
 
-gUnknown_085ECB64: ; 85ECB64
+gUnknown_085ECB64: @ 85ECB64
 	.incbin "base_emerald.gba", 0x5ecb64, 0x7
 
-gUnknown_085ECB6B: ; 85ECB6B
+gUnknown_085ECB6B: @ 85ECB6B
 	.incbin "base_emerald.gba", 0x5ecb6b, 0x7
 
-gUnknown_085ECB72: ; 85ECB72
+gUnknown_085ECB72: @ 85ECB72
 	.incbin "base_emerald.gba", 0x5ecb72, 0x8
 
-gUnknown_085ECB7A: ; 85ECB7A
+gUnknown_085ECB7A: @ 85ECB7A
 	.incbin "base_emerald.gba", 0x5ecb7a, 0x6
 
-gUnknown_085ECB80: ; 85ECB80
+gUnknown_085ECB80: @ 85ECB80
 	.incbin "base_emerald.gba", 0x5ecb80, 0x7
 
-gUnknown_085ECB87: ; 85ECB87
+gUnknown_085ECB87: @ 85ECB87
 	.incbin "base_emerald.gba", 0x5ecb87, 0x3d6
 
-gUnknown_085ECF5D: ; 85ECF5D
+gUnknown_085ECF5D: @ 85ECF5D
 	.incbin "base_emerald.gba", 0x5ecf5d, 0xe
 
-gUnknown_085ECF6B: ; 85ECF6B
+gUnknown_085ECF6B: @ 85ECF6B
 	.incbin "base_emerald.gba", 0x5ecf6b, 0x6
 
-gUnknown_085ECF71: ; 85ECF71
+gUnknown_085ECF71: @ 85ECF71
 	.incbin "base_emerald.gba", 0x5ecf71, 0x7
 
-gUnknown_085ECF78: ; 85ECF78
+gUnknown_085ECF78: @ 85ECF78
 	.incbin "base_emerald.gba", 0x5ecf78, 0x6
 
-gUnknown_085ECF7E: ; 85ECF7E
+gUnknown_085ECF7E: @ 85ECF7E
 	.incbin "base_emerald.gba", 0x5ecf7e, 0x8
 
-gUnknown_085ECF86: ; 85ECF86
+gUnknown_085ECF86: @ 85ECF86
 	.incbin "base_emerald.gba", 0x5ecf86, 0x8
 
-gUnknown_085ECF8E: ; 85ECF8E
+gUnknown_085ECF8E: @ 85ECF8E
 	.incbin "base_emerald.gba", 0x5ecf8e, 0x1
 
-gUnknown_085ECF8F: ; 85ECF8F
+gUnknown_085ECF8F: @ 85ECF8F
 	.incbin "base_emerald.gba", 0x5ecf8f, 0xa
 
-gUnknown_085ECF99: ; 85ECF99
+gUnknown_085ECF99: @ 85ECF99
 	.incbin "base_emerald.gba", 0x5ecf99, 0xd
 
-gUnknown_085ECFA6: ; 85ECFA6
+gUnknown_085ECFA6: @ 85ECFA6
 	.incbin "base_emerald.gba", 0x5ecfa6, 0x12
 
-gUnknown_085ECFB8: ; 85ECFB8
+gUnknown_085ECFB8: @ 85ECFB8
 	.incbin "base_emerald.gba", 0x5ecfb8, 0x35
 
-gUnknown_085ECFED: ; 85ECFED
+gUnknown_085ECFED: @ 85ECFED
 	.incbin "base_emerald.gba", 0x5ecfed, 0x23
 
-gUnknown_085ED010: ; 85ED010
+gUnknown_085ED010: @ 85ED010
 	.incbin "base_emerald.gba", 0x5ed010, 0xf
 
-gUnknown_085ED01F: ; 85ED01F
+gUnknown_085ED01F: @ 85ED01F
 	.incbin "base_emerald.gba", 0x5ed01f, 0x17
 
-gUnknown_085ED036: ; 85ED036
+gUnknown_085ED036: @ 85ED036
 	.incbin "base_emerald.gba", 0x5ed036, 0xc
 
-gUnknown_085ED042: ; 85ED042
+gUnknown_085ED042: @ 85ED042
 	.incbin "base_emerald.gba", 0x5ed042, 0x43
 
-gUnknown_085ED085: ; 85ED085
+gUnknown_085ED085: @ 85ED085
 	.incbin "base_emerald.gba", 0x5ed085, 0x11
 
-gUnknown_085ED096: ; 85ED096
+gUnknown_085ED096: @ 85ED096
 	.incbin "base_emerald.gba", 0x5ed096, 0x9
 
-gUnknown_085ED09F: ; 85ED09F
+gUnknown_085ED09F: @ 85ED09F
 	.incbin "base_emerald.gba", 0x5ed09f, 0x17
 
-gUnknown_085ED0B6: ; 85ED0B6
+gUnknown_085ED0B6: @ 85ED0B6
 	.incbin "base_emerald.gba", 0x5ed0b6, 0x12
 
-gUnknown_085ED0C8: ; 85ED0C8
+gUnknown_085ED0C8: @ 85ED0C8
 	.incbin "base_emerald.gba", 0x5ed0c8, 0xb
 
-gUnknown_085ED0D3: ; 85ED0D3
+gUnknown_085ED0D3: @ 85ED0D3
 	.incbin "base_emerald.gba", 0x5ed0d3, 0xd
 
-gUnknown_085ED0E0: ; 85ED0E0
+gUnknown_085ED0E0: @ 85ED0E0
 	.incbin "base_emerald.gba", 0x5ed0e0, 0xb3
 
-gUnknown_085ED193: ; 85ED193
+gUnknown_085ED193: @ 85ED193
 	.incbin "base_emerald.gba", 0x5ed193, 0x5
 
-gUnknown_085ED198: ; 85ED198
+gUnknown_085ED198: @ 85ED198
 	.incbin "base_emerald.gba", 0x5ed198, 0x8
 
-gUnknown_085ED1A0: ; 85ED1A0
+gUnknown_085ED1A0: @ 85ED1A0
 	.incbin "base_emerald.gba", 0x5ed1a0, 0x7
 
-gUnknown_085ED1A7: ; 85ED1A7
+gUnknown_085ED1A7: @ 85ED1A7
 	.incbin "base_emerald.gba", 0x5ed1a7, 0x4
 
-gUnknown_085ED1AB: ; 85ED1AB
+gUnknown_085ED1AB: @ 85ED1AB
 	.incbin "base_emerald.gba", 0x5ed1ab, 0x7
 
-gUnknown_085ED1B2: ; 85ED1B2
+gUnknown_085ED1B2: @ 85ED1B2
 	.incbin "base_emerald.gba", 0x5ed1b2, 0x3
 
-gUnknown_085ED1B5: ; 85ED1B5
+gUnknown_085ED1B5: @ 85ED1B5
 	.incbin "base_emerald.gba", 0x5ed1b5, 0x3
 
-gUnknown_085ED1B8: ; 85ED1B8
+gUnknown_085ED1B8: @ 85ED1B8
 	.incbin "base_emerald.gba", 0x5ed1b8, 0x18
 
-gUnknown_085ED1D0: ; 85ED1D0
+gUnknown_085ED1D0: @ 85ED1D0
 	.incbin "base_emerald.gba", 0x5ed1d0, 0x19
 
-gUnknown_085ED1E9: ; 85ED1E9
+gUnknown_085ED1E9: @ 85ED1E9
 	.incbin "base_emerald.gba", 0x5ed1e9, 0x11
 
-gUnknown_085ED1FA: ; 85ED1FA
+gUnknown_085ED1FA: @ 85ED1FA
 	.incbin "base_emerald.gba", 0x5ed1fa, 0xd
 
-gUnknown_085ED207: ; 85ED207
+gUnknown_085ED207: @ 85ED207
 	.incbin "base_emerald.gba", 0x5ed207, 0x17
 
-gUnknown_085ED21E: ; 85ED21E
+gUnknown_085ED21E: @ 85ED21E
 	.incbin "base_emerald.gba", 0x5ed21e, 0xa
 
-gUnknown_085ED228: ; 85ED228
+gUnknown_085ED228: @ 85ED228
 	.incbin "base_emerald.gba", 0x5ed228, 0x6
 
-gUnknown_085ED22E: ; 85ED22E
+gUnknown_085ED22E: @ 85ED22E
 	.incbin "base_emerald.gba", 0x5ed22e, 0x5
 
-gUnknown_085ED233: ; 85ED233
+gUnknown_085ED233: @ 85ED233
 	.incbin "base_emerald.gba", 0x5ed233, 0x5
 
-gUnknown_085ED238: ; 85ED238
+gUnknown_085ED238: @ 85ED238
 	.incbin "base_emerald.gba", 0x5ed238, 0x71
 
-gUnknown_085ED2A9: ; 85ED2A9
+gUnknown_085ED2A9: @ 85ED2A9
 	.incbin "base_emerald.gba", 0x5ed2a9, 0x14
 
-gUnknown_085ED2BD: ; 85ED2BD
+gUnknown_085ED2BD: @ 85ED2BD
 	.incbin "base_emerald.gba", 0x5ed2bd, 0x152
 
-gUnknown_085ED40F: ; 85ED40F
+gUnknown_085ED40F: @ 85ED40F
 	.incbin "base_emerald.gba", 0x5ed40f, 0x6
 
-gUnknown_085ED415: ; 85ED415
+gUnknown_085ED415: @ 85ED415
 	.incbin "base_emerald.gba", 0x5ed415, 0x8
 
-gUnknown_085ED41D: ; 85ED41D
+gUnknown_085ED41D: @ 85ED41D
 	.incbin "base_emerald.gba", 0x5ed41d, 0x6
 
-gUnknown_085ED423: ; 85ED423
+gUnknown_085ED423: @ 85ED423
 	.incbin "base_emerald.gba", 0x5ed423, 0x7
 
-gUnknown_085ED42A: ; 85ED42A
+gUnknown_085ED42A: @ 85ED42A
 	.incbin "base_emerald.gba", 0x5ed42a, 0x6
 
-gUnknown_085ED430: ; 85ED430
+gUnknown_085ED430: @ 85ED430
 	.incbin "base_emerald.gba", 0x5ed430, 0x4
 
-gUnknown_085ED434: ; 85ED434
+gUnknown_085ED434: @ 85ED434
 	.incbin "base_emerald.gba", 0x5ed434, 0x6
 
-gUnknown_085ED43A: ; 85ED43A
+gUnknown_085ED43A: @ 85ED43A
 	.incbin "base_emerald.gba", 0x5ed43a, 0x6
 
-gUnknown_085ED440: ; 85ED440
+gUnknown_085ED440: @ 85ED440
 	.incbin "base_emerald.gba", 0x5ed440, 0xa
 
-gUnknown_085ED44A: ; 85ED44A
+gUnknown_085ED44A: @ 85ED44A
 	.incbin "base_emerald.gba", 0x5ed44a, 0x15b
 
-gUnknown_085ED5A5: ; 85ED5A5
+gUnknown_085ED5A5: @ 85ED5A5
 	.incbin "base_emerald.gba", 0x5ed5a5, 0x19
 
-gUnknown_085ED5BE: ; 85ED5BE
+gUnknown_085ED5BE: @ 85ED5BE
 	.incbin "base_emerald.gba", 0x5ed5be, 0x216
 
-gUnknown_085ED7D4: ; 85ED7D4
+gUnknown_085ED7D4: @ 85ED7D4
 	.incbin "base_emerald.gba", 0x5ed7d4, 0xc
 
-gUnknown_085ED7E0: ; 85ED7E0
+gUnknown_085ED7E0: @ 85ED7E0
 	.incbin "base_emerald.gba", 0x5ed7e0, 0x28
 
-gUnknown_085ED808: ; 85ED808
+gUnknown_085ED808: @ 85ED808
 	.incbin "base_emerald.gba", 0x5ed808, 0x8
 
-gUnknown_085ED810: ; 85ED810
+gUnknown_085ED810: @ 85ED810
 	.incbin "base_emerald.gba", 0x5ed810, 0x10
 
-gUnknown_085ED820: ; 85ED820
+gUnknown_085ED820: @ 85ED820
 	.incbin "base_emerald.gba", 0x5ed820, 0xc
 
-gUnknown_085ED82C: ; 85ED82C
+gUnknown_085ED82C: @ 85ED82C
 	.incbin "base_emerald.gba", 0x5ed82c, 0x4
 
-gUnknown_085ED830: ; 85ED830
+gUnknown_085ED830: @ 85ED830
 	.incbin "base_emerald.gba", 0x5ed830, 0x8
 
-gUnknown_085ED838: ; 85ED838
+gUnknown_085ED838: @ 85ED838
 	.incbin "base_emerald.gba", 0x5ed838, 0x8
 
-gUnknown_085ED840: ; 85ED840
+gUnknown_085ED840: @ 85ED840
 	.incbin "base_emerald.gba", 0x5ed840, 0x8
 
-gUnknown_085ED848: ; 85ED848
+gUnknown_085ED848: @ 85ED848
 	.incbin "base_emerald.gba", 0x5ed848, 0x8
 
-gUnknown_085ED850: ; 85ED850
+gUnknown_085ED850: @ 85ED850
 	.incbin "base_emerald.gba", 0x5ed850, 0xc
 
-gUnknown_085ED85C: ; 85ED85C
+gUnknown_085ED85C: @ 85ED85C
 	.incbin "base_emerald.gba", 0x5ed85c, 0x4
 
-gUnknown_085ED860: ; 85ED860
+gUnknown_085ED860: @ 85ED860
 	.incbin "base_emerald.gba", 0x5ed860, 0x18
 
-gUnknown_085ED878: ; 85ED878
+gUnknown_085ED878: @ 85ED878
 	.incbin "base_emerald.gba", 0x5ed878, 0x58
 
-gUnknown_085ED8D0: ; 85ED8D0
+gUnknown_085ED8D0: @ 85ED8D0
 	.incbin "base_emerald.gba", 0x5ed8d0, 0xc
 
-gUnknown_085ED8DC: ; 85ED8DC
+gUnknown_085ED8DC: @ 85ED8DC
 	.incbin "base_emerald.gba", 0x5ed8dc, 0x18
 
-gUnknown_085ED8F4: ; 85ED8F4
+gUnknown_085ED8F4: @ 85ED8F4
 	.incbin "base_emerald.gba", 0x5ed8f4, 0xb
 
-gUnknown_085ED8FF: ; 85ED8FF
+gUnknown_085ED8FF: @ 85ED8FF
 	.incbin "base_emerald.gba", 0x5ed8ff, 0xf
 
-gUnknown_085ED90E: ; 85ED90E
+gUnknown_085ED90E: @ 85ED90E
 	.incbin "base_emerald.gba", 0x5ed90e, 0xe
 
-gUnknown_085ED91C: ; 85ED91C
+gUnknown_085ED91C: @ 85ED91C
 	.incbin "base_emerald.gba", 0x5ed91c, 0x3a7
 
-gUnknown_085EDCC3: ; 85EDCC3
+gUnknown_085EDCC3: @ 85EDCC3
 	.incbin "base_emerald.gba", 0x5edcc3, 0x7
 
-gUnknown_085EDCCA: ; 85EDCCA
+gUnknown_085EDCCA: @ 85EDCCA
 	.incbin "base_emerald.gba", 0x5edcca, 0x5
 
-gUnknown_085EDCCF: ; 85EDCCF
+gUnknown_085EDCCF: @ 85EDCCF
 	.incbin "base_emerald.gba", 0x5edccf, 0x8
 
-gUnknown_085EDCD7: ; 85EDCD7
+gUnknown_085EDCD7: @ 85EDCD7
 	.incbin "base_emerald.gba", 0x5edcd7, 0x7
 
-gUnknown_085EDCDE: ; 85EDCDE
+gUnknown_085EDCDE: @ 85EDCDE
 	.incbin "base_emerald.gba", 0x5edcde, 0x7
 
-gUnknown_085EDCE5: ; 85EDCE5
+gUnknown_085EDCE5: @ 85EDCE5
 	.incbin "base_emerald.gba", 0x5edce5, 0x64
 
-gUnknown_085EDD49: ; 85EDD49
+gUnknown_085EDD49: @ 85EDD49
 	.incbin "base_emerald.gba", 0x5edd49, 0x22
 
-gUnknown_085EDD6B: ; 85EDD6B
+gUnknown_085EDD6B: @ 85EDD6B
 	.incbin "base_emerald.gba", 0x5edd6b, 0x1b
 
-gUnknown_085EDD86: ; 85EDD86
+gUnknown_085EDD86: @ 85EDD86
 	.incbin "base_emerald.gba", 0x5edd86, 0x15
 
-gUnknown_085EDD9B: ; 85EDD9B
+gUnknown_085EDD9B: @ 85EDD9B
 	.incbin "base_emerald.gba", 0x5edd9b, 0x22
 
-gUnknown_085EDDBD: ; 85EDDBD
+gUnknown_085EDDBD: @ 85EDDBD
 	.incbin "base_emerald.gba", 0x5eddbd, 0x25
 
-gUnknown_085EDDE2: ; 85EDDE2
+gUnknown_085EDDE2: @ 85EDDE2
 	.incbin "base_emerald.gba", 0x5edde2, 0x19
 
-gUnknown_085EDDFB: ; 85EDDFB
+gUnknown_085EDDFB: @ 85EDDFB
 	.incbin "base_emerald.gba", 0x5eddfb, 0x1d
 
-gUnknown_085EDE18: ; 85EDE18
+gUnknown_085EDE18: @ 85EDE18
 	.incbin "base_emerald.gba", 0x5ede18, 0x14
 
-gUnknown_085EDE2C: ; 85EDE2C
+gUnknown_085EDE2C: @ 85EDE2C
 	.incbin "base_emerald.gba", 0x5ede2c, 0x31
 
-gUnknown_085EDE5D: ; 85EDE5D
+gUnknown_085EDE5D: @ 85EDE5D
 	.incbin "base_emerald.gba", 0x5ede5d, 0x8
 
-gUnknown_085EDE65: ; 85EDE65
+gUnknown_085EDE65: @ 85EDE65
 	.incbin "base_emerald.gba", 0x5ede65, 0x17
 
-gUnknown_085EDE7C: ; 85EDE7C
+gUnknown_085EDE7C: @ 85EDE7C
 	.incbin "base_emerald.gba", 0x5ede7c, 0x8
 
-gUnknown_085EDE84: ; 85EDE84
+gUnknown_085EDE84: @ 85EDE84
 	.incbin "base_emerald.gba", 0x5ede84, 0x9
 
-gUnknown_085EDE8D: ; 85EDE8D
+gUnknown_085EDE8D: @ 85EDE8D
 	.incbin "base_emerald.gba", 0x5ede8d, 0x46
 
-gUnknown_085EDED3: ; 85EDED3
+gUnknown_085EDED3: @ 85EDED3
 	.incbin "base_emerald.gba", 0x5eded3, 0x21
 
-gUnknown_085EDEF4: ; 85EDEF4
+gUnknown_085EDEF4: @ 85EDEF4
 	.incbin "base_emerald.gba", 0x5edef4, 0x1d
 
-gUnknown_085EDF11: ; 85EDF11
+gUnknown_085EDF11: @ 85EDF11
 	.incbin "base_emerald.gba", 0x5edf11, 0x19
 
-gUnknown_085EDF2A: ; 85EDF2A
+gUnknown_085EDF2A: @ 85EDF2A
 	.incbin "base_emerald.gba", 0x5edf2a, 0x14
 
-gUnknown_085EDF3E: ; 85EDF3E
+gUnknown_085EDF3E: @ 85EDF3E
 	.incbin "base_emerald.gba", 0x5edf3e, 0x31
 
-gUnknown_085EDF6F: ; 85EDF6F
+gUnknown_085EDF6F: @ 85EDF6F
 	.incbin "base_emerald.gba", 0x5edf6f, 0x17
 
-gUnknown_085EDF86: ; 85EDF86
+gUnknown_085EDF86: @ 85EDF86
 	.incbin "base_emerald.gba", 0x5edf86, 0x1a
 
-gUnknown_085EDFA0: ; 85EDFA0
+gUnknown_085EDFA0: @ 85EDFA0
 	.incbin "base_emerald.gba", 0x5edfa0, 0x4
 
-gUnknown_085EDFA4: ; 85EDFA4
+gUnknown_085EDFA4: @ 85EDFA4
 	.incbin "base_emerald.gba", 0x5edfa4, 0x4
 
-gUnknown_085EDFA8: ; 85EDFA8
+gUnknown_085EDFA8: @ 85EDFA8
 	.incbin "base_emerald.gba", 0x5edfa8, 0x4
 
-gUnknown_085EDFAC: ; 85EDFAC
+gUnknown_085EDFAC: @ 85EDFAC
 	.incbin "base_emerald.gba", 0x5edfac, 0x4
 
-gUnknown_085EDFB0: ; 85EDFB0
+gUnknown_085EDFB0: @ 85EDFB0
 	.incbin "base_emerald.gba", 0x5edfb0, 0xf
 
-gUnknown_085EDFBF: ; 85EDFBF
+gUnknown_085EDFBF: @ 85EDFBF
 	.incbin "base_emerald.gba", 0x5edfbf, 0xa
 
-gUnknown_085EDFC9: ; 85EDFC9
+gUnknown_085EDFC9: @ 85EDFC9
 	.incbin "base_emerald.gba", 0x5edfc9, 0xd
 
-gUnknown_085EDFD6: ; 85EDFD6
+gUnknown_085EDFD6: @ 85EDFD6
 	.incbin "base_emerald.gba", 0x5edfd6, 0x1f
 
-gUnknown_085EDFF5: ; 85EDFF5
+gUnknown_085EDFF5: @ 85EDFF5
 	.incbin "base_emerald.gba", 0x5edff5, 0x1f
 
-gUnknown_085EE014: ; 85EE014
+gUnknown_085EE014: @ 85EE014
 	.incbin "base_emerald.gba", 0x5ee014, 0x48
 
-gUnknown_085EE05C: ; 85EE05C
+gUnknown_085EE05C: @ 85EE05C
 	.incbin "base_emerald.gba", 0x5ee05c, 0xf
 
-gUnknown_085EE06B: ; 85EE06B
+gUnknown_085EE06B: @ 85EE06B
 	.incbin "base_emerald.gba", 0x5ee06b, 0x2c
 
-gUnknown_085EE097: ; 85EE097
+gUnknown_085EE097: @ 85EE097
 	.incbin "base_emerald.gba", 0x5ee097, 0xc
 
-gUnknown_085EE0A3: ; 85EE0A3
+gUnknown_085EE0A3: @ 85EE0A3
 	.incbin "base_emerald.gba", 0x5ee0a3, 0x1c
 
-gUnknown_085EE0BF: ; 85EE0BF
+gUnknown_085EE0BF: @ 85EE0BF
 	.incbin "base_emerald.gba", 0x5ee0bf, 0x1d
 
-gUnknown_085EE0DC: ; 85EE0DC
+gUnknown_085EE0DC: @ 85EE0DC
 	.incbin "base_emerald.gba", 0x5ee0dc, 0x1e
 
-gUnknown_085EE0FA: ; 85EE0FA
+gUnknown_085EE0FA: @ 85EE0FA
 	.incbin "base_emerald.gba", 0x5ee0fa, 0xd
 
-gUnknown_085EE107: ; 85EE107
+gUnknown_085EE107: @ 85EE107
 	.incbin "base_emerald.gba", 0x5ee107, 0x19
 
-gUnknown_085EE120: ; 85EE120
+gUnknown_085EE120: @ 85EE120
 	.incbin "base_emerald.gba", 0x5ee120, 0xd
 
-gUnknown_085EE12D: ; 85EE12D
+gUnknown_085EE12D: @ 85EE12D
 	.incbin "base_emerald.gba", 0x5ee12d, 0x2b
 
-gUnknown_085EE158: ; 85EE158
+gUnknown_085EE158: @ 85EE158
 	.incbin "base_emerald.gba", 0x5ee158, 0x20
 
-gUnknown_085EE178: ; 85EE178
+gUnknown_085EE178: @ 85EE178
 	.incbin "base_emerald.gba", 0x5ee178, 0x20
 
-gUnknown_085EE198: ; 85EE198
+gUnknown_085EE198: @ 85EE198
 	.incbin "base_emerald.gba", 0x5ee198, 0x1f
 
-gUnknown_085EE1B7: ; 85EE1B7
+gUnknown_085EE1B7: @ 85EE1B7
 	.incbin "base_emerald.gba", 0x5ee1b7, 0x24
 
-gUnknown_085EE1DB: ; 85EE1DB
+gUnknown_085EE1DB: @ 85EE1DB
 	.incbin "base_emerald.gba", 0x5ee1db, 0x23
 
-gUnknown_085EE1FE: ; 85EE1FE
+gUnknown_085EE1FE: @ 85EE1FE
 	.incbin "base_emerald.gba", 0x5ee1fe, 0x23
 
-gUnknown_085EE221: ; 85EE221
+gUnknown_085EE221: @ 85EE221
 	.incbin "base_emerald.gba", 0x5ee221, 0x20
 
-gUnknown_085EE241: ; 85EE241
+gUnknown_085EE241: @ 85EE241
 	.incbin "base_emerald.gba", 0x5ee241, 0x20
 
-gUnknown_085EE261: ; 85EE261
+gUnknown_085EE261: @ 85EE261
 	.incbin "base_emerald.gba", 0x5ee261, 0x1b
 
-gUnknown_085EE27C: ; 85EE27C
+gUnknown_085EE27C: @ 85EE27C
 	.incbin "base_emerald.gba", 0x5ee27c, 0x1c
 
-gUnknown_085EE298: ; 85EE298
+gUnknown_085EE298: @ 85EE298
 	.incbin "base_emerald.gba", 0x5ee298, 0x20
 
-gUnknown_085EE2B8: ; 85EE2B8
+gUnknown_085EE2B8: @ 85EE2B8
 	.incbin "base_emerald.gba", 0x5ee2b8, 0x20
 
-gUnknown_085EE2D8: ; 85EE2D8
+gUnknown_085EE2D8: @ 85EE2D8
 	.incbin "base_emerald.gba", 0x5ee2d8, 0x1a
 
-gUnknown_085EE2F2: ; 85EE2F2
+gUnknown_085EE2F2: @ 85EE2F2
 	.incbin "base_emerald.gba", 0x5ee2f2, 0x7
 
-gUnknown_085EE2F9: ; 85EE2F9
+gUnknown_085EE2F9: @ 85EE2F9
 	.incbin "base_emerald.gba", 0x5ee2f9, 0x9
 
-gUnknown_085EE302: ; 85EE302
+gUnknown_085EE302: @ 85EE302
 	.incbin "base_emerald.gba", 0x5ee302, 0xf
 
-gUnknown_085EE311: ; 85EE311
+gUnknown_085EE311: @ 85EE311
 	.incbin "base_emerald.gba", 0x5ee311, 0x8
 
-gUnknown_085EE319: ; 85EE319
+gUnknown_085EE319: @ 85EE319
 	.incbin "base_emerald.gba", 0x5ee319, 0x7
 
-gUnknown_085EE320: ; 85EE320
+gUnknown_085EE320: @ 85EE320
 	.incbin "base_emerald.gba", 0x5ee320, 0x6
 
-gUnknown_085EE326: ; 85EE326
+gUnknown_085EE326: @ 85EE326
 	.incbin "base_emerald.gba", 0x5ee326, 0xc
 
-gUnknown_085EE332: ; 85EE332
+gUnknown_085EE332: @ 85EE332
 	.incbin "base_emerald.gba", 0x5ee332, 0x6
 
-gUnknown_085EE338: ; 85EE338
+gUnknown_085EE338: @ 85EE338
 	.incbin "base_emerald.gba", 0x5ee338, 0x11
 
-gUnknown_085EE349: ; 85EE349
+gUnknown_085EE349: @ 85EE349
 	.incbin "base_emerald.gba", 0x5ee349, 0x12
 
-gUnknown_085EE35B: ; 85EE35B
+gUnknown_085EE35B: @ 85EE35B
 	.incbin "base_emerald.gba", 0x5ee35b, 0x12
 
-gUnknown_085EE36D: ; 85EE36D
+gUnknown_085EE36D: @ 85EE36D
 	.incbin "base_emerald.gba", 0x5ee36d, 0x14
 
-gUnknown_085EE381: ; 85EE381
+gUnknown_085EE381: @ 85EE381
 	.incbin "base_emerald.gba", 0x5ee381, 0x11
 
-gUnknown_085EE392: ; 85EE392
+gUnknown_085EE392: @ 85EE392
 	.incbin "base_emerald.gba", 0x5ee392, 0xa
 
-gUnknown_085EE39C: ; 85EE39C
+gUnknown_085EE39C: @ 85EE39C
 	.incbin "base_emerald.gba", 0x5ee39c, 0x88
 
-gUnknown_085EE424: ; 85EE424
+gUnknown_085EE424: @ 85EE424
 	.incbin "base_emerald.gba", 0x5ee424, 0x9
 
-gUnknown_085EE42D: ; 85EE42D
+gUnknown_085EE42D: @ 85EE42D
 	.incbin "base_emerald.gba", 0x5ee42d, 0x22
 
-gUnknown_085EE44F: ; 85EE44F
+gUnknown_085EE44F: @ 85EE44F
 	.incbin "base_emerald.gba", 0x5ee44f, 0x24
 
-gUnknown_085EE473: ; 85EE473
+gUnknown_085EE473: @ 85EE473
 	.incbin "base_emerald.gba", 0x5ee473, 0x1e
 
-gUnknown_085EE491: ; 85EE491
+gUnknown_085EE491: @ 85EE491
 	.incbin "base_emerald.gba", 0x5ee491, 0x7
 
-gUnknown_085EE498: ; 85EE498
+gUnknown_085EE498: @ 85EE498
 	.incbin "base_emerald.gba", 0x5ee498, 0x2
 
-gUnknown_085EE49A: ; 85EE49A
+gUnknown_085EE49A: @ 85EE49A
 	.incbin "base_emerald.gba", 0x5ee49a, 0xa
 
-gUnknown_085EE4A4: ; 85EE4A4
+gUnknown_085EE4A4: @ 85EE4A4
 	.incbin "base_emerald.gba", 0x5ee4a4, 0x53
 
-gUnknown_085EE4F7: ; 85EE4F7
+gUnknown_085EE4F7: @ 85EE4F7
 	.incbin "base_emerald.gba", 0x5ee4f7, 0x15
 
-gUnknown_085EE50C: ; 85EE50C
+gUnknown_085EE50C: @ 85EE50C
 	.incbin "base_emerald.gba", 0x5ee50c, 0x47
 
-gUnknown_085EE553: ; 85EE553
+gUnknown_085EE553: @ 85EE553
 	.incbin "base_emerald.gba", 0x5ee553, 0x1f
 
-gUnknown_085EE572: ; 85EE572
+gUnknown_085EE572: @ 85EE572
 	.incbin "base_emerald.gba", 0x5ee572, 0x17
 
-gUnknown_085EE589: ; 85EE589
+gUnknown_085EE589: @ 85EE589
 	.incbin "base_emerald.gba", 0x5ee589, 0x4b
 
-gUnknown_085EE5D4: ; 85EE5D4
+gUnknown_085EE5D4: @ 85EE5D4
 	.incbin "base_emerald.gba", 0x5ee5d4, 0xb
 
-gUnknown_085EE5DF: ; 85EE5DF
+gUnknown_085EE5DF: @ 85EE5DF
 	.incbin "base_emerald.gba", 0x5ee5df, 0xa
 
-gUnknown_085EE5E9: ; 85EE5E9
+gUnknown_085EE5E9: @ 85EE5E9
 	.incbin "base_emerald.gba", 0x5ee5e9, 0xb
 
-gUnknown_085EE5F4: ; 85EE5F4
+gUnknown_085EE5F4: @ 85EE5F4
 	.incbin "base_emerald.gba", 0x5ee5f4, 0x9
 
-gUnknown_085EE5FD: ; 85EE5FD
+gUnknown_085EE5FD: @ 85EE5FD
 	.incbin "base_emerald.gba", 0x5ee5fd, 0xa
 
-gUnknown_085EE607: ; 85EE607
+gUnknown_085EE607: @ 85EE607
 	.incbin "base_emerald.gba", 0x5ee607, 0xc
 
-gUnknown_085EE613: ; 85EE613
+gUnknown_085EE613: @ 85EE613
 	.incbin "base_emerald.gba", 0x5ee613, 0xa
 
-gUnknown_085EE61D: ; 85EE61D
+gUnknown_085EE61D: @ 85EE61D
 	.incbin "base_emerald.gba", 0x5ee61d, 0xb
 
-gUnknown_085EE628: ; 85EE628
+gUnknown_085EE628: @ 85EE628
 	.incbin "base_emerald.gba", 0x5ee628, 0xd
 
-gUnknown_085EE635: ; 85EE635
+gUnknown_085EE635: @ 85EE635
 	.incbin "base_emerald.gba", 0x5ee635, 0xb
 
-gUnknown_085EE640: ; 85EE640
+gUnknown_085EE640: @ 85EE640
 	.incbin "base_emerald.gba", 0x5ee640, 0x7
 
-gUnknown_085EE647: ; 85EE647
+gUnknown_085EE647: @ 85EE647
 	.incbin "base_emerald.gba", 0x5ee647, 0xd
 
-gUnknown_085EE654: ; 85EE654
+gUnknown_085EE654: @ 85EE654
 	.incbin "base_emerald.gba", 0x5ee654, 0x9
 
-gUnknown_085EE65D: ; 85EE65D
+gUnknown_085EE65D: @ 85EE65D
 	.incbin "base_emerald.gba", 0x5ee65d, 0xa
 
-gUnknown_085EE667: ; 85EE667
+gUnknown_085EE667: @ 85EE667
 	.incbin "base_emerald.gba", 0x5ee667, 0x23
 
-gUnknown_085EE68A: ; 85EE68A
+gUnknown_085EE68A: @ 85EE68A
 	.incbin "base_emerald.gba", 0x5ee68a, 0x4
 
-gUnknown_085EE68E: ; 85EE68E
+gUnknown_085EE68E: @ 85EE68E
 	.incbin "base_emerald.gba", 0x5ee68e, 0x2
 
-gUnknown_085EE690: ; 85EE690
+gUnknown_085EE690: @ 85EE690
 	.incbin "base_emerald.gba", 0x5ee690, 0x6f
 
-gUnknown_085EE6FF: ; 85EE6FF
+gUnknown_085EE6FF: @ 85EE6FF
 	.incbin "base_emerald.gba", 0x5ee6ff, 0x17
 
-gUnknown_085EE716: ; 85EE716
+gUnknown_085EE716: @ 85EE716
 	.incbin "base_emerald.gba", 0x5ee716, 0x4f
 
-gUnknown_085EE765: ; 85EE765
+gUnknown_085EE765: @ 85EE765
 	.incbin "base_emerald.gba", 0x5ee765, 0x23
 
-gUnknown_085EE788: ; 85EE788
+gUnknown_085EE788: @ 85EE788
 	.incbin "base_emerald.gba", 0x5ee788, 0x37
 
-gUnknown_085EE7BF: ; 85EE7BF
+gUnknown_085EE7BF: @ 85EE7BF
 	.incbin "base_emerald.gba", 0x5ee7bf, 0xf
 
-gUnknown_085EE7CE: ; 85EE7CE
+gUnknown_085EE7CE: @ 85EE7CE
 	.incbin "base_emerald.gba", 0x5ee7ce, 0x3c
 
-gUnknown_085EE80A: ; 85EE80A
+gUnknown_085EE80A: @ 85EE80A
 	.incbin "base_emerald.gba", 0x5ee80a, 0x1d
 
-gUnknown_085EE827: ; 85EE827
+gUnknown_085EE827: @ 85EE827
 	.incbin "base_emerald.gba", 0x5ee827, 0x28
 
-gUnknown_085EE84F: ; 85EE84F
+gUnknown_085EE84F: @ 85EE84F
 	.incbin "base_emerald.gba", 0x5ee84f, 0x6
 
-gUnknown_085EE855: ; 85EE855
+gUnknown_085EE855: @ 85EE855
 	.incbin "base_emerald.gba", 0x5ee855, 0x9
 
-gUnknown_085EE85E: ; 85EE85E
+gUnknown_085EE85E: @ 85EE85E
 	.incbin "base_emerald.gba", 0x5ee85e, 0x93
 
-gUnknown_085EE8F1: ; 85EE8F1
+gUnknown_085EE8F1: @ 85EE8F1
 	.incbin "base_emerald.gba", 0x5ee8f1, 0x6
 
-gUnknown_085EE8F7: ; 85EE8F7
+gUnknown_085EE8F7: @ 85EE8F7
 	.incbin "base_emerald.gba", 0x5ee8f7, 0xc
 
-gUnknown_085EE903: ; 85EE903
+gUnknown_085EE903: @ 85EE903
 	.incbin "base_emerald.gba", 0x5ee903, 0x1b
 
-gUnknown_085EE91E: ; 85EE91E
+gUnknown_085EE91E: @ 85EE91E
 	.incbin "base_emerald.gba", 0x5ee91e, 0x15
 
-gUnknown_085EE933: ; 85EE933
+gUnknown_085EE933: @ 85EE933
 	.incbin "base_emerald.gba", 0x5ee933, 0xf
 
-gUnknown_085EE942: ; 85EE942
+gUnknown_085EE942: @ 85EE942
 	.incbin "base_emerald.gba", 0x5ee942, 0x17
 
-gUnknown_085EE959: ; 85EE959
+gUnknown_085EE959: @ 85EE959
 	.incbin "base_emerald.gba", 0x5ee959, 0xd
 
-gUnknown_085EE966: ; 85EE966
+gUnknown_085EE966: @ 85EE966
 	.incbin "base_emerald.gba", 0x5ee966, 0x11
 
-gUnknown_085EE977: ; 85EE977
+gUnknown_085EE977: @ 85EE977
 	.incbin "base_emerald.gba", 0x5ee977, 0x16
 
-; 85EE98D
+@ 85EE98D
 	.include "data/text/easy_chat/easy_chat_group_names.s"
 
-gUnknown_085EEA42: ; 85EEA42
+gUnknown_085EEA42: @ 85EEA42
 	.incbin "base_emerald.gba", 0x5eea42, 0x31
 
-gUnknown_085EEA73: ; 85EEA73
+gUnknown_085EEA73: @ 85EEA73
 	.incbin "base_emerald.gba", 0x5eea73, 0x3
 
-gUnknown_085EEA76: ; 85EEA76
+gUnknown_085EEA76: @ 85EEA76
 	.incbin "base_emerald.gba", 0x5eea76, 0x2
 
-gUnknown_085EEA78: ; 85EEA78
+gUnknown_085EEA78: @ 85EEA78
 	.incbin "base_emerald.gba", 0x5eea78, 0x6
 
-gUnknown_085EEA7E: ; 85EEA7E
+gUnknown_085EEA7E: @ 85EEA7E
 	.incbin "base_emerald.gba", 0x5eea7e, 0x10
 
-gUnknown_085EEA8E: ; 85EEA8E
+gUnknown_085EEA8E: @ 85EEA8E
 	.incbin "base_emerald.gba", 0x5eea8e, 0x68
 
-gUnknown_085EEAF6: ; 85EEAF6
+gUnknown_085EEAF6: @ 85EEAF6
 	.incbin "base_emerald.gba", 0x5eeaf6, 0x15
 
-gUnknown_085EEB0B: ; 85EEB0B
+gUnknown_085EEB0B: @ 85EEB0B
 	.incbin "base_emerald.gba", 0x5eeb0b, 0x73
 
-gUnknown_085EEB7E: ; 85EEB7E
+gUnknown_085EEB7E: @ 85EEB7E
 	.incbin "base_emerald.gba", 0x5eeb7e, 0x34
 
-gUnknown_085EEBB2: ; 85EEBB2
+gUnknown_085EEBB2: @ 85EEBB2
 	.incbin "base_emerald.gba", 0x5eebb2, 0xf
 
-gUnknown_085EEBC1: ; 85EEBC1
+gUnknown_085EEBC1: @ 85EEBC1
 	.incbin "base_emerald.gba", 0x5eebc1, 0x1a
 
-gUnknown_085EEBDB: ; 85EEBDB
+gUnknown_085EEBDB: @ 85EEBDB
 	.incbin "base_emerald.gba", 0x5eebdb, 0x1b
 
-gUnknown_085EEBF6: ; 85EEBF6
+gUnknown_085EEBF6: @ 85EEBF6
 	.incbin "base_emerald.gba", 0x5eebf6, 0x1a
 
-gUnknown_085EEC10: ; 85EEC10
+gUnknown_085EEC10: @ 85EEC10
 	.incbin "base_emerald.gba", 0x5eec10, 0x5
 
-gUnknown_085EEC15: ; 85EEC15
+gUnknown_085EEC15: @ 85EEC15
 	.incbin "base_emerald.gba", 0x5eec15, 0x8
 
-gUnknown_085EEC1D: ; 85EEC1D
+gUnknown_085EEC1D: @ 85EEC1D
 	.incbin "base_emerald.gba", 0x5eec1d, 0x7
 
-gUnknown_085EEC24: ; 85EEC24
+gUnknown_085EEC24: @ 85EEC24
 	.incbin "base_emerald.gba", 0x5eec24, 0x9
 
-gUnknown_085EEC2D: ; 85EEC2D
+gUnknown_085EEC2D: @ 85EEC2D
 	.incbin "base_emerald.gba", 0x5eec2d, 0x1c
 
-gUnknown_085EEC49: ; 85EEC49
+gUnknown_085EEC49: @ 85EEC49
 	.incbin "base_emerald.gba", 0x5eec49, 0x4
 
-gUnknown_085EEC4D: ; 85EEC4D
+gUnknown_085EEC4D: @ 85EEC4D
 	.incbin "base_emerald.gba", 0x5eec4d, 0x3
 
-gUnknown_085EEC50: ; 85EEC50
+gUnknown_085EEC50: @ 85EEC50
 	.incbin "base_emerald.gba", 0x5eec50, 0x16
 
-gUnknown_085EEC66: ; 85EEC66
+gUnknown_085EEC66: @ 85EEC66
 	.incbin "base_emerald.gba", 0x5eec66, 0xd
 
-gUnknown_085EEC73: ; 85EEC73
+gUnknown_085EEC73: @ 85EEC73
 	.incbin "base_emerald.gba", 0x5eec73, 0x18
 
-gUnknown_085EEC8B: ; 85EEC8B
+gUnknown_085EEC8B: @ 85EEC8B
 	.incbin "base_emerald.gba", 0x5eec8b, 0x1a
 
-gUnknown_085EECA5: ; 85EECA5
+gUnknown_085EECA5: @ 85EECA5
 	.incbin "base_emerald.gba", 0x5eeca5, 0x5
 
-gUnknown_085EECAA: ; 85EECAA
+gUnknown_085EECAA: @ 85EECAA
 	.incbin "base_emerald.gba", 0x5eecaa, 0x8
 
-gUnknown_085EECB2: ; 85EECB2
+gUnknown_085EECB2: @ 85EECB2
 	.incbin "base_emerald.gba", 0x5eecb2, 0x9
 
-gUnknown_085EECBB: ; 85EECBB
+gUnknown_085EECBB: @ 85EECBB
 	.incbin "base_emerald.gba", 0x5eecbb, 0xf
 
-gUnknown_085EECCA: ; 85EECCA
+gUnknown_085EECCA: @ 85EECCA
 	.incbin "base_emerald.gba", 0x5eecca, 0x4
 
-gUnknown_085EECCE: ; 85EECCE
+gUnknown_085EECCE: @ 85EECCE
 	.incbin "base_emerald.gba", 0x5eecce, 0x3
 
-gUnknown_085EECD1: ; 85EECD1
+gUnknown_085EECD1: @ 85EECD1
 	.incbin "base_emerald.gba", 0x5eecd1, 0xc
 
-gUnknown_085EECDD: ; 85EECDD
+gUnknown_085EECDD: @ 85EECDD
 	.incbin "base_emerald.gba", 0x5eecdd, 0x13
 
-gUnknown_085EECF0: ; 85EECF0
+gUnknown_085EECF0: @ 85EECF0
 	.incbin "base_emerald.gba", 0x5eecf0, 0x1a
 
-gUnknown_085EED0A: ; 85EED0A
+gUnknown_085EED0A: @ 85EED0A
 	.incbin "base_emerald.gba", 0x5eed0a, 0x1a
 
-gUnknown_085EED24: ; 85EED24
+gUnknown_085EED24: @ 85EED24
 	.incbin "base_emerald.gba", 0x5eed24, 0x2
 
-gUnknown_085EED26: ; 85EED26
+gUnknown_085EED26: @ 85EED26
 	.incbin "base_emerald.gba", 0x5eed26, 0x7
 
-gUnknown_085EED2D: ; 85EED2D
+gUnknown_085EED2D: @ 85EED2D
 	.incbin "base_emerald.gba", 0x5eed2d, 0x7
 
-gUnknown_085EED34: ; 85EED34
+gUnknown_085EED34: @ 85EED34
 	.incbin "base_emerald.gba", 0x5eed34, 0x8
 
-gUnknown_085EED3C: ; 85EED3C
+gUnknown_085EED3C: @ 85EED3C
 	.incbin "base_emerald.gba", 0x5eed3c, 0x1b4
 
-gUnknown_085EEEF0: ; 85EEEF0
+gUnknown_085EEEF0: @ 85EEEF0
 	.incbin "base_emerald.gba", 0x5eeef0, 0x3c
 
-gUnknown_085EEF2C: ; 85EEF2C
+gUnknown_085EEF2C: @ 85EEF2C
 	.incbin "base_emerald.gba", 0x5eef2c, 0x3c
 
-gUnknown_085EEF68: ; 85EEF68
+gUnknown_085EEF68: @ 85EEF68
 	.incbin "base_emerald.gba", 0x5eef68, 0x2c
 
-gUnknown_085EEF94: ; 85EEF94
+gUnknown_085EEF94: @ 85EEF94
 	.incbin "base_emerald.gba", 0x5eef94, 0x54
 
-gUnknown_085EEFE8: ; 85EEFE8
+gUnknown_085EEFE8: @ 85EEFE8
 	.incbin "base_emerald.gba", 0x5eefe8, 0x10
 
-gUnknown_085EEFF8: ; 85EEFF8
+gUnknown_085EEFF8: @ 85EEFF8
 	.incbin "base_emerald.gba", 0x5eeff8, 0x1c
 
-gUnknown_085EF014: ; 85EF014
+gUnknown_085EF014: @ 85EF014
 	.incbin "base_emerald.gba", 0x5ef014, 0x18
 
-gUnknown_085EF02C: ; 85EF02C
+gUnknown_085EF02C: @ 85EF02C
 	.incbin "base_emerald.gba", 0x5ef02c, 0x24
 
-gUnknown_085EF050: ; 85EF050
+gUnknown_085EF050: @ 85EF050
 	.incbin "base_emerald.gba", 0x5ef050, 0x34
 
-gUnknown_085EF084: ; 85EF084
+gUnknown_085EF084: @ 85EF084
 	.incbin "base_emerald.gba", 0x5ef084, 0x44
 
-gUnknown_085EF0C8: ; 85EF0C8
+gUnknown_085EF0C8: @ 85EF0C8
 	.incbin "base_emerald.gba", 0x5ef0c8, 0x2c
 
-gUnknown_085EF0F4: ; 85EF0F4
+gUnknown_085EF0F4: @ 85EF0F4
 	.incbin "base_emerald.gba", 0x5ef0f4, 0x30
 
-gUnknown_085EF124: ; 85EF124
+gUnknown_085EF124: @ 85EF124
 	.incbin "base_emerald.gba", 0x5ef124, 0x28
 
-gUnknown_085EF14C: ; 85EF14C
+gUnknown_085EF14C: @ 85EF14C
 	.incbin "base_emerald.gba", 0x5ef14c, 0x2c
 
-gUnknown_085EF178: ; 85EF178
+gUnknown_085EF178: @ 85EF178
 	.incbin "base_emerald.gba", 0x5ef178, 0x20
 
-gUnknown_085EF198: ; 85EF198
+gUnknown_085EF198: @ 85EF198
 	.incbin "base_emerald.gba", 0x5ef198, 0x1c
 
-gUnknown_085EF1B4: ; 85EF1B4
+gUnknown_085EF1B4: @ 85EF1B4
 	.incbin "base_emerald.gba", 0x5ef1b4, 0x24
 
-gUnknown_085EF1D8: ; 85EF1D8
+gUnknown_085EF1D8: @ 85EF1D8
 	.incbin "base_emerald.gba", 0x5ef1d8, 0x28
 
-gUnknown_085EF200: ; 85EF200
+gUnknown_085EF200: @ 85EF200
 	.incbin "base_emerald.gba", 0x5ef200, 0x1c
 
-gUnknown_085EF21C: ; 85EF21C
+gUnknown_085EF21C: @ 85EF21C
 	.incbin "base_emerald.gba", 0x5ef21c, 0x28
 
-gUnknown_085EF244: ; 85EF244
+gUnknown_085EF244: @ 85EF244
 	.incbin "base_emerald.gba", 0x5ef244, 0x3c
 
-gUnknown_085EF280: ; 85EF280
+gUnknown_085EF280: @ 85EF280
 	.incbin "base_emerald.gba", 0x5ef280, 0x34
 
-gUnknown_085EF2B4: ; 85EF2B4
+gUnknown_085EF2B4: @ 85EF2B4
 	.incbin "base_emerald.gba", 0x5ef2b4, 0x30
 
-gUnknown_085EF2E4: ; 85EF2E4
+gUnknown_085EF2E4: @ 85EF2E4
 	.incbin "base_emerald.gba", 0x5ef2e4, 0x18
 
-gUnknown_085EF2FC: ; 85EF2FC
+gUnknown_085EF2FC: @ 85EF2FC
 	.incbin "base_emerald.gba", 0x5ef2fc, 0x34
 
-gUnknown_085EF330: ; 85EF330
+gUnknown_085EF330: @ 85EF330
 	.incbin "base_emerald.gba", 0x5ef330, 0x30
 
-gUnknown_085EF360: ; 85EF360
+gUnknown_085EF360: @ 85EF360
 	.incbin "base_emerald.gba", 0x5ef360, 0x1c
 
-gUnknown_085EF37C: ; 85EF37C
+gUnknown_085EF37C: @ 85EF37C
 	.incbin "base_emerald.gba", 0x5ef37c, 0x20
 
-gUnknown_085EF39C: ; 85EF39C
+gUnknown_085EF39C: @ 85EF39C
 	.incbin "base_emerald.gba", 0x5ef39c, 0x28
 
-gUnknown_085EF3C4: ; 85EF3C4
+gUnknown_085EF3C4: @ 85EF3C4
 	.incbin "base_emerald.gba", 0x5ef3c4, 0x2c
 
-gUnknown_085EF3F0: ; 85EF3F0
+gUnknown_085EF3F0: @ 85EF3F0
 	.incbin "base_emerald.gba", 0x5ef3f0, 0x20
 
-gUnknown_085EF410: ; 85EF410
+gUnknown_085EF410: @ 85EF410
 	.incbin "base_emerald.gba", 0x5ef410, 0x1c
 
-gUnknown_085EF42C: ; 85EF42C
+gUnknown_085EF42C: @ 85EF42C
 	.incbin "base_emerald.gba", 0x5ef42c, 0x34
 
-gUnknown_085EF460: ; 85EF460
+gUnknown_085EF460: @ 85EF460
 	.incbin "base_emerald.gba", 0x5ef460, 0x34
 
-gUnknown_085EF494: ; 85EF494
+gUnknown_085EF494: @ 85EF494
 	.incbin "base_emerald.gba", 0x5ef494, 0x30
 
-gUnknown_085EF4C4: ; 85EF4C4
+gUnknown_085EF4C4: @ 85EF4C4
 	.incbin "base_emerald.gba", 0x5ef4c4, 0x2c
 
-gUnknown_085EF4F0: ; 85EF4F0
+gUnknown_085EF4F0: @ 85EF4F0
 	.incbin "base_emerald.gba", 0x5ef4f0, 0x30
 
-gUnknown_085EF520: ; 85EF520
+gUnknown_085EF520: @ 85EF520
 	.incbin "base_emerald.gba", 0x5ef520, 0x3c
 
-gUnknown_085EF55C: ; 85EF55C
+gUnknown_085EF55C: @ 85EF55C
 	.incbin "base_emerald.gba", 0x5ef55c, 0x28
 
-gUnknown_085EF584: ; 85EF584
+gUnknown_085EF584: @ 85EF584
 	.incbin "base_emerald.gba", 0x5ef584, 0x38
 
-gUnknown_085EF5BC: ; 85EF5BC
+gUnknown_085EF5BC: @ 85EF5BC
 	.incbin "base_emerald.gba", 0x5ef5bc, 0x24
 
-gUnknown_085EF5E0: ; 85EF5E0
+gUnknown_085EF5E0: @ 85EF5E0
 	.incbin "base_emerald.gba", 0x5ef5e0, 0x2c
 
-gUnknown_085EF60C: ; 85EF60C
+gUnknown_085EF60C: @ 85EF60C
 	.incbin "base_emerald.gba", 0x5ef60c, 0x24
 
-gUnknown_085EF630: ; 85EF630
+gUnknown_085EF630: @ 85EF630
 	.incbin "base_emerald.gba", 0x5ef630, 0x24
 
-gUnknown_085EF654: ; 85EF654
+gUnknown_085EF654: @ 85EF654
 	.incbin "base_emerald.gba", 0x5ef654, 0x10
 
-gUnknown_085EF664: ; 85EF664
+gUnknown_085EF664: @ 85EF664
 	.incbin "base_emerald.gba", 0x5ef664, 0x14
 
-gUnknown_085EF678: ; 85EF678
+gUnknown_085EF678: @ 85EF678
 	.incbin "base_emerald.gba", 0x5ef678, 0x15
 
-gUnknown_085EF68D: ; 85EF68D
+gUnknown_085EF68D: @ 85EF68D
 	.incbin "base_emerald.gba", 0x5ef68d, 0x14
 
-gUnknown_085EF6A1: ; 85EF6A1
+gUnknown_085EF6A1: @ 85EF6A1
 	.incbin "base_emerald.gba", 0x5ef6a1, 0x1c
 
-gUnknown_085EF6BD: ; 85EF6BD
+gUnknown_085EF6BD: @ 85EF6BD
 	.incbin "base_emerald.gba", 0x5ef6bd, 0x15
 
-gUnknown_085EF6D2: ; 85EF6D2
+gUnknown_085EF6D2: @ 85EF6D2
 	.incbin "base_emerald.gba", 0x5ef6d2, 0x17
 
-gUnknown_085EF6E9: ; 85EF6E9
+gUnknown_085EF6E9: @ 85EF6E9
 	.incbin "base_emerald.gba", 0x5ef6e9, 0xf
 
-gUnknown_085EF6F8: ; 85EF6F8
+gUnknown_085EF6F8: @ 85EF6F8
 	.incbin "base_emerald.gba", 0x5ef6f8, 0x18
 
-gUnknown_085EF710: ; 85EF710
+gUnknown_085EF710: @ 85EF710
 	.incbin "base_emerald.gba", 0x5ef710, 0x24
 
-gUnknown_085EF734: ; 85EF734
+gUnknown_085EF734: @ 85EF734
 	.incbin "base_emerald.gba", 0x5ef734, 0x1c
 
-gUnknown_085EF750: ; 85EF750
+gUnknown_085EF750: @ 85EF750
 	.incbin "base_emerald.gba", 0x5ef750, 0x131
 
-gUnknown_085EF881: ; 85EF881
+gUnknown_085EF881: @ 85EF881
 	.incbin "base_emerald.gba", 0x5ef881, 0x2
 
-gUnknown_085EF883: ; 85EF883
+gUnknown_085EF883: @ 85EF883
 	.incbin "base_emerald.gba", 0x5ef883, 0x5
 
-gUnknown_085EF888: ; 85EF888
+gUnknown_085EF888: @ 85EF888
 	.incbin "base_emerald.gba", 0x5ef888, 0x2
 
-gUnknown_085EF88A: ; 85EF88A
+gUnknown_085EF88A: @ 85EF88A
 	.incbin "base_emerald.gba", 0x5ef88a, 0xb
 
-gUnknown_085EF895: ; 85EF895
+gUnknown_085EF895: @ 85EF895
 	.incbin "base_emerald.gba", 0x5ef895, 0xe
 
-gUnknown_085EF8A3: ; 85EF8A3
+gUnknown_085EF8A3: @ 85EF8A3
 	.incbin "base_emerald.gba", 0x5ef8a3, 0x1f
 
-gUnknown_085EF8C2: ; 85EF8C2
+gUnknown_085EF8C2: @ 85EF8C2
 	.incbin "base_emerald.gba", 0x5ef8c2, 0x18
 
-gUnknown_085EF8DA: ; 85EF8DA
+gUnknown_085EF8DA: @ 85EF8DA
 	.incbin "base_emerald.gba", 0x5ef8da, 0xa
 
-gUnknown_085EF8E4: ; 85EF8E4
+gUnknown_085EF8E4: @ 85EF8E4
 	.incbin "base_emerald.gba", 0x5ef8e4, 0xf
 
-gUnknown_085EF8F3: ; 85EF8F3
+gUnknown_085EF8F3: @ 85EF8F3
 	.incbin "base_emerald.gba", 0x5ef8f3, 0x6d
 
-gUnknown_085EF960: ; 85EF960
+gUnknown_085EF960: @ 85EF960
 	.incbin "base_emerald.gba", 0x5ef960, 0x19
 
-gUnknown_085EF979: ; 85EF979
+gUnknown_085EF979: @ 85EF979
 	.incbin "base_emerald.gba", 0x5ef979, 0x2d
 
-gUnknown_085EF9A6: ; 85EF9A6
+gUnknown_085EF9A6: @ 85EF9A6
 	.incbin "base_emerald.gba", 0x5ef9a6, 0x40
 
-gUnknown_085EF9E6: ; 85EF9E6
+gUnknown_085EF9E6: @ 85EF9E6
 	.incbin "base_emerald.gba", 0x5ef9e6, 0x2a
 
-gUnknown_085EFA10: ; 85EFA10
+gUnknown_085EFA10: @ 85EFA10
 	.incbin "base_emerald.gba", 0x5efa10, 0x21
 
-gUnknown_085EFA31: ; 85EFA31
+gUnknown_085EFA31: @ 85EFA31
 	.incbin "base_emerald.gba", 0x5efa31, 0xd
 
-gUnknown_085EFA3E: ; 85EFA3E
+gUnknown_085EFA3E: @ 85EFA3E
 	.incbin "base_emerald.gba", 0x5efa3e, 0x14
 
-gUnknown_085EFA52: ; 85EFA52
+gUnknown_085EFA52: @ 85EFA52
 	.incbin "base_emerald.gba", 0x5efa52, 0x4
 
-gUnknown_085EFA56: ; 85EFA56
+gUnknown_085EFA56: @ 85EFA56
 	.incbin "base_emerald.gba", 0x5efa56, 0x7
 
-gUnknown_085EFA5D: ; 85EFA5D
+gUnknown_085EFA5D: @ 85EFA5D
 	.incbin "base_emerald.gba", 0x5efa5d, 0xa
 
-gUnknown_085EFA67: ; 85EFA67
+gUnknown_085EFA67: @ 85EFA67
 	.incbin "base_emerald.gba", 0x5efa67, 0x7
 
-gUnknown_085EFA6E: ; 85EFA6E
+gUnknown_085EFA6E: @ 85EFA6E
 	.incbin "base_emerald.gba", 0x5efa6e, 0x21
 
-gUnknown_085EFA8F: ; 85EFA8F
+gUnknown_085EFA8F: @ 85EFA8F
 	.incbin "base_emerald.gba", 0x5efa8f, 0x1b
 
-gUnknown_085EFAAA: ; 85EFAAA
+gUnknown_085EFAAA: @ 85EFAAA
 	.incbin "base_emerald.gba", 0x5efaaa, 0x1c
 
-gUnknown_085EFAC6: ; 85EFAC6
+gUnknown_085EFAC6: @ 85EFAC6
 	.incbin "base_emerald.gba", 0x5efac6, 0x1a
 
-gUnknown_085EFAE0: ; 85EFAE0
+gUnknown_085EFAE0: @ 85EFAE0
 	.incbin "base_emerald.gba", 0x5efae0, 0x8
 
-gUnknown_085EFAE8: ; 85EFAE8
+gUnknown_085EFAE8: @ 85EFAE8
 	.incbin "base_emerald.gba", 0x5efae8, 0xea
 
-gUnknown_085EFBD2: ; 85EFBD2
+gUnknown_085EFBD2: @ 85EFBD2
 	.incbin "base_emerald.gba", 0x5efbd2, 0x3a
 
-gUnknown_085EFC0C: ; 85EFC0C
+gUnknown_085EFC0C: @ 85EFC0C
 	.incbin "base_emerald.gba", 0x5efc0c, 0x1b
 
-gUnknown_085EFC27: ; 85EFC27
+gUnknown_085EFC27: @ 85EFC27
 	.incbin "base_emerald.gba", 0x5efc27, 0xad
 
-gUnknown_085EFCD4: ; 85EFCD4
+gUnknown_085EFCD4: @ 85EFCD4
 	.incbin "base_emerald.gba", 0x5efcd4, 0xb
 
-gUnknown_085EFCDF: ; 85EFCDF
+gUnknown_085EFCDF: @ 85EFCDF
 	.incbin "base_emerald.gba", 0x5efcdf, 0x6
 
-gUnknown_085EFCE5: ; 85EFCE5
+gUnknown_085EFCE5: @ 85EFCE5
 	.incbin "base_emerald.gba", 0x5efce5, 0xb
 
-gUnknown_085EFCF0: ; 85EFCF0
+gUnknown_085EFCF0: @ 85EFCF0
 	.incbin "base_emerald.gba", 0x5efcf0, 0x10
 
-gUnknown_085EFD00: ; 85EFD00
+gUnknown_085EFD00: @ 85EFD00
 	.incbin "base_emerald.gba", 0x5efd00, 0x20
 
-gUnknown_085EFD20: ; 85EFD20
+gUnknown_085EFD20: @ 85EFD20
 	.incbin "base_emerald.gba", 0x5efd20, 0x8
 
-gUnknown_085EFD28: ; 85EFD28
+gUnknown_085EFD28: @ 85EFD28
 	.incbin "base_emerald.gba", 0x5efd28, 0x28
 
-gBerryFirmnessStringPointers: ; 85EFD50
+gBerryFirmnessStringPointers: @ 85EFD50
 	.4byte gBerryFirmnessString_VerySoft
 	.4byte gBerryFirmnessString_Soft
 	.4byte gBerryFirmnessString_Hard
 	.4byte gBerryFirmnessString_VeryHard
 	.4byte gBerryFirmnessString_SuperHard
 
-gUnknown_085EFD64: ; 85EFD64
+gUnknown_085EFD64: @ 85EFD64
 	.incbin "base_emerald.gba", 0x5efd64, 0x4
 
-gUnknown_085EFD68: ; 85EFD68
+gUnknown_085EFD68: @ 85EFD68
 	.incbin "base_emerald.gba", 0x5efd68, 0x18
 
-gUnknown_085EFD80: ; 85EFD80
+gUnknown_085EFD80: @ 85EFD80
 	.incbin "base_emerald.gba", 0x5efd80, 0x8
 
-gUnknown_085EFD88: ; 85EFD88
+gUnknown_085EFD88: @ 85EFD88
 	.incbin "base_emerald.gba", 0x5efd88, 0xc
 
-gUnknown_085EFD94: ; 85EFD94
+gUnknown_085EFD94: @ 85EFD94
 	.incbin "base_emerald.gba", 0x5efd94, 0x8
 
-gUnknown_085EFD9C: ; 85EFD9C
+gUnknown_085EFD9C: @ 85EFD9C
 	.incbin "base_emerald.gba", 0x5efd9c, 0x8
 
-gUnknown_085EFDA4: ; 85EFDA4
+gUnknown_085EFDA4: @ 85EFDA4
 	.incbin "base_emerald.gba", 0x5efda4, 0x8
 
-gUnknown_085EFDAC: ; 85EFDAC
+gUnknown_085EFDAC: @ 85EFDAC
 	.incbin "base_emerald.gba", 0x5efdac, 0x18
 
-gUnknown_085EFDC4: ; 85EFDC4
+gUnknown_085EFDC4: @ 85EFDC4
 	.incbin "base_emerald.gba", 0x5efdc4, 0x20
 
-gUnknown_085EFDE4: ; 85EFDE4
+gUnknown_085EFDE4: @ 85EFDE4
 	.incbin "base_emerald.gba", 0x5efde4, 0x90
 
-gUnknown_085EFE74: ; 85EFE74
+gUnknown_085EFE74: @ 85EFE74
 	.incbin "base_emerald.gba", 0x5efe74, 0x48
 
-gUnknown_085EFEBC: ; 85EFEBC
+gUnknown_085EFEBC: @ 85EFEBC
 	.incbin "base_emerald.gba", 0x5efebc, 0x32
 
-gUnknown_085EFEEE: ; 85EFEEE
+gUnknown_085EFEEE: @ 85EFEEE
 	.incbin "base_emerald.gba", 0x5efeee, 0x12
 
-gUnknown_085EFF00: ; 85EFF00
+gUnknown_085EFF00: @ 85EFF00
 	.incbin "base_emerald.gba", 0x5eff00, 0x5fc
 
-gUnknown_085F04FC: ; 85F04FC
+gUnknown_085F04FC: @ 85F04FC
 	.incbin "base_emerald.gba", 0x5f04fc, 0x54
 
-gUnknown_085F0550: ; 85F0550
+gUnknown_085F0550: @ 85F0550
 	.incbin "base_emerald.gba", 0x5f0550, 0x8
 
-gUnknown_085F0558: ; 85F0558
+gUnknown_085F0558: @ 85F0558
 	.incbin "base_emerald.gba", 0x5f0558, 0x10
 
-gUnknown_085F0568: ; 85F0568
+gUnknown_085F0568: @ 85F0568
 	.incbin "base_emerald.gba", 0x5f0568, 0x48
 
-gUnknown_085F05B0: ; 85F05B0
+gUnknown_085F05B0: @ 85F05B0
 	.incbin "base_emerald.gba", 0x5f05b0, 0xb4
 
-gUnknown_085F0664: ; 85F0664
+gUnknown_085F0664: @ 85F0664
 	.incbin "base_emerald.gba", 0x5f0664, 0x4
 
-gUnknown_085F0668: ; 85F0668
+gUnknown_085F0668: @ 85F0668
 	.incbin "base_emerald.gba", 0x5f0668, 0x4
 
-gUnknown_085F066C: ; 85F066C
+gUnknown_085F066C: @ 85F066C
 	.incbin "base_emerald.gba", 0x5f066c, 0x34
 
-gUnknown_085F06A0: ; 85F06A0
+gUnknown_085F06A0: @ 85F06A0
 	.incbin "base_emerald.gba", 0x5f06a0, 0x8
 
-gUnknown_085F06A8: ; 85F06A8
+gUnknown_085F06A8: @ 85F06A8
 	.incbin "base_emerald.gba", 0x5f06a8, 0x18
 
-gUnknown_085F06C0: ; 85F06C0
+gUnknown_085F06C0: @ 85F06C0
 	.incbin "base_emerald.gba", 0x5f06c0, 0x8
 
-gUnknown_085F06C8: ; 85F06C8
+gUnknown_085F06C8: @ 85F06C8
 	.incbin "base_emerald.gba", 0x5f06c8, 0x10
 
-gUnknown_085F06D8: ; 85F06D8
+gUnknown_085F06D8: @ 85F06D8
 	.incbin "base_emerald.gba", 0x5f06d8, 0x8
 
-gUnknown_085F06E0: ; 85F06E0
+gUnknown_085F06E0: @ 85F06E0
 	.incbin "base_emerald.gba", 0x5f06e0, 0x20
 
-gUnknown_085F0700: ; 85F0700
+gUnknown_085F0700: @ 85F0700
 	.incbin "base_emerald.gba", 0x5f0700, 0x20
 
-gUnknown_085F0720: ; 85F0720
+gUnknown_085F0720: @ 85F0720
 	.incbin "base_emerald.gba", 0x5f0720, 0x20
 
-gUnknown_085F0740: ; 85F0740
+gUnknown_085F0740: @ 85F0740
 	.incbin "base_emerald.gba", 0x5f0740, 0x480
 
-gUnknown_085F0BC0: ; 85F0BC0
+gUnknown_085F0BC0: @ 85F0BC0
 	.incbin "base_emerald.gba", 0x5f0bc0, 0x13c
 
-gUnknown_085F0CFC: ; 85F0CFC
+gUnknown_085F0CFC: @ 85F0CFC
 	.incbin "base_emerald.gba", 0x5f0cfc, 0x60
 
-gUnknown_085F0D5C: ; 85F0D5C
+gUnknown_085F0D5C: @ 85F0D5C
 	.incbin "base_emerald.gba", 0x5f0d5c, 0x60
 
-gUnknown_085F0DBC: ; 85F0DBC
+gUnknown_085F0DBC: @ 85F0DBC
 	.incbin "base_emerald.gba", 0x5f0dbc, 0x5dc
 
-gUnknown_085F1398: ; 85F1398
+gUnknown_085F1398: @ 85F1398
 	.incbin "base_emerald.gba", 0x5f1398, 0x2d0
 
-gUnknown_085F1668: ; 85F1668
+gUnknown_085F1668: @ 85F1668
 	.incbin "base_emerald.gba", 0x5f1668, 0x20
 
-gUnknown_085F1688: ; 85F1688
+gUnknown_085F1688: @ 85F1688
 	.incbin "base_emerald.gba", 0x5f1688, 0x20
 
-gUnknown_085F16A8: ; 85F16A8
+gUnknown_085F16A8: @ 85F16A8
 	.incbin "base_emerald.gba", 0x5f16a8, 0x13c
 
-gUnknown_085F17E4: ; 85F17E4
+gUnknown_085F17E4: @ 85F17E4
 	.incbin "base_emerald.gba", 0x5f17e4, 0x20
 
-gUnknown_085F1804: ; 85F1804
+gUnknown_085F1804: @ 85F1804
 	.incbin "base_emerald.gba", 0x5f1804, 0x20
 
-gUnknown_085F1824: ; 85F1824
+gUnknown_085F1824: @ 85F1824
 	.incbin "base_emerald.gba", 0x5f1824, 0x688
 
-gUnknown_085F1EAC: ; 85F1EAC
+gUnknown_085F1EAC: @ 85F1EAC
 	.incbin "base_emerald.gba", 0x5f1eac, 0x304
 
-gUnknown_085F21B0: ; 85F21B0
+gUnknown_085F21B0: @ 85F21B0
 	.incbin "base_emerald.gba", 0x5f21b0, 0x16c
 
-gUnknown_085F231C: ; 85F231C
+gUnknown_085F231C: @ 85F231C
 	.incbin "base_emerald.gba", 0x5f231c, 0x40
 
-gUnknown_085F235C: ; 85F235C
+gUnknown_085F235C: @ 85F235C
 	.incbin "base_emerald.gba", 0x5f235c, 0x1ec
 
-gUnknown_085F2548: ; 85F2548
+gUnknown_085F2548: @ 85F2548
 	.incbin "base_emerald.gba", 0x5f2548, 0x20
 
-gUnknown_085F2568: ; 85F2568
+gUnknown_085F2568: @ 85F2568
 	.incbin "base_emerald.gba", 0x5f2568, 0x2ae4
 
-gUnknown_085F504C: ; 85F504C
+gUnknown_085F504C: @ 85F504C
 	.incbin "base_emerald.gba", 0x5f504c, 0x18
 
-gUnknown_085F5064: ; 85F5064
+gUnknown_085F5064: @ 85F5064
 	.incbin "base_emerald.gba", 0x5f5064, 0x30
 
-gUnknown_085F5094: ; 85F5094
+gUnknown_085F5094: @ 85F5094
 	.incbin "base_emerald.gba", 0x5f5094, 0x10
 
-gUnknown_085F50A4: ; 85F50A4
+gUnknown_085F50A4: @ 85F50A4
 	.incbin "base_emerald.gba", 0x5f50a4, 0x48
 
-gUnknown_085F50EC: ; 85F50EC
+gUnknown_085F50EC: @ 85F50EC
 	.incbin "base_emerald.gba", 0x5f50ec, 0x28
 
-gUnknown_085F5114: ; 85F5114
+gUnknown_085F5114: @ 85F5114
 	.incbin "base_emerald.gba", 0x5f5114, 0xc
 
-gUnknown_085F5120: ; 85F5120
+gUnknown_085F5120: @ 85F5120
 	.incbin "base_emerald.gba", 0x5f5120, 0x60
 
-gUnknown_085F5180: ; 85F5180
+gUnknown_085F5180: @ 85F5180
 	.incbin "base_emerald.gba", 0x5f5180, 0x18
 
-gUnknown_085F5198: ; 85F5198
+gUnknown_085F5198: @ 85F5198
 	.incbin "base_emerald.gba", 0x5f5198, 0x4
 
-gUnknown_085F519C: ; 85F519C
+gUnknown_085F519C: @ 85F519C
 	.incbin "base_emerald.gba", 0x5f519c, 0x50
 
-gUnknown_085F51EC: ; 85F51EC
+gUnknown_085F51EC: @ 85F51EC
 	.incbin "base_emerald.gba", 0x5f51ec, 0x18
 
-gUnknown_085F5204: ; 85F5204
+gUnknown_085F5204: @ 85F5204
 	.incbin "base_emerald.gba", 0x5f5204, 0x38
 
-gUnknown_085F523C: ; 85F523C
+gUnknown_085F523C: @ 85F523C
 	.incbin "base_emerald.gba", 0x5f523c, 0x18
 
-gUnknown_085F5254: ; 85F5254
+gUnknown_085F5254: @ 85F5254
 	.incbin "base_emerald.gba", 0x5f5254, 0x38
 
-gUnknown_085F528C: ; 85F528C
+gUnknown_085F528C: @ 85F528C
 	.incbin "base_emerald.gba", 0x5f528c, 0x18
 
-gUnknown_085F52A4: ; 85F52A4
+gUnknown_085F52A4: @ 85F52A4
 	.incbin "base_emerald.gba", 0x5f52a4, 0x18
 
-gUnknown_085F52BC: ; 85F52BC
+gUnknown_085F52BC: @ 85F52BC
 	.incbin "base_emerald.gba", 0x5f52bc, 0x10
 
-gUnknown_085F52CC: ; 85F52CC
+gUnknown_085F52CC: @ 85F52CC
 	.incbin "base_emerald.gba", 0x5f52cc, 0x10
 
-gUnknown_085F52DC: ; 85F52DC
+gUnknown_085F52DC: @ 85F52DC
 	.incbin "base_emerald.gba", 0x5f52dc, 0x20
 
-gUnknown_085F52FC: ; 85F52FC
+gUnknown_085F52FC: @ 85F52FC
 	.incbin "base_emerald.gba", 0x5f52fc, 0x10
 
-gUnknown_085F530C: ; 85F530C
+gUnknown_085F530C: @ 85F530C
 	.incbin "base_emerald.gba", 0x5f530c, 0x28
 
-gUnknown_085F5334: ; 85F5334
+gUnknown_085F5334: @ 85F5334
 	.incbin "base_emerald.gba", 0x5f5334, 0x10
 
-gUnknown_085F5344: ; 85F5344
+gUnknown_085F5344: @ 85F5344
 	.incbin "base_emerald.gba", 0x5f5344, 0x10
 
-gUnknown_085F5354: ; 85F5354
+gUnknown_085F5354: @ 85F5354
 	.incbin "base_emerald.gba", 0x5f5354, 0x30
 
-gUnknown_085F5384: ; 85F5384
+gUnknown_085F5384: @ 85F5384
 	.incbin "base_emerald.gba", 0x5f5384, 0x28
 
-gUnknown_085F53AC: ; 85F53AC
+gUnknown_085F53AC: @ 85F53AC
 	.incbin "base_emerald.gba", 0x5f53ac, 0x10
 
-gUnknown_085F53BC: ; 85F53BC
+gUnknown_085F53BC: @ 85F53BC
 	.incbin "base_emerald.gba", 0x5f53bc, 0x50
 
-gUnknown_085F540C: ; 85F540C
+gUnknown_085F540C: @ 85F540C
 	.incbin "base_emerald.gba", 0x5f540c, 0x10
 
-gUnknown_085F541C: ; 85F541C
+gUnknown_085F541C: @ 85F541C
 	.incbin "base_emerald.gba", 0x5f541c, 0x24
 
-gUnknown_085F5440: ; 85F5440
+gUnknown_085F5440: @ 85F5440
 	.incbin "base_emerald.gba", 0x5f5440, 0x18
 
-gUnknown_085F5458: ; 85F5458
+gUnknown_085F5458: @ 85F5458
 	.incbin "base_emerald.gba", 0x5f5458, 0x38
 
-gUnknown_085F5490: ; 85F5490
+gUnknown_085F5490: @ 85F5490
 	.incbin "base_emerald.gba", 0x5f5490, 0x4
 
-gUnknown_085F5494: ; 85F5494
+gUnknown_085F5494: @ 85F5494
 	.incbin "base_emerald.gba", 0x5f5494, 0x4d40
 
-gUnknown_085FA1D4: ; 85FA1D4
+gUnknown_085FA1D4: @ 85FA1D4
 	.incbin "base_emerald.gba", 0x5fa1d4, 0x4
 
-gUnknown_085FA1D8: ; 85FA1D8
+gUnknown_085FA1D8: @ 85FA1D8
 	.incbin "base_emerald.gba", 0x5fa1d8, 0xff90
 
-gUnknown_0860A168: ; 860A168
+gUnknown_0860A168: @ 860A168
 	.incbin "base_emerald.gba", 0x60a168, 0x1b8
 
-gUnknown_0860A320: ; 860A320
+gUnknown_0860A320: @ 860A320
 	.incbin "base_emerald.gba", 0x60a320, 0x8c
 
-gUnknown_0860A3AC: ; 860A3AC
+gUnknown_0860A3AC: @ 860A3AC
 	.incbin "base_emerald.gba", 0x60a3ac, 0x30
 
-gUnknown_0860A3DC: ; 860A3DC
+gUnknown_0860A3DC: @ 860A3DC
 	.incbin "base_emerald.gba", 0x60a3dc, 0xd0
 
-gUnknown_0860A4AC: ; 860A4AC
+gUnknown_0860A4AC: @ 860A4AC
 	.incbin "base_emerald.gba", 0x60a4ac, 0x388
 
-gUnknown_0860A834: ; 860A834
+gUnknown_0860A834: @ 860A834
 	.incbin "base_emerald.gba", 0x60a834, 0x70
 
-gUnknown_0860A8A4: ; 860A8A4
+gUnknown_0860A8A4: @ 860A8A4
 	.incbin "base_emerald.gba", 0x60a8a4, 0x24
 
-gUnknown_0860A8C8: ; 860A8C8
+gUnknown_0860A8C8: @ 860A8C8
 	.incbin "base_emerald.gba", 0x60a8c8, 0x19c
 
-gUnknown_0860AA64: ; 860AA64
+gUnknown_0860AA64: @ 860AA64
 	.incbin "base_emerald.gba", 0x60aa64, 0x1c
 
-gUnknown_0860AA80: ; 860AA80
+gUnknown_0860AA80: @ 860AA80
 	.incbin "base_emerald.gba", 0x60aa80, 0x8
 
-gUnknown_0860AA88: ; 860AA88
+gUnknown_0860AA88: @ 860AA88
 	.incbin "base_emerald.gba", 0x60aa88, 0x25c
 
-gUnknown_0860ACE4: ; 860ACE4
+gUnknown_0860ACE4: @ 860ACE4
 	.incbin "base_emerald.gba", 0x60ace4, 0x4b
 
-gUnknown_0860AD2F: ; 860AD2F
+gUnknown_0860AD2F: @ 860AD2F
 	.incbin "base_emerald.gba", 0x60ad2f, 0x39
 
-gUnknown_0860AD68: ; 860AD68
+gUnknown_0860AD68: @ 860AD68
 	.incbin "base_emerald.gba", 0x60ad68, 0x8
 
-gUnknown_0860AD70: ; 860AD70
+gUnknown_0860AD70: @ 860AD70
 	.incbin "base_emerald.gba", 0x60ad70, 0x1e
 
-gUnknown_0860AD8E: ; 860AD8E
+gUnknown_0860AD8E: @ 860AD8E
 	.incbin "base_emerald.gba", 0x60ad8e, 0x30
 
-gUnknown_0860ADBE: ; 860ADBE
+gUnknown_0860ADBE: @ 860ADBE
 	.incbin "base_emerald.gba", 0x60adbe, 0xbe
 
-gUnknown_0860AE7C: ; 860AE7C
+gUnknown_0860AE7C: @ 860AE7C
 	.incbin "base_emerald.gba", 0x60ae7c, 0xc
 
-gUnknown_0860AE88: ; 860AE88
+gUnknown_0860AE88: @ 860AE88
 	.incbin "base_emerald.gba", 0x60ae88, 0x8
 
-gUnknown_0860AE90: ; 860AE90
+gUnknown_0860AE90: @ 860AE90
 	.incbin "base_emerald.gba", 0x60ae90, 0xe4
 
-gUnknown_0860AF74: ; 860AF74
+gUnknown_0860AF74: @ 860AF74
 	.incbin "base_emerald.gba", 0x60af74, 0xe4
 
-gUnknown_0860B058: ; 860B058
+gUnknown_0860B058: @ 860B058
 	.incbin "base_emerald.gba", 0x60b058, 0xc
 
-gUnknown_0860B064: ; 860B064
+gUnknown_0860B064: @ 860B064
 	.incbin "base_emerald.gba", 0x60b064, 0x8
 
-gUnknown_0860B06C: ; 860B06C
+gUnknown_0860B06C: @ 860B06C
 	.incbin "base_emerald.gba", 0x60b06c, 0x8
 
-gUnknown_0860B074: ; 860B074
+gUnknown_0860B074: @ 860B074
 	.incbin "base_emerald.gba", 0x60b074, 0xa
 
-gUnknown_0860B07E: ; 860B07E
+gUnknown_0860B07E: @ 860B07E
 	.incbin "base_emerald.gba", 0x60b07e, 0x126
 
-gUnknown_0860B1A4: ; 860B1A4
+gUnknown_0860B1A4: @ 860B1A4
 	.incbin "base_emerald.gba", 0x60b1a4, 0x40
 
-gUnknown_0860B1E4: ; 860B1E4
+gUnknown_0860B1E4: @ 860B1E4
 	.incbin "base_emerald.gba", 0x60b1e4, 0x20
 
-gUnknown_0860B204: ; 860B204
+gUnknown_0860B204: @ 860B204
 	.incbin "base_emerald.gba", 0x60b204, 0x20
 
-gUnknown_0860B224: ; 860B224
+gUnknown_0860B224: @ 860B224
 	.incbin "base_emerald.gba", 0x60b224, 0xc8
 
-gUnknown_0860B2EC: ; 860B2EC
+gUnknown_0860B2EC: @ 860B2EC
 	.incbin "base_emerald.gba", 0x60b2ec, 0x18
 
-gUnknown_0860B304: ; 860B304
+gUnknown_0860B304: @ 860B304
 	.incbin "base_emerald.gba", 0x60b304, 0xc
 
-gUnknown_0860B310: ; 860B310
+gUnknown_0860B310: @ 860B310
 	.incbin "base_emerald.gba", 0x60b310, 0x14
 
-gUnknown_0860B324: ; 860B324
+gUnknown_0860B324: @ 860B324
 	.incbin "base_emerald.gba", 0x60b324, 0x14
 
-gUnknown_0860B338: ; 860B338
+gUnknown_0860B338: @ 860B338
 	.incbin "base_emerald.gba", 0x60b338, 0x14
 
-gUnknown_0860B34C: ; 860B34C
+gUnknown_0860B34C: @ 860B34C
 	.incbin "base_emerald.gba", 0x60b34c, 0xc
 
-gUnknown_0860B358: ; 860B358
+gUnknown_0860B358: @ 860B358
 	.incbin "base_emerald.gba", 0x60b358, 0x1630
 
-gUnknown_0860C988: ; 860C988
+gUnknown_0860C988: @ 860C988
 	.incbin "base_emerald.gba", 0x60c988, 0x269
 
-gUnknown_0860CBF1: ; 860CBF1
+gUnknown_0860CBF1: @ 860CBF1
 	.incbin "base_emerald.gba", 0x60cbf1, 0x283
 
-gUnknown_0860CE74: ; 860CE74
+gUnknown_0860CE74: @ 860CE74
 	.incbin "base_emerald.gba", 0x60ce74, 0x10
 
-gUnknown_0860CE84: ; 860CE84
+gUnknown_0860CE84: @ 860CE84
 	.incbin "base_emerald.gba", 0x60ce84, 0x10
 
-gUnknown_0860CE94: ; 860CE94
+gUnknown_0860CE94: @ 860CE94
 	.incbin "base_emerald.gba", 0x60ce94, 0x20
 
-gUnknown_0860CEB4: ; 860CEB4
+gUnknown_0860CEB4: @ 860CEB4
 	.incbin "base_emerald.gba", 0x60ceb4, 0x90
 
-gUnknown_0860CF44: ; 860CF44
+gUnknown_0860CF44: @ 860CF44
 	.incbin "base_emerald.gba", 0x60cf44, 0xc
 
-gUnknown_0860CF50: ; 860CF50
+gUnknown_0860CF50: @ 860CF50
 	.incbin "base_emerald.gba", 0x60cf50, 0x58
 
-gUnknown_0860CFA8: ; 860CFA8
+gUnknown_0860CFA8: @ 860CFA8
 	.incbin "base_emerald.gba", 0x60cfa8, 0x30
 
-gUnknown_0860CFD8: ; 860CFD8
+gUnknown_0860CFD8: @ 860CFD8
 	.incbin "base_emerald.gba", 0x60cfd8, 0x30
 
-gUnknown_0860D008: ; 860D008
+gUnknown_0860D008: @ 860D008
 	.incbin "base_emerald.gba", 0x60d008, 0x48
 
-gUnknown_0860D050: ; 860D050
+gUnknown_0860D050: @ 860D050
 	.incbin "base_emerald.gba", 0x60d050, 0x18
 
-gUnknown_0860D068: ; 860D068
+gUnknown_0860D068: @ 860D068
 	.incbin "base_emerald.gba", 0x60d068, 0x18
 
-gUnknown_0860D080: ; 860D080
+gUnknown_0860D080: @ 860D080
 	.incbin "base_emerald.gba", 0x60d080, 0x10
 
-gUnknown_0860D090: ; 860D090
+gUnknown_0860D090: @ 860D090
 	.incbin "base_emerald.gba", 0x60d090, 0x5c
 
-gUnknown_0860D0EC: ; 860D0EC
+gUnknown_0860D0EC: @ 860D0EC
 	.incbin "base_emerald.gba", 0x60d0ec, 0x10
 
-gUnknown_0860D0FC: ; 860D0FC
+gUnknown_0860D0FC: @ 860D0FC
 	.incbin "base_emerald.gba", 0x60d0fc, 0x10
 
-gUnknown_0860D10C: ; 860D10C
+gUnknown_0860D10C: @ 860D10C
 	.incbin "base_emerald.gba", 0x60d10c, 0x40
 
-gUnknown_0860D14C: ; 860D14C
+gUnknown_0860D14C: @ 860D14C
 	.incbin "base_emerald.gba", 0x60d14c, 0x10
 
-gUnknown_0860D15C: ; 860D15C
+gUnknown_0860D15C: @ 860D15C
 	.incbin "base_emerald.gba", 0x60d15c, 0x40
 
-gUnknown_0860D19C: ; 860D19C
+gUnknown_0860D19C: @ 860D19C
 	.incbin "base_emerald.gba", 0x60d19c, 0x4
 
-gUnknown_0860D1A0: ; 860D1A0
+gUnknown_0860D1A0: @ 860D1A0
 	.incbin "base_emerald.gba", 0x60d1a0, 0x20
 
-gUnknown_0860D1C0: ; 860D1C0
+gUnknown_0860D1C0: @ 860D1C0
 	.incbin "base_emerald.gba", 0x60d1c0, 0x10
 
-gUnknown_0860D1D0: ; 860D1D0
+gUnknown_0860D1D0: @ 860D1D0
 	.incbin "base_emerald.gba", 0x60d1d0, 0x44
 
-gUnknown_0860D214: ; 860D214
+gUnknown_0860D214: @ 860D214
 	.incbin "base_emerald.gba", 0x60d214, 0x80
 
-gUnknown_0860D294: ; 860D294
+gUnknown_0860D294: @ 860D294
 	.incbin "base_emerald.gba", 0x60d294, 0xac
 
-gUnknown_0860D340: ; 860D340
+gUnknown_0860D340: @ 860D340
 	.incbin "base_emerald.gba", 0x60d340, 0x3
 
-gUnknown_0860D343: ; 860D343
+gUnknown_0860D343: @ 860D343
 	.incbin "base_emerald.gba", 0x60d343, 0x3
 
-gUnknown_0860D346: ; 860D346
+gUnknown_0860D346: @ 860D346
 	.incbin "base_emerald.gba", 0x60d346, 0x3
 
-gUnknown_0860D349: ; 860D349
+gUnknown_0860D349: @ 860D349
 	.incbin "base_emerald.gba", 0x60d349, 0x7
 
-gUnknown_0860D350: ; 860D350
+gUnknown_0860D350: @ 860D350
 	.incbin "base_emerald.gba", 0x60d350, 0x3c
 
-gUnknown_0860D38C: ; 860D38C
+gUnknown_0860D38C: @ 860D38C
 	.incbin "base_emerald.gba", 0x60d38c, 0x1c
 
-gUnknown_0860D3A8: ; 860D3A8
+gUnknown_0860D3A8: @ 860D3A8
 	.incbin "base_emerald.gba", 0x60d3a8, 0x3
 
-gUnknown_0860D3AB: ; 860D3AB
+gUnknown_0860D3AB: @ 860D3AB
 	.incbin "base_emerald.gba", 0x60d3ab, 0x3
 
-gUnknown_0860D3AE: ; 860D3AE
+gUnknown_0860D3AE: @ 860D3AE
 	.incbin "base_emerald.gba", 0x60d3ae, 0x3
 
-gUnknown_0860D3B1: ; 860D3B1
+gUnknown_0860D3B1: @ 860D3B1
 	.incbin "base_emerald.gba", 0x60d3b1, 0x3
 
-gUnknown_0860D3B4: ; 860D3B4
+gUnknown_0860D3B4: @ 860D3B4
 	.incbin "base_emerald.gba", 0x60d3b4, 0x10
 
-gUnknown_0860D3C4: ; 860D3C4
+gUnknown_0860D3C4: @ 860D3C4
 	.incbin "base_emerald.gba", 0x60d3c4, 0x2
 
-gUnknown_0860D3C6: ; 860D3C6
+gUnknown_0860D3C6: @ 860D3C6
 	.incbin "base_emerald.gba", 0x60d3c6, 0x2b
 
-gUnknown_0860D3F1: ; 860D3F1
+gUnknown_0860D3F1: @ 860D3F1
 	.incbin "base_emerald.gba", 0x60d3f1, 0x1
 
-gUnknown_0860D3F2: ; 860D3F2
+gUnknown_0860D3F2: @ 860D3F2
 	.incbin "base_emerald.gba", 0x60d3f2, 0x1f
 
-gUnknown_0860D411: ; 860D411
+gUnknown_0860D411: @ 860D411
 	.incbin "base_emerald.gba", 0x60d411, 0x8ff
 
-gUnknown_0860DD10: ; 860DD10
+gUnknown_0860DD10: @ 860DD10
 	.incbin "base_emerald.gba", 0x60dd10, 0x100
 
-gUnknown_0860DE10: ; 860DE10
+gUnknown_0860DE10: @ 860DE10
 	.incbin "base_emerald.gba", 0x60de10, 0x40
 
-gUnknown_0860DE50: ; 860DE50
+gUnknown_0860DE50: @ 860DE50
 	.incbin "base_emerald.gba", 0x60de50, 0x28
 
-gUnknown_0860DE78: ; 860DE78
+gUnknown_0860DE78: @ 860DE78
 	.incbin "base_emerald.gba", 0x60de78, 0xc
 
-gUnknown_0860DE84: ; 860DE84
+gUnknown_0860DE84: @ 860DE84
 	.incbin "base_emerald.gba", 0x60de84, 0x14
 
-gUnknown_0860DE98: ; 860DE98
+gUnknown_0860DE98: @ 860DE98
 	.incbin "base_emerald.gba", 0x60de98, 0x10
 
-gUnknown_0860DEA8: ; 860DEA8
+gUnknown_0860DEA8: @ 860DEA8
 	.incbin "base_emerald.gba", 0x60dea8, 0x10
 
-gUnknown_0860DEB8: ; 860DEB8
+gUnknown_0860DEB8: @ 860DEB8
 	.incbin "base_emerald.gba", 0x60deb8, 0xb68
 
-gUnknown_0860EA20: ; 860EA20
+gUnknown_0860EA20: @ 860EA20
 	.incbin "base_emerald.gba", 0x60ea20, 0xc
 
-gUnknown_0860EA2C: ; 860EA2C
+gUnknown_0860EA2C: @ 860EA2C
 	.incbin "base_emerald.gba", 0x60ea2c, 0x8
 
-gUnknown_0860EA34: ; 860EA34
+gUnknown_0860EA34: @ 860EA34
 	.incbin "base_emerald.gba", 0x60ea34, 0x18
 
-gUnknown_0860EA4C: ; 860EA4C
+gUnknown_0860EA4C: @ 860EA4C
 	.incbin "base_emerald.gba", 0x60ea4c, 0x20
 
-gUnknown_0860EA6C: ; 860EA6C
+gUnknown_0860EA6C: @ 860EA6C
 	.incbin "base_emerald.gba", 0x60ea6c, 0x100
 
-gUnknown_0860EB6C: ; 860EB6C
+gUnknown_0860EB6C: @ 860EB6C
 	.incbin "base_emerald.gba", 0x60eb6c, 0x20
 
-gUnknown_0860EB8C: ; 860EB8C
+gUnknown_0860EB8C: @ 860EB8C
 	.incbin "base_emerald.gba", 0x60eb8c, 0x3e4
 
-gUnknown_0860EF70: ; 860EF70
+gUnknown_0860EF70: @ 860EF70
 	.incbin "base_emerald.gba", 0x60ef70, 0x8
 
-gUnknown_0860EF78: ; 860EF78
+gUnknown_0860EF78: @ 860EF78
 	.incbin "base_emerald.gba", 0x60ef78, 0x20
 
-gUnknown_0860EF98: ; 860EF98
+gUnknown_0860EF98: @ 860EF98
 	.incbin "base_emerald.gba", 0x60ef98, 0x8
 
-gUnknown_0860EFA0: ; 860EFA0
+gUnknown_0860EFA0: @ 860EFA0
 	.incbin "base_emerald.gba", 0x60efa0, 0xc
 
-gUnknown_0860EFAC: ; 860EFAC
+gUnknown_0860EFAC: @ 860EFAC
 	.incbin "base_emerald.gba", 0x60efac, 0x18
 
-gUnknown_0860EFC4: ; 860EFC4
+gUnknown_0860EFC4: @ 860EFC4
 	.incbin "base_emerald.gba", 0x60efc4, 0x30
 
-gUnknown_0860EFF4: ; 860EFF4
+gUnknown_0860EFF4: @ 860EFF4
 	.incbin "base_emerald.gba", 0x60eff4, 0x1c
 
-gUnknown_0860F010: ; 860F010
+gUnknown_0860F010: @ 860F010
 	.incbin "base_emerald.gba", 0x60f010, 0x10
 
-gUnknown_0860F020: ; 860F020
+gUnknown_0860F020: @ 860F020
 	.incbin "base_emerald.gba", 0x60f020, 0x54
 
-gUnknown_0860F074: ; 860F074
+gUnknown_0860F074: @ 860F074
 	.incbin "base_emerald.gba", 0x60f074, 0x20
 
-gUnknown_0860F094: ; 860F094
+gUnknown_0860F094: @ 860F094
 	.incbin "base_emerald.gba", 0x60f094, 0x4
 
-gUnknown_0860F098: ; 860F098
+gUnknown_0860F098: @ 860F098
 	.incbin "base_emerald.gba", 0x60f098, 0x10
 
-gUnknown_0860F0A8: ; 860F0A8
+gUnknown_0860F0A8: @ 860F0A8
 	.incbin "base_emerald.gba", 0x60f0a8, 0x8
 
-gUnknown_0860F0B0: ; 860F0B0
+gUnknown_0860F0B0: @ 860F0B0
 	.incbin "base_emerald.gba", 0x60f0b0, 0x20
 
-gUnknown_0860F0D0: ; 860F0D0
+gUnknown_0860F0D0: @ 860F0D0
 	.incbin "base_emerald.gba", 0x60f0d0, 0x4
 
-gUnknown_0860F0D4: ; 860F0D4
+gUnknown_0860F0D4: @ 860F0D4
 	.incbin "base_emerald.gba", 0x60f0d4, 0x68
 
-gUnknown_0860F13C: ; 860F13C
+gUnknown_0860F13C: @ 860F13C
 	.incbin "base_emerald.gba", 0x60f13c, 0x1100
 
-gUnknown_0861023C: ; 861023C
+gUnknown_0861023C: @ 861023C
 	.incbin "base_emerald.gba", 0x61023c, 0x100
 
-gUnknown_0861033C: ; 861033C
+gUnknown_0861033C: @ 861033C
 	.incbin "base_emerald.gba", 0x61033c, 0x60
 
-gUnknown_0861039C: ; 861039C
+gUnknown_0861039C: @ 861039C
 	.incbin "base_emerald.gba", 0x61039c, 0x20
 
-gUnknown_086103BC: ; 86103BC
+gUnknown_086103BC: @ 86103BC
 	.incbin "base_emerald.gba", 0x6103bc, 0x28
 
-gUnknown_086103E4: ; 86103E4
+gUnknown_086103E4: @ 86103E4
 	.incbin "base_emerald.gba", 0x6103e4, 0x10
 
-gUnknown_086103F4: ; 86103F4
+gUnknown_086103F4: @ 86103F4
 	.incbin "base_emerald.gba", 0x6103f4, 0x28
 
-gUnknown_0861041C: ; 861041C
+gUnknown_0861041C: @ 861041C
 	.incbin "base_emerald.gba", 0x61041c, 0xc
 
-gUnknown_08610428: ; 8610428
+gUnknown_08610428: @ 8610428
 	.incbin "base_emerald.gba", 0x610428, 0xc
 
-gUnknown_08610434: ; 8610434
+gUnknown_08610434: @ 8610434
 	.incbin "base_emerald.gba", 0x610434, 0x38
 
-gUnknown_0861046C: ; 861046C
+gUnknown_0861046C: @ 861046C
 	.incbin "base_emerald.gba", 0x61046c, 0xa
 
-gUnknown_08610476: ; 8610476
+gUnknown_08610476: @ 8610476
 	.incbin "base_emerald.gba", 0x610476, 0x3
 
-gUnknown_08610479: ; 8610479
+gUnknown_08610479: @ 8610479
 	.incbin "base_emerald.gba", 0x610479, 0x15f
 
-gUnknown_086105D8: ; 86105D8
+gUnknown_086105D8: @ 86105D8
 	.incbin "base_emerald.gba", 0x6105d8, 0x18
 
-gUnknown_086105F0: ; 86105F0
+gUnknown_086105F0: @ 86105F0
 	.incbin "base_emerald.gba", 0x6105f0, 0x18
 
-gUnknown_08610608: ; 8610608
+gUnknown_08610608: @ 8610608
 	.incbin "base_emerald.gba", 0x610608, 0x18
 
-gUnknown_08610620: ; 8610620
+gUnknown_08610620: @ 8610620
 	.incbin "base_emerald.gba", 0x610620, 0x18
 
-gUnknown_08610638: ; 8610638
+gUnknown_08610638: @ 8610638
 	.incbin "base_emerald.gba", 0x610638, 0x18
 
-gUnknown_08610650: ; 8610650
+gUnknown_08610650: @ 8610650
 	.incbin "base_emerald.gba", 0x610650, 0x50
 
-gUnknown_086106A0: ; 86106A0
+gUnknown_086106A0: @ 86106A0
 	.incbin "base_emerald.gba", 0x6106a0, 0x10
 
-gUnknown_086106B0: ; 86106B0
+gUnknown_086106B0: @ 86106B0
 	.incbin "base_emerald.gba", 0x6106b0, 0x184
 
-gUnknown_08610834: ; 8610834
+gUnknown_08610834: @ 8610834
 	.incbin "base_emerald.gba", 0x610834, 0x18
 
-gUnknown_0861084C: ; 861084C
+gUnknown_0861084C: @ 861084C
 	.incbin "base_emerald.gba", 0x61084c, 0x18
 
-gUnknown_08610864: ; 8610864
+gUnknown_08610864: @ 8610864
 	.incbin "base_emerald.gba", 0x610864, 0x18
 
-gUnknown_0861087C: ; 861087C
+gUnknown_0861087C: @ 861087C
 	.incbin "base_emerald.gba", 0x61087c, 0x18
 
-gUnknown_08610894: ; 8610894
+gUnknown_08610894: @ 8610894
 	.incbin "base_emerald.gba", 0x610894, 0x18
 
-gUnknown_086108AC: ; 86108AC
+gUnknown_086108AC: @ 86108AC
 	.incbin "base_emerald.gba", 0x6108ac, 0xc
 
-gUnknown_086108B8: ; 86108B8
+gUnknown_086108B8: @ 86108B8
 	.incbin "base_emerald.gba", 0x6108b8, 0x10
 
-gUnknown_086108C8: ; 86108C8
+gUnknown_086108C8: @ 86108C8
 	.incbin "base_emerald.gba", 0x6108c8, 0x50
 
-gUnknown_08610918: ; 8610918
+gUnknown_08610918: @ 8610918
 	.incbin "base_emerald.gba", 0x610918, 0xa
 
-gUnknown_08610922: ; 8610922
+gUnknown_08610922: @ 8610922
 	.incbin "base_emerald.gba", 0x610922, 0x3
 
-gUnknown_08610925: ; 8610925
+gUnknown_08610925: @ 8610925
 	.incbin "base_emerald.gba", 0x610925, 0x3
 
-gUnknown_08610928: ; 8610928
+gUnknown_08610928: @ 8610928
 	.incbin "base_emerald.gba", 0x610928, 0x20
 
-gUnknown_08610948: ; 8610948
+gUnknown_08610948: @ 8610948
 	.incbin "base_emerald.gba", 0x610948, 0x28
 
-gUnknown_08610970: ; 8610970
+gUnknown_08610970: @ 8610970
 	.incbin "base_emerald.gba", 0x610970, 0x34
 
-gUnknown_086109A4: ; 86109A4
+gUnknown_086109A4: @ 86109A4
 	.incbin "base_emerald.gba", 0x6109a4, 0x16
 
-gUnknown_086109BA: ; 86109BA
+gUnknown_086109BA: @ 86109BA
 	.incbin "base_emerald.gba", 0x6109ba, 0x536
 
-gUnknown_08610EF0: ; 8610EF0
+gUnknown_08610EF0: @ 8610EF0
 	.incbin "base_emerald.gba", 0x610ef0, 0x100
 
-gUnknown_08610FF0: ; 8610FF0
+gUnknown_08610FF0: @ 8610FF0
 	.incbin "base_emerald.gba", 0x610ff0, 0x80
 
-gUnknown_08611070: ; 8611070
+gUnknown_08611070: @ 8611070
 	.incbin "base_emerald.gba", 0x611070, 0x140
 
-gUnknown_086111B0: ; 86111B0
+gUnknown_086111B0: @ 86111B0
 	.incbin "base_emerald.gba", 0x6111b0, 0x80
 
-gUnknown_08611230: ; 8611230
+gUnknown_08611230: @ 8611230
 	.incbin "base_emerald.gba", 0x611230, 0x80
 
-gUnknown_086112B0: ; 86112B0
+gUnknown_086112B0: @ 86112B0
 	.incbin "base_emerald.gba", 0x6112b0, 0x80
 
-gUnknown_08611330: ; 8611330
+gUnknown_08611330: @ 8611330
 	.incbin "base_emerald.gba", 0x611330, 0x40
 
-gUnknown_08611370: ; 8611370
+gUnknown_08611370: @ 8611370
 	.incbin "base_emerald.gba", 0x611370, 0x163
 
-gUnknown_086114D3: ; 86114D3
+gUnknown_086114D3: @ 86114D3
 	.incbin "base_emerald.gba", 0x6114d3, 0xd
 
-gUnknown_086114E0: ; 86114E0
+gUnknown_086114E0: @ 86114E0
 	.incbin "base_emerald.gba", 0x6114e0, 0x68
 
-gUnknown_08611548: ; 8611548
+gUnknown_08611548: @ 8611548
 	.incbin "base_emerald.gba", 0x611548, 0x8
 
-gUnknown_08611550: ; 8611550
+gUnknown_08611550: @ 8611550
 	.incbin "base_emerald.gba", 0x611550, 0x1c
 
-gUnknown_0861156C: ; 861156C
+gUnknown_0861156C: @ 861156C
 	.incbin "base_emerald.gba", 0x61156c, 0xc
 
-gUnknown_08611578: ; 8611578
+gUnknown_08611578: @ 8611578
 	.incbin "base_emerald.gba", 0x611578, 0x33c
 
-gUnknown_086118B4: ; 86118B4
+gUnknown_086118B4: @ 86118B4
 	.incbin "base_emerald.gba", 0x6118b4, 0x348
 
-gUnknown_08611BFC: ; 8611BFC
+gUnknown_08611BFC: @ 8611BFC
 	.incbin "base_emerald.gba", 0x611bfc, 0x1c
 
-gUnknown_08611C18: ; 8611C18
+gUnknown_08611C18: @ 8611C18
 	.incbin "base_emerald.gba", 0x611c18, 0x5c
 
-gUnknown_08611C74: ; 8611C74
+gUnknown_08611C74: @ 8611C74
 	.incbin "base_emerald.gba", 0x611c74, 0x8
 
-gUnknown_08611C7C: ; 8611C7C
+gUnknown_08611C7C: @ 8611C7C
 	.incbin "base_emerald.gba", 0x611c7c, 0x8
 
-gUnknown_08611C84: ; 8611C84
+gUnknown_08611C84: @ 8611C84
 	.incbin "base_emerald.gba", 0x611c84, 0x8
 
-gUnknown_08611C8C: ; 8611C8C
+gUnknown_08611C8C: @ 8611C8C
 	.incbin "base_emerald.gba", 0x611c8c, 0xe
 
-gUnknown_08611C9A: ; 8611C9A
+gUnknown_08611C9A: @ 8611C9A
 	.incbin "base_emerald.gba", 0x611c9a, 0x16
 
-gUnknown_08611CB0: ; 8611CB0
+gUnknown_08611CB0: @ 8611CB0
 	.incbin "base_emerald.gba", 0x611cb0, 0x50
 
-gUnknown_08611D00: ; 8611D00
+gUnknown_08611D00: @ 8611D00
 	.incbin "base_emerald.gba", 0x611d00, 0x8
 
-gUnknown_08611D08: ; 8611D08
+gUnknown_08611D08: @ 8611D08
 	.incbin "base_emerald.gba", 0x611d08, 0x28
 
-gUnknown_08611D30: ; 8611D30
+gUnknown_08611D30: @ 8611D30
 	.incbin "base_emerald.gba", 0x611d30, 0x80
 
-gUnknown_08611DB0: ; 8611DB0
+gUnknown_08611DB0: @ 8611DB0
 	.incbin "base_emerald.gba", 0x611db0, 0x8
 
-gUnknown_08611DB8: ; 8611DB8
+gUnknown_08611DB8: @ 8611DB8
 	.incbin "base_emerald.gba", 0x611db8, 0x8
 
-; 8611DC0
+@ 8611DC0
 	.include "data/battle_frontier/battle_arena_move_mind_ratings.s"
 
 	.align 2, 0
 
-; 8611F24
+@ 8611F24
 	.incbin "base_emerald.gba", 0x611f24, 0x38
 
-gUnknown_08611F5C: ; 8611F5C
+gUnknown_08611F5C: @ 8611F5C
 	.incbin "base_emerald.gba", 0x611f5c, 0x18
 
-gUnknown_08611F74: ; 8611F74
+gUnknown_08611F74: @ 8611F74
 	.incbin "base_emerald.gba", 0x611f74, 0x10
 
-gUnknown_08611F84: ; 8611F84
+gUnknown_08611F84: @ 8611F84
 	.incbin "base_emerald.gba", 0x611f84, 0x1c
 
-gUnknown_08611FA0: ; 8611FA0
+gUnknown_08611FA0: @ 8611FA0
 	.incbin "base_emerald.gba", 0x611fa0, 0xc
 
-gUnknown_08611FAC: ; 8611FAC
+gUnknown_08611FAC: @ 8611FAC
 	.incbin "base_emerald.gba", 0x611fac, 0x14
 
-; 8611FC0
+@ 8611FC0
 	.include "data/battle_frontier/battle_factory_style_move_lists.s"
 
-gUnknown_08612120: ; 8612120
+gUnknown_08612120: @ 8612120
 	.incbin "base_emerald.gba", 0x612120, 0x44
 
-gUnknown_08612164: ; 8612164
+gUnknown_08612164: @ 8612164
 	.incbin "base_emerald.gba", 0x612164, 0x10
 
-gUnknown_08612174: ; 8612174
+gUnknown_08612174: @ 8612174
 	.incbin "base_emerald.gba", 0x612174, 0x10
 
-gUnknown_08612184: ; 8612184
+gUnknown_08612184: @ 8612184
 	.incbin "base_emerald.gba", 0x612184, 0x10
 
-gUnknown_08612194: ; 8612194
+gUnknown_08612194: @ 8612194
 	.incbin "base_emerald.gba", 0x612194, 0x180
 
-gUnknown_08612314: ; 8612314
+gUnknown_08612314: @ 8612314
 	.incbin "base_emerald.gba", 0x612314, 0x8
 
-gUnknown_0861231C: ; 861231C
+gUnknown_0861231C: @ 861231C
 	.incbin "base_emerald.gba", 0x61231c, 0xc8
 
-gUnknown_086123E4: ; 86123E4
+gUnknown_086123E4: @ 86123E4
 	.incbin "base_emerald.gba", 0x6123e4, 0x1f8
 
-gUnknown_086125DC: ; 86125DC
+gUnknown_086125DC: @ 86125DC
 	.incbin "base_emerald.gba", 0x6125dc, 0x1c
 
-gUnknown_086125F8: ; 86125F8
+gUnknown_086125F8: @ 86125F8
 	.incbin "base_emerald.gba", 0x6125f8, 0x74
 
-gUnknown_0861266C: ; 861266C
+gUnknown_0861266C: @ 861266C
 	.incbin "base_emerald.gba", 0x61266c, 0x9
 
-gUnknown_08612675: ; 8612675
+gUnknown_08612675: @ 8612675
 	.incbin "base_emerald.gba", 0x612675, 0x13
 
-gUnknown_08612688: ; 8612688
+gUnknown_08612688: @ 8612688
 	.incbin "base_emerald.gba", 0x612688, 0x8
 
-gUnknown_08612690: ; 8612690
+gUnknown_08612690: @ 8612690
 	.incbin "base_emerald.gba", 0x612690, 0x8
 
-gUnknown_08612698: ; 8612698
+gUnknown_08612698: @ 8612698
 	.incbin "base_emerald.gba", 0x612698, 0x4
 
-gUnknown_0861269C: ; 861269C
+gUnknown_0861269C: @ 861269C
 	.incbin "base_emerald.gba", 0x61269c, 0x4
 
-gUnknown_086126A0: ; 86126A0
+gUnknown_086126A0: @ 86126A0
 	.incbin "base_emerald.gba", 0x6126a0, 0x4
 
-gUnknown_086126A4: ; 86126A4
+gUnknown_086126A4: @ 86126A4
 	.incbin "base_emerald.gba", 0x6126a4, 0x4
 
-gUnknown_086126A8: ; 86126A8
+gUnknown_086126A8: @ 86126A8
 	.incbin "base_emerald.gba", 0x6126a8, 0x2
 
-gUnknown_086126AA: ; 86126AA
+gUnknown_086126AA: @ 86126AA
 	.incbin "base_emerald.gba", 0x6126aa, 0x2
 
-gUnknown_086126AC: ; 86126AC
+gUnknown_086126AC: @ 86126AC
 	.incbin "base_emerald.gba", 0x6126ac, 0x2
 
-gUnknown_086126AE: ; 86126AE
+gUnknown_086126AE: @ 86126AE
 	.incbin "base_emerald.gba", 0x6126ae, 0x2
 
-; 86126B0
+@ 86126B0
 	.include "data/battle_frontier/battle_pyramid_level_50_wild_mons.s"
 
-; 8612E80
+@ 8612E80
 	.include "data/battle_frontier/battle_pyramid_open_level_wild_mons.s"
 
-gUnknown_08613650: ; 8613650
+gUnknown_08613650: @ 8613650
 	.incbin "base_emerald.gba", 0x613650, 0x5
 
-gUnknown_08613655: ; 8613655
+gUnknown_08613655: @ 8613655
 	.incbin "base_emerald.gba", 0x613655, 0xfb
 
-gUnknown_08613750: ; 8613750
+gUnknown_08613750: @ 8613750
 	.incbin "base_emerald.gba", 0x613750, 0x44
 
-gUnknown_08613794: ; 8613794
+gUnknown_08613794: @ 8613794
 	.incbin "base_emerald.gba", 0x613794, 0x8
 
-gUnknown_0861379C: ; 861379C
+gUnknown_0861379C: @ 861379C
 	.incbin "base_emerald.gba", 0x61379c, 0x190
 
-gUnknown_0861392C: ; 861392C
+gUnknown_0861392C: @ 861392C
 	.incbin "base_emerald.gba", 0x61392c, 0x190
 
-gUnknown_08613ABC: ; 8613ABC
+gUnknown_08613ABC: @ 8613ABC
 	.incbin "base_emerald.gba", 0x613abc, 0x7e
 
-gUnknown_08613B3A: ; 8613B3A
+gUnknown_08613B3A: @ 8613B3A
 	.incbin "base_emerald.gba", 0x613b3a, 0xa
 
-gUnknown_08613B44: ; 8613B44
+gUnknown_08613B44: @ 8613B44
 	.incbin "base_emerald.gba", 0x613b44, 0xd8
 
-gUnknown_08613C1C: ; 8613C1C
+gUnknown_08613C1C: @ 8613C1C
 	.incbin "base_emerald.gba", 0x613c1c, 0x2a4
 
-gUnknown_08613EC0: ; 8613EC0
+gUnknown_08613EC0: @ 8613EC0
 	.incbin "base_emerald.gba", 0x613ec0, 0x18
 
-gUnknown_08613ED8: ; 8613ED8
+gUnknown_08613ED8: @ 8613ED8
 	.incbin "base_emerald.gba", 0x613ed8, 0x8
 
-gUnknown_08613EE0: ; 8613EE0
+gUnknown_08613EE0: @ 8613EE0
 	.incbin "base_emerald.gba", 0x613ee0, 0x48
 
-gUnknown_08613F28: ; 8613F28
+gUnknown_08613F28: @ 8613F28
 	.incbin "base_emerald.gba", 0x613f28, 0xc
 
-gUnknown_08613F34: ; 8613F34
+gUnknown_08613F34: @ 8613F34
 	.incbin "base_emerald.gba", 0x613f34, 0x12
 
-gUnknown_08613F46: ; 8613F46
+gUnknown_08613F46: @ 8613F46
 	.incbin "base_emerald.gba", 0x613f46, 0x40
 
-gUnknown_08613F86: ; 8613F86
+gUnknown_08613F86: @ 8613F86
 	.incbin "base_emerald.gba", 0x613f86, 0xa
 
-gUnknown_08613F90: ; 8613F90
+gUnknown_08613F90: @ 8613F90
 	.incbin "base_emerald.gba", 0x613f90, 0xc
 
-gUnknown_08613F9C: ; 8613F9C
+gUnknown_08613F9C: @ 8613F9C
 	.incbin "base_emerald.gba", 0x613f9c, 0x18
 
-gUnknown_08613FB4: ; 8613FB4
+gUnknown_08613FB4: @ 8613FB4
 	.incbin "base_emerald.gba", 0x613fb4, 0x78
 
-gUnknown_0861402C: ; 861402C
+gUnknown_0861402C: @ 861402C
 	.incbin "base_emerald.gba", 0x61402c, 0x4
 
-gUnknown_08614030: ; 8614030
+gUnknown_08614030: @ 8614030
 	.incbin "base_emerald.gba", 0x614030, 0x4
 
-gUnknown_08614034: ; 8614034
+gUnknown_08614034: @ 8614034
 	.incbin "base_emerald.gba", 0x614034, 0x4
 
-gUnknown_08614038: ; 8614038
+gUnknown_08614038: @ 8614038
 	.incbin "base_emerald.gba", 0x614038, 0x4
 
-gUnknown_0861403C: ; 861403C
+gUnknown_0861403C: @ 861403C
 	.incbin "base_emerald.gba", 0x61403c, 0x6
 
-gUnknown_08614042: ; 8614042
+gUnknown_08614042: @ 8614042
 	.incbin "base_emerald.gba", 0x614042, 0x2
 
-gUnknown_08614044: ; 8614044
+gUnknown_08614044: @ 8614044
 	.incbin "base_emerald.gba", 0x614044, 0x2
 
-gUnknown_08614046: ; 8614046
+gUnknown_08614046: @ 8614046
 	.incbin "base_emerald.gba", 0x614046, 0x1
 
-gUnknown_08614047: ; 8614047
+gUnknown_08614047: @ 8614047
 	.incbin "base_emerald.gba", 0x614047, 0x4
 
-gUnknown_0861404B: ; 861404B
+gUnknown_0861404B: @ 861404B
 	.incbin "base_emerald.gba", 0x61404b, 0x2
 
-gUnknown_0861404D: ; 861404D
+gUnknown_0861404D: @ 861404D
 	.incbin "base_emerald.gba", 0x61404d, 0x2
 
-gUnknown_0861404F: ; 861404F
+gUnknown_0861404F: @ 861404F
 	.incbin "base_emerald.gba", 0x61404f, 0x5
 
-gUnknown_08614054: ; 8614054
+gUnknown_08614054: @ 8614054
 	.incbin "base_emerald.gba", 0x614054, 0x30
 
-gUnknown_08614084: ; 8614084
+gUnknown_08614084: @ 8614084
 	.incbin "base_emerald.gba", 0x614084, 0x8
 
-gUnknown_0861408C: ; 861408C
+gUnknown_0861408C: @ 861408C
 	.incbin "base_emerald.gba", 0x61408c, 0x8
 
-gUnknown_08614094: ; 8614094
+gUnknown_08614094: @ 8614094
 	.incbin "base_emerald.gba", 0x614094, 0x10
 
-gUnknown_086140A4: ; 86140A4
+gUnknown_086140A4: @ 86140A4
 	.incbin "base_emerald.gba", 0x6140a4, 0xc0
 
-gUnknown_08614164: ; 8614164
+gUnknown_08614164: @ 8614164
 	.incbin "base_emerald.gba", 0x614164, 0x10
 
-gUnknown_08614174: ; 8614174
+gUnknown_08614174: @ 8614174
 	.incbin "base_emerald.gba", 0x614174, 0x38
 
-gUnknown_086141AC: ; 86141AC
+gUnknown_086141AC: @ 86141AC
 	.incbin "base_emerald.gba", 0x6141ac, 0x50
 
-gUnknown_086141FC: ; 86141FC
+gUnknown_086141FC: @ 86141FC
 	.incbin "base_emerald.gba", 0x6141fc, 0x48
 
-gUnknown_08614244: ; 8614244
+gUnknown_08614244: @ 8614244
 	.incbin "base_emerald.gba", 0x614244, 0x18
 
-gUnknown_0861425C: ; 861425C
+gUnknown_0861425C: @ 861425C
 	.incbin "base_emerald.gba", 0x61425c, 0x4
 
-gUnknown_08614260: ; 8614260
+gUnknown_08614260: @ 8614260
 	.incbin "base_emerald.gba", 0x614260, 0x4
 
-gUnknown_08614264: ; 8614264
+gUnknown_08614264: @ 8614264
 	.incbin "base_emerald.gba", 0x614264, 0x4
 
-gUnknown_08614268: ; 8614268
+gUnknown_08614268: @ 8614268
 	.incbin "base_emerald.gba", 0x614268, 0x4
 
-gUnknown_0861426C: ; 861426C
+gUnknown_0861426C: @ 861426C
 	.incbin "base_emerald.gba", 0x61426c, 0x4
 
-gUnknown_08614270: ; 8614270
+gUnknown_08614270: @ 8614270
 	.incbin "base_emerald.gba", 0x614270, 0x4
 
-gUnknown_08614274: ; 8614274
+gUnknown_08614274: @ 8614274
 	.incbin "base_emerald.gba", 0x614274, 0x4
 
-gUnknown_08614278: ; 8614278
+gUnknown_08614278: @ 8614278
 	.incbin "base_emerald.gba", 0x614278, 0x18
 
-gUnknown_08614290: ; 8614290
+gUnknown_08614290: @ 8614290
 	.incbin "base_emerald.gba", 0x614290, 0x18
 
-gUnknown_086142A8: ; 86142A8
+gUnknown_086142A8: @ 86142A8
 	.incbin "base_emerald.gba", 0x6142a8, 0x20
 
-gUnknown_086142C8: ; 86142C8
+gUnknown_086142C8: @ 86142C8
 	.incbin "base_emerald.gba", 0x6142c8, 0x70
 
-gUnknown_08614338: ; 8614338
+gUnknown_08614338: @ 8614338
 	.incbin "base_emerald.gba", 0x614338, 0x40
 
-gUnknown_08614378: ; 8614378
+gUnknown_08614378: @ 8614378
 	.incbin "base_emerald.gba", 0x614378, 0x44
 
-gUnknown_086143BC: ; 86143BC
+gUnknown_086143BC: @ 86143BC
 	.incbin "base_emerald.gba", 0x6143bc, 0x4e
 
-gUnknown_0861440A: ; 861440A
+gUnknown_0861440A: @ 861440A
 	.incbin "base_emerald.gba", 0x61440a, 0x4
 
-gUnknown_0861440E: ; 861440E
+gUnknown_0861440E: @ 861440E
 	.incbin "base_emerald.gba", 0x61440e, 0x2
 
-; 8614410
+@ 8614410
 	.include "data/graphics/items/item_icon_table.s"
 
-; 8614FE0
+@ 8614FE0
 	.incbin "base_emerald.gba", 0x614fe0, 0x14
 
-gUnknown_08614FF4: ; 8614FF4
+gUnknown_08614FF4: @ 8614FF4
 	.incbin "base_emerald.gba", 0x614ff4, 0x18
 
-gUnknown_0861500C: ; 861500C
+gUnknown_0861500C: @ 861500C
 	.incbin "base_emerald.gba", 0x61500c, 0x3c
 
-gUnknown_08615048: ; 8615048
+gUnknown_08615048: @ 8615048
 	.incbin "base_emerald.gba", 0x615048, 0x670
 
-gUnknown_086156B8: ; 86156B8
+gUnknown_086156B8: @ 86156B8
 	.incbin "base_emerald.gba", 0x6156b8, 0x2c
 
-gUnknown_086156E4: ; 86156E4
+gUnknown_086156E4: @ 86156E4
 	.incbin "base_emerald.gba", 0x6156e4, 0x20
 
-gUnknown_08615704: ; 8615704
+gUnknown_08615704: @ 8615704
 	.incbin "base_emerald.gba", 0x615704, 0xc0
 
-gUnknown_086157C4: ; 86157C4
+gUnknown_086157C4: @ 86157C4
 	.incbin "base_emerald.gba", 0x6157c4, 0x1c
 
-gUnknown_086157E0: ; 86157E0
+gUnknown_086157E0: @ 86157E0
 	.incbin "base_emerald.gba", 0x6157e0, 0x1c
 
-gUnknown_086157FC: ; 86157FC
+gUnknown_086157FC: @ 86157FC
 	.incbin "base_emerald.gba", 0x6157fc, 0x14
 
-gUnknown_08615810: ; 8615810
+gUnknown_08615810: @ 8615810
 	.incbin "base_emerald.gba", 0x615810, 0x40
 
-gUnknown_08615850: ; 8615850
+gUnknown_08615850: @ 8615850
 	.incbin "base_emerald.gba", 0x615850, 0x40
 
-gUnknown_08615890: ; 8615890
+gUnknown_08615890: @ 8615890
 	.incbin "base_emerald.gba", 0x615890, 0x40
 
-gUnknown_086158D0: ; 86158D0
+gUnknown_086158D0: @ 86158D0
 	.incbin "base_emerald.gba", 0x6158d0, 0x38
 
-gUnknown_08615908: ; 8615908
+gUnknown_08615908: @ 8615908
 	.incbin "base_emerald.gba", 0x615908, 0x8
 
-gUnknown_08615910: ; 8615910
+gUnknown_08615910: @ 8615910
 	.incbin "base_emerald.gba", 0x615910, 0x8
 
-gUnknown_08615918: ; 8615918
+gUnknown_08615918: @ 8615918
 	.incbin "base_emerald.gba", 0x615918, 0x8
 
-gUnknown_08615920: ; 8615920
+gUnknown_08615920: @ 8615920
 	.incbin "base_emerald.gba", 0x615920, 0x8
 
-gUnknown_08615928: ; 8615928
+gUnknown_08615928: @ 8615928
 	.incbin "base_emerald.gba", 0x615928, 0x8
 
-gUnknown_08615930: ; 8615930
+gUnknown_08615930: @ 8615930
 	.incbin "base_emerald.gba", 0x615930, 0x8
 
-gUnknown_08615938: ; 8615938
+gUnknown_08615938: @ 8615938
 	.incbin "base_emerald.gba", 0x615938, 0x8
 
-gUnknown_08615940: ; 8615940
+gUnknown_08615940: @ 8615940
 	.incbin "base_emerald.gba", 0x615940, 0x8
 
-gUnknown_08615948: ; 8615948
+gUnknown_08615948: @ 8615948
 	.incbin "base_emerald.gba", 0x615948, 0x8
 
-gUnknown_08615950: ; 8615950
+gUnknown_08615950: @ 8615950
 	.incbin "base_emerald.gba", 0x615950, 0x8
 
-gUnknown_08615958: ; 8615958
+gUnknown_08615958: @ 8615958
 	.incbin "base_emerald.gba", 0x615958, 0x8
 
-gUnknown_08615960: ; 8615960
+gUnknown_08615960: @ 8615960
 	.incbin "base_emerald.gba", 0x615960, 0x8
 
-gUnknown_08615968: ; 8615968
+gUnknown_08615968: @ 8615968
 	.incbin "base_emerald.gba", 0x615968, 0x8
 
-gUnknown_08615970: ; 8615970
+gUnknown_08615970: @ 8615970
 	.incbin "base_emerald.gba", 0x615970, 0x18
 
-gUnknown_08615988: ; 8615988
+gUnknown_08615988: @ 8615988
 	.incbin "base_emerald.gba", 0x615988, 0x46
 
-gUnknown_086159CE: ; 86159CE
+gUnknown_086159CE: @ 86159CE
 	.incbin "base_emerald.gba", 0x6159ce, 0x46
 
-gUnknown_08615A14: ; 8615A14
+gUnknown_08615A14: @ 8615A14
 	.incbin "base_emerald.gba", 0x615a14, 0x36
 
-gUnknown_08615A4A: ; 8615A4A
+gUnknown_08615A4A: @ 8615A4A
 	.incbin "base_emerald.gba", 0x615a4a, 0x36
 
-gUnknown_08615A80: ; 8615A80
+gUnknown_08615A80: @ 8615A80
 	.incbin "base_emerald.gba", 0x615a80, 0x36
 
-gUnknown_08615AB6: ; 8615AB6
+gUnknown_08615AB6: @ 8615AB6
 	.incbin "base_emerald.gba", 0x615ab6, 0x2
 
-gUnknown_08615AB8: ; 8615AB8
+gUnknown_08615AB8: @ 8615AB8
 	.incbin "base_emerald.gba", 0x615ab8, 0x2
 
-gUnknown_08615ABA: ; 8615ABA
+gUnknown_08615ABA: @ 8615ABA
 	.incbin "base_emerald.gba", 0x615aba, 0x3
 
-gUnknown_08615ABD: ; 8615ABD
+gUnknown_08615ABD: @ 8615ABD
 	.incbin "base_emerald.gba", 0x615abd, 0x3
 
-gUnknown_08615AC0: ; 8615AC0
+gUnknown_08615AC0: @ 8615AC0
 	.incbin "base_emerald.gba", 0x615ac0, 0x3
 
-gUnknown_08615AC3: ; 8615AC3
+gUnknown_08615AC3: @ 8615AC3
 	.incbin "base_emerald.gba", 0x615ac3, 0x2
 
-gUnknown_08615AC5: ; 8615AC5
+gUnknown_08615AC5: @ 8615AC5
 	.incbin "base_emerald.gba", 0x615ac5, 0x2
 
-gUnknown_08615AC7: ; 8615AC7
+gUnknown_08615AC7: @ 8615AC7
 	.incbin "base_emerald.gba", 0x615ac7, 0x2
 
-gUnknown_08615AC9: ; 8615AC9
+gUnknown_08615AC9: @ 8615AC9
 	.incbin "base_emerald.gba", 0x615ac9, 0x2
 
-gUnknown_08615ACB: ; 8615ACB
+gUnknown_08615ACB: @ 8615ACB
 	.incbin "base_emerald.gba", 0x615acb, 0x2
 
-gUnknown_08615ACD: ; 8615ACD
+gUnknown_08615ACD: @ 8615ACD
 	.incbin "base_emerald.gba", 0x615acd, 0x3
 
-gUnknown_08615AD0: ; 8615AD0
+gUnknown_08615AD0: @ 8615AD0
 	.incbin "base_emerald.gba", 0x615ad0, 0x3
 
-gUnknown_08615AD3: ; 8615AD3
+gUnknown_08615AD3: @ 8615AD3
 	.incbin "base_emerald.gba", 0x615ad3, 0x3
 
-gUnknown_08615AD6: ; 8615AD6
+gUnknown_08615AD6: @ 8615AD6
 	.incbin "base_emerald.gba", 0x615ad6, 0x3
 
-gUnknown_08615AD9: ; 8615AD9
+gUnknown_08615AD9: @ 8615AD9
 	.incbin "base_emerald.gba", 0x615ad9, 0x3
 
-gUnknown_08615ADC: ; 8615ADC
+gUnknown_08615ADC: @ 8615ADC
 	.incbin "base_emerald.gba", 0x615adc, 0x3
 
-gUnknown_08615ADF: ; 8615ADF
+gUnknown_08615ADF: @ 8615ADF
 	.incbin "base_emerald.gba", 0x615adf, 0x3
 
-gUnknown_08615AE2: ; 8615AE2
+gUnknown_08615AE2: @ 8615AE2
 	.incbin "base_emerald.gba", 0x615ae2, 0x3
 
-gUnknown_08615AE5: ; 8615AE5
+gUnknown_08615AE5: @ 8615AE5
 	.incbin "base_emerald.gba", 0x615ae5, 0x3
 
-gUnknown_08615AE8: ; 8615AE8
+gUnknown_08615AE8: @ 8615AE8
 	.incbin "base_emerald.gba", 0x615ae8, 0x3
 
-gUnknown_08615AEB: ; 8615AEB
+gUnknown_08615AEB: @ 8615AEB
 	.incbin "base_emerald.gba", 0x615aeb, 0x3
 
-gUnknown_08615AEE: ; 8615AEE
+gUnknown_08615AEE: @ 8615AEE
 	.incbin "base_emerald.gba", 0x615aee, 0x3
 
-gUnknown_08615AF1: ; 8615AF1
+gUnknown_08615AF1: @ 8615AF1
 	.incbin "base_emerald.gba", 0x615af1, 0x3
 
-gUnknown_08615AF4: ; 8615AF4
+gUnknown_08615AF4: @ 8615AF4
 	.incbin "base_emerald.gba", 0x615af4, 0x6c
 
-gUnknown_08615B60: ; 8615B60
+gUnknown_08615B60: @ 8615B60
 	.incbin "base_emerald.gba", 0x615b60, 0xa8
 
-gUnknown_08615C08: ; 8615C08
+gUnknown_08615C08: @ 8615C08
 	.incbin "base_emerald.gba", 0x615c08, 0x130
 
-gUnknown_08615D38: ; 8615D38
+gUnknown_08615D38: @ 8615D38
 	.incbin "base_emerald.gba", 0x615d38, 0x38
 
-gUnknown_08615D70: ; 8615D70
+gUnknown_08615D70: @ 8615D70
 	.incbin "base_emerald.gba", 0x615d70, 0xe
 
-gUnknown_08615D7E: ; 8615D7E
+gUnknown_08615D7E: @ 8615D7E
 	.incbin "base_emerald.gba", 0x615d7e, 0x1e
 
-gUnknown_08615D9C: ; 8615D9C
+gUnknown_08615D9C: @ 8615D9C
 	.incbin "base_emerald.gba", 0x615d9c, 0x70
 
-gUnknown_08615E0C: ; 8615E0C
+gUnknown_08615E0C: @ 8615E0C
 	.incbin "base_emerald.gba", 0x615e0c, 0xa4
 
-gUnknown_08615EB0: ; 8615EB0
+gUnknown_08615EB0: @ 8615EB0
 	.incbin "base_emerald.gba", 0x615eb0, 0x8
 
-gUnknown_08615EB8: ; 8615EB8
+gUnknown_08615EB8: @ 8615EB8
 	.incbin "base_emerald.gba", 0x615eb8, 0x8
 
-gUnknown_08615EC0: ; 8615EC0
+gUnknown_08615EC0: @ 8615EC0
 	.incbin "base_emerald.gba", 0x615ec0, 0x38
 
-gUnknown_08615EF8: ; 8615EF8
+gUnknown_08615EF8: @ 8615EF8
 	.incbin "base_emerald.gba", 0x615ef8, 0x8
 
-gUnknown_08615F00: ; 8615F00
+gUnknown_08615F00: @ 8615F00
 	.incbin "base_emerald.gba", 0x615f00, 0x8
 
-gUnknown_08615F08: ; 8615F08
+gUnknown_08615F08: @ 8615F08
 	.incbin "base_emerald.gba", 0x615f08, 0x68
 
-gUnknown_08615F70: ; 8615F70
+gUnknown_08615F70: @ 8615F70
 	.incbin "base_emerald.gba", 0x615f70, 0x8
 
-gUnknown_08615F78: ; 8615F78
+gUnknown_08615F78: @ 8615F78
 	.incbin "base_emerald.gba", 0x615f78, 0x80
 
-gUnknown_08615FF8: ; 8615FF8
+gUnknown_08615FF8: @ 8615FF8
 	.incbin "base_emerald.gba", 0x615ff8, 0x8
 
-gUnknown_08616000: ; 8616000
+gUnknown_08616000: @ 8616000
 	.incbin "base_emerald.gba", 0x616000, 0x8
 
-gUnknown_08616008: ; 8616008
+gUnknown_08616008: @ 8616008
 	.incbin "base_emerald.gba", 0x616008, 0x18
 
-gUnknown_08616020: ; 8616020
+gUnknown_08616020: @ 8616020
 	.incbin "base_emerald.gba", 0x616020, 0x20
 
-gUnknown_08616040: ; 8616040
+gUnknown_08616040: @ 8616040
 	.incbin "base_emerald.gba", 0x616040, 0x74
 
-gUnknown_086160B4: ; 86160B4
+gUnknown_086160B4: @ 86160B4
 	.incbin "base_emerald.gba", 0x6160b4, 0x20
 
-gUnknown_086160D4: ; 86160D4
+gUnknown_086160D4: @ 86160D4
 	.incbin "base_emerald.gba", 0x6160d4, 0x4
 
-gUnknown_086160D8: ; 86160D8
+gUnknown_086160D8: @ 86160D8
 	.incbin "base_emerald.gba", 0x6160d8, 0x1c
 
-gUnknown_086160F4: ; 86160F4
+gUnknown_086160F4: @ 86160F4
 	.incbin "base_emerald.gba", 0x6160f4, 0x4
 
-gUnknown_086160F8: ; 86160F8
+gUnknown_086160F8: @ 86160F8
 	.incbin "base_emerald.gba", 0x6160f8, 0x28
 
-gUnknown_08616120: ; 8616120
+gUnknown_08616120: @ 8616120
 	.incbin "base_emerald.gba", 0x616120, 0x4
 
-gUnknown_08616124: ; 8616124
+gUnknown_08616124: @ 8616124
 	.incbin "base_emerald.gba", 0x616124, 0x4
 
 	.align 2, 0
 
-gFont6BrailleGlyphs: ; 8616128
+gFont6BrailleGlyphs: @ 8616128
 	.incbin "data/graphics/fonts/font6.fwjpnfont"
 
-gUnknown_08617128: ; 8617128
+gUnknown_08617128: @ 8617128
 	.incbin "base_emerald.gba", 0x617128, 0x48
 
-gUnknown_08617170: ; 8617170
+gUnknown_08617170: @ 8617170
 	.incbin "base_emerald.gba", 0x617170, 0x104
 
-gUnknown_08617274: ; 8617274
+gUnknown_08617274: @ 8617274
 	.incbin "base_emerald.gba", 0x617274, 0x920
 
-gUnknown_08617B94: ; 8617B94
+gUnknown_08617B94: @ 8617B94
 	.incbin "base_emerald.gba", 0x617b94, 0xb0
 
-gUnknown_08617C44: ; 8617C44
+gUnknown_08617C44: @ 8617C44
 	.incbin "base_emerald.gba", 0x617c44, 0x120
 
-gUnknown_08617D64: ; 8617D64
+gUnknown_08617D64: @ 8617D64
 	.incbin "base_emerald.gba", 0x617d64, 0x30
 
-gUnknown_08617D94: ; 8617D94
+gUnknown_08617D94: @ 8617D94
 	.incbin "base_emerald.gba", 0x617d94, 0x10
 
-gUnknown_08617DA4: ; 8617DA4
+gUnknown_08617DA4: @ 8617DA4
 	.incbin "base_emerald.gba", 0x617da4, 0x5c
 
-gUnknown_08617E00: ; 8617E00
+gUnknown_08617E00: @ 8617E00
 	.incbin "base_emerald.gba", 0x617e00, 0x18
 
-gUnknown_08617E18: ; 8617E18
+gUnknown_08617E18: @ 8617E18
 	.incbin "base_emerald.gba", 0x617e18, 0x1c
 
-gUnknown_08617E34: ; 8617E34
+gUnknown_08617E34: @ 8617E34
 	.incbin "base_emerald.gba", 0x617e34, 0x2c
 
-gUnknown_08617E60: ; 8617E60
+gUnknown_08617E60: @ 8617E60
 	.incbin "base_emerald.gba", 0x617e60, 0x18
 
-gUnknown_08617E78: ; 8617E78
+gUnknown_08617E78: @ 8617E78
 	.incbin "base_emerald.gba", 0x617e78, 0x15
 
-gUnknown_08617E8D: ; 8617E8D
+gUnknown_08617E8D: @ 8617E8D
 	.incbin "base_emerald.gba", 0x617e8d, 0xe
 
-gUnknown_08617E9B: ; 8617E9B
+gUnknown_08617E9B: @ 8617E9B
 	.incbin "base_emerald.gba", 0x617e9b, 0x26d
 
-gUnknown_08618108: ; 8618108
+gUnknown_08618108: @ 8618108
 	.incbin "base_emerald.gba", 0x618108, 0x8
 
-gUnknown_08618110: ; 8618110
+gUnknown_08618110: @ 8618110
 	.incbin "base_emerald.gba", 0x618110, 0x28
 
-gUnknown_08618138: ; 8618138
+gUnknown_08618138: @ 8618138
 	.incbin "base_emerald.gba", 0x618138, 0x20
 
-gUnknown_08618158: ; 8618158
+gUnknown_08618158: @ 8618158
 	.incbin "base_emerald.gba", 0x618158, 0x3
 
-gUnknown_0861815B: ; 861815B
+gUnknown_0861815B: @ 861815B
 	.incbin "base_emerald.gba", 0x61815b, 0x5
 
-gUnknown_08618160: ; 8618160
+gUnknown_08618160: @ 8618160
 	.incbin "base_emerald.gba", 0x618160, 0x18
 
-gUnknown_08618178: ; 8618178
+gUnknown_08618178: @ 8618178
 	.incbin "base_emerald.gba", 0x618178, 0x49
 
-; 86181C1
+@ 86181C1
 	.include "data/text/move_descriptions.s"
 
-; 861CAAC
+@ 861CAAC
 	.include "data/text/nature_names.s"
 
-gUnknown_0861CBB4: ; 861CBB4
+gUnknown_0861CBB4: @ 861CBB4
 	.incbin "base_emerald.gba", 0x61cbb4, 0x38
 
-gUnknown_0861CBEC: ; 861CBEC
+gUnknown_0861CBEC: @ 861CBEC
 	.incbin "base_emerald.gba", 0x61cbec, 0xc
 
-gUnknown_0861CBF8: ; 861CBF8
+gUnknown_0861CBF8: @ 861CBF8
 	.incbin "base_emerald.gba", 0x61cbf8, 0xc
 
-gUnknown_0861CC04: ; 861CC04
+gUnknown_0861CC04: @ 861CC04
 	.incbin "base_emerald.gba", 0x61cc04, 0xc
 
-gUnknown_0861CC10: ; 861CC10
+gUnknown_0861CC10: @ 861CC10
 	.incbin "base_emerald.gba", 0x61cc10, 0xc
 
-gUnknown_0861CC1C: ; 861CC1C
+gUnknown_0861CC1C: @ 861CC1C
 	.incbin "base_emerald.gba", 0x61cc1c, 0x8
 
-gUnknown_0861CC24: ; 861CC24
+gUnknown_0861CC24: @ 861CC24
 	.incbin "base_emerald.gba", 0x61cc24, 0xa8
 
-gUnknown_0861CCCC: ; 861CCCC
+gUnknown_0861CCCC: @ 861CCCC
 	.incbin "base_emerald.gba", 0x61cccc, 0x20
 
-gUnknown_0861CCEC: ; 861CCEC
+gUnknown_0861CCEC: @ 861CCEC
 	.incbin "base_emerald.gba", 0x61ccec, 0x28
 
-gUnknown_0861CD14: ; 861CD14
+gUnknown_0861CD14: @ 861CD14
 	.incbin "base_emerald.gba", 0x61cd14, 0x18
 
-gUnknown_0861CD2C: ; 861CD2C
+gUnknown_0861CD2C: @ 861CD2C
 	.incbin "base_emerald.gba", 0x61cd2c, 0xa7
 
-gUnknown_0861CDD3: ; 861CDD3
+gUnknown_0861CDD3: @ 861CDD3
 	.incbin "base_emerald.gba", 0x61cdd3, 0x81
 
-gUnknown_0861CE54: ; 861CE54
+gUnknown_0861CE54: @ 861CE54
 	.incbin "base_emerald.gba", 0x61ce54, 0x10
 
-gUnknown_0861CE64: ; 861CE64
+gUnknown_0861CE64: @ 861CE64
 	.incbin "base_emerald.gba", 0x61ce64, 0x10
 
-gUnknown_0861CE74: ; 861CE74
+gUnknown_0861CE74: @ 861CE74
 	.incbin "base_emerald.gba", 0x61ce74, 0x7
 
-gUnknown_0861CE7B: ; 861CE7B
+gUnknown_0861CE7B: @ 861CE7B
 	.incbin "base_emerald.gba", 0x61ce7b, 0x7
 
-gUnknown_0861CE82: ; 861CE82
+gUnknown_0861CE82: @ 861CE82
 	.incbin "base_emerald.gba", 0x61ce82, 0xc
 
-gUnknown_0861CE8E: ; 861CE8E
+gUnknown_0861CE8E: @ 861CE8E
 	.incbin "base_emerald.gba", 0x61ce8e, 0x9
 
-gUnknown_0861CE97: ; 861CE97
+gUnknown_0861CE97: @ 861CE97
 	.incbin "base_emerald.gba", 0x61ce97, 0x125
 
-gUnknown_0861CFBC: ; 861CFBC
+gUnknown_0861CFBC: @ 861CFBC
 	.incbin "base_emerald.gba", 0x61cfbc, 0x8
 
-gUnknown_0861CFC4: ; 861CFC4
+gUnknown_0861CFC4: @ 861CFC4
 	.incbin "base_emerald.gba", 0x61cfc4, 0x18
 
-gUnknown_0861CFDC: ; 861CFDC
+gUnknown_0861CFDC: @ 861CFDC
 	.incbin "base_emerald.gba", 0x61cfdc, 0x98
 
-gUnknown_0861D074: ; 861D074
+gUnknown_0861D074: @ 861D074
 	.incbin "base_emerald.gba", 0x61d074, 0x8
 
-gUnknown_0861D07C: ; 861D07C
+gUnknown_0861D07C: @ 861D07C
 	.incbin "base_emerald.gba", 0x61d07c, 0x8
 
-gUnknown_0861D084: ; 861D084
+gUnknown_0861D084: @ 861D084
 	.incbin "base_emerald.gba", 0x61d084, 0x74
 
-gUnknown_0861D0F8: ; 861D0F8
+gUnknown_0861D0F8: @ 861D0F8
 	.incbin "base_emerald.gba", 0x61d0f8, 0x8
 
-gUnknown_0861D100: ; 861D100
+gUnknown_0861D100: @ 861D100
 	.incbin "base_emerald.gba", 0x61d100, 0x8
 
-gUnknown_0861D108: ; 861D108
+gUnknown_0861D108: @ 861D108
 	.incbin "base_emerald.gba", 0x61d108, 0x18
 
-gUnknown_0861D120: ; 861D120
+gUnknown_0861D120: @ 861D120
 	.incbin "base_emerald.gba", 0x61d120, 0x20
 
-gUnknown_0861D140: ; 861D140
+gUnknown_0861D140: @ 861D140
 	.incbin "base_emerald.gba", 0x61d140, 0x60
 
-gUnknown_0861D1A0: ; 861D1A0
+gUnknown_0861D1A0: @ 861D1A0
 	.incbin "base_emerald.gba", 0x61d1a0, 0xd54
 
-gUnknown_0861DEF4: ; 861DEF4
+gUnknown_0861DEF4: @ 861DEF4
 	.incbin "base_emerald.gba", 0x61def4, 0x314
 
-gUnknown_0861E208: ; 861E208
+gUnknown_0861E208: @ 861E208
 	.incbin "base_emerald.gba", 0x61e208, 0xd5c
 
-gUnknown_0861EF64: ; 861EF64
+gUnknown_0861EF64: @ 861EF64
 	.incbin "base_emerald.gba", 0x61ef64, 0x350
 
-gUnknown_0861F2B4: ; 861F2B4
+gUnknown_0861F2B4: @ 861F2B4
 	.incbin "base_emerald.gba", 0x61f2b4, 0xc
 
-gUnknown_0861F2C0: ; 861F2C0
+gUnknown_0861F2C0: @ 861F2C0
 	.incbin "base_emerald.gba", 0x61f2c0, 0x18
 
-gUnknown_0861F2D8: ; 861F2D8
+gUnknown_0861F2D8: @ 861F2D8
 	.incbin "base_emerald.gba", 0x61f2d8, 0x30
 
-gUnknown_0861F308: ; 861F308
+gUnknown_0861F308: @ 861F308
 	.incbin "base_emerald.gba", 0x61f308, 0x4
 
-gUnknown_0861F30C: ; 861F30C
+gUnknown_0861F30C: @ 861F30C
 	.incbin "base_emerald.gba", 0x61f30c, 0x2
 
-gUnknown_0861F30E: ; 861F30E
+gUnknown_0861F30E: @ 861F30E
 	.incbin "base_emerald.gba", 0x61f30e, 0x2
 
-gUnknown_0861F310: ; 861F310
+gUnknown_0861F310: @ 861F310
 	.incbin "base_emerald.gba", 0x61f310, 0x4
 
-gUnknown_0861F314: ; 861F314
+gUnknown_0861F314: @ 861F314
 	.incbin "base_emerald.gba", 0x61f314, 0x8
 
-gUnknown_0861F31C: ; 861F31C
+gUnknown_0861F31C: @ 861F31C
 	.incbin "base_emerald.gba", 0x61f31c, 0xc
 
-gUnknown_0861F328: ; 861F328
+gUnknown_0861F328: @ 861F328
 	.incbin "base_emerald.gba", 0x61f328, 0x28
 
-gUnknown_0861F350: ; 861F350
+gUnknown_0861F350: @ 861F350
 	.incbin "base_emerald.gba", 0x61f350, 0x20
 
-gUnknown_0861F370: ; 861F370
+gUnknown_0861F370: @ 861F370
 	.incbin "base_emerald.gba", 0x61f370, 0x5c
 
-gUnknown_0861F3CC: ; 861F3CC
+gUnknown_0861F3CC: @ 861F3CC
 	.incbin "base_emerald.gba", 0x61f3cc, 0x8
 
-gUnknown_0861F3D4: ; 861F3D4
+gUnknown_0861F3D4: @ 861F3D4
 	.incbin "base_emerald.gba", 0x61f3d4, 0x18
 
-gUnknown_0861F3EC: ; 861F3EC
+gUnknown_0861F3EC: @ 861F3EC
 	.incbin "base_emerald.gba", 0x61f3ec, 0x618
 
-gUnknown_0861FA04: ; 861FA04
+gUnknown_0861FA04: @ 861FA04
 	.incbin "base_emerald.gba", 0x61fa04, 0x4
 
-gUnknown_0861FA08: ; 861FA08
+gUnknown_0861FA08: @ 861FA08
 	.incbin "base_emerald.gba", 0x61fa08, 0x10
 
-gUnknown_0861FA18: ; 861FA18
+gUnknown_0861FA18: @ 861FA18
 	.incbin "base_emerald.gba", 0x61fa18, 0x30
 
-gUnknown_0861FA48: ; 861FA48
+gUnknown_0861FA48: @ 861FA48
 	.incbin "base_emerald.gba", 0x61fa48, 0x4
 
-gUnknown_0861FA4C: ; 861FA4C
+gUnknown_0861FA4C: @ 861FA4C
 	.incbin "base_emerald.gba", 0x61fa4c, 0x8
 
-gUnknown_0861FA54: ; 861FA54
+gUnknown_0861FA54: @ 861FA54
 	.incbin "base_emerald.gba", 0x61fa54, 0x10
 
-gUnknown_0861FA64: ; 861FA64
+gUnknown_0861FA64: @ 861FA64
 	.incbin "base_emerald.gba", 0x61fa64, 0x8
 
-gUnknown_0861FA6C: ; 861FA6C
+gUnknown_0861FA6C: @ 861FA6C
 	.incbin "base_emerald.gba", 0x61fa6c, 0x30
 
-gUnknown_0861FA9C: ; 861FA9C
+gUnknown_0861FA9C: @ 861FA9C
 	.incbin "base_emerald.gba", 0x61fa9c, 0x68
 
-gUnknown_0861FB04: ; 861FB04
+gUnknown_0861FB04: @ 861FB04
 	.incbin "base_emerald.gba", 0x61fb04, 0x28
 
-gUnknown_0861FB2C: ; 861FB2C
+gUnknown_0861FB2C: @ 861FB2C
 	.incbin "base_emerald.gba", 0x61fb2c, 0x18
 
-gUnknown_0861FB44: ; 861FB44
+gUnknown_0861FB44: @ 861FB44
 	.incbin "base_emerald.gba", 0x61fb44, 0xa0
 
-gUnknown_0861FBE4: ; 861FBE4
+gUnknown_0861FBE4: @ 861FBE4
 	.incbin "base_emerald.gba", 0x61fbe4, 0x4
 
-gUnknown_0861FBE8: ; 861FBE8
+gUnknown_0861FBE8: @ 861FBE8
 	.incbin "base_emerald.gba", 0x61fbe8, 0xc
 
-gUnknown_0861FBF4: ; 861FBF4
+gUnknown_0861FBF4: @ 861FBF4
 	.incbin "base_emerald.gba", 0x61fbf4, 0x3
 
-gUnknown_0861FBF7: ; 861FBF7
+gUnknown_0861FBF7: @ 861FBF7
 	.incbin "base_emerald.gba", 0x61fbf7, 0x5
 
-gUnknown_0861FBFC: ; 861FBFC
+gUnknown_0861FBFC: @ 861FBFC
 	.incbin "base_emerald.gba", 0x61fbfc, 0x8
 
-gUnknown_0861FC04: ; 861FC04
+gUnknown_0861FC04: @ 861FC04
 	.incbin "base_emerald.gba", 0x61fc04, 0x18
 
-gUnknown_0861FC1C: ; 861FC1C
+gUnknown_0861FC1C: @ 861FC1C
 	.incbin "base_emerald.gba", 0x61fc1c, 0x20
 
-gUnknown_0861FC3C: ; 861FC3C
+gUnknown_0861FC3C: @ 861FC3C
 	.incbin "base_emerald.gba", 0x61fc3c, 0x18
 
-gUnknown_0861FC54: ; 861FC54
+gUnknown_0861FC54: @ 861FC54
 	.incbin "base_emerald.gba", 0x61fc54, 0x5
 
-gUnknown_0861FC59: ; 861FC59
+gUnknown_0861FC59: @ 861FC59
 	.incbin "base_emerald.gba", 0x61fc59, 0x1f
 
-gUnknown_0861FC78: ; 861FC78
+gUnknown_0861FC78: @ 861FC78
 	.incbin "base_emerald.gba", 0x61fc78, 0x2
 
-gUnknown_0861FC7A: ; 861FC7A
+gUnknown_0861FC7A: @ 861FC7A
 	.incbin "base_emerald.gba", 0x61fc7a, 0xc
 
-gUnknown_0861FC86: ; 861FC86
+gUnknown_0861FC86: @ 861FC86
 	.incbin "base_emerald.gba", 0x61fc86, 0x12
 
-gUnknown_0861FC98: ; 861FC98
+gUnknown_0861FC98: @ 861FC98
 	.incbin "base_emerald.gba", 0x61fc98, 0x14
 
-gUnknown_0861FCAC: ; 861FCAC
+gUnknown_0861FCAC: @ 861FCAC
 	.incbin "base_emerald.gba", 0x61fcac, 0xa0
 
-gUnknown_0861FD4C: ; 861FD4C
+gUnknown_0861FD4C: @ 861FD4C
 	.incbin "base_emerald.gba", 0x61fd4c, 0x20
 
-gUnknown_0861FD6C: ; 861FD6C
+gUnknown_0861FD6C: @ 861FD6C
 	.incbin "base_emerald.gba", 0x61fd6c, 0x288
 
-gUnknown_0861FFF4: ; 861FFF4
+gUnknown_0861FFF4: @ 861FFF4
 	.incbin "base_emerald.gba", 0x61fff4, 0x1a0
 
-gUnknown_08620194: ; 8620194
+gUnknown_08620194: @ 8620194
 	.incbin "base_emerald.gba", 0x620194, 0xc
 
-gUnknown_086201A0: ; 86201A0
+gUnknown_086201A0: @ 86201A0
 	.incbin "base_emerald.gba", 0x6201a0, 0x24
 
-gUnknown_086201C4: ; 86201C4
+gUnknown_086201C4: @ 86201C4
 	.incbin "base_emerald.gba", 0x6201c4, 0x10
 
-gUnknown_086201D4: ; 86201D4
+gUnknown_086201D4: @ 86201D4
 	.incbin "base_emerald.gba", 0x6201d4, 0x6c
 
-gUnknown_08620240: ; 8620240
+gUnknown_08620240: @ 8620240
 	.incbin "base_emerald.gba", 0x620240, 0x4
 
-gUnknown_08620244: ; 8620244
+gUnknown_08620244: @ 8620244
 	.incbin "base_emerald.gba", 0x620244, 0x88
 
-gUnknown_086202CC: ; 86202CC
+gUnknown_086202CC: @ 86202CC
 	.incbin "base_emerald.gba", 0x6202cc, 0x8
 
-gUnknown_086202D4: ; 86202D4
+gUnknown_086202D4: @ 86202D4
 	.incbin "base_emerald.gba", 0x6202d4, 0x38
 
-gUnknown_0862030C: ; 862030C
+gUnknown_0862030C: @ 862030C
 	.incbin "base_emerald.gba", 0x62030c, 0x3
 
-gUnknown_0862030F: ; 862030F
+gUnknown_0862030F: @ 862030F
 	.incbin "base_emerald.gba", 0x62030f, 0x3d
 
-gUnknown_0862034C: ; 862034C
+gUnknown_0862034C: @ 862034C
 	.incbin "base_emerald.gba", 0x62034c, 0x20
 
-gUnknown_0862036C: ; 862036C
+gUnknown_0862036C: @ 862036C
 	.incbin "base_emerald.gba", 0x62036c, 0x18
 
-gUnknown_08620384: ; 8620384
+gUnknown_08620384: @ 8620384
 	.incbin "base_emerald.gba", 0x620384, 0x1ca4
 
-gUnknown_08622028: ; 8622028
+gUnknown_08622028: @ 8622028
 	.incbin "base_emerald.gba", 0x622028, 0x4e0
 
-gUnknown_08622508: ; 8622508
+gUnknown_08622508: @ 8622508
 	.incbin "base_emerald.gba", 0x622508, 0x2
 
-gUnknown_0862250A: ; 862250A
+gUnknown_0862250A: @ 862250A
 	.incbin "base_emerald.gba", 0x62250a, 0x6
 
-gUnknown_08622510: ; 8622510
+gUnknown_08622510: @ 8622510
 	.incbin "base_emerald.gba", 0x622510, 0x20
 
-gUnknown_08622530: ; 8622530
+gUnknown_08622530: @ 8622530
 	.incbin "base_emerald.gba", 0x622530, 0xa4
 
-gUnknown_086225D4: ; 86225D4
+gUnknown_086225D4: @ 86225D4
 	.incbin "base_emerald.gba", 0x6225d4, 0x10c
 
-gUnknown_086226E0: ; 86226E0
+gUnknown_086226E0: @ 86226E0
 	.incbin "base_emerald.gba", 0x6226e0, 0x20
 
-gUnknown_08622700: ; 8622700
+gUnknown_08622700: @ 8622700
 	.incbin "base_emerald.gba", 0x622700, 0x20
 
-gUnknown_08622720: ; 8622720
+gUnknown_08622720: @ 8622720
 	.incbin "base_emerald.gba", 0x622720, 0x40
 
-gUnknown_08622760: ; 8622760
+gUnknown_08622760: @ 8622760
 	.incbin "base_emerald.gba", 0x622760, 0x2c
 
-gUnknown_0862278C: ; 862278C
+gUnknown_0862278C: @ 862278C
 	.incbin "base_emerald.gba", 0x62278c, 0x8
 
-gUnknown_08622794: ; 8622794
+gUnknown_08622794: @ 8622794
 	.incbin "base_emerald.gba", 0x622794, 0x4
 
-gUnknown_08622798: ; 8622798
+gUnknown_08622798: @ 8622798
 	.incbin "base_emerald.gba", 0x622798, 0x40
 
-gUnknown_086227D8: ; 86227D8
+gUnknown_086227D8: @ 86227D8
 	.incbin "base_emerald.gba", 0x6227d8, 0x8
 
-gUnknown_086227E0: ; 86227E0
+gUnknown_086227E0: @ 86227E0
 	.incbin "base_emerald.gba", 0x6227e0, 0x8
 
-gUnknown_086227E8: ; 86227E8
+gUnknown_086227E8: @ 86227E8
 	.incbin "base_emerald.gba", 0x6227e8, 0xc
 
-gUnknown_086227F4: ; 86227F4
+gUnknown_086227F4: @ 86227F4
 	.incbin "base_emerald.gba", 0x6227f4, 0x14
 
-gUnknown_08622808: ; 8622808
+gUnknown_08622808: @ 8622808
 	.incbin "base_emerald.gba", 0x622808, 0x8
 
-gUnknown_08622810: ; 8622810
+gUnknown_08622810: @ 8622810
 	.incbin "base_emerald.gba", 0x622810, 0x8
 
-gUnknown_08622818: ; 8622818
+gUnknown_08622818: @ 8622818
 	.incbin "base_emerald.gba", 0x622818, 0x18
 
-gUnknown_08622830: ; 8622830
+gUnknown_08622830: @ 8622830
 	.incbin "base_emerald.gba", 0x622830, 0x20
 
-gUnknown_08622850: ; 8622850
+gUnknown_08622850: @ 8622850
 	.incbin "base_emerald.gba", 0x622850, 0x18
 
-gUnknown_08622868: ; 8622868
+gUnknown_08622868: @ 8622868
 	.incbin "base_emerald.gba", 0x622868, 0x20
 
-gUnknown_08622888: ; 8622888
+gUnknown_08622888: @ 8622888
 	.incbin "base_emerald.gba", 0x622888, 0x850
 
-gUnknown_086230D8: ; 86230D8
+gUnknown_086230D8: @ 86230D8
 	.incbin "base_emerald.gba", 0x6230d8, 0xc
 
-gUnknown_086230E4: ; 86230E4
+gUnknown_086230E4: @ 86230E4
 	.incbin "base_emerald.gba", 0x6230e4, 0x14
 
-gUnknown_086230F8: ; 86230F8
+gUnknown_086230F8: @ 86230F8
 	.incbin "base_emerald.gba", 0x6230f8, 0x8
 
-gUnknown_08623100: ; 8623100
+gUnknown_08623100: @ 8623100
 	.incbin "base_emerald.gba", 0x623100, 0x10
 
-gUnknown_08623110: ; 8623110
+gUnknown_08623110: @ 8623110
 	.incbin "base_emerald.gba", 0x623110, 0x8
 
-gUnknown_08623118: ; 8623118
+gUnknown_08623118: @ 8623118
 	.incbin "base_emerald.gba", 0x623118, 0xb8
 
-gUnknown_086231D0: ; 86231D0
+gUnknown_086231D0: @ 86231D0
 	.incbin "base_emerald.gba", 0x6231d0, 0x18
 
-gUnknown_086231E8: ; 86231E8
+gUnknown_086231E8: @ 86231E8
 	.incbin "base_emerald.gba", 0x6231e8, 0x20
 
-gUnknown_08623208: ; 8623208
+gUnknown_08623208: @ 8623208
 	.incbin "base_emerald.gba", 0x623208, 0x20
 
-gUnknown_08623228: ; 8623228
+gUnknown_08623228: @ 8623228
 	.incbin "base_emerald.gba", 0x623228, 0x14
 
-gUnknown_0862323C: ; 862323C
+gUnknown_0862323C: @ 862323C
 	.incbin "base_emerald.gba", 0x62323c, 0xfc
 
-gUnknown_08623338: ; 8623338
+gUnknown_08623338: @ 8623338
 	.incbin "base_emerald.gba", 0x623338, 0x20
 
-gUnknown_08623358: ; 8623358
+gUnknown_08623358: @ 8623358
 	.incbin "base_emerald.gba", 0x623358, 0xc
 
-gUnknown_08623364: ; 8623364
+gUnknown_08623364: @ 8623364
 	.incbin "base_emerald.gba", 0x623364, 0x8
 
-gUnknown_0862336C: ; 862336C
+gUnknown_0862336C: @ 862336C
 	.incbin "base_emerald.gba", 0x62336c, 0x8
 
-gUnknown_08623374: ; 8623374
+gUnknown_08623374: @ 8623374
 	.incbin "base_emerald.gba", 0x623374, 0x8
 
-gUnknown_0862337C: ; 862337C
+gUnknown_0862337C: @ 862337C
 	.incbin "base_emerald.gba", 0x62337c, 0x8
 
-gUnknown_08623384: ; 8623384
+gUnknown_08623384: @ 8623384
 	.incbin "base_emerald.gba", 0x623384, 0x1c
 
-gUnknown_086233A0: ; 86233A0
+gUnknown_086233A0: @ 86233A0
 	.incbin "base_emerald.gba", 0x6233a0, 0x14
 
-gUnknown_086233B4: ; 86233B4
+gUnknown_086233B4: @ 86233B4
 	.incbin "base_emerald.gba", 0x6233b4, 0x10
 
-gUnknown_086233C4: ; 86233C4
+gUnknown_086233C4: @ 86233C4
 	.incbin "base_emerald.gba", 0x6233c4, 0x20
 
-gUnknown_086233E4: ; 86233E4
+gUnknown_086233E4: @ 86233E4
 	.incbin "base_emerald.gba", 0x6233e4, 0xc8
 
-gUnknown_086234AC: ; 86234AC
+gUnknown_086234AC: @ 86234AC
 	.incbin "base_emerald.gba", 0x6234ac, 0xc4
 
-gUnknown_08623570: ; 8623570
+gUnknown_08623570: @ 8623570
 	.incbin "base_emerald.gba", 0x623570, 0x20
 
-gUnknown_08623590: ; 8623590
+gUnknown_08623590: @ 8623590
 	.incbin "base_emerald.gba", 0x623590, 0x4
 
-gUnknown_08623594: ; 8623594
+gUnknown_08623594: @ 8623594
 	.incbin "base_emerald.gba", 0x623594, 0x4
 
-gUnknown_08623598: ; 8623598
+gUnknown_08623598: @ 8623598
 	.incbin "base_emerald.gba", 0x623598, 0x1c
 
-gUnknown_086235B4: ; 86235B4
+gUnknown_086235B4: @ 86235B4
 	.incbin "base_emerald.gba", 0x6235b4, 0x8
 
-gUnknown_086235BC: ; 86235BC
+gUnknown_086235BC: @ 86235BC
 	.incbin "base_emerald.gba", 0x6235bc, 0xc
 
-gUnknown_086235C8: ; 86235C8
+gUnknown_086235C8: @ 86235C8
 	.incbin "base_emerald.gba", 0x6235c8, 0xc
 
-gUnknown_086235D4: ; 86235D4
+gUnknown_086235D4: @ 86235D4
 	.incbin "base_emerald.gba", 0x6235d4, 0x4
 
-gUnknown_086235D8: ; 86235D8
+gUnknown_086235D8: @ 86235D8
 	.incbin "base_emerald.gba", 0x6235d8, 0xc
 
-gUnknown_086235E4: ; 86235E4
+gUnknown_086235E4: @ 86235E4
 	.incbin "base_emerald.gba", 0x6235e4, 0x20
 
-gUnknown_08623604: ; 8623604
+gUnknown_08623604: @ 8623604
 	.incbin "base_emerald.gba", 0x623604, 0xc8
 
-gUnknown_086236CC: ; 86236CC
+gUnknown_086236CC: @ 86236CC
 	.incbin "base_emerald.gba", 0x6236cc, 0xc4
 
-gUnknown_08623790: ; 8623790
+gUnknown_08623790: @ 8623790
 	.incbin "base_emerald.gba", 0x623790, 0x20
 
-gUnknown_086237B0: ; 86237B0
+gUnknown_086237B0: @ 86237B0
 	.incbin "base_emerald.gba", 0x6237b0, 0x4
 
-gUnknown_086237B4: ; 86237B4
+gUnknown_086237B4: @ 86237B4
 	.incbin "base_emerald.gba", 0x6237b4, 0x4
 
-gUnknown_086237B8: ; 86237B8
+gUnknown_086237B8: @ 86237B8
 	.incbin "base_emerald.gba", 0x6237b8, 0x1c
 
-gUnknown_086237D4: ; 86237D4
+gUnknown_086237D4: @ 86237D4
 	.incbin "base_emerald.gba", 0x6237d4, 0x8
 
-gUnknown_086237DC: ; 86237DC
+gUnknown_086237DC: @ 86237DC
 	.incbin "base_emerald.gba", 0x6237dc, 0xc
 
-gUnknown_086237E8: ; 86237E8
+gUnknown_086237E8: @ 86237E8
 	.incbin "base_emerald.gba", 0x6237e8, 0xc
 
-gUnknown_086237F4: ; 86237F4
+gUnknown_086237F4: @ 86237F4
 	.incbin "base_emerald.gba", 0x6237f4, 0x4
 
-gUnknown_086237F8: ; 86237F8
+gUnknown_086237F8: @ 86237F8
 	.incbin "base_emerald.gba", 0x6237f8, 0x44
 
-; 862383C
+@ 862383C
 	.include "data/text/ribbon_descriptions.s"
 
-; 8623A74
+@ 8623A74
 	.include "data/text/gift_ribbon_descriptions.s"
 
-gUnknown_08623FF8: ; 8623FF8
+gUnknown_08623FF8: @ 8623FF8
 	.incbin "base_emerald.gba", 0x623ff8, 0xa0
 
-gUnknown_08624098: ; 8624098
+gUnknown_08624098: @ 8624098
 	.incbin "base_emerald.gba", 0x624098, 0x20
 
-gUnknown_086240B8: ; 86240B8
+gUnknown_086240B8: @ 86240B8
 	.incbin "base_emerald.gba", 0x6240b8, 0xae0
 
-gUnknown_08624B98: ; 8624B98
+gUnknown_08624B98: @ 8624B98
 	.incbin "base_emerald.gba", 0x624b98, 0x8
 
-gUnknown_08624BA0: ; 8624BA0
+gUnknown_08624BA0: @ 8624BA0
 	.incbin "base_emerald.gba", 0x624ba0, 0x18
 
-gUnknown_08624BB8: ; 8624BB8
+gUnknown_08624BB8: @ 8624BB8
 	.incbin "base_emerald.gba", 0x624bb8, 0x8
 
-gUnknown_08624BC0: ; 8624BC0
+gUnknown_08624BC0: @ 8624BC0
 	.incbin "base_emerald.gba", 0x624bc0, 0x4
 
-gUnknown_08624BC4: ; 8624BC4
+gUnknown_08624BC4: @ 8624BC4
 	.incbin "base_emerald.gba", 0x624bc4, 0x8
 
-gUnknown_08624BCC: ; 8624BCC
+gUnknown_08624BCC: @ 8624BCC
 	.incbin "base_emerald.gba", 0x624bcc, 0xc
 
-gUnknown_08624BD8: ; 8624BD8
+gUnknown_08624BD8: @ 8624BD8
 	.incbin "base_emerald.gba", 0x624bd8, 0xc
 
-gUnknown_08624BE4: ; 8624BE4
+gUnknown_08624BE4: @ 8624BE4
 	.incbin "base_emerald.gba", 0x624be4, 0x4
 
-gUnknown_08624BE8: ; 8624BE8
+gUnknown_08624BE8: @ 8624BE8
 	.incbin "base_emerald.gba", 0x624be8, 0x10
 
-gUnknown_08624BF8: ; 8624BF8
+gUnknown_08624BF8: @ 8624BF8
 	.incbin "base_emerald.gba", 0x624bf8, 0x80
 
-gUnknown_08624C78: ; 8624C78
+gUnknown_08624C78: @ 8624C78
 	.incbin "base_emerald.gba", 0x624c78, 0x8
 
-gUnknown_08624C80: ; 8624C80
+gUnknown_08624C80: @ 8624C80
 	.incbin "base_emerald.gba", 0x624c80, 0x84
 
-gUnknown_08624D04: ; 8624D04
+gUnknown_08624D04: @ 8624D04
 	.incbin "base_emerald.gba", 0x624d04, 0x5a4
 
-gUnknown_086252A8: ; 86252A8
+gUnknown_086252A8: @ 86252A8
 	.incbin "base_emerald.gba", 0x6252a8, 0x54
 
-gUnknown_086252FC: ; 86252FC
+gUnknown_086252FC: @ 86252FC
 	.incbin "base_emerald.gba", 0x6252fc, 0x14
 
-gUnknown_08625310: ; 8625310
+gUnknown_08625310: @ 8625310
 	.incbin "base_emerald.gba", 0x625310, 0x14
 
-gUnknown_08625324: ; 8625324
+gUnknown_08625324: @ 8625324
 	.incbin "base_emerald.gba", 0x625324, 0x14
 
-gUnknown_08625338: ; 8625338
+gUnknown_08625338: @ 8625338
 	.incbin "base_emerald.gba", 0x625338, 0x14
 
-gUnknown_0862534C: ; 862534C
+gUnknown_0862534C: @ 862534C
 	.incbin "base_emerald.gba", 0x62534c, 0x14
 
-gUnknown_08625360: ; 8625360
+gUnknown_08625360: @ 8625360
 	.incbin "base_emerald.gba", 0x625360, 0x14
 
-gUnknown_08625374: ; 8625374
+gUnknown_08625374: @ 8625374
 	.incbin "base_emerald.gba", 0x625374, 0x14
 
-gUnknown_08625388: ; 8625388
+gUnknown_08625388: @ 8625388
 	.incbin "base_emerald.gba", 0x625388, 0x60
 
-gUnknown_086253E8: ; 86253E8
+gUnknown_086253E8: @ 86253E8
 	.incbin "base_emerald.gba", 0x6253e8, 0x18
 
-gUnknown_08625400: ; 8625400
+gUnknown_08625400: @ 8625400
 	.incbin "base_emerald.gba", 0x625400, 0x3
 
-gUnknown_08625403: ; 8625403
+gUnknown_08625403: @ 8625403
 	.incbin "base_emerald.gba", 0x625403, 0x1
 
-gUnknown_08625404: ; 8625404
+gUnknown_08625404: @ 8625404
 	.incbin "base_emerald.gba", 0x625404, 0xc
 
-gUnknown_08625410: ; 8625410
+gUnknown_08625410: @ 8625410
 	.incbin "base_emerald.gba", 0x625410, 0x100
 
-gUnknown_08625510: ; 8625510
+gUnknown_08625510: @ 8625510
 	.incbin "base_emerald.gba", 0x625510, 0x30
 
-gUnknown_08625540: ; 8625540
+gUnknown_08625540: @ 8625540
 	.incbin "base_emerald.gba", 0x625540, 0x8
 
-gUnknown_08625548: ; 8625548
+gUnknown_08625548: @ 8625548
 	.incbin "base_emerald.gba", 0x625548, 0x500
 
-gUnknown_08625A48: ; 8625A48
+gUnknown_08625A48: @ 8625A48
 	.incbin "base_emerald.gba", 0x625a48, 0x8
 
-gUnknown_08625A50: ; 8625A50
+gUnknown_08625A50: @ 8625A50
 	.incbin "base_emerald.gba", 0x625a50, 0x18
 
-gUnknown_08625A68: ; 8625A68
+gUnknown_08625A68: @ 8625A68
 	.incbin "base_emerald.gba", 0x625a68, 0x8
 
-gUnknown_08625A70: ; 8625A70
+gUnknown_08625A70: @ 8625A70
 	.incbin "base_emerald.gba", 0x625a70, 0x20
 
-gUnknown_08625A90: ; 8625A90
+gUnknown_08625A90: @ 8625A90
 	.incbin "base_emerald.gba", 0x625a90, 0x18
 
-gUnknown_08625AA8: ; 8625AA8
+gUnknown_08625AA8: @ 8625AA8
 	.incbin "base_emerald.gba", 0x625aa8, 0x18
 
-gUnknown_08625AC0: ; 8625AC0
+gUnknown_08625AC0: @ 8625AC0
 	.incbin "base_emerald.gba", 0x625ac0, 0x8
 
-gUnknown_08625AC8: ; 8625AC8
+gUnknown_08625AC8: @ 8625AC8
 	.incbin "base_emerald.gba", 0x625ac8, 0x4c
 
-gUnknown_08625B14: ; 8625B14
+gUnknown_08625B14: @ 8625B14
 	.incbin "base_emerald.gba", 0x625b14, 0x18
 
-gUnknown_08625B2C: ; 8625B2C
+gUnknown_08625B2C: @ 8625B2C
 	.incbin "base_emerald.gba", 0x625b2c, 0x28
 
-gUnknown_08625B54: ; 8625B54
+gUnknown_08625B54: @ 8625B54
 	.incbin "base_emerald.gba", 0x625b54, 0x18
 
-gUnknown_08625B6C: ; 8625B6C
+gUnknown_08625B6C: @ 8625B6C
 	.incbin "base_emerald.gba", 0x625b6c, 0x520
 
-gUnknown_0862608C: ; 862608C
+gUnknown_0862608C: @ 862608C
 	.incbin "base_emerald.gba", 0x62608c, 0x2
 
-gUnknown_0862608E: ; 862608E
+gUnknown_0862608E: @ 862608E
 	.incbin "base_emerald.gba", 0x62608e, 0x4326
 
-gUnknown_0862A3B4: ; 862A3B4
+gUnknown_0862A3B4: @ 862A3B4
 	.incbin "base_emerald.gba", 0x62a3b4, 0x218
 
-gUnknown_0862A5CC: ; 862A5CC
+gUnknown_0862A5CC: @ 862A5CC
 	.incbin "base_emerald.gba", 0x62a5cc, 0x8
 
-gUnknown_0862A5D4: ; 862A5D4
+gUnknown_0862A5D4: @ 862A5D4
 	.incbin "base_emerald.gba", 0x62a5d4, 0x20
 
-gUnknown_0862A5F4: ; 862A5F4
+gUnknown_0862A5F4: @ 862A5F4
 	.incbin "base_emerald.gba", 0x62a5f4, 0x4
 
-gUnknown_0862A5F8: ; 862A5F8
+gUnknown_0862A5F8: @ 862A5F8
 	.incbin "base_emerald.gba", 0x62a5f8, 0x20
 
-gUnknown_0862A618: ; 862A618
+gUnknown_0862A618: @ 862A618
 	.incbin "base_emerald.gba", 0x62a618, 0x48
 
-gUnknown_0862A660: ; 862A660
+gUnknown_0862A660: @ 862A660
 	.incbin "base_emerald.gba", 0x62a660, 0x10
 
-gUnknown_0862A670: ; 862A670
+gUnknown_0862A670: @ 862A670
 	.incbin "base_emerald.gba", 0x62a670, 0x18
 
-gUnknown_0862A688: ; 862A688
+gUnknown_0862A688: @ 862A688
 	.incbin "base_emerald.gba", 0x62a688, 0x10
 
-gUnknown_0862A698: ; 862A698
+gUnknown_0862A698: @ 862A698
 	.incbin "base_emerald.gba", 0x62a698, 0x8
 
-gUnknown_0862A6A0: ; 862A6A0
+gUnknown_0862A6A0: @ 862A6A0
 	.incbin "base_emerald.gba", 0x62a6a0, 0x8c
 
-gUnknown_0862A72C: ; 862A72C
+gUnknown_0862A72C: @ 862A72C
 	.incbin "base_emerald.gba", 0x62a72c, 0x24
 
-gUnknown_0862A750: ; 862A750
+gUnknown_0862A750: @ 862A750
 	.incbin "base_emerald.gba", 0x62a750, 0x24
 
-gUnknown_0862A774: ; 862A774
+gUnknown_0862A774: @ 862A774
 	.incbin "base_emerald.gba", 0x62a774, 0xa8
 
-gUnknown_0862A81C: ; 862A81C
+gUnknown_0862A81C: @ 862A81C
 	.incbin "base_emerald.gba", 0x62a81c, 0x30
 
-gUnknown_0862A84C: ; 862A84C
+gUnknown_0862A84C: @ 862A84C
 	.incbin "base_emerald.gba", 0x62a84c, 0x18
 
-gUnknown_0862A864: ; 862A864
+gUnknown_0862A864: @ 862A864
 	.incbin "base_emerald.gba", 0x62a864, 0x18
 
-gUnknown_0862A87C: ; 862A87C
+gUnknown_0862A87C: @ 862A87C
 	.incbin "base_emerald.gba", 0x62a87c, 0xc
 
-gUnknown_0862A888: ; 862A888
+gUnknown_0862A888: @ 862A888
 	.incbin "base_emerald.gba", 0x62a888, 0x3c
 
-gUnknown_0862A8C4: ; 862A8C4
+gUnknown_0862A8C4: @ 862A8C4
 	.incbin "base_emerald.gba", 0x62a8c4, 0x8
 
-gUnknown_0862A8CC: ; 862A8CC
+gUnknown_0862A8CC: @ 862A8CC
 	.incbin "base_emerald.gba", 0x62a8cc, 0x8
 
-gUnknown_0862A8D4: ; 862A8D4
+gUnknown_0862A8D4: @ 862A8D4
 	.incbin "base_emerald.gba", 0x62a8d4, 0x24
 
-gUnknown_0862A8F8: ; 862A8F8
+gUnknown_0862A8F8: @ 862A8F8
 	.incbin "base_emerald.gba", 0x62a8f8, 0x8
 
-gUnknown_0862A900: ; 862A900
+gUnknown_0862A900: @ 862A900
 	.incbin "base_emerald.gba", 0x62a900, 0x24
 
-gUnknown_0862A924: ; 862A924
+gUnknown_0862A924: @ 862A924
 	.incbin "base_emerald.gba", 0x62a924, 0x8
 
-gUnknown_0862A92C: ; 862A92C
+gUnknown_0862A92C: @ 862A92C
 	.incbin "base_emerald.gba", 0x62a92c, 0xa8
 
-gUnknown_0862A9D4: ; 862A9D4
+gUnknown_0862A9D4: @ 862A9D4
 	.incbin "base_emerald.gba", 0x62a9d4, 0x8
 
-gUnknown_0862A9DC: ; 862A9DC
+gUnknown_0862A9DC: @ 862A9DC
 	.incbin "base_emerald.gba", 0x62a9dc, 0x8
 
-gUnknown_0862A9E4: ; 862A9E4
+gUnknown_0862A9E4: @ 862A9E4
 	.incbin "base_emerald.gba", 0x62a9e4, 0x30
 
-gUnknown_0862AA14: ; 862AA14
+gUnknown_0862AA14: @ 862AA14
 	.incbin "base_emerald.gba", 0x62aa14, 0x8
 
-gUnknown_0862AA1C: ; 862AA1C
+gUnknown_0862AA1C: @ 862AA1C
 	.incbin "base_emerald.gba", 0x62aa1c, 0x18
 
-gUnknown_0862AA34: ; 862AA34
+gUnknown_0862AA34: @ 862AA34
 	.incbin "base_emerald.gba", 0x62aa34, 0x8
 
-gUnknown_0862AA3C: ; 862AA3C
+gUnknown_0862AA3C: @ 862AA3C
 	.incbin "base_emerald.gba", 0x62aa3c, 0x18
 
-gUnknown_0862AA54: ; 862AA54
+gUnknown_0862AA54: @ 862AA54
 	.incbin "base_emerald.gba", 0x62aa54, 0x3c
 
-gUnknown_0862AA90: ; 862AA90
+gUnknown_0862AA90: @ 862AA90
 	.incbin "base_emerald.gba", 0x62aa90, 0x8
 
-gUnknown_0862AA98: ; 862AA98
+gUnknown_0862AA98: @ 862AA98
 	.incbin "base_emerald.gba", 0x62aa98, 0x8
 
-gUnknown_0862AAA0: ; 862AAA0
+gUnknown_0862AAA0: @ 862AAA0
 	.incbin "base_emerald.gba", 0x62aaa0, 0x18
 
-gUnknown_0862AAB8: ; 862AAB8
+gUnknown_0862AAB8: @ 862AAB8
 	.incbin "base_emerald.gba", 0x62aab8, 0x14
 
-gUnknown_0862AACC: ; 862AACC
+gUnknown_0862AACC: @ 862AACC
 	.incbin "base_emerald.gba", 0x62aacc, 0x30
 
-gUnknown_0862AAFC: ; 862AAFC
+gUnknown_0862AAFC: @ 862AAFC
 	.incbin "base_emerald.gba", 0x62aafc, 0x8
 
-gUnknown_0862AB04: ; 862AB04
+gUnknown_0862AB04: @ 862AB04
 	.incbin "base_emerald.gba", 0x62ab04, 0x8
 
-gUnknown_0862AB0C: ; 862AB0C
+gUnknown_0862AB0C: @ 862AB0C
 	.incbin "base_emerald.gba", 0x62ab0c, 0x8
 
-gUnknown_0862AB14: ; 862AB14
+gUnknown_0862AB14: @ 862AB14
 	.incbin "base_emerald.gba", 0x62ab14, 0x18
 
-gUnknown_0862AB2C: ; 862AB2C
+gUnknown_0862AB2C: @ 862AB2C
 	.incbin "base_emerald.gba", 0x62ab2c, 0x18
 
-gUnknown_0862AB44: ; 862AB44
+gUnknown_0862AB44: @ 862AB44
 	.incbin "base_emerald.gba", 0x62ab44, 0xe4
 
-gUnknown_0862AC28: ; 862AC28
+gUnknown_0862AC28: @ 862AC28
 	.incbin "base_emerald.gba", 0x62ac28, 0x8
 
-gUnknown_0862AC30: ; 862AC30
+gUnknown_0862AC30: @ 862AC30
 	.incbin "base_emerald.gba", 0x62ac30, 0x8
 
-gUnknown_0862AC38: ; 862AC38
+gUnknown_0862AC38: @ 862AC38
 	.incbin "base_emerald.gba", 0x62ac38, 0x8
 
-gUnknown_0862AC40: ; 862AC40
+gUnknown_0862AC40: @ 862AC40
 	.incbin "base_emerald.gba", 0x62ac40, 0x8
 
-gUnknown_0862AC48: ; 862AC48
+gUnknown_0862AC48: @ 862AC48
 	.incbin "base_emerald.gba", 0x62ac48, 0x8
 
-gUnknown_0862AC50: ; 862AC50
+gUnknown_0862AC50: @ 862AC50
 	.incbin "base_emerald.gba", 0x62ac50, 0x8
 
-gUnknown_0862AC58: ; 862AC58
+gUnknown_0862AC58: @ 862AC58
 	.incbin "base_emerald.gba", 0x62ac58, 0x8
 
-gUnknown_0862AC60: ; 862AC60
+gUnknown_0862AC60: @ 862AC60
 	.incbin "base_emerald.gba", 0x62ac60, 0x8
 
-gUnknown_0862AC68: ; 862AC68
+gUnknown_0862AC68: @ 862AC68
 	.incbin "base_emerald.gba", 0x62ac68, 0x8
 
-gUnknown_0862AC70: ; 862AC70
+gUnknown_0862AC70: @ 862AC70
 	.incbin "base_emerald.gba", 0x62ac70, 0x8
 
-gUnknown_0862AC78: ; 862AC78
+gUnknown_0862AC78: @ 862AC78
 	.incbin "base_emerald.gba", 0x62ac78, 0x18
 
-gUnknown_0862AC90: ; 862AC90
+gUnknown_0862AC90: @ 862AC90
 	.incbin "base_emerald.gba", 0x62ac90, 0x18
 
-gUnknown_0862ACA8: ; 862ACA8
+gUnknown_0862ACA8: @ 862ACA8
 	.incbin "base_emerald.gba", 0x62aca8, 0x18
 
-gUnknown_0862ACC0: ; 862ACC0
+gUnknown_0862ACC0: @ 862ACC0
 	.incbin "base_emerald.gba", 0x62acc0, 0x18
 
-gUnknown_0862ACD8: ; 862ACD8
+gUnknown_0862ACD8: @ 862ACD8
 	.incbin "base_emerald.gba", 0x62acd8, 0x18
 
-gUnknown_0862ACF0: ; 862ACF0
+gUnknown_0862ACF0: @ 862ACF0
 	.incbin "base_emerald.gba", 0x62acf0, 0x18
 
-gUnknown_0862AD08: ; 862AD08
+gUnknown_0862AD08: @ 862AD08
 	.incbin "base_emerald.gba", 0x62ad08, 0xc
 
-gUnknown_0862AD14: ; 862AD14
+gUnknown_0862AD14: @ 862AD14
 	.incbin "base_emerald.gba", 0x62ad14, 0x20
 
-gUnknown_0862AD34: ; 862AD34
+gUnknown_0862AD34: @ 862AD34
 	.incbin "base_emerald.gba", 0x62ad34, 0x10
 
-gUnknown_0862AD44: ; 862AD44
+gUnknown_0862AD44: @ 862AD44
 	.incbin "base_emerald.gba", 0x62ad44, 0x10
 
-gUnknown_0862AD54: ; 862AD54
+gUnknown_0862AD54: @ 862AD54
 	.incbin "base_emerald.gba", 0x62ad54, 0x1dc
 
-gUnknown_0862AF30: ; 862AF30
+gUnknown_0862AF30: @ 862AF30
 	.incbin "base_emerald.gba", 0x62af30, 0x60c
 
-gUnknown_0862B53C: ; 862B53C
+gUnknown_0862B53C: @ 862B53C
 	.incbin "base_emerald.gba", 0x62b53c, 0x1e8
 
-gUnknown_0862B724: ; 862B724
+gUnknown_0862B724: @ 862B724
 	.incbin "base_emerald.gba", 0x62b724, 0x8
 
-gUnknown_0862B72C: ; 862B72C
+gUnknown_0862B72C: @ 862B72C
 	.incbin "base_emerald.gba", 0x62b72c, 0x2c
 
-gUnknown_0862B758: ; 862B758
+gUnknown_0862B758: @ 862B758
 	.incbin "base_emerald.gba", 0x62b758, 0x18
 
-gUnknown_0862B770: ; 862B770
+gUnknown_0862B770: @ 862B770
 	.incbin "base_emerald.gba", 0x62b770, 0x14
 
-gUnknown_0862B784: ; 862B784
+gUnknown_0862B784: @ 862B784
 	.incbin "base_emerald.gba", 0x62b784, 0x14
 
-gUnknown_0862B798: ; 862B798
+gUnknown_0862B798: @ 862B798
 	.incbin "base_emerald.gba", 0x62b798, 0x14
 
-gUnknown_0862B7AC: ; 862B7AC
+gUnknown_0862B7AC: @ 862B7AC
 	.incbin "base_emerald.gba", 0x62b7ac, 0x14
 
-gUnknown_0862B7C0: ; 862B7C0
+gUnknown_0862B7C0: @ 862B7C0
 	.incbin "base_emerald.gba", 0x62b7c0, 0x14
 
-gUnknown_0862B7D4: ; 862B7D4
+gUnknown_0862B7D4: @ 862B7D4
 	.incbin "base_emerald.gba", 0x62b7d4, 0x14
 
-gUnknown_0862B7E8: ; 862B7E8
+gUnknown_0862B7E8: @ 862B7E8
 	.incbin "base_emerald.gba", 0x62b7e8, 0x14
 
-gUnknown_0862B7FC: ; 862B7FC
+gUnknown_0862B7FC: @ 862B7FC
 	.incbin "base_emerald.gba", 0x62b7fc, 0x2e8
 
 	.align 2, 0
 
-gFont8LatinGlyphs: ; 862BAE4
+gFont8LatinGlyphs: @ 862BAE4
 	.incbin "data/graphics/fonts/font8.latfont"
 
-gFont8LatinGlyphWidths: ; 8633AE4
+gFont8LatinGlyphWidths: @ 8633AE4
 	.include "data/graphics/fonts/font8_latin_widths.s"
 
 	.align 2, 0
 
-gFont0LatinGlyphs: ; 8633CE4
+gFont0LatinGlyphs: @ 8633CE4
 	.incbin "data/graphics/fonts/font0.latfont"
 
-gFont0LatinGlyphWidths: ; 863BCE4
+gFont0LatinGlyphWidths: @ 863BCE4
 	.include "data/graphics/fonts/font0_latin_widths.s"
 
 	.align 2, 0
 
-gFont7LatinGlyphs: ; 863BEE4
+gFont7LatinGlyphs: @ 863BEE4
 	.incbin "data/graphics/fonts/font7.latfont"
 
-gFont7LatinGlyphWidths: ; 8643EE4
+gFont7LatinGlyphWidths: @ 8643EE4
 	.include "data/graphics/fonts/font7_latin_widths.s"
 
 	.align 2, 0
 
-gFont2LatinGlyphs: ; 86440E4
+gFont2LatinGlyphs: @ 86440E4
 	.incbin "data/graphics/fonts/font2.latfont"
 
-gFont2LatinGlyphWidths: ; 864C0E4
+gFont2LatinGlyphWidths: @ 864C0E4
 	.include "data/graphics/fonts/font2_latin_widths.s"
 
 	.align 2, 0
 
-gFont1LatinGlyphs: ; 864C2E4
+gFont1LatinGlyphs: @ 864C2E4
 	.incbin "data/graphics/fonts/font1.latfont"
 
-gFont1LatinGlyphWidths: ; 86542E4
+gFont1LatinGlyphWidths: @ 86542E4
 	.include "data/graphics/fonts/font1_latin_widths.s"
 
 	.align 2, 0
 
-gFont0JapaneseGlyphs: ; 86544E4
+gFont0JapaneseGlyphs: @ 86544E4
 	.incbin "data/graphics/fonts/font0.hwjpnfont"
 
 	.align 2, 0
 
-gFont1JapaneseGlyphs: ; 86584E4
+gFont1JapaneseGlyphs: @ 86584E4
 	.incbin "data/graphics/fonts/font1.hwjpnfont"
 
 	.align 2, 0
 
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs: ; 865C4E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs: @ 865C4E4
 	.incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont"
 
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths: ; 86644E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths: @ 86644E4
 	.include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.s"
 
 	.align 2, 0
 
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs: ; 86646E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs: @ 86646E4
 	.incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont"
 
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths: ; 866C6E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths: @ 866C6E4
 	.include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.s"
 
 	.align 2, 0
 
-gFont2JapaneseGlyphs: ; 866C8E4
+gFont2JapaneseGlyphs: @ 866C8E4
 	.incbin "data/graphics/fonts/font2.fwjpnfont"
 
-gFont2JapaneseGlyphWidths: ; 86748E4
+gFont2JapaneseGlyphWidths: @ 86748E4
 	.include "data/graphics/fonts/font2_japanese_widths.s"
 
-gUnknown_08674AE4: ; 8674AE4
+gUnknown_08674AE4: @ 8674AE4
 	.incbin "base_emerald.gba", 0x674ae4, 0x32
 
-gUnknown_08674B16: ; 8674B16
+gUnknown_08674B16: @ 8674B16
 	.incbin "base_emerald.gba", 0x674b16, 0x2c
 
-gUnknown_08674B42: ; 8674B42
+gUnknown_08674B42: @ 8674B42
 	.incbin "base_emerald.gba", 0x674b42, 0x28
 
-gUnknown_08674B6A: ; 8674B6A
+gUnknown_08674B6A: @ 8674B6A
 	.incbin "base_emerald.gba", 0x674b6a, 0x34
 
-gUnknown_08674B9E: ; 8674B9E
+gUnknown_08674B9E: @ 8674B9E
 	.incbin "base_emerald.gba", 0x674b9e, 0x36
 
-gUnknown_08674BD4: ; 8674BD4
+gUnknown_08674BD4: @ 8674BD4
 	.incbin "base_emerald.gba", 0x674bd4, 0x1c
 
-gUnknown_08674BF0: ; 8674BF0
+gUnknown_08674BF0: @ 8674BF0
 	.incbin "base_emerald.gba", 0x674bf0, 0x12
 
-gUnknown_08674C02: ; 8674C02
+gUnknown_08674C02: @ 8674C02
 	.incbin "base_emerald.gba", 0x674c02, 0x2f
 
-gUnknown_08674C31: ; 8674C31
+gUnknown_08674C31: @ 8674C31
 	.incbin "base_emerald.gba", 0x674c31, 0x55
 
-gUnknown_08674C86: ; 8674C86
+gUnknown_08674C86: @ 8674C86
 	.incbin "base_emerald.gba", 0x674c86, 0xd5a
 
-gUnknown_086759E0: ; 86759E0
+gUnknown_086759E0: @ 86759E0
 	.incbin "base_emerald.gba", 0x6759e0, 0x90
 
-gUnknown_08675A70: ; 8675A70
+gUnknown_08675A70: @ 8675A70
 	.incbin "base_emerald.gba", 0x675a70, 0x10
 
-gUnknown_08675A80: ; 8675A80
+gUnknown_08675A80: @ 8675A80
 	.incbin "base_emerald.gba", 0x675a80, 0xb4
 
-gUnknown_08675B34: ; 8675B34
+gUnknown_08675B34: @ 8675B34
 	.incbin "base_emerald.gba", 0x675b34, 0x30
 
-gUnknown_08675B64: ; 8675B64
+gUnknown_08675B64: @ 8675B64
 	.incbin "base_emerald.gba", 0x675b64, 0x18
 
-gUnknown_08675B7C: ; 8675B7C
+gUnknown_08675B7C: @ 8675B7C
 	.incbin "base_emerald.gba", 0x675b7c, 0x84
 
-gUnknown_08675C00: ; 8675C00
+gUnknown_08675C00: @ 8675C00
 	.incbin "base_emerald.gba", 0x675c00, 0x18
 
-gUnknown_08675C18: ; 8675C18
+gUnknown_08675C18: @ 8675C18
 	.incbin "base_emerald.gba", 0x675c18, 0x3c
 
-gUnknown_08675C54: ; 8675C54
+gUnknown_08675C54: @ 8675C54
 	.incbin "base_emerald.gba", 0x675c54, 0x10
 
-gUnknown_08675C64: ; 8675C64
+gUnknown_08675C64: @ 8675C64
 	.incbin "base_emerald.gba", 0x675c64, 0x34
 
-gUnknown_08675C98: ; 8675C98
+gUnknown_08675C98: @ 8675C98
 	.incbin "base_emerald.gba", 0x675c98, 0x34
 
-gUnknown_08675CCC: ; 8675CCC
+gUnknown_08675CCC: @ 8675CCC
 	.incbin "base_emerald.gba", 0x675ccc, 0x28028
 
-gUnknown_0869DCF4: ; 869DCF4
+gUnknown_0869DCF4: @ 869DCF4
 	.incbin "base_emerald.gba", 0x69dcf4, 0x600
 
-gUnknown_0869E2F4: ; 869E2F4
+gUnknown_0869E2F4: @ 869E2F4
 	.incbin "base_emerald.gba", 0x69e2f4, 0x600
 
-gUnknown_0869E8F4: ; 869E8F4
+gUnknown_0869E8F4: @ 869E8F4
 	.incbin "base_emerald.gba", 0x69e8f4, 0x600
 
-gUnknown_0869EEF4: ; 869EEF4
+gUnknown_0869EEF4: @ 869EEF4
 	.incbin "base_emerald.gba", 0x69eef4, 0x30
 
-gUnknown_0869EF24: ; 869EF24
+gUnknown_0869EF24: @ 869EF24
 	.incbin "base_emerald.gba", 0x69ef24, 0x600
 
-gUnknown_0869F524: ; 869F524
+gUnknown_0869F524: @ 869F524
 	.incbin "base_emerald.gba", 0x69f524, 0x600
 
-gUnknown_0869FB24: ; 869FB24
+gUnknown_0869FB24: @ 869FB24
 	.incbin "base_emerald.gba", 0x69fb24, 0x600
 
-gUnknown_086A0124: ; 86A0124
+gUnknown_086A0124: @ 86A0124
 	.incbin "base_emerald.gba", 0x6a0124, 0x1489c
 
-gUnknown_086B49C0: ; 86B49C0
+gUnknown_086B49C0: @ 86B49C0
 	.incbin "base_emerald.gba", 0x6b49c0, 0x30
 
-gUnknown_086B49F0: ; 86B49F0
+gUnknown_086B49F0: @ 86B49F0
 	.incbin "base_emerald.gba", 0x6b49f0, 0x2ee6e0
 
-gUnknown_089A30D0: ; 89A30D0
+gUnknown_089A30D0: @ 89A30D0
 	.incbin "base_emerald.gba", 0x9a30d0, 0x150
 
-gUnknown_089A3220: ; 89A3220
+gUnknown_089A3220: @ 89A3220
 	.incbin "base_emerald.gba", 0x9a3220, 0x2c
 
-gUnknown_089A324C: ; 89A324C
+gUnknown_089A324C: @ 89A324C
 	.incbin "base_emerald.gba", 0x9a324c, 0xc
 
-gUnknown_089A3258: ; 89A3258
+gUnknown_089A3258: @ 89A3258
 	.incbin "base_emerald.gba", 0x9a3258, 0x18
 
-gUnknown_089A3270: ; 89A3270
+gUnknown_089A3270: @ 89A3270
 	.incbin "base_emerald.gba", 0x9a3270, 0x100
 
-gUnknown_089A3370: ; 89A3370
+gUnknown_089A3370: @ 89A3370
 	.incbin "base_emerald.gba", 0x9a3370, 0x100
 
-gUnknown_089A3470: ; 89A3470
+gUnknown_089A3470: @ 89A3470
 	.incbin "base_emerald.gba", 0x9a3470, 0x30e0
 
-gUnknown_089A6550: ; 89A6550
+gUnknown_089A6550: @ 89A6550
 	.incbin "base_emerald.gba", 0x9a6550, 0xc0
 
-gMultiBootProgram_BerryGlitchFix_Start: ; 89A6610
+gMultiBootProgram_BerryGlitchFix_Start: @ 89A6610
 	.incbin "base_emerald.gba", 0x9a6610, 0x3b34
 gMultiBootProgram_BerryGlitchFix_End:
 
-gMultiBootProgram_PokemonColosseum_Start: ; 89AA144
+gMultiBootProgram_PokemonColosseum_Start: @ 89AA144
 	.incbin "base_emerald.gba", 0x9aa144, 0x28000
 gMultiBootProgram_PokemonColosseum_End:
 
 	zero_fill 0x8B00000 - 0x89D2144
 
-; 8B00000
+@ 8B00000
 	.include "data/graphics/pokemon/mon_front_pics.s"
 
 	zero_fill 0x8c00000 - 0x8b98b28
 
-gUnknown_08C00000: ; 8C00000
+gUnknown_08C00000: @ 8C00000
 	.incbin "base_emerald.gba", 0xc00000, 0x4e0
 
-gUnknown_08C004E0: ; 8C004E0
+gUnknown_08C004E0: @ 8C004E0
 	.incbin "base_emerald.gba", 0xc004e0, 0x44
 
-gUnknown_08C00524: ; 8C00524
+gUnknown_08C00524: @ 8C00524
 	.incbin "base_emerald.gba", 0xc00524, 0x22c
 
-; 8C00750
+@ 8C00750
 	.include "data/graphics/pokemon/circled_question_mark_graphics.s"
 
-; 8C00C10
+@ 8C00C10
 	.incbin "base_emerald.gba", 0xc00c10, 0x16f0
 
-gUnknown_08C02300: ; 8C02300
+gUnknown_08C02300: @ 8C02300
 	.incbin "base_emerald.gba", 0xc02300, 0x70f0
 
-gUnknown_08C093F0: ; 8C093F0
+gUnknown_08C093F0: @ 8C093F0
 	.incbin "base_emerald.gba", 0xc093f0, 0x87ec
 
-gUnknown_08C11BDC: ; 8C11BDC
+gUnknown_08C11BDC: @ 8C11BDC
 	.incbin "base_emerald.gba", 0xc11bdc, 0x52b4
 
-gUnknown_08C16E90: ; 8C16E90
+gUnknown_08C16E90: @ 8C16E90
 	.incbin "base_emerald.gba", 0xc16e90, 0x118
 
-gUnknown_08C16FA8: ; 8C16FA8
+gUnknown_08C16FA8: @ 8C16FA8
 	.incbin "base_emerald.gba", 0xc16fa8, 0x1c8
 
-gUnknown_08C17170: ; 8C17170
+gUnknown_08C17170: @ 8C17170
 	.incbin "base_emerald.gba", 0xc17170, 0x810
 
-gUnknown_08C17980: ; 8C17980
+gUnknown_08C17980: @ 8C17980
 	.incbin "base_emerald.gba", 0xc17980, 0x130
 
-gUnknown_08C17AB0: ; 8C17AB0
+gUnknown_08C17AB0: @ 8C17AB0
 	.incbin "base_emerald.gba", 0xc17ab0, 0xa5c
 
-gUnknown_08C1850C: ; 8C1850C
+gUnknown_08C1850C: @ 8C1850C
 	.incbin "base_emerald.gba", 0xc1850c, 0x107c
 
-gUnknown_08C19588: ; 8C19588
+gUnknown_08C19588: @ 8C19588
 	.incbin "base_emerald.gba", 0xc19588, 0x964
 
-gUnknown_08C19EEC: ; 8C19EEC
+gUnknown_08C19EEC: @ 8C19EEC
 	.incbin "base_emerald.gba", 0xc19eec, 0x114
 
-gUnknown_08C1A000: ; 8C1A000
+gUnknown_08C1A000: @ 8C1A000
 	.incbin "base_emerald.gba", 0xc1a000, 0x12c
 
-gUnknown_08C1A12C: ; 8C1A12C
+gUnknown_08C1A12C: @ 8C1A12C
 	.incbin "base_emerald.gba", 0xc1a12c, 0x188
 
-gUnknown_08C1A2B4: ; 8C1A2B4
+gUnknown_08C1A2B4: @ 8C1A2B4
 	.incbin "base_emerald.gba", 0xc1a2b4, 0x2404
 
-gUnknown_08C1C6B8: ; 8C1C6B8
+gUnknown_08C1C6B8: @ 8C1C6B8
 	.incbin "base_emerald.gba", 0xc1c6b8, 0x9f4
 
-gUnknown_08C1D0AC: ; 8C1D0AC
+gUnknown_08C1D0AC: @ 8C1D0AC
 	.incbin "base_emerald.gba", 0xc1d0ac, 0x13c
 
-gUnknown_08C1D1E8: ; 8C1D1E8
+gUnknown_08C1D1E8: @ 8C1D1E8
 	.incbin "base_emerald.gba", 0xc1d1e8, 0x28
 
-gUnknown_08C1D210: ; 8C1D210
+gUnknown_08C1D210: @ 8C1D210
 	.incbin "base_emerald.gba", 0xc1d210, 0x3458
 
-gUnknown_08C20668: ; 8C20668
+gUnknown_08C20668: @ 8C20668
 	.incbin "base_emerald.gba", 0xc20668, 0x1c
 
-gUnknown_08C20684: ; 8C20684
+gUnknown_08C20684: @ 8C20684
 	.incbin "base_emerald.gba", 0xc20684, 0x1f8c
 
-gUnknown_08C22610: ; 8C22610
+gUnknown_08C22610: @ 8C22610
 	.incbin "base_emerald.gba", 0xc22610, 0xcd0
 
-gUnknown_08C232E0: ; 8C232E0
+gUnknown_08C232E0: @ 8C232E0
 	.incbin "base_emerald.gba", 0xc232e0, 0xa70
 
-gUnknown_08C23D50: ; 8C23D50
+gUnknown_08C23D50: @ 8C23D50
 	.incbin "base_emerald.gba", 0xc23d50, 0x28
 
-gUnknown_08C23D78: ; 8C23D78
+gUnknown_08C23D78: @ 8C23D78
 	.incbin "base_emerald.gba", 0xc23d78, 0xc58
 
-gUnknown_08C249D0: ; 8C249D0
+gUnknown_08C249D0: @ 8C249D0
 	.incbin "base_emerald.gba", 0xc249d0, 0x28
 
-gUnknown_08C249F8: ; 8C249F8
+gUnknown_08C249F8: @ 8C249F8
 	.incbin "base_emerald.gba", 0xc249f8, 0x5c3c
 
-gUnknown_08C2A634: ; 8C2A634
+gUnknown_08C2A634: @ 8C2A634
 	.incbin "base_emerald.gba", 0xc2a634, 0xa0
 
-gUnknown_08C2A6D4: ; 8C2A6D4
+gUnknown_08C2A6D4: @ 8C2A6D4
 	.incbin "base_emerald.gba", 0xc2a6d4, 0x18
 
-gUnknown_08C2A6EC: ; 8C2A6EC
+gUnknown_08C2A6EC: @ 8C2A6EC
 	.incbin "base_emerald.gba", 0xc2a6ec, 0x27d0
 
-gUnknown_08C2CEBC: ; 8C2CEBC
+gUnknown_08C2CEBC: @ 8C2CEBC
 	.incbin "base_emerald.gba", 0xc2cebc, 0x24
 
-gUnknown_08C2CEE0: ; 8C2CEE0
+gUnknown_08C2CEE0: @ 8C2CEE0
 	.incbin "base_emerald.gba", 0xc2cee0, 0x240
 
-gUnknown_08C2D120: ; 8C2D120
+gUnknown_08C2D120: @ 8C2D120
 	.incbin "base_emerald.gba", 0xc2d120, 0x600
 
-gUnknown_08C2D720: ; 8C2D720
+gUnknown_08C2D720: @ 8C2D720
 	.incbin "base_emerald.gba", 0xc2d720, 0x210
 
-gUnknown_08C2D930: ; 8C2D930
+gUnknown_08C2D930: @ 8C2D930
 	.incbin "base_emerald.gba", 0xc2d930, 0x11c
 
-gUnknown_08C2DA4C: ; 8C2DA4C
+gUnknown_08C2DA4C: @ 8C2DA4C
 	.incbin "base_emerald.gba", 0xc2da4c, 0x11c
 
-gUnknown_08C2DB68: ; 8C2DB68
+gUnknown_08C2DB68: @ 8C2DB68
 	.incbin "base_emerald.gba", 0xc2db68, 0x20
 
-gUnknown_08C2DB88: ; 8C2DB88
+gUnknown_08C2DB88: @ 8C2DB88
 	.incbin "base_emerald.gba", 0xc2db88, 0x20
 
-gUnknown_08C2DBA8: ; 8C2DBA8
+gUnknown_08C2DBA8: @ 8C2DBA8
 	.incbin "base_emerald.gba", 0xc2dba8, 0x20
 
-gUnknown_08C2DBC8: ; 8C2DBC8
+gUnknown_08C2DBC8: @ 8C2DBC8
 	.incbin "base_emerald.gba", 0xc2dbc8, 0x20
 
-gUnknown_08C2DBE8: ; 8C2DBE8
+gUnknown_08C2DBE8: @ 8C2DBE8
 	.incbin "base_emerald.gba", 0xc2dbe8, 0x20
 
-gUnknown_08C2DC08: ; 8C2DC08
+gUnknown_08C2DC08: @ 8C2DC08
 	.incbin "base_emerald.gba", 0xc2dc08, 0x20
 
-gUnknown_08C2DC28: ; 8C2DC28
+gUnknown_08C2DC28: @ 8C2DC28
 	.incbin "base_emerald.gba", 0xc2dc28, 0x20
 
-gUnknown_08C2DC48: ; 8C2DC48
+gUnknown_08C2DC48: @ 8C2DC48
 	.incbin "base_emerald.gba", 0xc2dc48, 0x20
 
-gUnknown_08C2DC68: ; 8C2DC68
+gUnknown_08C2DC68: @ 8C2DC68
 	.incbin "base_emerald.gba", 0xc2dc68, 0x13c
 
-gUnknown_08C2DDA4: ; 8C2DDA4
+gUnknown_08C2DDA4: @ 8C2DDA4
 	.incbin "base_emerald.gba", 0xc2dda4, 0x20
 
-gUnknown_08C2DDC4: ; 8C2DDC4
+gUnknown_08C2DDC4: @ 8C2DDC4
 	.incbin "base_emerald.gba", 0xc2ddc4, 0xc8c
 
-gUnknown_08C2EA50: ; 8C2EA50
+gUnknown_08C2EA50: @ 8C2EA50
 	.incbin "base_emerald.gba", 0xc2ea50, 0x4c
 
-gUnknown_08C2EA9C: ; 8C2EA9C
+gUnknown_08C2EA9C: @ 8C2EA9C
 	.incbin "base_emerald.gba", 0xc2ea9c, 0xf6c
 
-; 8C2FA08
+@ 8C2FA08
 	.include "data/graphics/pokemon/mon_graphics.s"
 
-; 8D51DC8
+@ 8D51DC8
 	.include "data/graphics/trainers/trainer_graphics.s"
 
 	.align 2, 0
 
-gMonIcon_QuestionMark: ; 8D774D0
+gMonIcon_QuestionMark: @ 8D774D0
 	.incbin "data/graphics/pokemon/icons/question_mark_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_QuestionMark: ; 8D778D0
+gMonFootprint_QuestionMark: @ 8D778D0
 	.incbin "data/graphics/pokemon/footprints/question_mark_footprint.1bpp"
 
-gUnknown_08D778F0: ; 8D778F0
+gUnknown_08D778F0: @ 8D778F0
 	.incbin "base_emerald.gba", 0xd778f0, 0xe8
 
-gUnknown_08D779D8: ; 8D779D8
+gUnknown_08D779D8: @ 8D779D8
 	.incbin "base_emerald.gba", 0xd779d8, 0x10c
 
-gUnknown_08D77AE4: ; 8D77AE4
+gUnknown_08D77AE4: @ 8D77AE4
 	.incbin "base_emerald.gba", 0xd77ae4, 0x28
 
-gUnknown_08D77B0C: ; 8D77B0C
+gUnknown_08D77B0C: @ 8D77B0C
 	.incbin "base_emerald.gba", 0xd77b0c, 0x25fc
 
-gUnknown_08D7A108: ; 8D7A108
+gUnknown_08D7A108: @ 8D7A108
 	.incbin "base_emerald.gba", 0xd7a108, 0x618
 
-gUnknown_08D7A720: ; 8D7A720
+gUnknown_08D7A720: @ 8D7A720
 	.incbin "base_emerald.gba", 0xd7a720, 0x13f4
 
-gUnknown_08D7BB14: ; 8D7BB14
+gUnknown_08D7BB14: @ 8D7BB14
 	.incbin "base_emerald.gba", 0xd7bb14, 0x640
 
-gUnknown_08D7C154: ; 8D7C154
+gUnknown_08D7C154: @ 8D7C154
 	.incbin "base_emerald.gba", 0xd7c154, 0x2ec
 
-gUnknown_08D7C440: ; 8D7C440
+gUnknown_08D7C440: @ 8D7C440
 	.incbin "base_emerald.gba", 0xd7c440, 0x5ac
 
-gUnknown_08D7C9EC: ; 8D7C9EC
+gUnknown_08D7C9EC: @ 8D7C9EC
 	.incbin "base_emerald.gba", 0xd7c9ec, 0x3c
 
-gUnknown_08D7CA28: ; 8D7CA28
+gUnknown_08D7CA28: @ 8D7CA28
 	.incbin "base_emerald.gba", 0xd7ca28, 0x2b0
 
-gUnknown_08D7CCD8: ; 8D7CCD8
+gUnknown_08D7CCD8: @ 8D7CCD8
 	.incbin "base_emerald.gba", 0xd7ccd8, 0x608
 
-gUnknown_08D7D2E0: ; 8D7D2E0
+gUnknown_08D7D2E0: @ 8D7D2E0
 	.incbin "base_emerald.gba", 0xd7d2e0, 0x2b0
 
-gUnknown_08D7D590: ; 8D7D590
+gUnknown_08D7D590: @ 8D7D590
 	.incbin "base_emerald.gba", 0xd7d590, 0x674
 
-gUnknown_08D7DC04: ; 8D7DC04
+gUnknown_08D7DC04: @ 8D7DC04
 	.incbin "base_emerald.gba", 0xd7dc04, 0x2f0
 
-gUnknown_08D7DEF4: ; 8D7DEF4
+gUnknown_08D7DEF4: @ 8D7DEF4
 	.incbin "base_emerald.gba", 0xd7def4, 0x3c
 
-gUnknown_08D7DF30: ; 8D7DF30
+gUnknown_08D7DF30: @ 8D7DF30
 	.incbin "base_emerald.gba", 0xd7df30, 0x58
 
-gUnknown_08D7DF88: ; 8D7DF88
+gUnknown_08D7DF88: @ 8D7DF88
 	.incbin "base_emerald.gba", 0xd7df88, 0x3c
 
-gUnknown_08D7DFC4: ; 8D7DFC4
+gUnknown_08D7DFC4: @ 8D7DFC4
 	.incbin "base_emerald.gba", 0xd7dfc4, 0x3c
 
-gUnknown_08D7E000: ; 8D7E000
+gUnknown_08D7E000: @ 8D7E000
 	.incbin "base_emerald.gba", 0xd7e000, 0x60
 
-gUnknown_08D7E060: ; 8D7E060
+gUnknown_08D7E060: @ 8D7E060
 	.incbin "base_emerald.gba", 0xd7e060, 0x6c
 
-gUnknown_08D7E0CC: ; 8D7E0CC
+gUnknown_08D7E0CC: @ 8D7E0CC
 	.incbin "base_emerald.gba", 0xd7e0cc, 0x50
 
-gUnknown_08D7E11C: ; 8D7E11C
+gUnknown_08D7E11C: @ 8D7E11C
 	.incbin "base_emerald.gba", 0xd7e11c, 0x48
 
-gUnknown_08D7E164: ; 8D7E164
+gUnknown_08D7E164: @ 8D7E164
 	.incbin "base_emerald.gba", 0xd7e164, 0x44
 
-gUnknown_08D7E1A8: ; 8D7E1A8
+gUnknown_08D7E1A8: @ 8D7E1A8
 	.incbin "base_emerald.gba", 0xd7e1a8, 0x50
 
-gUnknown_08D7E1F8: ; 8D7E1F8
+gUnknown_08D7E1F8: @ 8D7E1F8
 	.incbin "base_emerald.gba", 0xd7e1f8, 0x3c
 
-gUnknown_08D7E234: ; 8D7E234
+gUnknown_08D7E234: @ 8D7E234
 	.incbin "base_emerald.gba", 0xd7e234, 0x17c4
 
-gUnknown_08D7F9F8: ; 8D7F9F8
+gUnknown_08D7F9F8: @ 8D7F9F8
 	.incbin "base_emerald.gba", 0xd7f9f8, 0x4cc
 
-gUnknown_08D7FEC4: ; 8D7FEC4
+gUnknown_08D7FEC4: @ 8D7FEC4
 	.incbin "base_emerald.gba", 0xd7fec4, 0x174c
 
-gUnknown_08D81610: ; 8D81610
+gUnknown_08D81610: @ 8D81610
 	.incbin "base_emerald.gba", 0xd81610, 0x81c
 
-gUnknown_08D81E2C: ; 8D81E2C
+gUnknown_08D81E2C: @ 8D81E2C
 	.incbin "base_emerald.gba", 0xd81e2c, 0x2a8
 
-gUnknown_08D820D4: ; 8D820D4
+gUnknown_08D820D4: @ 8D820D4
 	.incbin "base_emerald.gba", 0xd820d4, 0x410
 
-gUnknown_08D824E4: ; 8D824E4
+gUnknown_08D824E4: @ 8D824E4
 	.incbin "base_emerald.gba", 0xd824e4, 0x124
 
-gUnknown_08D82608: ; 8D82608
+gUnknown_08D82608: @ 8D82608
 	.incbin "base_emerald.gba", 0xd82608, 0x668
 
-gUnknown_08D82C70: ; 8D82C70
+gUnknown_08D82C70: @ 8D82C70
 	.incbin "base_emerald.gba", 0xd82c70, 0x2a0
 
-gUnknown_08D82F10: ; 8D82F10
+gUnknown_08D82F10: @ 8D82F10
 	.incbin "base_emerald.gba", 0xd82f10, 0x5ec
 
-gUnknown_08D834FC: ; 8D834FC
+gUnknown_08D834FC: @ 8D834FC
 	.incbin "base_emerald.gba", 0xd834fc, 0x404
 
-gUnknown_08D83900: ; 8D83900
+gUnknown_08D83900: @ 8D83900
 	.incbin "base_emerald.gba", 0xd83900, 0x22c
 
-gUnknown_08D83B2C: ; 8D83B2C
+gUnknown_08D83B2C: @ 8D83B2C
 	.incbin "base_emerald.gba", 0xd83b2c, 0x110
 
-gUnknown_08D83C3C: ; 8D83C3C
+gUnknown_08D83C3C: @ 8D83C3C
 	.incbin "base_emerald.gba", 0xd83c3c, 0x114
 
-gUnknown_08D83D50: ; 8D83D50
+gUnknown_08D83D50: @ 8D83D50
 	.incbin "base_emerald.gba", 0xd83d50, 0xc20
 
-gUnknown_08D84970: ; 8D84970
+gUnknown_08D84970: @ 8D84970
 	.incbin "base_emerald.gba", 0xd84970, 0x590
 
-gUnknown_08D84F00: ; 8D84F00
+gUnknown_08D84F00: @ 8D84F00
 	.incbin "base_emerald.gba", 0xd84f00, 0x458
 
-gUnknown_08D85358: ; 8D85358
+gUnknown_08D85358: @ 8D85358
 	.incbin "base_emerald.gba", 0xd85358, 0xec
 
-gUnknown_08D85444: ; 8D85444
+gUnknown_08D85444: @ 8D85444
 	.incbin "base_emerald.gba", 0xd85444, 0x84
 
-gUnknown_08D854C8: ; 8D854C8
+gUnknown_08D854C8: @ 8D854C8
 	.incbin "base_emerald.gba", 0xd854c8, 0x120
 
-gUnknown_08D855E8: ; 8D855E8
+gUnknown_08D855E8: @ 8D855E8
 	.incbin "base_emerald.gba", 0xd855e8, 0x18
 
-gUnknown_08D85600: ; 8D85600
+gUnknown_08D85600: @ 8D85600
 	.incbin "base_emerald.gba", 0xd85600, 0x20
 
-gUnknown_08D85620: ; 8D85620
+gUnknown_08D85620: @ 8D85620
 	.incbin "base_emerald.gba", 0xd85620, 0xa8
 
-gUnknown_08D856C8: ; 8D856C8
+gUnknown_08D856C8: @ 8D856C8
 	.incbin "base_emerald.gba", 0xd856c8, 0xe0
 
-gUnknown_08D857A8: ; 8D857A8
+gUnknown_08D857A8: @ 8D857A8
 	.incbin "base_emerald.gba", 0xd857a8, 0x274
 
-gUnknown_08D85A1C: ; 8D85A1C
+gUnknown_08D85A1C: @ 8D85A1C
 	.incbin "base_emerald.gba", 0xd85a1c, 0x234
 
-gUnknown_08D85C50: ; 8D85C50
+gUnknown_08D85C50: @ 8D85C50
 	.incbin "base_emerald.gba", 0xd85c50, 0x80
 
-gUnknown_08D85CD0: ; 8D85CD0
+gUnknown_08D85CD0: @ 8D85CD0
 	.incbin "base_emerald.gba", 0xd85cd0, 0x182
 
-gUnknown_08D85E52: ; 8D85E52
+gUnknown_08D85E52: @ 8D85E52
 	.incbin "base_emerald.gba", 0xd85e52, 0x20
 
-gUnknown_08D85E72: ; 8D85E72
+gUnknown_08D85E72: @ 8D85E72
 	.incbin "base_emerald.gba", 0xd85e72, 0xa
 
-gUnknown_08D85E7C: ; 8D85E7C
+gUnknown_08D85E7C: @ 8D85E7C
 	.incbin "base_emerald.gba", 0xd85e7c, 0x2618
 
-gUnknown_08D88494: ; 8D88494
+gUnknown_08D88494: @ 8D88494
 	.incbin "base_emerald.gba", 0xd88494, 0x8ac
 
-gUnknown_08D88D40: ; 8D88D40
+gUnknown_08D88D40: @ 8D88D40
 	.incbin "base_emerald.gba", 0xd88d40, 0x4e4
 
-gUnknown_08D89224: ; 8D89224
+gUnknown_08D89224: @ 8D89224
 	.incbin "base_emerald.gba", 0xd89224, 0x898
 
-gUnknown_08D89ABC: ; 8D89ABC
+gUnknown_08D89ABC: @ 8D89ABC
 	.incbin "base_emerald.gba", 0xd89abc, 0x4c0
 
-gUnknown_08D89F7C: ; 8D89F7C
+gUnknown_08D89F7C: @ 8D89F7C
 	.incbin "base_emerald.gba", 0xd89f7c, 0x89c
 
-gUnknown_08D8A818: ; 8D8A818
+gUnknown_08D8A818: @ 8D8A818
 	.incbin "base_emerald.gba", 0xd8a818, 0x11c
 
-gUnknown_08D8A934: ; 8D8A934
+gUnknown_08D8A934: @ 8D8A934
 	.incbin "base_emerald.gba", 0xd8a934, 0x120
 
-gUnknown_08D8AA54: ; 8D8AA54
+gUnknown_08D8AA54: @ 8D8AA54
 	.incbin "base_emerald.gba", 0xd8aa54, 0x72c
 
-gUnknown_08D8B180: ; 8D8B180
+gUnknown_08D8B180: @ 8D8B180
 	.incbin "base_emerald.gba", 0xd8b180, 0x2c0
 
-gUnknown_08D8B440: ; 8D8B440
+gUnknown_08D8B440: @ 8D8B440
 	.incbin "base_emerald.gba", 0xd8b440, 0x2a8
 
-gUnknown_08D8B6E8: ; 8D8B6E8
+gUnknown_08D8B6E8: @ 8D8B6E8
 	.incbin "base_emerald.gba", 0xd8b6e8, 0x38c
 
-gUnknown_08D8BA74: ; 8D8BA74
+gUnknown_08D8BA74: @ 8D8BA74
 	.incbin "base_emerald.gba", 0xd8ba74, 0x6f8
 
-gUnknown_08D8C16C: ; 8D8C16C
+gUnknown_08D8C16C: @ 8D8C16C
 	.incbin "base_emerald.gba", 0xd8c16c, 0x6cc
 
-gUnknown_08D8C838: ; 8D8C838
+gUnknown_08D8C838: @ 8D8C838
 	.incbin "base_emerald.gba", 0xd8c838, 0x490
 
-gUnknown_08D8CCC8: ; 8D8CCC8
+gUnknown_08D8CCC8: @ 8D8CCC8
 	.incbin "base_emerald.gba", 0xd8ccc8, 0x748
 
-gUnknown_08D8D410: ; 8D8D410
+gUnknown_08D8D410: @ 8D8D410
 	.incbin "base_emerald.gba", 0xd8d410, 0x17c
 
-gUnknown_08D8D58C: ; 8D8D58C
+gUnknown_08D8D58C: @ 8D8D58C
 	.incbin "base_emerald.gba", 0xd8d58c, 0x52c
 
-gUnknown_08D8DAB8: ; 8D8DAB8
+gUnknown_08D8DAB8: @ 8D8DAB8
 	.incbin "base_emerald.gba", 0xd8dab8, 0xefc
 
-gUnknown_08D8E9B4: ; 8D8E9B4
+gUnknown_08D8E9B4: @ 8D8E9B4
 	.incbin "base_emerald.gba", 0xd8e9b4, 0x80
 
-gUnknown_08D8EA34: ; 8D8EA34
+gUnknown_08D8EA34: @ 8D8EA34
 	.incbin "base_emerald.gba", 0xd8ea34, 0x1f0
 
-gUnknown_08D8EC24: ; 8D8EC24
+gUnknown_08D8EC24: @ 8D8EC24
 	.incbin "base_emerald.gba", 0xd8ec24, 0xf78
 
-gUnknown_08D8FB9C: ; 8D8FB9C
+gUnknown_08D8FB9C: @ 8D8FB9C
 	.incbin "base_emerald.gba", 0xd8fb9c, 0xd8
 
 	.align 2, 0
 
-gMonIcon_Egg: ; 8D8FC74
+gMonIcon_Egg: @ 8D8FC74
 	.incbin "data/graphics/pokemon/icons/egg_icon.4bpp"
 
 	.incbin "base_emerald.gba", 0xd90074, 0x1524
 
-gUnknown_08D91598: ; 8D91598
+gUnknown_08D91598: @ 8D91598
 	.incbin "base_emerald.gba", 0xd91598, 0x820
 
-gUnknown_08D91DB8: ; 8D91DB8
+gUnknown_08D91DB8: @ 8D91DB8
 	.incbin "base_emerald.gba", 0xd91db8, 0xa34
 
-gUnknown_08D927EC: ; 8D927EC
+gUnknown_08D927EC: @ 8D927EC
 	.incbin "base_emerald.gba", 0xd927ec, 0xaf4
 
-gUnknown_08D932E0: ; 8D932E0
+gUnknown_08D932E0: @ 8D932E0
 	.incbin "base_emerald.gba", 0xd932e0, 0x2b8
 
-gUnknown_08D93598: ; 8D93598
+gUnknown_08D93598: @ 8D93598
 	.incbin "base_emerald.gba", 0xd93598, 0x1e4
 
-gUnknown_08D9377C: ; 8D9377C
+gUnknown_08D9377C: @ 8D9377C
 	.incbin "base_emerald.gba", 0xd9377c, 0x1e4
 
-gUnknown_08D93960: ; 8D93960
+gUnknown_08D93960: @ 8D93960
 	.incbin "base_emerald.gba", 0xd93960, 0x1158
 
-gUnknown_08D94AB8: ; 8D94AB8
+gUnknown_08D94AB8: @ 8D94AB8
 	.incbin "base_emerald.gba", 0xd94ab8, 0x1320
 
-gUnknown_08D95DD8: ; 8D95DD8
+gUnknown_08D95DD8: @ 8D95DD8
 	.incbin "base_emerald.gba", 0xd95dd8, 0x28
 
-gUnknown_08D95E00: ; 8D95E00
+gUnknown_08D95E00: @ 8D95E00
 	.incbin "base_emerald.gba", 0xd95e00, 0x2d0
 
-gUnknown_08D960D0: ; 8D960D0
+gUnknown_08D960D0: @ 8D960D0
 	.incbin "base_emerald.gba", 0xd960d0, 0x2d4
 
-gUnknown_08D963A4: ; 8D963A4
+gUnknown_08D963A4: @ 8D963A4
 	.incbin "base_emerald.gba", 0xd963a4, 0x448
 
-gUnknown_08D967EC: ; 8D967EC
+gUnknown_08D967EC: @ 8D967EC
 	.incbin "base_emerald.gba", 0xd967ec, 0x2c8
 
-gUnknown_08D96AB4: ; 8D96AB4
+gUnknown_08D96AB4: @ 8D96AB4
 	.incbin "base_emerald.gba", 0xd96ab4, 0xec
 
-gUnknown_08D96BA0: ; 8D96BA0
+gUnknown_08D96BA0: @ 8D96BA0
 	.incbin "base_emerald.gba", 0xd96ba0, 0xfe4
 
-gUnknown_08D97B84: ; 8D97B84
+gUnknown_08D97B84: @ 8D97B84
 	.incbin "base_emerald.gba", 0xd97b84, 0x188
 
-gUnknown_08D97D0C: ; 8D97D0C
+gUnknown_08D97D0C: @ 8D97D0C
 	.incbin "base_emerald.gba", 0xd97d0c, 0x830
 
-gUnknown_08D9853C: ; 8D9853C
+gUnknown_08D9853C: @ 8D9853C
 	.incbin "base_emerald.gba", 0xd9853c, 0xf0
 
-gUnknown_08D9862C: ; 8D9862C
+gUnknown_08D9862C: @ 8D9862C
 	.incbin "base_emerald.gba", 0xd9862c, 0x1d0
 
-gUnknown_08D987FC: ; 8D987FC
+gUnknown_08D987FC: @ 8D987FC
 	.incbin "base_emerald.gba", 0xd987fc, 0x190
 
-gUnknown_08D9898C: ; 8D9898C
+gUnknown_08D9898C: @ 8D9898C
 	.incbin "base_emerald.gba", 0xd9898c, 0x19c
 
-gUnknown_08D98B28: ; 8D98B28
+gUnknown_08D98B28: @ 8D98B28
 	.incbin "base_emerald.gba", 0xd98b28, 0x1a0
 
-gUnknown_08D98CC8: ; 8D98CC8
+gUnknown_08D98CC8: @ 8D98CC8
 	.incbin "base_emerald.gba", 0xd98cc8, 0x18c0
 
-gUnknown_08D9A588: ; 8D9A588
+gUnknown_08D9A588: @ 8D9A588
 	.incbin "base_emerald.gba", 0xd9a588, 0x4c
 
-gUnknown_08D9A5D4: ; 8D9A5D4
+gUnknown_08D9A5D4: @ 8D9A5D4
 	.incbin "base_emerald.gba", 0xd9a5d4, 0x4c
 
-gUnknown_08D9A620: ; 8D9A620
+gUnknown_08D9A620: @ 8D9A620
 	.incbin "base_emerald.gba", 0xd9a620, 0x26c
 
-gUnknown_08D9A88C: ; 8D9A88C
+gUnknown_08D9A88C: @ 8D9A88C
 	.incbin "base_emerald.gba", 0xd9a88c, 0x544
 
-gUnknown_08D9ADD0: ; 8D9ADD0
+gUnknown_08D9ADD0: @ 8D9ADD0
 	.incbin "base_emerald.gba", 0xd9add0, 0x34
 
-gUnknown_08D9AE04: ; 8D9AE04
+gUnknown_08D9AE04: @ 8D9AE04
 	.incbin "base_emerald.gba", 0xd9ae04, 0x140
 
-gUnknown_08D9AF44: ; 8D9AF44
+gUnknown_08D9AF44: @ 8D9AF44
 	.incbin "base_emerald.gba", 0xd9af44, 0x78
 
-gUnknown_08D9AFBC: ; 8D9AFBC
+gUnknown_08D9AFBC: @ 8D9AFBC
 	.incbin "base_emerald.gba", 0xd9afbc, 0x10c
 
-gUnknown_08D9B0C8: ; 8D9B0C8
+gUnknown_08D9B0C8: @ 8D9B0C8
 	.incbin "base_emerald.gba", 0xd9b0c8, 0x28
 
-gUnknown_08D9B0F0: ; 8D9B0F0
+gUnknown_08D9B0F0: @ 8D9B0F0
 	.incbin "base_emerald.gba", 0xd9b0f0, 0x1c4
 
-gUnknown_08D9B2B4: ; 8D9B2B4
+gUnknown_08D9B2B4: @ 8D9B2B4
 	.incbin "base_emerald.gba", 0xd9b2b4, 0x1bc
 
-gUnknown_08D9B470: ; 8D9B470
+gUnknown_08D9B470: @ 8D9B470
 	.incbin "base_emerald.gba", 0xd9b470, 0x358
 
-gUnknown_08D9B7C8: ; 8D9B7C8
+gUnknown_08D9B7C8: @ 8D9B7C8
 	.incbin "base_emerald.gba", 0xd9b7c8, 0x27c
 
-gUnknown_08D9BA44: ; 8D9BA44
+gUnknown_08D9BA44: @ 8D9BA44
 	.incbin "base_emerald.gba", 0xd9ba44, 0x100
 
-gUnknown_08D9BB44: ; 8D9BB44
+gUnknown_08D9BB44: @ 8D9BB44
 	.incbin "base_emerald.gba", 0xd9bb44, 0x3ac
 
-gUnknown_08D9BEF0: ; 8D9BEF0
+gUnknown_08D9BEF0: @ 8D9BEF0
 	.incbin "base_emerald.gba", 0xd9bef0, 0xa8
 
-gUnknown_08D9BF98: ; 8D9BF98
+gUnknown_08D9BF98: @ 8D9BF98
 	.incbin "base_emerald.gba", 0xd9bf98, 0x1a4
 
-gUnknown_08D9C13C: ; 8D9C13C
+gUnknown_08D9C13C: @ 8D9C13C
 	.incbin "base_emerald.gba", 0xd9c13c, 0x26c
 
-; 8D9C3A8
+@ 8D9C3A8
 	.include "data/graphics/berries/berry_graphics.s"
 
-; 8DA1E78
+@ 8DA1E78
 	.incbin "base_emerald.gba", 0xda1e78, 0x1548
 
-gUnknown_08DA33C0: ; 8DA33C0
+gUnknown_08DA33C0: @ 8DA33C0
 	.incbin "base_emerald.gba", 0xda33c0, 0x428
 
-gUnknown_08DA37E8: ; 8DA37E8
+gUnknown_08DA37E8: @ 8DA37E8
 	.incbin "base_emerald.gba", 0xda37e8, 0x3c
 
-gUnknown_08DA3824: ; 8DA3824
+gUnknown_08DA3824: @ 8DA3824
 	.incbin "base_emerald.gba", 0xda3824, 0x164
 
-gUnknown_08DA3988: ; 8DA3988
+gUnknown_08DA3988: @ 8DA3988
 	.incbin "base_emerald.gba", 0xda3988, 0x100
 
-gUnknown_08DA3A88: ; 8DA3A88
+gUnknown_08DA3A88: @ 8DA3A88
 	.incbin "base_emerald.gba", 0xda3a88, 0x20c
 
-gUnknown_08DA3C94: ; 8DA3C94
+gUnknown_08DA3C94: @ 8DA3C94
 	.incbin "base_emerald.gba", 0xda3c94, 0x1114
 
-gUnknown_08DA4DA8: ; 8DA4DA8
+gUnknown_08DA4DA8: @ 8DA4DA8
 	.incbin "base_emerald.gba", 0xda4da8, 0x44
 
-gUnknown_08DA4DEC: ; 8DA4DEC
+gUnknown_08DA4DEC: @ 8DA4DEC
 	.incbin "base_emerald.gba", 0xda4dec, 0x184
 
-gUnknown_08DA4F70: ; 8DA4F70
+gUnknown_08DA4F70: @ 8DA4F70
 	.incbin "base_emerald.gba", 0xda4f70, 0x1148
 
-gUnknown_08DA60B8: ; 8DA60B8
+gUnknown_08DA60B8: @ 8DA60B8
 	.incbin "base_emerald.gba", 0xda60b8, 0x904
 
-gUnknown_08DA69BC: ; 8DA69BC
+gUnknown_08DA69BC: @ 8DA69BC
 	.incbin "base_emerald.gba", 0xda69bc, 0xb6c
 
-gUnknown_08DA7528: ; 8DA7528
+gUnknown_08DA7528: @ 8DA7528
 	.incbin "base_emerald.gba", 0xda7528, 0x21c
 
-gUnknown_08DA7744: ; 8DA7744
+gUnknown_08DA7744: @ 8DA7744
 	.incbin "base_emerald.gba", 0xda7744, 0x40
 
-gUnknown_08DA7784: ; 8DA7784
+gUnknown_08DA7784: @ 8DA7784
 	.incbin "base_emerald.gba", 0xda7784, 0x328
 
-gUnknown_08DA7AAC: ; 8DA7AAC
+gUnknown_08DA7AAC: @ 8DA7AAC
 	.incbin "base_emerald.gba", 0xda7aac, 0x184
 
-gUnknown_08DA7C30: ; 8DA7C30
+gUnknown_08DA7C30: @ 8DA7C30
 	.incbin "base_emerald.gba", 0xda7c30, 0x13c
 
-gUnknown_08DA7D6C: ; 8DA7D6C
+gUnknown_08DA7D6C: @ 8DA7D6C
 	.incbin "base_emerald.gba", 0xda7d6c, 0x140
 
-gUnknown_08DA7EAC: ; 8DA7EAC
+gUnknown_08DA7EAC: @ 8DA7EAC
 	.incbin "base_emerald.gba", 0xda7eac, 0x108
 
-gUnknown_08DA7FB4: ; 8DA7FB4
+gUnknown_08DA7FB4: @ 8DA7FB4
 	.incbin "base_emerald.gba", 0xda7fb4, 0x108
 
-gUnknown_08DA80BC: ; 8DA80BC
+gUnknown_08DA80BC: @ 8DA80BC
 	.incbin "base_emerald.gba", 0xda80bc, 0xa84
 
-gUnknown_08DA8B40: ; 8DA8B40
+gUnknown_08DA8B40: @ 8DA8B40
 	.incbin "base_emerald.gba", 0xda8b40, 0x22c
 
-gUnknown_08DA8D6C: ; 8DA8D6C
+gUnknown_08DA8D6C: @ 8DA8D6C
 	.incbin "base_emerald.gba", 0xda8d6c, 0x118
 
-gUnknown_08DA8E84: ; 8DA8E84
+gUnknown_08DA8E84: @ 8DA8E84
 	.incbin "base_emerald.gba", 0xda8e84, 0x1a30
 
-gUnknown_08DAA8B4: ; 8DAA8B4
+gUnknown_08DAA8B4: @ 8DAA8B4
 	.incbin "base_emerald.gba", 0xdaa8b4, 0x270
 
-gUnknown_08DAAB24: ; 8DAAB24
+gUnknown_08DAAB24: @ 8DAAB24
 	.incbin "base_emerald.gba", 0xdaab24, 0xf8
 
-gUnknown_08DAAC1C: ; 8DAAC1C
+gUnknown_08DAAC1C: @ 8DAAC1C
 	.incbin "base_emerald.gba", 0xdaac1c, 0x238
 
-gUnknown_08DAAE54: ; 8DAAE54
+gUnknown_08DAAE54: @ 8DAAE54
 	.incbin "base_emerald.gba", 0xdaae54, 0x144
 
-gUnknown_08DAAF98: ; 8DAAF98
+gUnknown_08DAAF98: @ 8DAAF98
 	.incbin "base_emerald.gba", 0xdaaf98, 0x54
 
-gUnknown_08DAAFEC: ; 8DAAFEC
+gUnknown_08DAAFEC: @ 8DAAFEC
 	.incbin "base_emerald.gba", 0xdaafec, 0x6c
 
-; 8DAB058
+@ 8DAB058
 	.include "data/graphics/items/item_graphics.s"
 
-; 8DB7AA0
+@ 8DB7AA0
 	.incbin "base_emerald.gba", 0xdb7aa0, 0x2a78
 
-gUnknown_08DBA518: ; 8DBA518
+gUnknown_08DBA518: @ 8DBA518
 	.incbin "base_emerald.gba", 0xdba518, 0xa0
 
-gUnknown_08DBA5B8: ; 8DBA5B8
+gUnknown_08DBA5B8: @ 8DBA5B8
 	.incbin "base_emerald.gba", 0xdba5b8, 0x1d30
 
-gUnknown_08DBC2E8: ; 8DBC2E8
+gUnknown_08DBC2E8: @ 8DBC2E8
 	.incbin "base_emerald.gba", 0xdbc2e8, 0x72c
 
-gUnknown_08DBCA14: ; 8DBCA14
+gUnknown_08DBCA14: @ 8DBCA14
 	.incbin "base_emerald.gba", 0xdbca14, 0x3d00
 
-gUnknown_08DC0714: ; 8DC0714
+gUnknown_08DC0714: @ 8DC0714
 	.incbin "base_emerald.gba", 0xdc0714, 0x40
 
-gUnknown_08DC0754: ; 8DC0754
+gUnknown_08DC0754: @ 8DC0754
 	.incbin "base_emerald.gba", 0xdc0754, 0x440
 
-gUnknown_08DC0B94: ; 8DC0B94
+gUnknown_08DC0B94: @ 8DC0B94
 	.incbin "base_emerald.gba", 0xdc0b94, 0xb62
 
-gUnknown_08DC16F6: ; 8DC16F6
+gUnknown_08DC16F6: @ 8DC16F6
 	.incbin "base_emerald.gba", 0xdc16f6, 0x60
 
-gUnknown_08DC1756: ; 8DC1756
+gUnknown_08DC1756: @ 8DC1756
 	.incbin "base_emerald.gba", 0xdc1756, 0x60
 
-gUnknown_08DC17B6: ; 8DC17B6
+gUnknown_08DC17B6: @ 8DC17B6
 	.incbin "base_emerald.gba", 0xdc17b6, 0xc0
 
-gUnknown_08DC1876: ; 8DC1876
+gUnknown_08DC1876: @ 8DC1876
 	.incbin "base_emerald.gba", 0xdc1876, 0xbe
 
-gUnknown_08DC1934: ; 8DC1934
+gUnknown_08DC1934: @ 8DC1934
 	.incbin "base_emerald.gba", 0xdc1934, 0x10d4
 
-gUnknown_08DC2A08: ; 8DC2A08
+gUnknown_08DC2A08: @ 8DC2A08
 	.incbin "base_emerald.gba", 0xdc2a08, 0x114
 
-gUnknown_08DC2B1C: ; 8DC2B1C
+gUnknown_08DC2B1C: @ 8DC2B1C
 	.incbin "base_emerald.gba", 0xdc2b1c, 0x140
 
-gUnknown_08DC2C5C: ; 8DC2C5C
+gUnknown_08DC2C5C: @ 8DC2C5C
 	.incbin "base_emerald.gba", 0xdc2c5c, 0x150
 
-gUnknown_08DC2DAC: ; 8DC2DAC
+gUnknown_08DC2DAC: @ 8DC2DAC
 	.incbin "base_emerald.gba", 0xdc2dac, 0xc0
 
-gUnknown_08DC2E6C: ; 8DC2E6C
+gUnknown_08DC2E6C: @ 8DC2E6C
 	.incbin "base_emerald.gba", 0xdc2e6c, 0xf0
 
-gUnknown_08DC2F5C: ; 8DC2F5C
+gUnknown_08DC2F5C: @ 8DC2F5C
 	.incbin "base_emerald.gba", 0xdc2f5c, 0x90
 
-gUnknown_08DC2FEC: ; 8DC2FEC
+gUnknown_08DC2FEC: @ 8DC2FEC
 	.incbin "base_emerald.gba", 0xdc2fec, 0x94
 
-gUnknown_08DC3080: ; 8DC3080
+gUnknown_08DC3080: @ 8DC3080
 	.incbin "base_emerald.gba", 0xdc3080, 0x118
 
-gUnknown_08DC3198: ; 8DC3198
+gUnknown_08DC3198: @ 8DC3198
 	.incbin "base_emerald.gba", 0xdc3198, 0xee
 
-gUnknown_08DC3286: ; 8DC3286
+gUnknown_08DC3286: @ 8DC3286
 	.incbin "base_emerald.gba", 0xdc3286, 0x7e
 
-gUnknown_08DC3304: ; 8DC3304
+gUnknown_08DC3304: @ 8DC3304
 	.incbin "base_emerald.gba", 0xdc3304, 0x56c
 
-gUnknown_08DC3870: ; 8DC3870
+gUnknown_08DC3870: @ 8DC3870
 	.incbin "base_emerald.gba", 0xdc3870, 0x19c
 
-gUnknown_08DC3A0C: ; 8DC3A0C
+gUnknown_08DC3A0C: @ 8DC3A0C
 	.incbin "base_emerald.gba", 0xdc3a0c, 0x2c8
 
-gUnknown_08DC3CD4: ; 8DC3CD4
+gUnknown_08DC3CD4: @ 8DC3CD4
 	.incbin "base_emerald.gba", 0xdc3cd4, 0x80
 
-gUnknown_08DC3D54: ; 8DC3D54
+gUnknown_08DC3D54: @ 8DC3D54
 	.incbin "base_emerald.gba", 0xdc3d54, 0x20
 
-gUnknown_08DC3D74: ; 8DC3D74
+gUnknown_08DC3D74: @ 8DC3D74
 	.incbin "base_emerald.gba", 0xdc3d74, 0x260
 
-gUnknown_08DC3FD4: ; 8DC3FD4
+gUnknown_08DC3FD4: @ 8DC3FD4
 	.incbin "base_emerald.gba", 0xdc3fd4, 0x16c
 
-gUnknown_08DC4140: ; 8DC4140
+gUnknown_08DC4140: @ 8DC4140
 	.incbin "base_emerald.gba", 0xdc4140, 0x1d8
 
-gUnknown_08DC4318: ; 8DC4318
+gUnknown_08DC4318: @ 8DC4318
 	.incbin "base_emerald.gba", 0xdc4318, 0x20
 
-gUnknown_08DC4338: ; 8DC4338
+gUnknown_08DC4338: @ 8DC4338
 	.incbin "base_emerald.gba", 0xdc4338, 0x20
 
-gUnknown_08DC4358: ; 8DC4358
+gUnknown_08DC4358: @ 8DC4358
 	.incbin "base_emerald.gba", 0xdc4358, 0x20
 
-gUnknown_08DC4378: ; 8DC4378
+gUnknown_08DC4378: @ 8DC4378
 	.incbin "base_emerald.gba", 0xdc4378, 0x2000
 
-gUnknown_08DC6378: ; 8DC6378
+gUnknown_08DC6378: @ 8DC6378
 	.incbin "base_emerald.gba", 0xdc6378, 0x80
 
-gUnknown_08DC63F8: ; 8DC63F8
+gUnknown_08DC63F8: @ 8DC63F8
 	.incbin "base_emerald.gba", 0xdc63f8, 0x28
 
-gUnknown_08DC6420: ; 8DC6420
+gUnknown_08DC6420: @ 8DC6420
 	.incbin "base_emerald.gba", 0xdc6420, 0x28
 
-gUnknown_08DC6448: ; 8DC6448
+gUnknown_08DC6448: @ 8DC6448
 	.incbin "base_emerald.gba", 0xdc6448, 0x28
 
-gUnknown_08DC6470: ; 8DC6470
+gUnknown_08DC6470: @ 8DC6470
 	.incbin "base_emerald.gba", 0xdc6470, 0x28
 
-gUnknown_08DC6498: ; 8DC6498
+gUnknown_08DC6498: @ 8DC6498
 	.incbin "base_emerald.gba", 0xdc6498, 0x14
 
-gUnknown_08DC64AC: ; 8DC64AC
+gUnknown_08DC64AC: @ 8DC64AC
 	.incbin "base_emerald.gba", 0xdc64ac, 0x14
 
-gUnknown_08DC64C0: ; 8DC64C0
+gUnknown_08DC64C0: @ 8DC64C0
 	.incbin "base_emerald.gba", 0xdc64c0, 0x14
 
-gUnknown_08DC64D4: ; 8DC64D4
+gUnknown_08DC64D4: @ 8DC64D4
 	.incbin "base_emerald.gba", 0xdc64d4, 0x14
 
-gUnknown_08DC64E8: ; 8DC64E8
+gUnknown_08DC64E8: @ 8DC64E8
 	.incbin "base_emerald.gba", 0xdc64e8, 0x14
 
-gUnknown_08DC64FC: ; 8DC64FC
+gUnknown_08DC64FC: @ 8DC64FC
 	.incbin "base_emerald.gba", 0xdc64fc, 0x14
 
-gUnknown_08DC6510: ; 8DC6510
+gUnknown_08DC6510: @ 8DC6510
 	.incbin "base_emerald.gba", 0xdc6510, 0x18
 
-gUnknown_08DC6528: ; 8DC6528
+gUnknown_08DC6528: @ 8DC6528
 	.incbin "base_emerald.gba", 0xdc6528, 0x20
 
-gUnknown_08DC6548: ; 8DC6548
+gUnknown_08DC6548: @ 8DC6548
 	.incbin "base_emerald.gba", 0xdc6548, 0x8b4
 
-gUnknown_08DC6DFC: ; 8DC6DFC
+gUnknown_08DC6DFC: @ 8DC6DFC
 	.incbin "base_emerald.gba", 0xdc6dfc, 0x274
 
-gUnknown_08DC7070: ; 8DC7070
+gUnknown_08DC7070: @ 8DC7070
 	.incbin "base_emerald.gba", 0xdc7070, 0xaf0
 
-gUnknown_08DC7B60: ; 8DC7B60
+gUnknown_08DC7B60: @ 8DC7B60
 	.incbin "base_emerald.gba", 0xdc7b60, 0x20
 
-gUnknown_08DC7B80: ; 8DC7B80
+gUnknown_08DC7B80: @ 8DC7B80
 	.incbin "base_emerald.gba", 0xdc7b80, 0x204
 
-gUnknown_08DC7D84: ; 8DC7D84
+gUnknown_08DC7D84: @ 8DC7D84
 	.incbin "base_emerald.gba", 0xdc7d84, 0x17c
 
-gUnknown_08DC7F00: ; 8DC7F00
+gUnknown_08DC7F00: @ 8DC7F00
 	.incbin "base_emerald.gba", 0xdc7f00, 0x11c0
 
-gUnknown_08DC90C0: ; 8DC90C0
+gUnknown_08DC90C0: @ 8DC90C0
 	.incbin "base_emerald.gba", 0xdc90c0, 0x20
 
-gUnknown_08DC90E0: ; 8DC90E0
+gUnknown_08DC90E0: @ 8DC90E0
 	.incbin "base_emerald.gba", 0xdc90e0, 0x50
 
-gUnknown_08DC9130: ; 8DC9130
+gUnknown_08DC9130: @ 8DC9130
 	.incbin "base_emerald.gba", 0xdc9130, 0xb8
 
-gUnknown_08DC91E8: ; 8DC91E8
+gUnknown_08DC91E8: @ 8DC91E8
 	.incbin "base_emerald.gba", 0xdc91e8, 0x420
 
-gUnknown_08DC9608: ; 8DC9608
+gUnknown_08DC9608: @ 8DC9608
 	.incbin "base_emerald.gba", 0xdc9608, 0x20
 
-gUnknown_08DC9628: ; 8DC9628
+gUnknown_08DC9628: @ 8DC9628
 	.incbin "base_emerald.gba", 0xdc9628, 0x2788
 
-gUnknown_08DCBDB0: ; 8DCBDB0
+gUnknown_08DCBDB0: @ 8DCBDB0
 	.incbin "base_emerald.gba", 0xdcbdb0, 0x20
 
-gUnknown_08DCBDD0: ; 8DCBDD0
+gUnknown_08DCBDD0: @ 8DCBDD0
 	.incbin "base_emerald.gba", 0xdcbdd0, 0x140
 
-gUnknown_08DCBF10: ; 8DCBF10
+gUnknown_08DCBF10: @ 8DCBF10
 	.incbin "base_emerald.gba", 0xdcbf10, 0x10c
 
-gUnknown_08DCC01C: ; 8DCC01C
+gUnknown_08DCC01C: @ 8DCC01C
 	.incbin "base_emerald.gba", 0xdcc01c, 0x20
 
-gUnknown_08DCC03C: ; 8DCC03C
+gUnknown_08DCC03C: @ 8DCC03C
 	.incbin "base_emerald.gba", 0xdcc03c, 0x20
 
-gUnknown_08DCC05C: ; 8DCC05C
+gUnknown_08DCC05C: @ 8DCC05C
 	.incbin "base_emerald.gba", 0xdcc05c, 0x5ec
 
-gUnknown_08DCC648: ; 8DCC648
+gUnknown_08DCC648: @ 8DCC648
 	.incbin "base_emerald.gba", 0xdcc648, 0x2c0
 
-gUnknown_08DCC908: ; 8DCC908
+gUnknown_08DCC908: @ 8DCC908
 	.incbin "base_emerald.gba", 0xdcc908, 0x2b0
 
-gUnknown_08DCCBB8: ; 8DCCBB8
+gUnknown_08DCCBB8: @ 8DCCBB8
 	.incbin "base_emerald.gba", 0xdccbb8, 0x3a4
 
-gUnknown_08DCCF5C: ; 8DCCF5C
+gUnknown_08DCCF5C: @ 8DCCF5C
 	.incbin "base_emerald.gba", 0xdccf5c, 0x20
 
-gUnknown_08DCCF7C: ; 8DCCF7C
+gUnknown_08DCCF7C: @ 8DCCF7C
 	.incbin "base_emerald.gba", 0xdccf7c, 0x8a0
 
-gUnknown_08DCD81C: ; 8DCD81C
+gUnknown_08DCD81C: @ 8DCD81C
 	.incbin "base_emerald.gba", 0xdcd81c, 0x214
 
-gUnknown_08DCDA30: ; 8DCDA30
+gUnknown_08DCDA30: @ 8DCDA30
 	.incbin "base_emerald.gba", 0xdcda30, 0x60
 
-gUnknown_08DCDA90: ; 8DCDA90
+gUnknown_08DCDA90: @ 8DCDA90
 	.incbin "base_emerald.gba", 0xdcda90, 0xa0
 
-gUnknown_08DCDB30: ; 8DCDB30
+gUnknown_08DCDB30: @ 8DCDB30
 	.incbin "base_emerald.gba", 0xdcdb30, 0xc40
 
-gUnknown_08DCE770: ; 8DCE770
+gUnknown_08DCE770: @ 8DCE770
 	.incbin "base_emerald.gba", 0xdce770, 0x500
 
-gUnknown_08DCEC70: ; 8DCEC70
+gUnknown_08DCEC70: @ 8DCEC70
 	.incbin "base_emerald.gba", 0xdcec70, 0x13e0
 
-gUnknown_08DD0050: ; 8DD0050
+gUnknown_08DD0050: @ 8DD0050
 	.incbin "base_emerald.gba", 0xdd0050, 0x1a68
 
-gUnknown_08DD1AB8: ; 8DD1AB8
+gUnknown_08DD1AB8: @ 8DD1AB8
 	.incbin "base_emerald.gba", 0xdd1ab8, 0x4c0
 
-gUnknown_08DD1F78: ; 8DD1F78
+gUnknown_08DD1F78: @ 8DD1F78
 	.incbin "base_emerald.gba", 0xdd1f78, 0x98
 
-gUnknown_08DD2010: ; 8DD2010
+gUnknown_08DD2010: @ 8DD2010
 	.incbin "base_emerald.gba", 0xdd2010, 0x1a0
 
-gUnknown_08DD21B0: ; 8DD21B0
+gUnknown_08DD21B0: @ 8DD21B0
 	.incbin "base_emerald.gba", 0xdd21b0, 0xdc
 
-gUnknown_08DD228C: ; 8DD228C
+gUnknown_08DD228C: @ 8DD228C
 	.incbin "base_emerald.gba", 0xdd228c, 0x1e0
 
-gUnknown_08DD246C: ; 8DD246C
+gUnknown_08DD246C: @ 8DD246C
 	.incbin "base_emerald.gba", 0xdd246c, 0x674
 
-gUnknown_08DD2AE0: ; 8DD2AE0
+gUnknown_08DD2AE0: @ 8DD2AE0
 	.incbin "base_emerald.gba", 0xdd2ae0, 0x98
 
-gUnknown_08DD2B78: ; 8DD2B78
+gUnknown_08DD2B78: @ 8DD2B78
 	.incbin "base_emerald.gba", 0xdd2b78, 0x1b8
 
-gUnknown_08DD2D30: ; 8DD2D30
+gUnknown_08DD2D30: @ 8DD2D30
 	.incbin "base_emerald.gba", 0xdd2d30, 0x12c
 
-gUnknown_08DD2E5C: ; 8DD2E5C
+gUnknown_08DD2E5C: @ 8DD2E5C
 	.incbin "base_emerald.gba", 0xdd2e5c, 0x18c
 
-gUnknown_08DD2FE8: ; 8DD2FE8
+gUnknown_08DD2FE8: @ 8DD2FE8
 	.incbin "base_emerald.gba", 0xdd2fe8, 0x6c0
 
-gUnknown_08DD36A8: ; 8DD36A8
+gUnknown_08DD36A8: @ 8DD36A8
 	.incbin "base_emerald.gba", 0xdd36a8, 0x20
 
-gUnknown_08DD36C8: ; 8DD36C8
+gUnknown_08DD36C8: @ 8DD36C8
 	.incbin "base_emerald.gba", 0xdd36c8, 0xb0
 
-gUnknown_08DD3778: ; 8DD3778
+gUnknown_08DD3778: @ 8DD3778
 	.incbin "base_emerald.gba", 0xdd3778, 0xc0
 
-gUnknown_08DD3838: ; 8DD3838
+gUnknown_08DD3838: @ 8DD3838
 	.incbin "base_emerald.gba", 0xdd3838, 0xd0c
 
-gUnknown_08DD4544: ; 8DD4544
+gUnknown_08DD4544: @ 8DD4544
 	.incbin "base_emerald.gba", 0xdd4544, 0xdc
 
-gUnknown_08DD4620: ; 8DD4620
+gUnknown_08DD4620: @ 8DD4620
 	.incbin "base_emerald.gba", 0xdd4620, 0xc0
 
-gUnknown_08DD46E0: ; 8DD46E0
+gUnknown_08DD46E0: @ 8DD46E0
 	.incbin "base_emerald.gba", 0xdd46e0, 0x180
 
-gUnknown_08DD4860: ; 8DD4860
+gUnknown_08DD4860: @ 8DD4860
 	.incbin "base_emerald.gba", 0xdd4860, 0x20
 
-gUnknown_08DD4880: ; 8DD4880
+gUnknown_08DD4880: @ 8DD4880
 	.incbin "base_emerald.gba", 0xdd4880, 0x238
 
-gUnknown_08DD4AB8: ; 8DD4AB8
+gUnknown_08DD4AB8: @ 8DD4AB8
 	.incbin "base_emerald.gba", 0xdd4ab8, 0xf8
 
-gUnknown_08DD4BB0: ; 8DD4BB0
+gUnknown_08DD4BB0: @ 8DD4BB0
 	.incbin "base_emerald.gba", 0xdd4bb0, 0x20
 
-gUnknown_08DD4BD0: ; 8DD4BD0
+gUnknown_08DD4BD0: @ 8DD4BD0
 	.incbin "base_emerald.gba", 0xdd4bd0, 0x20
 
-gUnknown_08DD4BF0: ; 8DD4BF0
+gUnknown_08DD4BF0: @ 8DD4BF0
 	.incbin "base_emerald.gba", 0xdd4bf0, 0x5c
 
-gUnknown_08DD4C4C: ; 8DD4C4C
+gUnknown_08DD4C4C: @ 8DD4C4C
 	.incbin "base_emerald.gba", 0xdd4c4c, 0x1c4
 
 	.align 2, 0
 
-gTilesetPalettes_General: ; 8DD4E10
+gTilesetPalettes_General: @ 8DD4E10
 	.incbin "data/graphics/tilesets/primary/general/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/primary/general/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/primary/general/palettes/02.gbapal"
@@ -13330,100 +13330,100 @@ gTilesetPalettes_General: ; 8DD4E10
 
 	.align 2, 0
 
-gTilesetTiles_General: ; 8DD5010
+gTilesetTiles_General: @ 8DD5010
 	.incbin "data/graphics/tilesets/primary/general/tiles.4bpp.lz"
 
-; 8DD72E0
+@ 8DD72E0
 	.incbin "base_emerald.gba", 0xdd72e0, 0x20
 
-gUnknown_08DD7300: ; 8DD7300
+gUnknown_08DD7300: @ 8DD7300
 	.incbin "base_emerald.gba", 0xdd7300, 0x60
 
-gUnknown_08DD7360: ; 8DD7360
+gUnknown_08DD7360: @ 8DD7360
 	.incbin "base_emerald.gba", 0xdd7360, 0x4084
 
-gUnknown_08DDB3E4: ; 8DDB3E4
+gUnknown_08DDB3E4: @ 8DDB3E4
 	.incbin "base_emerald.gba", 0xddb3e4, 0x80
 
-gUnknown_08DDB464: ; 8DDB464
+gUnknown_08DDB464: @ 8DDB464
 	.incbin "base_emerald.gba", 0xddb464, 0x1aa0
 
-gUnknown_08DDCF04: ; 8DDCF04
+gUnknown_08DDCF04: @ 8DDCF04
 	.incbin "base_emerald.gba", 0xddcf04, 0x800
 
-gUnknown_08DDD704: ; 8DDD704
+gUnknown_08DDD704: @ 8DDD704
 	.incbin "base_emerald.gba", 0xddd704, 0x24
 
-gUnknown_08DDD728: ; 8DDD728
+gUnknown_08DDD728: @ 8DDD728
 	.incbin "base_emerald.gba", 0xddd728, 0x20
 
-gUnknown_08DDD748: ; 8DDD748
+gUnknown_08DDD748: @ 8DDD748
 	.incbin "base_emerald.gba", 0xddd748, 0x8c8
 
-gUnknown_08DDE010: ; 8DDE010
+gUnknown_08DDE010: @ 8DDE010
 	.incbin "base_emerald.gba", 0xdde010, 0x20
 
-gUnknown_08DDE030: ; 8DDE030
+gUnknown_08DDE030: @ 8DDE030
 	.incbin "base_emerald.gba", 0xdde030, 0xfc
 
-gUnknown_08DDE12C: ; 8DDE12C
+gUnknown_08DDE12C: @ 8DDE12C
 	.incbin "base_emerald.gba", 0xdde12c, 0xcc
 
 	.align 2, 0
 
-gMonIconPalettes: ; 8DDE1F8
+gMonIconPalettes: @ 8DDE1F8
 	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_0.gbapal"
 	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_1.gbapal"
 	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_2.gbapal"
 
 	.align 2, 0
 
-gTitleScreenBgPalettes: ; 8DDE258
+gTitleScreenBgPalettes: @ 8DDE258
 	.incbin "data/graphics/title_screen/pokemon_logo.gbapal"
 	.incbin "data/graphics/title_screen/rayquaza_and_clouds.gbapal"
 
 	.align 2, 0
 
-gUnknown_08DDE438: ; 8DDE438
+gUnknown_08DDE438: @ 8DDE438
 	.incbin "base_emerald.gba", 0xdde438, 0x20
 
-gUnknown_08DDE458: ; 8DDE458
+gUnknown_08DDE458: @ 8DDE458
 	.incbin "base_emerald.gba", 0xdde458, 0x238
 
-gTitleScreenPokemonLogoTiles: ; 8DDE690
+gTitleScreenPokemonLogoTiles: @ 8DDE690
 	.incbin "data/graphics/title_screen/pokemon_logo.8bpp.lz"
 
 	.align 2, 0
 
-; 8DDFD94
+@ 8DDFD94
 	.incbin "base_emerald.gba", 0xddfd94, 0x8b0
 
-gUnknown_08DE0644: ; 8DE0644
+gUnknown_08DE0644: @ 8DE0644
 	.incbin "base_emerald.gba", 0xde0644, 0x184
 
-gUnknown_08DE07C8: ; 8DE07C8
+gUnknown_08DE07C8: @ 8DE07C8
 	.incbin "base_emerald.gba", 0xde07c8, 0x100
 
-gUnknown_08DE08C8: ; 8DE08C8
+gUnknown_08DE08C8: @ 8DE08C8
 	.incbin "base_emerald.gba", 0xde08c8, 0x17bc
 
-gUnknown_08DE2084: ; 8DE2084
+gUnknown_08DE2084: @ 8DE2084
 	.incbin "base_emerald.gba", 0xde2084, 0xfdc
 
-gUnknown_08DE3060: ; 8DE3060
+gUnknown_08DE3060: @ 8DE3060
 	.incbin "base_emerald.gba", 0xde3060, 0x2f0
 
-gUnknown_08DE3350: ; 8DE3350
+gUnknown_08DE3350: @ 8DE3350
 	.incbin "base_emerald.gba", 0xde3350, 0x24
 
-gUnknown_08DE3374: ; 8DE3374
+gUnknown_08DE3374: @ 8DE3374
 	.incbin "base_emerald.gba", 0xde3374, 0x24
 
-gUnknown_08DE3398: ; 8DE3398
+gUnknown_08DE3398: @ 8DE3398
 	.incbin "base_emerald.gba", 0xde3398, 0x120
 
-gUnknown_08DE34B8: ; 8DE34B8
+gUnknown_08DE34B8: @ 8DE34B8
 	.incbin "base_emerald.gba", 0xde34b8, 0xb1c
 
-gUnknown_08DE3FD4: ; 8DE3FD4
+gUnknown_08DE3FD4: @ 8DE3FD4
 	.incbin "base_emerald.gba", 0xde3fd4
diff --git a/data/egg_moves.s b/data/egg_moves.s
index 9c16a139c..3c3f719bf 100644
--- a/data/egg_moves.s
+++ b/data/egg_moves.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEggMoves: ; 832ADD8
+gEggMoves: @ 832ADD8
 	egg_moves_begin SPECIES_BULBASAUR
 	.2byte MOVE_LIGHT_SCREEN
 	.2byte MOVE_SKULL_BASH
diff --git a/data/event_script_command_function_table.s b/data/event_script_command_function_table.s
index 3658dfda5..cbde056e0 100644
--- a/data/event_script_command_function_table.s
+++ b/data/event_script_command_function_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEventScriptCommandFunctionTable: ; 81DB67C
+gEventScriptCommandFunctionTable: @ 81DB67C
 	.4byte s00_nop
 	.4byte s01_nop
 	.4byte s02_end
diff --git a/data/evolution_table.s b/data/evolution_table.s
index 3fac3406b..2a8ed0ba2 100644
--- a/data/evolution_table.s
+++ b/data/evolution_table.s
@@ -1,1421 +1,1421 @@
 	.align 2, 0
 
-gEvolutionTable: ; 832531C
-; ??????????
+gEvolutionTable: @ 832531C
+@ ??????????
 	empty_evo_entries 5
 
-; Bulbasaur
+@ Bulbasaur
 	evo_entry EVO_LEVEL, 16, SPECIES_IVYSAUR
 	empty_evo_entries 4
 
-; Ivysaur
+@ Ivysaur
 	evo_entry EVO_LEVEL, 32, SPECIES_VENUSAUR
 	empty_evo_entries 4
 
-; Venusaur
+@ Venusaur
 	empty_evo_entries 5
 
-; Charmander
+@ Charmander
 	evo_entry EVO_LEVEL, 16, SPECIES_CHARMELEON
 	empty_evo_entries 4
 
-; Charmeleon
+@ Charmeleon
 	evo_entry EVO_LEVEL, 36, SPECIES_CHARIZARD
 	empty_evo_entries 4
 
-; Charizard
+@ Charizard
 	empty_evo_entries 5
 
-; Squirtle
+@ Squirtle
 	evo_entry EVO_LEVEL, 16, SPECIES_WARTORTLE
 	empty_evo_entries 4
 
-; Wartortle
+@ Wartortle
 	evo_entry EVO_LEVEL, 36, SPECIES_BLASTOISE
 	empty_evo_entries 4
 
-; Blastoise
+@ Blastoise
 	empty_evo_entries 5
 
-; Caterpie
+@ Caterpie
 	evo_entry EVO_LEVEL, 7, SPECIES_METAPOD
 	empty_evo_entries 4
 
-; Metapod
+@ Metapod
 	evo_entry EVO_LEVEL, 10, SPECIES_BUTTERFREE
 	empty_evo_entries 4
 
-; Butterfree
+@ Butterfree
 	empty_evo_entries 5
 
-; Weedle
+@ Weedle
 	evo_entry EVO_LEVEL, 7, SPECIES_KAKUNA
 	empty_evo_entries 4
 
-; Kakuna
+@ Kakuna
 	evo_entry EVO_LEVEL, 10, SPECIES_BEEDRILL
 	empty_evo_entries 4
 
-; Beedrill
+@ Beedrill
 	empty_evo_entries 5
 
-; Pidgey
+@ Pidgey
 	evo_entry EVO_LEVEL, 18, SPECIES_PIDGEOTTO
 	empty_evo_entries 4
 
-; Pidgeotto
+@ Pidgeotto
 	evo_entry EVO_LEVEL, 36, SPECIES_PIDGEOT
 	empty_evo_entries 4
 
-; Pidgeot
+@ Pidgeot
 	empty_evo_entries 5
 
-; Rattata
+@ Rattata
 	evo_entry EVO_LEVEL, 20, SPECIES_RATICATE
 	empty_evo_entries 4
 
-; Raticate
+@ Raticate
 	empty_evo_entries 5
 
-; Spearow
+@ Spearow
 	evo_entry EVO_LEVEL, 20, SPECIES_FEAROW
 	empty_evo_entries 4
 
-; Fearow
+@ Fearow
 	empty_evo_entries 5
 
-; Ekans
+@ Ekans
 	evo_entry EVO_LEVEL, 22, SPECIES_ARBOK
 	empty_evo_entries 4
 
-; Arbok
+@ Arbok
 	empty_evo_entries 5
 
-; Pikachu
+@ Pikachu
 	evo_entry EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU
 	empty_evo_entries 4
 
-; Raichu
+@ Raichu
 	empty_evo_entries 5
 
-; Sandshrew
+@ Sandshrew
 	evo_entry EVO_LEVEL, 22, SPECIES_SANDSLASH
 	empty_evo_entries 4
 
-; Sandslash
+@ Sandslash
 	empty_evo_entries 5
 
-; Nidoran♀
+@ Nidoran♀
 	evo_entry EVO_LEVEL, 16, SPECIES_NIDORINA
 	empty_evo_entries 4
 
-; Nidorina
+@ Nidorina
 	evo_entry EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN
 	empty_evo_entries 4
 
-; Nidoqueen
+@ Nidoqueen
 	empty_evo_entries 5
 
-; Nidoran♂
+@ Nidoran♂
 	evo_entry EVO_LEVEL, 16, SPECIES_NIDORINO
 	empty_evo_entries 4
 
-; Nidorino
+@ Nidorino
 	evo_entry EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING
 	empty_evo_entries 4
 
-; Nidoking
+@ Nidoking
 	empty_evo_entries 5
 
-; Clefairy
+@ Clefairy
 	evo_entry EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE
 	empty_evo_entries 4
 
-; Clefable
+@ Clefable
 	empty_evo_entries 5
 
-; Vulpix
+@ Vulpix
 	evo_entry EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES
 	empty_evo_entries 4
 
-; Ninetales
+@ Ninetales
 	empty_evo_entries 5
 
-; Jigglypuff
+@ Jigglypuff
 	evo_entry EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF
 	empty_evo_entries 4
 
-; Wigglytuff
+@ Wigglytuff
 	empty_evo_entries 5
 
-; Zubat
+@ Zubat
 	evo_entry EVO_LEVEL, 22, SPECIES_GOLBAT
 	empty_evo_entries 4
 
-; Golbat
+@ Golbat
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_CROBAT
 	empty_evo_entries 4
 
-; Oddish
+@ Oddish
 	evo_entry EVO_LEVEL, 21, SPECIES_GLOOM
 	empty_evo_entries 4
 
-; Gloom
+@ Gloom
 	evo_entry EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME
 	evo_entry EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM
 	empty_evo_entries 3
 
-; Vileplume
+@ Vileplume
 	empty_evo_entries 5
 
-; Paras
+@ Paras
 	evo_entry EVO_LEVEL, 24, SPECIES_PARASECT
 	empty_evo_entries 4
 
-; Parasect
+@ Parasect
 	empty_evo_entries 5
 
-; Venonat
+@ Venonat
 	evo_entry EVO_LEVEL, 31, SPECIES_VENOMOTH
 	empty_evo_entries 4
 
-; Venomoth
+@ Venomoth
 	empty_evo_entries 5
 
-; Diglett
+@ Diglett
 	evo_entry EVO_LEVEL, 26, SPECIES_DUGTRIO
 	empty_evo_entries 4
 
-; Dugtrio
+@ Dugtrio
 	empty_evo_entries 5
 
-; Meowth
+@ Meowth
 	evo_entry EVO_LEVEL, 28, SPECIES_PERSIAN
 	empty_evo_entries 4
 
-; Persian
+@ Persian
 	empty_evo_entries 5
 
-; Psyduck
+@ Psyduck
 	evo_entry EVO_LEVEL, 33, SPECIES_GOLDUCK
 	empty_evo_entries 4
 
-; Golduck
+@ Golduck
 	empty_evo_entries 5
 
-; Mankey
+@ Mankey
 	evo_entry EVO_LEVEL, 28, SPECIES_PRIMEAPE
 	empty_evo_entries 4
 
-; Primeape
+@ Primeape
 	empty_evo_entries 5
 
-; Growlithe
+@ Growlithe
 	evo_entry EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE
 	empty_evo_entries 4
 
-; Arcanine
+@ Arcanine
 	empty_evo_entries 5
 
-; Poliwag
+@ Poliwag
 	evo_entry EVO_LEVEL, 25, SPECIES_POLIWHIRL
 	empty_evo_entries 4
 
-; Poliwhirl
+@ Poliwhirl
 	evo_entry EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH
 	evo_entry EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED
 	empty_evo_entries 3
 
-; Poliwrath
+@ Poliwrath
 	empty_evo_entries 5
 
-; Abra
+@ Abra
 	evo_entry EVO_LEVEL, 16, SPECIES_KADABRA
 	empty_evo_entries 4
 
-; Kadabra
+@ Kadabra
 	evo_entry EVO_TRADE, 0, SPECIES_ALAKAZAM
 	empty_evo_entries 4
 
-; Alakazam
+@ Alakazam
 	empty_evo_entries 5
 
-; Machop
+@ Machop
 	evo_entry EVO_LEVEL, 28, SPECIES_MACHOKE
 	empty_evo_entries 4
 
-; Machoke
+@ Machoke
 	evo_entry EVO_TRADE, 0, SPECIES_MACHAMP
 	empty_evo_entries 4
 
-; Machamp
+@ Machamp
 	empty_evo_entries 5
 
-; Bellsprout
+@ Bellsprout
 	evo_entry EVO_LEVEL, 21, SPECIES_WEEPINBELL
 	empty_evo_entries 4
 
-; Weepinbell
+@ Weepinbell
 	evo_entry EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL
 	empty_evo_entries 4
 
-; Victreebel
+@ Victreebel
 	empty_evo_entries 5
 
-; Tentacool
+@ Tentacool
 	evo_entry EVO_LEVEL, 30, SPECIES_TENTACRUEL
 	empty_evo_entries 4
 
-; Tentacruel
+@ Tentacruel
 	empty_evo_entries 5
 
-; Geodude
+@ Geodude
 	evo_entry EVO_LEVEL, 25, SPECIES_GRAVELER
 	empty_evo_entries 4
 
-; Graveler
+@ Graveler
 	evo_entry EVO_TRADE, 0, SPECIES_GOLEM
 	empty_evo_entries 4
 
-; Golem
+@ Golem
 	empty_evo_entries 5
 
-; Ponyta
+@ Ponyta
 	evo_entry EVO_LEVEL, 40, SPECIES_RAPIDASH
 	empty_evo_entries 4
 
-; Rapidash
+@ Rapidash
 	empty_evo_entries 5
 
-; Slowpoke
+@ Slowpoke
 	evo_entry EVO_LEVEL, 37, SPECIES_SLOWBRO
 	evo_entry EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING
 	empty_evo_entries 3
 
-; Slowbro
+@ Slowbro
 	empty_evo_entries 5
 
-; Magnemite
+@ Magnemite
 	evo_entry EVO_LEVEL, 30, SPECIES_MAGNETON
 	empty_evo_entries 4
 
-; Magneton
+@ Magneton
 	empty_evo_entries 5
 
-; Farfetch'd
+@ Farfetch'd
 	empty_evo_entries 5
 
-; Doduo
+@ Doduo
 	evo_entry EVO_LEVEL, 31, SPECIES_DODRIO
 	empty_evo_entries 4
 
-; Dodrio
+@ Dodrio
 	empty_evo_entries 5
 
-; Seel
+@ Seel
 	evo_entry EVO_LEVEL, 34, SPECIES_DEWGONG
 	empty_evo_entries 4
 
-; Dewgong
+@ Dewgong
 	empty_evo_entries 5
 
-; Grimer
+@ Grimer
 	evo_entry EVO_LEVEL, 38, SPECIES_MUK
 	empty_evo_entries 4
 
-; Muk
+@ Muk
 	empty_evo_entries 5
 
-; Shellder
+@ Shellder
 	evo_entry EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER
 	empty_evo_entries 4
 
-; Cloyster
+@ Cloyster
 	empty_evo_entries 5
 
-; Gastly
+@ Gastly
 	evo_entry EVO_LEVEL, 25, SPECIES_HAUNTER
 	empty_evo_entries 4
 
-; Haunter
+@ Haunter
 	evo_entry EVO_TRADE, 0, SPECIES_GENGAR
 	empty_evo_entries 4
 
-; Gengar
+@ Gengar
 	empty_evo_entries 5
 
-; Onix
+@ Onix
 	evo_entry EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX
 	empty_evo_entries 4
 
-; Drowzee
+@ Drowzee
 	evo_entry EVO_LEVEL, 26, SPECIES_HYPNO
 	empty_evo_entries 4
 
-; Hypno
+@ Hypno
 	empty_evo_entries 5
 
-; Krabby
+@ Krabby
 	evo_entry EVO_LEVEL, 28, SPECIES_KINGLER
 	empty_evo_entries 4
 
-; Kingler
+@ Kingler
 	empty_evo_entries 5
 
-; Voltorb
+@ Voltorb
 	evo_entry EVO_LEVEL, 30, SPECIES_ELECTRODE
 	empty_evo_entries 4
 
-; Electrode
+@ Electrode
 	empty_evo_entries 5
 
-; Exeggcute
+@ Exeggcute
 	evo_entry EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR
 	empty_evo_entries 4
 
-; Exeggutor
+@ Exeggutor
 	empty_evo_entries 5
 
-; Cubone
+@ Cubone
 	evo_entry EVO_LEVEL, 28, SPECIES_MAROWAK
 	empty_evo_entries 4
 
-; Marowak
+@ Marowak
 	empty_evo_entries 5
 
-; Hitmonlee
+@ Hitmonlee
 	empty_evo_entries 5
 
-; Hitmonchan
+@ Hitmonchan
 	empty_evo_entries 5
 
-; Lickitung
+@ Lickitung
 	empty_evo_entries 5
 
-; Koffing
+@ Koffing
 	evo_entry EVO_LEVEL, 35, SPECIES_WEEZING
 	empty_evo_entries 4
 
-; Weezing
+@ Weezing
 	empty_evo_entries 5
 
-; Rhyhorn
+@ Rhyhorn
 	evo_entry EVO_LEVEL, 42, SPECIES_RHYDON
 	empty_evo_entries 4
 
-; Rhydon
+@ Rhydon
 	empty_evo_entries 5
 
-; Chansey
+@ Chansey
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_BLISSEY
 	empty_evo_entries 4
 
-; Tangela
+@ Tangela
 	empty_evo_entries 5
 
-; Kangaskhan
+@ Kangaskhan
 	empty_evo_entries 5
 
-; Horsea
+@ Horsea
 	evo_entry EVO_LEVEL, 32, SPECIES_SEADRA
 	empty_evo_entries 4
 
-; Seadra
+@ Seadra
 	evo_entry EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA
 	empty_evo_entries 4
 
-; Goldeen
+@ Goldeen
 	evo_entry EVO_LEVEL, 33, SPECIES_SEAKING
 	empty_evo_entries 4
 
-; Seaking
+@ Seaking
 	empty_evo_entries 5
 
-; Staryu
+@ Staryu
 	evo_entry EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE
 	empty_evo_entries 4
 
-; Starmie
+@ Starmie
 	empty_evo_entries 5
 
-; Mr. mime
+@ Mr. mime
 	empty_evo_entries 5
 
-; Scyther
+@ Scyther
 	evo_entry EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR
 	empty_evo_entries 4
 
-; Jynx
+@ Jynx
 	empty_evo_entries 5
 
-; Electabuzz
+@ Electabuzz
 	empty_evo_entries 5
 
-; Magmar
+@ Magmar
 	empty_evo_entries 5
 
-; Pinsir
+@ Pinsir
 	empty_evo_entries 5
 
-; Tauros
+@ Tauros
 	empty_evo_entries 5
 
-; Magikarp
+@ Magikarp
 	evo_entry EVO_LEVEL, 20, SPECIES_GYARADOS
 	empty_evo_entries 4
 
-; Gyarados
+@ Gyarados
 	empty_evo_entries 5
 
-; Lapras
+@ Lapras
 	empty_evo_entries 5
 
-; Ditto
+@ Ditto
 	empty_evo_entries 5
 
-; Eevee
+@ Eevee
 	evo_entry EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON
 	evo_entry EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON
 	evo_entry EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON
 	evo_entry EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON
 	evo_entry EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON
 
-; Vaporeon
+@ Vaporeon
 	empty_evo_entries 5
 
-; Jolteon
+@ Jolteon
 	empty_evo_entries 5
 
-; Flareon
+@ Flareon
 	empty_evo_entries 5
 
-; Porygon
+@ Porygon
 	evo_entry EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2
 	empty_evo_entries 4
 
-; Omanyte
+@ Omanyte
 	evo_entry EVO_LEVEL, 40, SPECIES_OMASTAR
 	empty_evo_entries 4
 
-; Omastar
+@ Omastar
 	empty_evo_entries 5
 
-; Kabuto
+@ Kabuto
 	evo_entry EVO_LEVEL, 40, SPECIES_KABUTOPS
 	empty_evo_entries 4
 
-; Kabutops
+@ Kabutops
 	empty_evo_entries 5
 
-; Aerodactyl
+@ Aerodactyl
 	empty_evo_entries 5
 
-; Snorlax
+@ Snorlax
 	empty_evo_entries 5
 
-; Articuno
+@ Articuno
 	empty_evo_entries 5
 
-; Zapdos
+@ Zapdos
 	empty_evo_entries 5
 
-; Moltres
+@ Moltres
 	empty_evo_entries 5
 
-; Dratini
+@ Dratini
 	evo_entry EVO_LEVEL, 30, SPECIES_DRAGONAIR
 	empty_evo_entries 4
 
-; Dragonair
+@ Dragonair
 	evo_entry EVO_LEVEL, 55, SPECIES_DRAGONITE
 	empty_evo_entries 4
 
-; Dragonite
+@ Dragonite
 	empty_evo_entries 5
 
-; Mewtwo
+@ Mewtwo
 	empty_evo_entries 5
 
-; Mew
+@ Mew
 	empty_evo_entries 5
 
-; Chikorita
+@ Chikorita
 	evo_entry EVO_LEVEL, 16, SPECIES_BAYLEEF
 	empty_evo_entries 4
 
-; Bayleef
+@ Bayleef
 	evo_entry EVO_LEVEL, 32, SPECIES_MEGANIUM
 	empty_evo_entries 4
 
-; Meganium
+@ Meganium
 	empty_evo_entries 5
 
-; Cyndaquil
+@ Cyndaquil
 	evo_entry EVO_LEVEL, 14, SPECIES_QUILAVA
 	empty_evo_entries 4
 
-; Quilava
+@ Quilava
 	evo_entry EVO_LEVEL, 36, SPECIES_TYPHLOSION
 	empty_evo_entries 4
 
-; Typhlosion
+@ Typhlosion
 	empty_evo_entries 5
 
-; Totodile
+@ Totodile
 	evo_entry EVO_LEVEL, 18, SPECIES_CROCONAW
 	empty_evo_entries 4
 
-; Croconaw
+@ Croconaw
 	evo_entry EVO_LEVEL, 30, SPECIES_FERALIGATR
 	empty_evo_entries 4
 
-; Feraligatr
+@ Feraligatr
 	empty_evo_entries 5
 
-; Sentret
+@ Sentret
 	evo_entry EVO_LEVEL, 15, SPECIES_FURRET
 	empty_evo_entries 4
 
-; Furret
+@ Furret
 	empty_evo_entries 5
 
-; Hoothoot
+@ Hoothoot
 	evo_entry EVO_LEVEL, 20, SPECIES_NOCTOWL
 	empty_evo_entries 4
 
-; Noctowl
+@ Noctowl
 	empty_evo_entries 5
 
-; Ledyba
+@ Ledyba
 	evo_entry EVO_LEVEL, 18, SPECIES_LEDIAN
 	empty_evo_entries 4
 
-; Ledian
+@ Ledian
 	empty_evo_entries 5
 
-; Spinarak
+@ Spinarak
 	evo_entry EVO_LEVEL, 22, SPECIES_ARIADOS
 	empty_evo_entries 4
 
-; Ariados
+@ Ariados
 	empty_evo_entries 5
 
-; Crobat
+@ Crobat
 	empty_evo_entries 5
 
-; Chinchou
+@ Chinchou
 	evo_entry EVO_LEVEL, 27, SPECIES_LANTURN
 	empty_evo_entries 4
 
-; Lanturn
+@ Lanturn
 	empty_evo_entries 5
 
-; Pichu
+@ Pichu
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_PIKACHU
 	empty_evo_entries 4
 
-; Cleffa
+@ Cleffa
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY
 	empty_evo_entries 4
 
-; Igglybuff
+@ Igglybuff
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF
 	empty_evo_entries 4
 
-; Togepi
+@ Togepi
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_TOGETIC
 	empty_evo_entries 4
 
-; Togetic
+@ Togetic
 	empty_evo_entries 5
 
-; Natu
+@ Natu
 	evo_entry EVO_LEVEL, 25, SPECIES_XATU
 	empty_evo_entries 4
 
-; Xatu
+@ Xatu
 	empty_evo_entries 5
 
-; Mareep
+@ Mareep
 	evo_entry EVO_LEVEL, 15, SPECIES_FLAAFFY
 	empty_evo_entries 4
 
-; Flaaffy
+@ Flaaffy
 	evo_entry EVO_LEVEL, 30, SPECIES_AMPHAROS
 	empty_evo_entries 4
 
-; Ampharos
+@ Ampharos
 	empty_evo_entries 5
 
-; Bellossom
+@ Bellossom
 	empty_evo_entries 5
 
-; Marill
+@ Marill
 	evo_entry EVO_LEVEL, 18, SPECIES_AZUMARILL
 	empty_evo_entries 4
 
-; Azumarill
+@ Azumarill
 	empty_evo_entries 5
 
-; Sudowoodo
+@ Sudowoodo
 	empty_evo_entries 5
 
-; Politoed
+@ Politoed
 	empty_evo_entries 5
 
-; Hoppip
+@ Hoppip
 	evo_entry EVO_LEVEL, 18, SPECIES_SKIPLOOM
 	empty_evo_entries 4
 
-; Skiploom
+@ Skiploom
 	evo_entry EVO_LEVEL, 27, SPECIES_JUMPLUFF
 	empty_evo_entries 4
 
-; Jumpluff
+@ Jumpluff
 	empty_evo_entries 5
 
-; Aipom
+@ Aipom
 	empty_evo_entries 5
 
-; Sunkern
+@ Sunkern
 	evo_entry EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA
 	empty_evo_entries 4
 
-; Sunflora
+@ Sunflora
 	empty_evo_entries 5
 
-; Yanma
+@ Yanma
 	empty_evo_entries 5
 
-; Wooper
+@ Wooper
 	evo_entry EVO_LEVEL, 20, SPECIES_QUAGSIRE
 	empty_evo_entries 4
 
-; Quagsire
+@ Quagsire
 	empty_evo_entries 5
 
-; Espeon
+@ Espeon
 	empty_evo_entries 5
 
-; Umbreon
+@ Umbreon
 	empty_evo_entries 5
 
-; Murkrow
+@ Murkrow
 	empty_evo_entries 5
 
-; Slowking
+@ Slowking
 	empty_evo_entries 5
 
-; Misdreavus
+@ Misdreavus
 	empty_evo_entries 5
 
-; Unown
+@ Unown
 	empty_evo_entries 5
 
-; Wobbuffet
+@ Wobbuffet
 	empty_evo_entries 5
 
-; Girafarig
+@ Girafarig
 	empty_evo_entries 5
 
-; Pineco
+@ Pineco
 	evo_entry EVO_LEVEL, 31, SPECIES_FORRETRESS
 	empty_evo_entries 4
 
-; Forretress
+@ Forretress
 	empty_evo_entries 5
 
-; Dunsparce
+@ Dunsparce
 	empty_evo_entries 5
 
-; Gligar
+@ Gligar
 	empty_evo_entries 5
 
-; Steelix
+@ Steelix
 	empty_evo_entries 5
 
-; Snubbull
+@ Snubbull
 	evo_entry EVO_LEVEL, 23, SPECIES_GRANBULL
 	empty_evo_entries 4
 
-; Granbull
+@ Granbull
 	empty_evo_entries 5
 
-; Qwilfish
+@ Qwilfish
 	empty_evo_entries 5
 
-; Scizor
+@ Scizor
 	empty_evo_entries 5
 
-; Shuckle
+@ Shuckle
 	empty_evo_entries 5
 
-; Heracross
+@ Heracross
 	empty_evo_entries 5
 
-; Sneasel
+@ Sneasel
 	empty_evo_entries 5
 
-; Teddiursa
+@ Teddiursa
 	evo_entry EVO_LEVEL, 30, SPECIES_URSARING
 	empty_evo_entries 4
 
-; Ursaring
+@ Ursaring
 	empty_evo_entries 5
 
-; Slugma
+@ Slugma
 	evo_entry EVO_LEVEL, 38, SPECIES_MAGCARGO
 	empty_evo_entries 4
 
-; Magcargo
+@ Magcargo
 	empty_evo_entries 5
 
-; Swinub
+@ Swinub
 	evo_entry EVO_LEVEL, 33, SPECIES_PILOSWINE
 	empty_evo_entries 4
 
-; Piloswine
+@ Piloswine
 	empty_evo_entries 5
 
-; Corsola
+@ Corsola
 	empty_evo_entries 5
 
-; Remoraid
+@ Remoraid
 	evo_entry EVO_LEVEL, 25, SPECIES_OCTILLERY
 	empty_evo_entries 4
 
-; Octillery
+@ Octillery
 	empty_evo_entries 5
 
-; Delibird
+@ Delibird
 	empty_evo_entries 5
 
-; Mantine
+@ Mantine
 	empty_evo_entries 5
 
-; Skarmory
+@ Skarmory
 	empty_evo_entries 5
 
-; Houndour
+@ Houndour
 	evo_entry EVO_LEVEL, 24, SPECIES_HOUNDOOM
 	empty_evo_entries 4
 
-; Houndoom
+@ Houndoom
 	empty_evo_entries 5
 
-; Kingdra
+@ Kingdra
 	empty_evo_entries 5
 
-; Phanpy
+@ Phanpy
 	evo_entry EVO_LEVEL, 25, SPECIES_DONPHAN
 	empty_evo_entries 4
 
-; Donphan
+@ Donphan
 	empty_evo_entries 5
 
-; Porygon2
+@ Porygon2
 	empty_evo_entries 5
 
-; Stantler
+@ Stantler
 	empty_evo_entries 5
 
-; Smeargle
+@ Smeargle
 	empty_evo_entries 5
 
-; Tyrogue
+@ Tyrogue
 	evo_entry EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN
 	evo_entry EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE
 	evo_entry EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP
 	empty_evo_entries 2
 
-; Hitmontop
+@ Hitmontop
 	empty_evo_entries 5
 
-; Smoochum
+@ Smoochum
 	evo_entry EVO_LEVEL, 30, SPECIES_JYNX
 	empty_evo_entries 4
 
-; Elekid
+@ Elekid
 	evo_entry EVO_LEVEL, 30, SPECIES_ELECTABUZZ
 	empty_evo_entries 4
 
-; Magby
+@ Magby
 	evo_entry EVO_LEVEL, 30, SPECIES_MAGMAR
 	empty_evo_entries 4
 
-; Miltank
+@ Miltank
 	empty_evo_entries 5
 
-; Blissey
+@ Blissey
 	empty_evo_entries 5
 
-; Raikou
+@ Raikou
 	empty_evo_entries 5
 
-; Entei
+@ Entei
 	empty_evo_entries 5
 
-; Suicune
+@ Suicune
 	empty_evo_entries 5
 
-; Larvitar
+@ Larvitar
 	evo_entry EVO_LEVEL, 30, SPECIES_PUPITAR
 	empty_evo_entries 4
 
-; Pupitar
+@ Pupitar
 	evo_entry EVO_LEVEL, 55, SPECIES_TYRANITAR
 	empty_evo_entries 4
 
-; Tyranitar
+@ Tyranitar
 	empty_evo_entries 5
 
-; Lugia
+@ Lugia
 	empty_evo_entries 5
 
-; Ho-Oh
+@ Ho-Oh
 	empty_evo_entries 5
 
-; Celebi
+@ Celebi
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; ?
+@ ?
 	empty_evo_entries 5
 
-; Treecko
+@ Treecko
 	evo_entry EVO_LEVEL, 16, SPECIES_GROVYLE
 	empty_evo_entries 4
 
-; Grovyle
+@ Grovyle
 	evo_entry EVO_LEVEL, 36, SPECIES_SCEPTILE
 	empty_evo_entries 4
 
-; Sceptile
+@ Sceptile
 	empty_evo_entries 5
 
-; Torchic
+@ Torchic
 	evo_entry EVO_LEVEL, 16, SPECIES_COMBUSKEN
 	empty_evo_entries 4
 
-; Combusken
+@ Combusken
 	evo_entry EVO_LEVEL, 36, SPECIES_BLAZIKEN
 	empty_evo_entries 4
 
-; Blaziken
+@ Blaziken
 	empty_evo_entries 5
 
-; Mudkip
+@ Mudkip
 	evo_entry EVO_LEVEL, 16, SPECIES_MARSHTOMP
 	empty_evo_entries 4
 
-; Marshtomp
+@ Marshtomp
 	evo_entry EVO_LEVEL, 36, SPECIES_SWAMPERT
 	empty_evo_entries 4
 
-; Swampert
+@ Swampert
 	empty_evo_entries 5
 
-; Poochyena
+@ Poochyena
 	evo_entry EVO_LEVEL, 18, SPECIES_MIGHTYENA
 	empty_evo_entries 4
 
-; Mightyena
+@ Mightyena
 	empty_evo_entries 5
 
-; Zigzagoon
+@ Zigzagoon
 	evo_entry EVO_LEVEL, 20, SPECIES_LINOONE
 	empty_evo_entries 4
 
-; Linoone
+@ Linoone
 	empty_evo_entries 5
 
-; Wurmple
+@ Wurmple
 	evo_entry EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON
 	evo_entry EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON
 	empty_evo_entries 3
 
-; Silcoon
+@ Silcoon
 	evo_entry EVO_LEVEL, 10, SPECIES_BEAUTIFLY
 	empty_evo_entries 4
 
-; Beautifly
+@ Beautifly
 	empty_evo_entries 5
 
-; Cascoon
+@ Cascoon
 	evo_entry EVO_LEVEL, 10, SPECIES_DUSTOX
 	empty_evo_entries 4
 
-; Dustox
+@ Dustox
 	empty_evo_entries 5
 
-; Lotad
+@ Lotad
 	evo_entry EVO_LEVEL, 14, SPECIES_LOMBRE
 	empty_evo_entries 4
 
-; Lombre
+@ Lombre
 	evo_entry EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO
 	empty_evo_entries 4
 
-; Ludicolo
+@ Ludicolo
 	empty_evo_entries 5
 
-; Seedot
+@ Seedot
 	evo_entry EVO_LEVEL, 14, SPECIES_NUZLEAF
 	empty_evo_entries 4
 
-; Nuzleaf
+@ Nuzleaf
 	evo_entry EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY
 	empty_evo_entries 4
 
-; Shiftry
+@ Shiftry
 	empty_evo_entries 5
 
-; Nincada
+@ Nincada
 	evo_entry EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK
 	evo_entry EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA
 	empty_evo_entries 3
 
-; Ninjask
+@ Ninjask
 	empty_evo_entries 5
 
-; Shedinja
+@ Shedinja
 	empty_evo_entries 5
 
-; Taillow
+@ Taillow
 	evo_entry EVO_LEVEL, 22, SPECIES_SWELLOW
 	empty_evo_entries 4
 
-; Swellow
+@ Swellow
 	empty_evo_entries 5
 
-; Shroomish
+@ Shroomish
 	evo_entry EVO_LEVEL, 23, SPECIES_BRELOOM
 	empty_evo_entries 4
 
-; Breloom
+@ Breloom
 	empty_evo_entries 5
 
-; Spinda
+@ Spinda
 	empty_evo_entries 5
 
-; Wingull
+@ Wingull
 	evo_entry EVO_LEVEL, 25, SPECIES_PELIPPER
 	empty_evo_entries 4
 
-; Pelipper
+@ Pelipper
 	empty_evo_entries 5
 
-; Surskit
+@ Surskit
 	evo_entry EVO_LEVEL, 22, SPECIES_MASQUERAIN
 	empty_evo_entries 4
 
-; Masquerain
+@ Masquerain
 	empty_evo_entries 5
 
-; Wailmer
+@ Wailmer
 	evo_entry EVO_LEVEL, 40, SPECIES_WAILORD
 	empty_evo_entries 4
 
-; Wailord
+@ Wailord
 	empty_evo_entries 5
 
-; Skitty
+@ Skitty
 	evo_entry EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY
 	empty_evo_entries 4
 
-; Delcatty
+@ Delcatty
 	empty_evo_entries 5
 
-; Kecleon
+@ Kecleon
 	empty_evo_entries 5
 
-; Baltoy
+@ Baltoy
 	evo_entry EVO_LEVEL, 36, SPECIES_CLAYDOL
 	empty_evo_entries 4
 
-; Claydol
+@ Claydol
 	empty_evo_entries 5
 
-; Nosepass
+@ Nosepass
 	empty_evo_entries 5
 
-; Torkoal
+@ Torkoal
 	empty_evo_entries 5
 
-; Sableye
+@ Sableye
 	empty_evo_entries 5
 
-; Barboach
+@ Barboach
 	evo_entry EVO_LEVEL, 30, SPECIES_WHISCASH
 	empty_evo_entries 4
 
-; Whiscash
+@ Whiscash
 	empty_evo_entries 5
 
-; Luvdisc
+@ Luvdisc
 	empty_evo_entries 5
 
-; Corphish
+@ Corphish
 	evo_entry EVO_LEVEL, 30, SPECIES_CRAWDAUNT
 	empty_evo_entries 4
 
-; Crawdaunt
+@ Crawdaunt
 	empty_evo_entries 5
 
-; Feebas
+@ Feebas
 	evo_entry EVO_BEAUTY, 170, SPECIES_MILOTIC
 	empty_evo_entries 4
 
-; Milotic
+@ Milotic
 	empty_evo_entries 5
 
-; Carvanha
+@ Carvanha
 	evo_entry EVO_LEVEL, 30, SPECIES_SHARPEDO
 	empty_evo_entries 4
 
-; Sharpedo
+@ Sharpedo
 	empty_evo_entries 5
 
-; Trapinch
+@ Trapinch
 	evo_entry EVO_LEVEL, 35, SPECIES_VIBRAVA
 	empty_evo_entries 4
 
-; Vibrava
+@ Vibrava
 	evo_entry EVO_LEVEL, 45, SPECIES_FLYGON
 	empty_evo_entries 4
 
-; Flygon
+@ Flygon
 	empty_evo_entries 5
 
-; Makuhita
+@ Makuhita
 	evo_entry EVO_LEVEL, 24, SPECIES_HARIYAMA
 	empty_evo_entries 4
 
-; Hariyama
+@ Hariyama
 	empty_evo_entries 5
 
-; Electrike
+@ Electrike
 	evo_entry EVO_LEVEL, 26, SPECIES_MANECTRIC
 	empty_evo_entries 4
 
-; Manectric
+@ Manectric
 	empty_evo_entries 5
 
-; Numel
+@ Numel
 	evo_entry EVO_LEVEL, 33, SPECIES_CAMERUPT
 	empty_evo_entries 4
 
-; Camerupt
+@ Camerupt
 	empty_evo_entries 5
 
-; Spheal
+@ Spheal
 	evo_entry EVO_LEVEL, 32, SPECIES_SEALEO
 	empty_evo_entries 4
 
-; Sealeo
+@ Sealeo
 	evo_entry EVO_LEVEL, 44, SPECIES_WALREIN
 	empty_evo_entries 4
 
-; Walrein
+@ Walrein
 	empty_evo_entries 5
 
-; Cacnea
+@ Cacnea
 	evo_entry EVO_LEVEL, 32, SPECIES_CACTURNE
 	empty_evo_entries 4
 
-; Cacturne
+@ Cacturne
 	empty_evo_entries 5
 
-; Snorunt
+@ Snorunt
 	evo_entry EVO_LEVEL, 42, SPECIES_GLALIE
 	empty_evo_entries 4
 
-; Glalie
+@ Glalie
 	empty_evo_entries 5
 
-; Lunatone
+@ Lunatone
 	empty_evo_entries 5
 
-; Solrock
+@ Solrock
 	empty_evo_entries 5
 
-; Azurill
+@ Azurill
 	evo_entry EVO_FRIENDSHIP, 0, SPECIES_MARILL
 	empty_evo_entries 4
 
-; Spoink
+@ Spoink
 	evo_entry EVO_LEVEL, 32, SPECIES_GRUMPIG
 	empty_evo_entries 4
 
-; Grumpig
+@ Grumpig
 	empty_evo_entries 5
 
-; Plusle
+@ Plusle
 	empty_evo_entries 5
 
-; Minun
+@ Minun
 	empty_evo_entries 5
 
-; Mawile
+@ Mawile
 	empty_evo_entries 5
 
-; Meditite
+@ Meditite
 	evo_entry EVO_LEVEL, 37, SPECIES_MEDICHAM
 	empty_evo_entries 4
 
-; Medicham
+@ Medicham
 	empty_evo_entries 5
 
-; Swablu
+@ Swablu
 	evo_entry EVO_LEVEL, 35, SPECIES_ALTARIA
 	empty_evo_entries 4
 
-; Altaria
+@ Altaria
 	empty_evo_entries 5
 
-; Wynaut
+@ Wynaut
 	evo_entry EVO_LEVEL, 15, SPECIES_WOBBUFFET
 	empty_evo_entries 4
 
-; Duskull
+@ Duskull
 	evo_entry EVO_LEVEL, 37, SPECIES_DUSCLOPS
 	empty_evo_entries 4
 
-; Dusclops
+@ Dusclops
 	empty_evo_entries 5
 
-; Roselia
+@ Roselia
 	empty_evo_entries 5
 
-; Slakoth
+@ Slakoth
 	evo_entry EVO_LEVEL, 18, SPECIES_VIGOROTH
 	empty_evo_entries 4
 
-; Vigoroth
+@ Vigoroth
 	evo_entry EVO_LEVEL, 36, SPECIES_SLAKING
 	empty_evo_entries 4
 
-; Slaking
+@ Slaking
 	empty_evo_entries 5
 
-; Gulpin
+@ Gulpin
 	evo_entry EVO_LEVEL, 26, SPECIES_SWALOT
 	empty_evo_entries 4
 
-; Swalot
+@ Swalot
 	empty_evo_entries 5
 
-; Tropius
+@ Tropius
 	empty_evo_entries 5
 
-; Whismur
+@ Whismur
 	evo_entry EVO_LEVEL, 20, SPECIES_LOUDRED
 	empty_evo_entries 4
 
-; Loudred
+@ Loudred
 	evo_entry EVO_LEVEL, 40, SPECIES_EXPLOUD
 	empty_evo_entries 4
 
-; Exploud
+@ Exploud
 	empty_evo_entries 5
 
-; Clamperl
+@ Clamperl
 	evo_entry EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL
 	evo_entry EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS
 	empty_evo_entries 3
 
-; Huntail
+@ Huntail
 	empty_evo_entries 5
 
-; Gorebyss
+@ Gorebyss
 	empty_evo_entries 5
 
-; Absol
+@ Absol
 	empty_evo_entries 5
 
-; Shuppet
+@ Shuppet
 	evo_entry EVO_LEVEL, 37, SPECIES_BANETTE
 	empty_evo_entries 4
 
-; Banette
+@ Banette
 	empty_evo_entries 5
 
-; Seviper
+@ Seviper
 	empty_evo_entries 5
 
-; Zangoose
+@ Zangoose
 	empty_evo_entries 5
 
-; Relicanth
+@ Relicanth
 	empty_evo_entries 5
 
-; Aron
+@ Aron
 	evo_entry EVO_LEVEL, 32, SPECIES_LAIRON
 	empty_evo_entries 4
 
-; Lairon
+@ Lairon
 	evo_entry EVO_LEVEL, 42, SPECIES_AGGRON
 	empty_evo_entries 4
 
-; Aggron
+@ Aggron
 	empty_evo_entries 5
 
-; Castform
+@ Castform
 	empty_evo_entries 5
 
-; Volbeat
+@ Volbeat
 	empty_evo_entries 5
 
-; Illumise
+@ Illumise
 	empty_evo_entries 5
 
-; Lileep
+@ Lileep
 	evo_entry EVO_LEVEL, 40, SPECIES_CRADILY
 	empty_evo_entries 4
 
-; Cradily
+@ Cradily
 	empty_evo_entries 5
 
-; Anorith
+@ Anorith
 	evo_entry EVO_LEVEL, 40, SPECIES_ARMALDO
 	empty_evo_entries 4
 
-; Armaldo
+@ Armaldo
 	empty_evo_entries 5
 
-; Ralts
+@ Ralts
 	evo_entry EVO_LEVEL, 20, SPECIES_KIRLIA
 	empty_evo_entries 4
 
-; Kirlia
+@ Kirlia
 	evo_entry EVO_LEVEL, 30, SPECIES_GARDEVOIR
 	empty_evo_entries 4
 
-; Gardevoir
+@ Gardevoir
 	empty_evo_entries 5
 
-; Bagon
+@ Bagon
 	evo_entry EVO_LEVEL, 30, SPECIES_SHELGON
 	empty_evo_entries 4
 
-; Shelgon
+@ Shelgon
 	evo_entry EVO_LEVEL, 50, SPECIES_SALAMENCE
 	empty_evo_entries 4
 
-; Salamence
+@ Salamence
 	empty_evo_entries 5
 
-; Beldum
+@ Beldum
 	evo_entry EVO_LEVEL, 20, SPECIES_METANG
 	empty_evo_entries 4
 
-; Metang
+@ Metang
 	evo_entry EVO_LEVEL, 45, SPECIES_METAGROSS
 	empty_evo_entries 4
 
-; Metagross
+@ Metagross
 	empty_evo_entries 5
 
-; Regirock
+@ Regirock
 	empty_evo_entries 5
 
-; Regice
+@ Regice
 	empty_evo_entries 5
 
-; Registeel
+@ Registeel
 	empty_evo_entries 5
 
-; Kyogre
+@ Kyogre
 	empty_evo_entries 5
 
-; Groudon
+@ Groudon
 	empty_evo_entries 5
 
-; Rayquaza
+@ Rayquaza
 	empty_evo_entries 5
 
-; Latias
+@ Latias
 	empty_evo_entries 5
 
-; Latios
+@ Latios
 	empty_evo_entries 5
 
-; Jirachi
+@ Jirachi
 	empty_evo_entries 5
 
-; Deoxys
+@ Deoxys
 	empty_evo_entries 5
 
-; Chimecho
+@ Chimecho
 	empty_evo_entries 5
diff --git a/data/experience_tables.s b/data/experience_tables.s
index ae263d510..d42280ec4 100644
--- a/data/experience_tables.s
+++ b/data/experience_tables.s
@@ -1,12 +1,12 @@
 	.align 2, 0
 
-gExperienceTables: ; 831F72C
+gExperienceTables: @ 831F72C
 	.include "data/experience_tables/medium_fast_growth_rate.s"
 	.include "data/experience_tables/erratic_growth_rate.s"
 	.include "data/experience_tables/fluctuating_growth_rate.s"
 	.include "data/experience_tables/medium_slow_growth_rate.s"
 	.include "data/experience_tables/fast_growth_rate.s"
 	.include "data/experience_tables/slow_growth_rate.s"
-; TODO: find out if these copies are used
+@ TODO: find out if these copies are used
 	.include "data/experience_tables/medium_fast_growth_rate.s"
 	.include "data/experience_tables/medium_fast_growth_rate.s"
diff --git a/data/experience_tables/erratic_growth_rate.s b/data/experience_tables/erratic_growth_rate.s
index 1cb5003a9..d3a455a9f 100644
--- a/data/experience_tables/erratic_growth_rate.s
+++ b/data/experience_tables/erratic_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte      15 ; 2
-	.4byte      52 ; 3
-	.4byte     122 ; 4
-	.4byte     237 ; 5
-	.4byte     406 ; 6
-	.4byte     637 ; 7
-	.4byte     942 ; 8
-	.4byte    1326 ; 9
-	.4byte    1800 ; 10
-	.4byte    2369 ; 11
-	.4byte    3041 ; 12
-	.4byte    3822 ; 13
-	.4byte    4719 ; 14
-	.4byte    5737 ; 15
-	.4byte    6881 ; 16
-	.4byte    8155 ; 17
-	.4byte    9564 ; 18
-	.4byte   11111 ; 19
-	.4byte   12800 ; 20
-	.4byte   14632 ; 21
-	.4byte   16610 ; 22
-	.4byte   18737 ; 23
-	.4byte   21012 ; 24
-	.4byte   23437 ; 25
-	.4byte   26012 ; 26
-	.4byte   28737 ; 27
-	.4byte   31610 ; 28
-	.4byte   34632 ; 29
-	.4byte   37800 ; 30
-	.4byte   41111 ; 31
-	.4byte   44564 ; 32
-	.4byte   48155 ; 33
-	.4byte   51881 ; 34
-	.4byte   55737 ; 35
-	.4byte   59719 ; 36
-	.4byte   63822 ; 37
-	.4byte   68041 ; 38
-	.4byte   72369 ; 39
-	.4byte   76800 ; 40
-	.4byte   81326 ; 41
-	.4byte   85942 ; 42
-	.4byte   90637 ; 43
-	.4byte   95406 ; 44
-	.4byte  100237 ; 45
-	.4byte  105122 ; 46
-	.4byte  110052 ; 47
-	.4byte  115015 ; 48
-	.4byte  120001 ; 49
-	.4byte  125000 ; 50
-	.4byte  131324 ; 51
-	.4byte  137795 ; 52
-	.4byte  144410 ; 53
-	.4byte  151165 ; 54
-	.4byte  158056 ; 55
-	.4byte  165079 ; 56
-	.4byte  172229 ; 57
-	.4byte  179503 ; 58
-	.4byte  186894 ; 59
-	.4byte  194400 ; 60
-	.4byte  202013 ; 61
-	.4byte  209728 ; 62
-	.4byte  217540 ; 63
-	.4byte  225443 ; 64
-	.4byte  233431 ; 65
-	.4byte  241496 ; 66
-	.4byte  249633 ; 67
-	.4byte  257834 ; 68
-	.4byte  267406 ; 69
-	.4byte  276458 ; 70
-	.4byte  286328 ; 71
-	.4byte  296358 ; 72
-	.4byte  305767 ; 73
-	.4byte  316074 ; 74
-	.4byte  326531 ; 75
-	.4byte  336255 ; 76
-	.4byte  346965 ; 77
-	.4byte  357812 ; 78
-	.4byte  367807 ; 79
-	.4byte  378880 ; 80
-	.4byte  390077 ; 81
-	.4byte  400293 ; 82
-	.4byte  411686 ; 83
-	.4byte  423190 ; 84
-	.4byte  433572 ; 85
-	.4byte  445239 ; 86
-	.4byte  457001 ; 87
-	.4byte  467489 ; 88
-	.4byte  479378 ; 89
-	.4byte  491346 ; 90
-	.4byte  501878 ; 91
-	.4byte  513934 ; 92
-	.4byte  526049 ; 93
-	.4byte  536557 ; 94
-	.4byte  548720 ; 95
-	.4byte  560922 ; 96
-	.4byte  571333 ; 97
-	.4byte  583539 ; 98
-	.4byte  591882 ; 99
-	.4byte  600000 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte      15 @ 2
+	.4byte      52 @ 3
+	.4byte     122 @ 4
+	.4byte     237 @ 5
+	.4byte     406 @ 6
+	.4byte     637 @ 7
+	.4byte     942 @ 8
+	.4byte    1326 @ 9
+	.4byte    1800 @ 10
+	.4byte    2369 @ 11
+	.4byte    3041 @ 12
+	.4byte    3822 @ 13
+	.4byte    4719 @ 14
+	.4byte    5737 @ 15
+	.4byte    6881 @ 16
+	.4byte    8155 @ 17
+	.4byte    9564 @ 18
+	.4byte   11111 @ 19
+	.4byte   12800 @ 20
+	.4byte   14632 @ 21
+	.4byte   16610 @ 22
+	.4byte   18737 @ 23
+	.4byte   21012 @ 24
+	.4byte   23437 @ 25
+	.4byte   26012 @ 26
+	.4byte   28737 @ 27
+	.4byte   31610 @ 28
+	.4byte   34632 @ 29
+	.4byte   37800 @ 30
+	.4byte   41111 @ 31
+	.4byte   44564 @ 32
+	.4byte   48155 @ 33
+	.4byte   51881 @ 34
+	.4byte   55737 @ 35
+	.4byte   59719 @ 36
+	.4byte   63822 @ 37
+	.4byte   68041 @ 38
+	.4byte   72369 @ 39
+	.4byte   76800 @ 40
+	.4byte   81326 @ 41
+	.4byte   85942 @ 42
+	.4byte   90637 @ 43
+	.4byte   95406 @ 44
+	.4byte  100237 @ 45
+	.4byte  105122 @ 46
+	.4byte  110052 @ 47
+	.4byte  115015 @ 48
+	.4byte  120001 @ 49
+	.4byte  125000 @ 50
+	.4byte  131324 @ 51
+	.4byte  137795 @ 52
+	.4byte  144410 @ 53
+	.4byte  151165 @ 54
+	.4byte  158056 @ 55
+	.4byte  165079 @ 56
+	.4byte  172229 @ 57
+	.4byte  179503 @ 58
+	.4byte  186894 @ 59
+	.4byte  194400 @ 60
+	.4byte  202013 @ 61
+	.4byte  209728 @ 62
+	.4byte  217540 @ 63
+	.4byte  225443 @ 64
+	.4byte  233431 @ 65
+	.4byte  241496 @ 66
+	.4byte  249633 @ 67
+	.4byte  257834 @ 68
+	.4byte  267406 @ 69
+	.4byte  276458 @ 70
+	.4byte  286328 @ 71
+	.4byte  296358 @ 72
+	.4byte  305767 @ 73
+	.4byte  316074 @ 74
+	.4byte  326531 @ 75
+	.4byte  336255 @ 76
+	.4byte  346965 @ 77
+	.4byte  357812 @ 78
+	.4byte  367807 @ 79
+	.4byte  378880 @ 80
+	.4byte  390077 @ 81
+	.4byte  400293 @ 82
+	.4byte  411686 @ 83
+	.4byte  423190 @ 84
+	.4byte  433572 @ 85
+	.4byte  445239 @ 86
+	.4byte  457001 @ 87
+	.4byte  467489 @ 88
+	.4byte  479378 @ 89
+	.4byte  491346 @ 90
+	.4byte  501878 @ 91
+	.4byte  513934 @ 92
+	.4byte  526049 @ 93
+	.4byte  536557 @ 94
+	.4byte  548720 @ 95
+	.4byte  560922 @ 96
+	.4byte  571333 @ 97
+	.4byte  583539 @ 98
+	.4byte  591882 @ 99
+	.4byte  600000 @ 100
diff --git a/data/experience_tables/fast_growth_rate.s b/data/experience_tables/fast_growth_rate.s
index 37f7e2960..d8675fdc0 100644
--- a/data/experience_tables/fast_growth_rate.s
+++ b/data/experience_tables/fast_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte       6 ; 2
-	.4byte      21 ; 3
-	.4byte      51 ; 4
-	.4byte     100 ; 5
-	.4byte     172 ; 6
-	.4byte     274 ; 7
-	.4byte     409 ; 8
-	.4byte     583 ; 9
-	.4byte     800 ; 10
-	.4byte    1064 ; 11
-	.4byte    1382 ; 12
-	.4byte    1757 ; 13
-	.4byte    2195 ; 14
-	.4byte    2700 ; 15
-	.4byte    3276 ; 16
-	.4byte    3930 ; 17
-	.4byte    4665 ; 18
-	.4byte    5487 ; 19
-	.4byte    6400 ; 20
-	.4byte    7408 ; 21
-	.4byte    8518 ; 22
-	.4byte    9733 ; 23
-	.4byte   11059 ; 24
-	.4byte   12500 ; 25
-	.4byte   14060 ; 26
-	.4byte   15746 ; 27
-	.4byte   17561 ; 28
-	.4byte   19511 ; 29
-	.4byte   21600 ; 30
-	.4byte   23832 ; 31
-	.4byte   26214 ; 32
-	.4byte   28749 ; 33
-	.4byte   31443 ; 34
-	.4byte   34300 ; 35
-	.4byte   37324 ; 36
-	.4byte   40522 ; 37
-	.4byte   43897 ; 38
-	.4byte   47455 ; 39
-	.4byte   51200 ; 40
-	.4byte   55136 ; 41
-	.4byte   59270 ; 42
-	.4byte   63605 ; 43
-	.4byte   68147 ; 44
-	.4byte   72900 ; 45
-	.4byte   77868 ; 46
-	.4byte   83058 ; 47
-	.4byte   88473 ; 48
-	.4byte   94119 ; 49
-	.4byte  100000 ; 50
-	.4byte  106120 ; 51
-	.4byte  112486 ; 52
-	.4byte  119101 ; 53
-	.4byte  125971 ; 54
-	.4byte  133100 ; 55
-	.4byte  140492 ; 56
-	.4byte  148154 ; 57
-	.4byte  156089 ; 58
-	.4byte  164303 ; 59
-	.4byte  172800 ; 60
-	.4byte  181584 ; 61
-	.4byte  190662 ; 62
-	.4byte  200037 ; 63
-	.4byte  209715 ; 64
-	.4byte  219700 ; 65
-	.4byte  229996 ; 66
-	.4byte  240610 ; 67
-	.4byte  251545 ; 68
-	.4byte  262807 ; 69
-	.4byte  274400 ; 70
-	.4byte  286328 ; 71
-	.4byte  298598 ; 72
-	.4byte  311213 ; 73
-	.4byte  324179 ; 74
-	.4byte  337500 ; 75
-	.4byte  351180 ; 76
-	.4byte  365226 ; 77
-	.4byte  379641 ; 78
-	.4byte  394431 ; 79
-	.4byte  409600 ; 80
-	.4byte  425152 ; 81
-	.4byte  441094 ; 82
-	.4byte  457429 ; 83
-	.4byte  474163 ; 84
-	.4byte  491300 ; 85
-	.4byte  508844 ; 86
-	.4byte  526802 ; 87
-	.4byte  545177 ; 88
-	.4byte  563975 ; 89
-	.4byte  583200 ; 90
-	.4byte  602856 ; 91
-	.4byte  622950 ; 92
-	.4byte  643485 ; 93
-	.4byte  664467 ; 94
-	.4byte  685900 ; 95
-	.4byte  707788 ; 96
-	.4byte  730138 ; 97
-	.4byte  752953 ; 98
-	.4byte  776239 ; 99
-	.4byte  800000 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte       6 @ 2
+	.4byte      21 @ 3
+	.4byte      51 @ 4
+	.4byte     100 @ 5
+	.4byte     172 @ 6
+	.4byte     274 @ 7
+	.4byte     409 @ 8
+	.4byte     583 @ 9
+	.4byte     800 @ 10
+	.4byte    1064 @ 11
+	.4byte    1382 @ 12
+	.4byte    1757 @ 13
+	.4byte    2195 @ 14
+	.4byte    2700 @ 15
+	.4byte    3276 @ 16
+	.4byte    3930 @ 17
+	.4byte    4665 @ 18
+	.4byte    5487 @ 19
+	.4byte    6400 @ 20
+	.4byte    7408 @ 21
+	.4byte    8518 @ 22
+	.4byte    9733 @ 23
+	.4byte   11059 @ 24
+	.4byte   12500 @ 25
+	.4byte   14060 @ 26
+	.4byte   15746 @ 27
+	.4byte   17561 @ 28
+	.4byte   19511 @ 29
+	.4byte   21600 @ 30
+	.4byte   23832 @ 31
+	.4byte   26214 @ 32
+	.4byte   28749 @ 33
+	.4byte   31443 @ 34
+	.4byte   34300 @ 35
+	.4byte   37324 @ 36
+	.4byte   40522 @ 37
+	.4byte   43897 @ 38
+	.4byte   47455 @ 39
+	.4byte   51200 @ 40
+	.4byte   55136 @ 41
+	.4byte   59270 @ 42
+	.4byte   63605 @ 43
+	.4byte   68147 @ 44
+	.4byte   72900 @ 45
+	.4byte   77868 @ 46
+	.4byte   83058 @ 47
+	.4byte   88473 @ 48
+	.4byte   94119 @ 49
+	.4byte  100000 @ 50
+	.4byte  106120 @ 51
+	.4byte  112486 @ 52
+	.4byte  119101 @ 53
+	.4byte  125971 @ 54
+	.4byte  133100 @ 55
+	.4byte  140492 @ 56
+	.4byte  148154 @ 57
+	.4byte  156089 @ 58
+	.4byte  164303 @ 59
+	.4byte  172800 @ 60
+	.4byte  181584 @ 61
+	.4byte  190662 @ 62
+	.4byte  200037 @ 63
+	.4byte  209715 @ 64
+	.4byte  219700 @ 65
+	.4byte  229996 @ 66
+	.4byte  240610 @ 67
+	.4byte  251545 @ 68
+	.4byte  262807 @ 69
+	.4byte  274400 @ 70
+	.4byte  286328 @ 71
+	.4byte  298598 @ 72
+	.4byte  311213 @ 73
+	.4byte  324179 @ 74
+	.4byte  337500 @ 75
+	.4byte  351180 @ 76
+	.4byte  365226 @ 77
+	.4byte  379641 @ 78
+	.4byte  394431 @ 79
+	.4byte  409600 @ 80
+	.4byte  425152 @ 81
+	.4byte  441094 @ 82
+	.4byte  457429 @ 83
+	.4byte  474163 @ 84
+	.4byte  491300 @ 85
+	.4byte  508844 @ 86
+	.4byte  526802 @ 87
+	.4byte  545177 @ 88
+	.4byte  563975 @ 89
+	.4byte  583200 @ 90
+	.4byte  602856 @ 91
+	.4byte  622950 @ 92
+	.4byte  643485 @ 93
+	.4byte  664467 @ 94
+	.4byte  685900 @ 95
+	.4byte  707788 @ 96
+	.4byte  730138 @ 97
+	.4byte  752953 @ 98
+	.4byte  776239 @ 99
+	.4byte  800000 @ 100
diff --git a/data/experience_tables/fluctuating_growth_rate.s b/data/experience_tables/fluctuating_growth_rate.s
index 8a6b27baa..81a962327 100644
--- a/data/experience_tables/fluctuating_growth_rate.s
+++ b/data/experience_tables/fluctuating_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte       4 ; 2
-	.4byte      13 ; 3
-	.4byte      32 ; 4
-	.4byte      65 ; 5
-	.4byte     112 ; 6
-	.4byte     178 ; 7
-	.4byte     276 ; 8
-	.4byte     393 ; 9
-	.4byte     540 ; 10
-	.4byte     745 ; 11
-	.4byte     967 ; 12
-	.4byte    1230 ; 13
-	.4byte    1591 ; 14
-	.4byte    1957 ; 15
-	.4byte    2457 ; 16
-	.4byte    3046 ; 17
-	.4byte    3732 ; 18
-	.4byte    4526 ; 19
-	.4byte    5440 ; 20
-	.4byte    6482 ; 21
-	.4byte    7666 ; 22
-	.4byte    9003 ; 23
-	.4byte   10506 ; 24
-	.4byte   12187 ; 25
-	.4byte   14060 ; 26
-	.4byte   16140 ; 27
-	.4byte   18439 ; 28
-	.4byte   20974 ; 29
-	.4byte   23760 ; 30
-	.4byte   26811 ; 31
-	.4byte   30146 ; 32
-	.4byte   33780 ; 33
-	.4byte   37731 ; 34
-	.4byte   42017 ; 35
-	.4byte   46656 ; 36
-	.4byte   50653 ; 37
-	.4byte   55969 ; 38
-	.4byte   60505 ; 39
-	.4byte   66560 ; 40
-	.4byte   71677 ; 41
-	.4byte   78533 ; 42
-	.4byte   84277 ; 43
-	.4byte   91998 ; 44
-	.4byte   98415 ; 45
-	.4byte  107069 ; 46
-	.4byte  114205 ; 47
-	.4byte  123863 ; 48
-	.4byte  131766 ; 49
-	.4byte  142500 ; 50
-	.4byte  151222 ; 51
-	.4byte  163105 ; 52
-	.4byte  172697 ; 53
-	.4byte  185807 ; 54
-	.4byte  196322 ; 55
-	.4byte  210739 ; 56
-	.4byte  222231 ; 57
-	.4byte  238036 ; 58
-	.4byte  250562 ; 59
-	.4byte  267840 ; 60
-	.4byte  281456 ; 61
-	.4byte  300293 ; 62
-	.4byte  315059 ; 63
-	.4byte  335544 ; 64
-	.4byte  351520 ; 65
-	.4byte  373744 ; 66
-	.4byte  390991 ; 67
-	.4byte  415050 ; 68
-	.4byte  433631 ; 69
-	.4byte  459620 ; 70
-	.4byte  479600 ; 71
-	.4byte  507617 ; 72
-	.4byte  529063 ; 73
-	.4byte  559209 ; 74
-	.4byte  582187 ; 75
-	.4byte  614566 ; 76
-	.4byte  639146 ; 77
-	.4byte  673863 ; 78
-	.4byte  700115 ; 79
-	.4byte  737280 ; 80
-	.4byte  765275 ; 81
-	.4byte  804997 ; 82
-	.4byte  834809 ; 83
-	.4byte  877201 ; 84
-	.4byte  908905 ; 85
-	.4byte  954084 ; 86
-	.4byte  987754 ; 87
-	.4byte 1035837 ; 88
-	.4byte 1071552 ; 89
-	.4byte 1122660 ; 90
-	.4byte 1160499 ; 91
-	.4byte 1214753 ; 92
-	.4byte 1254796 ; 93
-	.4byte 1312322 ; 94
-	.4byte 1354652 ; 95
-	.4byte 1415577 ; 96
-	.4byte 1460276 ; 97
-	.4byte 1524731 ; 98
-	.4byte 1571884 ; 99
-	.4byte 1640000 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte       4 @ 2
+	.4byte      13 @ 3
+	.4byte      32 @ 4
+	.4byte      65 @ 5
+	.4byte     112 @ 6
+	.4byte     178 @ 7
+	.4byte     276 @ 8
+	.4byte     393 @ 9
+	.4byte     540 @ 10
+	.4byte     745 @ 11
+	.4byte     967 @ 12
+	.4byte    1230 @ 13
+	.4byte    1591 @ 14
+	.4byte    1957 @ 15
+	.4byte    2457 @ 16
+	.4byte    3046 @ 17
+	.4byte    3732 @ 18
+	.4byte    4526 @ 19
+	.4byte    5440 @ 20
+	.4byte    6482 @ 21
+	.4byte    7666 @ 22
+	.4byte    9003 @ 23
+	.4byte   10506 @ 24
+	.4byte   12187 @ 25
+	.4byte   14060 @ 26
+	.4byte   16140 @ 27
+	.4byte   18439 @ 28
+	.4byte   20974 @ 29
+	.4byte   23760 @ 30
+	.4byte   26811 @ 31
+	.4byte   30146 @ 32
+	.4byte   33780 @ 33
+	.4byte   37731 @ 34
+	.4byte   42017 @ 35
+	.4byte   46656 @ 36
+	.4byte   50653 @ 37
+	.4byte   55969 @ 38
+	.4byte   60505 @ 39
+	.4byte   66560 @ 40
+	.4byte   71677 @ 41
+	.4byte   78533 @ 42
+	.4byte   84277 @ 43
+	.4byte   91998 @ 44
+	.4byte   98415 @ 45
+	.4byte  107069 @ 46
+	.4byte  114205 @ 47
+	.4byte  123863 @ 48
+	.4byte  131766 @ 49
+	.4byte  142500 @ 50
+	.4byte  151222 @ 51
+	.4byte  163105 @ 52
+	.4byte  172697 @ 53
+	.4byte  185807 @ 54
+	.4byte  196322 @ 55
+	.4byte  210739 @ 56
+	.4byte  222231 @ 57
+	.4byte  238036 @ 58
+	.4byte  250562 @ 59
+	.4byte  267840 @ 60
+	.4byte  281456 @ 61
+	.4byte  300293 @ 62
+	.4byte  315059 @ 63
+	.4byte  335544 @ 64
+	.4byte  351520 @ 65
+	.4byte  373744 @ 66
+	.4byte  390991 @ 67
+	.4byte  415050 @ 68
+	.4byte  433631 @ 69
+	.4byte  459620 @ 70
+	.4byte  479600 @ 71
+	.4byte  507617 @ 72
+	.4byte  529063 @ 73
+	.4byte  559209 @ 74
+	.4byte  582187 @ 75
+	.4byte  614566 @ 76
+	.4byte  639146 @ 77
+	.4byte  673863 @ 78
+	.4byte  700115 @ 79
+	.4byte  737280 @ 80
+	.4byte  765275 @ 81
+	.4byte  804997 @ 82
+	.4byte  834809 @ 83
+	.4byte  877201 @ 84
+	.4byte  908905 @ 85
+	.4byte  954084 @ 86
+	.4byte  987754 @ 87
+	.4byte 1035837 @ 88
+	.4byte 1071552 @ 89
+	.4byte 1122660 @ 90
+	.4byte 1160499 @ 91
+	.4byte 1214753 @ 92
+	.4byte 1254796 @ 93
+	.4byte 1312322 @ 94
+	.4byte 1354652 @ 95
+	.4byte 1415577 @ 96
+	.4byte 1460276 @ 97
+	.4byte 1524731 @ 98
+	.4byte 1571884 @ 99
+	.4byte 1640000 @ 100
diff --git a/data/experience_tables/medium_fast_growth_rate.s b/data/experience_tables/medium_fast_growth_rate.s
index 92261477f..5a51dd381 100644
--- a/data/experience_tables/medium_fast_growth_rate.s
+++ b/data/experience_tables/medium_fast_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte       8 ; 2
-	.4byte      27 ; 3
-	.4byte      64 ; 4
-	.4byte     125 ; 5
-	.4byte     216 ; 6
-	.4byte     343 ; 7
-	.4byte     512 ; 8
-	.4byte     729 ; 9
-	.4byte    1000 ; 10
-	.4byte    1331 ; 11
-	.4byte    1728 ; 12
-	.4byte    2197 ; 13
-	.4byte    2744 ; 14
-	.4byte    3375 ; 15
-	.4byte    4096 ; 16
-	.4byte    4913 ; 17
-	.4byte    5832 ; 18
-	.4byte    6859 ; 19
-	.4byte    8000 ; 20
-	.4byte    9261 ; 21
-	.4byte   10648 ; 22
-	.4byte   12167 ; 23
-	.4byte   13824 ; 24
-	.4byte   15625 ; 25
-	.4byte   17576 ; 26
-	.4byte   19683 ; 27
-	.4byte   21952 ; 28
-	.4byte   24389 ; 29
-	.4byte   27000 ; 30
-	.4byte   29791 ; 31
-	.4byte   32768 ; 32
-	.4byte   35937 ; 33
-	.4byte   39304 ; 34
-	.4byte   42875 ; 35
-	.4byte   46656 ; 36
-	.4byte   50653 ; 37
-	.4byte   54872 ; 38
-	.4byte   59319 ; 39
-	.4byte   64000 ; 40
-	.4byte   68921 ; 41
-	.4byte   74088 ; 42
-	.4byte   79507 ; 43
-	.4byte   85184 ; 44
-	.4byte   91125 ; 45
-	.4byte   97336 ; 46
-	.4byte  103823 ; 47
-	.4byte  110592 ; 48
-	.4byte  117649 ; 49
-	.4byte  125000 ; 50
-	.4byte  132651 ; 51
-	.4byte  140608 ; 52
-	.4byte  148877 ; 53
-	.4byte  157464 ; 54
-	.4byte  166375 ; 55
-	.4byte  175616 ; 56
-	.4byte  185193 ; 57
-	.4byte  195112 ; 58
-	.4byte  205379 ; 59
-	.4byte  216000 ; 60
-	.4byte  226981 ; 61
-	.4byte  238328 ; 62
-	.4byte  250047 ; 63
-	.4byte  262144 ; 64
-	.4byte  274625 ; 65
-	.4byte  287496 ; 66
-	.4byte  300763 ; 67
-	.4byte  314432 ; 68
-	.4byte  328509 ; 69
-	.4byte  343000 ; 70
-	.4byte  357911 ; 71
-	.4byte  373248 ; 72
-	.4byte  389017 ; 73
-	.4byte  405224 ; 74
-	.4byte  421875 ; 75
-	.4byte  438976 ; 76
-	.4byte  456533 ; 77
-	.4byte  474552 ; 78
-	.4byte  493039 ; 79
-	.4byte  512000 ; 80
-	.4byte  531441 ; 81
-	.4byte  551368 ; 82
-	.4byte  571787 ; 83
-	.4byte  592704 ; 84
-	.4byte  614125 ; 85
-	.4byte  636056 ; 86
-	.4byte  658503 ; 87
-	.4byte  681472 ; 88
-	.4byte  704969 ; 89
-	.4byte  729000 ; 90
-	.4byte  753571 ; 91
-	.4byte  778688 ; 92
-	.4byte  804357 ; 93
-	.4byte  830584 ; 94
-	.4byte  857375 ; 95
-	.4byte  884736 ; 96
-	.4byte  912673 ; 97
-	.4byte  941192 ; 98
-	.4byte  970299 ; 99
-	.4byte 1000000 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte       8 @ 2
+	.4byte      27 @ 3
+	.4byte      64 @ 4
+	.4byte     125 @ 5
+	.4byte     216 @ 6
+	.4byte     343 @ 7
+	.4byte     512 @ 8
+	.4byte     729 @ 9
+	.4byte    1000 @ 10
+	.4byte    1331 @ 11
+	.4byte    1728 @ 12
+	.4byte    2197 @ 13
+	.4byte    2744 @ 14
+	.4byte    3375 @ 15
+	.4byte    4096 @ 16
+	.4byte    4913 @ 17
+	.4byte    5832 @ 18
+	.4byte    6859 @ 19
+	.4byte    8000 @ 20
+	.4byte    9261 @ 21
+	.4byte   10648 @ 22
+	.4byte   12167 @ 23
+	.4byte   13824 @ 24
+	.4byte   15625 @ 25
+	.4byte   17576 @ 26
+	.4byte   19683 @ 27
+	.4byte   21952 @ 28
+	.4byte   24389 @ 29
+	.4byte   27000 @ 30
+	.4byte   29791 @ 31
+	.4byte   32768 @ 32
+	.4byte   35937 @ 33
+	.4byte   39304 @ 34
+	.4byte   42875 @ 35
+	.4byte   46656 @ 36
+	.4byte   50653 @ 37
+	.4byte   54872 @ 38
+	.4byte   59319 @ 39
+	.4byte   64000 @ 40
+	.4byte   68921 @ 41
+	.4byte   74088 @ 42
+	.4byte   79507 @ 43
+	.4byte   85184 @ 44
+	.4byte   91125 @ 45
+	.4byte   97336 @ 46
+	.4byte  103823 @ 47
+	.4byte  110592 @ 48
+	.4byte  117649 @ 49
+	.4byte  125000 @ 50
+	.4byte  132651 @ 51
+	.4byte  140608 @ 52
+	.4byte  148877 @ 53
+	.4byte  157464 @ 54
+	.4byte  166375 @ 55
+	.4byte  175616 @ 56
+	.4byte  185193 @ 57
+	.4byte  195112 @ 58
+	.4byte  205379 @ 59
+	.4byte  216000 @ 60
+	.4byte  226981 @ 61
+	.4byte  238328 @ 62
+	.4byte  250047 @ 63
+	.4byte  262144 @ 64
+	.4byte  274625 @ 65
+	.4byte  287496 @ 66
+	.4byte  300763 @ 67
+	.4byte  314432 @ 68
+	.4byte  328509 @ 69
+	.4byte  343000 @ 70
+	.4byte  357911 @ 71
+	.4byte  373248 @ 72
+	.4byte  389017 @ 73
+	.4byte  405224 @ 74
+	.4byte  421875 @ 75
+	.4byte  438976 @ 76
+	.4byte  456533 @ 77
+	.4byte  474552 @ 78
+	.4byte  493039 @ 79
+	.4byte  512000 @ 80
+	.4byte  531441 @ 81
+	.4byte  551368 @ 82
+	.4byte  571787 @ 83
+	.4byte  592704 @ 84
+	.4byte  614125 @ 85
+	.4byte  636056 @ 86
+	.4byte  658503 @ 87
+	.4byte  681472 @ 88
+	.4byte  704969 @ 89
+	.4byte  729000 @ 90
+	.4byte  753571 @ 91
+	.4byte  778688 @ 92
+	.4byte  804357 @ 93
+	.4byte  830584 @ 94
+	.4byte  857375 @ 95
+	.4byte  884736 @ 96
+	.4byte  912673 @ 97
+	.4byte  941192 @ 98
+	.4byte  970299 @ 99
+	.4byte 1000000 @ 100
diff --git a/data/experience_tables/medium_slow_growth_rate.s b/data/experience_tables/medium_slow_growth_rate.s
index a2f7f8e00..d4c16b8c0 100644
--- a/data/experience_tables/medium_slow_growth_rate.s
+++ b/data/experience_tables/medium_slow_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte       9 ; 2
-	.4byte      57 ; 3
-	.4byte      96 ; 4
-	.4byte     135 ; 5
-	.4byte     179 ; 6
-	.4byte     236 ; 7
-	.4byte     314 ; 8
-	.4byte     419 ; 9
-	.4byte     560 ; 10
-	.4byte     742 ; 11
-	.4byte     973 ; 12
-	.4byte    1261 ; 13
-	.4byte    1612 ; 14
-	.4byte    2035 ; 15
-	.4byte    2535 ; 16
-	.4byte    3120 ; 17
-	.4byte    3798 ; 18
-	.4byte    4575 ; 19
-	.4byte    5460 ; 20
-	.4byte    6458 ; 21
-	.4byte    7577 ; 22
-	.4byte    8825 ; 23
-	.4byte   10208 ; 24
-	.4byte   11735 ; 25
-	.4byte   13411 ; 26
-	.4byte   15244 ; 27
-	.4byte   17242 ; 28
-	.4byte   19411 ; 29
-	.4byte   21760 ; 30
-	.4byte   24294 ; 31
-	.4byte   27021 ; 32
-	.4byte   29949 ; 33
-	.4byte   33084 ; 34
-	.4byte   36435 ; 35
-	.4byte   40007 ; 36
-	.4byte   43808 ; 37
-	.4byte   47846 ; 38
-	.4byte   52127 ; 39
-	.4byte   56660 ; 40
-	.4byte   61450 ; 41
-	.4byte   66505 ; 42
-	.4byte   71833 ; 43
-	.4byte   77440 ; 44
-	.4byte   83335 ; 45
-	.4byte   89523 ; 46
-	.4byte   96012 ; 47
-	.4byte  102810 ; 48
-	.4byte  109923 ; 49
-	.4byte  117360 ; 50
-	.4byte  125126 ; 51
-	.4byte  133229 ; 52
-	.4byte  141677 ; 53
-	.4byte  150476 ; 54
-	.4byte  159635 ; 55
-	.4byte  169159 ; 56
-	.4byte  179056 ; 57
-	.4byte  189334 ; 58
-	.4byte  199999 ; 59
-	.4byte  211060 ; 60
-	.4byte  222522 ; 61
-	.4byte  234393 ; 62
-	.4byte  246681 ; 63
-	.4byte  259392 ; 64
-	.4byte  272535 ; 65
-	.4byte  286115 ; 66
-	.4byte  300140 ; 67
-	.4byte  314618 ; 68
-	.4byte  329555 ; 69
-	.4byte  344960 ; 70
-	.4byte  360838 ; 71
-	.4byte  377197 ; 72
-	.4byte  394045 ; 73
-	.4byte  411388 ; 74
-	.4byte  429235 ; 75
-	.4byte  447591 ; 76
-	.4byte  466464 ; 77
-	.4byte  485862 ; 78
-	.4byte  505791 ; 79
-	.4byte  526260 ; 80
-	.4byte  547274 ; 81
-	.4byte  568841 ; 82
-	.4byte  590969 ; 83
-	.4byte  613664 ; 84
-	.4byte  636935 ; 85
-	.4byte  660787 ; 86
-	.4byte  685228 ; 87
-	.4byte  710266 ; 88
-	.4byte  735907 ; 89
-	.4byte  762160 ; 90
-	.4byte  789030 ; 91
-	.4byte  816525 ; 92
-	.4byte  844653 ; 93
-	.4byte  873420 ; 94
-	.4byte  902835 ; 95
-	.4byte  932903 ; 96
-	.4byte  963632 ; 97
-	.4byte  995030 ; 98
-	.4byte 1027103 ; 99
-	.4byte 1059860 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte       9 @ 2
+	.4byte      57 @ 3
+	.4byte      96 @ 4
+	.4byte     135 @ 5
+	.4byte     179 @ 6
+	.4byte     236 @ 7
+	.4byte     314 @ 8
+	.4byte     419 @ 9
+	.4byte     560 @ 10
+	.4byte     742 @ 11
+	.4byte     973 @ 12
+	.4byte    1261 @ 13
+	.4byte    1612 @ 14
+	.4byte    2035 @ 15
+	.4byte    2535 @ 16
+	.4byte    3120 @ 17
+	.4byte    3798 @ 18
+	.4byte    4575 @ 19
+	.4byte    5460 @ 20
+	.4byte    6458 @ 21
+	.4byte    7577 @ 22
+	.4byte    8825 @ 23
+	.4byte   10208 @ 24
+	.4byte   11735 @ 25
+	.4byte   13411 @ 26
+	.4byte   15244 @ 27
+	.4byte   17242 @ 28
+	.4byte   19411 @ 29
+	.4byte   21760 @ 30
+	.4byte   24294 @ 31
+	.4byte   27021 @ 32
+	.4byte   29949 @ 33
+	.4byte   33084 @ 34
+	.4byte   36435 @ 35
+	.4byte   40007 @ 36
+	.4byte   43808 @ 37
+	.4byte   47846 @ 38
+	.4byte   52127 @ 39
+	.4byte   56660 @ 40
+	.4byte   61450 @ 41
+	.4byte   66505 @ 42
+	.4byte   71833 @ 43
+	.4byte   77440 @ 44
+	.4byte   83335 @ 45
+	.4byte   89523 @ 46
+	.4byte   96012 @ 47
+	.4byte  102810 @ 48
+	.4byte  109923 @ 49
+	.4byte  117360 @ 50
+	.4byte  125126 @ 51
+	.4byte  133229 @ 52
+	.4byte  141677 @ 53
+	.4byte  150476 @ 54
+	.4byte  159635 @ 55
+	.4byte  169159 @ 56
+	.4byte  179056 @ 57
+	.4byte  189334 @ 58
+	.4byte  199999 @ 59
+	.4byte  211060 @ 60
+	.4byte  222522 @ 61
+	.4byte  234393 @ 62
+	.4byte  246681 @ 63
+	.4byte  259392 @ 64
+	.4byte  272535 @ 65
+	.4byte  286115 @ 66
+	.4byte  300140 @ 67
+	.4byte  314618 @ 68
+	.4byte  329555 @ 69
+	.4byte  344960 @ 70
+	.4byte  360838 @ 71
+	.4byte  377197 @ 72
+	.4byte  394045 @ 73
+	.4byte  411388 @ 74
+	.4byte  429235 @ 75
+	.4byte  447591 @ 76
+	.4byte  466464 @ 77
+	.4byte  485862 @ 78
+	.4byte  505791 @ 79
+	.4byte  526260 @ 80
+	.4byte  547274 @ 81
+	.4byte  568841 @ 82
+	.4byte  590969 @ 83
+	.4byte  613664 @ 84
+	.4byte  636935 @ 85
+	.4byte  660787 @ 86
+	.4byte  685228 @ 87
+	.4byte  710266 @ 88
+	.4byte  735907 @ 89
+	.4byte  762160 @ 90
+	.4byte  789030 @ 91
+	.4byte  816525 @ 92
+	.4byte  844653 @ 93
+	.4byte  873420 @ 94
+	.4byte  902835 @ 95
+	.4byte  932903 @ 96
+	.4byte  963632 @ 97
+	.4byte  995030 @ 98
+	.4byte 1027103 @ 99
+	.4byte 1059860 @ 100
diff --git a/data/experience_tables/slow_growth_rate.s b/data/experience_tables/slow_growth_rate.s
index 22f1aebd3..8d10b34ed 100644
--- a/data/experience_tables/slow_growth_rate.s
+++ b/data/experience_tables/slow_growth_rate.s
@@ -1,101 +1,101 @@
-	.4byte       0 ; 0
-	.4byte       1 ; 1
-	.4byte      10 ; 2
-	.4byte      33 ; 3
-	.4byte      80 ; 4
-	.4byte     156 ; 5
-	.4byte     270 ; 6
-	.4byte     428 ; 7
-	.4byte     640 ; 8
-	.4byte     911 ; 9
-	.4byte    1250 ; 10
-	.4byte    1663 ; 11
-	.4byte    2160 ; 12
-	.4byte    2746 ; 13
-	.4byte    3430 ; 14
-	.4byte    4218 ; 15
-	.4byte    5120 ; 16
-	.4byte    6141 ; 17
-	.4byte    7290 ; 18
-	.4byte    8573 ; 19
-	.4byte   10000 ; 20
-	.4byte   11576 ; 21
-	.4byte   13310 ; 22
-	.4byte   15208 ; 23
-	.4byte   17280 ; 24
-	.4byte   19531 ; 25
-	.4byte   21970 ; 26
-	.4byte   24603 ; 27
-	.4byte   27440 ; 28
-	.4byte   30486 ; 29
-	.4byte   33750 ; 30
-	.4byte   37238 ; 31
-	.4byte   40960 ; 32
-	.4byte   44921 ; 33
-	.4byte   49130 ; 34
-	.4byte   53593 ; 35
-	.4byte   58320 ; 36
-	.4byte   63316 ; 37
-	.4byte   68590 ; 38
-	.4byte   74148 ; 39
-	.4byte   80000 ; 40
-	.4byte   86151 ; 41
-	.4byte   92610 ; 42
-	.4byte   99383 ; 43
-	.4byte  106480 ; 44
-	.4byte  113906 ; 45
-	.4byte  121670 ; 46
-	.4byte  129778 ; 47
-	.4byte  138240 ; 48
-	.4byte  147061 ; 49
-	.4byte  156250 ; 50
-	.4byte  165813 ; 51
-	.4byte  175760 ; 52
-	.4byte  186096 ; 53
-	.4byte  196830 ; 54
-	.4byte  207968 ; 55
-	.4byte  219520 ; 56
-	.4byte  231491 ; 57
-	.4byte  243890 ; 58
-	.4byte  256723 ; 59
-	.4byte  270000 ; 60
-	.4byte  283726 ; 61
-	.4byte  297910 ; 62
-	.4byte  312558 ; 63
-	.4byte  327680 ; 64
-	.4byte  343281 ; 65
-	.4byte  359370 ; 66
-	.4byte  375953 ; 67
-	.4byte  393040 ; 68
-	.4byte  410636 ; 69
-	.4byte  428750 ; 70
-	.4byte  447388 ; 71
-	.4byte  466560 ; 72
-	.4byte  486271 ; 73
-	.4byte  506530 ; 74
-	.4byte  527343 ; 75
-	.4byte  548720 ; 76
-	.4byte  570666 ; 77
-	.4byte  593190 ; 78
-	.4byte  616298 ; 79
-	.4byte  640000 ; 80
-	.4byte  664301 ; 81
-	.4byte  689210 ; 82
-	.4byte  714733 ; 83
-	.4byte  740880 ; 84
-	.4byte  767656 ; 85
-	.4byte  795070 ; 86
-	.4byte  823128 ; 87
-	.4byte  851840 ; 88
-	.4byte  881211 ; 89
-	.4byte  911250 ; 90
-	.4byte  941963 ; 91
-	.4byte  973360 ; 92
-	.4byte 1005446 ; 93
-	.4byte 1038230 ; 94
-	.4byte 1071718 ; 95
-	.4byte 1105920 ; 96
-	.4byte 1140841 ; 97
-	.4byte 1176490 ; 98
-	.4byte 1212873 ; 99
-	.4byte 1250000 ; 100
+	.4byte       0 @ 0
+	.4byte       1 @ 1
+	.4byte      10 @ 2
+	.4byte      33 @ 3
+	.4byte      80 @ 4
+	.4byte     156 @ 5
+	.4byte     270 @ 6
+	.4byte     428 @ 7
+	.4byte     640 @ 8
+	.4byte     911 @ 9
+	.4byte    1250 @ 10
+	.4byte    1663 @ 11
+	.4byte    2160 @ 12
+	.4byte    2746 @ 13
+	.4byte    3430 @ 14
+	.4byte    4218 @ 15
+	.4byte    5120 @ 16
+	.4byte    6141 @ 17
+	.4byte    7290 @ 18
+	.4byte    8573 @ 19
+	.4byte   10000 @ 20
+	.4byte   11576 @ 21
+	.4byte   13310 @ 22
+	.4byte   15208 @ 23
+	.4byte   17280 @ 24
+	.4byte   19531 @ 25
+	.4byte   21970 @ 26
+	.4byte   24603 @ 27
+	.4byte   27440 @ 28
+	.4byte   30486 @ 29
+	.4byte   33750 @ 30
+	.4byte   37238 @ 31
+	.4byte   40960 @ 32
+	.4byte   44921 @ 33
+	.4byte   49130 @ 34
+	.4byte   53593 @ 35
+	.4byte   58320 @ 36
+	.4byte   63316 @ 37
+	.4byte   68590 @ 38
+	.4byte   74148 @ 39
+	.4byte   80000 @ 40
+	.4byte   86151 @ 41
+	.4byte   92610 @ 42
+	.4byte   99383 @ 43
+	.4byte  106480 @ 44
+	.4byte  113906 @ 45
+	.4byte  121670 @ 46
+	.4byte  129778 @ 47
+	.4byte  138240 @ 48
+	.4byte  147061 @ 49
+	.4byte  156250 @ 50
+	.4byte  165813 @ 51
+	.4byte  175760 @ 52
+	.4byte  186096 @ 53
+	.4byte  196830 @ 54
+	.4byte  207968 @ 55
+	.4byte  219520 @ 56
+	.4byte  231491 @ 57
+	.4byte  243890 @ 58
+	.4byte  256723 @ 59
+	.4byte  270000 @ 60
+	.4byte  283726 @ 61
+	.4byte  297910 @ 62
+	.4byte  312558 @ 63
+	.4byte  327680 @ 64
+	.4byte  343281 @ 65
+	.4byte  359370 @ 66
+	.4byte  375953 @ 67
+	.4byte  393040 @ 68
+	.4byte  410636 @ 69
+	.4byte  428750 @ 70
+	.4byte  447388 @ 71
+	.4byte  466560 @ 72
+	.4byte  486271 @ 73
+	.4byte  506530 @ 74
+	.4byte  527343 @ 75
+	.4byte  548720 @ 76
+	.4byte  570666 @ 77
+	.4byte  593190 @ 78
+	.4byte  616298 @ 79
+	.4byte  640000 @ 80
+	.4byte  664301 @ 81
+	.4byte  689210 @ 82
+	.4byte  714733 @ 83
+	.4byte  740880 @ 84
+	.4byte  767656 @ 85
+	.4byte  795070 @ 86
+	.4byte  823128 @ 87
+	.4byte  851840 @ 88
+	.4byte  881211 @ 89
+	.4byte  911250 @ 90
+	.4byte  941963 @ 91
+	.4byte  973360 @ 92
+	.4byte 1005446 @ 93
+	.4byte 1038230 @ 94
+	.4byte 1071718 @ 95
+	.4byte 1105920 @ 96
+	.4byte 1140841 @ 97
+	.4byte 1176490 @ 98
+	.4byte 1212873 @ 99
+	.4byte 1250000 @ 100
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 7485e7c74..86d9febee 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldEffectScriptPointers: ; 82DB9D4
+gFieldEffectScriptPointers: @ 82DB9D4
 	.4byte gFieldEffectScript_ExclamationMarkIcon1
 	.4byte gFieldEffectScript_UseCutOnTallGrass
 	.4byte gFieldEffectScript_UseCutOnTree
@@ -69,273 +69,273 @@ gFieldEffectScriptPointers: ; 82DB9D4
 	.4byte gFieldEffectScript_Unknown65
 	.4byte gFieldEffectScript_Unknown66
 
-gFieldEffectScript_ExclamationMarkIcon1: ; 82DBAE0
+gFieldEffectScript_ExclamationMarkIcon1: @ 82DBAE0
 	field_eff_callnative oei_exclamation_mark
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTallGrass: ; 82DBAE6
+gFieldEffectScript_UseCutOnTallGrass: @ 82DBAE6
 	field_eff_callnative sub_80D3A6C
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTree: ; 82DBAEC
+gFieldEffectScript_UseCutOnTree: @ 82DBAEC
 	field_eff_callnative sub_80D3ABC
 	field_eff_end
 
-gFieldEffectScript_Shadow: ; 82DBAF2
+gFieldEffectScript_Shadow: @ 82DBAF2
 	field_eff_callnative oei_shadow
 	field_eff_end
 
-gFieldEffectScript_TallGrass: ; 82DBAF8
+gFieldEffectScript_TallGrass: @ 82DBAF8
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_grass_normal
 	field_eff_end
 
-gFieldEffectScript_Ripple: ; 82DBB02
+gFieldEffectScript_Ripple: @ 82DBB02
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ripples
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMon: ; 82DBB0C
+gFieldEffectScript_FieldMoveShowMon: @ 82DBB0C
 	field_eff_callnative sub_80B849C
 	field_eff_end
 
-gFieldEffectScript_Ash: ; 82DBB12
+gFieldEffectScript_Ash: @ 82DBB12
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, oei_ash
 	field_eff_end
 
-gFieldEffectScript_SurfBlob: ; 82DBB1C
+gFieldEffectScript_SurfBlob: @ 82DBB1C
 	field_eff_callnative sub_8155534
 	field_eff_end
 
-gFieldEffectScript_UseSurf: ; 82DBB22
+gFieldEffectScript_UseSurf: @ 82DBB22
 	field_eff_callnative sub_80B8D44
 	field_eff_end
 
-gFieldEffectScript_GroundImpactDust: ; 82DBB28
+gFieldEffectScript_GroundImpactDust: @ 82DBB28
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155890
 	field_eff_end
 
-gFieldEffectScript_Unknown11: ; 82DBB32
+gFieldEffectScript_Unknown11: @ 82DBB32
 	field_eff_callnative oei_sweet_scent
 	field_eff_end
 
-gFieldEffectScript_BikeHopTallGrass: ; 82DBB38
+gFieldEffectScript_BikeHopTallGrass: @ 82DBB38
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154658
 	field_eff_end
 
-gFieldEffectScript_SandFootprints: ; 82DBB42
+gFieldEffectScript_SandFootprints: @ 82DBB42
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B04
 	field_eff_end
 
-gFieldEffectScript_BikeHopBigSplash: ; 82DBB4C
+gFieldEffectScript_BikeHopBigSplash: @ 82DBB4C
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, oei_water_drop_tall
 	field_eff_end
 
-gFieldEffectScript_Splash: ; 82DBB56
+gFieldEffectScript_Splash: @ 82DBB56
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154CEC
 	field_eff_end
 
-gFieldEffectScript_BikeHopSmallSplash: ; 82DBB60
+gFieldEffectScript_BikeHopSmallSplash: @ 82DBB60
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154E1C
 	field_eff_end
 
-gFieldEffectScript_LongGrass: ; 82DBB6A
+gFieldEffectScript_LongGrass: @ 82DBB6A
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_8154758
 	field_eff_end
 
-gFieldEffectScript_Unknown18: ; 82DBB74
+gFieldEffectScript_Unknown18: @ 82DBB74
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81548FC
 	field_eff_end
 
-gFieldEffectScript_Unknown19: ; 82DBB7E
+gFieldEffectScript_Unknown19: @ 82DBB7E
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81551F0
 	field_eff_end
 
-gFieldEffectScript_Unknown20: ; 82DBB88
+gFieldEffectScript_Unknown20: @ 82DBB88
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815525C
 	field_eff_end
 
-gFieldEffectScript_Unknown21: ; 82DBB92
+gFieldEffectScript_Unknown21: @ 82DBB92
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_81552C8
 	field_eff_end
 
-gFieldEffectScript_Unknown22: ; 82DBB9C
+gFieldEffectScript_Unknown22: @ 82DBB9C
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155334
 	field_eff_end
 
-gFieldEffectScript_BerryTreeGrowthSparkle: ; 82DBBA6
+gFieldEffectScript_BerryTreeGrowthSparkle: @ 82DBBA6
 	field_eff_callnative sub_8155B2C
 	field_eff_end
 
-gFieldEffectScript_DeepSandFootprints: ; 82DBBAC
+gFieldEffectScript_DeepSandFootprints: @ 82DBBAC
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154B78
 	field_eff_end
 
-gFieldEffectScript_Unknown25: ; 82DBBB6
+gFieldEffectScript_Unknown25: @ 82DBBB6
 	field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0
 	field_eff_end
 
-gFieldEffectScript_Unknown26: ; 82DBBC5
+gFieldEffectScript_Unknown26: @ 82DBBC5
 	field_eff_callnative sub_80FA208
 	field_eff_end
 
-gFieldEffectScript_Unknown27: ; 82DBBCB
+gFieldEffectScript_Unknown27: @ 82DBBCB
 	field_eff_callnative sub_80FA36C
 	field_eff_end
 
-gFieldEffectScript_TreeDisguise: ; 82DBBD1
+gFieldEffectScript_TreeDisguise: @ 82DBBD1
 	field_eff_callnative ShowTreeDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_MountainDisguise: ; 82DBBD7
+gFieldEffectScript_MountainDisguise: @ 82DBBD7
 	field_eff_callnative ShowMountainDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_Unknown30: ; 82DBBDD
+gFieldEffectScript_Unknown30: @ 82DBBDD
 	field_eff_callnative sub_80B90CC
 	field_eff_end
 
-gFieldEffectScript_UseFly: ; 82DBBE3
+gFieldEffectScript_UseFly: @ 82DBBE3
 	field_eff_callnative sub_80B91A4
 	field_eff_end
 
-gFieldEffectScript_FlyIn: ; 82DBBE9
+gFieldEffectScript_FlyIn: @ 82DBBE9
 	field_eff_callnative sub_80B97C0
 	field_eff_end
 
-gFieldEffectScript_ExclamationMarkIcon2: ; 82DBBEF
+gFieldEffectScript_ExclamationMarkIcon2: @ 82DBBEF
 	field_eff_callnative sub_80B4658
 	field_eff_end
 
-gFieldEffectScript_FeetInFlowingWater: ; 82DBBF5
+gFieldEffectScript_FeetInFlowingWater: @ 82DBBF5
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154EFC
 	field_eff_end
 
-gFieldEffectScript_BikeTireTracks: ; 82DBBFF
+gFieldEffectScript_BikeTireTracks: @ 82DBBFF
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8154BEC
 	field_eff_end
 
-gFieldEffectScript_SandDisguisePlaceholder: ; 82DBC09
+gFieldEffectScript_SandDisguisePlaceholder: @ 82DBC09
 	field_eff_callnative ShowSandDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_UseRockSmash: ; 82DBC0F
+gFieldEffectScript_UseRockSmash: @ 82DBC0F
 	field_eff_callnative oei_rocksmash
 	field_eff_end
 
-gFieldEffectScript_Unknown40: ; 82DBC15
+gFieldEffectScript_Unknown40: @ 82DBC15
 	field_eff_callnative sub_8145E2C
 	field_eff_end
 
-gFieldEffectScript_Unknown38: ; 82DBC1B
+gFieldEffectScript_Unknown38: @ 82DBC1B
 	field_eff_callnative sub_8135780
 	field_eff_end
 
-gFieldEffectScript_Unknown39: ; 82DBC21
+gFieldEffectScript_Unknown39: @ 82DBC21
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155900
 	field_eff_end
 
-gFieldEffectScript_ShortGrass: ; 82DBC2B
+gFieldEffectScript_ShortGrass: @ 82DBC2B
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_815496C
 	field_eff_end
 
-gFieldEffectScript_HotSpringsWater: ; 82DBC35
+gFieldEffectScript_HotSpringsWater: @ 82DBC35
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, sub_81550B4
 	field_eff_end
 
-gFieldEffectScript_Unknown43: ; 82DBC3F
+gFieldEffectScript_Unknown43: @ 82DBC3F
 	field_eff_callnative oei_waterfall
 	field_eff_end
 
-gFieldEffectScript_Unknown44: ; 82DBC45
+gFieldEffectScript_Unknown44: @ 82DBC45
 	field_eff_callnative sub_80B74D0
 	field_eff_end
 
-gFieldEffectScript_Unknown45: ; 82DBC4B
+gFieldEffectScript_Unknown45: @ 82DBC4B
 	field_eff_loadpal gFieldEffectObjectPaletteInfo10
 	field_eff_callnative sub_81470D0
 	field_eff_end
 
-gFieldEffectScript_HeartIcon: ; 82DBC56
+gFieldEffectScript_HeartIcon: @ 82DBC56
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690
 	field_eff_end
 
-gFieldEffectScript_Unknown47: ; 82DBC60
+gFieldEffectScript_Unknown47: @ 82DBC60
 	field_eff_callnative sub_80FA6FC
 	field_eff_end
 
-gFieldEffectScript_Unknown48: ; 82DBC66
+gFieldEffectScript_Unknown48: @ 82DBC66
 	field_eff_callnative sub_80FA700
 	field_eff_end
 
-gFieldEffectScript_JumpOutOfAsh: ; 82DBC6C
+gFieldEffectScript_JumpOutOfAsh: @ 82DBC6C
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48
 	field_eff_end
 
-gFieldEffectScript_Unknown50: ; 82DBC76
+gFieldEffectScript_Unknown50: @ 82DBC76
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4
 	field_eff_end
 
-gFieldEffectScript_Unknown51: ; 82DBC80
+gFieldEffectScript_Unknown51: @ 82DBC80
 	field_eff_callnative sub_8159F2C
 	field_eff_end
 
-gFieldEffectScript_Unknown52: ; 82DBC86
+gFieldEffectScript_Unknown52: @ 82DBC86
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C
 	field_eff_end
 
-gFieldEffectScript_Bubbles: ; 82DBC90
+gFieldEffectScript_Bubbles: @ 82DBC90
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_8155A88
 	field_eff_end
 
-gFieldEffectScript_Unknown54: ; 82DBC9A
+gFieldEffectScript_Unknown54: @ 82DBC9A
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, sub_8155DDC
 	field_eff_end
 
-gFieldEffectScript_Unknown55: ; 82DBCA4
+gFieldEffectScript_Unknown55: @ 82DBCA4
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C
 	field_eff_end
 
-gFieldEffectScript_Unknown56: ; 82DBCAE
+gFieldEffectScript_Unknown56: @ 82DBCAE
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248
 	field_eff_end
 
-gFieldEffectScript_Unknown57: ; 82DBCB8
+gFieldEffectScript_Unknown57: @ 82DBCB8
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC
 	field_eff_end
 
-gFieldEffectScript_Unknown58: ; 82DBCC2
+gFieldEffectScript_Unknown58: @ 82DBCC2
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMonInit: ; 82DBCCC
+gFieldEffectScript_FieldMoveShowMonInit: @ 82DBCCC
 	field_eff_callnative sub_80B84F8
 	field_eff_end
 
-gFieldEffectScript_Unknown60: ; 82DBCD2
+gFieldEffectScript_Unknown60: @ 82DBCD2
 	field_eff_callnative sub_81799B8
 	field_eff_end
 
-gFieldEffectScript_Unknown61: ; 82DBCD8
+gFieldEffectScript_Unknown61: @ 82DBCD8
 	field_eff_callnative sub_80FA458
 	field_eff_end
 
-gFieldEffectScript_Unknown62: ; 82DBCDE
+gFieldEffectScript_Unknown62: @ 82DBCDE
 	field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
 	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4
 	field_eff_end
 
-gFieldEffectScript_Unknown63: ; 82DBCED
+gFieldEffectScript_Unknown63: @ 82DBCED
 	field_eff_callnative sub_817C91C
 	field_eff_end
 
-gFieldEffectScript_Rayquaza: ; 82DBCF3
+gFieldEffectScript_Rayquaza: @ 82DBCF3
 	field_eff_callnative sub_80B8F98
 	field_eff_end
 
-gFieldEffectScript_Unknown65: ; 82DBCF9
+gFieldEffectScript_Unknown65: @ 82DBCF9
 	field_eff_callnative sub_80B9ADC
 	field_eff_end
 
-gFieldEffectScript_Unknown66: ; 82DBCFF
+gFieldEffectScript_Unknown66: @ 82DBCFF
 	field_eff_callnative sub_80B9E28
 	field_eff_end
diff --git a/data/graphics/berries/berry_graphics.s b/data/graphics/berries/berry_graphics.s
index 99d86fdf3..833b9429e 100644
--- a/data/graphics/berries/berry_graphics.s
+++ b/data/graphics/berries/berry_graphics.s
@@ -1,429 +1,429 @@
 	.align 2, 0
 
-gBerryPic_Cheri: ; 8D9C3A8
+gBerryPic_Cheri: @ 8D9C3A8
 	.incbin "data/graphics/berries/pics/cheri.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Oran: ; 8D9C4FC
+gBerryPic_Oran: @ 8D9C4FC
 	.incbin "data/graphics/berries/pics/oran.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pecha: ; 8D9C670
+gBerryPic_Pecha: @ 8D9C670
 	.incbin "data/graphics/berries/pics/pecha.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Rawst: ; 8D9C7E4
+gBerryPic_Rawst: @ 8D9C7E4
 	.incbin "data/graphics/berries/pics/rawst.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Aspear: ; 8D9C97C
+gBerryPic_Aspear: @ 8D9C97C
 	.incbin "data/graphics/berries/pics/aspear.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Leppa: ; 8D9CB24
+gBerryPic_Leppa: @ 8D9CB24
 	.incbin "data/graphics/berries/pics/leppa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Chesto: ; 8D9CC94
+gBerryPic_Chesto: @ 8D9CC94
 	.incbin "data/graphics/berries/pics/chesto.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Persim: ; 8D9CE78
+gBerryPic_Persim: @ 8D9CE78
 	.incbin "data/graphics/berries/pics/persim.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Lum: ; 8D9CFC8
+gBerryPic_Lum: @ 8D9CFC8
 	.incbin "data/graphics/berries/pics/lum.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Sitrus: ; 8D9D0E4
+gBerryPic_Sitrus: @ 8D9D0E4
 	.incbin "data/graphics/berries/pics/sitrus.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Figy: ; 8D9D288
+gBerryPic_Figy: @ 8D9D288
 	.incbin "data/graphics/berries/pics/figy.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Wiki: ; 8D9D434
+gBerryPic_Wiki: @ 8D9D434
 	.incbin "data/graphics/berries/pics/wiki.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Mago: ; 8D9D628
+gBerryPic_Mago: @ 8D9D628
 	.incbin "data/graphics/berries/pics/mago.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Aguav: ; 8D9D7DC
+gBerryPic_Aguav: @ 8D9D7DC
 	.incbin "data/graphics/berries/pics/aguav.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Iapapa: ; 8D9D950
+gBerryPic_Iapapa: @ 8D9D950
 	.incbin "data/graphics/berries/pics/iapapa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Razz: ; 8D9DC08
+gBerryPic_Razz: @ 8D9DC08
 	.incbin "data/graphics/berries/pics/razz.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Bluk: ; 8D9DE38
+gBerryPic_Bluk: @ 8D9DE38
 	.incbin "data/graphics/berries/pics/bluk.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Nanab: ; 8D9E020
+gBerryPic_Nanab: @ 8D9E020
 	.incbin "data/graphics/berries/pics/nanab.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Wepear: ; 8D9E194
+gBerryPic_Wepear: @ 8D9E194
 	.incbin "data/graphics/berries/pics/wepear.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pinap: ; 8D9E35C
+gBerryPic_Pinap: @ 8D9E35C
 	.incbin "data/graphics/berries/pics/pinap.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pomeg: ; 8D9E570
+gBerryPic_Pomeg: @ 8D9E570
 	.incbin "data/graphics/berries/pics/pomeg.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Kelpsy: ; 8D9E718
+gBerryPic_Kelpsy: @ 8D9E718
 	.incbin "data/graphics/berries/pics/kelpsy.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Qualot: ; 8D9E8C0
+gBerryPic_Qualot: @ 8D9E8C0
 	.incbin "data/graphics/berries/pics/qualot.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Hondew: ; 8D9EA8C
+gBerryPic_Hondew: @ 8D9EA8C
 	.incbin "data/graphics/berries/pics/hondew.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Grepa: ; 8D9ECE4
+gBerryPic_Grepa: @ 8D9ECE4
 	.incbin "data/graphics/berries/pics/grepa.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Tamato: ; 8D9EE74
+gBerryPic_Tamato: @ 8D9EE74
 	.incbin "data/graphics/berries/pics/tamato.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Cornn: ; 8D9F138
+gBerryPic_Cornn: @ 8D9F138
 	.incbin "data/graphics/berries/pics/cornn.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Magost: ; 8D9F33C
+gBerryPic_Magost: @ 8D9F33C
 	.incbin "data/graphics/berries/pics/magost.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Rabuta: ; 8D9F4E0
+gBerryPic_Rabuta: @ 8D9F4E0
 	.incbin "data/graphics/berries/pics/rabuta.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Nomel: ; 8D9F7D4
+gBerryPic_Nomel: @ 8D9F7D4
 	.incbin "data/graphics/berries/pics/nomel.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Spelon: ; 8D9F9B0
+gBerryPic_Spelon: @ 8D9F9B0
 	.incbin "data/graphics/berries/pics/spelon.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Pamtre: ; 8D9FBA0
+gBerryPic_Pamtre: @ 8D9FBA0
 	.incbin "data/graphics/berries/pics/pamtre.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Watmel: ; 8D9FDF0
+gBerryPic_Watmel: @ 8D9FDF0
 	.incbin "data/graphics/berries/pics/watmel.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Durin: ; 8DA00D4
+gBerryPic_Durin: @ 8DA00D4
 	.incbin "data/graphics/berries/pics/durin.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Belue: ; 8DA04A0
+gBerryPic_Belue: @ 8DA04A0
 	.incbin "data/graphics/berries/pics/belue.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Liechi: ; 8DA0778
+gBerryPic_Liechi: @ 8DA0778
 	.incbin "data/graphics/berries/pics/liechi.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Ganlon: ; 8DA09D0
+gBerryPic_Ganlon: @ 8DA09D0
 	.incbin "data/graphics/berries/pics/ganlon.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Salac: ; 8DA0B68
+gBerryPic_Salac: @ 8DA0B68
 	.incbin "data/graphics/berries/pics/salac.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Petaya: ; 8DA0DAC
+gBerryPic_Petaya: @ 8DA0DAC
 	.incbin "data/graphics/berries/pics/petaya.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Apicot: ; 8DA1054
+gBerryPic_Apicot: @ 8DA1054
 	.incbin "data/graphics/berries/pics/apicot.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Lansat: ; 8DA11E4
+gBerryPic_Lansat: @ 8DA11E4
 	.incbin "data/graphics/berries/pics/lansat.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Starf: ; 8DA13D8
+gBerryPic_Starf: @ 8DA13D8
 	.incbin "data/graphics/berries/pics/starf.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPic_Enigma: ; 8DA15A8
+gBerryPic_Enigma: @ 8DA15A8
 	.incbin "data/graphics/berries/pics/enigma.4bpp.lz"
 
 	.align 2, 0
 
-gBerryPalette_Cheri: ; 8DA17C0
+gBerryPalette_Cheri: @ 8DA17C0
 	.incbin "data/graphics/berries/palettes/cheri.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Oran: ; 8DA17E8
+gBerryPalette_Oran: @ 8DA17E8
 	.incbin "data/graphics/berries/palettes/oran.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pecha: ; 8DA1810
+gBerryPalette_Pecha: @ 8DA1810
 	.incbin "data/graphics/berries/palettes/pecha.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Rawst: ; 8DA1838
+gBerryPalette_Rawst: @ 8DA1838
 	.incbin "data/graphics/berries/palettes/rawst.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Aspear: ; 8DA1860
+gBerryPalette_Aspear: @ 8DA1860
 	.incbin "data/graphics/berries/palettes/aspear.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Leppa: ; 8DA1888
+gBerryPalette_Leppa: @ 8DA1888
 	.incbin "data/graphics/berries/palettes/leppa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Chesto: ; 8DA18B0
+gBerryPalette_Chesto: @ 8DA18B0
 	.incbin "data/graphics/berries/palettes/chesto.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Persim: ; 8DA18D8
+gBerryPalette_Persim: @ 8DA18D8
 	.incbin "data/graphics/berries/palettes/persim.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Lum: ; 8DA1900
+gBerryPalette_Lum: @ 8DA1900
 	.incbin "data/graphics/berries/palettes/lum.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Sitrus: ; 8DA1928
+gBerryPalette_Sitrus: @ 8DA1928
 	.incbin "data/graphics/berries/palettes/sitrus.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Figy: ; 8DA1950
+gBerryPalette_Figy: @ 8DA1950
 	.incbin "data/graphics/berries/palettes/figy.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Wiki: ; 8DA1978
+gBerryPalette_Wiki: @ 8DA1978
 	.incbin "data/graphics/berries/palettes/wiki.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Mago: ; 8DA19A0
+gBerryPalette_Mago: @ 8DA19A0
 	.incbin "data/graphics/berries/palettes/mago.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Aguav: ; 8DA19C8
+gBerryPalette_Aguav: @ 8DA19C8
 	.incbin "data/graphics/berries/palettes/aguav.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Iapapa: ; 8DA19F0
+gBerryPalette_Iapapa: @ 8DA19F0
 	.incbin "data/graphics/berries/palettes/iapapa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Razz: ; 8DA1A18
+gBerryPalette_Razz: @ 8DA1A18
 	.incbin "data/graphics/berries/palettes/razz.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Bluk: ; 8DA1A40
+gBerryPalette_Bluk: @ 8DA1A40
 	.incbin "data/graphics/berries/palettes/bluk.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Nanab: ; 8DA1A68
+gBerryPalette_Nanab: @ 8DA1A68
 	.incbin "data/graphics/berries/palettes/nanab.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Wepear: ; 8DA1A90
+gBerryPalette_Wepear: @ 8DA1A90
 	.incbin "data/graphics/berries/palettes/wepear.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pinap: ; 8DA1AB8
+gBerryPalette_Pinap: @ 8DA1AB8
 	.incbin "data/graphics/berries/palettes/pinap.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pomeg: ; 8DA1AE0
+gBerryPalette_Pomeg: @ 8DA1AE0
 	.incbin "data/graphics/berries/palettes/pomeg.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Kelpsy: ; 8DA1B08
+gBerryPalette_Kelpsy: @ 8DA1B08
 	.incbin "data/graphics/berries/palettes/kelpsy.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Qualot: ; 8DA1B30
+gBerryPalette_Qualot: @ 8DA1B30
 	.incbin "data/graphics/berries/palettes/qualot.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Hondew: ; 8DA1B58
+gBerryPalette_Hondew: @ 8DA1B58
 	.incbin "data/graphics/berries/palettes/hondew.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Grepa: ; 8DA1B80
+gBerryPalette_Grepa: @ 8DA1B80
 	.incbin "data/graphics/berries/palettes/grepa.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Tamato: ; 8DA1BA8
+gBerryPalette_Tamato: @ 8DA1BA8
 	.incbin "data/graphics/berries/palettes/tamato.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Cornn: ; 8DA1BD0
+gBerryPalette_Cornn: @ 8DA1BD0
 	.incbin "data/graphics/berries/palettes/cornn.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Magost: ; 8DA1BF8
+gBerryPalette_Magost: @ 8DA1BF8
 	.incbin "data/graphics/berries/palettes/magost.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Rabuta: ; 8DA1C20
+gBerryPalette_Rabuta: @ 8DA1C20
 	.incbin "data/graphics/berries/palettes/rabuta.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Nomel: ; 8DA1C48
+gBerryPalette_Nomel: @ 8DA1C48
 	.incbin "data/graphics/berries/palettes/nomel.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Spelon: ; 8DA1C70
+gBerryPalette_Spelon: @ 8DA1C70
 	.incbin "data/graphics/berries/palettes/spelon.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Pamtre: ; 8DA1C98
+gBerryPalette_Pamtre: @ 8DA1C98
 	.incbin "data/graphics/berries/palettes/pamtre.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Watmel: ; 8DA1CC0
+gBerryPalette_Watmel: @ 8DA1CC0
 	.incbin "data/graphics/berries/palettes/watmel.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Durin: ; 8DA1CE8
+gBerryPalette_Durin: @ 8DA1CE8
 	.incbin "data/graphics/berries/palettes/durin.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Belue: ; 8DA1D10
+gBerryPalette_Belue: @ 8DA1D10
 	.incbin "data/graphics/berries/palettes/belue.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Liechi: ; 8DA1D38
+gBerryPalette_Liechi: @ 8DA1D38
 	.incbin "data/graphics/berries/palettes/liechi.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Ganlon: ; 8DA1D60
+gBerryPalette_Ganlon: @ 8DA1D60
 	.incbin "data/graphics/berries/palettes/ganlon.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Salac: ; 8DA1D88
+gBerryPalette_Salac: @ 8DA1D88
 	.incbin "data/graphics/berries/palettes/salac.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Petaya: ; 8DA1DB0
+gBerryPalette_Petaya: @ 8DA1DB0
 	.incbin "data/graphics/berries/palettes/petaya.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Apicot: ; 8DA1DD8
+gBerryPalette_Apicot: @ 8DA1DD8
 	.incbin "data/graphics/berries/palettes/apicot.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Lansat: ; 8DA1E00
+gBerryPalette_Lansat: @ 8DA1E00
 	.incbin "data/graphics/berries/palettes/lansat.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Starf: ; 8DA1E28
+gBerryPalette_Starf: @ 8DA1E28
 	.incbin "data/graphics/berries/palettes/starf.gbapal.lz"
 
 	.align 2, 0
 
-gBerryPalette_Enigma: ; 8DA1E50
+gBerryPalette_Enigma: @ 8DA1E50
 	.incbin "data/graphics/berries/palettes/enigma.gbapal.lz"
diff --git a/data/graphics/berries/berry_pic_table.s b/data/graphics/berries/berry_pic_table.s
index 333678ec2..1dc4b5391 100644
--- a/data/graphics/berries/berry_pic_table.s
+++ b/data/graphics/berries/berry_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gBerryPicTable: ; 857FC94
+gBerryPicTable: @ 857FC94
 	.4byte gBerryPic_Cheri,  gBerryPalette_Cheri
 	.4byte gBerryPic_Chesto, gBerryPalette_Chesto
 	.4byte gBerryPic_Pecha,  gBerryPalette_Pecha
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.s b/data/graphics/field_objects/berry_tree_graphics_tables.s
index 150a4869f..3e2e9da22 100644
--- a/data/graphics/field_objects/berry_tree_graphics_tables.s
+++ b/data/graphics/field_objects/berry_tree_graphics_tables.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldObjectPicTable_PechaBerryTree: ; 850BE48
+gFieldObjectPicTable_PechaBerryTree: @ 850BE48
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -13,12 +13,12 @@ gFieldObjectPicTable_PechaBerryTree: ; 850BE48
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Pecha: ; 850BE90
+gBerryTreePaletteSlotTable_Pecha: @ 850BE90
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_KelpsyBerryTree: ; 850BE98
+gFieldObjectPicTable_KelpsyBerryTree: @ 850BE98
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -31,12 +31,12 @@ gFieldObjectPicTable_KelpsyBerryTree: ; 850BE98
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Kelpsy: ; 850BEE0
+gBerryTreePaletteSlotTable_Kelpsy: @ 850BEE0
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_WepearBerryTree: ; 850BEE8
+gFieldObjectPicTable_WepearBerryTree: @ 850BEE8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -49,12 +49,12 @@ gFieldObjectPicTable_WepearBerryTree: ; 850BEE8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Wepear: ; 850BF30
+gBerryTreePaletteSlotTable_Wepear: @ 850BF30
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_IapapaBerryTree: ; 850BF38
+gFieldObjectPicTable_IapapaBerryTree: @ 850BF38
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -67,12 +67,12 @@ gFieldObjectPicTable_IapapaBerryTree: ; 850BF38
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Iapapa: ; 850BF80
+gBerryTreePaletteSlotTable_Iapapa: @ 850BF80
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_CheriBerryTree: ; 850BF88
+gFieldObjectPicTable_CheriBerryTree: @ 850BF88
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -85,12 +85,12 @@ gFieldObjectPicTable_CheriBerryTree: ; 850BF88
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Cheri: ; 850BFD0
+gBerryTreePaletteSlotTable_Cheri: @ 850BFD0
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_FigyBerryTree: ; 850BFD8
+gFieldObjectPicTable_FigyBerryTree: @ 850BFD8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -103,12 +103,12 @@ gFieldObjectPicTable_FigyBerryTree: ; 850BFD8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Figy: ; 850C020
+gBerryTreePaletteSlotTable_Figy: @ 850C020
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_MagoBerryTree: ; 850C028
+gFieldObjectPicTable_MagoBerryTree: @ 850C028
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -121,12 +121,12 @@ gFieldObjectPicTable_MagoBerryTree: ; 850C028
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Mago: ; 850C070
+gBerryTreePaletteSlotTable_Mago: @ 850C070
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_LumBerryTree: ; 850C078
+gFieldObjectPicTable_LumBerryTree: @ 850C078
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -139,12 +139,12 @@ gFieldObjectPicTable_LumBerryTree: ; 850C078
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Lum: ; 850C0C0
+gBerryTreePaletteSlotTable_Lum: @ 850C0C0
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_RazzBerryTree: ; 850C0C8
+gFieldObjectPicTable_RazzBerryTree: @ 850C0C8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -157,12 +157,12 @@ gFieldObjectPicTable_RazzBerryTree: ; 850C0C8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Razz: ; 850C110
+gBerryTreePaletteSlotTable_Razz: @ 850C110
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_GrepaBerryTree: ; 850C118
+gFieldObjectPicTable_GrepaBerryTree: @ 850C118
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -175,12 +175,12 @@ gFieldObjectPicTable_GrepaBerryTree: ; 850C118
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Grepa: ; 850C160
+gBerryTreePaletteSlotTable_Grepa: @ 850C160
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_RabutaBerryTree: ; 850C168
+gFieldObjectPicTable_RabutaBerryTree: @ 850C168
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -193,12 +193,12 @@ gFieldObjectPicTable_RabutaBerryTree: ; 850C168
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Rabuta: ; 850C1B0
+gBerryTreePaletteSlotTable_Rabuta: @ 850C1B0
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_NomelBerryTree: ; 850C1B8
+gFieldObjectPicTable_NomelBerryTree: @ 850C1B8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -211,12 +211,12 @@ gFieldObjectPicTable_NomelBerryTree: ; 850C1B8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Nomel: ; 850C200
+gBerryTreePaletteSlotTable_Nomel: @ 850C200
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_LeppaBerryTree: ; 850C208
+gFieldObjectPicTable_LeppaBerryTree: @ 850C208
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -229,12 +229,12 @@ gFieldObjectPicTable_LeppaBerryTree: ; 850C208
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Leppa: ; 850C250
+gBerryTreePaletteSlotTable_Leppa: @ 850C250
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_LiechiBerryTree: ; 850C258
+gFieldObjectPicTable_LiechiBerryTree: @ 850C258
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -247,12 +247,12 @@ gFieldObjectPicTable_LiechiBerryTree: ; 850C258
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Liechi: ; 850C2A0
+gBerryTreePaletteSlotTable_Liechi: @ 850C2A0
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_HondewBerryTree: ; 850C2A8
+gFieldObjectPicTable_HondewBerryTree: @ 850C2A8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -265,12 +265,12 @@ gFieldObjectPicTable_HondewBerryTree: ; 850C2A8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Hondew: ; 850C2F0
+gBerryTreePaletteSlotTable_Hondew: @ 850C2F0
 	berry_tree_palette_slot_table 5
 
 	.align 2, 0
 
-gFieldObjectPicTable_AguavBerryTree: ; 850C2F8
+gFieldObjectPicTable_AguavBerryTree: @ 850C2F8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -283,12 +283,12 @@ gFieldObjectPicTable_AguavBerryTree: ; 850C2F8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Aguav: ; 850C340
+gBerryTreePaletteSlotTable_Aguav: @ 850C340
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_WikiBerryTree: ; 850C348
+gFieldObjectPicTable_WikiBerryTree: @ 850C348
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -301,12 +301,12 @@ gFieldObjectPicTable_WikiBerryTree: ; 850C348
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Wiki: ; 850C390
+gBerryTreePaletteSlotTable_Wiki: @ 850C390
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_PomegBerryTree: ; 850C398
+gFieldObjectPicTable_PomegBerryTree: @ 850C398
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -319,12 +319,12 @@ gFieldObjectPicTable_PomegBerryTree: ; 850C398
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Pomeg: ; 850C3E0
+gBerryTreePaletteSlotTable_Pomeg: @ 850C3E0
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_RawstBerryTree: ; 850C3E8
+gFieldObjectPicTable_RawstBerryTree: @ 850C3E8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -337,12 +337,12 @@ gFieldObjectPicTable_RawstBerryTree: ; 850C3E8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Rawst: ; 850C430
+gBerryTreePaletteSlotTable_Rawst: @ 850C430
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_SpelonBerryTree: ; 850C438
+gFieldObjectPicTable_SpelonBerryTree: @ 850C438
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -355,12 +355,12 @@ gFieldObjectPicTable_SpelonBerryTree: ; 850C438
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Spelon: ; 850C480
+gBerryTreePaletteSlotTable_Spelon: @ 850C480
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_ChestoBerryTree: ; 850C488
+gFieldObjectPicTable_ChestoBerryTree: @ 850C488
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -373,12 +373,12 @@ gFieldObjectPicTable_ChestoBerryTree: ; 850C488
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Chesto: ; 850C4D0
+gBerryTreePaletteSlotTable_Chesto: @ 850C4D0
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_OranBerryTree: ; 850C4D8
+gFieldObjectPicTable_OranBerryTree: @ 850C4D8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -391,12 +391,12 @@ gFieldObjectPicTable_OranBerryTree: ; 850C4D8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Oran: ; 850C520
+gBerryTreePaletteSlotTable_Oran: @ 850C520
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_PersimBerryTree: ; 850C528
+gFieldObjectPicTable_PersimBerryTree: @ 850C528
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -409,12 +409,12 @@ gFieldObjectPicTable_PersimBerryTree: ; 850C528
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Persim: ; 850C570
+gBerryTreePaletteSlotTable_Persim: @ 850C570
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_SitrusBerryTree: ; 850C578
+gFieldObjectPicTable_SitrusBerryTree: @ 850C578
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -427,12 +427,12 @@ gFieldObjectPicTable_SitrusBerryTree: ; 850C578
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Sitrus: ; 850C5C0
+gBerryTreePaletteSlotTable_Sitrus: @ 850C5C0
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_AspearBerryTree: ; 850C5C8
+gFieldObjectPicTable_AspearBerryTree: @ 850C5C8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -445,12 +445,12 @@ gFieldObjectPicTable_AspearBerryTree: ; 850C5C8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Aspear: ; 850C610
+gBerryTreePaletteSlotTable_Aspear: @ 850C610
 	berry_tree_palette_slot_table 3
 
 	.align 2, 0
 
-gFieldObjectPicTable_PamtreBerryTree: ; 850C618
+gFieldObjectPicTable_PamtreBerryTree: @ 850C618
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -463,12 +463,12 @@ gFieldObjectPicTable_PamtreBerryTree: ; 850C618
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Pamtre: ; 850C660
+gBerryTreePaletteSlotTable_Pamtre: @ 850C660
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_CornnBerryTree: ; 850C668
+gFieldObjectPicTable_CornnBerryTree: @ 850C668
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -481,12 +481,12 @@ gFieldObjectPicTable_CornnBerryTree: ; 850C668
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Cornn: ; 850C6B0
+gBerryTreePaletteSlotTable_Cornn: @ 850C6B0
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_LansatBerryTree: ; 850C6B8
+gFieldObjectPicTable_LansatBerryTree: @ 850C6B8
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -499,12 +499,12 @@ gFieldObjectPicTable_LansatBerryTree: ; 850C6B8
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Lansat: ; 850C700
+gBerryTreePaletteSlotTable_Lansat: @ 850C700
 	berry_tree_palette_slot_table 2
 
 	.align 2, 0
 
-gFieldObjectPicTable_DurinBerryTree: ; 850C708
+gFieldObjectPicTable_DurinBerryTree: @ 850C708
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -517,12 +517,12 @@ gFieldObjectPicTable_DurinBerryTree: ; 850C708
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Durin: ; 850C750
+gBerryTreePaletteSlotTable_Durin: @ 850C750
 	berry_tree_palette_slot_table 4
 
 	.align 2, 0
 
-gFieldObjectPicTable_TamatoBerryTree: ; 850C758
+gFieldObjectPicTable_TamatoBerryTree: @ 850C758
 	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
 	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
@@ -535,7 +535,7 @@ gFieldObjectPicTable_TamatoBerryTree: ; 850C758
 
 	.align 2, 0
 
-gBerryTreePaletteSlotTable_Tamato: ; 850C7A0
+gBerryTreePaletteSlotTable_Tamato: @ 850C7A0
 	berry_tree_palette_slot_table 2
 
 	.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
@@ -544,7 +544,7 @@ gBerryTreePaletteSlotTable_Tamato: ; 850C7A0
 	.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
 	.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
 
-gBerryTreeFieldObjectGraphicsIdTable: ; 850C7AA
+gBerryTreeFieldObjectGraphicsIdTable: @ 850C7AA
 	.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
 	.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
 	.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
@@ -553,146 +553,146 @@ gBerryTreeFieldObjectGraphicsIdTable: ; 850C7AA
 
 	.align 2, 0
 
-gBerryTreePicTablePointers: ; 850C7B0
-	.4byte gFieldObjectPicTable_CheriBerryTree  ; Cheri
-	.4byte gFieldObjectPicTable_ChestoBerryTree ; Chesto
-	.4byte gFieldObjectPicTable_PechaBerryTree  ; Pecha
-	.4byte gFieldObjectPicTable_RawstBerryTree  ; Rawst
-	.4byte gFieldObjectPicTable_AspearBerryTree ; Aspear
-	.4byte gFieldObjectPicTable_LeppaBerryTree  ; Leppa
-	.4byte gFieldObjectPicTable_OranBerryTree   ; Oran
-	.4byte gFieldObjectPicTable_PersimBerryTree ; Persim
-	.4byte gFieldObjectPicTable_LumBerryTree    ; Lum
-	.4byte gFieldObjectPicTable_SitrusBerryTree ; Sitrus
-	.4byte gFieldObjectPicTable_FigyBerryTree   ; Figy
-	.4byte gFieldObjectPicTable_WikiBerryTree   ; Wiki
-	.4byte gFieldObjectPicTable_MagoBerryTree   ; Mago
-	.4byte gFieldObjectPicTable_AguavBerryTree  ; Aguav
-	.4byte gFieldObjectPicTable_IapapaBerryTree ; Iapapa
-	.4byte gFieldObjectPicTable_RazzBerryTree   ; Razz
-	.4byte gFieldObjectPicTable_RazzBerryTree   ; Bluk
-	.4byte gFieldObjectPicTable_MagoBerryTree   ; Nanab
-	.4byte gFieldObjectPicTable_WepearBerryTree ; Wepear
-	.4byte gFieldObjectPicTable_IapapaBerryTree ; Pinap
-	.4byte gFieldObjectPicTable_PomegBerryTree  ; Pomeg
-	.4byte gFieldObjectPicTable_KelpsyBerryTree ; Kelpsy
-	.4byte gFieldObjectPicTable_WepearBerryTree ; Qualot
-	.4byte gFieldObjectPicTable_HondewBerryTree ; Hondew
-	.4byte gFieldObjectPicTable_GrepaBerryTree  ; Grepa
-	.4byte gFieldObjectPicTable_TamatoBerryTree ; Tamato
-	.4byte gFieldObjectPicTable_CornnBerryTree  ; Cornn
-	.4byte gFieldObjectPicTable_PomegBerryTree  ; Magost
-	.4byte gFieldObjectPicTable_RabutaBerryTree ; Rabuta
-	.4byte gFieldObjectPicTable_NomelBerryTree  ; Nomel
-	.4byte gFieldObjectPicTable_SpelonBerryTree ; Spelon
-	.4byte gFieldObjectPicTable_PamtreBerryTree ; Pamtre
-	.4byte gFieldObjectPicTable_RabutaBerryTree ; Watmel
-	.4byte gFieldObjectPicTable_DurinBerryTree  ; Durin
-	.4byte gFieldObjectPicTable_HondewBerryTree ; Belue
-	.4byte gFieldObjectPicTable_LiechiBerryTree ; Liechi
-	.4byte gFieldObjectPicTable_HondewBerryTree ; Ganlon
-	.4byte gFieldObjectPicTable_AguavBerryTree  ; Salac
-	.4byte gFieldObjectPicTable_PomegBerryTree  ; Petaya
-	.4byte gFieldObjectPicTable_GrepaBerryTree  ; Apicot
-	.4byte gFieldObjectPicTable_LansatBerryTree ; Lansat
-	.4byte gFieldObjectPicTable_CornnBerryTree  ; Starf
-	.4byte gFieldObjectPicTable_DurinBerryTree  ; Enigma
-
-	.align 2, 0
-
-gBerryTreePaletteSlotTablePointers: ; 850C85C
-	.4byte gBerryTreePaletteSlotTable_Cheri  ; Cheri
-	.4byte gBerryTreePaletteSlotTable_Chesto ; Chesto
-	.4byte gBerryTreePaletteSlotTable_Pecha  ; Pecha
-	.4byte gBerryTreePaletteSlotTable_Rawst  ; Rawst
-	.4byte gBerryTreePaletteSlotTable_Aspear ; Aspear
-	.4byte gBerryTreePaletteSlotTable_Leppa  ; Leppa
-	.4byte gBerryTreePaletteSlotTable_Oran   ; Oran
-	.4byte gBerryTreePaletteSlotTable_Persim ; Persim
-	.4byte gBerryTreePaletteSlotTable_Lum    ; Lum
-	.4byte gBerryTreePaletteSlotTable_Sitrus ; Sitrus
-	.4byte gBerryTreePaletteSlotTable_Figy   ; Figy
-	.4byte gBerryTreePaletteSlotTable_Wiki   ; Wiki
-	.4byte gBerryTreePaletteSlotTable_Mago   ; Mago
-	.4byte gBerryTreePaletteSlotTable_Aguav  ; Aguav
-	.4byte gBerryTreePaletteSlotTable_Iapapa ; Iapapa
-	.4byte gBerryTreePaletteSlotTable_Razz   ; Razz
-	.4byte gBerryTreePaletteSlotTable_Razz   ; Bluk
-	.4byte gBerryTreePaletteSlotTable_Mago   ; Nanab
-	.4byte gBerryTreePaletteSlotTable_Wepear ; Wepear
-	.4byte gBerryTreePaletteSlotTable_Iapapa ; Pinap
-	.4byte gBerryTreePaletteSlotTable_Pomeg  ; Pomeg
-	.4byte gBerryTreePaletteSlotTable_Kelpsy ; Kelpsy
-	.4byte gBerryTreePaletteSlotTable_Wepear ; Qualot
-	.4byte gBerryTreePaletteSlotTable_Hondew ; Hondew
-	.4byte gBerryTreePaletteSlotTable_Grepa  ; Grepa
-	.4byte gBerryTreePaletteSlotTable_Tamato ; Tamato
-	.4byte gBerryTreePaletteSlotTable_Cornn  ; Cornn
-	.4byte gBerryTreePaletteSlotTable_Pomeg  ; Magost
-	.4byte gBerryTreePaletteSlotTable_Rabuta ; Rabuta
-	.4byte gBerryTreePaletteSlotTable_Nomel  ; Nomel
-	.4byte gBerryTreePaletteSlotTable_Spelon ; Spelon
-	.4byte gBerryTreePaletteSlotTable_Pamtre ; Pamtre
-	.4byte gBerryTreePaletteSlotTable_Rabuta ; Watmel
-	.4byte gBerryTreePaletteSlotTable_Durin  ; Durin
-	.4byte gBerryTreePaletteSlotTable_Hondew ; Belue
-	.4byte gBerryTreePaletteSlotTable_Liechi ; Liechi
-	.4byte gBerryTreePaletteSlotTable_Hondew ; Ganlon
-	.4byte gBerryTreePaletteSlotTable_Aguav  ; Salac
-	.4byte gBerryTreePaletteSlotTable_Pomeg  ; Petaya
-	.4byte gBerryTreePaletteSlotTable_Grepa  ; Apicot
-	.4byte gBerryTreePaletteSlotTable_Lansat ; Lansat
-	.4byte gBerryTreePaletteSlotTable_Cornn  ; Starf
-	.4byte gBerryTreePaletteSlotTable_Durin  ; Enigma
-
-	.align 2, 0
-
-gBerryTreeFieldObjectGraphicsIdTablePointers: ; 850C908
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Cheri
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Chesto
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pecha
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Rawst
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Aspear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Leppa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Oran
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Persim
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Lum
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Sitrus
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Figy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Wiki
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Mago
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Aguav
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Iapapa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Razz
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Bluk
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Nanab
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Wepear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pinap
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pomeg
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Kelpsy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Qualot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Hondew
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Grepa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Tamato
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Cornn
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Magost
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Rabuta
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Nomel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Spelon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Pamtre
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Watmel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Durin
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Belue
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Liechi
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Ganlon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Salac
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Petaya
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Apicot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Lansat
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Starf
-	.4byte gBerryTreeFieldObjectGraphicsIdTable ; Enigma
-
-; extras
+gBerryTreePicTablePointers: @ 850C7B0
+	.4byte gFieldObjectPicTable_CheriBerryTree  @ Cheri
+	.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
+	.4byte gFieldObjectPicTable_PechaBerryTree  @ Pecha
+	.4byte gFieldObjectPicTable_RawstBerryTree  @ Rawst
+	.4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
+	.4byte gFieldObjectPicTable_LeppaBerryTree  @ Leppa
+	.4byte gFieldObjectPicTable_OranBerryTree   @ Oran
+	.4byte gFieldObjectPicTable_PersimBerryTree @ Persim
+	.4byte gFieldObjectPicTable_LumBerryTree    @ Lum
+	.4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
+	.4byte gFieldObjectPicTable_FigyBerryTree   @ Figy
+	.4byte gFieldObjectPicTable_WikiBerryTree   @ Wiki
+	.4byte gFieldObjectPicTable_MagoBerryTree   @ Mago
+	.4byte gFieldObjectPicTable_AguavBerryTree  @ Aguav
+	.4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
+	.4byte gFieldObjectPicTable_RazzBerryTree   @ Razz
+	.4byte gFieldObjectPicTable_RazzBerryTree   @ Bluk
+	.4byte gFieldObjectPicTable_MagoBerryTree   @ Nanab
+	.4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
+	.4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
+	.4byte gFieldObjectPicTable_PomegBerryTree  @ Pomeg
+	.4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
+	.4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
+	.4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
+	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Grepa
+	.4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
+	.4byte gFieldObjectPicTable_CornnBerryTree  @ Cornn
+	.4byte gFieldObjectPicTable_PomegBerryTree  @ Magost
+	.4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
+	.4byte gFieldObjectPicTable_NomelBerryTree  @ Nomel
+	.4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
+	.4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
+	.4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
+	.4byte gFieldObjectPicTable_DurinBerryTree  @ Durin
+	.4byte gFieldObjectPicTable_HondewBerryTree @ Belue
+	.4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
+	.4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
+	.4byte gFieldObjectPicTable_AguavBerryTree  @ Salac
+	.4byte gFieldObjectPicTable_PomegBerryTree  @ Petaya
+	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Apicot
+	.4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
+	.4byte gFieldObjectPicTable_CornnBerryTree  @ Starf
+	.4byte gFieldObjectPicTable_DurinBerryTree  @ Enigma
+
+	.align 2, 0
+
+gBerryTreePaletteSlotTablePointers: @ 850C85C
+	.4byte gBerryTreePaletteSlotTable_Cheri  @ Cheri
+	.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
+	.4byte gBerryTreePaletteSlotTable_Pecha  @ Pecha
+	.4byte gBerryTreePaletteSlotTable_Rawst  @ Rawst
+	.4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
+	.4byte gBerryTreePaletteSlotTable_Leppa  @ Leppa
+	.4byte gBerryTreePaletteSlotTable_Oran   @ Oran
+	.4byte gBerryTreePaletteSlotTable_Persim @ Persim
+	.4byte gBerryTreePaletteSlotTable_Lum    @ Lum
+	.4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
+	.4byte gBerryTreePaletteSlotTable_Figy   @ Figy
+	.4byte gBerryTreePaletteSlotTable_Wiki   @ Wiki
+	.4byte gBerryTreePaletteSlotTable_Mago   @ Mago
+	.4byte gBerryTreePaletteSlotTable_Aguav  @ Aguav
+	.4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
+	.4byte gBerryTreePaletteSlotTable_Razz   @ Razz
+	.4byte gBerryTreePaletteSlotTable_Razz   @ Bluk
+	.4byte gBerryTreePaletteSlotTable_Mago   @ Nanab
+	.4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
+	.4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
+	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Pomeg
+	.4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
+	.4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
+	.4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
+	.4byte gBerryTreePaletteSlotTable_Grepa  @ Grepa
+	.4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
+	.4byte gBerryTreePaletteSlotTable_Cornn  @ Cornn
+	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Magost
+	.4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
+	.4byte gBerryTreePaletteSlotTable_Nomel  @ Nomel
+	.4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
+	.4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
+	.4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
+	.4byte gBerryTreePaletteSlotTable_Durin  @ Durin
+	.4byte gBerryTreePaletteSlotTable_Hondew @ Belue
+	.4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
+	.4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
+	.4byte gBerryTreePaletteSlotTable_Aguav  @ Salac
+	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Petaya
+	.4byte gBerryTreePaletteSlotTable_Grepa  @ Apicot
+	.4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
+	.4byte gBerryTreePaletteSlotTable_Cornn  @ Starf
+	.4byte gBerryTreePaletteSlotTable_Durin  @ Enigma
+
+	.align 2, 0
+
+gBerryTreeFieldObjectGraphicsIdTablePointers: @ 850C908
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
+	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
+
+@ extras
 	.4byte gBerryTreeFieldObjectGraphicsIdTable
 	.4byte gBerryTreeFieldObjectGraphicsIdTable
 	.4byte gBerryTreeFieldObjectGraphicsIdTable
diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.s b/data/graphics/field_objects/field_effect_object_template_pointers.s
index 3690e2558..45683b205 100644
--- a/data/graphics/field_objects/field_effect_object_template_pointers.s
+++ b/data/graphics/field_objects/field_effect_object_template_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldEffectObjectTemplatePointers: ; 85059F8
+gFieldEffectObjectTemplatePointers: @ 85059F8
 	.4byte gFieldEffectObjectTemplate_ShadowSmall
 	.4byte gFieldEffectObjectTemplate_ShadowMedium
 	.4byte gFieldEffectObjectTemplate_ShadowLarge
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s
index af54ce775..c449af8a9 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.s
@@ -1,50 +1,50 @@
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo0: ; 850C9C0
+gFieldEffectObjectPaletteInfo0: @ 850C9C0
 	obj_pal gFieldEffectObjectPalette0, 0x1004
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo1: ; 850C9C8
+gFieldEffectObjectPaletteInfo1: @ 850C9C8
 	obj_pal gFieldEffectObjectPalette1, 0x1005
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850C9D0: ; 850C9D0
+gFieldEffectObjectImageAnim_850C9D0: @ 850C9D0
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Shadow: ; 850C9D8
+gFieldEffectObjectImageAnimTable_Shadow: @ 850C9D8
 	.4byte gFieldEffectObjectImageAnim_850C9D0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_ShadowSmall: ; 850C9DC
+gFieldEffectObjectPicTable_ShadowSmall: @ 850C9DC
 	obj_tiles gFieldEffectObjectPic_ShadowSmall, 0x20
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_ShadowMedium: ; 850C9E4
+gFieldEffectObjectPicTable_ShadowMedium: @ 850C9E4
 	obj_tiles gFieldEffectObjectPic_ShadowMedium, 0x40
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_ShadowLarge: ; 850C9EC
+gFieldEffectObjectPicTable_ShadowLarge: @ 850C9EC
 	obj_tiles gFieldEffectObjectPic_ShadowLarge, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_ShadowExtraLarge: ; 850C9F4
+gFieldEffectObjectPicTable_ShadowExtraLarge: @ 850C9F4
 	obj_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_ShadowSmall: ; 850C9FC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_ShadowSmall: @ 850C9FC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_8x8
 	.4byte gFieldEffectObjectImageAnimTable_Shadow
 	.4byte gFieldEffectObjectPicTable_ShadowSmall
@@ -53,9 +53,9 @@ gFieldEffectObjectTemplate_ShadowSmall: ; 850C9FC
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_ShadowMedium: ; 850CA14
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_ShadowMedium: @ 850CA14
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_Shadow
 	.4byte gFieldEffectObjectPicTable_ShadowMedium
@@ -64,9 +64,9 @@ gFieldEffectObjectTemplate_ShadowMedium: ; 850CA14
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_ShadowLarge: ; 850CA2C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_ShadowLarge: @ 850CA2C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_32x8
 	.4byte gFieldEffectObjectImageAnimTable_Shadow
 	.4byte gFieldEffectObjectPicTable_ShadowLarge
@@ -75,9 +75,9 @@ gFieldEffectObjectTemplate_ShadowLarge: ; 850CA2C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_ShadowExtraLarge: ; 850CA44
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_ShadowExtraLarge: @ 850CA44
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_64x32
 	.4byte gFieldEffectObjectImageAnimTable_Shadow
 	.4byte gFieldEffectObjectPicTable_ShadowExtraLarge
@@ -86,7 +86,7 @@ gFieldEffectObjectTemplate_ShadowExtraLarge: ; 850CA44
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_TallGrass: ; 850CA5C
+gFieldEffectObjectPicTable_TallGrass: @ 850CA5C
 	obj_tiles gFieldEffectObjectPic_TallGrass_0, 0x80
 	obj_tiles gFieldEffectObjectPic_TallGrass_1, 0x80
 	obj_tiles gFieldEffectObjectPic_TallGrass_2, 0x80
@@ -95,7 +95,7 @@ gFieldEffectObjectPicTable_TallGrass: ; 850CA5C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CA84: ; 850CA84
+gFieldEffectObjectImageAnim_850CA84: @ 850CA84
 	obj_image_anim_frame 1, 10
 	obj_image_anim_frame 2, 10
 	obj_image_anim_frame 3, 10
@@ -105,14 +105,14 @@ gFieldEffectObjectImageAnim_850CA84: ; 850CA84
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_TallGrass: ; 850CA9C
+gFieldEffectObjectImageAnimTable_TallGrass: @ 850CA9C
 	.4byte gFieldEffectObjectImageAnim_850CA84
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_TallGrass: ; 850CAA0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_TallGrass: @ 850CAA0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_TallGrass
 	.4byte gFieldEffectObjectPicTable_TallGrass
@@ -121,7 +121,7 @@ gFieldEffectObjectTemplate_TallGrass: ; 850CAA0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Ripple: ; 850CAB8
+gFieldEffectObjectPicTable_Ripple: @ 850CAB8
 	obj_tiles gFieldEffectObjectPic_Ripple_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Ripple_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Ripple_2, 0x80
@@ -130,7 +130,7 @@ gFieldEffectObjectPicTable_Ripple: ; 850CAB8
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CAE0: ; 850CAE0
+gFieldEffectObjectImageAnim_850CAE0: @ 850CAE0
 	obj_image_anim_frame 0, 12
 	obj_image_anim_frame 1, 9
 	obj_image_anim_frame 2, 9
@@ -143,14 +143,14 @@ gFieldEffectObjectImageAnim_850CAE0: ; 850CAE0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Ripple: ; 850CB04
+gFieldEffectObjectImageAnimTable_Ripple: @ 850CB04
 	.4byte gFieldEffectObjectImageAnim_850CAE0
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Ripple: ; 850CB08
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_Ripple: @ 850CB08
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Ripple
 	.4byte gFieldEffectObjectPicTable_Ripple
@@ -159,7 +159,7 @@ gFieldEffectObjectTemplate_Ripple: ; 850CB08
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Ash: ; 850CB20
+gFieldEffectObjectPicTable_Ash: @ 850CB20
 	obj_tiles gFieldEffectObjectPic_Ash_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Ash_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Ash_2, 0x80
@@ -168,7 +168,7 @@ gFieldEffectObjectPicTable_Ash: ; 850CB20
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CB48: ; 850CB48
+gFieldEffectObjectImageAnim_850CB48: @ 850CB48
 	obj_image_anim_frame 0, 12
 	obj_image_anim_frame 1, 12
 	obj_image_anim_frame 2, 8
@@ -178,14 +178,14 @@ gFieldEffectObjectImageAnim_850CB48: ; 850CB48
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Ash: ; 850CB60
+gFieldEffectObjectImageAnimTable_Ash: @ 850CB60
 	.4byte gFieldEffectObjectImageAnim_850CB48
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Ash: ; 850CB64
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_Ash: @ 850CB64
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Ash
 	.4byte gFieldEffectObjectPicTable_Ash
@@ -194,38 +194,38 @@ gFieldEffectObjectTemplate_Ash: ; 850CB64
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_SurfBlob: ; 850CB7C
+gFieldEffectObjectPicTable_SurfBlob: @ 850CB7C
 	obj_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200
 	obj_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200
 	obj_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CB94: ; 850CB94
+gFieldEffectObjectImageAnim_850CB94: @ 850CB94
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CB9C: ; 850CB9C
+gFieldEffectObjectImageAnim_850CB9C: @ 850CB9C
 	obj_image_anim_frame 1, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CBA4: ; 850CBA4
+gFieldEffectObjectImageAnim_850CBA4: @ 850CBA4
 	obj_image_anim_frame 2, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CBAC: ; 850CBAC
+gFieldEffectObjectImageAnim_850CBAC: @ 850CBAC
 	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_SurfBlob: ; 850CBB4
+gFieldEffectObjectImageAnimTable_SurfBlob: @ 850CBB4
 	.4byte gFieldEffectObjectImageAnim_850CB94
 	.4byte gFieldEffectObjectImageAnim_850CB9C
 	.4byte gFieldEffectObjectImageAnim_850CBA4
@@ -233,9 +233,9 @@ gFieldEffectObjectImageAnimTable_SurfBlob: ; 850CBB4
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_SurfBlob: ; 850CBC4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_SurfBlob: @ 850CBC4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldEffectObjectImageAnimTable_SurfBlob
 	.4byte gFieldEffectObjectPicTable_SurfBlob
@@ -244,7 +244,7 @@ gFieldEffectObjectTemplate_SurfBlob: ; 850CBC4
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Arrow: ; 850CBDC
+gFieldEffectObjectPicTable_Arrow: @ 850CBDC
 	obj_tiles gFieldEffectObjectPic_Arrow_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Arrow_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Arrow_2, 0x80
@@ -256,35 +256,35 @@ gFieldEffectObjectPicTable_Arrow: ; 850CBDC
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CC1C: ; 850CC1C
+gFieldEffectObjectImageAnim_850CC1C: @ 850CC1C
 	obj_image_anim_frame 3, 32
 	obj_image_anim_frame 7, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CC28: ; 850CC28
+gFieldEffectObjectImageAnim_850CC28: @ 850CC28
 	obj_image_anim_frame 0, 32
 	obj_image_anim_frame 4, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CC34: ; 850CC34
+gFieldEffectObjectImageAnim_850CC34: @ 850CC34
 	obj_image_anim_frame 1, 32
 	obj_image_anim_frame 5, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CC40: ; 850CC40
+gFieldEffectObjectImageAnim_850CC40: @ 850CC40
 	obj_image_anim_frame 2, 32
 	obj_image_anim_frame 6, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Arrow: ; 850CC4C
+gFieldEffectObjectImageAnimTable_Arrow: @ 850CC4C
 	.4byte gFieldEffectObjectImageAnim_850CC1C
 	.4byte gFieldEffectObjectImageAnim_850CC28
 	.4byte gFieldEffectObjectImageAnim_850CC34
@@ -292,9 +292,9 @@ gFieldEffectObjectImageAnimTable_Arrow: ; 850CC4C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Arrow: ; 850CC5C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_Arrow: @ 850CC5C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Arrow
 	.4byte gFieldEffectObjectPicTable_Arrow
@@ -303,14 +303,14 @@ gFieldEffectObjectTemplate_Arrow: ; 850CC5C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_GroundImpactDust: ; 850CC74
+gFieldEffectObjectPicTable_GroundImpactDust: @ 850CC74
 	obj_tiles gFieldEffectObjectPic_GroundImpactDust_0, 0x40
 	obj_tiles gFieldEffectObjectPic_GroundImpactDust_1, 0x40
 	obj_tiles gFieldEffectObjectPic_GroundImpactDust_2, 0x40
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CC8C: ; 850CC8C
+gFieldEffectObjectImageAnim_850CC8C: @ 850CC8C
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 2, 8
@@ -318,14 +318,14 @@ gFieldEffectObjectImageAnim_850CC8C: ; 850CC8C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_GroundImpactDust: ; 850CC9C
+gFieldEffectObjectImageAnimTable_GroundImpactDust: @ 850CC9C
 	.4byte gFieldEffectObjectImageAnim_850CC8C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_GroundImpactDust: ; 850CCA0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_GroundImpactDust: @ 850CCA0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_GroundImpactDust
 	.4byte gFieldEffectObjectPicTable_GroundImpactDust
@@ -334,7 +334,7 @@ gFieldEffectObjectTemplate_GroundImpactDust: ; 850CCA0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_BikeHopTallGrass: ; 850CCB8
+gFieldEffectObjectPicTable_BikeHopTallGrass: @ 850CCB8
 	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_0, 0x40
 	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_1, 0x40
 	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_2, 0x40
@@ -342,7 +342,7 @@ gFieldEffectObjectPicTable_BikeHopTallGrass: ; 850CCB8
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CCD8: ; 850CCD8
+gFieldEffectObjectImageAnim_850CCD8: @ 850CCD8
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 2, 8
@@ -351,14 +351,14 @@ gFieldEffectObjectImageAnim_850CCD8: ; 850CCD8
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_BikeHopTallGrass: ; 850CCEC
+gFieldEffectObjectImageAnimTable_BikeHopTallGrass: @ 850CCEC
 	.4byte gFieldEffectObjectImageAnim_850CCD8
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_BikeHopTallGrass: ; 850CCF0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_BikeHopTallGrass: @ 850CCF0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_BikeHopTallGrass
 	.4byte gFieldEffectObjectPicTable_BikeHopTallGrass
@@ -367,37 +367,37 @@ gFieldEffectObjectTemplate_BikeHopTallGrass: ; 850CCF0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_SandFootprints: ; 850CD08
+gFieldEffectObjectPicTable_SandFootprints: @ 850CD08
 	obj_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80
 	obj_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD18: ; 850CD18
+gFieldEffectObjectImageAnim_850CD18: @ 850CD18
 	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD20: ; 850CD20
+gFieldEffectObjectImageAnim_850CD20: @ 850CD20
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD28: ; 850CD28
+gFieldEffectObjectImageAnim_850CD28: @ 850CD28
 	obj_image_anim_frame 1, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD30: ; 850CD30
+gFieldEffectObjectImageAnim_850CD30: @ 850CD30
 	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_SandFootprints: ; 850CD38
+gFieldEffectObjectImageAnimTable_SandFootprints: @ 850CD38
 	.4byte gFieldEffectObjectImageAnim_850CD18
 	.4byte gFieldEffectObjectImageAnim_850CD18
 	.4byte gFieldEffectObjectImageAnim_850CD20
@@ -406,9 +406,9 @@ gFieldEffectObjectImageAnimTable_SandFootprints: ; 850CD38
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_SandFootprints: ; 850CD4C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_SandFootprints: @ 850CD4C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_SandFootprints
 	.4byte gFieldEffectObjectPicTable_SandFootprints
@@ -417,37 +417,37 @@ gFieldEffectObjectTemplate_SandFootprints: ; 850CD4C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_DeepSandFootprints: ; 850CD64
+gFieldEffectObjectPicTable_DeepSandFootprints: @ 850CD64
 	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80
 	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD74: ; 850CD74
+gFieldEffectObjectImageAnim_850CD74: @ 850CD74
 	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD7C: ; 850CD7C
+gFieldEffectObjectImageAnim_850CD7C: @ 850CD7C
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD84: ; 850CD84
+gFieldEffectObjectImageAnim_850CD84: @ 850CD84
 	obj_image_anim_frame 1, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CD8C: ; 850CD8C
+gFieldEffectObjectImageAnim_850CD8C: @ 850CD8C
 	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_DeepSandFootprints: ; 850CD94
+gFieldEffectObjectImageAnimTable_DeepSandFootprints: @ 850CD94
 	.4byte gFieldEffectObjectImageAnim_850CD74
 	.4byte gFieldEffectObjectImageAnim_850CD74
 	.4byte gFieldEffectObjectImageAnim_850CD7C
@@ -456,9 +456,9 @@ gFieldEffectObjectImageAnimTable_DeepSandFootprints: ; 850CD94
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_DeepSandFootprints: ; 850CDA8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_DeepSandFootprints: @ 850CDA8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints
 	.4byte gFieldEffectObjectPicTable_DeepSandFootprints
@@ -467,7 +467,7 @@ gFieldEffectObjectTemplate_DeepSandFootprints: ; 850CDA8
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_BikeTireTracks: ; 850CDC0
+gFieldEffectObjectPicTable_BikeTireTracks: @ 850CDC0
 	obj_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80
 	obj_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80
 	obj_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80
@@ -475,55 +475,55 @@ gFieldEffectObjectPicTable_BikeTireTracks: ; 850CDC0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CDE0: ; 850CDE0
+gFieldEffectObjectImageAnim_850CDE0: @ 850CDE0
 	obj_image_anim_frame 2, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CDE8: ; 850CDE8
+gFieldEffectObjectImageAnim_850CDE8: @ 850CDE8
 	obj_image_anim_frame 2, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CDF0: ; 850CDF0
+gFieldEffectObjectImageAnim_850CDF0: @ 850CDF0
 	obj_image_anim_frame 1, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CDF8: ; 850CDF8
+gFieldEffectObjectImageAnim_850CDF8: @ 850CDF8
 	obj_image_anim_frame 1, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CE00: ; 850CE00
+gFieldEffectObjectImageAnim_850CE00: @ 850CE00
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CE08: ; 850CE08
+gFieldEffectObjectImageAnim_850CE08: @ 850CE08
 	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CE10: ; 850CE10
+gFieldEffectObjectImageAnim_850CE10: @ 850CE10
 	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CE18: ; 850CE18
+gFieldEffectObjectImageAnim_850CE18: @ 850CE18
 	obj_image_anim_frame 3, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_BikeTireTracks: ; 850CE20
+gFieldEffectObjectImageAnimTable_BikeTireTracks: @ 850CE20
 	.4byte gFieldEffectObjectImageAnim_850CDE0
 	.4byte gFieldEffectObjectImageAnim_850CDE0
 	.4byte gFieldEffectObjectImageAnim_850CDE8
@@ -536,9 +536,9 @@ gFieldEffectObjectImageAnimTable_BikeTireTracks: ; 850CE20
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_BikeTireTracks: ; 850CE44
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_BikeTireTracks: @ 850CE44
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_BikeTireTracks
 	.4byte gFieldEffectObjectPicTable_BikeTireTracks
@@ -547,7 +547,7 @@ gFieldEffectObjectTemplate_BikeTireTracks: ; 850CE44
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_BikeHopBigSplash: ; 850CE5C
+gFieldEffectObjectPicTable_BikeHopBigSplash: @ 850CE5C
 	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_0, 0x80
 	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_1, 0x80
 	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_2, 0x80
@@ -555,7 +555,7 @@ gFieldEffectObjectPicTable_BikeHopBigSplash: ; 850CE5C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CE7C: ; 850CE7C
+gFieldEffectObjectImageAnim_850CE7C: @ 850CE7C
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 2, 8
@@ -564,14 +564,14 @@ gFieldEffectObjectImageAnim_850CE7C: ; 850CE7C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_BikeHopBigSplash: ; 850CE90
+gFieldEffectObjectImageAnimTable_BikeHopBigSplash: @ 850CE90
 	.4byte gFieldEffectObjectImageAnim_850CE7C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_BikeHopBigSplash: ; 850CE94
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_BikeHopBigSplash: @ 850CE94
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_BikeHopBigSplash
 	.4byte gFieldEffectObjectPicTable_BikeHopBigSplash
@@ -580,20 +580,20 @@ gFieldEffectObjectTemplate_BikeHopBigSplash: ; 850CE94
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Splash: ; 850CEAC
+gFieldEffectObjectPicTable_Splash: @ 850CEAC
 	obj_tiles gFieldEffectObjectPic_Splash_0, 0x40
 	obj_tiles gFieldEffectObjectPic_Splash_1, 0x40
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CEBC: ; 850CEBC
+gFieldEffectObjectImageAnim_850CEBC: @ 850CEBC
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CEC8: ; 850CEC8
+gFieldEffectObjectImageAnim_850CEC8: @ 850CEC8
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 0, 6
@@ -606,15 +606,15 @@ gFieldEffectObjectImageAnim_850CEC8: ; 850CEC8
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Splash: ; 850CEEC
+gFieldEffectObjectImageAnimTable_Splash: @ 850CEEC
 	.4byte gFieldEffectObjectImageAnim_850CEBC
 	.4byte gFieldEffectObjectImageAnim_850CEC8
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Splash: ; 850CEF4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_Splash: @ 850CEF4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_Splash
 	.4byte gFieldEffectObjectPicTable_Splash
@@ -623,14 +623,14 @@ gFieldEffectObjectTemplate_Splash: ; 850CEF4
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_BikeHopSmallSplash: ; 850CF0C
+gFieldEffectObjectPicTable_BikeHopSmallSplash: @ 850CF0C
 	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_0, 0x40
 	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_1, 0x40
 	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_2, 0x40
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CF24: ; 850CF24
+gFieldEffectObjectImageAnim_850CF24: @ 850CF24
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -638,14 +638,14 @@ gFieldEffectObjectImageAnim_850CF24: ; 850CF24
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_BikeHopSmallSplash: ; 850CF34
+gFieldEffectObjectImageAnimTable_BikeHopSmallSplash: @ 850CF34
 	.4byte gFieldEffectObjectImageAnim_850CF24
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_BikeHopSmallSplash: ; 850CF38
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_BikeHopSmallSplash: @ 850CF38
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_BikeHopSmallSplash
 	.4byte gFieldEffectObjectPicTable_BikeHopSmallSplash
@@ -654,7 +654,7 @@ gFieldEffectObjectTemplate_BikeHopSmallSplash: ; 850CF38
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_LongGrass: ; 850CF50
+gFieldEffectObjectPicTable_LongGrass: @ 850CF50
 	obj_tiles gFieldEffectObjectPic_LongGrass_0, 0x80
 	obj_tiles gFieldEffectObjectPic_LongGrass_1, 0x80
 	obj_tiles gFieldEffectObjectPic_LongGrass_2, 0x80
@@ -662,7 +662,7 @@ gFieldEffectObjectPicTable_LongGrass: ; 850CF50
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CF70: ; 850CF70
+gFieldEffectObjectImageAnim_850CF70: @ 850CF70
 	obj_image_anim_frame 1, 3
 	obj_image_anim_frame 2, 3
 	obj_image_anim_frame 0, 4
@@ -674,14 +674,14 @@ gFieldEffectObjectImageAnim_850CF70: ; 850CF70
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_LongGrass: ; 850CF90
+gFieldEffectObjectImageAnimTable_LongGrass: @ 850CF90
 	.4byte gFieldEffectObjectImageAnim_850CF70
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_LongGrass: ; 850CF94
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_LongGrass: @ 850CF94
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_LongGrass
 	.4byte gFieldEffectObjectPicTable_LongGrass
@@ -690,7 +690,7 @@ gFieldEffectObjectTemplate_LongGrass: ; 850CF94
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown16: ; 850CFAC
+gFieldEffectObjectPicTable_Unknown16: @ 850CFAC
 	obj_tiles gFieldEffectObjectPic_Unknown16_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown16_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown16_2, 0x80
@@ -700,7 +700,7 @@ gFieldEffectObjectPicTable_Unknown16: ; 850CFAC
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850CFDC: ; 850CFDC
+gFieldEffectObjectImageAnim_850CFDC: @ 850CFDC
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 8
@@ -711,14 +711,14 @@ gFieldEffectObjectImageAnim_850CFDC: ; 850CFDC
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown16: ; 850CFF8
+gFieldEffectObjectImageAnimTable_Unknown16: @ 850CFF8
 	.4byte gFieldEffectObjectImageAnim_850CFDC
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown16: ; 850CFFC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_Unknown16: @ 850CFFC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown16
 	.4byte gFieldEffectObjectPicTable_Unknown16
@@ -727,7 +727,7 @@ gFieldEffectObjectTemplate_Unknown16: ; 850CFFC
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown17: ; 850D014
+gFieldEffectObjectPicTable_Unknown17: @ 850D014
 	obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown17_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown17_1, 0x80
@@ -740,7 +740,7 @@ gFieldEffectObjectPicTable_Unknown17: ; 850D014
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D05C: ; 850D05C
+gFieldEffectObjectImageAnim_850D05C: @ 850D05C
 	obj_image_anim_frame 0, 10
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -754,14 +754,14 @@ gFieldEffectObjectImageAnim_850D05C: ; 850D05C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown17: ; 850D084
+gFieldEffectObjectImageAnimTable_Unknown17: @ 850D084
 	.4byte gFieldEffectObjectImageAnim_850D05C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown17: ; 850D088
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_Unknown17: @ 850D088
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown17
 	.4byte gFieldEffectObjectPicTable_Unknown17
@@ -770,7 +770,7 @@ gFieldEffectObjectTemplate_Unknown17: ; 850D088
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown18: ; 850D0A0
+gFieldEffectObjectPicTable_Unknown18: @ 850D0A0
 	obj_tiles gFieldEffectObjectPic_Unknown18_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown18_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown18_2, 0x80
@@ -778,7 +778,7 @@ gFieldEffectObjectPicTable_Unknown18: ; 850D0A0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D0C0: ; 850D0C0
+gFieldEffectObjectImageAnim_850D0C0: @ 850D0C0
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -789,14 +789,14 @@ gFieldEffectObjectImageAnim_850D0C0: ; 850D0C0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown18: ; 850D0DC
+gFieldEffectObjectImageAnimTable_Unknown18: @ 850D0DC
 	.4byte gFieldEffectObjectImageAnim_850D0C0
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown18: ; 850D0E0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_Unknown18: @ 850D0E0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown18
 	.4byte gFieldEffectObjectPicTable_Unknown18
@@ -805,7 +805,7 @@ gFieldEffectObjectTemplate_Unknown18: ; 850D0E0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown19: ; 850D0F8
+gFieldEffectObjectPicTable_Unknown19: @ 850D0F8
 	obj_tiles gFieldEffectObjectPic_Unknown19_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown19_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown19_2, 0x80
@@ -813,7 +813,7 @@ gFieldEffectObjectPicTable_Unknown19: ; 850D0F8
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D118: ; 850D118
+gFieldEffectObjectImageAnim_850D118: @ 850D118
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -822,14 +822,14 @@ gFieldEffectObjectImageAnim_850D118: ; 850D118
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown19: ; 850D12C
+gFieldEffectObjectImageAnimTable_Unknown19: @ 850D12C
 	.4byte gFieldEffectObjectImageAnim_850D118
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown19: ; 850D130
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_Unknown19: @ 850D130
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown19
 	.4byte gFieldEffectObjectPicTable_Unknown19
@@ -838,14 +838,14 @@ gFieldEffectObjectTemplate_Unknown19: ; 850D130
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown29: ; 850D148
+gFieldEffectObjectPicTable_Unknown29: @ 850D148
 	obj_tiles gFieldEffectObjectPic_Unknown29_0, 0x40
 	obj_tiles gFieldEffectObjectPic_Unknown29_1, 0x40
 	obj_tiles gFieldEffectObjectPic_Unknown29_2, 0x40
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D160: ; 850D160
+gFieldEffectObjectImageAnim_850D160: @ 850D160
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -853,14 +853,14 @@ gFieldEffectObjectImageAnim_850D160: ; 850D160
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown29: ; 850D170
+gFieldEffectObjectImageAnimTable_Unknown29: @ 850D170
 	.4byte gFieldEffectObjectImageAnim_850D160
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown29: ; 850D174
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_Unknown29: @ 850D174
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x8
 	.4byte gFieldEffectObjectImageAnimTable_Unknown29
 	.4byte gFieldEffectObjectPicTable_Unknown29
@@ -869,7 +869,7 @@ gFieldEffectObjectTemplate_Unknown29: ; 850D174
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown20: ; 850D18C
+gFieldEffectObjectPicTable_Unknown20: @ 850D18C
 	obj_tiles gFieldEffectObjectPic_Unknown20_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown20_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown20_2, 0x80
@@ -877,7 +877,7 @@ gFieldEffectObjectPicTable_Unknown20: ; 850D18C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D1AC: ; 850D1AC
+gFieldEffectObjectImageAnim_850D1AC: @ 850D1AC
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -888,14 +888,14 @@ gFieldEffectObjectImageAnim_850D1AC: ; 850D1AC
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown20: ; 850D1C8
+gFieldEffectObjectImageAnimTable_Unknown20: @ 850D1C8
 	.4byte gFieldEffectObjectImageAnim_850D1AC
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown20: ; 850D1CC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_Unknown20: @ 850D1CC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown20
 	.4byte gFieldEffectObjectPicTable_Unknown20
@@ -904,7 +904,7 @@ gFieldEffectObjectTemplate_Unknown20: ; 850D1CC
 
 	.align 2, 0
 
-gFieldEffectObjectRotScalAnim_850D1E4: ; 850D1E4
+gFieldEffectObjectRotScalAnim_850D1E4: @ 850D1E4
 	obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0
 	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
 	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
@@ -918,7 +918,7 @@ gFieldEffectObjectRotScalAnim_850D1E4: ; 850D1E4
 
 	.align 2, 0
 
-gFieldEffectObjectRotScalAnim_850D234: ; 850D234
+gFieldEffectObjectRotScalAnim_850D234: @ 850D234
 	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
 	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
 	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
@@ -932,15 +932,15 @@ gFieldEffectObjectRotScalAnim_850D234: ; 850D234
 
 	.align 2, 0
 
-gFieldEffectObjectRotScalAnimTable_Unknown21: ; 850D284
+gFieldEffectObjectRotScalAnimTable_Unknown21: @ 850D284
 	.4byte gFieldEffectObjectRotScalAnim_850D1E4
 	.4byte gFieldEffectObjectRotScalAnim_850D234
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown21: ; 850D28C
-	.2byte 0x0 ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_Unknown21: @ 850D28C
+	.2byte 0x0 @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gDefaultOamAttributes
 	.4byte gDummyObjectImageAnimTable
 	.4byte NULL
@@ -949,7 +949,7 @@ gFieldEffectObjectTemplate_Unknown21: ; 850D28C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_BerryTreeGrowthSparkle: ; 850D2A4
+gFieldEffectObjectPicTable_BerryTreeGrowthSparkle: @ 850D2A4
 	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80
 	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80
 	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80
@@ -959,7 +959,7 @@ gFieldEffectObjectPicTable_BerryTreeGrowthSparkle: ; 850D2A4
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D2D4: ; 850D2D4
+gFieldEffectObjectImageAnim_850D2D4: @ 850D2D4
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 2, 8
@@ -984,14 +984,14 @@ gFieldEffectObjectImageAnim_850D2D4: ; 850D2D4
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle: ; 850D328
+gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle: @ 850D328
 	.4byte gFieldEffectObjectImageAnim_850D2D4
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: ; 850D32C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: @ 850D32C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle
 	.4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle
@@ -1000,7 +1000,7 @@ gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: ; 850D32C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_TreeDisguise: ; 850D344
+gFieldEffectObjectPicTable_TreeDisguise: @ 850D344
 	obj_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100
 	obj_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100
 	obj_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100
@@ -1011,13 +1011,13 @@ gFieldEffectObjectPicTable_TreeDisguise: ; 850D344
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D37C: ; 850D37C
+gFieldEffectObjectImageAnim_850D37C: @ 850D37C
 	obj_image_anim_frame 0, 16
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D384: ; 850D384
+gFieldEffectObjectImageAnim_850D384: @ 850D384
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -1029,15 +1029,15 @@ gFieldEffectObjectImageAnim_850D384: ; 850D384
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_TreeDisguise: ; 850D3A4
+gFieldEffectObjectImageAnimTable_TreeDisguise: @ 850D3A4
 	.4byte gFieldEffectObjectImageAnim_850D37C
 	.4byte gFieldEffectObjectImageAnim_850D384
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_TreeDisguise: ; 850D3AC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_TreeDisguise: @ 850D3AC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
 	.4byte gFieldEffectObjectPicTable_TreeDisguise
@@ -1046,7 +1046,7 @@ gFieldEffectObjectTemplate_TreeDisguise: ; 850D3AC
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_MountainDisguise: ; 850D3C4
+gFieldEffectObjectPicTable_MountainDisguise: @ 850D3C4
 	obj_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100
 	obj_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100
 	obj_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100
@@ -1057,13 +1057,13 @@ gFieldEffectObjectPicTable_MountainDisguise: ; 850D3C4
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D3FC: ; 850D3FC
+gFieldEffectObjectImageAnim_850D3FC: @ 850D3FC
 	obj_image_anim_frame 0, 16
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D404: ; 850D404
+gFieldEffectObjectImageAnim_850D404: @ 850D404
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -1075,15 +1075,15 @@ gFieldEffectObjectImageAnim_850D404: ; 850D404
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_MountainDisguise: ; 850D424
+gFieldEffectObjectImageAnimTable_MountainDisguise: @ 850D424
 	.4byte gFieldEffectObjectImageAnim_850D3FC
 	.4byte gFieldEffectObjectImageAnim_850D404
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_MountainDisguise: ; 850D42C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_MountainDisguise: @ 850D42C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldEffectObjectImageAnimTable_MountainDisguise
 	.4byte gFieldEffectObjectPicTable_MountainDisguise
@@ -1092,7 +1092,7 @@ gFieldEffectObjectTemplate_MountainDisguise: ; 850D42C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_SandDisguisePlaceholder: ; 850D444
+gFieldEffectObjectPicTable_SandDisguisePlaceholder: @ 850D444
 	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_0, 0x100
 	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_1, 0x100
 	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_2, 0x100
@@ -1103,9 +1103,9 @@ gFieldEffectObjectPicTable_SandDisguisePlaceholder: ; 850D444
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_SandDisguisePlaceholder: ; 850D47C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_SandDisguisePlaceholder: @ 850D47C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
 	.4byte gFieldEffectObjectPicTable_SandDisguisePlaceholder
@@ -1114,25 +1114,25 @@ gFieldEffectObjectTemplate_SandDisguisePlaceholder: ; 850D47C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Bird: ; 850D494
+gFieldEffectObjectPicTable_Bird: @ 850D494
 	obj_tiles gFieldEffectObjectPic_Bird, 0x200
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D49C: ; 850D49C
+gFieldEffectObjectImageAnim_850D49C: @ 850D49C
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Bird: ; 850D4A4
+gFieldEffectObjectImageAnimTable_Bird: @ 850D4A4
 	.4byte gFieldEffectObjectImageAnim_850D49C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Bird: ; 850D4A8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_Bird: @ 850D4A8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldEffectObjectImageAnimTable_Bird
 	.4byte gFieldEffectObjectPicTable_Bird
@@ -1141,27 +1141,27 @@ gFieldEffectObjectTemplate_Bird: ; 850D4A8
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_ShortGrass: ; 850D4C0
+gFieldEffectObjectPicTable_ShortGrass: @ 850D4C0
 	obj_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80
 	obj_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D4D0: ; 850D4D0
+gFieldEffectObjectImageAnim_850D4D0: @ 850D4D0
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_ShortGrass: ; 850D4DC
+gFieldEffectObjectImageAnimTable_ShortGrass: @ 850D4DC
 	.4byte gFieldEffectObjectImageAnim_850D4D0
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_ShortGrass: ; 850D4E0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_ShortGrass: @ 850D4E0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_ShortGrass
 	.4byte gFieldEffectObjectPicTable_ShortGrass
@@ -1170,25 +1170,25 @@ gFieldEffectObjectTemplate_ShortGrass: ; 850D4E0
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_HotSpringsWater: ; 850D4F8
+gFieldEffectObjectPicTable_HotSpringsWater: @ 850D4F8
 	obj_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D500: ; 850D500
+gFieldEffectObjectImageAnim_850D500: @ 850D500
 	obj_image_anim_frame 0, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_HotSpringsWater: ; 850D508
+gFieldEffectObjectImageAnimTable_HotSpringsWater: @ 850D508
 	.4byte gFieldEffectObjectImageAnim_850D500
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_HotSpringsWater: ; 850D50C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1005 ; palette tag
+gFieldEffectObjectTemplate_HotSpringsWater: @ 850D50C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1005 @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_HotSpringsWater
 	.4byte gFieldEffectObjectPicTable_HotSpringsWater
@@ -1197,7 +1197,7 @@ gFieldEffectObjectTemplate_HotSpringsWater: ; 850D50C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_JumpOutOfAsh: ; 850D524
+gFieldEffectObjectPicTable_JumpOutOfAsh: @ 850D524
 	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_0, 0x80
 	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_1, 0x80
 	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_2, 0x80
@@ -1206,7 +1206,7 @@ gFieldEffectObjectPicTable_JumpOutOfAsh: ; 850D524
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D54C: ; 850D54C
+gFieldEffectObjectImageAnim_850D54C: @ 850D54C
 	obj_image_anim_frame 0, 6
 	obj_image_anim_frame 1, 6
 	obj_image_anim_frame 2, 6
@@ -1216,14 +1216,14 @@ gFieldEffectObjectImageAnim_850D54C: ; 850D54C
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_JumpOutOfAsh: ; 850D564
+gFieldEffectObjectImageAnimTable_JumpOutOfAsh: @ 850D564
 	.4byte gFieldEffectObjectImageAnim_850D54C
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_JumpOutOfAsh: ; 850D568
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x100D ; palette tag
+gFieldEffectObjectTemplate_JumpOutOfAsh: @ 850D568
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x100D @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_JumpOutOfAsh
 	.4byte gFieldEffectObjectPicTable_JumpOutOfAsh
@@ -1232,12 +1232,12 @@ gFieldEffectObjectTemplate_JumpOutOfAsh: ; 850D568
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo2: ; 850D580
+gFieldEffectObjectPaletteInfo2: @ 850D580
 	obj_pal gFieldEffectObjectPalette2, 0x100D
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown33: ; 850D588
+gFieldEffectObjectPicTable_Unknown33: @ 850D588
 	obj_tiles gFieldEffectObjectPic_Unknown33_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown33_1, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown33_2, 0x80
@@ -1246,7 +1246,7 @@ gFieldEffectObjectPicTable_Unknown33: ; 850D588
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D5B0: ; 850D5B0
+gFieldEffectObjectImageAnim_850D5B0: @ 850D5B0
 	obj_image_anim_frame 0, 6
 	obj_image_anim_frame 1, 6
 	obj_image_anim_frame 2, 6
@@ -1256,14 +1256,14 @@ gFieldEffectObjectImageAnim_850D5B0: ; 850D5B0
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown33: ; 850D5C8
+gFieldEffectObjectImageAnimTable_Unknown33: @ 850D5C8
 	.4byte gFieldEffectObjectImageAnim_850D5B0
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown33: ; 850D5CC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x100D ; palette tag
+gFieldEffectObjectTemplate_Unknown33: @ 850D5CC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x100D @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown33
 	.4byte gFieldEffectObjectPicTable_Unknown33
@@ -1272,7 +1272,7 @@ gFieldEffectObjectTemplate_Unknown33: ; 850D5CC
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Bubbles: ; 850D5E4
+gFieldEffectObjectPicTable_Bubbles: @ 850D5E4
 	obj_tiles gFieldEffectObjectPic_Bubbles_0, 0x100
 	obj_tiles gFieldEffectObjectPic_Bubbles_1, 0x100
 	obj_tiles gFieldEffectObjectPic_Bubbles_2, 0x100
@@ -1284,7 +1284,7 @@ gFieldEffectObjectPicTable_Bubbles: ; 850D5E4
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D624: ; 850D624
+gFieldEffectObjectImageAnim_850D624: @ 850D624
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -1297,14 +1297,14 @@ gFieldEffectObjectImageAnim_850D624: ; 850D624
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Bubbles: ; 850D648
+gFieldEffectObjectImageAnimTable_Bubbles: @ 850D648
 	.4byte gFieldEffectObjectImageAnim_850D624
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Bubbles: ; 850D64C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1004 ; palette tag
+gFieldEffectObjectTemplate_Bubbles: @ 850D64C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1004 @ palette tag
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldEffectObjectImageAnimTable_Bubbles
 	.4byte gFieldEffectObjectPicTable_Bubbles
@@ -1313,13 +1313,13 @@ gFieldEffectObjectTemplate_Bubbles: ; 850D64C
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Unknown35: ; 850D664
+gFieldEffectObjectPicTable_Unknown35: @ 850D664
 	obj_tiles gFieldEffectObjectPic_Unknown35_0, 0x80
 	obj_tiles gFieldEffectObjectPic_Unknown35_1, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D674: ; 850D674
+gFieldEffectObjectImageAnim_850D674: @ 850D674
 	obj_image_anim_frame 0, 3
 	obj_image_anim_frame 1, 5
 	obj_image_anim_frame 0, 5
@@ -1327,14 +1327,14 @@ gFieldEffectObjectImageAnim_850D674: ; 850D674
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Unknown35: ; 850D684
+gFieldEffectObjectImageAnimTable_Unknown35: @ 850D684
 	.4byte gFieldEffectObjectImageAnim_850D674
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Unknown35: ; 850D688
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x100F ; palette tag
+gFieldEffectObjectTemplate_Unknown35: @ 850D688
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x100F @ palette tag
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldEffectObjectImageAnimTable_Unknown35
 	.4byte gFieldEffectObjectPicTable_Unknown35
@@ -1343,30 +1343,30 @@ gFieldEffectObjectTemplate_Unknown35: ; 850D688
 
 	.align 2, 0
 
-gFieldEffectObjectPaletteInfo3: ; 850D6A0
+gFieldEffectObjectPaletteInfo3: @ 850D6A0
 	obj_pal gFieldEffectObjectPalette3, 0x100F
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnim_850D6A8: ; 850D6A8
+gFieldEffectObjectImageAnim_850D6A8: @ 850D6A8
 	obj_image_anim_frame 0, 1
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldEffectObjectImageAnimTable_Rayquaza: ; 850D6B0
+gFieldEffectObjectImageAnimTable_Rayquaza: @ 850D6B0
 	.4byte gFieldEffectObjectImageAnim_850D6A8
 
 	.align 2, 0
 
-gFieldEffectObjectPicTable_Rayquaza: ; 850D6B4
+gFieldEffectObjectPicTable_Rayquaza: @ 850D6B4
 	obj_tiles gFieldObjectPic_Rayquaza_0, 0x200
 
 	.align 2, 0
 
-gFieldEffectObjectTemplate_Rayquaza: ; 850D6BC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0xFFFF ; palette tag
+gFieldEffectObjectTemplate_Rayquaza: @ 850D6BC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0xFFFF @ palette tag
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldEffectObjectImageAnimTable_Rayquaza
 	.4byte gFieldEffectObjectPicTable_Rayquaza
diff --git a/data/graphics/field_objects/field_object_anims.s b/data/graphics/field_objects/field_object_anims.s
index 83c009341..8d1a4e1c2 100644
--- a/data/graphics/field_objects/field_object_anims.s
+++ b/data/graphics/field_objects/field_object_anims.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldObjectImageAnim_StayStill: ; 85089FC
+gFieldObjectImageAnim_StayStill: @ 85089FC
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 0, 8
@@ -9,31 +9,31 @@ gFieldObjectImageAnim_StayStill: ; 85089FC
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpFaceSouth: ; 8508A10
+gFieldObjectImageAnim_QuintyPlumpFaceSouth: @ 8508A10
 	obj_image_anim_frame 0, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpFaceNorth: ; 8508A18
+gFieldObjectImageAnim_QuintyPlumpFaceNorth: @ 8508A18
 	obj_image_anim_frame 1, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpFaceWest: ; 8508A20
+gFieldObjectImageAnim_QuintyPlumpFaceWest: @ 8508A20
 	obj_image_anim_frame 2, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpFaceEast: ; 8508A28
+gFieldObjectImageAnim_QuintyPlumpFaceEast: @ 8508A28
 	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoSouth: ; 8508A30
+gFieldObjectImageAnim_QuintyPlumpGoSouth: @ 8508A30
 	obj_image_anim_frame 3, 8
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -42,7 +42,7 @@ gFieldObjectImageAnim_QuintyPlumpGoSouth: ; 8508A30
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoNorth: ; 8508A44
+gFieldObjectImageAnim_QuintyPlumpGoNorth: @ 8508A44
 	obj_image_anim_frame 4, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -51,7 +51,7 @@ gFieldObjectImageAnim_QuintyPlumpGoNorth: ; 8508A44
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoWest: ; 8508A58
+gFieldObjectImageAnim_QuintyPlumpGoWest: @ 8508A58
 	obj_image_anim_frame 5, 8
 	obj_image_anim_frame 2, 8
 	obj_image_anim_frame 6, 8
@@ -60,7 +60,7 @@ gFieldObjectImageAnim_QuintyPlumpGoWest: ; 8508A58
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoEast: ; 8508A6C
+gFieldObjectImageAnim_QuintyPlumpGoEast: @ 8508A6C
 	obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -69,7 +69,7 @@ gFieldObjectImageAnim_QuintyPlumpGoEast: ; 8508A6C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastSouth: ; 8508A80
+gFieldObjectImageAnim_QuintyPlumpGoFastSouth: @ 8508A80
 	obj_image_anim_frame 3, 4
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -78,7 +78,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastSouth: ; 8508A80
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastNorth: ; 8508A94
+gFieldObjectImageAnim_QuintyPlumpGoFastNorth: @ 8508A94
 	obj_image_anim_frame 4, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -87,7 +87,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastNorth: ; 8508A94
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastWest: ; 8508AA8
+gFieldObjectImageAnim_QuintyPlumpGoFastWest: @ 8508AA8
 	obj_image_anim_frame 5, 4
 	obj_image_anim_frame 2, 4
 	obj_image_anim_frame 6, 4
@@ -96,7 +96,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastWest: ; 8508AA8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastEast: ; 8508ABC
+gFieldObjectImageAnim_QuintyPlumpGoFastEast: @ 8508ABC
 	obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -105,7 +105,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastEast: ; 8508ABC
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: ; 8508AD0
+gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: @ 8508AD0
 	obj_image_anim_frame 3, 2
 	obj_image_anim_frame 0, 2
 	obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -114,7 +114,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterSouth: ; 8508AD0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: ; 8508AE4
+gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: @ 8508AE4
 	obj_image_anim_frame 4, 2
 	obj_image_anim_frame 1, 2
 	obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -123,7 +123,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterNorth: ; 8508AE4
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFasterWest: ; 8508AF8
+gFieldObjectImageAnim_QuintyPlumpGoFasterWest: @ 8508AF8
 	obj_image_anim_frame 5, 2
 	obj_image_anim_frame 2, 2
 	obj_image_anim_frame 6, 2
@@ -132,7 +132,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterWest: ; 8508AF8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFasterEast: ; 8508B0C
+gFieldObjectImageAnim_QuintyPlumpGoFasterEast: @ 8508B0C
 	obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -141,7 +141,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFasterEast: ; 8508B0C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: ; 8508B20
+gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: @ 8508B20
 	obj_image_anim_frame 3, 1
 	obj_image_anim_frame 0, 1
 	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -150,7 +150,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestSouth: ; 8508B20
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: ; 8508B34
+gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: @ 8508B34
 	obj_image_anim_frame 4, 1
 	obj_image_anim_frame 1, 1
 	obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -159,7 +159,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestNorth: ; 8508B34
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastestWest: ; 8508B48
+gFieldObjectImageAnim_QuintyPlumpGoFastestWest: @ 8508B48
 	obj_image_anim_frame 5, 1
 	obj_image_anim_frame 2, 1
 	obj_image_anim_frame 6, 1
@@ -168,7 +168,7 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestWest: ; 8508B48
 
 	.align 2, 0
 
-gFieldObjectImageAnim_QuintyPlumpGoFastestEast: ; 8508B5C
+gFieldObjectImageAnim_QuintyPlumpGoFastestEast: @ 8508B5C
 	obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -177,31 +177,31 @@ gFieldObjectImageAnim_QuintyPlumpGoFastestEast: ; 8508B5C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_FaceSouth: ; 8508B70
+gFieldObjectImageAnim_FaceSouth: @ 8508B70
 	obj_image_anim_frame 0, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_FaceNorth: ; 8508B78
+gFieldObjectImageAnim_FaceNorth: @ 8508B78
 	obj_image_anim_frame 1, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_FaceWest: ; 8508B80
+gFieldObjectImageAnim_FaceWest: @ 8508B80
 	obj_image_anim_frame 2, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_FaceEast: ; 8508B88
+gFieldObjectImageAnim_FaceEast: @ 8508B88
 	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoSouth: ; 8508B90
+gFieldObjectImageAnim_GoSouth: @ 8508B90
 	obj_image_anim_frame 3, 8
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 4, 8
@@ -210,7 +210,7 @@ gFieldObjectImageAnim_GoSouth: ; 8508B90
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoNorth: ; 8508BA4
+gFieldObjectImageAnim_GoNorth: @ 8508BA4
 	obj_image_anim_frame 5, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 6, 8
@@ -219,7 +219,7 @@ gFieldObjectImageAnim_GoNorth: ; 8508BA4
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoWest: ; 8508BB8
+gFieldObjectImageAnim_GoWest: @ 8508BB8
 	obj_image_anim_frame 7, 8
 	obj_image_anim_frame 2, 8
 	obj_image_anim_frame 8, 8
@@ -228,7 +228,7 @@ gFieldObjectImageAnim_GoWest: ; 8508BB8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoEast: ; 8508BCC
+gFieldObjectImageAnim_GoEast: @ 8508BCC
 	obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP
@@ -237,7 +237,7 @@ gFieldObjectImageAnim_GoEast: ; 8508BCC
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastSouth: ; 8508BE0
+gFieldObjectImageAnim_GoFastSouth: @ 8508BE0
 	obj_image_anim_frame 3, 4
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 4, 4
@@ -246,7 +246,7 @@ gFieldObjectImageAnim_GoFastSouth: ; 8508BE0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastNorth: ; 8508BF4
+gFieldObjectImageAnim_GoFastNorth: @ 8508BF4
 	obj_image_anim_frame 5, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 6, 4
@@ -255,7 +255,7 @@ gFieldObjectImageAnim_GoFastNorth: ; 8508BF4
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastWest: ; 8508C08
+gFieldObjectImageAnim_GoFastWest: @ 8508C08
 	obj_image_anim_frame 7, 4
 	obj_image_anim_frame 2, 4
 	obj_image_anim_frame 8, 4
@@ -264,7 +264,7 @@ gFieldObjectImageAnim_GoFastWest: ; 8508C08
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastEast: ; 8508C1C
+gFieldObjectImageAnim_GoFastEast: @ 8508C1C
 	obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -273,7 +273,7 @@ gFieldObjectImageAnim_GoFastEast: ; 8508C1C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFasterSouth: ; 8508C30
+gFieldObjectImageAnim_GoFasterSouth: @ 8508C30
 	obj_image_anim_frame 3, 2
 	obj_image_anim_frame 0, 2
 	obj_image_anim_frame 4, 2
@@ -282,7 +282,7 @@ gFieldObjectImageAnim_GoFasterSouth: ; 8508C30
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFasterNorth: ; 8508C44
+gFieldObjectImageAnim_GoFasterNorth: @ 8508C44
 	obj_image_anim_frame 5, 2
 	obj_image_anim_frame 1, 2
 	obj_image_anim_frame 6, 2
@@ -291,7 +291,7 @@ gFieldObjectImageAnim_GoFasterNorth: ; 8508C44
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFasterWest: ; 8508C58
+gFieldObjectImageAnim_GoFasterWest: @ 8508C58
 	obj_image_anim_frame 7, 2
 	obj_image_anim_frame 2, 2
 	obj_image_anim_frame 8, 2
@@ -300,7 +300,7 @@ gFieldObjectImageAnim_GoFasterWest: ; 8508C58
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFasterEast: ; 8508C6C
+gFieldObjectImageAnim_GoFasterEast: @ 8508C6C
 	obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP
@@ -309,7 +309,7 @@ gFieldObjectImageAnim_GoFasterEast: ; 8508C6C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastestSouth: ; 8508C80
+gFieldObjectImageAnim_GoFastestSouth: @ 8508C80
 	obj_image_anim_frame 3, 1
 	obj_image_anim_frame 0, 1
 	obj_image_anim_frame 4, 1
@@ -318,7 +318,7 @@ gFieldObjectImageAnim_GoFastestSouth: ; 8508C80
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastestNorth: ; 8508C94
+gFieldObjectImageAnim_GoFastestNorth: @ 8508C94
 	obj_image_anim_frame 5, 1
 	obj_image_anim_frame 1, 1
 	obj_image_anim_frame 6, 1
@@ -327,7 +327,7 @@ gFieldObjectImageAnim_GoFastestNorth: ; 8508C94
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastestWest: ; 8508CA8
+gFieldObjectImageAnim_GoFastestWest: @ 8508CA8
 	obj_image_anim_frame 7, 1
 	obj_image_anim_frame 2, 1
 	obj_image_anim_frame 8, 1
@@ -336,7 +336,7 @@ gFieldObjectImageAnim_GoFastestWest: ; 8508CA8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GoFastestEast: ; 8508CBC
+gFieldObjectImageAnim_GoFastestEast: @ 8508CBC
 	obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP
@@ -345,7 +345,7 @@ gFieldObjectImageAnim_GoFastestEast: ; 8508CBC
 
 	.align 2, 0
 
-gFieldObjectImageAnim_RunSouth: ; 8508CD0
+gFieldObjectImageAnim_RunSouth: @ 8508CD0
 	obj_image_anim_frame 12, 5
 	obj_image_anim_frame 9, 3
 	obj_image_anim_frame 13, 5
@@ -354,7 +354,7 @@ gFieldObjectImageAnim_RunSouth: ; 8508CD0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_RunNorth: ; 8508CE4
+gFieldObjectImageAnim_RunNorth: @ 8508CE4
 	obj_image_anim_frame 14, 5
 	obj_image_anim_frame 10, 3
 	obj_image_anim_frame 15, 5
@@ -363,7 +363,7 @@ gFieldObjectImageAnim_RunNorth: ; 8508CE4
 
 	.align 2, 0
 
-gFieldObjectImageAnim_RunWest: ; 8508CF8
+gFieldObjectImageAnim_RunWest: @ 8508CF8
 	obj_image_anim_frame 16, 5
 	obj_image_anim_frame 11, 3
 	obj_image_anim_frame 17, 5
@@ -372,7 +372,7 @@ gFieldObjectImageAnim_RunWest: ; 8508CF8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_RunEast: ; 8508D0C
+gFieldObjectImageAnim_RunEast: @ 8508D0C
 	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP
@@ -381,7 +381,7 @@ gFieldObjectImageAnim_RunEast: ; 8508D0C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_FieldMove: ; 8508D20
+gFieldObjectImageAnim_FieldMove: @ 8508D20
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -391,143 +391,143 @@ gFieldObjectImageAnim_FieldMove: ; 8508D20
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GetOnOffSurfBlobSouth: ; 8508D38
+gFieldObjectImageAnim_GetOnOffSurfBlobSouth: @ 8508D38
 	obj_image_anim_frame 9, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GetOnOffSurfBlobNorth: ; 8508D40
+gFieldObjectImageAnim_GetOnOffSurfBlobNorth: @ 8508D40
 	obj_image_anim_frame 10, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GetOnOffSurfBlobWest: ; 8508D48
+gFieldObjectImageAnim_GetOnOffSurfBlobWest: @ 8508D48
 	obj_image_anim_frame 11, 32
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_GetOnOffSurfBlobEast: ; 8508D50
+gFieldObjectImageAnim_GetOnOffSurfBlobEast: @ 8508D50
 	obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyBackWheelSouth: ; 8508D58
+gFieldObjectImageAnim_BunnyHoppyBackWheelSouth: @ 8508D58
 	obj_image_anim_frame 9, 4
 	obj_image_anim_frame 10, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyBackWheelNorth: ; 8508D64
+gFieldObjectImageAnim_BunnyHoppyBackWheelNorth: @ 8508D64
 	obj_image_anim_frame 13, 4
 	obj_image_anim_frame 14, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyBackWheelWest: ; 8508D70
+gFieldObjectImageAnim_BunnyHoppyBackWheelWest: @ 8508D70
 	obj_image_anim_frame 17, 4
 	obj_image_anim_frame 18, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyBackWheelEast: ; 8508D7C
+gFieldObjectImageAnim_BunnyHoppyBackWheelEast: @ 8508D7C
 	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth: ; 8508D88
+gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth: @ 8508D88
 	obj_image_anim_frame 11, 4
 	obj_image_anim_frame 12, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth: ; 8508D94
+gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth: @ 8508D94
 	obj_image_anim_frame 15, 4
 	obj_image_anim_frame 16, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyFrontWheelWest: ; 8508DA0
+gFieldObjectImageAnim_BunnyHoppyFrontWheelWest: @ 8508DA0
 	obj_image_anim_frame 19, 4
 	obj_image_anim_frame 20, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BunnyHoppyFrontWheelEast: ; 8508DAC
+gFieldObjectImageAnim_BunnyHoppyFrontWheelEast: @ 8508DAC
 	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieBackWheelSouth: ; 8508DB8
+gFieldObjectImageAnim_StandingWheelieBackWheelSouth: @ 8508DB8
 	obj_image_anim_frame 9, 4
 	obj_image_anim_frame 0, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieBackWheelNorth: ; 8508DC4
+gFieldObjectImageAnim_StandingWheelieBackWheelNorth: @ 8508DC4
 	obj_image_anim_frame 13, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieBackWheelWest: ; 8508DD0
+gFieldObjectImageAnim_StandingWheelieBackWheelWest: @ 8508DD0
 	obj_image_anim_frame 17, 4
 	obj_image_anim_frame 2, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieBackWheelEast: ; 8508DDC
+gFieldObjectImageAnim_StandingWheelieBackWheelEast: @ 8508DDC
 	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieFrontWheelSouth: ; 8508DE8
+gFieldObjectImageAnim_StandingWheelieFrontWheelSouth: @ 8508DE8
 	obj_image_anim_frame 11, 4
 	obj_image_anim_frame 0, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieFrontWheelNorth: ; 8508DF4
+gFieldObjectImageAnim_StandingWheelieFrontWheelNorth: @ 8508DF4
 	obj_image_anim_frame 15, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieFrontWheelWest: ; 8508E00
+gFieldObjectImageAnim_StandingWheelieFrontWheelWest: @ 8508E00
 	obj_image_anim_frame 19, 4
 	obj_image_anim_frame 2, 4
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_StandingWheelieFrontWheelEast: ; 8508E0C
+gFieldObjectImageAnim_StandingWheelieFrontWheelEast: @ 8508E0C
 	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_MovingWheelieSouth: ; 8508E18
+gFieldObjectImageAnim_MovingWheelieSouth: @ 8508E18
 	obj_image_anim_frame 21, 4
 	obj_image_anim_frame 10, 4
 	obj_image_anim_frame 22, 4
@@ -536,7 +536,7 @@ gFieldObjectImageAnim_MovingWheelieSouth: ; 8508E18
 
 	.align 2, 0
 
-gFieldObjectImageAnim_MovingWheelieNorth: ; 8508E2C
+gFieldObjectImageAnim_MovingWheelieNorth: @ 8508E2C
 	obj_image_anim_frame 23, 4
 	obj_image_anim_frame 14, 4
 	obj_image_anim_frame 24, 4
@@ -545,7 +545,7 @@ gFieldObjectImageAnim_MovingWheelieNorth: ; 8508E2C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_MovingWheelieWest: ; 8508E40
+gFieldObjectImageAnim_MovingWheelieWest: @ 8508E40
 	obj_image_anim_frame 25, 4
 	obj_image_anim_frame 18, 4
 	obj_image_anim_frame 26, 4
@@ -554,7 +554,7 @@ gFieldObjectImageAnim_MovingWheelieWest: ; 8508E40
 
 	.align 2, 0
 
-gFieldObjectImageAnim_MovingWheelieEast: ; 8508E54
+gFieldObjectImageAnim_MovingWheelieEast: @ 8508E54
 	obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -563,27 +563,27 @@ gFieldObjectImageAnim_MovingWheelieEast: ; 8508E54
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BerryTreeStage0: ; 8508E68
+gFieldObjectImageAnim_BerryTreeStage0: @ 8508E68
 	obj_image_anim_frame 0, 32
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BerryTreeStage1: ; 8508E70
+gFieldObjectImageAnim_BerryTreeStage1: @ 8508E70
 	obj_image_anim_frame 1, 32
 	obj_image_anim_frame 2, 32
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BerryTreeStage2: ; 8508E7C
+gFieldObjectImageAnim_BerryTreeStage2: @ 8508E7C
 	obj_image_anim_frame 3, 48
 	obj_image_anim_frame 4, 48
 	obj_image_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BerryTreeStage3: ; 8508E88
+gFieldObjectImageAnim_BerryTreeStage3: @ 8508E88
 	obj_image_anim_frame 5, 32
 	obj_image_anim_frame 5, 32
 	obj_image_anim_frame 6, 32
@@ -592,7 +592,7 @@ gFieldObjectImageAnim_BerryTreeStage3: ; 8508E88
 
 	.align 2, 0
 
-gFieldObjectImageAnim_BerryTreeStage4: ; 8508E9C
+gFieldObjectImageAnim_BerryTreeStage4: @ 8508E9C
 	obj_image_anim_frame 7, 48
 	obj_image_anim_frame 7, 48
 	obj_image_anim_frame 8, 48
@@ -601,7 +601,7 @@ gFieldObjectImageAnim_BerryTreeStage4: ; 8508E9C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_NurseBow: ; 8508EB0
+gFieldObjectImageAnim_NurseBow: @ 8508EB0
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 9, 32
 	obj_image_anim_frame 0, 8
@@ -609,7 +609,7 @@ gFieldObjectImageAnim_NurseBow: ; 8508EB0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_RockBreak: ; 8508EC0
+gFieldObjectImageAnim_RockBreak: @ 8508EC0
 	obj_image_anim_frame 0, 8
 	obj_image_anim_frame 1, 8
 	obj_image_anim_frame 2, 8
@@ -618,7 +618,7 @@ gFieldObjectImageAnim_RockBreak: ; 8508EC0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_TreeCut: ; 8508ED4
+gFieldObjectImageAnim_TreeCut: @ 8508ED4
 	obj_image_anim_frame 0, 6
 	obj_image_anim_frame 1, 6
 	obj_image_anim_frame 2, 6
@@ -627,7 +627,7 @@ gFieldObjectImageAnim_TreeCut: ; 8508ED4
 
 	.align 2, 0
 
-gFieldObjectImageAnim_TakeOutRodSouth: ; 8508EE8
+gFieldObjectImageAnim_TakeOutRodSouth: @ 8508EE8
 	obj_image_anim_frame 8, 4
 	obj_image_anim_frame 9, 4
 	obj_image_anim_frame 10, 4
@@ -636,7 +636,7 @@ gFieldObjectImageAnim_TakeOutRodSouth: ; 8508EE8
 
 	.align 2, 0
 
-gFieldObjectImageAnim_TakeOutRodNorth: ; 8508EFC
+gFieldObjectImageAnim_TakeOutRodNorth: @ 8508EFC
 	obj_image_anim_frame 4, 4
 	obj_image_anim_frame 5, 4
 	obj_image_anim_frame 6, 4
@@ -645,7 +645,7 @@ gFieldObjectImageAnim_TakeOutRodNorth: ; 8508EFC
 
 	.align 2, 0
 
-gFieldObjectImageAnim_TakeOutRodWest: ; 8508F10
+gFieldObjectImageAnim_TakeOutRodWest: @ 8508F10
 	obj_image_anim_frame 0, 4
 	obj_image_anim_frame 1, 4
 	obj_image_anim_frame 2, 4
@@ -654,7 +654,7 @@ gFieldObjectImageAnim_TakeOutRodWest: ; 8508F10
 
 	.align 2, 0
 
-gFieldObjectImageAnim_TakeOutRodEast: ; 8508F24
+gFieldObjectImageAnim_TakeOutRodEast: @ 8508F24
 	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -663,7 +663,7 @@ gFieldObjectImageAnim_TakeOutRodEast: ; 8508F24
 
 	.align 2, 0
 
-gFieldObjectImageAnim_PutAwayRodSouth: ; 8508F38
+gFieldObjectImageAnim_PutAwayRodSouth: @ 8508F38
 	obj_image_anim_frame 11, 4
 	obj_image_anim_frame 10, 6
 	obj_image_anim_frame 9, 6
@@ -672,7 +672,7 @@ gFieldObjectImageAnim_PutAwayRodSouth: ; 8508F38
 
 	.align 2, 0
 
-gFieldObjectImageAnim_PutAwayRodNorth: ; 8508F4C
+gFieldObjectImageAnim_PutAwayRodNorth: @ 8508F4C
 	obj_image_anim_frame 7, 4
 	obj_image_anim_frame 6, 6
 	obj_image_anim_frame 5, 6
@@ -681,7 +681,7 @@ gFieldObjectImageAnim_PutAwayRodNorth: ; 8508F4C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_PutAwayRodWest: ; 8508F60
+gFieldObjectImageAnim_PutAwayRodWest: @ 8508F60
 	obj_image_anim_frame 3, 4
 	obj_image_anim_frame 2, 4
 	obj_image_anim_frame 1, 4
@@ -690,7 +690,7 @@ gFieldObjectImageAnim_PutAwayRodWest: ; 8508F60
 
 	.align 2, 0
 
-gFieldObjectImageAnim_PutAwayRodEast: ; 8508F74
+gFieldObjectImageAnim_PutAwayRodEast: @ 8508F74
 	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
@@ -699,7 +699,7 @@ gFieldObjectImageAnim_PutAwayRodEast: ; 8508F74
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HookedPokemonSouth: ; 8508F88
+gFieldObjectImageAnim_HookedPokemonSouth: @ 8508F88
 	obj_image_anim_frame 10, 6
 	obj_image_anim_frame 11, 6
 	obj_image_anim_loop 1
@@ -708,7 +708,7 @@ gFieldObjectImageAnim_HookedPokemonSouth: ; 8508F88
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HookedPokemonNorth: ; 8508F9C
+gFieldObjectImageAnim_HookedPokemonNorth: @ 8508F9C
 	obj_image_anim_frame 6, 6
 	obj_image_anim_frame 7, 6
 	obj_image_anim_loop 1
@@ -717,7 +717,7 @@ gFieldObjectImageAnim_HookedPokemonNorth: ; 8508F9C
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HookedPokemonWest: ; 8508FB0
+gFieldObjectImageAnim_HookedPokemonWest: @ 8508FB0
 	obj_image_anim_frame 2, 6
 	obj_image_anim_frame 3, 6
 	obj_image_anim_loop 1
@@ -726,7 +726,7 @@ gFieldObjectImageAnim_HookedPokemonWest: ; 8508FB0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HookedPokemonEast: ; 8508FC4
+gFieldObjectImageAnim_HookedPokemonEast: @ 8508FC4
 	obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP
 	obj_image_anim_loop 1
@@ -735,7 +735,7 @@ gFieldObjectImageAnim_HookedPokemonEast: ; 8508FC4
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8508FD8: ; 8508FD8
+gFieldObjectRotScalAnim_8508FD8: @ 8508FD8
 	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
 	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
 	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
@@ -745,7 +745,7 @@ gFieldObjectRotScalAnim_8508FD8: ; 8508FD8
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8509008: ; 8509008
+gFieldObjectRotScalAnim_8509008: @ 8509008
 	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
 	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
 	obj_rot_scal_anim_loop 15
@@ -756,33 +756,33 @@ gFieldObjectRotScalAnim_8509008: ; 8509008
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8509040: ; 8509040
+gFieldObjectRotScalAnim_8509040: @ 8509040
 	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
 	obj_rot_scal_anim_end
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8509050: ; 8509050
+gFieldObjectRotScalAnim_8509050: @ 8509050
 	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
 	obj_rot_scal_anim_end
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8509060: ; 8509060
+gFieldObjectRotScalAnim_8509060: @ 8509060
 	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
 	obj_rot_scal_anim_loop 8
 	obj_rot_scal_anim_end
 
 	.align 2, 0
 
-gFieldObjectRotScalAnim_8509078: ; 8509078
+gFieldObjectRotScalAnim_8509078: @ 8509078
 	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
 	obj_rot_scal_anim_loop 8
 	obj_rot_scal_anim_end
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HoOhFlapWings: ; 8509090
+gFieldObjectImageAnim_HoOhFlapWings: @ 8509090
 	obj_image_anim_frame 3, 8
 	obj_image_anim_frame 4, 8
 	obj_image_anim_frame 3, 8
@@ -791,18 +791,18 @@ gFieldObjectImageAnim_HoOhFlapWings: ; 8509090
 
 	.align 2, 0
 
-gFieldObjectImageAnim_HoOhStayStill: ; 85090A4
+gFieldObjectImageAnim_HoOhStayStill: @ 85090A4
 	obj_image_anim_frame 3, 16
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Inanimate: ; 85090AC
+gFieldObjectImageAnimTable_Inanimate: @ 85090AC
 	.4byte gFieldObjectImageAnim_StayStill
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_QuintyPlump: ; 85090B0
+gFieldObjectImageAnimTable_QuintyPlump: @ 85090B0
 	.4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth
 	.4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth
 	.4byte gFieldObjectImageAnim_QuintyPlumpFaceWest
@@ -826,7 +826,7 @@ gFieldObjectImageAnimTable_QuintyPlump: ; 85090B0
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Standard: ; 8509100
+gFieldObjectImageAnimTable_Standard: @ 8509100
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -850,7 +850,7 @@ gFieldObjectImageAnimTable_Standard: ; 8509100
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_HoOh: ; 8509150
+gFieldObjectImageAnimTable_HoOh: @ 8509150
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -874,7 +874,7 @@ gFieldObjectImageAnimTable_HoOh: ; 8509150
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Groudon3: ; 85091A0
+gFieldObjectImageAnimTable_Groudon3: @ 85091A0
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -898,61 +898,61 @@ gFieldObjectImageAnimTable_Groudon3: ; 85091A0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_85091F0: ; 85091F0
+gFieldObjectImageAnim_85091F0: @ 85091F0
 	obj_image_anim_frame 1, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_85091F8: ; 85091F8
+gFieldObjectImageAnim_85091F8: @ 85091F8
 	obj_image_anim_frame 4, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509200: ; 8509200
+gFieldObjectImageAnim_8509200: @ 8509200
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509208: ; 8509208
+gFieldObjectImageAnim_8509208: @ 8509208
 	obj_image_anim_frame 2, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509210: ; 8509210
+gFieldObjectImageAnim_8509210: @ 8509210
 	obj_image_anim_frame 3, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509218: ; 8509218
+gFieldObjectImageAnim_8509218: @ 8509218
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509220: ; 8509220
+gFieldObjectImageAnim_8509220: @ 8509220
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509228: ; 8509228
+gFieldObjectImageAnim_8509228: @ 8509228
 	obj_image_anim_frame 0, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnim_8509230: ; 8509230
+gFieldObjectImageAnim_8509230: @ 8509230
 	obj_image_anim_frame 3, 1
 	obj_image_anim_jump 0
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Rayquaza2: ; 8509238
+gFieldObjectImageAnimTable_Rayquaza2: @ 8509238
 	.4byte gFieldObjectImageAnim_8509218
 	.4byte gFieldObjectImageAnim_8509220
 	.4byte gFieldObjectImageAnim_8509228
@@ -976,7 +976,7 @@ gFieldObjectImageAnimTable_Rayquaza2: ; 8509238
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_BrendanMayNormal: ; 8509288
+gFieldObjectImageAnimTable_BrendanMayNormal: @ 8509288
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -1004,7 +1004,7 @@ gFieldObjectImageAnimTable_BrendanMayNormal: ; 8509288
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_AcroBike: ; 85092E8
+gFieldObjectImageAnimTable_AcroBike: @ 85092E8
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -1048,7 +1048,7 @@ gFieldObjectImageAnimTable_AcroBike: ; 85092E8
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Surfing: ; 8509388
+gFieldObjectImageAnimTable_Surfing: @ 8509388
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -1076,7 +1076,7 @@ gFieldObjectImageAnimTable_Surfing: ; 8509388
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Nurse: ; 85093E8
+gFieldObjectImageAnimTable_Nurse: @ 85093E8
 	.4byte gFieldObjectImageAnim_FaceSouth
 	.4byte gFieldObjectImageAnim_FaceNorth
 	.4byte gFieldObjectImageAnim_FaceWest
@@ -1101,12 +1101,12 @@ gFieldObjectImageAnimTable_Nurse: ; 85093E8
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_FieldMove: ; 850943C
+gFieldObjectImageAnimTable_FieldMove: @ 850943C
 	.4byte gFieldObjectImageAnim_FieldMove
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_BerryTree: ; 8509440
+gFieldObjectImageAnimTable_BerryTree: @ 8509440
 	.4byte gFieldObjectImageAnim_BerryTreeStage0
 	.4byte gFieldObjectImageAnim_BerryTreeStage1
 	.4byte gFieldObjectImageAnim_BerryTreeStage2
@@ -1115,19 +1115,19 @@ gFieldObjectImageAnimTable_BerryTree: ; 8509440
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_BreakableRock: ; 8509454
+gFieldObjectImageAnimTable_BreakableRock: @ 8509454
 	.4byte gFieldObjectImageAnim_StayStill
 	.4byte gFieldObjectImageAnim_RockBreak
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_CuttableTree: ; 850945C
+gFieldObjectImageAnimTable_CuttableTree: @ 850945C
 	.4byte gFieldObjectImageAnim_StayStill
 	.4byte gFieldObjectImageAnim_TreeCut
 
 	.align 2, 0
 
-gFieldObjectImageAnimTable_Fishing: ; 8509464
+gFieldObjectImageAnimTable_Fishing: @ 8509464
 	.4byte gFieldObjectImageAnim_TakeOutRodSouth
 	.4byte gFieldObjectImageAnim_TakeOutRodNorth
 	.4byte gFieldObjectImageAnim_TakeOutRodWest
@@ -1143,7 +1143,7 @@ gFieldObjectImageAnimTable_Fishing: ; 8509464
 
 	.align 2, 0
 
-gFieldObjectRotScalAnimTable_KyogreGroudon: ; 8509494
+gFieldObjectRotScalAnimTable_KyogreGroudon: @ 8509494
 	.4byte gFieldObjectRotScalAnim_8508FD8
 	.4byte gFieldObjectRotScalAnim_8509008
 	.4byte gFieldObjectRotScalAnim_8509050
diff --git a/data/graphics/field_objects/field_object_graphics.s b/data/graphics/field_objects/field_object_graphics.s
index 981ec2675..fed1fc9db 100644
--- a/data/graphics/field_objects/field_object_graphics.s
+++ b/data/graphics/field_objects/field_object_graphics.s
@@ -1,8145 +1,8145 @@
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_0: ; 84975F8
+gFieldObjectPic_BrendanNormal_0: @ 84975F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_1: ; 84976F8
+gFieldObjectPic_BrendanNormal_1: @ 84976F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_2: ; 84977F8
+gFieldObjectPic_BrendanNormal_2: @ 84977F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_3: ; 84978F8
+gFieldObjectPic_BrendanNormal_3: @ 84978F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_4: ; 84979F8
+gFieldObjectPic_BrendanNormal_4: @ 84979F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_5: ; 8497AF8
+gFieldObjectPic_BrendanNormal_5: @ 8497AF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_6: ; 8497BF8
+gFieldObjectPic_BrendanNormal_6: @ 8497BF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_7: ; 8497CF8
+gFieldObjectPic_BrendanNormal_7: @ 8497CF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_8: ; 8497DF8
+gFieldObjectPic_BrendanNormal_8: @ 8497DF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_9: ; 8497EF8
+gFieldObjectPic_BrendanNormal_9: @ 8497EF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_10: ; 8497FF8
+gFieldObjectPic_BrendanNormal_10: @ 8497FF8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_11: ; 84980F8
+gFieldObjectPic_BrendanNormal_11: @ 84980F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_12: ; 84981F8
+gFieldObjectPic_BrendanNormal_12: @ 84981F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_13: ; 84982F8
+gFieldObjectPic_BrendanNormal_13: @ 84982F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_14: ; 84983F8
+gFieldObjectPic_BrendanNormal_14: @ 84983F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_15: ; 84984F8
+gFieldObjectPic_BrendanNormal_15: @ 84984F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_16: ; 84985F8
+gFieldObjectPic_BrendanNormal_16: @ 84985F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanNormal_17: ; 84986F8
+gFieldObjectPic_BrendanNormal_17: @ 84986F8
 	.incbin "data/graphics/field_objects/pics/people/brendan/normal/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette8: ; 84987F8
+gFieldObjectPalette8: @ 84987F8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_08.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_0: ; 8498818
+gFieldObjectPic_RubySapphireBrendan_0: @ 8498818
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_1: ; 8498918
+gFieldObjectPic_RubySapphireBrendan_1: @ 8498918
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_2: ; 8498A18
+gFieldObjectPic_RubySapphireBrendan_2: @ 8498A18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_3: ; 8498B18
+gFieldObjectPic_RubySapphireBrendan_3: @ 8498B18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_4: ; 8498C18
+gFieldObjectPic_RubySapphireBrendan_4: @ 8498C18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_5: ; 8498D18
+gFieldObjectPic_RubySapphireBrendan_5: @ 8498D18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_6: ; 8498E18
+gFieldObjectPic_RubySapphireBrendan_6: @ 8498E18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_7: ; 8498F18
+gFieldObjectPic_RubySapphireBrendan_7: @ 8498F18
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_8: ; 8499018
+gFieldObjectPic_RubySapphireBrendan_8: @ 8499018
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_9: ; 8499118
+gFieldObjectPic_RubySapphireBrendan_9: @ 8499118
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_10: ; 8499218
+gFieldObjectPic_RubySapphireBrendan_10: @ 8499218
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_11: ; 8499318
+gFieldObjectPic_RubySapphireBrendan_11: @ 8499318
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_12: ; 8499418
+gFieldObjectPic_RubySapphireBrendan_12: @ 8499418
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_13: ; 8499518
+gFieldObjectPic_RubySapphireBrendan_13: @ 8499518
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_14: ; 8499618
+gFieldObjectPic_RubySapphireBrendan_14: @ 8499618
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_15: ; 8499718
+gFieldObjectPic_RubySapphireBrendan_15: @ 8499718
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_16: ; 8499818
+gFieldObjectPic_RubySapphireBrendan_16: @ 8499818
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireBrendan_17: ; 8499918
+gFieldObjectPic_RubySapphireBrendan_17: @ 8499918
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_brendan/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette33: ; 8499A18
+gFieldObjectPalette33: @ 8499A18
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_33.gbapal"
 
 	zero_fill 0x8499c18 - 0x8499a38
 
 	.align 2, 0
 
-gFieldObjectPalette9: ; 8499C18
+gFieldObjectPalette9: @ 8499C18
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_09.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette10: ; 8499C38
+gFieldObjectPalette10: @ 8499C38
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_10.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFieldMove_0: ; 8499C58
+gFieldObjectPic_BrendanFieldMove_0: @ 8499C58
 	.incbin "data/graphics/field_objects/pics/people/brendan/field_move/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFieldMove_1: ; 8499E58
+gFieldObjectPic_BrendanFieldMove_1: @ 8499E58
 	.incbin "data/graphics/field_objects/pics/people/brendan/field_move/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFieldMove_2: ; 849A058
+gFieldObjectPic_BrendanFieldMove_2: @ 849A058
 	.incbin "data/graphics/field_objects/pics/people/brendan/field_move/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFieldMove_3: ; 849A258
+gFieldObjectPic_BrendanFieldMove_3: @ 849A258
 	.incbin "data/graphics/field_objects/pics/people/brendan/field_move/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFieldMove_4: ; 849A458
+gFieldObjectPic_BrendanFieldMove_4: @ 849A458
 	.incbin "data/graphics/field_objects/pics/people/brendan/field_move/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_0: ; 849A658
+gFieldObjectPic_BrendanSurfing_0: @ 849A658
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_3: ; 849A858
+gFieldObjectPic_BrendanSurfing_3: @ 849A858
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_1: ; 849AA58
+gFieldObjectPic_BrendanSurfing_1: @ 849AA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_4: ; 849AC58
+gFieldObjectPic_BrendanSurfing_4: @ 849AC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_2: ; 849AE58
+gFieldObjectPic_BrendanSurfing_2: @ 849AE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanSurfing_5: ; 849B058
+gFieldObjectPic_BrendanSurfing_5: @ 849B058
 	.incbin "data/graphics/field_objects/pics/people/brendan/surfing/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_0: ; 849B258
+gFieldObjectPic_BrendanMachBike_0: @ 849B258
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_1: ; 849B458
+gFieldObjectPic_BrendanMachBike_1: @ 849B458
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_2: ; 849B658
+gFieldObjectPic_BrendanMachBike_2: @ 849B658
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_3: ; 849B858
+gFieldObjectPic_BrendanMachBike_3: @ 849B858
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_4: ; 849BA58
+gFieldObjectPic_BrendanMachBike_4: @ 849BA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_5: ; 849BC58
+gFieldObjectPic_BrendanMachBike_5: @ 849BC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_6: ; 849BE58
+gFieldObjectPic_BrendanMachBike_6: @ 849BE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_7: ; 849C058
+gFieldObjectPic_BrendanMachBike_7: @ 849C058
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanMachBike_8: ; 849C258
+gFieldObjectPic_BrendanMachBike_8: @ 849C258
 	.incbin "data/graphics/field_objects/pics/people/brendan/mach_bike/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_0: ; 849C458
+gFieldObjectPic_BrendanAcroBike_0: @ 849C458
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_1: ; 849C658
+gFieldObjectPic_BrendanAcroBike_1: @ 849C658
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_2: ; 849C858
+gFieldObjectPic_BrendanAcroBike_2: @ 849C858
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_3: ; 849CA58
+gFieldObjectPic_BrendanAcroBike_3: @ 849CA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_4: ; 849CC58
+gFieldObjectPic_BrendanAcroBike_4: @ 849CC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_5: ; 849CE58
+gFieldObjectPic_BrendanAcroBike_5: @ 849CE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_6: ; 849D058
+gFieldObjectPic_BrendanAcroBike_6: @ 849D058
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_7: ; 849D258
+gFieldObjectPic_BrendanAcroBike_7: @ 849D258
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_8: ; 849D458
+gFieldObjectPic_BrendanAcroBike_8: @ 849D458
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_9: ; 849D658
+gFieldObjectPic_BrendanAcroBike_9: @ 849D658
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_10: ; 849D858
+gFieldObjectPic_BrendanAcroBike_10: @ 849D858
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_11: ; 849DA58
+gFieldObjectPic_BrendanAcroBike_11: @ 849DA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_12: ; 849DC58
+gFieldObjectPic_BrendanAcroBike_12: @ 849DC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_13: ; 849DE58
+gFieldObjectPic_BrendanAcroBike_13: @ 849DE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_14: ; 849E058
+gFieldObjectPic_BrendanAcroBike_14: @ 849E058
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_15: ; 849E258
+gFieldObjectPic_BrendanAcroBike_15: @ 849E258
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_16: ; 849E458
+gFieldObjectPic_BrendanAcroBike_16: @ 849E458
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_17: ; 849E658
+gFieldObjectPic_BrendanAcroBike_17: @ 849E658
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_18: ; 849E858
+gFieldObjectPic_BrendanAcroBike_18: @ 849E858
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/18.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_19: ; 849EA58
+gFieldObjectPic_BrendanAcroBike_19: @ 849EA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/19.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_20: ; 849EC58
+gFieldObjectPic_BrendanAcroBike_20: @ 849EC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/20.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_21: ; 849EE58
+gFieldObjectPic_BrendanAcroBike_21: @ 849EE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/21.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_22: ; 849F058
+gFieldObjectPic_BrendanAcroBike_22: @ 849F058
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/22.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_23: ; 849F258
+gFieldObjectPic_BrendanAcroBike_23: @ 849F258
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/23.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_24: ; 849F458
+gFieldObjectPic_BrendanAcroBike_24: @ 849F458
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/24.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_25: ; 849F658
+gFieldObjectPic_BrendanAcroBike_25: @ 849F658
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/25.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanAcroBike_26: ; 849F858
+gFieldObjectPic_BrendanAcroBike_26: @ 849F858
 	.incbin "data/graphics/field_objects/pics/people/brendan/acro_bike/26.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_0: ; 849FA58
+gFieldObjectPic_BrendanFishing_0: @ 849FA58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_1: ; 849FC58
+gFieldObjectPic_BrendanFishing_1: @ 849FC58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_2: ; 849FE58
+gFieldObjectPic_BrendanFishing_2: @ 849FE58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_3: ; 84A0058
+gFieldObjectPic_BrendanFishing_3: @ 84A0058
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_4: ; 84A0258
+gFieldObjectPic_BrendanFishing_4: @ 84A0258
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_5: ; 84A0458
+gFieldObjectPic_BrendanFishing_5: @ 84A0458
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_6: ; 84A0658
+gFieldObjectPic_BrendanFishing_6: @ 84A0658
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_7: ; 84A0858
+gFieldObjectPic_BrendanFishing_7: @ 84A0858
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_8: ; 84A0A58
+gFieldObjectPic_BrendanFishing_8: @ 84A0A58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_9: ; 84A0C58
+gFieldObjectPic_BrendanFishing_9: @ 84A0C58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_10: ; 84A0E58
+gFieldObjectPic_BrendanFishing_10: @ 84A0E58
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanFishing_11: ; 84A1058
+gFieldObjectPic_BrendanFishing_11: @ 84A1058
 	.incbin "data/graphics/field_objects/pics/people/brendan/fishing/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_0: ; 84A1258
+gFieldObjectPic_BrendanWatering_0: @ 84A1258
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_3: ; 84A1458
+gFieldObjectPic_BrendanWatering_3: @ 84A1458
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_1: ; 84A1658
+gFieldObjectPic_BrendanWatering_1: @ 84A1658
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_4: ; 84A1858
+gFieldObjectPic_BrendanWatering_4: @ 84A1858
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_2: ; 84A1A58
+gFieldObjectPic_BrendanWatering_2: @ 84A1A58
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanWatering_5: ; 84A1C58
+gFieldObjectPic_BrendanWatering_5: @ 84A1C58
 	.incbin "data/graphics/field_objects/pics/people/brendan/watering/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanDecorating: ; 84A1E58
+gFieldObjectPic_BrendanDecorating: @ 84A1E58
 	.incbin "data/graphics/field_objects/pics/people/brendan/decorating.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayDecorating: ; 84A1F58
+gFieldObjectPic_MayDecorating: @ 84A1F58
 	.incbin "data/graphics/field_objects/pics/people/may/decorating.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanUnderwater_0: ; 84A2058
+gFieldObjectPic_BrendanUnderwater_0: @ 84A2058
 	.incbin "data/graphics/field_objects/pics/people/brendan/underwater/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanUnderwater_1: ; 84A2258
+gFieldObjectPic_BrendanUnderwater_1: @ 84A2258
 	.incbin "data/graphics/field_objects/pics/people/brendan/underwater/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanUnderwater_2: ; 84A2458
+gFieldObjectPic_BrendanUnderwater_2: @ 84A2458
 	.incbin "data/graphics/field_objects/pics/people/brendan/underwater/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BrendanUnderwater_3: ; 84A2658
+gFieldObjectPic_BrendanUnderwater_3: @ 84A2658
 	.incbin "data/graphics/field_objects/pics/people/brendan/underwater/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayUnderwater_0: ; 84A2858
+gFieldObjectPic_MayUnderwater_0: @ 84A2858
 	.incbin "data/graphics/field_objects/pics/people/may/underwater/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayUnderwater_1: ; 84A2A58
+gFieldObjectPic_MayUnderwater_1: @ 84A2A58
 	.incbin "data/graphics/field_objects/pics/people/may/underwater/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayUnderwater_2: ; 84A2C58
+gFieldObjectPic_MayUnderwater_2: @ 84A2C58
 	.incbin "data/graphics/field_objects/pics/people/may/underwater/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayUnderwater_3: ; 84A2E58
+gFieldObjectPic_MayUnderwater_3: @ 84A2E58
 	.incbin "data/graphics/field_objects/pics/people/may/underwater/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette11: ; 84A3058
+gFieldObjectPalette11: @ 84A3058
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_11.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_0: ; 84A3078
+gFieldObjectPic_MayNormal_0: @ 84A3078
 	.incbin "data/graphics/field_objects/pics/people/may/normal/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_1: ; 84A3178
+gFieldObjectPic_MayNormal_1: @ 84A3178
 	.incbin "data/graphics/field_objects/pics/people/may/normal/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_2: ; 84A3278
+gFieldObjectPic_MayNormal_2: @ 84A3278
 	.incbin "data/graphics/field_objects/pics/people/may/normal/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_3: ; 84A3378
+gFieldObjectPic_MayNormal_3: @ 84A3378
 	.incbin "data/graphics/field_objects/pics/people/may/normal/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_4: ; 84A3478
+gFieldObjectPic_MayNormal_4: @ 84A3478
 	.incbin "data/graphics/field_objects/pics/people/may/normal/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_5: ; 84A3578
+gFieldObjectPic_MayNormal_5: @ 84A3578
 	.incbin "data/graphics/field_objects/pics/people/may/normal/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_6: ; 84A3678
+gFieldObjectPic_MayNormal_6: @ 84A3678
 	.incbin "data/graphics/field_objects/pics/people/may/normal/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_7: ; 84A3778
+gFieldObjectPic_MayNormal_7: @ 84A3778
 	.incbin "data/graphics/field_objects/pics/people/may/normal/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_8: ; 84A3878
+gFieldObjectPic_MayNormal_8: @ 84A3878
 	.incbin "data/graphics/field_objects/pics/people/may/normal/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_9: ; 84A3978
+gFieldObjectPic_MayNormal_9: @ 84A3978
 	.incbin "data/graphics/field_objects/pics/people/may/normal/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_10: ; 84A3A78
+gFieldObjectPic_MayNormal_10: @ 84A3A78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_11: ; 84A3B78
+gFieldObjectPic_MayNormal_11: @ 84A3B78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_12: ; 84A3C78
+gFieldObjectPic_MayNormal_12: @ 84A3C78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_13: ; 84A3D78
+gFieldObjectPic_MayNormal_13: @ 84A3D78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_14: ; 84A3E78
+gFieldObjectPic_MayNormal_14: @ 84A3E78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_15: ; 84A3F78
+gFieldObjectPic_MayNormal_15: @ 84A3F78
 	.incbin "data/graphics/field_objects/pics/people/may/normal/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_16: ; 84A4078
+gFieldObjectPic_MayNormal_16: @ 84A4078
 	.incbin "data/graphics/field_objects/pics/people/may/normal/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayNormal_17: ; 84A4178
+gFieldObjectPic_MayNormal_17: @ 84A4178
 	.incbin "data/graphics/field_objects/pics/people/may/normal/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette17: ; 84A4278
+gFieldObjectPalette17: @ 84A4278
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_17.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette18: ; 84A4298
+gFieldObjectPalette18: @ 84A4298
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_18.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_0: ; 84A42B8
+gFieldObjectPic_RubySapphireMay_0: @ 84A42B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_1: ; 84A43B8
+gFieldObjectPic_RubySapphireMay_1: @ 84A43B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_2: ; 84A44B8
+gFieldObjectPic_RubySapphireMay_2: @ 84A44B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_3: ; 84A45B8
+gFieldObjectPic_RubySapphireMay_3: @ 84A45B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_4: ; 84A46B8
+gFieldObjectPic_RubySapphireMay_4: @ 84A46B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_5: ; 84A47B8
+gFieldObjectPic_RubySapphireMay_5: @ 84A47B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_6: ; 84A48B8
+gFieldObjectPic_RubySapphireMay_6: @ 84A48B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_7: ; 84A49B8
+gFieldObjectPic_RubySapphireMay_7: @ 84A49B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_8: ; 84A4AB8
+gFieldObjectPic_RubySapphireMay_8: @ 84A4AB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_9: ; 84A4BB8
+gFieldObjectPic_RubySapphireMay_9: @ 84A4BB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_10: ; 84A4CB8
+gFieldObjectPic_RubySapphireMay_10: @ 84A4CB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_11: ; 84A4DB8
+gFieldObjectPic_RubySapphireMay_11: @ 84A4DB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_12: ; 84A4EB8
+gFieldObjectPic_RubySapphireMay_12: @ 84A4EB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_13: ; 84A4FB8
+gFieldObjectPic_RubySapphireMay_13: @ 84A4FB8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_14: ; 84A50B8
+gFieldObjectPic_RubySapphireMay_14: @ 84A50B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_15: ; 84A51B8
+gFieldObjectPic_RubySapphireMay_15: @ 84A51B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_16: ; 84A52B8
+gFieldObjectPic_RubySapphireMay_16: @ 84A52B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireMay_17: ; 84A53B8
+gFieldObjectPic_RubySapphireMay_17: @ 84A53B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_may/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette34: ; 84A54B8
+gFieldObjectPalette34: @ 84A54B8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_34.gbapal"
 
 	.align 2, 0
 
-gUnusedFieldObjectPalette: ; 84A54D8
+gUnusedFieldObjectPalette: @ 84A54D8
 	.incbin "data/graphics/field_objects/palettes/unused_palette.gbapal"
 
 	zero_fill 0x84a56b8 - 0x84a54f8
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_0: ; 84A56B8
+gFieldObjectPic_MayMachBike_0: @ 84A56B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_1: ; 84A58B8
+gFieldObjectPic_MayMachBike_1: @ 84A58B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_2: ; 84A5AB8
+gFieldObjectPic_MayMachBike_2: @ 84A5AB8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_3: ; 84A5CB8
+gFieldObjectPic_MayMachBike_3: @ 84A5CB8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_4: ; 84A5EB8
+gFieldObjectPic_MayMachBike_4: @ 84A5EB8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_5: ; 84A60B8
+gFieldObjectPic_MayMachBike_5: @ 84A60B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_6: ; 84A62B8
+gFieldObjectPic_MayMachBike_6: @ 84A62B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_7: ; 84A64B8
+gFieldObjectPic_MayMachBike_7: @ 84A64B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayMachBike_8: ; 84A66B8
+gFieldObjectPic_MayMachBike_8: @ 84A66B8
 	.incbin "data/graphics/field_objects/pics/people/may/mach_bike/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_0: ; 84A68B8
+gFieldObjectPic_MayAcroBike_0: @ 84A68B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_1: ; 84A6AB8
+gFieldObjectPic_MayAcroBike_1: @ 84A6AB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_2: ; 84A6CB8
+gFieldObjectPic_MayAcroBike_2: @ 84A6CB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_3: ; 84A6EB8
+gFieldObjectPic_MayAcroBike_3: @ 84A6EB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_4: ; 84A70B8
+gFieldObjectPic_MayAcroBike_4: @ 84A70B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_5: ; 84A72B8
+gFieldObjectPic_MayAcroBike_5: @ 84A72B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_6: ; 84A74B8
+gFieldObjectPic_MayAcroBike_6: @ 84A74B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_7: ; 84A76B8
+gFieldObjectPic_MayAcroBike_7: @ 84A76B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_8: ; 84A78B8
+gFieldObjectPic_MayAcroBike_8: @ 84A78B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_9: ; 84A7AB8
+gFieldObjectPic_MayAcroBike_9: @ 84A7AB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_10: ; 84A7CB8
+gFieldObjectPic_MayAcroBike_10: @ 84A7CB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_11: ; 84A7EB8
+gFieldObjectPic_MayAcroBike_11: @ 84A7EB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_12: ; 84A80B8
+gFieldObjectPic_MayAcroBike_12: @ 84A80B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/12.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_13: ; 84A82B8
+gFieldObjectPic_MayAcroBike_13: @ 84A82B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/13.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_14: ; 84A84B8
+gFieldObjectPic_MayAcroBike_14: @ 84A84B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/14.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_15: ; 84A86B8
+gFieldObjectPic_MayAcroBike_15: @ 84A86B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/15.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_16: ; 84A88B8
+gFieldObjectPic_MayAcroBike_16: @ 84A88B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/16.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_17: ; 84A8AB8
+gFieldObjectPic_MayAcroBike_17: @ 84A8AB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/17.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_18: ; 84A8CB8
+gFieldObjectPic_MayAcroBike_18: @ 84A8CB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/18.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_19: ; 84A8EB8
+gFieldObjectPic_MayAcroBike_19: @ 84A8EB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/19.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_20: ; 84A90B8
+gFieldObjectPic_MayAcroBike_20: @ 84A90B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/20.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_21: ; 84A92B8
+gFieldObjectPic_MayAcroBike_21: @ 84A92B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/21.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_22: ; 84A94B8
+gFieldObjectPic_MayAcroBike_22: @ 84A94B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/22.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_23: ; 84A96B8
+gFieldObjectPic_MayAcroBike_23: @ 84A96B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/23.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_24: ; 84A98B8
+gFieldObjectPic_MayAcroBike_24: @ 84A98B8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/24.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_25: ; 84A9AB8
+gFieldObjectPic_MayAcroBike_25: @ 84A9AB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/25.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayAcroBike_26: ; 84A9CB8
+gFieldObjectPic_MayAcroBike_26: @ 84A9CB8
 	.incbin "data/graphics/field_objects/pics/people/may/acro_bike/26.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_0: ; 84A9EB8
+gFieldObjectPic_MaySurfing_0: @ 84A9EB8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_3: ; 84AA0B8
+gFieldObjectPic_MaySurfing_3: @ 84AA0B8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_1: ; 84AA2B8
+gFieldObjectPic_MaySurfing_1: @ 84AA2B8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_4: ; 84AA4B8
+gFieldObjectPic_MaySurfing_4: @ 84AA4B8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_2: ; 84AA6B8
+gFieldObjectPic_MaySurfing_2: @ 84AA6B8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MaySurfing_5: ; 84AA8B8
+gFieldObjectPic_MaySurfing_5: @ 84AA8B8
 	.incbin "data/graphics/field_objects/pics/people/may/surfing/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFieldMove_0: ; 84AAAB8
+gFieldObjectPic_MayFieldMove_0: @ 84AAAB8
 	.incbin "data/graphics/field_objects/pics/people/may/field_move/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFieldMove_1: ; 84AACB8
+gFieldObjectPic_MayFieldMove_1: @ 84AACB8
 	.incbin "data/graphics/field_objects/pics/people/may/field_move/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFieldMove_2: ; 84AAEB8
+gFieldObjectPic_MayFieldMove_2: @ 84AAEB8
 	.incbin "data/graphics/field_objects/pics/people/may/field_move/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFieldMove_3: ; 84AB0B8
+gFieldObjectPic_MayFieldMove_3: @ 84AB0B8
 	.incbin "data/graphics/field_objects/pics/people/may/field_move/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFieldMove_4: ; 84AB2B8
+gFieldObjectPic_MayFieldMove_4: @ 84AB2B8
 	.incbin "data/graphics/field_objects/pics/people/may/field_move/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_0: ; 84AB4B8
+gFieldObjectPic_MayFishing_0: @ 84AB4B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/00.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_1: ; 84AB6B8
+gFieldObjectPic_MayFishing_1: @ 84AB6B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/01.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_2: ; 84AB8B8
+gFieldObjectPic_MayFishing_2: @ 84AB8B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/02.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_3: ; 84ABAB8
+gFieldObjectPic_MayFishing_3: @ 84ABAB8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/03.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_4: ; 84ABCB8
+gFieldObjectPic_MayFishing_4: @ 84ABCB8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/04.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_5: ; 84ABEB8
+gFieldObjectPic_MayFishing_5: @ 84ABEB8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/05.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_6: ; 84AC0B8
+gFieldObjectPic_MayFishing_6: @ 84AC0B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/06.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_7: ; 84AC2B8
+gFieldObjectPic_MayFishing_7: @ 84AC2B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/07.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_8: ; 84AC4B8
+gFieldObjectPic_MayFishing_8: @ 84AC4B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/08.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_9: ; 84AC6B8
+gFieldObjectPic_MayFishing_9: @ 84AC6B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/09.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_10: ; 84AC8B8
+gFieldObjectPic_MayFishing_10: @ 84AC8B8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/10.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayFishing_11: ; 84ACAB8
+gFieldObjectPic_MayFishing_11: @ 84ACAB8
 	.incbin "data/graphics/field_objects/pics/people/may/fishing/11.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_0: ; 84ACCB8
+gFieldObjectPic_MayWatering_0: @ 84ACCB8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_3: ; 84ACEB8
+gFieldObjectPic_MayWatering_3: @ 84ACEB8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_1: ; 84AD0B8
+gFieldObjectPic_MayWatering_1: @ 84AD0B8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_4: ; 84AD2B8
+gFieldObjectPic_MayWatering_4: @ 84AD2B8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_2: ; 84AD4B8
+gFieldObjectPic_MayWatering_2: @ 84AD4B8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MayWatering_5: ; 84AD6B8
+gFieldObjectPic_MayWatering_5: @ 84AD6B8
 	.incbin "data/graphics/field_objects/pics/people/may/watering/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette0: ; 84AD8B8
+gFieldObjectPalette0: @ 84AD8B8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_00.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette1: ; 84AD8D8
+gFieldObjectPalette1: @ 84AD8D8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_01.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette2: ; 84AD8F8
+gFieldObjectPalette2: @ 84AD8F8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_02.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette3: ; 84AD918
+gFieldObjectPalette3: @ 84AD918
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_03.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette4: ; 84AD938
+gFieldObjectPalette4: @ 84AD938
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_04.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette5: ; 84AD958
+gFieldObjectPalette5: @ 84AD958
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_05.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette6: ; 84AD978
+gFieldObjectPalette6: @ 84AD978
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_06.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette7: ; 84AD998
+gFieldObjectPalette7: @ 84AD998
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_07.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_0: ; 84AD9B8
+gFieldObjectPic_LittleBoy1_0: @ 84AD9B8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_1: ; 84ADA38
+gFieldObjectPic_LittleBoy1_1: @ 84ADA38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_2: ; 84ADAB8
+gFieldObjectPic_LittleBoy1_2: @ 84ADAB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_3: ; 84ADB38
+gFieldObjectPic_LittleBoy1_3: @ 84ADB38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_4: ; 84ADBB8
+gFieldObjectPic_LittleBoy1_4: @ 84ADBB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_5: ; 84ADC38
+gFieldObjectPic_LittleBoy1_5: @ 84ADC38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_6: ; 84ADCB8
+gFieldObjectPic_LittleBoy1_6: @ 84ADCB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_7: ; 84ADD38
+gFieldObjectPic_LittleBoy1_7: @ 84ADD38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy1_8: ; 84ADDB8
+gFieldObjectPic_LittleBoy1_8: @ 84ADDB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_0: ; 84ADE38
+gFieldObjectPic_LittleGirl1_0: @ 84ADE38
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_1: ; 84ADF38
+gFieldObjectPic_LittleGirl1_1: @ 84ADF38
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_2: ; 84AE038
+gFieldObjectPic_LittleGirl1_2: @ 84AE038
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_3: ; 84AE138
+gFieldObjectPic_LittleGirl1_3: @ 84AE138
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_4: ; 84AE238
+gFieldObjectPic_LittleGirl1_4: @ 84AE238
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_5: ; 84AE338
+gFieldObjectPic_LittleGirl1_5: @ 84AE338
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_6: ; 84AE438
+gFieldObjectPic_LittleGirl1_6: @ 84AE438
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_7: ; 84AE538
+gFieldObjectPic_LittleGirl1_7: @ 84AE538
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl1_8: ; 84AE638
+gFieldObjectPic_LittleGirl1_8: @ 84AE638
 	.incbin "data/graphics/field_objects/pics/people/little_girl_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_0: ; 84AE738
+gFieldObjectPic_Boy1_0: @ 84AE738
 	.incbin "data/graphics/field_objects/pics/people/boy_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_1: ; 84AE838
+gFieldObjectPic_Boy1_1: @ 84AE838
 	.incbin "data/graphics/field_objects/pics/people/boy_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_2: ; 84AE938
+gFieldObjectPic_Boy1_2: @ 84AE938
 	.incbin "data/graphics/field_objects/pics/people/boy_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_3: ; 84AEA38
+gFieldObjectPic_Boy1_3: @ 84AEA38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_4: ; 84AEB38
+gFieldObjectPic_Boy1_4: @ 84AEB38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_5: ; 84AEC38
+gFieldObjectPic_Boy1_5: @ 84AEC38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_6: ; 84AED38
+gFieldObjectPic_Boy1_6: @ 84AED38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_7: ; 84AEE38
+gFieldObjectPic_Boy1_7: @ 84AEE38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy1_8: ; 84AEF38
+gFieldObjectPic_Boy1_8: @ 84AEF38
 	.incbin "data/graphics/field_objects/pics/people/boy_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_0: ; 84AF038
+gFieldObjectPic_Girl1_0: @ 84AF038
 	.incbin "data/graphics/field_objects/pics/people/girl_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_1: ; 84AF138
+gFieldObjectPic_Girl1_1: @ 84AF138
 	.incbin "data/graphics/field_objects/pics/people/girl_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_2: ; 84AF238
+gFieldObjectPic_Girl1_2: @ 84AF238
 	.incbin "data/graphics/field_objects/pics/people/girl_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_3: ; 84AF338
+gFieldObjectPic_Girl1_3: @ 84AF338
 	.incbin "data/graphics/field_objects/pics/people/girl_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_4: ; 84AF438
+gFieldObjectPic_Girl1_4: @ 84AF438
 	.incbin "data/graphics/field_objects/pics/people/girl_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_5: ; 84AF538
+gFieldObjectPic_Girl1_5: @ 84AF538
 	.incbin "data/graphics/field_objects/pics/people/girl_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_6: ; 84AF638
+gFieldObjectPic_Girl1_6: @ 84AF638
 	.incbin "data/graphics/field_objects/pics/people/girl_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_7: ; 84AF738
+gFieldObjectPic_Girl1_7: @ 84AF738
 	.incbin "data/graphics/field_objects/pics/people/girl_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl1_8: ; 84AF838
+gFieldObjectPic_Girl1_8: @ 84AF838
 	.incbin "data/graphics/field_objects/pics/people/girl_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_0: ; 84AF938
+gFieldObjectPic_Boy2_0: @ 84AF938
 	.incbin "data/graphics/field_objects/pics/people/boy_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_1: ; 84AFA38
+gFieldObjectPic_Boy2_1: @ 84AFA38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_2: ; 84AFB38
+gFieldObjectPic_Boy2_2: @ 84AFB38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_3: ; 84AFC38
+gFieldObjectPic_Boy2_3: @ 84AFC38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_4: ; 84AFD38
+gFieldObjectPic_Boy2_4: @ 84AFD38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_5: ; 84AFE38
+gFieldObjectPic_Boy2_5: @ 84AFE38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_6: ; 84AFF38
+gFieldObjectPic_Boy2_6: @ 84AFF38
 	.incbin "data/graphics/field_objects/pics/people/boy_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_7: ; 84B0038
+gFieldObjectPic_Boy2_7: @ 84B0038
 	.incbin "data/graphics/field_objects/pics/people/boy_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy2_8: ; 84B0138
+gFieldObjectPic_Boy2_8: @ 84B0138
 	.incbin "data/graphics/field_objects/pics/people/boy_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_0: ; 84B0238
+gFieldObjectPic_Girl2_0: @ 84B0238
 	.incbin "data/graphics/field_objects/pics/people/girl_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_1: ; 84B0338
+gFieldObjectPic_Girl2_1: @ 84B0338
 	.incbin "data/graphics/field_objects/pics/people/girl_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_2: ; 84B0438
+gFieldObjectPic_Girl2_2: @ 84B0438
 	.incbin "data/graphics/field_objects/pics/people/girl_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_3: ; 84B0538
+gFieldObjectPic_Girl2_3: @ 84B0538
 	.incbin "data/graphics/field_objects/pics/people/girl_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_4: ; 84B0638
+gFieldObjectPic_Girl2_4: @ 84B0638
 	.incbin "data/graphics/field_objects/pics/people/girl_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_5: ; 84B0738
+gFieldObjectPic_Girl2_5: @ 84B0738
 	.incbin "data/graphics/field_objects/pics/people/girl_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_6: ; 84B0838
+gFieldObjectPic_Girl2_6: @ 84B0838
 	.incbin "data/graphics/field_objects/pics/people/girl_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_7: ; 84B0938
+gFieldObjectPic_Girl2_7: @ 84B0938
 	.incbin "data/graphics/field_objects/pics/people/girl_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl2_8: ; 84B0A38
+gFieldObjectPic_Girl2_8: @ 84B0A38
 	.incbin "data/graphics/field_objects/pics/people/girl_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_0: ; 84B0B38
+gFieldObjectPic_LittleBoy2_0: @ 84B0B38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_1: ; 84B0BB8
+gFieldObjectPic_LittleBoy2_1: @ 84B0BB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_2: ; 84B0C38
+gFieldObjectPic_LittleBoy2_2: @ 84B0C38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_3: ; 84B0CB8
+gFieldObjectPic_LittleBoy2_3: @ 84B0CB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_4: ; 84B0D38
+gFieldObjectPic_LittleBoy2_4: @ 84B0D38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_5: ; 84B0DB8
+gFieldObjectPic_LittleBoy2_5: @ 84B0DB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_6: ; 84B0E38
+gFieldObjectPic_LittleBoy2_6: @ 84B0E38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_7: ; 84B0EB8
+gFieldObjectPic_LittleBoy2_7: @ 84B0EB8
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleBoy2_8: ; 84B0F38
+gFieldObjectPic_LittleBoy2_8: @ 84B0F38
 	.incbin "data/graphics/field_objects/pics/people/little_boy_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_0: ; 84B0FB8
+gFieldObjectPic_LittleGirl2_0: @ 84B0FB8
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_1: ; 84B1038
+gFieldObjectPic_LittleGirl2_1: @ 84B1038
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_2: ; 84B10B8
+gFieldObjectPic_LittleGirl2_2: @ 84B10B8
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_3: ; 84B1138
+gFieldObjectPic_LittleGirl2_3: @ 84B1138
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_4: ; 84B11B8
+gFieldObjectPic_LittleGirl2_4: @ 84B11B8
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_5: ; 84B1238
+gFieldObjectPic_LittleGirl2_5: @ 84B1238
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_6: ; 84B12B8
+gFieldObjectPic_LittleGirl2_6: @ 84B12B8
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_7: ; 84B1338
+gFieldObjectPic_LittleGirl2_7: @ 84B1338
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LittleGirl2_8: ; 84B13B8
+gFieldObjectPic_LittleGirl2_8: @ 84B13B8
 	.incbin "data/graphics/field_objects/pics/people/little_girl_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_0: ; 84B1438
+gFieldObjectPic_Boy3_0: @ 84B1438
 	.incbin "data/graphics/field_objects/pics/people/boy_3/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_1: ; 84B1538
+gFieldObjectPic_Boy3_1: @ 84B1538
 	.incbin "data/graphics/field_objects/pics/people/boy_3/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_2: ; 84B1638
+gFieldObjectPic_Boy3_2: @ 84B1638
 	.incbin "data/graphics/field_objects/pics/people/boy_3/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_3: ; 84B1738
+gFieldObjectPic_Boy3_3: @ 84B1738
 	.incbin "data/graphics/field_objects/pics/people/boy_3/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_4: ; 84B1838
+gFieldObjectPic_Boy3_4: @ 84B1838
 	.incbin "data/graphics/field_objects/pics/people/boy_3/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_5: ; 84B1938
+gFieldObjectPic_Boy3_5: @ 84B1938
 	.incbin "data/graphics/field_objects/pics/people/boy_3/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_6: ; 84B1A38
+gFieldObjectPic_Boy3_6: @ 84B1A38
 	.incbin "data/graphics/field_objects/pics/people/boy_3/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_7: ; 84B1B38
+gFieldObjectPic_Boy3_7: @ 84B1B38
 	.incbin "data/graphics/field_objects/pics/people/boy_3/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy3_8: ; 84B1C38
+gFieldObjectPic_Boy3_8: @ 84B1C38
 	.incbin "data/graphics/field_objects/pics/people/boy_3/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_0: ; 84B1D38
+gFieldObjectPic_Girl3_0: @ 84B1D38
 	.incbin "data/graphics/field_objects/pics/people/girl_3/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_1: ; 84B1E38
+gFieldObjectPic_Girl3_1: @ 84B1E38
 	.incbin "data/graphics/field_objects/pics/people/girl_3/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_2: ; 84B1F38
+gFieldObjectPic_Girl3_2: @ 84B1F38
 	.incbin "data/graphics/field_objects/pics/people/girl_3/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_3: ; 84B2038
+gFieldObjectPic_Girl3_3: @ 84B2038
 	.incbin "data/graphics/field_objects/pics/people/girl_3/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_4: ; 84B2138
+gFieldObjectPic_Girl3_4: @ 84B2138
 	.incbin "data/graphics/field_objects/pics/people/girl_3/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_5: ; 84B2238
+gFieldObjectPic_Girl3_5: @ 84B2238
 	.incbin "data/graphics/field_objects/pics/people/girl_3/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_6: ; 84B2338
+gFieldObjectPic_Girl3_6: @ 84B2338
 	.incbin "data/graphics/field_objects/pics/people/girl_3/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_7: ; 84B2438
+gFieldObjectPic_Girl3_7: @ 84B2438
 	.incbin "data/graphics/field_objects/pics/people/girl_3/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Girl3_8: ; 84B2538
+gFieldObjectPic_Girl3_8: @ 84B2538
 	.incbin "data/graphics/field_objects/pics/people/girl_3/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_0: ; 84B2638
+gFieldObjectPic_Boy4_0: @ 84B2638
 	.incbin "data/graphics/field_objects/pics/people/boy_4/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_1: ; 84B2738
+gFieldObjectPic_Boy4_1: @ 84B2738
 	.incbin "data/graphics/field_objects/pics/people/boy_4/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_2: ; 84B2838
+gFieldObjectPic_Boy4_2: @ 84B2838
 	.incbin "data/graphics/field_objects/pics/people/boy_4/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_3: ; 84B2938
+gFieldObjectPic_Boy4_3: @ 84B2938
 	.incbin "data/graphics/field_objects/pics/people/boy_4/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_4: ; 84B2A38
+gFieldObjectPic_Boy4_4: @ 84B2A38
 	.incbin "data/graphics/field_objects/pics/people/boy_4/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_5: ; 84B2B38
+gFieldObjectPic_Boy4_5: @ 84B2B38
 	.incbin "data/graphics/field_objects/pics/people/boy_4/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_6: ; 84B2C38
+gFieldObjectPic_Boy4_6: @ 84B2C38
 	.incbin "data/graphics/field_objects/pics/people/boy_4/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_7: ; 84B2D38
+gFieldObjectPic_Boy4_7: @ 84B2D38
 	.incbin "data/graphics/field_objects/pics/people/boy_4/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy4_8: ; 84B2E38
+gFieldObjectPic_Boy4_8: @ 84B2E38
 	.incbin "data/graphics/field_objects/pics/people/boy_4/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_0: ; 84B2F38
+gFieldObjectPic_Woman1_0: @ 84B2F38
 	.incbin "data/graphics/field_objects/pics/people/woman_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_1: ; 84B3038
+gFieldObjectPic_Woman1_1: @ 84B3038
 	.incbin "data/graphics/field_objects/pics/people/woman_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_2: ; 84B3138
+gFieldObjectPic_Woman1_2: @ 84B3138
 	.incbin "data/graphics/field_objects/pics/people/woman_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_3: ; 84B3238
+gFieldObjectPic_Woman1_3: @ 84B3238
 	.incbin "data/graphics/field_objects/pics/people/woman_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_4: ; 84B3338
+gFieldObjectPic_Woman1_4: @ 84B3338
 	.incbin "data/graphics/field_objects/pics/people/woman_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_5: ; 84B3438
+gFieldObjectPic_Woman1_5: @ 84B3438
 	.incbin "data/graphics/field_objects/pics/people/woman_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_6: ; 84B3538
+gFieldObjectPic_Woman1_6: @ 84B3538
 	.incbin "data/graphics/field_objects/pics/people/woman_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_7: ; 84B3638
+gFieldObjectPic_Woman1_7: @ 84B3638
 	.incbin "data/graphics/field_objects/pics/people/woman_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman1_8: ; 84B3738
+gFieldObjectPic_Woman1_8: @ 84B3738
 	.incbin "data/graphics/field_objects/pics/people/woman_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_0: ; 84B3838
+gFieldObjectPic_FatMan_0: @ 84B3838
 	.incbin "data/graphics/field_objects/pics/people/fat_man/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_1: ; 84B3938
+gFieldObjectPic_FatMan_1: @ 84B3938
 	.incbin "data/graphics/field_objects/pics/people/fat_man/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_2: ; 84B3A38
+gFieldObjectPic_FatMan_2: @ 84B3A38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_3: ; 84B3B38
+gFieldObjectPic_FatMan_3: @ 84B3B38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_4: ; 84B3C38
+gFieldObjectPic_FatMan_4: @ 84B3C38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_5: ; 84B3D38
+gFieldObjectPic_FatMan_5: @ 84B3D38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_6: ; 84B3E38
+gFieldObjectPic_FatMan_6: @ 84B3E38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_7: ; 84B3F38
+gFieldObjectPic_FatMan_7: @ 84B3F38
 	.incbin "data/graphics/field_objects/pics/people/fat_man/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FatMan_8: ; 84B4038
+gFieldObjectPic_FatMan_8: @ 84B4038
 	.incbin "data/graphics/field_objects/pics/people/fat_man/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_0: ; 84B4138
+gFieldObjectPic_Woman2_0: @ 84B4138
 	.incbin "data/graphics/field_objects/pics/people/woman_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_1: ; 84B4238
+gFieldObjectPic_Woman2_1: @ 84B4238
 	.incbin "data/graphics/field_objects/pics/people/woman_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_2: ; 84B4338
+gFieldObjectPic_Woman2_2: @ 84B4338
 	.incbin "data/graphics/field_objects/pics/people/woman_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_3: ; 84B4438
+gFieldObjectPic_Woman2_3: @ 84B4438
 	.incbin "data/graphics/field_objects/pics/people/woman_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_4: ; 84B4538
+gFieldObjectPic_Woman2_4: @ 84B4538
 	.incbin "data/graphics/field_objects/pics/people/woman_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_5: ; 84B4638
+gFieldObjectPic_Woman2_5: @ 84B4638
 	.incbin "data/graphics/field_objects/pics/people/woman_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_6: ; 84B4738
+gFieldObjectPic_Woman2_6: @ 84B4738
 	.incbin "data/graphics/field_objects/pics/people/woman_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_7: ; 84B4838
+gFieldObjectPic_Woman2_7: @ 84B4838
 	.incbin "data/graphics/field_objects/pics/people/woman_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman2_8: ; 84B4938
+gFieldObjectPic_Woman2_8: @ 84B4938
 	.incbin "data/graphics/field_objects/pics/people/woman_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_0: ; 84B4A38
+gFieldObjectPic_Man1_0: @ 84B4A38
 	.incbin "data/graphics/field_objects/pics/people/man_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_1: ; 84B4B38
+gFieldObjectPic_Man1_1: @ 84B4B38
 	.incbin "data/graphics/field_objects/pics/people/man_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_2: ; 84B4C38
+gFieldObjectPic_Man1_2: @ 84B4C38
 	.incbin "data/graphics/field_objects/pics/people/man_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_3: ; 84B4D38
+gFieldObjectPic_Man1_3: @ 84B4D38
 	.incbin "data/graphics/field_objects/pics/people/man_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_4: ; 84B4E38
+gFieldObjectPic_Man1_4: @ 84B4E38
 	.incbin "data/graphics/field_objects/pics/people/man_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_5: ; 84B4F38
+gFieldObjectPic_Man1_5: @ 84B4F38
 	.incbin "data/graphics/field_objects/pics/people/man_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_6: ; 84B5038
+gFieldObjectPic_Man1_6: @ 84B5038
 	.incbin "data/graphics/field_objects/pics/people/man_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_7: ; 84B5138
+gFieldObjectPic_Man1_7: @ 84B5138
 	.incbin "data/graphics/field_objects/pics/people/man_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man1_8: ; 84B5238
+gFieldObjectPic_Man1_8: @ 84B5238
 	.incbin "data/graphics/field_objects/pics/people/man_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_0: ; 84B5338
+gFieldObjectPic_Woman3_0: @ 84B5338
 	.incbin "data/graphics/field_objects/pics/people/woman_3/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_1: ; 84B5438
+gFieldObjectPic_Woman3_1: @ 84B5438
 	.incbin "data/graphics/field_objects/pics/people/woman_3/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_2: ; 84B5538
+gFieldObjectPic_Woman3_2: @ 84B5538
 	.incbin "data/graphics/field_objects/pics/people/woman_3/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_3: ; 84B5638
+gFieldObjectPic_Woman3_3: @ 84B5638
 	.incbin "data/graphics/field_objects/pics/people/woman_3/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_4: ; 84B5738
+gFieldObjectPic_Woman3_4: @ 84B5738
 	.incbin "data/graphics/field_objects/pics/people/woman_3/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_5: ; 84B5838
+gFieldObjectPic_Woman3_5: @ 84B5838
 	.incbin "data/graphics/field_objects/pics/people/woman_3/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_6: ; 84B5938
+gFieldObjectPic_Woman3_6: @ 84B5938
 	.incbin "data/graphics/field_objects/pics/people/woman_3/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_7: ; 84B5A38
+gFieldObjectPic_Woman3_7: @ 84B5A38
 	.incbin "data/graphics/field_objects/pics/people/woman_3/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman3_8: ; 84B5B38
+gFieldObjectPic_Woman3_8: @ 84B5B38
 	.incbin "data/graphics/field_objects/pics/people/woman_3/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_0: ; 84B5C38
+gFieldObjectPic_OldMan1_0: @ 84B5C38
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_1: ; 84B5D38
+gFieldObjectPic_OldMan1_1: @ 84B5D38
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_2: ; 84B5E38
+gFieldObjectPic_OldMan1_2: @ 84B5E38
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_3: ; 84B5F38
+gFieldObjectPic_OldMan1_3: @ 84B5F38
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_4: ; 84B6038
+gFieldObjectPic_OldMan1_4: @ 84B6038
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_5: ; 84B6138
+gFieldObjectPic_OldMan1_5: @ 84B6138
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_6: ; 84B6238
+gFieldObjectPic_OldMan1_6: @ 84B6238
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_7: ; 84B6338
+gFieldObjectPic_OldMan1_7: @ 84B6338
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan1_8: ; 84B6438
+gFieldObjectPic_OldMan1_8: @ 84B6438
 	.incbin "data/graphics/field_objects/pics/people/old_man_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_0: ; 84B6538
+gFieldObjectPic_OldWoman1_0: @ 84B6538
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_1: ; 84B6638
+gFieldObjectPic_OldWoman1_1: @ 84B6638
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_2: ; 84B6738
+gFieldObjectPic_OldWoman1_2: @ 84B6738
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_3: ; 84B6838
+gFieldObjectPic_OldWoman1_3: @ 84B6838
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_4: ; 84B6938
+gFieldObjectPic_OldWoman1_4: @ 84B6938
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_5: ; 84B6A38
+gFieldObjectPic_OldWoman1_5: @ 84B6A38
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_6: ; 84B6B38
+gFieldObjectPic_OldWoman1_6: @ 84B6B38
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_7: ; 84B6C38
+gFieldObjectPic_OldWoman1_7: @ 84B6C38
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman1_8: ; 84B6D38
+gFieldObjectPic_OldWoman1_8: @ 84B6D38
 	.incbin "data/graphics/field_objects/pics/people/old_woman_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_0: ; 84B6E38
+gFieldObjectPic_Man2_0: @ 84B6E38
 	.incbin "data/graphics/field_objects/pics/people/man_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_1: ; 84B6F38
+gFieldObjectPic_Man2_1: @ 84B6F38
 	.incbin "data/graphics/field_objects/pics/people/man_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_2: ; 84B7038
+gFieldObjectPic_Man2_2: @ 84B7038
 	.incbin "data/graphics/field_objects/pics/people/man_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_3: ; 84B7138
+gFieldObjectPic_Man2_3: @ 84B7138
 	.incbin "data/graphics/field_objects/pics/people/man_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_4: ; 84B7238
+gFieldObjectPic_Man2_4: @ 84B7238
 	.incbin "data/graphics/field_objects/pics/people/man_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_5: ; 84B7338
+gFieldObjectPic_Man2_5: @ 84B7338
 	.incbin "data/graphics/field_objects/pics/people/man_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_6: ; 84B7438
+gFieldObjectPic_Man2_6: @ 84B7438
 	.incbin "data/graphics/field_objects/pics/people/man_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_7: ; 84B7538
+gFieldObjectPic_Man2_7: @ 84B7538
 	.incbin "data/graphics/field_objects/pics/people/man_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man2_8: ; 84B7638
+gFieldObjectPic_Man2_8: @ 84B7638
 	.incbin "data/graphics/field_objects/pics/people/man_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_0: ; 84B7738
+gFieldObjectPic_Woman4_0: @ 84B7738
 	.incbin "data/graphics/field_objects/pics/people/woman_4/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_1: ; 84B7838
+gFieldObjectPic_Woman4_1: @ 84B7838
 	.incbin "data/graphics/field_objects/pics/people/woman_4/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_2: ; 84B7938
+gFieldObjectPic_Woman4_2: @ 84B7938
 	.incbin "data/graphics/field_objects/pics/people/woman_4/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_3: ; 84B7A38
+gFieldObjectPic_Woman4_3: @ 84B7A38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_4: ; 84B7B38
+gFieldObjectPic_Woman4_4: @ 84B7B38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_5: ; 84B7C38
+gFieldObjectPic_Woman4_5: @ 84B7C38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_6: ; 84B7D38
+gFieldObjectPic_Woman4_6: @ 84B7D38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_7: ; 84B7E38
+gFieldObjectPic_Woman4_7: @ 84B7E38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman4_8: ; 84B7F38
+gFieldObjectPic_Woman4_8: @ 84B7F38
 	.incbin "data/graphics/field_objects/pics/people/woman_4/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_0: ; 84B8038
+gFieldObjectPic_Man3_0: @ 84B8038
 	.incbin "data/graphics/field_objects/pics/people/man_3/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_1: ; 84B8138
+gFieldObjectPic_Man3_1: @ 84B8138
 	.incbin "data/graphics/field_objects/pics/people/man_3/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_2: ; 84B8238
+gFieldObjectPic_Man3_2: @ 84B8238
 	.incbin "data/graphics/field_objects/pics/people/man_3/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_3: ; 84B8338
+gFieldObjectPic_Man3_3: @ 84B8338
 	.incbin "data/graphics/field_objects/pics/people/man_3/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_4: ; 84B8438
+gFieldObjectPic_Man3_4: @ 84B8438
 	.incbin "data/graphics/field_objects/pics/people/man_3/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_5: ; 84B8538
+gFieldObjectPic_Man3_5: @ 84B8538
 	.incbin "data/graphics/field_objects/pics/people/man_3/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_6: ; 84B8638
+gFieldObjectPic_Man3_6: @ 84B8638
 	.incbin "data/graphics/field_objects/pics/people/man_3/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_7: ; 84B8738
+gFieldObjectPic_Man3_7: @ 84B8738
 	.incbin "data/graphics/field_objects/pics/people/man_3/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man3_8: ; 84B8838
+gFieldObjectPic_Man3_8: @ 84B8838
 	.incbin "data/graphics/field_objects/pics/people/man_3/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_0: ; 84B8938
+gFieldObjectPic_Woman5_0: @ 84B8938
 	.incbin "data/graphics/field_objects/pics/people/woman_5/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_1: ; 84B8A38
+gFieldObjectPic_Woman5_1: @ 84B8A38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_2: ; 84B8B38
+gFieldObjectPic_Woman5_2: @ 84B8B38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_3: ; 84B8C38
+gFieldObjectPic_Woman5_3: @ 84B8C38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_4: ; 84B8D38
+gFieldObjectPic_Woman5_4: @ 84B8D38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_5: ; 84B8E38
+gFieldObjectPic_Woman5_5: @ 84B8E38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_6: ; 84B8F38
+gFieldObjectPic_Woman5_6: @ 84B8F38
 	.incbin "data/graphics/field_objects/pics/people/woman_5/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_7: ; 84B9038
+gFieldObjectPic_Woman5_7: @ 84B9038
 	.incbin "data/graphics/field_objects/pics/people/woman_5/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman5_8: ; 84B9138
+gFieldObjectPic_Woman5_8: @ 84B9138
 	.incbin "data/graphics/field_objects/pics/people/woman_5/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cook_0: ; 84B9238
+gFieldObjectPic_Cook_0: @ 84B9238
 	.incbin "data/graphics/field_objects/pics/people/cook/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cook_1: ; 84B9338
+gFieldObjectPic_Cook_1: @ 84B9338
 	.incbin "data/graphics/field_objects/pics/people/cook/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cook_2: ; 84B9438
+gFieldObjectPic_Cook_2: @ 84B9438
 	.incbin "data/graphics/field_objects/pics/people/cook/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_0: ; 84B9538
+gFieldObjectPic_Woman6_0: @ 84B9538
 	.incbin "data/graphics/field_objects/pics/people/woman_6/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_1: ; 84B9638
+gFieldObjectPic_Woman6_1: @ 84B9638
 	.incbin "data/graphics/field_objects/pics/people/woman_6/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_2: ; 84B9738
+gFieldObjectPic_Woman6_2: @ 84B9738
 	.incbin "data/graphics/field_objects/pics/people/woman_6/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_3: ; 84B9838
+gFieldObjectPic_Woman6_3: @ 84B9838
 	.incbin "data/graphics/field_objects/pics/people/woman_6/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_4: ; 84B9938
+gFieldObjectPic_Woman6_4: @ 84B9938
 	.incbin "data/graphics/field_objects/pics/people/woman_6/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_5: ; 84B9A38
+gFieldObjectPic_Woman6_5: @ 84B9A38
 	.incbin "data/graphics/field_objects/pics/people/woman_6/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_6: ; 84B9B38
+gFieldObjectPic_Woman6_6: @ 84B9B38
 	.incbin "data/graphics/field_objects/pics/people/woman_6/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_7: ; 84B9C38
+gFieldObjectPic_Woman6_7: @ 84B9C38
 	.incbin "data/graphics/field_objects/pics/people/woman_6/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman6_8: ; 84B9D38
+gFieldObjectPic_Woman6_8: @ 84B9D38
 	.incbin "data/graphics/field_objects/pics/people/woman_6/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan2_0: ; 84B9E38
+gFieldObjectPic_OldMan2_0: @ 84B9E38
 	.incbin "data/graphics/field_objects/pics/people/old_man_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan2_1: ; 84B9F38
+gFieldObjectPic_OldMan2_1: @ 84B9F38
 	.incbin "data/graphics/field_objects/pics/people/old_man_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldMan2_2: ; 84BA038
+gFieldObjectPic_OldMan2_2: @ 84BA038
 	.incbin "data/graphics/field_objects/pics/people/old_man_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_0: ; 84BA138
+gFieldObjectPic_OldWoman2_0: @ 84BA138
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_1: ; 84BA238
+gFieldObjectPic_OldWoman2_1: @ 84BA238
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_2: ; 84BA338
+gFieldObjectPic_OldWoman2_2: @ 84BA338
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_3: ; 84BA438
+gFieldObjectPic_OldWoman2_3: @ 84BA438
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_4: ; 84BA538
+gFieldObjectPic_OldWoman2_4: @ 84BA538
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_5: ; 84BA638
+gFieldObjectPic_OldWoman2_5: @ 84BA638
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_6: ; 84BA738
+gFieldObjectPic_OldWoman2_6: @ 84BA738
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_7: ; 84BA838
+gFieldObjectPic_OldWoman2_7: @ 84BA838
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OldWoman2_8: ; 84BA938
+gFieldObjectPic_OldWoman2_8: @ 84BA938
 	.incbin "data/graphics/field_objects/pics/people/old_woman_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_0: ; 84BAA38
+gFieldObjectPic_Camper_0: @ 84BAA38
 	.incbin "data/graphics/field_objects/pics/people/camper/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_1: ; 84BAB38
+gFieldObjectPic_Camper_1: @ 84BAB38
 	.incbin "data/graphics/field_objects/pics/people/camper/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_2: ; 84BAC38
+gFieldObjectPic_Camper_2: @ 84BAC38
 	.incbin "data/graphics/field_objects/pics/people/camper/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_3: ; 84BAD38
+gFieldObjectPic_Camper_3: @ 84BAD38
 	.incbin "data/graphics/field_objects/pics/people/camper/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_4: ; 84BAE38
+gFieldObjectPic_Camper_4: @ 84BAE38
 	.incbin "data/graphics/field_objects/pics/people/camper/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_5: ; 84BAF38
+gFieldObjectPic_Camper_5: @ 84BAF38
 	.incbin "data/graphics/field_objects/pics/people/camper/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_6: ; 84BB038
+gFieldObjectPic_Camper_6: @ 84BB038
 	.incbin "data/graphics/field_objects/pics/people/camper/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_7: ; 84BB138
+gFieldObjectPic_Camper_7: @ 84BB138
 	.incbin "data/graphics/field_objects/pics/people/camper/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Camper_8: ; 84BB238
+gFieldObjectPic_Camper_8: @ 84BB238
 	.incbin "data/graphics/field_objects/pics/people/camper/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_0: ; 84BB338
+gFieldObjectPic_Picnicker_0: @ 84BB338
 	.incbin "data/graphics/field_objects/pics/people/picnicker/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_1: ; 84BB438
+gFieldObjectPic_Picnicker_1: @ 84BB438
 	.incbin "data/graphics/field_objects/pics/people/picnicker/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_2: ; 84BB538
+gFieldObjectPic_Picnicker_2: @ 84BB538
 	.incbin "data/graphics/field_objects/pics/people/picnicker/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_3: ; 84BB638
+gFieldObjectPic_Picnicker_3: @ 84BB638
 	.incbin "data/graphics/field_objects/pics/people/picnicker/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_4: ; 84BB738
+gFieldObjectPic_Picnicker_4: @ 84BB738
 	.incbin "data/graphics/field_objects/pics/people/picnicker/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_5: ; 84BB838
+gFieldObjectPic_Picnicker_5: @ 84BB838
 	.incbin "data/graphics/field_objects/pics/people/picnicker/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_6: ; 84BB938
+gFieldObjectPic_Picnicker_6: @ 84BB938
 	.incbin "data/graphics/field_objects/pics/people/picnicker/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_7: ; 84BBA38
+gFieldObjectPic_Picnicker_7: @ 84BBA38
 	.incbin "data/graphics/field_objects/pics/people/picnicker/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Picnicker_8: ; 84BBB38
+gFieldObjectPic_Picnicker_8: @ 84BBB38
 	.incbin "data/graphics/field_objects/pics/people/picnicker/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_0: ; 84BBC38
+gFieldObjectPic_Man4_0: @ 84BBC38
 	.incbin "data/graphics/field_objects/pics/people/man_4/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_1: ; 84BBD38
+gFieldObjectPic_Man4_1: @ 84BBD38
 	.incbin "data/graphics/field_objects/pics/people/man_4/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_2: ; 84BBE38
+gFieldObjectPic_Man4_2: @ 84BBE38
 	.incbin "data/graphics/field_objects/pics/people/man_4/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_3: ; 84BBF38
+gFieldObjectPic_Man4_3: @ 84BBF38
 	.incbin "data/graphics/field_objects/pics/people/man_4/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_4: ; 84BC038
+gFieldObjectPic_Man4_4: @ 84BC038
 	.incbin "data/graphics/field_objects/pics/people/man_4/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_5: ; 84BC138
+gFieldObjectPic_Man4_5: @ 84BC138
 	.incbin "data/graphics/field_objects/pics/people/man_4/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_6: ; 84BC238
+gFieldObjectPic_Man4_6: @ 84BC238
 	.incbin "data/graphics/field_objects/pics/people/man_4/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_7: ; 84BC338
+gFieldObjectPic_Man4_7: @ 84BC338
 	.incbin "data/graphics/field_objects/pics/people/man_4/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man4_8: ; 84BC438
+gFieldObjectPic_Man4_8: @ 84BC438
 	.incbin "data/graphics/field_objects/pics/people/man_4/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_0: ; 84BC538
+gFieldObjectPic_Woman7_0: @ 84BC538
 	.incbin "data/graphics/field_objects/pics/people/woman_7/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_1: ; 84BC638
+gFieldObjectPic_Woman7_1: @ 84BC638
 	.incbin "data/graphics/field_objects/pics/people/woman_7/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_2: ; 84BC738
+gFieldObjectPic_Woman7_2: @ 84BC738
 	.incbin "data/graphics/field_objects/pics/people/woman_7/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_3: ; 84BC838
+gFieldObjectPic_Woman7_3: @ 84BC838
 	.incbin "data/graphics/field_objects/pics/people/woman_7/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_4: ; 84BC938
+gFieldObjectPic_Woman7_4: @ 84BC938
 	.incbin "data/graphics/field_objects/pics/people/woman_7/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_5: ; 84BCA38
+gFieldObjectPic_Woman7_5: @ 84BCA38
 	.incbin "data/graphics/field_objects/pics/people/woman_7/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_6: ; 84BCB38
+gFieldObjectPic_Woman7_6: @ 84BCB38
 	.incbin "data/graphics/field_objects/pics/people/woman_7/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_7: ; 84BCC38
+gFieldObjectPic_Woman7_7: @ 84BCC38
 	.incbin "data/graphics/field_objects/pics/people/woman_7/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Woman7_8: ; 84BCD38
+gFieldObjectPic_Woman7_8: @ 84BCD38
 	.incbin "data/graphics/field_objects/pics/people/woman_7/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_0: ; 84BCE38
+gFieldObjectPic_Youngster_0: @ 84BCE38
 	.incbin "data/graphics/field_objects/pics/people/youngster/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_1: ; 84BCF38
+gFieldObjectPic_Youngster_1: @ 84BCF38
 	.incbin "data/graphics/field_objects/pics/people/youngster/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_2: ; 84BD038
+gFieldObjectPic_Youngster_2: @ 84BD038
 	.incbin "data/graphics/field_objects/pics/people/youngster/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_3: ; 84BD138
+gFieldObjectPic_Youngster_3: @ 84BD138
 	.incbin "data/graphics/field_objects/pics/people/youngster/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_4: ; 84BD238
+gFieldObjectPic_Youngster_4: @ 84BD238
 	.incbin "data/graphics/field_objects/pics/people/youngster/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_5: ; 84BD338
+gFieldObjectPic_Youngster_5: @ 84BD338
 	.incbin "data/graphics/field_objects/pics/people/youngster/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_6: ; 84BD438
+gFieldObjectPic_Youngster_6: @ 84BD438
 	.incbin "data/graphics/field_objects/pics/people/youngster/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_7: ; 84BD538
+gFieldObjectPic_Youngster_7: @ 84BD538
 	.incbin "data/graphics/field_objects/pics/people/youngster/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Youngster_8: ; 84BD638
+gFieldObjectPic_Youngster_8: @ 84BD638
 	.incbin "data/graphics/field_objects/pics/people/youngster/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_0: ; 84BD738
+gFieldObjectPic_BugCatcher_0: @ 84BD738
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_1: ; 84BD838
+gFieldObjectPic_BugCatcher_1: @ 84BD838
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_2: ; 84BD938
+gFieldObjectPic_BugCatcher_2: @ 84BD938
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_3: ; 84BDA38
+gFieldObjectPic_BugCatcher_3: @ 84BDA38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_4: ; 84BDB38
+gFieldObjectPic_BugCatcher_4: @ 84BDB38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_5: ; 84BDC38
+gFieldObjectPic_BugCatcher_5: @ 84BDC38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_6: ; 84BDD38
+gFieldObjectPic_BugCatcher_6: @ 84BDD38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_7: ; 84BDE38
+gFieldObjectPic_BugCatcher_7: @ 84BDE38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BugCatcher_8: ; 84BDF38
+gFieldObjectPic_BugCatcher_8: @ 84BDF38
 	.incbin "data/graphics/field_objects/pics/people/bug_catcher/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_0: ; 84BE038
+gFieldObjectPic_PsychicM_0: @ 84BE038
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_1: ; 84BE138
+gFieldObjectPic_PsychicM_1: @ 84BE138
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_2: ; 84BE238
+gFieldObjectPic_PsychicM_2: @ 84BE238
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_3: ; 84BE338
+gFieldObjectPic_PsychicM_3: @ 84BE338
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_4: ; 84BE438
+gFieldObjectPic_PsychicM_4: @ 84BE438
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_5: ; 84BE538
+gFieldObjectPic_PsychicM_5: @ 84BE538
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_6: ; 84BE638
+gFieldObjectPic_PsychicM_6: @ 84BE638
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_7: ; 84BE738
+gFieldObjectPic_PsychicM_7: @ 84BE738
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PsychicM_8: ; 84BE838
+gFieldObjectPic_PsychicM_8: @ 84BE838
 	.incbin "data/graphics/field_objects/pics/people/psychic_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_0: ; 84BE938
+gFieldObjectPic_SchoolKidM_0: @ 84BE938
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_1: ; 84BEA38
+gFieldObjectPic_SchoolKidM_1: @ 84BEA38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_2: ; 84BEB38
+gFieldObjectPic_SchoolKidM_2: @ 84BEB38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_3: ; 84BEC38
+gFieldObjectPic_SchoolKidM_3: @ 84BEC38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_4: ; 84BED38
+gFieldObjectPic_SchoolKidM_4: @ 84BED38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_5: ; 84BEE38
+gFieldObjectPic_SchoolKidM_5: @ 84BEE38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_6: ; 84BEF38
+gFieldObjectPic_SchoolKidM_6: @ 84BEF38
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_7: ; 84BF038
+gFieldObjectPic_SchoolKidM_7: @ 84BF038
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SchoolKidM_8: ; 84BF138
+gFieldObjectPic_SchoolKidM_8: @ 84BF138
 	.incbin "data/graphics/field_objects/pics/people/school_kid_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_0: ; 84BF238
+gFieldObjectPic_Maniac_0: @ 84BF238
 	.incbin "data/graphics/field_objects/pics/people/maniac/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_1: ; 84BF338
+gFieldObjectPic_Maniac_1: @ 84BF338
 	.incbin "data/graphics/field_objects/pics/people/maniac/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_2: ; 84BF438
+gFieldObjectPic_Maniac_2: @ 84BF438
 	.incbin "data/graphics/field_objects/pics/people/maniac/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_3: ; 84BF538
+gFieldObjectPic_Maniac_3: @ 84BF538
 	.incbin "data/graphics/field_objects/pics/people/maniac/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_4: ; 84BF638
+gFieldObjectPic_Maniac_4: @ 84BF638
 	.incbin "data/graphics/field_objects/pics/people/maniac/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_5: ; 84BF738
+gFieldObjectPic_Maniac_5: @ 84BF738
 	.incbin "data/graphics/field_objects/pics/people/maniac/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_6: ; 84BF838
+gFieldObjectPic_Maniac_6: @ 84BF838
 	.incbin "data/graphics/field_objects/pics/people/maniac/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_7: ; 84BF938
+gFieldObjectPic_Maniac_7: @ 84BF938
 	.incbin "data/graphics/field_objects/pics/people/maniac/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maniac_8: ; 84BFA38
+gFieldObjectPic_Maniac_8: @ 84BFA38
 	.incbin "data/graphics/field_objects/pics/people/maniac/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_0: ; 84BFB38
+gFieldObjectPic_HexManiac_0: @ 84BFB38
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_1: ; 84BFC38
+gFieldObjectPic_HexManiac_1: @ 84BFC38
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_2: ; 84BFD38
+gFieldObjectPic_HexManiac_2: @ 84BFD38
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_3: ; 84BFE38
+gFieldObjectPic_HexManiac_3: @ 84BFE38
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_4: ; 84BFF38
+gFieldObjectPic_HexManiac_4: @ 84BFF38
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_5: ; 84C0038
+gFieldObjectPic_HexManiac_5: @ 84C0038
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_6: ; 84C0138
+gFieldObjectPic_HexManiac_6: @ 84C0138
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_7: ; 84C0238
+gFieldObjectPic_HexManiac_7: @ 84C0238
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HexManiac_8: ; 84C0338
+gFieldObjectPic_HexManiac_8: @ 84C0338
 	.incbin "data/graphics/field_objects/pics/people/hex_maniac/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_0: ; 84C0438
+gFieldObjectPic_UnusedWoman_0: @ 84C0438
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_1: ; 84C0538
+gFieldObjectPic_UnusedWoman_1: @ 84C0538
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_2: ; 84C0638
+gFieldObjectPic_UnusedWoman_2: @ 84C0638
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_3: ; 84C0738
+gFieldObjectPic_UnusedWoman_3: @ 84C0738
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_4: ; 84C0838
+gFieldObjectPic_UnusedWoman_4: @ 84C0838
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_5: ; 84C0938
+gFieldObjectPic_UnusedWoman_5: @ 84C0938
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_6: ; 84C0A38
+gFieldObjectPic_UnusedWoman_6: @ 84C0A38
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_7: ; 84C0B38
+gFieldObjectPic_UnusedWoman_7: @ 84C0B38
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWoman_8: ; 84C0C38
+gFieldObjectPic_UnusedWoman_8: @ 84C0C38
 	.incbin "data/graphics/field_objects/pics/people/unused_woman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_0: ; 84C0D38
+gFieldObjectPic_SwimmerM_0: @ 84C0D38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_1: ; 84C0E38
+gFieldObjectPic_SwimmerM_1: @ 84C0E38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_2: ; 84C0F38
+gFieldObjectPic_SwimmerM_2: @ 84C0F38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_3: ; 84C1038
+gFieldObjectPic_SwimmerM_3: @ 84C1038
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_4: ; 84C1138
+gFieldObjectPic_SwimmerM_4: @ 84C1138
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_5: ; 84C1238
+gFieldObjectPic_SwimmerM_5: @ 84C1238
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_6: ; 84C1338
+gFieldObjectPic_SwimmerM_6: @ 84C1338
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_7: ; 84C1438
+gFieldObjectPic_SwimmerM_7: @ 84C1438
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerM_8: ; 84C1538
+gFieldObjectPic_SwimmerM_8: @ 84C1538
 	.incbin "data/graphics/field_objects/pics/people/swimmer_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_0: ; 84C1638
+gFieldObjectPic_SwimmerF_0: @ 84C1638
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_1: ; 84C1738
+gFieldObjectPic_SwimmerF_1: @ 84C1738
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_2: ; 84C1838
+gFieldObjectPic_SwimmerF_2: @ 84C1838
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_3: ; 84C1938
+gFieldObjectPic_SwimmerF_3: @ 84C1938
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_4: ; 84C1A38
+gFieldObjectPic_SwimmerF_4: @ 84C1A38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_5: ; 84C1B38
+gFieldObjectPic_SwimmerF_5: @ 84C1B38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_6: ; 84C1C38
+gFieldObjectPic_SwimmerF_6: @ 84C1C38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_7: ; 84C1D38
+gFieldObjectPic_SwimmerF_7: @ 84C1D38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwimmerF_8: ; 84C1E38
+gFieldObjectPic_SwimmerF_8: @ 84C1E38
 	.incbin "data/graphics/field_objects/pics/people/swimmer_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_0: ; 84C1F38
+gFieldObjectPic_BlackBelt_0: @ 84C1F38
 	.incbin "data/graphics/field_objects/pics/people/black_belt/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_1: ; 84C2038
+gFieldObjectPic_BlackBelt_1: @ 84C2038
 	.incbin "data/graphics/field_objects/pics/people/black_belt/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_2: ; 84C2138
+gFieldObjectPic_BlackBelt_2: @ 84C2138
 	.incbin "data/graphics/field_objects/pics/people/black_belt/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_3: ; 84C2238
+gFieldObjectPic_BlackBelt_3: @ 84C2238
 	.incbin "data/graphics/field_objects/pics/people/black_belt/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_4: ; 84C2338
+gFieldObjectPic_BlackBelt_4: @ 84C2338
 	.incbin "data/graphics/field_objects/pics/people/black_belt/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_5: ; 84C2438
+gFieldObjectPic_BlackBelt_5: @ 84C2438
 	.incbin "data/graphics/field_objects/pics/people/black_belt/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_6: ; 84C2538
+gFieldObjectPic_BlackBelt_6: @ 84C2538
 	.incbin "data/graphics/field_objects/pics/people/black_belt/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_7: ; 84C2638
+gFieldObjectPic_BlackBelt_7: @ 84C2638
 	.incbin "data/graphics/field_objects/pics/people/black_belt/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BlackBelt_8: ; 84C2738
+gFieldObjectPic_BlackBelt_8: @ 84C2738
 	.incbin "data/graphics/field_objects/pics/people/black_belt/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_0: ; 84C2838
+gFieldObjectPic_Beauty_0: @ 84C2838
 	.incbin "data/graphics/field_objects/pics/people/beauty/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_1: ; 84C2938
+gFieldObjectPic_Beauty_1: @ 84C2938
 	.incbin "data/graphics/field_objects/pics/people/beauty/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_2: ; 84C2A38
+gFieldObjectPic_Beauty_2: @ 84C2A38
 	.incbin "data/graphics/field_objects/pics/people/beauty/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_3: ; 84C2B38
+gFieldObjectPic_Beauty_3: @ 84C2B38
 	.incbin "data/graphics/field_objects/pics/people/beauty/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_4: ; 84C2C38
+gFieldObjectPic_Beauty_4: @ 84C2C38
 	.incbin "data/graphics/field_objects/pics/people/beauty/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_5: ; 84C2D38
+gFieldObjectPic_Beauty_5: @ 84C2D38
 	.incbin "data/graphics/field_objects/pics/people/beauty/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_6: ; 84C2E38
+gFieldObjectPic_Beauty_6: @ 84C2E38
 	.incbin "data/graphics/field_objects/pics/people/beauty/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_7: ; 84C2F38
+gFieldObjectPic_Beauty_7: @ 84C2F38
 	.incbin "data/graphics/field_objects/pics/people/beauty/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Beauty_8: ; 84C3038
+gFieldObjectPic_Beauty_8: @ 84C3038
 	.incbin "data/graphics/field_objects/pics/people/beauty/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_0: ; 84C3138
+gFieldObjectPic_Scientist1_0: @ 84C3138
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_1: ; 84C3238
+gFieldObjectPic_Scientist1_1: @ 84C3238
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_2: ; 84C3338
+gFieldObjectPic_Scientist1_2: @ 84C3338
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_3: ; 84C3438
+gFieldObjectPic_Scientist1_3: @ 84C3438
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_4: ; 84C3538
+gFieldObjectPic_Scientist1_4: @ 84C3538
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_5: ; 84C3638
+gFieldObjectPic_Scientist1_5: @ 84C3638
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_6: ; 84C3738
+gFieldObjectPic_Scientist1_6: @ 84C3738
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_7: ; 84C3838
+gFieldObjectPic_Scientist1_7: @ 84C3838
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist1_8: ; 84C3938
+gFieldObjectPic_Scientist1_8: @ 84C3938
 	.incbin "data/graphics/field_objects/pics/people/scientist_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_0: ; 84C3A38
+gFieldObjectPic_Lass_0: @ 84C3A38
 	.incbin "data/graphics/field_objects/pics/people/lass/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_1: ; 84C3B38
+gFieldObjectPic_Lass_1: @ 84C3B38
 	.incbin "data/graphics/field_objects/pics/people/lass/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_2: ; 84C3C38
+gFieldObjectPic_Lass_2: @ 84C3C38
 	.incbin "data/graphics/field_objects/pics/people/lass/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_3: ; 84C3D38
+gFieldObjectPic_Lass_3: @ 84C3D38
 	.incbin "data/graphics/field_objects/pics/people/lass/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_4: ; 84C3E38
+gFieldObjectPic_Lass_4: @ 84C3E38
 	.incbin "data/graphics/field_objects/pics/people/lass/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_5: ; 84C3F38
+gFieldObjectPic_Lass_5: @ 84C3F38
 	.incbin "data/graphics/field_objects/pics/people/lass/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_6: ; 84C4038
+gFieldObjectPic_Lass_6: @ 84C4038
 	.incbin "data/graphics/field_objects/pics/people/lass/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_7: ; 84C4138
+gFieldObjectPic_Lass_7: @ 84C4138
 	.incbin "data/graphics/field_objects/pics/people/lass/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lass_8: ; 84C4238
+gFieldObjectPic_Lass_8: @ 84C4238
 	.incbin "data/graphics/field_objects/pics/people/lass/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_0: ; 84C4338
+gFieldObjectPic_Gentleman_0: @ 84C4338
 	.incbin "data/graphics/field_objects/pics/people/gentleman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_1: ; 84C4438
+gFieldObjectPic_Gentleman_1: @ 84C4438
 	.incbin "data/graphics/field_objects/pics/people/gentleman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_2: ; 84C4538
+gFieldObjectPic_Gentleman_2: @ 84C4538
 	.incbin "data/graphics/field_objects/pics/people/gentleman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_3: ; 84C4638
+gFieldObjectPic_Gentleman_3: @ 84C4638
 	.incbin "data/graphics/field_objects/pics/people/gentleman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_4: ; 84C4738
+gFieldObjectPic_Gentleman_4: @ 84C4738
 	.incbin "data/graphics/field_objects/pics/people/gentleman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_5: ; 84C4838
+gFieldObjectPic_Gentleman_5: @ 84C4838
 	.incbin "data/graphics/field_objects/pics/people/gentleman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_6: ; 84C4938
+gFieldObjectPic_Gentleman_6: @ 84C4938
 	.incbin "data/graphics/field_objects/pics/people/gentleman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_7: ; 84C4A38
+gFieldObjectPic_Gentleman_7: @ 84C4A38
 	.incbin "data/graphics/field_objects/pics/people/gentleman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Gentleman_8: ; 84C4B38
+gFieldObjectPic_Gentleman_8: @ 84C4B38
 	.incbin "data/graphics/field_objects/pics/people/gentleman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_0: ; 84C4C38
+gFieldObjectPic_Sailor_0: @ 84C4C38
 	.incbin "data/graphics/field_objects/pics/people/sailor/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_1: ; 84C4D38
+gFieldObjectPic_Sailor_1: @ 84C4D38
 	.incbin "data/graphics/field_objects/pics/people/sailor/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_2: ; 84C4E38
+gFieldObjectPic_Sailor_2: @ 84C4E38
 	.incbin "data/graphics/field_objects/pics/people/sailor/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_3: ; 84C4F38
+gFieldObjectPic_Sailor_3: @ 84C4F38
 	.incbin "data/graphics/field_objects/pics/people/sailor/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_4: ; 84C5038
+gFieldObjectPic_Sailor_4: @ 84C5038
 	.incbin "data/graphics/field_objects/pics/people/sailor/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_5: ; 84C5138
+gFieldObjectPic_Sailor_5: @ 84C5138
 	.incbin "data/graphics/field_objects/pics/people/sailor/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_6: ; 84C5238
+gFieldObjectPic_Sailor_6: @ 84C5238
 	.incbin "data/graphics/field_objects/pics/people/sailor/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_7: ; 84C5338
+gFieldObjectPic_Sailor_7: @ 84C5338
 	.incbin "data/graphics/field_objects/pics/people/sailor/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sailor_8: ; 84C5438
+gFieldObjectPic_Sailor_8: @ 84C5438
 	.incbin "data/graphics/field_objects/pics/people/sailor/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_0: ; 84C5538
+gFieldObjectPic_Fisherman_0: @ 84C5538
 	.incbin "data/graphics/field_objects/pics/people/fisherman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_1: ; 84C5638
+gFieldObjectPic_Fisherman_1: @ 84C5638
 	.incbin "data/graphics/field_objects/pics/people/fisherman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_2: ; 84C5738
+gFieldObjectPic_Fisherman_2: @ 84C5738
 	.incbin "data/graphics/field_objects/pics/people/fisherman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_3: ; 84C5838
+gFieldObjectPic_Fisherman_3: @ 84C5838
 	.incbin "data/graphics/field_objects/pics/people/fisherman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_4: ; 84C5938
+gFieldObjectPic_Fisherman_4: @ 84C5938
 	.incbin "data/graphics/field_objects/pics/people/fisherman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_5: ; 84C5A38
+gFieldObjectPic_Fisherman_5: @ 84C5A38
 	.incbin "data/graphics/field_objects/pics/people/fisherman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_6: ; 84C5B38
+gFieldObjectPic_Fisherman_6: @ 84C5B38
 	.incbin "data/graphics/field_objects/pics/people/fisherman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_7: ; 84C5C38
+gFieldObjectPic_Fisherman_7: @ 84C5C38
 	.incbin "data/graphics/field_objects/pics/people/fisherman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fisherman_8: ; 84C5D38
+gFieldObjectPic_Fisherman_8: @ 84C5D38
 	.incbin "data/graphics/field_objects/pics/people/fisherman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_0: ; 84C5E38
+gFieldObjectPic_RunningTriathleteM_0: @ 84C5E38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_1: ; 84C5F38
+gFieldObjectPic_RunningTriathleteM_1: @ 84C5F38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_2: ; 84C6038
+gFieldObjectPic_RunningTriathleteM_2: @ 84C6038
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_3: ; 84C6138
+gFieldObjectPic_RunningTriathleteM_3: @ 84C6138
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_4: ; 84C6238
+gFieldObjectPic_RunningTriathleteM_4: @ 84C6238
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_5: ; 84C6338
+gFieldObjectPic_RunningTriathleteM_5: @ 84C6338
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_6: ; 84C6438
+gFieldObjectPic_RunningTriathleteM_6: @ 84C6438
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_7: ; 84C6538
+gFieldObjectPic_RunningTriathleteM_7: @ 84C6538
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteM_8: ; 84C6638
+gFieldObjectPic_RunningTriathleteM_8: @ 84C6638
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_0: ; 84C6738
+gFieldObjectPic_RunningTriathleteF_0: @ 84C6738
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_1: ; 84C6838
+gFieldObjectPic_RunningTriathleteF_1: @ 84C6838
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_2: ; 84C6938
+gFieldObjectPic_RunningTriathleteF_2: @ 84C6938
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_3: ; 84C6A38
+gFieldObjectPic_RunningTriathleteF_3: @ 84C6A38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_4: ; 84C6B38
+gFieldObjectPic_RunningTriathleteF_4: @ 84C6B38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_5: ; 84C6C38
+gFieldObjectPic_RunningTriathleteF_5: @ 84C6C38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_6: ; 84C6D38
+gFieldObjectPic_RunningTriathleteF_6: @ 84C6D38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_7: ; 84C6E38
+gFieldObjectPic_RunningTriathleteF_7: @ 84C6E38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RunningTriathleteF_8: ; 84C6F38
+gFieldObjectPic_RunningTriathleteF_8: @ 84C6F38
 	.incbin "data/graphics/field_objects/pics/people/running_triathlete_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_0: ; 84C7038
+gFieldObjectPic_TuberF_0: @ 84C7038
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_1: ; 84C70B8
+gFieldObjectPic_TuberF_1: @ 84C70B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_2: ; 84C7138
+gFieldObjectPic_TuberF_2: @ 84C7138
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_3: ; 84C71B8
+gFieldObjectPic_TuberF_3: @ 84C71B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_4: ; 84C7238
+gFieldObjectPic_TuberF_4: @ 84C7238
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_5: ; 84C72B8
+gFieldObjectPic_TuberF_5: @ 84C72B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_6: ; 84C7338
+gFieldObjectPic_TuberF_6: @ 84C7338
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_7: ; 84C73B8
+gFieldObjectPic_TuberF_7: @ 84C73B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberF_8: ; 84C7438
+gFieldObjectPic_TuberF_8: @ 84C7438
 	.incbin "data/graphics/field_objects/pics/people/tuber_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_0: ; 84C74B8
+gFieldObjectPic_TuberM_0: @ 84C74B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_1: ; 84C7538
+gFieldObjectPic_TuberM_1: @ 84C7538
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_2: ; 84C75B8
+gFieldObjectPic_TuberM_2: @ 84C75B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_3: ; 84C7638
+gFieldObjectPic_TuberM_3: @ 84C7638
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_4: ; 84C76B8
+gFieldObjectPic_TuberM_4: @ 84C76B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_5: ; 84C7738
+gFieldObjectPic_TuberM_5: @ 84C7738
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_6: ; 84C77B8
+gFieldObjectPic_TuberM_6: @ 84C77B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_7: ; 84C7838
+gFieldObjectPic_TuberM_7: @ 84C7838
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberM_8: ; 84C78B8
+gFieldObjectPic_TuberM_8: @ 84C78B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_0: ; 84C7938
+gFieldObjectPic_Hiker_0: @ 84C7938
 	.incbin "data/graphics/field_objects/pics/people/hiker/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_1: ; 84C7A38
+gFieldObjectPic_Hiker_1: @ 84C7A38
 	.incbin "data/graphics/field_objects/pics/people/hiker/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_2: ; 84C7B38
+gFieldObjectPic_Hiker_2: @ 84C7B38
 	.incbin "data/graphics/field_objects/pics/people/hiker/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_3: ; 84C7C38
+gFieldObjectPic_Hiker_3: @ 84C7C38
 	.incbin "data/graphics/field_objects/pics/people/hiker/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_4: ; 84C7D38
+gFieldObjectPic_Hiker_4: @ 84C7D38
 	.incbin "data/graphics/field_objects/pics/people/hiker/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_5: ; 84C7E38
+gFieldObjectPic_Hiker_5: @ 84C7E38
 	.incbin "data/graphics/field_objects/pics/people/hiker/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_6: ; 84C7F38
+gFieldObjectPic_Hiker_6: @ 84C7F38
 	.incbin "data/graphics/field_objects/pics/people/hiker/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_7: ; 84C8038
+gFieldObjectPic_Hiker_7: @ 84C8038
 	.incbin "data/graphics/field_objects/pics/people/hiker/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Hiker_8: ; 84C8138
+gFieldObjectPic_Hiker_8: @ 84C8138
 	.incbin "data/graphics/field_objects/pics/people/hiker/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_0: ; 84C8238
+gFieldObjectPic_CyclingTriathleteM_0: @ 84C8238
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_1: ; 84C8438
+gFieldObjectPic_CyclingTriathleteM_1: @ 84C8438
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_2: ; 84C8638
+gFieldObjectPic_CyclingTriathleteM_2: @ 84C8638
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_3: ; 84C8838
+gFieldObjectPic_CyclingTriathleteM_3: @ 84C8838
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_4: ; 84C8A38
+gFieldObjectPic_CyclingTriathleteM_4: @ 84C8A38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_5: ; 84C8C38
+gFieldObjectPic_CyclingTriathleteM_5: @ 84C8C38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_6: ; 84C8E38
+gFieldObjectPic_CyclingTriathleteM_6: @ 84C8E38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_7: ; 84C9038
+gFieldObjectPic_CyclingTriathleteM_7: @ 84C9038
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteM_8: ; 84C9238
+gFieldObjectPic_CyclingTriathleteM_8: @ 84C9238
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_0: ; 84C9438
+gFieldObjectPic_CyclingTriathleteF_0: @ 84C9438
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_1: ; 84C9638
+gFieldObjectPic_CyclingTriathleteF_1: @ 84C9638
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_2: ; 84C9838
+gFieldObjectPic_CyclingTriathleteF_2: @ 84C9838
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_3: ; 84C9A38
+gFieldObjectPic_CyclingTriathleteF_3: @ 84C9A38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_4: ; 84C9C38
+gFieldObjectPic_CyclingTriathleteF_4: @ 84C9C38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_5: ; 84C9E38
+gFieldObjectPic_CyclingTriathleteF_5: @ 84C9E38
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_6: ; 84CA038
+gFieldObjectPic_CyclingTriathleteF_6: @ 84CA038
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_7: ; 84CA238
+gFieldObjectPic_CyclingTriathleteF_7: @ 84CA238
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyclingTriathleteF_8: ; 84CA438
+gFieldObjectPic_CyclingTriathleteF_8: @ 84CA438
 	.incbin "data/graphics/field_objects/pics/people/cycling_triathlete_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_0: ; 84CA638
+gFieldObjectPic_Man5_0: @ 84CA638
 	.incbin "data/graphics/field_objects/pics/people/man_5/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_1: ; 84CA738
+gFieldObjectPic_Man5_1: @ 84CA738
 	.incbin "data/graphics/field_objects/pics/people/man_5/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_2: ; 84CA838
+gFieldObjectPic_Man5_2: @ 84CA838
 	.incbin "data/graphics/field_objects/pics/people/man_5/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_3: ; 84CA938
+gFieldObjectPic_Man5_3: @ 84CA938
 	.incbin "data/graphics/field_objects/pics/people/man_5/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_4: ; 84CAA38
+gFieldObjectPic_Man5_4: @ 84CAA38
 	.incbin "data/graphics/field_objects/pics/people/man_5/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_5: ; 84CAB38
+gFieldObjectPic_Man5_5: @ 84CAB38
 	.incbin "data/graphics/field_objects/pics/people/man_5/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_6: ; 84CAC38
+gFieldObjectPic_Man5_6: @ 84CAC38
 	.incbin "data/graphics/field_objects/pics/people/man_5/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_7: ; 84CAD38
+gFieldObjectPic_Man5_7: @ 84CAD38
 	.incbin "data/graphics/field_objects/pics/people/man_5/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man5_8: ; 84CAE38
+gFieldObjectPic_Man5_8: @ 84CAE38
 	.incbin "data/graphics/field_objects/pics/people/man_5/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_0: ; 84CAF38
+gFieldObjectPic_Man6_0: @ 84CAF38
 	.incbin "data/graphics/field_objects/pics/people/man_6/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_1: ; 84CB038
+gFieldObjectPic_Man6_1: @ 84CB038
 	.incbin "data/graphics/field_objects/pics/people/man_6/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_2: ; 84CB138
+gFieldObjectPic_Man6_2: @ 84CB138
 	.incbin "data/graphics/field_objects/pics/people/man_6/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_3: ; 84CB238
+gFieldObjectPic_Man6_3: @ 84CB238
 	.incbin "data/graphics/field_objects/pics/people/man_6/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_4: ; 84CB338
+gFieldObjectPic_Man6_4: @ 84CB338
 	.incbin "data/graphics/field_objects/pics/people/man_6/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_5: ; 84CB438
+gFieldObjectPic_Man6_5: @ 84CB438
 	.incbin "data/graphics/field_objects/pics/people/man_6/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_6: ; 84CB538
+gFieldObjectPic_Man6_6: @ 84CB538
 	.incbin "data/graphics/field_objects/pics/people/man_6/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_7: ; 84CB638
+gFieldObjectPic_Man6_7: @ 84CB638
 	.incbin "data/graphics/field_objects/pics/people/man_6/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man6_8: ; 84CB738
+gFieldObjectPic_Man6_8: @ 84CB738
 	.incbin "data/graphics/field_objects/pics/people/man_6/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Nurse_0: ; 84CB838
+gFieldObjectPic_Nurse_0: @ 84CB838
 	.incbin "data/graphics/field_objects/pics/people/nurse/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Nurse_1: ; 84CB938
+gFieldObjectPic_Nurse_1: @ 84CB938
 	.incbin "data/graphics/field_objects/pics/people/nurse/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Nurse_2: ; 84CBA38
+gFieldObjectPic_Nurse_2: @ 84CBA38
 	.incbin "data/graphics/field_objects/pics/people/nurse/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Nurse_3: ; 84CBB38
+gFieldObjectPic_Nurse_3: @ 84CBB38
 	.incbin "data/graphics/field_objects/pics/people/nurse/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ItemBall: ; 84CBC38
+gFieldObjectPic_ItemBall: @ 84CBC38
 	.incbin "data/graphics/field_objects/pics/misc/item_ball.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_0: ; 84CBCB8
+gFieldObjectPic_ProfBirch_0: @ 84CBCB8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_1: ; 84CBDB8
+gFieldObjectPic_ProfBirch_1: @ 84CBDB8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_2: ; 84CBEB8
+gFieldObjectPic_ProfBirch_2: @ 84CBEB8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_3: ; 84CBFB8
+gFieldObjectPic_ProfBirch_3: @ 84CBFB8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_4: ; 84CC0B8
+gFieldObjectPic_ProfBirch_4: @ 84CC0B8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_5: ; 84CC1B8
+gFieldObjectPic_ProfBirch_5: @ 84CC1B8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_6: ; 84CC2B8
+gFieldObjectPic_ProfBirch_6: @ 84CC2B8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_7: ; 84CC3B8
+gFieldObjectPic_ProfBirch_7: @ 84CC3B8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ProfBirch_8: ; 84CC4B8
+gFieldObjectPic_ProfBirch_8: @ 84CC4B8
 	.incbin "data/graphics/field_objects/pics/people/prof_birch/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_0: ; 84CC5B8
+gFieldObjectPic_ReporterM_0: @ 84CC5B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_1: ; 84CC6B8
+gFieldObjectPic_ReporterM_1: @ 84CC6B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_2: ; 84CC7B8
+gFieldObjectPic_ReporterM_2: @ 84CC7B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_3: ; 84CC8B8
+gFieldObjectPic_ReporterM_3: @ 84CC8B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_4: ; 84CC9B8
+gFieldObjectPic_ReporterM_4: @ 84CC9B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_5: ; 84CCAB8
+gFieldObjectPic_ReporterM_5: @ 84CCAB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_6: ; 84CCBB8
+gFieldObjectPic_ReporterM_6: @ 84CCBB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_7: ; 84CCCB8
+gFieldObjectPic_ReporterM_7: @ 84CCCB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterM_8: ; 84CCDB8
+gFieldObjectPic_ReporterM_8: @ 84CCDB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_0: ; 84CCEB8
+gFieldObjectPic_ReporterF_0: @ 84CCEB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_1: ; 84CCFB8
+gFieldObjectPic_ReporterF_1: @ 84CCFB8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_2: ; 84CD0B8
+gFieldObjectPic_ReporterF_2: @ 84CD0B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_3: ; 84CD1B8
+gFieldObjectPic_ReporterF_3: @ 84CD1B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_4: ; 84CD2B8
+gFieldObjectPic_ReporterF_4: @ 84CD2B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_5: ; 84CD3B8
+gFieldObjectPic_ReporterF_5: @ 84CD3B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_6: ; 84CD4B8
+gFieldObjectPic_ReporterF_6: @ 84CD4B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_7: ; 84CD5B8
+gFieldObjectPic_ReporterF_7: @ 84CD5B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ReporterF_8: ; 84CD6B8
+gFieldObjectPic_ReporterF_8: @ 84CD6B8
 	.incbin "data/graphics/field_objects/pics/people/reporter_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_0: ; 84CD7B8
+gFieldObjectPic_MauvilleOldMan1_0: @ 84CD7B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_1: ; 84CD8B8
+gFieldObjectPic_MauvilleOldMan1_1: @ 84CD8B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_2: ; 84CD9B8
+gFieldObjectPic_MauvilleOldMan1_2: @ 84CD9B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_3: ; 84CDAB8
+gFieldObjectPic_MauvilleOldMan1_3: @ 84CDAB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_4: ; 84CDBB8
+gFieldObjectPic_MauvilleOldMan1_4: @ 84CDBB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_5: ; 84CDCB8
+gFieldObjectPic_MauvilleOldMan1_5: @ 84CDCB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_6: ; 84CDDB8
+gFieldObjectPic_MauvilleOldMan1_6: @ 84CDDB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_7: ; 84CDEB8
+gFieldObjectPic_MauvilleOldMan1_7: @ 84CDEB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan1_8: ; 84CDFB8
+gFieldObjectPic_MauvilleOldMan1_8: @ 84CDFB8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_1/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_0: ; 84CE0B8
+gFieldObjectPic_MauvilleOldMan2_0: @ 84CE0B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_1: ; 84CE1B8
+gFieldObjectPic_MauvilleOldMan2_1: @ 84CE1B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_2: ; 84CE2B8
+gFieldObjectPic_MauvilleOldMan2_2: @ 84CE2B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_3: ; 84CE3B8
+gFieldObjectPic_MauvilleOldMan2_3: @ 84CE3B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_4: ; 84CE4B8
+gFieldObjectPic_MauvilleOldMan2_4: @ 84CE4B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_5: ; 84CE5B8
+gFieldObjectPic_MauvilleOldMan2_5: @ 84CE5B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_6: ; 84CE6B8
+gFieldObjectPic_MauvilleOldMan2_6: @ 84CE6B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_7: ; 84CE7B8
+gFieldObjectPic_MauvilleOldMan2_7: @ 84CE7B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MauvilleOldMan2_8: ; 84CE8B8
+gFieldObjectPic_MauvilleOldMan2_8: @ 84CE8B8
 	.incbin "data/graphics/field_objects/pics/people/mauville_old_man_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_0: ; 84CE9B8
+gFieldObjectPic_MartEmployee_0: @ 84CE9B8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_1: ; 84CEAB8
+gFieldObjectPic_MartEmployee_1: @ 84CEAB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_2: ; 84CEBB8
+gFieldObjectPic_MartEmployee_2: @ 84CEBB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_3: ; 84CECB8
+gFieldObjectPic_MartEmployee_3: @ 84CECB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_4: ; 84CEDB8
+gFieldObjectPic_MartEmployee_4: @ 84CEDB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_5: ; 84CEEB8
+gFieldObjectPic_MartEmployee_5: @ 84CEEB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_6: ; 84CEFB8
+gFieldObjectPic_MartEmployee_6: @ 84CEFB8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_7: ; 84CF0B8
+gFieldObjectPic_MartEmployee_7: @ 84CF0B8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MartEmployee_8: ; 84CF1B8
+gFieldObjectPic_MartEmployee_8: @ 84CF1B8
 	.incbin "data/graphics/field_objects/pics/people/mart_employee/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_0: ; 84CF2B8
+gFieldObjectPic_RooftopSaleWoman_0: @ 84CF2B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_1: ; 84CF3B8
+gFieldObjectPic_RooftopSaleWoman_1: @ 84CF3B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_2: ; 84CF4B8
+gFieldObjectPic_RooftopSaleWoman_2: @ 84CF4B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_3: ; 84CF5B8
+gFieldObjectPic_RooftopSaleWoman_3: @ 84CF5B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_4: ; 84CF6B8
+gFieldObjectPic_RooftopSaleWoman_4: @ 84CF6B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_5: ; 84CF7B8
+gFieldObjectPic_RooftopSaleWoman_5: @ 84CF7B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_6: ; 84CF8B8
+gFieldObjectPic_RooftopSaleWoman_6: @ 84CF8B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_7: ; 84CF9B8
+gFieldObjectPic_RooftopSaleWoman_7: @ 84CF9B8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RooftopSaleWoman_8: ; 84CFAB8
+gFieldObjectPic_RooftopSaleWoman_8: @ 84CFAB8
 	.incbin "data/graphics/field_objects/pics/people/rooftop_sale_woman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_0: ; 84CFBB8
+gFieldObjectPic_Teala_0: @ 84CFBB8
 	.incbin "data/graphics/field_objects/pics/people/teala/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_1: ; 84CFCB8
+gFieldObjectPic_Teala_1: @ 84CFCB8
 	.incbin "data/graphics/field_objects/pics/people/teala/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_2: ; 84CFDB8
+gFieldObjectPic_Teala_2: @ 84CFDB8
 	.incbin "data/graphics/field_objects/pics/people/teala/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_3: ; 84CFEB8
+gFieldObjectPic_Teala_3: @ 84CFEB8
 	.incbin "data/graphics/field_objects/pics/people/teala/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_4: ; 84CFFB8
+gFieldObjectPic_Teala_4: @ 84CFFB8
 	.incbin "data/graphics/field_objects/pics/people/teala/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_5: ; 84D00B8
+gFieldObjectPic_Teala_5: @ 84D00B8
 	.incbin "data/graphics/field_objects/pics/people/teala/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_6: ; 84D01B8
+gFieldObjectPic_Teala_6: @ 84D01B8
 	.incbin "data/graphics/field_objects/pics/people/teala/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_7: ; 84D02B8
+gFieldObjectPic_Teala_7: @ 84D02B8
 	.incbin "data/graphics/field_objects/pics/people/teala/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Teala_8: ; 84D03B8
+gFieldObjectPic_Teala_8: @ 84D03B8
 	.incbin "data/graphics/field_objects/pics/people/teala/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_0: ; 84D04B8
+gFieldObjectPic_Artist_0: @ 84D04B8
 	.incbin "data/graphics/field_objects/pics/people/artist/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_1: ; 84D05B8
+gFieldObjectPic_Artist_1: @ 84D05B8
 	.incbin "data/graphics/field_objects/pics/people/artist/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_2: ; 84D06B8
+gFieldObjectPic_Artist_2: @ 84D06B8
 	.incbin "data/graphics/field_objects/pics/people/artist/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_3: ; 84D07B8
+gFieldObjectPic_Artist_3: @ 84D07B8
 	.incbin "data/graphics/field_objects/pics/people/artist/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_4: ; 84D08B8
+gFieldObjectPic_Artist_4: @ 84D08B8
 	.incbin "data/graphics/field_objects/pics/people/artist/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_5: ; 84D09B8
+gFieldObjectPic_Artist_5: @ 84D09B8
 	.incbin "data/graphics/field_objects/pics/people/artist/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_6: ; 84D0AB8
+gFieldObjectPic_Artist_6: @ 84D0AB8
 	.incbin "data/graphics/field_objects/pics/people/artist/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_7: ; 84D0BB8
+gFieldObjectPic_Artist_7: @ 84D0BB8
 	.incbin "data/graphics/field_objects/pics/people/artist/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Artist_8: ; 84D0CB8
+gFieldObjectPic_Artist_8: @ 84D0CB8
 	.incbin "data/graphics/field_objects/pics/people/artist/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_0: ; 84D0DB8
+gFieldObjectPic_Cameraman_0: @ 84D0DB8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_1: ; 84D0EB8
+gFieldObjectPic_Cameraman_1: @ 84D0EB8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_2: ; 84D0FB8
+gFieldObjectPic_Cameraman_2: @ 84D0FB8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_3: ; 84D10B8
+gFieldObjectPic_Cameraman_3: @ 84D10B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_4: ; 84D11B8
+gFieldObjectPic_Cameraman_4: @ 84D11B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_5: ; 84D12B8
+gFieldObjectPic_Cameraman_5: @ 84D12B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_6: ; 84D13B8
+gFieldObjectPic_Cameraman_6: @ 84D13B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_7: ; 84D14B8
+gFieldObjectPic_Cameraman_7: @ 84D14B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Cameraman_8: ; 84D15B8
+gFieldObjectPic_Cameraman_8: @ 84D15B8
 	.incbin "data/graphics/field_objects/pics/people/cameraman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_0: ; 84D16B8
+gFieldObjectPic_Scientist2_0: @ 84D16B8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_1: ; 84D17B8
+gFieldObjectPic_Scientist2_1: @ 84D17B8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_2: ; 84D18B8
+gFieldObjectPic_Scientist2_2: @ 84D18B8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_3: ; 84D19B8
+gFieldObjectPic_Scientist2_3: @ 84D19B8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_4: ; 84D1AB8
+gFieldObjectPic_Scientist2_4: @ 84D1AB8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_5: ; 84D1BB8
+gFieldObjectPic_Scientist2_5: @ 84D1BB8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_6: ; 84D1CB8
+gFieldObjectPic_Scientist2_6: @ 84D1CB8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_7: ; 84D1DB8
+gFieldObjectPic_Scientist2_7: @ 84D1DB8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scientist2_8: ; 84D1EB8
+gFieldObjectPic_Scientist2_8: @ 84D1EB8
 	.incbin "data/graphics/field_objects/pics/people/scientist_2/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_0: ; 84D1FB8
+gFieldObjectPic_Man7_0: @ 84D1FB8
 	.incbin "data/graphics/field_objects/pics/people/man_7/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_1: ; 84D20B8
+gFieldObjectPic_Man7_1: @ 84D20B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_2: ; 84D21B8
+gFieldObjectPic_Man7_2: @ 84D21B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_3: ; 84D22B8
+gFieldObjectPic_Man7_3: @ 84D22B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_4: ; 84D23B8
+gFieldObjectPic_Man7_4: @ 84D23B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_5: ; 84D24B8
+gFieldObjectPic_Man7_5: @ 84D24B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_6: ; 84D25B8
+gFieldObjectPic_Man7_6: @ 84D25B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_7: ; 84D26B8
+gFieldObjectPic_Man7_7: @ 84D26B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Man7_8: ; 84D27B8
+gFieldObjectPic_Man7_8: @ 84D27B8
 	.incbin "data/graphics/field_objects/pics/people/man_7/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_0: ; 84D28B8
+gFieldObjectPic_AquaMemberM_0: @ 84D28B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_1: ; 84D29B8
+gFieldObjectPic_AquaMemberM_1: @ 84D29B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_2: ; 84D2AB8
+gFieldObjectPic_AquaMemberM_2: @ 84D2AB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_3: ; 84D2BB8
+gFieldObjectPic_AquaMemberM_3: @ 84D2BB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_4: ; 84D2CB8
+gFieldObjectPic_AquaMemberM_4: @ 84D2CB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_5: ; 84D2DB8
+gFieldObjectPic_AquaMemberM_5: @ 84D2DB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_6: ; 84D2EB8
+gFieldObjectPic_AquaMemberM_6: @ 84D2EB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_7: ; 84D2FB8
+gFieldObjectPic_AquaMemberM_7: @ 84D2FB8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberM_8: ; 84D30B8
+gFieldObjectPic_AquaMemberM_8: @ 84D30B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_0: ; 84D31B8
+gFieldObjectPic_AquaMemberF_0: @ 84D31B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_1: ; 84D32B8
+gFieldObjectPic_AquaMemberF_1: @ 84D32B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_2: ; 84D33B8
+gFieldObjectPic_AquaMemberF_2: @ 84D33B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_3: ; 84D34B8
+gFieldObjectPic_AquaMemberF_3: @ 84D34B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_4: ; 84D35B8
+gFieldObjectPic_AquaMemberF_4: @ 84D35B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_5: ; 84D36B8
+gFieldObjectPic_AquaMemberF_5: @ 84D36B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_6: ; 84D37B8
+gFieldObjectPic_AquaMemberF_6: @ 84D37B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_7: ; 84D38B8
+gFieldObjectPic_AquaMemberF_7: @ 84D38B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AquaMemberF_8: ; 84D39B8
+gFieldObjectPic_AquaMemberF_8: @ 84D39B8
 	.incbin "data/graphics/field_objects/pics/people/aqua_member_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_0: ; 84D3AB8
+gFieldObjectPic_MagmaMemberM_0: @ 84D3AB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_1: ; 84D3BB8
+gFieldObjectPic_MagmaMemberM_1: @ 84D3BB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_2: ; 84D3CB8
+gFieldObjectPic_MagmaMemberM_2: @ 84D3CB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_3: ; 84D3DB8
+gFieldObjectPic_MagmaMemberM_3: @ 84D3DB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_4: ; 84D3EB8
+gFieldObjectPic_MagmaMemberM_4: @ 84D3EB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_5: ; 84D3FB8
+gFieldObjectPic_MagmaMemberM_5: @ 84D3FB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_6: ; 84D40B8
+gFieldObjectPic_MagmaMemberM_6: @ 84D40B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_7: ; 84D41B8
+gFieldObjectPic_MagmaMemberM_7: @ 84D41B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberM_8: ; 84D42B8
+gFieldObjectPic_MagmaMemberM_8: @ 84D42B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_m/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_0: ; 84D43B8
+gFieldObjectPic_MagmaMemberF_0: @ 84D43B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_1: ; 84D44B8
+gFieldObjectPic_MagmaMemberF_1: @ 84D44B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_2: ; 84D45B8
+gFieldObjectPic_MagmaMemberF_2: @ 84D45B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_3: ; 84D46B8
+gFieldObjectPic_MagmaMemberF_3: @ 84D46B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_4: ; 84D47B8
+gFieldObjectPic_MagmaMemberF_4: @ 84D47B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_5: ; 84D48B8
+gFieldObjectPic_MagmaMemberF_5: @ 84D48B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_6: ; 84D49B8
+gFieldObjectPic_MagmaMemberF_6: @ 84D49B8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_7: ; 84D4AB8
+gFieldObjectPic_MagmaMemberF_7: @ 84D4AB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagmaMemberF_8: ; 84D4BB8
+gFieldObjectPic_MagmaMemberF_8: @ 84D4BB8
 	.incbin "data/graphics/field_objects/pics/people/magma_member_f/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sidney_0: ; 84D4CB8
+gFieldObjectPic_Sidney_0: @ 84D4CB8
 	.incbin "data/graphics/field_objects/pics/people/sidney/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sidney_1: ; 84D4DB8
+gFieldObjectPic_Sidney_1: @ 84D4DB8
 	.incbin "data/graphics/field_objects/pics/people/sidney/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sidney_2: ; 84D4EB8
+gFieldObjectPic_Sidney_2: @ 84D4EB8
 	.incbin "data/graphics/field_objects/pics/people/sidney/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Phoebe_0: ; 84D4FB8
+gFieldObjectPic_Phoebe_0: @ 84D4FB8
 	.incbin "data/graphics/field_objects/pics/people/phoebe/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Phoebe_1: ; 84D50B8
+gFieldObjectPic_Phoebe_1: @ 84D50B8
 	.incbin "data/graphics/field_objects/pics/people/phoebe/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Phoebe_2: ; 84D51B8
+gFieldObjectPic_Phoebe_2: @ 84D51B8
 	.incbin "data/graphics/field_objects/pics/people/phoebe/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Glacia_0: ; 84D52B8
+gFieldObjectPic_Glacia_0: @ 84D52B8
 	.incbin "data/graphics/field_objects/pics/people/glacia/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Glacia_1: ; 84D53B8
+gFieldObjectPic_Glacia_1: @ 84D53B8
 	.incbin "data/graphics/field_objects/pics/people/glacia/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Glacia_2: ; 84D54B8
+gFieldObjectPic_Glacia_2: @ 84D54B8
 	.incbin "data/graphics/field_objects/pics/people/glacia/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Drake_0: ; 84D55B8
+gFieldObjectPic_Drake_0: @ 84D55B8
 	.incbin "data/graphics/field_objects/pics/people/drake/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Drake_1: ; 84D56B8
+gFieldObjectPic_Drake_1: @ 84D56B8
 	.incbin "data/graphics/field_objects/pics/people/drake/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Drake_2: ; 84D57B8
+gFieldObjectPic_Drake_2: @ 84D57B8
 	.incbin "data/graphics/field_objects/pics/people/drake/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Roxanne_0: ; 84D58B8
+gFieldObjectPic_Roxanne_0: @ 84D58B8
 	.incbin "data/graphics/field_objects/pics/people/roxanne/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Roxanne_1: ; 84D59B8
+gFieldObjectPic_Roxanne_1: @ 84D59B8
 	.incbin "data/graphics/field_objects/pics/people/roxanne/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Roxanne_2: ; 84D5AB8
+gFieldObjectPic_Roxanne_2: @ 84D5AB8
 	.incbin "data/graphics/field_objects/pics/people/roxanne/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brawly_0: ; 84D5BB8
+gFieldObjectPic_Brawly_0: @ 84D5BB8
 	.incbin "data/graphics/field_objects/pics/people/brawly/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brawly_1: ; 84D5CB8
+gFieldObjectPic_Brawly_1: @ 84D5CB8
 	.incbin "data/graphics/field_objects/pics/people/brawly/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brawly_2: ; 84D5DB8
+gFieldObjectPic_Brawly_2: @ 84D5DB8
 	.incbin "data/graphics/field_objects/pics/people/brawly/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wattson_0: ; 84D5EB8
+gFieldObjectPic_Wattson_0: @ 84D5EB8
 	.incbin "data/graphics/field_objects/pics/people/wattson/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wattson_1: ; 84D5FB8
+gFieldObjectPic_Wattson_1: @ 84D5FB8
 	.incbin "data/graphics/field_objects/pics/people/wattson/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wattson_2: ; 84D60B8
+gFieldObjectPic_Wattson_2: @ 84D60B8
 	.incbin "data/graphics/field_objects/pics/people/wattson/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Flannery_0: ; 84D61B8
+gFieldObjectPic_Flannery_0: @ 84D61B8
 	.incbin "data/graphics/field_objects/pics/people/flannery/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Flannery_1: ; 84D62B8
+gFieldObjectPic_Flannery_1: @ 84D62B8
 	.incbin "data/graphics/field_objects/pics/people/flannery/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Flannery_2: ; 84D63B8
+gFieldObjectPic_Flannery_2: @ 84D63B8
 	.incbin "data/graphics/field_objects/pics/people/flannery/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_0: ; 84D64B8
+gFieldObjectPic_Norman_0: @ 84D64B8
 	.incbin "data/graphics/field_objects/pics/people/norman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_1: ; 84D65B8
+gFieldObjectPic_Norman_1: @ 84D65B8
 	.incbin "data/graphics/field_objects/pics/people/norman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_2: ; 84D66B8
+gFieldObjectPic_Norman_2: @ 84D66B8
 	.incbin "data/graphics/field_objects/pics/people/norman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_3: ; 84D67B8
+gFieldObjectPic_Norman_3: @ 84D67B8
 	.incbin "data/graphics/field_objects/pics/people/norman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_4: ; 84D68B8
+gFieldObjectPic_Norman_4: @ 84D68B8
 	.incbin "data/graphics/field_objects/pics/people/norman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_5: ; 84D69B8
+gFieldObjectPic_Norman_5: @ 84D69B8
 	.incbin "data/graphics/field_objects/pics/people/norman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_6: ; 84D6AB8
+gFieldObjectPic_Norman_6: @ 84D6AB8
 	.incbin "data/graphics/field_objects/pics/people/norman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_7: ; 84D6BB8
+gFieldObjectPic_Norman_7: @ 84D6BB8
 	.incbin "data/graphics/field_objects/pics/people/norman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Norman_8: ; 84D6CB8
+gFieldObjectPic_Norman_8: @ 84D6CB8
 	.incbin "data/graphics/field_objects/pics/people/norman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Winona_0: ; 84D6DB8
+gFieldObjectPic_Winona_0: @ 84D6DB8
 	.incbin "data/graphics/field_objects/pics/people/winona/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Winona_1: ; 84D6EB8
+gFieldObjectPic_Winona_1: @ 84D6EB8
 	.incbin "data/graphics/field_objects/pics/people/winona/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Winona_2: ; 84D6FB8
+gFieldObjectPic_Winona_2: @ 84D6FB8
 	.incbin "data/graphics/field_objects/pics/people/winona/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Liza_0: ; 84D70B8
+gFieldObjectPic_Liza_0: @ 84D70B8
 	.incbin "data/graphics/field_objects/pics/people/liza/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Liza_1: ; 84D71B8
+gFieldObjectPic_Liza_1: @ 84D71B8
 	.incbin "data/graphics/field_objects/pics/people/liza/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Liza_2: ; 84D72B8
+gFieldObjectPic_Liza_2: @ 84D72B8
 	.incbin "data/graphics/field_objects/pics/people/liza/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tate_0: ; 84D73B8
+gFieldObjectPic_Tate_0: @ 84D73B8
 	.incbin "data/graphics/field_objects/pics/people/tate/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tate_1: ; 84D74B8
+gFieldObjectPic_Tate_1: @ 84D74B8
 	.incbin "data/graphics/field_objects/pics/people/tate/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tate_2: ; 84D75B8
+gFieldObjectPic_Tate_2: @ 84D75B8
 	.incbin "data/graphics/field_objects/pics/people/tate/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_0: ; 84D76B8
+gFieldObjectPic_Wallace_0: @ 84D76B8
 	.incbin "data/graphics/field_objects/pics/people/wallace/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_1: ; 84D77B8
+gFieldObjectPic_Wallace_1: @ 84D77B8
 	.incbin "data/graphics/field_objects/pics/people/wallace/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_2: ; 84D78B8
+gFieldObjectPic_Wallace_2: @ 84D78B8
 	.incbin "data/graphics/field_objects/pics/people/wallace/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_3: ; 84D79B8
+gFieldObjectPic_Wallace_3: @ 84D79B8
 	.incbin "data/graphics/field_objects/pics/people/wallace/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_4: ; 84D7AB8
+gFieldObjectPic_Wallace_4: @ 84D7AB8
 	.incbin "data/graphics/field_objects/pics/people/wallace/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_5: ; 84D7BB8
+gFieldObjectPic_Wallace_5: @ 84D7BB8
 	.incbin "data/graphics/field_objects/pics/people/wallace/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_6: ; 84D7CB8
+gFieldObjectPic_Wallace_6: @ 84D7CB8
 	.incbin "data/graphics/field_objects/pics/people/wallace/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_7: ; 84D7DB8
+gFieldObjectPic_Wallace_7: @ 84D7DB8
 	.incbin "data/graphics/field_objects/pics/people/wallace/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wallace_8: ; 84D7EB8
+gFieldObjectPic_Wallace_8: @ 84D7EB8
 	.incbin "data/graphics/field_objects/pics/people/wallace/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_0: ; 84D7FB8
+gFieldObjectPic_Steven_0: @ 84D7FB8
 	.incbin "data/graphics/field_objects/pics/people/steven/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_1: ; 84D80B8
+gFieldObjectPic_Steven_1: @ 84D80B8
 	.incbin "data/graphics/field_objects/pics/people/steven/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_2: ; 84D81B8
+gFieldObjectPic_Steven_2: @ 84D81B8
 	.incbin "data/graphics/field_objects/pics/people/steven/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_3: ; 84D82B8
+gFieldObjectPic_Steven_3: @ 84D82B8
 	.incbin "data/graphics/field_objects/pics/people/steven/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_4: ; 84D83B8
+gFieldObjectPic_Steven_4: @ 84D83B8
 	.incbin "data/graphics/field_objects/pics/people/steven/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_5: ; 84D84B8
+gFieldObjectPic_Steven_5: @ 84D84B8
 	.incbin "data/graphics/field_objects/pics/people/steven/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_6: ; 84D85B8
+gFieldObjectPic_Steven_6: @ 84D85B8
 	.incbin "data/graphics/field_objects/pics/people/steven/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_7: ; 84D86B8
+gFieldObjectPic_Steven_7: @ 84D86B8
 	.incbin "data/graphics/field_objects/pics/people/steven/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Steven_8: ; 84D87B8
+gFieldObjectPic_Steven_8: @ 84D87B8
 	.incbin "data/graphics/field_objects/pics/people/steven/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_0: ; 84D88B8
+gFieldObjectPic_Wally_0: @ 84D88B8
 	.incbin "data/graphics/field_objects/pics/people/wally/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_1: ; 84D89B8
+gFieldObjectPic_Wally_1: @ 84D89B8
 	.incbin "data/graphics/field_objects/pics/people/wally/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_2: ; 84D8AB8
+gFieldObjectPic_Wally_2: @ 84D8AB8
 	.incbin "data/graphics/field_objects/pics/people/wally/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_3: ; 84D8BB8
+gFieldObjectPic_Wally_3: @ 84D8BB8
 	.incbin "data/graphics/field_objects/pics/people/wally/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_4: ; 84D8CB8
+gFieldObjectPic_Wally_4: @ 84D8CB8
 	.incbin "data/graphics/field_objects/pics/people/wally/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_5: ; 84D8DB8
+gFieldObjectPic_Wally_5: @ 84D8DB8
 	.incbin "data/graphics/field_objects/pics/people/wally/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_6: ; 84D8EB8
+gFieldObjectPic_Wally_6: @ 84D8EB8
 	.incbin "data/graphics/field_objects/pics/people/wally/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_7: ; 84D8FB8
+gFieldObjectPic_Wally_7: @ 84D8FB8
 	.incbin "data/graphics/field_objects/pics/people/wally/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wally_8: ; 84D90B8
+gFieldObjectPic_Wally_8: @ 84D90B8
 	.incbin "data/graphics/field_objects/pics/people/wally/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_0: ; 84D91B8
+gFieldObjectPic_RubySapphireLittleBoy_0: @ 84D91B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_1: ; 84D9238
+gFieldObjectPic_RubySapphireLittleBoy_1: @ 84D9238
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_2: ; 84D92B8
+gFieldObjectPic_RubySapphireLittleBoy_2: @ 84D92B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_3: ; 84D9338
+gFieldObjectPic_RubySapphireLittleBoy_3: @ 84D9338
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_4: ; 84D93B8
+gFieldObjectPic_RubySapphireLittleBoy_4: @ 84D93B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_5: ; 84D9438
+gFieldObjectPic_RubySapphireLittleBoy_5: @ 84D9438
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_6: ; 84D94B8
+gFieldObjectPic_RubySapphireLittleBoy_6: @ 84D94B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_7: ; 84D9538
+gFieldObjectPic_RubySapphireLittleBoy_7: @ 84D9538
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RubySapphireLittleBoy_8: ; 84D95B8
+gFieldObjectPic_RubySapphireLittleBoy_8: @ 84D95B8
 	.incbin "data/graphics/field_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_0: ; 84D9638
+gFieldObjectPic_HotSpringsOldWoman_0: @ 84D9638
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_1: ; 84D9738
+gFieldObjectPic_HotSpringsOldWoman_1: @ 84D9738
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_2: ; 84D9838
+gFieldObjectPic_HotSpringsOldWoman_2: @ 84D9838
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_3: ; 84D9938
+gFieldObjectPic_HotSpringsOldWoman_3: @ 84D9938
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_4: ; 84D9A38
+gFieldObjectPic_HotSpringsOldWoman_4: @ 84D9A38
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_5: ; 84D9B38
+gFieldObjectPic_HotSpringsOldWoman_5: @ 84D9B38
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_6: ; 84D9C38
+gFieldObjectPic_HotSpringsOldWoman_6: @ 84D9C38
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_7: ; 84D9D38
+gFieldObjectPic_HotSpringsOldWoman_7: @ 84D9D38
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HotSpringsOldWoman_8: ; 84D9E38
+gFieldObjectPic_HotSpringsOldWoman_8: @ 84D9E38
 	.incbin "data/graphics/field_objects/pics/people/hot_springs_old_woman/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LatiasLatios_0: ; 84D9F38
+gFieldObjectPic_LatiasLatios_0: @ 84D9F38
 	.incbin "data/graphics/field_objects/pics/pokemon/latias_latios/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LatiasLatios_1: ; 84DA138
+gFieldObjectPic_LatiasLatios_1: @ 84DA138
 	.incbin "data/graphics/field_objects/pics/pokemon/latias_latios/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LatiasLatios_2: ; 84DA338
+gFieldObjectPic_LatiasLatios_2: @ 84DA338
 	.incbin "data/graphics/field_objects/pics/pokemon/latias_latios/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy5_0: ; 84DA538
+gFieldObjectPic_Boy5_0: @ 84DA538
 	.incbin "data/graphics/field_objects/pics/people/boy_5/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy5_1: ; 84DA638
+gFieldObjectPic_Boy5_1: @ 84DA638
 	.incbin "data/graphics/field_objects/pics/people/boy_5/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Boy5_2: ; 84DA738
+gFieldObjectPic_Boy5_2: @ 84DA738
 	.incbin "data/graphics/field_objects/pics/people/boy_5/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_0: ; 84DA838
+gFieldObjectPic_ContestOldMan_0: @ 84DA838
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_1: ; 84DA938
+gFieldObjectPic_ContestOldMan_1: @ 84DA938
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_2: ; 84DAA38
+gFieldObjectPic_ContestOldMan_2: @ 84DAA38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_3: ; 84DAB38
+gFieldObjectPic_ContestOldMan_3: @ 84DAB38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_4: ; 84DAC38
+gFieldObjectPic_ContestOldMan_4: @ 84DAC38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_5: ; 84DAD38
+gFieldObjectPic_ContestOldMan_5: @ 84DAD38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_6: ; 84DAE38
+gFieldObjectPic_ContestOldMan_6: @ 84DAE38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_7: ; 84DAF38
+gFieldObjectPic_ContestOldMan_7: @ 84DAF38
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ContestOldMan_8: ; 84DB038
+gFieldObjectPic_ContestOldMan_8: @ 84DB038
 	.incbin "data/graphics/field_objects/pics/people/contest_old_man/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_0: ; 84DB138
+gFieldObjectPic_Archie_0: @ 84DB138
 	.incbin "data/graphics/field_objects/pics/people/archie/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_1: ; 84DB238
+gFieldObjectPic_Archie_1: @ 84DB238
 	.incbin "data/graphics/field_objects/pics/people/archie/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_2: ; 84DB338
+gFieldObjectPic_Archie_2: @ 84DB338
 	.incbin "data/graphics/field_objects/pics/people/archie/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_3: ; 84DB438
+gFieldObjectPic_Archie_3: @ 84DB438
 	.incbin "data/graphics/field_objects/pics/people/archie/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_4: ; 84DB538
+gFieldObjectPic_Archie_4: @ 84DB538
 	.incbin "data/graphics/field_objects/pics/people/archie/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_5: ; 84DB638
+gFieldObjectPic_Archie_5: @ 84DB638
 	.incbin "data/graphics/field_objects/pics/people/archie/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_6: ; 84DB738
+gFieldObjectPic_Archie_6: @ 84DB738
 	.incbin "data/graphics/field_objects/pics/people/archie/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_7: ; 84DB838
+gFieldObjectPic_Archie_7: @ 84DB838
 	.incbin "data/graphics/field_objects/pics/people/archie/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Archie_8: ; 84DB938
+gFieldObjectPic_Archie_8: @ 84DB938
 	.incbin "data/graphics/field_objects/pics/people/archie/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_0: ; 84DBA38
+gFieldObjectPic_Maxie_0: @ 84DBA38
 	.incbin "data/graphics/field_objects/pics/people/maxie/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_1: ; 84DBB38
+gFieldObjectPic_Maxie_1: @ 84DBB38
 	.incbin "data/graphics/field_objects/pics/people/maxie/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_2: ; 84DBC38
+gFieldObjectPic_Maxie_2: @ 84DBC38
 	.incbin "data/graphics/field_objects/pics/people/maxie/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_3: ; 84DBD38
+gFieldObjectPic_Maxie_3: @ 84DBD38
 	.incbin "data/graphics/field_objects/pics/people/maxie/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_4: ; 84DBE38
+gFieldObjectPic_Maxie_4: @ 84DBE38
 	.incbin "data/graphics/field_objects/pics/people/maxie/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_5: ; 84DBF38
+gFieldObjectPic_Maxie_5: @ 84DBF38
 	.incbin "data/graphics/field_objects/pics/people/maxie/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_6: ; 84DC038
+gFieldObjectPic_Maxie_6: @ 84DC038
 	.incbin "data/graphics/field_objects/pics/people/maxie/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_7: ; 84DC138
+gFieldObjectPic_Maxie_7: @ 84DC138
 	.incbin "data/graphics/field_objects/pics/people/maxie/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Maxie_8: ; 84DC238
+gFieldObjectPic_Maxie_8: @ 84DC238
 	.incbin "data/graphics/field_objects/pics/people/maxie/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KyogreFront_0: ; 84DC338
+gFieldObjectPic_KyogreFront_0: @ 84DC338
 	.incbin "data/graphics/field_objects/pics/pokemon/kyogre_front/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KyogreFront_1: ; 84DC538
+gFieldObjectPic_KyogreFront_1: @ 84DC538
 	.incbin "data/graphics/field_objects/pics/pokemon/kyogre_front/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KyogreSide_0: ; 84DC738
+gFieldObjectPic_KyogreSide_0: @ 84DC738
 	.incbin "data/graphics/field_objects/pics/pokemon/kyogre_side/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KyogreSide_1: ; 84DC938
+gFieldObjectPic_KyogreSide_1: @ 84DC938
 	.incbin "data/graphics/field_objects/pics/pokemon/kyogre_side/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GroudonFront_0: ; 84DCB38
+gFieldObjectPic_GroudonFront_0: @ 84DCB38
 	.incbin "data/graphics/field_objects/pics/pokemon/groudon_front/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GroudonFront_1: ; 84DCD38
+gFieldObjectPic_GroudonFront_1: @ 84DCD38
 	.incbin "data/graphics/field_objects/pics/pokemon/groudon_front/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GroudonSide_0: ; 84DCF38
+gFieldObjectPic_GroudonSide_0: @ 84DCF38
 	.incbin "data/graphics/field_objects/pics/pokemon/groudon_side/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GroudonSide_1: ; 84DD138
+gFieldObjectPic_GroudonSide_1: @ 84DD138
 	.incbin "data/graphics/field_objects/pics/pokemon/groudon_side/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Regi: ; 84DD338
+gFieldObjectPic_Regi: @ 84DD338
 	.incbin "data/graphics/field_objects/pics/pokemon/regi.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Skitty_0: ; 84DD538
+gFieldObjectPic_Skitty_0: @ 84DD538
 	.incbin "data/graphics/field_objects/pics/pokemon/skitty/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Skitty_1: ; 84DD5B8
+gFieldObjectPic_Skitty_1: @ 84DD5B8
 	.incbin "data/graphics/field_objects/pics/pokemon/skitty/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Skitty_2: ; 84DD638
+gFieldObjectPic_Skitty_2: @ 84DD638
 	.incbin "data/graphics/field_objects/pics/pokemon/skitty/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kecleon_0: ; 84DD6B8
+gFieldObjectPic_Kecleon_0: @ 84DD6B8
 	.incbin "data/graphics/field_objects/pics/pokemon/kecleon/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kecleon_1: ; 84DD738
+gFieldObjectPic_Kecleon_1: @ 84DD738
 	.incbin "data/graphics/field_objects/pics/pokemon/kecleon/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kecleon_2: ; 84DD7B8
+gFieldObjectPic_Kecleon_2: @ 84DD7B8
 	.incbin "data/graphics/field_objects/pics/pokemon/kecleon/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Rayquaza_0: ; 84DD838
+gFieldObjectPic_Rayquaza_0: @ 84DD838
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Rayquaza_1: ; 84DE038
+gFieldObjectPic_Rayquaza_1: @ 84DE038
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Rayquaza_2: ; 84DE838
+gFieldObjectPic_Rayquaza_2: @ 84DE838
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Rayquaza_3: ; 84DF038
+gFieldObjectPic_Rayquaza_3: @ 84DF038
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Rayquaza_4: ; 84DF838
+gFieldObjectPic_Rayquaza_4: @ 84DF838
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RayquazaStill: ; 84E0038
+gFieldObjectPic_RayquazaStill: @ 84E0038
 	.incbin "data/graphics/field_objects/pics/pokemon/rayquaza_still.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Zigzagoon_0: ; 84E0838
+gFieldObjectPic_Zigzagoon_0: @ 84E0838
 	.incbin "data/graphics/field_objects/pics/pokemon/zigzagoon/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Zigzagoon_1: ; 84E08B8
+gFieldObjectPic_Zigzagoon_1: @ 84E08B8
 	.incbin "data/graphics/field_objects/pics/pokemon/zigzagoon/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Zigzagoon_2: ; 84E0938
+gFieldObjectPic_Zigzagoon_2: @ 84E0938
 	.incbin "data/graphics/field_objects/pics/pokemon/zigzagoon/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Pikachu_0: ; 84E09B8
+gFieldObjectPic_Pikachu_0: @ 84E09B8
 	.incbin "data/graphics/field_objects/pics/pokemon/pikachu/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Pikachu_1: ; 84E0A38
+gFieldObjectPic_Pikachu_1: @ 84E0A38
 	.incbin "data/graphics/field_objects/pics/pokemon/pikachu/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Pikachu_2: ; 84E0AB8
+gFieldObjectPic_Pikachu_2: @ 84E0AB8
 	.incbin "data/graphics/field_objects/pics/pokemon/pikachu/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azumarill_0: ; 84E0B38
+gFieldObjectPic_Azumarill_0: @ 84E0B38
 	.incbin "data/graphics/field_objects/pics/pokemon/azumarill/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azumarill_1: ; 84E0BB8
+gFieldObjectPic_Azumarill_1: @ 84E0BB8
 	.incbin "data/graphics/field_objects/pics/pokemon/azumarill/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azumarill_2: ; 84E0C38
+gFieldObjectPic_Azumarill_2: @ 84E0C38
 	.incbin "data/graphics/field_objects/pics/pokemon/azumarill/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_0: ; 84E0CB8
+gFieldObjectPic_Wingull_0: @ 84E0CB8
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_3: ; 84E0D38
+gFieldObjectPic_Wingull_3: @ 84E0D38
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_1: ; 84E0DB8
+gFieldObjectPic_Wingull_1: @ 84E0DB8
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_4: ; 84E0E38
+gFieldObjectPic_Wingull_4: @ 84E0E38
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_2: ; 84E0EB8
+gFieldObjectPic_Wingull_2: @ 84E0EB8
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Wingull_5: ; 84E0F38
+gFieldObjectPic_Wingull_5: @ 84E0F38
 	.incbin "data/graphics/field_objects/pics/pokemon/wingull/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_0: ; 84E0FB8
+gFieldObjectPic_TuberMSwimming_0: @ 84E0FB8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_1: ; 84E1038
+gFieldObjectPic_TuberMSwimming_1: @ 84E1038
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_2: ; 84E10B8
+gFieldObjectPic_TuberMSwimming_2: @ 84E10B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_3: ; 84E1138
+gFieldObjectPic_TuberMSwimming_3: @ 84E1138
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_4: ; 84E11B8
+gFieldObjectPic_TuberMSwimming_4: @ 84E11B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_5: ; 84E1238
+gFieldObjectPic_TuberMSwimming_5: @ 84E1238
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_6: ; 84E12B8
+gFieldObjectPic_TuberMSwimming_6: @ 84E12B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_7: ; 84E1338
+gFieldObjectPic_TuberMSwimming_7: @ 84E1338
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TuberMSwimming_8: ; 84E13B8
+gFieldObjectPic_TuberMSwimming_8: @ 84E13B8
 	.incbin "data/graphics/field_objects/pics/people/tuber_m_swimming/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azurill_0: ; 84E1438
+gFieldObjectPic_Azurill_0: @ 84E1438
 	.incbin "data/graphics/field_objects/pics/pokemon/azurill/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azurill_1: ; 84E14B8
+gFieldObjectPic_Azurill_1: @ 84E14B8
 	.incbin "data/graphics/field_objects/pics/pokemon/azurill/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Azurill_2: ; 84E1538
+gFieldObjectPic_Azurill_2: @ 84E1538
 	.incbin "data/graphics/field_objects/pics/pokemon/azurill/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_0: ; 84E15B8
+gFieldObjectPic_Mom_0: @ 84E15B8
 	.incbin "data/graphics/field_objects/pics/people/mom/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_1: ; 84E16B8
+gFieldObjectPic_Mom_1: @ 84E16B8
 	.incbin "data/graphics/field_objects/pics/people/mom/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_2: ; 84E17B8
+gFieldObjectPic_Mom_2: @ 84E17B8
 	.incbin "data/graphics/field_objects/pics/people/mom/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_3: ; 84E18B8
+gFieldObjectPic_Mom_3: @ 84E18B8
 	.incbin "data/graphics/field_objects/pics/people/mom/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_4: ; 84E19B8
+gFieldObjectPic_Mom_4: @ 84E19B8
 	.incbin "data/graphics/field_objects/pics/people/mom/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_5: ; 84E1AB8
+gFieldObjectPic_Mom_5: @ 84E1AB8
 	.incbin "data/graphics/field_objects/pics/people/mom/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_6: ; 84E1BB8
+gFieldObjectPic_Mom_6: @ 84E1BB8
 	.incbin "data/graphics/field_objects/pics/people/mom/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_7: ; 84E1CB8
+gFieldObjectPic_Mom_7: @ 84E1CB8
 	.incbin "data/graphics/field_objects/pics/people/mom/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mom_8: ; 84E1DB8
+gFieldObjectPic_Mom_8: @ 84E1DB8
 	.incbin "data/graphics/field_objects/pics/people/mom/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette22: ; 84E1EB8
+gFieldObjectPalette22: @ 84E1EB8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_22.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette23: ; 84E1ED8
+gFieldObjectPalette23: @ 84E1ED8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_23.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette24: ; 84E1EF8
+gFieldObjectPalette24: @ 84E1EF8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_24.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette25: ; 84E1F18
+gFieldObjectPalette25: @ 84E1F18
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_25.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedNatuDoll: ; 84E1F38
+gFieldObjectPic_UnusedNatuDoll: @ 84E1F38
 	.incbin "data/graphics/field_objects/pics/dolls/unused_natu_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedMagnemiteDoll: ; 84E1FB8
+gFieldObjectPic_UnusedMagnemiteDoll: @ 84E1FB8
 	.incbin "data/graphics/field_objects/pics/dolls/unused_magnemite_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedSquirtleDoll: ; 84E2038
+gFieldObjectPic_UnusedSquirtleDoll: @ 84E2038
 	.incbin "data/graphics/field_objects/pics/dolls/unused_squirtle_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedWooperDoll: ; 84E20B8
+gFieldObjectPic_UnusedWooperDoll: @ 84E20B8
 	.incbin "data/graphics/field_objects/pics/dolls/unused_wooper_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedPikachuDoll: ; 84E2138
+gFieldObjectPic_UnusedPikachuDoll: @ 84E2138
 	.incbin "data/graphics/field_objects/pics/dolls/unused_pikachu_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnusedPorygon2Doll: ; 84E21B8
+gFieldObjectPic_UnusedPorygon2Doll: @ 84E21B8
 	.incbin "data/graphics/field_objects/pics/dolls/unused_porygon2_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PichuDoll: ; 84E2238
+gFieldObjectPic_PichuDoll: @ 84E2238
 	.incbin "data/graphics/field_objects/pics/dolls/pichu_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PikachuDoll: ; 84E22B8
+gFieldObjectPic_PikachuDoll: @ 84E22B8
 	.incbin "data/graphics/field_objects/pics/dolls/pikachu_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MarillDoll: ; 84E2338
+gFieldObjectPic_MarillDoll: @ 84E2338
 	.incbin "data/graphics/field_objects/pics/dolls/marill_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TogepiDoll: ; 84E23B8
+gFieldObjectPic_TogepiDoll: @ 84E23B8
 	.incbin "data/graphics/field_objects/pics/dolls/togepi_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CyndaquilDoll: ; 84E2438
+gFieldObjectPic_CyndaquilDoll: @ 84E2438
 	.incbin "data/graphics/field_objects/pics/dolls/cyndaquil_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChikoritaDoll: ; 84E24B8
+gFieldObjectPic_ChikoritaDoll: @ 84E24B8
 	.incbin "data/graphics/field_objects/pics/dolls/chikorita_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TotodileDoll: ; 84E2538
+gFieldObjectPic_TotodileDoll: @ 84E2538
 	.incbin "data/graphics/field_objects/pics/dolls/totodile_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_JigglypuffDoll: ; 84E25B8
+gFieldObjectPic_JigglypuffDoll: @ 84E25B8
 	.incbin "data/graphics/field_objects/pics/dolls/jigglypuff_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MeowthDoll: ; 84E2638
+gFieldObjectPic_MeowthDoll: @ 84E2638
 	.incbin "data/graphics/field_objects/pics/dolls/meowth_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ClefairyDoll: ; 84E26B8
+gFieldObjectPic_ClefairyDoll: @ 84E26B8
 	.incbin "data/graphics/field_objects/pics/dolls/clefairy_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DittoDoll: ; 84E2738
+gFieldObjectPic_DittoDoll: @ 84E2738
 	.incbin "data/graphics/field_objects/pics/dolls/ditto_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SmoochumDoll: ; 84E27B8
+gFieldObjectPic_SmoochumDoll: @ 84E27B8
 	.incbin "data/graphics/field_objects/pics/dolls/smoochum_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TreeckoDoll: ; 84E2838
+gFieldObjectPic_TreeckoDoll: @ 84E2838
 	.incbin "data/graphics/field_objects/pics/dolls/treecko_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TorchicDoll: ; 84E28B8
+gFieldObjectPic_TorchicDoll: @ 84E28B8
 	.incbin "data/graphics/field_objects/pics/dolls/torchic_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MudkipDoll: ; 84E2938
+gFieldObjectPic_MudkipDoll: @ 84E2938
 	.incbin "data/graphics/field_objects/pics/dolls/mudkip_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DuskullDoll: ; 84E29B8
+gFieldObjectPic_DuskullDoll: @ 84E29B8
 	.incbin "data/graphics/field_objects/pics/dolls/duskull_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WynautDoll: ; 84E2A38
+gFieldObjectPic_WynautDoll: @ 84E2A38
 	.incbin "data/graphics/field_objects/pics/dolls/wynaut_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BaltoyDoll: ; 84E2AB8
+gFieldObjectPic_BaltoyDoll: @ 84E2AB8
 	.incbin "data/graphics/field_objects/pics/dolls/baltoy_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KecleonDoll: ; 84E2B38
+gFieldObjectPic_KecleonDoll: @ 84E2B38
 	.incbin "data/graphics/field_objects/pics/dolls/kecleon_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AzurillDoll: ; 84E2BB8
+gFieldObjectPic_AzurillDoll: @ 84E2BB8
 	.incbin "data/graphics/field_objects/pics/dolls/azurill_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SkittyDoll: ; 84E2C38
+gFieldObjectPic_SkittyDoll: @ 84E2C38
 	.incbin "data/graphics/field_objects/pics/dolls/skitty_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SwabluDoll: ; 84E2CB8
+gFieldObjectPic_SwabluDoll: @ 84E2CB8
 	.incbin "data/graphics/field_objects/pics/dolls/swablu_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GulpinDoll: ; 84E2D38
+gFieldObjectPic_GulpinDoll: @ 84E2D38
 	.incbin "data/graphics/field_objects/pics/dolls/gulpin_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LotadDoll: ; 84E2DB8
+gFieldObjectPic_LotadDoll: @ 84E2DB8
 	.incbin "data/graphics/field_objects/pics/dolls/lotad_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SeedotDoll: ; 84E2E38
+gFieldObjectPic_SeedotDoll: @ 84E2E38
 	.incbin "data/graphics/field_objects/pics/dolls/seedot_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PikaCushion: ; 84E2EB8
+gFieldObjectPic_PikaCushion: @ 84E2EB8
 	.incbin "data/graphics/field_objects/pics/cushions/pika_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RoundCushion: ; 84E2F38
+gFieldObjectPic_RoundCushion: @ 84E2F38
 	.incbin "data/graphics/field_objects/pics/cushions/round_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KissCushion: ; 84E2FB8
+gFieldObjectPic_KissCushion: @ 84E2FB8
 	.incbin "data/graphics/field_objects/pics/cushions/kiss_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ZigzagCushion: ; 84E3038
+gFieldObjectPic_ZigzagCushion: @ 84E3038
 	.incbin "data/graphics/field_objects/pics/cushions/zigzag_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpinCushion: ; 84E30B8
+gFieldObjectPic_SpinCushion: @ 84E30B8
 	.incbin "data/graphics/field_objects/pics/cushions/spin_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DiamondCushion: ; 84E3138
+gFieldObjectPic_DiamondCushion: @ 84E3138
 	.incbin "data/graphics/field_objects/pics/cushions/diamond_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BallCushion: ; 84E31B8
+gFieldObjectPic_BallCushion: @ 84E31B8
 	.incbin "data/graphics/field_objects/pics/cushions/ball_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrassCushion: ; 84E3238
+gFieldObjectPic_GrassCushion: @ 84E3238
 	.incbin "data/graphics/field_objects/pics/cushions/grass_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FireCushion: ; 84E32B8
+gFieldObjectPic_FireCushion: @ 84E32B8
 	.incbin "data/graphics/field_objects/pics/cushions/fire_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WaterCushion: ; 84E3338
+gFieldObjectPic_WaterCushion: @ 84E3338
 	.incbin "data/graphics/field_objects/pics/cushions/water_cushion.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigSnorlaxDoll: ; 84E33B8
+gFieldObjectPic_BigSnorlaxDoll: @ 84E33B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_snorlax_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigRhydonDoll: ; 84E35B8
+gFieldObjectPic_BigRhydonDoll: @ 84E35B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_rhydon_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigLaprasDoll: ; 84E37B8
+gFieldObjectPic_BigLaprasDoll: @ 84E37B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_lapras_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigVenusaurDoll: ; 84E39B8
+gFieldObjectPic_BigVenusaurDoll: @ 84E39B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_venusaur_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigCharizardDoll: ; 84E3BB8
+gFieldObjectPic_BigCharizardDoll: @ 84E3BB8
 	.incbin "data/graphics/field_objects/pics/dolls/big_charizard_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigBlastoiseDoll: ; 84E3DB8
+gFieldObjectPic_BigBlastoiseDoll: @ 84E3DB8
 	.incbin "data/graphics/field_objects/pics/dolls/big_blastoise_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigWailmerDoll: ; 84E3FB8
+gFieldObjectPic_BigWailmerDoll: @ 84E3FB8
 	.incbin "data/graphics/field_objects/pics/dolls/big_wailmer_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigRegirockDoll: ; 84E41B8
+gFieldObjectPic_BigRegirockDoll: @ 84E41B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_regirock_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigRegiceDoll: ; 84E43B8
+gFieldObjectPic_BigRegiceDoll: @ 84E43B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_regice_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BigRegisteelDoll: ; 84E45B8
+gFieldObjectPic_BigRegisteelDoll: @ 84E45B8
 	.incbin "data/graphics/field_objects/pics/dolls/big_registeel_doll.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CuttableTree_0: ; 84E47B8
+gFieldObjectPic_CuttableTree_0: @ 84E47B8
 	.incbin "data/graphics/field_objects/pics/misc/cuttable_tree/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CuttableTree_1: ; 84E4838
+gFieldObjectPic_CuttableTree_1: @ 84E4838
 	.incbin "data/graphics/field_objects/pics/misc/cuttable_tree/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CuttableTree_2: ; 84E48B8
+gFieldObjectPic_CuttableTree_2: @ 84E48B8
 	.incbin "data/graphics/field_objects/pics/misc/cuttable_tree/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CuttableTree_3: ; 84E4938
+gFieldObjectPic_CuttableTree_3: @ 84E4938
 	.incbin "data/graphics/field_objects/pics/misc/cuttable_tree/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BreakableRock_0: ; 84E49B8
+gFieldObjectPic_BreakableRock_0: @ 84E49B8
 	.incbin "data/graphics/field_objects/pics/misc/breakable_rock/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BreakableRock_1: ; 84E4A38
+gFieldObjectPic_BreakableRock_1: @ 84E4A38
 	.incbin "data/graphics/field_objects/pics/misc/breakable_rock/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BreakableRock_2: ; 84E4AB8
+gFieldObjectPic_BreakableRock_2: @ 84E4AB8
 	.incbin "data/graphics/field_objects/pics/misc/breakable_rock/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BreakableRock_3: ; 84E4B38
+gFieldObjectPic_BreakableRock_3: @ 84E4B38
 	.incbin "data/graphics/field_objects/pics/misc/breakable_rock/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PushableBoulder: ; 84E4BB8
+gFieldObjectPic_PushableBoulder: @ 84E4BB8
 	.incbin "data/graphics/field_objects/pics/misc/pushable_boulder.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MrBrineysBoat_0: ; 84E4C38
+gFieldObjectPic_MrBrineysBoat_0: @ 84E4C38
 	.incbin "data/graphics/field_objects/pics/misc/mr_brineys_boat/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MrBrineysBoat_1: ; 84E4E38
+gFieldObjectPic_MrBrineysBoat_1: @ 84E4E38
 	.incbin "data/graphics/field_objects/pics/misc/mr_brineys_boat/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MrBrineysBoat_2: ; 84E5038
+gFieldObjectPic_MrBrineysBoat_2: @ 84E5038
 	.incbin "data/graphics/field_objects/pics/misc/mr_brineys_boat/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Fossil: ; 84E5238
+gFieldObjectPic_Fossil: @ 84E5238
 	.incbin "data/graphics/field_objects/pics/misc/fossil.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SubmarineShadow: ; 84E52B8
+gFieldObjectPic_SubmarineShadow: @ 84E52B8
 	.incbin "data/graphics/field_objects/pics/misc/submarine_shadow.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette26: ; 84E5838
+gFieldObjectPalette26: @ 84E5838
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_26.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_Truck: ; 84E5858
+gFieldObjectPic_Truck: @ 84E5858
 	.incbin "data/graphics/field_objects/pics/misc/truck.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette14: ; 84E5CD8
+gFieldObjectPalette14: @ 84E5CD8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_14.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_VigorothCarryingBox_0: ; 84E5CF8
+gFieldObjectPic_VigorothCarryingBox_0: @ 84E5CF8
 	.incbin "data/graphics/field_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_VigorothCarryingBox_1: ; 84E5EF8
+gFieldObjectPic_VigorothCarryingBox_1: @ 84E5EF8
 	.incbin "data/graphics/field_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_VigorothCarryingBox_2: ; 84E60F8
+gFieldObjectPic_VigorothCarryingBox_2: @ 84E60F8
 	.incbin "data/graphics/field_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_VigorothFacingAway_0: ; 84E62F8
+gFieldObjectPic_VigorothFacingAway_0: @ 84E62F8
 	.incbin "data/graphics/field_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_VigorothFacingAway_1: ; 84E64F8
+gFieldObjectPic_VigorothFacingAway_1: @ 84E64F8
 	.incbin "data/graphics/field_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette15: ; 84E66F8
+gFieldObjectPalette15: @ 84E66F8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_15.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_BirchsBag: ; 84E6718
+gFieldObjectPic_BirchsBag: @ 84E6718
 	.incbin "data/graphics/field_objects/pics/misc/birchs_bag.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_0: ; 84E6798
+gFieldObjectPic_EnemyZigzagoon_0: @ 84E6798
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_1: ; 84E6998
+gFieldObjectPic_EnemyZigzagoon_1: @ 84E6998
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_2: ; 84E6B98
+gFieldObjectPic_EnemyZigzagoon_2: @ 84E6B98
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_3: ; 84E6D98
+gFieldObjectPic_EnemyZigzagoon_3: @ 84E6D98
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_4: ; 84E6F98
+gFieldObjectPic_EnemyZigzagoon_4: @ 84E6F98
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_5: ; 84E7198
+gFieldObjectPic_EnemyZigzagoon_5: @ 84E7198
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_6: ; 84E7398
+gFieldObjectPic_EnemyZigzagoon_6: @ 84E7398
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_7: ; 84E7598
+gFieldObjectPic_EnemyZigzagoon_7: @ 84E7598
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_EnemyZigzagoon_8: ; 84E7798
+gFieldObjectPic_EnemyZigzagoon_8: @ 84E7798
 	.incbin "data/graphics/field_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette16: ; 84E7998
+gFieldObjectPalette16: @ 84E7998
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_16.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_0: ; 84E79B8
+gFieldObjectPic_Poochyena_0: @ 84E79B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_1: ; 84E7BB8
+gFieldObjectPic_Poochyena_1: @ 84E7BB8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_2: ; 84E7DB8
+gFieldObjectPic_Poochyena_2: @ 84E7DB8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_3: ; 84E7FB8
+gFieldObjectPic_Poochyena_3: @ 84E7FB8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_4: ; 84E81B8
+gFieldObjectPic_Poochyena_4: @ 84E81B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_5: ; 84E83B8
+gFieldObjectPic_Poochyena_5: @ 84E83B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_6: ; 84E85B8
+gFieldObjectPic_Poochyena_6: @ 84E85B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_7: ; 84E87B8
+gFieldObjectPic_Poochyena_7: @ 84E87B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Poochyena_8: ; 84E89B8
+gFieldObjectPic_Poochyena_8: @ 84E89B8
 	.incbin "data/graphics/field_objects/pics/pokemon/poochyena/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette27: ; 84E8BB8
+gFieldObjectPalette27: @ 84E8BB8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_27.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_CableCar: ; 84E8BD8
+gFieldObjectPic_CableCar: @ 84E8BD8
 	.incbin "data/graphics/field_objects/pics/misc/cable_car.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette20: ; 84E93D8
+gFieldObjectPalette20: @ 84E93D8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_20.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_SSTidal: ; 84E93F8
+gFieldObjectPic_SSTidal: @ 84E93F8
 	.incbin "data/graphics/field_objects/pics/misc/ss_tidal.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette21: ; 84E9B78
+gFieldObjectPalette21: @ 84E9B78
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_21.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_0: ; 84E9B98
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_0: @ 84E9B98
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_1: ; 84E9C18
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_1: @ 84E9C18
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_2: ; 84E9C98
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_2: @ 84E9C98
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_3: ; 84E9D18
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_3: @ 84E9D18
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_4: ; 84E9D98
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_4: @ 84E9D98
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_5: ; 84E9E18
+gFieldEffectObjectPic_BerryTreeGrowthSparkle_5: @ 84E9E18
 	.incbin "data/graphics/field_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BerryTreeDirtPile: ; 84E9E98
+gFieldObjectPic_BerryTreeDirtPile: @ 84E9E98
 	.incbin "data/graphics/field_objects/pics/berry_trees/dirt_pile.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BerryTreeSprout_0: ; 84E9F18
+gFieldObjectPic_BerryTreeSprout_0: @ 84E9F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sprout/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_BerryTreeSprout_1: ; 84E9F98
+gFieldObjectPic_BerryTreeSprout_1: @ 84E9F98
 	.incbin "data/graphics/field_objects/pics/berry_trees/sprout/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_0: ; 84EA018
+gFieldObjectPic_PechaBerryTree_0: @ 84EA018
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_1: ; 84EA118
+gFieldObjectPic_PechaBerryTree_1: @ 84EA118
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_2: ; 84EA218
+gFieldObjectPic_PechaBerryTree_2: @ 84EA218
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_3: ; 84EA318
+gFieldObjectPic_PechaBerryTree_3: @ 84EA318
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_4: ; 84EA418
+gFieldObjectPic_PechaBerryTree_4: @ 84EA418
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PechaBerryTree_5: ; 84EA518
+gFieldObjectPic_PechaBerryTree_5: @ 84EA518
 	.incbin "data/graphics/field_objects/pics/berry_trees/pecha/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_0: ; 84EA618
+gFieldObjectPic_KelpsyBerryTree_0: @ 84EA618
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_1: ; 84EA718
+gFieldObjectPic_KelpsyBerryTree_1: @ 84EA718
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_2: ; 84EA818
+gFieldObjectPic_KelpsyBerryTree_2: @ 84EA818
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_3: ; 84EA918
+gFieldObjectPic_KelpsyBerryTree_3: @ 84EA918
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_4: ; 84EAA18
+gFieldObjectPic_KelpsyBerryTree_4: @ 84EAA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_KelpsyBerryTree_5: ; 84EAB18
+gFieldObjectPic_KelpsyBerryTree_5: @ 84EAB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/kelpsy/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_0: ; 84EAC18
+gFieldObjectPic_WepearBerryTree_0: @ 84EAC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_1: ; 84EAD18
+gFieldObjectPic_WepearBerryTree_1: @ 84EAD18
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_2: ; 84EAE18
+gFieldObjectPic_WepearBerryTree_2: @ 84EAE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_3: ; 84EAF18
+gFieldObjectPic_WepearBerryTree_3: @ 84EAF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_4: ; 84EB018
+gFieldObjectPic_WepearBerryTree_4: @ 84EB018
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WepearBerryTree_5: ; 84EB118
+gFieldObjectPic_WepearBerryTree_5: @ 84EB118
 	.incbin "data/graphics/field_objects/pics/berry_trees/wepear/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_0: ; 84EB218
+gFieldObjectPic_IapapaBerryTree_0: @ 84EB218
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_1: ; 84EB318
+gFieldObjectPic_IapapaBerryTree_1: @ 84EB318
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_2: ; 84EB418
+gFieldObjectPic_IapapaBerryTree_2: @ 84EB418
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_3: ; 84EB518
+gFieldObjectPic_IapapaBerryTree_3: @ 84EB518
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_4: ; 84EB618
+gFieldObjectPic_IapapaBerryTree_4: @ 84EB618
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_IapapaBerryTree_5: ; 84EB718
+gFieldObjectPic_IapapaBerryTree_5: @ 84EB718
 	.incbin "data/graphics/field_objects/pics/berry_trees/iapapa/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_0: ; 84EB818
+gFieldObjectPic_CheriBerryTree_0: @ 84EB818
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_1: ; 84EB918
+gFieldObjectPic_CheriBerryTree_1: @ 84EB918
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_2: ; 84EBA18
+gFieldObjectPic_CheriBerryTree_2: @ 84EBA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_3: ; 84EBB18
+gFieldObjectPic_CheriBerryTree_3: @ 84EBB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_4: ; 84EBC18
+gFieldObjectPic_CheriBerryTree_4: @ 84EBC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CheriBerryTree_5: ; 84EBD18
+gFieldObjectPic_CheriBerryTree_5: @ 84EBD18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cheri/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_0: ; 84EBE18
+gFieldObjectPic_FigyBerryTree_0: @ 84EBE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_1: ; 84EBF18
+gFieldObjectPic_FigyBerryTree_1: @ 84EBF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_2: ; 84EC018
+gFieldObjectPic_FigyBerryTree_2: @ 84EC018
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_3: ; 84EC118
+gFieldObjectPic_FigyBerryTree_3: @ 84EC118
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_4: ; 84EC218
+gFieldObjectPic_FigyBerryTree_4: @ 84EC218
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_FigyBerryTree_5: ; 84EC318
+gFieldObjectPic_FigyBerryTree_5: @ 84EC318
 	.incbin "data/graphics/field_objects/pics/berry_trees/figy/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_0: ; 84EC418
+gFieldObjectPic_MagoBerryTree_0: @ 84EC418
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_1: ; 84EC518
+gFieldObjectPic_MagoBerryTree_1: @ 84EC518
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_2: ; 84EC618
+gFieldObjectPic_MagoBerryTree_2: @ 84EC618
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_3: ; 84EC718
+gFieldObjectPic_MagoBerryTree_3: @ 84EC718
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_4: ; 84EC818
+gFieldObjectPic_MagoBerryTree_4: @ 84EC818
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MagoBerryTree_5: ; 84EC918
+gFieldObjectPic_MagoBerryTree_5: @ 84EC918
 	.incbin "data/graphics/field_objects/pics/berry_trees/mago/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_0: ; 84ECA18
+gFieldObjectPic_LumBerryTree_0: @ 84ECA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_1: ; 84ECB18
+gFieldObjectPic_LumBerryTree_1: @ 84ECB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_2: ; 84ECC18
+gFieldObjectPic_LumBerryTree_2: @ 84ECC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_3: ; 84ECD18
+gFieldObjectPic_LumBerryTree_3: @ 84ECD18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_4: ; 84ECE18
+gFieldObjectPic_LumBerryTree_4: @ 84ECE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LumBerryTree_5: ; 84ECF18
+gFieldObjectPic_LumBerryTree_5: @ 84ECF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/lum/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_0: ; 84ED018
+gFieldObjectPic_RazzBerryTree_0: @ 84ED018
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_1: ; 84ED118
+gFieldObjectPic_RazzBerryTree_1: @ 84ED118
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_2: ; 84ED218
+gFieldObjectPic_RazzBerryTree_2: @ 84ED218
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_3: ; 84ED318
+gFieldObjectPic_RazzBerryTree_3: @ 84ED318
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_4: ; 84ED418
+gFieldObjectPic_RazzBerryTree_4: @ 84ED418
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RazzBerryTree_5: ; 84ED518
+gFieldObjectPic_RazzBerryTree_5: @ 84ED518
 	.incbin "data/graphics/field_objects/pics/berry_trees/razz/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_0: ; 84ED618
+gFieldObjectPic_GrepaBerryTree_0: @ 84ED618
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_1: ; 84ED718
+gFieldObjectPic_GrepaBerryTree_1: @ 84ED718
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_2: ; 84ED818
+gFieldObjectPic_GrepaBerryTree_2: @ 84ED818
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_3: ; 84ED918
+gFieldObjectPic_GrepaBerryTree_3: @ 84ED918
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_4: ; 84EDA18
+gFieldObjectPic_GrepaBerryTree_4: @ 84EDA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_GrepaBerryTree_5: ; 84EDB18
+gFieldObjectPic_GrepaBerryTree_5: @ 84EDB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/grepa/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_0: ; 84EDC18
+gFieldObjectPic_RabutaBerryTree_0: @ 84EDC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_1: ; 84EDD18
+gFieldObjectPic_RabutaBerryTree_1: @ 84EDD18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_2: ; 84EDE18
+gFieldObjectPic_RabutaBerryTree_2: @ 84EDE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_3: ; 84EDF18
+gFieldObjectPic_RabutaBerryTree_3: @ 84EDF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_4: ; 84EE018
+gFieldObjectPic_RabutaBerryTree_4: @ 84EE018
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RabutaBerryTree_5: ; 84EE118
+gFieldObjectPic_RabutaBerryTree_5: @ 84EE118
 	.incbin "data/graphics/field_objects/pics/berry_trees/rabuta/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_0: ; 84EE218
+gFieldObjectPic_NomelBerryTree_0: @ 84EE218
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_1: ; 84EE318
+gFieldObjectPic_NomelBerryTree_1: @ 84EE318
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_2: ; 84EE418
+gFieldObjectPic_NomelBerryTree_2: @ 84EE418
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_3: ; 84EE518
+gFieldObjectPic_NomelBerryTree_3: @ 84EE518
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_4: ; 84EE618
+gFieldObjectPic_NomelBerryTree_4: @ 84EE618
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_NomelBerryTree_5: ; 84EE718
+gFieldObjectPic_NomelBerryTree_5: @ 84EE718
 	.incbin "data/graphics/field_objects/pics/berry_trees/nomel/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_0: ; 84EE818
+gFieldObjectPic_LeppaBerryTree_0: @ 84EE818
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_1: ; 84EE918
+gFieldObjectPic_LeppaBerryTree_1: @ 84EE918
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_2: ; 84EEA18
+gFieldObjectPic_LeppaBerryTree_2: @ 84EEA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_3: ; 84EEB18
+gFieldObjectPic_LeppaBerryTree_3: @ 84EEB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_4: ; 84EEC18
+gFieldObjectPic_LeppaBerryTree_4: @ 84EEC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LeppaBerryTree_5: ; 84EED18
+gFieldObjectPic_LeppaBerryTree_5: @ 84EED18
 	.incbin "data/graphics/field_objects/pics/berry_trees/leppa/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_0: ; 84EEE18
+gFieldObjectPic_LiechiBerryTree_0: @ 84EEE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_1: ; 84EEF18
+gFieldObjectPic_LiechiBerryTree_1: @ 84EEF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_2: ; 84EF018
+gFieldObjectPic_LiechiBerryTree_2: @ 84EF018
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_3: ; 84EF118
+gFieldObjectPic_LiechiBerryTree_3: @ 84EF118
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_4: ; 84EF218
+gFieldObjectPic_LiechiBerryTree_4: @ 84EF218
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LiechiBerryTree_5: ; 84EF318
+gFieldObjectPic_LiechiBerryTree_5: @ 84EF318
 	.incbin "data/graphics/field_objects/pics/berry_trees/liechi/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_0: ; 84EF418
+gFieldObjectPic_HondewBerryTree_0: @ 84EF418
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_1: ; 84EF518
+gFieldObjectPic_HondewBerryTree_1: @ 84EF518
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_2: ; 84EF618
+gFieldObjectPic_HondewBerryTree_2: @ 84EF618
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_3: ; 84EF718
+gFieldObjectPic_HondewBerryTree_3: @ 84EF718
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_4: ; 84EF818
+gFieldObjectPic_HondewBerryTree_4: @ 84EF818
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HondewBerryTree_5: ; 84EF918
+gFieldObjectPic_HondewBerryTree_5: @ 84EF918
 	.incbin "data/graphics/field_objects/pics/berry_trees/hondew/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_0: ; 84EFA18
+gFieldObjectPic_AguavBerryTree_0: @ 84EFA18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_1: ; 84EFB18
+gFieldObjectPic_AguavBerryTree_1: @ 84EFB18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_2: ; 84EFC18
+gFieldObjectPic_AguavBerryTree_2: @ 84EFC18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_3: ; 84EFD18
+gFieldObjectPic_AguavBerryTree_3: @ 84EFD18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_4: ; 84EFE18
+gFieldObjectPic_AguavBerryTree_4: @ 84EFE18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AguavBerryTree_5: ; 84EFF18
+gFieldObjectPic_AguavBerryTree_5: @ 84EFF18
 	.incbin "data/graphics/field_objects/pics/berry_trees/aguav/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_0: ; 84F0018
+gFieldObjectPic_WikiBerryTree_0: @ 84F0018
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_1: ; 84F0118
+gFieldObjectPic_WikiBerryTree_1: @ 84F0118
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_2: ; 84F0218
+gFieldObjectPic_WikiBerryTree_2: @ 84F0218
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_3: ; 84F0318
+gFieldObjectPic_WikiBerryTree_3: @ 84F0318
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_4: ; 84F0418
+gFieldObjectPic_WikiBerryTree_4: @ 84F0418
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_WikiBerryTree_5: ; 84F0518
+gFieldObjectPic_WikiBerryTree_5: @ 84F0518
 	.incbin "data/graphics/field_objects/pics/berry_trees/wiki/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_0: ; 84F0618
+gFieldObjectPic_PomegBerryTree_0: @ 84F0618
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_1: ; 84F0718
+gFieldObjectPic_PomegBerryTree_1: @ 84F0718
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_2: ; 84F0818
+gFieldObjectPic_PomegBerryTree_2: @ 84F0818
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_3: ; 84F0918
+gFieldObjectPic_PomegBerryTree_3: @ 84F0918
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_4: ; 84F0A18
+gFieldObjectPic_PomegBerryTree_4: @ 84F0A18
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PomegBerryTree_5: ; 84F0B18
+gFieldObjectPic_PomegBerryTree_5: @ 84F0B18
 	.incbin "data/graphics/field_objects/pics/berry_trees/pomeg/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_0: ; 84F0C18
+gFieldObjectPic_RawstBerryTree_0: @ 84F0C18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_1: ; 84F0D18
+gFieldObjectPic_RawstBerryTree_1: @ 84F0D18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_2: ; 84F0E18
+gFieldObjectPic_RawstBerryTree_2: @ 84F0E18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_3: ; 84F0F18
+gFieldObjectPic_RawstBerryTree_3: @ 84F0F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_4: ; 84F1018
+gFieldObjectPic_RawstBerryTree_4: @ 84F1018
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_RawstBerryTree_5: ; 84F1118
+gFieldObjectPic_RawstBerryTree_5: @ 84F1118
 	.incbin "data/graphics/field_objects/pics/berry_trees/rawst/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_0: ; 84F1218
+gFieldObjectPic_SpelonBerryTree_0: @ 84F1218
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_1: ; 84F1318
+gFieldObjectPic_SpelonBerryTree_1: @ 84F1318
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_2: ; 84F1418
+gFieldObjectPic_SpelonBerryTree_2: @ 84F1418
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_3: ; 84F1518
+gFieldObjectPic_SpelonBerryTree_3: @ 84F1518
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_4: ; 84F1618
+gFieldObjectPic_SpelonBerryTree_4: @ 84F1618
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SpelonBerryTree_5: ; 84F1718
+gFieldObjectPic_SpelonBerryTree_5: @ 84F1718
 	.incbin "data/graphics/field_objects/pics/berry_trees/spelon/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_0: ; 84F1818
+gFieldObjectPic_ChestoBerryTree_0: @ 84F1818
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_1: ; 84F1918
+gFieldObjectPic_ChestoBerryTree_1: @ 84F1918
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_2: ; 84F1A18
+gFieldObjectPic_ChestoBerryTree_2: @ 84F1A18
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_3: ; 84F1B18
+gFieldObjectPic_ChestoBerryTree_3: @ 84F1B18
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_4: ; 84F1C18
+gFieldObjectPic_ChestoBerryTree_4: @ 84F1C18
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_ChestoBerryTree_5: ; 84F1D18
+gFieldObjectPic_ChestoBerryTree_5: @ 84F1D18
 	.incbin "data/graphics/field_objects/pics/berry_trees/chesto/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_0: ; 84F1E18
+gFieldObjectPic_OranBerryTree_0: @ 84F1E18
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_1: ; 84F1F18
+gFieldObjectPic_OranBerryTree_1: @ 84F1F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_2: ; 84F2018
+gFieldObjectPic_OranBerryTree_2: @ 84F2018
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_3: ; 84F2118
+gFieldObjectPic_OranBerryTree_3: @ 84F2118
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_4: ; 84F2218
+gFieldObjectPic_OranBerryTree_4: @ 84F2218
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_OranBerryTree_5: ; 84F2318
+gFieldObjectPic_OranBerryTree_5: @ 84F2318
 	.incbin "data/graphics/field_objects/pics/berry_trees/oran/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_0: ; 84F2418
+gFieldObjectPic_PersimBerryTree_0: @ 84F2418
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_1: ; 84F2518
+gFieldObjectPic_PersimBerryTree_1: @ 84F2518
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_2: ; 84F2618
+gFieldObjectPic_PersimBerryTree_2: @ 84F2618
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_3: ; 84F2718
+gFieldObjectPic_PersimBerryTree_3: @ 84F2718
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_4: ; 84F2818
+gFieldObjectPic_PersimBerryTree_4: @ 84F2818
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PersimBerryTree_5: ; 84F2918
+gFieldObjectPic_PersimBerryTree_5: @ 84F2918
 	.incbin "data/graphics/field_objects/pics/berry_trees/persim/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_0: ; 84F2A18
+gFieldObjectPic_SitrusBerryTree_0: @ 84F2A18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_1: ; 84F2B18
+gFieldObjectPic_SitrusBerryTree_1: @ 84F2B18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_2: ; 84F2C18
+gFieldObjectPic_SitrusBerryTree_2: @ 84F2C18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_3: ; 84F2D18
+gFieldObjectPic_SitrusBerryTree_3: @ 84F2D18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_4: ; 84F2E18
+gFieldObjectPic_SitrusBerryTree_4: @ 84F2E18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_SitrusBerryTree_5: ; 84F2F18
+gFieldObjectPic_SitrusBerryTree_5: @ 84F2F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/sitrus/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_0: ; 84F3018
+gFieldObjectPic_AspearBerryTree_0: @ 84F3018
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_1: ; 84F3118
+gFieldObjectPic_AspearBerryTree_1: @ 84F3118
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_2: ; 84F3218
+gFieldObjectPic_AspearBerryTree_2: @ 84F3218
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_3: ; 84F3318
+gFieldObjectPic_AspearBerryTree_3: @ 84F3318
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_4: ; 84F3418
+gFieldObjectPic_AspearBerryTree_4: @ 84F3418
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_AspearBerryTree_5: ; 84F3518
+gFieldObjectPic_AspearBerryTree_5: @ 84F3518
 	.incbin "data/graphics/field_objects/pics/berry_trees/aspear/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_0: ; 84F3618
+gFieldObjectPic_PamtreBerryTree_0: @ 84F3618
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_1: ; 84F3718
+gFieldObjectPic_PamtreBerryTree_1: @ 84F3718
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_2: ; 84F3818
+gFieldObjectPic_PamtreBerryTree_2: @ 84F3818
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_3: ; 84F3918
+gFieldObjectPic_PamtreBerryTree_3: @ 84F3918
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_4: ; 84F3A18
+gFieldObjectPic_PamtreBerryTree_4: @ 84F3A18
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_PamtreBerryTree_5: ; 84F3B18
+gFieldObjectPic_PamtreBerryTree_5: @ 84F3B18
 	.incbin "data/graphics/field_objects/pics/berry_trees/pamtre/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_0: ; 84F3C18
+gFieldObjectPic_CornnBerryTree_0: @ 84F3C18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_1: ; 84F3D18
+gFieldObjectPic_CornnBerryTree_1: @ 84F3D18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_2: ; 84F3E18
+gFieldObjectPic_CornnBerryTree_2: @ 84F3E18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_3: ; 84F3F18
+gFieldObjectPic_CornnBerryTree_3: @ 84F3F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_4: ; 84F4018
+gFieldObjectPic_CornnBerryTree_4: @ 84F4018
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_CornnBerryTree_5: ; 84F4118
+gFieldObjectPic_CornnBerryTree_5: @ 84F4118
 	.incbin "data/graphics/field_objects/pics/berry_trees/cornn/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_0: ; 84F4218
+gFieldObjectPic_LansatBerryTree_0: @ 84F4218
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_1: ; 84F4318
+gFieldObjectPic_LansatBerryTree_1: @ 84F4318
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_2: ; 84F4418
+gFieldObjectPic_LansatBerryTree_2: @ 84F4418
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_3: ; 84F4518
+gFieldObjectPic_LansatBerryTree_3: @ 84F4518
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_4: ; 84F4618
+gFieldObjectPic_LansatBerryTree_4: @ 84F4618
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_LansatBerryTree_5: ; 84F4718
+gFieldObjectPic_LansatBerryTree_5: @ 84F4718
 	.incbin "data/graphics/field_objects/pics/berry_trees/lansat/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_0: ; 84F4818
+gFieldObjectPic_DurinBerryTree_0: @ 84F4818
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_1: ; 84F4918
+gFieldObjectPic_DurinBerryTree_1: @ 84F4918
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_2: ; 84F4A18
+gFieldObjectPic_DurinBerryTree_2: @ 84F4A18
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_3: ; 84F4B18
+gFieldObjectPic_DurinBerryTree_3: @ 84F4B18
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_4: ; 84F4C18
+gFieldObjectPic_DurinBerryTree_4: @ 84F4C18
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_DurinBerryTree_5: ; 84F4D18
+gFieldObjectPic_DurinBerryTree_5: @ 84F4D18
 	.incbin "data/graphics/field_objects/pics/berry_trees/durin/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_0: ; 84F4E18
+gFieldObjectPic_TamatoBerryTree_0: @ 84F4E18
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_1: ; 84F4F18
+gFieldObjectPic_TamatoBerryTree_1: @ 84F4F18
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_2: ; 84F5018
+gFieldObjectPic_TamatoBerryTree_2: @ 84F5018
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_3: ; 84F5118
+gFieldObjectPic_TamatoBerryTree_3: @ 84F5118
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_4: ; 84F5218
+gFieldObjectPic_TamatoBerryTree_4: @ 84F5218
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_TamatoBerryTree_5: ; 84F5318
+gFieldObjectPic_TamatoBerryTree_5: @ 84F5318
 	.incbin "data/graphics/field_objects/pics/berry_trees/tamato/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SurfBlob_0: ; 84F5418
+gFieldEffectObjectPic_SurfBlob_0: @ 84F5418
 	.incbin "data/graphics/field_objects/pics/effects/surf_blob/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SurfBlob_1: ; 84F5618
+gFieldEffectObjectPic_SurfBlob_1: @ 84F5618
 	.incbin "data/graphics/field_objects/pics/effects/surf_blob/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SurfBlob_2: ; 84F5818
+gFieldEffectObjectPic_SurfBlob_2: @ 84F5818
 	.incbin "data/graphics/field_objects/pics/effects/surf_blob/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_0: ; 84F5A18
+gFieldObjectPic_QuintyPlump_0: @ 84F5A18
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_1: ; 84F5C18
+gFieldObjectPic_QuintyPlump_1: @ 84F5C18
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_2: ; 84F5E18
+gFieldObjectPic_QuintyPlump_2: @ 84F5E18
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_3: ; 84F6018
+gFieldObjectPic_QuintyPlump_3: @ 84F6018
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_4: ; 84F6218
+gFieldObjectPic_QuintyPlump_4: @ 84F6218
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_5: ; 84F6418
+gFieldObjectPic_QuintyPlump_5: @ 84F6418
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_QuintyPlump_6: ; 84F6618
+gFieldObjectPic_QuintyPlump_6: @ 84F6618
 	.incbin "data/graphics/field_objects/pics/people/quinty_plump/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette12: ; 84F6818
+gFieldObjectPalette12: @ 84F6818
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_12.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPalette13: ; 84F6838
+gFieldObjectPalette13: @ 84F6838
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_13.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShadowSmall: ; 84F6858
+gFieldEffectObjectPic_ShadowSmall: @ 84F6858
 	.incbin "data/graphics/field_objects/pics/effects/shadow_small.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShadowMedium: ; 84F6878
+gFieldEffectObjectPic_ShadowMedium: @ 84F6878
 	.incbin "data/graphics/field_objects/pics/effects/shadow_medium.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShadowLarge: ; 84F68B8
+gFieldEffectObjectPic_ShadowLarge: @ 84F68B8
 	.incbin "data/graphics/field_objects/pics/effects/shadow_large.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShadowExtraLarge: ; 84F6938
+gFieldEffectObjectPic_ShadowExtraLarge: @ 84F6938
 	.incbin "data/graphics/field_objects/pics/effects/shadow_extra_large.4bpp"
 
 	.incbin "base_emerald.gba", 0x4f6d38, 0x160
 
 	.align 2, 0
 
-gFieldEffectObjectPalette6: ; 84F6E98
+gFieldEffectObjectPalette6: @ 84F6E98
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_06.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ripple_0: ; 84F6EB8
+gFieldEffectObjectPic_Ripple_0: @ 84F6EB8
 	.incbin "data/graphics/field_objects/pics/effects/ripple/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ripple_1: ; 84F6F38
+gFieldEffectObjectPic_Ripple_1: @ 84F6F38
 	.incbin "data/graphics/field_objects/pics/effects/ripple/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ripple_2: ; 84F6FB8
+gFieldEffectObjectPic_Ripple_2: @ 84F6FB8
 	.incbin "data/graphics/field_objects/pics/effects/ripple/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ripple_3: ; 84F7038
+gFieldEffectObjectPic_Ripple_3: @ 84F7038
 	.incbin "data/graphics/field_objects/pics/effects/ripple/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ripple_4: ; 84F70B8
+gFieldEffectObjectPic_Ripple_4: @ 84F70B8
 	.incbin "data/graphics/field_objects/pics/effects/ripple/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ash_0: ; 84F7138
+gFieldEffectObjectPic_Ash_0: @ 84F7138
 	.incbin "data/graphics/field_objects/pics/effects/ash/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ash_1: ; 84F71B8
+gFieldEffectObjectPic_Ash_1: @ 84F71B8
 	.incbin "data/graphics/field_objects/pics/effects/ash/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ash_2: ; 84F7238
+gFieldEffectObjectPic_Ash_2: @ 84F7238
 	.incbin "data/graphics/field_objects/pics/effects/ash/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ash_3: ; 84F72B8
+gFieldEffectObjectPic_Ash_3: @ 84F72B8
 	.incbin "data/graphics/field_objects/pics/effects/ash/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Ash_4: ; 84F7338
+gFieldEffectObjectPic_Ash_4: @ 84F7338
 	.incbin "data/graphics/field_objects/pics/effects/ash/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_0: ; 84F73B8
+gFieldEffectObjectPic_Arrow_0: @ 84F73B8
 	.incbin "data/graphics/field_objects/pics/effects/arrow/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_1: ; 84F7438
+gFieldEffectObjectPic_Arrow_1: @ 84F7438
 	.incbin "data/graphics/field_objects/pics/effects/arrow/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_2: ; 84F74B8
+gFieldEffectObjectPic_Arrow_2: @ 84F74B8
 	.incbin "data/graphics/field_objects/pics/effects/arrow/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_3: ; 84F7538
+gFieldEffectObjectPic_Arrow_3: @ 84F7538
 	.incbin "data/graphics/field_objects/pics/effects/arrow/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_4: ; 84F75B8
+gFieldEffectObjectPic_Arrow_4: @ 84F75B8
 	.incbin "data/graphics/field_objects/pics/effects/arrow/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_5: ; 84F7638
+gFieldEffectObjectPic_Arrow_5: @ 84F7638
 	.incbin "data/graphics/field_objects/pics/effects/arrow/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_6: ; 84F76B8
+gFieldEffectObjectPic_Arrow_6: @ 84F76B8
 	.incbin "data/graphics/field_objects/pics/effects/arrow/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Arrow_7: ; 84F7738
+gFieldEffectObjectPic_Arrow_7: @ 84F7738
 	.incbin "data/graphics/field_objects/pics/effects/arrow/7.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPalette0: ; 84F77B8
+gFieldEffectObjectPalette0: @ 84F77B8
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_00.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPalette1: ; 84F77D8
+gFieldEffectObjectPalette1: @ 84F77D8
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_01.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_GroundImpactDust_0: ; 84F77F8
+gFieldEffectObjectPic_GroundImpactDust_0: @ 84F77F8
 	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_GroundImpactDust_1: ; 84F7838
+gFieldEffectObjectPic_GroundImpactDust_1: @ 84F7838
 	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_GroundImpactDust_2: ; 84F7878
+gFieldEffectObjectPic_GroundImpactDust_2: @ 84F7878
 	.incbin "data/graphics/field_objects/pics/effects/ground_impact_dust/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopTallGrass_0: ; 84F78B8
+gFieldEffectObjectPic_BikeHopTallGrass_0: @ 84F78B8
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopTallGrass_1: ; 84F78F8
+gFieldEffectObjectPic_BikeHopTallGrass_1: @ 84F78F8
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopTallGrass_2: ; 84F7938
+gFieldEffectObjectPic_BikeHopTallGrass_2: @ 84F7938
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopTallGrass_3: ; 84F7978
+gFieldEffectObjectPic_BikeHopTallGrass_3: @ 84F7978
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
 
 	.incbin "base_emerald.gba", 0x4f79b8, 0x200
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_0: ; 84F7BB8
+gFieldEffectObjectPic_Unknown16_0: @ 84F7BB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_1: ; 84F7C38
+gFieldEffectObjectPic_Unknown16_1: @ 84F7C38
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_2: ; 84F7CB8
+gFieldEffectObjectPic_Unknown16_2: @ 84F7CB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_3: ; 84F7D38
+gFieldEffectObjectPic_Unknown16_3: @ 84F7D38
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_4: ; 84F7DB8
+gFieldEffectObjectPic_Unknown16_4: @ 84F7DB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/4.4bpp"
 
 	.incbin "base_emerald.gba", 0x4f7e38, 0x80
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown16_5: ; 84F7EB8
+gFieldEffectObjectPic_Unknown16_5: @ 84F7EB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_16/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_0: ; 84F7F38
+gFieldEffectObjectPic_Unknown17_0: @ 84F7F38
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_1: ; 84F7FB8
+gFieldEffectObjectPic_Unknown17_1: @ 84F7FB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_2: ; 84F8038
+gFieldEffectObjectPic_Unknown17_2: @ 84F8038
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_3: ; 84F80B8
+gFieldEffectObjectPic_Unknown17_3: @ 84F80B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_4: ; 84F8138
+gFieldEffectObjectPic_Unknown17_4: @ 84F8138
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_5: ; 84F81B8
+gFieldEffectObjectPic_Unknown17_5: @ 84F81B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_6: ; 84F8238
+gFieldEffectObjectPic_Unknown17_6: @ 84F8238
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown17_7: ; 84F82B8
+gFieldEffectObjectPic_Unknown17_7: @ 84F82B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_17/7.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown18_0: ; 84F8338
+gFieldEffectObjectPic_Unknown18_0: @ 84F8338
 	.incbin "data/graphics/field_objects/pics/effects/unknown_18/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown18_1: ; 84F83B8
+gFieldEffectObjectPic_Unknown18_1: @ 84F83B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_18/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown18_2: ; 84F8438
+gFieldEffectObjectPic_Unknown18_2: @ 84F8438
 	.incbin "data/graphics/field_objects/pics/effects/unknown_18/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown18_3: ; 84F84B8
+gFieldEffectObjectPic_Unknown18_3: @ 84F84B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_18/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_LongGrass_0: ; 84F8538
+gFieldEffectObjectPic_LongGrass_0: @ 84F8538
 	.incbin "data/graphics/field_objects/pics/effects/long_grass/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_LongGrass_1: ; 84F85B8
+gFieldEffectObjectPic_LongGrass_1: @ 84F85B8
 	.incbin "data/graphics/field_objects/pics/effects/long_grass/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_LongGrass_2: ; 84F8638
+gFieldEffectObjectPic_LongGrass_2: @ 84F8638
 	.incbin "data/graphics/field_objects/pics/effects/long_grass/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_LongGrass_3: ; 84F86B8
+gFieldEffectObjectPic_LongGrass_3: @ 84F86B8
 	.incbin "data/graphics/field_objects/pics/effects/long_grass/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TallGrass_0: ; 84F8738
+gFieldEffectObjectPic_TallGrass_0: @ 84F8738
 	.incbin "data/graphics/field_objects/pics/effects/tall_grass/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TallGrass_1: ; 84F87B8
+gFieldEffectObjectPic_TallGrass_1: @ 84F87B8
 	.incbin "data/graphics/field_objects/pics/effects/tall_grass/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TallGrass_2: ; 84F8838
+gFieldEffectObjectPic_TallGrass_2: @ 84F8838
 	.incbin "data/graphics/field_objects/pics/effects/tall_grass/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TallGrass_3: ; 84F88B8
+gFieldEffectObjectPic_TallGrass_3: @ 84F88B8
 	.incbin "data/graphics/field_objects/pics/effects/tall_grass/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TallGrass_4: ; 84F8938
+gFieldEffectObjectPic_TallGrass_4: @ 84F8938
 	.incbin "data/graphics/field_objects/pics/effects/tall_grass/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShortGrass_0: ; 84F89B8
+gFieldEffectObjectPic_ShortGrass_0: @ 84F89B8
 	.incbin "data/graphics/field_objects/pics/effects/short_grass/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_ShortGrass_1: ; 84F8A38
+gFieldEffectObjectPic_ShortGrass_1: @ 84F8A38
 	.incbin "data/graphics/field_objects/pics/effects/short_grass/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandFootprints_0: ; 84F8AB8
+gFieldEffectObjectPic_SandFootprints_0: @ 84F8AB8
 	.incbin "data/graphics/field_objects/pics/effects/sand_footprints/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandFootprints_1: ; 84F8B38
+gFieldEffectObjectPic_SandFootprints_1: @ 84F8B38
 	.incbin "data/graphics/field_objects/pics/effects/sand_footprints/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_DeepSandFootprints_0: ; 84F8BB8
+gFieldEffectObjectPic_DeepSandFootprints_0: @ 84F8BB8
 	.incbin "data/graphics/field_objects/pics/effects/deep_sand_footprints/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_DeepSandFootprints_1: ; 84F8C38
+gFieldEffectObjectPic_DeepSandFootprints_1: @ 84F8C38
 	.incbin "data/graphics/field_objects/pics/effects/deep_sand_footprints/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeTireTracks_0: ; 84F8CB8
+gFieldEffectObjectPic_BikeTireTracks_0: @ 84F8CB8
 	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeTireTracks_1: ; 84F8D38
+gFieldEffectObjectPic_BikeTireTracks_1: @ 84F8D38
 	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeTireTracks_2: ; 84F8DB8
+gFieldEffectObjectPic_BikeTireTracks_2: @ 84F8DB8
 	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeTireTracks_3: ; 84F8E38
+gFieldEffectObjectPic_BikeTireTracks_3: @ 84F8E38
 	.incbin "data/graphics/field_objects/pics/effects/bike_tire_tracks/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown19_0: ; 84F8EB8
+gFieldEffectObjectPic_Unknown19_0: @ 84F8EB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_19/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown19_1: ; 84F8F38
+gFieldEffectObjectPic_Unknown19_1: @ 84F8F38
 	.incbin "data/graphics/field_objects/pics/effects/unknown_19/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown19_2: ; 84F8FB8
+gFieldEffectObjectPic_Unknown19_2: @ 84F8FB8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_19/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown19_3: ; 84F9038
+gFieldEffectObjectPic_Unknown19_3: @ 84F9038
 	.incbin "data/graphics/field_objects/pics/effects/unknown_19/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown29_0: ; 84F90B8
+gFieldEffectObjectPic_Unknown29_0: @ 84F90B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_29/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown29_1: ; 84F90F8
+gFieldEffectObjectPic_Unknown29_1: @ 84F90F8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_29/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown29_2: ; 84F9138
+gFieldEffectObjectPic_Unknown29_2: @ 84F9138
 	.incbin "data/graphics/field_objects/pics/effects/unknown_29/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopBigSplash_0: ; 84F9178
+gFieldEffectObjectPic_BikeHopBigSplash_0: @ 84F9178
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopBigSplash_1: ; 84F91F8
+gFieldEffectObjectPic_BikeHopBigSplash_1: @ 84F91F8
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopBigSplash_2: ; 84F9278
+gFieldEffectObjectPic_BikeHopBigSplash_2: @ 84F9278
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopBigSplash_3: ; 84F92F8
+gFieldEffectObjectPic_BikeHopBigSplash_3: @ 84F92F8
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_big_splash/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Splash_0: ; 84F9378
+gFieldEffectObjectPic_Splash_0: @ 84F9378
 	.incbin "data/graphics/field_objects/pics/effects/splash/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Splash_1: ; 84F93B8
+gFieldEffectObjectPic_Splash_1: @ 84F93B8
 	.incbin "data/graphics/field_objects/pics/effects/splash/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopSmallSplash_0: ; 84F93F8
+gFieldEffectObjectPic_BikeHopSmallSplash_0: @ 84F93F8
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopSmallSplash_1: ; 84F9438
+gFieldEffectObjectPic_BikeHopSmallSplash_1: @ 84F9438
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_BikeHopSmallSplash_2: ; 84F9478
+gFieldEffectObjectPic_BikeHopSmallSplash_2: @ 84F9478
 	.incbin "data/graphics/field_objects/pics/effects/bike_hop_small_splash/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown20_0: ; 84F94B8
+gFieldEffectObjectPic_Unknown20_0: @ 84F94B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_20/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown20_1: ; 84F9538
+gFieldEffectObjectPic_Unknown20_1: @ 84F9538
 	.incbin "data/graphics/field_objects/pics/effects/unknown_20/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown20_2: ; 84F95B8
+gFieldEffectObjectPic_Unknown20_2: @ 84F95B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_20/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown20_3: ; 84F9638
+gFieldEffectObjectPic_Unknown20_3: @ 84F9638
 	.incbin "data/graphics/field_objects/pics/effects/unknown_20/3.4bpp"
 
 	.align 2, 0
 
-; unreferenced
-gFieldEffectObjectPic_Unknown20_4: ; 84F96B8
+@ unreferenced
+gFieldEffectObjectPic_Unknown20_4: @ 84F96B8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_20/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_0: ; 84F9738
+gFieldEffectObjectPic_TreeDisguise_0: @ 84F9738
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_1: ; 84F9838
+gFieldEffectObjectPic_TreeDisguise_1: @ 84F9838
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_2: ; 84F9938
+gFieldEffectObjectPic_TreeDisguise_2: @ 84F9938
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_3: ; 84F9A38
+gFieldEffectObjectPic_TreeDisguise_3: @ 84F9A38
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_4: ; 84F9B38
+gFieldEffectObjectPic_TreeDisguise_4: @ 84F9B38
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_5: ; 84F9C38
+gFieldEffectObjectPic_TreeDisguise_5: @ 84F9C38
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_TreeDisguise_6: ; 84F9D38
+gFieldEffectObjectPic_TreeDisguise_6: @ 84F9D38
 	.incbin "data/graphics/field_objects/pics/effects/tree_disguise/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_0: ; 84F9E38
+gFieldEffectObjectPic_MountainDisguise_0: @ 84F9E38
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_1: ; 84F9F38
+gFieldEffectObjectPic_MountainDisguise_1: @ 84F9F38
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_2: ; 84FA038
+gFieldEffectObjectPic_MountainDisguise_2: @ 84FA038
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_3: ; 84FA138
+gFieldEffectObjectPic_MountainDisguise_3: @ 84FA138
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_4: ; 84FA238
+gFieldEffectObjectPic_MountainDisguise_4: @ 84FA238
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_5: ; 84FA338
+gFieldEffectObjectPic_MountainDisguise_5: @ 84FA338
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_MountainDisguise_6: ; 84FA438
+gFieldEffectObjectPic_MountainDisguise_6: @ 84FA438
 	.incbin "data/graphics/field_objects/pics/effects/mountain_disguise/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_0: ; 84FA538
+gFieldEffectObjectPic_SandDisguisePlaceholder_0: @ 84FA538
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_1: ; 84FA638
+gFieldEffectObjectPic_SandDisguisePlaceholder_1: @ 84FA638
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_2: ; 84FA738
+gFieldEffectObjectPic_SandDisguisePlaceholder_2: @ 84FA738
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_3: ; 84FA838
+gFieldEffectObjectPic_SandDisguisePlaceholder_3: @ 84FA838
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_4: ; 84FA938
+gFieldEffectObjectPic_SandDisguisePlaceholder_4: @ 84FA938
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_5: ; 84FAA38
+gFieldEffectObjectPic_SandDisguisePlaceholder_5: @ 84FAA38
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_SandDisguisePlaceholder_6: ; 84FAB38
+gFieldEffectObjectPic_SandDisguisePlaceholder_6: @ 84FAB38
 	.incbin "data/graphics/field_objects/pics/effects/sand_disguise_placeholder/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_HotSpringsWater: ; 84FAC38
+gFieldEffectObjectPic_HotSpringsWater: @ 84FAC38
 	.incbin "data/graphics/field_objects/pics/effects/hot_springs_water.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPalette2: ; 84FACB8
+gFieldEffectObjectPalette2: @ 84FACB8
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_02.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_JumpOutOfAsh_0: ; 84FACD8
+gFieldEffectObjectPic_JumpOutOfAsh_0: @ 84FACD8
 	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_JumpOutOfAsh_1: ; 84FAD58
+gFieldEffectObjectPic_JumpOutOfAsh_1: @ 84FAD58
 	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_JumpOutOfAsh_2: ; 84FADD8
+gFieldEffectObjectPic_JumpOutOfAsh_2: @ 84FADD8
 	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_JumpOutOfAsh_3: ; 84FAE58
+gFieldEffectObjectPic_JumpOutOfAsh_3: @ 84FAE58
 	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_JumpOutOfAsh_4: ; 84FAED8
+gFieldEffectObjectPic_JumpOutOfAsh_4: @ 84FAED8
 	.incbin "data/graphics/field_objects/pics/effects/jump_out_of_ash/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown33_0: ; 84FAF58
+gFieldEffectObjectPic_Unknown33_0: @ 84FAF58
 	.incbin "data/graphics/field_objects/pics/effects/unknown_33/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown33_1: ; 84FAFD8
+gFieldEffectObjectPic_Unknown33_1: @ 84FAFD8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_33/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown33_2: ; 84FB058
+gFieldEffectObjectPic_Unknown33_2: @ 84FB058
 	.incbin "data/graphics/field_objects/pics/effects/unknown_33/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown33_3: ; 84FB0D8
+gFieldEffectObjectPic_Unknown33_3: @ 84FB0D8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_33/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown33_4: ; 84FB158
+gFieldEffectObjectPic_Unknown33_4: @ 84FB158
 	.incbin "data/graphics/field_objects/pics/effects/unknown_33/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_0: ; 84FB1D8
+gFieldEffectObjectPic_Bubbles_0: @ 84FB1D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_1: ; 84FB2D8
+gFieldEffectObjectPic_Bubbles_1: @ 84FB2D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_2: ; 84FB3D8
+gFieldEffectObjectPic_Bubbles_2: @ 84FB3D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/2.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_3: ; 84FB4D8
+gFieldEffectObjectPic_Bubbles_3: @ 84FB4D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/3.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_4: ; 84FB5D8
+gFieldEffectObjectPic_Bubbles_4: @ 84FB5D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/4.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_5: ; 84FB6D8
+gFieldEffectObjectPic_Bubbles_5: @ 84FB6D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/5.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_6: ; 84FB7D8
+gFieldEffectObjectPic_Bubbles_6: @ 84FB7D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/6.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bubbles_7: ; 84FB8D8
+gFieldEffectObjectPic_Bubbles_7: @ 84FB8D8
 	.incbin "data/graphics/field_objects/pics/effects/bubbles/7.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown35_0: ; 84FB9D8
+gFieldEffectObjectPic_Unknown35_0: @ 84FB9D8
 	.incbin "data/graphics/field_objects/pics/effects/unknown_35/0.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Unknown35_1: ; 84FBA58
+gFieldEffectObjectPic_Unknown35_1: @ 84FBA58
 	.incbin "data/graphics/field_objects/pics/effects/unknown_35/1.4bpp"
 
 	.align 2, 0
 
-gFieldEffectObjectPalette3: ; 84FBAD8
+gFieldEffectObjectPalette3: @ 84FBAD8
 	.incbin "data/graphics/field_objects/palettes/field_effect_object_palette_03.gbapal"
 
 	.align 2, 0
 
-gFieldEffectObjectPic_Bird: ; 84FBAF8
+gFieldEffectObjectPic_Bird: @ 84FBAF8
 	.incbin "data/graphics/field_objects/pics/effects/bird.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_0: ; 84FBCF8
+gFieldObjectPic_Juan_0: @ 84FBCF8
 	.incbin "data/graphics/field_objects/pics/people/juan/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_1: ; 84FBDF8
+gFieldObjectPic_Juan_1: @ 84FBDF8
 	.incbin "data/graphics/field_objects/pics/people/juan/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_2: ; 84FBEF8
+gFieldObjectPic_Juan_2: @ 84FBEF8
 	.incbin "data/graphics/field_objects/pics/people/juan/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_3: ; 84FBFF8
+gFieldObjectPic_Juan_3: @ 84FBFF8
 	.incbin "data/graphics/field_objects/pics/people/juan/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_4: ; 84FC0F8
+gFieldObjectPic_Juan_4: @ 84FC0F8
 	.incbin "data/graphics/field_objects/pics/people/juan/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_5: ; 84FC1F8
+gFieldObjectPic_Juan_5: @ 84FC1F8
 	.incbin "data/graphics/field_objects/pics/people/juan/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_6: ; 84FC2F8
+gFieldObjectPic_Juan_6: @ 84FC2F8
 	.incbin "data/graphics/field_objects/pics/people/juan/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_7: ; 84FC3F8
+gFieldObjectPic_Juan_7: @ 84FC3F8
 	.incbin "data/graphics/field_objects/pics/people/juan/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Juan_8: ; 84FC4F8
+gFieldObjectPic_Juan_8: @ 84FC4F8
 	.incbin "data/graphics/field_objects/pics/people/juan/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_0: ; 84FC5F8
+gFieldObjectPic_Scott_0: @ 84FC5F8
 	.incbin "data/graphics/field_objects/pics/people/scott/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_1: ; 84FC6F8
+gFieldObjectPic_Scott_1: @ 84FC6F8
 	.incbin "data/graphics/field_objects/pics/people/scott/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_2: ; 84FC7F8
+gFieldObjectPic_Scott_2: @ 84FC7F8
 	.incbin "data/graphics/field_objects/pics/people/scott/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_3: ; 84FC8F8
+gFieldObjectPic_Scott_3: @ 84FC8F8
 	.incbin "data/graphics/field_objects/pics/people/scott/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_4: ; 84FC9F8
+gFieldObjectPic_Scott_4: @ 84FC9F8
 	.incbin "data/graphics/field_objects/pics/people/scott/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_5: ; 84FCAF8
+gFieldObjectPic_Scott_5: @ 84FCAF8
 	.incbin "data/graphics/field_objects/pics/people/scott/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_6: ; 84FCBF8
+gFieldObjectPic_Scott_6: @ 84FCBF8
 	.incbin "data/graphics/field_objects/pics/people/scott/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_7: ; 84FCCF8
+gFieldObjectPic_Scott_7: @ 84FCCF8
 	.incbin "data/graphics/field_objects/pics/people/scott/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Scott_8: ; 84FCDF8
+gFieldObjectPic_Scott_8: @ 84FCDF8
 	.incbin "data/graphics/field_objects/pics/people/scott/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Statue: ; 84FCEF8
+gFieldObjectPic_Statue: @ 84FCEF8
 	.incbin "data/graphics/field_objects/pics/misc/statue.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_0: ; 84FCFF8
+gFieldObjectPic_Kirlia_0: @ 84FCFF8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_1: ; 84FD0F8
+gFieldObjectPic_Kirlia_1: @ 84FD0F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_2: ; 84FD1F8
+gFieldObjectPic_Kirlia_2: @ 84FD1F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_3: ; 84FD2F8
+gFieldObjectPic_Kirlia_3: @ 84FD2F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_4: ; 84FD3F8
+gFieldObjectPic_Kirlia_4: @ 84FD3F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_5: ; 84FD4F8
+gFieldObjectPic_Kirlia_5: @ 84FD4F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_6: ; 84FD5F8
+gFieldObjectPic_Kirlia_6: @ 84FD5F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_7: ; 84FD6F8
+gFieldObjectPic_Kirlia_7: @ 84FD6F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Kirlia_8: ; 84FD7F8
+gFieldObjectPic_Kirlia_8: @ 84FD7F8
 	.incbin "data/graphics/field_objects/pics/pokemon/kirlia/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_0: ; 84FD8F8
+gFieldObjectPic_Dusclops_0: @ 84FD8F8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_1: ; 84FD9F8
+gFieldObjectPic_Dusclops_1: @ 84FD9F8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_2: ; 84FDAF8
+gFieldObjectPic_Dusclops_2: @ 84FDAF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_3: ; 84FDBF8
+gFieldObjectPic_Dusclops_3: @ 84FDBF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_4: ; 84FDCF8
+gFieldObjectPic_Dusclops_4: @ 84FDCF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_5: ; 84FDDF8
+gFieldObjectPic_Dusclops_5: @ 84FDDF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_6: ; 84FDEF8
+gFieldObjectPic_Dusclops_6: @ 84FDEF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_7: ; 84FDFF8
+gFieldObjectPic_Dusclops_7: @ 84FDFF8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Dusclops_8: ; 84FE0F8
+gFieldObjectPic_Dusclops_8: @ 84FE0F8
 	.incbin "data/graphics/field_objects/pics/pokemon/dusclops/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MysteryEventDeliveryman_0: ; 84FE1F8
+gFieldObjectPic_MysteryEventDeliveryman_0: @ 84FE1F8
 	.incbin "data/graphics/field_objects/pics/people/mystery_event_deliveryman/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MysteryEventDeliveryman_1: ; 84FE2F8
+gFieldObjectPic_MysteryEventDeliveryman_1: @ 84FE2F8
 	.incbin "data/graphics/field_objects/pics/people/mystery_event_deliveryman/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MysteryEventDeliveryman_2: ; 84FE3F8
+gFieldObjectPic_MysteryEventDeliveryman_2: @ 84FE3F8
 	.incbin "data/graphics/field_objects/pics/people/mystery_event_deliveryman/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnionRoomAttendant_0: ; 84FE4F8
+gFieldObjectPic_UnionRoomAttendant_0: @ 84FE4F8
 	.incbin "data/graphics/field_objects/pics/people/union_room_attendant/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnionRoomAttendant_1: ; 84FE5F8
+gFieldObjectPic_UnionRoomAttendant_1: @ 84FE5F8
 	.incbin "data/graphics/field_objects/pics/people/union_room_attendant/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_UnionRoomAttendant_2: ; 84FE6F8
+gFieldObjectPic_UnionRoomAttendant_2: @ 84FE6F8
 	.incbin "data/graphics/field_objects/pics/people/union_room_attendant/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_MovingBox: ; 84FE7F8
+gFieldObjectPic_MovingBox: @ 84FE7F8
 	.incbin "data/graphics/field_objects/pics/misc/moving_box.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette19: ; 84FE878
+gFieldObjectPalette19: @ 84FE878
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_19.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_Sudowoodo_0: ; 84FE898
+gFieldObjectPic_Sudowoodo_0: @ 84FE898
 	.incbin "data/graphics/field_objects/pics/pokemon/sudowoodo/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sudowoodo_1: ; 84FE998
+gFieldObjectPic_Sudowoodo_1: @ 84FE998
 	.incbin "data/graphics/field_objects/pics/pokemon/sudowoodo/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Sudowoodo_2: ; 84FEA98
+gFieldObjectPic_Sudowoodo_2: @ 84FEA98
 	.incbin "data/graphics/field_objects/pics/pokemon/sudowoodo/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_0: ; 84FEB98
+gFieldObjectPic_Mew_0: @ 84FEB98
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_1: ; 84FEC98
+gFieldObjectPic_Mew_1: @ 84FEC98
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_2: ; 84FED98
+gFieldObjectPic_Mew_2: @ 84FED98
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_3: ; 84FEE98
+gFieldObjectPic_Mew_3: @ 84FEE98
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_4: ; 84FEF98
+gFieldObjectPic_Mew_4: @ 84FEF98
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_5: ; 84FF098
+gFieldObjectPic_Mew_5: @ 84FF098
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_6: ; 84FF198
+gFieldObjectPic_Mew_6: @ 84FF198
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_7: ; 84FF298
+gFieldObjectPic_Mew_7: @ 84FF298
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Mew_8: ; 84FF398
+gFieldObjectPic_Mew_8: @ 84FF398
 	.incbin "data/graphics/field_objects/pics/pokemon/mew/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette28: ; 84FF498
+gFieldObjectPalette28: @ 84FF498
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_28.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_0: ; 84FF4B8
+gFieldObjectPic_Red_0: @ 84FF4B8
 	.incbin "data/graphics/field_objects/pics/people/red/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_1: ; 84FF5B8
+gFieldObjectPic_Red_1: @ 84FF5B8
 	.incbin "data/graphics/field_objects/pics/people/red/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_2: ; 84FF6B8
+gFieldObjectPic_Red_2: @ 84FF6B8
 	.incbin "data/graphics/field_objects/pics/people/red/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_3: ; 84FF7B8
+gFieldObjectPic_Red_3: @ 84FF7B8
 	.incbin "data/graphics/field_objects/pics/people/red/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_4: ; 84FF8B8
+gFieldObjectPic_Red_4: @ 84FF8B8
 	.incbin "data/graphics/field_objects/pics/people/red/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_5: ; 84FF9B8
+gFieldObjectPic_Red_5: @ 84FF9B8
 	.incbin "data/graphics/field_objects/pics/people/red/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_6: ; 84FFAB8
+gFieldObjectPic_Red_6: @ 84FFAB8
 	.incbin "data/graphics/field_objects/pics/people/red/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_7: ; 84FFBB8
+gFieldObjectPic_Red_7: @ 84FFBB8
 	.incbin "data/graphics/field_objects/pics/people/red/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Red_8: ; 84FFCB8
+gFieldObjectPic_Red_8: @ 84FFCB8
 	.incbin "data/graphics/field_objects/pics/people/red/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_0: ; 84FFDB8
+gFieldObjectPic_Leaf_0: @ 84FFDB8
 	.incbin "data/graphics/field_objects/pics/people/leaf/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_1: ; 84FFEB8
+gFieldObjectPic_Leaf_1: @ 84FFEB8
 	.incbin "data/graphics/field_objects/pics/people/leaf/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_2: ; 84FFFB8
+gFieldObjectPic_Leaf_2: @ 84FFFB8
 	.incbin "data/graphics/field_objects/pics/people/leaf/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_3: ; 85000B8
+gFieldObjectPic_Leaf_3: @ 85000B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_4: ; 85001B8
+gFieldObjectPic_Leaf_4: @ 85001B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_5: ; 85002B8
+gFieldObjectPic_Leaf_5: @ 85002B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_6: ; 85003B8
+gFieldObjectPic_Leaf_6: @ 85003B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_7: ; 85004B8
+gFieldObjectPic_Leaf_7: @ 85004B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Leaf_8: ; 85005B8
+gFieldObjectPic_Leaf_8: @ 85005B8
 	.incbin "data/graphics/field_objects/pics/people/leaf/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette30: ; 85006B8
+gFieldObjectPalette30: @ 85006B8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_30.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_BirthIslandStone: ; 85006D8
+gFieldObjectPic_BirthIslandStone: @ 85006D8
 	.incbin "data/graphics/field_objects/pics/misc/birth_island_stone.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette29: ; 85008D8
+gFieldObjectPalette29: @ 85008D8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_29.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_Deoxys_0: ; 85008F8
+gFieldObjectPic_Deoxys_0: @ 85008F8
 	.incbin "data/graphics/field_objects/pics/pokemon/deoxys/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Deoxys_1: ; 8500AF8
+gFieldObjectPic_Deoxys_1: @ 8500AF8
 	.incbin "data/graphics/field_objects/pics/pokemon/deoxys/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_0: ; 8500CF8
+gFieldObjectPic_Anabel_0: @ 8500CF8
 	.incbin "data/graphics/field_objects/pics/people/anabel/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_1: ; 8500DF8
+gFieldObjectPic_Anabel_1: @ 8500DF8
 	.incbin "data/graphics/field_objects/pics/people/anabel/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_2: ; 8500EF8
+gFieldObjectPic_Anabel_2: @ 8500EF8
 	.incbin "data/graphics/field_objects/pics/people/anabel/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_3: ; 8500FF8
+gFieldObjectPic_Anabel_3: @ 8500FF8
 	.incbin "data/graphics/field_objects/pics/people/anabel/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_4: ; 85010F8
+gFieldObjectPic_Anabel_4: @ 85010F8
 	.incbin "data/graphics/field_objects/pics/people/anabel/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_5: ; 85011F8
+gFieldObjectPic_Anabel_5: @ 85011F8
 	.incbin "data/graphics/field_objects/pics/people/anabel/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_6: ; 85012F8
+gFieldObjectPic_Anabel_6: @ 85012F8
 	.incbin "data/graphics/field_objects/pics/people/anabel/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_7: ; 85013F8
+gFieldObjectPic_Anabel_7: @ 85013F8
 	.incbin "data/graphics/field_objects/pics/people/anabel/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Anabel_8: ; 85014F8
+gFieldObjectPic_Anabel_8: @ 85014F8
 	.incbin "data/graphics/field_objects/pics/people/anabel/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_0: ; 85015F8
+gFieldObjectPic_Tucker_0: @ 85015F8
 	.incbin "data/graphics/field_objects/pics/people/tucker/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_1: ; 85016F8
+gFieldObjectPic_Tucker_1: @ 85016F8
 	.incbin "data/graphics/field_objects/pics/people/tucker/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_2: ; 85017F8
+gFieldObjectPic_Tucker_2: @ 85017F8
 	.incbin "data/graphics/field_objects/pics/people/tucker/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_3: ; 85018F8
+gFieldObjectPic_Tucker_3: @ 85018F8
 	.incbin "data/graphics/field_objects/pics/people/tucker/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_4: ; 85019F8
+gFieldObjectPic_Tucker_4: @ 85019F8
 	.incbin "data/graphics/field_objects/pics/people/tucker/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_5: ; 8501AF8
+gFieldObjectPic_Tucker_5: @ 8501AF8
 	.incbin "data/graphics/field_objects/pics/people/tucker/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_6: ; 8501BF8
+gFieldObjectPic_Tucker_6: @ 8501BF8
 	.incbin "data/graphics/field_objects/pics/people/tucker/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_7: ; 8501CF8
+gFieldObjectPic_Tucker_7: @ 8501CF8
 	.incbin "data/graphics/field_objects/pics/people/tucker/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Tucker_8: ; 8501DF8
+gFieldObjectPic_Tucker_8: @ 8501DF8
 	.incbin "data/graphics/field_objects/pics/people/tucker/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_0: ; 8501EF8
+gFieldObjectPic_Spenser_0: @ 8501EF8
 	.incbin "data/graphics/field_objects/pics/people/spenser/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_1: ; 8501FF8
+gFieldObjectPic_Spenser_1: @ 8501FF8
 	.incbin "data/graphics/field_objects/pics/people/spenser/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_2: ; 85020F8
+gFieldObjectPic_Spenser_2: @ 85020F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_3: ; 85021F8
+gFieldObjectPic_Spenser_3: @ 85021F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_4: ; 85022F8
+gFieldObjectPic_Spenser_4: @ 85022F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_5: ; 85023F8
+gFieldObjectPic_Spenser_5: @ 85023F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_6: ; 85024F8
+gFieldObjectPic_Spenser_6: @ 85024F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_7: ; 85025F8
+gFieldObjectPic_Spenser_7: @ 85025F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Spenser_8: ; 85026F8
+gFieldObjectPic_Spenser_8: @ 85026F8
 	.incbin "data/graphics/field_objects/pics/people/spenser/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_0: ; 85027F8
+gFieldObjectPic_Greta_0: @ 85027F8
 	.incbin "data/graphics/field_objects/pics/people/greta/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_1: ; 85028F8
+gFieldObjectPic_Greta_1: @ 85028F8
 	.incbin "data/graphics/field_objects/pics/people/greta/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_2: ; 85029F8
+gFieldObjectPic_Greta_2: @ 85029F8
 	.incbin "data/graphics/field_objects/pics/people/greta/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_3: ; 8502AF8
+gFieldObjectPic_Greta_3: @ 8502AF8
 	.incbin "data/graphics/field_objects/pics/people/greta/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_4: ; 8502BF8
+gFieldObjectPic_Greta_4: @ 8502BF8
 	.incbin "data/graphics/field_objects/pics/people/greta/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_5: ; 8502CF8
+gFieldObjectPic_Greta_5: @ 8502CF8
 	.incbin "data/graphics/field_objects/pics/people/greta/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_6: ; 8502DF8
+gFieldObjectPic_Greta_6: @ 8502DF8
 	.incbin "data/graphics/field_objects/pics/people/greta/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_7: ; 8502EF8
+gFieldObjectPic_Greta_7: @ 8502EF8
 	.incbin "data/graphics/field_objects/pics/people/greta/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Greta_8: ; 8502FF8
+gFieldObjectPic_Greta_8: @ 8502FF8
 	.incbin "data/graphics/field_objects/pics/people/greta/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_0: ; 85030F8
+gFieldObjectPic_Noland_0: @ 85030F8
 	.incbin "data/graphics/field_objects/pics/people/noland/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_1: ; 85031F8
+gFieldObjectPic_Noland_1: @ 85031F8
 	.incbin "data/graphics/field_objects/pics/people/noland/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_2: ; 85032F8
+gFieldObjectPic_Noland_2: @ 85032F8
 	.incbin "data/graphics/field_objects/pics/people/noland/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_3: ; 85033F8
+gFieldObjectPic_Noland_3: @ 85033F8
 	.incbin "data/graphics/field_objects/pics/people/noland/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_4: ; 85034F8
+gFieldObjectPic_Noland_4: @ 85034F8
 	.incbin "data/graphics/field_objects/pics/people/noland/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_5: ; 85035F8
+gFieldObjectPic_Noland_5: @ 85035F8
 	.incbin "data/graphics/field_objects/pics/people/noland/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_6: ; 85036F8
+gFieldObjectPic_Noland_6: @ 85036F8
 	.incbin "data/graphics/field_objects/pics/people/noland/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_7: ; 85037F8
+gFieldObjectPic_Noland_7: @ 85037F8
 	.incbin "data/graphics/field_objects/pics/people/noland/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Noland_8: ; 85038F8
+gFieldObjectPic_Noland_8: @ 85038F8
 	.incbin "data/graphics/field_objects/pics/people/noland/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_0: ; 85039F8
+gFieldObjectPic_Lucy_0: @ 85039F8
 	.incbin "data/graphics/field_objects/pics/people/lucy/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_1: ; 8503AF8
+gFieldObjectPic_Lucy_1: @ 8503AF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_2: ; 8503BF8
+gFieldObjectPic_Lucy_2: @ 8503BF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_3: ; 8503CF8
+gFieldObjectPic_Lucy_3: @ 8503CF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_4: ; 8503DF8
+gFieldObjectPic_Lucy_4: @ 8503DF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_5: ; 8503EF8
+gFieldObjectPic_Lucy_5: @ 8503EF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_6: ; 8503FF8
+gFieldObjectPic_Lucy_6: @ 8503FF8
 	.incbin "data/graphics/field_objects/pics/people/lucy/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_7: ; 85040F8
+gFieldObjectPic_Lucy_7: @ 85040F8
 	.incbin "data/graphics/field_objects/pics/people/lucy/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lucy_8: ; 85041F8
+gFieldObjectPic_Lucy_8: @ 85041F8
 	.incbin "data/graphics/field_objects/pics/people/lucy/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_0: ; 85042F8
+gFieldObjectPic_Brandon_0: @ 85042F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_1: ; 85043F8
+gFieldObjectPic_Brandon_1: @ 85043F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_2: ; 85044F8
+gFieldObjectPic_Brandon_2: @ 85044F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/2.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_3: ; 85045F8
+gFieldObjectPic_Brandon_3: @ 85045F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/3.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_4: ; 85046F8
+gFieldObjectPic_Brandon_4: @ 85046F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/4.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_5: ; 85047F8
+gFieldObjectPic_Brandon_5: @ 85047F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/5.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_6: ; 85048F8
+gFieldObjectPic_Brandon_6: @ 85048F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/6.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_7: ; 85049F8
+gFieldObjectPic_Brandon_7: @ 85049F8
 	.incbin "data/graphics/field_objects/pics/people/brandon/7.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Brandon_8: ; 8504AF8
+gFieldObjectPic_Brandon_8: @ 8504AF8
 	.incbin "data/graphics/field_objects/pics/people/brandon/8.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lugia_0: ; 8504BF8
+gFieldObjectPic_Lugia_0: @ 8504BF8
 	.incbin "data/graphics/field_objects/pics/pokemon/lugia/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_Lugia_1: ; 8504DF8
+gFieldObjectPic_Lugia_1: @ 8504DF8
 	.incbin "data/graphics/field_objects/pics/pokemon/lugia/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette32: ; 8504FF8
+gFieldObjectPalette32: @ 8504FF8
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_32.gbapal"
 
 	.align 2, 0
 
-gFieldObjectPic_HoOh_0: ; 8505018
+gFieldObjectPic_HoOh_0: @ 8505018
 	.incbin "data/graphics/field_objects/pics/pokemon/ho_oh/0.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPic_HoOh_1: ; 8505218
+gFieldObjectPic_HoOh_1: @ 8505218
 	.incbin "data/graphics/field_objects/pics/pokemon/ho_oh/1.4bpp"
 
 	.align 2, 0
 
-gFieldObjectPalette31: ; 8505418
+gFieldObjectPalette31: @ 8505418
 	.incbin "data/graphics/field_objects/palettes/field_object_palette_31.gbapal"
diff --git a/data/graphics/field_objects/field_object_graphics_info.s b/data/graphics/field_objects/field_object_graphics_info.s
index 4dcfad3dd..cf1695545 100644
--- a/data/graphics/field_objects/field_object_graphics_info.s
+++ b/data/graphics/field_objects/field_object_graphics_info.s
@@ -1,15 +1,15 @@
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanNormal: ; 8509954
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+gFieldObjectGraphicsInfo_BrendanNormal: @ 8509954
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
+	.byte TRACKS_FOOT
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -18,16 +18,16 @@ gFieldObjectGraphicsInfo_BrendanNormal: ; 8509954
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanMachBike: ; 8509978
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanMachBike: @ 8509978
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -36,16 +36,16 @@ gFieldObjectGraphicsInfo_BrendanMachBike: ; 8509978
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanAcroBike: ; 850999C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanAcroBike: @ 850999C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -54,16 +54,16 @@ gFieldObjectGraphicsInfo_BrendanAcroBike: ; 850999C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanSurfing: ; 85099C0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanSurfing: @ 85099C0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Surfing
@@ -72,16 +72,16 @@ gFieldObjectGraphicsInfo_BrendanSurfing: ; 85099C0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanFieldMove: ; 85099E4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanFieldMove: @ 85099E4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_FieldMove
@@ -90,16 +90,16 @@ gFieldObjectGraphicsInfo_BrendanFieldMove: ; 85099E4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_QuintyPlump: ; 8509A08
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x110B ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_L << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_QuintyPlump: @ 8509A08
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x110B @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_QuintyPlump
@@ -108,16 +108,16 @@ gFieldObjectGraphicsInfo_QuintyPlump: ; 8509A08
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LittleBoy1: ; 8509A2C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LittleBoy1: @ 8509A2C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -126,16 +126,16 @@ gFieldObjectGraphicsInfo_LittleBoy1: ; 8509A2C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LittleGirl1: ; 8509A50
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LittleGirl1: @ 8509A50
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -144,16 +144,16 @@ gFieldObjectGraphicsInfo_LittleGirl1: ; 8509A50
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Boy1: ; 8509A74
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Boy1: @ 8509A74
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -162,16 +162,16 @@ gFieldObjectGraphicsInfo_Boy1: ; 8509A74
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Girl1: ; 8509A98
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Girl1: @ 8509A98
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -180,16 +180,16 @@ gFieldObjectGraphicsInfo_Girl1: ; 8509A98
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Boy2: ; 8509ABC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Boy2: @ 8509ABC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -198,16 +198,16 @@ gFieldObjectGraphicsInfo_Boy2: ; 8509ABC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Girl2: ; 8509AE0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Girl2: @ 8509AE0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -216,16 +216,16 @@ gFieldObjectGraphicsInfo_Girl2: ; 8509AE0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LittleBoy2: ; 8509B04
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LittleBoy2: @ 8509B04
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -234,16 +234,16 @@ gFieldObjectGraphicsInfo_LittleBoy2: ; 8509B04
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LittleGirl2: ; 8509B28
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LittleGirl2: @ 8509B28
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -252,16 +252,16 @@ gFieldObjectGraphicsInfo_LittleGirl2: ; 8509B28
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Boy3: ; 8509B4C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Boy3: @ 8509B4C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -270,16 +270,16 @@ gFieldObjectGraphicsInfo_Boy3: ; 8509B4C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Girl3: ; 8509B70
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Girl3: @ 8509B70
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -288,16 +288,16 @@ gFieldObjectGraphicsInfo_Girl3: ; 8509B70
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Boy4: ; 8509B94
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Boy4: @ 8509B94
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -306,16 +306,16 @@ gFieldObjectGraphicsInfo_Boy4: ; 8509B94
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman1: ; 8509BB8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman1: @ 8509BB8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -324,16 +324,16 @@ gFieldObjectGraphicsInfo_Woman1: ; 8509BB8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_FatMan: ; 8509BDC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_FatMan: @ 8509BDC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -342,16 +342,16 @@ gFieldObjectGraphicsInfo_FatMan: ; 8509BDC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman2: ; 8509C00
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman2: @ 8509C00
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -360,16 +360,16 @@ gFieldObjectGraphicsInfo_Woman2: ; 8509C00
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man1: ; 8509C24
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man1: @ 8509C24
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -378,16 +378,16 @@ gFieldObjectGraphicsInfo_Man1: ; 8509C24
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman3: ; 8509C48
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman3: @ 8509C48
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -396,16 +396,16 @@ gFieldObjectGraphicsInfo_Woman3: ; 8509C48
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_OldMan1: ; 8509C6C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_OldMan1: @ 8509C6C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -414,16 +414,16 @@ gFieldObjectGraphicsInfo_OldMan1: ; 8509C6C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_OldWoman1: ; 8509C90
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_OldWoman1: @ 8509C90
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -432,16 +432,16 @@ gFieldObjectGraphicsInfo_OldWoman1: ; 8509C90
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man2: ; 8509CB4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man2: @ 8509CB4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -450,16 +450,16 @@ gFieldObjectGraphicsInfo_Man2: ; 8509CB4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman4: ; 8509CD8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman4: @ 8509CD8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -468,16 +468,16 @@ gFieldObjectGraphicsInfo_Woman4: ; 8509CD8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man3: ; 8509CFC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man3: @ 8509CFC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -486,16 +486,16 @@ gFieldObjectGraphicsInfo_Man3: ; 8509CFC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman5: ; 8509D20
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman5: @ 8509D20
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -504,16 +504,16 @@ gFieldObjectGraphicsInfo_Woman5: ; 8509D20
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Cook: ; 8509D44
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Cook: @ 8509D44
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -522,16 +522,16 @@ gFieldObjectGraphicsInfo_Cook: ; 8509D44
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman6: ; 8509D68
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman6: @ 8509D68
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -540,16 +540,16 @@ gFieldObjectGraphicsInfo_Woman6: ; 8509D68
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_OldMan2: ; 8509D8C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_OldMan2: @ 8509D8C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -558,16 +558,16 @@ gFieldObjectGraphicsInfo_OldMan2: ; 8509D8C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_OldWoman2: ; 8509DB0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_OldWoman2: @ 8509DB0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -576,16 +576,16 @@ gFieldObjectGraphicsInfo_OldWoman2: ; 8509DB0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Camper: ; 8509DD4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Camper: @ 8509DD4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -594,16 +594,16 @@ gFieldObjectGraphicsInfo_Camper: ; 8509DD4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Picnicker: ; 8509DF8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Picnicker: @ 8509DF8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -612,16 +612,16 @@ gFieldObjectGraphicsInfo_Picnicker: ; 8509DF8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man4: ; 8509E1C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man4: @ 8509E1C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -630,16 +630,16 @@ gFieldObjectGraphicsInfo_Man4: ; 8509E1C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Woman7: ; 8509E40
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Woman7: @ 8509E40
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -648,16 +648,16 @@ gFieldObjectGraphicsInfo_Woman7: ; 8509E40
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Youngster: ; 8509E64
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Youngster: @ 8509E64
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -666,16 +666,16 @@ gFieldObjectGraphicsInfo_Youngster: ; 8509E64
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BugCatcher: ; 8509E88
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BugCatcher: @ 8509E88
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -684,16 +684,16 @@ gFieldObjectGraphicsInfo_BugCatcher: ; 8509E88
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_PsychicM: ; 8509EAC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_PsychicM: @ 8509EAC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -702,16 +702,16 @@ gFieldObjectGraphicsInfo_PsychicM: ; 8509EAC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SchoolKidM: ; 8509ED0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SchoolKidM: @ 8509ED0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -720,16 +720,16 @@ gFieldObjectGraphicsInfo_SchoolKidM: ; 8509ED0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Maniac: ; 8509EF4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Maniac: @ 8509EF4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -738,16 +738,16 @@ gFieldObjectGraphicsInfo_Maniac: ; 8509EF4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_HexManiac: ; 8509F18
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_HexManiac: @ 8509F18
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -756,16 +756,16 @@ gFieldObjectGraphicsInfo_HexManiac: ; 8509F18
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Rayquaza1: ; 8509F3C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 2048 ; image size
-	.2byte 64 ; width
-	.2byte 64 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Rayquaza1: @ 8509F3C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 2048 @ image size
+	.2byte 64 @ width
+	.2byte 64 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_64x64
 	.4byte gFieldObjectSpriteOamTables_64x64
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -774,16 +774,16 @@ gFieldObjectGraphicsInfo_Rayquaza1: ; 8509F3C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SwimmerM: ; 8509F60
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SwimmerM: @ 8509F60
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -792,16 +792,16 @@ gFieldObjectGraphicsInfo_SwimmerM: ; 8509F60
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SwimmerF: ; 8509F84
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SwimmerF: @ 8509F84
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -810,16 +810,16 @@ gFieldObjectGraphicsInfo_SwimmerF: ; 8509F84
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BlackBelt: ; 8509FA8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BlackBelt: @ 8509FA8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -828,16 +828,16 @@ gFieldObjectGraphicsInfo_BlackBelt: ; 8509FA8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Beauty: ; 8509FCC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Beauty: @ 8509FCC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -846,16 +846,16 @@ gFieldObjectGraphicsInfo_Beauty: ; 8509FCC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Scientist1: ; 8509FF0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Scientist1: @ 8509FF0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -864,16 +864,16 @@ gFieldObjectGraphicsInfo_Scientist1: ; 8509FF0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Lass: ; 850A014
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Lass: @ 850A014
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -882,16 +882,16 @@ gFieldObjectGraphicsInfo_Lass: ; 850A014
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Gentleman: ; 850A038
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Gentleman: @ 850A038
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -900,16 +900,16 @@ gFieldObjectGraphicsInfo_Gentleman: ; 850A038
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Sailor: ; 850A05C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Sailor: @ 850A05C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -918,16 +918,16 @@ gFieldObjectGraphicsInfo_Sailor: ; 850A05C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Fisherman: ; 850A080
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Fisherman: @ 850A080
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -936,16 +936,16 @@ gFieldObjectGraphicsInfo_Fisherman: ; 850A080
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RunningTriathleteM: ; 850A0A4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RunningTriathleteM: @ 850A0A4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -954,16 +954,16 @@ gFieldObjectGraphicsInfo_RunningTriathleteM: ; 850A0A4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RunningTriathleteF: ; 850A0C8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RunningTriathleteF: @ 850A0C8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -972,16 +972,16 @@ gFieldObjectGraphicsInfo_RunningTriathleteF: ; 850A0C8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TuberF: ; 850A0EC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TuberF: @ 850A0EC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -990,16 +990,16 @@ gFieldObjectGraphicsInfo_TuberF: ; 850A0EC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TuberM: ; 850A110
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TuberM: @ 850A110
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1008,16 +1008,16 @@ gFieldObjectGraphicsInfo_TuberM: ; 850A110
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Hiker: ; 850A134
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Hiker: @ 850A134
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1026,16 +1026,16 @@ gFieldObjectGraphicsInfo_Hiker: ; 850A134
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_CyclingTriathleteM: ; 850A158
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_CyclingTriathleteM: @ 850A158
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -1044,16 +1044,16 @@ gFieldObjectGraphicsInfo_CyclingTriathleteM: ; 850A158
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_CyclingTriathleteF: ; 850A17C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_CyclingTriathleteF: @ 850A17C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -1062,16 +1062,16 @@ gFieldObjectGraphicsInfo_CyclingTriathleteF: ; 850A17C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Nurse: ; 850A1A0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Nurse: @ 850A1A0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Nurse
@@ -1080,16 +1080,16 @@ gFieldObjectGraphicsInfo_Nurse: ; 850A1A0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ItemBall: ; 850A1C4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ItemBall: @ 850A1C4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1098,34 +1098,34 @@ gFieldObjectGraphicsInfo_ItemBall: ; 850A1C4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BerryTree: ; 850A1E8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BerryTree: @ 850A1E8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
-	.4byte NULL ; sprite OAM tables
+	.4byte NULL @ sprite OAM tables
 	.4byte gFieldObjectImageAnimTable_BerryTree
 	.4byte gFieldObjectPicTable_PechaBerryTree
 	.4byte gDummyObjectRotScalAnimTable
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BerryTreeEarlyStages: ; 850A20C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BerryTreeEarlyStages: @ 850A20C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_BerryTree
@@ -1134,16 +1134,16 @@ gFieldObjectGraphicsInfo_BerryTreeEarlyStages: ; 850A20C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BerryTreeLateStages: ; 850A230
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BerryTreeLateStages: @ 850A230
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BerryTree
@@ -1152,16 +1152,16 @@ gFieldObjectGraphicsInfo_BerryTreeLateStages: ; 850A230
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ProfBirch: ; 850A254
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ProfBirch: @ 850A254
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1170,16 +1170,16 @@ gFieldObjectGraphicsInfo_ProfBirch: ; 850A254
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man5: ; 850A278
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man5: @ 850A278
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1188,16 +1188,16 @@ gFieldObjectGraphicsInfo_Man5: ; 850A278
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man6: ; 850A29C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man6: @ 850A29C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1206,16 +1206,16 @@ gFieldObjectGraphicsInfo_Man6: ; 850A29C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ReporterM: ; 850A2C0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ReporterM: @ 850A2C0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1224,16 +1224,16 @@ gFieldObjectGraphicsInfo_ReporterM: ; 850A2C0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ReporterF: ; 850A2E4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ReporterF: @ 850A2E4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1242,16 +1242,16 @@ gFieldObjectGraphicsInfo_ReporterF: ; 850A2E4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Bard: ; 850A308
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Bard: @ 850A308
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1260,16 +1260,16 @@ gFieldObjectGraphicsInfo_Bard: ; 850A308
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Hipster: ; 850A32C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Hipster: @ 850A32C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1278,16 +1278,16 @@ gFieldObjectGraphicsInfo_Hipster: ; 850A32C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Trader: ; 850A350
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Trader: @ 850A350
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1296,16 +1296,16 @@ gFieldObjectGraphicsInfo_Trader: ; 850A350
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Storyteller: ; 850A374
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Storyteller: @ 850A374
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1314,16 +1314,16 @@ gFieldObjectGraphicsInfo_Storyteller: ; 850A374
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Giddy: ; 850A398
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Giddy: @ 850A398
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1332,16 +1332,16 @@ gFieldObjectGraphicsInfo_Giddy: ; 850A398
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1: ; 850A3BC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1: @ 850A3BC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1350,16 +1350,16 @@ gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1: ; 850A3BC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2: ; 850A3E0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2: @ 850A3E0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1368,16 +1368,16 @@ gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2: ; 850A3E0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedNatuDoll: ; 850A404
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedNatuDoll: @ 850A404
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1386,16 +1386,16 @@ gFieldObjectGraphicsInfo_UnusedNatuDoll: ; 850A404
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedMagnemiteDoll: ; 850A428
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedMagnemiteDoll: @ 850A428
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1404,16 +1404,16 @@ gFieldObjectGraphicsInfo_UnusedMagnemiteDoll: ; 850A428
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedSquirtleDoll: ; 850A44C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedSquirtleDoll: @ 850A44C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1422,16 +1422,16 @@ gFieldObjectGraphicsInfo_UnusedSquirtleDoll: ; 850A44C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedWooperDoll: ; 850A470
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedWooperDoll: @ 850A470
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1440,16 +1440,16 @@ gFieldObjectGraphicsInfo_UnusedWooperDoll: ; 850A470
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedPikachuDoll: ; 850A494
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedPikachuDoll: @ 850A494
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1458,16 +1458,16 @@ gFieldObjectGraphicsInfo_UnusedPikachuDoll: ; 850A494
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnusedPorygon2Doll: ; 850A4B8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnusedPorygon2Doll: @ 850A4B8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1476,16 +1476,16 @@ gFieldObjectGraphicsInfo_UnusedPorygon2Doll: ; 850A4B8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_CuttableTree: ; 850A4DC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_CuttableTree: @ 850A4DC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_CuttableTree
@@ -1494,16 +1494,16 @@ gFieldObjectGraphicsInfo_CuttableTree: ; 850A4DC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MartEmployee: ; 850A500
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MartEmployee: @ 850A500
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1512,16 +1512,16 @@ gFieldObjectGraphicsInfo_MartEmployee: ; 850A500
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RooftopSaleWoman: ; 850A524
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RooftopSaleWoman: @ 850A524
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1530,16 +1530,16 @@ gFieldObjectGraphicsInfo_RooftopSaleWoman: ; 850A524
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Teala: ; 850A548
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Teala: @ 850A548
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1548,16 +1548,16 @@ gFieldObjectGraphicsInfo_Teala: ; 850A548
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BreakableRock: ; 850A56C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BreakableRock: @ 850A56C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_BreakableRock
@@ -1566,16 +1566,16 @@ gFieldObjectGraphicsInfo_BreakableRock: ; 850A56C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_PushableBoulder: ; 850A590
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_PushableBoulder: @ 850A590
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1584,16 +1584,16 @@ gFieldObjectGraphicsInfo_PushableBoulder: ; 850A590
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MrBrineysBoat: ; 850A5B4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MrBrineysBoat: @ 850A5B4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1602,16 +1602,16 @@ gFieldObjectGraphicsInfo_MrBrineysBoat: ; 850A5B4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayNormal: ; 850A5D8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayNormal: @ 850A5D8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -1620,16 +1620,16 @@ gFieldObjectGraphicsInfo_MayNormal: ; 850A5D8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayMachBike: ; 850A5FC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayMachBike: @ 850A5FC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1638,16 +1638,16 @@ gFieldObjectGraphicsInfo_MayMachBike: ; 850A5FC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayAcroBike: ; 850A620
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayAcroBike: @ 850A620
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -1656,16 +1656,16 @@ gFieldObjectGraphicsInfo_MayAcroBike: ; 850A620
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MaySurfing: ; 850A644
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MaySurfing: @ 850A644
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Surfing
@@ -1674,16 +1674,16 @@ gFieldObjectGraphicsInfo_MaySurfing: ; 850A644
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayFieldMove: ; 850A668
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayFieldMove: @ 850A668
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_FieldMove
@@ -1692,16 +1692,16 @@ gFieldObjectGraphicsInfo_MayFieldMove: ; 850A668
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Truck: ; 850A68C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x110D ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 1152 ; image size
-	.2byte 48 ; width
-	.2byte 48 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Truck: @ 850A68C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x110D @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 1152 @ image size
+	.2byte 48 @ width
+	.2byte 48 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_Truck
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1710,16 +1710,16 @@ gFieldObjectGraphicsInfo_Truck: ; 850A68C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_VigorothCarryingBox: ; 850A6B0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x110E ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_VigorothCarryingBox: @ 850A6B0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x110E @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1728,16 +1728,16 @@ gFieldObjectGraphicsInfo_VigorothCarryingBox: ; 850A6B0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_VigorothFacingAway: ; 850A6D4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x110E ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_VigorothFacingAway: @ 850A6D4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x110E @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1746,16 +1746,16 @@ gFieldObjectGraphicsInfo_VigorothFacingAway: ; 850A6D4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BirchsBag: ; 850A6F8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BirchsBag: @ 850A6F8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -1764,16 +1764,16 @@ gFieldObjectGraphicsInfo_BirchsBag: ; 850A6F8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_EnemyZigzagoon: ; 850A71C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x110F ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_EnemyZigzagoon: @ 850A71C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x110F @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1782,16 +1782,16 @@ gFieldObjectGraphicsInfo_EnemyZigzagoon: ; 850A71C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Poochyena: ; 850A740
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111C ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Poochyena: @ 850A740
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111C @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1800,16 +1800,16 @@ gFieldObjectGraphicsInfo_Poochyena: ; 850A740
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Artist: ; 850A764
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Artist: @ 850A764
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1818,16 +1818,16 @@ gFieldObjectGraphicsInfo_Artist: ; 850A764
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalBrendanNormal: ; 850A788
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalBrendanNormal: @ 850A788
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -1836,16 +1836,16 @@ gFieldObjectGraphicsInfo_RivalBrendanNormal: ; 850A788
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalBrendanMachBike: ; 850A7AC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalBrendanMachBike: @ 850A7AC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1854,16 +1854,16 @@ gFieldObjectGraphicsInfo_RivalBrendanMachBike: ; 850A7AC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalBrendanAcroBike: ; 850A7D0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalBrendanAcroBike: @ 850A7D0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -1872,16 +1872,16 @@ gFieldObjectGraphicsInfo_RivalBrendanAcroBike: ; 850A7D0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalBrendanSurfing: ; 850A7F4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalBrendanSurfing: @ 850A7F4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Surfing
@@ -1890,16 +1890,16 @@ gFieldObjectGraphicsInfo_RivalBrendanSurfing: ; 850A7F4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalBrendanFieldMove: ; 850A818
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalBrendanFieldMove: @ 850A818
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_FieldMove
@@ -1908,16 +1908,16 @@ gFieldObjectGraphicsInfo_RivalBrendanFieldMove: ; 850A818
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalMayNormal: ; 850A83C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalMayNormal: @ 850A83C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -1926,16 +1926,16 @@ gFieldObjectGraphicsInfo_RivalMayNormal: ; 850A83C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalMayMachBike: ; 850A860
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalMayMachBike: @ 850A860
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -1944,16 +1944,16 @@ gFieldObjectGraphicsInfo_RivalMayMachBike: ; 850A860
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalMayAcroBike: ; 850A884
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalMayAcroBike: @ 850A884
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_BIKE_TIRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_AcroBike
@@ -1962,16 +1962,16 @@ gFieldObjectGraphicsInfo_RivalMayAcroBike: ; 850A884
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalMaySurfing: ; 850A8A8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalMaySurfing: @ 850A8A8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Surfing
@@ -1980,16 +1980,16 @@ gFieldObjectGraphicsInfo_RivalMaySurfing: ; 850A8A8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RivalMayFieldMove: ; 850A8CC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RivalMayFieldMove: @ 850A8CC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_FieldMove
@@ -1998,16 +1998,16 @@ gFieldObjectGraphicsInfo_RivalMayFieldMove: ; 850A8CC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Cameraman: ; 850A8F0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Cameraman: @ 850A8F0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2016,16 +2016,16 @@ gFieldObjectGraphicsInfo_Cameraman: ; 850A8F0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanUnderwater: ; 850A914
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1115 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanUnderwater: @ 850A914
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1115 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2034,16 +2034,16 @@ gFieldObjectGraphicsInfo_BrendanUnderwater: ; 850A914
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayUnderwater: ; 850A938
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1115 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayUnderwater: @ 850A938
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1115 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2052,16 +2052,16 @@ gFieldObjectGraphicsInfo_MayUnderwater: ; 850A938
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MovingBox: ; 850A95C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1112 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MovingBox: @ 850A95C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1112 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2070,16 +2070,16 @@ gFieldObjectGraphicsInfo_MovingBox: ; 850A95C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_CableCar: ; 850A980
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1113 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 2048 ; image size
-	.2byte 64 ; width
-	.2byte 64 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_CableCar: @ 850A980
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1113 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 2048 @ image size
+	.2byte 64 @ width
+	.2byte 64 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_64x64
 	.4byte gFieldObjectSpriteOamTables_64x64
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2088,16 +2088,16 @@ gFieldObjectGraphicsInfo_CableCar: ; 850A980
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Scientist2: ; 850A9A4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Scientist2: @ 850A9A4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2106,16 +2106,16 @@ gFieldObjectGraphicsInfo_Scientist2: ; 850A9A4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Man7: ; 850A9C8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Man7: @ 850A9C8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2124,16 +2124,16 @@ gFieldObjectGraphicsInfo_Man7: ; 850A9C8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_AquaMemberM: ; 850A9EC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_AquaMemberM: @ 850A9EC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2142,16 +2142,16 @@ gFieldObjectGraphicsInfo_AquaMemberM: ; 850A9EC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_AquaMemberF: ; 850AA10
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_AquaMemberF: @ 850AA10
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2160,16 +2160,16 @@ gFieldObjectGraphicsInfo_AquaMemberF: ; 850AA10
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MagmaMemberM: ; 850AA34
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MagmaMemberM: @ 850AA34
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2178,16 +2178,16 @@ gFieldObjectGraphicsInfo_MagmaMemberM: ; 850AA34
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MagmaMemberF: ; 850AA58
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MagmaMemberF: @ 850AA58
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2196,16 +2196,16 @@ gFieldObjectGraphicsInfo_MagmaMemberF: ; 850AA58
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Sidney: ; 850AA7C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Sidney: @ 850AA7C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2214,16 +2214,16 @@ gFieldObjectGraphicsInfo_Sidney: ; 850AA7C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Phoebe: ; 850AAA0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Phoebe: @ 850AAA0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2232,16 +2232,16 @@ gFieldObjectGraphicsInfo_Phoebe: ; 850AAA0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Glacia: ; 850AAC4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Glacia: @ 850AAC4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2250,16 +2250,16 @@ gFieldObjectGraphicsInfo_Glacia: ; 850AAC4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Drake: ; 850AAE8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Drake: @ 850AAE8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2268,16 +2268,16 @@ gFieldObjectGraphicsInfo_Drake: ; 850AAE8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Roxanne: ; 850AB0C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Roxanne: @ 850AB0C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2286,16 +2286,16 @@ gFieldObjectGraphicsInfo_Roxanne: ; 850AB0C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Brawly: ; 850AB30
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Brawly: @ 850AB30
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2304,16 +2304,16 @@ gFieldObjectGraphicsInfo_Brawly: ; 850AB30
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Wattson: ; 850AB54
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Wattson: @ 850AB54
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2322,16 +2322,16 @@ gFieldObjectGraphicsInfo_Wattson: ; 850AB54
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Flannery: ; 850AB78
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Flannery: @ 850AB78
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2340,16 +2340,16 @@ gFieldObjectGraphicsInfo_Flannery: ; 850AB78
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Norman: ; 850AB9C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Norman: @ 850AB9C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2358,16 +2358,16 @@ gFieldObjectGraphicsInfo_Norman: ; 850AB9C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Winona: ; 850ABC0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Winona: @ 850ABC0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2376,16 +2376,16 @@ gFieldObjectGraphicsInfo_Winona: ; 850ABC0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Liza: ; 850ABE4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Liza: @ 850ABE4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2394,16 +2394,16 @@ gFieldObjectGraphicsInfo_Liza: ; 850ABE4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Tate: ; 850AC08
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Tate: @ 850AC08
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2412,16 +2412,16 @@ gFieldObjectGraphicsInfo_Tate: ; 850AC08
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Wallace: ; 850AC2C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Wallace: @ 850AC2C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2430,16 +2430,16 @@ gFieldObjectGraphicsInfo_Wallace: ; 850AC2C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Steven: ; 850AC50
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Steven: @ 850AC50
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2448,16 +2448,16 @@ gFieldObjectGraphicsInfo_Steven: ; 850AC50
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Wally: ; 850AC74
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Wally: @ 850AC74
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2466,16 +2466,16 @@ gFieldObjectGraphicsInfo_Wally: ; 850AC74
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RubySapphireLittleBoy: ; 850AC98
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RubySapphireLittleBoy: @ 850AC98
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2484,16 +2484,16 @@ gFieldObjectGraphicsInfo_RubySapphireLittleBoy: ; 850AC98
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanFishing: ; 850ACBC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanFishing: @ 850ACBC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Fishing
@@ -2502,16 +2502,16 @@ gFieldObjectGraphicsInfo_BrendanFishing: ; 850ACBC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayFishing: ; 850ACE0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayFishing: @ 850ACE0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Fishing
@@ -2520,16 +2520,16 @@ gFieldObjectGraphicsInfo_MayFishing: ; 850ACE0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_HotSpringsOldWoman: ; 850AD04
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_HotSpringsOldWoman: @ 850AD04
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2538,16 +2538,16 @@ gFieldObjectGraphicsInfo_HotSpringsOldWoman: ; 850AD04
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SSTidal: ; 850AD28
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1114 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 1920 ; image size
-	.2byte 96 ; width
-	.2byte 40 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SSTidal: @ 850AD28
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1114 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 1920 @ image size
+	.2byte 96 @ width
+	.2byte 40 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_8x8
 	.4byte gFieldObjectSpriteOamTables_SSTidal
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2556,16 +2556,16 @@ gFieldObjectGraphicsInfo_SSTidal: ; 850AD28
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SubmarineShadow: ; 850AD4C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111B ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 1408 ; image size
-	.2byte 88 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SubmarineShadow: @ 850AD4C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111B @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 1408 @ image size
+	.2byte 88 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_8x8
 	.4byte gFieldObjectSpriteOamTables_SubmarineShadow
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -2574,16 +2574,16 @@ gFieldObjectGraphicsInfo_SubmarineShadow: ; 850AD4C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_PichuDoll: ; 850AD70
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_PichuDoll: @ 850AD70
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2592,16 +2592,16 @@ gFieldObjectGraphicsInfo_PichuDoll: ; 850AD70
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_PikachuDoll: ; 850AD94
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_PikachuDoll: @ 850AD94
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2610,16 +2610,16 @@ gFieldObjectGraphicsInfo_PikachuDoll: ; 850AD94
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MarillDoll: ; 850ADB8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MarillDoll: @ 850ADB8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2628,16 +2628,16 @@ gFieldObjectGraphicsInfo_MarillDoll: ; 850ADB8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TogepiDoll: ; 850ADDC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TogepiDoll: @ 850ADDC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2646,16 +2646,16 @@ gFieldObjectGraphicsInfo_TogepiDoll: ; 850ADDC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_CyndaquilDoll: ; 850AE00
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_CyndaquilDoll: @ 850AE00
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2664,16 +2664,16 @@ gFieldObjectGraphicsInfo_CyndaquilDoll: ; 850AE00
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ChikoritaDoll: ; 850AE24
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ChikoritaDoll: @ 850AE24
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2682,16 +2682,16 @@ gFieldObjectGraphicsInfo_ChikoritaDoll: ; 850AE24
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TotodileDoll: ; 850AE48
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TotodileDoll: @ 850AE48
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2700,16 +2700,16 @@ gFieldObjectGraphicsInfo_TotodileDoll: ; 850AE48
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_JigglypuffDoll: ; 850AE6C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_JigglypuffDoll: @ 850AE6C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2718,16 +2718,16 @@ gFieldObjectGraphicsInfo_JigglypuffDoll: ; 850AE6C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MeowthDoll: ; 850AE90
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MeowthDoll: @ 850AE90
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2736,16 +2736,16 @@ gFieldObjectGraphicsInfo_MeowthDoll: ; 850AE90
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ClefairyDoll: ; 850AEB4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ClefairyDoll: @ 850AEB4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2754,16 +2754,16 @@ gFieldObjectGraphicsInfo_ClefairyDoll: ; 850AEB4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_DittoDoll: ; 850AED8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_DittoDoll: @ 850AED8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2772,16 +2772,16 @@ gFieldObjectGraphicsInfo_DittoDoll: ; 850AED8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SmoochumDoll: ; 850AEFC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SmoochumDoll: @ 850AEFC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2790,16 +2790,16 @@ gFieldObjectGraphicsInfo_SmoochumDoll: ; 850AEFC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TreeckoDoll: ; 850AF20
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TreeckoDoll: @ 850AF20
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2808,16 +2808,16 @@ gFieldObjectGraphicsInfo_TreeckoDoll: ; 850AF20
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TorchicDoll: ; 850AF44
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TorchicDoll: @ 850AF44
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2826,16 +2826,16 @@ gFieldObjectGraphicsInfo_TorchicDoll: ; 850AF44
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MudkipDoll: ; 850AF68
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MudkipDoll: @ 850AF68
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2844,16 +2844,16 @@ gFieldObjectGraphicsInfo_MudkipDoll: ; 850AF68
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_DuskullDoll: ; 850AF8C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_DuskullDoll: @ 850AF8C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2862,16 +2862,16 @@ gFieldObjectGraphicsInfo_DuskullDoll: ; 850AF8C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_WynautDoll: ; 850AFB0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_WynautDoll: @ 850AFB0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2880,16 +2880,16 @@ gFieldObjectGraphicsInfo_WynautDoll: ; 850AFB0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BaltoyDoll: ; 850AFD4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BaltoyDoll: @ 850AFD4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2898,16 +2898,16 @@ gFieldObjectGraphicsInfo_BaltoyDoll: ; 850AFD4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_KecleonDoll: ; 850AFF8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_KecleonDoll: @ 850AFF8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2916,16 +2916,16 @@ gFieldObjectGraphicsInfo_KecleonDoll: ; 850AFF8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_AzurillDoll: ; 850B01C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_AzurillDoll: @ 850B01C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2934,16 +2934,16 @@ gFieldObjectGraphicsInfo_AzurillDoll: ; 850B01C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SkittyDoll: ; 850B040
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SkittyDoll: @ 850B040
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2952,16 +2952,16 @@ gFieldObjectGraphicsInfo_SkittyDoll: ; 850B040
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SwabluDoll: ; 850B064
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SwabluDoll: @ 850B064
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2970,16 +2970,16 @@ gFieldObjectGraphicsInfo_SwabluDoll: ; 850B064
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_GulpinDoll: ; 850B088
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_GulpinDoll: @ 850B088
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -2988,16 +2988,16 @@ gFieldObjectGraphicsInfo_GulpinDoll: ; 850B088
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LotadDoll: ; 850B0AC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LotadDoll: @ 850B0AC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3006,16 +3006,16 @@ gFieldObjectGraphicsInfo_LotadDoll: ; 850B0AC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SeedotDoll: ; 850B0D0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SeedotDoll: @ 850B0D0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3024,16 +3024,16 @@ gFieldObjectGraphicsInfo_SeedotDoll: ; 850B0D0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_PikaCushion: ; 850B0F4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_PikaCushion: @ 850B0F4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3042,16 +3042,16 @@ gFieldObjectGraphicsInfo_PikaCushion: ; 850B0F4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RoundCushion: ; 850B118
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RoundCushion: @ 850B118
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3060,16 +3060,16 @@ gFieldObjectGraphicsInfo_RoundCushion: ; 850B118
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_KissCushion: ; 850B13C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_KissCushion: @ 850B13C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3078,16 +3078,16 @@ gFieldObjectGraphicsInfo_KissCushion: ; 850B13C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ZigzagCushion: ; 850B160
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ZigzagCushion: @ 850B160
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3096,16 +3096,16 @@ gFieldObjectGraphicsInfo_ZigzagCushion: ; 850B160
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_SpinCushion: ; 850B184
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_SpinCushion: @ 850B184
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3114,16 +3114,16 @@ gFieldObjectGraphicsInfo_SpinCushion: ; 850B184
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_DiamondCushion: ; 850B1A8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_DiamondCushion: @ 850B1A8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3132,16 +3132,16 @@ gFieldObjectGraphicsInfo_DiamondCushion: ; 850B1A8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BallCushion: ; 850B1CC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BallCushion: @ 850B1CC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3150,16 +3150,16 @@ gFieldObjectGraphicsInfo_BallCushion: ; 850B1CC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_GrassCushion: ; 850B1F0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_GrassCushion: @ 850B1F0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3168,16 +3168,16 @@ gFieldObjectGraphicsInfo_GrassCushion: ; 850B1F0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_FireCushion: ; 850B214
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_FireCushion: @ 850B214
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3186,16 +3186,16 @@ gFieldObjectGraphicsInfo_FireCushion: ; 850B214
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_WaterCushion: ; 850B238
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_WaterCushion: @ 850B238
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3204,16 +3204,16 @@ gFieldObjectGraphicsInfo_WaterCushion: ; 850B238
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigSnorlaxDoll: ; 850B25C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigSnorlaxDoll: @ 850B25C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3222,16 +3222,16 @@ gFieldObjectGraphicsInfo_BigSnorlaxDoll: ; 850B25C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigRhydonDoll: ; 850B280
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigRhydonDoll: @ 850B280
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3240,16 +3240,16 @@ gFieldObjectGraphicsInfo_BigRhydonDoll: ; 850B280
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigLaprasDoll: ; 850B2A4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigLaprasDoll: @ 850B2A4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3258,16 +3258,16 @@ gFieldObjectGraphicsInfo_BigLaprasDoll: ; 850B2A4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigVenusaurDoll: ; 850B2C8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigVenusaurDoll: @ 850B2C8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3276,16 +3276,16 @@ gFieldObjectGraphicsInfo_BigVenusaurDoll: ; 850B2C8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigCharizardDoll: ; 850B2EC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigCharizardDoll: @ 850B2EC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3294,16 +3294,16 @@ gFieldObjectGraphicsInfo_BigCharizardDoll: ; 850B2EC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigBlastoiseDoll: ; 850B310
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigBlastoiseDoll: @ 850B310
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3312,16 +3312,16 @@ gFieldObjectGraphicsInfo_BigBlastoiseDoll: ; 850B310
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigWailmerDoll: ; 850B334
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigWailmerDoll: @ 850B334
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3330,16 +3330,16 @@ gFieldObjectGraphicsInfo_BigWailmerDoll: ; 850B334
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigRegirockDoll: ; 850B358
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigRegirockDoll: @ 850B358
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3348,16 +3348,16 @@ gFieldObjectGraphicsInfo_BigRegirockDoll: ; 850B358
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigRegiceDoll: ; 850B37C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigRegiceDoll: @ 850B37C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3366,16 +3366,16 @@ gFieldObjectGraphicsInfo_BigRegiceDoll: ; 850B37C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BigRegisteelDoll: ; 850B3A0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BigRegisteelDoll: @ 850B3A0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3384,16 +3384,16 @@ gFieldObjectGraphicsInfo_BigRegisteelDoll: ; 850B3A0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Latias: ; 850B3C4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Latias: @ 850B3C4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3402,16 +3402,16 @@ gFieldObjectGraphicsInfo_Latias: ; 850B3C4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Latios: ; 850B3E8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Latios: @ 850B3E8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3420,16 +3420,16 @@ gFieldObjectGraphicsInfo_Latios: ; 850B3E8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Boy5: ; 850B40C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Boy5: @ 850B40C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3438,16 +3438,16 @@ gFieldObjectGraphicsInfo_Boy5: ; 850B40C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_ContestOldMan: ; 850B430
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_ContestOldMan: @ 850B430
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3456,16 +3456,16 @@ gFieldObjectGraphicsInfo_ContestOldMan: ; 850B430
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanWatering: ; 850B454
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanWatering: @ 850B454
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3474,16 +3474,16 @@ gFieldObjectGraphicsInfo_BrendanWatering: ; 850B454
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayWatering: ; 850B478
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 0 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayWatering: @ 850B478
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3492,16 +3492,16 @@ gFieldObjectGraphicsInfo_MayWatering: ; 850B478
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BrendanDecorating: ; 850B49C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1100 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BrendanDecorating: @ 850B49C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1100 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3510,16 +3510,16 @@ gFieldObjectGraphicsInfo_BrendanDecorating: ; 850B49C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MayDecorating: ; 850B4C0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MayDecorating: @ 850B4C0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3528,16 +3528,16 @@ gFieldObjectGraphicsInfo_MayDecorating: ; 850B4C0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Archie: ; 850B4E4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Archie: @ 850B4E4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3546,16 +3546,16 @@ gFieldObjectGraphicsInfo_Archie: ; 850B4E4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Maxie: ; 850B508
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Maxie: @ 850B508
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3564,16 +3564,16 @@ gFieldObjectGraphicsInfo_Maxie: ; 850B508
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kyogre1: ; 850B52C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kyogre1: @ 850B52C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3582,16 +3582,16 @@ gFieldObjectGraphicsInfo_Kyogre1: ; 850B52C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Groudon1: ; 850B550
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Groudon1: @ 850B550
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3600,16 +3600,16 @@ gFieldObjectGraphicsInfo_Groudon1: ; 850B550
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kyogre3: ; 850B574
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kyogre3: @ 850B574
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3618,16 +3618,16 @@ gFieldObjectGraphicsInfo_Kyogre3: ; 850B574
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Groudon3: ; 850B598
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Groudon3: @ 850B598
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Groudon3
@@ -3636,16 +3636,16 @@ gFieldObjectGraphicsInfo_Groudon3: ; 850B598
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Fossil: ; 850B5BC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Fossil: @ 850B5BC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -3654,16 +3654,16 @@ gFieldObjectGraphicsInfo_Fossil: ; 850B5BC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Regirock: ; 850B5E0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Regirock: @ 850B5E0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3672,16 +3672,16 @@ gFieldObjectGraphicsInfo_Regirock: ; 850B5E0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Regice: ; 850B604
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Regice: @ 850B604
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3690,16 +3690,16 @@ gFieldObjectGraphicsInfo_Regice: ; 850B604
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Registeel: ; 850B628
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Registeel: @ 850B628
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3708,16 +3708,16 @@ gFieldObjectGraphicsInfo_Registeel: ; 850B628
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Skitty: ; 850B64C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Skitty: @ 850B64C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3726,16 +3726,16 @@ gFieldObjectGraphicsInfo_Skitty: ; 850B64C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kecleon1: ; 850B670
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kecleon1: @ 850B670
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3744,16 +3744,16 @@ gFieldObjectGraphicsInfo_Kecleon1: ; 850B670
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kyogre2: ; 850B694
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1116 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kyogre2: @ 850B694
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1116 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3762,16 +3762,16 @@ gFieldObjectGraphicsInfo_Kyogre2: ; 850B694
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Groudon2: ; 850B6B8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1118 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Groudon2: @ 850B6B8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1118 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3780,16 +3780,16 @@ gFieldObjectGraphicsInfo_Groudon2: ; 850B6B8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Rayquaza2: ; 850B6DC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 2048 ; image size
-	.2byte 64 ; width
-	.2byte 64 ; height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Rayquaza2: @ 850B6DC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 2048 @ image size
+	.2byte 64 @ width
+	.2byte 64 @ height
+	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_64x64
 	.4byte gFieldObjectSpriteOamTables_64x64
 	.4byte gFieldObjectImageAnimTable_Rayquaza2
@@ -3798,16 +3798,16 @@ gFieldObjectGraphicsInfo_Rayquaza2: ; 850B6DC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Zigzagoon: ; 850B700
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Zigzagoon: @ 850B700
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3816,16 +3816,16 @@ gFieldObjectGraphicsInfo_Zigzagoon: ; 850B700
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Pikachu: ; 850B724
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Pikachu: @ 850B724
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3834,16 +3834,16 @@ gFieldObjectGraphicsInfo_Pikachu: ; 850B724
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Azumarill: ; 850B748
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Azumarill: @ 850B748
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3852,16 +3852,16 @@ gFieldObjectGraphicsInfo_Azumarill: ; 850B748
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Wingull: ; 850B76C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Wingull: @ 850B76C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3870,16 +3870,16 @@ gFieldObjectGraphicsInfo_Wingull: ; 850B76C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kecleon2: ; 850B790
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kecleon2: @ 850B790
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3888,16 +3888,16 @@ gFieldObjectGraphicsInfo_Kecleon2: ; 850B790
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_TuberMSwimming: ; 850B7B4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1104 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 3 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_TuberMSwimming: @ 850B7B4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1104 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3906,16 +3906,16 @@ gFieldObjectGraphicsInfo_TuberMSwimming: ; 850B7B4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Azurill: ; 850B7D8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 128 ; image size
-	.2byte 16 ; width
-	.2byte 16 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Azurill: @ 850B7D8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 128 @ image size
+	.2byte 16 @ width
+	.2byte 16 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x16
 	.4byte gFieldObjectSpriteOamTables_16x16
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3924,16 +3924,16 @@ gFieldObjectGraphicsInfo_Azurill: ; 850B7D8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Mom: ; 850B7FC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Mom: @ 850B7FC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3942,16 +3942,16 @@ gFieldObjectGraphicsInfo_Mom: ; 850B7FC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LinkBrendan: ; 850B820
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LinkBrendan: @ 850B820
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -3960,16 +3960,16 @@ gFieldObjectGraphicsInfo_LinkBrendan: ; 850B820
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_LinkMay: ; 850B844
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1110 ; palette tag
-	.2byte 0x1102 ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_LinkMay: @ 850B844
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1110 @ palette tag
+	.2byte 0x1102 @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
@@ -3978,16 +3978,16 @@ gFieldObjectGraphicsInfo_LinkMay: ; 850B844
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Juan: ; 850B868
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Juan: @ 850B868
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -3996,16 +3996,16 @@ gFieldObjectGraphicsInfo_Juan: ; 850B868
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Scott: ; 850B88C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Scott: @ 850B88C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4014,16 +4014,16 @@ gFieldObjectGraphicsInfo_Scott: ; 850B88C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_MysteryEventDeliveryman: ; 850B8B0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_MysteryEventDeliveryman: @ 850B8B0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4032,16 +4032,16 @@ gFieldObjectGraphicsInfo_MysteryEventDeliveryman: ; 850B8B0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Statue: ; 850B8D4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Statue: @ 850B8D4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -4050,16 +4050,16 @@ gFieldObjectGraphicsInfo_Statue: ; 850B8D4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Kirlia: ; 850B8F8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_S << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Kirlia: @ 850B8F8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4068,16 +4068,16 @@ gFieldObjectGraphicsInfo_Kirlia: ; 850B8F8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Dusclops: ; 850B91C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Dusclops: @ 850B91C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4086,16 +4086,16 @@ gFieldObjectGraphicsInfo_Dusclops: ; 850B91C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_UnionRoomAttendant: ; 850B940
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_UnionRoomAttendant: @ 850B940
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4104,16 +4104,16 @@ gFieldObjectGraphicsInfo_UnionRoomAttendant: ; 850B940
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Red: ; 850B964
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111D ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Red: @ 850B964
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111D @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4122,16 +4122,16 @@ gFieldObjectGraphicsInfo_Red: ; 850B964
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Leaf: ; 850B988
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111D ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Leaf: @ 850B988
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111D @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4140,16 +4140,16 @@ gFieldObjectGraphicsInfo_Leaf: ; 850B988
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Sudowoodo: ; 850B9AC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Sudowoodo: @ 850B9AC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4158,16 +4158,16 @@ gFieldObjectGraphicsInfo_Sudowoodo: ; 850B9AC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Mew: ; 850B9D0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Mew: @ 850B9D0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4176,16 +4176,16 @@ gFieldObjectGraphicsInfo_Mew: ; 850B9D0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Deoxys: ; 850B9F4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111E ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Deoxys: @ 850B9F4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111E @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4194,16 +4194,16 @@ gFieldObjectGraphicsInfo_Deoxys: ; 850B9F4
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_BirthIslandStone: ; 850BA18
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x111F ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_BirthIslandStone: @ 850BA18
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x111F @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Inanimate
@@ -4212,16 +4212,16 @@ gFieldObjectGraphicsInfo_BirthIslandStone: ; 850BA18
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Anabel: ; 850BA3C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Anabel: @ 850BA3C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4230,16 +4230,16 @@ gFieldObjectGraphicsInfo_Anabel: ; 850BA3C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Tucker: ; 850BA60
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Tucker: @ 850BA60
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4248,16 +4248,16 @@ gFieldObjectGraphicsInfo_Tucker: ; 850BA60
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Greta: ; 850BA84
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Greta: @ 850BA84
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4266,16 +4266,16 @@ gFieldObjectGraphicsInfo_Greta: ; 850BA84
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Spenser: ; 850BAA8
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1103 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 2 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Spenser: @ 850BAA8
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1103 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4284,16 +4284,16 @@ gFieldObjectGraphicsInfo_Spenser: ; 850BAA8
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Noland: ; 850BACC
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Noland: @ 850BACC
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4302,16 +4302,16 @@ gFieldObjectGraphicsInfo_Noland: ; 850BACC
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Lucy: ; 850BAF0
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1106 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 5 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Lucy: @ 850BAF0
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1106 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4320,16 +4320,16 @@ gFieldObjectGraphicsInfo_Lucy: ; 850BAF0
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Brandon: ; 850BB14
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1105 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 4 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Brandon: @ 850BB14
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1105 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4338,16 +4338,16 @@ gFieldObjectGraphicsInfo_Brandon: ; 850BB14
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RubySapphireBrendan: ; 850BB38
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1122 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RubySapphireBrendan: @ 850BB38
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1122 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4356,16 +4356,16 @@ gFieldObjectGraphicsInfo_RubySapphireBrendan: ; 850BB38
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_RubySapphireMay: ; 850BB5C
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1123 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 256 ; image size
-	.2byte 16 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_RubySapphireMay: @ 850BB5C
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1123 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 256 @ image size
+	.2byte 16 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_16x32
 	.4byte gFieldObjectSpriteOamTables_16x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4374,16 +4374,16 @@ gFieldObjectGraphicsInfo_RubySapphireMay: ; 850BB5C
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_Lugia: ; 850BB80
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1121 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_Lugia: @ 850BB80
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1121 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_Standard
@@ -4392,16 +4392,16 @@ gFieldObjectGraphicsInfo_Lugia: ; 850BB80
 
 	.align 2, 0
 
-gFieldObjectGraphicsInfo_HoOh: ; 850BBA4
-	.2byte 0xFFFF ; tiles tag
-	.2byte 0x1120 ; palette tag
-	.2byte 0x11FF ; palette tag 2
-	.2byte 512 ; image size
-	.2byte 32 ; width
-	.2byte 32 ; height
-	.byte (SHADOW_SIZE_M << 4) | 10 ; flags, shadow size, palette slot
+gFieldObjectGraphicsInfo_HoOh: @ 850BBA4
+	.2byte 0xFFFF @ tiles tag
+	.2byte 0x1120 @ palette tag
+	.2byte 0x11FF @ palette tag 2
+	.2byte 512 @ image size
+	.2byte 32 @ width
+	.2byte 32 @ height
+	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
 	.byte TRACKS_FOOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieldObjectBaseOam_32x32
 	.4byte gFieldObjectSpriteOamTables_32x32
 	.4byte gFieldObjectImageAnimTable_HoOh
diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.s b/data/graphics/field_objects/field_object_graphics_info_pointers.s
index 07922ab4e..651a7fd1f 100644
--- a/data/graphics/field_objects/field_object_graphics_info_pointers.s
+++ b/data/graphics/field_objects/field_object_graphics_info_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldObjectGraphicsInfoPointers: ; 8505620
+gFieldObjectGraphicsInfoPointers: @ 8505620
 	.4byte gFieldObjectGraphicsInfo_BrendanNormal
 	.4byte gFieldObjectGraphicsInfo_BrendanMachBike
 	.4byte gFieldObjectGraphicsInfo_BrendanSurfing
@@ -243,7 +243,7 @@ gFieldObjectGraphicsInfoPointers: ; 8505620
 
 	.align 2, 0
 
-gMauvilleOldManGraphicsInfoPointers: ; 85059DC
+gMauvilleOldManGraphicsInfoPointers: @ 85059DC
 	.4byte gFieldObjectGraphicsInfo_Bard
 	.4byte gFieldObjectGraphicsInfo_Hipster
 	.4byte gFieldObjectGraphicsInfo_Trader
diff --git a/data/graphics/field_objects/field_object_oam.s b/data/graphics/field_objects/field_object_oam.s
index c93a512f0..e88608fd7 100644
--- a/data/graphics/field_objects/field_object_oam.s
+++ b/data/graphics/field_objects/field_object_oam.s
@@ -1,203 +1,203 @@
 	.align 2, 0
 
-gFieldObjectBaseOam_8x8: ; 85094EC
+gFieldObjectBaseOam_8x8: @ 85094EC
 	.4byte OAM_SIZE_8x8
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_16x8: ; 85094F4
+gFieldObjectBaseOam_16x8: @ 85094F4
 	.4byte OAM_SIZE_16x8
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_16x16: ; 85094FC
+gFieldObjectBaseOam_16x16: @ 85094FC
 	.4byte OAM_SIZE_16x16
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_32x8: ; 8509504
+gFieldObjectBaseOam_32x8: @ 8509504
 	.4byte OAM_SIZE_32x8
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_64x32: ; 850950C
+gFieldObjectBaseOam_64x32: @ 850950C
 	.4byte OAM_SIZE_64x32
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_16x32: ; 8509514
+gFieldObjectBaseOam_16x32: @ 8509514
 	.4byte OAM_SIZE_16x32
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_32x32: ; 850951C
+gFieldObjectBaseOam_32x32: @ 850951C
 	.4byte OAM_SIZE_32x32
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectBaseOam_64x64: ; 8509524
+gFieldObjectBaseOam_64x64: @ 8509524
 	.4byte OAM_SIZE_64x64
-	.2byte 2 << 10 ; priority
+	.2byte 2 << 10 @ priority
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x16_0: ; 850952C
+gFieldObjectSpriteOamTable_16x16_0: @ 850952C
 	sprite_oam  -8,  -8, 2,  0, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x16_1: ; 8509530
+gFieldObjectSpriteOamTable_16x16_1: @ 8509530
 	sprite_oam  -8,  -8, 1,  0, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x16_2: ; 8509534
+gFieldObjectSpriteOamTable_16x16_2: @ 8509534
 	sprite_oam  -8,  -8, 2,  0, 16x8
 	sprite_oam  -8,   0, 3,  2, 16x8
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x16_3: ; 850953C
+gFieldObjectSpriteOamTable_16x16_3: @ 850953C
 	sprite_oam  -8,  -8, 2,  0, 16x16
 	sprite_oam  -8,  -8, 3,  0, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x16_4: ; 8509544
+gFieldObjectSpriteOamTable_16x16_4: @ 8509544
 	sprite_oam  -8,  -8, 1,  0, 16x16
 	sprite_oam  -8,  -8, 3,  0, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_16x16: ; 850954C
-	.4byte 0 ; number of sprites
-	.4byte NULL ; unknown
+gFieldObjectSpriteOamTables_16x16: @ 850954C
+	.4byte 0 @ number of sprites
+	.4byte NULL @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_0 ; below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_1 ; above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_2 ; unknown
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_3 ; long grass below high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_4 ; long grass above high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x32_0: ; 850957C
+gFieldObjectSpriteOamTable_16x32_0: @ 850957C
 	sprite_oam  -8, -16, 2,  0, 16x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x32_1: ; 8509580
+gFieldObjectSpriteOamTable_16x32_1: @ 8509580
 	sprite_oam  -8, -16, 1,  0, 16x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x32_2: ; 8509584
+gFieldObjectSpriteOamTable_16x32_2: @ 8509584
 	sprite_oam  -8, -16, 2,  0, 16x16
 	sprite_oam  -8,   0, 2,  4, 16x8
 	sprite_oam  -8,   8, 3,  6, 16x8
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x32_3: ; 8509590
+gFieldObjectSpriteOamTable_16x32_3: @ 8509590
 	sprite_oam  -8, -16, 2,  0, 16x16
 	sprite_oam  -8,   0, 3,  4, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_16x32_4: ; 8509598
+gFieldObjectSpriteOamTable_16x32_4: @ 8509598
 	sprite_oam  -8, -16, 1,  0, 16x16
 	sprite_oam  -8,   0, 3,  4, 16x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_16x32: ; 85095A0
-	.4byte 0 ; number of sprites
-	.4byte NULL ; unknown
+gFieldObjectSpriteOamTables_16x32: @ 85095A0
+	.4byte 0 @ number of sprites
+	.4byte NULL @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_0 ; below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_1 ; above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
 
-	.4byte 3 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_2 ; unknown
+	.4byte 3 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_3 ; long grass below high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_4 ; long grass above high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_32x32_0: ; 85095D0
+gFieldObjectSpriteOamTable_32x32_0: @ 85095D0
 	sprite_oam -16, -16, 2,  0, 32x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_32x32_1: ; 85095D4
+gFieldObjectSpriteOamTable_32x32_1: @ 85095D4
 	sprite_oam -16, -16, 1,  0, 32x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_32x32_2: ; 85095D8
+gFieldObjectSpriteOamTable_32x32_2: @ 85095D8
 	sprite_oam -16, -16, 2,  0, 32x16
 	sprite_oam -16,   0, 2,  8, 32x8
 	sprite_oam -16,   8, 3, 12, 32x8
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_32x32_3: ; 85095E4
+gFieldObjectSpriteOamTable_32x32_3: @ 85095E4
 	sprite_oam -16, -16, 2,  0, 32x16
 	sprite_oam -16,   0, 3,  8, 32x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_32x32_4: ; 85095EC
+gFieldObjectSpriteOamTable_32x32_4: @ 85095EC
 	sprite_oam -16, -16, 1,  0, 32x16
 	sprite_oam -16,   0, 3,  8, 32x16
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_32x32: ; 85095F4
-	.4byte 0 ; number of sprites
-	.4byte NULL ; unknown
+gFieldObjectSpriteOamTables_32x32: @ 85095F4
+	.4byte 0 @ number of sprites
+	.4byte NULL @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_0 ; below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_1 ; above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
 
-	.4byte 3 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_2 ; unknown
+	.4byte 3 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_3 ; long grass below high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
 
-	.4byte 2 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_4 ; long grass above high bridge
+	.4byte 2 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_Truck_0: ; 8509624
+gFieldObjectSpriteOamTable_Truck_0: @ 8509624
 	sprite_oam -24, -24, 2,  0, 32x8
 	sprite_oam   8, -24, 2,  4, 16x8
 	sprite_oam -24, -16, 2,  6, 32x8
@@ -213,110 +213,110 @@ gFieldObjectSpriteOamTable_Truck_0: ; 8509624
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_Truck: ; 8509654
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; unknown
+gFieldObjectSpriteOamTables_Truck: @ 8509654
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
 
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; below high bridge
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
 
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; above high bridge
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
 
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; unknown
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
 
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; long grass below high bridge
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
 
-	.4byte 12 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 ; long grass above high bridge
+	.4byte 12 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_Unused_0: ; 8509684
+gFieldObjectSpriteOamTable_Unused_0: @ 8509684
 	sprite_oam -32, -16, 2,  0, 64x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_Unused_1: ; 8509688
+gFieldObjectSpriteOamTable_Unused_1: @ 8509688
 	sprite_oam -32, -16, 1,  0, 64x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_Unused_2: ; 850968C
+gFieldObjectSpriteOamTable_Unused_2: @ 850968C
 	sprite_oam -32, -16, 2,  0, 64x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_Unused_3: ; 8509690
+gFieldObjectSpriteOamTable_Unused_3: @ 8509690
 	sprite_oam -32, -16, 2,  0, 64x32
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_Unused: ; 8509694
-	.4byte 0 ; number of sprites
-	.4byte NULL ; unknown
+gFieldObjectSpriteOamTables_Unused: @ 8509694
+	.4byte 0 @ number of sprites
+	.4byte NULL @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_0 ; below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_1 ; above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_2 ; unknown
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 ; long grass below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 ; long grass above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_64x64_0: ; 85096C4
+gFieldObjectSpriteOamTable_64x64_0: @ 85096C4
 	sprite_oam -32, -32, 2,  0, 64x64
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_64x64_1: ; 85096C8
+gFieldObjectSpriteOamTable_64x64_1: @ 85096C8
 	sprite_oam -32, -32, 1,  0, 64x64
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_64x64_2: ; 85096CC
+gFieldObjectSpriteOamTable_64x64_2: @ 85096CC
 	sprite_oam -32, -32, 2,  0, 64x64
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_64x64_3: ; 85096D0
+gFieldObjectSpriteOamTable_64x64_3: @ 85096D0
 	sprite_oam -32, -32, 2,  0, 64x64
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_64x64: ; 85096D4
-	.4byte 0 ; number of sprites
-	.4byte NULL ; unknown
+gFieldObjectSpriteOamTables_64x64: @ 85096D4
+	.4byte 0 @ number of sprites
+	.4byte NULL @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_0 ; below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_1 ; above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_2 ; unknown
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 ; long grass below high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
 
-	.4byte 1 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 ; long grass above high bridge
+	.4byte 1 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SSTidal_0: ; 8509704
+gFieldObjectSpriteOamTable_SSTidal_0: @ 8509704
 	sprite_oam -48, -20, 2,  0, 32x8
 	sprite_oam -16, -20, 2,  4, 32x8
 	sprite_oam  16, -20, 2,  8, 32x8
@@ -335,7 +335,7 @@ gFieldObjectSpriteOamTable_SSTidal_0: ; 8509704
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SSTidal_1: ; 8509740
+gFieldObjectSpriteOamTable_SSTidal_1: @ 8509740
 	sprite_oam -48, -20, 1,  0, 32x8
 	sprite_oam -16, -20, 1,  4, 32x8
 	sprite_oam  16, -20, 1,  8, 32x8
@@ -354,7 +354,7 @@ gFieldObjectSpriteOamTable_SSTidal_1: ; 8509740
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SSTidal_2: ; 850977C
+gFieldObjectSpriteOamTable_SSTidal_2: @ 850977C
 	sprite_oam -48, -20, 2,  0, 32x8
 	sprite_oam -16, -20, 2,  4, 32x8
 	sprite_oam  16, -20, 2,  8, 32x8
@@ -373,7 +373,7 @@ gFieldObjectSpriteOamTable_SSTidal_2: ; 850977C
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SSTidal_3: ; 85097B8
+gFieldObjectSpriteOamTable_SSTidal_3: @ 85097B8
 	sprite_oam -48, -20, 1,  0, 32x8
 	sprite_oam -16, -20, 1,  4, 32x8
 	sprite_oam  16, -20, 1,  8, 32x8
@@ -392,28 +392,28 @@ gFieldObjectSpriteOamTable_SSTidal_3: ; 85097B8
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_SSTidal: ; 85097F4
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 ; unknown
+gFieldObjectSpriteOamTables_SSTidal: @ 85097F4
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
 
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 ; below high bridge
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
 
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_1 ; above high bridge
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
 
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_2 ; unknown
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
 
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 ; long grass below high bridge
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
 
-	.4byte 15 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 ; long grass above high bridge
+	.4byte 15 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SubmarineShadow_0: ; 8509824
+gFieldObjectSpriteOamTable_SubmarineShadow_0: @ 8509824
 	sprite_oam -48, -20, 2,  0, 32x8
 	sprite_oam -16, -20, 2,  4, 32x8
 	sprite_oam  16, -20, 2,  8, 16x8
@@ -433,7 +433,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_0: ; 8509824
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SubmarineShadow_1: ; 8509864
+gFieldObjectSpriteOamTable_SubmarineShadow_1: @ 8509864
 	sprite_oam -48, -20, 1,  0, 32x8
 	sprite_oam -16, -20, 1,  4, 32x8
 	sprite_oam  16, -20, 1,  8, 16x8
@@ -453,7 +453,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_1: ; 8509864
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SubmarineShadow_2: ; 85098A4
+gFieldObjectSpriteOamTable_SubmarineShadow_2: @ 85098A4
 	sprite_oam -48, -20, 2,  0, 32x8
 	sprite_oam -16, -20, 2,  4, 32x8
 	sprite_oam  16, -20, 2,  8, 16x8
@@ -473,7 +473,7 @@ gFieldObjectSpriteOamTable_SubmarineShadow_2: ; 85098A4
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTable_SubmarineShadow_3: ; 85098E4
+gFieldObjectSpriteOamTable_SubmarineShadow_3: @ 85098E4
 	sprite_oam -48, -20, 1,  0, 32x8
 	sprite_oam -16, -20, 1,  4, 32x8
 	sprite_oam  16, -20, 1,  8, 16x8
@@ -493,21 +493,21 @@ gFieldObjectSpriteOamTable_SubmarineShadow_3: ; 85098E4
 
 	.align 2, 0
 
-gFieldObjectSpriteOamTables_SubmarineShadow: ; 8509924
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 ; unknown
+gFieldObjectSpriteOamTables_SubmarineShadow: @ 8509924
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
 
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 ; below high bridge
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
 
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 ; above high bridge
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
 
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 ; unknown
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
 
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 ; long grass below high bridge
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
 
-	.4byte 16 ; number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 ; long grass above high bridge
+	.4byte 16 @ number of sprites
+	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
diff --git a/data/graphics/field_objects/field_object_pic_tables.s b/data/graphics/field_objects/field_object_pic_tables.s
index 181eb59d8..41f4216cb 100644
--- a/data/graphics/field_objects/field_object_pic_tables.s
+++ b/data/graphics/field_objects/field_object_pic_tables.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanNormal: ; 8505A8C
+gFieldObjectPicTable_BrendanNormal: @ 8505A8C
 	obj_tiles gFieldObjectPic_BrendanNormal_0, 0x100
 	obj_tiles gFieldObjectPic_BrendanNormal_1, 0x100
 	obj_tiles gFieldObjectPic_BrendanNormal_2, 0x100
@@ -22,7 +22,7 @@ gFieldObjectPicTable_BrendanNormal: ; 8505A8C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanMachBike: ; 8505B1C
+gFieldObjectPicTable_BrendanMachBike: @ 8505B1C
 	obj_tiles gFieldObjectPic_BrendanMachBike_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanMachBike_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanMachBike_2, 0x200
@@ -35,7 +35,7 @@ gFieldObjectPicTable_BrendanMachBike: ; 8505B1C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanAcroBike: ; 8505B64
+gFieldObjectPicTable_BrendanAcroBike: @ 8505B64
 	obj_tiles gFieldObjectPic_BrendanAcroBike_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanAcroBike_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanAcroBike_2, 0x200
@@ -66,7 +66,7 @@ gFieldObjectPicTable_BrendanAcroBike: ; 8505B64
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanSurfing: ; 8505C3C
+gFieldObjectPicTable_BrendanSurfing: @ 8505C3C
 	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
@@ -82,7 +82,7 @@ gFieldObjectPicTable_BrendanSurfing: ; 8505C3C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanUnderwater: ; 8505C9C
+gFieldObjectPicTable_BrendanUnderwater: @ 8505C9C
 	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
@@ -95,7 +95,7 @@ gFieldObjectPicTable_BrendanUnderwater: ; 8505C9C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanFieldMove: ; 8505CE4
+gFieldObjectPicTable_BrendanFieldMove: @ 8505CE4
 	obj_tiles gFieldObjectPic_BrendanFieldMove_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanFieldMove_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanFieldMove_2, 0x200
@@ -104,7 +104,7 @@ gFieldObjectPicTable_BrendanFieldMove: ; 8505CE4
 
 	.align 2, 0
 
-gFieldObjectPicTable_QuintyPlump: ; 8505D0C
+gFieldObjectPicTable_QuintyPlump: @ 8505D0C
 	obj_tiles gFieldObjectPic_QuintyPlump_0, 0x200
 	obj_tiles gFieldObjectPic_QuintyPlump_1, 0x200
 	obj_tiles gFieldObjectPic_QuintyPlump_2, 0x200
@@ -115,7 +115,7 @@ gFieldObjectPicTable_QuintyPlump: ; 8505D0C
 
 	.align 2, 0
 
-gFieldObjectPicTable_LittleBoy1: ; 8505D44
+gFieldObjectPicTable_LittleBoy1: @ 8505D44
 	obj_tiles gFieldObjectPic_LittleBoy1_0, 0x80
 	obj_tiles gFieldObjectPic_LittleBoy1_1, 0x80
 	obj_tiles gFieldObjectPic_LittleBoy1_2, 0x80
@@ -128,7 +128,7 @@ gFieldObjectPicTable_LittleBoy1: ; 8505D44
 
 	.align 2, 0
 
-gFieldObjectPicTable_LittleGirl1: ; 8505D8C
+gFieldObjectPicTable_LittleGirl1: @ 8505D8C
 	obj_tiles gFieldObjectPic_LittleGirl1_0, 0x100
 	obj_tiles gFieldObjectPic_LittleGirl1_1, 0x100
 	obj_tiles gFieldObjectPic_LittleGirl1_2, 0x100
@@ -141,7 +141,7 @@ gFieldObjectPicTable_LittleGirl1: ; 8505D8C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Boy1: ; 8505DD4
+gFieldObjectPicTable_Boy1: @ 8505DD4
 	obj_tiles gFieldObjectPic_Boy1_0, 0x100
 	obj_tiles gFieldObjectPic_Boy1_1, 0x100
 	obj_tiles gFieldObjectPic_Boy1_2, 0x100
@@ -154,7 +154,7 @@ gFieldObjectPicTable_Boy1: ; 8505DD4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Girl1: ; 8505E1C
+gFieldObjectPicTable_Girl1: @ 8505E1C
 	obj_tiles gFieldObjectPic_Girl1_0, 0x100
 	obj_tiles gFieldObjectPic_Girl1_1, 0x100
 	obj_tiles gFieldObjectPic_Girl1_2, 0x100
@@ -167,7 +167,7 @@ gFieldObjectPicTable_Girl1: ; 8505E1C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Boy2: ; 8505E64
+gFieldObjectPicTable_Boy2: @ 8505E64
 	obj_tiles gFieldObjectPic_Boy2_0, 0x100
 	obj_tiles gFieldObjectPic_Boy2_1, 0x100
 	obj_tiles gFieldObjectPic_Boy2_2, 0x100
@@ -180,7 +180,7 @@ gFieldObjectPicTable_Boy2: ; 8505E64
 
 	.align 2, 0
 
-gFieldObjectPicTable_Girl2: ; 8505EAC
+gFieldObjectPicTable_Girl2: @ 8505EAC
 	obj_tiles gFieldObjectPic_Girl2_0, 0x100
 	obj_tiles gFieldObjectPic_Girl2_1, 0x100
 	obj_tiles gFieldObjectPic_Girl2_2, 0x100
@@ -193,7 +193,7 @@ gFieldObjectPicTable_Girl2: ; 8505EAC
 
 	.align 2, 0
 
-gFieldObjectPicTable_LittleBoy2: ; 8505EF4
+gFieldObjectPicTable_LittleBoy2: @ 8505EF4
 	obj_tiles gFieldObjectPic_LittleBoy2_0, 0x80
 	obj_tiles gFieldObjectPic_LittleBoy2_1, 0x80
 	obj_tiles gFieldObjectPic_LittleBoy2_2, 0x80
@@ -206,7 +206,7 @@ gFieldObjectPicTable_LittleBoy2: ; 8505EF4
 
 	.align 2, 0
 
-gFieldObjectPicTable_LittleGirl2: ; 8505F3C
+gFieldObjectPicTable_LittleGirl2: @ 8505F3C
 	obj_tiles gFieldObjectPic_LittleGirl2_0, 0x80
 	obj_tiles gFieldObjectPic_LittleGirl2_1, 0x80
 	obj_tiles gFieldObjectPic_LittleGirl2_2, 0x80
@@ -219,7 +219,7 @@ gFieldObjectPicTable_LittleGirl2: ; 8505F3C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Boy3: ; 8505F84
+gFieldObjectPicTable_Boy3: @ 8505F84
 	obj_tiles gFieldObjectPic_Boy3_0, 0x100
 	obj_tiles gFieldObjectPic_Boy3_1, 0x100
 	obj_tiles gFieldObjectPic_Boy3_2, 0x100
@@ -232,7 +232,7 @@ gFieldObjectPicTable_Boy3: ; 8505F84
 
 	.align 2, 0
 
-gFieldObjectPicTable_Girl3: ; 8505FCC
+gFieldObjectPicTable_Girl3: @ 8505FCC
 	obj_tiles gFieldObjectPic_Girl3_0, 0x100
 	obj_tiles gFieldObjectPic_Girl3_1, 0x100
 	obj_tiles gFieldObjectPic_Girl3_2, 0x100
@@ -245,7 +245,7 @@ gFieldObjectPicTable_Girl3: ; 8505FCC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Boy4: ; 8506014
+gFieldObjectPicTable_Boy4: @ 8506014
 	obj_tiles gFieldObjectPic_Boy4_0, 0x100
 	obj_tiles gFieldObjectPic_Boy4_1, 0x100
 	obj_tiles gFieldObjectPic_Boy4_2, 0x100
@@ -258,7 +258,7 @@ gFieldObjectPicTable_Boy4: ; 8506014
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman1: ; 850605C
+gFieldObjectPicTable_Woman1: @ 850605C
 	obj_tiles gFieldObjectPic_Woman1_0, 0x100
 	obj_tiles gFieldObjectPic_Woman1_1, 0x100
 	obj_tiles gFieldObjectPic_Woman1_2, 0x100
@@ -271,7 +271,7 @@ gFieldObjectPicTable_Woman1: ; 850605C
 
 	.align 2, 0
 
-gFieldObjectPicTable_FatMan: ; 85060A4
+gFieldObjectPicTable_FatMan: @ 85060A4
 	obj_tiles gFieldObjectPic_FatMan_0, 0x100
 	obj_tiles gFieldObjectPic_FatMan_1, 0x100
 	obj_tiles gFieldObjectPic_FatMan_2, 0x100
@@ -284,7 +284,7 @@ gFieldObjectPicTable_FatMan: ; 85060A4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman2: ; 85060EC
+gFieldObjectPicTable_Woman2: @ 85060EC
 	obj_tiles gFieldObjectPic_Woman2_0, 0x100
 	obj_tiles gFieldObjectPic_Woman2_1, 0x100
 	obj_tiles gFieldObjectPic_Woman2_2, 0x100
@@ -297,7 +297,7 @@ gFieldObjectPicTable_Woman2: ; 85060EC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man1: ; 8506134
+gFieldObjectPicTable_Man1: @ 8506134
 	obj_tiles gFieldObjectPic_Man1_0, 0x100
 	obj_tiles gFieldObjectPic_Man1_1, 0x100
 	obj_tiles gFieldObjectPic_Man1_2, 0x100
@@ -310,7 +310,7 @@ gFieldObjectPicTable_Man1: ; 8506134
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman3: ; 850617C
+gFieldObjectPicTable_Woman3: @ 850617C
 	obj_tiles gFieldObjectPic_Woman3_0, 0x100
 	obj_tiles gFieldObjectPic_Woman3_1, 0x100
 	obj_tiles gFieldObjectPic_Woman3_2, 0x100
@@ -323,7 +323,7 @@ gFieldObjectPicTable_Woman3: ; 850617C
 
 	.align 2, 0
 
-gFieldObjectPicTable_OldMan1: ; 85061C4
+gFieldObjectPicTable_OldMan1: @ 85061C4
 	obj_tiles gFieldObjectPic_OldMan1_0, 0x100
 	obj_tiles gFieldObjectPic_OldMan1_1, 0x100
 	obj_tiles gFieldObjectPic_OldMan1_2, 0x100
@@ -336,7 +336,7 @@ gFieldObjectPicTable_OldMan1: ; 85061C4
 
 	.align 2, 0
 
-gFieldObjectPicTable_OldWoman1: ; 850620C
+gFieldObjectPicTable_OldWoman1: @ 850620C
 	obj_tiles gFieldObjectPic_OldWoman1_0, 0x100
 	obj_tiles gFieldObjectPic_OldWoman1_1, 0x100
 	obj_tiles gFieldObjectPic_OldWoman1_2, 0x100
@@ -349,7 +349,7 @@ gFieldObjectPicTable_OldWoman1: ; 850620C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man2: ; 8506254
+gFieldObjectPicTable_Man2: @ 8506254
 	obj_tiles gFieldObjectPic_Man2_0, 0x100
 	obj_tiles gFieldObjectPic_Man2_1, 0x100
 	obj_tiles gFieldObjectPic_Man2_2, 0x100
@@ -362,7 +362,7 @@ gFieldObjectPicTable_Man2: ; 8506254
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman4: ; 850629C
+gFieldObjectPicTable_Woman4: @ 850629C
 	obj_tiles gFieldObjectPic_Woman4_0, 0x100
 	obj_tiles gFieldObjectPic_Woman4_1, 0x100
 	obj_tiles gFieldObjectPic_Woman4_2, 0x100
@@ -375,7 +375,7 @@ gFieldObjectPicTable_Woman4: ; 850629C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man3: ; 85062E4
+gFieldObjectPicTable_Man3: @ 85062E4
 	obj_tiles gFieldObjectPic_Man3_0, 0x100
 	obj_tiles gFieldObjectPic_Man3_1, 0x100
 	obj_tiles gFieldObjectPic_Man3_2, 0x100
@@ -388,7 +388,7 @@ gFieldObjectPicTable_Man3: ; 85062E4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman5: ; 850632C
+gFieldObjectPicTable_Woman5: @ 850632C
 	obj_tiles gFieldObjectPic_Woman5_0, 0x100
 	obj_tiles gFieldObjectPic_Woman5_1, 0x100
 	obj_tiles gFieldObjectPic_Woman5_2, 0x100
@@ -401,7 +401,7 @@ gFieldObjectPicTable_Woman5: ; 850632C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Cook: ; 8506374
+gFieldObjectPicTable_Cook: @ 8506374
 	obj_tiles gFieldObjectPic_Cook_0, 0x100
 	obj_tiles gFieldObjectPic_Cook_1, 0x100
 	obj_tiles gFieldObjectPic_Cook_2, 0x100
@@ -414,7 +414,7 @@ gFieldObjectPicTable_Cook: ; 8506374
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman6: ; 85063BC
+gFieldObjectPicTable_Woman6: @ 85063BC
 	obj_tiles gFieldObjectPic_Woman6_0, 0x100
 	obj_tiles gFieldObjectPic_Woman6_1, 0x100
 	obj_tiles gFieldObjectPic_Woman6_2, 0x100
@@ -427,7 +427,7 @@ gFieldObjectPicTable_Woman6: ; 85063BC
 
 	.align 2, 0
 
-gFieldObjectPicTable_OldMan2: ; 8506404
+gFieldObjectPicTable_OldMan2: @ 8506404
 	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
 	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
 	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
@@ -440,7 +440,7 @@ gFieldObjectPicTable_OldMan2: ; 8506404
 
 	.align 2, 0
 
-gFieldObjectPicTable_OldWoman2: ; 850644C
+gFieldObjectPicTable_OldWoman2: @ 850644C
 	obj_tiles gFieldObjectPic_OldWoman2_0, 0x100
 	obj_tiles gFieldObjectPic_OldWoman2_1, 0x100
 	obj_tiles gFieldObjectPic_OldWoman2_2, 0x100
@@ -453,7 +453,7 @@ gFieldObjectPicTable_OldWoman2: ; 850644C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Camper: ; 8506494
+gFieldObjectPicTable_Camper: @ 8506494
 	obj_tiles gFieldObjectPic_Camper_0, 0x100
 	obj_tiles gFieldObjectPic_Camper_1, 0x100
 	obj_tiles gFieldObjectPic_Camper_2, 0x100
@@ -466,7 +466,7 @@ gFieldObjectPicTable_Camper: ; 8506494
 
 	.align 2, 0
 
-gFieldObjectPicTable_Picnicker: ; 85064DC
+gFieldObjectPicTable_Picnicker: @ 85064DC
 	obj_tiles gFieldObjectPic_Picnicker_0, 0x100
 	obj_tiles gFieldObjectPic_Picnicker_1, 0x100
 	obj_tiles gFieldObjectPic_Picnicker_2, 0x100
@@ -479,7 +479,7 @@ gFieldObjectPicTable_Picnicker: ; 85064DC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man4: ; 8506524
+gFieldObjectPicTable_Man4: @ 8506524
 	obj_tiles gFieldObjectPic_Man4_0, 0x100
 	obj_tiles gFieldObjectPic_Man4_1, 0x100
 	obj_tiles gFieldObjectPic_Man4_2, 0x100
@@ -492,7 +492,7 @@ gFieldObjectPicTable_Man4: ; 8506524
 
 	.align 2, 0
 
-gFieldObjectPicTable_Woman7: ; 850656C
+gFieldObjectPicTable_Woman7: @ 850656C
 	obj_tiles gFieldObjectPic_Woman7_0, 0x100
 	obj_tiles gFieldObjectPic_Woman7_1, 0x100
 	obj_tiles gFieldObjectPic_Woman7_2, 0x100
@@ -505,7 +505,7 @@ gFieldObjectPicTable_Woman7: ; 850656C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Youngster: ; 85065B4
+gFieldObjectPicTable_Youngster: @ 85065B4
 	obj_tiles gFieldObjectPic_Youngster_0, 0x100
 	obj_tiles gFieldObjectPic_Youngster_1, 0x100
 	obj_tiles gFieldObjectPic_Youngster_2, 0x100
@@ -518,7 +518,7 @@ gFieldObjectPicTable_Youngster: ; 85065B4
 
 	.align 2, 0
 
-gFieldObjectPicTable_BugCatcher: ; 85065FC
+gFieldObjectPicTable_BugCatcher: @ 85065FC
 	obj_tiles gFieldObjectPic_BugCatcher_0, 0x100
 	obj_tiles gFieldObjectPic_BugCatcher_1, 0x100
 	obj_tiles gFieldObjectPic_BugCatcher_2, 0x100
@@ -531,7 +531,7 @@ gFieldObjectPicTable_BugCatcher: ; 85065FC
 
 	.align 2, 0
 
-gFieldObjectPicTable_PsychicM: ; 8506644
+gFieldObjectPicTable_PsychicM: @ 8506644
 	obj_tiles gFieldObjectPic_PsychicM_0, 0x100
 	obj_tiles gFieldObjectPic_PsychicM_1, 0x100
 	obj_tiles gFieldObjectPic_PsychicM_2, 0x100
@@ -544,7 +544,7 @@ gFieldObjectPicTable_PsychicM: ; 8506644
 
 	.align 2, 0
 
-gFieldObjectPicTable_SchoolKidM: ; 850668C
+gFieldObjectPicTable_SchoolKidM: @ 850668C
 	obj_tiles gFieldObjectPic_SchoolKidM_0, 0x100
 	obj_tiles gFieldObjectPic_SchoolKidM_1, 0x100
 	obj_tiles gFieldObjectPic_SchoolKidM_2, 0x100
@@ -557,7 +557,7 @@ gFieldObjectPicTable_SchoolKidM: ; 850668C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Maniac: ; 85066D4
+gFieldObjectPicTable_Maniac: @ 85066D4
 	obj_tiles gFieldObjectPic_Maniac_0, 0x100
 	obj_tiles gFieldObjectPic_Maniac_1, 0x100
 	obj_tiles gFieldObjectPic_Maniac_2, 0x100
@@ -570,7 +570,7 @@ gFieldObjectPicTable_Maniac: ; 85066D4
 
 	.align 2, 0
 
-gFieldObjectPicTable_HexManiac: ; 850671C
+gFieldObjectPicTable_HexManiac: @ 850671C
 	obj_tiles gFieldObjectPic_HexManiac_0, 0x100
 	obj_tiles gFieldObjectPic_HexManiac_1, 0x100
 	obj_tiles gFieldObjectPic_HexManiac_2, 0x100
@@ -583,7 +583,7 @@ gFieldObjectPicTable_HexManiac: ; 850671C
 
 	.align 2, 0
 
-gFieldObjectPicTable_SwimmerM: ; 8506764
+gFieldObjectPicTable_SwimmerM: @ 8506764
 	obj_tiles gFieldObjectPic_SwimmerM_0, 0x100
 	obj_tiles gFieldObjectPic_SwimmerM_1, 0x100
 	obj_tiles gFieldObjectPic_SwimmerM_2, 0x100
@@ -596,7 +596,7 @@ gFieldObjectPicTable_SwimmerM: ; 8506764
 
 	.align 2, 0
 
-gFieldObjectPicTable_SwimmerF: ; 85067AC
+gFieldObjectPicTable_SwimmerF: @ 85067AC
 	obj_tiles gFieldObjectPic_SwimmerF_0, 0x100
 	obj_tiles gFieldObjectPic_SwimmerF_1, 0x100
 	obj_tiles gFieldObjectPic_SwimmerF_2, 0x100
@@ -609,7 +609,7 @@ gFieldObjectPicTable_SwimmerF: ; 85067AC
 
 	.align 2, 0
 
-gFieldObjectPicTable_BlackBelt: ; 85067F4
+gFieldObjectPicTable_BlackBelt: @ 85067F4
 	obj_tiles gFieldObjectPic_BlackBelt_0, 0x100
 	obj_tiles gFieldObjectPic_BlackBelt_1, 0x100
 	obj_tiles gFieldObjectPic_BlackBelt_2, 0x100
@@ -622,7 +622,7 @@ gFieldObjectPicTable_BlackBelt: ; 85067F4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Beauty: ; 850683C
+gFieldObjectPicTable_Beauty: @ 850683C
 	obj_tiles gFieldObjectPic_Beauty_0, 0x100
 	obj_tiles gFieldObjectPic_Beauty_1, 0x100
 	obj_tiles gFieldObjectPic_Beauty_2, 0x100
@@ -635,7 +635,7 @@ gFieldObjectPicTable_Beauty: ; 850683C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Scientist1: ; 8506884
+gFieldObjectPicTable_Scientist1: @ 8506884
 	obj_tiles gFieldObjectPic_Scientist1_0, 0x100
 	obj_tiles gFieldObjectPic_Scientist1_1, 0x100
 	obj_tiles gFieldObjectPic_Scientist1_2, 0x100
@@ -648,7 +648,7 @@ gFieldObjectPicTable_Scientist1: ; 8506884
 
 	.align 2, 0
 
-gFieldObjectPicTable_Lass: ; 85068CC
+gFieldObjectPicTable_Lass: @ 85068CC
 	obj_tiles gFieldObjectPic_Lass_0, 0x100
 	obj_tiles gFieldObjectPic_Lass_1, 0x100
 	obj_tiles gFieldObjectPic_Lass_2, 0x100
@@ -661,7 +661,7 @@ gFieldObjectPicTable_Lass: ; 85068CC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Gentleman: ; 8506914
+gFieldObjectPicTable_Gentleman: @ 8506914
 	obj_tiles gFieldObjectPic_Gentleman_0, 0x100
 	obj_tiles gFieldObjectPic_Gentleman_1, 0x100
 	obj_tiles gFieldObjectPic_Gentleman_2, 0x100
@@ -674,7 +674,7 @@ gFieldObjectPicTable_Gentleman: ; 8506914
 
 	.align 2, 0
 
-gFieldObjectPicTable_Sailor: ; 850695C
+gFieldObjectPicTable_Sailor: @ 850695C
 	obj_tiles gFieldObjectPic_Sailor_0, 0x100
 	obj_tiles gFieldObjectPic_Sailor_1, 0x100
 	obj_tiles gFieldObjectPic_Sailor_2, 0x100
@@ -687,7 +687,7 @@ gFieldObjectPicTable_Sailor: ; 850695C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Fisherman: ; 85069A4
+gFieldObjectPicTable_Fisherman: @ 85069A4
 	obj_tiles gFieldObjectPic_Fisherman_0, 0x100
 	obj_tiles gFieldObjectPic_Fisherman_1, 0x100
 	obj_tiles gFieldObjectPic_Fisherman_2, 0x100
@@ -700,7 +700,7 @@ gFieldObjectPicTable_Fisherman: ; 85069A4
 
 	.align 2, 0
 
-gFieldObjectPicTable_RunningTriathleteM: ; 85069EC
+gFieldObjectPicTable_RunningTriathleteM: @ 85069EC
 	obj_tiles gFieldObjectPic_RunningTriathleteM_0, 0x100
 	obj_tiles gFieldObjectPic_RunningTriathleteM_1, 0x100
 	obj_tiles gFieldObjectPic_RunningTriathleteM_2, 0x100
@@ -713,7 +713,7 @@ gFieldObjectPicTable_RunningTriathleteM: ; 85069EC
 
 	.align 2, 0
 
-gFieldObjectPicTable_RunningTriathleteF: ; 8506A34
+gFieldObjectPicTable_RunningTriathleteF: @ 8506A34
 	obj_tiles gFieldObjectPic_RunningTriathleteF_0, 0x100
 	obj_tiles gFieldObjectPic_RunningTriathleteF_1, 0x100
 	obj_tiles gFieldObjectPic_RunningTriathleteF_2, 0x100
@@ -726,7 +726,7 @@ gFieldObjectPicTable_RunningTriathleteF: ; 8506A34
 
 	.align 2, 0
 
-gFieldObjectPicTable_TuberF: ; 8506A7C
+gFieldObjectPicTable_TuberF: @ 8506A7C
 	obj_tiles gFieldObjectPic_TuberF_0, 0x80
 	obj_tiles gFieldObjectPic_TuberF_1, 0x80
 	obj_tiles gFieldObjectPic_TuberF_2, 0x80
@@ -739,7 +739,7 @@ gFieldObjectPicTable_TuberF: ; 8506A7C
 
 	.align 2, 0
 
-gFieldObjectPicTable_TuberM: ; 8506AC4
+gFieldObjectPicTable_TuberM: @ 8506AC4
 	obj_tiles gFieldObjectPic_TuberM_0, 0x80
 	obj_tiles gFieldObjectPic_TuberM_1, 0x80
 	obj_tiles gFieldObjectPic_TuberM_2, 0x80
@@ -752,7 +752,7 @@ gFieldObjectPicTable_TuberM: ; 8506AC4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Hiker: ; 8506B0C
+gFieldObjectPicTable_Hiker: @ 8506B0C
 	obj_tiles gFieldObjectPic_Hiker_0, 0x100
 	obj_tiles gFieldObjectPic_Hiker_1, 0x100
 	obj_tiles gFieldObjectPic_Hiker_2, 0x100
@@ -765,7 +765,7 @@ gFieldObjectPicTable_Hiker: ; 8506B0C
 
 	.align 2, 0
 
-gFieldObjectPicTable_CyclingTriathleteM: ; 8506B54
+gFieldObjectPicTable_CyclingTriathleteM: @ 8506B54
 	obj_tiles gFieldObjectPic_CyclingTriathleteM_0, 0x200
 	obj_tiles gFieldObjectPic_CyclingTriathleteM_1, 0x200
 	obj_tiles gFieldObjectPic_CyclingTriathleteM_2, 0x200
@@ -778,7 +778,7 @@ gFieldObjectPicTable_CyclingTriathleteM: ; 8506B54
 
 	.align 2, 0
 
-gFieldObjectPicTable_CyclingTriathleteF: ; 8506B9C
+gFieldObjectPicTable_CyclingTriathleteF: @ 8506B9C
 	obj_tiles gFieldObjectPic_CyclingTriathleteF_0, 0x200
 	obj_tiles gFieldObjectPic_CyclingTriathleteF_1, 0x200
 	obj_tiles gFieldObjectPic_CyclingTriathleteF_2, 0x200
@@ -791,7 +791,7 @@ gFieldObjectPicTable_CyclingTriathleteF: ; 8506B9C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Nurse: ; 8506BE4
+gFieldObjectPicTable_Nurse: @ 8506BE4
 	obj_tiles gFieldObjectPic_Nurse_0, 0x100
 	obj_tiles gFieldObjectPic_Nurse_1, 0x100
 	obj_tiles gFieldObjectPic_Nurse_2, 0x100
@@ -805,12 +805,12 @@ gFieldObjectPicTable_Nurse: ; 8506BE4
 
 	.align 2, 0
 
-gFieldObjectPicTable_ItemBall: ; 8506C34
+gFieldObjectPicTable_ItemBall: @ 8506C34
 	obj_tiles gFieldObjectPic_ItemBall, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_ProfBirch: ; 8506C3C
+gFieldObjectPicTable_ProfBirch: @ 8506C3C
 	obj_tiles gFieldObjectPic_ProfBirch_0, 0x100
 	obj_tiles gFieldObjectPic_ProfBirch_1, 0x100
 	obj_tiles gFieldObjectPic_ProfBirch_2, 0x100
@@ -823,7 +823,7 @@ gFieldObjectPicTable_ProfBirch: ; 8506C3C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man5: ; 8506C84
+gFieldObjectPicTable_Man5: @ 8506C84
 	obj_tiles gFieldObjectPic_Man5_0, 0x100
 	obj_tiles gFieldObjectPic_Man5_1, 0x100
 	obj_tiles gFieldObjectPic_Man5_2, 0x100
@@ -836,7 +836,7 @@ gFieldObjectPicTable_Man5: ; 8506C84
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man6: ; 8506CCC
+gFieldObjectPicTable_Man6: @ 8506CCC
 	obj_tiles gFieldObjectPic_Man6_0, 0x100
 	obj_tiles gFieldObjectPic_Man6_1, 0x100
 	obj_tiles gFieldObjectPic_Man6_2, 0x100
@@ -849,7 +849,7 @@ gFieldObjectPicTable_Man6: ; 8506CCC
 
 	.align 2, 0
 
-gFieldObjectPicTable_ReporterM: ; 8506D14
+gFieldObjectPicTable_ReporterM: @ 8506D14
 	obj_tiles gFieldObjectPic_ReporterM_0, 0x100
 	obj_tiles gFieldObjectPic_ReporterM_1, 0x100
 	obj_tiles gFieldObjectPic_ReporterM_2, 0x100
@@ -862,7 +862,7 @@ gFieldObjectPicTable_ReporterM: ; 8506D14
 
 	.align 2, 0
 
-gFieldObjectPicTable_ReporterF: ; 8506D5C
+gFieldObjectPicTable_ReporterF: @ 8506D5C
 	obj_tiles gFieldObjectPic_ReporterF_0, 0x100
 	obj_tiles gFieldObjectPic_ReporterF_1, 0x100
 	obj_tiles gFieldObjectPic_ReporterF_2, 0x100
@@ -875,7 +875,7 @@ gFieldObjectPicTable_ReporterF: ; 8506D5C
 
 	.align 2, 0
 
-gFieldObjectPicTable_MauvilleOldMan1: ; 8506DA4
+gFieldObjectPicTable_MauvilleOldMan1: @ 8506DA4
 	obj_tiles gFieldObjectPic_MauvilleOldMan1_0, 0x100
 	obj_tiles gFieldObjectPic_MauvilleOldMan1_1, 0x100
 	obj_tiles gFieldObjectPic_MauvilleOldMan1_2, 0x100
@@ -888,7 +888,7 @@ gFieldObjectPicTable_MauvilleOldMan1: ; 8506DA4
 
 	.align 2, 0
 
-gFieldObjectPicTable_MauvilleOldMan2: ; 8506DEC
+gFieldObjectPicTable_MauvilleOldMan2: @ 8506DEC
 	obj_tiles gFieldObjectPic_MauvilleOldMan2_0, 0x100
 	obj_tiles gFieldObjectPic_MauvilleOldMan2_1, 0x100
 	obj_tiles gFieldObjectPic_MauvilleOldMan2_2, 0x100
@@ -901,37 +901,37 @@ gFieldObjectPicTable_MauvilleOldMan2: ; 8506DEC
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedNatuDoll: ; 8506E34
+gFieldObjectPicTable_UnusedNatuDoll: @ 8506E34
 	obj_tiles gFieldObjectPic_UnusedNatuDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedMagnemiteDoll: ; 8506E3C
+gFieldObjectPicTable_UnusedMagnemiteDoll: @ 8506E3C
 	obj_tiles gFieldObjectPic_UnusedMagnemiteDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedSquirtleDoll: ; 8506E44
+gFieldObjectPicTable_UnusedSquirtleDoll: @ 8506E44
 	obj_tiles gFieldObjectPic_UnusedSquirtleDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedWooperDoll: ; 8506E4C
+gFieldObjectPicTable_UnusedWooperDoll: @ 8506E4C
 	obj_tiles gFieldObjectPic_UnusedWooperDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedPikachuDoll: ; 8506E54
+gFieldObjectPicTable_UnusedPikachuDoll: @ 8506E54
 	obj_tiles gFieldObjectPic_UnusedPikachuDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnusedPorygon2Doll: ; 8506E5C
+gFieldObjectPicTable_UnusedPorygon2Doll: @ 8506E5C
 	obj_tiles gFieldObjectPic_UnusedPorygon2Doll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_CuttableTree: ; 8506E64
+gFieldObjectPicTable_CuttableTree: @ 8506E64
 	obj_tiles gFieldObjectPic_CuttableTree_0, 0x80
 	obj_tiles gFieldObjectPic_CuttableTree_1, 0x80
 	obj_tiles gFieldObjectPic_CuttableTree_2, 0x80
@@ -939,7 +939,7 @@ gFieldObjectPicTable_CuttableTree: ; 8506E64
 
 	.align 2, 0
 
-gFieldObjectPicTable_MartEmployee: ; 8506E84
+gFieldObjectPicTable_MartEmployee: @ 8506E84
 	obj_tiles gFieldObjectPic_MartEmployee_0, 0x100
 	obj_tiles gFieldObjectPic_MartEmployee_1, 0x100
 	obj_tiles gFieldObjectPic_MartEmployee_2, 0x100
@@ -952,7 +952,7 @@ gFieldObjectPicTable_MartEmployee: ; 8506E84
 
 	.align 2, 0
 
-gFieldObjectPicTable_RooftopSaleWoman: ; 8506ECC
+gFieldObjectPicTable_RooftopSaleWoman: @ 8506ECC
 	obj_tiles gFieldObjectPic_RooftopSaleWoman_0, 0x100
 	obj_tiles gFieldObjectPic_RooftopSaleWoman_1, 0x100
 	obj_tiles gFieldObjectPic_RooftopSaleWoman_2, 0x100
@@ -965,7 +965,7 @@ gFieldObjectPicTable_RooftopSaleWoman: ; 8506ECC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Teala: ; 8506F14
+gFieldObjectPicTable_Teala: @ 8506F14
 	obj_tiles gFieldObjectPic_Teala_0, 0x100
 	obj_tiles gFieldObjectPic_Teala_1, 0x100
 	obj_tiles gFieldObjectPic_Teala_2, 0x100
@@ -978,7 +978,7 @@ gFieldObjectPicTable_Teala: ; 8506F14
 
 	.align 2, 0
 
-gFieldObjectPicTable_BreakableRock: ; 8506F5C
+gFieldObjectPicTable_BreakableRock: @ 8506F5C
 	obj_tiles gFieldObjectPic_BreakableRock_0, 0x80
 	obj_tiles gFieldObjectPic_BreakableRock_1, 0x80
 	obj_tiles gFieldObjectPic_BreakableRock_2, 0x80
@@ -986,12 +986,12 @@ gFieldObjectPicTable_BreakableRock: ; 8506F5C
 
 	.align 2, 0
 
-gFieldObjectPicTable_PushableBoulder: ; 8506F7C
+gFieldObjectPicTable_PushableBoulder: @ 8506F7C
 	obj_tiles gFieldObjectPic_PushableBoulder, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_MrBrineysBoat: ; 8506F84
+gFieldObjectPicTable_MrBrineysBoat: @ 8506F84
 	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
 	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
 	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
@@ -1004,12 +1004,12 @@ gFieldObjectPicTable_MrBrineysBoat: ; 8506F84
 
 	.align 2, 0
 
-gFieldObjectPicTable_Truck: ; 8506FCC
+gFieldObjectPicTable_Truck: @ 8506FCC
 	obj_tiles gFieldObjectPic_Truck, 0x480
 
 	.align 2, 0
 
-gFieldObjectPicTable_VigorothCarryingBox: ; 8506FD4
+gFieldObjectPicTable_VigorothCarryingBox: @ 8506FD4
 	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
 	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
 	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
@@ -1022,7 +1022,7 @@ gFieldObjectPicTable_VigorothCarryingBox: ; 8506FD4
 
 	.align 2, 0
 
-gFieldObjectPicTable_VigorothFacingAway: ; 850701C
+gFieldObjectPicTable_VigorothFacingAway: @ 850701C
 	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
 	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
 	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
@@ -1035,12 +1035,12 @@ gFieldObjectPicTable_VigorothFacingAway: ; 850701C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BirchsBag: ; 8507064
+gFieldObjectPicTable_BirchsBag: @ 8507064
 	obj_tiles gFieldObjectPic_BirchsBag, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_EnemyZigzagoon: ; 850706C
+gFieldObjectPicTable_EnemyZigzagoon: @ 850706C
 	obj_tiles gFieldObjectPic_EnemyZigzagoon_0, 0x200
 	obj_tiles gFieldObjectPic_EnemyZigzagoon_1, 0x200
 	obj_tiles gFieldObjectPic_EnemyZigzagoon_2, 0x200
@@ -1053,7 +1053,7 @@ gFieldObjectPicTable_EnemyZigzagoon: ; 850706C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Poochyena: ; 85070B4
+gFieldObjectPicTable_Poochyena: @ 85070B4
 	obj_tiles gFieldObjectPic_Poochyena_0, 0x200
 	obj_tiles gFieldObjectPic_Poochyena_1, 0x200
 	obj_tiles gFieldObjectPic_Poochyena_2, 0x200
@@ -1066,7 +1066,7 @@ gFieldObjectPicTable_Poochyena: ; 85070B4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Artist: ; 85070FC
+gFieldObjectPicTable_Artist: @ 85070FC
 	obj_tiles gFieldObjectPic_Artist_0, 0x100
 	obj_tiles gFieldObjectPic_Artist_1, 0x100
 	obj_tiles gFieldObjectPic_Artist_2, 0x100
@@ -1079,7 +1079,7 @@ gFieldObjectPicTable_Artist: ; 85070FC
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayNormal: ; 8507144
+gFieldObjectPicTable_MayNormal: @ 8507144
 	obj_tiles gFieldObjectPic_MayNormal_0, 0x100
 	obj_tiles gFieldObjectPic_MayNormal_1, 0x100
 	obj_tiles gFieldObjectPic_MayNormal_2, 0x100
@@ -1101,7 +1101,7 @@ gFieldObjectPicTable_MayNormal: ; 8507144
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayMachBike: ; 85071D4
+gFieldObjectPicTable_MayMachBike: @ 85071D4
 	obj_tiles gFieldObjectPic_MayMachBike_0, 0x200
 	obj_tiles gFieldObjectPic_MayMachBike_1, 0x200
 	obj_tiles gFieldObjectPic_MayMachBike_2, 0x200
@@ -1114,7 +1114,7 @@ gFieldObjectPicTable_MayMachBike: ; 85071D4
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayAcroBike: ; 850721C
+gFieldObjectPicTable_MayAcroBike: @ 850721C
 	obj_tiles gFieldObjectPic_MayAcroBike_0, 0x200
 	obj_tiles gFieldObjectPic_MayAcroBike_1, 0x200
 	obj_tiles gFieldObjectPic_MayAcroBike_2, 0x200
@@ -1145,7 +1145,7 @@ gFieldObjectPicTable_MayAcroBike: ; 850721C
 
 	.align 2, 0
 
-gFieldObjectPicTable_MaySurfing: ; 85072F4
+gFieldObjectPicTable_MaySurfing: @ 85072F4
 	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
 	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
 	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
@@ -1161,7 +1161,7 @@ gFieldObjectPicTable_MaySurfing: ; 85072F4
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayUnderwater: ; 8507354
+gFieldObjectPicTable_MayUnderwater: @ 8507354
 	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
 	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
 	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
@@ -1174,7 +1174,7 @@ gFieldObjectPicTable_MayUnderwater: ; 8507354
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayFieldMove: ; 850739C
+gFieldObjectPicTable_MayFieldMove: @ 850739C
 	obj_tiles gFieldObjectPic_MayFieldMove_0, 0x200
 	obj_tiles gFieldObjectPic_MayFieldMove_1, 0x200
 	obj_tiles gFieldObjectPic_MayFieldMove_2, 0x200
@@ -1183,7 +1183,7 @@ gFieldObjectPicTable_MayFieldMove: ; 850739C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Cameraman: ; 85073C4
+gFieldObjectPicTable_Cameraman: @ 85073C4
 	obj_tiles gFieldObjectPic_Cameraman_0, 0x100
 	obj_tiles gFieldObjectPic_Cameraman_1, 0x100
 	obj_tiles gFieldObjectPic_Cameraman_2, 0x100
@@ -1196,17 +1196,17 @@ gFieldObjectPicTable_Cameraman: ; 85073C4
 
 	.align 2, 0
 
-gFieldObjectPicTable_MovingBox: ; 850740C
+gFieldObjectPicTable_MovingBox: @ 850740C
 	obj_tiles gFieldObjectPic_MovingBox, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_CableCar: ; 8507414
+gFieldObjectPicTable_CableCar: @ 8507414
 	obj_tiles gFieldObjectPic_CableCar, 0x800
 
 	.align 2, 0
 
-gFieldObjectPicTable_Scientist2: ; 850741C
+gFieldObjectPicTable_Scientist2: @ 850741C
 	obj_tiles gFieldObjectPic_Scientist2_0, 0x100
 	obj_tiles gFieldObjectPic_Scientist2_1, 0x100
 	obj_tiles gFieldObjectPic_Scientist2_2, 0x100
@@ -1219,7 +1219,7 @@ gFieldObjectPicTable_Scientist2: ; 850741C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Man7: ; 8507464
+gFieldObjectPicTable_Man7: @ 8507464
 	obj_tiles gFieldObjectPic_Man7_0, 0x100
 	obj_tiles gFieldObjectPic_Man7_1, 0x100
 	obj_tiles gFieldObjectPic_Man7_2, 0x100
@@ -1232,7 +1232,7 @@ gFieldObjectPicTable_Man7: ; 8507464
 
 	.align 2, 0
 
-gFieldObjectPicTable_AquaMemberM: ; 85074AC
+gFieldObjectPicTable_AquaMemberM: @ 85074AC
 	obj_tiles gFieldObjectPic_AquaMemberM_0, 0x100
 	obj_tiles gFieldObjectPic_AquaMemberM_1, 0x100
 	obj_tiles gFieldObjectPic_AquaMemberM_2, 0x100
@@ -1245,7 +1245,7 @@ gFieldObjectPicTable_AquaMemberM: ; 85074AC
 
 	.align 2, 0
 
-gFieldObjectPicTable_AquaMemberF: ; 85074F4
+gFieldObjectPicTable_AquaMemberF: @ 85074F4
 	obj_tiles gFieldObjectPic_AquaMemberF_0, 0x100
 	obj_tiles gFieldObjectPic_AquaMemberF_1, 0x100
 	obj_tiles gFieldObjectPic_AquaMemberF_2, 0x100
@@ -1258,7 +1258,7 @@ gFieldObjectPicTable_AquaMemberF: ; 85074F4
 
 	.align 2, 0
 
-gFieldObjectPicTable_MagmaMemberM: ; 850753C
+gFieldObjectPicTable_MagmaMemberM: @ 850753C
 	obj_tiles gFieldObjectPic_MagmaMemberM_0, 0x100
 	obj_tiles gFieldObjectPic_MagmaMemberM_1, 0x100
 	obj_tiles gFieldObjectPic_MagmaMemberM_2, 0x100
@@ -1271,7 +1271,7 @@ gFieldObjectPicTable_MagmaMemberM: ; 850753C
 
 	.align 2, 0
 
-gFieldObjectPicTable_MagmaMemberF: ; 8507584
+gFieldObjectPicTable_MagmaMemberF: @ 8507584
 	obj_tiles gFieldObjectPic_MagmaMemberF_0, 0x100
 	obj_tiles gFieldObjectPic_MagmaMemberF_1, 0x100
 	obj_tiles gFieldObjectPic_MagmaMemberF_2, 0x100
@@ -1284,7 +1284,7 @@ gFieldObjectPicTable_MagmaMemberF: ; 8507584
 
 	.align 2, 0
 
-gFieldObjectPicTable_Sidney: ; 85075CC
+gFieldObjectPicTable_Sidney: @ 85075CC
 	obj_tiles gFieldObjectPic_Sidney_0, 0x100
 	obj_tiles gFieldObjectPic_Sidney_1, 0x100
 	obj_tiles gFieldObjectPic_Sidney_2, 0x100
@@ -1297,7 +1297,7 @@ gFieldObjectPicTable_Sidney: ; 85075CC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Phoebe: ; 8507614
+gFieldObjectPicTable_Phoebe: @ 8507614
 	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
 	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
 	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
@@ -1310,7 +1310,7 @@ gFieldObjectPicTable_Phoebe: ; 8507614
 
 	.align 2, 0
 
-gFieldObjectPicTable_Glacia: ; 850765C
+gFieldObjectPicTable_Glacia: @ 850765C
 	obj_tiles gFieldObjectPic_Glacia_0, 0x100
 	obj_tiles gFieldObjectPic_Glacia_1, 0x100
 	obj_tiles gFieldObjectPic_Glacia_2, 0x100
@@ -1323,7 +1323,7 @@ gFieldObjectPicTable_Glacia: ; 850765C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Drake: ; 85076A4
+gFieldObjectPicTable_Drake: @ 85076A4
 	obj_tiles gFieldObjectPic_Drake_0, 0x100
 	obj_tiles gFieldObjectPic_Drake_1, 0x100
 	obj_tiles gFieldObjectPic_Drake_2, 0x100
@@ -1336,7 +1336,7 @@ gFieldObjectPicTable_Drake: ; 85076A4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Roxanne: ; 85076EC
+gFieldObjectPicTable_Roxanne: @ 85076EC
 	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
 	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
 	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
@@ -1349,7 +1349,7 @@ gFieldObjectPicTable_Roxanne: ; 85076EC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Brawly: ; 8507734
+gFieldObjectPicTable_Brawly: @ 8507734
 	obj_tiles gFieldObjectPic_Brawly_0, 0x100
 	obj_tiles gFieldObjectPic_Brawly_1, 0x100
 	obj_tiles gFieldObjectPic_Brawly_2, 0x100
@@ -1362,7 +1362,7 @@ gFieldObjectPicTable_Brawly: ; 8507734
 
 	.align 2, 0
 
-gFieldObjectPicTable_Wattson: ; 850777C
+gFieldObjectPicTable_Wattson: @ 850777C
 	obj_tiles gFieldObjectPic_Wattson_0, 0x100
 	obj_tiles gFieldObjectPic_Wattson_1, 0x100
 	obj_tiles gFieldObjectPic_Wattson_2, 0x100
@@ -1375,7 +1375,7 @@ gFieldObjectPicTable_Wattson: ; 850777C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Flannery: ; 85077C4
+gFieldObjectPicTable_Flannery: @ 85077C4
 	obj_tiles gFieldObjectPic_Flannery_0, 0x100
 	obj_tiles gFieldObjectPic_Flannery_1, 0x100
 	obj_tiles gFieldObjectPic_Flannery_2, 0x100
@@ -1388,7 +1388,7 @@ gFieldObjectPicTable_Flannery: ; 85077C4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Norman: ; 850780C
+gFieldObjectPicTable_Norman: @ 850780C
 	obj_tiles gFieldObjectPic_Norman_0, 0x100
 	obj_tiles gFieldObjectPic_Norman_1, 0x100
 	obj_tiles gFieldObjectPic_Norman_2, 0x100
@@ -1401,7 +1401,7 @@ gFieldObjectPicTable_Norman: ; 850780C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Winona: ; 8507854
+gFieldObjectPicTable_Winona: @ 8507854
 	obj_tiles gFieldObjectPic_Winona_0, 0x100
 	obj_tiles gFieldObjectPic_Winona_1, 0x100
 	obj_tiles gFieldObjectPic_Winona_2, 0x100
@@ -1414,7 +1414,7 @@ gFieldObjectPicTable_Winona: ; 8507854
 
 	.align 2, 0
 
-gFieldObjectPicTable_Liza: ; 850789C
+gFieldObjectPicTable_Liza: @ 850789C
 	obj_tiles gFieldObjectPic_Liza_0, 0x100
 	obj_tiles gFieldObjectPic_Liza_1, 0x100
 	obj_tiles gFieldObjectPic_Liza_2, 0x100
@@ -1427,7 +1427,7 @@ gFieldObjectPicTable_Liza: ; 850789C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Tate: ; 85078E4
+gFieldObjectPicTable_Tate: @ 85078E4
 	obj_tiles gFieldObjectPic_Tate_0, 0x100
 	obj_tiles gFieldObjectPic_Tate_1, 0x100
 	obj_tiles gFieldObjectPic_Tate_2, 0x100
@@ -1440,7 +1440,7 @@ gFieldObjectPicTable_Tate: ; 85078E4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Wallace: ; 850792C
+gFieldObjectPicTable_Wallace: @ 850792C
 	obj_tiles gFieldObjectPic_Wallace_0, 0x100
 	obj_tiles gFieldObjectPic_Wallace_1, 0x100
 	obj_tiles gFieldObjectPic_Wallace_2, 0x100
@@ -1453,7 +1453,7 @@ gFieldObjectPicTable_Wallace: ; 850792C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Steven: ; 8507974
+gFieldObjectPicTable_Steven: @ 8507974
 	obj_tiles gFieldObjectPic_Steven_0, 0x100
 	obj_tiles gFieldObjectPic_Steven_1, 0x100
 	obj_tiles gFieldObjectPic_Steven_2, 0x100
@@ -1466,7 +1466,7 @@ gFieldObjectPicTable_Steven: ; 8507974
 
 	.align 2, 0
 
-gFieldObjectPicTable_Wally: ; 85079BC
+gFieldObjectPicTable_Wally: @ 85079BC
 	obj_tiles gFieldObjectPic_Wally_0, 0x100
 	obj_tiles gFieldObjectPic_Wally_1, 0x100
 	obj_tiles gFieldObjectPic_Wally_2, 0x100
@@ -1479,7 +1479,7 @@ gFieldObjectPicTable_Wally: ; 85079BC
 
 	.align 2, 0
 
-gFieldObjectPicTable_RubySapphireLittleBoy: ; 8507A04
+gFieldObjectPicTable_RubySapphireLittleBoy: @ 8507A04
 	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_0, 0x80
 	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_1, 0x80
 	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_2, 0x80
@@ -1492,7 +1492,7 @@ gFieldObjectPicTable_RubySapphireLittleBoy: ; 8507A04
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanFishing: ; 8507A4C
+gFieldObjectPicTable_BrendanFishing: @ 8507A4C
 	obj_tiles gFieldObjectPic_BrendanFishing_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanFishing_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanFishing_2, 0x200
@@ -1508,7 +1508,7 @@ gFieldObjectPicTable_BrendanFishing: ; 8507A4C
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayFishing: ; 8507AAC
+gFieldObjectPicTable_MayFishing: @ 8507AAC
 	obj_tiles gFieldObjectPic_MayFishing_0, 0x200
 	obj_tiles gFieldObjectPic_MayFishing_1, 0x200
 	obj_tiles gFieldObjectPic_MayFishing_2, 0x200
@@ -1524,7 +1524,7 @@ gFieldObjectPicTable_MayFishing: ; 8507AAC
 
 	.align 2, 0
 
-gFieldObjectPicTable_HotSpringsOldWoman: ; 8507B0C
+gFieldObjectPicTable_HotSpringsOldWoman: @ 8507B0C
 	obj_tiles gFieldObjectPic_HotSpringsOldWoman_0, 0x100
 	obj_tiles gFieldObjectPic_HotSpringsOldWoman_1, 0x100
 	obj_tiles gFieldObjectPic_HotSpringsOldWoman_2, 0x100
@@ -1537,7 +1537,7 @@ gFieldObjectPicTable_HotSpringsOldWoman: ; 8507B0C
 
 	.align 2, 0
 
-gFieldObjectPicTable_SSTidal: ; 8507B54
+gFieldObjectPicTable_SSTidal: @ 8507B54
 	obj_tiles gFieldObjectPic_SSTidal, 0x780
 	obj_tiles gFieldObjectPic_SSTidal, 0x780
 	obj_tiles gFieldObjectPic_SSTidal, 0x780
@@ -1550,7 +1550,7 @@ gFieldObjectPicTable_SSTidal: ; 8507B54
 
 	.align 2, 0
 
-gFieldObjectPicTable_SubmarineShadow: ; 8507B9C
+gFieldObjectPicTable_SubmarineShadow: @ 8507B9C
 	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
 	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
 	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
@@ -1563,232 +1563,232 @@ gFieldObjectPicTable_SubmarineShadow: ; 8507B9C
 
 	.align 2, 0
 
-gFieldObjectPicTable_PichuDoll: ; 8507BE4
+gFieldObjectPicTable_PichuDoll: @ 8507BE4
 	obj_tiles gFieldObjectPic_PichuDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_PikachuDoll: ; 8507BEC
+gFieldObjectPicTable_PikachuDoll: @ 8507BEC
 	obj_tiles gFieldObjectPic_PikachuDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_MarillDoll: ; 8507BF4
+gFieldObjectPicTable_MarillDoll: @ 8507BF4
 	obj_tiles gFieldObjectPic_MarillDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_TogepiDoll: ; 8507BFC
+gFieldObjectPicTable_TogepiDoll: @ 8507BFC
 	obj_tiles gFieldObjectPic_TogepiDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_CyndaquilDoll: ; 8507C04
+gFieldObjectPicTable_CyndaquilDoll: @ 8507C04
 	obj_tiles gFieldObjectPic_CyndaquilDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_ChikoritaDoll: ; 8507C0C
+gFieldObjectPicTable_ChikoritaDoll: @ 8507C0C
 	obj_tiles gFieldObjectPic_ChikoritaDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_TotodileDoll: ; 8507C14
+gFieldObjectPicTable_TotodileDoll: @ 8507C14
 	obj_tiles gFieldObjectPic_TotodileDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_JigglypuffDoll: ; 8507C1C
+gFieldObjectPicTable_JigglypuffDoll: @ 8507C1C
 	obj_tiles gFieldObjectPic_JigglypuffDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_MeowthDoll: ; 8507C24
+gFieldObjectPicTable_MeowthDoll: @ 8507C24
 	obj_tiles gFieldObjectPic_MeowthDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_ClefairyDoll: ; 8507C2C
+gFieldObjectPicTable_ClefairyDoll: @ 8507C2C
 	obj_tiles gFieldObjectPic_ClefairyDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_DittoDoll: ; 8507C34
+gFieldObjectPicTable_DittoDoll: @ 8507C34
 	obj_tiles gFieldObjectPic_DittoDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_SmoochumDoll: ; 8507C3C
+gFieldObjectPicTable_SmoochumDoll: @ 8507C3C
 	obj_tiles gFieldObjectPic_SmoochumDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_TreeckoDoll: ; 8507C44
+gFieldObjectPicTable_TreeckoDoll: @ 8507C44
 	obj_tiles gFieldObjectPic_TreeckoDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_TorchicDoll: ; 8507C4C
+gFieldObjectPicTable_TorchicDoll: @ 8507C4C
 	obj_tiles gFieldObjectPic_TorchicDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_MudkipDoll: ; 8507C54
+gFieldObjectPicTable_MudkipDoll: @ 8507C54
 	obj_tiles gFieldObjectPic_MudkipDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_DuskullDoll: ; 8507C5C
+gFieldObjectPicTable_DuskullDoll: @ 8507C5C
 	obj_tiles gFieldObjectPic_DuskullDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_WynautDoll: ; 8507C64
+gFieldObjectPicTable_WynautDoll: @ 8507C64
 	obj_tiles gFieldObjectPic_WynautDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_BaltoyDoll: ; 8507C6C
+gFieldObjectPicTable_BaltoyDoll: @ 8507C6C
 	obj_tiles gFieldObjectPic_BaltoyDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_KecleonDoll: ; 8507C74
+gFieldObjectPicTable_KecleonDoll: @ 8507C74
 	obj_tiles gFieldObjectPic_KecleonDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_AzurillDoll: ; 8507C7C
+gFieldObjectPicTable_AzurillDoll: @ 8507C7C
 	obj_tiles gFieldObjectPic_AzurillDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_SkittyDoll: ; 8507C84
+gFieldObjectPicTable_SkittyDoll: @ 8507C84
 	obj_tiles gFieldObjectPic_SkittyDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_SwabluDoll: ; 8507C8C
+gFieldObjectPicTable_SwabluDoll: @ 8507C8C
 	obj_tiles gFieldObjectPic_SwabluDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_GulpinDoll: ; 8507C94
+gFieldObjectPicTable_GulpinDoll: @ 8507C94
 	obj_tiles gFieldObjectPic_GulpinDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_LotadDoll: ; 8507C9C
+gFieldObjectPicTable_LotadDoll: @ 8507C9C
 	obj_tiles gFieldObjectPic_LotadDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_SeedotDoll: ; 8507CA4
+gFieldObjectPicTable_SeedotDoll: @ 8507CA4
 	obj_tiles gFieldObjectPic_SeedotDoll, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_PikaCushion: ; 8507CAC
+gFieldObjectPicTable_PikaCushion: @ 8507CAC
 	obj_tiles gFieldObjectPic_PikaCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_RoundCushion: ; 8507CB4
+gFieldObjectPicTable_RoundCushion: @ 8507CB4
 	obj_tiles gFieldObjectPic_RoundCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_KissCushion: ; 8507CBC
+gFieldObjectPicTable_KissCushion: @ 8507CBC
 	obj_tiles gFieldObjectPic_KissCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_ZigzagCushion: ; 8507CC4
+gFieldObjectPicTable_ZigzagCushion: @ 8507CC4
 	obj_tiles gFieldObjectPic_ZigzagCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_SpinCushion: ; 8507CCC
+gFieldObjectPicTable_SpinCushion: @ 8507CCC
 	obj_tiles gFieldObjectPic_SpinCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_DiamondCushion: ; 8507CD4
+gFieldObjectPicTable_DiamondCushion: @ 8507CD4
 	obj_tiles gFieldObjectPic_DiamondCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_BallCushion: ; 8507CDC
+gFieldObjectPicTable_BallCushion: @ 8507CDC
 	obj_tiles gFieldObjectPic_BallCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_GrassCushion: ; 8507CE4
+gFieldObjectPicTable_GrassCushion: @ 8507CE4
 	obj_tiles gFieldObjectPic_GrassCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_FireCushion: ; 8507CEC
+gFieldObjectPicTable_FireCushion: @ 8507CEC
 	obj_tiles gFieldObjectPic_FireCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_WaterCushion: ; 8507CF4
+gFieldObjectPicTable_WaterCushion: @ 8507CF4
 	obj_tiles gFieldObjectPic_WaterCushion, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigSnorlaxDoll: ; 8507CFC
+gFieldObjectPicTable_BigSnorlaxDoll: @ 8507CFC
 	obj_tiles gFieldObjectPic_BigSnorlaxDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigRhydonDoll: ; 8507D04
+gFieldObjectPicTable_BigRhydonDoll: @ 8507D04
 	obj_tiles gFieldObjectPic_BigRhydonDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigLaprasDoll: ; 8507D0C
+gFieldObjectPicTable_BigLaprasDoll: @ 8507D0C
 	obj_tiles gFieldObjectPic_BigLaprasDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigVenusaurDoll: ; 8507D14
+gFieldObjectPicTable_BigVenusaurDoll: @ 8507D14
 	obj_tiles gFieldObjectPic_BigVenusaurDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigCharizardDoll: ; 8507D1C
+gFieldObjectPicTable_BigCharizardDoll: @ 8507D1C
 	obj_tiles gFieldObjectPic_BigCharizardDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigBlastoiseDoll: ; 8507D24
+gFieldObjectPicTable_BigBlastoiseDoll: @ 8507D24
 	obj_tiles gFieldObjectPic_BigBlastoiseDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigWailmerDoll: ; 8507D2C
+gFieldObjectPicTable_BigWailmerDoll: @ 8507D2C
 	obj_tiles gFieldObjectPic_BigWailmerDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigRegirockDoll: ; 8507D34
+gFieldObjectPicTable_BigRegirockDoll: @ 8507D34
 	obj_tiles gFieldObjectPic_BigRegirockDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigRegiceDoll: ; 8507D3C
+gFieldObjectPicTable_BigRegiceDoll: @ 8507D3C
 	obj_tiles gFieldObjectPic_BigRegiceDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_BigRegisteelDoll: ; 8507D44
+gFieldObjectPicTable_BigRegisteelDoll: @ 8507D44
 	obj_tiles gFieldObjectPic_BigRegisteelDoll, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_LatiasLatios: ; 8507D4C
+gFieldObjectPicTable_LatiasLatios: @ 8507D4C
 	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
 	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
 	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
@@ -1801,7 +1801,7 @@ gFieldObjectPicTable_LatiasLatios: ; 8507D4C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Boy5: ; 8507D94
+gFieldObjectPicTable_Boy5: @ 8507D94
 	obj_tiles gFieldObjectPic_Boy5_0, 0x100
 	obj_tiles gFieldObjectPic_Boy5_1, 0x100
 	obj_tiles gFieldObjectPic_Boy5_2, 0x100
@@ -1814,7 +1814,7 @@ gFieldObjectPicTable_Boy5: ; 8507D94
 
 	.align 2, 0
 
-gFieldObjectPicTable_ContestOldMan: ; 8507DDC
+gFieldObjectPicTable_ContestOldMan: @ 8507DDC
 	obj_tiles gFieldObjectPic_ContestOldMan_0, 0x100
 	obj_tiles gFieldObjectPic_ContestOldMan_1, 0x100
 	obj_tiles gFieldObjectPic_ContestOldMan_2, 0x100
@@ -1827,7 +1827,7 @@ gFieldObjectPicTable_ContestOldMan: ; 8507DDC
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanWatering: ; 8507E24
+gFieldObjectPicTable_BrendanWatering: @ 8507E24
 	obj_tiles gFieldObjectPic_BrendanWatering_0, 0x200
 	obj_tiles gFieldObjectPic_BrendanWatering_1, 0x200
 	obj_tiles gFieldObjectPic_BrendanWatering_2, 0x200
@@ -1840,7 +1840,7 @@ gFieldObjectPicTable_BrendanWatering: ; 8507E24
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayWatering: ; 8507E6C
+gFieldObjectPicTable_MayWatering: @ 8507E6C
 	obj_tiles gFieldObjectPic_MayWatering_0, 0x200
 	obj_tiles gFieldObjectPic_MayWatering_1, 0x200
 	obj_tiles gFieldObjectPic_MayWatering_2, 0x200
@@ -1853,17 +1853,17 @@ gFieldObjectPicTable_MayWatering: ; 8507E6C
 
 	.align 2, 0
 
-gFieldObjectPicTable_BrendanDecorating: ; 8507EB4
+gFieldObjectPicTable_BrendanDecorating: @ 8507EB4
 	obj_tiles gFieldObjectPic_BrendanDecorating, 0x100
 
 	.align 2, 0
 
-gFieldObjectPicTable_MayDecorating: ; 8507EBC
+gFieldObjectPicTable_MayDecorating: @ 8507EBC
 	obj_tiles gFieldObjectPic_MayDecorating, 0x100
 
 	.align 2, 0
 
-gFieldObjectPicTable_Archie: ; 8507EC4
+gFieldObjectPicTable_Archie: @ 8507EC4
 	obj_tiles gFieldObjectPic_Archie_0, 0x100
 	obj_tiles gFieldObjectPic_Archie_1, 0x100
 	obj_tiles gFieldObjectPic_Archie_2, 0x100
@@ -1876,7 +1876,7 @@ gFieldObjectPicTable_Archie: ; 8507EC4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Maxie: ; 8507F0C
+gFieldObjectPicTable_Maxie: @ 8507F0C
 	obj_tiles gFieldObjectPic_Maxie_0, 0x100
 	obj_tiles gFieldObjectPic_Maxie_1, 0x100
 	obj_tiles gFieldObjectPic_Maxie_2, 0x100
@@ -1889,7 +1889,7 @@ gFieldObjectPicTable_Maxie: ; 8507F0C
 
 	.align 2, 0
 
-gFieldObjectPicTable_KyogreFront: ; 8507F54
+gFieldObjectPicTable_KyogreFront: @ 8507F54
 	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
 	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
 	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
@@ -1902,7 +1902,7 @@ gFieldObjectPicTable_KyogreFront: ; 8507F54
 
 	.align 2, 0
 
-gFieldObjectPicTable_GroudonFront: ; 8507F9C
+gFieldObjectPicTable_GroudonFront: @ 8507F9C
 	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
 	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
 	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
@@ -1915,7 +1915,7 @@ gFieldObjectPicTable_GroudonFront: ; 8507F9C
 
 	.align 2, 0
 
-gFieldObjectPicTable_KyogreSide: ; 8507FE4
+gFieldObjectPicTable_KyogreSide: @ 8507FE4
 	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
 	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
 	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
@@ -1928,7 +1928,7 @@ gFieldObjectPicTable_KyogreSide: ; 8507FE4
 
 	.align 2, 0
 
-gFieldObjectPicTable_GroudonSide: ; 850802C
+gFieldObjectPicTable_GroudonSide: @ 850802C
 	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
 	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
 	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
@@ -1941,12 +1941,12 @@ gFieldObjectPicTable_GroudonSide: ; 850802C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Fossil: ; 8508074
+gFieldObjectPicTable_Fossil: @ 8508074
 	obj_tiles gFieldObjectPic_Fossil, 0x80
 
 	.align 2, 0
 
-gFieldObjectPicTable_Regi: ; 850807C
+gFieldObjectPicTable_Regi: @ 850807C
 	obj_tiles gFieldObjectPic_Regi, 0x200
 	obj_tiles gFieldObjectPic_Regi, 0x200
 	obj_tiles gFieldObjectPic_Regi, 0x200
@@ -1959,7 +1959,7 @@ gFieldObjectPicTable_Regi: ; 850807C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Skitty: ; 85080C4
+gFieldObjectPicTable_Skitty: @ 85080C4
 	obj_tiles gFieldObjectPic_Skitty_0, 0x80
 	obj_tiles gFieldObjectPic_Skitty_1, 0x80
 	obj_tiles gFieldObjectPic_Skitty_2, 0x80
@@ -1972,7 +1972,7 @@ gFieldObjectPicTable_Skitty: ; 85080C4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Kecleon: ; 850810C
+gFieldObjectPicTable_Kecleon: @ 850810C
 	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
 	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
 	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
@@ -1985,7 +1985,7 @@ gFieldObjectPicTable_Kecleon: ; 850810C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Rayquaza: ; 8508154
+gFieldObjectPicTable_Rayquaza: @ 8508154
 	obj_tiles gFieldObjectPic_Rayquaza_0, 0x800
 	obj_tiles gFieldObjectPic_Rayquaza_1, 0x800
 	obj_tiles gFieldObjectPic_Rayquaza_2, 0x800
@@ -1994,7 +1994,7 @@ gFieldObjectPicTable_Rayquaza: ; 8508154
 
 	.align 2, 0
 
-gFieldObjectPicTable_RayquazaStill: ; 850817C
+gFieldObjectPicTable_RayquazaStill: @ 850817C
 	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
 	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
 	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
@@ -2007,7 +2007,7 @@ gFieldObjectPicTable_RayquazaStill: ; 850817C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Zigzagoon: ; 85081C4
+gFieldObjectPicTable_Zigzagoon: @ 85081C4
 	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
 	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
 	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
@@ -2020,7 +2020,7 @@ gFieldObjectPicTable_Zigzagoon: ; 85081C4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Pikachu: ; 850820C
+gFieldObjectPicTable_Pikachu: @ 850820C
 	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
 	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
 	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
@@ -2033,7 +2033,7 @@ gFieldObjectPicTable_Pikachu: ; 850820C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Azumarill: ; 8508254
+gFieldObjectPicTable_Azumarill: @ 8508254
 	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
 	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
 	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
@@ -2046,7 +2046,7 @@ gFieldObjectPicTable_Azumarill: ; 8508254
 
 	.align 2, 0
 
-gFieldObjectPicTable_Wingull: ; 850829C
+gFieldObjectPicTable_Wingull: @ 850829C
 	obj_tiles gFieldObjectPic_Wingull_0, 0x80
 	obj_tiles gFieldObjectPic_Wingull_1, 0x80
 	obj_tiles gFieldObjectPic_Wingull_2, 0x80
@@ -2059,7 +2059,7 @@ gFieldObjectPicTable_Wingull: ; 850829C
 
 	.align 2, 0
 
-gFieldObjectPicTable_TuberMSwimming: ; 85082E4
+gFieldObjectPicTable_TuberMSwimming: @ 85082E4
 	obj_tiles gFieldObjectPic_TuberMSwimming_0, 0x80
 	obj_tiles gFieldObjectPic_TuberMSwimming_1, 0x80
 	obj_tiles gFieldObjectPic_TuberMSwimming_2, 0x80
@@ -2072,7 +2072,7 @@ gFieldObjectPicTable_TuberMSwimming: ; 85082E4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Azurill: ; 850832C
+gFieldObjectPicTable_Azurill: @ 850832C
 	obj_tiles gFieldObjectPic_Azurill_0, 0x80
 	obj_tiles gFieldObjectPic_Azurill_1, 0x80
 	obj_tiles gFieldObjectPic_Azurill_2, 0x80
@@ -2085,7 +2085,7 @@ gFieldObjectPicTable_Azurill: ; 850832C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Mom: ; 8508374
+gFieldObjectPicTable_Mom: @ 8508374
 	obj_tiles gFieldObjectPic_Mom_0, 0x100
 	obj_tiles gFieldObjectPic_Mom_1, 0x100
 	obj_tiles gFieldObjectPic_Mom_2, 0x100
@@ -2098,7 +2098,7 @@ gFieldObjectPicTable_Mom: ; 8508374
 
 	.align 2, 0
 
-gFieldObjectPicTable_Scott: ; 85083BC
+gFieldObjectPicTable_Scott: @ 85083BC
 	obj_tiles gFieldObjectPic_Scott_0, 0x100
 	obj_tiles gFieldObjectPic_Scott_1, 0x100
 	obj_tiles gFieldObjectPic_Scott_2, 0x100
@@ -2111,7 +2111,7 @@ gFieldObjectPicTable_Scott: ; 85083BC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Juan: ; 8508404
+gFieldObjectPicTable_Juan: @ 8508404
 	obj_tiles gFieldObjectPic_Juan_0, 0x100
 	obj_tiles gFieldObjectPic_Juan_1, 0x100
 	obj_tiles gFieldObjectPic_Juan_2, 0x100
@@ -2124,7 +2124,7 @@ gFieldObjectPicTable_Juan: ; 8508404
 
 	.align 2, 0
 
-gFieldObjectPicTable_MysteryEventDeliveryman: ; 850844C
+gFieldObjectPicTable_MysteryEventDeliveryman: @ 850844C
 	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
 	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
 	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
@@ -2137,12 +2137,12 @@ gFieldObjectPicTable_MysteryEventDeliveryman: ; 850844C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Statue: ; 8508494
+gFieldObjectPicTable_Statue: @ 8508494
 	obj_tiles gFieldObjectPic_Statue, 0x100
 
 	.align 2, 0
 
-gFieldObjectPicTable_Dusclops: ; 850849C
+gFieldObjectPicTable_Dusclops: @ 850849C
 	obj_tiles gFieldObjectPic_Dusclops_0, 0x100
 	obj_tiles gFieldObjectPic_Dusclops_1, 0x100
 	obj_tiles gFieldObjectPic_Dusclops_2, 0x100
@@ -2155,7 +2155,7 @@ gFieldObjectPicTable_Dusclops: ; 850849C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Kirlia: ; 85084E4
+gFieldObjectPicTable_Kirlia: @ 85084E4
 	obj_tiles gFieldObjectPic_Kirlia_0, 0x100
 	obj_tiles gFieldObjectPic_Kirlia_1, 0x100
 	obj_tiles gFieldObjectPic_Kirlia_2, 0x100
@@ -2168,7 +2168,7 @@ gFieldObjectPicTable_Kirlia: ; 85084E4
 
 	.align 2, 0
 
-gFieldObjectPicTable_UnionRoomAttendant: ; 850852C
+gFieldObjectPicTable_UnionRoomAttendant: @ 850852C
 	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
 	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
 	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
@@ -2181,7 +2181,7 @@ gFieldObjectPicTable_UnionRoomAttendant: ; 850852C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Sudowoodo: ; 8508574
+gFieldObjectPicTable_Sudowoodo: @ 8508574
 	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
 	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
 	obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100
@@ -2194,7 +2194,7 @@ gFieldObjectPicTable_Sudowoodo: ; 8508574
 
 	.align 2, 0
 
-gFieldObjectPicTable_Mew: ; 85085BC
+gFieldObjectPicTable_Mew: @ 85085BC
 	obj_tiles gFieldObjectPic_Mew_0, 0x100
 	obj_tiles gFieldObjectPic_Mew_1, 0x100
 	obj_tiles gFieldObjectPic_Mew_2, 0x100
@@ -2207,7 +2207,7 @@ gFieldObjectPicTable_Mew: ; 85085BC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Red: ; 8508604
+gFieldObjectPicTable_Red: @ 8508604
 	obj_tiles gFieldObjectPic_Red_0, 0x100
 	obj_tiles gFieldObjectPic_Red_1, 0x100
 	obj_tiles gFieldObjectPic_Red_2, 0x100
@@ -2220,7 +2220,7 @@ gFieldObjectPicTable_Red: ; 8508604
 
 	.align 2, 0
 
-gFieldObjectPicTable_Leaf: ; 850864C
+gFieldObjectPicTable_Leaf: @ 850864C
 	obj_tiles gFieldObjectPic_Leaf_0, 0x100
 	obj_tiles gFieldObjectPic_Leaf_1, 0x100
 	obj_tiles gFieldObjectPic_Leaf_2, 0x100
@@ -2233,7 +2233,7 @@ gFieldObjectPicTable_Leaf: ; 850864C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Deoxys: ; 8508694
+gFieldObjectPicTable_Deoxys: @ 8508694
 	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
 	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
 	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
@@ -2246,12 +2246,12 @@ gFieldObjectPicTable_Deoxys: ; 8508694
 
 	.align 2, 0
 
-gFieldObjectPicTable_BirthIslandStone: ; 85086DC
+gFieldObjectPicTable_BirthIslandStone: @ 85086DC
 	obj_tiles gFieldObjectPic_BirthIslandStone, 0x200
 
 	.align 2, 0
 
-gFieldObjectPicTable_Anabel: ; 85086E4
+gFieldObjectPicTable_Anabel: @ 85086E4
 	obj_tiles gFieldObjectPic_Anabel_0, 0x100
 	obj_tiles gFieldObjectPic_Anabel_1, 0x100
 	obj_tiles gFieldObjectPic_Anabel_2, 0x100
@@ -2264,7 +2264,7 @@ gFieldObjectPicTable_Anabel: ; 85086E4
 
 	.align 2, 0
 
-gFieldObjectPicTable_Tucker: ; 850872C
+gFieldObjectPicTable_Tucker: @ 850872C
 	obj_tiles gFieldObjectPic_Tucker_0, 0x100
 	obj_tiles gFieldObjectPic_Tucker_1, 0x100
 	obj_tiles gFieldObjectPic_Tucker_2, 0x100
@@ -2277,7 +2277,7 @@ gFieldObjectPicTable_Tucker: ; 850872C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Spenser: ; 8508774
+gFieldObjectPicTable_Spenser: @ 8508774
 	obj_tiles gFieldObjectPic_Spenser_0, 0x100
 	obj_tiles gFieldObjectPic_Spenser_1, 0x100
 	obj_tiles gFieldObjectPic_Spenser_2, 0x100
@@ -2290,7 +2290,7 @@ gFieldObjectPicTable_Spenser: ; 8508774
 
 	.align 2, 0
 
-gFieldObjectPicTable_Greta: ; 85087BC
+gFieldObjectPicTable_Greta: @ 85087BC
 	obj_tiles gFieldObjectPic_Greta_0, 0x100
 	obj_tiles gFieldObjectPic_Greta_1, 0x100
 	obj_tiles gFieldObjectPic_Greta_2, 0x100
@@ -2303,7 +2303,7 @@ gFieldObjectPicTable_Greta: ; 85087BC
 
 	.align 2, 0
 
-gFieldObjectPicTable_Noland: ; 8508804
+gFieldObjectPicTable_Noland: @ 8508804
 	obj_tiles gFieldObjectPic_Noland_0, 0x100
 	obj_tiles gFieldObjectPic_Noland_1, 0x100
 	obj_tiles gFieldObjectPic_Noland_2, 0x100
@@ -2316,7 +2316,7 @@ gFieldObjectPicTable_Noland: ; 8508804
 
 	.align 2, 0
 
-gFieldObjectPicTable_Lucy: ; 850884C
+gFieldObjectPicTable_Lucy: @ 850884C
 	obj_tiles gFieldObjectPic_Lucy_0, 0x100
 	obj_tiles gFieldObjectPic_Lucy_1, 0x100
 	obj_tiles gFieldObjectPic_Lucy_2, 0x100
@@ -2329,7 +2329,7 @@ gFieldObjectPicTable_Lucy: ; 850884C
 
 	.align 2, 0
 
-gFieldObjectPicTable_Brandon: ; 8508894
+gFieldObjectPicTable_Brandon: @ 8508894
 	obj_tiles gFieldObjectPic_Brandon_0, 0x100
 	obj_tiles gFieldObjectPic_Brandon_1, 0x100
 	obj_tiles gFieldObjectPic_Brandon_2, 0x100
@@ -2342,7 +2342,7 @@ gFieldObjectPicTable_Brandon: ; 8508894
 
 	.align 2, 0
 
-gFieldObjectPicTable_Lugia: ; 85088DC
+gFieldObjectPicTable_Lugia: @ 85088DC
 	obj_tiles gFieldObjectPic_Lugia_0, 0x200
 	obj_tiles gFieldObjectPic_Lugia_0, 0x200
 	obj_tiles gFieldObjectPic_Lugia_0, 0x200
@@ -2355,7 +2355,7 @@ gFieldObjectPicTable_Lugia: ; 85088DC
 
 	.align 2, 0
 
-gFieldObjectPicTable_HoOh: ; 8508924
+gFieldObjectPicTable_HoOh: @ 8508924
 	obj_tiles gFieldObjectPic_HoOh_0, 0x200
 	obj_tiles gFieldObjectPic_HoOh_0, 0x200
 	obj_tiles gFieldObjectPic_HoOh_0, 0x200
@@ -2368,7 +2368,7 @@ gFieldObjectPicTable_HoOh: ; 8508924
 
 	.align 2, 0
 
-gFieldObjectPicTable_RubySapphireBrendan: ; 850896C
+gFieldObjectPicTable_RubySapphireBrendan: @ 850896C
 	obj_tiles gFieldObjectPic_RubySapphireBrendan_0, 0x100
 	obj_tiles gFieldObjectPic_RubySapphireBrendan_1, 0x100
 	obj_tiles gFieldObjectPic_RubySapphireBrendan_2, 0x100
@@ -2381,7 +2381,7 @@ gFieldObjectPicTable_RubySapphireBrendan: ; 850896C
 
 	.align 2, 0
 
-gFieldObjectPicTable_RubySapphireMay: ; 85089B4
+gFieldObjectPicTable_RubySapphireMay: @ 85089B4
 	obj_tiles gFieldObjectPic_RubySapphireMay_0, 0x100
 	obj_tiles gFieldObjectPic_RubySapphireMay_1, 0x100
 	obj_tiles gFieldObjectPic_RubySapphireMay_2, 0x100
diff --git a/data/graphics/items/item_graphics.s b/data/graphics/items/item_graphics.s
index 52a57bdf5..83a55566d 100644
--- a/data/graphics/items/item_graphics.s
+++ b/data/graphics/items/item_graphics.s
@@ -1,2354 +1,2354 @@
 	.align 2, 0
 
-gItemIcon_QuestionMark: ; 8DAB058
+gItemIcon_QuestionMark: @ 8DAB058
 	.incbin "data/graphics/items/icons/question_mark.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_QuestionMark: ; 8DAB0D0
+gItemIconPalette_QuestionMark: @ 8DAB0D0
 	.incbin "data/graphics/items/icon_palettes/question_mark.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ReturnToFieldArrow: ; 8DAB0E4
+gItemIcon_ReturnToFieldArrow: @ 8DAB0E4
 	.incbin "data/graphics/items/icons/return_to_field_arrow.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ReturnToFieldArrow: ; 8DAB16C
+gItemIconPalette_ReturnToFieldArrow: @ 8DAB16C
 	.incbin "data/graphics/items/icon_palettes/return_to_field_arrow.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MasterBall: ; 8DAB184
+gItemIcon_MasterBall: @ 8DAB184
 	.incbin "data/graphics/items/icons/master_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MasterBall: ; 8DAB254
+gItemIconPalette_MasterBall: @ 8DAB254
 	.incbin "data/graphics/items/icon_palettes/master_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_UltraBall: ; 8DAB27C
+gItemIcon_UltraBall: @ 8DAB27C
 	.incbin "data/graphics/items/icons/ultra_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_UltraBall: ; 8DAB33C
+gItemIconPalette_UltraBall: @ 8DAB33C
 	.incbin "data/graphics/items/icon_palettes/ultra_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GreatBall: ; 8DAB364
+gItemIcon_GreatBall: @ 8DAB364
 	.incbin "data/graphics/items/icons/great_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GreatBall: ; 8DAB434
+gItemIconPalette_GreatBall: @ 8DAB434
 	.incbin "data/graphics/items/icon_palettes/great_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PokeBall: ; 8DAB45C
+gItemIcon_PokeBall: @ 8DAB45C
 	.incbin "data/graphics/items/icons/poke_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PokeBall: ; 8DAB50C
+gItemIconPalette_PokeBall: @ 8DAB50C
 	.incbin "data/graphics/items/icon_palettes/poke_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SafariBall: ; 8DAB530
+gItemIcon_SafariBall: @ 8DAB530
 	.incbin "data/graphics/items/icons/safari_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SafariBall: ; 8DAB600
+gItemIconPalette_SafariBall: @ 8DAB600
 	.incbin "data/graphics/items/icon_palettes/safari_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_NetBall: ; 8DAB628
+gItemIcon_NetBall: @ 8DAB628
 	.incbin "data/graphics/items/icons/net_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NetBall: ; 8DAB6FC
+gItemIconPalette_NetBall: @ 8DAB6FC
 	.incbin "data/graphics/items/icon_palettes/net_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DiveBall: ; 8DAB720
+gItemIcon_DiveBall: @ 8DAB720
 	.incbin "data/graphics/items/icons/dive_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DiveBall: ; 8DAB7E8
+gItemIconPalette_DiveBall: @ 8DAB7E8
 	.incbin "data/graphics/items/icon_palettes/dive_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_NestBall: ; 8DAB80C
+gItemIcon_NestBall: @ 8DAB80C
 	.incbin "data/graphics/items/icons/nest_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NestBall: ; 8DAB8D0
+gItemIconPalette_NestBall: @ 8DAB8D0
 	.incbin "data/graphics/items/icon_palettes/nest_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RepeatBall: ; 8DAB8F8
+gItemIcon_RepeatBall: @ 8DAB8F8
 	.incbin "data/graphics/items/icons/repeat_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RepeatBall: ; 8DAB9BC
+gItemIconPalette_RepeatBall: @ 8DAB9BC
 	.incbin "data/graphics/items/icon_palettes/repeat_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TimerBall: ; 8DAB9E4
+gItemIcon_TimerBall: @ 8DAB9E4
 	.incbin "data/graphics/items/icons/timer_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_LuxuryBall: ; 8DABAAC
+gItemIcon_LuxuryBall: @ 8DABAAC
 	.incbin "data/graphics/items/icons/luxury_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LuxuryBall: ; 8DABB68
+gItemIconPalette_LuxuryBall: @ 8DABB68
 	.incbin "data/graphics/items/icon_palettes/luxury_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PremierBall: ; 8DABB90
+gItemIcon_PremierBall: @ 8DABB90
 	.incbin "data/graphics/items/icons/premier_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Potion: ; 8DABC34
+gItemIcon_Potion: @ 8DABC34
 	.incbin "data/graphics/items/icons/potion.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Potion: ; 8DABCFC
+gItemIconPalette_Potion: @ 8DABCFC
 	.incbin "data/graphics/items/icon_palettes/potion.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Antidote: ; 8DABD20
+gItemIcon_Antidote: @ 8DABD20
 	.incbin "data/graphics/items/icons/antidote.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Antidote: ; 8DABDD0
+gItemIconPalette_Antidote: @ 8DABDD0
 	.incbin "data/graphics/items/icon_palettes/antidote.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BurnHeal: ; 8DABDF4
+gItemIconPalette_BurnHeal: @ 8DABDF4
 	.incbin "data/graphics/items/icon_palettes/burn_heal.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_IceHeal: ; 8DABE18
+gItemIconPalette_IceHeal: @ 8DABE18
 	.incbin "data/graphics/items/icon_palettes/ice_heal.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_StatusHeal: ; 8DABE3C
+gItemIcon_StatusHeal: @ 8DABE3C
 	.incbin "data/graphics/items/icons/status_heal.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Awakening: ; 8DABEEC
+gItemIconPalette_Awakening: @ 8DABEEC
 	.incbin "data/graphics/items/icon_palettes/awakening.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ParalyzeHeal: ; 8DABF10
+gItemIconPalette_ParalyzeHeal: @ 8DABF10
 	.incbin "data/graphics/items/icon_palettes/paralyze_heal.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LargePotion: ; 8DABF34
+gItemIcon_LargePotion: @ 8DABF34
 	.incbin "data/graphics/items/icons/large_potion.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FullRestore: ; 8DAC018
+gItemIconPalette_FullRestore: @ 8DAC018
 	.incbin "data/graphics/items/icon_palettes/full_restore.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MaxPotion: ; 8DAC03C
+gItemIconPalette_MaxPotion: @ 8DAC03C
 	.incbin "data/graphics/items/icon_palettes/max_potion.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HyperPotion: ; 8DAC060
+gItemIconPalette_HyperPotion: @ 8DAC060
 	.incbin "data/graphics/items/icon_palettes/hyper_potion.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SuperPotion: ; 8DAC084
+gItemIconPalette_SuperPotion: @ 8DAC084
 	.incbin "data/graphics/items/icon_palettes/super_potion.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FullHeal: ; 8DAC0A8
+gItemIcon_FullHeal: @ 8DAC0A8
 	.incbin "data/graphics/items/icons/full_heal.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FullHeal: ; 8DAC150
+gItemIconPalette_FullHeal: @ 8DAC150
 	.incbin "data/graphics/items/icon_palettes/full_heal.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Revive: ; 8DAC178
+gItemIcon_Revive: @ 8DAC178
 	.incbin "data/graphics/items/icons/revive.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_MaxRevive: ; 8DAC1D4
+gItemIcon_MaxRevive: @ 8DAC1D4
 	.incbin "data/graphics/items/icons/max_revive.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Revive: ; 8DAC2A0
+gItemIconPalette_Revive: @ 8DAC2A0
 	.incbin "data/graphics/items/icon_palettes/revive.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FreshWater: ; 8DAC2BC
+gItemIcon_FreshWater: @ 8DAC2BC
 	.incbin "data/graphics/items/icons/fresh_water.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FreshWater: ; 8DAC36C
+gItemIconPalette_FreshWater: @ 8DAC36C
 	.incbin "data/graphics/items/icon_palettes/fresh_water.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SodaPop: ; 8DAC390
+gItemIcon_SodaPop: @ 8DAC390
 	.incbin "data/graphics/items/icons/soda_pop.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SodaPop: ; 8DAC424
+gItemIconPalette_SodaPop: @ 8DAC424
 	.incbin "data/graphics/items/icon_palettes/soda_pop.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Lemonade: ; 8DAC44C
+gItemIcon_Lemonade: @ 8DAC44C
 	.incbin "data/graphics/items/icons/lemonade.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Lemonade: ; 8DAC50C
+gItemIconPalette_Lemonade: @ 8DAC50C
 	.incbin "data/graphics/items/icon_palettes/lemonade.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MoomooMilk: ; 8DAC534
+gItemIcon_MoomooMilk: @ 8DAC534
 	.incbin "data/graphics/items/icons/moomoo_milk.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MoomooMilk: ; 8DAC5E4
+gItemIconPalette_MoomooMilk: @ 8DAC5E4
 	.incbin "data/graphics/items/icon_palettes/moomoo_milk.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Powder: ; 8DAC60C
+gItemIcon_Powder: @ 8DAC60C
 	.incbin "data/graphics/items/icons/powder.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_EnergyPowder: ; 8DAC698
+gItemIconPalette_EnergyPowder: @ 8DAC698
 	.incbin "data/graphics/items/icon_palettes/energy_powder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_EnergyRoot: ; 8DAC6B8
+gItemIcon_EnergyRoot: @ 8DAC6B8
 	.incbin "data/graphics/items/icons/energy_root.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_EnergyRoot: ; 8DAC784
+gItemIconPalette_EnergyRoot: @ 8DAC784
 	.incbin "data/graphics/items/icon_palettes/energy_root.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HealPowder: ; 8DAC7A0
+gItemIconPalette_HealPowder: @ 8DAC7A0
 	.incbin "data/graphics/items/icon_palettes/heal_powder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RevivalHerb: ; 8DAC7C0
+gItemIcon_RevivalHerb: @ 8DAC7C0
 	.incbin "data/graphics/items/icons/revival_herb.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RevivalHerb: ; 8DAC890
+gItemIconPalette_RevivalHerb: @ 8DAC890
 	.incbin "data/graphics/items/icon_palettes/revival_herb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Ether: ; 8DAC8B0
+gItemIcon_Ether: @ 8DAC8B0
 	.incbin "data/graphics/items/icons/ether.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Ether: ; 8DAC970
+gItemIconPalette_Ether: @ 8DAC970
 	.incbin "data/graphics/items/icon_palettes/ether.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MaxEther: ; 8DAC994
+gItemIconPalette_MaxEther: @ 8DAC994
 	.incbin "data/graphics/items/icon_palettes/max_ether.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Elixir: ; 8DAC9B8
+gItemIconPalette_Elixir: @ 8DAC9B8
 	.incbin "data/graphics/items/icon_palettes/elixir.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MaxElixir: ; 8DAC9DC
+gItemIconPalette_MaxElixir: @ 8DAC9DC
 	.incbin "data/graphics/items/icon_palettes/max_elixir.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LavaCookie: ; 8DACA00
+gItemIcon_LavaCookie: @ 8DACA00
 	.incbin "data/graphics/items/icons/lava_cookie.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LavaCookieAndLetter: ; 8DACACC
+gItemIconPalette_LavaCookieAndLetter: @ 8DACACC
 	.incbin "data/graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Flute: ; 8DACAF0
+gItemIcon_Flute: @ 8DACAF0
 	.incbin "data/graphics/items/icons/flute.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlueFlute: ; 8DACBA4
+gItemIconPalette_BlueFlute: @ 8DACBA4
 	.incbin "data/graphics/items/icon_palettes/blue_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_YellowFlute: ; 8DACBC8
+gItemIconPalette_YellowFlute: @ 8DACBC8
 	.incbin "data/graphics/items/icon_palettes/yellow_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RedFlute: ; 8DACBEC
+gItemIconPalette_RedFlute: @ 8DACBEC
 	.incbin "data/graphics/items/icon_palettes/red_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlackFlute: ; 8DACC10
+gItemIconPalette_BlackFlute: @ 8DACC10
 	.incbin "data/graphics/items/icon_palettes/black_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WhiteFlute: ; 8DACC34
+gItemIconPalette_WhiteFlute: @ 8DACC34
 	.incbin "data/graphics/items/icon_palettes/white_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BerryJuice: ; 8DACC58
+gItemIcon_BerryJuice: @ 8DACC58
 	.incbin "data/graphics/items/icons/berry_juice.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BerryJuice: ; 8DACD38
+gItemIconPalette_BerryJuice: @ 8DACD38
 	.incbin "data/graphics/items/icon_palettes/berry_juice.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SacredAsh: ; 8DACD60
+gItemIcon_SacredAsh: @ 8DACD60
 	.incbin "data/graphics/items/icons/sacred_ash.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SacredAsh: ; 8DACE20
+gItemIconPalette_SacredAsh: @ 8DACE20
 	.incbin "data/graphics/items/icon_palettes/sacred_ash.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ShoalSalt: ; 8DACE44
+gItemIconPalette_ShoalSalt: @ 8DACE44
 	.incbin "data/graphics/items/icon_palettes/shoal_salt.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ShoalShell: ; 8DACE64
+gItemIcon_ShoalShell: @ 8DACE64
 	.incbin "data/graphics/items/icons/shoal_shell.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Shell: ; 8DACF58
+gItemIconPalette_Shell: @ 8DACF58
 	.incbin "data/graphics/items/icon_palettes/shell.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Shard: ; 8DACF80
+gItemIcon_Shard: @ 8DACF80
 	.incbin "data/graphics/items/icons/shard.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RedShard: ; 8DACFDC
+gItemIconPalette_RedShard: @ 8DACFDC
 	.incbin "data/graphics/items/icon_palettes/red_shard.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlueShard: ; 8DACFF4
+gItemIconPalette_BlueShard: @ 8DACFF4
 	.incbin "data/graphics/items/icon_palettes/blue_shard.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_YellowShard: ; 8DAD00C
+gItemIconPalette_YellowShard: @ 8DAD00C
 	.incbin "data/graphics/items/icon_palettes/yellow_shard.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GreenShard: ; 8DAD024
+gItemIconPalette_GreenShard: @ 8DAD024
 	.incbin "data/graphics/items/icon_palettes/green_shard.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HPUp: ; 8DAD03C
+gItemIcon_HPUp: @ 8DAD03C
 	.incbin "data/graphics/items/icons/hp_up.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HPUp: ; 8DAD0F4
+gItemIconPalette_HPUp: @ 8DAD0F4
 	.incbin "data/graphics/items/icon_palettes/hp_up.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Vitamin: ; 8DAD11C
+gItemIcon_Vitamin: @ 8DAD11C
 	.incbin "data/graphics/items/icons/vitamin.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Protein: ; 8DAD1CC
+gItemIconPalette_Protein: @ 8DAD1CC
 	.incbin "data/graphics/items/icon_palettes/protein.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Iron: ; 8DAD1F4
+gItemIconPalette_Iron: @ 8DAD1F4
 	.incbin "data/graphics/items/icon_palettes/iron.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Carbos: ; 8DAD21C
+gItemIconPalette_Carbos: @ 8DAD21C
 	.incbin "data/graphics/items/icon_palettes/carbos.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Calcium: ; 8DAD244
+gItemIconPalette_Calcium: @ 8DAD244
 	.incbin "data/graphics/items/icon_palettes/calcium.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RareCandy: ; 8DAD26C
+gItemIcon_RareCandy: @ 8DAD26C
 	.incbin "data/graphics/items/icons/rare_candy.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RareCandy: ; 8DAD330
+gItemIconPalette_RareCandy: @ 8DAD330
 	.incbin "data/graphics/items/icon_palettes/rare_candy.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PPUp: ; 8DAD34C
+gItemIcon_PPUp: @ 8DAD34C
 	.incbin "data/graphics/items/icons/pp_up.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PPUp: ; 8DAD3FC
+gItemIconPalette_PPUp: @ 8DAD3FC
 	.incbin "data/graphics/items/icon_palettes/pp_up.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Zinc: ; 8DAD424
+gItemIconPalette_Zinc: @ 8DAD424
 	.incbin "data/graphics/items/icon_palettes/zinc.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PPMax: ; 8DAD44C
+gItemIcon_PPMax: @ 8DAD44C
 	.incbin "data/graphics/items/icons/pp_max.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PPMax: ; 8DAD4F4
+gItemIconPalette_PPMax: @ 8DAD4F4
 	.incbin "data/graphics/items/icon_palettes/pp_max.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GuardSpec: ; 8DAD51C
+gItemIconPalette_GuardSpec: @ 8DAD51C
 	.incbin "data/graphics/items/icon_palettes/guard_spec.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DireHit: ; 8DAD540
+gItemIconPalette_DireHit: @ 8DAD540
 	.incbin "data/graphics/items/icon_palettes/dire_hit.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_XAttack: ; 8DAD564
+gItemIconPalette_XAttack: @ 8DAD564
 	.incbin "data/graphics/items/icon_palettes/x_attack.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BattleStatItem: ; 8DAD588
+gItemIcon_BattleStatItem: @ 8DAD588
 	.incbin "data/graphics/items/icons/battle_stat_item.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_XDefend: ; 8DAD66C
+gItemIconPalette_XDefend: @ 8DAD66C
 	.incbin "data/graphics/items/icon_palettes/x_defend.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_XSpeed: ; 8DAD690
+gItemIconPalette_XSpeed: @ 8DAD690
 	.incbin "data/graphics/items/icon_palettes/x_speed.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_XAccuracy: ; 8DAD6B4
+gItemIconPalette_XAccuracy: @ 8DAD6B4
 	.incbin "data/graphics/items/icon_palettes/x_accuracy.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_XSpecial: ; 8DAD6D8
+gItemIconPalette_XSpecial: @ 8DAD6D8
 	.incbin "data/graphics/items/icon_palettes/x_special.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PokeDoll: ; 8DAD6FC
+gItemIcon_PokeDoll: @ 8DAD6FC
 	.incbin "data/graphics/items/icons/poke_doll.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PokeDoll: ; 8DAD7EC
+gItemIconPalette_PokeDoll: @ 8DAD7EC
 	.incbin "data/graphics/items/icon_palettes/poke_doll.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FluffyTail: ; 8DAD808
+gItemIcon_FluffyTail: @ 8DAD808
 	.incbin "data/graphics/items/icons/fluffy_tail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FluffyTail: ; 8DAD8F8
+gItemIconPalette_FluffyTail: @ 8DAD8F8
 	.incbin "data/graphics/items/icon_palettes/fluffy_tail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Repel: ; 8DAD91C
+gItemIcon_Repel: @ 8DAD91C
 	.incbin "data/graphics/items/icons/repel.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SuperRepel: ; 8DAD9BC
+gItemIconPalette_SuperRepel: @ 8DAD9BC
 	.incbin "data/graphics/items/icon_palettes/super_repel.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MaxRepel: ; 8DAD9E4
+gItemIconPalette_MaxRepel: @ 8DAD9E4
 	.incbin "data/graphics/items/icon_palettes/max_repel.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_EscapeRope: ; 8DADA0C
+gItemIcon_EscapeRope: @ 8DADA0C
 	.incbin "data/graphics/items/icons/escape_rope.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_EscapeRope: ; 8DADAC0
+gItemIconPalette_EscapeRope: @ 8DADAC0
 	.incbin "data/graphics/items/icon_palettes/escape_rope.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Repel: ; 8DADAE4
+gItemIconPalette_Repel: @ 8DADAE4
 	.incbin "data/graphics/items/icon_palettes/repel.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SunStone: ; 8DADB0C
+gItemIcon_SunStone: @ 8DADB0C
 	.incbin "data/graphics/items/icons/sun_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SunStone: ; 8DADC04
+gItemIconPalette_SunStone: @ 8DADC04
 	.incbin "data/graphics/items/icon_palettes/sun_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MoonStone: ; 8DADC20
+gItemIcon_MoonStone: @ 8DADC20
 	.incbin "data/graphics/items/icons/moon_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MoonStone: ; 8DADCF4
+gItemIconPalette_MoonStone: @ 8DADCF4
 	.incbin "data/graphics/items/icon_palettes/moon_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FireStone: ; 8DADD14
+gItemIcon_FireStone: @ 8DADD14
 	.incbin "data/graphics/items/icons/fire_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FireStone: ; 8DADE08
+gItemIconPalette_FireStone: @ 8DADE08
 	.incbin "data/graphics/items/icon_palettes/fire_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ThunderStone: ; 8DADE30
+gItemIcon_ThunderStone: @ 8DADE30
 	.incbin "data/graphics/items/icons/thunder_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ThunderStone: ; 8DADF18
+gItemIconPalette_ThunderStone: @ 8DADF18
 	.incbin "data/graphics/items/icon_palettes/thunder_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WaterStone: ; 8DADF38
+gItemIcon_WaterStone: @ 8DADF38
 	.incbin "data/graphics/items/icons/water_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WaterStone: ; 8DAE018
+gItemIconPalette_WaterStone: @ 8DAE018
 	.incbin "data/graphics/items/icon_palettes/water_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LeafStone: ; 8DAE03C
+gItemIcon_LeafStone: @ 8DAE03C
 	.incbin "data/graphics/items/icons/leaf_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LeafStone: ; 8DAE130
+gItemIconPalette_LeafStone: @ 8DAE130
 	.incbin "data/graphics/items/icon_palettes/leaf_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TinyMushroom: ; 8DAE158
+gItemIcon_TinyMushroom: @ 8DAE158
 	.incbin "data/graphics/items/icons/tiny_mushroom.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_BigMushroom: ; 8DAE1D8
+gItemIcon_BigMushroom: @ 8DAE1D8
 	.incbin "data/graphics/items/icons/big_mushroom.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Mushroom: ; 8DAE290
+gItemIconPalette_Mushroom: @ 8DAE290
 	.incbin "data/graphics/items/icon_palettes/mushroom.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Pearl: ; 8DAE2B4
+gItemIcon_Pearl: @ 8DAE2B4
 	.incbin "data/graphics/items/icons/pearl.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Pearl: ; 8DAE330
+gItemIconPalette_Pearl: @ 8DAE330
 	.incbin "data/graphics/items/icon_palettes/pearl.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BigPearl: ; 8DAE358
+gItemIcon_BigPearl: @ 8DAE358
 	.incbin "data/graphics/items/icons/big_pearl.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Stardust: ; 8DAE410
+gItemIcon_Stardust: @ 8DAE410
 	.incbin "data/graphics/items/icons/stardust.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Star: ; 8DAE4D0
+gItemIconPalette_Star: @ 8DAE4D0
 	.incbin "data/graphics/items/icon_palettes/star.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_StarPiece: ; 8DAE4F4
+gItemIcon_StarPiece: @ 8DAE4F4
 	.incbin "data/graphics/items/icons/star_piece.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Nugget: ; 8DAE578
+gItemIcon_Nugget: @ 8DAE578
 	.incbin "data/graphics/items/icons/nugget.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Nugget: ; 8DAE604
+gItemIconPalette_Nugget: @ 8DAE604
 	.incbin "data/graphics/items/icon_palettes/nugget.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HeartScale: ; 8DAE624
+gItemIcon_HeartScale: @ 8DAE624
 	.incbin "data/graphics/items/icons/heart_scale.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HeartScale: ; 8DAE6C4
+gItemIconPalette_HeartScale: @ 8DAE6C4
 	.incbin "data/graphics/items/icon_palettes/heart_scale.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_OrangeMail: ; 8DAE6E0
+gItemIcon_OrangeMail: @ 8DAE6E0
 	.incbin "data/graphics/items/icons/orange_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OrangeMail: ; 8DAE7B4
+gItemIconPalette_OrangeMail: @ 8DAE7B4
 	.incbin "data/graphics/items/icon_palettes/orange_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HarborMail: ; 8DAE7D4
+gItemIcon_HarborMail: @ 8DAE7D4
 	.incbin "data/graphics/items/icons/harbor_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HarborMail: ; 8DAE89C
+gItemIconPalette_HarborMail: @ 8DAE89C
 	.incbin "data/graphics/items/icon_palettes/harbor_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GlitterMail: ; 8DAE8BC
+gItemIcon_GlitterMail: @ 8DAE8BC
 	.incbin "data/graphics/items/icons/glitter_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GlitterMail: ; 8DAE998
+gItemIconPalette_GlitterMail: @ 8DAE998
 	.incbin "data/graphics/items/icon_palettes/glitter_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MechMail: ; 8DAE9C0
+gItemIcon_MechMail: @ 8DAE9C0
 	.incbin "data/graphics/items/icons/mech_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MechMail: ; 8DAEA9C
+gItemIconPalette_MechMail: @ 8DAEA9C
 	.incbin "data/graphics/items/icon_palettes/mech_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WoodMail: ; 8DAEABC
+gItemIcon_WoodMail: @ 8DAEABC
 	.incbin "data/graphics/items/icons/wood_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WoodMail: ; 8DAEB9C
+gItemIconPalette_WoodMail: @ 8DAEB9C
 	.incbin "data/graphics/items/icon_palettes/wood_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WaveMail: ; 8DAEBBC
+gItemIcon_WaveMail: @ 8DAEBBC
 	.incbin "data/graphics/items/icons/wave_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WaveMail: ; 8DAEC94
+gItemIconPalette_WaveMail: @ 8DAEC94
 	.incbin "data/graphics/items/icon_palettes/wave_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BeadMail: ; 8DAECB4
+gItemIcon_BeadMail: @ 8DAECB4
 	.incbin "data/graphics/items/icons/bead_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BeadMail: ; 8DAED74
+gItemIconPalette_BeadMail: @ 8DAED74
 	.incbin "data/graphics/items/icon_palettes/bead_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ShadowMail: ; 8DAED94
+gItemIcon_ShadowMail: @ 8DAED94
 	.incbin "data/graphics/items/icons/shadow_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ShadowMail: ; 8DAEE68
+gItemIconPalette_ShadowMail: @ 8DAEE68
 	.incbin "data/graphics/items/icon_palettes/shadow_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TropicMail: ; 8DAEE8C
+gItemIcon_TropicMail: @ 8DAEE8C
 	.incbin "data/graphics/items/icons/tropic_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TropicMail: ; 8DAEF70
+gItemIconPalette_TropicMail: @ 8DAEF70
 	.incbin "data/graphics/items/icon_palettes/tropic_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DreamMail: ; 8DAEF94
+gItemIcon_DreamMail: @ 8DAEF94
 	.incbin "data/graphics/items/icons/dream_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DreamMail: ; 8DAF074
+gItemIconPalette_DreamMail: @ 8DAF074
 	.incbin "data/graphics/items/icon_palettes/dream_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FabMail: ; 8DAF094
+gItemIcon_FabMail: @ 8DAF094
 	.incbin "data/graphics/items/icons/fab_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FabMail: ; 8DAF15C
+gItemIconPalette_FabMail: @ 8DAF15C
 	.incbin "data/graphics/items/icon_palettes/fab_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RetroMail: ; 8DAF178
+gItemIcon_RetroMail: @ 8DAF178
 	.incbin "data/graphics/items/icons/retro_mail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RetroMail: ; 8DAF210
+gItemIconPalette_RetroMail: @ 8DAF210
 	.incbin "data/graphics/items/icon_palettes/retro_mail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_CheriBerry: ; 8DAF230
+gItemIcon_CheriBerry: @ 8DAF230
 	.incbin "data/graphics/items/icons/cheri_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_CheriBerry: ; 8DAF318
+gItemIconPalette_CheriBerry: @ 8DAF318
 	.incbin "data/graphics/items/icon_palettes/cheri_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ChestoBerry: ; 8DAF340
+gItemIcon_ChestoBerry: @ 8DAF340
 	.incbin "data/graphics/items/icons/chesto_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ChestoBerry: ; 8DAF400
+gItemIconPalette_ChestoBerry: @ 8DAF400
 	.incbin "data/graphics/items/icon_palettes/chesto_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PechaBerry: ; 8DAF424
+gItemIcon_PechaBerry: @ 8DAF424
 	.incbin "data/graphics/items/icons/pecha_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PechaBerry: ; 8DAF4E4
+gItemIconPalette_PechaBerry: @ 8DAF4E4
 	.incbin "data/graphics/items/icon_palettes/pecha_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RawstBerry: ; 8DAF508
+gItemIcon_RawstBerry: @ 8DAF508
 	.incbin "data/graphics/items/icons/rawst_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RawstBerry: ; 8DAF5EC
+gItemIconPalette_RawstBerry: @ 8DAF5EC
 	.incbin "data/graphics/items/icon_palettes/rawst_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_AspearBerry: ; 8DAF610
+gItemIcon_AspearBerry: @ 8DAF610
 	.incbin "data/graphics/items/icons/aspear_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_AspearBerry: ; 8DAF6F8
+gItemIconPalette_AspearBerry: @ 8DAF6F8
 	.incbin "data/graphics/items/icon_palettes/aspear_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LeppaBerry: ; 8DAF71C
+gItemIcon_LeppaBerry: @ 8DAF71C
 	.incbin "data/graphics/items/icons/leppa_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LeppaBerry: ; 8DAF7D4
+gItemIconPalette_LeppaBerry: @ 8DAF7D4
 	.incbin "data/graphics/items/icon_palettes/leppa_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_OranBerry: ; 8DAF7F8
+gItemIcon_OranBerry: @ 8DAF7F8
 	.incbin "data/graphics/items/icons/oran_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OranBerry: ; 8DAF8BC
+gItemIconPalette_OranBerry: @ 8DAF8BC
 	.incbin "data/graphics/items/icon_palettes/oran_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PersimBerry: ; 8DAF8E0
+gItemIcon_PersimBerry: @ 8DAF8E0
 	.incbin "data/graphics/items/icons/persim_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PersimBerry: ; 8DAF9B4
+gItemIconPalette_PersimBerry: @ 8DAF9B4
 	.incbin "data/graphics/items/icon_palettes/persim_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LumBerry: ; 8DAF9D8
+gItemIcon_LumBerry: @ 8DAF9D8
 	.incbin "data/graphics/items/icons/lum_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LumBerry: ; 8DAFA90
+gItemIconPalette_LumBerry: @ 8DAFA90
 	.incbin "data/graphics/items/icon_palettes/lum_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SitrusBerry: ; 8DAFAAC
+gItemIcon_SitrusBerry: @ 8DAFAAC
 	.incbin "data/graphics/items/icons/sitrus_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SitrusBerry: ; 8DAFB78
+gItemIconPalette_SitrusBerry: @ 8DAFB78
 	.incbin "data/graphics/items/icon_palettes/sitrus_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FigyBerry: ; 8DAFB9C
+gItemIcon_FigyBerry: @ 8DAFB9C
 	.incbin "data/graphics/items/icons/figy_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FigyBerry: ; 8DAFC64
+gItemIconPalette_FigyBerry: @ 8DAFC64
 	.incbin "data/graphics/items/icon_palettes/figy_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WikiBerry: ; 8DAFC88
+gItemIcon_WikiBerry: @ 8DAFC88
 	.incbin "data/graphics/items/icons/wiki_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WikiBerry: ; 8DAFD6C
+gItemIconPalette_WikiBerry: @ 8DAFD6C
 	.incbin "data/graphics/items/icon_palettes/wiki_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MagoBerry: ; 8DAFD90
+gItemIcon_MagoBerry: @ 8DAFD90
 	.incbin "data/graphics/items/icons/mago_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MagoBerry: ; 8DAFE4C
+gItemIconPalette_MagoBerry: @ 8DAFE4C
 	.incbin "data/graphics/items/icon_palettes/mago_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_AguavBerry: ; 8DAFE70
+gItemIcon_AguavBerry: @ 8DAFE70
 	.incbin "data/graphics/items/icons/aguav_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_AguavBerry: ; 8DAFF5C
+gItemIconPalette_AguavBerry: @ 8DAFF5C
 	.incbin "data/graphics/items/icon_palettes/aguav_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_IapapaBerry: ; 8DAFF7C
+gItemIcon_IapapaBerry: @ 8DAFF7C
 	.incbin "data/graphics/items/icons/iapapa_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_IapapaBerry: ; 8DB0064
+gItemIconPalette_IapapaBerry: @ 8DB0064
 	.incbin "data/graphics/items/icon_palettes/iapapa_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RazzBerry: ; 8DB0088
+gItemIcon_RazzBerry: @ 8DB0088
 	.incbin "data/graphics/items/icons/razz_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RazzBerry: ; 8DB0168
+gItemIconPalette_RazzBerry: @ 8DB0168
 	.incbin "data/graphics/items/icon_palettes/razz_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BlukBerry: ; 8DB018C
+gItemIcon_BlukBerry: @ 8DB018C
 	.incbin "data/graphics/items/icons/bluk_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlukBerry: ; 8DB027C
+gItemIconPalette_BlukBerry: @ 8DB027C
 	.incbin "data/graphics/items/icon_palettes/bluk_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_NanabBerry: ; 8DB02A0
+gItemIcon_NanabBerry: @ 8DB02A0
 	.incbin "data/graphics/items/icons/nanab_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NanabBerry: ; 8DB0384
+gItemIconPalette_NanabBerry: @ 8DB0384
 	.incbin "data/graphics/items/icon_palettes/nanab_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WepearBerry: ; 8DB03A8
+gItemIcon_WepearBerry: @ 8DB03A8
 	.incbin "data/graphics/items/icons/wepear_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WepearBerry: ; 8DB0470
+gItemIconPalette_WepearBerry: @ 8DB0470
 	.incbin "data/graphics/items/icon_palettes/wepear_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PinapBerry: ; 8DB048C
+gItemIcon_PinapBerry: @ 8DB048C
 	.incbin "data/graphics/items/icons/pinap_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PinapBerry: ; 8DB0580
+gItemIconPalette_PinapBerry: @ 8DB0580
 	.incbin "data/graphics/items/icon_palettes/pinap_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PomegBerry: ; 8DB05A4
+gItemIcon_PomegBerry: @ 8DB05A4
 	.incbin "data/graphics/items/icons/pomeg_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PomegBerry: ; 8DB0658
+gItemIconPalette_PomegBerry: @ 8DB0658
 	.incbin "data/graphics/items/icon_palettes/pomeg_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_KelpsyBerry: ; 8DB067C
+gItemIcon_KelpsyBerry: @ 8DB067C
 	.incbin "data/graphics/items/icons/kelpsy_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_KelpsyBerry: ; 8DB074C
+gItemIconPalette_KelpsyBerry: @ 8DB074C
 	.incbin "data/graphics/items/icon_palettes/kelpsy_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_QualotBerry: ; 8DB076C
+gItemIcon_QualotBerry: @ 8DB076C
 	.incbin "data/graphics/items/icons/qualot_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_QualotBerry: ; 8DB0838
+gItemIconPalette_QualotBerry: @ 8DB0838
 	.incbin "data/graphics/items/icon_palettes/qualot_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HondewBerry: ; 8DB085C
+gItemIcon_HondewBerry: @ 8DB085C
 	.incbin "data/graphics/items/icons/hondew_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HondewBerry: ; 8DB093C
+gItemIconPalette_HondewBerry: @ 8DB093C
 	.incbin "data/graphics/items/icon_palettes/hondew_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GrepaBerry: ; 8DB0960
+gItemIcon_GrepaBerry: @ 8DB0960
 	.incbin "data/graphics/items/icons/grepa_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GrepaBerry: ; 8DB0A14
+gItemIconPalette_GrepaBerry: @ 8DB0A14
 	.incbin "data/graphics/items/icon_palettes/grepa_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TamatoBerry: ; 8DB0A38
+gItemIcon_TamatoBerry: @ 8DB0A38
 	.incbin "data/graphics/items/icons/tamato_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TamatoBerry: ; 8DB0B14
+gItemIconPalette_TamatoBerry: @ 8DB0B14
 	.incbin "data/graphics/items/icon_palettes/tamato_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_CornnBerry: ; 8DB0B38
+gItemIcon_CornnBerry: @ 8DB0B38
 	.incbin "data/graphics/items/icons/cornn_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_CornnBerry: ; 8DB0C24
+gItemIconPalette_CornnBerry: @ 8DB0C24
 	.incbin "data/graphics/items/icon_palettes/cornn_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MagostBerry: ; 8DB0C4C
+gItemIcon_MagostBerry: @ 8DB0C4C
 	.incbin "data/graphics/items/icons/magost_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MagostBerry: ; 8DB0CF4
+gItemIconPalette_MagostBerry: @ 8DB0CF4
 	.incbin "data/graphics/items/icon_palettes/magost_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RabutaBerry: ; 8DB0D18
+gItemIcon_RabutaBerry: @ 8DB0D18
 	.incbin "data/graphics/items/icons/rabuta_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RabutaBerry: ; 8DB0E14
+gItemIconPalette_RabutaBerry: @ 8DB0E14
 	.incbin "data/graphics/items/icon_palettes/rabuta_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_NomelBerry: ; 8DB0E38
+gItemIcon_NomelBerry: @ 8DB0E38
 	.incbin "data/graphics/items/icons/nomel_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NomelBerry: ; 8DB0EDC
+gItemIconPalette_NomelBerry: @ 8DB0EDC
 	.incbin "data/graphics/items/icon_palettes/nomel_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SpelonBerry: ; 8DB0EF8
+gItemIcon_SpelonBerry: @ 8DB0EF8
 	.incbin "data/graphics/items/icons/spelon_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SpelonBerry: ; 8DB0FBC
+gItemIconPalette_SpelonBerry: @ 8DB0FBC
 	.incbin "data/graphics/items/icon_palettes/spelon_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PamtreBerry: ; 8DB0FDC
+gItemIcon_PamtreBerry: @ 8DB0FDC
 	.incbin "data/graphics/items/icons/pamtre_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PamtreBerry: ; 8DB10BC
+gItemIconPalette_PamtreBerry: @ 8DB10BC
 	.incbin "data/graphics/items/icon_palettes/pamtre_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WatmelBerry: ; 8DB10E4
+gItemIcon_WatmelBerry: @ 8DB10E4
 	.incbin "data/graphics/items/icons/watmel_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WatmelBerry: ; 8DB11F4
+gItemIconPalette_WatmelBerry: @ 8DB11F4
 	.incbin "data/graphics/items/icon_palettes/watmel_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DurinBerry: ; 8DB1218
+gItemIcon_DurinBerry: @ 8DB1218
 	.incbin "data/graphics/items/icons/durin_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DurinBerry: ; 8DB131C
+gItemIconPalette_DurinBerry: @ 8DB131C
 	.incbin "data/graphics/items/icon_palettes/durin_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BelueBerry: ; 8DB1340
+gItemIcon_BelueBerry: @ 8DB1340
 	.incbin "data/graphics/items/icons/belue_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BelueBerry: ; 8DB1424
+gItemIconPalette_BelueBerry: @ 8DB1424
 	.incbin "data/graphics/items/icon_palettes/belue_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LiechiBerry: ; 8DB1448
+gItemIcon_LiechiBerry: @ 8DB1448
 	.incbin "data/graphics/items/icons/liechi_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LiechiBerry: ; 8DB1528
+gItemIconPalette_LiechiBerry: @ 8DB1528
 	.incbin "data/graphics/items/icon_palettes/liechi_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GanlonBerry: ; 8DB1548
+gItemIcon_GanlonBerry: @ 8DB1548
 	.incbin "data/graphics/items/icons/ganlon_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GanlonBerry: ; 8DB1628
+gItemIconPalette_GanlonBerry: @ 8DB1628
 	.incbin "data/graphics/items/icon_palettes/ganlon_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SalacBerry: ; 8DB1648
+gItemIcon_SalacBerry: @ 8DB1648
 	.incbin "data/graphics/items/icons/salac_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SalacBerry: ; 8DB1730
+gItemIconPalette_SalacBerry: @ 8DB1730
 	.incbin "data/graphics/items/icon_palettes/salac_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PetayaBerry: ; 8DB1750
+gItemIcon_PetayaBerry: @ 8DB1750
 	.incbin "data/graphics/items/icons/petaya_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PetayaBerry: ; 8DB1848
+gItemIconPalette_PetayaBerry: @ 8DB1848
 	.incbin "data/graphics/items/icon_palettes/petaya_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ApicotBerry: ; 8DB186C
+gItemIcon_ApicotBerry: @ 8DB186C
 	.incbin "data/graphics/items/icons/apicot_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ApicotBerry: ; 8DB1924
+gItemIconPalette_ApicotBerry: @ 8DB1924
 	.incbin "data/graphics/items/icon_palettes/apicot_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LansatBerry: ; 8DB194C
+gItemIcon_LansatBerry: @ 8DB194C
 	.incbin "data/graphics/items/icons/lansat_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LansatBerry: ; 8DB1A2C
+gItemIconPalette_LansatBerry: @ 8DB1A2C
 	.incbin "data/graphics/items/icon_palettes/lansat_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_StarfBerry: ; 8DB1A50
+gItemIcon_StarfBerry: @ 8DB1A50
 	.incbin "data/graphics/items/icons/starf_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_StarfBerry: ; 8DB1B20
+gItemIconPalette_StarfBerry: @ 8DB1B20
 	.incbin "data/graphics/items/icon_palettes/starf_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_EnigmaBerry: ; 8DB1B44
+gItemIcon_EnigmaBerry: @ 8DB1B44
 	.incbin "data/graphics/items/icons/enigma_berry.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_EnigmaBerry: ; 8DB1C10
+gItemIconPalette_EnigmaBerry: @ 8DB1C10
 	.incbin "data/graphics/items/icon_palettes/enigma_berry.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BrightPowder: ; 8DB1C30
+gItemIcon_BrightPowder: @ 8DB1C30
 	.incbin "data/graphics/items/icons/bright_powder.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BrightPowder: ; 8DB1CEC
+gItemIconPalette_BrightPowder: @ 8DB1CEC
 	.incbin "data/graphics/items/icon_palettes/bright_powder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_InBattleHerb: ; 8DB1D0C
+gItemIcon_InBattleHerb: @ 8DB1D0C
 	.incbin "data/graphics/items/icons/in_battle_herb.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WhiteHerb: ; 8DB1DB8
+gItemIconPalette_WhiteHerb: @ 8DB1DB8
 	.incbin "data/graphics/items/icon_palettes/white_herb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MachoBrace: ; 8DB1DD8
+gItemIcon_MachoBrace: @ 8DB1DD8
 	.incbin "data/graphics/items/icons/macho_brace.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MachoBrace: ; 8DB1EC4
+gItemIconPalette_MachoBrace: @ 8DB1EC4
 	.incbin "data/graphics/items/icon_palettes/macho_brace.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ExpShare: ; 8DB1EEC
+gItemIcon_ExpShare: @ 8DB1EEC
 	.incbin "data/graphics/items/icons/exp_share.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ExpShare: ; 8DB1FD8
+gItemIconPalette_ExpShare: @ 8DB1FD8
 	.incbin "data/graphics/items/icon_palettes/exp_share.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_QuickClaw: ; 8DB2000
+gItemIcon_QuickClaw: @ 8DB2000
 	.incbin "data/graphics/items/icons/quick_claw.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_QuickClaw: ; 8DB2098
+gItemIconPalette_QuickClaw: @ 8DB2098
 	.incbin "data/graphics/items/icon_palettes/quick_claw.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SootheBell: ; 8DB20B8
+gItemIcon_SootheBell: @ 8DB20B8
 	.incbin "data/graphics/items/icons/soothe_bell.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SootheBell: ; 8DB217C
+gItemIconPalette_SootheBell: @ 8DB217C
 	.incbin "data/graphics/items/icon_palettes/soothe_bell.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MentalHerb: ; 8DB21A0
+gItemIconPalette_MentalHerb: @ 8DB21A0
 	.incbin "data/graphics/items/icon_palettes/mental_herb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ChoiceBand: ; 8DB21C0
+gItemIcon_ChoiceBand: @ 8DB21C0
 	.incbin "data/graphics/items/icons/choice_band.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ChoiceBand: ; 8DB22AC
+gItemIconPalette_ChoiceBand: @ 8DB22AC
 	.incbin "data/graphics/items/icon_palettes/choice_band.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_KingsRock: ; 8DB22D4
+gItemIcon_KingsRock: @ 8DB22D4
 	.incbin "data/graphics/items/icons/kings_rock.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_KingsRock: ; 8DB23C4
+gItemIconPalette_KingsRock: @ 8DB23C4
 	.incbin "data/graphics/items/icon_palettes/kings_rock.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SilverPowder: ; 8DB23E0
+gItemIcon_SilverPowder: @ 8DB23E0
 	.incbin "data/graphics/items/icons/silver_powder.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SilverPowder: ; 8DB246C
+gItemIconPalette_SilverPowder: @ 8DB246C
 	.incbin "data/graphics/items/icon_palettes/silver_powder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_AmuletCoin: ; 8DB2490
+gItemIcon_AmuletCoin: @ 8DB2490
 	.incbin "data/graphics/items/icons/amulet_coin.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_AmuletCoin: ; 8DB2528
+gItemIconPalette_AmuletCoin: @ 8DB2528
 	.incbin "data/graphics/items/icon_palettes/amulet_coin.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_CleanseTag: ; 8DB254C
+gItemIcon_CleanseTag: @ 8DB254C
 	.incbin "data/graphics/items/icons/cleanse_tag.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_CleanseTag: ; 8DB25F0
+gItemIconPalette_CleanseTag: @ 8DB25F0
 	.incbin "data/graphics/items/icon_palettes/cleanse_tag.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SoulDew: ; 8DB2610
+gItemIcon_SoulDew: @ 8DB2610
 	.incbin "data/graphics/items/icons/soul_dew.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SoulDew: ; 8DB26A4
+gItemIconPalette_SoulDew: @ 8DB26A4
 	.incbin "data/graphics/items/icon_palettes/soul_dew.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DeepSeaTooth: ; 8DB26C4
+gItemIcon_DeepSeaTooth: @ 8DB26C4
 	.incbin "data/graphics/items/icons/deep_sea_tooth.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DeepSeaTooth: ; 8DB2778
+gItemIconPalette_DeepSeaTooth: @ 8DB2778
 	.incbin "data/graphics/items/icon_palettes/deep_sea_tooth.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DeepSeaScale: ; 8DB279C
+gItemIcon_DeepSeaScale: @ 8DB279C
 	.incbin "data/graphics/items/icons/deep_sea_scale.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DeepSeaScale: ; 8DB2844
+gItemIconPalette_DeepSeaScale: @ 8DB2844
 	.incbin "data/graphics/items/icon_palettes/deep_sea_scale.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SmokeBall: ; 8DB2864
+gItemIcon_SmokeBall: @ 8DB2864
 	.incbin "data/graphics/items/icons/smoke_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SmokeBall: ; 8DB291C
+gItemIconPalette_SmokeBall: @ 8DB291C
 	.incbin "data/graphics/items/icon_palettes/smoke_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Everstone: ; 8DB2940
+gItemIcon_Everstone: @ 8DB2940
 	.incbin "data/graphics/items/icons/everstone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Everstone: ; 8DB29F4
+gItemIconPalette_Everstone: @ 8DB29F4
 	.incbin "data/graphics/items/icon_palettes/everstone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FocusBand: ; 8DB2A10
+gItemIcon_FocusBand: @ 8DB2A10
 	.incbin "data/graphics/items/icons/focus_band.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FocusBand: ; 8DB2B00
+gItemIconPalette_FocusBand: @ 8DB2B00
 	.incbin "data/graphics/items/icon_palettes/focus_band.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LuckyEgg: ; 8DB2B28
+gItemIcon_LuckyEgg: @ 8DB2B28
 	.incbin "data/graphics/items/icons/lucky_egg.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LuckyEgg: ; 8DB2BB0
+gItemIconPalette_LuckyEgg: @ 8DB2BB0
 	.incbin "data/graphics/items/icon_palettes/lucky_egg.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ScopeLens: ; 8DB2BC8
+gItemIcon_ScopeLens: @ 8DB2BC8
 	.incbin "data/graphics/items/icons/scope_lens.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ScopeLens: ; 8DB2CC8
+gItemIconPalette_ScopeLens: @ 8DB2CC8
 	.incbin "data/graphics/items/icon_palettes/scope_lens.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MetalCoat: ; 8DB2CF0
+gItemIcon_MetalCoat: @ 8DB2CF0
 	.incbin "data/graphics/items/icons/metal_coat.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MetalCoat: ; 8DB2DAC
+gItemIconPalette_MetalCoat: @ 8DB2DAC
 	.incbin "data/graphics/items/icon_palettes/metal_coat.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Leftovers: ; 8DB2DCC
+gItemIcon_Leftovers: @ 8DB2DCC
 	.incbin "data/graphics/items/icons/leftovers.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Leftovers: ; 8DB2E70
+gItemIconPalette_Leftovers: @ 8DB2E70
 	.incbin "data/graphics/items/icon_palettes/leftovers.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DragonScale: ; 8DB2E94
+gItemIcon_DragonScale: @ 8DB2E94
 	.incbin "data/graphics/items/icons/dragon_scale.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DragonScale: ; 8DB2F48
+gItemIconPalette_DragonScale: @ 8DB2F48
 	.incbin "data/graphics/items/icon_palettes/dragon_scale.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LightBall: ; 8DB2F68
+gItemIcon_LightBall: @ 8DB2F68
 	.incbin "data/graphics/items/icons/light_ball.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LightBall: ; 8DB2FFC
+gItemIconPalette_LightBall: @ 8DB2FFC
 	.incbin "data/graphics/items/icon_palettes/light_ball.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SoftSand: ; 8DB3020
+gItemIcon_SoftSand: @ 8DB3020
 	.incbin "data/graphics/items/icons/soft_sand.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SoftSand: ; 8DB30DC
+gItemIconPalette_SoftSand: @ 8DB30DC
 	.incbin "data/graphics/items/icon_palettes/soft_sand.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HardStone: ; 8DB30FC
+gItemIcon_HardStone: @ 8DB30FC
 	.incbin "data/graphics/items/icons/hard_stone.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HardStone: ; 8DB31B0
+gItemIconPalette_HardStone: @ 8DB31B0
 	.incbin "data/graphics/items/icon_palettes/hard_stone.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MiracleSeed: ; 8DB31D4
+gItemIcon_MiracleSeed: @ 8DB31D4
 	.incbin "data/graphics/items/icons/miracle_seed.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MiracleSeed: ; 8DB3284
+gItemIconPalette_MiracleSeed: @ 8DB3284
 	.incbin "data/graphics/items/icon_palettes/miracle_seed.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BlackGlasses: ; 8DB32A0
+gItemIcon_BlackGlasses: @ 8DB32A0
 	.incbin "data/graphics/items/icons/black_glasses.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlackTypeEnhancingItem: ; 8DB3328
+gItemIconPalette_BlackTypeEnhancingItem: @ 8DB3328
 	.incbin "data/graphics/items/icon_palettes/black_type_enhancing_item.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BlackBelt: ; 8DB3340
+gItemIcon_BlackBelt: @ 8DB3340
 	.incbin "data/graphics/items/icons/black_belt.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Magnet: ; 8DB3408
+gItemIcon_Magnet: @ 8DB3408
 	.incbin "data/graphics/items/icons/magnet.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Magnet: ; 8DB34B8
+gItemIconPalette_Magnet: @ 8DB34B8
 	.incbin "data/graphics/items/icon_palettes/magnet.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MysticWater: ; 8DB34E0
+gItemIcon_MysticWater: @ 8DB34E0
 	.incbin "data/graphics/items/icons/mystic_water.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MysticWater: ; 8DB3578
+gItemIconPalette_MysticWater: @ 8DB3578
 	.incbin "data/graphics/items/icon_palettes/mystic_water.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SharpBeak: ; 8DB3598
+gItemIcon_SharpBeak: @ 8DB3598
 	.incbin "data/graphics/items/icons/sharp_beak.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SharpBeak: ; 8DB3654
+gItemIconPalette_SharpBeak: @ 8DB3654
 	.incbin "data/graphics/items/icon_palettes/sharp_beak.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PoisonBarb: ; 8DB3674
+gItemIcon_PoisonBarb: @ 8DB3674
 	.incbin "data/graphics/items/icons/poison_barb.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PoisonBarb: ; 8DB36FC
+gItemIconPalette_PoisonBarb: @ 8DB36FC
 	.incbin "data/graphics/items/icon_palettes/poison_barb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_NeverMeltIce: ; 8DB371C
+gItemIcon_NeverMeltIce: @ 8DB371C
 	.incbin "data/graphics/items/icons/never_melt_ice.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NeverMeltIce: ; 8DB37E8
+gItemIconPalette_NeverMeltIce: @ 8DB37E8
 	.incbin "data/graphics/items/icon_palettes/never_melt_ice.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SpellTag: ; 8DB3804
+gItemIcon_SpellTag: @ 8DB3804
 	.incbin "data/graphics/items/icons/spell_tag.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SpellTag: ; 8DB38A4
+gItemIconPalette_SpellTag: @ 8DB38A4
 	.incbin "data/graphics/items/icon_palettes/spell_tag.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TwistedSpoon: ; 8DB38C4
+gItemIcon_TwistedSpoon: @ 8DB38C4
 	.incbin "data/graphics/items/icons/twisted_spoon.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TwistedSpoon: ; 8DB3964
+gItemIconPalette_TwistedSpoon: @ 8DB3964
 	.incbin "data/graphics/items/icon_palettes/twisted_spoon.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Charcoal: ; 8DB397C
+gItemIcon_Charcoal: @ 8DB397C
 	.incbin "data/graphics/items/icons/charcoal.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Charcoal: ; 8DB3A4C
+gItemIconPalette_Charcoal: @ 8DB3A4C
 	.incbin "data/graphics/items/icon_palettes/charcoal.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DragonFang: ; 8DB3A68
+gItemIcon_DragonFang: @ 8DB3A68
 	.incbin "data/graphics/items/icons/dragon_fang.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DragonFang: ; 8DB3B1C
+gItemIconPalette_DragonFang: @ 8DB3B1C
 	.incbin "data/graphics/items/icon_palettes/dragon_fang.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SilkScarf: ; 8DB3B3C
+gItemIcon_SilkScarf: @ 8DB3B3C
 	.incbin "data/graphics/items/icons/silk_scarf.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SilkScarf: ; 8DB3C44
+gItemIconPalette_SilkScarf: @ 8DB3C44
 	.incbin "data/graphics/items/icon_palettes/silk_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_UpGrade: ; 8DB3C64
+gItemIcon_UpGrade: @ 8DB3C64
 	.incbin "data/graphics/items/icons/up_grade.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_UpGrade: ; 8DB3D20
+gItemIconPalette_UpGrade: @ 8DB3D20
 	.incbin "data/graphics/items/icon_palettes/up_grade.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ShellBell: ; 8DB3D48
+gItemIcon_ShellBell: @ 8DB3D48
 	.incbin "data/graphics/items/icons/shell_bell.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_SeaIncense: ; 8DB3E28
+gItemIcon_SeaIncense: @ 8DB3E28
 	.incbin "data/graphics/items/icons/sea_incense.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SeaIncense: ; 8DB3F10
+gItemIconPalette_SeaIncense: @ 8DB3F10
 	.incbin "data/graphics/items/icon_palettes/sea_incense.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LaxIncense: ; 8DB3F38
+gItemIcon_LaxIncense: @ 8DB3F38
 	.incbin "data/graphics/items/icons/lax_incense.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LaxIncense: ; 8DB4020
+gItemIconPalette_LaxIncense: @ 8DB4020
 	.incbin "data/graphics/items/icon_palettes/lax_incense.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LuckyPunch: ; 8DB4048
+gItemIcon_LuckyPunch: @ 8DB4048
 	.incbin "data/graphics/items/icons/lucky_punch.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_LuckyPunch: ; 8DB410C
+gItemIconPalette_LuckyPunch: @ 8DB410C
 	.incbin "data/graphics/items/icon_palettes/lucky_punch.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MetalPowder: ; 8DB412C
+gItemIcon_MetalPowder: @ 8DB412C
 	.incbin "data/graphics/items/icons/metal_powder.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MetalPowder: ; 8DB41EC
+gItemIconPalette_MetalPowder: @ 8DB41EC
 	.incbin "data/graphics/items/icon_palettes/metal_powder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ThickClub: ; 8DB4210
+gItemIcon_ThickClub: @ 8DB4210
 	.incbin "data/graphics/items/icons/thick_club.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ThickClub: ; 8DB42A4
+gItemIconPalette_ThickClub: @ 8DB42A4
 	.incbin "data/graphics/items/icon_palettes/thick_club.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Stick: ; 8DB42C0
+gItemIcon_Stick: @ 8DB42C0
 	.incbin "data/graphics/items/icons/stick.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Stick: ; 8DB4360
+gItemIconPalette_Stick: @ 8DB4360
 	.incbin "data/graphics/items/icon_palettes/stick.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Scarf: ; 8DB4384
+gItemIcon_Scarf: @ 8DB4384
 	.incbin "data/graphics/items/icons/scarf.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RedScarf: ; 8DB4450
+gItemIconPalette_RedScarf: @ 8DB4450
 	.incbin "data/graphics/items/icon_palettes/red_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlueScarf: ; 8DB446C
+gItemIconPalette_BlueScarf: @ 8DB446C
 	.incbin "data/graphics/items/icon_palettes/blue_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PinkScarf: ; 8DB4488
+gItemIconPalette_PinkScarf: @ 8DB4488
 	.incbin "data/graphics/items/icon_palettes/pink_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GreenScarf: ; 8DB44A4
+gItemIconPalette_GreenScarf: @ 8DB44A4
 	.incbin "data/graphics/items/icon_palettes/green_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_YellowScarf: ; 8DB44C0
+gItemIconPalette_YellowScarf: @ 8DB44C0
 	.incbin "data/graphics/items/icon_palettes/yellow_scarf.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MachBike: ; 8DB44DC
+gItemIcon_MachBike: @ 8DB44DC
 	.incbin "data/graphics/items/icons/mach_bike.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MachBike: ; 8DB45E4
+gItemIconPalette_MachBike: @ 8DB45E4
 	.incbin "data/graphics/items/icon_palettes/mach_bike.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_CoinCase: ; 8DB4608
+gItemIcon_CoinCase: @ 8DB4608
 	.incbin "data/graphics/items/icons/coin_case.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_CoinCase: ; 8DB46C8
+gItemIconPalette_CoinCase: @ 8DB46C8
 	.incbin "data/graphics/items/icon_palettes/coin_case.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Itemfinder: ; 8DB46E8
+gItemIcon_Itemfinder: @ 8DB46E8
 	.incbin "data/graphics/items/icons/itemfinder.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Itemfinder: ; 8DB47A4
+gItemIconPalette_Itemfinder: @ 8DB47A4
 	.incbin "data/graphics/items/icon_palettes/itemfinder.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_OldRod: ; 8DB47CC
+gItemIcon_OldRod: @ 8DB47CC
 	.incbin "data/graphics/items/icons/old_rod.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OldRod: ; 8DB4878
+gItemIconPalette_OldRod: @ 8DB4878
 	.incbin "data/graphics/items/icon_palettes/old_rod.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GoodRod: ; 8DB489C
+gItemIcon_GoodRod: @ 8DB489C
 	.incbin "data/graphics/items/icons/good_rod.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GoodRod: ; 8DB4938
+gItemIconPalette_GoodRod: @ 8DB4938
 	.incbin "data/graphics/items/icon_palettes/good_rod.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SuperRod: ; 8DB4960
+gItemIcon_SuperRod: @ 8DB4960
 	.incbin "data/graphics/items/icons/super_rod.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SuperRod: ; 8DB4A10
+gItemIconPalette_SuperRod: @ 8DB4A10
 	.incbin "data/graphics/items/icon_palettes/super_rod.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SSTicket: ; 8DB4A38
+gItemIcon_SSTicket: @ 8DB4A38
 	.incbin "data/graphics/items/icons/ss_ticket.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SSTicket: ; 8DB4ACC
+gItemIconPalette_SSTicket: @ 8DB4ACC
 	.incbin "data/graphics/items/icon_palettes/ss_ticket.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ContestPass: ; 8DB4AE4
+gItemIcon_ContestPass: @ 8DB4AE4
 	.incbin "data/graphics/items/icons/contest_pass.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ContestPass: ; 8DB4B90
+gItemIconPalette_ContestPass: @ 8DB4B90
 	.incbin "data/graphics/items/icon_palettes/contest_pass.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_WailmerPail: ; 8DB4BB8
+gItemIcon_WailmerPail: @ 8DB4BB8
 	.incbin "data/graphics/items/icons/wailmer_pail.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WailmerPail: ; 8DB4C84
+gItemIconPalette_WailmerPail: @ 8DB4C84
 	.incbin "data/graphics/items/icon_palettes/wailmer_pail.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DevonGoods: ; 8DB4CA8
+gItemIcon_DevonGoods: @ 8DB4CA8
 	.incbin "data/graphics/items/icons/devon_goods.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DevonGoods: ; 8DB4D50
+gItemIconPalette_DevonGoods: @ 8DB4D50
 	.incbin "data/graphics/items/icon_palettes/devon_goods.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SootSack: ; 8DB4D6C
+gItemIcon_SootSack: @ 8DB4D6C
 	.incbin "data/graphics/items/icons/soot_sack.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SootSack: ; 8DB4E44
+gItemIconPalette_SootSack: @ 8DB4E44
 	.incbin "data/graphics/items/icon_palettes/soot_sack.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BasementKey: ; 8DB4E6C
+gItemIcon_BasementKey: @ 8DB4E6C
 	.incbin "data/graphics/items/icons/basement_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OldKey: ; 8DB4F14
+gItemIconPalette_OldKey: @ 8DB4F14
 	.incbin "data/graphics/items/icon_palettes/old_key.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_AcroBike: ; 8DB4F3C
+gItemIcon_AcroBike: @ 8DB4F3C
 	.incbin "data/graphics/items/icons/acro_bike.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_AcroBike: ; 8DB5038
+gItemIconPalette_AcroBike: @ 8DB5038
 	.incbin "data/graphics/items/icon_palettes/acro_bike.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PokeblockCase: ; 8DB5058
+gItemIcon_PokeblockCase: @ 8DB5058
 	.incbin "data/graphics/items/icons/pokeblock_case.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PokeblockCase: ; 8DB5140
+gItemIconPalette_PokeblockCase: @ 8DB5140
 	.incbin "data/graphics/items/icon_palettes/pokeblock_case.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Letter: ; 8DB5168
+gItemIcon_Letter: @ 8DB5168
 	.incbin "data/graphics/items/icons/letter.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_EonTicket: ; 8DB51E8
+gItemIcon_EonTicket: @ 8DB51E8
 	.incbin "data/graphics/items/icons/eon_ticket.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_EonTicket: ; 8DB5284
+gItemIconPalette_EonTicket: @ 8DB5284
 	.incbin "data/graphics/items/icon_palettes/eon_ticket.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Orb: ; 8DB52A8
+gItemIcon_Orb: @ 8DB52A8
 	.incbin "data/graphics/items/icons/orb.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RedOrb: ; 8DB5360
+gItemIconPalette_RedOrb: @ 8DB5360
 	.incbin "data/graphics/items/icon_palettes/red_orb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BlueOrb: ; 8DB537C
+gItemIconPalette_BlueOrb: @ 8DB537C
 	.incbin "data/graphics/items/icon_palettes/blue_orb.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Scanner: ; 8DB5398
+gItemIcon_Scanner: @ 8DB5398
 	.incbin "data/graphics/items/icons/scanner.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Scanner: ; 8DB5460
+gItemIconPalette_Scanner: @ 8DB5460
 	.incbin "data/graphics/items/icon_palettes/scanner.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GoGoggles: ; 8DB5484
+gItemIcon_GoGoggles: @ 8DB5484
 	.incbin "data/graphics/items/icons/go_goggles.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GoGoggles: ; 8DB5538
+gItemIconPalette_GoGoggles: @ 8DB5538
 	.incbin "data/graphics/items/icon_palettes/go_goggles.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Meteorite: ; 8DB5558
+gItemIcon_Meteorite: @ 8DB5558
 	.incbin "data/graphics/items/icons/meteorite.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Meteorite: ; 8DB5638
+gItemIconPalette_Meteorite: @ 8DB5638
 	.incbin "data/graphics/items/icon_palettes/meteorite.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Room1Key: ; 8DB5658
+gItemIcon_Room1Key: @ 8DB5658
 	.incbin "data/graphics/items/icons/room1_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Room2Key: ; 8DB5710
+gItemIcon_Room2Key: @ 8DB5710
 	.incbin "data/graphics/items/icons/room2_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Room4Key: ; 8DB57CC
+gItemIcon_Room4Key: @ 8DB57CC
 	.incbin "data/graphics/items/icons/room4_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_Room6Key: ; 8DB588C
+gItemIcon_Room6Key: @ 8DB588C
 	.incbin "data/graphics/items/icons/room6_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_StorageKey: ; 8DB5948
+gItemIcon_StorageKey: @ 8DB5948
 	.incbin "data/graphics/items/icons/storage_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_RootFossil: ; 8DB59F0
+gItemIcon_RootFossil: @ 8DB59F0
 	.incbin "data/graphics/items/icons/root_fossil.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_HoennFossil: ; 8DB5AFC
+gItemIconPalette_HoennFossil: @ 8DB5AFC
 	.incbin "data/graphics/items/icon_palettes/hoenn_fossil.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_ClawFossil: ; 8DB5B24
+gItemIcon_ClawFossil: @ 8DB5B24
 	.incbin "data/graphics/items/icons/claw_fossil.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_DevonScope: ; 8DB5C14
+gItemIcon_DevonScope: @ 8DB5C14
 	.incbin "data/graphics/items/icons/devon_scope.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DevonScope: ; 8DB5CD0
+gItemIconPalette_DevonScope: @ 8DB5CD0
 	.incbin "data/graphics/items/icon_palettes/devon_scope.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TM: ; 8DB5CF8
+gItemIcon_TM: @ 8DB5CF8
 	.incbin "data/graphics/items/icons/tm.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FightingTMHM: ; 8DB5DF4
+gItemIconPalette_FightingTMHM: @ 8DB5DF4
 	.incbin "data/graphics/items/icon_palettes/fighting_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DragonTMHM: ; 8DB5E1C
+gItemIconPalette_DragonTMHM: @ 8DB5E1C
 	.incbin "data/graphics/items/icon_palettes/dragon_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_WaterTMHM: ; 8DB5E44
+gItemIconPalette_WaterTMHM: @ 8DB5E44
 	.incbin "data/graphics/items/icon_palettes/water_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PsychicTMHM: ; 8DB5E6C
+gItemIconPalette_PsychicTMHM: @ 8DB5E6C
 	.incbin "data/graphics/items/icon_palettes/psychic_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_NormalTMHM: ; 8DB5E94
+gItemIconPalette_NormalTMHM: @ 8DB5E94
 	.incbin "data/graphics/items/icon_palettes/normal_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PoisonTMHM: ; 8DB5EBC
+gItemIconPalette_PoisonTMHM: @ 8DB5EBC
 	.incbin "data/graphics/items/icon_palettes/poison_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_IceTMHM: ; 8DB5EE4
+gItemIconPalette_IceTMHM: @ 8DB5EE4
 	.incbin "data/graphics/items/icon_palettes/ice_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GrassTMHM: ; 8DB5F0C
+gItemIconPalette_GrassTMHM: @ 8DB5F0C
 	.incbin "data/graphics/items/icon_palettes/grass_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FireTMHM: ; 8DB5F34
+gItemIconPalette_FireTMHM: @ 8DB5F34
 	.incbin "data/graphics/items/icon_palettes/fire_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_DarkTMHM: ; 8DB5F5C
+gItemIconPalette_DarkTMHM: @ 8DB5F5C
 	.incbin "data/graphics/items/icon_palettes/dark_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SteelTMHM: ; 8DB5F84
+gItemIconPalette_SteelTMHM: @ 8DB5F84
 	.incbin "data/graphics/items/icon_palettes/steel_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_ElectricTMHM: ; 8DB5FAC
+gItemIconPalette_ElectricTMHM: @ 8DB5FAC
 	.incbin "data/graphics/items/icon_palettes/electric_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GroundTMHM: ; 8DB5FD4
+gItemIconPalette_GroundTMHM: @ 8DB5FD4
 	.incbin "data/graphics/items/icon_palettes/ground_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GhostTMHM: ; 8DB5FFC
+gItemIconPalette_GhostTMHM: @ 8DB5FFC
 	.incbin "data/graphics/items/icon_palettes/ghost_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RockTMHM: ; 8DB6024
+gItemIconPalette_RockTMHM: @ 8DB6024
 	.incbin "data/graphics/items/icon_palettes/rock_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FlyingTMHM: ; 8DB604C
+gItemIconPalette_FlyingTMHM: @ 8DB604C
 	.incbin "data/graphics/items/icon_palettes/flying_tm_hm.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HM: ; 8DB6074
+gItemIcon_HM: @ 8DB6074
 	.incbin "data/graphics/items/icons/hm.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_OaksParcel: ; 8DB6174
+gItemIcon_OaksParcel: @ 8DB6174
 	.incbin "data/graphics/items/icons/oaks_parcel.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OaksParcel: ; 8DB622C
+gItemIconPalette_OaksParcel: @ 8DB622C
 	.incbin "data/graphics/items/icon_palettes/oaks_parcel.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PokeFlute: ; 8DB624C
+gItemIcon_PokeFlute: @ 8DB624C
 	.incbin "data/graphics/items/icons/poke_flute.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PokeFlute: ; 8DB6310
+gItemIconPalette_PokeFlute: @ 8DB6310
 	.incbin "data/graphics/items/icon_palettes/poke_flute.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_SecretKey: ; 8DB6338
+gItemIcon_SecretKey: @ 8DB6338
 	.incbin "data/graphics/items/icons/secret_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SecretKey: ; 8DB6404
+gItemIconPalette_SecretKey: @ 8DB6404
 	.incbin "data/graphics/items/icon_palettes/secret_key.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BikeVoucher: ; 8DB642C
+gItemIcon_BikeVoucher: @ 8DB642C
 	.incbin "data/graphics/items/icons/bike_voucher.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BikeVoucher: ; 8DB64CC
+gItemIconPalette_BikeVoucher: @ 8DB64CC
 	.incbin "data/graphics/items/icon_palettes/bike_voucher.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_GoldTeeth: ; 8DB64EC
+gItemIcon_GoldTeeth: @ 8DB64EC
 	.incbin "data/graphics/items/icons/gold_teeth.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_GoldTeeth: ; 8DB65D8
+gItemIconPalette_GoldTeeth: @ 8DB65D8
 	.incbin "data/graphics/items/icon_palettes/gold_teeth.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_OldAmber: ; 8DB65FC
+gItemIcon_OldAmber: @ 8DB65FC
 	.incbin "data/graphics/items/icons/old_amber.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OldAmber: ; 8DB66DC
+gItemIconPalette_OldAmber: @ 8DB66DC
 	.incbin "data/graphics/items/icon_palettes/old_amber.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_CardKey: ; 8DB6700
+gItemIcon_CardKey: @ 8DB6700
 	.incbin "data/graphics/items/icons/card_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_CardKey: ; 8DB67A8
+gItemIconPalette_CardKey: @ 8DB67A8
 	.incbin "data/graphics/items/icon_palettes/card_key.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_LiftKey: ; 8DB67C8
+gItemIcon_LiftKey: @ 8DB67C8
 	.incbin "data/graphics/items/icons/lift_key.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Key: ; 8DB6884
+gItemIconPalette_Key: @ 8DB6884
 	.incbin "data/graphics/items/icon_palettes/key.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_HelixFossil: ; 8DB68A4
+gItemIcon_HelixFossil: @ 8DB68A4
 	.incbin "data/graphics/items/icons/helix_fossil.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_KantoFossil: ; 8DB6998
+gItemIconPalette_KantoFossil: @ 8DB6998
 	.incbin "data/graphics/items/icon_palettes/kanto_fossil.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_DomeFossil: ; 8DB69B8
+gItemIcon_DomeFossil: @ 8DB69B8
 	.incbin "data/graphics/items/icons/dome_fossil.4bpp.lz"
 
 	.align 2, 0
 
-gItemIcon_SilphScope: ; 8DB6AA8
+gItemIcon_SilphScope: @ 8DB6AA8
 	.incbin "data/graphics/items/icons/silph_scope.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_SilphScope: ; 8DB6B7C
+gItemIconPalette_SilphScope: @ 8DB6B7C
 	.incbin "data/graphics/items/icon_palettes/silph_scope.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Bicycle: ; 8DB6BA0
+gItemIcon_Bicycle: @ 8DB6BA0
 	.incbin "data/graphics/items/icons/bicycle.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Bicycle: ; 8DB6CA4
+gItemIconPalette_Bicycle: @ 8DB6CA4
 	.incbin "data/graphics/items/icon_palettes/bicycle.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TownMap: ; 8DB6CC4
+gItemIcon_TownMap: @ 8DB6CC4
 	.incbin "data/graphics/items/icons/town_map.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TownMap: ; 8DB6D80
+gItemIconPalette_TownMap: @ 8DB6D80
 	.incbin "data/graphics/items/icon_palettes/town_map.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_VSSeeker: ; 8DB6DA8
+gItemIcon_VSSeeker: @ 8DB6DA8
 	.incbin "data/graphics/items/icons/vs_seeker.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_VSSeeker: ; 8DB6E70
+gItemIconPalette_VSSeeker: @ 8DB6E70
 	.incbin "data/graphics/items/icon_palettes/vs_seeker.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_FameChecker: ; 8DB6E90
+gItemIcon_FameChecker: @ 8DB6E90
 	.incbin "data/graphics/items/icons/fame_checker.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_FameChecker: ; 8DB6F48
+gItemIconPalette_FameChecker: @ 8DB6F48
 	.incbin "data/graphics/items/icon_palettes/fame_checker.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TMCase: ; 8DB6F6C
+gItemIcon_TMCase: @ 8DB6F6C
 	.incbin "data/graphics/items/icons/tm_case.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TMCase: ; 8DB7030
+gItemIconPalette_TMCase: @ 8DB7030
 	.incbin "data/graphics/items/icon_palettes/tm_case.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_BerryPouch: ; 8DB7058
+gItemIcon_BerryPouch: @ 8DB7058
 	.incbin "data/graphics/items/icons/berry_pouch.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_BerryPouch: ; 8DB7158
+gItemIconPalette_BerryPouch: @ 8DB7158
 	.incbin "data/graphics/items/icon_palettes/berry_pouch.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TeachyTV: ; 8DB7180
+gItemIcon_TeachyTV: @ 8DB7180
 	.incbin "data/graphics/items/icons/teachy_tv.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TeachyTV: ; 8DB7278
+gItemIconPalette_TeachyTV: @ 8DB7278
 	.incbin "data/graphics/items/icon_palettes/teachy_tv.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_TriPass: ; 8DB72A0
+gItemIcon_TriPass: @ 8DB72A0
 	.incbin "data/graphics/items/icons/tri_pass.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_TriPass: ; 8DB7344
+gItemIconPalette_TriPass: @ 8DB7344
 	.incbin "data/graphics/items/icon_palettes/tri_pass.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_RainbowPass: ; 8DB7364
+gItemIcon_RainbowPass: @ 8DB7364
 	.incbin "data/graphics/items/icons/rainbow_pass.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_RainbowPass: ; 8DB740C
+gItemIconPalette_RainbowPass: @ 8DB740C
 	.incbin "data/graphics/items/icon_palettes/rainbow_pass.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Tea: ; 8DB7434
+gItemIcon_Tea: @ 8DB7434
 	.incbin "data/graphics/items/icons/tea.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Tea: ; 8DB74FC
+gItemIconPalette_Tea: @ 8DB74FC
 	.incbin "data/graphics/items/icon_palettes/tea.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MysticTicket: ; 8DB7520
+gItemIcon_MysticTicket: @ 8DB7520
 	.incbin "data/graphics/items/icons/mystic_ticket.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MysticTicket: ; 8DB75B8
+gItemIconPalette_MysticTicket: @ 8DB75B8
 	.incbin "data/graphics/items/icon_palettes/mystic_ticket.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_AuroraTicket: ; 8DB75D8
+gItemIcon_AuroraTicket: @ 8DB75D8
 	.incbin "data/graphics/items/icons/aurora_ticket.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_AuroraTicket: ; 8DB7674
+gItemIconPalette_AuroraTicket: @ 8DB7674
 	.incbin "data/graphics/items/icon_palettes/aurora_ticket.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_PowderJar: ; 8DB7698
+gItemIcon_PowderJar: @ 8DB7698
 	.incbin "data/graphics/items/icons/powder_jar.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_PowderJar: ; 8DB7738
+gItemIconPalette_PowderJar: @ 8DB7738
 	.incbin "data/graphics/items/icon_palettes/powder_jar.gbapal.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Ruby: ; 8DB7760
+gItemIconPalette_Ruby: @ 8DB7760
 	.incbin "data/graphics/items/icon_palettes/ruby.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_Gem: ; 8DB7788
+gItemIcon_Gem: @ 8DB7788
 	.incbin "data/graphics/items/icons/gem.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_Sapphire: ; 8DB7850
+gItemIconPalette_Sapphire: @ 8DB7850
 	.incbin "data/graphics/items/icon_palettes/sapphire.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_MagmaEmblem: ; 8DB7878
+gItemIcon_MagmaEmblem: @ 8DB7878
 	.incbin "data/graphics/items/icons/magma_emblem.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_MagmaEmblem: ; 8DB794C
+gItemIconPalette_MagmaEmblem: @ 8DB794C
 	.incbin "data/graphics/items/icon_palettes/magma_emblem.gbapal.lz"
 
 	.align 2, 0
 
-gItemIcon_OldSeaMap: ; 8DB7974
+gItemIcon_OldSeaMap: @ 8DB7974
 	.incbin "data/graphics/items/icons/old_sea_map.4bpp.lz"
 
 	.align 2, 0
 
-gItemIconPalette_OldSeaMap: ; 8DB7A78
+gItemIconPalette_OldSeaMap: @ 8DB7A78
 	.incbin "data/graphics/items/icon_palettes/old_sea_map.gbapal.lz"
diff --git a/data/graphics/items/item_icon_table.s b/data/graphics/items/item_icon_table.s
index e36442a37..49b0ad48d 100644
--- a/data/graphics/items/item_icon_table.s
+++ b/data/graphics/items/item_icon_table.s
@@ -1,1514 +1,1514 @@
 	.align 2, 0
 
-gItemIconTable: ; 8614410
-; ????????
+gItemIconTable: @ 8614410
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Master Ball
+@ Master Ball
 	.4byte gItemIcon_MasterBall
 	.4byte gItemIconPalette_MasterBall
 
-; Ultra Ball
+@ Ultra Ball
 	.4byte gItemIcon_UltraBall
 	.4byte gItemIconPalette_UltraBall
 
-; Great Ball
+@ Great Ball
 	.4byte gItemIcon_GreatBall
 	.4byte gItemIconPalette_GreatBall
 
-; Poké Ball
+@ Poké Ball
 	.4byte gItemIcon_PokeBall
 	.4byte gItemIconPalette_PokeBall
 
-; Safari Ball
+@ Safari Ball
 	.4byte gItemIcon_SafariBall
 	.4byte gItemIconPalette_SafariBall
 
-; Net Ball
+@ Net Ball
 	.4byte gItemIcon_NetBall
 	.4byte gItemIconPalette_NetBall
 
-; Dive Ball
+@ Dive Ball
 	.4byte gItemIcon_DiveBall
 	.4byte gItemIconPalette_DiveBall
 
-; Nest Ball
+@ Nest Ball
 	.4byte gItemIcon_NestBall
 	.4byte gItemIconPalette_NestBall
 
-; Repeat Ball
+@ Repeat Ball
 	.4byte gItemIcon_RepeatBall
 	.4byte gItemIconPalette_RepeatBall
 
-; Timer Ball
+@ Timer Ball
 	.4byte gItemIcon_TimerBall
 	.4byte gItemIconPalette_RepeatBall
 
-; Luxury Ball
+@ Luxury Ball
 	.4byte gItemIcon_LuxuryBall
 	.4byte gItemIconPalette_LuxuryBall
 
-; Premier Ball
+@ Premier Ball
 	.4byte gItemIcon_PremierBall
 	.4byte gItemIconPalette_LuxuryBall
 
-; Potion
+@ Potion
 	.4byte gItemIcon_Potion
 	.4byte gItemIconPalette_Potion
 
-; Antidote
+@ Antidote
 	.4byte gItemIcon_Antidote
 	.4byte gItemIconPalette_Antidote
 
-; Burn Heal
+@ Burn Heal
 	.4byte gItemIcon_StatusHeal
 	.4byte gItemIconPalette_BurnHeal
 
-; Ice Heal
+@ Ice Heal
 	.4byte gItemIcon_StatusHeal
 	.4byte gItemIconPalette_IceHeal
 
-; Awakening
+@ Awakening
 	.4byte gItemIcon_StatusHeal
 	.4byte gItemIconPalette_Awakening
 
-; Paralyze Heal
+@ Paralyze Heal
 	.4byte gItemIcon_StatusHeal
 	.4byte gItemIconPalette_ParalyzeHeal
 
-; Full Restore
+@ Full Restore
 	.4byte gItemIcon_LargePotion
 	.4byte gItemIconPalette_FullRestore
 
-; Max Potion
+@ Max Potion
 	.4byte gItemIcon_LargePotion
 	.4byte gItemIconPalette_MaxPotion
 
-; Hyper Potion
+@ Hyper Potion
 	.4byte gItemIcon_Potion
 	.4byte gItemIconPalette_HyperPotion
 
-; Super Potion
+@ Super Potion
 	.4byte gItemIcon_Potion
 	.4byte gItemIconPalette_SuperPotion
 
-; Full Heal
+@ Full Heal
 	.4byte gItemIcon_FullHeal
 	.4byte gItemIconPalette_FullHeal
 
-; Revive
+@ Revive
 	.4byte gItemIcon_Revive
 	.4byte gItemIconPalette_Revive
 
-; Max Revive
+@ Max Revive
 	.4byte gItemIcon_MaxRevive
 	.4byte gItemIconPalette_Revive
 
-; Fresh Water
+@ Fresh Water
 	.4byte gItemIcon_FreshWater
 	.4byte gItemIconPalette_FreshWater
 
-; Soda Pop
+@ Soda Pop
 	.4byte gItemIcon_SodaPop
 	.4byte gItemIconPalette_SodaPop
 
-; Lemonade
+@ Lemonade
 	.4byte gItemIcon_Lemonade
 	.4byte gItemIconPalette_Lemonade
 
-; Moomoo Milk
+@ Moomoo Milk
 	.4byte gItemIcon_MoomooMilk
 	.4byte gItemIconPalette_MoomooMilk
 
-; Energy Powder
+@ Energy Powder
 	.4byte gItemIcon_Powder
 	.4byte gItemIconPalette_EnergyPowder
 
-; Energy Root
+@ Energy Root
 	.4byte gItemIcon_EnergyRoot
 	.4byte gItemIconPalette_EnergyRoot
 
-; Heal Powder
+@ Heal Powder
 	.4byte gItemIcon_Powder
 	.4byte gItemIconPalette_HealPowder
 
-; Revival Herb
+@ Revival Herb
 	.4byte gItemIcon_RevivalHerb
 	.4byte gItemIconPalette_RevivalHerb
 
-; Ether
+@ Ether
 	.4byte gItemIcon_Ether
 	.4byte gItemIconPalette_Ether
 
-; Max Ether
+@ Max Ether
 	.4byte gItemIcon_Ether
 	.4byte gItemIconPalette_MaxEther
 
-; Elixir
+@ Elixir
 	.4byte gItemIcon_Ether
 	.4byte gItemIconPalette_Elixir
 
-; Max Elixir
+@ Max Elixir
 	.4byte gItemIcon_Ether
 	.4byte gItemIconPalette_MaxElixir
 
-; Lava Cookie
+@ Lava Cookie
 	.4byte gItemIcon_LavaCookie
 	.4byte gItemIconPalette_LavaCookieAndLetter
 
-; Blue Flute
+@ Blue Flute
 	.4byte gItemIcon_Flute
 	.4byte gItemIconPalette_BlueFlute
 
-; Yellow Flute
+@ Yellow Flute
 	.4byte gItemIcon_Flute
 	.4byte gItemIconPalette_YellowFlute
 
-; Red Flute
+@ Red Flute
 	.4byte gItemIcon_Flute
 	.4byte gItemIconPalette_RedFlute
 
-; Black Flute
+@ Black Flute
 	.4byte gItemIcon_Flute
 	.4byte gItemIconPalette_BlackFlute
 
-; White Flute
+@ White Flute
 	.4byte gItemIcon_Flute
 	.4byte gItemIconPalette_WhiteFlute
 
-; Berry Juice
+@ Berry Juice
 	.4byte gItemIcon_BerryJuice
 	.4byte gItemIconPalette_BerryJuice
 
-; Sacred Ash
+@ Sacred Ash
 	.4byte gItemIcon_SacredAsh
 	.4byte gItemIconPalette_SacredAsh
 
-; Shoal Salt
+@ Shoal Salt
 	.4byte gItemIcon_Powder
 	.4byte gItemIconPalette_ShoalSalt
 
-; Shoal Shell
+@ Shoal Shell
 	.4byte gItemIcon_ShoalShell
 	.4byte gItemIconPalette_Shell
 
-; Red Shard
+@ Red Shard
 	.4byte gItemIcon_Shard
 	.4byte gItemIconPalette_RedShard
 
-; Blue Shard
+@ Blue Shard
 	.4byte gItemIcon_Shard
 	.4byte gItemIconPalette_BlueShard
 
-; Yellow Shard
+@ Yellow Shard
 	.4byte gItemIcon_Shard
 	.4byte gItemIconPalette_YellowShard
 
-; Green Shard
+@ Green Shard
 	.4byte gItemIcon_Shard
 	.4byte gItemIconPalette_GreenShard
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; HP Up
+@ HP Up
 	.4byte gItemIcon_HPUp
 	.4byte gItemIconPalette_HPUp
 
-; Protein
+@ Protein
 	.4byte gItemIcon_Vitamin
 	.4byte gItemIconPalette_Protein
 
-; Iron
+@ Iron
 	.4byte gItemIcon_Vitamin
 	.4byte gItemIconPalette_Iron
 
-; Carbos
+@ Carbos
 	.4byte gItemIcon_Vitamin
 	.4byte gItemIconPalette_Carbos
 
-; Calcium
+@ Calcium
 	.4byte gItemIcon_Vitamin
 	.4byte gItemIconPalette_Calcium
 
-; Rare Candy
+@ Rare Candy
 	.4byte gItemIcon_RareCandy
 	.4byte gItemIconPalette_RareCandy
 
-; PP Up
+@ PP Up
 	.4byte gItemIcon_PPUp
 	.4byte gItemIconPalette_PPUp
 
-; Zinc
+@ Zinc
 	.4byte gItemIcon_Vitamin
 	.4byte gItemIconPalette_Zinc
 
-; Pp Max
+@ Pp Max
 	.4byte gItemIcon_PPMax
 	.4byte gItemIconPalette_PPMax
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Guard Spec.
+@ Guard Spec.
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_GuardSpec
 
-; Dire Hit
+@ Dire Hit
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_DireHit
 
-; X Attack
+@ X Attack
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_XAttack
 
-; X Defend
+@ X Defend
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_XDefend
 
-; X Speed
+@ X Speed
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_XSpeed
 
-; X Accuracy
+@ X Accuracy
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_XAccuracy
 
-; X Special
+@ X Special
 	.4byte gItemIcon_BattleStatItem
 	.4byte gItemIconPalette_XSpecial
 
-; Poké Doll
+@ Poké Doll
 	.4byte gItemIcon_PokeDoll
 	.4byte gItemIconPalette_PokeDoll
 
-; Fluffy Tail
+@ Fluffy Tail
 	.4byte gItemIcon_FluffyTail
 	.4byte gItemIconPalette_FluffyTail
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Super Repel
+@ Super Repel
 	.4byte gItemIcon_Repel
 	.4byte gItemIconPalette_SuperRepel
 
-; Max Repel
+@ Max Repel
 	.4byte gItemIcon_Repel
 	.4byte gItemIconPalette_MaxRepel
 
-; Escape Rope
+@ Escape Rope
 	.4byte gItemIcon_EscapeRope
 	.4byte gItemIconPalette_EscapeRope
 
-; Repel
+@ Repel
 	.4byte gItemIcon_Repel
 	.4byte gItemIconPalette_Repel
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Sun Stone
+@ Sun Stone
 	.4byte gItemIcon_SunStone
 	.4byte gItemIconPalette_SunStone
 
-; Moon Stone
+@ Moon Stone
 	.4byte gItemIcon_MoonStone
 	.4byte gItemIconPalette_MoonStone
 
-; Fire Stone
+@ Fire Stone
 	.4byte gItemIcon_FireStone
 	.4byte gItemIconPalette_FireStone
 
-; Thunder Stone
+@ Thunder Stone
 	.4byte gItemIcon_ThunderStone
 	.4byte gItemIconPalette_ThunderStone
 
-; Water Stone
+@ Water Stone
 	.4byte gItemIcon_WaterStone
 	.4byte gItemIconPalette_WaterStone
 
-; Leaf Stone
+@ Leaf Stone
 	.4byte gItemIcon_LeafStone
 	.4byte gItemIconPalette_LeafStone
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Tiny Mushroom
+@ Tiny Mushroom
 	.4byte gItemIcon_TinyMushroom
 	.4byte gItemIconPalette_Mushroom
 
-; Big Mushroom
+@ Big Mushroom
 	.4byte gItemIcon_BigMushroom
 	.4byte gItemIconPalette_Mushroom
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Pearl
+@ Pearl
 	.4byte gItemIcon_Pearl
 	.4byte gItemIconPalette_Pearl
 
-; Big Pearl
+@ Big Pearl
 	.4byte gItemIcon_BigPearl
 	.4byte gItemIconPalette_Pearl
 
-; Stardust
+@ Stardust
 	.4byte gItemIcon_Stardust
 	.4byte gItemIconPalette_Star
 
-; Star Piece
+@ Star Piece
 	.4byte gItemIcon_StarPiece
 	.4byte gItemIconPalette_Star
 
-; Nugget
+@ Nugget
 	.4byte gItemIcon_Nugget
 	.4byte gItemIconPalette_Nugget
 
-; Heart Scale
+@ Heart Scale
 	.4byte gItemIcon_HeartScale
 	.4byte gItemIconPalette_HeartScale
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Orange Mail
+@ Orange Mail
 	.4byte gItemIcon_OrangeMail
 	.4byte gItemIconPalette_OrangeMail
 
-; Harbor Mail
+@ Harbor Mail
 	.4byte gItemIcon_HarborMail
 	.4byte gItemIconPalette_HarborMail
 
-; Glitter Mail
+@ Glitter Mail
 	.4byte gItemIcon_GlitterMail
 	.4byte gItemIconPalette_GlitterMail
 
-; Mech Mail
+@ Mech Mail
 	.4byte gItemIcon_MechMail
 	.4byte gItemIconPalette_MechMail
 
-; Wood Mail
+@ Wood Mail
 	.4byte gItemIcon_WoodMail
 	.4byte gItemIconPalette_WoodMail
 
-; Wave Mail
+@ Wave Mail
 	.4byte gItemIcon_WaveMail
 	.4byte gItemIconPalette_WaveMail
 
-; Bead Mail
+@ Bead Mail
 	.4byte gItemIcon_BeadMail
 	.4byte gItemIconPalette_BeadMail
 
-; Shadow Mail
+@ Shadow Mail
 	.4byte gItemIcon_ShadowMail
 	.4byte gItemIconPalette_ShadowMail
 
-; Tropic Mail
+@ Tropic Mail
 	.4byte gItemIcon_TropicMail
 	.4byte gItemIconPalette_TropicMail
 
-; Dream Mail
+@ Dream Mail
 	.4byte gItemIcon_DreamMail
 	.4byte gItemIconPalette_DreamMail
 
-; Fab Mail
+@ Fab Mail
 	.4byte gItemIcon_FabMail
 	.4byte gItemIconPalette_FabMail
 
-; Retro Mail
+@ Retro Mail
 	.4byte gItemIcon_RetroMail
 	.4byte gItemIconPalette_RetroMail
 
-; Cheri Berry
+@ Cheri Berry
 	.4byte gItemIcon_CheriBerry
 	.4byte gItemIconPalette_CheriBerry
 
-; Chesto Berry
+@ Chesto Berry
 	.4byte gItemIcon_ChestoBerry
 	.4byte gItemIconPalette_ChestoBerry
 
-; Pecha Berry
+@ Pecha Berry
 	.4byte gItemIcon_PechaBerry
 	.4byte gItemIconPalette_PechaBerry
 
-; Rawst Berry
+@ Rawst Berry
 	.4byte gItemIcon_RawstBerry
 	.4byte gItemIconPalette_RawstBerry
 
-; Aspear Berry
+@ Aspear Berry
 	.4byte gItemIcon_AspearBerry
 	.4byte gItemIconPalette_AspearBerry
 
-; Leppa Berry
+@ Leppa Berry
 	.4byte gItemIcon_LeppaBerry
 	.4byte gItemIconPalette_LeppaBerry
 
-; Oran Berry
+@ Oran Berry
 	.4byte gItemIcon_OranBerry
 	.4byte gItemIconPalette_OranBerry
 
-; Persim Berry
+@ Persim Berry
 	.4byte gItemIcon_PersimBerry
 	.4byte gItemIconPalette_PersimBerry
 
-; Lum Berry
+@ Lum Berry
 	.4byte gItemIcon_LumBerry
 	.4byte gItemIconPalette_LumBerry
 
-; Sitrus Berry
+@ Sitrus Berry
 	.4byte gItemIcon_SitrusBerry
 	.4byte gItemIconPalette_SitrusBerry
 
-; Figy Berry
+@ Figy Berry
 	.4byte gItemIcon_FigyBerry
 	.4byte gItemIconPalette_FigyBerry
 
-; Wiki Berry
+@ Wiki Berry
 	.4byte gItemIcon_WikiBerry
 	.4byte gItemIconPalette_WikiBerry
 
-; Mago Berry
+@ Mago Berry
 	.4byte gItemIcon_MagoBerry
 	.4byte gItemIconPalette_MagoBerry
 
-; Aguav Berry
+@ Aguav Berry
 	.4byte gItemIcon_AguavBerry
 	.4byte gItemIconPalette_AguavBerry
 
-; Iapapa Berry
+@ Iapapa Berry
 	.4byte gItemIcon_IapapaBerry
 	.4byte gItemIconPalette_IapapaBerry
 
-; Razz Berry
+@ Razz Berry
 	.4byte gItemIcon_RazzBerry
 	.4byte gItemIconPalette_RazzBerry
 
-; Bluk Berry
+@ Bluk Berry
 	.4byte gItemIcon_BlukBerry
 	.4byte gItemIconPalette_BlukBerry
 
-; Nanab Berry
+@ Nanab Berry
 	.4byte gItemIcon_NanabBerry
 	.4byte gItemIconPalette_NanabBerry
 
-; Wepear Berry
+@ Wepear Berry
 	.4byte gItemIcon_WepearBerry
 	.4byte gItemIconPalette_WepearBerry
 
-; Pinap Berry
+@ Pinap Berry
 	.4byte gItemIcon_PinapBerry
 	.4byte gItemIconPalette_PinapBerry
 
-; Pomeg Berry
+@ Pomeg Berry
 	.4byte gItemIcon_PomegBerry
 	.4byte gItemIconPalette_PomegBerry
 
-; Kelpsy Berry
+@ Kelpsy Berry
 	.4byte gItemIcon_KelpsyBerry
 	.4byte gItemIconPalette_KelpsyBerry
 
-; Qualot Berry
+@ Qualot Berry
 	.4byte gItemIcon_QualotBerry
 	.4byte gItemIconPalette_QualotBerry
 
-; Hondew Berry
+@ Hondew Berry
 	.4byte gItemIcon_HondewBerry
 	.4byte gItemIconPalette_HondewBerry
 
-; Grepa Berry
+@ Grepa Berry
 	.4byte gItemIcon_GrepaBerry
 	.4byte gItemIconPalette_GrepaBerry
 
-; Tamato Berry
+@ Tamato Berry
 	.4byte gItemIcon_TamatoBerry
 	.4byte gItemIconPalette_TamatoBerry
 
-; Cornn Berry
+@ Cornn Berry
 	.4byte gItemIcon_CornnBerry
 	.4byte gItemIconPalette_CornnBerry
 
-; Magost Berry
+@ Magost Berry
 	.4byte gItemIcon_MagostBerry
 	.4byte gItemIconPalette_MagostBerry
 
-; Rabuta Berry
+@ Rabuta Berry
 	.4byte gItemIcon_RabutaBerry
 	.4byte gItemIconPalette_RabutaBerry
 
-; Nomel Berry
+@ Nomel Berry
 	.4byte gItemIcon_NomelBerry
 	.4byte gItemIconPalette_NomelBerry
 
-; Spelon Berry
+@ Spelon Berry
 	.4byte gItemIcon_SpelonBerry
 	.4byte gItemIconPalette_SpelonBerry
 
-; Pamtre Berry
+@ Pamtre Berry
 	.4byte gItemIcon_PamtreBerry
 	.4byte gItemIconPalette_PamtreBerry
 
-; Watmel Berry
+@ Watmel Berry
 	.4byte gItemIcon_WatmelBerry
 	.4byte gItemIconPalette_WatmelBerry
 
-; Durin Berry
+@ Durin Berry
 	.4byte gItemIcon_DurinBerry
 	.4byte gItemIconPalette_DurinBerry
 
-; Belue Berry
+@ Belue Berry
 	.4byte gItemIcon_BelueBerry
 	.4byte gItemIconPalette_BelueBerry
 
-; Liechi Berry
+@ Liechi Berry
 	.4byte gItemIcon_LiechiBerry
 	.4byte gItemIconPalette_LiechiBerry
 
-; Ganlon Berry
+@ Ganlon Berry
 	.4byte gItemIcon_GanlonBerry
 	.4byte gItemIconPalette_GanlonBerry
 
-; Salac Berry
+@ Salac Berry
 	.4byte gItemIcon_SalacBerry
 	.4byte gItemIconPalette_SalacBerry
 
-; Petaya Berry
+@ Petaya Berry
 	.4byte gItemIcon_PetayaBerry
 	.4byte gItemIconPalette_PetayaBerry
 
-; Apicot Berry
+@ Apicot Berry
 	.4byte gItemIcon_ApicotBerry
 	.4byte gItemIconPalette_ApicotBerry
 
-; Lansat Berry
+@ Lansat Berry
 	.4byte gItemIcon_LansatBerry
 	.4byte gItemIconPalette_LansatBerry
 
-; Starf Berry
+@ Starf Berry
 	.4byte gItemIcon_StarfBerry
 	.4byte gItemIconPalette_StarfBerry
 
-; Enigma Berry
+@ Enigma Berry
 	.4byte gItemIcon_EnigmaBerry
 	.4byte gItemIconPalette_EnigmaBerry
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Bright Powder
+@ Bright Powder
 	.4byte gItemIcon_BrightPowder
 	.4byte gItemIconPalette_BrightPowder
 
-; White Herb
+@ White Herb
 	.4byte gItemIcon_InBattleHerb
 	.4byte gItemIconPalette_WhiteHerb
 
-; Macho Brace
+@ Macho Brace
 	.4byte gItemIcon_MachoBrace
 	.4byte gItemIconPalette_MachoBrace
 
-; Exp. Share
+@ Exp. Share
 	.4byte gItemIcon_ExpShare
 	.4byte gItemIconPalette_ExpShare
 
-; Quick Claw
+@ Quick Claw
 	.4byte gItemIcon_QuickClaw
 	.4byte gItemIconPalette_QuickClaw
 
-; Soothe Bell
+@ Soothe Bell
 	.4byte gItemIcon_SootheBell
 	.4byte gItemIconPalette_SootheBell
 
-; Mental Herb
+@ Mental Herb
 	.4byte gItemIcon_InBattleHerb
 	.4byte gItemIconPalette_MentalHerb
 
-; Choice Band
+@ Choice Band
 	.4byte gItemIcon_ChoiceBand
 	.4byte gItemIconPalette_ChoiceBand
 
-; King's Rock
+@ King's Rock
 	.4byte gItemIcon_KingsRock
 	.4byte gItemIconPalette_KingsRock
 
-; Silver Powder
+@ Silver Powder
 	.4byte gItemIcon_SilverPowder
 	.4byte gItemIconPalette_SilverPowder
 
-; Amulet Coin
+@ Amulet Coin
 	.4byte gItemIcon_AmuletCoin
 	.4byte gItemIconPalette_AmuletCoin
 
-; Cleanse Tag
+@ Cleanse Tag
 	.4byte gItemIcon_CleanseTag
 	.4byte gItemIconPalette_CleanseTag
 
-; Soul Dew
+@ Soul Dew
 	.4byte gItemIcon_SoulDew
 	.4byte gItemIconPalette_SoulDew
 
-; Deep Sea Tooth
+@ Deep Sea Tooth
 	.4byte gItemIcon_DeepSeaTooth
 	.4byte gItemIconPalette_DeepSeaTooth
 
-; Deep Sea Scale
+@ Deep Sea Scale
 	.4byte gItemIcon_DeepSeaScale
 	.4byte gItemIconPalette_DeepSeaScale
 
-; Smoke Ball
+@ Smoke Ball
 	.4byte gItemIcon_SmokeBall
 	.4byte gItemIconPalette_SmokeBall
 
-; Everstone
+@ Everstone
 	.4byte gItemIcon_Everstone
 	.4byte gItemIconPalette_Everstone
 
-; Focus Band
+@ Focus Band
 	.4byte gItemIcon_FocusBand
 	.4byte gItemIconPalette_FocusBand
 
-; Lucky Egg
+@ Lucky Egg
 	.4byte gItemIcon_LuckyEgg
 	.4byte gItemIconPalette_LuckyEgg
 
-; Scope Lens
+@ Scope Lens
 	.4byte gItemIcon_ScopeLens
 	.4byte gItemIconPalette_ScopeLens
 
-; Metal Coat
+@ Metal Coat
 	.4byte gItemIcon_MetalCoat
 	.4byte gItemIconPalette_MetalCoat
 
-; Leftovers
+@ Leftovers
 	.4byte gItemIcon_Leftovers
 	.4byte gItemIconPalette_Leftovers
 
-; Dragon Scale
+@ Dragon Scale
 	.4byte gItemIcon_DragonScale
 	.4byte gItemIconPalette_DragonScale
 
-; Light Ball
+@ Light Ball
 	.4byte gItemIcon_LightBall
 	.4byte gItemIconPalette_LightBall
 
-; Soft Sand
+@ Soft Sand
 	.4byte gItemIcon_SoftSand
 	.4byte gItemIconPalette_SoftSand
 
-; Hard Stone
+@ Hard Stone
 	.4byte gItemIcon_HardStone
 	.4byte gItemIconPalette_HardStone
 
-; Miracle Seed
+@ Miracle Seed
 	.4byte gItemIcon_MiracleSeed
 	.4byte gItemIconPalette_MiracleSeed
 
-; Black Glasses
+@ Black Glasses
 	.4byte gItemIcon_BlackGlasses
 	.4byte gItemIconPalette_BlackTypeEnhancingItem
 
-; Black Belt
+@ Black Belt
 	.4byte gItemIcon_BlackBelt
 	.4byte gItemIconPalette_BlackTypeEnhancingItem
 
-; Magnet
+@ Magnet
 	.4byte gItemIcon_Magnet
 	.4byte gItemIconPalette_Magnet
 
-; Mystic Water
+@ Mystic Water
 	.4byte gItemIcon_MysticWater
 	.4byte gItemIconPalette_MysticWater
 
-; Sharp Beak
+@ Sharp Beak
 	.4byte gItemIcon_SharpBeak
 	.4byte gItemIconPalette_SharpBeak
 
-; Poison Barb
+@ Poison Barb
 	.4byte gItemIcon_PoisonBarb
 	.4byte gItemIconPalette_PoisonBarb
 
-; Never-Melt Ice
+@ Never-Melt Ice
 	.4byte gItemIcon_NeverMeltIce
 	.4byte gItemIconPalette_NeverMeltIce
 
-; Spell Tag
+@ Spell Tag
 	.4byte gItemIcon_SpellTag
 	.4byte gItemIconPalette_SpellTag
 
-; Twisted Spoon
+@ Twisted Spoon
 	.4byte gItemIcon_TwistedSpoon
 	.4byte gItemIconPalette_TwistedSpoon
 
-; Charcoal
+@ Charcoal
 	.4byte gItemIcon_Charcoal
 	.4byte gItemIconPalette_Charcoal
 
-; Dragon Fang
+@ Dragon Fang
 	.4byte gItemIcon_DragonFang
 	.4byte gItemIconPalette_DragonFang
 
-; Silk Scarf
+@ Silk Scarf
 	.4byte gItemIcon_SilkScarf
 	.4byte gItemIconPalette_SilkScarf
 
-; Up-Grade
+@ Up-Grade
 	.4byte gItemIcon_UpGrade
 	.4byte gItemIconPalette_UpGrade
 
-; Shell Bell
+@ Shell Bell
 	.4byte gItemIcon_ShellBell
 	.4byte gItemIconPalette_Shell
 
-; Sea Incense
+@ Sea Incense
 	.4byte gItemIcon_SeaIncense
 	.4byte gItemIconPalette_SeaIncense
 
-; Lax Incense
+@ Lax Incense
 	.4byte gItemIcon_LaxIncense
 	.4byte gItemIconPalette_LaxIncense
 
-; Lucky Punch
+@ Lucky Punch
 	.4byte gItemIcon_LuckyPunch
 	.4byte gItemIconPalette_LuckyPunch
 
-; Metal Powder
+@ Metal Powder
 	.4byte gItemIcon_MetalPowder
 	.4byte gItemIconPalette_MetalPowder
 
-; Thick Club
+@ Thick Club
 	.4byte gItemIcon_ThickClub
 	.4byte gItemIconPalette_ThickClub
 
-; Stick
+@ Stick
 	.4byte gItemIcon_Stick
 	.4byte gItemIconPalette_Stick
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Red Scarf
+@ Red Scarf
 	.4byte gItemIcon_Scarf
 	.4byte gItemIconPalette_RedScarf
 
-; Blue Scarf
+@ Blue Scarf
 	.4byte gItemIcon_Scarf
 	.4byte gItemIconPalette_BlueScarf
 
-; Pink Scarf
+@ Pink Scarf
 	.4byte gItemIcon_Scarf
 	.4byte gItemIconPalette_PinkScarf
 
-; Green Scarf
+@ Green Scarf
 	.4byte gItemIcon_Scarf
 	.4byte gItemIconPalette_GreenScarf
 
-; Yellow Scarf
+@ Yellow Scarf
 	.4byte gItemIcon_Scarf
 	.4byte gItemIconPalette_YellowScarf
 
-; Mach Bike
+@ Mach Bike
 	.4byte gItemIcon_MachBike
 	.4byte gItemIconPalette_MachBike
 
-; Coin Case
+@ Coin Case
 	.4byte gItemIcon_CoinCase
 	.4byte gItemIconPalette_CoinCase
 
-; Itemfinder
+@ Itemfinder
 	.4byte gItemIcon_Itemfinder
 	.4byte gItemIconPalette_Itemfinder
 
-; Old Rod
+@ Old Rod
 	.4byte gItemIcon_OldRod
 	.4byte gItemIconPalette_OldRod
 
-; Good Rod
+@ Good Rod
 	.4byte gItemIcon_GoodRod
 	.4byte gItemIconPalette_GoodRod
 
-; Super Rod
+@ Super Rod
 	.4byte gItemIcon_SuperRod
 	.4byte gItemIconPalette_SuperRod
 
-; S.S. Ticket
+@ S.S. Ticket
 	.4byte gItemIcon_SSTicket
 	.4byte gItemIconPalette_SSTicket
 
-; Contest Pass
+@ Contest Pass
 	.4byte gItemIcon_ContestPass
 	.4byte gItemIconPalette_ContestPass
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Wailmer Pail
+@ Wailmer Pail
 	.4byte gItemIcon_WailmerPail
 	.4byte gItemIconPalette_WailmerPail
 
-; Devon Goods
+@ Devon Goods
 	.4byte gItemIcon_DevonGoods
 	.4byte gItemIconPalette_DevonGoods
 
-; Soot Sack
+@ Soot Sack
 	.4byte gItemIcon_SootSack
 	.4byte gItemIconPalette_SootSack
 
-; Basement Key
+@ Basement Key
 	.4byte gItemIcon_BasementKey
 	.4byte gItemIconPalette_OldKey
 
-; Acro Bike
+@ Acro Bike
 	.4byte gItemIcon_AcroBike
 	.4byte gItemIconPalette_AcroBike
 
-; Pokéblock Case
+@ Pokéblock Case
 	.4byte gItemIcon_PokeblockCase
 	.4byte gItemIconPalette_PokeblockCase
 
-; Letter
+@ Letter
 	.4byte gItemIcon_Letter
 	.4byte gItemIconPalette_LavaCookieAndLetter
 
-; Eon Ticket
+@ Eon Ticket
 	.4byte gItemIcon_EonTicket
 	.4byte gItemIconPalette_EonTicket
 
-; Red Orb
+@ Red Orb
 	.4byte gItemIcon_Orb
 	.4byte gItemIconPalette_RedOrb
 
-; Blue Orb
+@ Blue Orb
 	.4byte gItemIcon_Orb
 	.4byte gItemIconPalette_BlueOrb
 
-; Scanner
+@ Scanner
 	.4byte gItemIcon_Scanner
 	.4byte gItemIconPalette_Scanner
 
-; Go-Goggles
+@ Go-Goggles
 	.4byte gItemIcon_GoGoggles
 	.4byte gItemIconPalette_GoGoggles
 
-; Meteorite
+@ Meteorite
 	.4byte gItemIcon_Meteorite
 	.4byte gItemIconPalette_Meteorite
 
-; Rm. 1 Key
+@ Rm. 1 Key
 	.4byte gItemIcon_Room1Key
 	.4byte gItemIconPalette_Key
 
-; Rm. 2 Key
+@ Rm. 2 Key
 	.4byte gItemIcon_Room2Key
 	.4byte gItemIconPalette_Key
 
-; Rm. 4 Key
+@ Rm. 4 Key
 	.4byte gItemIcon_Room4Key
 	.4byte gItemIconPalette_Key
 
-; Rm. 6 Key
+@ Rm. 6 Key
 	.4byte gItemIcon_Room6Key
 	.4byte gItemIconPalette_Key
 
-; Storage Key
+@ Storage Key
 	.4byte gItemIcon_StorageKey
 	.4byte gItemIconPalette_OldKey
 
-; Root Fossil
+@ Root Fossil
 	.4byte gItemIcon_RootFossil
 	.4byte gItemIconPalette_HoennFossil
 
-; Claw Fossil
+@ Claw Fossil
 	.4byte gItemIcon_ClawFossil
 	.4byte gItemIconPalette_HoennFossil
 
-; Devon Scope
+@ Devon Scope
 	.4byte gItemIcon_DevonScope
 	.4byte gItemIconPalette_DevonScope
 
-; TM01
+@ TM01
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FightingTMHM
 
-; TM02
+@ TM02
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_DragonTMHM
 
-; TM03
+@ TM03
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_WaterTMHM
 
-; TM04
+@ TM04
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM05
+@ TM05
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM06
+@ TM06
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PoisonTMHM
 
-; TM07
+@ TM07
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_IceTMHM
 
-; TM08
+@ TM08
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FightingTMHM
 
-; TM09
+@ TM09
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GrassTMHM
 
-; TM10
+@ TM10
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM11
+@ TM11
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FireTMHM
 
-; TM12
+@ TM12
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_DarkTMHM
 
-; TM13
+@ TM13
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_IceTMHM
 
-; TM14
+@ TM14
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_IceTMHM
 
-; TM15
+@ TM15
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM16
+@ TM16
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM17
+@ TM17
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM18
+@ TM18
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_WaterTMHM
 
-; TM19
+@ TM19
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GrassTMHM
 
-; TM20
+@ TM20
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM21
+@ TM21
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM22
+@ TM22
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GrassTMHM
 
-; TM23
+@ TM23
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_SteelTMHM
 
-; TM24
+@ TM24
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_ElectricTMHM
 
-; TM25
+@ TM25
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_ElectricTMHM
 
-; TM26
+@ TM26
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GroundTMHM
 
-; TM27
+@ TM27
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM28
+@ TM28
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GroundTMHM
 
-; TM29
+@ TM29
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM30
+@ TM30
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_GhostTMHM
 
-; TM31
+@ TM31
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FightingTMHM
 
-; TM32
+@ TM32
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM33
+@ TM33
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM34
+@ TM34
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_ElectricTMHM
 
-; TM35
+@ TM35
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FireTMHM
 
-; TM36
+@ TM36
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PoisonTMHM
 
-; TM37
+@ TM37
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_RockTMHM
 
-; TM38
+@ TM38
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FireTMHM
 
-; TM39
+@ TM39
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_RockTMHM
 
-; TM40
+@ TM40
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FlyingTMHM
 
-; TM41
+@ TM41
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_DarkTMHM
 
-; TM42
+@ TM42
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM43
+@ TM43
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM44
+@ TM44
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM45
+@ TM45
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_NormalTMHM
 
-; TM46
+@ TM46
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_DarkTMHM
 
-; TM47
+@ TM47
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_SteelTMHM
 
-; TM48
+@ TM48
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_PsychicTMHM
 
-; TM49
+@ TM49
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_DarkTMHM
 
-; TM50
+@ TM50
 	.4byte gItemIcon_TM
 	.4byte gItemIconPalette_FireTMHM
 
-; HM01
+@ HM01
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_NormalTMHM
 
-; HM02
+@ HM02
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_FlyingTMHM
 
-; HM03
+@ HM03
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_WaterTMHM
 
-; HM04
+@ HM04
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_NormalTMHM
 
-; HM05
+@ HM05
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_NormalTMHM
 
-; HM06
+@ HM06
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_FightingTMHM
 
-; HM07
+@ HM07
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_WaterTMHM
 
-; HM08
+@ HM08
 	.4byte gItemIcon_HM
 	.4byte gItemIconPalette_WaterTMHM
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; ????????
+@ ????????
 	.4byte gItemIcon_QuestionMark
 	.4byte gItemIconPalette_QuestionMark
 
-; Oak's Parcel
+@ Oak's Parcel
 	.4byte gItemIcon_OaksParcel
 	.4byte gItemIconPalette_OaksParcel
 
-; Poké Flute
+@ Poké Flute
 	.4byte gItemIcon_PokeFlute
 	.4byte gItemIconPalette_PokeFlute
 
-; Secret Key
+@ Secret Key
 	.4byte gItemIcon_SecretKey
 	.4byte gItemIconPalette_SecretKey
 
-; Bike Voucher
+@ Bike Voucher
 	.4byte gItemIcon_BikeVoucher
 	.4byte gItemIconPalette_BikeVoucher
 
-; Gold Teeth
+@ Gold Teeth
 	.4byte gItemIcon_GoldTeeth
 	.4byte gItemIconPalette_GoldTeeth
 
-; Old Amber
+@ Old Amber
 	.4byte gItemIcon_OldAmber
 	.4byte gItemIconPalette_OldAmber
 
-; Card Key
+@ Card Key
 	.4byte gItemIcon_CardKey
 	.4byte gItemIconPalette_CardKey
 
-; Lift Key
+@ Lift Key
 	.4byte gItemIcon_LiftKey
 	.4byte gItemIconPalette_Key
 
-; Helix Fossil
+@ Helix Fossil
 	.4byte gItemIcon_HelixFossil
 	.4byte gItemIconPalette_KantoFossil
 
-; Dome Fossil
+@ Dome Fossil
 	.4byte gItemIcon_DomeFossil
 	.4byte gItemIconPalette_KantoFossil
 
-; Silph Scope
+@ Silph Scope
 	.4byte gItemIcon_SilphScope
 	.4byte gItemIconPalette_SilphScope
 
-; Bicycle
+@ Bicycle
 	.4byte gItemIcon_Bicycle
 	.4byte gItemIconPalette_Bicycle
 
-; Town Map
+@ Town Map
 	.4byte gItemIcon_TownMap
 	.4byte gItemIconPalette_TownMap
 
-; Vs. Seeker
+@ Vs. Seeker
 	.4byte gItemIcon_VSSeeker
 	.4byte gItemIconPalette_VSSeeker
 
-; Fame Checker
+@ Fame Checker
 	.4byte gItemIcon_FameChecker
 	.4byte gItemIconPalette_FameChecker
 
-; TM Case
+@ TM Case
 	.4byte gItemIcon_TMCase
 	.4byte gItemIconPalette_TMCase
 
-; Berry Pouch
+@ Berry Pouch
 	.4byte gItemIcon_BerryPouch
 	.4byte gItemIconPalette_BerryPouch
 
-; Teachy TV
+@ Teachy TV
 	.4byte gItemIcon_TeachyTV
 	.4byte gItemIconPalette_TeachyTV
 
-; Tri-Pass
+@ Tri-Pass
 	.4byte gItemIcon_TriPass
 	.4byte gItemIconPalette_TriPass
 
-; Rainbow Pass
+@ Rainbow Pass
 	.4byte gItemIcon_RainbowPass
 	.4byte gItemIconPalette_RainbowPass
 
-; Tea
+@ Tea
 	.4byte gItemIcon_Tea
 	.4byte gItemIconPalette_Tea
 
-; Mystic Ticket
+@ Mystic Ticket
 	.4byte gItemIcon_MysticTicket
 	.4byte gItemIconPalette_MysticTicket
 
-; Aurora Ticket
+@ Aurora Ticket
 	.4byte gItemIcon_AuroraTicket
 	.4byte gItemIconPalette_AuroraTicket
 
-; Powder Jar
+@ Powder Jar
 	.4byte gItemIcon_PowderJar
 	.4byte gItemIconPalette_PowderJar
 
-; Ruby
+@ Ruby
 	.4byte gItemIcon_Gem
 	.4byte gItemIconPalette_Ruby
 
-; Sapphire
+@ Sapphire
 	.4byte gItemIcon_Gem
 	.4byte gItemIconPalette_Sapphire
 
-; Magma Emblem
+@ Magma Emblem
 	.4byte gItemIcon_MagmaEmblem
 	.4byte gItemIconPalette_MagmaEmblem
 
-; Old Sea Map
+@ Old Sea Map
 	.4byte gItemIcon_OldSeaMap
 	.4byte gItemIconPalette_OldSeaMap
 
-; Return to field arrow
+@ Return to field arrow
 	.4byte gItemIcon_ReturnToFieldArrow
 	.4byte gItemIconPalette_ReturnToFieldArrow
diff --git a/data/graphics/pokemon/circled_question_mark_graphics.s b/data/graphics/pokemon/circled_question_mark_graphics.s
index 8e2fd5594..08efad642 100644
--- a/data/graphics/pokemon/circled_question_mark_graphics.s
+++ b/data/graphics/pokemon/circled_question_mark_graphics.s
@@ -1,19 +1,19 @@
 	.align 2, 0
 
-gMonStillFrontPic_CircledQuestionMark: ; 8C00750
+gMonStillFrontPic_CircledQuestionMark: @ 8C00750
 	.incbin "data/graphics/pokemon/still_front_pics/circled_question_mark_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_CircledQuestionMark: ; 8C00998
+gMonBackPic_CircledQuestionMark: @ 8C00998
 	.incbin "data/graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_CircledQuestionMark: ; 8C00BE0
+gMonPalette_CircledQuestionMark: @ 8C00BE0
 	.incbin "data/graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_CircledQuestionMark: ; 8C00BF8
+gMonShinyPalette_CircledQuestionMark: @ 8C00BF8
 	.incbin "data/graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"
diff --git a/data/graphics/pokemon/mon_back_pic_table.s b/data/graphics/pokemon/mon_back_pic_table.s
index c1a9269fe..f22359520 100644
--- a/data/graphics/pokemon/mon_back_pic_table.s
+++ b/data/graphics/pokemon/mon_back_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonBackPicTable: ; 83028B8
+gMonBackPicTable: @ 83028B8
 	obj_tiles gMonBackPic_CircledQuestionMark, 0x800, 0
 	obj_tiles gMonBackPic_Bulbasaur, 0x800, 1
 	obj_tiles gMonBackPic_Ivysaur, 0x800, 2
diff --git a/data/graphics/pokemon/mon_footprint_table.s b/data/graphics/pokemon/mon_footprint_table.s
index 43bb4f5c4..a1c4c099c 100644
--- a/data/graphics/pokemon/mon_footprint_table.s
+++ b/data/graphics/pokemon/mon_footprint_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonFootprintTable: ; 856E694
+gMonFootprintTable: @ 856E694
 	.4byte gMonFootprint_Bulbasaur
 	.4byte gMonFootprint_Bulbasaur
 	.4byte gMonFootprint_Ivysaur
diff --git a/data/graphics/pokemon/mon_front_pic_table.s b/data/graphics/pokemon/mon_front_pic_table.s
index d4f24bf83..6b51ff296 100644
--- a/data/graphics/pokemon/mon_front_pic_table.s
+++ b/data/graphics/pokemon/mon_front_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonFrontPicTable: ; 830A18C
+gMonFrontPicTable: @ 830A18C
 	obj_tiles gMonFrontPic_CircledQuestionMark, 0x800, 0
 	obj_tiles gMonFrontPic_Bulbasaur, 0x800, 1
 	obj_tiles gMonFrontPic_Ivysaur, 0x800, 2
diff --git a/data/graphics/pokemon/mon_front_pics.s b/data/graphics/pokemon/mon_front_pics.s
index 5dfac2300..7a420c024 100644
--- a/data/graphics/pokemon/mon_front_pics.s
+++ b/data/graphics/pokemon/mon_front_pics.s
@@ -1,2079 +1,2079 @@
 	.align 2, 0
 
-gMonFrontPic_CircledQuestionMark: ; 8B00000
+gMonFrontPic_CircledQuestionMark: @ 8B00000
 	.incbin "data/graphics/pokemon/front_pics/circled_question_mark_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Bulbasaur: ; 8B00338
+gMonFrontPic_Bulbasaur: @ 8B00338
 	.incbin "data/graphics/pokemon/front_pics/bulbasaur_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ivysaur: ; 8B007B0
+gMonFrontPic_Ivysaur: @ 8B007B0
 	.incbin "data/graphics/pokemon/front_pics/ivysaur_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Venusaur: ; 8B00E10
+gMonFrontPic_Venusaur: @ 8B00E10
 	.incbin "data/graphics/pokemon/front_pics/venusaur_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Charmander: ; 8B017CC
+gMonFrontPic_Charmander: @ 8B017CC
 	.incbin "data/graphics/pokemon/front_pics/charmander_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Charmeleon: ; 8B01C7C
+gMonFrontPic_Charmeleon: @ 8B01C7C
 	.incbin "data/graphics/pokemon/front_pics/charmeleon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Charizard: ; 8B02368
+gMonFrontPic_Charizard: @ 8B02368
 	.incbin "data/graphics/pokemon/front_pics/charizard_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Squirtle: ; 8B02D68
+gMonFrontPic_Squirtle: @ 8B02D68
 	.incbin "data/graphics/pokemon/front_pics/squirtle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wartortle: ; 8B03260
+gMonFrontPic_Wartortle: @ 8B03260
 	.incbin "data/graphics/pokemon/front_pics/wartortle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Blastoise: ; 8B03944
+gMonFrontPic_Blastoise: @ 8B03944
 	.incbin "data/graphics/pokemon/front_pics/blastoise_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Caterpie: ; 8B04280
+gMonFrontPic_Caterpie: @ 8B04280
 	.incbin "data/graphics/pokemon/front_pics/caterpie_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Metapod: ; 8B046FC
+gMonFrontPic_Metapod: @ 8B046FC
 	.incbin "data/graphics/pokemon/front_pics/metapod_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Butterfree: ; 8B04AA8
+gMonFrontPic_Butterfree: @ 8B04AA8
 	.incbin "data/graphics/pokemon/front_pics/butterfree_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Weedle: ; 8B05080
+gMonFrontPic_Weedle: @ 8B05080
 	.incbin "data/graphics/pokemon/front_pics/weedle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kakuna: ; 8B05444
+gMonFrontPic_Kakuna: @ 8B05444
 	.incbin "data/graphics/pokemon/front_pics/kakuna_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Beedrill: ; 8B05820
+gMonFrontPic_Beedrill: @ 8B05820
 	.incbin "data/graphics/pokemon/front_pics/beedrill_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pidgey: ; 8B05F38
+gMonFrontPic_Pidgey: @ 8B05F38
 	.incbin "data/graphics/pokemon/front_pics/pidgey_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pidgeotto: ; 8B0644C
+gMonFrontPic_Pidgeotto: @ 8B0644C
 	.incbin "data/graphics/pokemon/front_pics/pidgeotto_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pidgeot: ; 8B06B24
+gMonFrontPic_Pidgeot: @ 8B06B24
 	.incbin "data/graphics/pokemon/front_pics/pidgeot_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Rattata: ; 8B073DC
+gMonFrontPic_Rattata: @ 8B073DC
 	.incbin "data/graphics/pokemon/front_pics/rattata_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Raticate: ; 8B07828
+gMonFrontPic_Raticate: @ 8B07828
 	.incbin "data/graphics/pokemon/front_pics/raticate_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Spearow: ; 8B07EA4
+gMonFrontPic_Spearow: @ 8B07EA4
 	.incbin "data/graphics/pokemon/front_pics/spearow_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Fearow: ; 8B08388
+gMonFrontPic_Fearow: @ 8B08388
 	.incbin "data/graphics/pokemon/front_pics/fearow_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ekans: ; 8B08BC4
+gMonFrontPic_Ekans: @ 8B08BC4
 	.incbin "data/graphics/pokemon/front_pics/ekans_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Arbok: ; 8B0918C
+gMonFrontPic_Arbok: @ 8B0918C
 	.incbin "data/graphics/pokemon/front_pics/arbok_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pikachu: ; 8B09964
+gMonFrontPic_Pikachu: @ 8B09964
 	.incbin "data/graphics/pokemon/front_pics/pikachu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Raichu: ; 8B09E3C
+gMonFrontPic_Raichu: @ 8B09E3C
 	.incbin "data/graphics/pokemon/front_pics/raichu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sandshrew: ; 8B0A554
+gMonFrontPic_Sandshrew: @ 8B0A554
 	.incbin "data/graphics/pokemon/front_pics/sandshrew_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sandslash: ; 8B0AA6C
+gMonFrontPic_Sandslash: @ 8B0AA6C
 	.incbin "data/graphics/pokemon/front_pics/sandslash_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_NidoranF: ; 8B0B1C4
+gMonFrontPic_NidoranF: @ 8B0B1C4
 	.incbin "data/graphics/pokemon/front_pics/nidoran_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nidorina: ; 8B0B628
+gMonFrontPic_Nidorina: @ 8B0B628
 	.incbin "data/graphics/pokemon/front_pics/nidorina_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nidoqueen: ; 8B0BC5C
+gMonFrontPic_Nidoqueen: @ 8B0BC5C
 	.incbin "data/graphics/pokemon/front_pics/nidoqueen_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_NidoranM: ; 8B0C4E8
+gMonFrontPic_NidoranM: @ 8B0C4E8
 	.incbin "data/graphics/pokemon/front_pics/nidoran_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nidorino: ; 8B0CA54
+gMonFrontPic_Nidorino: @ 8B0CA54
 	.incbin "data/graphics/pokemon/front_pics/nidorino_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nidoking: ; 8B0D10C
+gMonFrontPic_Nidoking: @ 8B0D10C
 	.incbin "data/graphics/pokemon/front_pics/nidoking_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Clefairy: ; 8B0D9A8
+gMonFrontPic_Clefairy: @ 8B0D9A8
 	.incbin "data/graphics/pokemon/front_pics/clefairy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Clefable: ; 8B0DE24
+gMonFrontPic_Clefable: @ 8B0DE24
 	.incbin "data/graphics/pokemon/front_pics/clefable_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Vulpix: ; 8B0E3A4
+gMonFrontPic_Vulpix: @ 8B0E3A4
 	.incbin "data/graphics/pokemon/front_pics/vulpix_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ninetales: ; 8B0EA08
+gMonFrontPic_Ninetales: @ 8B0EA08
 	.incbin "data/graphics/pokemon/front_pics/ninetales_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Jigglypuff: ; 8B0F1CC
+gMonFrontPic_Jigglypuff: @ 8B0F1CC
 	.incbin "data/graphics/pokemon/front_pics/jigglypuff_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wigglytuff: ; 8B0F67C
+gMonFrontPic_Wigglytuff: @ 8B0F67C
 	.incbin "data/graphics/pokemon/front_pics/wigglytuff_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Zubat: ; 8B0FCD0
+gMonFrontPic_Zubat: @ 8B0FCD0
 	.incbin "data/graphics/pokemon/front_pics/zubat_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Golbat: ; 8B10188
+gMonFrontPic_Golbat: @ 8B10188
 	.incbin "data/graphics/pokemon/front_pics/golbat_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Oddish: ; 8B10780
+gMonFrontPic_Oddish: @ 8B10780
 	.incbin "data/graphics/pokemon/front_pics/oddish_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gloom: ; 8B10B78
+gMonFrontPic_Gloom: @ 8B10B78
 	.incbin "data/graphics/pokemon/front_pics/gloom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Vileplume: ; 8B111B0
+gMonFrontPic_Vileplume: @ 8B111B0
 	.incbin "data/graphics/pokemon/front_pics/vileplume_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Paras: ; 8B11750
+gMonFrontPic_Paras: @ 8B11750
 	.incbin "data/graphics/pokemon/front_pics/paras_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Parasect: ; 8B11BAC
+gMonFrontPic_Parasect: @ 8B11BAC
 	.incbin "data/graphics/pokemon/front_pics/parasect_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Venonat: ; 8B121BC
+gMonFrontPic_Venonat: @ 8B121BC
 	.incbin "data/graphics/pokemon/front_pics/venonat_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Venomoth: ; 8B127A8
+gMonFrontPic_Venomoth: @ 8B127A8
 	.incbin "data/graphics/pokemon/front_pics/venomoth_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Diglett: ; 8B12F74
+gMonFrontPic_Diglett: @ 8B12F74
 	.incbin "data/graphics/pokemon/front_pics/diglett_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dugtrio: ; 8B13338
+gMonFrontPic_Dugtrio: @ 8B13338
 	.incbin "data/graphics/pokemon/front_pics/dugtrio_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Meowth: ; 8B137CC
+gMonFrontPic_Meowth: @ 8B137CC
 	.incbin "data/graphics/pokemon/front_pics/meowth_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Persian: ; 8B13CB4
+gMonFrontPic_Persian: @ 8B13CB4
 	.incbin "data/graphics/pokemon/front_pics/persian_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Psyduck: ; 8B1439C
+gMonFrontPic_Psyduck: @ 8B1439C
 	.incbin "data/graphics/pokemon/front_pics/psyduck_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Golduck: ; 8B14904
+gMonFrontPic_Golduck: @ 8B14904
 	.incbin "data/graphics/pokemon/front_pics/golduck_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mankey: ; 8B14F9C
+gMonFrontPic_Mankey: @ 8B14F9C
 	.incbin "data/graphics/pokemon/front_pics/mankey_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Primeape: ; 8B15550
+gMonFrontPic_Primeape: @ 8B15550
 	.incbin "data/graphics/pokemon/front_pics/primeape_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Growlithe: ; 8B15BFC
+gMonFrontPic_Growlithe: @ 8B15BFC
 	.incbin "data/graphics/pokemon/front_pics/growlithe_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Arcanine: ; 8B161E8
+gMonFrontPic_Arcanine: @ 8B161E8
 	.incbin "data/graphics/pokemon/front_pics/arcanine_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Poliwag: ; 8B16BF4
+gMonFrontPic_Poliwag: @ 8B16BF4
 	.incbin "data/graphics/pokemon/front_pics/poliwag_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Poliwhirl: ; 8B170C8
+gMonFrontPic_Poliwhirl: @ 8B170C8
 	.incbin "data/graphics/pokemon/front_pics/poliwhirl_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Poliwrath: ; 8B176B4
+gMonFrontPic_Poliwrath: @ 8B176B4
 	.incbin "data/graphics/pokemon/front_pics/poliwrath_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Abra: ; 8B17D38
+gMonFrontPic_Abra: @ 8B17D38
 	.incbin "data/graphics/pokemon/front_pics/abra_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kadabra: ; 8B18144
+gMonFrontPic_Kadabra: @ 8B18144
 	.incbin "data/graphics/pokemon/front_pics/kadabra_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Alakazam: ; 8B18910
+gMonFrontPic_Alakazam: @ 8B18910
 	.incbin "data/graphics/pokemon/front_pics/alakazam_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Machop: ; 8B190CC
+gMonFrontPic_Machop: @ 8B190CC
 	.incbin "data/graphics/pokemon/front_pics/machop_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Machoke: ; 8B194FC
+gMonFrontPic_Machoke: @ 8B194FC
 	.incbin "data/graphics/pokemon/front_pics/machoke_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Machamp: ; 8B19BB4
+gMonFrontPic_Machamp: @ 8B19BB4
 	.incbin "data/graphics/pokemon/front_pics/machamp_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Bellsprout: ; 8B1A2C0
+gMonFrontPic_Bellsprout: @ 8B1A2C0
 	.incbin "data/graphics/pokemon/front_pics/bellsprout_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Weepinbell: ; 8B1A798
+gMonFrontPic_Weepinbell: @ 8B1A798
 	.incbin "data/graphics/pokemon/front_pics/weepinbell_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Victreebel: ; 8B1AD20
+gMonFrontPic_Victreebel: @ 8B1AD20
 	.incbin "data/graphics/pokemon/front_pics/victreebel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tentacool: ; 8B1B474
+gMonFrontPic_Tentacool: @ 8B1B474
 	.incbin "data/graphics/pokemon/front_pics/tentacool_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tentacruel: ; 8B1B8F4
+gMonFrontPic_Tentacruel: @ 8B1B8F4
 	.incbin "data/graphics/pokemon/front_pics/tentacruel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Geodude: ; 8B1C018
+gMonFrontPic_Geodude: @ 8B1C018
 	.incbin "data/graphics/pokemon/front_pics/geodude_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Graveler: ; 8B1C4A8
+gMonFrontPic_Graveler: @ 8B1C4A8
 	.incbin "data/graphics/pokemon/front_pics/graveler_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Golem: ; 8B1CA7C
+gMonFrontPic_Golem: @ 8B1CA7C
 	.incbin "data/graphics/pokemon/front_pics/golem_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ponyta: ; 8B1D160
+gMonFrontPic_Ponyta: @ 8B1D160
 	.incbin "data/graphics/pokemon/front_pics/ponyta_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Rapidash: ; 8B1D820
+gMonFrontPic_Rapidash: @ 8B1D820
 	.incbin "data/graphics/pokemon/front_pics/rapidash_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slowpoke: ; 8B1E188
+gMonFrontPic_Slowpoke: @ 8B1E188
 	.incbin "data/graphics/pokemon/front_pics/slowpoke_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slowbro: ; 8B1E650
+gMonFrontPic_Slowbro: @ 8B1E650
 	.incbin "data/graphics/pokemon/front_pics/slowbro_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magnemite: ; 8B1EDC8
+gMonFrontPic_Magnemite: @ 8B1EDC8
 	.incbin "data/graphics/pokemon/front_pics/magnemite_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magneton: ; 8B1F160
+gMonFrontPic_Magneton: @ 8B1F160
 	.incbin "data/graphics/pokemon/front_pics/magneton_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Farfetchd: ; 8B1F814
+gMonFrontPic_Farfetchd: @ 8B1F814
 	.incbin "data/graphics/pokemon/front_pics/farfetch_d_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Doduo: ; 8B1FD9C
+gMonFrontPic_Doduo: @ 8B1FD9C
 	.incbin "data/graphics/pokemon/front_pics/doduo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dodrio: ; 8B20398
+gMonFrontPic_Dodrio: @ 8B20398
 	.incbin "data/graphics/pokemon/front_pics/dodrio_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Seel: ; 8B20CAC
+gMonFrontPic_Seel: @ 8B20CAC
 	.incbin "data/graphics/pokemon/front_pics/seel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dewgong: ; 8B211F4
+gMonFrontPic_Dewgong: @ 8B211F4
 	.incbin "data/graphics/pokemon/front_pics/dewgong_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Grimer: ; 8B21894
+gMonFrontPic_Grimer: @ 8B21894
 	.incbin "data/graphics/pokemon/front_pics/grimer_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Muk: ; 8B21E1C
+gMonFrontPic_Muk: @ 8B21E1C
 	.incbin "data/graphics/pokemon/front_pics/muk_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shellder: ; 8B22538
+gMonFrontPic_Shellder: @ 8B22538
 	.incbin "data/graphics/pokemon/front_pics/shellder_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cloyster: ; 8B2298C
+gMonFrontPic_Cloyster: @ 8B2298C
 	.incbin "data/graphics/pokemon/front_pics/cloyster_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gastly: ; 8B23138
+gMonFrontPic_Gastly: @ 8B23138
 	.incbin "data/graphics/pokemon/front_pics/gastly_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Haunter: ; 8B237DC
+gMonFrontPic_Haunter: @ 8B237DC
 	.incbin "data/graphics/pokemon/front_pics/haunter_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gengar: ; 8B23ED0
+gMonFrontPic_Gengar: @ 8B23ED0
 	.incbin "data/graphics/pokemon/front_pics/gengar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Onix: ; 8B2456C
+gMonFrontPic_Onix: @ 8B2456C
 	.incbin "data/graphics/pokemon/front_pics/onix_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Drowzee: ; 8B24DEC
+gMonFrontPic_Drowzee: @ 8B24DEC
 	.incbin "data/graphics/pokemon/front_pics/drowzee_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hypno: ; 8B253D4
+gMonFrontPic_Hypno: @ 8B253D4
 	.incbin "data/graphics/pokemon/front_pics/hypno_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Krabby: ; 8B25A20
+gMonFrontPic_Krabby: @ 8B25A20
 	.incbin "data/graphics/pokemon/front_pics/krabby_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kingler: ; 8B25EE4
+gMonFrontPic_Kingler: @ 8B25EE4
 	.incbin "data/graphics/pokemon/front_pics/kingler_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Voltorb: ; 8B267F4
+gMonFrontPic_Voltorb: @ 8B267F4
 	.incbin "data/graphics/pokemon/front_pics/voltorb_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Electrode: ; 8B26B68
+gMonFrontPic_Electrode: @ 8B26B68
 	.incbin "data/graphics/pokemon/front_pics/electrode_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Exeggcute: ; 8B26F7C
+gMonFrontPic_Exeggcute: @ 8B26F7C
 	.incbin "data/graphics/pokemon/front_pics/exeggcute_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Exeggutor: ; 8B27614
+gMonFrontPic_Exeggutor: @ 8B27614
 	.incbin "data/graphics/pokemon/front_pics/exeggutor_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cubone: ; 8B27E24
+gMonFrontPic_Cubone: @ 8B27E24
 	.incbin "data/graphics/pokemon/front_pics/cubone_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Marowak: ; 8B282A8
+gMonFrontPic_Marowak: @ 8B282A8
 	.incbin "data/graphics/pokemon/front_pics/marowak_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hitmonlee: ; 8B28948
+gMonFrontPic_Hitmonlee: @ 8B28948
 	.incbin "data/graphics/pokemon/front_pics/hitmonlee_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hitmonchan: ; 8B29068
+gMonFrontPic_Hitmonchan: @ 8B29068
 	.incbin "data/graphics/pokemon/front_pics/hitmonchan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lickitung: ; 8B29678
+gMonFrontPic_Lickitung: @ 8B29678
 	.incbin "data/graphics/pokemon/front_pics/lickitung_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Koffing: ; 8B29D50
+gMonFrontPic_Koffing: @ 8B29D50
 	.incbin "data/graphics/pokemon/front_pics/koffing_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Weezing: ; 8B2A368
+gMonFrontPic_Weezing: @ 8B2A368
 	.incbin "data/graphics/pokemon/front_pics/weezing_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Rhyhorn: ; 8B2ABC8
+gMonFrontPic_Rhyhorn: @ 8B2ABC8
 	.incbin "data/graphics/pokemon/front_pics/rhyhorn_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Rhydon: ; 8B2B2A4
+gMonFrontPic_Rhydon: @ 8B2B2A4
 	.incbin "data/graphics/pokemon/front_pics/rhydon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Chansey: ; 8B2BBA4
+gMonFrontPic_Chansey: @ 8B2BBA4
 	.incbin "data/graphics/pokemon/front_pics/chansey_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tangela: ; 8B2C128
+gMonFrontPic_Tangela: @ 8B2C128
 	.incbin "data/graphics/pokemon/front_pics/tangela_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kangaskhan: ; 8B2C800
+gMonFrontPic_Kangaskhan: @ 8B2C800
 	.incbin "data/graphics/pokemon/front_pics/kangaskhan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Horsea: ; 8B2D0B4
+gMonFrontPic_Horsea: @ 8B2D0B4
 	.incbin "data/graphics/pokemon/front_pics/horsea_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Seadra: ; 8B2D4D0
+gMonFrontPic_Seadra: @ 8B2D4D0
 	.incbin "data/graphics/pokemon/front_pics/seadra_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Goldeen: ; 8B2DBB4
+gMonFrontPic_Goldeen: @ 8B2DBB4
 	.incbin "data/graphics/pokemon/front_pics/goldeen_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Seaking: ; 8B2E18C
+gMonFrontPic_Seaking: @ 8B2E18C
 	.incbin "data/graphics/pokemon/front_pics/seaking_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Staryu: ; 8B2E930
+gMonFrontPic_Staryu: @ 8B2E930
 	.incbin "data/graphics/pokemon/front_pics/staryu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Starmie: ; 8B2EE64
+gMonFrontPic_Starmie: @ 8B2EE64
 	.incbin "data/graphics/pokemon/front_pics/starmie_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mrmime: ; 8B2F4D0
+gMonFrontPic_Mrmime: @ 8B2F4D0
 	.incbin "data/graphics/pokemon/front_pics/mr_mime_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Scyther: ; 8B2FB0C
+gMonFrontPic_Scyther: @ 8B2FB0C
 	.incbin "data/graphics/pokemon/front_pics/scyther_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Jynx: ; 8B3034C
+gMonFrontPic_Jynx: @ 8B3034C
 	.incbin "data/graphics/pokemon/front_pics/jynx_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Electabuzz: ; 8B30BE0
+gMonFrontPic_Electabuzz: @ 8B30BE0
 	.incbin "data/graphics/pokemon/front_pics/electabuzz_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magmar: ; 8B313C8
+gMonFrontPic_Magmar: @ 8B313C8
 	.incbin "data/graphics/pokemon/front_pics/magmar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pinsir: ; 8B31C40
+gMonFrontPic_Pinsir: @ 8B31C40
 	.incbin "data/graphics/pokemon/front_pics/pinsir_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tauros: ; 8B323D8
+gMonFrontPic_Tauros: @ 8B323D8
 	.incbin "data/graphics/pokemon/front_pics/tauros_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magikarp: ; 8B32C7C
+gMonFrontPic_Magikarp: @ 8B32C7C
 	.incbin "data/graphics/pokemon/front_pics/magikarp_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gyarados: ; 8B332A4
+gMonFrontPic_Gyarados: @ 8B332A4
 	.incbin "data/graphics/pokemon/front_pics/gyarados_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lapras: ; 8B33B74
+gMonFrontPic_Lapras: @ 8B33B74
 	.incbin "data/graphics/pokemon/front_pics/lapras_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ditto: ; 8B341D4
+gMonFrontPic_Ditto: @ 8B341D4
 	.incbin "data/graphics/pokemon/front_pics/ditto_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Eevee: ; 8B34548
+gMonFrontPic_Eevee: @ 8B34548
 	.incbin "data/graphics/pokemon/front_pics/eevee_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Vaporeon: ; 8B34A68
+gMonFrontPic_Vaporeon: @ 8B34A68
 	.incbin "data/graphics/pokemon/front_pics/vaporeon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Jolteon: ; 8B35098
+gMonFrontPic_Jolteon: @ 8B35098
 	.incbin "data/graphics/pokemon/front_pics/jolteon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Flareon: ; 8B35774
+gMonFrontPic_Flareon: @ 8B35774
 	.incbin "data/graphics/pokemon/front_pics/flareon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Porygon: ; 8B35DB8
+gMonFrontPic_Porygon: @ 8B35DB8
 	.incbin "data/graphics/pokemon/front_pics/porygon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Omanyte: ; 8B36248
+gMonFrontPic_Omanyte: @ 8B36248
 	.incbin "data/graphics/pokemon/front_pics/omanyte_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Omastar: ; 8B36670
+gMonFrontPic_Omastar: @ 8B36670
 	.incbin "data/graphics/pokemon/front_pics/omastar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kabuto: ; 8B36CB4
+gMonFrontPic_Kabuto: @ 8B36CB4
 	.incbin "data/graphics/pokemon/front_pics/kabuto_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kabutops: ; 8B37088
+gMonFrontPic_Kabutops: @ 8B37088
 	.incbin "data/graphics/pokemon/front_pics/kabutops_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Aerodactyl: ; 8B377DC
+gMonFrontPic_Aerodactyl: @ 8B377DC
 	.incbin "data/graphics/pokemon/front_pics/aerodactyl_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Snorlax: ; 8B37F64
+gMonFrontPic_Snorlax: @ 8B37F64
 	.incbin "data/graphics/pokemon/front_pics/snorlax_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Articuno: ; 8B3868C
+gMonFrontPic_Articuno: @ 8B3868C
 	.incbin "data/graphics/pokemon/front_pics/articuno_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Zapdos: ; 8B39004
+gMonFrontPic_Zapdos: @ 8B39004
 	.incbin "data/graphics/pokemon/front_pics/zapdos_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Moltres: ; 8B39800
+gMonFrontPic_Moltres: @ 8B39800
 	.incbin "data/graphics/pokemon/front_pics/moltres_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dratini: ; 8B3A0A8
+gMonFrontPic_Dratini: @ 8B3A0A8
 	.incbin "data/graphics/pokemon/front_pics/dratini_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dragonair: ; 8B3A5B4
+gMonFrontPic_Dragonair: @ 8B3A5B4
 	.incbin "data/graphics/pokemon/front_pics/dragonair_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dragonite: ; 8B3AC44
+gMonFrontPic_Dragonite: @ 8B3AC44
 	.incbin "data/graphics/pokemon/front_pics/dragonite_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mewtwo: ; 8B3B56C
+gMonFrontPic_Mewtwo: @ 8B3B56C
 	.incbin "data/graphics/pokemon/front_pics/mewtwo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mew: ; 8B3BD14
+gMonFrontPic_Mew: @ 8B3BD14
 	.incbin "data/graphics/pokemon/front_pics/mew_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Chikorita: ; 8B3C1F4
+gMonFrontPic_Chikorita: @ 8B3C1F4
 	.incbin "data/graphics/pokemon/front_pics/chikorita_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Bayleef: ; 8B3C68C
+gMonFrontPic_Bayleef: @ 8B3C68C
 	.incbin "data/graphics/pokemon/front_pics/bayleef_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Meganium: ; 8B3CCA0
+gMonFrontPic_Meganium: @ 8B3CCA0
 	.incbin "data/graphics/pokemon/front_pics/meganium_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cyndaquil: ; 8B3D5D4
+gMonFrontPic_Cyndaquil: @ 8B3D5D4
 	.incbin "data/graphics/pokemon/front_pics/cyndaquil_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Quilava: ; 8B3DA94
+gMonFrontPic_Quilava: @ 8B3DA94
 	.incbin "data/graphics/pokemon/front_pics/quilava_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Typhlosion: ; 8B3E080
+gMonFrontPic_Typhlosion: @ 8B3E080
 	.incbin "data/graphics/pokemon/front_pics/typhlosion_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Totodile: ; 8B3E798
+gMonFrontPic_Totodile: @ 8B3E798
 	.incbin "data/graphics/pokemon/front_pics/totodile_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Croconaw: ; 8B3EC60
+gMonFrontPic_Croconaw: @ 8B3EC60
 	.incbin "data/graphics/pokemon/front_pics/croconaw_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Feraligatr: ; 8B3F2BC
+gMonFrontPic_Feraligatr: @ 8B3F2BC
 	.incbin "data/graphics/pokemon/front_pics/feraligatr_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sentret: ; 8B3FB90
+gMonFrontPic_Sentret: @ 8B3FB90
 	.incbin "data/graphics/pokemon/front_pics/sentret_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Furret: ; 8B4005C
+gMonFrontPic_Furret: @ 8B4005C
 	.incbin "data/graphics/pokemon/front_pics/furret_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hoothoot: ; 8B40650
+gMonFrontPic_Hoothoot: @ 8B40650
 	.incbin "data/graphics/pokemon/front_pics/hoothoot_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Noctowl: ; 8B40A4C
+gMonFrontPic_Noctowl: @ 8B40A4C
 	.incbin "data/graphics/pokemon/front_pics/noctowl_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ledyba: ; 8B41100
+gMonFrontPic_Ledyba: @ 8B41100
 	.incbin "data/graphics/pokemon/front_pics/ledyba_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ledian: ; 8B4161C
+gMonFrontPic_Ledian: @ 8B4161C
 	.incbin "data/graphics/pokemon/front_pics/ledian_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Spinarak: ; 8B41AEC
+gMonFrontPic_Spinarak: @ 8B41AEC
 	.incbin "data/graphics/pokemon/front_pics/spinarak_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ariados: ; 8B41F34
+gMonFrontPic_Ariados: @ 8B41F34
 	.incbin "data/graphics/pokemon/front_pics/ariados_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Crobat: ; 8B42628
+gMonFrontPic_Crobat: @ 8B42628
 	.incbin "data/graphics/pokemon/front_pics/crobat_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Chinchou: ; 8B42BFC
+gMonFrontPic_Chinchou: @ 8B42BFC
 	.incbin "data/graphics/pokemon/front_pics/chinchou_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lanturn: ; 8B43100
+gMonFrontPic_Lanturn: @ 8B43100
 	.incbin "data/graphics/pokemon/front_pics/lanturn_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pichu: ; 8B43748
+gMonFrontPic_Pichu: @ 8B43748
 	.incbin "data/graphics/pokemon/front_pics/pichu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cleffa: ; 8B43B00
+gMonFrontPic_Cleffa: @ 8B43B00
 	.incbin "data/graphics/pokemon/front_pics/cleffa_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Igglybuff: ; 8B43EBC
+gMonFrontPic_Igglybuff: @ 8B43EBC
 	.incbin "data/graphics/pokemon/front_pics/igglybuff_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Togepi: ; 8B44228
+gMonFrontPic_Togepi: @ 8B44228
 	.incbin "data/graphics/pokemon/front_pics/togepi_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Togetic: ; 8B4454C
+gMonFrontPic_Togetic: @ 8B4454C
 	.incbin "data/graphics/pokemon/front_pics/togetic_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Natu: ; 8B449DC
+gMonFrontPic_Natu: @ 8B449DC
 	.incbin "data/graphics/pokemon/front_pics/natu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Xatu: ; 8B44D08
+gMonFrontPic_Xatu: @ 8B44D08
 	.incbin "data/graphics/pokemon/front_pics/xatu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mareep: ; 8B4529C
+gMonFrontPic_Mareep: @ 8B4529C
 	.incbin "data/graphics/pokemon/front_pics/mareep_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Flaaffy: ; 8B45744
+gMonFrontPic_Flaaffy: @ 8B45744
 	.incbin "data/graphics/pokemon/front_pics/flaaffy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ampharos: ; 8B45C34
+gMonFrontPic_Ampharos: @ 8B45C34
 	.incbin "data/graphics/pokemon/front_pics/ampharos_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Bellossom: ; 8B462C0
+gMonFrontPic_Bellossom: @ 8B462C0
 	.incbin "data/graphics/pokemon/front_pics/bellossom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Marill: ; 8B46758
+gMonFrontPic_Marill: @ 8B46758
 	.incbin "data/graphics/pokemon/front_pics/marill_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Azumarill: ; 8B46C84
+gMonFrontPic_Azumarill: @ 8B46C84
 	.incbin "data/graphics/pokemon/front_pics/azumarill_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sudowoodo: ; 8B47228
+gMonFrontPic_Sudowoodo: @ 8B47228
 	.incbin "data/graphics/pokemon/front_pics/sudowoodo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Politoed: ; 8B477E4
+gMonFrontPic_Politoed: @ 8B477E4
 	.incbin "data/graphics/pokemon/front_pics/politoed_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hoppip: ; 8B47DEC
+gMonFrontPic_Hoppip: @ 8B47DEC
 	.incbin "data/graphics/pokemon/front_pics/hoppip_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Skiploom: ; 8B482B4
+gMonFrontPic_Skiploom: @ 8B482B4
 	.incbin "data/graphics/pokemon/front_pics/skiploom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Jumpluff: ; 8B486F8
+gMonFrontPic_Jumpluff: @ 8B486F8
 	.incbin "data/graphics/pokemon/front_pics/jumpluff_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Aipom: ; 8B48C78
+gMonFrontPic_Aipom: @ 8B48C78
 	.incbin "data/graphics/pokemon/front_pics/aipom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sunkern: ; 8B49178
+gMonFrontPic_Sunkern: @ 8B49178
 	.incbin "data/graphics/pokemon/front_pics/sunkern_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sunflora: ; 8B49518
+gMonFrontPic_Sunflora: @ 8B49518
 	.incbin "data/graphics/pokemon/front_pics/sunflora_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Yanma: ; 8B49AB0
+gMonFrontPic_Yanma: @ 8B49AB0
 	.incbin "data/graphics/pokemon/front_pics/yanma_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wooper: ; 8B4A03C
+gMonFrontPic_Wooper: @ 8B4A03C
 	.incbin "data/graphics/pokemon/front_pics/wooper_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Quagsire: ; 8B4A3FC
+gMonFrontPic_Quagsire: @ 8B4A3FC
 	.incbin "data/graphics/pokemon/front_pics/quagsire_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Espeon: ; 8B4AA80
+gMonFrontPic_Espeon: @ 8B4AA80
 	.incbin "data/graphics/pokemon/front_pics/espeon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Umbreon: ; 8B4B060
+gMonFrontPic_Umbreon: @ 8B4B060
 	.incbin "data/graphics/pokemon/front_pics/umbreon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Murkrow: ; 8B4B610
+gMonFrontPic_Murkrow: @ 8B4B610
 	.incbin "data/graphics/pokemon/front_pics/murkrow_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slowking: ; 8B4BB6C
+gMonFrontPic_Slowking: @ 8B4BB6C
 	.incbin "data/graphics/pokemon/front_pics/slowking_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Misdreavus: ; 8B4C234
+gMonFrontPic_Misdreavus: @ 8B4C234
 	.incbin "data/graphics/pokemon/front_pics/misdreavus_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownA: ; 8B4C730
+gMonFrontPic_UnownA: @ 8B4C730
 	.incbin "data/graphics/pokemon/front_pics/unown_a_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wobbuffet: ; 8B4C9F4
+gMonFrontPic_Wobbuffet: @ 8B4C9F4
 	.incbin "data/graphics/pokemon/front_pics/wobbuffet_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Girafarig: ; 8B4CFC4
+gMonFrontPic_Girafarig: @ 8B4CFC4
 	.incbin "data/graphics/pokemon/front_pics/girafarig_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pineco: ; 8B4D75C
+gMonFrontPic_Pineco: @ 8B4D75C
 	.incbin "data/graphics/pokemon/front_pics/pineco_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Forretress: ; 8B4DBE4
+gMonFrontPic_Forretress: @ 8B4DBE4
 	.incbin "data/graphics/pokemon/front_pics/forretress_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dunsparce: ; 8B4E1E8
+gMonFrontPic_Dunsparce: @ 8B4E1E8
 	.incbin "data/graphics/pokemon/front_pics/dunsparce_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gligar: ; 8B4E73C
+gMonFrontPic_Gligar: @ 8B4E73C
 	.incbin "data/graphics/pokemon/front_pics/gligar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Steelix: ; 8B4EE6C
+gMonFrontPic_Steelix: @ 8B4EE6C
 	.incbin "data/graphics/pokemon/front_pics/steelix_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Snubbull: ; 8B4F73C
+gMonFrontPic_Snubbull: @ 8B4F73C
 	.incbin "data/graphics/pokemon/front_pics/snubbull_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Granbull: ; 8B4FC2C
+gMonFrontPic_Granbull: @ 8B4FC2C
 	.incbin "data/graphics/pokemon/front_pics/granbull_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Qwilfish: ; 8B502CC
+gMonFrontPic_Qwilfish: @ 8B502CC
 	.incbin "data/graphics/pokemon/front_pics/qwilfish_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Scizor: ; 8B50780
+gMonFrontPic_Scizor: @ 8B50780
 	.incbin "data/graphics/pokemon/front_pics/scizor_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shuckle: ; 8B5100C
+gMonFrontPic_Shuckle: @ 8B5100C
 	.incbin "data/graphics/pokemon/front_pics/shuckle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Heracross: ; 8B51470
+gMonFrontPic_Heracross: @ 8B51470
 	.incbin "data/graphics/pokemon/front_pics/heracross_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sneasel: ; 8B51B04
+gMonFrontPic_Sneasel: @ 8B51B04
 	.incbin "data/graphics/pokemon/front_pics/sneasel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Teddiursa: ; 8B52114
+gMonFrontPic_Teddiursa: @ 8B52114
 	.incbin "data/graphics/pokemon/front_pics/teddiursa_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ursaring: ; 8B524C0
+gMonFrontPic_Ursaring: @ 8B524C0
 	.incbin "data/graphics/pokemon/front_pics/ursaring_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slugma: ; 8B52C4C
+gMonFrontPic_Slugma: @ 8B52C4C
 	.incbin "data/graphics/pokemon/front_pics/slugma_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magcargo: ; 8B5307C
+gMonFrontPic_Magcargo: @ 8B5307C
 	.incbin "data/graphics/pokemon/front_pics/magcargo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Swinub: ; 8B536DC
+gMonFrontPic_Swinub: @ 8B536DC
 	.incbin "data/graphics/pokemon/front_pics/swinub_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Piloswine: ; 8B53A7C
+gMonFrontPic_Piloswine: @ 8B53A7C
 	.incbin "data/graphics/pokemon/front_pics/piloswine_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Corsola: ; 8B53FB8
+gMonFrontPic_Corsola: @ 8B53FB8
 	.incbin "data/graphics/pokemon/front_pics/corsola_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Remoraid: ; 8B5450C
+gMonFrontPic_Remoraid: @ 8B5450C
 	.incbin "data/graphics/pokemon/front_pics/remoraid_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Octillery: ; 8B54960
+gMonFrontPic_Octillery: @ 8B54960
 	.incbin "data/graphics/pokemon/front_pics/octillery_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Delibird: ; 8B54EE4
+gMonFrontPic_Delibird: @ 8B54EE4
 	.incbin "data/graphics/pokemon/front_pics/delibird_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mantine: ; 8B55514
+gMonFrontPic_Mantine: @ 8B55514
 	.incbin "data/graphics/pokemon/front_pics/mantine_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Skarmory: ; 8B55D60
+gMonFrontPic_Skarmory: @ 8B55D60
 	.incbin "data/graphics/pokemon/front_pics/skarmory_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Houndour: ; 8B5656C
+gMonFrontPic_Houndour: @ 8B5656C
 	.incbin "data/graphics/pokemon/front_pics/houndour_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Houndoom: ; 8B56A70
+gMonFrontPic_Houndoom: @ 8B56A70
 	.incbin "data/graphics/pokemon/front_pics/houndoom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kingdra: ; 8B57164
+gMonFrontPic_Kingdra: @ 8B57164
 	.incbin "data/graphics/pokemon/front_pics/kingdra_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Phanpy: ; 8B57900
+gMonFrontPic_Phanpy: @ 8B57900
 	.incbin "data/graphics/pokemon/front_pics/phanpy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Donphan: ; 8B57D74
+gMonFrontPic_Donphan: @ 8B57D74
 	.incbin "data/graphics/pokemon/front_pics/donphan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Porygon2: ; 8B5846C
+gMonFrontPic_Porygon2: @ 8B5846C
 	.incbin "data/graphics/pokemon/front_pics/porygon2_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Stantler: ; 8B588E8
+gMonFrontPic_Stantler: @ 8B588E8
 	.incbin "data/graphics/pokemon/front_pics/stantler_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Smeargle: ; 8B5905C
+gMonFrontPic_Smeargle: @ 8B5905C
 	.incbin "data/graphics/pokemon/front_pics/smeargle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tyrogue: ; 8B5970C
+gMonFrontPic_Tyrogue: @ 8B5970C
 	.incbin "data/graphics/pokemon/front_pics/tyrogue_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hitmontop: ; 8B59BD4
+gMonFrontPic_Hitmontop: @ 8B59BD4
 	.incbin "data/graphics/pokemon/front_pics/hitmontop_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Smoochum: ; 8B5A1B4
+gMonFrontPic_Smoochum: @ 8B5A1B4
 	.incbin "data/graphics/pokemon/front_pics/smoochum_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Elekid: ; 8B5A5A4
+gMonFrontPic_Elekid: @ 8B5A5A4
 	.incbin "data/graphics/pokemon/front_pics/elekid_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Magby: ; 8B5AB58
+gMonFrontPic_Magby: @ 8B5AB58
 	.incbin "data/graphics/pokemon/front_pics/magby_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Miltank: ; 8B5B004
+gMonFrontPic_Miltank: @ 8B5B004
 	.incbin "data/graphics/pokemon/front_pics/miltank_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Blissey: ; 8B5B6C0
+gMonFrontPic_Blissey: @ 8B5B6C0
 	.incbin "data/graphics/pokemon/front_pics/blissey_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Raikou: ; 8B5BD2C
+gMonFrontPic_Raikou: @ 8B5BD2C
 	.incbin "data/graphics/pokemon/front_pics/raikou_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Entei: ; 8B5C738
+gMonFrontPic_Entei: @ 8B5C738
 	.incbin "data/graphics/pokemon/front_pics/entei_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Suicune: ; 8B5CFCC
+gMonFrontPic_Suicune: @ 8B5CFCC
 	.incbin "data/graphics/pokemon/front_pics/suicune_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Larvitar: ; 8B5DA34
+gMonFrontPic_Larvitar: @ 8B5DA34
 	.incbin "data/graphics/pokemon/front_pics/larvitar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pupitar: ; 8B5DEC0
+gMonFrontPic_Pupitar: @ 8B5DEC0
 	.incbin "data/graphics/pokemon/front_pics/pupitar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tyranitar: ; 8B5E308
+gMonFrontPic_Tyranitar: @ 8B5E308
 	.incbin "data/graphics/pokemon/front_pics/tyranitar_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lugia: ; 8B5EC68
+gMonFrontPic_Lugia: @ 8B5EC68
 	.incbin "data/graphics/pokemon/front_pics/lugia_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_HoOh: ; 8B5F4FC
+gMonFrontPic_HoOh: @ 8B5F4FC
 	.incbin "data/graphics/pokemon/front_pics/ho_oh_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Celebi: ; 8B60090
+gMonFrontPic_Celebi: @ 8B60090
 	.incbin "data/graphics/pokemon/front_pics/celebi_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_DoubleQuestionMark: ; 8B60544
+gMonFrontPic_DoubleQuestionMark: @ 8B60544
 	.incbin "data/graphics/pokemon/front_pics/double_question_mark_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Treecko: ; 8B607B4
+gMonFrontPic_Treecko: @ 8B607B4
 	.incbin "data/graphics/pokemon/front_pics/treecko_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Grovyle: ; 8B60D28
+gMonFrontPic_Grovyle: @ 8B60D28
 	.incbin "data/graphics/pokemon/front_pics/grovyle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sceptile: ; 8B6157C
+gMonFrontPic_Sceptile: @ 8B6157C
 	.incbin "data/graphics/pokemon/front_pics/sceptile_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Torchic: ; 8B61C9C
+gMonFrontPic_Torchic: @ 8B61C9C
 	.incbin "data/graphics/pokemon/front_pics/torchic_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Combusken: ; 8B6218C
+gMonFrontPic_Combusken: @ 8B6218C
 	.incbin "data/graphics/pokemon/front_pics/combusken_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Blaziken: ; 8B62964
+gMonFrontPic_Blaziken: @ 8B62964
 	.incbin "data/graphics/pokemon/front_pics/blaziken_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mudkip: ; 8B630B0
+gMonFrontPic_Mudkip: @ 8B630B0
 	.incbin "data/graphics/pokemon/front_pics/mudkip_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Marshtomp: ; 8B635E4
+gMonFrontPic_Marshtomp: @ 8B635E4
 	.incbin "data/graphics/pokemon/front_pics/marshtomp_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Swampert: ; 8B63BF4
+gMonFrontPic_Swampert: @ 8B63BF4
 	.incbin "data/graphics/pokemon/front_pics/swampert_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Poochyena: ; 8B64564
+gMonFrontPic_Poochyena: @ 8B64564
 	.incbin "data/graphics/pokemon/front_pics/poochyena_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mightyena: ; 8B64AC0
+gMonFrontPic_Mightyena: @ 8B64AC0
 	.incbin "data/graphics/pokemon/front_pics/mightyena_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Zigzagoon: ; 8B65294
+gMonFrontPic_Zigzagoon: @ 8B65294
 	.incbin "data/graphics/pokemon/front_pics/zigzagoon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Linoone: ; 8B659B0
+gMonFrontPic_Linoone: @ 8B659B0
 	.incbin "data/graphics/pokemon/front_pics/linoone_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wurmple: ; 8B65F9C
+gMonFrontPic_Wurmple: @ 8B65F9C
 	.incbin "data/graphics/pokemon/front_pics/wurmple_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Silcoon: ; 8B66498
+gMonFrontPic_Silcoon: @ 8B66498
 	.incbin "data/graphics/pokemon/front_pics/silcoon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Beautifly: ; 8B66830
+gMonFrontPic_Beautifly: @ 8B66830
 	.incbin "data/graphics/pokemon/front_pics/beautifly_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cascoon: ; 8B66DBC
+gMonFrontPic_Cascoon: @ 8B66DBC
 	.incbin "data/graphics/pokemon/front_pics/cascoon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dustox: ; 8B67130
+gMonFrontPic_Dustox: @ 8B67130
 	.incbin "data/graphics/pokemon/front_pics/dustox_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lotad: ; 8B67734
+gMonFrontPic_Lotad: @ 8B67734
 	.incbin "data/graphics/pokemon/front_pics/lotad_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lombre: ; 8B67B7C
+gMonFrontPic_Lombre: @ 8B67B7C
 	.incbin "data/graphics/pokemon/front_pics/lombre_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ludicolo: ; 8B68120
+gMonFrontPic_Ludicolo: @ 8B68120
 	.incbin "data/graphics/pokemon/front_pics/ludicolo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Seedot: ; 8B688F0
+gMonFrontPic_Seedot: @ 8B688F0
 	.incbin "data/graphics/pokemon/front_pics/seedot_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nuzleaf: ; 8B68DB4
+gMonFrontPic_Nuzleaf: @ 8B68DB4
 	.incbin "data/graphics/pokemon/front_pics/nuzleaf_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shiftry: ; 8B69278
+gMonFrontPic_Shiftry: @ 8B69278
 	.incbin "data/graphics/pokemon/front_pics/shiftry_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nincada: ; 8B69878
+gMonFrontPic_Nincada: @ 8B69878
 	.incbin "data/graphics/pokemon/front_pics/nincada_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ninjask: ; 8B69D04
+gMonFrontPic_Ninjask: @ 8B69D04
 	.incbin "data/graphics/pokemon/front_pics/ninjask_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shedinja: ; 8B6A23C
+gMonFrontPic_Shedinja: @ 8B6A23C
 	.incbin "data/graphics/pokemon/front_pics/shedinja_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Taillow: ; 8B6A81C
+gMonFrontPic_Taillow: @ 8B6A81C
 	.incbin "data/graphics/pokemon/front_pics/taillow_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Swellow: ; 8B6AD5C
+gMonFrontPic_Swellow: @ 8B6AD5C
 	.incbin "data/graphics/pokemon/front_pics/swellow_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shroomish: ; 8B6B2C8
+gMonFrontPic_Shroomish: @ 8B6B2C8
 	.incbin "data/graphics/pokemon/front_pics/shroomish_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Breloom: ; 8B6B690
+gMonFrontPic_Breloom: @ 8B6B690
 	.incbin "data/graphics/pokemon/front_pics/breloom_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Spinda: ; 8B6BD3C
+gMonFrontPic_Spinda: @ 8B6BD3C
 	.incbin "data/graphics/pokemon/front_pics/spinda_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wingull: ; 8B6C130
+gMonFrontPic_Wingull: @ 8B6C130
 	.incbin "data/graphics/pokemon/front_pics/wingull_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Pelipper: ; 8B6C514
+gMonFrontPic_Pelipper: @ 8B6C514
 	.incbin "data/graphics/pokemon/front_pics/pelipper_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Surskit: ; 8B6CB0C
+gMonFrontPic_Surskit: @ 8B6CB0C
 	.incbin "data/graphics/pokemon/front_pics/surskit_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Masquerain: ; 8B6CEB0
+gMonFrontPic_Masquerain: @ 8B6CEB0
 	.incbin "data/graphics/pokemon/front_pics/masquerain_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wailmer: ; 8B6D4F0
+gMonFrontPic_Wailmer: @ 8B6D4F0
 	.incbin "data/graphics/pokemon/front_pics/wailmer_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wailord: ; 8B6D9A4
+gMonFrontPic_Wailord: @ 8B6D9A4
 	.incbin "data/graphics/pokemon/front_pics/wailord_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Skitty: ; 8B6E01C
+gMonFrontPic_Skitty: @ 8B6E01C
 	.incbin "data/graphics/pokemon/front_pics/skitty_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Delcatty: ; 8B6E588
+gMonFrontPic_Delcatty: @ 8B6E588
 	.incbin "data/graphics/pokemon/front_pics/delcatty_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kecleon: ; 8B6EBE0
+gMonFrontPic_Kecleon: @ 8B6EBE0
 	.incbin "data/graphics/pokemon/front_pics/kecleon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Baltoy: ; 8B6F274
+gMonFrontPic_Baltoy: @ 8B6F274
 	.incbin "data/graphics/pokemon/front_pics/baltoy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Claydol: ; 8B6F62C
+gMonFrontPic_Claydol: @ 8B6F62C
 	.incbin "data/graphics/pokemon/front_pics/claydol_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Nosepass: ; 8B6FD08
+gMonFrontPic_Nosepass: @ 8B6FD08
 	.incbin "data/graphics/pokemon/front_pics/nosepass_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Torkoal: ; 8B70268
+gMonFrontPic_Torkoal: @ 8B70268
 	.incbin "data/graphics/pokemon/front_pics/torkoal_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sableye: ; 8B70A58
+gMonFrontPic_Sableye: @ 8B70A58
 	.incbin "data/graphics/pokemon/front_pics/sableye_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Barboach: ; 8B70EF8
+gMonFrontPic_Barboach: @ 8B70EF8
 	.incbin "data/graphics/pokemon/front_pics/barboach_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Whiscash: ; 8B71400
+gMonFrontPic_Whiscash: @ 8B71400
 	.incbin "data/graphics/pokemon/front_pics/whiscash_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Luvdisc: ; 8B7197C
+gMonFrontPic_Luvdisc: @ 8B7197C
 	.incbin "data/graphics/pokemon/front_pics/luvdisc_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Corphish: ; 8B71CB0
+gMonFrontPic_Corphish: @ 8B71CB0
 	.incbin "data/graphics/pokemon/front_pics/corphish_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Crawdaunt: ; 8B721E4
+gMonFrontPic_Crawdaunt: @ 8B721E4
 	.incbin "data/graphics/pokemon/front_pics/crawdaunt_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Feebas: ; 8B72920
+gMonFrontPic_Feebas: @ 8B72920
 	.incbin "data/graphics/pokemon/front_pics/feebas_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Milotic: ; 8B72E30
+gMonFrontPic_Milotic: @ 8B72E30
 	.incbin "data/graphics/pokemon/front_pics/milotic_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Carvanha: ; 8B736FC
+gMonFrontPic_Carvanha: @ 8B736FC
 	.incbin "data/graphics/pokemon/front_pics/carvanha_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sharpedo: ; 8B73D1C
+gMonFrontPic_Sharpedo: @ 8B73D1C
 	.incbin "data/graphics/pokemon/front_pics/sharpedo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Trapinch: ; 8B7434C
+gMonFrontPic_Trapinch: @ 8B7434C
 	.incbin "data/graphics/pokemon/front_pics/trapinch_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Vibrava: ; 8B74720
+gMonFrontPic_Vibrava: @ 8B74720
 	.incbin "data/graphics/pokemon/front_pics/vibrava_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Flygon: ; 8B74DB0
+gMonFrontPic_Flygon: @ 8B74DB0
 	.incbin "data/graphics/pokemon/front_pics/flygon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Makuhita: ; 8B75614
+gMonFrontPic_Makuhita: @ 8B75614
 	.incbin "data/graphics/pokemon/front_pics/makuhita_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Hariyama: ; 8B75AD0
+gMonFrontPic_Hariyama: @ 8B75AD0
 	.incbin "data/graphics/pokemon/front_pics/hariyama_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Electrike: ; 8B763D0
+gMonFrontPic_Electrike: @ 8B763D0
 	.incbin "data/graphics/pokemon/front_pics/electrike_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Manectric: ; 8B768A0
+gMonFrontPic_Manectric: @ 8B768A0
 	.incbin "data/graphics/pokemon/front_pics/manectric_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Numel: ; 8B76E9C
+gMonFrontPic_Numel: @ 8B76E9C
 	.incbin "data/graphics/pokemon/front_pics/numel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Camerupt: ; 8B773B8
+gMonFrontPic_Camerupt: @ 8B773B8
 	.incbin "data/graphics/pokemon/front_pics/camerupt_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Spheal: ; 8B779DC
+gMonFrontPic_Spheal: @ 8B779DC
 	.incbin "data/graphics/pokemon/front_pics/spheal_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Sealeo: ; 8B77E0C
+gMonFrontPic_Sealeo: @ 8B77E0C
 	.incbin "data/graphics/pokemon/front_pics/sealeo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Walrein: ; 8B78484
+gMonFrontPic_Walrein: @ 8B78484
 	.incbin "data/graphics/pokemon/front_pics/walrein_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cacnea: ; 8B78C54
+gMonFrontPic_Cacnea: @ 8B78C54
 	.incbin "data/graphics/pokemon/front_pics/cacnea_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cacturne: ; 8B7916C
+gMonFrontPic_Cacturne: @ 8B7916C
 	.incbin "data/graphics/pokemon/front_pics/cacturne_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Snorunt: ; 8B79928
+gMonFrontPic_Snorunt: @ 8B79928
 	.incbin "data/graphics/pokemon/front_pics/snorunt_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Glalie: ; 8B79E44
+gMonFrontPic_Glalie: @ 8B79E44
 	.incbin "data/graphics/pokemon/front_pics/glalie_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lunatone: ; 8B7A568
+gMonFrontPic_Lunatone: @ 8B7A568
 	.incbin "data/graphics/pokemon/front_pics/lunatone_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Solrock: ; 8B7AA90
+gMonFrontPic_Solrock: @ 8B7AA90
 	.incbin "data/graphics/pokemon/front_pics/solrock_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Azurill: ; 8B7B264
+gMonFrontPic_Azurill: @ 8B7B264
 	.incbin "data/graphics/pokemon/front_pics/azurill_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Spoink: ; 8B7B7B4
+gMonFrontPic_Spoink: @ 8B7B7B4
 	.incbin "data/graphics/pokemon/front_pics/spoink_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Grumpig: ; 8B7BBA0
+gMonFrontPic_Grumpig: @ 8B7BBA0
 	.incbin "data/graphics/pokemon/front_pics/grumpig_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Plusle: ; 8B7C258
+gMonFrontPic_Plusle: @ 8B7C258
 	.incbin "data/graphics/pokemon/front_pics/plusle_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Minun: ; 8B7C6F4
+gMonFrontPic_Minun: @ 8B7C6F4
 	.incbin "data/graphics/pokemon/front_pics/minun_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Mawile: ; 8B7CB14
+gMonFrontPic_Mawile: @ 8B7CB14
 	.incbin "data/graphics/pokemon/front_pics/mawile_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Meditite: ; 8B7D2A4
+gMonFrontPic_Meditite: @ 8B7D2A4
 	.incbin "data/graphics/pokemon/front_pics/meditite_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Medicham: ; 8B7D6E4
+gMonFrontPic_Medicham: @ 8B7D6E4
 	.incbin "data/graphics/pokemon/front_pics/medicham_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Swablu: ; 8B7DC3C
+gMonFrontPic_Swablu: @ 8B7DC3C
 	.incbin "data/graphics/pokemon/front_pics/swablu_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Altaria: ; 8B7E128
+gMonFrontPic_Altaria: @ 8B7E128
 	.incbin "data/graphics/pokemon/front_pics/altaria_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Wynaut: ; 8B7E844
+gMonFrontPic_Wynaut: @ 8B7E844
 	.incbin "data/graphics/pokemon/front_pics/wynaut_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Duskull: ; 8B7ECB8
+gMonFrontPic_Duskull: @ 8B7ECB8
 	.incbin "data/graphics/pokemon/front_pics/duskull_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Dusclops: ; 8B7F228
+gMonFrontPic_Dusclops: @ 8B7F228
 	.incbin "data/graphics/pokemon/front_pics/dusclops_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Roselia: ; 8B7F8D8
+gMonFrontPic_Roselia: @ 8B7F8D8
 	.incbin "data/graphics/pokemon/front_pics/roselia_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slakoth: ; 8B7FEE8
+gMonFrontPic_Slakoth: @ 8B7FEE8
 	.incbin "data/graphics/pokemon/front_pics/slakoth_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Vigoroth: ; 8B802D8
+gMonFrontPic_Vigoroth: @ 8B802D8
 	.incbin "data/graphics/pokemon/front_pics/vigoroth_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Slaking: ; 8B80A88
+gMonFrontPic_Slaking: @ 8B80A88
 	.incbin "data/graphics/pokemon/front_pics/slaking_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gulpin: ; 8B81134
+gMonFrontPic_Gulpin: @ 8B81134
 	.incbin "data/graphics/pokemon/front_pics/gulpin_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Swalot: ; 8B814E4
+gMonFrontPic_Swalot: @ 8B814E4
 	.incbin "data/graphics/pokemon/front_pics/swalot_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Tropius: ; 8B81A78
+gMonFrontPic_Tropius: @ 8B81A78
 	.incbin "data/graphics/pokemon/front_pics/tropius_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Whismur: ; 8B8239C
+gMonFrontPic_Whismur: @ 8B8239C
 	.incbin "data/graphics/pokemon/front_pics/whismur_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Loudred: ; 8B82808
+gMonFrontPic_Loudred: @ 8B82808
 	.incbin "data/graphics/pokemon/front_pics/loudred_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Exploud: ; 8B82F00
+gMonFrontPic_Exploud: @ 8B82F00
 	.incbin "data/graphics/pokemon/front_pics/exploud_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Clamperl: ; 8B83908
+gMonFrontPic_Clamperl: @ 8B83908
 	.incbin "data/graphics/pokemon/front_pics/clamperl_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Huntail: ; 8B83DB4
+gMonFrontPic_Huntail: @ 8B83DB4
 	.incbin "data/graphics/pokemon/front_pics/huntail_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gorebyss: ; 8B844A8
+gMonFrontPic_Gorebyss: @ 8B844A8
 	.incbin "data/graphics/pokemon/front_pics/gorebyss_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Absol: ; 8B84A50
+gMonFrontPic_Absol: @ 8B84A50
 	.incbin "data/graphics/pokemon/front_pics/absol_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shuppet: ; 8B851C0
+gMonFrontPic_Shuppet: @ 8B851C0
 	.incbin "data/graphics/pokemon/front_pics/shuppet_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Banette: ; 8B855C0
+gMonFrontPic_Banette: @ 8B855C0
 	.incbin "data/graphics/pokemon/front_pics/banette_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Seviper: ; 8B85ACC
+gMonFrontPic_Seviper: @ 8B85ACC
 	.incbin "data/graphics/pokemon/front_pics/seviper_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Zangoose: ; 8B8625C
+gMonFrontPic_Zangoose: @ 8B8625C
 	.incbin "data/graphics/pokemon/front_pics/zangoose_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Relicanth: ; 8B86978
+gMonFrontPic_Relicanth: @ 8B86978
 	.incbin "data/graphics/pokemon/front_pics/relicanth_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Aron: ; 8B86EBC
+gMonFrontPic_Aron: @ 8B86EBC
 	.incbin "data/graphics/pokemon/front_pics/aron_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lairon: ; 8B87260
+gMonFrontPic_Lairon: @ 8B87260
 	.incbin "data/graphics/pokemon/front_pics/lairon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Aggron: ; 8B87878
+gMonFrontPic_Aggron: @ 8B87878
 	.incbin "data/graphics/pokemon/front_pics/aggron_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Castform: ; 8B8824C
+gMonFrontPic_Castform: @ 8B8824C
 	.incbin "data/graphics/pokemon/front_pics/castform_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Volbeat: ; 8B88CD4
+gMonFrontPic_Volbeat: @ 8B88CD4
 	.incbin "data/graphics/pokemon/front_pics/volbeat_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Illumise: ; 8B892EC
+gMonFrontPic_Illumise: @ 8B892EC
 	.incbin "data/graphics/pokemon/front_pics/illumise_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Lileep: ; 8B8996C
+gMonFrontPic_Lileep: @ 8B8996C
 	.incbin "data/graphics/pokemon/front_pics/lileep_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Cradily: ; 8B89F64
+gMonFrontPic_Cradily: @ 8B89F64
 	.incbin "data/graphics/pokemon/front_pics/cradily_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Anorith: ; 8B8A6B4
+gMonFrontPic_Anorith: @ 8B8A6B4
 	.incbin "data/graphics/pokemon/front_pics/anorith_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Armaldo: ; 8B8ACA0
+gMonFrontPic_Armaldo: @ 8B8ACA0
 	.incbin "data/graphics/pokemon/front_pics/armaldo_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Ralts: ; 8B8B618
+gMonFrontPic_Ralts: @ 8B8B618
 	.incbin "data/graphics/pokemon/front_pics/ralts_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kirlia: ; 8B8BA24
+gMonFrontPic_Kirlia: @ 8B8BA24
 	.incbin "data/graphics/pokemon/front_pics/kirlia_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Gardevoir: ; 8B8BF74
+gMonFrontPic_Gardevoir: @ 8B8BF74
 	.incbin "data/graphics/pokemon/front_pics/gardevoir_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Bagon: ; 8B8C4A8
+gMonFrontPic_Bagon: @ 8B8C4A8
 	.incbin "data/graphics/pokemon/front_pics/bagon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Shelgon: ; 8B8C93C
+gMonFrontPic_Shelgon: @ 8B8C93C
 	.incbin "data/graphics/pokemon/front_pics/shelgon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Salamence: ; 8B8CEA8
+gMonFrontPic_Salamence: @ 8B8CEA8
 	.incbin "data/graphics/pokemon/front_pics/salamence_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Beldum: ; 8B8D608
+gMonFrontPic_Beldum: @ 8B8D608
 	.incbin "data/graphics/pokemon/front_pics/beldum_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Metang: ; 8B8DA6C
+gMonFrontPic_Metang: @ 8B8DA6C
 	.incbin "data/graphics/pokemon/front_pics/metang_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Metagross: ; 8B8E23C
+gMonFrontPic_Metagross: @ 8B8E23C
 	.incbin "data/graphics/pokemon/front_pics/metagross_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Regirock: ; 8B8E920
+gMonFrontPic_Regirock: @ 8B8E920
 	.incbin "data/graphics/pokemon/front_pics/regirock_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Regice: ; 8B8F1E8
+gMonFrontPic_Regice: @ 8B8F1E8
 	.incbin "data/graphics/pokemon/front_pics/regice_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Registeel: ; 8B8F994
+gMonFrontPic_Registeel: @ 8B8F994
 	.incbin "data/graphics/pokemon/front_pics/registeel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Kyogre: ; 8B90170
+gMonFrontPic_Kyogre: @ 8B90170
 	.incbin "data/graphics/pokemon/front_pics/kyogre_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Groudon: ; 8B90948
+gMonFrontPic_Groudon: @ 8B90948
 	.incbin "data/graphics/pokemon/front_pics/groudon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Rayquaza: ; 8B9135C
+gMonFrontPic_Rayquaza: @ 8B9135C
 	.incbin "data/graphics/pokemon/front_pics/rayquaza_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Latias: ; 8B91CF0
+gMonFrontPic_Latias: @ 8B91CF0
 	.incbin "data/graphics/pokemon/front_pics/latias_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Latios: ; 8B92378
+gMonFrontPic_Latios: @ 8B92378
 	.incbin "data/graphics/pokemon/front_pics/latios_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Jirachi: ; 8B92BA8
+gMonFrontPic_Jirachi: @ 8B92BA8
 	.incbin "data/graphics/pokemon/front_pics/jirachi_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Deoxys: ; 8B93154
+gMonFrontPic_Deoxys: @ 8B93154
 	.incbin "data/graphics/pokemon/front_pics/deoxys_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Chimecho: ; 8B938C0
+gMonFrontPic_Chimecho: @ 8B938C0
 	.incbin "data/graphics/pokemon/front_pics/chimecho_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_Egg: ; 8B93D08
+gMonFrontPic_Egg: @ 8B93D08
 	.incbin "data/graphics/pokemon/front_pics/egg_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownB: ; 8B93FC4
+gMonFrontPic_UnownB: @ 8B93FC4
 	.incbin "data/graphics/pokemon/front_pics/unown_b_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownC: ; 8B9428C
+gMonFrontPic_UnownC: @ 8B9428C
 	.incbin "data/graphics/pokemon/front_pics/unown_c_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownD: ; 8B94590
+gMonFrontPic_UnownD: @ 8B94590
 	.incbin "data/graphics/pokemon/front_pics/unown_d_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownE: ; 8B94878
+gMonFrontPic_UnownE: @ 8B94878
 	.incbin "data/graphics/pokemon/front_pics/unown_e_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownF: ; 8B94B20
+gMonFrontPic_UnownF: @ 8B94B20
 	.incbin "data/graphics/pokemon/front_pics/unown_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownG: ; 8B94E08
+gMonFrontPic_UnownG: @ 8B94E08
 	.incbin "data/graphics/pokemon/front_pics/unown_g_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownH: ; 8B950D4
+gMonFrontPic_UnownH: @ 8B950D4
 	.incbin "data/graphics/pokemon/front_pics/unown_h_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownI: ; 8B9540C
+gMonFrontPic_UnownI: @ 8B9540C
 	.incbin "data/graphics/pokemon/front_pics/unown_i_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownJ: ; 8B95698
+gMonFrontPic_UnownJ: @ 8B95698
 	.incbin "data/graphics/pokemon/front_pics/unown_j_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownK: ; 8B95950
+gMonFrontPic_UnownK: @ 8B95950
 	.incbin "data/graphics/pokemon/front_pics/unown_k_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownL: ; 8B95C10
+gMonFrontPic_UnownL: @ 8B95C10
 	.incbin "data/graphics/pokemon/front_pics/unown_l_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownM: ; 8B95EB4
+gMonFrontPic_UnownM: @ 8B95EB4
 	.incbin "data/graphics/pokemon/front_pics/unown_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownN: ; 8B961C8
+gMonFrontPic_UnownN: @ 8B961C8
 	.incbin "data/graphics/pokemon/front_pics/unown_n_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownO: ; 8B964B0
+gMonFrontPic_UnownO: @ 8B964B0
 	.incbin "data/graphics/pokemon/front_pics/unown_o_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownP: ; 8B967DC
+gMonFrontPic_UnownP: @ 8B967DC
 	.incbin "data/graphics/pokemon/front_pics/unown_p_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownQ: ; 8B96A6C
+gMonFrontPic_UnownQ: @ 8B96A6C
 	.incbin "data/graphics/pokemon/front_pics/unown_q_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownR: ; 8B96D14
+gMonFrontPic_UnownR: @ 8B96D14
 	.incbin "data/graphics/pokemon/front_pics/unown_r_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownS: ; 8B96FA8
+gMonFrontPic_UnownS: @ 8B96FA8
 	.incbin "data/graphics/pokemon/front_pics/unown_s_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownT: ; 8B97284
+gMonFrontPic_UnownT: @ 8B97284
 	.incbin "data/graphics/pokemon/front_pics/unown_t_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownU: ; 8B97528
+gMonFrontPic_UnownU: @ 8B97528
 	.incbin "data/graphics/pokemon/front_pics/unown_u_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownV: ; 8B97834
+gMonFrontPic_UnownV: @ 8B97834
 	.incbin "data/graphics/pokemon/front_pics/unown_v_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownW: ; 8B97B0C
+gMonFrontPic_UnownW: @ 8B97B0C
 	.incbin "data/graphics/pokemon/front_pics/unown_w_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownX: ; 8B97DD4
+gMonFrontPic_UnownX: @ 8B97DD4
 	.incbin "data/graphics/pokemon/front_pics/unown_x_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownY: ; 8B98088
+gMonFrontPic_UnownY: @ 8B98088
 	.incbin "data/graphics/pokemon/front_pics/unown_y_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownZ: ; 8B98350
+gMonFrontPic_UnownZ: @ 8B98350
 	.incbin "data/graphics/pokemon/front_pics/unown_z_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownExclamationMark: ; 8B985F4
+gMonFrontPic_UnownExclamationMark: @ 8B985F4
 	.incbin "data/graphics/pokemon/front_pics/unown_exclamation_mark_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonFrontPic_UnownQuestionMark: ; 8B98878
+gMonFrontPic_UnownQuestionMark: @ 8B98878
 	.incbin "data/graphics/pokemon/front_pics/unown_question_mark_front_pic.4bpp.lz"
diff --git a/data/graphics/pokemon/mon_graphics.s b/data/graphics/pokemon/mon_graphics.s
index 2475b6274..7570d5bb6 100644
--- a/data/graphics/pokemon/mon_graphics.s
+++ b/data/graphics/pokemon/mon_graphics.s
@@ -1,12016 +1,12016 @@
 	.align 2, 0
 
-gMonStillFrontPic_Bulbasaur: ; 8C2FA08
+gMonStillFrontPic_Bulbasaur: @ 8C2FA08
 	.incbin "data/graphics/pokemon/still_front_pics/bulbasaur_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Bulbasaur: ; 8C2FCA0
+gMonPalette_Bulbasaur: @ 8C2FCA0
 	.incbin "data/graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Bulbasaur: ; 8C2FCC8
+gMonBackPic_Bulbasaur: @ 8C2FCC8
 	.incbin "data/graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Bulbasaur: ; 8C2FF78
+gMonShinyPalette_Bulbasaur: @ 8C2FF78
 	.incbin "data/graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Bulbasaur: ; 8C2FFA0
+gMonIcon_Bulbasaur: @ 8C2FFA0
 	.incbin "data/graphics/pokemon/icons/bulbasaur_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Bulbasaur: ; 8C303A0
+gMonFootprint_Bulbasaur: @ 8C303A0
 	.incbin "data/graphics/pokemon/footprints/bulbasaur_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ivysaur: ; 8C303C0
+gMonStillFrontPic_Ivysaur: @ 8C303C0
 	.incbin "data/graphics/pokemon/still_front_pics/ivysaur_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ivysaur: ; 8C30734
+gMonPalette_Ivysaur: @ 8C30734
 	.incbin "data/graphics/pokemon/palettes/ivysaur_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ivysaur: ; 8C3075C
+gMonBackPic_Ivysaur: @ 8C3075C
 	.incbin "data/graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ivysaur: ; 8C30AE8
+gMonShinyPalette_Ivysaur: @ 8C30AE8
 	.incbin "data/graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ivysaur: ; 8C30B10
+gMonIcon_Ivysaur: @ 8C30B10
 	.incbin "data/graphics/pokemon/icons/ivysaur_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ivysaur: ; 8C30F10
+gMonFootprint_Ivysaur: @ 8C30F10
 	.incbin "data/graphics/pokemon/footprints/ivysaur_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Venusaur: ; 8C30F30
+gMonStillFrontPic_Venusaur: @ 8C30F30
 	.incbin "data/graphics/pokemon/still_front_pics/venusaur_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Venusaur: ; 8C314BC
+gMonPalette_Venusaur: @ 8C314BC
 	.incbin "data/graphics/pokemon/palettes/venusaur_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Venusaur: ; 8C314E4
+gMonBackPic_Venusaur: @ 8C314E4
 	.incbin "data/graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Venusaur: ; 8C319B4
+gMonShinyPalette_Venusaur: @ 8C319B4
 	.incbin "data/graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Venusaur: ; 8C319DC
+gMonIcon_Venusaur: @ 8C319DC
 	.incbin "data/graphics/pokemon/icons/venusaur_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Venusaur: ; 8C31DDC
+gMonFootprint_Venusaur: @ 8C31DDC
 	.incbin "data/graphics/pokemon/footprints/venusaur_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Charmander: ; 8C31DFC
+gMonStillFrontPic_Charmander: @ 8C31DFC
 	.incbin "data/graphics/pokemon/still_front_pics/charmander_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Charmander: ; 8C320AC
+gMonPalette_Charmander: @ 8C320AC
 	.incbin "data/graphics/pokemon/palettes/charmander_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Charmander: ; 8C320D4
+gMonBackPic_Charmander: @ 8C320D4
 	.incbin "data/graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Charmander: ; 8C32368
+gMonShinyPalette_Charmander: @ 8C32368
 	.incbin "data/graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Charmander: ; 8C32390
+gMonIcon_Charmander: @ 8C32390
 	.incbin "data/graphics/pokemon/icons/charmander_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Charmander: ; 8C32790
+gMonFootprint_Charmander: @ 8C32790
 	.incbin "data/graphics/pokemon/footprints/charmander_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Charmeleon: ; 8C327B0
+gMonStillFrontPic_Charmeleon: @ 8C327B0
 	.incbin "data/graphics/pokemon/still_front_pics/charmeleon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Charmeleon: ; 8C32B58
+gMonPalette_Charmeleon: @ 8C32B58
 	.incbin "data/graphics/pokemon/palettes/charmeleon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Charmeleon: ; 8C32B80
+gMonBackPic_Charmeleon: @ 8C32B80
 	.incbin "data/graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Charmeleon: ; 8C32E60
+gMonShinyPalette_Charmeleon: @ 8C32E60
 	.incbin "data/graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Charmeleon: ; 8C32E88
+gMonIcon_Charmeleon: @ 8C32E88
 	.incbin "data/graphics/pokemon/icons/charmeleon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Charmeleon: ; 8C33288
+gMonFootprint_Charmeleon: @ 8C33288
 	.incbin "data/graphics/pokemon/footprints/charmeleon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Charizard: ; 8C332A8
+gMonStillFrontPic_Charizard: @ 8C332A8
 	.incbin "data/graphics/pokemon/still_front_pics/charizard_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Charizard: ; 8C337F8
+gMonPalette_Charizard: @ 8C337F8
 	.incbin "data/graphics/pokemon/palettes/charizard_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Charizard: ; 8C33820
+gMonBackPic_Charizard: @ 8C33820
 	.incbin "data/graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Charizard: ; 8C33C3C
+gMonShinyPalette_Charizard: @ 8C33C3C
 	.incbin "data/graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Charizard: ; 8C33C64
+gMonIcon_Charizard: @ 8C33C64
 	.incbin "data/graphics/pokemon/icons/charizard_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Charizard: ; 8C34064
+gMonFootprint_Charizard: @ 8C34064
 	.incbin "data/graphics/pokemon/footprints/charizard_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Squirtle: ; 8C34084
+gMonStillFrontPic_Squirtle: @ 8C34084
 	.incbin "data/graphics/pokemon/still_front_pics/squirtle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Squirtle: ; 8C34360
+gMonPalette_Squirtle: @ 8C34360
 	.incbin "data/graphics/pokemon/palettes/squirtle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Squirtle: ; 8C34388
+gMonBackPic_Squirtle: @ 8C34388
 	.incbin "data/graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Squirtle: ; 8C34608
+gMonShinyPalette_Squirtle: @ 8C34608
 	.incbin "data/graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Squirtle: ; 8C34630
+gMonIcon_Squirtle: @ 8C34630
 	.incbin "data/graphics/pokemon/icons/squirtle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Squirtle: ; 8C34A30
+gMonFootprint_Squirtle: @ 8C34A30
 	.incbin "data/graphics/pokemon/footprints/squirtle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wartortle: ; 8C34A50
+gMonStillFrontPic_Wartortle: @ 8C34A50
 	.incbin "data/graphics/pokemon/still_front_pics/wartortle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wartortle: ; 8C34DCC
+gMonPalette_Wartortle: @ 8C34DCC
 	.incbin "data/graphics/pokemon/palettes/wartortle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wartortle: ; 8C34DF4
+gMonBackPic_Wartortle: @ 8C34DF4
 	.incbin "data/graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wartortle: ; 8C35128
+gMonShinyPalette_Wartortle: @ 8C35128
 	.incbin "data/graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wartortle: ; 8C35150
+gMonIcon_Wartortle: @ 8C35150
 	.incbin "data/graphics/pokemon/icons/wartortle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wartortle: ; 8C35550
+gMonFootprint_Wartortle: @ 8C35550
 	.incbin "data/graphics/pokemon/footprints/wartortle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Blastoise: ; 8C35570
+gMonStillFrontPic_Blastoise: @ 8C35570
 	.incbin "data/graphics/pokemon/still_front_pics/blastoise_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Blastoise: ; 8C35A74
+gMonPalette_Blastoise: @ 8C35A74
 	.incbin "data/graphics/pokemon/palettes/blastoise_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Blastoise: ; 8C35A9C
+gMonBackPic_Blastoise: @ 8C35A9C
 	.incbin "data/graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Blastoise: ; 8C35EB8
+gMonShinyPalette_Blastoise: @ 8C35EB8
 	.incbin "data/graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Blastoise: ; 8C35EE0
+gMonIcon_Blastoise: @ 8C35EE0
 	.incbin "data/graphics/pokemon/icons/blastoise_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Blastoise: ; 8C362E0
+gMonFootprint_Blastoise: @ 8C362E0
 	.incbin "data/graphics/pokemon/footprints/blastoise_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Caterpie: ; 8C36300
+gMonStillFrontPic_Caterpie: @ 8C36300
 	.incbin "data/graphics/pokemon/still_front_pics/caterpie_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Caterpie: ; 8C36560
+gMonPalette_Caterpie: @ 8C36560
 	.incbin "data/graphics/pokemon/palettes/caterpie_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Caterpie: ; 8C36588
+gMonBackPic_Caterpie: @ 8C36588
 	.incbin "data/graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Caterpie: ; 8C36810
+gMonShinyPalette_Caterpie: @ 8C36810
 	.incbin "data/graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Caterpie: ; 8C36838
+gMonIcon_Caterpie: @ 8C36838
 	.incbin "data/graphics/pokemon/icons/caterpie_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Caterpie: ; 8C36C38
+gMonFootprint_Caterpie: @ 8C36C38
 	.incbin "data/graphics/pokemon/footprints/caterpie_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Metapod: ; 8C36C58
+gMonStillFrontPic_Metapod: @ 8C36C58
 	.incbin "data/graphics/pokemon/still_front_pics/metapod_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Metapod: ; 8C36E70
+gMonPalette_Metapod: @ 8C36E70
 	.incbin "data/graphics/pokemon/palettes/metapod_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Metapod: ; 8C36E90
+gMonBackPic_Metapod: @ 8C36E90
 	.incbin "data/graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Metapod: ; 8C370D0
+gMonShinyPalette_Metapod: @ 8C370D0
 	.incbin "data/graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Metapod: ; 8C370F0
+gMonIcon_Metapod: @ 8C370F0
 	.incbin "data/graphics/pokemon/icons/metapod_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Metapod: ; 8C374F0
+gMonFootprint_Metapod: @ 8C374F0
 	.incbin "data/graphics/pokemon/footprints/metapod_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Butterfree: ; 8C37510
+gMonStillFrontPic_Butterfree: @ 8C37510
 	.incbin "data/graphics/pokemon/still_front_pics/butterfree_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Butterfree: ; 8C37870
+gMonPalette_Butterfree: @ 8C37870
 	.incbin "data/graphics/pokemon/palettes/butterfree_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Butterfree: ; 8C37898
+gMonBackPic_Butterfree: @ 8C37898
 	.incbin "data/graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Butterfree: ; 8C37CA8
+gMonShinyPalette_Butterfree: @ 8C37CA8
 	.incbin "data/graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Butterfree: ; 8C37CD0
+gMonIcon_Butterfree: @ 8C37CD0
 	.incbin "data/graphics/pokemon/icons/butterfree_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Butterfree: ; 8C380D0
+gMonFootprint_Butterfree: @ 8C380D0
 	.incbin "data/graphics/pokemon/footprints/butterfree_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Weedle: ; 8C380F0
+gMonStillFrontPic_Weedle: @ 8C380F0
 	.incbin "data/graphics/pokemon/still_front_pics/weedle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Weedle: ; 8C38330
+gMonPalette_Weedle: @ 8C38330
 	.incbin "data/graphics/pokemon/palettes/weedle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Weedle: ; 8C38358
+gMonBackPic_Weedle: @ 8C38358
 	.incbin "data/graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Weedle: ; 8C385C0
+gMonShinyPalette_Weedle: @ 8C385C0
 	.incbin "data/graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Weedle: ; 8C385E8
+gMonIcon_Weedle: @ 8C385E8
 	.incbin "data/graphics/pokemon/icons/weedle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Weedle: ; 8C389E8
+gMonFootprint_Weedle: @ 8C389E8
 	.incbin "data/graphics/pokemon/footprints/weedle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kakuna: ; 8C38A08
+gMonStillFrontPic_Kakuna: @ 8C38A08
 	.incbin "data/graphics/pokemon/still_front_pics/kakuna_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kakuna: ; 8C38C54
+gMonPalette_Kakuna: @ 8C38C54
 	.incbin "data/graphics/pokemon/palettes/kakuna_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kakuna: ; 8C38C78
+gMonBackPic_Kakuna: @ 8C38C78
 	.incbin "data/graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kakuna: ; 8C38EFC
+gMonShinyPalette_Kakuna: @ 8C38EFC
 	.incbin "data/graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kakuna: ; 8C38F20
+gMonIcon_Kakuna: @ 8C38F20
 	.incbin "data/graphics/pokemon/icons/kakuna_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kakuna: ; 8C39320
+gMonFootprint_Kakuna: @ 8C39320
 	.incbin "data/graphics/pokemon/footprints/kakuna_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Beedrill: ; 8C39340
+gMonStillFrontPic_Beedrill: @ 8C39340
 	.incbin "data/graphics/pokemon/still_front_pics/beedrill_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Beedrill: ; 8C39750
+gMonPalette_Beedrill: @ 8C39750
 	.incbin "data/graphics/pokemon/palettes/beedrill_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Beedrill: ; 8C39778
+gMonBackPic_Beedrill: @ 8C39778
 	.incbin "data/graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Beedrill: ; 8C39AEC
+gMonShinyPalette_Beedrill: @ 8C39AEC
 	.incbin "data/graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Beedrill: ; 8C39B14
+gMonIcon_Beedrill: @ 8C39B14
 	.incbin "data/graphics/pokemon/icons/beedrill_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Beedrill: ; 8C39F14
+gMonFootprint_Beedrill: @ 8C39F14
 	.incbin "data/graphics/pokemon/footprints/beedrill_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pidgey: ; 8C39F34
+gMonStillFrontPic_Pidgey: @ 8C39F34
 	.incbin "data/graphics/pokemon/still_front_pics/pidgey_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pidgey: ; 8C3A220
+gMonPalette_Pidgey: @ 8C3A220
 	.incbin "data/graphics/pokemon/palettes/pidgey_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pidgey: ; 8C3A248
+gMonBackPic_Pidgey: @ 8C3A248
 	.incbin "data/graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pidgey: ; 8C3A59C
+gMonShinyPalette_Pidgey: @ 8C3A59C
 	.incbin "data/graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pidgey: ; 8C3A5C4
+gMonIcon_Pidgey: @ 8C3A5C4
 	.incbin "data/graphics/pokemon/icons/pidgey_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pidgey: ; 8C3A9C4
+gMonFootprint_Pidgey: @ 8C3A9C4
 	.incbin "data/graphics/pokemon/footprints/pidgey_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pidgeotto: ; 8C3A9E4
+gMonStillFrontPic_Pidgeotto: @ 8C3A9E4
 	.incbin "data/graphics/pokemon/still_front_pics/pidgeotto_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pidgeotto: ; 8C3AD58
+gMonPalette_Pidgeotto: @ 8C3AD58
 	.incbin "data/graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pidgeotto: ; 8C3AD80
+gMonBackPic_Pidgeotto: @ 8C3AD80
 	.incbin "data/graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pidgeotto: ; 8C3B0CC
+gMonShinyPalette_Pidgeotto: @ 8C3B0CC
 	.incbin "data/graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pidgeotto: ; 8C3B0F4
+gMonIcon_Pidgeotto: @ 8C3B0F4
 	.incbin "data/graphics/pokemon/icons/pidgeotto_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pidgeotto: ; 8C3B4F4
+gMonFootprint_Pidgeotto: @ 8C3B4F4
 	.incbin "data/graphics/pokemon/footprints/pidgeotto_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pidgeot: ; 8C3B514
+gMonStillFrontPic_Pidgeot: @ 8C3B514
 	.incbin "data/graphics/pokemon/still_front_pics/pidgeot_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pidgeot: ; 8C3BA10
+gMonPalette_Pidgeot: @ 8C3BA10
 	.incbin "data/graphics/pokemon/palettes/pidgeot_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pidgeot: ; 8C3BA38
+gMonBackPic_Pidgeot: @ 8C3BA38
 	.incbin "data/graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pidgeot: ; 8C3BDC0
+gMonShinyPalette_Pidgeot: @ 8C3BDC0
 	.incbin "data/graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pidgeot: ; 8C3BDE8
+gMonIcon_Pidgeot: @ 8C3BDE8
 	.incbin "data/graphics/pokemon/icons/pidgeot_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pidgeot: ; 8C3C1E8
+gMonFootprint_Pidgeot: @ 8C3C1E8
 	.incbin "data/graphics/pokemon/footprints/pidgeot_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Rattata: ; 8C3C208
+gMonStillFrontPic_Rattata: @ 8C3C208
 	.incbin "data/graphics/pokemon/still_front_pics/rattata_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Rattata: ; 8C3C454
+gMonPalette_Rattata: @ 8C3C454
 	.incbin "data/graphics/pokemon/palettes/rattata_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Rattata: ; 8C3C47C
+gMonBackPic_Rattata: @ 8C3C47C
 	.incbin "data/graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Rattata: ; 8C3C758
+gMonShinyPalette_Rattata: @ 8C3C758
 	.incbin "data/graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Rattata: ; 8C3C780
+gMonIcon_Rattata: @ 8C3C780
 	.incbin "data/graphics/pokemon/icons/rattata_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Rattata: ; 8C3CB80
+gMonFootprint_Rattata: @ 8C3CB80
 	.incbin "data/graphics/pokemon/footprints/rattata_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Raticate: ; 8C3CBA0
+gMonStillFrontPic_Raticate: @ 8C3CBA0
 	.incbin "data/graphics/pokemon/still_front_pics/raticate_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Raticate: ; 8C3CF28
+gMonPalette_Raticate: @ 8C3CF28
 	.incbin "data/graphics/pokemon/palettes/raticate_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Raticate: ; 8C3CF50
+gMonBackPic_Raticate: @ 8C3CF50
 	.incbin "data/graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Raticate: ; 8C3D280
+gMonShinyPalette_Raticate: @ 8C3D280
 	.incbin "data/graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Raticate: ; 8C3D2A8
+gMonIcon_Raticate: @ 8C3D2A8
 	.incbin "data/graphics/pokemon/icons/raticate_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Raticate: ; 8C3D6A8
+gMonFootprint_Raticate: @ 8C3D6A8
 	.incbin "data/graphics/pokemon/footprints/raticate_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Spearow: ; 8C3D6C8
+gMonStillFrontPic_Spearow: @ 8C3D6C8
 	.incbin "data/graphics/pokemon/still_front_pics/spearow_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Spearow: ; 8C3D950
+gMonPalette_Spearow: @ 8C3D950
 	.incbin "data/graphics/pokemon/palettes/spearow_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Spearow: ; 8C3D978
+gMonBackPic_Spearow: @ 8C3D978
 	.incbin "data/graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Spearow: ; 8C3DC54
+gMonShinyPalette_Spearow: @ 8C3DC54
 	.incbin "data/graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Spearow: ; 8C3DC7C
+gMonIcon_Spearow: @ 8C3DC7C
 	.incbin "data/graphics/pokemon/icons/spearow_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Spearow: ; 8C3E07C
+gMonFootprint_Spearow: @ 8C3E07C
 	.incbin "data/graphics/pokemon/footprints/spearow_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Fearow: ; 8C3E09C
+gMonStillFrontPic_Fearow: @ 8C3E09C
 	.incbin "data/graphics/pokemon/still_front_pics/fearow_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Fearow: ; 8C3E530
+gMonPalette_Fearow: @ 8C3E530
 	.incbin "data/graphics/pokemon/palettes/fearow_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Fearow: ; 8C3E558
+gMonBackPic_Fearow: @ 8C3E558
 	.incbin "data/graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Fearow: ; 8C3E850
+gMonShinyPalette_Fearow: @ 8C3E850
 	.incbin "data/graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Fearow: ; 8C3E878
+gMonIcon_Fearow: @ 8C3E878
 	.incbin "data/graphics/pokemon/icons/fearow_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Fearow: ; 8C3EC78
+gMonFootprint_Fearow: @ 8C3EC78
 	.incbin "data/graphics/pokemon/footprints/fearow_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ekans: ; 8C3EC98
+gMonStillFrontPic_Ekans: @ 8C3EC98
 	.incbin "data/graphics/pokemon/still_front_pics/ekans_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ekans: ; 8C3EF98
+gMonPalette_Ekans: @ 8C3EF98
 	.incbin "data/graphics/pokemon/palettes/ekans_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ekans: ; 8C3EFC0
+gMonBackPic_Ekans: @ 8C3EFC0
 	.incbin "data/graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ekans: ; 8C3F2B0
+gMonShinyPalette_Ekans: @ 8C3F2B0
 	.incbin "data/graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ekans: ; 8C3F2D8
+gMonIcon_Ekans: @ 8C3F2D8
 	.incbin "data/graphics/pokemon/icons/ekans_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ekans: ; 8C3F6D8
+gMonFootprint_Ekans: @ 8C3F6D8
 	.incbin "data/graphics/pokemon/footprints/ekans_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Arbok: ; 8C3F6F8
+gMonStillFrontPic_Arbok: @ 8C3F6F8
 	.incbin "data/graphics/pokemon/still_front_pics/arbok_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Arbok: ; 8C3FB44
+gMonPalette_Arbok: @ 8C3FB44
 	.incbin "data/graphics/pokemon/palettes/arbok_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Arbok: ; 8C3FB6C
+gMonBackPic_Arbok: @ 8C3FB6C
 	.incbin "data/graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Arbok: ; 8C3FE0C
+gMonShinyPalette_Arbok: @ 8C3FE0C
 	.incbin "data/graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Arbok: ; 8C3FE34
+gMonIcon_Arbok: @ 8C3FE34
 	.incbin "data/graphics/pokemon/icons/arbok_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Arbok: ; 8C40234
+gMonFootprint_Arbok: @ 8C40234
 	.incbin "data/graphics/pokemon/footprints/arbok_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pikachu: ; 8C40254
+gMonStillFrontPic_Pikachu: @ 8C40254
 	.incbin "data/graphics/pokemon/still_front_pics/pikachu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pikachu: ; 8C40524
+gMonPalette_Pikachu: @ 8C40524
 	.incbin "data/graphics/pokemon/palettes/pikachu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pikachu: ; 8C4054C
+gMonBackPic_Pikachu: @ 8C4054C
 	.incbin "data/graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pikachu: ; 8C40824
+gMonShinyPalette_Pikachu: @ 8C40824
 	.incbin "data/graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pikachu: ; 8C4084C
+gMonIcon_Pikachu: @ 8C4084C
 	.incbin "data/graphics/pokemon/icons/pikachu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pikachu: ; 8C40C4C
+gMonFootprint_Pikachu: @ 8C40C4C
 	.incbin "data/graphics/pokemon/footprints/pikachu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Raichu: ; 8C40C6C
+gMonStillFrontPic_Raichu: @ 8C40C6C
 	.incbin "data/graphics/pokemon/still_front_pics/raichu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Raichu: ; 8C41018
+gMonPalette_Raichu: @ 8C41018
 	.incbin "data/graphics/pokemon/palettes/raichu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Raichu: ; 8C41040
+gMonBackPic_Raichu: @ 8C41040
 	.incbin "data/graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Raichu: ; 8C41360
+gMonShinyPalette_Raichu: @ 8C41360
 	.incbin "data/graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Raichu: ; 8C41388
+gMonIcon_Raichu: @ 8C41388
 	.incbin "data/graphics/pokemon/icons/raichu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Raichu: ; 8C41788
+gMonFootprint_Raichu: @ 8C41788
 	.incbin "data/graphics/pokemon/footprints/raichu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sandshrew: ; 8C417A8
+gMonStillFrontPic_Sandshrew: @ 8C417A8
 	.incbin "data/graphics/pokemon/still_front_pics/sandshrew_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sandshrew: ; 8C41A68
+gMonPalette_Sandshrew: @ 8C41A68
 	.incbin "data/graphics/pokemon/palettes/sandshrew_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sandshrew: ; 8C41A90
+gMonBackPic_Sandshrew: @ 8C41A90
 	.incbin "data/graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sandshrew: ; 8C41DB8
+gMonShinyPalette_Sandshrew: @ 8C41DB8
 	.incbin "data/graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sandshrew: ; 8C41DE0
+gMonIcon_Sandshrew: @ 8C41DE0
 	.incbin "data/graphics/pokemon/icons/sandshrew_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sandshrew: ; 8C421E0
+gMonFootprint_Sandshrew: @ 8C421E0
 	.incbin "data/graphics/pokemon/footprints/sandshrew_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sandslash: ; 8C42200
+gMonStillFrontPic_Sandslash: @ 8C42200
 	.incbin "data/graphics/pokemon/still_front_pics/sandslash_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sandslash: ; 8C425EC
+gMonPalette_Sandslash: @ 8C425EC
 	.incbin "data/graphics/pokemon/palettes/sandslash_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sandslash: ; 8C42614
+gMonBackPic_Sandslash: @ 8C42614
 	.incbin "data/graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sandslash: ; 8C42A30
+gMonShinyPalette_Sandslash: @ 8C42A30
 	.incbin "data/graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sandslash: ; 8C42A58
+gMonIcon_Sandslash: @ 8C42A58
 	.incbin "data/graphics/pokemon/icons/sandslash_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sandslash: ; 8C42E58
+gMonFootprint_Sandslash: @ 8C42E58
 	.incbin "data/graphics/pokemon/footprints/sandslash_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_NidoranF: ; 8C42E78
+gMonStillFrontPic_NidoranF: @ 8C42E78
 	.incbin "data/graphics/pokemon/still_front_pics/nidoran_f_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_NidoranF: ; 8C430F0
+gMonPalette_NidoranF: @ 8C430F0
 	.incbin "data/graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_NidoranF: ; 8C43118
+gMonBackPic_NidoranF: @ 8C43118
 	.incbin "data/graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_NidoranF: ; 8C433F0
+gMonShinyPalette_NidoranF: @ 8C433F0
 	.incbin "data/graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_NidoranF: ; 8C43418
+gMonIcon_NidoranF: @ 8C43418
 	.incbin "data/graphics/pokemon/icons/nidoran_f_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_NidoranF: ; 8C43818
+gMonFootprint_NidoranF: @ 8C43818
 	.incbin "data/graphics/pokemon/footprints/nidoran_f_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nidorina: ; 8C43838
+gMonStillFrontPic_Nidorina: @ 8C43838
 	.incbin "data/graphics/pokemon/still_front_pics/nidorina_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nidorina: ; 8C43B64
+gMonPalette_Nidorina: @ 8C43B64
 	.incbin "data/graphics/pokemon/palettes/nidorina_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nidorina: ; 8C43B8C
+gMonBackPic_Nidorina: @ 8C43B8C
 	.incbin "data/graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nidorina: ; 8C43F20
+gMonShinyPalette_Nidorina: @ 8C43F20
 	.incbin "data/graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nidorina: ; 8C43F48
+gMonIcon_Nidorina: @ 8C43F48
 	.incbin "data/graphics/pokemon/icons/nidorina_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nidorina: ; 8C44348
+gMonFootprint_Nidorina: @ 8C44348
 	.incbin "data/graphics/pokemon/footprints/nidorina_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nidoqueen: ; 8C44368
+gMonStillFrontPic_Nidoqueen: @ 8C44368
 	.incbin "data/graphics/pokemon/still_front_pics/nidoqueen_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nidoqueen: ; 8C447F4
+gMonPalette_Nidoqueen: @ 8C447F4
 	.incbin "data/graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nidoqueen: ; 8C4481C
+gMonBackPic_Nidoqueen: @ 8C4481C
 	.incbin "data/graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nidoqueen: ; 8C44BE0
+gMonShinyPalette_Nidoqueen: @ 8C44BE0
 	.incbin "data/graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nidoqueen: ; 8C44C08
+gMonIcon_Nidoqueen: @ 8C44C08
 	.incbin "data/graphics/pokemon/icons/nidoqueen_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nidoqueen: ; 8C45008
+gMonFootprint_Nidoqueen: @ 8C45008
 	.incbin "data/graphics/pokemon/footprints/nidoqueen_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_NidoranM: ; 8C45028
+gMonStillFrontPic_NidoranM: @ 8C45028
 	.incbin "data/graphics/pokemon/still_front_pics/nidoran_m_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_NidoranM: ; 8C452F8
+gMonPalette_NidoranM: @ 8C452F8
 	.incbin "data/graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_NidoranM: ; 8C45320
+gMonBackPic_NidoranM: @ 8C45320
 	.incbin "data/graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_NidoranM: ; 8C45654
+gMonShinyPalette_NidoranM: @ 8C45654
 	.incbin "data/graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_NidoranM: ; 8C4567C
+gMonIcon_NidoranM: @ 8C4567C
 	.incbin "data/graphics/pokemon/icons/nidoran_m_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_NidoranM: ; 8C45A7C
+gMonFootprint_NidoranM: @ 8C45A7C
 	.incbin "data/graphics/pokemon/footprints/nidoran_m_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nidorino: ; 8C45A9C
+gMonStillFrontPic_Nidorino: @ 8C45A9C
 	.incbin "data/graphics/pokemon/still_front_pics/nidorino_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nidorino: ; 8C45E30
+gMonPalette_Nidorino: @ 8C45E30
 	.incbin "data/graphics/pokemon/palettes/nidorino_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nidorino: ; 8C45E58
+gMonBackPic_Nidorino: @ 8C45E58
 	.incbin "data/graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nidorino: ; 8C46214
+gMonShinyPalette_Nidorino: @ 8C46214
 	.incbin "data/graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nidorino: ; 8C4623C
+gMonIcon_Nidorino: @ 8C4623C
 	.incbin "data/graphics/pokemon/icons/nidorino_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nidorino: ; 8C4663C
+gMonFootprint_Nidorino: @ 8C4663C
 	.incbin "data/graphics/pokemon/footprints/nidorino_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nidoking: ; 8C4665C
+gMonStillFrontPic_Nidoking: @ 8C4665C
 	.incbin "data/graphics/pokemon/still_front_pics/nidoking_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nidoking: ; 8C46B54
+gMonPalette_Nidoking: @ 8C46B54
 	.incbin "data/graphics/pokemon/palettes/nidoking_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nidoking: ; 8C46B7C
+gMonBackPic_Nidoking: @ 8C46B7C
 	.incbin "data/graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nidoking: ; 8C46FB8
+gMonShinyPalette_Nidoking: @ 8C46FB8
 	.incbin "data/graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nidoking: ; 8C46FE0
+gMonIcon_Nidoking: @ 8C46FE0
 	.incbin "data/graphics/pokemon/icons/nidoking_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nidoking: ; 8C473E0
+gMonFootprint_Nidoking: @ 8C473E0
 	.incbin "data/graphics/pokemon/footprints/nidoking_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Clefairy: ; 8C47400
+gMonStillFrontPic_Clefairy: @ 8C47400
 	.incbin "data/graphics/pokemon/still_front_pics/clefairy_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Clefairy: ; 8C47688
+gMonPalette_Clefairy: @ 8C47688
 	.incbin "data/graphics/pokemon/palettes/clefairy_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Clefairy: ; 8C476B0
+gMonBackPic_Clefairy: @ 8C476B0
 	.incbin "data/graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Clefairy: ; 8C47980
+gMonShinyPalette_Clefairy: @ 8C47980
 	.incbin "data/graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Clefairy: ; 8C479A8
+gMonIcon_Clefairy: @ 8C479A8
 	.incbin "data/graphics/pokemon/icons/clefairy_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Clefairy: ; 8C47DA8
+gMonFootprint_Clefairy: @ 8C47DA8
 	.incbin "data/graphics/pokemon/footprints/clefairy_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Clefable: ; 8C47DC8
+gMonStillFrontPic_Clefable: @ 8C47DC8
 	.incbin "data/graphics/pokemon/still_front_pics/clefable_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Clefable: ; 8C48104
+gMonPalette_Clefable: @ 8C48104
 	.incbin "data/graphics/pokemon/palettes/clefable_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Clefable: ; 8C4812C
+gMonBackPic_Clefable: @ 8C4812C
 	.incbin "data/graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Clefable: ; 8C48464
+gMonShinyPalette_Clefable: @ 8C48464
 	.incbin "data/graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Clefable: ; 8C4848C
+gMonIcon_Clefable: @ 8C4848C
 	.incbin "data/graphics/pokemon/icons/clefable_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Clefable: ; 8C4888C
+gMonFootprint_Clefable: @ 8C4888C
 	.incbin "data/graphics/pokemon/footprints/clefable_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Vulpix: ; 8C488AC
+gMonStillFrontPic_Vulpix: @ 8C488AC
 	.incbin "data/graphics/pokemon/still_front_pics/vulpix_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Vulpix: ; 8C48BE8
+gMonPalette_Vulpix: @ 8C48BE8
 	.incbin "data/graphics/pokemon/palettes/vulpix_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Vulpix: ; 8C48C10
+gMonBackPic_Vulpix: @ 8C48C10
 	.incbin "data/graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Vulpix: ; 8C48F0C
+gMonShinyPalette_Vulpix: @ 8C48F0C
 	.incbin "data/graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Vulpix: ; 8C48F34
+gMonIcon_Vulpix: @ 8C48F34
 	.incbin "data/graphics/pokemon/icons/vulpix_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Vulpix: ; 8C49334
+gMonFootprint_Vulpix: @ 8C49334
 	.incbin "data/graphics/pokemon/footprints/vulpix_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ninetales: ; 8C49354
+gMonStillFrontPic_Ninetales: @ 8C49354
 	.incbin "data/graphics/pokemon/still_front_pics/ninetales_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ninetales: ; 8C49790
+gMonPalette_Ninetales: @ 8C49790
 	.incbin "data/graphics/pokemon/palettes/ninetales_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ninetales: ; 8C497B0
+gMonBackPic_Ninetales: @ 8C497B0
 	.incbin "data/graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ninetales: ; 8C49B30
+gMonShinyPalette_Ninetales: @ 8C49B30
 	.incbin "data/graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ninetales: ; 8C49B50
+gMonIcon_Ninetales: @ 8C49B50
 	.incbin "data/graphics/pokemon/icons/ninetales_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ninetales: ; 8C49F50
+gMonFootprint_Ninetales: @ 8C49F50
 	.incbin "data/graphics/pokemon/footprints/ninetales_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Jigglypuff: ; 8C49F70
+gMonStillFrontPic_Jigglypuff: @ 8C49F70
 	.incbin "data/graphics/pokemon/still_front_pics/jigglypuff_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Jigglypuff: ; 8C4A1E8
+gMonPalette_Jigglypuff: @ 8C4A1E8
 	.incbin "data/graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Jigglypuff: ; 8C4A210
+gMonBackPic_Jigglypuff: @ 8C4A210
 	.incbin "data/graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Jigglypuff: ; 8C4A46C
+gMonShinyPalette_Jigglypuff: @ 8C4A46C
 	.incbin "data/graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Jigglypuff: ; 8C4A494
+gMonIcon_Jigglypuff: @ 8C4A494
 	.incbin "data/graphics/pokemon/icons/jigglypuff_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Jigglypuff: ; 8C4A894
+gMonFootprint_Jigglypuff: @ 8C4A894
 	.incbin "data/graphics/pokemon/footprints/jigglypuff_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wigglytuff: ; 8C4A8B4
+gMonStillFrontPic_Wigglytuff: @ 8C4A8B4
 	.incbin "data/graphics/pokemon/still_front_pics/wigglytuff_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wigglytuff: ; 8C4AC08
+gMonPalette_Wigglytuff: @ 8C4AC08
 	.incbin "data/graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wigglytuff: ; 8C4AC30
+gMonBackPic_Wigglytuff: @ 8C4AC30
 	.incbin "data/graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wigglytuff: ; 8C4AED8
+gMonShinyPalette_Wigglytuff: @ 8C4AED8
 	.incbin "data/graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wigglytuff: ; 8C4AF00
+gMonIcon_Wigglytuff: @ 8C4AF00
 	.incbin "data/graphics/pokemon/icons/wigglytuff_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wigglytuff: ; 8C4B300
+gMonFootprint_Wigglytuff: @ 8C4B300
 	.incbin "data/graphics/pokemon/footprints/wigglytuff_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Zubat: ; 8C4B320
+gMonStillFrontPic_Zubat: @ 8C4B320
 	.incbin "data/graphics/pokemon/still_front_pics/zubat_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Zubat: ; 8C4B5F8
+gMonPalette_Zubat: @ 8C4B5F8
 	.incbin "data/graphics/pokemon/palettes/zubat_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Zubat: ; 8C4B620
+gMonBackPic_Zubat: @ 8C4B620
 	.incbin "data/graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Zubat: ; 8C4B8DC
+gMonShinyPalette_Zubat: @ 8C4B8DC
 	.incbin "data/graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Zubat: ; 8C4B904
+gMonIcon_Zubat: @ 8C4B904
 	.incbin "data/graphics/pokemon/icons/zubat_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Zubat: ; 8C4BD04
+gMonFootprint_Zubat: @ 8C4BD04
 	.incbin "data/graphics/pokemon/footprints/zubat_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Golbat: ; 8C4BD24
+gMonStillFrontPic_Golbat: @ 8C4BD24
 	.incbin "data/graphics/pokemon/still_front_pics/golbat_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Golbat: ; 8C4C0C0
+gMonPalette_Golbat: @ 8C4C0C0
 	.incbin "data/graphics/pokemon/palettes/golbat_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Golbat: ; 8C4C0E8
+gMonBackPic_Golbat: @ 8C4C0E8
 	.incbin "data/graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Golbat: ; 8C4C3A4
+gMonShinyPalette_Golbat: @ 8C4C3A4
 	.incbin "data/graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Golbat: ; 8C4C3CC
+gMonIcon_Golbat: @ 8C4C3CC
 	.incbin "data/graphics/pokemon/icons/golbat_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Golbat: ; 8C4C7CC
+gMonFootprint_Golbat: @ 8C4C7CC
 	.incbin "data/graphics/pokemon/footprints/golbat_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Oddish: ; 8C4C7EC
+gMonStillFrontPic_Oddish: @ 8C4C7EC
 	.incbin "data/graphics/pokemon/still_front_pics/oddish_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Oddish: ; 8C4CA20
+gMonPalette_Oddish: @ 8C4CA20
 	.incbin "data/graphics/pokemon/palettes/oddish_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Oddish: ; 8C4CA48
+gMonBackPic_Oddish: @ 8C4CA48
 	.incbin "data/graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Oddish: ; 8C4CCC0
+gMonShinyPalette_Oddish: @ 8C4CCC0
 	.incbin "data/graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Oddish: ; 8C4CCE8
+gMonIcon_Oddish: @ 8C4CCE8
 	.incbin "data/graphics/pokemon/icons/oddish_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Oddish: ; 8C4D0E8
+gMonFootprint_Oddish: @ 8C4D0E8
 	.incbin "data/graphics/pokemon/footprints/oddish_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gloom: ; 8C4D108
+gMonStillFrontPic_Gloom: @ 8C4D108
 	.incbin "data/graphics/pokemon/still_front_pics/gloom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gloom: ; 8C4D480
+gMonPalette_Gloom: @ 8C4D480
 	.incbin "data/graphics/pokemon/palettes/gloom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gloom: ; 8C4D4A8
+gMonBackPic_Gloom: @ 8C4D4A8
 	.incbin "data/graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gloom: ; 8C4D810
+gMonShinyPalette_Gloom: @ 8C4D810
 	.incbin "data/graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gloom: ; 8C4D838
+gMonIcon_Gloom: @ 8C4D838
 	.incbin "data/graphics/pokemon/icons/gloom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gloom: ; 8C4DC38
+gMonFootprint_Gloom: @ 8C4DC38
 	.incbin "data/graphics/pokemon/footprints/gloom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Vileplume: ; 8C4DC58
+gMonStillFrontPic_Vileplume: @ 8C4DC58
 	.incbin "data/graphics/pokemon/still_front_pics/vileplume_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Vileplume: ; 8C4DFD4
+gMonPalette_Vileplume: @ 8C4DFD4
 	.incbin "data/graphics/pokemon/palettes/vileplume_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Vileplume: ; 8C4DFFC
+gMonBackPic_Vileplume: @ 8C4DFFC
 	.incbin "data/graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Vileplume: ; 8C4E414
+gMonShinyPalette_Vileplume: @ 8C4E414
 	.incbin "data/graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Vileplume: ; 8C4E43C
+gMonIcon_Vileplume: @ 8C4E43C
 	.incbin "data/graphics/pokemon/icons/vileplume_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Vileplume: ; 8C4E83C
+gMonFootprint_Vileplume: @ 8C4E83C
 	.incbin "data/graphics/pokemon/footprints/vileplume_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Paras: ; 8C4E85C
+gMonStillFrontPic_Paras: @ 8C4E85C
 	.incbin "data/graphics/pokemon/still_front_pics/paras_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Paras: ; 8C4EAC8
+gMonPalette_Paras: @ 8C4EAC8
 	.incbin "data/graphics/pokemon/palettes/paras_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Paras: ; 8C4EAF0
+gMonBackPic_Paras: @ 8C4EAF0
 	.incbin "data/graphics/pokemon/back_pics/paras_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Paras: ; 8C4ED90
+gMonShinyPalette_Paras: @ 8C4ED90
 	.incbin "data/graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Paras: ; 8C4EDB8
+gMonIcon_Paras: @ 8C4EDB8
 	.incbin "data/graphics/pokemon/icons/paras_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Paras: ; 8C4F1B8
+gMonFootprint_Paras: @ 8C4F1B8
 	.incbin "data/graphics/pokemon/footprints/paras_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Parasect: ; 8C4F1D8
+gMonStillFrontPic_Parasect: @ 8C4F1D8
 	.incbin "data/graphics/pokemon/still_front_pics/parasect_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Parasect: ; 8C4F59C
+gMonPalette_Parasect: @ 8C4F59C
 	.incbin "data/graphics/pokemon/palettes/parasect_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Parasect: ; 8C4F5C4
+gMonBackPic_Parasect: @ 8C4F5C4
 	.incbin "data/graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Parasect: ; 8C4F8C0
+gMonShinyPalette_Parasect: @ 8C4F8C0
 	.incbin "data/graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Parasect: ; 8C4F8E8
+gMonIcon_Parasect: @ 8C4F8E8
 	.incbin "data/graphics/pokemon/icons/parasect_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Parasect: ; 8C4FCE8
+gMonFootprint_Parasect: @ 8C4FCE8
 	.incbin "data/graphics/pokemon/footprints/parasect_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Venonat: ; 8C4FD08
+gMonStillFrontPic_Venonat: @ 8C4FD08
 	.incbin "data/graphics/pokemon/still_front_pics/venonat_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Venonat: ; 8C50080
+gMonPalette_Venonat: @ 8C50080
 	.incbin "data/graphics/pokemon/palettes/venonat_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Venonat: ; 8C500A8
+gMonBackPic_Venonat: @ 8C500A8
 	.incbin "data/graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Venonat: ; 8C503D8
+gMonShinyPalette_Venonat: @ 8C503D8
 	.incbin "data/graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Venonat: ; 8C50400
+gMonIcon_Venonat: @ 8C50400
 	.incbin "data/graphics/pokemon/icons/venonat_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Venonat: ; 8C50800
+gMonFootprint_Venonat: @ 8C50800
 	.incbin "data/graphics/pokemon/footprints/venonat_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Venomoth: ; 8C50820
+gMonStillFrontPic_Venomoth: @ 8C50820
 	.incbin "data/graphics/pokemon/still_front_pics/venomoth_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Venomoth: ; 8C50CC4
+gMonPalette_Venomoth: @ 8C50CC4
 	.incbin "data/graphics/pokemon/palettes/venomoth_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Venomoth: ; 8C50CEC
+gMonBackPic_Venomoth: @ 8C50CEC
 	.incbin "data/graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Venomoth: ; 8C510B0
+gMonShinyPalette_Venomoth: @ 8C510B0
 	.incbin "data/graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Venomoth: ; 8C510D8
+gMonIcon_Venomoth: @ 8C510D8
 	.incbin "data/graphics/pokemon/icons/venomoth_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Venomoth: ; 8C514D8
+gMonFootprint_Venomoth: @ 8C514D8
 	.incbin "data/graphics/pokemon/footprints/venomoth_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Diglett: ; 8C514F8
+gMonStillFrontPic_Diglett: @ 8C514F8
 	.incbin "data/graphics/pokemon/still_front_pics/diglett_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Diglett: ; 8C51704
+gMonPalette_Diglett: @ 8C51704
 	.incbin "data/graphics/pokemon/palettes/diglett_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Diglett: ; 8C5172C
+gMonBackPic_Diglett: @ 8C5172C
 	.incbin "data/graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Diglett: ; 8C51938
+gMonShinyPalette_Diglett: @ 8C51938
 	.incbin "data/graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Diglett: ; 8C51960
+gMonIcon_Diglett: @ 8C51960
 	.incbin "data/graphics/pokemon/icons/diglett_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Diglett: ; 8C51D60
+gMonFootprint_Diglett: @ 8C51D60
 	.incbin "data/graphics/pokemon/footprints/diglett_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dugtrio: ; 8C51D80
+gMonStillFrontPic_Dugtrio: @ 8C51D80
 	.incbin "data/graphics/pokemon/still_front_pics/dugtrio_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dugtrio: ; 8C520A4
+gMonPalette_Dugtrio: @ 8C520A4
 	.incbin "data/graphics/pokemon/palettes/dugtrio_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dugtrio: ; 8C520CC
+gMonBackPic_Dugtrio: @ 8C520CC
 	.incbin "data/graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dugtrio: ; 8C52378
+gMonShinyPalette_Dugtrio: @ 8C52378
 	.incbin "data/graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dugtrio: ; 8C523A0
+gMonIcon_Dugtrio: @ 8C523A0
 	.incbin "data/graphics/pokemon/icons/dugtrio_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dugtrio: ; 8C527A0
+gMonFootprint_Dugtrio: @ 8C527A0
 	.incbin "data/graphics/pokemon/footprints/dugtrio_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Meowth: ; 8C527C0
+gMonStillFrontPic_Meowth: @ 8C527C0
 	.incbin "data/graphics/pokemon/still_front_pics/meowth_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Meowth: ; 8C52AAC
+gMonPalette_Meowth: @ 8C52AAC
 	.incbin "data/graphics/pokemon/palettes/meowth_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Meowth: ; 8C52AD4
+gMonBackPic_Meowth: @ 8C52AD4
 	.incbin "data/graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Meowth: ; 8C52DB8
+gMonShinyPalette_Meowth: @ 8C52DB8
 	.incbin "data/graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Meowth: ; 8C52DE0
+gMonIcon_Meowth: @ 8C52DE0
 	.incbin "data/graphics/pokemon/icons/meowth_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Meowth: ; 8C531E0
+gMonFootprint_Meowth: @ 8C531E0
 	.incbin "data/graphics/pokemon/footprints/meowth_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Persian: ; 8C53200
+gMonStillFrontPic_Persian: @ 8C53200
 	.incbin "data/graphics/pokemon/still_front_pics/persian_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Persian: ; 8C535B4
+gMonPalette_Persian: @ 8C535B4
 	.incbin "data/graphics/pokemon/palettes/persian_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Persian: ; 8C535DC
+gMonBackPic_Persian: @ 8C535DC
 	.incbin "data/graphics/pokemon/back_pics/persian_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Persian: ; 8C53940
+gMonShinyPalette_Persian: @ 8C53940
 	.incbin "data/graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Persian: ; 8C53968
+gMonIcon_Persian: @ 8C53968
 	.incbin "data/graphics/pokemon/icons/persian_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Persian: ; 8C53D68
+gMonFootprint_Persian: @ 8C53D68
 	.incbin "data/graphics/pokemon/footprints/persian_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Psyduck: ; 8C53D88
+gMonStillFrontPic_Psyduck: @ 8C53D88
 	.incbin "data/graphics/pokemon/still_front_pics/psyduck_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Psyduck: ; 8C54060
+gMonPalette_Psyduck: @ 8C54060
 	.incbin "data/graphics/pokemon/palettes/psyduck_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Psyduck: ; 8C54088
+gMonBackPic_Psyduck: @ 8C54088
 	.incbin "data/graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Psyduck: ; 8C54324
+gMonShinyPalette_Psyduck: @ 8C54324
 	.incbin "data/graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Psyduck: ; 8C5434C
+gMonIcon_Psyduck: @ 8C5434C
 	.incbin "data/graphics/pokemon/icons/psyduck_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Psyduck: ; 8C5474C
+gMonFootprint_Psyduck: @ 8C5474C
 	.incbin "data/graphics/pokemon/footprints/psyduck_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Golduck: ; 8C5476C
+gMonStillFrontPic_Golduck: @ 8C5476C
 	.incbin "data/graphics/pokemon/still_front_pics/golduck_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Golduck: ; 8C54B44
+gMonPalette_Golduck: @ 8C54B44
 	.incbin "data/graphics/pokemon/palettes/golduck_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Golduck: ; 8C54B6C
+gMonBackPic_Golduck: @ 8C54B6C
 	.incbin "data/graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Golduck: ; 8C54E98
+gMonShinyPalette_Golduck: @ 8C54E98
 	.incbin "data/graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Golduck: ; 8C54EC0
+gMonIcon_Golduck: @ 8C54EC0
 	.incbin "data/graphics/pokemon/icons/golduck_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Golduck: ; 8C552C0
+gMonFootprint_Golduck: @ 8C552C0
 	.incbin "data/graphics/pokemon/footprints/golduck_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mankey: ; 8C552E0
+gMonStillFrontPic_Mankey: @ 8C552E0
 	.incbin "data/graphics/pokemon/still_front_pics/mankey_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mankey: ; 8C555F8
+gMonPalette_Mankey: @ 8C555F8
 	.incbin "data/graphics/pokemon/palettes/mankey_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mankey: ; 8C55620
+gMonBackPic_Mankey: @ 8C55620
 	.incbin "data/graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mankey: ; 8C55988
+gMonShinyPalette_Mankey: @ 8C55988
 	.incbin "data/graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mankey: ; 8C559B0
+gMonIcon_Mankey: @ 8C559B0
 	.incbin "data/graphics/pokemon/icons/mankey_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mankey: ; 8C55DB0
+gMonFootprint_Mankey: @ 8C55DB0
 	.incbin "data/graphics/pokemon/footprints/mankey_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Primeape: ; 8C55DD0
+gMonStillFrontPic_Primeape: @ 8C55DD0
 	.incbin "data/graphics/pokemon/still_front_pics/primeape_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Primeape: ; 8C56180
+gMonPalette_Primeape: @ 8C56180
 	.incbin "data/graphics/pokemon/palettes/primeape_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Primeape: ; 8C561A8
+gMonBackPic_Primeape: @ 8C561A8
 	.incbin "data/graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Primeape: ; 8C56518
+gMonShinyPalette_Primeape: @ 8C56518
 	.incbin "data/graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Primeape: ; 8C56540
+gMonIcon_Primeape: @ 8C56540
 	.incbin "data/graphics/pokemon/icons/primeape_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Primeape: ; 8C56940
+gMonFootprint_Primeape: @ 8C56940
 	.incbin "data/graphics/pokemon/footprints/primeape_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Growlithe: ; 8C56960
+gMonStillFrontPic_Growlithe: @ 8C56960
 	.incbin "data/graphics/pokemon/still_front_pics/growlithe_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Growlithe: ; 8C56CB8
+gMonPalette_Growlithe: @ 8C56CB8
 	.incbin "data/graphics/pokemon/palettes/growlithe_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Growlithe: ; 8C56CE0
+gMonBackPic_Growlithe: @ 8C56CE0
 	.incbin "data/graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Growlithe: ; 8C5701C
+gMonShinyPalette_Growlithe: @ 8C5701C
 	.incbin "data/graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Growlithe: ; 8C57044
+gMonIcon_Growlithe: @ 8C57044
 	.incbin "data/graphics/pokemon/icons/growlithe_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Growlithe: ; 8C57444
+gMonFootprint_Growlithe: @ 8C57444
 	.incbin "data/graphics/pokemon/footprints/growlithe_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Arcanine: ; 8C57464
+gMonStillFrontPic_Arcanine: @ 8C57464
 	.incbin "data/graphics/pokemon/still_front_pics/arcanine_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Arcanine: ; 8C57998
+gMonPalette_Arcanine: @ 8C57998
 	.incbin "data/graphics/pokemon/palettes/arcanine_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Arcanine: ; 8C579C0
+gMonBackPic_Arcanine: @ 8C579C0
 	.incbin "data/graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Arcanine: ; 8C57DA0
+gMonShinyPalette_Arcanine: @ 8C57DA0
 	.incbin "data/graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Arcanine: ; 8C57DC8
+gMonIcon_Arcanine: @ 8C57DC8
 	.incbin "data/graphics/pokemon/icons/arcanine_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Arcanine: ; 8C581C8
+gMonFootprint_Arcanine: @ 8C581C8
 	.incbin "data/graphics/pokemon/footprints/arcanine_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Poliwag: ; 8C581E8
+gMonStillFrontPic_Poliwag: @ 8C581E8
 	.incbin "data/graphics/pokemon/still_front_pics/poliwag_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Poliwag: ; 8C58470
+gMonPalette_Poliwag: @ 8C58470
 	.incbin "data/graphics/pokemon/palettes/poliwag_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Poliwag: ; 8C58498
+gMonBackPic_Poliwag: @ 8C58498
 	.incbin "data/graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Poliwag: ; 8C58708
+gMonShinyPalette_Poliwag: @ 8C58708
 	.incbin "data/graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Poliwag: ; 8C58730
+gMonIcon_Poliwag: @ 8C58730
 	.incbin "data/graphics/pokemon/icons/poliwag_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Poliwag: ; 8C58B30
+gMonFootprint_Poliwag: @ 8C58B30
 	.incbin "data/graphics/pokemon/footprints/poliwag_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Poliwhirl: ; 8C58B50
+gMonStillFrontPic_Poliwhirl: @ 8C58B50
 	.incbin "data/graphics/pokemon/still_front_pics/poliwhirl_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Poliwhirl: ; 8C58F14
+gMonPalette_Poliwhirl: @ 8C58F14
 	.incbin "data/graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Poliwhirl: ; 8C58F3C
+gMonBackPic_Poliwhirl: @ 8C58F3C
 	.incbin "data/graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Poliwhirl: ; 8C591FC
+gMonShinyPalette_Poliwhirl: @ 8C591FC
 	.incbin "data/graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Poliwhirl: ; 8C59224
+gMonIcon_Poliwhirl: @ 8C59224
 	.incbin "data/graphics/pokemon/icons/poliwhirl_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Poliwhirl: ; 8C59624
+gMonFootprint_Poliwhirl: @ 8C59624
 	.incbin "data/graphics/pokemon/footprints/poliwhirl_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Poliwrath: ; 8C59644
+gMonStillFrontPic_Poliwrath: @ 8C59644
 	.incbin "data/graphics/pokemon/still_front_pics/poliwrath_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Poliwrath: ; 8C59A0C
+gMonPalette_Poliwrath: @ 8C59A0C
 	.incbin "data/graphics/pokemon/palettes/poliwrath_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Poliwrath: ; 8C59A34
+gMonBackPic_Poliwrath: @ 8C59A34
 	.incbin "data/graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Poliwrath: ; 8C59D54
+gMonShinyPalette_Poliwrath: @ 8C59D54
 	.incbin "data/graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Poliwrath: ; 8C59D7C
+gMonIcon_Poliwrath: @ 8C59D7C
 	.incbin "data/graphics/pokemon/icons/poliwrath_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Poliwrath: ; 8C5A17C
+gMonFootprint_Poliwrath: @ 8C5A17C
 	.incbin "data/graphics/pokemon/footprints/poliwrath_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Abra: ; 8C5A19C
+gMonStillFrontPic_Abra: @ 8C5A19C
 	.incbin "data/graphics/pokemon/still_front_pics/abra_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Abra: ; 8C5A480
+gMonPalette_Abra: @ 8C5A480
 	.incbin "data/graphics/pokemon/palettes/abra_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Abra: ; 8C5A4A4
+gMonBackPic_Abra: @ 8C5A4A4
 	.incbin "data/graphics/pokemon/back_pics/abra_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Abra: ; 8C5A7B8
+gMonShinyPalette_Abra: @ 8C5A7B8
 	.incbin "data/graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Abra: ; 8C5A7DC
+gMonIcon_Abra: @ 8C5A7DC
 	.incbin "data/graphics/pokemon/icons/abra_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Abra: ; 8C5ABDC
+gMonFootprint_Abra: @ 8C5ABDC
 	.incbin "data/graphics/pokemon/footprints/abra_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kadabra: ; 8C5ABFC
+gMonStillFrontPic_Kadabra: @ 8C5ABFC
 	.incbin "data/graphics/pokemon/still_front_pics/kadabra_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kadabra: ; 8C5B060
+gMonPalette_Kadabra: @ 8C5B060
 	.incbin "data/graphics/pokemon/palettes/kadabra_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kadabra: ; 8C5B088
+gMonBackPic_Kadabra: @ 8C5B088
 	.incbin "data/graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kadabra: ; 8C5B464
+gMonShinyPalette_Kadabra: @ 8C5B464
 	.incbin "data/graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kadabra: ; 8C5B48C
+gMonIcon_Kadabra: @ 8C5B48C
 	.incbin "data/graphics/pokemon/icons/kadabra_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kadabra: ; 8C5B88C
+gMonFootprint_Kadabra: @ 8C5B88C
 	.incbin "data/graphics/pokemon/footprints/kadabra_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Alakazam: ; 8C5B8AC
+gMonStillFrontPic_Alakazam: @ 8C5B8AC
 	.incbin "data/graphics/pokemon/still_front_pics/alakazam_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Alakazam: ; 8C5BCA8
+gMonPalette_Alakazam: @ 8C5BCA8
 	.incbin "data/graphics/pokemon/palettes/alakazam_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Alakazam: ; 8C5BCD0
+gMonBackPic_Alakazam: @ 8C5BCD0
 	.incbin "data/graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Alakazam: ; 8C5C114
+gMonShinyPalette_Alakazam: @ 8C5C114
 	.incbin "data/graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Alakazam: ; 8C5C13C
+gMonIcon_Alakazam: @ 8C5C13C
 	.incbin "data/graphics/pokemon/icons/alakazam_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Alakazam: ; 8C5C53C
+gMonFootprint_Alakazam: @ 8C5C53C
 	.incbin "data/graphics/pokemon/footprints/alakazam_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Machop: ; 8C5C55C
+gMonStillFrontPic_Machop: @ 8C5C55C
 	.incbin "data/graphics/pokemon/still_front_pics/machop_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Machop: ; 8C5C800
+gMonPalette_Machop: @ 8C5C800
 	.incbin "data/graphics/pokemon/palettes/machop_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Machop: ; 8C5C828
+gMonBackPic_Machop: @ 8C5C828
 	.incbin "data/graphics/pokemon/back_pics/machop_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Machop: ; 8C5CB08
+gMonShinyPalette_Machop: @ 8C5CB08
 	.incbin "data/graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Machop: ; 8C5CB30
+gMonIcon_Machop: @ 8C5CB30
 	.incbin "data/graphics/pokemon/icons/machop_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Machop: ; 8C5CF30
+gMonFootprint_Machop: @ 8C5CF30
 	.incbin "data/graphics/pokemon/footprints/machop_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Machoke: ; 8C5CF50
+gMonStillFrontPic_Machoke: @ 8C5CF50
 	.incbin "data/graphics/pokemon/still_front_pics/machoke_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Machoke: ; 8C5D300
+gMonPalette_Machoke: @ 8C5D300
 	.incbin "data/graphics/pokemon/palettes/machoke_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Machoke: ; 8C5D328
+gMonBackPic_Machoke: @ 8C5D328
 	.incbin "data/graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Machoke: ; 8C5D678
+gMonShinyPalette_Machoke: @ 8C5D678
 	.incbin "data/graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Machoke: ; 8C5D6A0
+gMonIcon_Machoke: @ 8C5D6A0
 	.incbin "data/graphics/pokemon/icons/machoke_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Machoke: ; 8C5DAA0
+gMonFootprint_Machoke: @ 8C5DAA0
 	.incbin "data/graphics/pokemon/footprints/machoke_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Machamp: ; 8C5DAC0
+gMonStillFrontPic_Machamp: @ 8C5DAC0
 	.incbin "data/graphics/pokemon/still_front_pics/machamp_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Machamp: ; 8C5E010
+gMonPalette_Machamp: @ 8C5E010
 	.incbin "data/graphics/pokemon/palettes/machamp_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Machamp: ; 8C5E038
+gMonBackPic_Machamp: @ 8C5E038
 	.incbin "data/graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Machamp: ; 8C5E494
+gMonShinyPalette_Machamp: @ 8C5E494
 	.incbin "data/graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Machamp: ; 8C5E4BC
+gMonIcon_Machamp: @ 8C5E4BC
 	.incbin "data/graphics/pokemon/icons/machamp_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Machamp: ; 8C5E8BC
+gMonFootprint_Machamp: @ 8C5E8BC
 	.incbin "data/graphics/pokemon/footprints/machamp_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Bellsprout: ; 8C5E8DC
+gMonStillFrontPic_Bellsprout: @ 8C5E8DC
 	.incbin "data/graphics/pokemon/still_front_pics/bellsprout_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Bellsprout: ; 8C5EB5C
+gMonPalette_Bellsprout: @ 8C5EB5C
 	.incbin "data/graphics/pokemon/palettes/bellsprout_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Bellsprout: ; 8C5EB84
+gMonBackPic_Bellsprout: @ 8C5EB84
 	.incbin "data/graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Bellsprout: ; 8C5EE20
+gMonShinyPalette_Bellsprout: @ 8C5EE20
 	.incbin "data/graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Bellsprout: ; 8C5EE48
+gMonIcon_Bellsprout: @ 8C5EE48
 	.incbin "data/graphics/pokemon/icons/bellsprout_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Bellsprout: ; 8C5F248
+gMonFootprint_Bellsprout: @ 8C5F248
 	.incbin "data/graphics/pokemon/footprints/bellsprout_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Weepinbell: ; 8C5F268
+gMonStillFrontPic_Weepinbell: @ 8C5F268
 	.incbin "data/graphics/pokemon/still_front_pics/weepinbell_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Weepinbell: ; 8C5F58C
+gMonPalette_Weepinbell: @ 8C5F58C
 	.incbin "data/graphics/pokemon/palettes/weepinbell_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Weepinbell: ; 8C5F5B4
+gMonBackPic_Weepinbell: @ 8C5F5B4
 	.incbin "data/graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Weepinbell: ; 8C5F8B0
+gMonShinyPalette_Weepinbell: @ 8C5F8B0
 	.incbin "data/graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Weepinbell: ; 8C5F8D8
+gMonIcon_Weepinbell: @ 8C5F8D8
 	.incbin "data/graphics/pokemon/icons/weepinbell_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Weepinbell: ; 8C5FCD8
+gMonFootprint_Weepinbell: @ 8C5FCD8
 	.incbin "data/graphics/pokemon/footprints/weepinbell_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Victreebel: ; 8C5FCF8
+gMonStillFrontPic_Victreebel: @ 8C5FCF8
 	.incbin "data/graphics/pokemon/still_front_pics/victreebel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Victreebel: ; 8C60124
+gMonPalette_Victreebel: @ 8C60124
 	.incbin "data/graphics/pokemon/palettes/victreebel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Victreebel: ; 8C6014C
+gMonBackPic_Victreebel: @ 8C6014C
 	.incbin "data/graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Victreebel: ; 8C604E4
+gMonShinyPalette_Victreebel: @ 8C604E4
 	.incbin "data/graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Victreebel: ; 8C6050C
+gMonIcon_Victreebel: @ 8C6050C
 	.incbin "data/graphics/pokemon/icons/victreebel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Victreebel: ; 8C6090C
+gMonFootprint_Victreebel: @ 8C6090C
 	.incbin "data/graphics/pokemon/footprints/victreebel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tentacool: ; 8C6092C
+gMonStillFrontPic_Tentacool: @ 8C6092C
 	.incbin "data/graphics/pokemon/still_front_pics/tentacool_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tentacool: ; 8C60BCC
+gMonPalette_Tentacool: @ 8C60BCC
 	.incbin "data/graphics/pokemon/palettes/tentacool_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tentacool: ; 8C60BF4
+gMonBackPic_Tentacool: @ 8C60BF4
 	.incbin "data/graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tentacool: ; 8C60EC0
+gMonShinyPalette_Tentacool: @ 8C60EC0
 	.incbin "data/graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tentacool: ; 8C60EE8
+gMonIcon_Tentacool: @ 8C60EE8
 	.incbin "data/graphics/pokemon/icons/tentacool_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tentacool: ; 8C612E8
+gMonFootprint_Tentacool: @ 8C612E8
 	.incbin "data/graphics/pokemon/footprints/tentacool_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tentacruel: ; 8C61308
+gMonStillFrontPic_Tentacruel: @ 8C61308
 	.incbin "data/graphics/pokemon/still_front_pics/tentacruel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tentacruel: ; 8C617A4
+gMonPalette_Tentacruel: @ 8C617A4
 	.incbin "data/graphics/pokemon/palettes/tentacruel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tentacruel: ; 8C617CC
+gMonBackPic_Tentacruel: @ 8C617CC
 	.incbin "data/graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tentacruel: ; 8C61B68
+gMonShinyPalette_Tentacruel: @ 8C61B68
 	.incbin "data/graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tentacruel: ; 8C61B90
+gMonIcon_Tentacruel: @ 8C61B90
 	.incbin "data/graphics/pokemon/icons/tentacruel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tentacruel: ; 8C61F90
+gMonFootprint_Tentacruel: @ 8C61F90
 	.incbin "data/graphics/pokemon/footprints/tentacruel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Geodude: ; 8C61FB0
+gMonStillFrontPic_Geodude: @ 8C61FB0
 	.incbin "data/graphics/pokemon/still_front_pics/geodude_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Geodude: ; 8C6221C
+gMonPalette_Geodude: @ 8C6221C
 	.incbin "data/graphics/pokemon/palettes/geodude_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Geodude: ; 8C62238
+gMonBackPic_Geodude: @ 8C62238
 	.incbin "data/graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Geodude: ; 8C624CC
+gMonShinyPalette_Geodude: @ 8C624CC
 	.incbin "data/graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Geodude: ; 8C624E8
+gMonIcon_Geodude: @ 8C624E8
 	.incbin "data/graphics/pokemon/icons/geodude_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Geodude: ; 8C628E8
+gMonFootprint_Geodude: @ 8C628E8
 	.incbin "data/graphics/pokemon/footprints/geodude_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Graveler: ; 8C62908
+gMonStillFrontPic_Graveler: @ 8C62908
 	.incbin "data/graphics/pokemon/still_front_pics/graveler_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Graveler: ; 8C62D10
+gMonPalette_Graveler: @ 8C62D10
 	.incbin "data/graphics/pokemon/palettes/graveler_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Graveler: ; 8C62D30
+gMonBackPic_Graveler: @ 8C62D30
 	.incbin "data/graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Graveler: ; 8C62FAC
+gMonShinyPalette_Graveler: @ 8C62FAC
 	.incbin "data/graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Graveler: ; 8C62FCC
+gMonIcon_Graveler: @ 8C62FCC
 	.incbin "data/graphics/pokemon/icons/graveler_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Graveler: ; 8C633CC
+gMonFootprint_Graveler: @ 8C633CC
 	.incbin "data/graphics/pokemon/footprints/graveler_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Golem: ; 8C633EC
+gMonStillFrontPic_Golem: @ 8C633EC
 	.incbin "data/graphics/pokemon/still_front_pics/golem_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Golem: ; 8C63868
+gMonPalette_Golem: @ 8C63868
 	.incbin "data/graphics/pokemon/palettes/golem_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Golem: ; 8C63890
+gMonBackPic_Golem: @ 8C63890
 	.incbin "data/graphics/pokemon/back_pics/golem_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Golem: ; 8C63B50
+gMonShinyPalette_Golem: @ 8C63B50
 	.incbin "data/graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Golem: ; 8C63B78
+gMonIcon_Golem: @ 8C63B78
 	.incbin "data/graphics/pokemon/icons/golem_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Golem: ; 8C63F78
+gMonFootprint_Golem: @ 8C63F78
 	.incbin "data/graphics/pokemon/footprints/golem_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ponyta: ; 8C63F98
+gMonStillFrontPic_Ponyta: @ 8C63F98
 	.incbin "data/graphics/pokemon/still_front_pics/ponyta_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ponyta: ; 8C64340
+gMonPalette_Ponyta: @ 8C64340
 	.incbin "data/graphics/pokemon/palettes/ponyta_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ponyta: ; 8C64368
+gMonBackPic_Ponyta: @ 8C64368
 	.incbin "data/graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ponyta: ; 8C646A4
+gMonShinyPalette_Ponyta: @ 8C646A4
 	.incbin "data/graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ponyta: ; 8C646CC
+gMonIcon_Ponyta: @ 8C646CC
 	.incbin "data/graphics/pokemon/icons/ponyta_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ponyta: ; 8C64ACC
+gMonFootprint_Ponyta: @ 8C64ACC
 	.incbin "data/graphics/pokemon/footprints/ponyta_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Rapidash: ; 8C64AEC
+gMonStillFrontPic_Rapidash: @ 8C64AEC
 	.incbin "data/graphics/pokemon/still_front_pics/rapidash_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Rapidash: ; 8C64FBC
+gMonPalette_Rapidash: @ 8C64FBC
 	.incbin "data/graphics/pokemon/palettes/rapidash_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Rapidash: ; 8C64FE4
+gMonBackPic_Rapidash: @ 8C64FE4
 	.incbin "data/graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Rapidash: ; 8C653F4
+gMonShinyPalette_Rapidash: @ 8C653F4
 	.incbin "data/graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Rapidash: ; 8C6541C
+gMonIcon_Rapidash: @ 8C6541C
 	.incbin "data/graphics/pokemon/icons/rapidash_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Rapidash: ; 8C6581C
+gMonFootprint_Rapidash: @ 8C6581C
 	.incbin "data/graphics/pokemon/footprints/rapidash_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slowpoke: ; 8C6583C
+gMonStillFrontPic_Slowpoke: @ 8C6583C
 	.incbin "data/graphics/pokemon/still_front_pics/slowpoke_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slowpoke: ; 8C65B48
+gMonPalette_Slowpoke: @ 8C65B48
 	.incbin "data/graphics/pokemon/palettes/slowpoke_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slowpoke: ; 8C65B70
+gMonBackPic_Slowpoke: @ 8C65B70
 	.incbin "data/graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slowpoke: ; 8C65DD4
+gMonShinyPalette_Slowpoke: @ 8C65DD4
 	.incbin "data/graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slowpoke: ; 8C65DFC
+gMonIcon_Slowpoke: @ 8C65DFC
 	.incbin "data/graphics/pokemon/icons/slowpoke_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slowpoke: ; 8C661FC
+gMonFootprint_Slowpoke: @ 8C661FC
 	.incbin "data/graphics/pokemon/footprints/slowpoke_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slowbro: ; 8C6621C
+gMonStillFrontPic_Slowbro: @ 8C6621C
 	.incbin "data/graphics/pokemon/still_front_pics/slowbro_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slowbro: ; 8C666DC
+gMonPalette_Slowbro: @ 8C666DC
 	.incbin "data/graphics/pokemon/palettes/slowbro_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slowbro: ; 8C66704
+gMonBackPic_Slowbro: @ 8C66704
 	.incbin "data/graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slowbro: ; 8C66AA0
+gMonShinyPalette_Slowbro: @ 8C66AA0
 	.incbin "data/graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slowbro: ; 8C66AC8
+gMonIcon_Slowbro: @ 8C66AC8
 	.incbin "data/graphics/pokemon/icons/slowbro_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slowbro: ; 8C66EC8
+gMonFootprint_Slowbro: @ 8C66EC8
 	.incbin "data/graphics/pokemon/footprints/slowbro_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magnemite: ; 8C66EE8
+gMonStillFrontPic_Magnemite: @ 8C66EE8
 	.incbin "data/graphics/pokemon/still_front_pics/magnemite_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magnemite: ; 8C670C0
+gMonPalette_Magnemite: @ 8C670C0
 	.incbin "data/graphics/pokemon/palettes/magnemite_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magnemite: ; 8C670E8
+gMonBackPic_Magnemite: @ 8C670E8
 	.incbin "data/graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magnemite: ; 8C672D0
+gMonShinyPalette_Magnemite: @ 8C672D0
 	.incbin "data/graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magnemite: ; 8C672F4
+gMonIcon_Magnemite: @ 8C672F4
 	.incbin "data/graphics/pokemon/icons/magnemite_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magnemite: ; 8C676F4
+gMonFootprint_Magnemite: @ 8C676F4
 	.incbin "data/graphics/pokemon/footprints/magnemite_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magneton: ; 8C67714
+gMonStillFrontPic_Magneton: @ 8C67714
 	.incbin "data/graphics/pokemon/still_front_pics/magneton_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magneton: ; 8C67B18
+gMonPalette_Magneton: @ 8C67B18
 	.incbin "data/graphics/pokemon/palettes/magneton_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magneton: ; 8C67B40
+gMonBackPic_Magneton: @ 8C67B40
 	.incbin "data/graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magneton: ; 8C67EC0
+gMonShinyPalette_Magneton: @ 8C67EC0
 	.incbin "data/graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magneton: ; 8C67EE8
+gMonIcon_Magneton: @ 8C67EE8
 	.incbin "data/graphics/pokemon/icons/magneton_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magneton: ; 8C682E8
+gMonFootprint_Magneton: @ 8C682E8
 	.incbin "data/graphics/pokemon/footprints/magneton_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Farfetchd: ; 8C68308
+gMonStillFrontPic_Farfetchd: @ 8C68308
 	.incbin "data/graphics/pokemon/still_front_pics/farfetch_d_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Farfetchd: ; 8C68684
+gMonPalette_Farfetchd: @ 8C68684
 	.incbin "data/graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Farfetchd: ; 8C686AC
+gMonBackPic_Farfetchd: @ 8C686AC
 	.incbin "data/graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Farfetchd: ; 8C68A18
+gMonShinyPalette_Farfetchd: @ 8C68A18
 	.incbin "data/graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Farfetchd: ; 8C68A40
+gMonIcon_Farfetchd: @ 8C68A40
 	.incbin "data/graphics/pokemon/icons/farfetch_d_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Farfetchd: ; 8C68E40
+gMonFootprint_Farfetchd: @ 8C68E40
 	.incbin "data/graphics/pokemon/footprints/farfetch_d_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Doduo: ; 8C68E60
+gMonStillFrontPic_Doduo: @ 8C68E60
 	.incbin "data/graphics/pokemon/still_front_pics/doduo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Doduo: ; 8C691B4
+gMonPalette_Doduo: @ 8C691B4
 	.incbin "data/graphics/pokemon/palettes/doduo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Doduo: ; 8C691D8
+gMonBackPic_Doduo: @ 8C691D8
 	.incbin "data/graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Doduo: ; 8C694F0
+gMonShinyPalette_Doduo: @ 8C694F0
 	.incbin "data/graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Doduo: ; 8C69514
+gMonIcon_Doduo: @ 8C69514
 	.incbin "data/graphics/pokemon/icons/doduo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Doduo: ; 8C69914
+gMonFootprint_Doduo: @ 8C69914
 	.incbin "data/graphics/pokemon/footprints/doduo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dodrio: ; 8C69934
+gMonStillFrontPic_Dodrio: @ 8C69934
 	.incbin "data/graphics/pokemon/still_front_pics/dodrio_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dodrio: ; 8C69E10
+gMonPalette_Dodrio: @ 8C69E10
 	.incbin "data/graphics/pokemon/palettes/dodrio_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dodrio: ; 8C69E38
+gMonBackPic_Dodrio: @ 8C69E38
 	.incbin "data/graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dodrio: ; 8C6A29C
+gMonShinyPalette_Dodrio: @ 8C6A29C
 	.incbin "data/graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dodrio: ; 8C6A2C4
+gMonIcon_Dodrio: @ 8C6A2C4
 	.incbin "data/graphics/pokemon/icons/dodrio_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dodrio: ; 8C6A6C4
+gMonFootprint_Dodrio: @ 8C6A6C4
 	.incbin "data/graphics/pokemon/footprints/dodrio_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Seel: ; 8C6A6E4
+gMonStillFrontPic_Seel: @ 8C6A6E4
 	.incbin "data/graphics/pokemon/still_front_pics/seel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Seel: ; 8C6A9EC
+gMonPalette_Seel: @ 8C6A9EC
 	.incbin "data/graphics/pokemon/palettes/seel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Seel: ; 8C6AA14
+gMonBackPic_Seel: @ 8C6AA14
 	.incbin "data/graphics/pokemon/back_pics/seel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Seel: ; 8C6AD00
+gMonShinyPalette_Seel: @ 8C6AD00
 	.incbin "data/graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Seel: ; 8C6AD28
+gMonIcon_Seel: @ 8C6AD28
 	.incbin "data/graphics/pokemon/icons/seel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Seel: ; 8C6B128
+gMonFootprint_Seel: @ 8C6B128
 	.incbin "data/graphics/pokemon/footprints/seel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dewgong: ; 8C6B148
+gMonStillFrontPic_Dewgong: @ 8C6B148
 	.incbin "data/graphics/pokemon/still_front_pics/dewgong_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dewgong: ; 8C6B510
+gMonPalette_Dewgong: @ 8C6B510
 	.incbin "data/graphics/pokemon/palettes/dewgong_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dewgong: ; 8C6B530
+gMonBackPic_Dewgong: @ 8C6B530
 	.incbin "data/graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dewgong: ; 8C6B7C4
+gMonShinyPalette_Dewgong: @ 8C6B7C4
 	.incbin "data/graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dewgong: ; 8C6B7E4
+gMonIcon_Dewgong: @ 8C6B7E4
 	.incbin "data/graphics/pokemon/icons/dewgong_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dewgong: ; 8C6BBE4
+gMonFootprint_Dewgong: @ 8C6BBE4
 	.incbin "data/graphics/pokemon/footprints/dewgong_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Grimer: ; 8C6BC04
+gMonStillFrontPic_Grimer: @ 8C6BC04
 	.incbin "data/graphics/pokemon/still_front_pics/grimer_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Grimer: ; 8C6BF20
+gMonPalette_Grimer: @ 8C6BF20
 	.incbin "data/graphics/pokemon/palettes/grimer_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Grimer: ; 8C6BF44
+gMonBackPic_Grimer: @ 8C6BF44
 	.incbin "data/graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Grimer: ; 8C6C228
+gMonShinyPalette_Grimer: @ 8C6C228
 	.incbin "data/graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Grimer: ; 8C6C24C
+gMonIcon_Grimer: @ 8C6C24C
 	.incbin "data/graphics/pokemon/icons/grimer_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Grimer: ; 8C6C64C
+gMonFootprint_Grimer: @ 8C6C64C
 	.incbin "data/graphics/pokemon/footprints/grimer_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Muk: ; 8C6C66C
+gMonStillFrontPic_Muk: @ 8C6C66C
 	.incbin "data/graphics/pokemon/still_front_pics/muk_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Muk: ; 8C6CAB8
+gMonPalette_Muk: @ 8C6CAB8
 	.incbin "data/graphics/pokemon/palettes/muk_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Muk: ; 8C6CADC
+gMonBackPic_Muk: @ 8C6CADC
 	.incbin "data/graphics/pokemon/back_pics/muk_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Muk: ; 8C6CE34
+gMonShinyPalette_Muk: @ 8C6CE34
 	.incbin "data/graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Muk: ; 8C6CE58
+gMonIcon_Muk: @ 8C6CE58
 	.incbin "data/graphics/pokemon/icons/muk_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Muk: ; 8C6D258
+gMonFootprint_Muk: @ 8C6D258
 	.incbin "data/graphics/pokemon/footprints/muk_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shellder: ; 8C6D278
+gMonStillFrontPic_Shellder: @ 8C6D278
 	.incbin "data/graphics/pokemon/still_front_pics/shellder_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shellder: ; 8C6D4E0
+gMonPalette_Shellder: @ 8C6D4E0
 	.incbin "data/graphics/pokemon/palettes/shellder_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shellder: ; 8C6D504
+gMonBackPic_Shellder: @ 8C6D504
 	.incbin "data/graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shellder: ; 8C6D818
+gMonShinyPalette_Shellder: @ 8C6D818
 	.incbin "data/graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shellder: ; 8C6D83C
+gMonIcon_Shellder: @ 8C6D83C
 	.incbin "data/graphics/pokemon/icons/shellder_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shellder: ; 8C6DC3C
+gMonFootprint_Shellder: @ 8C6DC3C
 	.incbin "data/graphics/pokemon/footprints/shellder_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cloyster: ; 8C6DC5C
+gMonStillFrontPic_Cloyster: @ 8C6DC5C
 	.incbin "data/graphics/pokemon/still_front_pics/cloyster_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cloyster: ; 8C6E094
+gMonPalette_Cloyster: @ 8C6E094
 	.incbin "data/graphics/pokemon/palettes/cloyster_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cloyster: ; 8C6E0B8
+gMonBackPic_Cloyster: @ 8C6E0B8
 	.incbin "data/graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cloyster: ; 8C6E4C4
+gMonShinyPalette_Cloyster: @ 8C6E4C4
 	.incbin "data/graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cloyster: ; 8C6E4E8
+gMonIcon_Cloyster: @ 8C6E4E8
 	.incbin "data/graphics/pokemon/icons/cloyster_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cloyster: ; 8C6E8E8
+gMonFootprint_Cloyster: @ 8C6E8E8
 	.incbin "data/graphics/pokemon/footprints/cloyster_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gastly: ; 8C6E908
+gMonStillFrontPic_Gastly: @ 8C6E908
 	.incbin "data/graphics/pokemon/still_front_pics/gastly_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gastly: ; 8C6ECC0
+gMonPalette_Gastly: @ 8C6ECC0
 	.incbin "data/graphics/pokemon/palettes/gastly_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gastly: ; 8C6ECE8
+gMonBackPic_Gastly: @ 8C6ECE8
 	.incbin "data/graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gastly: ; 8C6F00C
+gMonShinyPalette_Gastly: @ 8C6F00C
 	.incbin "data/graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gastly: ; 8C6F034
+gMonIcon_Gastly: @ 8C6F034
 	.incbin "data/graphics/pokemon/icons/gastly_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gastly: ; 8C6F434
+gMonFootprint_Gastly: @ 8C6F434
 	.incbin "data/graphics/pokemon/footprints/gastly_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Haunter: ; 8C6F454
+gMonStillFrontPic_Haunter: @ 8C6F454
 	.incbin "data/graphics/pokemon/still_front_pics/haunter_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Haunter: ; 8C6F854
+gMonPalette_Haunter: @ 8C6F854
 	.incbin "data/graphics/pokemon/palettes/haunter_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Haunter: ; 8C6F878
+gMonBackPic_Haunter: @ 8C6F878
 	.incbin "data/graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Haunter: ; 8C6FBA0
+gMonShinyPalette_Haunter: @ 8C6FBA0
 	.incbin "data/graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Haunter: ; 8C6FBC4
+gMonIcon_Haunter: @ 8C6FBC4
 	.incbin "data/graphics/pokemon/icons/haunter_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Haunter: ; 8C6FFC4
+gMonFootprint_Haunter: @ 8C6FFC4
 	.incbin "data/graphics/pokemon/footprints/haunter_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gengar: ; 8C6FFE4
+gMonStillFrontPic_Gengar: @ 8C6FFE4
 	.incbin "data/graphics/pokemon/still_front_pics/gengar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gengar: ; 8C70380
+gMonPalette_Gengar: @ 8C70380
 	.incbin "data/graphics/pokemon/palettes/gengar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gengar: ; 8C703A4
+gMonBackPic_Gengar: @ 8C703A4
 	.incbin "data/graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gengar: ; 8C7068C
+gMonShinyPalette_Gengar: @ 8C7068C
 	.incbin "data/graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gengar: ; 8C706B0
+gMonIcon_Gengar: @ 8C706B0
 	.incbin "data/graphics/pokemon/icons/gengar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gengar: ; 8C70AB0
+gMonFootprint_Gengar: @ 8C70AB0
 	.incbin "data/graphics/pokemon/footprints/gengar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Onix: ; 8C70AD0
+gMonStillFrontPic_Onix: @ 8C70AD0
 	.incbin "data/graphics/pokemon/still_front_pics/onix_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Onix: ; 8C70F48
+gMonPalette_Onix: @ 8C70F48
 	.incbin "data/graphics/pokemon/palettes/onix_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Onix: ; 8C70F64
+gMonBackPic_Onix: @ 8C70F64
 	.incbin "data/graphics/pokemon/back_pics/onix_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Onix: ; 8C712E0
+gMonShinyPalette_Onix: @ 8C712E0
 	.incbin "data/graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Onix: ; 8C712FC
+gMonIcon_Onix: @ 8C712FC
 	.incbin "data/graphics/pokemon/icons/onix_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Onix: ; 8C716FC
+gMonFootprint_Onix: @ 8C716FC
 	.incbin "data/graphics/pokemon/footprints/onix_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Drowzee: ; 8C7171C
+gMonStillFrontPic_Drowzee: @ 8C7171C
 	.incbin "data/graphics/pokemon/still_front_pics/drowzee_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Drowzee: ; 8C71A94
+gMonPalette_Drowzee: @ 8C71A94
 	.incbin "data/graphics/pokemon/palettes/drowzee_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Drowzee: ; 8C71AB8
+gMonBackPic_Drowzee: @ 8C71AB8
 	.incbin "data/graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Drowzee: ; 8C71D14
+gMonShinyPalette_Drowzee: @ 8C71D14
 	.incbin "data/graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Drowzee: ; 8C71D38
+gMonIcon_Drowzee: @ 8C71D38
 	.incbin "data/graphics/pokemon/icons/drowzee_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Drowzee: ; 8C72138
+gMonFootprint_Drowzee: @ 8C72138
 	.incbin "data/graphics/pokemon/footprints/drowzee_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hypno: ; 8C72158
+gMonStillFrontPic_Hypno: @ 8C72158
 	.incbin "data/graphics/pokemon/still_front_pics/hypno_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hypno: ; 8C72544
+gMonPalette_Hypno: @ 8C72544
 	.incbin "data/graphics/pokemon/palettes/hypno_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hypno: ; 8C72568
+gMonBackPic_Hypno: @ 8C72568
 	.incbin "data/graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hypno: ; 8C72898
+gMonShinyPalette_Hypno: @ 8C72898
 	.incbin "data/graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hypno: ; 8C728BC
+gMonIcon_Hypno: @ 8C728BC
 	.incbin "data/graphics/pokemon/icons/hypno_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hypno: ; 8C72CBC
+gMonFootprint_Hypno: @ 8C72CBC
 	.incbin "data/graphics/pokemon/footprints/hypno_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Krabby: ; 8C72CDC
+gMonStillFrontPic_Krabby: @ 8C72CDC
 	.incbin "data/graphics/pokemon/still_front_pics/krabby_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Krabby: ; 8C72F94
+gMonPalette_Krabby: @ 8C72F94
 	.incbin "data/graphics/pokemon/palettes/krabby_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Krabby: ; 8C72FBC
+gMonBackPic_Krabby: @ 8C72FBC
 	.incbin "data/graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Krabby: ; 8C73348
+gMonShinyPalette_Krabby: @ 8C73348
 	.incbin "data/graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Krabby: ; 8C73370
+gMonIcon_Krabby: @ 8C73370
 	.incbin "data/graphics/pokemon/icons/krabby_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Krabby: ; 8C73770
+gMonFootprint_Krabby: @ 8C73770
 	.incbin "data/graphics/pokemon/footprints/krabby_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kingler: ; 8C73790
+gMonStillFrontPic_Kingler: @ 8C73790
 	.incbin "data/graphics/pokemon/still_front_pics/kingler_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kingler: ; 8C73CC4
+gMonPalette_Kingler: @ 8C73CC4
 	.incbin "data/graphics/pokemon/palettes/kingler_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kingler: ; 8C73CE8
+gMonBackPic_Kingler: @ 8C73CE8
 	.incbin "data/graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kingler: ; 8C7406C
+gMonShinyPalette_Kingler: @ 8C7406C
 	.incbin "data/graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kingler: ; 8C74090
+gMonIcon_Kingler: @ 8C74090
 	.incbin "data/graphics/pokemon/icons/kingler_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kingler: ; 8C74490
+gMonFootprint_Kingler: @ 8C74490
 	.incbin "data/graphics/pokemon/footprints/kingler_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Voltorb: ; 8C744B0
+gMonStillFrontPic_Voltorb: @ 8C744B0
 	.incbin "data/graphics/pokemon/still_front_pics/voltorb_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Voltorb: ; 8C746B8
+gMonPalette_Voltorb: @ 8C746B8
 	.incbin "data/graphics/pokemon/palettes/voltorb_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Voltorb: ; 8C746DC
+gMonBackPic_Voltorb: @ 8C746DC
 	.incbin "data/graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Voltorb: ; 8C74950
+gMonShinyPalette_Voltorb: @ 8C74950
 	.incbin "data/graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Voltorb: ; 8C74974
+gMonIcon_Voltorb: @ 8C74974
 	.incbin "data/graphics/pokemon/icons/voltorb_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Voltorb: ; 8C74D74
+gMonFootprint_Voltorb: @ 8C74D74
 	.incbin "data/graphics/pokemon/footprints/voltorb_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Electrode: ; 8C74D94
+gMonStillFrontPic_Electrode: @ 8C74D94
 	.incbin "data/graphics/pokemon/still_front_pics/electrode_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Electrode: ; 8C75000
+gMonPalette_Electrode: @ 8C75000
 	.incbin "data/graphics/pokemon/palettes/electrode_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Electrode: ; 8C75024
+gMonBackPic_Electrode: @ 8C75024
 	.incbin "data/graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Electrode: ; 8C75294
+gMonShinyPalette_Electrode: @ 8C75294
 	.incbin "data/graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Electrode: ; 8C752B8
+gMonIcon_Electrode: @ 8C752B8
 	.incbin "data/graphics/pokemon/icons/electrode_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Electrode: ; 8C756B8
+gMonFootprint_Electrode: @ 8C756B8
 	.incbin "data/graphics/pokemon/footprints/electrode_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Exeggcute: ; 8C756D8
+gMonStillFrontPic_Exeggcute: @ 8C756D8
 	.incbin "data/graphics/pokemon/still_front_pics/exeggcute_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Exeggcute: ; 8C75ADC
+gMonPalette_Exeggcute: @ 8C75ADC
 	.incbin "data/graphics/pokemon/palettes/exeggcute_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Exeggcute: ; 8C75B00
+gMonBackPic_Exeggcute: @ 8C75B00
 	.incbin "data/graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Exeggcute: ; 8C75E08
+gMonShinyPalette_Exeggcute: @ 8C75E08
 	.incbin "data/graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Exeggcute: ; 8C75E2C
+gMonIcon_Exeggcute: @ 8C75E2C
 	.incbin "data/graphics/pokemon/icons/exeggcute_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Exeggcute: ; 8C7622C
+gMonFootprint_Exeggcute: @ 8C7622C
 	.incbin "data/graphics/pokemon/footprints/exeggcute_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Exeggutor: ; 8C7624C
+gMonStillFrontPic_Exeggutor: @ 8C7624C
 	.incbin "data/graphics/pokemon/still_front_pics/exeggutor_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Exeggutor: ; 8C7674C
+gMonPalette_Exeggutor: @ 8C7674C
 	.incbin "data/graphics/pokemon/palettes/exeggutor_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Exeggutor: ; 8C76774
+gMonBackPic_Exeggutor: @ 8C76774
 	.incbin "data/graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Exeggutor: ; 8C76C14
+gMonShinyPalette_Exeggutor: @ 8C76C14
 	.incbin "data/graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Exeggutor: ; 8C76C3C
+gMonIcon_Exeggutor: @ 8C76C3C
 	.incbin "data/graphics/pokemon/icons/exeggutor_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Exeggutor: ; 8C7703C
+gMonFootprint_Exeggutor: @ 8C7703C
 	.incbin "data/graphics/pokemon/footprints/exeggutor_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cubone: ; 8C7705C
+gMonStillFrontPic_Cubone: @ 8C7705C
 	.incbin "data/graphics/pokemon/still_front_pics/cubone_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cubone: ; 8C7732C
+gMonPalette_Cubone: @ 8C7732C
 	.incbin "data/graphics/pokemon/palettes/cubone_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cubone: ; 8C77354
+gMonBackPic_Cubone: @ 8C77354
 	.incbin "data/graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cubone: ; 8C77694
+gMonShinyPalette_Cubone: @ 8C77694
 	.incbin "data/graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cubone: ; 8C776BC
+gMonIcon_Cubone: @ 8C776BC
 	.incbin "data/graphics/pokemon/icons/cubone_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cubone: ; 8C77ABC
+gMonFootprint_Cubone: @ 8C77ABC
 	.incbin "data/graphics/pokemon/footprints/cubone_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Marowak: ; 8C77ADC
+gMonStillFrontPic_Marowak: @ 8C77ADC
 	.incbin "data/graphics/pokemon/still_front_pics/marowak_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Marowak: ; 8C77E64
+gMonPalette_Marowak: @ 8C77E64
 	.incbin "data/graphics/pokemon/palettes/marowak_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Marowak: ; 8C77E8C
+gMonBackPic_Marowak: @ 8C77E8C
 	.incbin "data/graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Marowak: ; 8C781D4
+gMonShinyPalette_Marowak: @ 8C781D4
 	.incbin "data/graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Marowak: ; 8C781FC
+gMonIcon_Marowak: @ 8C781FC
 	.incbin "data/graphics/pokemon/icons/marowak_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Marowak: ; 8C785FC
+gMonFootprint_Marowak: @ 8C785FC
 	.incbin "data/graphics/pokemon/footprints/marowak_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hitmonlee: ; 8C7861C
+gMonStillFrontPic_Hitmonlee: @ 8C7861C
 	.incbin "data/graphics/pokemon/still_front_pics/hitmonlee_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hitmonlee: ; 8C78A1C
+gMonPalette_Hitmonlee: @ 8C78A1C
 	.incbin "data/graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hitmonlee: ; 8C78A44
+gMonBackPic_Hitmonlee: @ 8C78A44
 	.incbin "data/graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hitmonlee: ; 8C78CE8
+gMonShinyPalette_Hitmonlee: @ 8C78CE8
 	.incbin "data/graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hitmonlee: ; 8C78D10
+gMonIcon_Hitmonlee: @ 8C78D10
 	.incbin "data/graphics/pokemon/icons/hitmonlee_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hitmonlee: ; 8C79110
+gMonFootprint_Hitmonlee: @ 8C79110
 	.incbin "data/graphics/pokemon/footprints/hitmonlee_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hitmonchan: ; 8C79130
+gMonStillFrontPic_Hitmonchan: @ 8C79130
 	.incbin "data/graphics/pokemon/still_front_pics/hitmonchan_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hitmonchan: ; 8C79470
+gMonPalette_Hitmonchan: @ 8C79470
 	.incbin "data/graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hitmonchan: ; 8C79498
+gMonBackPic_Hitmonchan: @ 8C79498
 	.incbin "data/graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hitmonchan: ; 8C797DC
+gMonShinyPalette_Hitmonchan: @ 8C797DC
 	.incbin "data/graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hitmonchan: ; 8C79804
+gMonIcon_Hitmonchan: @ 8C79804
 	.incbin "data/graphics/pokemon/icons/hitmonchan_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hitmonchan: ; 8C79C04
+gMonFootprint_Hitmonchan: @ 8C79C04
 	.incbin "data/graphics/pokemon/footprints/hitmonchan_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lickitung: ; 8C79C24
+gMonStillFrontPic_Lickitung: @ 8C79C24
 	.incbin "data/graphics/pokemon/still_front_pics/lickitung_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lickitung: ; 8C79FDC
+gMonPalette_Lickitung: @ 8C79FDC
 	.incbin "data/graphics/pokemon/palettes/lickitung_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lickitung: ; 8C7A004
+gMonBackPic_Lickitung: @ 8C7A004
 	.incbin "data/graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lickitung: ; 8C7A2C4
+gMonShinyPalette_Lickitung: @ 8C7A2C4
 	.incbin "data/graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lickitung: ; 8C7A2EC
+gMonIcon_Lickitung: @ 8C7A2EC
 	.incbin "data/graphics/pokemon/icons/lickitung_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lickitung: ; 8C7A6EC
+gMonFootprint_Lickitung: @ 8C7A6EC
 	.incbin "data/graphics/pokemon/footprints/lickitung_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Koffing: ; 8C7A70C
+gMonStillFrontPic_Koffing: @ 8C7A70C
 	.incbin "data/graphics/pokemon/still_front_pics/koffing_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Koffing: ; 8C7AA68
+gMonPalette_Koffing: @ 8C7AA68
 	.incbin "data/graphics/pokemon/palettes/koffing_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Koffing: ; 8C7AA90
+gMonBackPic_Koffing: @ 8C7AA90
 	.incbin "data/graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Koffing: ; 8C7AD90
+gMonShinyPalette_Koffing: @ 8C7AD90
 	.incbin "data/graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Koffing: ; 8C7ADB8
+gMonIcon_Koffing: @ 8C7ADB8
 	.incbin "data/graphics/pokemon/icons/koffing_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Koffing: ; 8C7B1B8
+gMonFootprint_Koffing: @ 8C7B1B8
 	.incbin "data/graphics/pokemon/footprints/koffing_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Weezing: ; 8C7B1D8
+gMonStillFrontPic_Weezing: @ 8C7B1D8
 	.incbin "data/graphics/pokemon/still_front_pics/weezing_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Weezing: ; 8C7B660
+gMonPalette_Weezing: @ 8C7B660
 	.incbin "data/graphics/pokemon/palettes/weezing_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Weezing: ; 8C7B688
+gMonBackPic_Weezing: @ 8C7B688
 	.incbin "data/graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Weezing: ; 8C7B9B8
+gMonShinyPalette_Weezing: @ 8C7B9B8
 	.incbin "data/graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Weezing: ; 8C7B9E0
+gMonIcon_Weezing: @ 8C7B9E0
 	.incbin "data/graphics/pokemon/icons/weezing_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Weezing: ; 8C7BDE0
+gMonFootprint_Weezing: @ 8C7BDE0
 	.incbin "data/graphics/pokemon/footprints/weezing_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Rhyhorn: ; 8C7BE00
+gMonStillFrontPic_Rhyhorn: @ 8C7BE00
 	.incbin "data/graphics/pokemon/still_front_pics/rhyhorn_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Rhyhorn: ; 8C7C204
+gMonPalette_Rhyhorn: @ 8C7C204
 	.incbin "data/graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Rhyhorn: ; 8C7C224
+gMonBackPic_Rhyhorn: @ 8C7C224
 	.incbin "data/graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Rhyhorn: ; 8C7C56C
+gMonShinyPalette_Rhyhorn: @ 8C7C56C
 	.incbin "data/graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Rhyhorn: ; 8C7C58C
+gMonIcon_Rhyhorn: @ 8C7C58C
 	.incbin "data/graphics/pokemon/icons/rhyhorn_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Rhyhorn: ; 8C7C98C
+gMonFootprint_Rhyhorn: @ 8C7C98C
 	.incbin "data/graphics/pokemon/footprints/rhyhorn_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Rhydon: ; 8C7C9AC
+gMonStillFrontPic_Rhydon: @ 8C7C9AC
 	.incbin "data/graphics/pokemon/still_front_pics/rhydon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Rhydon: ; 8C7CEB4
+gMonPalette_Rhydon: @ 8C7CEB4
 	.incbin "data/graphics/pokemon/palettes/rhydon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Rhydon: ; 8C7CEDC
+gMonBackPic_Rhydon: @ 8C7CEDC
 	.incbin "data/graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Rhydon: ; 8C7D32C
+gMonShinyPalette_Rhydon: @ 8C7D32C
 	.incbin "data/graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Rhydon: ; 8C7D354
+gMonIcon_Rhydon: @ 8C7D354
 	.incbin "data/graphics/pokemon/icons/rhydon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Rhydon: ; 8C7D754
+gMonFootprint_Rhydon: @ 8C7D754
 	.incbin "data/graphics/pokemon/footprints/rhydon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Chansey: ; 8C7D774
+gMonStillFrontPic_Chansey: @ 8C7D774
 	.incbin "data/graphics/pokemon/still_front_pics/chansey_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Chansey: ; 8C7DAC8
+gMonPalette_Chansey: @ 8C7DAC8
 	.incbin "data/graphics/pokemon/palettes/chansey_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Chansey: ; 8C7DAEC
+gMonBackPic_Chansey: @ 8C7DAEC
 	.incbin "data/graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Chansey: ; 8C7DDC0
+gMonShinyPalette_Chansey: @ 8C7DDC0
 	.incbin "data/graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Chansey: ; 8C7DDE4
+gMonIcon_Chansey: @ 8C7DDE4
 	.incbin "data/graphics/pokemon/icons/chansey_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Chansey: ; 8C7E1E4
+gMonFootprint_Chansey: @ 8C7E1E4
 	.incbin "data/graphics/pokemon/footprints/chansey_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tangela: ; 8C7E204
+gMonStillFrontPic_Tangela: @ 8C7E204
 	.incbin "data/graphics/pokemon/still_front_pics/tangela_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tangela: ; 8C7E5D8
+gMonPalette_Tangela: @ 8C7E5D8
 	.incbin "data/graphics/pokemon/palettes/tangela_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tangela: ; 8C7E5FC
+gMonBackPic_Tangela: @ 8C7E5FC
 	.incbin "data/graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tangela: ; 8C7E9A8
+gMonShinyPalette_Tangela: @ 8C7E9A8
 	.incbin "data/graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tangela: ; 8C7E9CC
+gMonIcon_Tangela: @ 8C7E9CC
 	.incbin "data/graphics/pokemon/icons/tangela_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tangela: ; 8C7EDCC
+gMonFootprint_Tangela: @ 8C7EDCC
 	.incbin "data/graphics/pokemon/footprints/tangela_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kangaskhan: ; 8C7EDEC
+gMonStillFrontPic_Kangaskhan: @ 8C7EDEC
 	.incbin "data/graphics/pokemon/still_front_pics/kangaskhan_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kangaskhan: ; 8C7F2E4
+gMonPalette_Kangaskhan: @ 8C7F2E4
 	.incbin "data/graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kangaskhan: ; 8C7F30C
+gMonBackPic_Kangaskhan: @ 8C7F30C
 	.incbin "data/graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kangaskhan: ; 8C7F73C
+gMonShinyPalette_Kangaskhan: @ 8C7F73C
 	.incbin "data/graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kangaskhan: ; 8C7F764
+gMonIcon_Kangaskhan: @ 8C7F764
 	.incbin "data/graphics/pokemon/icons/kangaskhan_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kangaskhan: ; 8C7FB64
+gMonFootprint_Kangaskhan: @ 8C7FB64
 	.incbin "data/graphics/pokemon/footprints/kangaskhan_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Horsea: ; 8C7FB84
+gMonStillFrontPic_Horsea: @ 8C7FB84
 	.incbin "data/graphics/pokemon/still_front_pics/horsea_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Horsea: ; 8C7FDFC
+gMonPalette_Horsea: @ 8C7FDFC
 	.incbin "data/graphics/pokemon/palettes/horsea_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Horsea: ; 8C7FE24
+gMonBackPic_Horsea: @ 8C7FE24
 	.incbin "data/graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Horsea: ; 8C80104
+gMonShinyPalette_Horsea: @ 8C80104
 	.incbin "data/graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Horsea: ; 8C8012C
+gMonIcon_Horsea: @ 8C8012C
 	.incbin "data/graphics/pokemon/icons/horsea_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Horsea: ; 8C8052C
+gMonFootprint_Horsea: @ 8C8052C
 	.incbin "data/graphics/pokemon/footprints/horsea_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Seadra: ; 8C8054C
+gMonStillFrontPic_Seadra: @ 8C8054C
 	.incbin "data/graphics/pokemon/still_front_pics/seadra_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Seadra: ; 8C8090C
+gMonPalette_Seadra: @ 8C8090C
 	.incbin "data/graphics/pokemon/palettes/seadra_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Seadra: ; 8C80934
+gMonBackPic_Seadra: @ 8C80934
 	.incbin "data/graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Seadra: ; 8C80CD4
+gMonShinyPalette_Seadra: @ 8C80CD4
 	.incbin "data/graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Seadra: ; 8C80CFC
+gMonIcon_Seadra: @ 8C80CFC
 	.incbin "data/graphics/pokemon/icons/seadra_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Seadra: ; 8C810FC
+gMonFootprint_Seadra: @ 8C810FC
 	.incbin "data/graphics/pokemon/footprints/seadra_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Goldeen: ; 8C8111C
+gMonStillFrontPic_Goldeen: @ 8C8111C
 	.incbin "data/graphics/pokemon/still_front_pics/goldeen_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Goldeen: ; 8C81484
+gMonPalette_Goldeen: @ 8C81484
 	.incbin "data/graphics/pokemon/palettes/goldeen_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Goldeen: ; 8C814AC
+gMonBackPic_Goldeen: @ 8C814AC
 	.incbin "data/graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Goldeen: ; 8C8181C
+gMonShinyPalette_Goldeen: @ 8C8181C
 	.incbin "data/graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Goldeen: ; 8C81844
+gMonIcon_Goldeen: @ 8C81844
 	.incbin "data/graphics/pokemon/icons/goldeen_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Goldeen: ; 8C81C44
+gMonFootprint_Goldeen: @ 8C81C44
 	.incbin "data/graphics/pokemon/footprints/goldeen_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Seaking: ; 8C81C64
+gMonStillFrontPic_Seaking: @ 8C81C64
 	.incbin "data/graphics/pokemon/still_front_pics/seaking_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Seaking: ; 8C820D8
+gMonPalette_Seaking: @ 8C820D8
 	.incbin "data/graphics/pokemon/palettes/seaking_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Seaking: ; 8C82100
+gMonBackPic_Seaking: @ 8C82100
 	.incbin "data/graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Seaking: ; 8C82450
+gMonShinyPalette_Seaking: @ 8C82450
 	.incbin "data/graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Seaking: ; 8C82478
+gMonIcon_Seaking: @ 8C82478
 	.incbin "data/graphics/pokemon/icons/seaking_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Seaking: ; 8C82878
+gMonFootprint_Seaking: @ 8C82878
 	.incbin "data/graphics/pokemon/footprints/seaking_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Staryu: ; 8C82898
+gMonStillFrontPic_Staryu: @ 8C82898
 	.incbin "data/graphics/pokemon/still_front_pics/staryu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Staryu: ; 8C82B7C
+gMonPalette_Staryu: @ 8C82B7C
 	.incbin "data/graphics/pokemon/palettes/staryu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Staryu: ; 8C82BA4
+gMonBackPic_Staryu: @ 8C82BA4
 	.incbin "data/graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Staryu: ; 8C82E30
+gMonShinyPalette_Staryu: @ 8C82E30
 	.incbin "data/graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Staryu: ; 8C82E58
+gMonIcon_Staryu: @ 8C82E58
 	.incbin "data/graphics/pokemon/icons/staryu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Staryu: ; 8C83258
+gMonFootprint_Staryu: @ 8C83258
 	.incbin "data/graphics/pokemon/footprints/staryu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Starmie: ; 8C83278
+gMonStillFrontPic_Starmie: @ 8C83278
 	.incbin "data/graphics/pokemon/still_front_pics/starmie_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Starmie: ; 8C836A0
+gMonPalette_Starmie: @ 8C836A0
 	.incbin "data/graphics/pokemon/palettes/starmie_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Starmie: ; 8C836C8
+gMonBackPic_Starmie: @ 8C836C8
 	.incbin "data/graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Starmie: ; 8C8396C
+gMonShinyPalette_Starmie: @ 8C8396C
 	.incbin "data/graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Starmie: ; 8C83994
+gMonIcon_Starmie: @ 8C83994
 	.incbin "data/graphics/pokemon/icons/starmie_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Starmie: ; 8C83D94
+gMonFootprint_Starmie: @ 8C83D94
 	.incbin "data/graphics/pokemon/footprints/starmie_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mrmime: ; 8C83DB4
+gMonStillFrontPic_Mrmime: @ 8C83DB4
 	.incbin "data/graphics/pokemon/still_front_pics/mr_mime_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mrmime: ; 8C84164
+gMonPalette_Mrmime: @ 8C84164
 	.incbin "data/graphics/pokemon/palettes/mr_mime_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mrmime: ; 8C8418C
+gMonBackPic_Mrmime: @ 8C8418C
 	.incbin "data/graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mrmime: ; 8C844C0
+gMonShinyPalette_Mrmime: @ 8C844C0
 	.incbin "data/graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mrmime: ; 8C844E8
+gMonIcon_Mrmime: @ 8C844E8
 	.incbin "data/graphics/pokemon/icons/mr_mime_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mrmime: ; 8C848E8
+gMonFootprint_Mrmime: @ 8C848E8
 	.incbin "data/graphics/pokemon/footprints/mr_mime_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Scyther: ; 8C84908
+gMonStillFrontPic_Scyther: @ 8C84908
 	.incbin "data/graphics/pokemon/still_front_pics/scyther_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Scyther: ; 8C84DB4
+gMonPalette_Scyther: @ 8C84DB4
 	.incbin "data/graphics/pokemon/palettes/scyther_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Scyther: ; 8C84DDC
+gMonBackPic_Scyther: @ 8C84DDC
 	.incbin "data/graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Scyther: ; 8C85184
+gMonShinyPalette_Scyther: @ 8C85184
 	.incbin "data/graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Scyther: ; 8C851AC
+gMonIcon_Scyther: @ 8C851AC
 	.incbin "data/graphics/pokemon/icons/scyther_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Scyther: ; 8C855AC
+gMonFootprint_Scyther: @ 8C855AC
 	.incbin "data/graphics/pokemon/footprints/scyther_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Jynx: ; 8C855CC
+gMonStillFrontPic_Jynx: @ 8C855CC
 	.incbin "data/graphics/pokemon/still_front_pics/jynx_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Jynx: ; 8C85A68
+gMonPalette_Jynx: @ 8C85A68
 	.incbin "data/graphics/pokemon/palettes/jynx_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Jynx: ; 8C85A90
+gMonBackPic_Jynx: @ 8C85A90
 	.incbin "data/graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Jynx: ; 8C85D88
+gMonShinyPalette_Jynx: @ 8C85D88
 	.incbin "data/graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Jynx: ; 8C85DB0
+gMonIcon_Jynx: @ 8C85DB0
 	.incbin "data/graphics/pokemon/icons/jynx_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Jynx: ; 8C861B0
+gMonFootprint_Jynx: @ 8C861B0
 	.incbin "data/graphics/pokemon/footprints/jynx_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Electabuzz: ; 8C861D0
+gMonStillFrontPic_Electabuzz: @ 8C861D0
 	.incbin "data/graphics/pokemon/still_front_pics/electabuzz_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Electabuzz: ; 8C8664C
+gMonPalette_Electabuzz: @ 8C8664C
 	.incbin "data/graphics/pokemon/palettes/electabuzz_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Electabuzz: ; 8C86674
+gMonBackPic_Electabuzz: @ 8C86674
 	.incbin "data/graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Electabuzz: ; 8C86984
+gMonShinyPalette_Electabuzz: @ 8C86984
 	.incbin "data/graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Electabuzz: ; 8C869AC
+gMonIcon_Electabuzz: @ 8C869AC
 	.incbin "data/graphics/pokemon/icons/electabuzz_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Electabuzz: ; 8C86DAC
+gMonFootprint_Electabuzz: @ 8C86DAC
 	.incbin "data/graphics/pokemon/footprints/electabuzz_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magmar: ; 8C86DCC
+gMonStillFrontPic_Magmar: @ 8C86DCC
 	.incbin "data/graphics/pokemon/still_front_pics/magmar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magmar: ; 8C87274
+gMonPalette_Magmar: @ 8C87274
 	.incbin "data/graphics/pokemon/palettes/magmar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magmar: ; 8C8729C
+gMonBackPic_Magmar: @ 8C8729C
 	.incbin "data/graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magmar: ; 8C875E4
+gMonShinyPalette_Magmar: @ 8C875E4
 	.incbin "data/graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magmar: ; 8C8760C
+gMonIcon_Magmar: @ 8C8760C
 	.incbin "data/graphics/pokemon/icons/magmar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magmar: ; 8C87A0C
+gMonFootprint_Magmar: @ 8C87A0C
 	.incbin "data/graphics/pokemon/footprints/magmar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pinsir: ; 8C87A2C
+gMonStillFrontPic_Pinsir: @ 8C87A2C
 	.incbin "data/graphics/pokemon/still_front_pics/pinsir_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pinsir: ; 8C87E54
+gMonPalette_Pinsir: @ 8C87E54
 	.incbin "data/graphics/pokemon/palettes/pinsir_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pinsir: ; 8C87E78
+gMonBackPic_Pinsir: @ 8C87E78
 	.incbin "data/graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pinsir: ; 8C881CC
+gMonShinyPalette_Pinsir: @ 8C881CC
 	.incbin "data/graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pinsir: ; 8C881F0
+gMonIcon_Pinsir: @ 8C881F0
 	.incbin "data/graphics/pokemon/icons/pinsir_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pinsir: ; 8C885F0
+gMonFootprint_Pinsir: @ 8C885F0
 	.incbin "data/graphics/pokemon/footprints/pinsir_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tauros: ; 8C88610
+gMonStillFrontPic_Tauros: @ 8C88610
 	.incbin "data/graphics/pokemon/still_front_pics/tauros_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tauros: ; 8C88AE0
+gMonPalette_Tauros: @ 8C88AE0
 	.incbin "data/graphics/pokemon/palettes/tauros_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tauros: ; 8C88B08
+gMonBackPic_Tauros: @ 8C88B08
 	.incbin "data/graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tauros: ; 8C88DBC
+gMonShinyPalette_Tauros: @ 8C88DBC
 	.incbin "data/graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tauros: ; 8C88DE4
+gMonIcon_Tauros: @ 8C88DE4
 	.incbin "data/graphics/pokemon/icons/tauros_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tauros: ; 8C891E4
+gMonFootprint_Tauros: @ 8C891E4
 	.incbin "data/graphics/pokemon/footprints/tauros_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magikarp: ; 8C89204
+gMonStillFrontPic_Magikarp: @ 8C89204
 	.incbin "data/graphics/pokemon/still_front_pics/magikarp_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magikarp: ; 8C89554
+gMonPalette_Magikarp: @ 8C89554
 	.incbin "data/graphics/pokemon/palettes/magikarp_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magikarp: ; 8C8957C
+gMonBackPic_Magikarp: @ 8C8957C
 	.incbin "data/graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magikarp: ; 8C898AC
+gMonShinyPalette_Magikarp: @ 8C898AC
 	.incbin "data/graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magikarp: ; 8C898D4
+gMonIcon_Magikarp: @ 8C898D4
 	.incbin "data/graphics/pokemon/icons/magikarp_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magikarp: ; 8C89CD4
+gMonFootprint_Magikarp: @ 8C89CD4
 	.incbin "data/graphics/pokemon/footprints/magikarp_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gyarados: ; 8C89CF4
+gMonStillFrontPic_Gyarados: @ 8C89CF4
 	.incbin "data/graphics/pokemon/still_front_pics/gyarados_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gyarados: ; 8C8A25C
+gMonPalette_Gyarados: @ 8C8A25C
 	.incbin "data/graphics/pokemon/palettes/gyarados_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gyarados: ; 8C8A284
+gMonBackPic_Gyarados: @ 8C8A284
 	.incbin "data/graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gyarados: ; 8C8A758
+gMonShinyPalette_Gyarados: @ 8C8A758
 	.incbin "data/graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gyarados: ; 8C8A780
+gMonIcon_Gyarados: @ 8C8A780
 	.incbin "data/graphics/pokemon/icons/gyarados_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gyarados: ; 8C8AB80
+gMonFootprint_Gyarados: @ 8C8AB80
 	.incbin "data/graphics/pokemon/footprints/gyarados_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lapras: ; 8C8ABA0
+gMonStillFrontPic_Lapras: @ 8C8ABA0
 	.incbin "data/graphics/pokemon/still_front_pics/lapras_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lapras: ; 8C8AF60
+gMonPalette_Lapras: @ 8C8AF60
 	.incbin "data/graphics/pokemon/palettes/lapras_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lapras: ; 8C8AF88
+gMonBackPic_Lapras: @ 8C8AF88
 	.incbin "data/graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lapras: ; 8C8B2CC
+gMonShinyPalette_Lapras: @ 8C8B2CC
 	.incbin "data/graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lapras: ; 8C8B2F4
+gMonIcon_Lapras: @ 8C8B2F4
 	.incbin "data/graphics/pokemon/icons/lapras_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lapras: ; 8C8B6F4
+gMonFootprint_Lapras: @ 8C8B6F4
 	.incbin "data/graphics/pokemon/footprints/lapras_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ditto: ; 8C8B714
+gMonStillFrontPic_Ditto: @ 8C8B714
 	.incbin "data/graphics/pokemon/still_front_pics/ditto_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ditto: ; 8C8B904
+gMonPalette_Ditto: @ 8C8B904
 	.incbin "data/graphics/pokemon/palettes/ditto_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ditto: ; 8C8B924
+gMonBackPic_Ditto: @ 8C8B924
 	.incbin "data/graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ditto: ; 8C8BB24
+gMonShinyPalette_Ditto: @ 8C8BB24
 	.incbin "data/graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ditto: ; 8C8BB44
+gMonIcon_Ditto: @ 8C8BB44
 	.incbin "data/graphics/pokemon/icons/ditto_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ditto: ; 8C8BF44
+gMonFootprint_Ditto: @ 8C8BF44
 	.incbin "data/graphics/pokemon/footprints/ditto_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Eevee: ; 8C8BF64
+gMonStillFrontPic_Eevee: @ 8C8BF64
 	.incbin "data/graphics/pokemon/still_front_pics/eevee_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Eevee: ; 8C8C208
+gMonPalette_Eevee: @ 8C8C208
 	.incbin "data/graphics/pokemon/palettes/eevee_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Eevee: ; 8C8C22C
+gMonBackPic_Eevee: @ 8C8C22C
 	.incbin "data/graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Eevee: ; 8C8C554
+gMonShinyPalette_Eevee: @ 8C8C554
 	.incbin "data/graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Eevee: ; 8C8C578
+gMonIcon_Eevee: @ 8C8C578
 	.incbin "data/graphics/pokemon/icons/eevee_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Eevee: ; 8C8C978
+gMonFootprint_Eevee: @ 8C8C978
 	.incbin "data/graphics/pokemon/footprints/eevee_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Vaporeon: ; 8C8C998
+gMonStillFrontPic_Vaporeon: @ 8C8C998
 	.incbin "data/graphics/pokemon/still_front_pics/vaporeon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Vaporeon: ; 8C8CD2C
+gMonPalette_Vaporeon: @ 8C8CD2C
 	.incbin "data/graphics/pokemon/palettes/vaporeon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Vaporeon: ; 8C8CD54
+gMonBackPic_Vaporeon: @ 8C8CD54
 	.incbin "data/graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Vaporeon: ; 8C8D01C
+gMonShinyPalette_Vaporeon: @ 8C8D01C
 	.incbin "data/graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Vaporeon: ; 8C8D044
+gMonIcon_Vaporeon: @ 8C8D044
 	.incbin "data/graphics/pokemon/icons/vaporeon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Vaporeon: ; 8C8D444
+gMonFootprint_Vaporeon: @ 8C8D444
 	.incbin "data/graphics/pokemon/footprints/vaporeon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Jolteon: ; 8C8D464
+gMonStillFrontPic_Jolteon: @ 8C8D464
 	.incbin "data/graphics/pokemon/still_front_pics/jolteon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Jolteon: ; 8C8D804
+gMonPalette_Jolteon: @ 8C8D804
 	.incbin "data/graphics/pokemon/palettes/jolteon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Jolteon: ; 8C8D82C
+gMonBackPic_Jolteon: @ 8C8D82C
 	.incbin "data/graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Jolteon: ; 8C8DBBC
+gMonShinyPalette_Jolteon: @ 8C8DBBC
 	.incbin "data/graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Jolteon: ; 8C8DBE4
+gMonIcon_Jolteon: @ 8C8DBE4
 	.incbin "data/graphics/pokemon/icons/jolteon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Jolteon: ; 8C8DFE4
+gMonFootprint_Jolteon: @ 8C8DFE4
 	.incbin "data/graphics/pokemon/footprints/jolteon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Flareon: ; 8C8E004
+gMonStillFrontPic_Flareon: @ 8C8E004
 	.incbin "data/graphics/pokemon/still_front_pics/flareon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Flareon: ; 8C8E380
+gMonPalette_Flareon: @ 8C8E380
 	.incbin "data/graphics/pokemon/palettes/flareon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Flareon: ; 8C8E3A8
+gMonBackPic_Flareon: @ 8C8E3A8
 	.incbin "data/graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Flareon: ; 8C8E738
+gMonShinyPalette_Flareon: @ 8C8E738
 	.incbin "data/graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Flareon: ; 8C8E760
+gMonIcon_Flareon: @ 8C8E760
 	.incbin "data/graphics/pokemon/icons/flareon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Flareon: ; 8C8EB60
+gMonFootprint_Flareon: @ 8C8EB60
 	.incbin "data/graphics/pokemon/footprints/flareon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Porygon: ; 8C8EB80
+gMonStillFrontPic_Porygon: @ 8C8EB80
 	.incbin "data/graphics/pokemon/still_front_pics/porygon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Porygon: ; 8C8EE3C
+gMonPalette_Porygon: @ 8C8EE3C
 	.incbin "data/graphics/pokemon/palettes/porygon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Porygon: ; 8C8EE60
+gMonBackPic_Porygon: @ 8C8EE60
 	.incbin "data/graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Porygon: ; 8C8F118
+gMonShinyPalette_Porygon: @ 8C8F118
 	.incbin "data/graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Porygon: ; 8C8F13C
+gMonIcon_Porygon: @ 8C8F13C
 	.incbin "data/graphics/pokemon/icons/porygon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Porygon: ; 8C8F53C
+gMonFootprint_Porygon: @ 8C8F53C
 	.incbin "data/graphics/pokemon/footprints/porygon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Omanyte: ; 8C8F55C
+gMonStillFrontPic_Omanyte: @ 8C8F55C
 	.incbin "data/graphics/pokemon/still_front_pics/omanyte_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Omanyte: ; 8C8F804
+gMonPalette_Omanyte: @ 8C8F804
 	.incbin "data/graphics/pokemon/palettes/omanyte_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Omanyte: ; 8C8F82C
+gMonBackPic_Omanyte: @ 8C8F82C
 	.incbin "data/graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Omanyte: ; 8C8FB78
+gMonShinyPalette_Omanyte: @ 8C8FB78
 	.incbin "data/graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Omanyte: ; 8C8FBA0
+gMonIcon_Omanyte: @ 8C8FBA0
 	.incbin "data/graphics/pokemon/icons/omanyte_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Omanyte: ; 8C8FFA0
+gMonFootprint_Omanyte: @ 8C8FFA0
 	.incbin "data/graphics/pokemon/footprints/omanyte_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Omastar: ; 8C8FFC0
+gMonStillFrontPic_Omastar: @ 8C8FFC0
 	.incbin "data/graphics/pokemon/still_front_pics/omastar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Omastar: ; 8C90380
+gMonPalette_Omastar: @ 8C90380
 	.incbin "data/graphics/pokemon/palettes/omastar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Omastar: ; 8C903A8
+gMonBackPic_Omastar: @ 8C903A8
 	.incbin "data/graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Omastar: ; 8C906E8
+gMonShinyPalette_Omastar: @ 8C906E8
 	.incbin "data/graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Omastar: ; 8C90710
+gMonIcon_Omastar: @ 8C90710
 	.incbin "data/graphics/pokemon/icons/omastar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Omastar: ; 8C90B10
+gMonFootprint_Omastar: @ 8C90B10
 	.incbin "data/graphics/pokemon/footprints/omastar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kabuto: ; 8C90B30
+gMonStillFrontPic_Kabuto: @ 8C90B30
 	.incbin "data/graphics/pokemon/still_front_pics/kabuto_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kabuto: ; 8C90DA0
+gMonPalette_Kabuto: @ 8C90DA0
 	.incbin "data/graphics/pokemon/palettes/kabuto_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kabuto: ; 8C90DC8
+gMonBackPic_Kabuto: @ 8C90DC8
 	.incbin "data/graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kabuto: ; 8C91060
+gMonShinyPalette_Kabuto: @ 8C91060
 	.incbin "data/graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kabuto: ; 8C91088
+gMonIcon_Kabuto: @ 8C91088
 	.incbin "data/graphics/pokemon/icons/kabuto_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kabuto: ; 8C91488
+gMonFootprint_Kabuto: @ 8C91488
 	.incbin "data/graphics/pokemon/footprints/kabuto_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kabutops: ; 8C914A8
+gMonStillFrontPic_Kabutops: @ 8C914A8
 	.incbin "data/graphics/pokemon/still_front_pics/kabutops_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kabutops: ; 8C918A8
+gMonPalette_Kabutops: @ 8C918A8
 	.incbin "data/graphics/pokemon/palettes/kabutops_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kabutops: ; 8C918CC
+gMonBackPic_Kabutops: @ 8C918CC
 	.incbin "data/graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kabutops: ; 8C91C70
+gMonShinyPalette_Kabutops: @ 8C91C70
 	.incbin "data/graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kabutops: ; 8C91C94
+gMonIcon_Kabutops: @ 8C91C94
 	.incbin "data/graphics/pokemon/icons/kabutops_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kabutops: ; 8C92094
+gMonFootprint_Kabutops: @ 8C92094
 	.incbin "data/graphics/pokemon/footprints/kabutops_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Aerodactyl: ; 8C920B4
+gMonStillFrontPic_Aerodactyl: @ 8C920B4
 	.incbin "data/graphics/pokemon/still_front_pics/aerodactyl_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Aerodactyl: ; 8C92534
+gMonPalette_Aerodactyl: @ 8C92534
 	.incbin "data/graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Aerodactyl: ; 8C9255C
+gMonBackPic_Aerodactyl: @ 8C9255C
 	.incbin "data/graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Aerodactyl: ; 8C92860
+gMonShinyPalette_Aerodactyl: @ 8C92860
 	.incbin "data/graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Aerodactyl: ; 8C92888
+gMonIcon_Aerodactyl: @ 8C92888
 	.incbin "data/graphics/pokemon/icons/aerodactyl_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Aerodactyl: ; 8C92C88
+gMonFootprint_Aerodactyl: @ 8C92C88
 	.incbin "data/graphics/pokemon/footprints/aerodactyl_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Snorlax: ; 8C92CA8
+gMonStillFrontPic_Snorlax: @ 8C92CA8
 	.incbin "data/graphics/pokemon/still_front_pics/snorlax_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Snorlax: ; 8C930EC
+gMonPalette_Snorlax: @ 8C930EC
 	.incbin "data/graphics/pokemon/palettes/snorlax_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Snorlax: ; 8C93114
+gMonBackPic_Snorlax: @ 8C93114
 	.incbin "data/graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Snorlax: ; 8C93330
+gMonShinyPalette_Snorlax: @ 8C93330
 	.incbin "data/graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Snorlax: ; 8C93358
+gMonIcon_Snorlax: @ 8C93358
 	.incbin "data/graphics/pokemon/icons/snorlax_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Snorlax: ; 8C93758
+gMonFootprint_Snorlax: @ 8C93758
 	.incbin "data/graphics/pokemon/footprints/snorlax_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Articuno: ; 8C93778
+gMonStillFrontPic_Articuno: @ 8C93778
 	.incbin "data/graphics/pokemon/still_front_pics/articuno_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Articuno: ; 8C93C70
+gMonPalette_Articuno: @ 8C93C70
 	.incbin "data/graphics/pokemon/palettes/articuno_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Articuno: ; 8C93C98
+gMonBackPic_Articuno: @ 8C93C98
 	.incbin "data/graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Articuno: ; 8C93EF4
+gMonShinyPalette_Articuno: @ 8C93EF4
 	.incbin "data/graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Articuno: ; 8C93F1C
+gMonIcon_Articuno: @ 8C93F1C
 	.incbin "data/graphics/pokemon/icons/articuno_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Articuno: ; 8C9431C
+gMonFootprint_Articuno: @ 8C9431C
 	.incbin "data/graphics/pokemon/footprints/articuno_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Zapdos: ; 8C9433C
+gMonStillFrontPic_Zapdos: @ 8C9433C
 	.incbin "data/graphics/pokemon/still_front_pics/zapdos_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Zapdos: ; 8C947B0
+gMonPalette_Zapdos: @ 8C947B0
 	.incbin "data/graphics/pokemon/palettes/zapdos_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Zapdos: ; 8C947D8
+gMonBackPic_Zapdos: @ 8C947D8
 	.incbin "data/graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Zapdos: ; 8C94B14
+gMonShinyPalette_Zapdos: @ 8C94B14
 	.incbin "data/graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Zapdos: ; 8C94B3C
+gMonIcon_Zapdos: @ 8C94B3C
 	.incbin "data/graphics/pokemon/icons/zapdos_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Zapdos: ; 8C94F3C
+gMonFootprint_Zapdos: @ 8C94F3C
 	.incbin "data/graphics/pokemon/footprints/zapdos_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Moltres: ; 8C94F5C
+gMonStillFrontPic_Moltres: @ 8C94F5C
 	.incbin "data/graphics/pokemon/still_front_pics/moltres_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Moltres: ; 8C9550C
+gMonPalette_Moltres: @ 8C9550C
 	.incbin "data/graphics/pokemon/palettes/moltres_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Moltres: ; 8C95534
+gMonBackPic_Moltres: @ 8C95534
 	.incbin "data/graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Moltres: ; 8C95870
+gMonShinyPalette_Moltres: @ 8C95870
 	.incbin "data/graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Moltres: ; 8C95898
+gMonIcon_Moltres: @ 8C95898
 	.incbin "data/graphics/pokemon/icons/moltres_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Moltres: ; 8C95C98
+gMonFootprint_Moltres: @ 8C95C98
 	.incbin "data/graphics/pokemon/footprints/moltres_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dratini: ; 8C95CB8
+gMonStillFrontPic_Dratini: @ 8C95CB8
 	.incbin "data/graphics/pokemon/still_front_pics/dratini_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dratini: ; 8C95F70
+gMonPalette_Dratini: @ 8C95F70
 	.incbin "data/graphics/pokemon/palettes/dratini_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dratini: ; 8C95F94
+gMonBackPic_Dratini: @ 8C95F94
 	.incbin "data/graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dratini: ; 8C96224
+gMonShinyPalette_Dratini: @ 8C96224
 	.incbin "data/graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dratini: ; 8C96248
+gMonIcon_Dratini: @ 8C96248
 	.incbin "data/graphics/pokemon/icons/dratini_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dratini: ; 8C96648
+gMonFootprint_Dratini: @ 8C96648
 	.incbin "data/graphics/pokemon/footprints/dratini_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dragonair: ; 8C96668
+gMonStillFrontPic_Dragonair: @ 8C96668
 	.incbin "data/graphics/pokemon/still_front_pics/dragonair_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dragonair: ; 8C969C8
+gMonPalette_Dragonair: @ 8C969C8
 	.incbin "data/graphics/pokemon/palettes/dragonair_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dragonair: ; 8C969F0
+gMonBackPic_Dragonair: @ 8C969F0
 	.incbin "data/graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dragonair: ; 8C96D00
+gMonShinyPalette_Dragonair: @ 8C96D00
 	.incbin "data/graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dragonair: ; 8C96D28
+gMonIcon_Dragonair: @ 8C96D28
 	.incbin "data/graphics/pokemon/icons/dragonair_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dragonair: ; 8C97128
+gMonFootprint_Dragonair: @ 8C97128
 	.incbin "data/graphics/pokemon/footprints/dragonair_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dragonite: ; 8C97148
+gMonStillFrontPic_Dragonite: @ 8C97148
 	.incbin "data/graphics/pokemon/still_front_pics/dragonite_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dragonite: ; 8C976B8
+gMonPalette_Dragonite: @ 8C976B8
 	.incbin "data/graphics/pokemon/palettes/dragonite_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dragonite: ; 8C976E0
+gMonBackPic_Dragonite: @ 8C976E0
 	.incbin "data/graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dragonite: ; 8C979DC
+gMonShinyPalette_Dragonite: @ 8C979DC
 	.incbin "data/graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dragonite: ; 8C97A04
+gMonIcon_Dragonite: @ 8C97A04
 	.incbin "data/graphics/pokemon/icons/dragonite_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dragonite: ; 8C97E04
+gMonFootprint_Dragonite: @ 8C97E04
 	.incbin "data/graphics/pokemon/footprints/dragonite_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mewtwo: ; 8C97E24
+gMonStillFrontPic_Mewtwo: @ 8C97E24
 	.incbin "data/graphics/pokemon/still_front_pics/mewtwo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mewtwo: ; 8C98260
+gMonPalette_Mewtwo: @ 8C98260
 	.incbin "data/graphics/pokemon/palettes/mewtwo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mewtwo: ; 8C98284
+gMonBackPic_Mewtwo: @ 8C98284
 	.incbin "data/graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mewtwo: ; 8C98650
+gMonShinyPalette_Mewtwo: @ 8C98650
 	.incbin "data/graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mewtwo: ; 8C98674
+gMonIcon_Mewtwo: @ 8C98674
 	.incbin "data/graphics/pokemon/icons/mewtwo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mewtwo: ; 8C98A74
+gMonFootprint_Mewtwo: @ 8C98A74
 	.incbin "data/graphics/pokemon/footprints/mewtwo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mew: ; 8C98A94
+gMonStillFrontPic_Mew: @ 8C98A94
 	.incbin "data/graphics/pokemon/still_front_pics/mew_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mew: ; 8C98D14
+gMonPalette_Mew: @ 8C98D14
 	.incbin "data/graphics/pokemon/palettes/mew_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mew: ; 8C98D38
+gMonBackPic_Mew: @ 8C98D38
 	.incbin "data/graphics/pokemon/back_pics/mew_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mew: ; 8C99004
+gMonShinyPalette_Mew: @ 8C99004
 	.incbin "data/graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mew: ; 8C99028
+gMonIcon_Mew: @ 8C99028
 	.incbin "data/graphics/pokemon/icons/mew_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mew: ; 8C99428
+gMonFootprint_Mew: @ 8C99428
 	.incbin "data/graphics/pokemon/footprints/mew_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Chikorita: ; 8C99448
+gMonStillFrontPic_Chikorita: @ 8C99448
 	.incbin "data/graphics/pokemon/still_front_pics/chikorita_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Chikorita: ; 8C996B0
+gMonPalette_Chikorita: @ 8C996B0
 	.incbin "data/graphics/pokemon/palettes/chikorita_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Chikorita: ; 8C996D8
+gMonBackPic_Chikorita: @ 8C996D8
 	.incbin "data/graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Chikorita: ; 8C9999C
+gMonShinyPalette_Chikorita: @ 8C9999C
 	.incbin "data/graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Chikorita: ; 8C999C4
+gMonIcon_Chikorita: @ 8C999C4
 	.incbin "data/graphics/pokemon/icons/chikorita_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Chikorita: ; 8C99DC4
+gMonFootprint_Chikorita: @ 8C99DC4
 	.incbin "data/graphics/pokemon/footprints/chikorita_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Bayleef: ; 8C99DE4
+gMonStillFrontPic_Bayleef: @ 8C99DE4
 	.incbin "data/graphics/pokemon/still_front_pics/bayleef_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Bayleef: ; 8C9A1B8
+gMonPalette_Bayleef: @ 8C9A1B8
 	.incbin "data/graphics/pokemon/palettes/bayleef_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Bayleef: ; 8C9A1E0
+gMonBackPic_Bayleef: @ 8C9A1E0
 	.incbin "data/graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Bayleef: ; 8C9A570
+gMonShinyPalette_Bayleef: @ 8C9A570
 	.incbin "data/graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Bayleef: ; 8C9A598
+gMonIcon_Bayleef: @ 8C9A598
 	.incbin "data/graphics/pokemon/icons/bayleef_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Bayleef: ; 8C9A998
+gMonFootprint_Bayleef: @ 8C9A998
 	.incbin "data/graphics/pokemon/footprints/bayleef_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Meganium: ; 8C9A9B8
+gMonStillFrontPic_Meganium: @ 8C9A9B8
 	.incbin "data/graphics/pokemon/still_front_pics/meganium_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Meganium: ; 8C9AF14
+gMonPalette_Meganium: @ 8C9AF14
 	.incbin "data/graphics/pokemon/palettes/meganium_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Meganium: ; 8C9AF3C
+gMonBackPic_Meganium: @ 8C9AF3C
 	.incbin "data/graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Meganium: ; 8C9B28C
+gMonShinyPalette_Meganium: @ 8C9B28C
 	.incbin "data/graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Meganium: ; 8C9B2B4
+gMonIcon_Meganium: @ 8C9B2B4
 	.incbin "data/graphics/pokemon/icons/meganium_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Meganium: ; 8C9B6B4
+gMonFootprint_Meganium: @ 8C9B6B4
 	.incbin "data/graphics/pokemon/footprints/meganium_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cyndaquil: ; 8C9B6D4
+gMonStillFrontPic_Cyndaquil: @ 8C9B6D4
 	.incbin "data/graphics/pokemon/still_front_pics/cyndaquil_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cyndaquil: ; 8C9B960
+gMonPalette_Cyndaquil: @ 8C9B960
 	.incbin "data/graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cyndaquil: ; 8C9B988
+gMonBackPic_Cyndaquil: @ 8C9B988
 	.incbin "data/graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cyndaquil: ; 8C9BCB4
+gMonShinyPalette_Cyndaquil: @ 8C9BCB4
 	.incbin "data/graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cyndaquil: ; 8C9BCDC
+gMonIcon_Cyndaquil: @ 8C9BCDC
 	.incbin "data/graphics/pokemon/icons/cyndaquil_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cyndaquil: ; 8C9C0DC
+gMonFootprint_Cyndaquil: @ 8C9C0DC
 	.incbin "data/graphics/pokemon/footprints/cyndaquil_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Quilava: ; 8C9C0FC
+gMonStillFrontPic_Quilava: @ 8C9C0FC
 	.incbin "data/graphics/pokemon/still_front_pics/quilava_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Quilava: ; 8C9C418
+gMonPalette_Quilava: @ 8C9C418
 	.incbin "data/graphics/pokemon/palettes/quilava_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Quilava: ; 8C9C440
+gMonBackPic_Quilava: @ 8C9C440
 	.incbin "data/graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Quilava: ; 8C9C7B4
+gMonShinyPalette_Quilava: @ 8C9C7B4
 	.incbin "data/graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Quilava: ; 8C9C7DC
+gMonIcon_Quilava: @ 8C9C7DC
 	.incbin "data/graphics/pokemon/icons/quilava_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Quilava: ; 8C9CBDC
+gMonFootprint_Quilava: @ 8C9CBDC
 	.incbin "data/graphics/pokemon/footprints/quilava_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Typhlosion: ; 8C9CBFC
+gMonStillFrontPic_Typhlosion: @ 8C9CBFC
 	.incbin "data/graphics/pokemon/still_front_pics/typhlosion_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Typhlosion: ; 8C9D024
+gMonPalette_Typhlosion: @ 8C9D024
 	.incbin "data/graphics/pokemon/palettes/typhlosion_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Typhlosion: ; 8C9D04C
+gMonBackPic_Typhlosion: @ 8C9D04C
 	.incbin "data/graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Typhlosion: ; 8C9D450
+gMonShinyPalette_Typhlosion: @ 8C9D450
 	.incbin "data/graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Typhlosion: ; 8C9D478
+gMonIcon_Typhlosion: @ 8C9D478
 	.incbin "data/graphics/pokemon/icons/typhlosion_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Typhlosion: ; 8C9D878
+gMonFootprint_Typhlosion: @ 8C9D878
 	.incbin "data/graphics/pokemon/footprints/typhlosion_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Totodile: ; 8C9D898
+gMonStillFrontPic_Totodile: @ 8C9D898
 	.incbin "data/graphics/pokemon/still_front_pics/totodile_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Totodile: ; 8C9DB3C
+gMonPalette_Totodile: @ 8C9DB3C
 	.incbin "data/graphics/pokemon/palettes/totodile_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Totodile: ; 8C9DB64
+gMonBackPic_Totodile: @ 8C9DB64
 	.incbin "data/graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Totodile: ; 8C9DE44
+gMonShinyPalette_Totodile: @ 8C9DE44
 	.incbin "data/graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Totodile: ; 8C9DE6C
+gMonIcon_Totodile: @ 8C9DE6C
 	.incbin "data/graphics/pokemon/icons/totodile_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Totodile: ; 8C9E26C
+gMonFootprint_Totodile: @ 8C9E26C
 	.incbin "data/graphics/pokemon/footprints/totodile_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Croconaw: ; 8C9E28C
+gMonStillFrontPic_Croconaw: @ 8C9E28C
 	.incbin "data/graphics/pokemon/still_front_pics/croconaw_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Croconaw: ; 8C9E5F4
+gMonPalette_Croconaw: @ 8C9E5F4
 	.incbin "data/graphics/pokemon/palettes/croconaw_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Croconaw: ; 8C9E61C
+gMonBackPic_Croconaw: @ 8C9E61C
 	.incbin "data/graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Croconaw: ; 8C9E96C
+gMonShinyPalette_Croconaw: @ 8C9E96C
 	.incbin "data/graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Croconaw: ; 8C9E994
+gMonIcon_Croconaw: @ 8C9E994
 	.incbin "data/graphics/pokemon/icons/croconaw_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Croconaw: ; 8C9ED94
+gMonFootprint_Croconaw: @ 8C9ED94
 	.incbin "data/graphics/pokemon/footprints/croconaw_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Feraligatr: ; 8C9EDB4
+gMonStillFrontPic_Feraligatr: @ 8C9EDB4
 	.incbin "data/graphics/pokemon/still_front_pics/feraligatr_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Feraligatr: ; 8C9F320
+gMonPalette_Feraligatr: @ 8C9F320
 	.incbin "data/graphics/pokemon/palettes/feraligatr_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Feraligatr: ; 8C9F348
+gMonBackPic_Feraligatr: @ 8C9F348
 	.incbin "data/graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Feraligatr: ; 8C9F814
+gMonShinyPalette_Feraligatr: @ 8C9F814
 	.incbin "data/graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Feraligatr: ; 8C9F83C
+gMonIcon_Feraligatr: @ 8C9F83C
 	.incbin "data/graphics/pokemon/icons/feraligatr_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Feraligatr: ; 8C9FC3C
+gMonFootprint_Feraligatr: @ 8C9FC3C
 	.incbin "data/graphics/pokemon/footprints/feraligatr_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sentret: ; 8C9FC5C
+gMonStillFrontPic_Sentret: @ 8C9FC5C
 	.incbin "data/graphics/pokemon/still_front_pics/sentret_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sentret: ; 8C9FF38
+gMonPalette_Sentret: @ 8C9FF38
 	.incbin "data/graphics/pokemon/palettes/sentret_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sentret: ; 8C9FF60
+gMonBackPic_Sentret: @ 8C9FF60
 	.incbin "data/graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sentret: ; 8CA0204
+gMonShinyPalette_Sentret: @ 8CA0204
 	.incbin "data/graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sentret: ; 8CA022C
+gMonIcon_Sentret: @ 8CA022C
 	.incbin "data/graphics/pokemon/icons/sentret_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sentret: ; 8CA062C
+gMonFootprint_Sentret: @ 8CA062C
 	.incbin "data/graphics/pokemon/footprints/sentret_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Furret: ; 8CA064C
+gMonStillFrontPic_Furret: @ 8CA064C
 	.incbin "data/graphics/pokemon/still_front_pics/furret_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Furret: ; 8CA0980
+gMonPalette_Furret: @ 8CA0980
 	.incbin "data/graphics/pokemon/palettes/furret_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Furret: ; 8CA09A8
+gMonBackPic_Furret: @ 8CA09A8
 	.incbin "data/graphics/pokemon/back_pics/furret_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Furret: ; 8CA0CD0
+gMonShinyPalette_Furret: @ 8CA0CD0
 	.incbin "data/graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Furret: ; 8CA0CF8
+gMonIcon_Furret: @ 8CA0CF8
 	.incbin "data/graphics/pokemon/icons/furret_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Furret: ; 8CA10F8
+gMonFootprint_Furret: @ 8CA10F8
 	.incbin "data/graphics/pokemon/footprints/furret_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hoothoot: ; 8CA1118
+gMonStillFrontPic_Hoothoot: @ 8CA1118
 	.incbin "data/graphics/pokemon/still_front_pics/hoothoot_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hoothoot: ; 8CA139C
+gMonPalette_Hoothoot: @ 8CA139C
 	.incbin "data/graphics/pokemon/palettes/hoothoot_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hoothoot: ; 8CA13C4
+gMonBackPic_Hoothoot: @ 8CA13C4
 	.incbin "data/graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hoothoot: ; 8CA16CC
+gMonShinyPalette_Hoothoot: @ 8CA16CC
 	.incbin "data/graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hoothoot: ; 8CA16F4
+gMonIcon_Hoothoot: @ 8CA16F4
 	.incbin "data/graphics/pokemon/icons/hoothoot_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hoothoot: ; 8CA1AF4
+gMonFootprint_Hoothoot: @ 8CA1AF4
 	.incbin "data/graphics/pokemon/footprints/hoothoot_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Noctowl: ; 8CA1B14
+gMonStillFrontPic_Noctowl: @ 8CA1B14
 	.incbin "data/graphics/pokemon/still_front_pics/noctowl_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Noctowl: ; 8CA1E68
+gMonPalette_Noctowl: @ 8CA1E68
 	.incbin "data/graphics/pokemon/palettes/noctowl_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Noctowl: ; 8CA1E90
+gMonBackPic_Noctowl: @ 8CA1E90
 	.incbin "data/graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Noctowl: ; 8CA21EC
+gMonShinyPalette_Noctowl: @ 8CA21EC
 	.incbin "data/graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Noctowl: ; 8CA2214
+gMonIcon_Noctowl: @ 8CA2214
 	.incbin "data/graphics/pokemon/icons/noctowl_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Noctowl: ; 8CA2614
+gMonFootprint_Noctowl: @ 8CA2614
 	.incbin "data/graphics/pokemon/footprints/noctowl_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ledyba: ; 8CA2634
+gMonStillFrontPic_Ledyba: @ 8CA2634
 	.incbin "data/graphics/pokemon/still_front_pics/ledyba_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ledyba: ; 8CA2928
+gMonPalette_Ledyba: @ 8CA2928
 	.incbin "data/graphics/pokemon/palettes/ledyba_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ledyba: ; 8CA2950
+gMonBackPic_Ledyba: @ 8CA2950
 	.incbin "data/graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ledyba: ; 8CA2C80
+gMonShinyPalette_Ledyba: @ 8CA2C80
 	.incbin "data/graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ledyba: ; 8CA2CA8
+gMonIcon_Ledyba: @ 8CA2CA8
 	.incbin "data/graphics/pokemon/icons/ledyba_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ledyba: ; 8CA30A8
+gMonFootprint_Ledyba: @ 8CA30A8
 	.incbin "data/graphics/pokemon/footprints/ledyba_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ledian: ; 8CA30C8
+gMonStillFrontPic_Ledian: @ 8CA30C8
 	.incbin "data/graphics/pokemon/still_front_pics/ledian_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ledian: ; 8CA3450
+gMonPalette_Ledian: @ 8CA3450
 	.incbin "data/graphics/pokemon/palettes/ledian_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ledian: ; 8CA3478
+gMonBackPic_Ledian: @ 8CA3478
 	.incbin "data/graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ledian: ; 8CA37D0
+gMonShinyPalette_Ledian: @ 8CA37D0
 	.incbin "data/graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ledian: ; 8CA37F8
+gMonIcon_Ledian: @ 8CA37F8
 	.incbin "data/graphics/pokemon/icons/ledian_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ledian: ; 8CA3BF8
+gMonFootprint_Ledian: @ 8CA3BF8
 	.incbin "data/graphics/pokemon/footprints/ledian_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Spinarak: ; 8CA3C18
+gMonStillFrontPic_Spinarak: @ 8CA3C18
 	.incbin "data/graphics/pokemon/still_front_pics/spinarak_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Spinarak: ; 8CA3E8C
+gMonPalette_Spinarak: @ 8CA3E8C
 	.incbin "data/graphics/pokemon/palettes/spinarak_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Spinarak: ; 8CA3EB4
+gMonBackPic_Spinarak: @ 8CA3EB4
 	.incbin "data/graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Spinarak: ; 8CA4118
+gMonShinyPalette_Spinarak: @ 8CA4118
 	.incbin "data/graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Spinarak: ; 8CA4140
+gMonIcon_Spinarak: @ 8CA4140
 	.incbin "data/graphics/pokemon/icons/spinarak_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Spinarak: ; 8CA4540
+gMonFootprint_Spinarak: @ 8CA4540
 	.incbin "data/graphics/pokemon/footprints/spinarak_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ariados: ; 8CA4560
+gMonStillFrontPic_Ariados: @ 8CA4560
 	.incbin "data/graphics/pokemon/still_front_pics/ariados_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ariados: ; 8CA4920
+gMonPalette_Ariados: @ 8CA4920
 	.incbin "data/graphics/pokemon/palettes/ariados_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ariados: ; 8CA4948
+gMonBackPic_Ariados: @ 8CA4948
 	.incbin "data/graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ariados: ; 8CA4CC0
+gMonShinyPalette_Ariados: @ 8CA4CC0
 	.incbin "data/graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ariados: ; 8CA4CE8
+gMonIcon_Ariados: @ 8CA4CE8
 	.incbin "data/graphics/pokemon/icons/ariados_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ariados: ; 8CA50E8
+gMonFootprint_Ariados: @ 8CA50E8
 	.incbin "data/graphics/pokemon/footprints/ariados_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Crobat: ; 8CA5108
+gMonStillFrontPic_Crobat: @ 8CA5108
 	.incbin "data/graphics/pokemon/still_front_pics/crobat_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Crobat: ; 8CA54B8
+gMonPalette_Crobat: @ 8CA54B8
 	.incbin "data/graphics/pokemon/palettes/crobat_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Crobat: ; 8CA54E0
+gMonBackPic_Crobat: @ 8CA54E0
 	.incbin "data/graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Crobat: ; 8CA57E8
+gMonShinyPalette_Crobat: @ 8CA57E8
 	.incbin "data/graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Crobat: ; 8CA5810
+gMonIcon_Crobat: @ 8CA5810
 	.incbin "data/graphics/pokemon/icons/crobat_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Crobat: ; 8CA5C10
+gMonFootprint_Crobat: @ 8CA5C10
 	.incbin "data/graphics/pokemon/footprints/crobat_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Chinchou: ; 8CA5C30
+gMonStillFrontPic_Chinchou: @ 8CA5C30
 	.incbin "data/graphics/pokemon/still_front_pics/chinchou_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Chinchou: ; 8CA5F08
+gMonPalette_Chinchou: @ 8CA5F08
 	.incbin "data/graphics/pokemon/palettes/chinchou_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Chinchou: ; 8CA5F30
+gMonBackPic_Chinchou: @ 8CA5F30
 	.incbin "data/graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Chinchou: ; 8CA6228
+gMonShinyPalette_Chinchou: @ 8CA6228
 	.incbin "data/graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Chinchou: ; 8CA6250
+gMonIcon_Chinchou: @ 8CA6250
 	.incbin "data/graphics/pokemon/icons/chinchou_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Chinchou: ; 8CA6650
+gMonFootprint_Chinchou: @ 8CA6650
 	.incbin "data/graphics/pokemon/footprints/chinchou_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lanturn: ; 8CA6670
+gMonStillFrontPic_Lanturn: @ 8CA6670
 	.incbin "data/graphics/pokemon/still_front_pics/lanturn_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lanturn: ; 8CA69E0
+gMonPalette_Lanturn: @ 8CA69E0
 	.incbin "data/graphics/pokemon/palettes/lanturn_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lanturn: ; 8CA6A08
+gMonBackPic_Lanturn: @ 8CA6A08
 	.incbin "data/graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lanturn: ; 8CA6D08
+gMonShinyPalette_Lanturn: @ 8CA6D08
 	.incbin "data/graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lanturn: ; 8CA6D30
+gMonIcon_Lanturn: @ 8CA6D30
 	.incbin "data/graphics/pokemon/icons/lanturn_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lanturn: ; 8CA7130
+gMonFootprint_Lanturn: @ 8CA7130
 	.incbin "data/graphics/pokemon/footprints/lanturn_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pichu: ; 8CA7150
+gMonStillFrontPic_Pichu: @ 8CA7150
 	.incbin "data/graphics/pokemon/still_front_pics/pichu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pichu: ; 8CA736C
+gMonPalette_Pichu: @ 8CA736C
 	.incbin "data/graphics/pokemon/palettes/pichu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pichu: ; 8CA7394
+gMonBackPic_Pichu: @ 8CA7394
 	.incbin "data/graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pichu: ; 8CA75F0
+gMonShinyPalette_Pichu: @ 8CA75F0
 	.incbin "data/graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pichu: ; 8CA7618
+gMonIcon_Pichu: @ 8CA7618
 	.incbin "data/graphics/pokemon/icons/pichu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pichu: ; 8CA7A18
+gMonFootprint_Pichu: @ 8CA7A18
 	.incbin "data/graphics/pokemon/footprints/pichu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cleffa: ; 8CA7A38
+gMonStillFrontPic_Cleffa: @ 8CA7A38
 	.incbin "data/graphics/pokemon/still_front_pics/cleffa_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cleffa: ; 8CA7C18
+gMonPalette_Cleffa: @ 8CA7C18
 	.incbin "data/graphics/pokemon/palettes/cleffa_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cleffa: ; 8CA7C40
+gMonBackPic_Cleffa: @ 8CA7C40
 	.incbin "data/graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cleffa: ; 8CA7E7C
+gMonShinyPalette_Cleffa: @ 8CA7E7C
 	.incbin "data/graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cleffa: ; 8CA7EA4
+gMonIcon_Cleffa: @ 8CA7EA4
 	.incbin "data/graphics/pokemon/icons/cleffa_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cleffa: ; 8CA82A4
+gMonFootprint_Cleffa: @ 8CA82A4
 	.incbin "data/graphics/pokemon/footprints/cleffa_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Igglybuff: ; 8CA82C4
+gMonStillFrontPic_Igglybuff: @ 8CA82C4
 	.incbin "data/graphics/pokemon/still_front_pics/igglybuff_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Igglybuff: ; 8CA84AC
+gMonPalette_Igglybuff: @ 8CA84AC
 	.incbin "data/graphics/pokemon/palettes/igglybuff_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Igglybuff: ; 8CA84D4
+gMonBackPic_Igglybuff: @ 8CA84D4
 	.incbin "data/graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Igglybuff: ; 8CA8710
+gMonShinyPalette_Igglybuff: @ 8CA8710
 	.incbin "data/graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Igglybuff: ; 8CA8738
+gMonIcon_Igglybuff: @ 8CA8738
 	.incbin "data/graphics/pokemon/icons/igglybuff_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Igglybuff: ; 8CA8B38
+gMonFootprint_Igglybuff: @ 8CA8B38
 	.incbin "data/graphics/pokemon/footprints/igglybuff_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Togepi: ; 8CA8B58
+gMonStillFrontPic_Togepi: @ 8CA8B58
 	.incbin "data/graphics/pokemon/still_front_pics/togepi_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Togepi: ; 8CA8D2C
+gMonPalette_Togepi: @ 8CA8D2C
 	.incbin "data/graphics/pokemon/palettes/togepi_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Togepi: ; 8CA8D54
+gMonBackPic_Togepi: @ 8CA8D54
 	.incbin "data/graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Togepi: ; 8CA8FC8
+gMonShinyPalette_Togepi: @ 8CA8FC8
 	.incbin "data/graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Togepi: ; 8CA8FF0
+gMonIcon_Togepi: @ 8CA8FF0
 	.incbin "data/graphics/pokemon/icons/togepi_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Togepi: ; 8CA93F0
+gMonFootprint_Togepi: @ 8CA93F0
 	.incbin "data/graphics/pokemon/footprints/togepi_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Togetic: ; 8CA9410
+gMonStillFrontPic_Togetic: @ 8CA9410
 	.incbin "data/graphics/pokemon/still_front_pics/togetic_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Togetic: ; 8CA9684
+gMonPalette_Togetic: @ 8CA9684
 	.incbin "data/graphics/pokemon/palettes/togetic_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Togetic: ; 8CA96AC
+gMonBackPic_Togetic: @ 8CA96AC
 	.incbin "data/graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Togetic: ; 8CA99D8
+gMonShinyPalette_Togetic: @ 8CA99D8
 	.incbin "data/graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Togetic: ; 8CA9A00
+gMonIcon_Togetic: @ 8CA9A00
 	.incbin "data/graphics/pokemon/icons/togetic_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Togetic: ; 8CA9E00
+gMonFootprint_Togetic: @ 8CA9E00
 	.incbin "data/graphics/pokemon/footprints/togetic_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Natu: ; 8CA9E20
+gMonStillFrontPic_Natu: @ 8CA9E20
 	.incbin "data/graphics/pokemon/still_front_pics/natu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Natu: ; 8CA9FEC
+gMonPalette_Natu: @ 8CA9FEC
 	.incbin "data/graphics/pokemon/palettes/natu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Natu: ; 8CAA014
+gMonBackPic_Natu: @ 8CAA014
 	.incbin "data/graphics/pokemon/back_pics/natu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Natu: ; 8CAA228
+gMonShinyPalette_Natu: @ 8CAA228
 	.incbin "data/graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Natu: ; 8CAA250
+gMonIcon_Natu: @ 8CAA250
 	.incbin "data/graphics/pokemon/icons/natu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Natu: ; 8CAA650
+gMonFootprint_Natu: @ 8CAA650
 	.incbin "data/graphics/pokemon/footprints/natu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Xatu: ; 8CAA670
+gMonStillFrontPic_Xatu: @ 8CAA670
 	.incbin "data/graphics/pokemon/still_front_pics/xatu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Xatu: ; 8CAA94C
+gMonPalette_Xatu: @ 8CAA94C
 	.incbin "data/graphics/pokemon/palettes/xatu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Xatu: ; 8CAA974
+gMonBackPic_Xatu: @ 8CAA974
 	.incbin "data/graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Xatu: ; 8CAACEC
+gMonShinyPalette_Xatu: @ 8CAACEC
 	.incbin "data/graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Xatu: ; 8CAAD14
+gMonIcon_Xatu: @ 8CAAD14
 	.incbin "data/graphics/pokemon/icons/xatu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Xatu: ; 8CAB114
+gMonFootprint_Xatu: @ 8CAB114
 	.incbin "data/graphics/pokemon/footprints/xatu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mareep: ; 8CAB134
+gMonStillFrontPic_Mareep: @ 8CAB134
 	.incbin "data/graphics/pokemon/still_front_pics/mareep_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mareep: ; 8CAB3E8
+gMonPalette_Mareep: @ 8CAB3E8
 	.incbin "data/graphics/pokemon/palettes/mareep_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mareep: ; 8CAB410
+gMonBackPic_Mareep: @ 8CAB410
 	.incbin "data/graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mareep: ; 8CAB704
+gMonShinyPalette_Mareep: @ 8CAB704
 	.incbin "data/graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mareep: ; 8CAB72C
+gMonIcon_Mareep: @ 8CAB72C
 	.incbin "data/graphics/pokemon/icons/mareep_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mareep: ; 8CABB2C
+gMonFootprint_Mareep: @ 8CABB2C
 	.incbin "data/graphics/pokemon/footprints/mareep_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Flaaffy: ; 8CABB4C
+gMonStillFrontPic_Flaaffy: @ 8CABB4C
 	.incbin "data/graphics/pokemon/still_front_pics/flaaffy_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Flaaffy: ; 8CABE4C
+gMonPalette_Flaaffy: @ 8CABE4C
 	.incbin "data/graphics/pokemon/palettes/flaaffy_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Flaaffy: ; 8CABE74
+gMonBackPic_Flaaffy: @ 8CABE74
 	.incbin "data/graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Flaaffy: ; 8CAC190
+gMonShinyPalette_Flaaffy: @ 8CAC190
 	.incbin "data/graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Flaaffy: ; 8CAC1B8
+gMonIcon_Flaaffy: @ 8CAC1B8
 	.incbin "data/graphics/pokemon/icons/flaaffy_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Flaaffy: ; 8CAC5B8
+gMonFootprint_Flaaffy: @ 8CAC5B8
 	.incbin "data/graphics/pokemon/footprints/flaaffy_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ampharos: ; 8CAC5D8
+gMonStillFrontPic_Ampharos: @ 8CAC5D8
 	.incbin "data/graphics/pokemon/still_front_pics/ampharos_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ampharos: ; 8CAC934
+gMonPalette_Ampharos: @ 8CAC934
 	.incbin "data/graphics/pokemon/palettes/ampharos_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ampharos: ; 8CAC95C
+gMonBackPic_Ampharos: @ 8CAC95C
 	.incbin "data/graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ampharos: ; 8CACCD4
+gMonShinyPalette_Ampharos: @ 8CACCD4
 	.incbin "data/graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ampharos: ; 8CACCFC
+gMonIcon_Ampharos: @ 8CACCFC
 	.incbin "data/graphics/pokemon/icons/ampharos_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ampharos: ; 8CAD0FC
+gMonFootprint_Ampharos: @ 8CAD0FC
 	.incbin "data/graphics/pokemon/footprints/ampharos_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Bellossom: ; 8CAD11C
+gMonStillFrontPic_Bellossom: @ 8CAD11C
 	.incbin "data/graphics/pokemon/still_front_pics/bellossom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Bellossom: ; 8CAD38C
+gMonPalette_Bellossom: @ 8CAD38C
 	.incbin "data/graphics/pokemon/palettes/bellossom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Bellossom: ; 8CAD3B4
+gMonBackPic_Bellossom: @ 8CAD3B4
 	.incbin "data/graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Bellossom: ; 8CAD6D8
+gMonShinyPalette_Bellossom: @ 8CAD6D8
 	.incbin "data/graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Bellossom: ; 8CAD700
+gMonIcon_Bellossom: @ 8CAD700
 	.incbin "data/graphics/pokemon/icons/bellossom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Bellossom: ; 8CADB00
+gMonFootprint_Bellossom: @ 8CADB00
 	.incbin "data/graphics/pokemon/footprints/bellossom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Marill: ; 8CADB20
+gMonStillFrontPic_Marill: @ 8CADB20
 	.incbin "data/graphics/pokemon/still_front_pics/marill_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Marill: ; 8CADDE4
+gMonPalette_Marill: @ 8CADDE4
 	.incbin "data/graphics/pokemon/palettes/marill_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Marill: ; 8CADE0C
+gMonBackPic_Marill: @ 8CADE0C
 	.incbin "data/graphics/pokemon/back_pics/marill_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Marill: ; 8CAE0B8
+gMonShinyPalette_Marill: @ 8CAE0B8
 	.incbin "data/graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Marill: ; 8CAE0E0
+gMonIcon_Marill: @ 8CAE0E0
 	.incbin "data/graphics/pokemon/icons/marill_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Marill: ; 8CAE4E0
+gMonFootprint_Marill: @ 8CAE4E0
 	.incbin "data/graphics/pokemon/footprints/marill_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Azumarill: ; 8CAE500
+gMonStillFrontPic_Azumarill: @ 8CAE500
 	.incbin "data/graphics/pokemon/still_front_pics/azumarill_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Azumarill: ; 8CAE800
+gMonPalette_Azumarill: @ 8CAE800
 	.incbin "data/graphics/pokemon/palettes/azumarill_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Azumarill: ; 8CAE828
+gMonBackPic_Azumarill: @ 8CAE828
 	.incbin "data/graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Azumarill: ; 8CAEAE4
+gMonShinyPalette_Azumarill: @ 8CAEAE4
 	.incbin "data/graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Azumarill: ; 8CAEB0C
+gMonIcon_Azumarill: @ 8CAEB0C
 	.incbin "data/graphics/pokemon/icons/azumarill_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Azumarill: ; 8CAEF0C
+gMonFootprint_Azumarill: @ 8CAEF0C
 	.incbin "data/graphics/pokemon/footprints/azumarill_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sudowoodo: ; 8CAEF2C
+gMonStillFrontPic_Sudowoodo: @ 8CAEF2C
 	.incbin "data/graphics/pokemon/still_front_pics/sudowoodo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sudowoodo: ; 8CAF244
+gMonPalette_Sudowoodo: @ 8CAF244
 	.incbin "data/graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sudowoodo: ; 8CAF26C
+gMonBackPic_Sudowoodo: @ 8CAF26C
 	.incbin "data/graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sudowoodo: ; 8CAF5C8
+gMonShinyPalette_Sudowoodo: @ 8CAF5C8
 	.incbin "data/graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sudowoodo: ; 8CAF5F0
+gMonIcon_Sudowoodo: @ 8CAF5F0
 	.incbin "data/graphics/pokemon/icons/sudowoodo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sudowoodo: ; 8CAF9F0
+gMonFootprint_Sudowoodo: @ 8CAF9F0
 	.incbin "data/graphics/pokemon/footprints/sudowoodo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Politoed: ; 8CAFA10
+gMonStillFrontPic_Politoed: @ 8CAFA10
 	.incbin "data/graphics/pokemon/still_front_pics/politoed_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Politoed: ; 8CAFD4C
+gMonPalette_Politoed: @ 8CAFD4C
 	.incbin "data/graphics/pokemon/palettes/politoed_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Politoed: ; 8CAFD74
+gMonBackPic_Politoed: @ 8CAFD74
 	.incbin "data/graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Politoed: ; 8CB0030
+gMonShinyPalette_Politoed: @ 8CB0030
 	.incbin "data/graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Politoed: ; 8CB0058
+gMonIcon_Politoed: @ 8CB0058
 	.incbin "data/graphics/pokemon/icons/politoed_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Politoed: ; 8CB0458
+gMonFootprint_Politoed: @ 8CB0458
 	.incbin "data/graphics/pokemon/footprints/politoed_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hoppip: ; 8CB0478
+gMonStillFrontPic_Hoppip: @ 8CB0478
 	.incbin "data/graphics/pokemon/still_front_pics/hoppip_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hoppip: ; 8CB072C
+gMonPalette_Hoppip: @ 8CB072C
 	.incbin "data/graphics/pokemon/palettes/hoppip_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hoppip: ; 8CB0754
+gMonBackPic_Hoppip: @ 8CB0754
 	.incbin "data/graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hoppip: ; 8CB0A34
+gMonShinyPalette_Hoppip: @ 8CB0A34
 	.incbin "data/graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hoppip: ; 8CB0A5C
+gMonIcon_Hoppip: @ 8CB0A5C
 	.incbin "data/graphics/pokemon/icons/hoppip_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hoppip: ; 8CB0E5C
+gMonFootprint_Hoppip: @ 8CB0E5C
 	.incbin "data/graphics/pokemon/footprints/hoppip_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Skiploom: ; 8CB0E7C
+gMonStillFrontPic_Skiploom: @ 8CB0E7C
 	.incbin "data/graphics/pokemon/still_front_pics/skiploom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Skiploom: ; 8CB1104
+gMonPalette_Skiploom: @ 8CB1104
 	.incbin "data/graphics/pokemon/palettes/skiploom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Skiploom: ; 8CB112C
+gMonBackPic_Skiploom: @ 8CB112C
 	.incbin "data/graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Skiploom: ; 8CB140C
+gMonShinyPalette_Skiploom: @ 8CB140C
 	.incbin "data/graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Skiploom: ; 8CB1434
+gMonIcon_Skiploom: @ 8CB1434
 	.incbin "data/graphics/pokemon/icons/skiploom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Skiploom: ; 8CB1834
+gMonFootprint_Skiploom: @ 8CB1834
 	.incbin "data/graphics/pokemon/footprints/skiploom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Jumpluff: ; 8CB1854
+gMonStillFrontPic_Jumpluff: @ 8CB1854
 	.incbin "data/graphics/pokemon/still_front_pics/jumpluff_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Jumpluff: ; 8CB1BC0
+gMonPalette_Jumpluff: @ 8CB1BC0
 	.incbin "data/graphics/pokemon/palettes/jumpluff_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Jumpluff: ; 8CB1BE8
+gMonBackPic_Jumpluff: @ 8CB1BE8
 	.incbin "data/graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Jumpluff: ; 8CB1FE0
+gMonShinyPalette_Jumpluff: @ 8CB1FE0
 	.incbin "data/graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Jumpluff: ; 8CB2008
+gMonIcon_Jumpluff: @ 8CB2008
 	.incbin "data/graphics/pokemon/icons/jumpluff_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Jumpluff: ; 8CB2408
+gMonFootprint_Jumpluff: @ 8CB2408
 	.incbin "data/graphics/pokemon/footprints/jumpluff_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Aipom: ; 8CB2428
+gMonStillFrontPic_Aipom: @ 8CB2428
 	.incbin "data/graphics/pokemon/still_front_pics/aipom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Aipom: ; 8CB2724
+gMonPalette_Aipom: @ 8CB2724
 	.incbin "data/graphics/pokemon/palettes/aipom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Aipom: ; 8CB274C
+gMonBackPic_Aipom: @ 8CB274C
 	.incbin "data/graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Aipom: ; 8CB2A40
+gMonShinyPalette_Aipom: @ 8CB2A40
 	.incbin "data/graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Aipom: ; 8CB2A68
+gMonIcon_Aipom: @ 8CB2A68
 	.incbin "data/graphics/pokemon/icons/aipom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Aipom: ; 8CB2E68
+gMonFootprint_Aipom: @ 8CB2E68
 	.incbin "data/graphics/pokemon/footprints/aipom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sunkern: ; 8CB2E88
+gMonStillFrontPic_Sunkern: @ 8CB2E88
 	.incbin "data/graphics/pokemon/still_front_pics/sunkern_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sunkern: ; 8CB30C0
+gMonPalette_Sunkern: @ 8CB30C0
 	.incbin "data/graphics/pokemon/palettes/sunkern_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sunkern: ; 8CB30E8
+gMonBackPic_Sunkern: @ 8CB30E8
 	.incbin "data/graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sunkern: ; 8CB33AC
+gMonShinyPalette_Sunkern: @ 8CB33AC
 	.incbin "data/graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sunkern: ; 8CB33D4
+gMonIcon_Sunkern: @ 8CB33D4
 	.incbin "data/graphics/pokemon/icons/sunkern_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sunkern: ; 8CB37D4
+gMonFootprint_Sunkern: @ 8CB37D4
 	.incbin "data/graphics/pokemon/footprints/sunkern_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sunflora: ; 8CB37F4
+gMonStillFrontPic_Sunflora: @ 8CB37F4
 	.incbin "data/graphics/pokemon/still_front_pics/sunflora_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sunflora: ; 8CB3B4C
+gMonPalette_Sunflora: @ 8CB3B4C
 	.incbin "data/graphics/pokemon/palettes/sunflora_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sunflora: ; 8CB3B74
+gMonBackPic_Sunflora: @ 8CB3B74
 	.incbin "data/graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sunflora: ; 8CB3F14
+gMonShinyPalette_Sunflora: @ 8CB3F14
 	.incbin "data/graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sunflora: ; 8CB3F3C
+gMonIcon_Sunflora: @ 8CB3F3C
 	.incbin "data/graphics/pokemon/icons/sunflora_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sunflora: ; 8CB433C
+gMonFootprint_Sunflora: @ 8CB433C
 	.incbin "data/graphics/pokemon/footprints/sunflora_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Yanma: ; 8CB435C
+gMonStillFrontPic_Yanma: @ 8CB435C
 	.incbin "data/graphics/pokemon/still_front_pics/yanma_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Yanma: ; 8CB46E0
+gMonPalette_Yanma: @ 8CB46E0
 	.incbin "data/graphics/pokemon/palettes/yanma_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Yanma: ; 8CB4708
+gMonBackPic_Yanma: @ 8CB4708
 	.incbin "data/graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Yanma: ; 8CB4ABC
+gMonShinyPalette_Yanma: @ 8CB4ABC
 	.incbin "data/graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Yanma: ; 8CB4AE4
+gMonIcon_Yanma: @ 8CB4AE4
 	.incbin "data/graphics/pokemon/icons/yanma_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Yanma: ; 8CB4EE4
+gMonFootprint_Yanma: @ 8CB4EE4
 	.incbin "data/graphics/pokemon/footprints/yanma_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wooper: ; 8CB4F04
+gMonStillFrontPic_Wooper: @ 8CB4F04
 	.incbin "data/graphics/pokemon/still_front_pics/wooper_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wooper: ; 8CB5144
+gMonPalette_Wooper: @ 8CB5144
 	.incbin "data/graphics/pokemon/palettes/wooper_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wooper: ; 8CB516C
+gMonBackPic_Wooper: @ 8CB516C
 	.incbin "data/graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wooper: ; 8CB53F8
+gMonShinyPalette_Wooper: @ 8CB53F8
 	.incbin "data/graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wooper: ; 8CB5420
+gMonIcon_Wooper: @ 8CB5420
 	.incbin "data/graphics/pokemon/icons/wooper_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wooper: ; 8CB5820
+gMonFootprint_Wooper: @ 8CB5820
 	.incbin "data/graphics/pokemon/footprints/wooper_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Quagsire: ; 8CB5840
+gMonStillFrontPic_Quagsire: @ 8CB5840
 	.incbin "data/graphics/pokemon/still_front_pics/quagsire_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Quagsire: ; 8CB5BB4
+gMonPalette_Quagsire: @ 8CB5BB4
 	.incbin "data/graphics/pokemon/palettes/quagsire_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Quagsire: ; 8CB5BDC
+gMonBackPic_Quagsire: @ 8CB5BDC
 	.incbin "data/graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Quagsire: ; 8CB5ED8
+gMonShinyPalette_Quagsire: @ 8CB5ED8
 	.incbin "data/graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Quagsire: ; 8CB5F00
+gMonIcon_Quagsire: @ 8CB5F00
 	.incbin "data/graphics/pokemon/icons/quagsire_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Quagsire: ; 8CB6300
+gMonFootprint_Quagsire: @ 8CB6300
 	.incbin "data/graphics/pokemon/footprints/quagsire_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Espeon: ; 8CB6320
+gMonStillFrontPic_Espeon: @ 8CB6320
 	.incbin "data/graphics/pokemon/still_front_pics/espeon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Espeon: ; 8CB6660
+gMonPalette_Espeon: @ 8CB6660
 	.incbin "data/graphics/pokemon/palettes/espeon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Espeon: ; 8CB6684
+gMonBackPic_Espeon: @ 8CB6684
 	.incbin "data/graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Espeon: ; 8CB6960
+gMonShinyPalette_Espeon: @ 8CB6960
 	.incbin "data/graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Espeon: ; 8CB6984
+gMonIcon_Espeon: @ 8CB6984
 	.incbin "data/graphics/pokemon/icons/espeon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Espeon: ; 8CB6D84
+gMonFootprint_Espeon: @ 8CB6D84
 	.incbin "data/graphics/pokemon/footprints/espeon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Umbreon: ; 8CB6DA4
+gMonStillFrontPic_Umbreon: @ 8CB6DA4
 	.incbin "data/graphics/pokemon/still_front_pics/umbreon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Umbreon: ; 8CB70B8
+gMonPalette_Umbreon: @ 8CB70B8
 	.incbin "data/graphics/pokemon/palettes/umbreon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Umbreon: ; 8CB70E0
+gMonBackPic_Umbreon: @ 8CB70E0
 	.incbin "data/graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Umbreon: ; 8CB73F4
+gMonShinyPalette_Umbreon: @ 8CB73F4
 	.incbin "data/graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Umbreon: ; 8CB741C
+gMonIcon_Umbreon: @ 8CB741C
 	.incbin "data/graphics/pokemon/icons/umbreon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Umbreon: ; 8CB781C
+gMonFootprint_Umbreon: @ 8CB781C
 	.incbin "data/graphics/pokemon/footprints/umbreon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Murkrow: ; 8CB783C
+gMonStillFrontPic_Murkrow: @ 8CB783C
 	.incbin "data/graphics/pokemon/still_front_pics/murkrow_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Murkrow: ; 8CB7B1C
+gMonPalette_Murkrow: @ 8CB7B1C
 	.incbin "data/graphics/pokemon/palettes/murkrow_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Murkrow: ; 8CB7B44
+gMonBackPic_Murkrow: @ 8CB7B44
 	.incbin "data/graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Murkrow: ; 8CB7E5C
+gMonShinyPalette_Murkrow: @ 8CB7E5C
 	.incbin "data/graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Murkrow: ; 8CB7E84
+gMonIcon_Murkrow: @ 8CB7E84
 	.incbin "data/graphics/pokemon/icons/murkrow_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Murkrow: ; 8CB8284
+gMonFootprint_Murkrow: @ 8CB8284
 	.incbin "data/graphics/pokemon/footprints/murkrow_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slowking: ; 8CB82A4
+gMonStillFrontPic_Slowking: @ 8CB82A4
 	.incbin "data/graphics/pokemon/still_front_pics/slowking_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slowking: ; 8CB8658
+gMonPalette_Slowking: @ 8CB8658
 	.incbin "data/graphics/pokemon/palettes/slowking_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slowking: ; 8CB8680
+gMonBackPic_Slowking: @ 8CB8680
 	.incbin "data/graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slowking: ; 8CB8A0C
+gMonShinyPalette_Slowking: @ 8CB8A0C
 	.incbin "data/graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slowking: ; 8CB8A34
+gMonIcon_Slowking: @ 8CB8A34
 	.incbin "data/graphics/pokemon/icons/slowking_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slowking: ; 8CB8E34
+gMonFootprint_Slowking: @ 8CB8E34
 	.incbin "data/graphics/pokemon/footprints/slowking_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Misdreavus: ; 8CB8E54
+gMonStillFrontPic_Misdreavus: @ 8CB8E54
 	.incbin "data/graphics/pokemon/still_front_pics/misdreavus_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Misdreavus: ; 8CB9114
+gMonPalette_Misdreavus: @ 8CB9114
 	.incbin "data/graphics/pokemon/palettes/misdreavus_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Misdreavus: ; 8CB913C
+gMonBackPic_Misdreavus: @ 8CB913C
 	.incbin "data/graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Misdreavus: ; 8CB9460
+gMonShinyPalette_Misdreavus: @ 8CB9460
 	.incbin "data/graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Misdreavus: ; 8CB9488
+gMonIcon_Misdreavus: @ 8CB9488
 	.incbin "data/graphics/pokemon/icons/misdreavus_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Misdreavus: ; 8CB9888
+gMonFootprint_Misdreavus: @ 8CB9888
 	.incbin "data/graphics/pokemon/footprints/misdreavus_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownA: ; 8CB98A8
+gMonStillFrontPic_UnownA: @ 8CB98A8
 	.incbin "data/graphics/pokemon/still_front_pics/unown_a_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Unown: ; 8CB9A7C
+gMonPalette_Unown: @ 8CB9A7C
 	.incbin "data/graphics/pokemon/palettes/unown_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownA: ; 8CB9A9C
+gMonBackPic_UnownA: @ 8CB9A9C
 	.incbin "data/graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Unown: ; 8CB9C9C
+gMonShinyPalette_Unown: @ 8CB9C9C
 	.incbin "data/graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownA: ; 8CB9CBC
+gMonIcon_UnownA: @ 8CB9CBC
 	.incbin "data/graphics/pokemon/icons/unown_a_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Unown: ; 8CBA0BC
+gMonFootprint_Unown: @ 8CBA0BC
 	.incbin "data/graphics/pokemon/footprints/unown_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wobbuffet: ; 8CBA0DC
+gMonStillFrontPic_Wobbuffet: @ 8CBA0DC
 	.incbin "data/graphics/pokemon/still_front_pics/wobbuffet_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wobbuffet: ; 8CBA42C
+gMonPalette_Wobbuffet: @ 8CBA42C
 	.incbin "data/graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wobbuffet: ; 8CBA454
+gMonBackPic_Wobbuffet: @ 8CBA454
 	.incbin "data/graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wobbuffet: ; 8CBA698
+gMonShinyPalette_Wobbuffet: @ 8CBA698
 	.incbin "data/graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wobbuffet: ; 8CBA6C0
+gMonIcon_Wobbuffet: @ 8CBA6C0
 	.incbin "data/graphics/pokemon/icons/wobbuffet_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wobbuffet: ; 8CBAAC0
+gMonFootprint_Wobbuffet: @ 8CBAAC0
 	.incbin "data/graphics/pokemon/footprints/wobbuffet_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Girafarig: ; 8CBAAE0
+gMonStillFrontPic_Girafarig: @ 8CBAAE0
 	.incbin "data/graphics/pokemon/still_front_pics/girafarig_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Girafarig: ; 8CBAEE4
+gMonPalette_Girafarig: @ 8CBAEE4
 	.incbin "data/graphics/pokemon/palettes/girafarig_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Girafarig: ; 8CBAF0C
+gMonBackPic_Girafarig: @ 8CBAF0C
 	.incbin "data/graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Girafarig: ; 8CBB2B8
+gMonShinyPalette_Girafarig: @ 8CBB2B8
 	.incbin "data/graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Girafarig: ; 8CBB2E0
+gMonIcon_Girafarig: @ 8CBB2E0
 	.incbin "data/graphics/pokemon/icons/girafarig_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Girafarig: ; 8CBB6E0
+gMonFootprint_Girafarig: @ 8CBB6E0
 	.incbin "data/graphics/pokemon/footprints/girafarig_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pineco: ; 8CBB700
+gMonStillFrontPic_Pineco: @ 8CBB700
 	.incbin "data/graphics/pokemon/still_front_pics/pineco_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pineco: ; 8CBBA40
+gMonPalette_Pineco: @ 8CBBA40
 	.incbin "data/graphics/pokemon/palettes/pineco_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pineco: ; 8CBBA64
+gMonBackPic_Pineco: @ 8CBBA64
 	.incbin "data/graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pineco: ; 8CBBD3C
+gMonShinyPalette_Pineco: @ 8CBBD3C
 	.incbin "data/graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pineco: ; 8CBBD60
+gMonIcon_Pineco: @ 8CBBD60
 	.incbin "data/graphics/pokemon/icons/pineco_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pineco: ; 8CBC160
+gMonFootprint_Pineco: @ 8CBC160
 	.incbin "data/graphics/pokemon/footprints/pineco_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Forretress: ; 8CBC180
+gMonStillFrontPic_Forretress: @ 8CBC180
 	.incbin "data/graphics/pokemon/still_front_pics/forretress_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Forretress: ; 8CBC59C
+gMonPalette_Forretress: @ 8CBC59C
 	.incbin "data/graphics/pokemon/palettes/forretress_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Forretress: ; 8CBC5C4
+gMonBackPic_Forretress: @ 8CBC5C4
 	.incbin "data/graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Forretress: ; 8CBC884
+gMonShinyPalette_Forretress: @ 8CBC884
 	.incbin "data/graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Forretress: ; 8CBC8AC
+gMonIcon_Forretress: @ 8CBC8AC
 	.incbin "data/graphics/pokemon/icons/forretress_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Forretress: ; 8CBCCAC
+gMonFootprint_Forretress: @ 8CBCCAC
 	.incbin "data/graphics/pokemon/footprints/forretress_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dunsparce: ; 8CBCCCC
+gMonStillFrontPic_Dunsparce: @ 8CBCCCC
 	.incbin "data/graphics/pokemon/still_front_pics/dunsparce_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dunsparce: ; 8CBCFDC
+gMonPalette_Dunsparce: @ 8CBCFDC
 	.incbin "data/graphics/pokemon/palettes/dunsparce_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dunsparce: ; 8CBD004
+gMonBackPic_Dunsparce: @ 8CBD004
 	.incbin "data/graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dunsparce: ; 8CBD300
+gMonShinyPalette_Dunsparce: @ 8CBD300
 	.incbin "data/graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dunsparce: ; 8CBD328
+gMonIcon_Dunsparce: @ 8CBD328
 	.incbin "data/graphics/pokemon/icons/dunsparce_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dunsparce: ; 8CBD728
+gMonFootprint_Dunsparce: @ 8CBD728
 	.incbin "data/graphics/pokemon/footprints/dunsparce_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gligar: ; 8CBD748
+gMonStillFrontPic_Gligar: @ 8CBD748
 	.incbin "data/graphics/pokemon/still_front_pics/gligar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gligar: ; 8CBDB70
+gMonPalette_Gligar: @ 8CBDB70
 	.incbin "data/graphics/pokemon/palettes/gligar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gligar: ; 8CBDB98
+gMonBackPic_Gligar: @ 8CBDB98
 	.incbin "data/graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gligar: ; 8CBDF70
+gMonShinyPalette_Gligar: @ 8CBDF70
 	.incbin "data/graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gligar: ; 8CBDF98
+gMonIcon_Gligar: @ 8CBDF98
 	.incbin "data/graphics/pokemon/icons/gligar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gligar: ; 8CBE398
+gMonFootprint_Gligar: @ 8CBE398
 	.incbin "data/graphics/pokemon/footprints/gligar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Steelix: ; 8CBE3B8
+gMonStillFrontPic_Steelix: @ 8CBE3B8
 	.incbin "data/graphics/pokemon/still_front_pics/steelix_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Steelix: ; 8CBE880
+gMonPalette_Steelix: @ 8CBE880
 	.incbin "data/graphics/pokemon/palettes/steelix_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Steelix: ; 8CBE8A4
+gMonBackPic_Steelix: @ 8CBE8A4
 	.incbin "data/graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Steelix: ; 8CBECB0
+gMonShinyPalette_Steelix: @ 8CBECB0
 	.incbin "data/graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Steelix: ; 8CBECD4
+gMonIcon_Steelix: @ 8CBECD4
 	.incbin "data/graphics/pokemon/icons/steelix_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Steelix: ; 8CBF0D4
+gMonFootprint_Steelix: @ 8CBF0D4
 	.incbin "data/graphics/pokemon/footprints/steelix_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Snubbull: ; 8CBF0F4
+gMonStillFrontPic_Snubbull: @ 8CBF0F4
 	.incbin "data/graphics/pokemon/still_front_pics/snubbull_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Snubbull: ; 8CBF3C8
+gMonPalette_Snubbull: @ 8CBF3C8
 	.incbin "data/graphics/pokemon/palettes/snubbull_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Snubbull: ; 8CBF3F0
+gMonBackPic_Snubbull: @ 8CBF3F0
 	.incbin "data/graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Snubbull: ; 8CBF718
+gMonShinyPalette_Snubbull: @ 8CBF718
 	.incbin "data/graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Snubbull: ; 8CBF740
+gMonIcon_Snubbull: @ 8CBF740
 	.incbin "data/graphics/pokemon/icons/snubbull_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Snubbull: ; 8CBFB40
+gMonFootprint_Snubbull: @ 8CBFB40
 	.incbin "data/graphics/pokemon/footprints/snubbull_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Granbull: ; 8CBFB60
+gMonStillFrontPic_Granbull: @ 8CBFB60
 	.incbin "data/graphics/pokemon/still_front_pics/granbull_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Granbull: ; 8CBFEEC
+gMonPalette_Granbull: @ 8CBFEEC
 	.incbin "data/graphics/pokemon/palettes/granbull_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Granbull: ; 8CBFF14
+gMonBackPic_Granbull: @ 8CBFF14
 	.incbin "data/graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Granbull: ; 8CC0238
+gMonShinyPalette_Granbull: @ 8CC0238
 	.incbin "data/graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Granbull: ; 8CC0260
+gMonIcon_Granbull: @ 8CC0260
 	.incbin "data/graphics/pokemon/icons/granbull_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Granbull: ; 8CC0660
+gMonFootprint_Granbull: @ 8CC0660
 	.incbin "data/graphics/pokemon/footprints/granbull_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Qwilfish: ; 8CC0680
+gMonStillFrontPic_Qwilfish: @ 8CC0680
 	.incbin "data/graphics/pokemon/still_front_pics/qwilfish_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Qwilfish: ; 8CC0940
+gMonPalette_Qwilfish: @ 8CC0940
 	.incbin "data/graphics/pokemon/palettes/qwilfish_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Qwilfish: ; 8CC0968
+gMonBackPic_Qwilfish: @ 8CC0968
 	.incbin "data/graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Qwilfish: ; 8CC0C48
+gMonShinyPalette_Qwilfish: @ 8CC0C48
 	.incbin "data/graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Qwilfish: ; 8CC0C70
+gMonIcon_Qwilfish: @ 8CC0C70
 	.incbin "data/graphics/pokemon/icons/qwilfish_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Qwilfish: ; 8CC1070
+gMonFootprint_Qwilfish: @ 8CC1070
 	.incbin "data/graphics/pokemon/footprints/qwilfish_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Scizor: ; 8CC1090
+gMonStillFrontPic_Scizor: @ 8CC1090
 	.incbin "data/graphics/pokemon/still_front_pics/scizor_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Scizor: ; 8CC1578
+gMonPalette_Scizor: @ 8CC1578
 	.incbin "data/graphics/pokemon/palettes/scizor_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Scizor: ; 8CC15A0
+gMonBackPic_Scizor: @ 8CC15A0
 	.incbin "data/graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Scizor: ; 8CC1920
+gMonShinyPalette_Scizor: @ 8CC1920
 	.incbin "data/graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Scizor: ; 8CC1948
+gMonIcon_Scizor: @ 8CC1948
 	.incbin "data/graphics/pokemon/icons/scizor_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Scizor: ; 8CC1D48
+gMonFootprint_Scizor: @ 8CC1D48
 	.incbin "data/graphics/pokemon/footprints/scizor_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shuckle: ; 8CC1D68
+gMonStillFrontPic_Shuckle: @ 8CC1D68
 	.incbin "data/graphics/pokemon/still_front_pics/shuckle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shuckle: ; 8CC2030
+gMonPalette_Shuckle: @ 8CC2030
 	.incbin "data/graphics/pokemon/palettes/shuckle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shuckle: ; 8CC2058
+gMonBackPic_Shuckle: @ 8CC2058
 	.incbin "data/graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shuckle: ; 8CC22B0
+gMonShinyPalette_Shuckle: @ 8CC22B0
 	.incbin "data/graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shuckle: ; 8CC22D8
+gMonIcon_Shuckle: @ 8CC22D8
 	.incbin "data/graphics/pokemon/icons/shuckle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shuckle: ; 8CC26D8
+gMonFootprint_Shuckle: @ 8CC26D8
 	.incbin "data/graphics/pokemon/footprints/shuckle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Heracross: ; 8CC26F8
+gMonStillFrontPic_Heracross: @ 8CC26F8
 	.incbin "data/graphics/pokemon/still_front_pics/heracross_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Heracross: ; 8CC2AE8
+gMonPalette_Heracross: @ 8CC2AE8
 	.incbin "data/graphics/pokemon/palettes/heracross_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Heracross: ; 8CC2B10
+gMonBackPic_Heracross: @ 8CC2B10
 	.incbin "data/graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Heracross: ; 8CC2E80
+gMonShinyPalette_Heracross: @ 8CC2E80
 	.incbin "data/graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Heracross: ; 8CC2EA8
+gMonIcon_Heracross: @ 8CC2EA8
 	.incbin "data/graphics/pokemon/icons/heracross_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Heracross: ; 8CC32A8
+gMonFootprint_Heracross: @ 8CC32A8
 	.incbin "data/graphics/pokemon/footprints/heracross_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sneasel: ; 8CC32C8
+gMonStillFrontPic_Sneasel: @ 8CC32C8
 	.incbin "data/graphics/pokemon/still_front_pics/sneasel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sneasel: ; 8CC360C
+gMonPalette_Sneasel: @ 8CC360C
 	.incbin "data/graphics/pokemon/palettes/sneasel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sneasel: ; 8CC3634
+gMonBackPic_Sneasel: @ 8CC3634
 	.incbin "data/graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sneasel: ; 8CC3958
+gMonShinyPalette_Sneasel: @ 8CC3958
 	.incbin "data/graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sneasel: ; 8CC3980
+gMonIcon_Sneasel: @ 8CC3980
 	.incbin "data/graphics/pokemon/icons/sneasel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sneasel: ; 8CC3D80
+gMonFootprint_Sneasel: @ 8CC3D80
 	.incbin "data/graphics/pokemon/footprints/sneasel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Teddiursa: ; 8CC3DA0
+gMonStillFrontPic_Teddiursa: @ 8CC3DA0
 	.incbin "data/graphics/pokemon/still_front_pics/teddiursa_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Teddiursa: ; 8CC400C
+gMonPalette_Teddiursa: @ 8CC400C
 	.incbin "data/graphics/pokemon/palettes/teddiursa_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Teddiursa: ; 8CC4034
+gMonBackPic_Teddiursa: @ 8CC4034
 	.incbin "data/graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Teddiursa: ; 8CC42AC
+gMonShinyPalette_Teddiursa: @ 8CC42AC
 	.incbin "data/graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Teddiursa: ; 8CC42D4
+gMonIcon_Teddiursa: @ 8CC42D4
 	.incbin "data/graphics/pokemon/icons/teddiursa_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Teddiursa: ; 8CC46D4
+gMonFootprint_Teddiursa: @ 8CC46D4
 	.incbin "data/graphics/pokemon/footprints/teddiursa_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ursaring: ; 8CC46F4
+gMonStillFrontPic_Ursaring: @ 8CC46F4
 	.incbin "data/graphics/pokemon/still_front_pics/ursaring_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ursaring: ; 8CC4B2C
+gMonPalette_Ursaring: @ 8CC4B2C
 	.incbin "data/graphics/pokemon/palettes/ursaring_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ursaring: ; 8CC4B54
+gMonBackPic_Ursaring: @ 8CC4B54
 	.incbin "data/graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ursaring: ; 8CC4EDC
+gMonShinyPalette_Ursaring: @ 8CC4EDC
 	.incbin "data/graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ursaring: ; 8CC4F04
+gMonIcon_Ursaring: @ 8CC4F04
 	.incbin "data/graphics/pokemon/icons/ursaring_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ursaring: ; 8CC5304
+gMonFootprint_Ursaring: @ 8CC5304
 	.incbin "data/graphics/pokemon/footprints/ursaring_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slugma: ; 8CC5324
+gMonStillFrontPic_Slugma: @ 8CC5324
 	.incbin "data/graphics/pokemon/still_front_pics/slugma_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slugma: ; 8CC5598
+gMonPalette_Slugma: @ 8CC5598
 	.incbin "data/graphics/pokemon/palettes/slugma_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slugma: ; 8CC55BC
+gMonBackPic_Slugma: @ 8CC55BC
 	.incbin "data/graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slugma: ; 8CC58A4
+gMonShinyPalette_Slugma: @ 8CC58A4
 	.incbin "data/graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slugma: ; 8CC58C8
+gMonIcon_Slugma: @ 8CC58C8
 	.incbin "data/graphics/pokemon/icons/slugma_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slugma: ; 8CC5CC8
+gMonFootprint_Slugma: @ 8CC5CC8
 	.incbin "data/graphics/pokemon/footprints/slugma_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magcargo: ; 8CC5CE8
+gMonStillFrontPic_Magcargo: @ 8CC5CE8
 	.incbin "data/graphics/pokemon/still_front_pics/magcargo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magcargo: ; 8CC6030
+gMonPalette_Magcargo: @ 8CC6030
 	.incbin "data/graphics/pokemon/palettes/magcargo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magcargo: ; 8CC6058
+gMonBackPic_Magcargo: @ 8CC6058
 	.incbin "data/graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magcargo: ; 8CC6470
+gMonShinyPalette_Magcargo: @ 8CC6470
 	.incbin "data/graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magcargo: ; 8CC6498
+gMonIcon_Magcargo: @ 8CC6498
 	.incbin "data/graphics/pokemon/icons/magcargo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magcargo: ; 8CC6898
+gMonFootprint_Magcargo: @ 8CC6898
 	.incbin "data/graphics/pokemon/footprints/magcargo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Swinub: ; 8CC68B8
+gMonStillFrontPic_Swinub: @ 8CC68B8
 	.incbin "data/graphics/pokemon/still_front_pics/swinub_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Swinub: ; 8CC6AB4
+gMonPalette_Swinub: @ 8CC6AB4
 	.incbin "data/graphics/pokemon/palettes/swinub_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Swinub: ; 8CC6ADC
+gMonBackPic_Swinub: @ 8CC6ADC
 	.incbin "data/graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Swinub: ; 8CC6D18
+gMonShinyPalette_Swinub: @ 8CC6D18
 	.incbin "data/graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Swinub: ; 8CC6D40
+gMonIcon_Swinub: @ 8CC6D40
 	.incbin "data/graphics/pokemon/icons/swinub_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Swinub: ; 8CC7140
+gMonFootprint_Swinub: @ 8CC7140
 	.incbin "data/graphics/pokemon/footprints/swinub_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Piloswine: ; 8CC7160
+gMonStillFrontPic_Piloswine: @ 8CC7160
 	.incbin "data/graphics/pokemon/still_front_pics/piloswine_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Piloswine: ; 8CC7488
+gMonPalette_Piloswine: @ 8CC7488
 	.incbin "data/graphics/pokemon/palettes/piloswine_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Piloswine: ; 8CC74B0
+gMonBackPic_Piloswine: @ 8CC74B0
 	.incbin "data/graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Piloswine: ; 8CC76FC
+gMonShinyPalette_Piloswine: @ 8CC76FC
 	.incbin "data/graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Piloswine: ; 8CC7724
+gMonIcon_Piloswine: @ 8CC7724
 	.incbin "data/graphics/pokemon/icons/piloswine_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Piloswine: ; 8CC7B24
+gMonFootprint_Piloswine: @ 8CC7B24
 	.incbin "data/graphics/pokemon/footprints/piloswine_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Corsola: ; 8CC7B44
+gMonStillFrontPic_Corsola: @ 8CC7B44
 	.incbin "data/graphics/pokemon/still_front_pics/corsola_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Corsola: ; 8CC7E2C
+gMonPalette_Corsola: @ 8CC7E2C
 	.incbin "data/graphics/pokemon/palettes/corsola_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Corsola: ; 8CC7E54
+gMonBackPic_Corsola: @ 8CC7E54
 	.incbin "data/graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Corsola: ; 8CC8114
+gMonShinyPalette_Corsola: @ 8CC8114
 	.incbin "data/graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Corsola: ; 8CC813C
+gMonIcon_Corsola: @ 8CC813C
 	.incbin "data/graphics/pokemon/icons/corsola_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Corsola: ; 8CC853C
+gMonFootprint_Corsola: @ 8CC853C
 	.incbin "data/graphics/pokemon/footprints/corsola_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Remoraid: ; 8CC855C
+gMonStillFrontPic_Remoraid: @ 8CC855C
 	.incbin "data/graphics/pokemon/still_front_pics/remoraid_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Remoraid: ; 8CC87C4
+gMonPalette_Remoraid: @ 8CC87C4
 	.incbin "data/graphics/pokemon/palettes/remoraid_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Remoraid: ; 8CC87EC
+gMonBackPic_Remoraid: @ 8CC87EC
 	.incbin "data/graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Remoraid: ; 8CC8B00
+gMonShinyPalette_Remoraid: @ 8CC8B00
 	.incbin "data/graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Remoraid: ; 8CC8B28
+gMonIcon_Remoraid: @ 8CC8B28
 	.incbin "data/graphics/pokemon/icons/remoraid_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Remoraid: ; 8CC8F28
+gMonFootprint_Remoraid: @ 8CC8F28
 	.incbin "data/graphics/pokemon/footprints/remoraid_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Octillery: ; 8CC8F48
+gMonStillFrontPic_Octillery: @ 8CC8F48
 	.incbin "data/graphics/pokemon/still_front_pics/octillery_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Octillery: ; 8CC927C
+gMonPalette_Octillery: @ 8CC927C
 	.incbin "data/graphics/pokemon/palettes/octillery_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Octillery: ; 8CC92A4
+gMonBackPic_Octillery: @ 8CC92A4
 	.incbin "data/graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Octillery: ; 8CC955C
+gMonShinyPalette_Octillery: @ 8CC955C
 	.incbin "data/graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Octillery: ; 8CC9584
+gMonIcon_Octillery: @ 8CC9584
 	.incbin "data/graphics/pokemon/icons/octillery_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Octillery: ; 8CC9984
+gMonFootprint_Octillery: @ 8CC9984
 	.incbin "data/graphics/pokemon/footprints/octillery_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Delibird: ; 8CC99A4
+gMonStillFrontPic_Delibird: @ 8CC99A4
 	.incbin "data/graphics/pokemon/still_front_pics/delibird_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Delibird: ; 8CC9D14
+gMonPalette_Delibird: @ 8CC9D14
 	.incbin "data/graphics/pokemon/palettes/delibird_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Delibird: ; 8CC9D3C
+gMonBackPic_Delibird: @ 8CC9D3C
 	.incbin "data/graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Delibird: ; 8CCA0FC
+gMonShinyPalette_Delibird: @ 8CCA0FC
 	.incbin "data/graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Delibird: ; 8CCA124
+gMonIcon_Delibird: @ 8CCA124
 	.incbin "data/graphics/pokemon/icons/delibird_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Delibird: ; 8CCA524
+gMonFootprint_Delibird: @ 8CCA524
 	.incbin "data/graphics/pokemon/footprints/delibird_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mantine: ; 8CCA544
+gMonStillFrontPic_Mantine: @ 8CCA544
 	.incbin "data/graphics/pokemon/still_front_pics/mantine_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mantine: ; 8CCA9E0
+gMonPalette_Mantine: @ 8CCA9E0
 	.incbin "data/graphics/pokemon/palettes/mantine_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mantine: ; 8CCAA08
+gMonBackPic_Mantine: @ 8CCAA08
 	.incbin "data/graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mantine: ; 8CCACA8
+gMonShinyPalette_Mantine: @ 8CCACA8
 	.incbin "data/graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mantine: ; 8CCACD0
+gMonIcon_Mantine: @ 8CCACD0
 	.incbin "data/graphics/pokemon/icons/mantine_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mantine: ; 8CCB0D0
+gMonFootprint_Mantine: @ 8CCB0D0
 	.incbin "data/graphics/pokemon/footprints/mantine_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Skarmory: ; 8CCB0F0
+gMonStillFrontPic_Skarmory: @ 8CCB0F0
 	.incbin "data/graphics/pokemon/still_front_pics/skarmory_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Skarmory: ; 8CCB5D0
+gMonPalette_Skarmory: @ 8CCB5D0
 	.incbin "data/graphics/pokemon/palettes/skarmory_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Skarmory: ; 8CCB5F8
+gMonBackPic_Skarmory: @ 8CCB5F8
 	.incbin "data/graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Skarmory: ; 8CCB8FC
+gMonShinyPalette_Skarmory: @ 8CCB8FC
 	.incbin "data/graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Skarmory: ; 8CCB924
+gMonIcon_Skarmory: @ 8CCB924
 	.incbin "data/graphics/pokemon/icons/skarmory_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Skarmory: ; 8CCBD24
+gMonFootprint_Skarmory: @ 8CCBD24
 	.incbin "data/graphics/pokemon/footprints/skarmory_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Houndour: ; 8CCBD44
+gMonStillFrontPic_Houndour: @ 8CCBD44
 	.incbin "data/graphics/pokemon/still_front_pics/houndour_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Houndour: ; 8CCBFFC
+gMonPalette_Houndour: @ 8CCBFFC
 	.incbin "data/graphics/pokemon/palettes/houndour_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Houndour: ; 8CCC024
+gMonBackPic_Houndour: @ 8CCC024
 	.incbin "data/graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Houndour: ; 8CCC2A4
+gMonShinyPalette_Houndour: @ 8CCC2A4
 	.incbin "data/graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Houndour: ; 8CCC2CC
+gMonIcon_Houndour: @ 8CCC2CC
 	.incbin "data/graphics/pokemon/icons/houndour_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Houndour: ; 8CCC6CC
+gMonFootprint_Houndour: @ 8CCC6CC
 	.incbin "data/graphics/pokemon/footprints/houndour_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Houndoom: ; 8CCC6EC
+gMonStillFrontPic_Houndoom: @ 8CCC6EC
 	.incbin "data/graphics/pokemon/still_front_pics/houndoom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Houndoom: ; 8CCCAEC
+gMonPalette_Houndoom: @ 8CCCAEC
 	.incbin "data/graphics/pokemon/palettes/houndoom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Houndoom: ; 8CCCB14
+gMonBackPic_Houndoom: @ 8CCCB14
 	.incbin "data/graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Houndoom: ; 8CCCE38
+gMonShinyPalette_Houndoom: @ 8CCCE38
 	.incbin "data/graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Houndoom: ; 8CCCE60
+gMonIcon_Houndoom: @ 8CCCE60
 	.incbin "data/graphics/pokemon/icons/houndoom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Houndoom: ; 8CCD260
+gMonFootprint_Houndoom: @ 8CCD260
 	.incbin "data/graphics/pokemon/footprints/houndoom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kingdra: ; 8CCD280
+gMonStillFrontPic_Kingdra: @ 8CCD280
 	.incbin "data/graphics/pokemon/still_front_pics/kingdra_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kingdra: ; 8CCD6A0
+gMonPalette_Kingdra: @ 8CCD6A0
 	.incbin "data/graphics/pokemon/palettes/kingdra_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kingdra: ; 8CCD6C8
+gMonBackPic_Kingdra: @ 8CCD6C8
 	.incbin "data/graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kingdra: ; 8CCDA7C
+gMonShinyPalette_Kingdra: @ 8CCDA7C
 	.incbin "data/graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kingdra: ; 8CCDAA4
+gMonIcon_Kingdra: @ 8CCDAA4
 	.incbin "data/graphics/pokemon/icons/kingdra_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kingdra: ; 8CCDEA4
+gMonFootprint_Kingdra: @ 8CCDEA4
 	.incbin "data/graphics/pokemon/footprints/kingdra_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Phanpy: ; 8CCDEC4
+gMonStillFrontPic_Phanpy: @ 8CCDEC4
 	.incbin "data/graphics/pokemon/still_front_pics/phanpy_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Phanpy: ; 8CCE120
+gMonPalette_Phanpy: @ 8CCE120
 	.incbin "data/graphics/pokemon/palettes/phanpy_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Phanpy: ; 8CCE148
+gMonBackPic_Phanpy: @ 8CCE148
 	.incbin "data/graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Phanpy: ; 8CCE40C
+gMonShinyPalette_Phanpy: @ 8CCE40C
 	.incbin "data/graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Phanpy: ; 8CCE434
+gMonIcon_Phanpy: @ 8CCE434
 	.incbin "data/graphics/pokemon/icons/phanpy_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Phanpy: ; 8CCE834
+gMonFootprint_Phanpy: @ 8CCE834
 	.incbin "data/graphics/pokemon/footprints/phanpy_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Donphan: ; 8CCE854
+gMonStillFrontPic_Donphan: @ 8CCE854
 	.incbin "data/graphics/pokemon/still_front_pics/donphan_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Donphan: ; 8CCECC8
+gMonPalette_Donphan: @ 8CCECC8
 	.incbin "data/graphics/pokemon/palettes/donphan_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Donphan: ; 8CCECF0
+gMonBackPic_Donphan: @ 8CCECF0
 	.incbin "data/graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Donphan: ; 8CCEFEC
+gMonShinyPalette_Donphan: @ 8CCEFEC
 	.incbin "data/graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Donphan: ; 8CCF014
+gMonIcon_Donphan: @ 8CCF014
 	.incbin "data/graphics/pokemon/icons/donphan_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Donphan: ; 8CCF414
+gMonFootprint_Donphan: @ 8CCF414
 	.incbin "data/graphics/pokemon/footprints/donphan_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Porygon2: ; 8CCF434
+gMonStillFrontPic_Porygon2: @ 8CCF434
 	.incbin "data/graphics/pokemon/still_front_pics/porygon2_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Porygon2: ; 8CCF6BC
+gMonPalette_Porygon2: @ 8CCF6BC
 	.incbin "data/graphics/pokemon/palettes/porygon2_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Porygon2: ; 8CCF6E4
+gMonBackPic_Porygon2: @ 8CCF6E4
 	.incbin "data/graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Porygon2: ; 8CCFA00
+gMonShinyPalette_Porygon2: @ 8CCFA00
 	.incbin "data/graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Porygon2: ; 8CCFA28
+gMonIcon_Porygon2: @ 8CCFA28
 	.incbin "data/graphics/pokemon/icons/porygon2_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Porygon2: ; 8CCFE28
+gMonFootprint_Porygon2: @ 8CCFE28
 	.incbin "data/graphics/pokemon/footprints/porygon2_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Stantler: ; 8CCFE48
+gMonStillFrontPic_Stantler: @ 8CCFE48
 	.incbin "data/graphics/pokemon/still_front_pics/stantler_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Stantler: ; 8CD025C
+gMonPalette_Stantler: @ 8CD025C
 	.incbin "data/graphics/pokemon/palettes/stantler_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Stantler: ; 8CD0284
+gMonBackPic_Stantler: @ 8CD0284
 	.incbin "data/graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Stantler: ; 8CD05D0
+gMonShinyPalette_Stantler: @ 8CD05D0
 	.incbin "data/graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Stantler: ; 8CD05F8
+gMonIcon_Stantler: @ 8CD05F8
 	.incbin "data/graphics/pokemon/icons/stantler_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Stantler: ; 8CD09F8
+gMonFootprint_Stantler: @ 8CD09F8
 	.incbin "data/graphics/pokemon/footprints/stantler_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Smeargle: ; 8CD0A18
+gMonStillFrontPic_Smeargle: @ 8CD0A18
 	.incbin "data/graphics/pokemon/still_front_pics/smeargle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Smeargle: ; 8CD0DAC
+gMonPalette_Smeargle: @ 8CD0DAC
 	.incbin "data/graphics/pokemon/palettes/smeargle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Smeargle: ; 8CD0DD4
+gMonBackPic_Smeargle: @ 8CD0DD4
 	.incbin "data/graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Smeargle: ; 8CD10F8
+gMonShinyPalette_Smeargle: @ 8CD10F8
 	.incbin "data/graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Smeargle: ; 8CD1120
+gMonIcon_Smeargle: @ 8CD1120
 	.incbin "data/graphics/pokemon/icons/smeargle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Smeargle: ; 8CD1520
+gMonFootprint_Smeargle: @ 8CD1520
 	.incbin "data/graphics/pokemon/footprints/smeargle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tyrogue: ; 8CD1540
+gMonStillFrontPic_Tyrogue: @ 8CD1540
 	.incbin "data/graphics/pokemon/still_front_pics/tyrogue_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tyrogue: ; 8CD17CC
+gMonPalette_Tyrogue: @ 8CD17CC
 	.incbin "data/graphics/pokemon/palettes/tyrogue_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tyrogue: ; 8CD17F4
+gMonBackPic_Tyrogue: @ 8CD17F4
 	.incbin "data/graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tyrogue: ; 8CD1B10
+gMonShinyPalette_Tyrogue: @ 8CD1B10
 	.incbin "data/graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tyrogue: ; 8CD1B38
+gMonIcon_Tyrogue: @ 8CD1B38
 	.incbin "data/graphics/pokemon/icons/tyrogue_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tyrogue: ; 8CD1F38
+gMonFootprint_Tyrogue: @ 8CD1F38
 	.incbin "data/graphics/pokemon/footprints/tyrogue_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hitmontop: ; 8CD1F58
+gMonStillFrontPic_Hitmontop: @ 8CD1F58
 	.incbin "data/graphics/pokemon/still_front_pics/hitmontop_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hitmontop: ; 8CD22E4
+gMonPalette_Hitmontop: @ 8CD22E4
 	.incbin "data/graphics/pokemon/palettes/hitmontop_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hitmontop: ; 8CD230C
+gMonBackPic_Hitmontop: @ 8CD230C
 	.incbin "data/graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hitmontop: ; 8CD2734
+gMonShinyPalette_Hitmontop: @ 8CD2734
 	.incbin "data/graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hitmontop: ; 8CD275C
+gMonIcon_Hitmontop: @ 8CD275C
 	.incbin "data/graphics/pokemon/icons/hitmontop_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hitmontop: ; 8CD2B5C
+gMonFootprint_Hitmontop: @ 8CD2B5C
 	.incbin "data/graphics/pokemon/footprints/hitmontop_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Smoochum: ; 8CD2B7C
+gMonStillFrontPic_Smoochum: @ 8CD2B7C
 	.incbin "data/graphics/pokemon/still_front_pics/smoochum_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Smoochum: ; 8CD2DD4
+gMonPalette_Smoochum: @ 8CD2DD4
 	.incbin "data/graphics/pokemon/palettes/smoochum_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Smoochum: ; 8CD2DFC
+gMonBackPic_Smoochum: @ 8CD2DFC
 	.incbin "data/graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Smoochum: ; 8CD3074
+gMonShinyPalette_Smoochum: @ 8CD3074
 	.incbin "data/graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Smoochum: ; 8CD309C
+gMonIcon_Smoochum: @ 8CD309C
 	.incbin "data/graphics/pokemon/icons/smoochum_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Smoochum: ; 8CD349C
+gMonFootprint_Smoochum: @ 8CD349C
 	.incbin "data/graphics/pokemon/footprints/smoochum_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Elekid: ; 8CD34BC
+gMonStillFrontPic_Elekid: @ 8CD34BC
 	.incbin "data/graphics/pokemon/still_front_pics/elekid_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Elekid: ; 8CD37C4
+gMonPalette_Elekid: @ 8CD37C4
 	.incbin "data/graphics/pokemon/palettes/elekid_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Elekid: ; 8CD37EC
+gMonBackPic_Elekid: @ 8CD37EC
 	.incbin "data/graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Elekid: ; 8CD3B44
+gMonShinyPalette_Elekid: @ 8CD3B44
 	.incbin "data/graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Elekid: ; 8CD3B6C
+gMonIcon_Elekid: @ 8CD3B6C
 	.incbin "data/graphics/pokemon/icons/elekid_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Elekid: ; 8CD3F6C
+gMonFootprint_Elekid: @ 8CD3F6C
 	.incbin "data/graphics/pokemon/footprints/elekid_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Magby: ; 8CD3F8C
+gMonStillFrontPic_Magby: @ 8CD3F8C
 	.incbin "data/graphics/pokemon/still_front_pics/magby_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Magby: ; 8CD4210
+gMonPalette_Magby: @ 8CD4210
 	.incbin "data/graphics/pokemon/palettes/magby_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Magby: ; 8CD4238
+gMonBackPic_Magby: @ 8CD4238
 	.incbin "data/graphics/pokemon/back_pics/magby_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Magby: ; 8CD44E4
+gMonShinyPalette_Magby: @ 8CD44E4
 	.incbin "data/graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Magby: ; 8CD450C
+gMonIcon_Magby: @ 8CD450C
 	.incbin "data/graphics/pokemon/icons/magby_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Magby: ; 8CD490C
+gMonFootprint_Magby: @ 8CD490C
 	.incbin "data/graphics/pokemon/footprints/magby_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Miltank: ; 8CD492C
+gMonStillFrontPic_Miltank: @ 8CD492C
 	.incbin "data/graphics/pokemon/still_front_pics/miltank_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Miltank: ; 8CD4CDC
+gMonPalette_Miltank: @ 8CD4CDC
 	.incbin "data/graphics/pokemon/palettes/miltank_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Miltank: ; 8CD4D04
+gMonBackPic_Miltank: @ 8CD4D04
 	.incbin "data/graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Miltank: ; 8CD50A0
+gMonShinyPalette_Miltank: @ 8CD50A0
 	.incbin "data/graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Miltank: ; 8CD50C8
+gMonIcon_Miltank: @ 8CD50C8
 	.incbin "data/graphics/pokemon/icons/miltank_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Miltank: ; 8CD54C8
+gMonFootprint_Miltank: @ 8CD54C8
 	.incbin "data/graphics/pokemon/footprints/miltank_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Blissey: ; 8CD54E8
+gMonStillFrontPic_Blissey: @ 8CD54E8
 	.incbin "data/graphics/pokemon/still_front_pics/blissey_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Blissey: ; 8CD58D0
+gMonPalette_Blissey: @ 8CD58D0
 	.incbin "data/graphics/pokemon/palettes/blissey_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Blissey: ; 8CD58F8
+gMonBackPic_Blissey: @ 8CD58F8
 	.incbin "data/graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Blissey: ; 8CD5BC4
+gMonShinyPalette_Blissey: @ 8CD5BC4
 	.incbin "data/graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Blissey: ; 8CD5BEC
+gMonIcon_Blissey: @ 8CD5BEC
 	.incbin "data/graphics/pokemon/icons/blissey_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Blissey: ; 8CD5FEC
+gMonFootprint_Blissey: @ 8CD5FEC
 	.incbin "data/graphics/pokemon/footprints/blissey_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Raikou: ; 8CD600C
+gMonStillFrontPic_Raikou: @ 8CD600C
 	.incbin "data/graphics/pokemon/still_front_pics/raikou_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Raikou: ; 8CD6588
+gMonPalette_Raikou: @ 8CD6588
 	.incbin "data/graphics/pokemon/palettes/raikou_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Raikou: ; 8CD65B0
+gMonBackPic_Raikou: @ 8CD65B0
 	.incbin "data/graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Raikou: ; 8CD6958
+gMonShinyPalette_Raikou: @ 8CD6958
 	.incbin "data/graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Raikou: ; 8CD6980
+gMonIcon_Raikou: @ 8CD6980
 	.incbin "data/graphics/pokemon/icons/raikou_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Raikou: ; 8CD6D80
+gMonFootprint_Raikou: @ 8CD6D80
 	.incbin "data/graphics/pokemon/footprints/raikou_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Entei: ; 8CD6DA0
+gMonStillFrontPic_Entei: @ 8CD6DA0
 	.incbin "data/graphics/pokemon/still_front_pics/entei_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Entei: ; 8CD739C
+gMonPalette_Entei: @ 8CD739C
 	.incbin "data/graphics/pokemon/palettes/entei_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Entei: ; 8CD73C4
+gMonBackPic_Entei: @ 8CD73C4
 	.incbin "data/graphics/pokemon/back_pics/entei_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Entei: ; 8CD77E8
+gMonShinyPalette_Entei: @ 8CD77E8
 	.incbin "data/graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Entei: ; 8CD7810
+gMonIcon_Entei: @ 8CD7810
 	.incbin "data/graphics/pokemon/icons/entei_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Entei: ; 8CD7C10
+gMonFootprint_Entei: @ 8CD7C10
 	.incbin "data/graphics/pokemon/footprints/entei_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Suicune: ; 8CD7C30
+gMonStillFrontPic_Suicune: @ 8CD7C30
 	.incbin "data/graphics/pokemon/still_front_pics/suicune_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Suicune: ; 8CD81B4
+gMonPalette_Suicune: @ 8CD81B4
 	.incbin "data/graphics/pokemon/palettes/suicune_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Suicune: ; 8CD81DC
+gMonBackPic_Suicune: @ 8CD81DC
 	.incbin "data/graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Suicune: ; 8CD86B8
+gMonShinyPalette_Suicune: @ 8CD86B8
 	.incbin "data/graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Suicune: ; 8CD86E0
+gMonIcon_Suicune: @ 8CD86E0
 	.incbin "data/graphics/pokemon/icons/suicune_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Suicune: ; 8CD8AE0
+gMonFootprint_Suicune: @ 8CD8AE0
 	.incbin "data/graphics/pokemon/footprints/suicune_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Larvitar: ; 8CD8B00
+gMonStillFrontPic_Larvitar: @ 8CD8B00
 	.incbin "data/graphics/pokemon/still_front_pics/larvitar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Larvitar: ; 8CD8D5C
+gMonPalette_Larvitar: @ 8CD8D5C
 	.incbin "data/graphics/pokemon/palettes/larvitar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Larvitar: ; 8CD8D84
+gMonBackPic_Larvitar: @ 8CD8D84
 	.incbin "data/graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Larvitar: ; 8CD9030
+gMonShinyPalette_Larvitar: @ 8CD9030
 	.incbin "data/graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Larvitar: ; 8CD9058
+gMonIcon_Larvitar: @ 8CD9058
 	.incbin "data/graphics/pokemon/icons/larvitar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Larvitar: ; 8CD9458
+gMonFootprint_Larvitar: @ 8CD9458
 	.incbin "data/graphics/pokemon/footprints/larvitar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pupitar: ; 8CD9478
+gMonStillFrontPic_Pupitar: @ 8CD9478
 	.incbin "data/graphics/pokemon/still_front_pics/pupitar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pupitar: ; 8CD9768
+gMonPalette_Pupitar: @ 8CD9768
 	.incbin "data/graphics/pokemon/palettes/pupitar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pupitar: ; 8CD9790
+gMonBackPic_Pupitar: @ 8CD9790
 	.incbin "data/graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pupitar: ; 8CD9AC8
+gMonShinyPalette_Pupitar: @ 8CD9AC8
 	.incbin "data/graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pupitar: ; 8CD9AF0
+gMonIcon_Pupitar: @ 8CD9AF0
 	.incbin "data/graphics/pokemon/icons/pupitar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pupitar: ; 8CD9EF0
+gMonFootprint_Pupitar: @ 8CD9EF0
 	.incbin "data/graphics/pokemon/footprints/pupitar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tyranitar: ; 8CD9F10
+gMonStillFrontPic_Tyranitar: @ 8CD9F10
 	.incbin "data/graphics/pokemon/still_front_pics/tyranitar_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tyranitar: ; 8CDA44C
+gMonPalette_Tyranitar: @ 8CDA44C
 	.incbin "data/graphics/pokemon/palettes/tyranitar_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tyranitar: ; 8CDA474
+gMonBackPic_Tyranitar: @ 8CDA474
 	.incbin "data/graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tyranitar: ; 8CDA860
+gMonShinyPalette_Tyranitar: @ 8CDA860
 	.incbin "data/graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tyranitar: ; 8CDA888
+gMonIcon_Tyranitar: @ 8CDA888
 	.incbin "data/graphics/pokemon/icons/tyranitar_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tyranitar: ; 8CDAC88
+gMonFootprint_Tyranitar: @ 8CDAC88
 	.incbin "data/graphics/pokemon/footprints/tyranitar_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lugia: ; 8CDACA8
+gMonStillFrontPic_Lugia: @ 8CDACA8
 	.incbin "data/graphics/pokemon/still_front_pics/lugia_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lugia: ; 8CDB16C
+gMonPalette_Lugia: @ 8CDB16C
 	.incbin "data/graphics/pokemon/palettes/lugia_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lugia: ; 8CDB194
+gMonBackPic_Lugia: @ 8CDB194
 	.incbin "data/graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lugia: ; 8CDB568
+gMonShinyPalette_Lugia: @ 8CDB568
 	.incbin "data/graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lugia: ; 8CDB590
+gMonIcon_Lugia: @ 8CDB590
 	.incbin "data/graphics/pokemon/icons/lugia_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lugia: ; 8CDB990
+gMonFootprint_Lugia: @ 8CDB990
 	.incbin "data/graphics/pokemon/footprints/lugia_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_HoOh: ; 8CDB9B0
+gMonStillFrontPic_HoOh: @ 8CDB9B0
 	.incbin "data/graphics/pokemon/still_front_pics/ho_oh_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_HoOh: ; 8CDC004
+gMonPalette_HoOh: @ 8CDC004
 	.incbin "data/graphics/pokemon/palettes/ho_oh_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_HoOh: ; 8CDC02C
+gMonBackPic_HoOh: @ 8CDC02C
 	.incbin "data/graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_HoOh: ; 8CDC43C
+gMonShinyPalette_HoOh: @ 8CDC43C
 	.incbin "data/graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_HoOh: ; 8CDC464
+gMonIcon_HoOh: @ 8CDC464
 	.incbin "data/graphics/pokemon/icons/ho_oh_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_HoOh: ; 8CDC864
+gMonFootprint_HoOh: @ 8CDC864
 	.incbin "data/graphics/pokemon/footprints/ho_oh_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Celebi: ; 8CDC884
+gMonStillFrontPic_Celebi: @ 8CDC884
 	.incbin "data/graphics/pokemon/still_front_pics/celebi_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Celebi: ; 8CDCAFC
+gMonPalette_Celebi: @ 8CDCAFC
 	.incbin "data/graphics/pokemon/palettes/celebi_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Celebi: ; 8CDCB24
+gMonBackPic_Celebi: @ 8CDCB24
 	.incbin "data/graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Celebi: ; 8CDCED0
+gMonShinyPalette_Celebi: @ 8CDCED0
 	.incbin "data/graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Celebi: ; 8CDCEF8
+gMonIcon_Celebi: @ 8CDCEF8
 	.incbin "data/graphics/pokemon/icons/celebi_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Celebi: ; 8CDD2F8
+gMonFootprint_Celebi: @ 8CDD2F8
 	.incbin "data/graphics/pokemon/footprints/celebi_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_DoubleQuestionMark: ; 8CDD318
+gMonStillFrontPic_DoubleQuestionMark: @ 8CDD318
 	.incbin "data/graphics/pokemon/still_front_pics/double_question_mark_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_DoubleQuestionMark: ; 8CDD498
+gMonPalette_DoubleQuestionMark: @ 8CDD498
 	.incbin "data/graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_DoubleQuestionMark: ; 8CDD4AC
+gMonBackPic_DoubleQuestionMark: @ 8CDD4AC
 	.incbin "data/graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_DoubleQuestionMark: ; 8CDD630
+gMonShinyPalette_DoubleQuestionMark: @ 8CDD630
 	.incbin "data/graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonStillFrontPic_Treecko: ; 8CDD644
+gMonStillFrontPic_Treecko: @ 8CDD644
 	.incbin "data/graphics/pokemon/still_front_pics/treecko_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Treecko: ; 8CDD94C
+gMonPalette_Treecko: @ 8CDD94C
 	.incbin "data/graphics/pokemon/palettes/treecko_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Treecko: ; 8CDD974
+gMonBackPic_Treecko: @ 8CDD974
 	.incbin "data/graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Treecko: ; 8CDDC74
+gMonShinyPalette_Treecko: @ 8CDDC74
 	.incbin "data/graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Treecko: ; 8CDDC9C
+gMonIcon_Treecko: @ 8CDDC9C
 	.incbin "data/graphics/pokemon/icons/treecko_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Treecko: ; 8CDE09C
+gMonFootprint_Treecko: @ 8CDE09C
 	.incbin "data/graphics/pokemon/footprints/treecko_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Grovyle: ; 8CDE0BC
+gMonStillFrontPic_Grovyle: @ 8CDE0BC
 	.incbin "data/graphics/pokemon/still_front_pics/grovyle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Grovyle: ; 8CDE548
+gMonPalette_Grovyle: @ 8CDE548
 	.incbin "data/graphics/pokemon/palettes/grovyle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Grovyle: ; 8CDE570
+gMonBackPic_Grovyle: @ 8CDE570
 	.incbin "data/graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Grovyle: ; 8CDE8AC
+gMonShinyPalette_Grovyle: @ 8CDE8AC
 	.incbin "data/graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Grovyle: ; 8CDE8D4
+gMonIcon_Grovyle: @ 8CDE8D4
 	.incbin "data/graphics/pokemon/icons/grovyle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Grovyle: ; 8CDECD4
+gMonFootprint_Grovyle: @ 8CDECD4
 	.incbin "data/graphics/pokemon/footprints/grovyle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sceptile: ; 8CDECF4
+gMonStillFrontPic_Sceptile: @ 8CDECF4
 	.incbin "data/graphics/pokemon/still_front_pics/sceptile_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sceptile: ; 8CDF1F8
+gMonPalette_Sceptile: @ 8CDF1F8
 	.incbin "data/graphics/pokemon/palettes/sceptile_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sceptile: ; 8CDF220
+gMonBackPic_Sceptile: @ 8CDF220
 	.incbin "data/graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sceptile: ; 8CDF61C
+gMonShinyPalette_Sceptile: @ 8CDF61C
 	.incbin "data/graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sceptile: ; 8CDF644
+gMonIcon_Sceptile: @ 8CDF644
 	.incbin "data/graphics/pokemon/icons/sceptile_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sceptile: ; 8CDFA44
+gMonFootprint_Sceptile: @ 8CDFA44
 	.incbin "data/graphics/pokemon/footprints/sceptile_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Torchic: ; 8CDFA64
+gMonStillFrontPic_Torchic: @ 8CDFA64
 	.incbin "data/graphics/pokemon/still_front_pics/torchic_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Torchic: ; 8CDFD00
+gMonPalette_Torchic: @ 8CDFD00
 	.incbin "data/graphics/pokemon/palettes/torchic_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Torchic: ; 8CDFD28
+gMonBackPic_Torchic: @ 8CDFD28
 	.incbin "data/graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Torchic: ; 8CE0000
+gMonShinyPalette_Torchic: @ 8CE0000
 	.incbin "data/graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Torchic: ; 8CE0028
+gMonIcon_Torchic: @ 8CE0028
 	.incbin "data/graphics/pokemon/icons/torchic_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Torchic: ; 8CE0428
+gMonFootprint_Torchic: @ 8CE0428
 	.incbin "data/graphics/pokemon/footprints/torchic_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Combusken: ; 8CE0448
+gMonStillFrontPic_Combusken: @ 8CE0448
 	.incbin "data/graphics/pokemon/still_front_pics/combusken_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Combusken: ; 8CE0834
+gMonPalette_Combusken: @ 8CE0834
 	.incbin "data/graphics/pokemon/palettes/combusken_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Combusken: ; 8CE085C
+gMonBackPic_Combusken: @ 8CE085C
 	.incbin "data/graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Combusken: ; 8CE0C2C
+gMonShinyPalette_Combusken: @ 8CE0C2C
 	.incbin "data/graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Combusken: ; 8CE0C54
+gMonIcon_Combusken: @ 8CE0C54
 	.incbin "data/graphics/pokemon/icons/combusken_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Combusken: ; 8CE1054
+gMonFootprint_Combusken: @ 8CE1054
 	.incbin "data/graphics/pokemon/footprints/combusken_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Blaziken: ; 8CE1074
+gMonStillFrontPic_Blaziken: @ 8CE1074
 	.incbin "data/graphics/pokemon/still_front_pics/blaziken_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Blaziken: ; 8CE17C4
+gMonPalette_Blaziken: @ 8CE17C4
 	.incbin "data/graphics/pokemon/palettes/blaziken_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Blaziken: ; 8CE17EC
+gMonBackPic_Blaziken: @ 8CE17EC
 	.incbin "data/graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Blaziken: ; 8CE1BC8
+gMonShinyPalette_Blaziken: @ 8CE1BC8
 	.incbin "data/graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Blaziken: ; 8CE1BF0
+gMonIcon_Blaziken: @ 8CE1BF0
 	.incbin "data/graphics/pokemon/icons/blaziken_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Blaziken: ; 8CE1FF0
+gMonFootprint_Blaziken: @ 8CE1FF0
 	.incbin "data/graphics/pokemon/footprints/blaziken_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mudkip: ; 8CE2010
+gMonStillFrontPic_Mudkip: @ 8CE2010
 	.incbin "data/graphics/pokemon/still_front_pics/mudkip_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mudkip: ; 8CE22C8
+gMonPalette_Mudkip: @ 8CE22C8
 	.incbin "data/graphics/pokemon/palettes/mudkip_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mudkip: ; 8CE22F0
+gMonBackPic_Mudkip: @ 8CE22F0
 	.incbin "data/graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mudkip: ; 8CE25D0
+gMonShinyPalette_Mudkip: @ 8CE25D0
 	.incbin "data/graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mudkip: ; 8CE25F8
+gMonIcon_Mudkip: @ 8CE25F8
 	.incbin "data/graphics/pokemon/icons/mudkip_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mudkip: ; 8CE29F8
+gMonFootprint_Mudkip: @ 8CE29F8
 	.incbin "data/graphics/pokemon/footprints/mudkip_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Marshtomp: ; 8CE2A18
+gMonStillFrontPic_Marshtomp: @ 8CE2A18
 	.incbin "data/graphics/pokemon/still_front_pics/marshtomp_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Marshtomp: ; 8CE3078
+gMonPalette_Marshtomp: @ 8CE3078
 	.incbin "data/graphics/pokemon/palettes/marshtomp_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Marshtomp: ; 8CE30A0
+gMonBackPic_Marshtomp: @ 8CE30A0
 	.incbin "data/graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Marshtomp: ; 8CE3450
+gMonShinyPalette_Marshtomp: @ 8CE3450
 	.incbin "data/graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Marshtomp: ; 8CE3478
+gMonIcon_Marshtomp: @ 8CE3478
 	.incbin "data/graphics/pokemon/icons/marshtomp_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Marshtomp: ; 8CE3878
+gMonFootprint_Marshtomp: @ 8CE3878
 	.incbin "data/graphics/pokemon/footprints/marshtomp_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Swampert: ; 8CE3898
+gMonStillFrontPic_Swampert: @ 8CE3898
 	.incbin "data/graphics/pokemon/still_front_pics/swampert_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Swampert: ; 8CE3E14
+gMonPalette_Swampert: @ 8CE3E14
 	.incbin "data/graphics/pokemon/palettes/swampert_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Swampert: ; 8CE3E3C
+gMonBackPic_Swampert: @ 8CE3E3C
 	.incbin "data/graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Swampert: ; 8CE41F0
+gMonShinyPalette_Swampert: @ 8CE41F0
 	.incbin "data/graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Swampert: ; 8CE4218
+gMonIcon_Swampert: @ 8CE4218
 	.incbin "data/graphics/pokemon/icons/swampert_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Swampert: ; 8CE4618
+gMonFootprint_Swampert: @ 8CE4618
 	.incbin "data/graphics/pokemon/footprints/swampert_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Poochyena: ; 8CE4638
+gMonStillFrontPic_Poochyena: @ 8CE4638
 	.incbin "data/graphics/pokemon/still_front_pics/poochyena_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Poochyena: ; 8CE4BDC
+gMonPalette_Poochyena: @ 8CE4BDC
 	.incbin "data/graphics/pokemon/palettes/poochyena_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Poochyena: ; 8CE4C04
+gMonBackPic_Poochyena: @ 8CE4C04
 	.incbin "data/graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Poochyena: ; 8CE4F30
+gMonShinyPalette_Poochyena: @ 8CE4F30
 	.incbin "data/graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Poochyena: ; 8CE4F58
+gMonIcon_Poochyena: @ 8CE4F58
 	.incbin "data/graphics/pokemon/icons/poochyena_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Poochyena: ; 8CE5358
+gMonFootprint_Poochyena: @ 8CE5358
 	.incbin "data/graphics/pokemon/footprints/poochyena_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mightyena: ; 8CE5378
+gMonStillFrontPic_Mightyena: @ 8CE5378
 	.incbin "data/graphics/pokemon/still_front_pics/mightyena_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mightyena: ; 8CE57B0
+gMonPalette_Mightyena: @ 8CE57B0
 	.incbin "data/graphics/pokemon/palettes/mightyena_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mightyena: ; 8CE57D8
+gMonBackPic_Mightyena: @ 8CE57D8
 	.incbin "data/graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mightyena: ; 8CE5B50
+gMonShinyPalette_Mightyena: @ 8CE5B50
 	.incbin "data/graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mightyena: ; 8CE5B78
+gMonIcon_Mightyena: @ 8CE5B78
 	.incbin "data/graphics/pokemon/icons/mightyena_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mightyena: ; 8CE5F78
+gMonFootprint_Mightyena: @ 8CE5F78
 	.incbin "data/graphics/pokemon/footprints/mightyena_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Zigzagoon: ; 8CE5F98
+gMonStillFrontPic_Zigzagoon: @ 8CE5F98
 	.incbin "data/graphics/pokemon/still_front_pics/zigzagoon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Zigzagoon: ; 8CE6368
+gMonPalette_Zigzagoon: @ 8CE6368
 	.incbin "data/graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Zigzagoon: ; 8CE6390
+gMonBackPic_Zigzagoon: @ 8CE6390
 	.incbin "data/graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Zigzagoon: ; 8CE66D0
+gMonShinyPalette_Zigzagoon: @ 8CE66D0
 	.incbin "data/graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Zigzagoon: ; 8CE66F8
+gMonIcon_Zigzagoon: @ 8CE66F8
 	.incbin "data/graphics/pokemon/icons/zigzagoon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Zigzagoon: ; 8CE6AF8
+gMonFootprint_Zigzagoon: @ 8CE6AF8
 	.incbin "data/graphics/pokemon/footprints/zigzagoon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Linoone: ; 8CE6B18
+gMonStillFrontPic_Linoone: @ 8CE6B18
 	.incbin "data/graphics/pokemon/still_front_pics/linoone_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Linoone: ; 8CE6E88
+gMonPalette_Linoone: @ 8CE6E88
 	.incbin "data/graphics/pokemon/palettes/linoone_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Linoone: ; 8CE6EB0
+gMonBackPic_Linoone: @ 8CE6EB0
 	.incbin "data/graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Linoone: ; 8CE7184
+gMonShinyPalette_Linoone: @ 8CE7184
 	.incbin "data/graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Linoone: ; 8CE71AC
+gMonIcon_Linoone: @ 8CE71AC
 	.incbin "data/graphics/pokemon/icons/linoone_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Linoone: ; 8CE75AC
+gMonFootprint_Linoone: @ 8CE75AC
 	.incbin "data/graphics/pokemon/footprints/linoone_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wurmple: ; 8CE75CC
+gMonStillFrontPic_Wurmple: @ 8CE75CC
 	.incbin "data/graphics/pokemon/still_front_pics/wurmple_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wurmple: ; 8CE7854
+gMonPalette_Wurmple: @ 8CE7854
 	.incbin "data/graphics/pokemon/palettes/wurmple_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wurmple: ; 8CE787C
+gMonBackPic_Wurmple: @ 8CE787C
 	.incbin "data/graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wurmple: ; 8CE7AC8
+gMonShinyPalette_Wurmple: @ 8CE7AC8
 	.incbin "data/graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wurmple: ; 8CE7AF0
+gMonIcon_Wurmple: @ 8CE7AF0
 	.incbin "data/graphics/pokemon/icons/wurmple_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wurmple: ; 8CE7EF0
+gMonFootprint_Wurmple: @ 8CE7EF0
 	.incbin "data/graphics/pokemon/footprints/wurmple_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Silcoon: ; 8CE7F10
+gMonStillFrontPic_Silcoon: @ 8CE7F10
 	.incbin "data/graphics/pokemon/still_front_pics/silcoon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Silcoon: ; 8CE8190
+gMonPalette_Silcoon: @ 8CE8190
 	.incbin "data/graphics/pokemon/palettes/silcoon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Silcoon: ; 8CE81B8
+gMonBackPic_Silcoon: @ 8CE81B8
 	.incbin "data/graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Silcoon: ; 8CE83D4
+gMonShinyPalette_Silcoon: @ 8CE83D4
 	.incbin "data/graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Silcoon: ; 8CE83FC
+gMonIcon_Silcoon: @ 8CE83FC
 	.incbin "data/graphics/pokemon/icons/silcoon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Silcoon: ; 8CE87FC
+gMonFootprint_Silcoon: @ 8CE87FC
 	.incbin "data/graphics/pokemon/footprints/silcoon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Beautifly: ; 8CE881C
+gMonStillFrontPic_Beautifly: @ 8CE881C
 	.incbin "data/graphics/pokemon/still_front_pics/beautifly_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Beautifly: ; 8CE8B74
+gMonPalette_Beautifly: @ 8CE8B74
 	.incbin "data/graphics/pokemon/palettes/beautifly_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Beautifly: ; 8CE8B9C
+gMonBackPic_Beautifly: @ 8CE8B9C
 	.incbin "data/graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Beautifly: ; 8CE8F4C
+gMonShinyPalette_Beautifly: @ 8CE8F4C
 	.incbin "data/graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Beautifly: ; 8CE8F74
+gMonIcon_Beautifly: @ 8CE8F74
 	.incbin "data/graphics/pokemon/icons/beautifly_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Beautifly: ; 8CE9374
+gMonFootprint_Beautifly: @ 8CE9374
 	.incbin "data/graphics/pokemon/footprints/beautifly_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cascoon: ; 8CE9394
+gMonStillFrontPic_Cascoon: @ 8CE9394
 	.incbin "data/graphics/pokemon/still_front_pics/cascoon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cascoon: ; 8CE9600
+gMonPalette_Cascoon: @ 8CE9600
 	.incbin "data/graphics/pokemon/palettes/cascoon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cascoon: ; 8CE9628
+gMonBackPic_Cascoon: @ 8CE9628
 	.incbin "data/graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cascoon: ; 8CE9838
+gMonShinyPalette_Cascoon: @ 8CE9838
 	.incbin "data/graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cascoon: ; 8CE9860
+gMonIcon_Cascoon: @ 8CE9860
 	.incbin "data/graphics/pokemon/icons/cascoon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cascoon: ; 8CE9C60
+gMonFootprint_Cascoon: @ 8CE9C60
 	.incbin "data/graphics/pokemon/footprints/cascoon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dustox: ; 8CE9C80
+gMonStillFrontPic_Dustox: @ 8CE9C80
 	.incbin "data/graphics/pokemon/still_front_pics/dustox_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dustox: ; 8CE9FE8
+gMonPalette_Dustox: @ 8CE9FE8
 	.incbin "data/graphics/pokemon/palettes/dustox_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dustox: ; 8CEA010
+gMonBackPic_Dustox: @ 8CEA010
 	.incbin "data/graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dustox: ; 8CEA268
+gMonShinyPalette_Dustox: @ 8CEA268
 	.incbin "data/graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dustox: ; 8CEA290
+gMonIcon_Dustox: @ 8CEA290
 	.incbin "data/graphics/pokemon/icons/dustox_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dustox: ; 8CEA690
+gMonFootprint_Dustox: @ 8CEA690
 	.incbin "data/graphics/pokemon/footprints/dustox_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lotad: ; 8CEA6B0
+gMonStillFrontPic_Lotad: @ 8CEA6B0
 	.incbin "data/graphics/pokemon/still_front_pics/lotad_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lotad: ; 8CEA910
+gMonPalette_Lotad: @ 8CEA910
 	.incbin "data/graphics/pokemon/palettes/lotad_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lotad: ; 8CEA938
+gMonBackPic_Lotad: @ 8CEA938
 	.incbin "data/graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lotad: ; 8CEAC20
+gMonShinyPalette_Lotad: @ 8CEAC20
 	.incbin "data/graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lotad: ; 8CEAC48
+gMonIcon_Lotad: @ 8CEAC48
 	.incbin "data/graphics/pokemon/icons/lotad_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lotad: ; 8CEB048
+gMonFootprint_Lotad: @ 8CEB048
 	.incbin "data/graphics/pokemon/footprints/lotad_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lombre: ; 8CEB068
+gMonStillFrontPic_Lombre: @ 8CEB068
 	.incbin "data/graphics/pokemon/still_front_pics/lombre_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lombre: ; 8CEB380
+gMonPalette_Lombre: @ 8CEB380
 	.incbin "data/graphics/pokemon/palettes/lombre_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lombre: ; 8CEB3A8
+gMonBackPic_Lombre: @ 8CEB3A8
 	.incbin "data/graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lombre: ; 8CEB6A4
+gMonShinyPalette_Lombre: @ 8CEB6A4
 	.incbin "data/graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lombre: ; 8CEB6CC
+gMonIcon_Lombre: @ 8CEB6CC
 	.incbin "data/graphics/pokemon/icons/lombre_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lombre: ; 8CEBACC
+gMonFootprint_Lombre: @ 8CEBACC
 	.incbin "data/graphics/pokemon/footprints/lombre_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ludicolo: ; 8CEBAEC
+gMonStillFrontPic_Ludicolo: @ 8CEBAEC
 	.incbin "data/graphics/pokemon/still_front_pics/ludicolo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ludicolo: ; 8CEBFD0
+gMonPalette_Ludicolo: @ 8CEBFD0
 	.incbin "data/graphics/pokemon/palettes/ludicolo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ludicolo: ; 8CEBFF8
+gMonBackPic_Ludicolo: @ 8CEBFF8
 	.incbin "data/graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ludicolo: ; 8CEC2F4
+gMonShinyPalette_Ludicolo: @ 8CEC2F4
 	.incbin "data/graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ludicolo: ; 8CEC31C
+gMonIcon_Ludicolo: @ 8CEC31C
 	.incbin "data/graphics/pokemon/icons/ludicolo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ludicolo: ; 8CEC71C
+gMonFootprint_Ludicolo: @ 8CEC71C
 	.incbin "data/graphics/pokemon/footprints/ludicolo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Seedot: ; 8CEC73C
+gMonStillFrontPic_Seedot: @ 8CEC73C
 	.incbin "data/graphics/pokemon/still_front_pics/seedot_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Seedot: ; 8CEC9D0
+gMonPalette_Seedot: @ 8CEC9D0
 	.incbin "data/graphics/pokemon/palettes/seedot_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Seedot: ; 8CEC9F8
+gMonBackPic_Seedot: @ 8CEC9F8
 	.incbin "data/graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Seedot: ; 8CECCD8
+gMonShinyPalette_Seedot: @ 8CECCD8
 	.incbin "data/graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Seedot: ; 8CECD00
+gMonIcon_Seedot: @ 8CECD00
 	.incbin "data/graphics/pokemon/icons/seedot_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Seedot: ; 8CED100
+gMonFootprint_Seedot: @ 8CED100
 	.incbin "data/graphics/pokemon/footprints/seedot_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nuzleaf: ; 8CED120
+gMonStillFrontPic_Nuzleaf: @ 8CED120
 	.incbin "data/graphics/pokemon/still_front_pics/nuzleaf_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nuzleaf: ; 8CED40C
+gMonPalette_Nuzleaf: @ 8CED40C
 	.incbin "data/graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nuzleaf: ; 8CED434
+gMonBackPic_Nuzleaf: @ 8CED434
 	.incbin "data/graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nuzleaf: ; 8CED6FC
+gMonShinyPalette_Nuzleaf: @ 8CED6FC
 	.incbin "data/graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nuzleaf: ; 8CED724
+gMonIcon_Nuzleaf: @ 8CED724
 	.incbin "data/graphics/pokemon/icons/nuzleaf_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nuzleaf: ; 8CEDB24
+gMonFootprint_Nuzleaf: @ 8CEDB24
 	.incbin "data/graphics/pokemon/footprints/nuzleaf_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shiftry: ; 8CEDB44
+gMonStillFrontPic_Shiftry: @ 8CEDB44
 	.incbin "data/graphics/pokemon/still_front_pics/shiftry_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shiftry: ; 8CEE000
+gMonPalette_Shiftry: @ 8CEE000
 	.incbin "data/graphics/pokemon/palettes/shiftry_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shiftry: ; 8CEE028
+gMonBackPic_Shiftry: @ 8CEE028
 	.incbin "data/graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shiftry: ; 8CEE2EC
+gMonShinyPalette_Shiftry: @ 8CEE2EC
 	.incbin "data/graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shiftry: ; 8CEE314
+gMonIcon_Shiftry: @ 8CEE314
 	.incbin "data/graphics/pokemon/icons/shiftry_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shiftry: ; 8CEE714
+gMonFootprint_Shiftry: @ 8CEE714
 	.incbin "data/graphics/pokemon/footprints/shiftry_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nincada: ; 8CEE734
+gMonStillFrontPic_Nincada: @ 8CEE734
 	.incbin "data/graphics/pokemon/still_front_pics/nincada_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nincada: ; 8CEE9D4
+gMonPalette_Nincada: @ 8CEE9D4
 	.incbin "data/graphics/pokemon/palettes/nincada_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nincada: ; 8CEE9FC
+gMonBackPic_Nincada: @ 8CEE9FC
 	.incbin "data/graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nincada: ; 8CEECB4
+gMonShinyPalette_Nincada: @ 8CEECB4
 	.incbin "data/graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nincada: ; 8CEECDC
+gMonIcon_Nincada: @ 8CEECDC
 	.incbin "data/graphics/pokemon/icons/nincada_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nincada: ; 8CEF0DC
+gMonFootprint_Nincada: @ 8CEF0DC
 	.incbin "data/graphics/pokemon/footprints/nincada_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ninjask: ; 8CEF0FC
+gMonStillFrontPic_Ninjask: @ 8CEF0FC
 	.incbin "data/graphics/pokemon/still_front_pics/ninjask_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ninjask: ; 8CEF46C
+gMonPalette_Ninjask: @ 8CEF46C
 	.incbin "data/graphics/pokemon/palettes/ninjask_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ninjask: ; 8CEF494
+gMonBackPic_Ninjask: @ 8CEF494
 	.incbin "data/graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ninjask: ; 8CEF860
+gMonShinyPalette_Ninjask: @ 8CEF860
 	.incbin "data/graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ninjask: ; 8CEF888
+gMonIcon_Ninjask: @ 8CEF888
 	.incbin "data/graphics/pokemon/icons/ninjask_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ninjask: ; 8CEFC88
+gMonFootprint_Ninjask: @ 8CEFC88
 	.incbin "data/graphics/pokemon/footprints/ninjask_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shedinja: ; 8CEFCA8
+gMonStillFrontPic_Shedinja: @ 8CEFCA8
 	.incbin "data/graphics/pokemon/still_front_pics/shedinja_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shedinja: ; 8CEFFC8
+gMonPalette_Shedinja: @ 8CEFFC8
 	.incbin "data/graphics/pokemon/palettes/shedinja_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shedinja: ; 8CEFFF0
+gMonBackPic_Shedinja: @ 8CEFFF0
 	.incbin "data/graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shedinja: ; 8CF0390
+gMonShinyPalette_Shedinja: @ 8CF0390
 	.incbin "data/graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shedinja: ; 8CF03B8
+gMonIcon_Shedinja: @ 8CF03B8
 	.incbin "data/graphics/pokemon/icons/shedinja_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shedinja: ; 8CF07B8
+gMonFootprint_Shedinja: @ 8CF07B8
 	.incbin "data/graphics/pokemon/footprints/shedinja_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Taillow: ; 8CF07D8
+gMonStillFrontPic_Taillow: @ 8CF07D8
 	.incbin "data/graphics/pokemon/still_front_pics/taillow_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Taillow: ; 8CF0A30
+gMonPalette_Taillow: @ 8CF0A30
 	.incbin "data/graphics/pokemon/palettes/taillow_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Taillow: ; 8CF0A58
+gMonBackPic_Taillow: @ 8CF0A58
 	.incbin "data/graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Taillow: ; 8CF0C78
+gMonShinyPalette_Taillow: @ 8CF0C78
 	.incbin "data/graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Taillow: ; 8CF0CA0
+gMonIcon_Taillow: @ 8CF0CA0
 	.incbin "data/graphics/pokemon/icons/taillow_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Taillow: ; 8CF10A0
+gMonFootprint_Taillow: @ 8CF10A0
 	.incbin "data/graphics/pokemon/footprints/taillow_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Swellow: ; 8CF10C0
+gMonStillFrontPic_Swellow: @ 8CF10C0
 	.incbin "data/graphics/pokemon/still_front_pics/swellow_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Swellow: ; 8CF1484
+gMonPalette_Swellow: @ 8CF1484
 	.incbin "data/graphics/pokemon/palettes/swellow_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Swellow: ; 8CF14AC
+gMonBackPic_Swellow: @ 8CF14AC
 	.incbin "data/graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Swellow: ; 8CF17E4
+gMonShinyPalette_Swellow: @ 8CF17E4
 	.incbin "data/graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Swellow: ; 8CF180C
+gMonIcon_Swellow: @ 8CF180C
 	.incbin "data/graphics/pokemon/icons/swellow_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Swellow: ; 8CF1C0C
+gMonFootprint_Swellow: @ 8CF1C0C
 	.incbin "data/graphics/pokemon/footprints/swellow_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shroomish: ; 8CF1C2C
+gMonStillFrontPic_Shroomish: @ 8CF1C2C
 	.incbin "data/graphics/pokemon/still_front_pics/shroomish_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shroomish: ; 8CF1E94
+gMonPalette_Shroomish: @ 8CF1E94
 	.incbin "data/graphics/pokemon/palettes/shroomish_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shroomish: ; 8CF1EBC
+gMonBackPic_Shroomish: @ 8CF1EBC
 	.incbin "data/graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shroomish: ; 8CF219C
+gMonShinyPalette_Shroomish: @ 8CF219C
 	.incbin "data/graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shroomish: ; 8CF21C4
+gMonIcon_Shroomish: @ 8CF21C4
 	.incbin "data/graphics/pokemon/icons/shroomish_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shroomish: ; 8CF25C4
+gMonFootprint_Shroomish: @ 8CF25C4
 	.incbin "data/graphics/pokemon/footprints/shroomish_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Breloom: ; 8CF25E4
+gMonStillFrontPic_Breloom: @ 8CF25E4
 	.incbin "data/graphics/pokemon/still_front_pics/breloom_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Breloom: ; 8CF29CC
+gMonPalette_Breloom: @ 8CF29CC
 	.incbin "data/graphics/pokemon/palettes/breloom_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Breloom: ; 8CF29F4
+gMonBackPic_Breloom: @ 8CF29F4
 	.incbin "data/graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Breloom: ; 8CF2DD4
+gMonShinyPalette_Breloom: @ 8CF2DD4
 	.incbin "data/graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Breloom: ; 8CF2DFC
+gMonIcon_Breloom: @ 8CF2DFC
 	.incbin "data/graphics/pokemon/icons/breloom_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Breloom: ; 8CF31FC
+gMonFootprint_Breloom: @ 8CF31FC
 	.incbin "data/graphics/pokemon/footprints/breloom_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Spinda: ; 8CF321C
+gMonStillFrontPic_Spinda: @ 8CF321C
 	.incbin "data/graphics/pokemon/still_front_pics/spinda_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Spinda: ; 8CF3510
+gMonPalette_Spinda: @ 8CF3510
 	.incbin "data/graphics/pokemon/palettes/spinda_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Spinda: ; 8CF3538
+gMonBackPic_Spinda: @ 8CF3538
 	.incbin "data/graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Spinda: ; 8CF3874
+gMonShinyPalette_Spinda: @ 8CF3874
 	.incbin "data/graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Spinda: ; 8CF389C
+gMonIcon_Spinda: @ 8CF389C
 	.incbin "data/graphics/pokemon/icons/spinda_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Spinda: ; 8CF3C9C
+gMonFootprint_Spinda: @ 8CF3C9C
 	.incbin "data/graphics/pokemon/footprints/spinda_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wingull: ; 8CF3CBC
+gMonStillFrontPic_Wingull: @ 8CF3CBC
 	.incbin "data/graphics/pokemon/still_front_pics/wingull_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wingull: ; 8CF3EF8
+gMonPalette_Wingull: @ 8CF3EF8
 	.incbin "data/graphics/pokemon/palettes/wingull_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wingull: ; 8CF3F20
+gMonBackPic_Wingull: @ 8CF3F20
 	.incbin "data/graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wingull: ; 8CF4270
+gMonShinyPalette_Wingull: @ 8CF4270
 	.incbin "data/graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wingull: ; 8CF4298
+gMonIcon_Wingull: @ 8CF4298
 	.incbin "data/graphics/pokemon/icons/wingull_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wingull: ; 8CF4698
+gMonFootprint_Wingull: @ 8CF4698
 	.incbin "data/graphics/pokemon/footprints/wingull_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Pelipper: ; 8CF46B8
+gMonStillFrontPic_Pelipper: @ 8CF46B8
 	.incbin "data/graphics/pokemon/still_front_pics/pelipper_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Pelipper: ; 8CF4A50
+gMonPalette_Pelipper: @ 8CF4A50
 	.incbin "data/graphics/pokemon/palettes/pelipper_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Pelipper: ; 8CF4A78
+gMonBackPic_Pelipper: @ 8CF4A78
 	.incbin "data/graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Pelipper: ; 8CF4DF8
+gMonShinyPalette_Pelipper: @ 8CF4DF8
 	.incbin "data/graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Pelipper: ; 8CF4E20
+gMonIcon_Pelipper: @ 8CF4E20
 	.incbin "data/graphics/pokemon/icons/pelipper_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Pelipper: ; 8CF5220
+gMonFootprint_Pelipper: @ 8CF5220
 	.incbin "data/graphics/pokemon/footprints/pelipper_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Surskit: ; 8CF5240
+gMonStillFrontPic_Surskit: @ 8CF5240
 	.incbin "data/graphics/pokemon/still_front_pics/surskit_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Surskit: ; 8CF544C
+gMonPalette_Surskit: @ 8CF544C
 	.incbin "data/graphics/pokemon/palettes/surskit_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Surskit: ; 8CF5474
+gMonBackPic_Surskit: @ 8CF5474
 	.incbin "data/graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Surskit: ; 8CF56AC
+gMonShinyPalette_Surskit: @ 8CF56AC
 	.incbin "data/graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Surskit: ; 8CF56D4
+gMonIcon_Surskit: @ 8CF56D4
 	.incbin "data/graphics/pokemon/icons/surskit_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Surskit: ; 8CF5AD4
+gMonFootprint_Surskit: @ 8CF5AD4
 	.incbin "data/graphics/pokemon/footprints/surskit_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Masquerain: ; 8CF5AF4
+gMonStillFrontPic_Masquerain: @ 8CF5AF4
 	.incbin "data/graphics/pokemon/still_front_pics/masquerain_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Masquerain: ; 8CF5E90
+gMonPalette_Masquerain: @ 8CF5E90
 	.incbin "data/graphics/pokemon/palettes/masquerain_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Masquerain: ; 8CF5EB8
+gMonBackPic_Masquerain: @ 8CF5EB8
 	.incbin "data/graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Masquerain: ; 8CF6210
+gMonShinyPalette_Masquerain: @ 8CF6210
 	.incbin "data/graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Masquerain: ; 8CF6238
+gMonIcon_Masquerain: @ 8CF6238
 	.incbin "data/graphics/pokemon/icons/masquerain_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Masquerain: ; 8CF6638
+gMonFootprint_Masquerain: @ 8CF6638
 	.incbin "data/graphics/pokemon/footprints/masquerain_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wailmer: ; 8CF6658
+gMonStillFrontPic_Wailmer: @ 8CF6658
 	.incbin "data/graphics/pokemon/still_front_pics/wailmer_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wailmer: ; 8CF6938
+gMonPalette_Wailmer: @ 8CF6938
 	.incbin "data/graphics/pokemon/palettes/wailmer_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wailmer: ; 8CF6960
+gMonBackPic_Wailmer: @ 8CF6960
 	.incbin "data/graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wailmer: ; 8CF6B44
+gMonShinyPalette_Wailmer: @ 8CF6B44
 	.incbin "data/graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wailmer: ; 8CF6B6C
+gMonIcon_Wailmer: @ 8CF6B6C
 	.incbin "data/graphics/pokemon/icons/wailmer_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wailmer: ; 8CF6F6C
+gMonFootprint_Wailmer: @ 8CF6F6C
 	.incbin "data/graphics/pokemon/footprints/wailmer_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wailord: ; 8CF6F8C
+gMonStillFrontPic_Wailord: @ 8CF6F8C
 	.incbin "data/graphics/pokemon/still_front_pics/wailord_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wailord: ; 8CF7350
+gMonPalette_Wailord: @ 8CF7350
 	.incbin "data/graphics/pokemon/palettes/wailord_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wailord: ; 8CF7378
+gMonBackPic_Wailord: @ 8CF7378
 	.incbin "data/graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wailord: ; 8CF7590
+gMonShinyPalette_Wailord: @ 8CF7590
 	.incbin "data/graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wailord: ; 8CF75B8
+gMonIcon_Wailord: @ 8CF75B8
 	.incbin "data/graphics/pokemon/icons/wailord_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wailord: ; 8CF79B8
+gMonFootprint_Wailord: @ 8CF79B8
 	.incbin "data/graphics/pokemon/footprints/wailord_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Skitty: ; 8CF79D8
+gMonStillFrontPic_Skitty: @ 8CF79D8
 	.incbin "data/graphics/pokemon/still_front_pics/skitty_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Skitty: ; 8CF7CD8
+gMonPalette_Skitty: @ 8CF7CD8
 	.incbin "data/graphics/pokemon/palettes/skitty_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Skitty: ; 8CF7D00
+gMonBackPic_Skitty: @ 8CF7D00
 	.incbin "data/graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Skitty: ; 8CF8048
+gMonShinyPalette_Skitty: @ 8CF8048
 	.incbin "data/graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Skitty: ; 8CF8070
+gMonIcon_Skitty: @ 8CF8070
 	.incbin "data/graphics/pokemon/icons/skitty_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Skitty: ; 8CF8470
+gMonFootprint_Skitty: @ 8CF8470
 	.incbin "data/graphics/pokemon/footprints/skitty_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Delcatty: ; 8CF8490
+gMonStillFrontPic_Delcatty: @ 8CF8490
 	.incbin "data/graphics/pokemon/still_front_pics/delcatty_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Delcatty: ; 8CF881C
+gMonPalette_Delcatty: @ 8CF881C
 	.incbin "data/graphics/pokemon/palettes/delcatty_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Delcatty: ; 8CF8844
+gMonBackPic_Delcatty: @ 8CF8844
 	.incbin "data/graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Delcatty: ; 8CF8BE0
+gMonShinyPalette_Delcatty: @ 8CF8BE0
 	.incbin "data/graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Delcatty: ; 8CF8C08
+gMonIcon_Delcatty: @ 8CF8C08
 	.incbin "data/graphics/pokemon/icons/delcatty_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Delcatty: ; 8CF9008
+gMonFootprint_Delcatty: @ 8CF9008
 	.incbin "data/graphics/pokemon/footprints/delcatty_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kecleon: ; 8CF9028
+gMonStillFrontPic_Kecleon: @ 8CF9028
 	.incbin "data/graphics/pokemon/still_front_pics/kecleon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kecleon: ; 8CF93A8
+gMonPalette_Kecleon: @ 8CF93A8
 	.incbin "data/graphics/pokemon/palettes/kecleon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kecleon: ; 8CF93D0
+gMonBackPic_Kecleon: @ 8CF93D0
 	.incbin "data/graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kecleon: ; 8CF97A8
+gMonShinyPalette_Kecleon: @ 8CF97A8
 	.incbin "data/graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kecleon: ; 8CF97D0
+gMonIcon_Kecleon: @ 8CF97D0
 	.incbin "data/graphics/pokemon/icons/kecleon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kecleon: ; 8CF9BD0
+gMonFootprint_Kecleon: @ 8CF9BD0
 	.incbin "data/graphics/pokemon/footprints/kecleon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Baltoy: ; 8CF9BF0
+gMonStillFrontPic_Baltoy: @ 8CF9BF0
 	.incbin "data/graphics/pokemon/still_front_pics/baltoy_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Baltoy: ; 8CF9E14
+gMonPalette_Baltoy: @ 8CF9E14
 	.incbin "data/graphics/pokemon/palettes/baltoy_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Baltoy: ; 8CF9E34
+gMonBackPic_Baltoy: @ 8CF9E34
 	.incbin "data/graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Baltoy: ; 8CFA0DC
+gMonShinyPalette_Baltoy: @ 8CFA0DC
 	.incbin "data/graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Baltoy: ; 8CFA0FC
+gMonIcon_Baltoy: @ 8CFA0FC
 	.incbin "data/graphics/pokemon/icons/baltoy_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Baltoy: ; 8CFA4FC
+gMonFootprint_Baltoy: @ 8CFA4FC
 	.incbin "data/graphics/pokemon/footprints/baltoy_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Claydol: ; 8CFA51C
+gMonStillFrontPic_Claydol: @ 8CFA51C
 	.incbin "data/graphics/pokemon/still_front_pics/claydol_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Claydol: ; 8CFA8D4
+gMonPalette_Claydol: @ 8CFA8D4
 	.incbin "data/graphics/pokemon/palettes/claydol_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Claydol: ; 8CFA8FC
+gMonBackPic_Claydol: @ 8CFA8FC
 	.incbin "data/graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Claydol: ; 8CFACD0
+gMonShinyPalette_Claydol: @ 8CFACD0
 	.incbin "data/graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Claydol: ; 8CFACF8
+gMonIcon_Claydol: @ 8CFACF8
 	.incbin "data/graphics/pokemon/icons/claydol_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Claydol: ; 8CFB0F8
+gMonFootprint_Claydol: @ 8CFB0F8
 	.incbin "data/graphics/pokemon/footprints/claydol_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Nosepass: ; 8CFB118
+gMonStillFrontPic_Nosepass: @ 8CFB118
 	.incbin "data/graphics/pokemon/still_front_pics/nosepass_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Nosepass: ; 8CFB3E4
+gMonPalette_Nosepass: @ 8CFB3E4
 	.incbin "data/graphics/pokemon/palettes/nosepass_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Nosepass: ; 8CFB40C
+gMonBackPic_Nosepass: @ 8CFB40C
 	.incbin "data/graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Nosepass: ; 8CFB6AC
+gMonShinyPalette_Nosepass: @ 8CFB6AC
 	.incbin "data/graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Nosepass: ; 8CFB6D4
+gMonIcon_Nosepass: @ 8CFB6D4
 	.incbin "data/graphics/pokemon/icons/nosepass_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Nosepass: ; 8CFBAD4
+gMonFootprint_Nosepass: @ 8CFBAD4
 	.incbin "data/graphics/pokemon/footprints/nosepass_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Torkoal: ; 8CFBAF4
+gMonStillFrontPic_Torkoal: @ 8CFBAF4
 	.incbin "data/graphics/pokemon/still_front_pics/torkoal_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Torkoal: ; 8CFBFA0
+gMonPalette_Torkoal: @ 8CFBFA0
 	.incbin "data/graphics/pokemon/palettes/torkoal_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Torkoal: ; 8CFBFC8
+gMonBackPic_Torkoal: @ 8CFBFC8
 	.incbin "data/graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Torkoal: ; 8CFC290
+gMonShinyPalette_Torkoal: @ 8CFC290
 	.incbin "data/graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Torkoal: ; 8CFC2B8
+gMonIcon_Torkoal: @ 8CFC2B8
 	.incbin "data/graphics/pokemon/icons/torkoal_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Torkoal: ; 8CFC6B8
+gMonFootprint_Torkoal: @ 8CFC6B8
 	.incbin "data/graphics/pokemon/footprints/torkoal_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sableye: ; 8CFC6D8
+gMonStillFrontPic_Sableye: @ 8CFC6D8
 	.incbin "data/graphics/pokemon/still_front_pics/sableye_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sableye: ; 8CFC9AC
+gMonPalette_Sableye: @ 8CFC9AC
 	.incbin "data/graphics/pokemon/palettes/sableye_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sableye: ; 8CFC9D4
+gMonBackPic_Sableye: @ 8CFC9D4
 	.incbin "data/graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sableye: ; 8CFCCFC
+gMonShinyPalette_Sableye: @ 8CFCCFC
 	.incbin "data/graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sableye: ; 8CFCD24
+gMonIcon_Sableye: @ 8CFCD24
 	.incbin "data/graphics/pokemon/icons/sableye_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sableye: ; 8CFD124
+gMonFootprint_Sableye: @ 8CFD124
 	.incbin "data/graphics/pokemon/footprints/sableye_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Barboach: ; 8CFD144
+gMonStillFrontPic_Barboach: @ 8CFD144
 	.incbin "data/graphics/pokemon/still_front_pics/barboach_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Barboach: ; 8CFD3D4
+gMonPalette_Barboach: @ 8CFD3D4
 	.incbin "data/graphics/pokemon/palettes/barboach_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Barboach: ; 8CFD3FC
+gMonBackPic_Barboach: @ 8CFD3FC
 	.incbin "data/graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Barboach: ; 8CFD68C
+gMonShinyPalette_Barboach: @ 8CFD68C
 	.incbin "data/graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Barboach: ; 8CFD6B4
+gMonIcon_Barboach: @ 8CFD6B4
 	.incbin "data/graphics/pokemon/icons/barboach_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Barboach: ; 8CFDAB4
+gMonFootprint_Barboach: @ 8CFDAB4
 	.incbin "data/graphics/pokemon/footprints/barboach_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Whiscash: ; 8CFDAD4
+gMonStillFrontPic_Whiscash: @ 8CFDAD4
 	.incbin "data/graphics/pokemon/still_front_pics/whiscash_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Whiscash: ; 8CFDE4C
+gMonPalette_Whiscash: @ 8CFDE4C
 	.incbin "data/graphics/pokemon/palettes/whiscash_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Whiscash: ; 8CFDE74
+gMonBackPic_Whiscash: @ 8CFDE74
 	.incbin "data/graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Whiscash: ; 8CFE1C0
+gMonShinyPalette_Whiscash: @ 8CFE1C0
 	.incbin "data/graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Whiscash: ; 8CFE1E8
+gMonIcon_Whiscash: @ 8CFE1E8
 	.incbin "data/graphics/pokemon/icons/whiscash_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Whiscash: ; 8CFE5E8
+gMonFootprint_Whiscash: @ 8CFE5E8
 	.incbin "data/graphics/pokemon/footprints/whiscash_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Luvdisc: ; 8CFE608
+gMonStillFrontPic_Luvdisc: @ 8CFE608
 	.incbin "data/graphics/pokemon/still_front_pics/luvdisc_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Luvdisc: ; 8CFE7C8
+gMonPalette_Luvdisc: @ 8CFE7C8
 	.incbin "data/graphics/pokemon/palettes/luvdisc_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Luvdisc: ; 8CFE7EC
+gMonBackPic_Luvdisc: @ 8CFE7EC
 	.incbin "data/graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Luvdisc: ; 8CFE9C0
+gMonShinyPalette_Luvdisc: @ 8CFE9C0
 	.incbin "data/graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Luvdisc: ; 8CFE9E4
+gMonIcon_Luvdisc: @ 8CFE9E4
 	.incbin "data/graphics/pokemon/icons/luvdisc_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Luvdisc: ; 8CFEDE4
+gMonFootprint_Luvdisc: @ 8CFEDE4
 	.incbin "data/graphics/pokemon/footprints/luvdisc_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Corphish: ; 8CFEE04
+gMonStillFrontPic_Corphish: @ 8CFEE04
 	.incbin "data/graphics/pokemon/still_front_pics/corphish_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Corphish: ; 8CFF160
+gMonPalette_Corphish: @ 8CFF160
 	.incbin "data/graphics/pokemon/palettes/corphish_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Corphish: ; 8CFF188
+gMonBackPic_Corphish: @ 8CFF188
 	.incbin "data/graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Corphish: ; 8CFF4A4
+gMonShinyPalette_Corphish: @ 8CFF4A4
 	.incbin "data/graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Corphish: ; 8CFF4CC
+gMonIcon_Corphish: @ 8CFF4CC
 	.incbin "data/graphics/pokemon/icons/corphish_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Corphish: ; 8CFF8CC
+gMonFootprint_Corphish: @ 8CFF8CC
 	.incbin "data/graphics/pokemon/footprints/corphish_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Crawdaunt: ; 8CFF8EC
+gMonStillFrontPic_Crawdaunt: @ 8CFF8EC
 	.incbin "data/graphics/pokemon/still_front_pics/crawdaunt_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Crawdaunt: ; 8CFFD7C
+gMonPalette_Crawdaunt: @ 8CFFD7C
 	.incbin "data/graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Crawdaunt: ; 8CFFDA4
+gMonBackPic_Crawdaunt: @ 8CFFDA4
 	.incbin "data/graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Crawdaunt: ; 8D00188
+gMonShinyPalette_Crawdaunt: @ 8D00188
 	.incbin "data/graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Crawdaunt: ; 8D001B0
+gMonIcon_Crawdaunt: @ 8D001B0
 	.incbin "data/graphics/pokemon/icons/crawdaunt_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Crawdaunt: ; 8D005B0
+gMonFootprint_Crawdaunt: @ 8D005B0
 	.incbin "data/graphics/pokemon/footprints/crawdaunt_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Feebas: ; 8D005D0
+gMonStillFrontPic_Feebas: @ 8D005D0
 	.incbin "data/graphics/pokemon/still_front_pics/feebas_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Feebas: ; 8D0085C
+gMonPalette_Feebas: @ 8D0085C
 	.incbin "data/graphics/pokemon/palettes/feebas_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Feebas: ; 8D00884
+gMonBackPic_Feebas: @ 8D00884
 	.incbin "data/graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Feebas: ; 8D00BBC
+gMonShinyPalette_Feebas: @ 8D00BBC
 	.incbin "data/graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Feebas: ; 8D00BE4
+gMonIcon_Feebas: @ 8D00BE4
 	.incbin "data/graphics/pokemon/icons/feebas_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Feebas: ; 8D00FE4
+gMonFootprint_Feebas: @ 8D00FE4
 	.incbin "data/graphics/pokemon/footprints/feebas_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Milotic: ; 8D01004
+gMonStillFrontPic_Milotic: @ 8D01004
 	.incbin "data/graphics/pokemon/still_front_pics/milotic_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Milotic: ; 8D01494
+gMonPalette_Milotic: @ 8D01494
 	.incbin "data/graphics/pokemon/palettes/milotic_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Milotic: ; 8D014BC
+gMonBackPic_Milotic: @ 8D014BC
 	.incbin "data/graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Milotic: ; 8D017B0
+gMonShinyPalette_Milotic: @ 8D017B0
 	.incbin "data/graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Milotic: ; 8D017D8
+gMonIcon_Milotic: @ 8D017D8
 	.incbin "data/graphics/pokemon/icons/milotic_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Milotic: ; 8D01BD8
+gMonFootprint_Milotic: @ 8D01BD8
 	.incbin "data/graphics/pokemon/footprints/milotic_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Carvanha: ; 8D01BF8
+gMonStillFrontPic_Carvanha: @ 8D01BF8
 	.incbin "data/graphics/pokemon/still_front_pics/carvanha_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Carvanha: ; 8D01F24
+gMonPalette_Carvanha: @ 8D01F24
 	.incbin "data/graphics/pokemon/palettes/carvanha_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Carvanha: ; 8D01F4C
+gMonBackPic_Carvanha: @ 8D01F4C
 	.incbin "data/graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Carvanha: ; 8D0225C
+gMonShinyPalette_Carvanha: @ 8D0225C
 	.incbin "data/graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Carvanha: ; 8D02284
+gMonIcon_Carvanha: @ 8D02284
 	.incbin "data/graphics/pokemon/icons/carvanha_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Carvanha: ; 8D02684
+gMonFootprint_Carvanha: @ 8D02684
 	.incbin "data/graphics/pokemon/footprints/carvanha_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sharpedo: ; 8D026A4
+gMonStillFrontPic_Sharpedo: @ 8D026A4
 	.incbin "data/graphics/pokemon/still_front_pics/sharpedo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sharpedo: ; 8D02A34
+gMonPalette_Sharpedo: @ 8D02A34
 	.incbin "data/graphics/pokemon/palettes/sharpedo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sharpedo: ; 8D02A5C
+gMonBackPic_Sharpedo: @ 8D02A5C
 	.incbin "data/graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sharpedo: ; 8D02DB4
+gMonShinyPalette_Sharpedo: @ 8D02DB4
 	.incbin "data/graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sharpedo: ; 8D02DDC
+gMonIcon_Sharpedo: @ 8D02DDC
 	.incbin "data/graphics/pokemon/icons/sharpedo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sharpedo: ; 8D031DC
+gMonFootprint_Sharpedo: @ 8D031DC
 	.incbin "data/graphics/pokemon/footprints/sharpedo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Trapinch: ; 8D031FC
+gMonStillFrontPic_Trapinch: @ 8D031FC
 	.incbin "data/graphics/pokemon/still_front_pics/trapinch_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Trapinch: ; 8D03418
+gMonPalette_Trapinch: @ 8D03418
 	.incbin "data/graphics/pokemon/palettes/trapinch_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Trapinch: ; 8D03440
+gMonBackPic_Trapinch: @ 8D03440
 	.incbin "data/graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Trapinch: ; 8D03660
+gMonShinyPalette_Trapinch: @ 8D03660
 	.incbin "data/graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Trapinch: ; 8D03688
+gMonIcon_Trapinch: @ 8D03688
 	.incbin "data/graphics/pokemon/icons/trapinch_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Trapinch: ; 8D03A88
+gMonFootprint_Trapinch: @ 8D03A88
 	.incbin "data/graphics/pokemon/footprints/trapinch_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Vibrava: ; 8D03AA8
+gMonStillFrontPic_Vibrava: @ 8D03AA8
 	.incbin "data/graphics/pokemon/still_front_pics/vibrava_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Vibrava: ; 8D03E18
+gMonPalette_Vibrava: @ 8D03E18
 	.incbin "data/graphics/pokemon/palettes/vibrava_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Vibrava: ; 8D03E40
+gMonBackPic_Vibrava: @ 8D03E40
 	.incbin "data/graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Vibrava: ; 8D040B8
+gMonShinyPalette_Vibrava: @ 8D040B8
 	.incbin "data/graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Vibrava: ; 8D040E0
+gMonIcon_Vibrava: @ 8D040E0
 	.incbin "data/graphics/pokemon/icons/vibrava_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Vibrava: ; 8D044E0
+gMonFootprint_Vibrava: @ 8D044E0
 	.incbin "data/graphics/pokemon/footprints/vibrava_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Flygon: ; 8D04500
+gMonStillFrontPic_Flygon: @ 8D04500
 	.incbin "data/graphics/pokemon/still_front_pics/flygon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Flygon: ; 8D049F0
+gMonPalette_Flygon: @ 8D049F0
 	.incbin "data/graphics/pokemon/palettes/flygon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Flygon: ; 8D04A18
+gMonBackPic_Flygon: @ 8D04A18
 	.incbin "data/graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Flygon: ; 8D04E54
+gMonShinyPalette_Flygon: @ 8D04E54
 	.incbin "data/graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Flygon: ; 8D04E7C
+gMonIcon_Flygon: @ 8D04E7C
 	.incbin "data/graphics/pokemon/icons/flygon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Flygon: ; 8D0527C
+gMonFootprint_Flygon: @ 8D0527C
 	.incbin "data/graphics/pokemon/footprints/flygon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Makuhita: ; 8D0529C
+gMonStillFrontPic_Makuhita: @ 8D0529C
 	.incbin "data/graphics/pokemon/still_front_pics/makuhita_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Makuhita: ; 8D055B4
+gMonPalette_Makuhita: @ 8D055B4
 	.incbin "data/graphics/pokemon/palettes/makuhita_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Makuhita: ; 8D055DC
+gMonBackPic_Makuhita: @ 8D055DC
 	.incbin "data/graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Makuhita: ; 8D058CC
+gMonShinyPalette_Makuhita: @ 8D058CC
 	.incbin "data/graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Makuhita: ; 8D058F0
+gMonIcon_Makuhita: @ 8D058F0
 	.incbin "data/graphics/pokemon/icons/makuhita_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Makuhita: ; 8D05CF0
+gMonFootprint_Makuhita: @ 8D05CF0
 	.incbin "data/graphics/pokemon/footprints/makuhita_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Hariyama: ; 8D05D10
+gMonStillFrontPic_Hariyama: @ 8D05D10
 	.incbin "data/graphics/pokemon/still_front_pics/hariyama_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Hariyama: ; 8D061C0
+gMonPalette_Hariyama: @ 8D061C0
 	.incbin "data/graphics/pokemon/palettes/hariyama_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Hariyama: ; 8D061E8
+gMonBackPic_Hariyama: @ 8D061E8
 	.incbin "data/graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Hariyama: ; 8D065C8
+gMonShinyPalette_Hariyama: @ 8D065C8
 	.incbin "data/graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Hariyama: ; 8D065F0
+gMonIcon_Hariyama: @ 8D065F0
 	.incbin "data/graphics/pokemon/icons/hariyama_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Hariyama: ; 8D069F0
+gMonFootprint_Hariyama: @ 8D069F0
 	.incbin "data/graphics/pokemon/footprints/hariyama_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Electrike: ; 8D06A10
+gMonStillFrontPic_Electrike: @ 8D06A10
 	.incbin "data/graphics/pokemon/still_front_pics/electrike_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Electrike: ; 8D06CA0
+gMonPalette_Electrike: @ 8D06CA0
 	.incbin "data/graphics/pokemon/palettes/electrike_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Electrike: ; 8D06CC8
+gMonBackPic_Electrike: @ 8D06CC8
 	.incbin "data/graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Electrike: ; 8D06F54
+gMonShinyPalette_Electrike: @ 8D06F54
 	.incbin "data/graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Electrike: ; 8D06F7C
+gMonIcon_Electrike: @ 8D06F7C
 	.incbin "data/graphics/pokemon/icons/electrike_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Electrike: ; 8D0737C
+gMonFootprint_Electrike: @ 8D0737C
 	.incbin "data/graphics/pokemon/footprints/electrike_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Manectric: ; 8D0739C
+gMonStillFrontPic_Manectric: @ 8D0739C
 	.incbin "data/graphics/pokemon/still_front_pics/manectric_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Manectric: ; 8D076CC
+gMonPalette_Manectric: @ 8D076CC
 	.incbin "data/graphics/pokemon/palettes/manectric_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Manectric: ; 8D076F4
+gMonBackPic_Manectric: @ 8D076F4
 	.incbin "data/graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Manectric: ; 8D07920
+gMonShinyPalette_Manectric: @ 8D07920
 	.incbin "data/graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Manectric: ; 8D07948
+gMonIcon_Manectric: @ 8D07948
 	.incbin "data/graphics/pokemon/icons/manectric_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Manectric: ; 8D07D48
+gMonFootprint_Manectric: @ 8D07D48
 	.incbin "data/graphics/pokemon/footprints/manectric_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Numel: ; 8D07D68
+gMonStillFrontPic_Numel: @ 8D07D68
 	.incbin "data/graphics/pokemon/still_front_pics/numel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Numel: ; 8D08038
+gMonPalette_Numel: @ 8D08038
 	.incbin "data/graphics/pokemon/palettes/numel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Numel: ; 8D08060
+gMonBackPic_Numel: @ 8D08060
 	.incbin "data/graphics/pokemon/back_pics/numel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Numel: ; 8D0831C
+gMonShinyPalette_Numel: @ 8D0831C
 	.incbin "data/graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Numel: ; 8D08344
+gMonIcon_Numel: @ 8D08344
 	.incbin "data/graphics/pokemon/icons/numel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Numel: ; 8D08744
+gMonFootprint_Numel: @ 8D08744
 	.incbin "data/graphics/pokemon/footprints/numel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Camerupt: ; 8D08764
+gMonStillFrontPic_Camerupt: @ 8D08764
 	.incbin "data/graphics/pokemon/still_front_pics/camerupt_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Camerupt: ; 8D08B7C
+gMonPalette_Camerupt: @ 8D08B7C
 	.incbin "data/graphics/pokemon/palettes/camerupt_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Camerupt: ; 8D08BA4
+gMonBackPic_Camerupt: @ 8D08BA4
 	.incbin "data/graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Camerupt: ; 8D08E68
+gMonShinyPalette_Camerupt: @ 8D08E68
 	.incbin "data/graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Camerupt: ; 8D08E90
+gMonIcon_Camerupt: @ 8D08E90
 	.incbin "data/graphics/pokemon/icons/camerupt_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Camerupt: ; 8D09290
+gMonFootprint_Camerupt: @ 8D09290
 	.incbin "data/graphics/pokemon/footprints/camerupt_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Spheal: ; 8D092B0
+gMonStillFrontPic_Spheal: @ 8D092B0
 	.incbin "data/graphics/pokemon/still_front_pics/spheal_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Spheal: ; 8D09524
+gMonPalette_Spheal: @ 8D09524
 	.incbin "data/graphics/pokemon/palettes/spheal_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Spheal: ; 8D0954C
+gMonBackPic_Spheal: @ 8D0954C
 	.incbin "data/graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Spheal: ; 8D09748
+gMonShinyPalette_Spheal: @ 8D09748
 	.incbin "data/graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Spheal: ; 8D09770
+gMonIcon_Spheal: @ 8D09770
 	.incbin "data/graphics/pokemon/icons/spheal_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Spheal: ; 8D09B70
+gMonFootprint_Spheal: @ 8D09B70
 	.incbin "data/graphics/pokemon/footprints/spheal_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Sealeo: ; 8D09B90
+gMonStillFrontPic_Sealeo: @ 8D09B90
 	.incbin "data/graphics/pokemon/still_front_pics/sealeo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Sealeo: ; 8D09F10
+gMonPalette_Sealeo: @ 8D09F10
 	.incbin "data/graphics/pokemon/palettes/sealeo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Sealeo: ; 8D09F38
+gMonBackPic_Sealeo: @ 8D09F38
 	.incbin "data/graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Sealeo: ; 8D0A1B4
+gMonShinyPalette_Sealeo: @ 8D0A1B4
 	.incbin "data/graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Sealeo: ; 8D0A1DC
+gMonIcon_Sealeo: @ 8D0A1DC
 	.incbin "data/graphics/pokemon/icons/sealeo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Sealeo: ; 8D0A5DC
+gMonFootprint_Sealeo: @ 8D0A5DC
 	.incbin "data/graphics/pokemon/footprints/sealeo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Walrein: ; 8D0A5FC
+gMonStillFrontPic_Walrein: @ 8D0A5FC
 	.incbin "data/graphics/pokemon/still_front_pics/walrein_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Walrein: ; 8D0AD70
+gMonPalette_Walrein: @ 8D0AD70
 	.incbin "data/graphics/pokemon/palettes/walrein_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Walrein: ; 8D0AD98
+gMonBackPic_Walrein: @ 8D0AD98
 	.incbin "data/graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Walrein: ; 8D0B120
+gMonShinyPalette_Walrein: @ 8D0B120
 	.incbin "data/graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Walrein: ; 8D0B148
+gMonIcon_Walrein: @ 8D0B148
 	.incbin "data/graphics/pokemon/icons/walrein_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Walrein: ; 8D0B548
+gMonFootprint_Walrein: @ 8D0B548
 	.incbin "data/graphics/pokemon/footprints/walrein_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cacnea: ; 8D0B568
+gMonStillFrontPic_Cacnea: @ 8D0B568
 	.incbin "data/graphics/pokemon/still_front_pics/cacnea_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cacnea: ; 8D0B878
+gMonPalette_Cacnea: @ 8D0B878
 	.incbin "data/graphics/pokemon/palettes/cacnea_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cacnea: ; 8D0B8A0
+gMonBackPic_Cacnea: @ 8D0B8A0
 	.incbin "data/graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cacnea: ; 8D0BC00
+gMonShinyPalette_Cacnea: @ 8D0BC00
 	.incbin "data/graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cacnea: ; 8D0BC28
+gMonIcon_Cacnea: @ 8D0BC28
 	.incbin "data/graphics/pokemon/icons/cacnea_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cacnea: ; 8D0C028
+gMonFootprint_Cacnea: @ 8D0C028
 	.incbin "data/graphics/pokemon/footprints/cacnea_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cacturne: ; 8D0C048
+gMonStillFrontPic_Cacturne: @ 8D0C048
 	.incbin "data/graphics/pokemon/still_front_pics/cacturne_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cacturne: ; 8D0C480
+gMonPalette_Cacturne: @ 8D0C480
 	.incbin "data/graphics/pokemon/palettes/cacturne_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cacturne: ; 8D0C4A8
+gMonBackPic_Cacturne: @ 8D0C4A8
 	.incbin "data/graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cacturne: ; 8D0C7A8
+gMonShinyPalette_Cacturne: @ 8D0C7A8
 	.incbin "data/graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cacturne: ; 8D0C7D0
+gMonIcon_Cacturne: @ 8D0C7D0
 	.incbin "data/graphics/pokemon/icons/cacturne_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cacturne: ; 8D0CBD0
+gMonFootprint_Cacturne: @ 8D0CBD0
 	.incbin "data/graphics/pokemon/footprints/cacturne_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Snorunt: ; 8D0CBF0
+gMonStillFrontPic_Snorunt: @ 8D0CBF0
 	.incbin "data/graphics/pokemon/still_front_pics/snorunt_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Snorunt: ; 8D0CEB4
+gMonPalette_Snorunt: @ 8D0CEB4
 	.incbin "data/graphics/pokemon/palettes/snorunt_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Snorunt: ; 8D0CEDC
+gMonBackPic_Snorunt: @ 8D0CEDC
 	.incbin "data/graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Snorunt: ; 8D0D1C0
+gMonShinyPalette_Snorunt: @ 8D0D1C0
 	.incbin "data/graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Snorunt: ; 8D0D1E8
+gMonIcon_Snorunt: @ 8D0D1E8
 	.incbin "data/graphics/pokemon/icons/snorunt_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Snorunt: ; 8D0D5E8
+gMonFootprint_Snorunt: @ 8D0D5E8
 	.incbin "data/graphics/pokemon/footprints/snorunt_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Glalie: ; 8D0D608
+gMonStillFrontPic_Glalie: @ 8D0D608
 	.incbin "data/graphics/pokemon/still_front_pics/glalie_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Glalie: ; 8D0D9D0
+gMonPalette_Glalie: @ 8D0D9D0
 	.incbin "data/graphics/pokemon/palettes/glalie_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Glalie: ; 8D0D9F8
+gMonBackPic_Glalie: @ 8D0D9F8
 	.incbin "data/graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Glalie: ; 8D0DDA8
+gMonShinyPalette_Glalie: @ 8D0DDA8
 	.incbin "data/graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Glalie: ; 8D0DDD0
+gMonIcon_Glalie: @ 8D0DDD0
 	.incbin "data/graphics/pokemon/icons/glalie_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Glalie: ; 8D0E1D0
+gMonFootprint_Glalie: @ 8D0E1D0
 	.incbin "data/graphics/pokemon/footprints/glalie_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lunatone: ; 8D0E1F0
+gMonStillFrontPic_Lunatone: @ 8D0E1F0
 	.incbin "data/graphics/pokemon/still_front_pics/lunatone_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lunatone: ; 8D0E518
+gMonPalette_Lunatone: @ 8D0E518
 	.incbin "data/graphics/pokemon/palettes/lunatone_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lunatone: ; 8D0E540
+gMonBackPic_Lunatone: @ 8D0E540
 	.incbin "data/graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lunatone: ; 8D0E898
+gMonShinyPalette_Lunatone: @ 8D0E898
 	.incbin "data/graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lunatone: ; 8D0E8C0
+gMonIcon_Lunatone: @ 8D0E8C0
 	.incbin "data/graphics/pokemon/icons/lunatone_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lunatone: ; 8D0ECC0
+gMonFootprint_Lunatone: @ 8D0ECC0
 	.incbin "data/graphics/pokemon/footprints/lunatone_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Solrock: ; 8D0ECE0
+gMonStillFrontPic_Solrock: @ 8D0ECE0
 	.incbin "data/graphics/pokemon/still_front_pics/solrock_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Solrock: ; 8D0F12C
+gMonPalette_Solrock: @ 8D0F12C
 	.incbin "data/graphics/pokemon/palettes/solrock_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Solrock: ; 8D0F154
+gMonBackPic_Solrock: @ 8D0F154
 	.incbin "data/graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Solrock: ; 8D0F540
+gMonShinyPalette_Solrock: @ 8D0F540
 	.incbin "data/graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Solrock: ; 8D0F568
+gMonIcon_Solrock: @ 8D0F568
 	.incbin "data/graphics/pokemon/icons/solrock_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Solrock: ; 8D0F968
+gMonFootprint_Solrock: @ 8D0F968
 	.incbin "data/graphics/pokemon/footprints/solrock_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Azurill: ; 8D0F988
+gMonStillFrontPic_Azurill: @ 8D0F988
 	.incbin "data/graphics/pokemon/still_front_pics/azurill_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Azurill: ; 8D0FC50
+gMonPalette_Azurill: @ 8D0FC50
 	.incbin "data/graphics/pokemon/palettes/azurill_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Azurill: ; 8D0FC78
+gMonBackPic_Azurill: @ 8D0FC78
 	.incbin "data/graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Azurill: ; 8D0FF90
+gMonShinyPalette_Azurill: @ 8D0FF90
 	.incbin "data/graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Azurill: ; 8D0FFB8
+gMonIcon_Azurill: @ 8D0FFB8
 	.incbin "data/graphics/pokemon/icons/azurill_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Azurill: ; 8D103B8
+gMonFootprint_Azurill: @ 8D103B8
 	.incbin "data/graphics/pokemon/footprints/azurill_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Spoink: ; 8D103D8
+gMonStillFrontPic_Spoink: @ 8D103D8
 	.incbin "data/graphics/pokemon/still_front_pics/spoink_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Spoink: ; 8D10644
+gMonPalette_Spoink: @ 8D10644
 	.incbin "data/graphics/pokemon/palettes/spoink_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Spoink: ; 8D1066C
+gMonBackPic_Spoink: @ 8D1066C
 	.incbin "data/graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Spoink: ; 8D108AC
+gMonShinyPalette_Spoink: @ 8D108AC
 	.incbin "data/graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Spoink: ; 8D108D4
+gMonIcon_Spoink: @ 8D108D4
 	.incbin "data/graphics/pokemon/icons/spoink_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Spoink: ; 8D10CD4
+gMonFootprint_Spoink: @ 8D10CD4
 	.incbin "data/graphics/pokemon/footprints/spoink_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Grumpig: ; 8D10CF4
+gMonStillFrontPic_Grumpig: @ 8D10CF4
 	.incbin "data/graphics/pokemon/still_front_pics/grumpig_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Grumpig: ; 8D110B0
+gMonPalette_Grumpig: @ 8D110B0
 	.incbin "data/graphics/pokemon/palettes/grumpig_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Grumpig: ; 8D110D8
+gMonBackPic_Grumpig: @ 8D110D8
 	.incbin "data/graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Grumpig: ; 8D11438
+gMonShinyPalette_Grumpig: @ 8D11438
 	.incbin "data/graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Grumpig: ; 8D11460
+gMonIcon_Grumpig: @ 8D11460
 	.incbin "data/graphics/pokemon/icons/grumpig_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Grumpig: ; 8D11860
+gMonFootprint_Grumpig: @ 8D11860
 	.incbin "data/graphics/pokemon/footprints/grumpig_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Plusle: ; 8D11880
+gMonStillFrontPic_Plusle: @ 8D11880
 	.incbin "data/graphics/pokemon/still_front_pics/plusle_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Plusle: ; 8D11B0C
+gMonPalette_Plusle: @ 8D11B0C
 	.incbin "data/graphics/pokemon/palettes/plusle_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Plusle: ; 8D11B34
+gMonBackPic_Plusle: @ 8D11B34
 	.incbin "data/graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Plusle: ; 8D11DEC
+gMonShinyPalette_Plusle: @ 8D11DEC
 	.incbin "data/graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Plusle: ; 8D11E14
+gMonIcon_Plusle: @ 8D11E14
 	.incbin "data/graphics/pokemon/icons/plusle_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Plusle: ; 8D12214
+gMonFootprint_Plusle: @ 8D12214
 	.incbin "data/graphics/pokemon/footprints/plusle_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Minun: ; 8D12234
+gMonStillFrontPic_Minun: @ 8D12234
 	.incbin "data/graphics/pokemon/still_front_pics/minun_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Minun: ; 8D1249C
+gMonPalette_Minun: @ 8D1249C
 	.incbin "data/graphics/pokemon/palettes/minun_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Minun: ; 8D124C4
+gMonBackPic_Minun: @ 8D124C4
 	.incbin "data/graphics/pokemon/back_pics/minun_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Minun: ; 8D1278C
+gMonShinyPalette_Minun: @ 8D1278C
 	.incbin "data/graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Minun: ; 8D127B4
+gMonIcon_Minun: @ 8D127B4
 	.incbin "data/graphics/pokemon/icons/minun_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Minun: ; 8D12BB4
+gMonFootprint_Minun: @ 8D12BB4
 	.incbin "data/graphics/pokemon/footprints/minun_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Mawile: ; 8D12BD4
+gMonStillFrontPic_Mawile: @ 8D12BD4
 	.incbin "data/graphics/pokemon/still_front_pics/mawile_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Mawile: ; 8D12F90
+gMonPalette_Mawile: @ 8D12F90
 	.incbin "data/graphics/pokemon/palettes/mawile_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Mawile: ; 8D12FB8
+gMonBackPic_Mawile: @ 8D12FB8
 	.incbin "data/graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Mawile: ; 8D133B8
+gMonShinyPalette_Mawile: @ 8D133B8
 	.incbin "data/graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Mawile: ; 8D133E0
+gMonIcon_Mawile: @ 8D133E0
 	.incbin "data/graphics/pokemon/icons/mawile_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Mawile: ; 8D137E0
+gMonFootprint_Mawile: @ 8D137E0
 	.incbin "data/graphics/pokemon/footprints/mawile_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Meditite: ; 8D13800
+gMonStillFrontPic_Meditite: @ 8D13800
 	.incbin "data/graphics/pokemon/still_front_pics/meditite_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Meditite: ; 8D13AB8
+gMonPalette_Meditite: @ 8D13AB8
 	.incbin "data/graphics/pokemon/palettes/meditite_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Meditite: ; 8D13AE0
+gMonBackPic_Meditite: @ 8D13AE0
 	.incbin "data/graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Meditite: ; 8D13DA8
+gMonShinyPalette_Meditite: @ 8D13DA8
 	.incbin "data/graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Meditite: ; 8D13DCC
+gMonIcon_Meditite: @ 8D13DCC
 	.incbin "data/graphics/pokemon/icons/meditite_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Meditite: ; 8D141CC
+gMonFootprint_Meditite: @ 8D141CC
 	.incbin "data/graphics/pokemon/footprints/meditite_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Medicham: ; 8D141EC
+gMonStillFrontPic_Medicham: @ 8D141EC
 	.incbin "data/graphics/pokemon/still_front_pics/medicham_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Medicham: ; 8D1451C
+gMonPalette_Medicham: @ 8D1451C
 	.incbin "data/graphics/pokemon/palettes/medicham_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Medicham: ; 8D14544
+gMonBackPic_Medicham: @ 8D14544
 	.incbin "data/graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Medicham: ; 8D1487C
+gMonShinyPalette_Medicham: @ 8D1487C
 	.incbin "data/graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Medicham: ; 8D148A4
+gMonIcon_Medicham: @ 8D148A4
 	.incbin "data/graphics/pokemon/icons/medicham_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Medicham: ; 8D14CA4
+gMonFootprint_Medicham: @ 8D14CA4
 	.incbin "data/graphics/pokemon/footprints/medicham_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Swablu: ; 8D14CC4
+gMonStillFrontPic_Swablu: @ 8D14CC4
 	.incbin "data/graphics/pokemon/still_front_pics/swablu_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Swablu: ; 8D15274
+gMonPalette_Swablu: @ 8D15274
 	.incbin "data/graphics/pokemon/palettes/swablu_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Swablu: ; 8D1529C
+gMonBackPic_Swablu: @ 8D1529C
 	.incbin "data/graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Swablu: ; 8D15654
+gMonShinyPalette_Swablu: @ 8D15654
 	.incbin "data/graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Swablu: ; 8D1567C
+gMonIcon_Swablu: @ 8D1567C
 	.incbin "data/graphics/pokemon/icons/swablu_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Swablu: ; 8D15A7C
+gMonFootprint_Swablu: @ 8D15A7C
 	.incbin "data/graphics/pokemon/footprints/swablu_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Altaria: ; 8D15A9C
+gMonStillFrontPic_Altaria: @ 8D15A9C
 	.incbin "data/graphics/pokemon/still_front_pics/altaria_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Altaria: ; 8D15E78
+gMonPalette_Altaria: @ 8D15E78
 	.incbin "data/graphics/pokemon/palettes/altaria_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Altaria: ; 8D15EA0
+gMonBackPic_Altaria: @ 8D15EA0
 	.incbin "data/graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Altaria: ; 8D16218
+gMonShinyPalette_Altaria: @ 8D16218
 	.incbin "data/graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Altaria: ; 8D16240
+gMonIcon_Altaria: @ 8D16240
 	.incbin "data/graphics/pokemon/icons/altaria_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Altaria: ; 8D16640
+gMonFootprint_Altaria: @ 8D16640
 	.incbin "data/graphics/pokemon/footprints/altaria_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Wynaut: ; 8D16660
+gMonStillFrontPic_Wynaut: @ 8D16660
 	.incbin "data/graphics/pokemon/still_front_pics/wynaut_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Wynaut: ; 8D168F8
+gMonPalette_Wynaut: @ 8D168F8
 	.incbin "data/graphics/pokemon/palettes/wynaut_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Wynaut: ; 8D16920
+gMonBackPic_Wynaut: @ 8D16920
 	.incbin "data/graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Wynaut: ; 8D16BB0
+gMonShinyPalette_Wynaut: @ 8D16BB0
 	.incbin "data/graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Wynaut: ; 8D16BD8
+gMonIcon_Wynaut: @ 8D16BD8
 	.incbin "data/graphics/pokemon/icons/wynaut_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Wynaut: ; 8D16FD8
+gMonFootprint_Wynaut: @ 8D16FD8
 	.incbin "data/graphics/pokemon/footprints/wynaut_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Duskull: ; 8D16FF8
+gMonStillFrontPic_Duskull: @ 8D16FF8
 	.incbin "data/graphics/pokemon/still_front_pics/duskull_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Duskull: ; 8D172E8
+gMonPalette_Duskull: @ 8D172E8
 	.incbin "data/graphics/pokemon/palettes/duskull_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Duskull: ; 8D17310
+gMonBackPic_Duskull: @ 8D17310
 	.incbin "data/graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Duskull: ; 8D175C0
+gMonShinyPalette_Duskull: @ 8D175C0
 	.incbin "data/graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Duskull: ; 8D175E8
+gMonIcon_Duskull: @ 8D175E8
 	.incbin "data/graphics/pokemon/icons/duskull_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Duskull: ; 8D179E8
+gMonFootprint_Duskull: @ 8D179E8
 	.incbin "data/graphics/pokemon/footprints/duskull_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Dusclops: ; 8D17A08
+gMonStillFrontPic_Dusclops: @ 8D17A08
 	.incbin "data/graphics/pokemon/still_front_pics/dusclops_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Dusclops: ; 8D17DA8
+gMonPalette_Dusclops: @ 8D17DA8
 	.incbin "data/graphics/pokemon/palettes/dusclops_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Dusclops: ; 8D17DD0
+gMonBackPic_Dusclops: @ 8D17DD0
 	.incbin "data/graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Dusclops: ; 8D180BC
+gMonShinyPalette_Dusclops: @ 8D180BC
 	.incbin "data/graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Dusclops: ; 8D180E4
+gMonIcon_Dusclops: @ 8D180E4
 	.incbin "data/graphics/pokemon/icons/dusclops_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Dusclops: ; 8D184E4
+gMonFootprint_Dusclops: @ 8D184E4
 	.incbin "data/graphics/pokemon/footprints/dusclops_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Roselia: ; 8D18504
+gMonStillFrontPic_Roselia: @ 8D18504
 	.incbin "data/graphics/pokemon/still_front_pics/roselia_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Roselia: ; 8D18870
+gMonPalette_Roselia: @ 8D18870
 	.incbin "data/graphics/pokemon/palettes/roselia_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Roselia: ; 8D18898
+gMonBackPic_Roselia: @ 8D18898
 	.incbin "data/graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Roselia: ; 8D18C60
+gMonShinyPalette_Roselia: @ 8D18C60
 	.incbin "data/graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Roselia: ; 8D18C88
+gMonIcon_Roselia: @ 8D18C88
 	.incbin "data/graphics/pokemon/icons/roselia_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Roselia: ; 8D19088
+gMonFootprint_Roselia: @ 8D19088
 	.incbin "data/graphics/pokemon/footprints/roselia_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slakoth: ; 8D190A8
+gMonStillFrontPic_Slakoth: @ 8D190A8
 	.incbin "data/graphics/pokemon/still_front_pics/slakoth_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slakoth: ; 8D19390
+gMonPalette_Slakoth: @ 8D19390
 	.incbin "data/graphics/pokemon/palettes/slakoth_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slakoth: ; 8D193B8
+gMonBackPic_Slakoth: @ 8D193B8
 	.incbin "data/graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slakoth: ; 8D196A0
+gMonShinyPalette_Slakoth: @ 8D196A0
 	.incbin "data/graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slakoth: ; 8D196C8
+gMonIcon_Slakoth: @ 8D196C8
 	.incbin "data/graphics/pokemon/icons/slakoth_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slakoth: ; 8D19AC8
+gMonFootprint_Slakoth: @ 8D19AC8
 	.incbin "data/graphics/pokemon/footprints/slakoth_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Vigoroth: ; 8D19AE8
+gMonStillFrontPic_Vigoroth: @ 8D19AE8
 	.incbin "data/graphics/pokemon/still_front_pics/vigoroth_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Vigoroth: ; 8D19EE4
+gMonPalette_Vigoroth: @ 8D19EE4
 	.incbin "data/graphics/pokemon/palettes/vigoroth_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Vigoroth: ; 8D19F0C
+gMonBackPic_Vigoroth: @ 8D19F0C
 	.incbin "data/graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Vigoroth: ; 8D1A1D4
+gMonShinyPalette_Vigoroth: @ 8D1A1D4
 	.incbin "data/graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Vigoroth: ; 8D1A1FC
+gMonIcon_Vigoroth: @ 8D1A1FC
 	.incbin "data/graphics/pokemon/icons/vigoroth_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Vigoroth: ; 8D1A5FC
+gMonFootprint_Vigoroth: @ 8D1A5FC
 	.incbin "data/graphics/pokemon/footprints/vigoroth_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Slaking: ; 8D1A61C
+gMonStillFrontPic_Slaking: @ 8D1A61C
 	.incbin "data/graphics/pokemon/still_front_pics/slaking_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Slaking: ; 8D1AAF0
+gMonPalette_Slaking: @ 8D1AAF0
 	.incbin "data/graphics/pokemon/palettes/slaking_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Slaking: ; 8D1AB18
+gMonBackPic_Slaking: @ 8D1AB18
 	.incbin "data/graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Slaking: ; 8D1AEDC
+gMonShinyPalette_Slaking: @ 8D1AEDC
 	.incbin "data/graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Slaking: ; 8D1AF04
+gMonIcon_Slaking: @ 8D1AF04
 	.incbin "data/graphics/pokemon/icons/slaking_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Slaking: ; 8D1B304
+gMonFootprint_Slaking: @ 8D1B304
 	.incbin "data/graphics/pokemon/footprints/slaking_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gulpin: ; 8D1B324
+gMonStillFrontPic_Gulpin: @ 8D1B324
 	.incbin "data/graphics/pokemon/still_front_pics/gulpin_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gulpin: ; 8D1B53C
+gMonPalette_Gulpin: @ 8D1B53C
 	.incbin "data/graphics/pokemon/palettes/gulpin_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gulpin: ; 8D1B564
+gMonBackPic_Gulpin: @ 8D1B564
 	.incbin "data/graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gulpin: ; 8D1B7E8
+gMonShinyPalette_Gulpin: @ 8D1B7E8
 	.incbin "data/graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gulpin: ; 8D1B810
+gMonIcon_Gulpin: @ 8D1B810
 	.incbin "data/graphics/pokemon/icons/gulpin_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gulpin: ; 8D1BC10
+gMonFootprint_Gulpin: @ 8D1BC10
 	.incbin "data/graphics/pokemon/footprints/gulpin_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Swalot: ; 8D1BC30
+gMonStillFrontPic_Swalot: @ 8D1BC30
 	.incbin "data/graphics/pokemon/still_front_pics/swalot_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Swalot: ; 8D1BF74
+gMonPalette_Swalot: @ 8D1BF74
 	.incbin "data/graphics/pokemon/palettes/swalot_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Swalot: ; 8D1BF9C
+gMonBackPic_Swalot: @ 8D1BF9C
 	.incbin "data/graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Swalot: ; 8D1C2E4
+gMonShinyPalette_Swalot: @ 8D1C2E4
 	.incbin "data/graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Swalot: ; 8D1C30C
+gMonIcon_Swalot: @ 8D1C30C
 	.incbin "data/graphics/pokemon/icons/swalot_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Swalot: ; 8D1C70C
+gMonFootprint_Swalot: @ 8D1C70C
 	.incbin "data/graphics/pokemon/footprints/swalot_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Tropius: ; 8D1C72C
+gMonStillFrontPic_Tropius: @ 8D1C72C
 	.incbin "data/graphics/pokemon/still_front_pics/tropius_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Tropius: ; 8D1CCA4
+gMonPalette_Tropius: @ 8D1CCA4
 	.incbin "data/graphics/pokemon/palettes/tropius_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Tropius: ; 8D1CCCC
+gMonBackPic_Tropius: @ 8D1CCCC
 	.incbin "data/graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Tropius: ; 8D1CFF0
+gMonShinyPalette_Tropius: @ 8D1CFF0
 	.incbin "data/graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Tropius: ; 8D1D018
+gMonIcon_Tropius: @ 8D1D018
 	.incbin "data/graphics/pokemon/icons/tropius_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Tropius: ; 8D1D418
+gMonFootprint_Tropius: @ 8D1D418
 	.incbin "data/graphics/pokemon/footprints/tropius_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Whismur: ; 8D1D438
+gMonStillFrontPic_Whismur: @ 8D1D438
 	.incbin "data/graphics/pokemon/still_front_pics/whismur_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Whismur: ; 8D1D6CC
+gMonPalette_Whismur: @ 8D1D6CC
 	.incbin "data/graphics/pokemon/palettes/whismur_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Whismur: ; 8D1D6F4
+gMonBackPic_Whismur: @ 8D1D6F4
 	.incbin "data/graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Whismur: ; 8D1D964
+gMonShinyPalette_Whismur: @ 8D1D964
 	.incbin "data/graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Whismur: ; 8D1D98C
+gMonIcon_Whismur: @ 8D1D98C
 	.incbin "data/graphics/pokemon/icons/whismur_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Whismur: ; 8D1DD8C
+gMonFootprint_Whismur: @ 8D1DD8C
 	.incbin "data/graphics/pokemon/footprints/whismur_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Loudred: ; 8D1DDAC
+gMonStillFrontPic_Loudred: @ 8D1DDAC
 	.incbin "data/graphics/pokemon/still_front_pics/loudred_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Loudred: ; 8D1E224
+gMonPalette_Loudred: @ 8D1E224
 	.incbin "data/graphics/pokemon/palettes/loudred_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Loudred: ; 8D1E24C
+gMonBackPic_Loudred: @ 8D1E24C
 	.incbin "data/graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Loudred: ; 8D1E5BC
+gMonShinyPalette_Loudred: @ 8D1E5BC
 	.incbin "data/graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Loudred: ; 8D1E5E4
+gMonIcon_Loudred: @ 8D1E5E4
 	.incbin "data/graphics/pokemon/icons/loudred_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Loudred: ; 8D1E9E4
+gMonFootprint_Loudred: @ 8D1E9E4
 	.incbin "data/graphics/pokemon/footprints/loudred_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Exploud: ; 8D1EA04
+gMonStillFrontPic_Exploud: @ 8D1EA04
 	.incbin "data/graphics/pokemon/still_front_pics/exploud_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Exploud: ; 8D1EF6C
+gMonPalette_Exploud: @ 8D1EF6C
 	.incbin "data/graphics/pokemon/palettes/exploud_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Exploud: ; 8D1EF94
+gMonBackPic_Exploud: @ 8D1EF94
 	.incbin "data/graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Exploud: ; 8D1F3A0
+gMonShinyPalette_Exploud: @ 8D1F3A0
 	.incbin "data/graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Exploud: ; 8D1F3C8
+gMonIcon_Exploud: @ 8D1F3C8
 	.incbin "data/graphics/pokemon/icons/exploud_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Exploud: ; 8D1F7C8
+gMonFootprint_Exploud: @ 8D1F7C8
 	.incbin "data/graphics/pokemon/footprints/exploud_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Clamperl: ; 8D1F7E8
+gMonStillFrontPic_Clamperl: @ 8D1F7E8
 	.incbin "data/graphics/pokemon/still_front_pics/clamperl_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Clamperl: ; 8D1FAC0
+gMonPalette_Clamperl: @ 8D1FAC0
 	.incbin "data/graphics/pokemon/palettes/clamperl_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Clamperl: ; 8D1FAE8
+gMonBackPic_Clamperl: @ 8D1FAE8
 	.incbin "data/graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Clamperl: ; 8D1FD7C
+gMonShinyPalette_Clamperl: @ 8D1FD7C
 	.incbin "data/graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Clamperl: ; 8D1FDA4
+gMonIcon_Clamperl: @ 8D1FDA4
 	.incbin "data/graphics/pokemon/icons/clamperl_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Clamperl: ; 8D201A4
+gMonFootprint_Clamperl: @ 8D201A4
 	.incbin "data/graphics/pokemon/footprints/clamperl_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Huntail: ; 8D201C4
+gMonStillFrontPic_Huntail: @ 8D201C4
 	.incbin "data/graphics/pokemon/still_front_pics/huntail_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Huntail: ; 8D20590
+gMonPalette_Huntail: @ 8D20590
 	.incbin "data/graphics/pokemon/palettes/huntail_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Huntail: ; 8D205B8
+gMonBackPic_Huntail: @ 8D205B8
 	.incbin "data/graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Huntail: ; 8D2090C
+gMonShinyPalette_Huntail: @ 8D2090C
 	.incbin "data/graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Huntail: ; 8D20934
+gMonIcon_Huntail: @ 8D20934
 	.incbin "data/graphics/pokemon/icons/huntail_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Huntail: ; 8D20D34
+gMonFootprint_Huntail: @ 8D20D34
 	.incbin "data/graphics/pokemon/footprints/huntail_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gorebyss: ; 8D20D54
+gMonStillFrontPic_Gorebyss: @ 8D20D54
 	.incbin "data/graphics/pokemon/still_front_pics/gorebyss_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gorebyss: ; 8D21064
+gMonPalette_Gorebyss: @ 8D21064
 	.incbin "data/graphics/pokemon/palettes/gorebyss_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gorebyss: ; 8D2108C
+gMonBackPic_Gorebyss: @ 8D2108C
 	.incbin "data/graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gorebyss: ; 8D21374
+gMonShinyPalette_Gorebyss: @ 8D21374
 	.incbin "data/graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gorebyss: ; 8D2139C
+gMonIcon_Gorebyss: @ 8D2139C
 	.incbin "data/graphics/pokemon/icons/gorebyss_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gorebyss: ; 8D2179C
+gMonFootprint_Gorebyss: @ 8D2179C
 	.incbin "data/graphics/pokemon/footprints/gorebyss_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Absol: ; 8D217BC
+gMonStillFrontPic_Absol: @ 8D217BC
 	.incbin "data/graphics/pokemon/still_front_pics/absol_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Absol: ; 8D21BEC
+gMonPalette_Absol: @ 8D21BEC
 	.incbin "data/graphics/pokemon/palettes/absol_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Absol: ; 8D21C14
+gMonBackPic_Absol: @ 8D21C14
 	.incbin "data/graphics/pokemon/back_pics/absol_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Absol: ; 8D21F74
+gMonShinyPalette_Absol: @ 8D21F74
 	.incbin "data/graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Absol: ; 8D21F9C
+gMonIcon_Absol: @ 8D21F9C
 	.incbin "data/graphics/pokemon/icons/absol_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Absol: ; 8D2239C
+gMonFootprint_Absol: @ 8D2239C
 	.incbin "data/graphics/pokemon/footprints/absol_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shuppet: ; 8D223BC
+gMonStillFrontPic_Shuppet: @ 8D223BC
 	.incbin "data/graphics/pokemon/still_front_pics/shuppet_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shuppet: ; 8D225F4
+gMonPalette_Shuppet: @ 8D225F4
 	.incbin "data/graphics/pokemon/palettes/shuppet_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shuppet: ; 8D2261C
+gMonBackPic_Shuppet: @ 8D2261C
 	.incbin "data/graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shuppet: ; 8D228B4
+gMonShinyPalette_Shuppet: @ 8D228B4
 	.incbin "data/graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shuppet: ; 8D228DC
+gMonIcon_Shuppet: @ 8D228DC
 	.incbin "data/graphics/pokemon/icons/shuppet_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shuppet: ; 8D22CDC
+gMonFootprint_Shuppet: @ 8D22CDC
 	.incbin "data/graphics/pokemon/footprints/shuppet_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Banette: ; 8D22CFC
+gMonStillFrontPic_Banette: @ 8D22CFC
 	.incbin "data/graphics/pokemon/still_front_pics/banette_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Banette: ; 8D22FB0
+gMonPalette_Banette: @ 8D22FB0
 	.incbin "data/graphics/pokemon/palettes/banette_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Banette: ; 8D22FD8
+gMonBackPic_Banette: @ 8D22FD8
 	.incbin "data/graphics/pokemon/back_pics/banette_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Banette: ; 8D23254
+gMonShinyPalette_Banette: @ 8D23254
 	.incbin "data/graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Banette: ; 8D2327C
+gMonIcon_Banette: @ 8D2327C
 	.incbin "data/graphics/pokemon/icons/banette_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Banette: ; 8D2367C
+gMonFootprint_Banette: @ 8D2367C
 	.incbin "data/graphics/pokemon/footprints/banette_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Seviper: ; 8D2369C
+gMonStillFrontPic_Seviper: @ 8D2369C
 	.incbin "data/graphics/pokemon/still_front_pics/seviper_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Seviper: ; 8D23ABC
+gMonPalette_Seviper: @ 8D23ABC
 	.incbin "data/graphics/pokemon/palettes/seviper_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Seviper: ; 8D23AE4
+gMonBackPic_Seviper: @ 8D23AE4
 	.incbin "data/graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Seviper: ; 8D23F70
+gMonShinyPalette_Seviper: @ 8D23F70
 	.incbin "data/graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Seviper: ; 8D23F98
+gMonIcon_Seviper: @ 8D23F98
 	.incbin "data/graphics/pokemon/icons/seviper_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Seviper: ; 8D24398
+gMonFootprint_Seviper: @ 8D24398
 	.incbin "data/graphics/pokemon/footprints/seviper_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Zangoose: ; 8D243B8
+gMonStillFrontPic_Zangoose: @ 8D243B8
 	.incbin "data/graphics/pokemon/still_front_pics/zangoose_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Zangoose: ; 8D24784
+gMonPalette_Zangoose: @ 8D24784
 	.incbin "data/graphics/pokemon/palettes/zangoose_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Zangoose: ; 8D247AC
+gMonBackPic_Zangoose: @ 8D247AC
 	.incbin "data/graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Zangoose: ; 8D24B20
+gMonShinyPalette_Zangoose: @ 8D24B20
 	.incbin "data/graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Zangoose: ; 8D24B48
+gMonIcon_Zangoose: @ 8D24B48
 	.incbin "data/graphics/pokemon/icons/zangoose_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Zangoose: ; 8D24F48
+gMonFootprint_Zangoose: @ 8D24F48
 	.incbin "data/graphics/pokemon/footprints/zangoose_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Relicanth: ; 8D24F68
+gMonStillFrontPic_Relicanth: @ 8D24F68
 	.incbin "data/graphics/pokemon/still_front_pics/relicanth_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Relicanth: ; 8D252FC
+gMonPalette_Relicanth: @ 8D252FC
 	.incbin "data/graphics/pokemon/palettes/relicanth_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Relicanth: ; 8D25324
+gMonBackPic_Relicanth: @ 8D25324
 	.incbin "data/graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Relicanth: ; 8D2567C
+gMonShinyPalette_Relicanth: @ 8D2567C
 	.incbin "data/graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Relicanth: ; 8D256A4
+gMonIcon_Relicanth: @ 8D256A4
 	.incbin "data/graphics/pokemon/icons/relicanth_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Relicanth: ; 8D25AA4
+gMonFootprint_Relicanth: @ 8D25AA4
 	.incbin "data/graphics/pokemon/footprints/relicanth_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Aron: ; 8D25AC4
+gMonStillFrontPic_Aron: @ 8D25AC4
 	.incbin "data/graphics/pokemon/still_front_pics/aron_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Aron: ; 8D25CAC
+gMonPalette_Aron: @ 8D25CAC
 	.incbin "data/graphics/pokemon/palettes/aron_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Aron: ; 8D25CD4
+gMonBackPic_Aron: @ 8D25CD4
 	.incbin "data/graphics/pokemon/back_pics/aron_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Aron: ; 8D25EFC
+gMonShinyPalette_Aron: @ 8D25EFC
 	.incbin "data/graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Aron: ; 8D25F24
+gMonIcon_Aron: @ 8D25F24
 	.incbin "data/graphics/pokemon/icons/aron_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Aron: ; 8D26324
+gMonFootprint_Aron: @ 8D26324
 	.incbin "data/graphics/pokemon/footprints/aron_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lairon: ; 8D26344
+gMonStillFrontPic_Lairon: @ 8D26344
 	.incbin "data/graphics/pokemon/still_front_pics/lairon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lairon: ; 8D26710
+gMonPalette_Lairon: @ 8D26710
 	.incbin "data/graphics/pokemon/palettes/lairon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lairon: ; 8D26738
+gMonBackPic_Lairon: @ 8D26738
 	.incbin "data/graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lairon: ; 8D26A24
+gMonShinyPalette_Lairon: @ 8D26A24
 	.incbin "data/graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lairon: ; 8D26A4C
+gMonIcon_Lairon: @ 8D26A4C
 	.incbin "data/graphics/pokemon/icons/lairon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lairon: ; 8D26E4C
+gMonFootprint_Lairon: @ 8D26E4C
 	.incbin "data/graphics/pokemon/footprints/lairon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Aggron: ; 8D26E6C
+gMonStillFrontPic_Aggron: @ 8D26E6C
 	.incbin "data/graphics/pokemon/still_front_pics/aggron_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Aggron: ; 8D273E8
+gMonPalette_Aggron: @ 8D273E8
 	.incbin "data/graphics/pokemon/palettes/aggron_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Aggron: ; 8D27410
+gMonBackPic_Aggron: @ 8D27410
 	.incbin "data/graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Aggron: ; 8D27838
+gMonShinyPalette_Aggron: @ 8D27838
 	.incbin "data/graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Aggron: ; 8D27860
+gMonIcon_Aggron: @ 8D27860
 	.incbin "data/graphics/pokemon/icons/aggron_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Aggron: ; 8D27C60
+gMonFootprint_Aggron: @ 8D27C60
 	.incbin "data/graphics/pokemon/footprints/aggron_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Castform: ; 8D27C80
+gMonStillFrontPic_Castform: @ 8D27C80
 	.incbin "data/graphics/pokemon/still_front_pics/castform_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Castform: ; 8D28708
+gMonPalette_Castform: @ 8D28708
 	.incbin "data/graphics/pokemon/palettes/castform_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Castform: ; 8D28788
+gMonBackPic_Castform: @ 8D28788
 	.incbin "data/graphics/pokemon/back_pics/castform_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Castform: ; 8D29144
+gMonShinyPalette_Castform: @ 8D29144
 	.incbin "data/graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Castform: ; 8D291C0
+gMonIcon_Castform: @ 8D291C0
 	.incbin "data/graphics/pokemon/icons/castform_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Castform: ; 8D295C0
+gMonFootprint_Castform: @ 8D295C0
 	.incbin "data/graphics/pokemon/footprints/castform_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Volbeat: ; 8D295E0
+gMonStillFrontPic_Volbeat: @ 8D295E0
 	.incbin "data/graphics/pokemon/still_front_pics/volbeat_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Volbeat: ; 8D29970
+gMonPalette_Volbeat: @ 8D29970
 	.incbin "data/graphics/pokemon/palettes/volbeat_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Volbeat: ; 8D29998
+gMonBackPic_Volbeat: @ 8D29998
 	.incbin "data/graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Volbeat: ; 8D29CF8
+gMonShinyPalette_Volbeat: @ 8D29CF8
 	.incbin "data/graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Volbeat: ; 8D29D20
+gMonIcon_Volbeat: @ 8D29D20
 	.incbin "data/graphics/pokemon/icons/volbeat_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Volbeat: ; 8D2A120
+gMonFootprint_Volbeat: @ 8D2A120
 	.incbin "data/graphics/pokemon/footprints/volbeat_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Illumise: ; 8D2A140
+gMonStillFrontPic_Illumise: @ 8D2A140
 	.incbin "data/graphics/pokemon/still_front_pics/illumise_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Illumise: ; 8D2A4B4
+gMonPalette_Illumise: @ 8D2A4B4
 	.incbin "data/graphics/pokemon/palettes/illumise_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Illumise: ; 8D2A4DC
+gMonBackPic_Illumise: @ 8D2A4DC
 	.incbin "data/graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Illumise: ; 8D2A7F8
+gMonShinyPalette_Illumise: @ 8D2A7F8
 	.incbin "data/graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Illumise: ; 8D2A820
+gMonIcon_Illumise: @ 8D2A820
 	.incbin "data/graphics/pokemon/icons/illumise_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Illumise: ; 8D2AC20
+gMonFootprint_Illumise: @ 8D2AC20
 	.incbin "data/graphics/pokemon/footprints/illumise_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Lileep: ; 8D2AC40
+gMonStillFrontPic_Lileep: @ 8D2AC40
 	.incbin "data/graphics/pokemon/still_front_pics/lileep_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Lileep: ; 8D2AF84
+gMonPalette_Lileep: @ 8D2AF84
 	.incbin "data/graphics/pokemon/palettes/lileep_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Lileep: ; 8D2AFAC
+gMonBackPic_Lileep: @ 8D2AFAC
 	.incbin "data/graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Lileep: ; 8D2B2F0
+gMonShinyPalette_Lileep: @ 8D2B2F0
 	.incbin "data/graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Lileep: ; 8D2B318
+gMonIcon_Lileep: @ 8D2B318
 	.incbin "data/graphics/pokemon/icons/lileep_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Lileep: ; 8D2B718
+gMonFootprint_Lileep: @ 8D2B718
 	.incbin "data/graphics/pokemon/footprints/lileep_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Cradily: ; 8D2B738
+gMonStillFrontPic_Cradily: @ 8D2B738
 	.incbin "data/graphics/pokemon/still_front_pics/cradily_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Cradily: ; 8D2BB54
+gMonPalette_Cradily: @ 8D2BB54
 	.incbin "data/graphics/pokemon/palettes/cradily_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Cradily: ; 8D2BB7C
+gMonBackPic_Cradily: @ 8D2BB7C
 	.incbin "data/graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Cradily: ; 8D2BF78
+gMonShinyPalette_Cradily: @ 8D2BF78
 	.incbin "data/graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Cradily: ; 8D2BFA0
+gMonIcon_Cradily: @ 8D2BFA0
 	.incbin "data/graphics/pokemon/icons/cradily_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Cradily: ; 8D2C3A0
+gMonFootprint_Cradily: @ 8D2C3A0
 	.incbin "data/graphics/pokemon/footprints/cradily_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Anorith: ; 8D2C3C0
+gMonStillFrontPic_Anorith: @ 8D2C3C0
 	.incbin "data/graphics/pokemon/still_front_pics/anorith_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Anorith: ; 8D2C6E4
+gMonPalette_Anorith: @ 8D2C6E4
 	.incbin "data/graphics/pokemon/palettes/anorith_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Anorith: ; 8D2C70C
+gMonBackPic_Anorith: @ 8D2C70C
 	.incbin "data/graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Anorith: ; 8D2C954
+gMonShinyPalette_Anorith: @ 8D2C954
 	.incbin "data/graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Anorith: ; 8D2C97C
+gMonIcon_Anorith: @ 8D2C97C
 	.incbin "data/graphics/pokemon/icons/anorith_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Anorith: ; 8D2CD7C
+gMonFootprint_Anorith: @ 8D2CD7C
 	.incbin "data/graphics/pokemon/footprints/anorith_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Armaldo: ; 8D2CD9C
+gMonStillFrontPic_Armaldo: @ 8D2CD9C
 	.incbin "data/graphics/pokemon/still_front_pics/armaldo_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Armaldo: ; 8D2D31C
+gMonPalette_Armaldo: @ 8D2D31C
 	.incbin "data/graphics/pokemon/palettes/armaldo_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Armaldo: ; 8D2D344
+gMonBackPic_Armaldo: @ 8D2D344
 	.incbin "data/graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Armaldo: ; 8D2D77C
+gMonShinyPalette_Armaldo: @ 8D2D77C
 	.incbin "data/graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Armaldo: ; 8D2D7A4
+gMonIcon_Armaldo: @ 8D2D7A4
 	.incbin "data/graphics/pokemon/icons/armaldo_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Armaldo: ; 8D2DBA4
+gMonFootprint_Armaldo: @ 8D2DBA4
 	.incbin "data/graphics/pokemon/footprints/armaldo_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Ralts: ; 8D2DBC4
+gMonStillFrontPic_Ralts: @ 8D2DBC4
 	.incbin "data/graphics/pokemon/still_front_pics/ralts_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Ralts: ; 8D2DDF4
+gMonPalette_Ralts: @ 8D2DDF4
 	.incbin "data/graphics/pokemon/palettes/ralts_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Ralts: ; 8D2DE1C
+gMonBackPic_Ralts: @ 8D2DE1C
 	.incbin "data/graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Ralts: ; 8D2E058
+gMonShinyPalette_Ralts: @ 8D2E058
 	.incbin "data/graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Ralts: ; 8D2E080
+gMonIcon_Ralts: @ 8D2E080
 	.incbin "data/graphics/pokemon/icons/ralts_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Ralts: ; 8D2E480
+gMonFootprint_Ralts: @ 8D2E480
 	.incbin "data/graphics/pokemon/footprints/ralts_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kirlia: ; 8D2E4A0
+gMonStillFrontPic_Kirlia: @ 8D2E4A0
 	.incbin "data/graphics/pokemon/still_front_pics/kirlia_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kirlia: ; 8D2E79C
+gMonPalette_Kirlia: @ 8D2E79C
 	.incbin "data/graphics/pokemon/palettes/kirlia_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kirlia: ; 8D2E7C4
+gMonBackPic_Kirlia: @ 8D2E7C4
 	.incbin "data/graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kirlia: ; 8D2EB38
+gMonShinyPalette_Kirlia: @ 8D2EB38
 	.incbin "data/graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kirlia: ; 8D2EB60
+gMonIcon_Kirlia: @ 8D2EB60
 	.incbin "data/graphics/pokemon/icons/kirlia_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kirlia: ; 8D2EF60
+gMonFootprint_Kirlia: @ 8D2EF60
 	.incbin "data/graphics/pokemon/footprints/kirlia_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Gardevoir: ; 8D2EF80
+gMonStillFrontPic_Gardevoir: @ 8D2EF80
 	.incbin "data/graphics/pokemon/still_front_pics/gardevoir_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Gardevoir: ; 8D2F2FC
+gMonPalette_Gardevoir: @ 8D2F2FC
 	.incbin "data/graphics/pokemon/palettes/gardevoir_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Gardevoir: ; 8D2F324
+gMonBackPic_Gardevoir: @ 8D2F324
 	.incbin "data/graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Gardevoir: ; 8D2F658
+gMonShinyPalette_Gardevoir: @ 8D2F658
 	.incbin "data/graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Gardevoir: ; 8D2F680
+gMonIcon_Gardevoir: @ 8D2F680
 	.incbin "data/graphics/pokemon/icons/gardevoir_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Gardevoir: ; 8D2FA80
+gMonFootprint_Gardevoir: @ 8D2FA80
 	.incbin "data/graphics/pokemon/footprints/gardevoir_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Bagon: ; 8D2FAA0
+gMonStillFrontPic_Bagon: @ 8D2FAA0
 	.incbin "data/graphics/pokemon/still_front_pics/bagon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Bagon: ; 8D2FD18
+gMonPalette_Bagon: @ 8D2FD18
 	.incbin "data/graphics/pokemon/palettes/bagon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Bagon: ; 8D2FD40
+gMonBackPic_Bagon: @ 8D2FD40
 	.incbin "data/graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Bagon: ; 8D30028
+gMonShinyPalette_Bagon: @ 8D30028
 	.incbin "data/graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Bagon: ; 8D30050
+gMonIcon_Bagon: @ 8D30050
 	.incbin "data/graphics/pokemon/icons/bagon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Bagon: ; 8D30450
+gMonFootprint_Bagon: @ 8D30450
 	.incbin "data/graphics/pokemon/footprints/bagon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Shelgon: ; 8D30470
+gMonStillFrontPic_Shelgon: @ 8D30470
 	.incbin "data/graphics/pokemon/still_front_pics/shelgon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Shelgon: ; 8D30774
+gMonPalette_Shelgon: @ 8D30774
 	.incbin "data/graphics/pokemon/palettes/shelgon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Shelgon: ; 8D3079C
+gMonBackPic_Shelgon: @ 8D3079C
 	.incbin "data/graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Shelgon: ; 8D30A84
+gMonShinyPalette_Shelgon: @ 8D30A84
 	.incbin "data/graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Shelgon: ; 8D30AAC
+gMonIcon_Shelgon: @ 8D30AAC
 	.incbin "data/graphics/pokemon/icons/shelgon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Shelgon: ; 8D30EAC
+gMonFootprint_Shelgon: @ 8D30EAC
 	.incbin "data/graphics/pokemon/footprints/shelgon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Salamence: ; 8D30ECC
+gMonStillFrontPic_Salamence: @ 8D30ECC
 	.incbin "data/graphics/pokemon/still_front_pics/salamence_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Salamence: ; 8D31330
+gMonPalette_Salamence: @ 8D31330
 	.incbin "data/graphics/pokemon/palettes/salamence_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Salamence: ; 8D31358
+gMonBackPic_Salamence: @ 8D31358
 	.incbin "data/graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Salamence: ; 8D3163C
+gMonShinyPalette_Salamence: @ 8D3163C
 	.incbin "data/graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Salamence: ; 8D31664
+gMonIcon_Salamence: @ 8D31664
 	.incbin "data/graphics/pokemon/icons/salamence_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Salamence: ; 8D31A64
+gMonFootprint_Salamence: @ 8D31A64
 	.incbin "data/graphics/pokemon/footprints/salamence_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Beldum: ; 8D31A84
+gMonStillFrontPic_Beldum: @ 8D31A84
 	.incbin "data/graphics/pokemon/still_front_pics/beldum_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Beldum: ; 8D31CF4
+gMonPalette_Beldum: @ 8D31CF4
 	.incbin "data/graphics/pokemon/palettes/beldum_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Beldum: ; 8D31D1C
+gMonBackPic_Beldum: @ 8D31D1C
 	.incbin "data/graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Beldum: ; 8D3200C
+gMonShinyPalette_Beldum: @ 8D3200C
 	.incbin "data/graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Beldum: ; 8D32034
+gMonIcon_Beldum: @ 8D32034
 	.incbin "data/graphics/pokemon/icons/beldum_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Beldum: ; 8D32434
+gMonFootprint_Beldum: @ 8D32434
 	.incbin "data/graphics/pokemon/footprints/beldum_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Metang: ; 8D32454
+gMonStillFrontPic_Metang: @ 8D32454
 	.incbin "data/graphics/pokemon/still_front_pics/metang_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Metang: ; 8D328B0
+gMonPalette_Metang: @ 8D328B0
 	.incbin "data/graphics/pokemon/palettes/metang_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Metang: ; 8D328D8
+gMonBackPic_Metang: @ 8D328D8
 	.incbin "data/graphics/pokemon/back_pics/metang_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Metang: ; 8D32BFC
+gMonShinyPalette_Metang: @ 8D32BFC
 	.incbin "data/graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Metang: ; 8D32C24
+gMonIcon_Metang: @ 8D32C24
 	.incbin "data/graphics/pokemon/icons/metang_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Metang: ; 8D33024
+gMonFootprint_Metang: @ 8D33024
 	.incbin "data/graphics/pokemon/footprints/metang_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Metagross: ; 8D33044
+gMonStillFrontPic_Metagross: @ 8D33044
 	.incbin "data/graphics/pokemon/still_front_pics/metagross_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Metagross: ; 8D334A8
+gMonPalette_Metagross: @ 8D334A8
 	.incbin "data/graphics/pokemon/palettes/metagross_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Metagross: ; 8D334D0
+gMonBackPic_Metagross: @ 8D334D0
 	.incbin "data/graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Metagross: ; 8D3379C
+gMonShinyPalette_Metagross: @ 8D3379C
 	.incbin "data/graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Metagross: ; 8D337C4
+gMonIcon_Metagross: @ 8D337C4
 	.incbin "data/graphics/pokemon/icons/metagross_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Metagross: ; 8D33BC4
+gMonFootprint_Metagross: @ 8D33BC4
 	.incbin "data/graphics/pokemon/footprints/metagross_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Regirock: ; 8D33BE4
+gMonStillFrontPic_Regirock: @ 8D33BE4
 	.incbin "data/graphics/pokemon/still_front_pics/regirock_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Regirock: ; 8D340A0
+gMonPalette_Regirock: @ 8D340A0
 	.incbin "data/graphics/pokemon/palettes/regirock_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Regirock: ; 8D340C8
+gMonBackPic_Regirock: @ 8D340C8
 	.incbin "data/graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Regirock: ; 8D34514
+gMonShinyPalette_Regirock: @ 8D34514
 	.incbin "data/graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Regirock: ; 8D3453C
+gMonIcon_Regirock: @ 8D3453C
 	.incbin "data/graphics/pokemon/icons/regirock_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Regirock: ; 8D3493C
+gMonFootprint_Regirock: @ 8D3493C
 	.incbin "data/graphics/pokemon/footprints/regirock_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Regice: ; 8D3495C
+gMonStillFrontPic_Regice: @ 8D3495C
 	.incbin "data/graphics/pokemon/still_front_pics/regice_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Regice: ; 8D34DA4
+gMonPalette_Regice: @ 8D34DA4
 	.incbin "data/graphics/pokemon/palettes/regice_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Regice: ; 8D34DCC
+gMonBackPic_Regice: @ 8D34DCC
 	.incbin "data/graphics/pokemon/back_pics/regice_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Regice: ; 8D350BC
+gMonShinyPalette_Regice: @ 8D350BC
 	.incbin "data/graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Regice: ; 8D350E4
+gMonIcon_Regice: @ 8D350E4
 	.incbin "data/graphics/pokemon/icons/regice_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Regice: ; 8D354E4
+gMonFootprint_Regice: @ 8D354E4
 	.incbin "data/graphics/pokemon/footprints/regice_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Registeel: ; 8D35504
+gMonStillFrontPic_Registeel: @ 8D35504
 	.incbin "data/graphics/pokemon/still_front_pics/registeel_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Registeel: ; 8D3598C
+gMonPalette_Registeel: @ 8D3598C
 	.incbin "data/graphics/pokemon/palettes/registeel_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Registeel: ; 8D359B4
+gMonBackPic_Registeel: @ 8D359B4
 	.incbin "data/graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Registeel: ; 8D35CEC
+gMonShinyPalette_Registeel: @ 8D35CEC
 	.incbin "data/graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Registeel: ; 8D35D14
+gMonIcon_Registeel: @ 8D35D14
 	.incbin "data/graphics/pokemon/icons/registeel_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Registeel: ; 8D36114
+gMonFootprint_Registeel: @ 8D36114
 	.incbin "data/graphics/pokemon/footprints/registeel_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Kyogre: ; 8D36134
+gMonStillFrontPic_Kyogre: @ 8D36134
 	.incbin "data/graphics/pokemon/still_front_pics/kyogre_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Kyogre: ; 8D365A4
+gMonPalette_Kyogre: @ 8D365A4
 	.incbin "data/graphics/pokemon/palettes/kyogre_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Kyogre: ; 8D365CC
+gMonBackPic_Kyogre: @ 8D365CC
 	.incbin "data/graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Kyogre: ; 8D36844
+gMonShinyPalette_Kyogre: @ 8D36844
 	.incbin "data/graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Kyogre: ; 8D3686C
+gMonIcon_Kyogre: @ 8D3686C
 	.incbin "data/graphics/pokemon/icons/kyogre_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Kyogre: ; 8D36C6C
+gMonFootprint_Kyogre: @ 8D36C6C
 	.incbin "data/graphics/pokemon/footprints/kyogre_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Groudon: ; 8D36C8C
+gMonStillFrontPic_Groudon: @ 8D36C8C
 	.incbin "data/graphics/pokemon/still_front_pics/groudon_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Groudon: ; 8D37220
+gMonPalette_Groudon: @ 8D37220
 	.incbin "data/graphics/pokemon/palettes/groudon_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Groudon: ; 8D37248
+gMonBackPic_Groudon: @ 8D37248
 	.incbin "data/graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Groudon: ; 8D376B0
+gMonShinyPalette_Groudon: @ 8D376B0
 	.incbin "data/graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Groudon: ; 8D376D8
+gMonIcon_Groudon: @ 8D376D8
 	.incbin "data/graphics/pokemon/icons/groudon_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Groudon: ; 8D37AD8
+gMonFootprint_Groudon: @ 8D37AD8
 	.incbin "data/graphics/pokemon/footprints/groudon_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Rayquaza: ; 8D37AF8
+gMonStillFrontPic_Rayquaza: @ 8D37AF8
 	.incbin "data/graphics/pokemon/still_front_pics/rayquaza_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Rayquaza: ; 8D382E4
+gMonPalette_Rayquaza: @ 8D382E4
 	.incbin "data/graphics/pokemon/palettes/rayquaza_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Rayquaza: ; 8D3830C
+gMonBackPic_Rayquaza: @ 8D3830C
 	.incbin "data/graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Rayquaza: ; 8D38644
+gMonShinyPalette_Rayquaza: @ 8D38644
 	.incbin "data/graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Rayquaza: ; 8D3866C
+gMonIcon_Rayquaza: @ 8D3866C
 	.incbin "data/graphics/pokemon/icons/rayquaza_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Rayquaza: ; 8D38A6C
+gMonFootprint_Rayquaza: @ 8D38A6C
 	.incbin "data/graphics/pokemon/footprints/rayquaza_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Latias: ; 8D38A8C
+gMonStillFrontPic_Latias: @ 8D38A8C
 	.incbin "data/graphics/pokemon/still_front_pics/latias_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Latias: ; 8D38EB0
+gMonPalette_Latias: @ 8D38EB0
 	.incbin "data/graphics/pokemon/palettes/latias_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Latias: ; 8D38ED8
+gMonBackPic_Latias: @ 8D38ED8
 	.incbin "data/graphics/pokemon/back_pics/latias_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Latias: ; 8D391D4
+gMonShinyPalette_Latias: @ 8D391D4
 	.incbin "data/graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Latias: ; 8D391FC
+gMonIcon_Latias: @ 8D391FC
 	.incbin "data/graphics/pokemon/icons/latias_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Latias: ; 8D395FC
+gMonFootprint_Latias: @ 8D395FC
 	.incbin "data/graphics/pokemon/footprints/latias_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Latios: ; 8D3961C
+gMonStillFrontPic_Latios: @ 8D3961C
 	.incbin "data/graphics/pokemon/still_front_pics/latios_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Latios: ; 8D39A70
+gMonPalette_Latios: @ 8D39A70
 	.incbin "data/graphics/pokemon/palettes/latios_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Latios: ; 8D39A98
+gMonBackPic_Latios: @ 8D39A98
 	.incbin "data/graphics/pokemon/back_pics/latios_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Latios: ; 8D39DF8
+gMonShinyPalette_Latios: @ 8D39DF8
 	.incbin "data/graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Latios: ; 8D39E20
+gMonIcon_Latios: @ 8D39E20
 	.incbin "data/graphics/pokemon/icons/latios_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Latios: ; 8D3A220
+gMonFootprint_Latios: @ 8D3A220
 	.incbin "data/graphics/pokemon/footprints/latios_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Jirachi: ; 8D3A240
+gMonStillFrontPic_Jirachi: @ 8D3A240
 	.incbin "data/graphics/pokemon/still_front_pics/jirachi_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Jirachi: ; 8D3A54C
+gMonPalette_Jirachi: @ 8D3A54C
 	.incbin "data/graphics/pokemon/palettes/jirachi_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Jirachi: ; 8D3A574
+gMonBackPic_Jirachi: @ 8D3A574
 	.incbin "data/graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Jirachi: ; 8D3A914
+gMonShinyPalette_Jirachi: @ 8D3A914
 	.incbin "data/graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Jirachi: ; 8D3A93C
+gMonIcon_Jirachi: @ 8D3A93C
 	.incbin "data/graphics/pokemon/icons/jirachi_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Jirachi: ; 8D3AD3C
+gMonFootprint_Jirachi: @ 8D3AD3C
 	.incbin "data/graphics/pokemon/footprints/jirachi_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Deoxys: ; 8D3AD5C
+gMonStillFrontPic_Deoxys: @ 8D3AD5C
 	.incbin "data/graphics/pokemon/still_front_pics/deoxys_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Deoxys: ; 8D3B138
+gMonPalette_Deoxys: @ 8D3B138
 	.incbin "data/graphics/pokemon/palettes/deoxys_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Deoxys: ; 8D3B160
+gMonBackPic_Deoxys: @ 8D3B160
 	.incbin "data/graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Deoxys: ; 8D3B7D0
+gMonShinyPalette_Deoxys: @ 8D3B7D0
 	.incbin "data/graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Deoxys: ; 8D3B7F8
+gMonIcon_Deoxys: @ 8D3B7F8
 	.incbin "data/graphics/pokemon/icons/deoxys_icon.4bpp"
 
 	.incbin "base_emerald.gba", 0xd3bbf8, 0x8000
 
 	.align 2, 0
 
-gMonFootprint_Deoxys: ; 8D43BF8
+gMonFootprint_Deoxys: @ 8D43BF8
 	.incbin "data/graphics/pokemon/footprints/deoxys_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Chimecho: ; 8D43C18
+gMonStillFrontPic_Chimecho: @ 8D43C18
 	.incbin "data/graphics/pokemon/still_front_pics/chimecho_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Chimecho: ; 8D43E64
+gMonPalette_Chimecho: @ 8D43E64
 	.incbin "data/graphics/pokemon/palettes/chimecho_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonBackPic_Chimecho: ; 8D43E8C
+gMonBackPic_Chimecho: @ 8D43E8C
 	.incbin "data/graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonShinyPalette_Chimecho: ; 8D44100
+gMonShinyPalette_Chimecho: @ 8D44100
 	.incbin "data/graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonIcon_Chimecho: ; 8D44128
+gMonIcon_Chimecho: @ 8D44128
 	.incbin "data/graphics/pokemon/icons/chimecho_icon.4bpp"
 
 	.align 2, 0
 
-gMonFootprint_Chimecho: ; 8D44528
+gMonFootprint_Chimecho: @ 8D44528
 	.incbin "data/graphics/pokemon/footprints/chimecho_footprint.1bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_Egg: ; 8D44548
+gMonStillFrontPic_Egg: @ 8D44548
 	.incbin "data/graphics/pokemon/still_front_pics/egg_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonPalette_Egg: ; 8D446FC
+gMonPalette_Egg: @ 8D446FC
 	.incbin "data/graphics/pokemon/palettes/egg_palette.gbapal.lz"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownB: ; 8D4471C
+gMonStillFrontPic_UnownB: @ 8D4471C
 	.incbin "data/graphics/pokemon/still_front_pics/unown_b_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownB: ; 8D448F4
+gMonBackPic_UnownB: @ 8D448F4
 	.incbin "data/graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownB: ; 8D44AF8
+gMonIcon_UnownB: @ 8D44AF8
 	.incbin "data/graphics/pokemon/icons/unown_B_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownC: ; 8D44EF8
+gMonStillFrontPic_UnownC: @ 8D44EF8
 	.incbin "data/graphics/pokemon/still_front_pics/unown_c_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownC: ; 8D4510C
+gMonBackPic_UnownC: @ 8D4510C
 	.incbin "data/graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownC: ; 8D453B8
+gMonIcon_UnownC: @ 8D453B8
 	.incbin "data/graphics/pokemon/icons/unown_C_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownD: ; 8D457B8
+gMonStillFrontPic_UnownD: @ 8D457B8
 	.incbin "data/graphics/pokemon/still_front_pics/unown_d_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownD: ; 8D459B0
+gMonBackPic_UnownD: @ 8D459B0
 	.incbin "data/graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownD: ; 8D45C08
+gMonIcon_UnownD: @ 8D45C08
 	.incbin "data/graphics/pokemon/icons/unown_D_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownE: ; 8D46008
+gMonStillFrontPic_UnownE: @ 8D46008
 	.incbin "data/graphics/pokemon/still_front_pics/unown_e_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownE: ; 8D461C0
+gMonBackPic_UnownE: @ 8D461C0
 	.incbin "data/graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownE: ; 8D463C0
+gMonIcon_UnownE: @ 8D463C0
 	.incbin "data/graphics/pokemon/icons/unown_E_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownF: ; 8D467C0
+gMonStillFrontPic_UnownF: @ 8D467C0
 	.incbin "data/graphics/pokemon/still_front_pics/unown_f_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownF: ; 8D469B4
+gMonBackPic_UnownF: @ 8D469B4
 	.incbin "data/graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownF: ; 8D46BD0
+gMonIcon_UnownF: @ 8D46BD0
 	.incbin "data/graphics/pokemon/icons/unown_F_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownG: ; 8D46FD0
+gMonStillFrontPic_UnownG: @ 8D46FD0
 	.incbin "data/graphics/pokemon/still_front_pics/unown_g_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownG: ; 8D471AC
+gMonBackPic_UnownG: @ 8D471AC
 	.incbin "data/graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownG: ; 8D473F8
+gMonIcon_UnownG: @ 8D473F8
 	.incbin "data/graphics/pokemon/icons/unown_G_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownH: ; 8D477F8
+gMonStillFrontPic_UnownH: @ 8D477F8
 	.incbin "data/graphics/pokemon/still_front_pics/unown_h_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownH: ; 8D47A3C
+gMonBackPic_UnownH: @ 8D47A3C
 	.incbin "data/graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownH: ; 8D47D00
+gMonIcon_UnownH: @ 8D47D00
 	.incbin "data/graphics/pokemon/icons/unown_H_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownI: ; 8D48100
+gMonStillFrontPic_UnownI: @ 8D48100
 	.incbin "data/graphics/pokemon/still_front_pics/unown_i_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownI: ; 8D48298
+gMonBackPic_UnownI: @ 8D48298
 	.incbin "data/graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownI: ; 8D48440
+gMonIcon_UnownI: @ 8D48440
 	.incbin "data/graphics/pokemon/icons/unown_I_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownJ: ; 8D48840
+gMonStillFrontPic_UnownJ: @ 8D48840
 	.incbin "data/graphics/pokemon/still_front_pics/unown_j_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownJ: ; 8D48A04
+gMonBackPic_UnownJ: @ 8D48A04
 	.incbin "data/graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownJ: ; 8D48BEC
+gMonIcon_UnownJ: @ 8D48BEC
 	.incbin "data/graphics/pokemon/icons/unown_J_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownK: ; 8D48FEC
+gMonStillFrontPic_UnownK: @ 8D48FEC
 	.incbin "data/graphics/pokemon/still_front_pics/unown_k_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownK: ; 8D491BC
+gMonBackPic_UnownK: @ 8D491BC
 	.incbin "data/graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownK: ; 8D493B4
+gMonIcon_UnownK: @ 8D493B4
 	.incbin "data/graphics/pokemon/icons/unown_K_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownL: ; 8D497B4
+gMonStillFrontPic_UnownL: @ 8D497B4
 	.incbin "data/graphics/pokemon/still_front_pics/unown_l_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownL: ; 8D49964
+gMonBackPic_UnownL: @ 8D49964
 	.incbin "data/graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownL: ; 8D49B38
+gMonIcon_UnownL: @ 8D49B38
 	.incbin "data/graphics/pokemon/icons/unown_L_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownM: ; 8D49F38
+gMonStillFrontPic_UnownM: @ 8D49F38
 	.incbin "data/graphics/pokemon/still_front_pics/unown_m_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownM: ; 8D4A15C
+gMonBackPic_UnownM: @ 8D4A15C
 	.incbin "data/graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownM: ; 8D4A404
+gMonIcon_UnownM: @ 8D4A404
 	.incbin "data/graphics/pokemon/icons/unown_M_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownN: ; 8D4A804
+gMonStillFrontPic_UnownN: @ 8D4A804
 	.incbin "data/graphics/pokemon/still_front_pics/unown_n_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownN: ; 8D4A9FC
+gMonBackPic_UnownN: @ 8D4A9FC
 	.incbin "data/graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownN: ; 8D4AC68
+gMonIcon_UnownN: @ 8D4AC68
 	.incbin "data/graphics/pokemon/icons/unown_N_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownO: ; 8D4B068
+gMonStillFrontPic_UnownO: @ 8D4B068
 	.incbin "data/graphics/pokemon/still_front_pics/unown_o_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownO: ; 8D4B2A0
+gMonBackPic_UnownO: @ 8D4B2A0
 	.incbin "data/graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownO: ; 8D4B560
+gMonIcon_UnownO: @ 8D4B560
 	.incbin "data/graphics/pokemon/icons/unown_O_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownP: ; 8D4B960
+gMonStillFrontPic_UnownP: @ 8D4B960
 	.incbin "data/graphics/pokemon/still_front_pics/unown_p_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownP: ; 8D4BB00
+gMonBackPic_UnownP: @ 8D4BB00
 	.incbin "data/graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownP: ; 8D4BCC4
+gMonIcon_UnownP: @ 8D4BCC4
 	.incbin "data/graphics/pokemon/icons/unown_P_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownQ: ; 8D4C0C4
+gMonStillFrontPic_UnownQ: @ 8D4C0C4
 	.incbin "data/graphics/pokemon/still_front_pics/unown_q_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownQ: ; 8D4C278
+gMonBackPic_UnownQ: @ 8D4C278
 	.incbin "data/graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownQ: ; 8D4C444
+gMonIcon_UnownQ: @ 8D4C444
 	.incbin "data/graphics/pokemon/icons/unown_Q_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownR: ; 8D4C844
+gMonStillFrontPic_UnownR: @ 8D4C844
 	.incbin "data/graphics/pokemon/still_front_pics/unown_r_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownR: ; 8D4C9E8
+gMonBackPic_UnownR: @ 8D4C9E8
 	.incbin "data/graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownR: ; 8D4CBB0
+gMonIcon_UnownR: @ 8D4CBB0
 	.incbin "data/graphics/pokemon/icons/unown_R_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownS: ; 8D4CFB0
+gMonStillFrontPic_UnownS: @ 8D4CFB0
 	.incbin "data/graphics/pokemon/still_front_pics/unown_s_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownS: ; 8D4D198
+gMonBackPic_UnownS: @ 8D4D198
 	.incbin "data/graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownS: ; 8D4D3EC
+gMonIcon_UnownS: @ 8D4D3EC
 	.incbin "data/graphics/pokemon/icons/unown_S_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownT: ; 8D4D7EC
+gMonStillFrontPic_UnownT: @ 8D4D7EC
 	.incbin "data/graphics/pokemon/still_front_pics/unown_t_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownT: ; 8D4D99C
+gMonBackPic_UnownT: @ 8D4D99C
 	.incbin "data/graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownT: ; 8D4DB50
+gMonIcon_UnownT: @ 8D4DB50
 	.incbin "data/graphics/pokemon/icons/unown_T_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownU: ; 8D4DF50
+gMonStillFrontPic_UnownU: @ 8D4DF50
 	.incbin "data/graphics/pokemon/still_front_pics/unown_u_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownU: ; 8D4E168
+gMonBackPic_UnownU: @ 8D4E168
 	.incbin "data/graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownU: ; 8D4E3BC
+gMonIcon_UnownU: @ 8D4E3BC
 	.incbin "data/graphics/pokemon/icons/unown_U_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownV: ; 8D4E7BC
+gMonStillFrontPic_UnownV: @ 8D4E7BC
 	.incbin "data/graphics/pokemon/still_front_pics/unown_v_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownV: ; 8D4E9A0
+gMonBackPic_UnownV: @ 8D4E9A0
 	.incbin "data/graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownV: ; 8D4EBD0
+gMonIcon_UnownV: @ 8D4EBD0
 	.incbin "data/graphics/pokemon/icons/unown_V_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownW: ; 8D4EFD0
+gMonStillFrontPic_UnownW: @ 8D4EFD0
 	.incbin "data/graphics/pokemon/still_front_pics/unown_w_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownW: ; 8D4F1A4
+gMonBackPic_UnownW: @ 8D4F1A4
 	.incbin "data/graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownW: ; 8D4F3A8
+gMonIcon_UnownW: @ 8D4F3A8
 	.incbin "data/graphics/pokemon/icons/unown_W_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownX: ; 8D4F7A8
+gMonStillFrontPic_UnownX: @ 8D4F7A8
 	.incbin "data/graphics/pokemon/still_front_pics/unown_x_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownX: ; 8D4F96C
+gMonBackPic_UnownX: @ 8D4F96C
 	.incbin "data/graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownX: ; 8D4FB5C
+gMonIcon_UnownX: @ 8D4FB5C
 	.incbin "data/graphics/pokemon/icons/unown_X_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownY: ; 8D4FF5C
+gMonStillFrontPic_UnownY: @ 8D4FF5C
 	.incbin "data/graphics/pokemon/still_front_pics/unown_y_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownY: ; 8D50134
+gMonBackPic_UnownY: @ 8D50134
 	.incbin "data/graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownY: ; 8D50328
+gMonIcon_UnownY: @ 8D50328
 	.incbin "data/graphics/pokemon/icons/unown_Y_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownZ: ; 8D50728
+gMonStillFrontPic_UnownZ: @ 8D50728
 	.incbin "data/graphics/pokemon/still_front_pics/unown_z_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownZ: ; 8D508D8
+gMonBackPic_UnownZ: @ 8D508D8
 	.incbin "data/graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownZ: ; 8D50AB4
+gMonIcon_UnownZ: @ 8D50AB4
 	.incbin "data/graphics/pokemon/icons/unown_Z_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownExclamationMark: ; 8D50EB4
+gMonStillFrontPic_UnownExclamationMark: @ 8D50EB4
 	.incbin "data/graphics/pokemon/still_front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownExclamationMark: ; 8D51044
+gMonBackPic_UnownExclamationMark: @ 8D51044
 	.incbin "data/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownExclamationMark: ; 8D5120C
+gMonIcon_UnownExclamationMark: @ 8D5120C
 	.incbin "data/graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp"
 
 	.align 2, 0
 
-gMonStillFrontPic_UnownQuestionMark: ; 8D5160C
+gMonStillFrontPic_UnownQuestionMark: @ 8D5160C
 	.incbin "data/graphics/pokemon/still_front_pics/unown_question_mark_still_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonBackPic_UnownQuestionMark: ; 8D517C8
+gMonBackPic_UnownQuestionMark: @ 8D517C8
 	.incbin "data/graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz"
 
 	.align 2, 0
 
-gMonIcon_UnownQuestionMark: ; 8D519C8
+gMonIcon_UnownQuestionMark: @ 8D519C8
 	.incbin "data/graphics/pokemon/icons/unown_question_mark_icon.4bpp"
diff --git a/data/graphics/pokemon/mon_icon_palette_indices.s b/data/graphics/pokemon/mon_icon_palette_indices.s
index f714cf6d3..879a69b4b 100644
--- a/data/graphics/pokemon/mon_icon_palette_indices.s
+++ b/data/graphics/pokemon/mon_icon_palette_indices.s
@@ -1,443 +1,443 @@
 	.align 2, 0
 
-gMonIconPaletteIndices: ; 857C388
-	.byte 0 ; ??????????
-	.byte 1 ; Bulbasaur
-	.byte 1 ; Ivysaur
-	.byte 1 ; Venusaur
-	.byte 0 ; Charmander
-	.byte 0 ; Charmeleon
-	.byte 0 ; Charizard
-	.byte 0 ; Squirtle
-	.byte 2 ; Wartortle
-	.byte 2 ; Blastoise
-	.byte 1 ; Caterpie
-	.byte 1 ; Metapod
-	.byte 0 ; Butterfree
-	.byte 1 ; Weedle
-	.byte 2 ; Kakuna
-	.byte 2 ; Beedrill
-	.byte 0 ; Pidgey
-	.byte 0 ; Pidgeotto
-	.byte 0 ; Pidgeot
-	.byte 2 ; Rattata
-	.byte 1 ; Raticate
-	.byte 0 ; Spearow
-	.byte 0 ; Fearow
-	.byte 2 ; Ekans
-	.byte 2 ; Arbok
-	.byte 2 ; Pikachu
-	.byte 0 ; Raichu
-	.byte 2 ; Sandshrew
-	.byte 2 ; Sandslash
-	.byte 2 ; Nidoran♀
-	.byte 2 ; Nidorina
-	.byte 2 ; Nidoqueen
-	.byte 2 ; Nidoran♂
-	.byte 2 ; Nidorino
-	.byte 2 ; Nidoking
-	.byte 0 ; Clefairy
-	.byte 0 ; Clefable
-	.byte 2 ; Vulpix
-	.byte 1 ; Ninetales
-	.byte 0 ; Jigglypuff
-	.byte 0 ; Wigglytuff
-	.byte 2 ; Zubat
-	.byte 2 ; Golbat
-	.byte 1 ; Oddish
-	.byte 0 ; Gloom
-	.byte 0 ; Vileplume
-	.byte 0 ; Paras
-	.byte 0 ; Parasect
-	.byte 0 ; Venonat
-	.byte 2 ; Venomoth
-	.byte 2 ; Diglett
-	.byte 2 ; Dugtrio
-	.byte 1 ; Meowth
-	.byte 1 ; Persian
-	.byte 1 ; Psyduck
-	.byte 2 ; Golduck
-	.byte 1 ; Mankey
-	.byte 2 ; Primeape
-	.byte 0 ; Growlithe
-	.byte 0 ; Arcanine
-	.byte 0 ; Poliwag
-	.byte 0 ; Poliwhirl
-	.byte 0 ; Poliwrath
-	.byte 2 ; Abra
-	.byte 2 ; Kadabra
-	.byte 2 ; Alakazam
-	.byte 0 ; Machop
-	.byte 2 ; Machoke
-	.byte 0 ; Machamp
-	.byte 1 ; Bellsprout
-	.byte 1 ; Weepinbell
-	.byte 1 ; Victreebel
-	.byte 2 ; Tentacool
-	.byte 2 ; Tentacruel
-	.byte 1 ; Geodude
-	.byte 1 ; Graveler
-	.byte 1 ; Golem
-	.byte 0 ; Ponyta
-	.byte 0 ; Rapidash
-	.byte 0 ; Slowpoke
-	.byte 0 ; Slowbro
-	.byte 0 ; Magnemite
-	.byte 0 ; Magneton
-	.byte 1 ; Farfetch'd
-	.byte 2 ; Doduo
-	.byte 2 ; Dodrio
-	.byte 2 ; Seel
-	.byte 2 ; Dewgong
-	.byte 2 ; Grimer
-	.byte 2 ; Muk
-	.byte 2 ; Shellder
-	.byte 2 ; Cloyster
-	.byte 2 ; Gastly
-	.byte 2 ; Haunter
-	.byte 2 ; Gengar
-	.byte 2 ; Onix
-	.byte 2 ; Drowzee
-	.byte 1 ; Hypno
-	.byte 2 ; Krabby
-	.byte 2 ; Kingler
-	.byte 0 ; Voltorb
-	.byte 0 ; Electrode
-	.byte 0 ; Exeggcute
-	.byte 1 ; Exeggutor
-	.byte 1 ; Cubone
-	.byte 1 ; Marowak
-	.byte 2 ; Hitmonlee
-	.byte 2 ; Hitmonchan
-	.byte 1 ; Lickitung
-	.byte 2 ; Koffing
-	.byte 2 ; Weezing
-	.byte 1 ; Rhyhorn
-	.byte 1 ; Rhydon
-	.byte 0 ; Chansey
-	.byte 0 ; Tangela
-	.byte 1 ; Kangaskhan
-	.byte 0 ; Horsea
-	.byte 0 ; Seadra
-	.byte 0 ; Goldeen
-	.byte 0 ; Seaking
-	.byte 2 ; Staryu
-	.byte 2 ; Starmie
-	.byte 0 ; Mr. mime
-	.byte 1 ; Scyther
-	.byte 2 ; Jynx
-	.byte 1 ; Electabuzz
-	.byte 0 ; Magmar
-	.byte 2 ; Pinsir
-	.byte 2 ; Tauros
-	.byte 0 ; Magikarp
-	.byte 0 ; Gyarados
-	.byte 2 ; Lapras
-	.byte 2 ; Ditto
-	.byte 2 ; Eevee
-	.byte 0 ; Vaporeon
-	.byte 0 ; Jolteon
-	.byte 0 ; Flareon
-	.byte 0 ; Porygon
-	.byte 0 ; Omanyte
-	.byte 0 ; Omastar
-	.byte 2 ; Kabuto
-	.byte 2 ; Kabutops
-	.byte 0 ; Aerodactyl
-	.byte 1 ; Snorlax
-	.byte 0 ; Articuno
-	.byte 0 ; Zapdos
-	.byte 0 ; Moltres
-	.byte 0 ; Dratini
-	.byte 0 ; Dragonair
-	.byte 2 ; Dragonite
-	.byte 2 ; Mewtwo
-	.byte 0 ; Mew
-	.byte 1 ; Chikorita
-	.byte 1 ; Bayleef
-	.byte 1 ; Meganium
-	.byte 1 ; Cyndaquil
-	.byte 1 ; Quilava
-	.byte 1 ; Typhlosion
-	.byte 2 ; Totodile
-	.byte 2 ; Croconaw
-	.byte 2 ; Feraligatr
-	.byte 2 ; Sentret
-	.byte 2 ; Furret
-	.byte 2 ; Hoothoot
-	.byte 2 ; Noctowl
-	.byte 0 ; Ledyba
-	.byte 0 ; Ledian
-	.byte 1 ; Spinarak
-	.byte 0 ; Ariados
-	.byte 2 ; Crobat
-	.byte 2 ; Chinchou
-	.byte 0 ; Lanturn
-	.byte 0 ; Pichu
-	.byte 0 ; Cleffa
-	.byte 1 ; Igglybuff
-	.byte 2 ; Togepi
-	.byte 2 ; Togetic
-	.byte 0 ; Natu
-	.byte 0 ; Xatu
-	.byte 2 ; Mareep
-	.byte 0 ; Flaaffy
-	.byte 0 ; Ampharos
-	.byte 1 ; Bellossom
-	.byte 2 ; Marill
-	.byte 2 ; Azumarill
-	.byte 1 ; Sudowoodo
-	.byte 1 ; Politoed
-	.byte 1 ; Hoppip
-	.byte 1 ; Skiploom
-	.byte 2 ; Jumpluff
-	.byte 2 ; Aipom
-	.byte 1 ; Sunkern
-	.byte 1 ; Sunflora
-	.byte 1 ; Yanma
-	.byte 0 ; Wooper
-	.byte 0 ; Quagsire
-	.byte 2 ; Espeon
-	.byte 2 ; Umbreon
-	.byte 2 ; Murkrow
-	.byte 0 ; Slowking
-	.byte 0 ; Misdreavus
-	.byte 0 ; Unown A
-	.byte 0 ; Wobbuffet
-	.byte 1 ; Girafarig
-	.byte 0 ; Pineco
-	.byte 2 ; Forretress
-	.byte 2 ; Dunsparce
-	.byte 2 ; Gligar
-	.byte 0 ; Steelix
-	.byte 0 ; Snubbull
-	.byte 2 ; Granbull
-	.byte 0 ; Qwilfish
-	.byte 0 ; Scizor
-	.byte 1 ; Shuckle
-	.byte 2 ; Heracross
-	.byte 0 ; Sneasel
-	.byte 0 ; Teddiursa
-	.byte 2 ; Ursaring
-	.byte 0 ; Slugma
-	.byte 0 ; Magcargo
-	.byte 2 ; Swinub
-	.byte 2 ; Piloswine
-	.byte 0 ; Corsola
-	.byte 0 ; Remoraid
-	.byte 0 ; Octillery
-	.byte 0 ; Delibird
-	.byte 2 ; Mantine
-	.byte 0 ; Skarmory
-	.byte 0 ; Houndour
-	.byte 0 ; Houndoom
-	.byte 0 ; Kingdra
-	.byte 0 ; Phanpy
-	.byte 0 ; Donphan
-	.byte 0 ; Porygon2
-	.byte 2 ; Stantler
-	.byte 1 ; Smeargle
-	.byte 2 ; Tyrogue
-	.byte 2 ; Hitmontop
-	.byte 1 ; Smoochum
-	.byte 1 ; Elekid
-	.byte 1 ; Magby
-	.byte 1 ; Miltank
-	.byte 1 ; Blissey
-	.byte 0 ; Raikou
-	.byte 2 ; Entei
-	.byte 0 ; Suicune
-	.byte 1 ; Larvitar
-	.byte 0 ; Pupitar
-	.byte 1 ; Tyranitar
-	.byte 0 ; Lugia
-	.byte 1 ; Ho-Oh
-	.byte 1 ; Celebi
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 0 ; ?
-	.byte 1 ; Treecko
-	.byte 0 ; Grovyle
-	.byte 1 ; Sceptile
-	.byte 0 ; Torchic
-	.byte 0 ; Combusken
-	.byte 0 ; Blaziken
-	.byte 0 ; Mudkip
-	.byte 0 ; Marshtomp
-	.byte 0 ; Swampert
-	.byte 2 ; Poochyena
-	.byte 2 ; Mightyena
-	.byte 2 ; Zigzagoon
-	.byte 2 ; Linoone
-	.byte 0 ; Wurmple
-	.byte 2 ; Silcoon
-	.byte 0 ; Beautifly
-	.byte 2 ; Cascoon
-	.byte 1 ; Dustox
-	.byte 1 ; Lotad
-	.byte 1 ; Lombre
-	.byte 1 ; Ludicolo
-	.byte 1 ; Seedot
-	.byte 1 ; Nuzleaf
-	.byte 0 ; Shiftry
-	.byte 1 ; Nincada
-	.byte 1 ; Ninjask
-	.byte 1 ; Shedinja
-	.byte 2 ; Taillow
-	.byte 2 ; Swellow
-	.byte 1 ; Shroomish
-	.byte 1 ; Breloom
-	.byte 1 ; Spinda
-	.byte 0 ; Wingull
-	.byte 0 ; Pelipper
-	.byte 2 ; Surskit
-	.byte 0 ; Masquerain
-	.byte 2 ; Wailmer
-	.byte 0 ; Wailord
-	.byte 0 ; Skitty
-	.byte 2 ; Delcatty
-	.byte 1 ; Kecleon
-	.byte 1 ; Baltoy
-	.byte 0 ; Claydol
-	.byte 0 ; Nosepass
-	.byte 1 ; Torkoal
-	.byte 2 ; Sableye
-	.byte 0 ; Barboach
-	.byte 0 ; Whiscash
-	.byte 0 ; Luvdisc
-	.byte 0 ; Corphish
-	.byte 0 ; Crawdaunt
-	.byte 2 ; Feebas
-	.byte 0 ; Milotic
-	.byte 0 ; Carvanha
-	.byte 0 ; Sharpedo
-	.byte 1 ; Trapinch
-	.byte 1 ; Vibrava
-	.byte 1 ; Flygon
-	.byte 2 ; Makuhita
-	.byte 1 ; Hariyama
-	.byte 1 ; Electrike
-	.byte 0 ; Manectric
-	.byte 1 ; Numel
-	.byte 0 ; Camerupt
-	.byte 2 ; Spheal
-	.byte 2 ; Sealeo
-	.byte 0 ; Walrein
-	.byte 1 ; Cacnea
-	.byte 1 ; Cacturne
-	.byte 2 ; Snorunt
-	.byte 0 ; Glalie
-	.byte 1 ; Lunatone
-	.byte 0 ; Solrock
-	.byte 2 ; Azurill
-	.byte 0 ; Spoink
-	.byte 2 ; Grumpig
-	.byte 0 ; Plusle
-	.byte 0 ; Minun
-	.byte 2 ; Mawile
-	.byte 0 ; Meditite
-	.byte 0 ; Medicham
-	.byte 0 ; Swablu
-	.byte 0 ; Altaria
-	.byte 0 ; Wynaut
-	.byte 0 ; Duskull
-	.byte 0 ; Dusclops
-	.byte 0 ; Roselia
-	.byte 2 ; Slakoth
-	.byte 2 ; Vigoroth
-	.byte 1 ; Slaking
-	.byte 1 ; Gulpin
-	.byte 2 ; Swalot
-	.byte 1 ; Tropius
-	.byte 0 ; Whismur
-	.byte 2 ; Loudred
-	.byte 2 ; Exploud
-	.byte 0 ; Clamperl
-	.byte 0 ; Huntail
-	.byte 0 ; Gorebyss
-	.byte 0 ; Absol
-	.byte 0 ; Shuppet
-	.byte 0 ; Banette
-	.byte 2 ; Seviper
-	.byte 0 ; Zangoose
-	.byte 1 ; Relicanth
-	.byte 2 ; Aron
-	.byte 2 ; Lairon
-	.byte 2 ; Aggron
-	.byte 0 ; Castform
-	.byte 0 ; Volbeat
-	.byte 2 ; Illumise
-	.byte 2 ; Lileep
-	.byte 0 ; Cradily
-	.byte 0 ; Anorith
-	.byte 0 ; Armaldo
-	.byte 1 ; Ralts
-	.byte 1 ; Kirlia
-	.byte 1 ; Gardevoir
-	.byte 2 ; Bagon
-	.byte 2 ; Shelgon
-	.byte 0 ; Salamence
-	.byte 0 ; Beldum
-	.byte 0 ; Metang
-	.byte 0 ; Metagross
-	.byte 2 ; Regirock
-	.byte 2 ; Regice
-	.byte 2 ; Registeel
-	.byte 2 ; Kyogre
-	.byte 0 ; Groudon
-	.byte 1 ; Rayquaza
-	.byte 0 ; Latias
-	.byte 2 ; Latios
-	.byte 0 ; Jirachi
-	.byte 0 ; Deoxys
-	.byte 0 ; Chimecho
-	.byte 1 ; Egg
-	.byte 0 ; Unown B
-	.byte 0 ; Unown C
-	.byte 0 ; Unown D
-	.byte 0 ; Unown E
-	.byte 0 ; Unown F
-	.byte 0 ; Unown G
-	.byte 0 ; Unown H
-	.byte 0 ; Unown I
-	.byte 0 ; Unown J
-	.byte 0 ; Unown K
-	.byte 0 ; Unown L
-	.byte 0 ; Unown M
-	.byte 0 ; Unown N
-	.byte 0 ; Unown O
-	.byte 0 ; Unown P
-	.byte 0 ; Unown Q
-	.byte 0 ; Unown R
-	.byte 0 ; Unown S
-	.byte 0 ; Unown T
-	.byte 0 ; Unown U
-	.byte 0 ; Unown V
-	.byte 0 ; Unown W
-	.byte 0 ; Unown X
-	.byte 0 ; Unown Y
-	.byte 0 ; Unown Z
-	.byte 0 ; Unown Exclamation Mark
-	.byte 0 ; Unown Question Mark
+gMonIconPaletteIndices: @ 857C388
+	.byte 0 @ ??????????
+	.byte 1 @ Bulbasaur
+	.byte 1 @ Ivysaur
+	.byte 1 @ Venusaur
+	.byte 0 @ Charmander
+	.byte 0 @ Charmeleon
+	.byte 0 @ Charizard
+	.byte 0 @ Squirtle
+	.byte 2 @ Wartortle
+	.byte 2 @ Blastoise
+	.byte 1 @ Caterpie
+	.byte 1 @ Metapod
+	.byte 0 @ Butterfree
+	.byte 1 @ Weedle
+	.byte 2 @ Kakuna
+	.byte 2 @ Beedrill
+	.byte 0 @ Pidgey
+	.byte 0 @ Pidgeotto
+	.byte 0 @ Pidgeot
+	.byte 2 @ Rattata
+	.byte 1 @ Raticate
+	.byte 0 @ Spearow
+	.byte 0 @ Fearow
+	.byte 2 @ Ekans
+	.byte 2 @ Arbok
+	.byte 2 @ Pikachu
+	.byte 0 @ Raichu
+	.byte 2 @ Sandshrew
+	.byte 2 @ Sandslash
+	.byte 2 @ Nidoran♀
+	.byte 2 @ Nidorina
+	.byte 2 @ Nidoqueen
+	.byte 2 @ Nidoran♂
+	.byte 2 @ Nidorino
+	.byte 2 @ Nidoking
+	.byte 0 @ Clefairy
+	.byte 0 @ Clefable
+	.byte 2 @ Vulpix
+	.byte 1 @ Ninetales
+	.byte 0 @ Jigglypuff
+	.byte 0 @ Wigglytuff
+	.byte 2 @ Zubat
+	.byte 2 @ Golbat
+	.byte 1 @ Oddish
+	.byte 0 @ Gloom
+	.byte 0 @ Vileplume
+	.byte 0 @ Paras
+	.byte 0 @ Parasect
+	.byte 0 @ Venonat
+	.byte 2 @ Venomoth
+	.byte 2 @ Diglett
+	.byte 2 @ Dugtrio
+	.byte 1 @ Meowth
+	.byte 1 @ Persian
+	.byte 1 @ Psyduck
+	.byte 2 @ Golduck
+	.byte 1 @ Mankey
+	.byte 2 @ Primeape
+	.byte 0 @ Growlithe
+	.byte 0 @ Arcanine
+	.byte 0 @ Poliwag
+	.byte 0 @ Poliwhirl
+	.byte 0 @ Poliwrath
+	.byte 2 @ Abra
+	.byte 2 @ Kadabra
+	.byte 2 @ Alakazam
+	.byte 0 @ Machop
+	.byte 2 @ Machoke
+	.byte 0 @ Machamp
+	.byte 1 @ Bellsprout
+	.byte 1 @ Weepinbell
+	.byte 1 @ Victreebel
+	.byte 2 @ Tentacool
+	.byte 2 @ Tentacruel
+	.byte 1 @ Geodude
+	.byte 1 @ Graveler
+	.byte 1 @ Golem
+	.byte 0 @ Ponyta
+	.byte 0 @ Rapidash
+	.byte 0 @ Slowpoke
+	.byte 0 @ Slowbro
+	.byte 0 @ Magnemite
+	.byte 0 @ Magneton
+	.byte 1 @ Farfetch'd
+	.byte 2 @ Doduo
+	.byte 2 @ Dodrio
+	.byte 2 @ Seel
+	.byte 2 @ Dewgong
+	.byte 2 @ Grimer
+	.byte 2 @ Muk
+	.byte 2 @ Shellder
+	.byte 2 @ Cloyster
+	.byte 2 @ Gastly
+	.byte 2 @ Haunter
+	.byte 2 @ Gengar
+	.byte 2 @ Onix
+	.byte 2 @ Drowzee
+	.byte 1 @ Hypno
+	.byte 2 @ Krabby
+	.byte 2 @ Kingler
+	.byte 0 @ Voltorb
+	.byte 0 @ Electrode
+	.byte 0 @ Exeggcute
+	.byte 1 @ Exeggutor
+	.byte 1 @ Cubone
+	.byte 1 @ Marowak
+	.byte 2 @ Hitmonlee
+	.byte 2 @ Hitmonchan
+	.byte 1 @ Lickitung
+	.byte 2 @ Koffing
+	.byte 2 @ Weezing
+	.byte 1 @ Rhyhorn
+	.byte 1 @ Rhydon
+	.byte 0 @ Chansey
+	.byte 0 @ Tangela
+	.byte 1 @ Kangaskhan
+	.byte 0 @ Horsea
+	.byte 0 @ Seadra
+	.byte 0 @ Goldeen
+	.byte 0 @ Seaking
+	.byte 2 @ Staryu
+	.byte 2 @ Starmie
+	.byte 0 @ Mr. mime
+	.byte 1 @ Scyther
+	.byte 2 @ Jynx
+	.byte 1 @ Electabuzz
+	.byte 0 @ Magmar
+	.byte 2 @ Pinsir
+	.byte 2 @ Tauros
+	.byte 0 @ Magikarp
+	.byte 0 @ Gyarados
+	.byte 2 @ Lapras
+	.byte 2 @ Ditto
+	.byte 2 @ Eevee
+	.byte 0 @ Vaporeon
+	.byte 0 @ Jolteon
+	.byte 0 @ Flareon
+	.byte 0 @ Porygon
+	.byte 0 @ Omanyte
+	.byte 0 @ Omastar
+	.byte 2 @ Kabuto
+	.byte 2 @ Kabutops
+	.byte 0 @ Aerodactyl
+	.byte 1 @ Snorlax
+	.byte 0 @ Articuno
+	.byte 0 @ Zapdos
+	.byte 0 @ Moltres
+	.byte 0 @ Dratini
+	.byte 0 @ Dragonair
+	.byte 2 @ Dragonite
+	.byte 2 @ Mewtwo
+	.byte 0 @ Mew
+	.byte 1 @ Chikorita
+	.byte 1 @ Bayleef
+	.byte 1 @ Meganium
+	.byte 1 @ Cyndaquil
+	.byte 1 @ Quilava
+	.byte 1 @ Typhlosion
+	.byte 2 @ Totodile
+	.byte 2 @ Croconaw
+	.byte 2 @ Feraligatr
+	.byte 2 @ Sentret
+	.byte 2 @ Furret
+	.byte 2 @ Hoothoot
+	.byte 2 @ Noctowl
+	.byte 0 @ Ledyba
+	.byte 0 @ Ledian
+	.byte 1 @ Spinarak
+	.byte 0 @ Ariados
+	.byte 2 @ Crobat
+	.byte 2 @ Chinchou
+	.byte 0 @ Lanturn
+	.byte 0 @ Pichu
+	.byte 0 @ Cleffa
+	.byte 1 @ Igglybuff
+	.byte 2 @ Togepi
+	.byte 2 @ Togetic
+	.byte 0 @ Natu
+	.byte 0 @ Xatu
+	.byte 2 @ Mareep
+	.byte 0 @ Flaaffy
+	.byte 0 @ Ampharos
+	.byte 1 @ Bellossom
+	.byte 2 @ Marill
+	.byte 2 @ Azumarill
+	.byte 1 @ Sudowoodo
+	.byte 1 @ Politoed
+	.byte 1 @ Hoppip
+	.byte 1 @ Skiploom
+	.byte 2 @ Jumpluff
+	.byte 2 @ Aipom
+	.byte 1 @ Sunkern
+	.byte 1 @ Sunflora
+	.byte 1 @ Yanma
+	.byte 0 @ Wooper
+	.byte 0 @ Quagsire
+	.byte 2 @ Espeon
+	.byte 2 @ Umbreon
+	.byte 2 @ Murkrow
+	.byte 0 @ Slowking
+	.byte 0 @ Misdreavus
+	.byte 0 @ Unown A
+	.byte 0 @ Wobbuffet
+	.byte 1 @ Girafarig
+	.byte 0 @ Pineco
+	.byte 2 @ Forretress
+	.byte 2 @ Dunsparce
+	.byte 2 @ Gligar
+	.byte 0 @ Steelix
+	.byte 0 @ Snubbull
+	.byte 2 @ Granbull
+	.byte 0 @ Qwilfish
+	.byte 0 @ Scizor
+	.byte 1 @ Shuckle
+	.byte 2 @ Heracross
+	.byte 0 @ Sneasel
+	.byte 0 @ Teddiursa
+	.byte 2 @ Ursaring
+	.byte 0 @ Slugma
+	.byte 0 @ Magcargo
+	.byte 2 @ Swinub
+	.byte 2 @ Piloswine
+	.byte 0 @ Corsola
+	.byte 0 @ Remoraid
+	.byte 0 @ Octillery
+	.byte 0 @ Delibird
+	.byte 2 @ Mantine
+	.byte 0 @ Skarmory
+	.byte 0 @ Houndour
+	.byte 0 @ Houndoom
+	.byte 0 @ Kingdra
+	.byte 0 @ Phanpy
+	.byte 0 @ Donphan
+	.byte 0 @ Porygon2
+	.byte 2 @ Stantler
+	.byte 1 @ Smeargle
+	.byte 2 @ Tyrogue
+	.byte 2 @ Hitmontop
+	.byte 1 @ Smoochum
+	.byte 1 @ Elekid
+	.byte 1 @ Magby
+	.byte 1 @ Miltank
+	.byte 1 @ Blissey
+	.byte 0 @ Raikou
+	.byte 2 @ Entei
+	.byte 0 @ Suicune
+	.byte 1 @ Larvitar
+	.byte 0 @ Pupitar
+	.byte 1 @ Tyranitar
+	.byte 0 @ Lugia
+	.byte 1 @ Ho-Oh
+	.byte 1 @ Celebi
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 0 @ ?
+	.byte 1 @ Treecko
+	.byte 0 @ Grovyle
+	.byte 1 @ Sceptile
+	.byte 0 @ Torchic
+	.byte 0 @ Combusken
+	.byte 0 @ Blaziken
+	.byte 0 @ Mudkip
+	.byte 0 @ Marshtomp
+	.byte 0 @ Swampert
+	.byte 2 @ Poochyena
+	.byte 2 @ Mightyena
+	.byte 2 @ Zigzagoon
+	.byte 2 @ Linoone
+	.byte 0 @ Wurmple
+	.byte 2 @ Silcoon
+	.byte 0 @ Beautifly
+	.byte 2 @ Cascoon
+	.byte 1 @ Dustox
+	.byte 1 @ Lotad
+	.byte 1 @ Lombre
+	.byte 1 @ Ludicolo
+	.byte 1 @ Seedot
+	.byte 1 @ Nuzleaf
+	.byte 0 @ Shiftry
+	.byte 1 @ Nincada
+	.byte 1 @ Ninjask
+	.byte 1 @ Shedinja
+	.byte 2 @ Taillow
+	.byte 2 @ Swellow
+	.byte 1 @ Shroomish
+	.byte 1 @ Breloom
+	.byte 1 @ Spinda
+	.byte 0 @ Wingull
+	.byte 0 @ Pelipper
+	.byte 2 @ Surskit
+	.byte 0 @ Masquerain
+	.byte 2 @ Wailmer
+	.byte 0 @ Wailord
+	.byte 0 @ Skitty
+	.byte 2 @ Delcatty
+	.byte 1 @ Kecleon
+	.byte 1 @ Baltoy
+	.byte 0 @ Claydol
+	.byte 0 @ Nosepass
+	.byte 1 @ Torkoal
+	.byte 2 @ Sableye
+	.byte 0 @ Barboach
+	.byte 0 @ Whiscash
+	.byte 0 @ Luvdisc
+	.byte 0 @ Corphish
+	.byte 0 @ Crawdaunt
+	.byte 2 @ Feebas
+	.byte 0 @ Milotic
+	.byte 0 @ Carvanha
+	.byte 0 @ Sharpedo
+	.byte 1 @ Trapinch
+	.byte 1 @ Vibrava
+	.byte 1 @ Flygon
+	.byte 2 @ Makuhita
+	.byte 1 @ Hariyama
+	.byte 1 @ Electrike
+	.byte 0 @ Manectric
+	.byte 1 @ Numel
+	.byte 0 @ Camerupt
+	.byte 2 @ Spheal
+	.byte 2 @ Sealeo
+	.byte 0 @ Walrein
+	.byte 1 @ Cacnea
+	.byte 1 @ Cacturne
+	.byte 2 @ Snorunt
+	.byte 0 @ Glalie
+	.byte 1 @ Lunatone
+	.byte 0 @ Solrock
+	.byte 2 @ Azurill
+	.byte 0 @ Spoink
+	.byte 2 @ Grumpig
+	.byte 0 @ Plusle
+	.byte 0 @ Minun
+	.byte 2 @ Mawile
+	.byte 0 @ Meditite
+	.byte 0 @ Medicham
+	.byte 0 @ Swablu
+	.byte 0 @ Altaria
+	.byte 0 @ Wynaut
+	.byte 0 @ Duskull
+	.byte 0 @ Dusclops
+	.byte 0 @ Roselia
+	.byte 2 @ Slakoth
+	.byte 2 @ Vigoroth
+	.byte 1 @ Slaking
+	.byte 1 @ Gulpin
+	.byte 2 @ Swalot
+	.byte 1 @ Tropius
+	.byte 0 @ Whismur
+	.byte 2 @ Loudred
+	.byte 2 @ Exploud
+	.byte 0 @ Clamperl
+	.byte 0 @ Huntail
+	.byte 0 @ Gorebyss
+	.byte 0 @ Absol
+	.byte 0 @ Shuppet
+	.byte 0 @ Banette
+	.byte 2 @ Seviper
+	.byte 0 @ Zangoose
+	.byte 1 @ Relicanth
+	.byte 2 @ Aron
+	.byte 2 @ Lairon
+	.byte 2 @ Aggron
+	.byte 0 @ Castform
+	.byte 0 @ Volbeat
+	.byte 2 @ Illumise
+	.byte 2 @ Lileep
+	.byte 0 @ Cradily
+	.byte 0 @ Anorith
+	.byte 0 @ Armaldo
+	.byte 1 @ Ralts
+	.byte 1 @ Kirlia
+	.byte 1 @ Gardevoir
+	.byte 2 @ Bagon
+	.byte 2 @ Shelgon
+	.byte 0 @ Salamence
+	.byte 0 @ Beldum
+	.byte 0 @ Metang
+	.byte 0 @ Metagross
+	.byte 2 @ Regirock
+	.byte 2 @ Regice
+	.byte 2 @ Registeel
+	.byte 2 @ Kyogre
+	.byte 0 @ Groudon
+	.byte 1 @ Rayquaza
+	.byte 0 @ Latias
+	.byte 2 @ Latios
+	.byte 0 @ Jirachi
+	.byte 0 @ Deoxys
+	.byte 0 @ Chimecho
+	.byte 1 @ Egg
+	.byte 0 @ Unown B
+	.byte 0 @ Unown C
+	.byte 0 @ Unown D
+	.byte 0 @ Unown E
+	.byte 0 @ Unown F
+	.byte 0 @ Unown G
+	.byte 0 @ Unown H
+	.byte 0 @ Unown I
+	.byte 0 @ Unown J
+	.byte 0 @ Unown K
+	.byte 0 @ Unown L
+	.byte 0 @ Unown M
+	.byte 0 @ Unown N
+	.byte 0 @ Unown O
+	.byte 0 @ Unown P
+	.byte 0 @ Unown Q
+	.byte 0 @ Unown R
+	.byte 0 @ Unown S
+	.byte 0 @ Unown T
+	.byte 0 @ Unown U
+	.byte 0 @ Unown V
+	.byte 0 @ Unown W
+	.byte 0 @ Unown X
+	.byte 0 @ Unown Y
+	.byte 0 @ Unown Z
+	.byte 0 @ Unown Exclamation Mark
+	.byte 0 @ Unown Question Mark
diff --git a/data/graphics/pokemon/mon_icon_palette_table.s b/data/graphics/pokemon/mon_icon_palette_table.s
index 793f8af55..e53ef669e 100644
--- a/data/graphics/pokemon/mon_icon_palette_table.s
+++ b/data/graphics/pokemon/mon_icon_palette_table.s
@@ -1,12 +1,12 @@
 	.align 2, 0
 
-gMonIconPaletteTable: ; 857C540
+gMonIconPaletteTable: @ 857C540
 	obj_pal gMonIconPalettes + 0 * 32, 56000
 	obj_pal gMonIconPalettes + 1 * 32, 56001
 	obj_pal gMonIconPalettes + 2 * 32, 56002
 
-; These palettes are actually part of the title screen BG palette and are not
-; used for Pokémon icons.
+@ These palettes are actually part of the title screen BG palette and are not
+@ used for Pokémon icons.
 	obj_pal gMonIconPalettes + 3 * 32, 56003
 	obj_pal gMonIconPalettes + 4 * 32, 56004
 	obj_pal gMonIconPalettes + 5 * 32, 56005
diff --git a/data/graphics/pokemon/mon_icon_table.s b/data/graphics/pokemon/mon_icon_table.s
index ebf7dedd0..4428eeeb9 100644
--- a/data/graphics/pokemon/mon_icon_table.s
+++ b/data/graphics/pokemon/mon_icon_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonIconTable: ; 857BCA8
+gMonIconTable: @ 857BCA8
 	.4byte gMonIcon_Bulbasaur
 	.4byte gMonIcon_Bulbasaur
 	.4byte gMonIcon_Ivysaur
diff --git a/data/graphics/pokemon/mon_palette_table.s b/data/graphics/pokemon/mon_palette_table.s
index 2e7218e1b..b22f59e9b 100644
--- a/data/graphics/pokemon/mon_palette_table.s
+++ b/data/graphics/pokemon/mon_palette_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonPaletteTable: ; 8303678
+gMonPaletteTable: @ 8303678
 	obj_pal gMonPalette_CircledQuestionMark, 0
 	obj_pal gMonPalette_Bulbasaur, 1
 	obj_pal gMonPalette_Ivysaur, 2
diff --git a/data/graphics/pokemon/mon_shiny_palette_table.s b/data/graphics/pokemon/mon_shiny_palette_table.s
index 8d436b273..1f7d35b4e 100644
--- a/data/graphics/pokemon/mon_shiny_palette_table.s
+++ b/data/graphics/pokemon/mon_shiny_palette_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonShinyPaletteTable: ; 8304438
+gMonShinyPaletteTable: @ 8304438
 	obj_pal gMonShinyPalette_CircledQuestionMark, 500
 	obj_pal gMonShinyPalette_Bulbasaur, 501
 	obj_pal gMonShinyPalette_Ivysaur, 502
diff --git a/data/graphics/pokemon/mon_still_front_pic_table.s b/data/graphics/pokemon/mon_still_front_pic_table.s
index 67ff3cb69..40b081a1b 100644
--- a/data/graphics/pokemon/mon_still_front_pic_table.s
+++ b/data/graphics/pokemon/mon_still_front_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gMonStillFrontPicTable: ; 8301418
+gMonStillFrontPicTable: @ 8301418
 	obj_tiles gMonStillFrontPic_CircledQuestionMark, 0x800, 0
 	obj_tiles gMonStillFrontPic_Bulbasaur, 0x800, 1
 	obj_tiles gMonStillFrontPic_Ivysaur, 0x800, 2
diff --git a/data/graphics/tilesets/metatiles.s b/data/graphics/tilesets/metatiles.s
index d805a1d74..031f7ed0e 100644
--- a/data/graphics/tilesets/metatiles.s
+++ b/data/graphics/tilesets/metatiles.s
@@ -1,699 +1,699 @@
 	.align 1, 0
 
-gMetatiles_General: ; 83960F0
+gMetatiles_General: @ 83960F0
 	.incbin "base_emerald.gba", 0x3960f0, 0x2000
 
 	.align 1, 0
 
-gMetatileAttributes_General: ; 83980F0
+gMetatileAttributes_General: @ 83980F0
 	.incbin "base_emerald.gba", 0x3980f0, 0x400
 
 	.align 1, 0
 
-gMetatiles_Petalburg: ; 83984F0
+gMetatiles_Petalburg: @ 83984F0
 	.incbin "base_emerald.gba", 0x3984f0, 0x900
 
 	.align 1, 0
 
-gMetatileAttributes_Petalburg: ; 8398DF0
+gMetatileAttributes_Petalburg: @ 8398DF0
 	.incbin "base_emerald.gba", 0x398df0, 0x120
 
 	.align 1, 0
 
-gMetatiles_Rustboro: ; 8398F10
+gMetatiles_Rustboro: @ 8398F10
 	.incbin "base_emerald.gba", 0x398f10, 0x15e0
 
 	.align 1, 0
 
-gMetatileAttributes_Rustboro: ; 839A4F0
+gMetatileAttributes_Rustboro: @ 839A4F0
 	.incbin "base_emerald.gba", 0x39a4f0, 0x2bc
 
 	.align 1, 0
 
-gMetatiles_Dewford: ; 839A7AC
+gMetatiles_Dewford: @ 839A7AC
 	.incbin "base_emerald.gba", 0x39a7ac, 0x17b0
 
 	.align 1, 0
 
-gMetatileAttributes_Dewford: ; 839BF5C
+gMetatileAttributes_Dewford: @ 839BF5C
 	.incbin "base_emerald.gba", 0x39bf5c, 0x2f6
 
 	.align 1, 0
 
-gMetatiles_Slateport: ; 839C252
+gMetatiles_Slateport: @ 839C252
 	.incbin "base_emerald.gba", 0x39c252, 0x1960
 
 	.align 1, 0
 
-gMetatileAttributes_Slateport: ; 839DBB2
+gMetatileAttributes_Slateport: @ 839DBB2
 	.incbin "base_emerald.gba", 0x39dbb2, 0x32c
 
 	.align 1, 0
 
-gMetatiles_Mauville: ; 839DEDE
+gMetatiles_Mauville: @ 839DEDE
 	.incbin "base_emerald.gba", 0x39dede, 0x1fe0
 
 	.align 1, 0
 
-gMetatileAttributes_Mauville: ; 839FEBE
+gMetatileAttributes_Mauville: @ 839FEBE
 	.incbin "base_emerald.gba", 0x39febe, 0x3fc
 
 	.align 1, 0
 
-gMetatiles_Lavaridge: ; 83A02BA
+gMetatiles_Lavaridge: @ 83A02BA
 	.incbin "base_emerald.gba", 0x3a02ba, 0x1b90
 
 	.align 1, 0
 
-gMetatileAttributes_Lavaridge: ; 83A1E4A
+gMetatileAttributes_Lavaridge: @ 83A1E4A
 	.incbin "base_emerald.gba", 0x3a1e4a, 0x372
 
 	.align 1, 0
 
-gMetatiles_Fallarbor: ; 83A21BC
+gMetatiles_Fallarbor: @ 83A21BC
 	.incbin "base_emerald.gba", 0x3a21bc, 0x16f0
 
 	.align 1, 0
 
-gMetatileAttributes_Fallarbor: ; 83A38AC
+gMetatileAttributes_Fallarbor: @ 83A38AC
 	.incbin "base_emerald.gba", 0x3a38ac, 0x2de
 
 	.align 1, 0
 
-gMetatiles_Fortree: ; 83A3B8A
+gMetatiles_Fortree: @ 83A3B8A
 	.incbin "base_emerald.gba", 0x3a3b8a, 0x1180
 
 	.align 1, 0
 
-gMetatileAttributes_Fortree: ; 83A4D0A
+gMetatileAttributes_Fortree: @ 83A4D0A
 	.incbin "base_emerald.gba", 0x3a4d0a, 0x230
 
 	.align 1, 0
 
-gMetatiles_Lilycove: ; 83A4F3A
+gMetatiles_Lilycove: @ 83A4F3A
 	.incbin "base_emerald.gba", 0x3a4f3a, 0x15f0
 
 	.align 1, 0
 
-gMetatileAttributes_Lilycove: ; 83A652A
+gMetatileAttributes_Lilycove: @ 83A652A
 	.incbin "base_emerald.gba", 0x3a652a, 0x2be
 
 	.align 1, 0
 
-gMetatiles_Mossdeep: ; 83A67E8
+gMetatiles_Mossdeep: @ 83A67E8
 	.incbin "base_emerald.gba", 0x3a67e8, 0x1c60
 
 	.align 1, 0
 
-gMetatileAttributes_Mossdeep: ; 83A8448
+gMetatileAttributes_Mossdeep: @ 83A8448
 	.incbin "base_emerald.gba", 0x3a8448, 0x38c
 
 	.align 1, 0
 
-gMetatiles_EverGrande: ; 83A87D4
+gMetatiles_EverGrande: @ 83A87D4
 	.incbin "base_emerald.gba", 0x3a87d4, 0xa80
 
 	.align 1, 0
 
-gMetatileAttributes_EverGrande: ; 83A9254
+gMetatileAttributes_EverGrande: @ 83A9254
 	.incbin "base_emerald.gba", 0x3a9254, 0x150
 
 	.align 1, 0
 
-gMetatiles_Pacifidlog: ; 83A93A4
+gMetatiles_Pacifidlog: @ 83A93A4
 	.incbin "base_emerald.gba", 0x3a93a4, 0xcb0
 
 	.align 1, 0
 
-gMetatileAttributes_Pacifidlog: ; 83AA054
+gMetatileAttributes_Pacifidlog: @ 83AA054
 	.incbin "base_emerald.gba", 0x3aa054, 0x196
 
 	.align 1, 0
 
-gMetatiles_Sootopolis: ; 83AA1EA
+gMetatiles_Sootopolis: @ 83AA1EA
 	.incbin "base_emerald.gba", 0x3aa1ea, 0xfe0
 
 	.align 1, 0
 
-gMetatileAttributes_Sootopolis: ; 83AB1CA
+gMetatileAttributes_Sootopolis: @ 83AB1CA
 	.incbin "base_emerald.gba", 0x3ab1ca, 0x1fc
 
 	.align 1, 0
 
-gMetatiles_BattleFrontierOutsideWest: ; 83AB3C6
+gMetatiles_BattleFrontierOutsideWest: @ 83AB3C6
 	.incbin "base_emerald.gba", 0x3ab3c6, 0x1fe0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleFrontierOutsideWest: ; 83AD3A6
+gMetatileAttributes_BattleFrontierOutsideWest: @ 83AD3A6
 	.incbin "base_emerald.gba", 0x3ad3a6, 0x3fc
 
 	.align 1, 0
 
-gMetatiles_BattleFrontierOutsideEast: ; 83AD7A2
+gMetatiles_BattleFrontierOutsideEast: @ 83AD7A2
 	.incbin "base_emerald.gba", 0x3ad7a2, 0x1fe0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleFrontierOutsideEast: ; 83AF782
+gMetatileAttributes_BattleFrontierOutsideEast: @ 83AF782
 	.incbin "base_emerald.gba", 0x3af782, 0x3fc
 
 	.align 1, 0
 
-gMetatiles_InsideBuilding: ; 83AFB7E
+gMetatiles_InsideBuilding: @ 83AFB7E
 	.incbin "base_emerald.gba", 0x3afb7e, 0x80
 
 	.align 1, 0
 
-gMetatileAttributes_InsideBuilding: ; 83AFBFE
+gMetatileAttributes_InsideBuilding: @ 83AFBFE
 	.incbin "base_emerald.gba", 0x3afbfe, 0x10
 
 	.align 1, 0
 
-gMetatiles_Shop: ; 83AFC0E
+gMetatiles_Shop: @ 83AFC0E
 	.incbin "base_emerald.gba", 0x3afc0e, 0x1210
 
 	.align 1, 0
 
-gMetatileAttributes_Shop: ; 83B0E1E
+gMetatileAttributes_Shop: @ 83B0E1E
 	.incbin "base_emerald.gba", 0x3b0e1e, 0x242
 
 	.align 1, 0
 
-gMetatiles_PokemonCenter: ; 83B1060
+gMetatiles_PokemonCenter: @ 83B1060
 	.incbin "base_emerald.gba", 0x3b1060, 0xe80
 
 	.align 1, 0
 
-gMetatileAttributes_PokemonCenter: ; 83B1EE0
+gMetatileAttributes_PokemonCenter: @ 83B1EE0
 	.incbin "base_emerald.gba", 0x3b1ee0, 0x1d0
 
 	.align 1, 0
 
-gMetatiles_Cave: ; 83B20B0
+gMetatiles_Cave: @ 83B20B0
 	.incbin "base_emerald.gba", 0x3b20b0, 0x19e0
 
 	.align 1, 0
 
-gMetatileAttributes_Cave: ; 83B3A90
+gMetatileAttributes_Cave: @ 83B3A90
 	.incbin "base_emerald.gba", 0x3b3a90, 0x33c
 
 	.align 1, 0
 
-gMetatiles_PokemonSchool: ; 83B3DCC
+gMetatiles_PokemonSchool: @ 83B3DCC
 	.incbin "base_emerald.gba", 0x3b3dcc, 0x3a0
 
 	.align 1, 0
 
-gMetatileAttributes_PokemonSchool: ; 83B416C
+gMetatileAttributes_PokemonSchool: @ 83B416C
 	.incbin "base_emerald.gba", 0x3b416c, 0x74
 
 	.align 1, 0
 
-gMetatiles_PokemonFanClub: ; 83B41E0
+gMetatiles_PokemonFanClub: @ 83B41E0
 	.incbin "base_emerald.gba", 0x3b41e0, 0x680
 
 	.align 1, 0
 
-gMetatileAttributes_PokemonFanClub: ; 83B4860
+gMetatileAttributes_PokemonFanClub: @ 83B4860
 	.incbin "base_emerald.gba", 0x3b4860, 0xd0
 
 	.align 1, 0
 
-gMetatiles_Unused1: ; 83B4930
+gMetatiles_Unused1: @ 83B4930
 	.incbin "base_emerald.gba", 0x3b4930, 0x20
 
 	.align 1, 0
 
-gMetatileAttributes_Unused1: ; 83B4950
+gMetatileAttributes_Unused1: @ 83B4950
 	.incbin "base_emerald.gba", 0x3b4950, 0x4
 
 	.align 1, 0
 
-gMetatiles_MeteorFalls: ; 83B4954
+gMetatiles_MeteorFalls: @ 83B4954
 	.incbin "base_emerald.gba", 0x3b4954, 0x9f0
 
 	.align 1, 0
 
-gMetatileAttributes_MeteorFalls: ; 83B5344
+gMetatileAttributes_MeteorFalls: @ 83B5344
 	.incbin "base_emerald.gba", 0x3b5344, 0x13e
 
 	.align 1, 0
 
-gMetatiles_OceanicMuseum: ; 83B5482
+gMetatiles_OceanicMuseum: @ 83B5482
 	.incbin "base_emerald.gba", 0x3b5482, 0x7a0
 
 	.align 1, 0
 
-gMetatileAttributes_OceanicMuseum: ; 83B5C22
+gMetatileAttributes_OceanicMuseum: @ 83B5C22
 	.incbin "base_emerald.gba", 0x3b5c22, 0xf4
 
 	.align 1, 0
 
-gMetatiles_CableClub: ; 83B5D16
+gMetatiles_CableClub: @ 83B5D16
 	.incbin "base_emerald.gba", 0x3b5d16, 0x1000
 
 	.align 1, 0
 
-gMetatileAttributes_CableClub: ; 83B6D16
+gMetatileAttributes_CableClub: @ 83B6D16
 	.incbin "base_emerald.gba", 0x3b6d16, 0x200
 
 	.align 1, 0
 
-gMetatiles_SeashoreHouse: ; 83B6F16
+gMetatiles_SeashoreHouse: @ 83B6F16
 	.incbin "base_emerald.gba", 0x3b6f16, 0x380
 
 	.align 1, 0
 
-gMetatileAttributes_SeashoreHouse: ; 83B7296
+gMetatileAttributes_SeashoreHouse: @ 83B7296
 	.incbin "base_emerald.gba", 0x3b7296, 0x70
 
 	.align 1, 0
 
-gMetatiles_PrettyPetalFlowerShop: ; 83B7306
+gMetatiles_PrettyPetalFlowerShop: @ 83B7306
 	.incbin "base_emerald.gba", 0x3b7306, 0x480
 
 	.align 1, 0
 
-gMetatileAttributes_PrettyPetalFlowerShop: ; 83B7786
+gMetatileAttributes_PrettyPetalFlowerShop: @ 83B7786
 	.incbin "base_emerald.gba", 0x3b7786, 0x90
 
 	.align 1, 0
 
-gMetatiles_PokemonDayCare: ; 83B7816
+gMetatiles_PokemonDayCare: @ 83B7816
 	.incbin "base_emerald.gba", 0x3b7816, 0x440
 
 	.align 1, 0
 
-gMetatileAttributes_PokemonDayCare: ; 83B7C56
+gMetatileAttributes_PokemonDayCare: @ 83B7C56
 	.incbin "base_emerald.gba", 0x3b7c56, 0x88
 
 	.align 1, 0
 
-gMetatiles_Facility: ; 83B7CDE
+gMetatiles_Facility: @ 83B7CDE
 	.incbin "base_emerald.gba", 0x3b7cde, 0x1ff0
 
 	.align 1, 0
 
-gMetatileAttributes_Facility: ; 83B9CCE
+gMetatileAttributes_Facility: @ 83B9CCE
 	.incbin "base_emerald.gba", 0x3b9cce, 0x3fe
 
 	.align 1, 0
 
-gMetatiles_BikeShop: ; 83BA0CC
+gMetatiles_BikeShop: @ 83BA0CC
 	.incbin "base_emerald.gba", 0x3ba0cc, 0xf80
 
 	.align 1, 0
 
-gMetatileAttributes_BikeShop: ; 83BB04C
+gMetatileAttributes_BikeShop: @ 83BB04C
 	.incbin "base_emerald.gba", 0x3bb04c, 0x1f0
 
 	.align 1, 0
 
-gMetatiles_RusturfTunnel: ; 83BB23C
+gMetatiles_RusturfTunnel: @ 83BB23C
 	.incbin "base_emerald.gba", 0x3bb23c, 0x530
 
 	.align 1, 0
 
-gMetatileAttributes_RusturfTunnel: ; 83BB76C
+gMetatileAttributes_RusturfTunnel: @ 83BB76C
 	.incbin "base_emerald.gba", 0x3bb76c, 0xa6
 
 	.align 1, 0
 
-gMetatiles_SecretBaseSecondary: ; 83BB812
+gMetatiles_SecretBaseSecondary: @ 83BB812
 	.incbin "base_emerald.gba", 0x3bb812, 0x1440
 
 	.align 1, 0
 
-gMetatileAttributes_SecretBaseSecondary: ; 83BCC52
+gMetatileAttributes_SecretBaseSecondary: @ 83BCC52
 	.incbin "base_emerald.gba", 0x3bcc52, 0x288
 
 	.align 1, 0
 
-gMetatiles_InsideOfTruck: ; 83BCEDA
+gMetatiles_InsideOfTruck: @ 83BCEDA
 	.incbin "base_emerald.gba", 0x3bceda, 0x260
 
 	.align 1, 0
 
-gMetatileAttributes_InsideOfTruck: ; 83BD13A
+gMetatileAttributes_InsideOfTruck: @ 83BD13A
 	.incbin "base_emerald.gba", 0x3bd13a, 0x4c
 
 	.align 1, 0
 
-gMetatiles_Contest: ; 83BD186
+gMetatiles_Contest: @ 83BD186
 	.incbin "base_emerald.gba", 0x3bd186, 0xe90
 
 	.align 1, 0
 
-gMetatileAttributes_Contest: ; 83BE016
+gMetatileAttributes_Contest: @ 83BE016
 	.incbin "base_emerald.gba", 0x3be016, 0x1d2
 
 	.align 1, 0
 
-gMetatiles_LilycoveMuseum: ; 83BE1E8
+gMetatiles_LilycoveMuseum: @ 83BE1E8
 	.incbin "base_emerald.gba", 0x3be1e8, 0x8f0
 
 	.align 1, 0
 
-gMetatileAttributes_LilycoveMuseum: ; 83BEAD8
+gMetatileAttributes_LilycoveMuseum: @ 83BEAD8
 	.incbin "base_emerald.gba", 0x3bead8, 0x11e
 
 	.align 1, 0
 
-gMetatiles_BrendansMaysHouse: ; 83BEBF6
+gMetatiles_BrendansMaysHouse: @ 83BEBF6
 	.incbin "base_emerald.gba", 0x3bebf6, 0xc40
 
 	.align 1, 0
 
-gMetatileAttributes_BrendansMaysHouse: ; 83BF836
+gMetatileAttributes_BrendansMaysHouse: @ 83BF836
 	.incbin "base_emerald.gba", 0x3bf836, 0x188
 
 	.align 1, 0
 
-gMetatiles_Lab: ; 83BF9BE
+gMetatiles_Lab: @ 83BF9BE
 	.incbin "base_emerald.gba", 0x3bf9be, 0x9e0
 
 	.align 1, 0
 
-gMetatileAttributes_Lab: ; 83C039E
+gMetatileAttributes_Lab: @ 83C039E
 	.incbin "base_emerald.gba", 0x3c039e, 0x13c
 
 	.align 1, 0
 
-gMetatiles_Underwater: ; 83C04DA
+gMetatiles_Underwater: @ 83C04DA
 	.incbin "base_emerald.gba", 0x3c04da, 0xec0
 
 	.align 1, 0
 
-gMetatileAttributes_Underwater: ; 83C139A
+gMetatileAttributes_Underwater: @ 83C139A
 	.incbin "base_emerald.gba", 0x3c139a, 0x1d8
 
 	.align 1, 0
 
-gMetatiles_GenericBuilding: ; 83C1572
+gMetatiles_GenericBuilding: @ 83C1572
 	.incbin "base_emerald.gba", 0x3c1572, 0x2000
 
 	.align 1, 0
 
-gMetatileAttributes_GenericBuilding: ; 83C3572
+gMetatileAttributes_GenericBuilding: @ 83C3572
 	.incbin "base_emerald.gba", 0x3c3572, 0x400
 
 	.align 1, 0
 
-gMetatiles_MauvilleGameCorner: ; 83C3972
+gMetatiles_MauvilleGameCorner: @ 83C3972
 	.incbin "base_emerald.gba", 0x3c3972, 0x600
 
 	.align 1, 0
 
-gMetatileAttributes_MauvilleGameCorner: ; 83C3F72
+gMetatileAttributes_MauvilleGameCorner: @ 83C3F72
 	.incbin "base_emerald.gba", 0x3c3f72, 0xc0
 
 	.align 1, 0
 
-gMetatiles_Unused2: ; 83C4032
+gMetatiles_Unused2: @ 83C4032
 	.incbin "base_emerald.gba", 0x3c4032, 0x3a0
 
 	.align 1, 0
 
-gMetatileAttributes_Unused2: ; 83C43D2
+gMetatileAttributes_Unused2: @ 83C43D2
 	.incbin "base_emerald.gba", 0x3c43d2, 0x74
 
 	.align 1, 0
 
-gMetatiles_RustboroGym: ; 83C4446
+gMetatiles_RustboroGym: @ 83C4446
 	.incbin "base_emerald.gba", 0x3c4446, 0x380
 
 	.align 1, 0
 
-gMetatileAttributes_RustboroGym: ; 83C47C6
+gMetatileAttributes_RustboroGym: @ 83C47C6
 	.incbin "base_emerald.gba", 0x3c47c6, 0x70
 
 	.align 1, 0
 
-gMetatiles_DewfordGym: ; 83C4836
+gMetatiles_DewfordGym: @ 83C4836
 	.incbin "base_emerald.gba", 0x3c4836, 0x450
 
 	.align 1, 0
 
-gMetatileAttributes_DewfordGym: ; 83C4C86
+gMetatileAttributes_DewfordGym: @ 83C4C86
 	.incbin "base_emerald.gba", 0x3c4c86, 0x8a
 
 	.align 1, 0
 
-gMetatiles_MauvilleGym: ; 83C4D10
+gMetatiles_MauvilleGym: @ 83C4D10
 	.incbin "base_emerald.gba", 0x3c4d10, 0x750
 
 	.align 1, 0
 
-gMetatileAttributes_MauvilleGym: ; 83C5460
+gMetatileAttributes_MauvilleGym: @ 83C5460
 	.incbin "base_emerald.gba", 0x3c5460, 0xea
 
 	.align 1, 0
 
-gMetatiles_LavaridgeGym: ; 83C554A
+gMetatiles_LavaridgeGym: @ 83C554A
 	.incbin "base_emerald.gba", 0x3c554a, 0x3d0
 
 	.align 1, 0
 
-gMetatileAttributes_LavaridgeGym: ; 83C591A
+gMetatileAttributes_LavaridgeGym: @ 83C591A
 	.incbin "base_emerald.gba", 0x3c591a, 0x7a
 
 	.align 1, 0
 
-gMetatiles_PetalburgGym: ; 83C5994
+gMetatiles_PetalburgGym: @ 83C5994
 	.incbin "base_emerald.gba", 0x3c5994, 0xe00
 
 	.align 1, 0
 
-gMetatileAttributes_PetalburgGym: ; 83C6794
+gMetatileAttributes_PetalburgGym: @ 83C6794
 	.incbin "base_emerald.gba", 0x3c6794, 0x1c0
 
 	.align 1, 0
 
-gMetatiles_FortreeGym: ; 83C6954
+gMetatiles_FortreeGym: @ 83C6954
 	.incbin "base_emerald.gba", 0x3c6954, 0x500
 
 	.align 1, 0
 
-gMetatileAttributes_FortreeGym: ; 83C6E54
+gMetatileAttributes_FortreeGym: @ 83C6E54
 	.incbin "base_emerald.gba", 0x3c6e54, 0xa0
 
 	.align 1, 0
 
-gMetatiles_MossdeepGym: ; 83C6EF4
+gMetatiles_MossdeepGym: @ 83C6EF4
 	.incbin "base_emerald.gba", 0x3c6ef4, 0x750
 
 	.align 1, 0
 
-gMetatileAttributes_MossdeepGym: ; 83C7644
+gMetatileAttributes_MossdeepGym: @ 83C7644
 	.incbin "base_emerald.gba", 0x3c7644, 0xea
 
 	.align 1, 0
 
-gMetatiles_SootopolisGym: ; 83C772E
+gMetatiles_SootopolisGym: @ 83C772E
 	.incbin "base_emerald.gba", 0x3c772e, 0x7a0
 
 	.align 1, 0
 
-gMetatileAttributes_SootopolisGym: ; 83C7ECE
+gMetatileAttributes_SootopolisGym: @ 83C7ECE
 	.incbin "base_emerald.gba", 0x3c7ece, 0xf4
 
 	.align 1, 0
 
-gMetatiles_TrickHousePuzzle: ; 83C7FC2
+gMetatiles_TrickHousePuzzle: @ 83C7FC2
 	.incbin "base_emerald.gba", 0x3c7fc2, 0xbd0
 
 	.align 1, 0
 
-gMetatileAttributes_TrickHousePuzzle: ; 83C8B92
+gMetatileAttributes_TrickHousePuzzle: @ 83C8B92
 	.incbin "base_emerald.gba", 0x3c8b92, 0x17a
 
 	.align 1, 0
 
-gMetatiles_InsideShip: ; 83C8D0C
+gMetatiles_InsideShip: @ 83C8D0C
 	.incbin "base_emerald.gba", 0x3c8d0c, 0xfc0
 
 	.align 1, 0
 
-gMetatileAttributes_InsideShip: ; 83C9CCC
+gMetatileAttributes_InsideShip: @ 83C9CCC
 	.incbin "base_emerald.gba", 0x3c9ccc, 0x1f8
 
 	.align 1, 0
 
-gMetatiles_SecretBasePrimary: ; 83C9EC4
+gMetatiles_SecretBasePrimary: @ 83C9EC4
 	.incbin "base_emerald.gba", 0x3c9ec4, 0x20
 
 	.align 1, 0
 
-gMetatileAttributes_SecretBasePrimary: ; 83C9EE4
+gMetatileAttributes_SecretBasePrimary: @ 83C9EE4
 	.incbin "base_emerald.gba", 0x3c9ee4, 0x4
 
 	.align 1, 0
 
-gMetatiles_EliteFour: ; 83C9EE8
+gMetatiles_EliteFour: @ 83C9EE8
 	.incbin "base_emerald.gba", 0x3c9ee8, 0x14c0
 
 	.align 1, 0
 
-gMetatileAttributes_EliteFour: ; 83CB3A8
+gMetatileAttributes_EliteFour: @ 83CB3A8
 	.incbin "base_emerald.gba", 0x3cb3a8, 0x298
 
 	.align 1, 0
 
-gMetatiles_BattleFrontier: ; 83CB640
+gMetatiles_BattleFrontier: @ 83CB640
 	.incbin "base_emerald.gba", 0x3cb640, 0x1fd0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleFrontier: ; 83CD610
+gMetatileAttributes_BattleFrontier: @ 83CD610
 	.incbin "base_emerald.gba", 0x3cd610, 0x3fa
 
 	.align 1, 0
 
-gMetatiles_BattlePalace: ; 83CDA0A
+gMetatiles_BattlePalace: @ 83CDA0A
 	.incbin "base_emerald.gba", 0x3cda0a, 0xae0
 
 	.align 1, 0
 
-gMetatileAttributes_BattlePalace: ; 83CE4EA
+gMetatileAttributes_BattlePalace: @ 83CE4EA
 	.incbin "base_emerald.gba", 0x3ce4ea, 0x15c
 
 	.align 1, 0
 
-gMetatiles_BattleDome: ; 83CE646
+gMetatiles_BattleDome: @ 83CE646
 	.incbin "base_emerald.gba", 0x3ce646, 0x1ab0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleDome: ; 83D00F6
+gMetatileAttributes_BattleDome: @ 83D00F6
 	.incbin "base_emerald.gba", 0x3d00f6, 0x356
 
 	.align 1, 0
 
-gMetatiles_BattleFactory: ; 83D044C
+gMetatiles_BattleFactory: @ 83D044C
 	.incbin "base_emerald.gba", 0x3d044c, 0x1620
 
 	.align 1, 0
 
-gMetatileAttributes_BattleFactory: ; 83D1A6C
+gMetatileAttributes_BattleFactory: @ 83D1A6C
 	.incbin "base_emerald.gba", 0x3d1a6c, 0x2c4
 
 	.align 1, 0
 
-gMetatiles_BattlePike: ; 83D1D30
+gMetatiles_BattlePike: @ 83D1D30
 	.incbin "base_emerald.gba", 0x3d1d30, 0x15b0
 
 	.align 1, 0
 
-gMetatileAttributes_BattlePike: ; 83D32E0
+gMetatileAttributes_BattlePike: @ 83D32E0
 	.incbin "base_emerald.gba", 0x3d32e0, 0x2b6
 
 	.align 1, 0
 
-gMetatiles_BattleArena: ; 83D3596
+gMetatiles_BattleArena: @ 83D3596
 	.incbin "base_emerald.gba", 0x3d3596, 0xb10
 
 	.align 1, 0
 
-gMetatileAttributes_BattleArena: ; 83D40A6
+gMetatileAttributes_BattleArena: @ 83D40A6
 	.incbin "base_emerald.gba", 0x3d40a6, 0x162
 
 	.align 1, 0
 
-gMetatiles_BattlePyramid: ; 83D4208
+gMetatiles_BattlePyramid: @ 83D4208
 	.incbin "base_emerald.gba", 0x3d4208, 0xdd0
 
 	.align 1, 0
 
-gMetatileAttributes_BattlePyramid: ; 83D4FD8
+gMetatileAttributes_BattlePyramid: @ 83D4FD8
 	.incbin "base_emerald.gba", 0x3d4fd8, 0x1ba
 
 	.align 1, 0
 
-gMetatiles_MirageTower: ; 83D5192
+gMetatiles_MirageTower: @ 83D5192
 	.incbin "base_emerald.gba", 0x3d5192, 0x19e0
 
 	.align 1, 0
 
-gMetatileAttributes_MirageTower: ; 83D6B72
+gMetatileAttributes_MirageTower: @ 83D6B72
 	.incbin "base_emerald.gba", 0x3d6b72, 0x33c
 
 	.align 1, 0
 
-gMetatiles_MossdeepGameCorner: ; 83D6EAE
+gMetatiles_MossdeepGameCorner: @ 83D6EAE
 	.incbin "base_emerald.gba", 0x3d6eae, 0x350
 
 	.align 1, 0
 
-gMetatileAttributes_MossdeepGameCorner: ; 83D71FE
+gMetatileAttributes_MossdeepGameCorner: @ 83D71FE
 	.incbin "base_emerald.gba", 0x3d71fe, 0x6a
 
 	.align 1, 0
 
-gMetatiles_IslandHarbor: ; 83D7268
+gMetatiles_IslandHarbor: @ 83D7268
 	.incbin "base_emerald.gba", 0x3d7268, 0x1d60
 
 	.align 1, 0
 
-gMetatileAttributes_IslandHarbor: ; 83D8FC8
+gMetatileAttributes_IslandHarbor: @ 83D8FC8
 	.incbin "base_emerald.gba", 0x3d8fc8, 0x3ac
 
 	.align 1, 0
 
-gMetatiles_TrainerHill: ; 83D9374
+gMetatiles_TrainerHill: @ 83D9374
 	.incbin "base_emerald.gba", 0x3d9374, 0x1e60
 
 	.align 1, 0
 
-gMetatileAttributes_TrainerHill: ; 83DB1D4
+gMetatileAttributes_TrainerHill: @ 83DB1D4
 	.incbin "base_emerald.gba", 0x3db1d4, 0x3cc
 
 	.align 1, 0
 
-gMetatiles_NavelRock: ; 83DB5A0
+gMetatiles_NavelRock: @ 83DB5A0
 	.incbin "base_emerald.gba", 0x3db5a0, 0x1c30
 
 	.align 1, 0
 
-gMetatileAttributes_NavelRock: ; 83DD1D0
+gMetatileAttributes_NavelRock: @ 83DD1D0
 	.incbin "base_emerald.gba", 0x3dd1d0, 0x386
 
 	.align 1, 0
 
-gMetatiles_BattleFrontierRankingHall: ; 83DD556
+gMetatiles_BattleFrontierRankingHall: @ 83DD556
 	.incbin "base_emerald.gba", 0x3dd556, 0x5e0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleFrontierRankingHall: ; 83DDB36
+gMetatileAttributes_BattleFrontierRankingHall: @ 83DDB36
 	.incbin "base_emerald.gba", 0x3ddb36, 0xbc
 
 	.align 1, 0
 
-gMetatiles_BattleTent: ; 83DDBF2
+gMetatiles_BattleTent: @ 83DDBF2
 	.incbin "base_emerald.gba", 0x3ddbf2, 0x10d0
 
 	.align 1, 0
 
-gMetatileAttributes_BattleTent: ; 83DECC2
+gMetatileAttributes_BattleTent: @ 83DECC2
 	.incbin "base_emerald.gba", 0x3decc2, 0x21a
 
 	.align 1, 0
 
-gMetatiles_MysteryEventsHouse: ; 83DEEDC
+gMetatiles_MysteryEventsHouse: @ 83DEEDC
 	.incbin "base_emerald.gba", 0x3deedc, 0x430
 
 	.align 1, 0
 
-gMetatileAttributes_MysteryEventsHouse: ; 83DF30C
+gMetatileAttributes_MysteryEventsHouse: @ 83DF30C
 	.incbin "base_emerald.gba", 0x3df30c, 0x86
 
 	.align 1, 0
 
-gMetatiles_UnionRoom: ; 83DF392
+gMetatiles_UnionRoom: @ 83DF392
 	.incbin "base_emerald.gba", 0x3df392, 0x310
 
 	.align 1, 0
 
-gMetatileAttributes_UnionRoom: ; 83DF6A2
+gMetatileAttributes_UnionRoom: @ 83DF6A2
 	.incbin "base_emerald.gba", 0x3df6a2, 0x62
diff --git a/data/graphics/tilesets/tileset_graphics.s b/data/graphics/tilesets/tileset_graphics.s
index 9306f4f61..94ce528de 100644
--- a/data/graphics/tilesets/tileset_graphics.s
+++ b/data/graphics/tilesets/tileset_graphics.s
@@ -1,11 +1,11 @@
 	.align 2, 0
 
-gTilesetTiles_Petalburg: ; 8339E08
+gTilesetTiles_Petalburg: @ 8339E08
 	.incbin "data/graphics/tilesets/secondary/petalburg/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Petalburg: ; 833A704
+gTilesetPalettes_Petalburg: @ 833A704
 	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/petalburg/palettes/02.gbapal"
@@ -25,12 +25,12 @@ gTilesetPalettes_Petalburg: ; 833A704
 
 	.align 2, 0
 
-gTilesetTiles_Rustboro: ; 833A904
+gTilesetTiles_Rustboro: @ 833A904
 	.incbin "data/graphics/tilesets/secondary/rustboro/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Rustboro: ; 833BEC0
+gTilesetPalettes_Rustboro: @ 833BEC0
 	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rustboro/palettes/02.gbapal"
@@ -50,12 +50,12 @@ gTilesetPalettes_Rustboro: ; 833BEC0
 
 	.align 2, 0
 
-gTilesetTiles_Dewford: ; 833C0C0
+gTilesetTiles_Dewford: @ 833C0C0
 	.incbin "data/graphics/tilesets/secondary/dewford/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Dewford: ; 833D540
+gTilesetPalettes_Dewford: @ 833D540
 	.incbin "data/graphics/tilesets/secondary/dewford/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/dewford/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/dewford/palettes/02.gbapal"
@@ -75,12 +75,12 @@ gTilesetPalettes_Dewford: ; 833D540
 
 	.align 2, 0
 
-gTilesetTiles_Slateport: ; 833D740
+gTilesetTiles_Slateport: @ 833D740
 	.incbin "data/graphics/tilesets/secondary/slateport/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Slateport: ; 833F708
+gTilesetPalettes_Slateport: @ 833F708
 	.incbin "data/graphics/tilesets/secondary/slateport/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/slateport/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/slateport/palettes/02.gbapal"
@@ -100,12 +100,12 @@ gTilesetPalettes_Slateport: ; 833F708
 
 	.align 2, 0
 
-gTilesetTiles_Mauville: ; 833F908
+gTilesetTiles_Mauville: @ 833F908
 	.incbin "data/graphics/tilesets/secondary/mauville/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Mauville: ; 834172C
+gTilesetPalettes_Mauville: @ 834172C
 	.incbin "data/graphics/tilesets/secondary/mauville/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville/palettes/02.gbapal"
@@ -125,12 +125,12 @@ gTilesetPalettes_Mauville: ; 834172C
 
 	.align 2, 0
 
-gTilesetTiles_Lavaridge: ; 834192C
+gTilesetTiles_Lavaridge: @ 834192C
 	.incbin "data/graphics/tilesets/secondary/lavaridge/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Lavaridge: ; 8342E28
+gTilesetPalettes_Lavaridge: @ 8342E28
 	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/02.gbapal"
@@ -150,12 +150,12 @@ gTilesetPalettes_Lavaridge: ; 8342E28
 
 	.align 2, 0
 
-gTilesetTiles_Fallarbor: ; 8343028
+gTilesetTiles_Fallarbor: @ 8343028
 	.incbin "data/graphics/tilesets/secondary/fallarbor/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Fallarbor: ; 83447A0
+gTilesetPalettes_Fallarbor: @ 83447A0
 	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/02.gbapal"
@@ -175,12 +175,12 @@ gTilesetPalettes_Fallarbor: ; 83447A0
 
 	.align 2, 0
 
-gTilesetTiles_Fortree: ; 83449A0
+gTilesetTiles_Fortree: @ 83449A0
 	.incbin "data/graphics/tilesets/secondary/fortree/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Fortree: ; 8346020
+gTilesetPalettes_Fortree: @ 8346020
 	.incbin "data/graphics/tilesets/secondary/fortree/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fortree/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fortree/palettes/02.gbapal"
@@ -200,12 +200,12 @@ gTilesetPalettes_Fortree: ; 8346020
 
 	.align 2, 0
 
-gTilesetTiles_Lilycove: ; 8346220
+gTilesetTiles_Lilycove: @ 8346220
 	.incbin "data/graphics/tilesets/secondary/lilycove/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Lilycove: ; 83475C0
+gTilesetPalettes_Lilycove: @ 83475C0
 	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lilycove/palettes/02.gbapal"
@@ -225,12 +225,12 @@ gTilesetPalettes_Lilycove: ; 83475C0
 
 	.align 2, 0
 
-gTilesetTiles_Mossdeep: ; 83477C0
+gTilesetTiles_Mossdeep: @ 83477C0
 	.incbin "data/graphics/tilesets/secondary/mossdeep/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Mossdeep: ; 8348E10
+gTilesetPalettes_Mossdeep: @ 8348E10
 	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/02.gbapal"
@@ -250,12 +250,12 @@ gTilesetPalettes_Mossdeep: ; 8348E10
 
 	.align 2, 0
 
-gTilesetTiles_EverGrande: ; 8349010
+gTilesetTiles_EverGrande: @ 8349010
 	.incbin "data/graphics/tilesets/secondary/ever_grande/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_EverGrande: ; 8349C28
+gTilesetPalettes_EverGrande: @ 8349C28
 	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/02.gbapal"
@@ -275,12 +275,12 @@ gTilesetPalettes_EverGrande: ; 8349C28
 
 	.align 2, 0
 
-gTilesetTiles_Pacifidlog: ; 8349E28
+gTilesetTiles_Pacifidlog: @ 8349E28
 	.incbin "data/graphics/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Pacifidlog: ; 834B5B4
+gTilesetPalettes_Pacifidlog: @ 834B5B4
 	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/02.gbapal"
@@ -300,12 +300,12 @@ gTilesetPalettes_Pacifidlog: ; 834B5B4
 
 	.align 2, 0
 
-gTilesetTiles_Sootopolis: ; 834B7B4
+gTilesetTiles_Sootopolis: @ 834B7B4
 	.incbin "data/graphics/tilesets/secondary/sootopolis/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Sootopolis: ; 834C6B4
+gTilesetPalettes_Sootopolis: @ 834C6B4
 	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/02.gbapal"
@@ -325,12 +325,12 @@ gTilesetPalettes_Sootopolis: ; 834C6B4
 
 	.align 2, 0
 
-gTilesetTiles_BattleFrontierOutsideWest: ; 834C8B4
+gTilesetTiles_BattleFrontierOutsideWest: @ 834C8B4
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleFrontierOutsideWest: ; 834E3E4
+gTilesetPalettes_BattleFrontierOutsideWest: @ 834E3E4
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
@@ -350,12 +350,12 @@ gTilesetPalettes_BattleFrontierOutsideWest: ; 834E3E4
 
 	.align 2, 0
 
-gTilesetTiles_BattleFrontierOutsideEast: ; 834E5E4
+gTilesetTiles_BattleFrontierOutsideEast: @ 834E5E4
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleFrontierOutsideEast: ; 834F984
+gTilesetPalettes_BattleFrontierOutsideEast: @ 834F984
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
@@ -375,12 +375,12 @@ gTilesetPalettes_BattleFrontierOutsideEast: ; 834F984
 
 	.align 2, 0
 
-gTilesetTiles_InsideBuilding: ; 834FB84
+gTilesetTiles_InsideBuilding: @ 834FB84
 	.incbin "data/graphics/tilesets/primary/inside_building/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_InsideBuilding: ; 83508BC
+gTilesetPalettes_InsideBuilding: @ 83508BC
 	.incbin "data/graphics/tilesets/primary/inside_building/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/primary/inside_building/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/primary/inside_building/palettes/02.gbapal"
@@ -400,12 +400,12 @@ gTilesetPalettes_InsideBuilding: ; 83508BC
 
 	.align 2, 0
 
-gTilesetTiles_Shop: ; 8350ABC
+gTilesetTiles_Shop: @ 8350ABC
 	.incbin "data/graphics/tilesets/secondary/shop/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Shop: ; 83520DC
+gTilesetPalettes_Shop: @ 83520DC
 	.incbin "data/graphics/tilesets/secondary/shop/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/shop/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/shop/palettes/02.gbapal"
@@ -425,12 +425,12 @@ gTilesetPalettes_Shop: ; 83520DC
 
 	.align 2, 0
 
-gTilesetTiles_PokemonCenter: ; 83522DC
+gTilesetTiles_PokemonCenter: @ 83522DC
 	.incbin "data/graphics/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PokemonCenter: ; 8353574
+gTilesetPalettes_PokemonCenter: @ 8353574
 	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/02.gbapal"
@@ -450,12 +450,12 @@ gTilesetPalettes_PokemonCenter: ; 8353574
 
 	.align 2, 0
 
-gTilesetTiles_Cave: ; 8353774
+gTilesetTiles_Cave: @ 8353774
 	.incbin "data/graphics/tilesets/secondary/cave/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Cave: ; 8355260
+gTilesetPalettes_Cave: @ 8355260
 	.incbin "data/graphics/tilesets/secondary/cave/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/cave/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/cave/palettes/02.gbapal"
@@ -475,12 +475,12 @@ gTilesetPalettes_Cave: ; 8355260
 
 	.align 2, 0
 
-gTilesetTiles_PokemonSchool: ; 8355460
+gTilesetTiles_PokemonSchool: @ 8355460
 	.incbin "data/graphics/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PokemonSchool: ; 8355BA8
+gTilesetPalettes_PokemonSchool: @ 8355BA8
 	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/02.gbapal"
@@ -500,12 +500,12 @@ gTilesetPalettes_PokemonSchool: ; 8355BA8
 
 	.align 2, 0
 
-gTilesetTiles_PokemonFanClub: ; 8355DA8
+gTilesetTiles_PokemonFanClub: @ 8355DA8
 	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PokemonFanClub: ; 83566D4
+gTilesetPalettes_PokemonFanClub: @ 83566D4
 	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
@@ -525,12 +525,12 @@ gTilesetPalettes_PokemonFanClub: ; 83566D4
 
 	.align 2, 0
 
-gTilesetTiles_Unused1: ; 83568D4
+gTilesetTiles_Unused1: @ 83568D4
 	.incbin "data/graphics/tilesets/secondary/unused_1/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Unused1: ; 8356920
+gTilesetPalettes_Unused1: @ 8356920
 	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/unused_1/palettes/02.gbapal"
@@ -550,12 +550,12 @@ gTilesetPalettes_Unused1: ; 8356920
 
 	.align 2, 0
 
-gTilesetTiles_MeteorFalls: ; 8356B20
+gTilesetTiles_MeteorFalls: @ 8356B20
 	.incbin "data/graphics/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MeteorFalls: ; 8358840
+gTilesetPalettes_MeteorFalls: @ 8358840
 	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/02.gbapal"
@@ -575,12 +575,12 @@ gTilesetPalettes_MeteorFalls: ; 8358840
 
 	.align 2, 0
 
-gTilesetTiles_OceanicMuseum: ; 8358A40
+gTilesetTiles_OceanicMuseum: @ 8358A40
 	.incbin "data/graphics/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_OceanicMuseum: ; 83599CC
+gTilesetPalettes_OceanicMuseum: @ 83599CC
 	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
@@ -600,7 +600,7 @@ gTilesetPalettes_OceanicMuseum: ; 83599CC
 
 	.align 2, 0
 
-gTilesetTiles_CableClub: ; 8359BCC
+gTilesetTiles_CableClub: @ 8359BCC
 	.incbin "data/graphics/tilesets/secondary/cable_club/tiles.4bpp"
 
 	.align 2, 0
@@ -609,7 +609,7 @@ gTilesetTiles_CableClub: ; 8359BCC
 
 	.align 2, 0
 
-gTilesetPalettes_CableClub: ; 835EACC
+gTilesetPalettes_CableClub: @ 835EACC
 	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/cable_club/palettes/02.gbapal"
@@ -629,12 +629,12 @@ gTilesetPalettes_CableClub: ; 835EACC
 
 	.align 2, 0
 
-gTilesetTiles_SeashoreHouse: ; 835ECCC
+gTilesetTiles_SeashoreHouse: @ 835ECCC
 	.incbin "data/graphics/tilesets/secondary/seashore_house/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SeashoreHouse: ; 835F5A8
+gTilesetPalettes_SeashoreHouse: @ 835F5A8
 	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/02.gbapal"
@@ -654,12 +654,12 @@ gTilesetPalettes_SeashoreHouse: ; 835F5A8
 
 	.align 2, 0
 
-gTilesetTiles_PrettyPetalFlowerShop: ; 835F7A8
+gTilesetTiles_PrettyPetalFlowerShop: @ 835F7A8
 	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PrettyPetalFlowerShop: ; 83603A0
+gTilesetPalettes_PrettyPetalFlowerShop: @ 83603A0
 	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
@@ -679,12 +679,12 @@ gTilesetPalettes_PrettyPetalFlowerShop: ; 83603A0
 
 	.align 2, 0
 
-gTilesetTiles_PokemonDayCare: ; 83605A0
+gTilesetTiles_PokemonDayCare: @ 83605A0
 	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PokemonDayCare: ; 8360FDC
+gTilesetPalettes_PokemonDayCare: @ 8360FDC
 	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
@@ -704,12 +704,12 @@ gTilesetPalettes_PokemonDayCare: ; 8360FDC
 
 	.align 2, 0
 
-gTilesetTiles_Facility: ; 83611DC
+gTilesetTiles_Facility: @ 83611DC
 	.incbin "data/graphics/tilesets/secondary/facility/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Facility: ; 8362E90
+gTilesetPalettes_Facility: @ 8362E90
 	.incbin "data/graphics/tilesets/secondary/facility/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/facility/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/facility/palettes/02.gbapal"
@@ -729,12 +729,12 @@ gTilesetPalettes_Facility: ; 8362E90
 
 	.align 2, 0
 
-gTilesetTiles_BikeShop: ; 8363090
+gTilesetTiles_BikeShop: @ 8363090
 	.incbin "data/graphics/tilesets/secondary/bike_shop/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BikeShop: ; 83643C0
+gTilesetPalettes_BikeShop: @ 83643C0
 	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/02.gbapal"
@@ -754,12 +754,12 @@ gTilesetPalettes_BikeShop: ; 83643C0
 
 	.align 2, 0
 
-gTilesetTiles_RusturfTunnel: ; 83645C0
+gTilesetTiles_RusturfTunnel: @ 83645C0
 	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_RusturfTunnel: ; 8365008
+gTilesetPalettes_RusturfTunnel: @ 8365008
 	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
@@ -779,12 +779,12 @@ gTilesetPalettes_RusturfTunnel: ; 8365008
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseBrownCave: ; 8365788
+gTilesetPalettes_SecretBaseBrownCave: @ 8365788
 	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
@@ -804,12 +804,12 @@ gTilesetPalettes_SecretBaseBrownCave: ; 8365788
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseTree: ; 8365EAC
+gTilesetPalettes_SecretBaseTree: @ 8365EAC
 	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
@@ -829,12 +829,12 @@ gTilesetPalettes_SecretBaseTree: ; 8365EAC
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseShrub: ; 8366614
+gTilesetPalettes_SecretBaseShrub: @ 8366614
 	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
@@ -854,12 +854,12 @@ gTilesetPalettes_SecretBaseShrub: ; 8366614
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseBlueCave: ; 8366C30
+gTilesetPalettes_SecretBaseBlueCave: @ 8366C30
 	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
@@ -879,12 +879,12 @@ gTilesetPalettes_SecretBaseBlueCave: ; 8366C30
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseYellowCave: ; 8367368
+gTilesetPalettes_SecretBaseYellowCave: @ 8367368
 	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
@@ -904,12 +904,12 @@ gTilesetPalettes_SecretBaseYellowCave: ; 8367368
 
 	.align 2, 0
 
-; unused compressed copy of tiles
+@ unused compressed copy of tiles
 	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBaseRedCave: ; 83679A0
+gTilesetPalettes_SecretBaseRedCave: @ 83679A0
 	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
@@ -929,42 +929,42 @@ gTilesetPalettes_SecretBaseRedCave: ; 83679A0
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseBrownCave: ; 8367BA0
+gTilesetTiles_SecretBaseBrownCave: @ 8367BA0
 	.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseTree: ; 8368600
+gTilesetTiles_SecretBaseTree: @ 8368600
 	.incbin "data/graphics/tilesets/secondary/secret_base/tree/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseShrub: ; 8369060
+gTilesetTiles_SecretBaseShrub: @ 8369060
 	.incbin "data/graphics/tilesets/secondary/secret_base/shrub/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseBlueCave: ; 8369AC0
+gTilesetTiles_SecretBaseBlueCave: @ 8369AC0
 	.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseYellowCave: ; 836A520
+gTilesetTiles_SecretBaseYellowCave: @ 836A520
 	.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_SecretBaseRedCave: ; 836AF80
+gTilesetTiles_SecretBaseRedCave: @ 836AF80
 	.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
 
 	.align 2, 0
 
-gTilesetTiles_InsideOfTruck: ; 836B9E0
+gTilesetTiles_InsideOfTruck: @ 836B9E0
 	.incbin "data/graphics/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_InsideOfTruck: ; 836BC3C
+gTilesetPalettes_InsideOfTruck: @ 836BC3C
 	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
@@ -984,12 +984,12 @@ gTilesetPalettes_InsideOfTruck: ; 836BC3C
 
 	.align 2, 0
 
-gTilesetTiles_Contest: ; 836BE3C
+gTilesetTiles_Contest: @ 836BE3C
 	.incbin "data/graphics/tilesets/secondary/contest/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Contest: ; 836C990
+gTilesetPalettes_Contest: @ 836C990
 	.incbin "data/graphics/tilesets/secondary/contest/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/contest/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/contest/palettes/02.gbapal"
@@ -1009,12 +1009,12 @@ gTilesetPalettes_Contest: ; 836C990
 
 	.align 2, 0
 
-gTilesetTiles_LilycoveMuseum: ; 836CB90
+gTilesetTiles_LilycoveMuseum: @ 836CB90
 	.incbin "data/graphics/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_LilycoveMuseum: ; 836DEAC
+gTilesetPalettes_LilycoveMuseum: @ 836DEAC
 	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
@@ -1034,12 +1034,12 @@ gTilesetPalettes_LilycoveMuseum: ; 836DEAC
 
 	.align 2, 0
 
-gTilesetTiles_BrendansMaysHouse: ; 836E0AC
+gTilesetTiles_BrendansMaysHouse: @ 836E0AC
 	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BrendansMaysHouse: ; 836F178
+gTilesetPalettes_BrendansMaysHouse: @ 836F178
 	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
@@ -1059,12 +1059,12 @@ gTilesetPalettes_BrendansMaysHouse: ; 836F178
 
 	.align 2, 0
 
-gTilesetTiles_Lab: ; 836F378
+gTilesetTiles_Lab: @ 836F378
 	.incbin "data/graphics/tilesets/secondary/lab/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Lab: ; 83703DC
+gTilesetPalettes_Lab: @ 83703DC
 	.incbin "data/graphics/tilesets/secondary/lab/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lab/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lab/palettes/02.gbapal"
@@ -1084,12 +1084,12 @@ gTilesetPalettes_Lab: ; 83703DC
 
 	.align 2, 0
 
-gTilesetTiles_Underwater: ; 83705DC
+gTilesetTiles_Underwater: @ 83705DC
 	.incbin "data/graphics/tilesets/secondary/underwater/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Underwater: ; 8371798
+gTilesetPalettes_Underwater: @ 8371798
 	.incbin "data/graphics/tilesets/secondary/underwater/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/underwater/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/underwater/palettes/02.gbapal"
@@ -1109,12 +1109,12 @@ gTilesetPalettes_Underwater: ; 8371798
 
 	.align 2, 0
 
-gTilesetTiles_GenericBuilding: ; 8371998
+gTilesetTiles_GenericBuilding: @ 8371998
 	.incbin "data/graphics/tilesets/secondary/generic_building/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_GenericBuilding: ; 83733C4
+gTilesetPalettes_GenericBuilding: @ 83733C4
 	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/generic_building/palettes/02.gbapal"
@@ -1134,12 +1134,12 @@ gTilesetPalettes_GenericBuilding: ; 83733C4
 
 	.align 2, 0
 
-gTilesetTiles_MauvilleGameCorner: ; 83735C4
+gTilesetTiles_MauvilleGameCorner: @ 83735C4
 	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MauvilleGameCorner: ; 8374288
+gTilesetPalettes_MauvilleGameCorner: @ 8374288
 	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
@@ -1159,12 +1159,12 @@ gTilesetPalettes_MauvilleGameCorner: ; 8374288
 
 	.align 2, 0
 
-gTilesetTiles_Unused2: ; 8374488
+gTilesetTiles_Unused2: @ 8374488
 	.incbin "data/graphics/tilesets/secondary/unused_2/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_Unused2: ; 83749B0
+gTilesetPalettes_Unused2: @ 83749B0
 	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/unused_2/palettes/02.gbapal"
@@ -1184,12 +1184,12 @@ gTilesetPalettes_Unused2: ; 83749B0
 
 	.align 2, 0
 
-gTilesetTiles_RustboroGym: ; 8374BB0
+gTilesetTiles_RustboroGym: @ 8374BB0
 	.incbin "data/graphics/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_RustboroGym: ; 8374F34
+gTilesetPalettes_RustboroGym: @ 8374F34
 	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
@@ -1209,12 +1209,12 @@ gTilesetPalettes_RustboroGym: ; 8374F34
 
 	.align 2, 0
 
-gTilesetTiles_DewfordGym: ; 8375134
+gTilesetTiles_DewfordGym: @ 8375134
 	.incbin "data/graphics/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_DewfordGym: ; 8375400
+gTilesetPalettes_DewfordGym: @ 8375400
 	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/02.gbapal"
@@ -1234,12 +1234,12 @@ gTilesetPalettes_DewfordGym: ; 8375400
 
 	.align 2, 0
 
-gTilesetTiles_MauvilleGym: ; 8375600
+gTilesetTiles_MauvilleGym: @ 8375600
 	.incbin "data/graphics/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MauvilleGym: ; 8375D84
+gTilesetPalettes_MauvilleGym: @ 8375D84
 	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/02.gbapal"
@@ -1259,12 +1259,12 @@ gTilesetPalettes_MauvilleGym: ; 8375D84
 
 	.align 2, 0
 
-gTilesetTiles_LavaridgeGym: ; 8375F84
+gTilesetTiles_LavaridgeGym: @ 8375F84
 	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_LavaridgeGym: ; 83762AC
+gTilesetPalettes_LavaridgeGym: @ 83762AC
 	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
@@ -1284,12 +1284,12 @@ gTilesetPalettes_LavaridgeGym: ; 83762AC
 
 	.align 2, 0
 
-gTilesetTiles_PetalburgGym: ; 83764AC
+gTilesetTiles_PetalburgGym: @ 83764AC
 	.incbin "data/graphics/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_PetalburgGym: ; 8376B50
+gTilesetPalettes_PetalburgGym: @ 8376B50
 	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
@@ -1309,12 +1309,12 @@ gTilesetPalettes_PetalburgGym: ; 8376B50
 
 	.align 2, 0
 
-gTilesetTiles_FortreeGym: ; 8376D50
+gTilesetTiles_FortreeGym: @ 8376D50
 	.incbin "data/graphics/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_FortreeGym: ; 83770C4
+gTilesetPalettes_FortreeGym: @ 83770C4
 	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/02.gbapal"
@@ -1334,12 +1334,12 @@ gTilesetPalettes_FortreeGym: ; 83770C4
 
 	.align 2, 0
 
-gTilesetTiles_MossdeepGym: ; 83772C4
+gTilesetTiles_MossdeepGym: @ 83772C4
 	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MossdeepGym: ; 8377730
+gTilesetPalettes_MossdeepGym: @ 8377730
 	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
@@ -1359,12 +1359,12 @@ gTilesetPalettes_MossdeepGym: ; 8377730
 
 	.align 2, 0
 
-gTilesetTiles_SootopolisGym: ; 8377930
+gTilesetTiles_SootopolisGym: @ 8377930
 	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_SootopolisGym: ; 8378AC4
+gTilesetPalettes_SootopolisGym: @ 8378AC4
 	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
@@ -1384,12 +1384,12 @@ gTilesetPalettes_SootopolisGym: ; 8378AC4
 
 	.align 2, 0
 
-gTilesetTiles_TrickHousePuzzle: ; 8378CC4
+gTilesetTiles_TrickHousePuzzle: @ 8378CC4
 	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_TrickHousePuzzle: ; 8379A78
+gTilesetPalettes_TrickHousePuzzle: @ 8379A78
 	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
@@ -1409,12 +1409,12 @@ gTilesetPalettes_TrickHousePuzzle: ; 8379A78
 
 	.align 2, 0
 
-gTilesetTiles_InsideShip: ; 8379C78
+gTilesetTiles_InsideShip: @ 8379C78
 	.incbin "data/graphics/tilesets/secondary/inside_ship/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_InsideShip: ; 837A848
+gTilesetPalettes_InsideShip: @ 837A848
 	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/02.gbapal"
@@ -1434,7 +1434,7 @@ gTilesetPalettes_InsideShip: ; 837A848
 
 	.align 2, 0
 
-gTilesetTiles_SecretBase: ; 837AA48
+gTilesetTiles_SecretBase: @ 837AA48
 	.incbin "data/graphics/tilesets/primary/secret_base/tiles.4bpp"
 
 	.align 2, 0
@@ -1443,7 +1443,7 @@ gTilesetTiles_SecretBase: ; 837AA48
 
 	.align 2, 0
 
-gTilesetPalettes_SecretBase: ; 8382A48
+gTilesetPalettes_SecretBase: @ 8382A48
 	.incbin "data/graphics/tilesets/primary/secret_base/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/primary/secret_base/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/primary/secret_base/palettes/02.gbapal"
@@ -1463,12 +1463,12 @@ gTilesetPalettes_SecretBase: ; 8382A48
 
 	.align 2, 0
 
-gTilesetTiles_EliteFour: ; 8382C48
+gTilesetTiles_EliteFour: @ 8382C48
 	.incbin "data/graphics/tilesets/secondary/elite_four/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_EliteFour: ; 8383CC4
+gTilesetPalettes_EliteFour: @ 8383CC4
 	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/elite_four/palettes/02.gbapal"
@@ -1488,12 +1488,12 @@ gTilesetPalettes_EliteFour: ; 8383CC4
 
 	.align 2, 0
 
-gTilesetTiles_BattleFrontier: ; 8383EC4
+gTilesetTiles_BattleFrontier: @ 8383EC4
 	.incbin "data/graphics/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleFrontier: ; 8384BC8
+gTilesetPalettes_BattleFrontier: @ 8384BC8
 	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/02.gbapal"
@@ -1513,12 +1513,12 @@ gTilesetPalettes_BattleFrontier: ; 8384BC8
 
 	.align 2, 0
 
-gTilesetTiles_BattlePalace: ; 8384DC8
+gTilesetTiles_BattlePalace: @ 8384DC8
 	.incbin "data/graphics/tilesets/secondary/battle_palace/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattlePalace: ; 8385540
+gTilesetPalettes_BattlePalace: @ 8385540
 	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/02.gbapal"
@@ -1538,12 +1538,12 @@ gTilesetPalettes_BattlePalace: ; 8385540
 
 	.align 2, 0
 
-gTilesetTiles_BattleDome: ; 8385740
+gTilesetTiles_BattleDome: @ 8385740
 	.incbin "data/graphics/tilesets/secondary/battle_dome/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleDome: ; 8386990
+gTilesetPalettes_BattleDome: @ 8386990
 	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/02.gbapal"
@@ -1563,12 +1563,12 @@ gTilesetPalettes_BattleDome: ; 8386990
 
 	.align 2, 0
 
-gTilesetTiles_BattleFactory: ; 8386B90
+gTilesetTiles_BattleFactory: @ 8386B90
 	.incbin "data/graphics/tilesets/secondary/battle_factory/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleFactory: ; 8387D7C
+gTilesetPalettes_BattleFactory: @ 8387D7C
 	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/02.gbapal"
@@ -1588,12 +1588,12 @@ gTilesetPalettes_BattleFactory: ; 8387D7C
 
 	.align 2, 0
 
-gTilesetTiles_BattlePike: ; 8387F7C
+gTilesetTiles_BattlePike: @ 8387F7C
 	.incbin "data/graphics/tilesets/secondary/battle_pike/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattlePike: ; 8389250
+gTilesetPalettes_BattlePike: @ 8389250
 	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/02.gbapal"
@@ -1613,12 +1613,12 @@ gTilesetPalettes_BattlePike: ; 8389250
 
 	.align 2, 0
 
-gTilesetTiles_BattleArena: ; 8389450
+gTilesetTiles_BattleArena: @ 8389450
 	.incbin "data/graphics/tilesets/secondary/battle_arena/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleArena: ; 8389F8C
+gTilesetPalettes_BattleArena: @ 8389F8C
 	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/02.gbapal"
@@ -1638,12 +1638,12 @@ gTilesetPalettes_BattleArena: ; 8389F8C
 
 	.align 2, 0
 
-gTilesetTiles_BattlePyramid: ; 838A18C
+gTilesetTiles_BattlePyramid: @ 838A18C
 	.incbin "data/graphics/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattlePyramid: ; 838B39C
+gTilesetPalettes_BattlePyramid: @ 838B39C
 	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
@@ -1663,12 +1663,12 @@ gTilesetPalettes_BattlePyramid: ; 838B39C
 
 	.align 2, 0
 
-gTilesetTiles_MirageTower: ; 838B59C
+gTilesetTiles_MirageTower: @ 838B59C
 	.incbin "data/graphics/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MirageTower: ; 838CFE4
+gTilesetPalettes_MirageTower: @ 838CFE4
 	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/02.gbapal"
@@ -1688,12 +1688,12 @@ gTilesetPalettes_MirageTower: ; 838CFE4
 
 	.align 2, 0
 
-gTilesetTiles_MossdeepGameCorner: ; 838D1E4
+gTilesetTiles_MossdeepGameCorner: @ 838D1E4
 	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MossdeepGameCorner: ; 838D604
+gTilesetPalettes_MossdeepGameCorner: @ 838D604
 	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
@@ -1713,12 +1713,12 @@ gTilesetPalettes_MossdeepGameCorner: ; 838D604
 
 	.align 2, 0
 
-gTilesetTiles_IslandHarbor: ; 838D804
+gTilesetTiles_IslandHarbor: @ 838D804
 	.incbin "data/graphics/tilesets/secondary/island_harbor/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_IslandHarbor: ; 838F1D4
+gTilesetPalettes_IslandHarbor: @ 838F1D4
 	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/02.gbapal"
@@ -1738,12 +1738,12 @@ gTilesetPalettes_IslandHarbor: ; 838F1D4
 
 	.align 2, 0
 
-gTilesetTiles_TrainerHill: ; 838F3D4
+gTilesetTiles_TrainerHill: @ 838F3D4
 	.incbin "data/graphics/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_TrainerHill: ; 83904C4
+gTilesetPalettes_TrainerHill: @ 83904C4
 	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/02.gbapal"
@@ -1763,12 +1763,12 @@ gTilesetPalettes_TrainerHill: ; 83904C4
 
 	.align 2, 0
 
-gTilesetTiles_NavelRock: ; 83906C4
+gTilesetTiles_NavelRock: @ 83906C4
 	.incbin "data/graphics/tilesets/secondary/navel_rock/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_NavelRock: ; 8392258
+gTilesetPalettes_NavelRock: @ 8392258
 	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/02.gbapal"
@@ -1788,12 +1788,12 @@ gTilesetPalettes_NavelRock: ; 8392258
 
 	.align 2, 0
 
-gTilesetTiles_BattleFrontierRankingHall: ; 8392458
+gTilesetTiles_BattleFrontierRankingHall: @ 8392458
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleFrontierRankingHall: ; 8392CAC
+gTilesetPalettes_BattleFrontierRankingHall: @ 8392CAC
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
@@ -1813,12 +1813,12 @@ gTilesetPalettes_BattleFrontierRankingHall: ; 8392CAC
 
 	.align 2, 0
 
-gTilesetTiles_BattleTent: ; 8392EAC
+gTilesetTiles_BattleTent: @ 8392EAC
 	.incbin "data/graphics/tilesets/secondary/battle_tent/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_BattleTent: ; 8393910
+gTilesetPalettes_BattleTent: @ 8393910
 	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/02.gbapal"
@@ -1838,12 +1838,12 @@ gTilesetPalettes_BattleTent: ; 8393910
 
 	.align 2, 0
 
-gTilesetTiles_MysteryEventsHouse: ; 8393B10
+gTilesetTiles_MysteryEventsHouse: @ 8393B10
 	.incbin "data/graphics/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
 
 	.align 2, 0
 
-gTilesetPalettes_MysteryEventsHouse: ; 8395478
+gTilesetPalettes_MysteryEventsHouse: @ 8395478
 	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
@@ -1863,7 +1863,7 @@ gTilesetPalettes_MysteryEventsHouse: ; 8395478
 
 	.align 2, 0
 
-gTilesetPalettes_UnionRoom: ; 8395678
+gTilesetPalettes_UnionRoom: @ 8395678
 	.incbin "data/graphics/tilesets/secondary/union_room/palettes/00.gbapal"
 	.incbin "data/graphics/tilesets/secondary/union_room/palettes/01.gbapal"
 	.incbin "data/graphics/tilesets/secondary/union_room/palettes/02.gbapal"
@@ -1883,5 +1883,5 @@ gTilesetPalettes_UnionRoom: ; 8395678
 
 	.align 2, 0
 
-gTilesetTiles_UnionRoom: ; 8395878
+gTilesetTiles_UnionRoom: @ 8395878
 	.incbin "data/graphics/tilesets/secondary/union_room/tiles.4bpp.lz"
diff --git a/data/graphics/tilesets/tilesets.s b/data/graphics/tilesets/tilesets.s
index 21cfed61a..62bb8a938 100644
--- a/data/graphics/tilesets/tilesets.s
+++ b/data/graphics/tilesets/tilesets.s
@@ -1,9 +1,9 @@
 	.align 2, 0
 
-gTileset_General: ; 83DF704
-	.byte TRUE ; is compressed
-	.byte FALSE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_General: @ 83DF704
+	.byte TRUE @ is compressed
+	.byte FALSE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_General
 	.4byte gTilesetPalettes_General
 	.4byte gMetatiles_General
@@ -12,10 +12,10 @@ gTileset_General: ; 83DF704
 
 	.align 2, 0
 
-gTileset_Petalburg: ; 83DF71C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Petalburg: @ 83DF71C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Petalburg
 	.4byte gTilesetPalettes_Petalburg
 	.4byte gMetatiles_Petalburg
@@ -24,10 +24,10 @@ gTileset_Petalburg: ; 83DF71C
 
 	.align 2, 0
 
-gTileset_Rustboro: ; 83DF734
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Rustboro: @ 83DF734
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Rustboro
 	.4byte gTilesetPalettes_Rustboro
 	.4byte gMetatiles_Rustboro
@@ -36,10 +36,10 @@ gTileset_Rustboro: ; 83DF734
 
 	.align 2, 0
 
-gTileset_Dewford: ; 83DF74C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Dewford: @ 83DF74C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Dewford
 	.4byte gTilesetPalettes_Dewford
 	.4byte gMetatiles_Dewford
@@ -48,10 +48,10 @@ gTileset_Dewford: ; 83DF74C
 
 	.align 2, 0
 
-gTileset_Slateport: ; 83DF764
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Slateport: @ 83DF764
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Slateport
 	.4byte gTilesetPalettes_Slateport
 	.4byte gMetatiles_Slateport
@@ -60,10 +60,10 @@ gTileset_Slateport: ; 83DF764
 
 	.align 2, 0
 
-gTileset_Mauville: ; 83DF77C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Mauville: @ 83DF77C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Mauville
 	.4byte gTilesetPalettes_Mauville
 	.4byte gMetatiles_Mauville
@@ -72,10 +72,10 @@ gTileset_Mauville: ; 83DF77C
 
 	.align 2, 0
 
-gTileset_Lavaridge: ; 83DF794
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Lavaridge: @ 83DF794
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Lavaridge
 	.4byte gTilesetPalettes_Lavaridge
 	.4byte gMetatiles_Lavaridge
@@ -84,10 +84,10 @@ gTileset_Lavaridge: ; 83DF794
 
 	.align 2, 0
 
-gTileset_Fallarbor: ; 83DF7AC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Fallarbor: @ 83DF7AC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Fallarbor
 	.4byte gTilesetPalettes_Fallarbor
 	.4byte gMetatiles_Fallarbor
@@ -96,10 +96,10 @@ gTileset_Fallarbor: ; 83DF7AC
 
 	.align 2, 0
 
-gTileset_Fortree: ; 83DF7C4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Fortree: @ 83DF7C4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Fortree
 	.4byte gTilesetPalettes_Fortree
 	.4byte gMetatiles_Fortree
@@ -108,10 +108,10 @@ gTileset_Fortree: ; 83DF7C4
 
 	.align 2, 0
 
-gTileset_Lilycove: ; 83DF7DC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Lilycove: @ 83DF7DC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Lilycove
 	.4byte gTilesetPalettes_Lilycove
 	.4byte gMetatiles_Lilycove
@@ -120,10 +120,10 @@ gTileset_Lilycove: ; 83DF7DC
 
 	.align 2, 0
 
-gTileset_Mossdeep: ; 83DF7F4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Mossdeep: @ 83DF7F4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Mossdeep
 	.4byte gTilesetPalettes_Mossdeep
 	.4byte gMetatiles_Mossdeep
@@ -132,10 +132,10 @@ gTileset_Mossdeep: ; 83DF7F4
 
 	.align 2, 0
 
-gTileset_EverGrande: ; 83DF80C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_EverGrande: @ 83DF80C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_EverGrande
 	.4byte gTilesetPalettes_EverGrande
 	.4byte gMetatiles_EverGrande
@@ -144,10 +144,10 @@ gTileset_EverGrande: ; 83DF80C
 
 	.align 2, 0
 
-gTileset_Pacifidlog: ; 83DF824
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Pacifidlog: @ 83DF824
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Pacifidlog
 	.4byte gTilesetPalettes_Pacifidlog
 	.4byte gMetatiles_Pacifidlog
@@ -156,10 +156,10 @@ gTileset_Pacifidlog: ; 83DF824
 
 	.align 2, 0
 
-gTileset_Sootopolis: ; 83DF83C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Sootopolis: @ 83DF83C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Sootopolis
 	.4byte gTilesetPalettes_Sootopolis
 	.4byte gMetatiles_Sootopolis
@@ -168,10 +168,10 @@ gTileset_Sootopolis: ; 83DF83C
 
 	.align 2, 0
 
-gTileset_BattleFrontierOutsideWest: ; 83DF854
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleFrontierOutsideWest: @ 83DF854
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleFrontierOutsideWest
 	.4byte gTilesetPalettes_BattleFrontierOutsideWest
 	.4byte gMetatiles_BattleFrontierOutsideWest
@@ -180,10 +180,10 @@ gTileset_BattleFrontierOutsideWest: ; 83DF854
 
 	.align 2, 0
 
-gTileset_BattleFrontierOutsideEast: ; 83DF86C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleFrontierOutsideEast: @ 83DF86C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleFrontierOutsideEast
 	.4byte gTilesetPalettes_BattleFrontierOutsideEast
 	.4byte gMetatiles_BattleFrontierOutsideEast
@@ -192,10 +192,10 @@ gTileset_BattleFrontierOutsideEast: ; 83DF86C
 
 	.align 2, 0
 
-gTileset_InsideBuilding: ; 83DF884
-	.byte TRUE ; is compressed
-	.byte FALSE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_InsideBuilding: @ 83DF884
+	.byte TRUE @ is compressed
+	.byte FALSE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_InsideBuilding
 	.4byte gTilesetPalettes_InsideBuilding
 	.4byte gMetatiles_InsideBuilding
@@ -204,34 +204,34 @@ gTileset_InsideBuilding: ; 83DF884
 
 	.align 2, 0
 
-gTileset_Shop: ; 83DF89C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Shop: @ 83DF89C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Shop
 	.4byte gTilesetPalettes_Shop
 	.4byte gMetatiles_Shop
 	.4byte gMetatileAttributes_Shop
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_PokemonCenter: ; 83DF8B4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PokemonCenter: @ 83DF8B4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PokemonCenter
 	.4byte gTilesetPalettes_PokemonCenter
 	.4byte gMetatiles_PokemonCenter
 	.4byte gMetatileAttributes_PokemonCenter
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Cave: ; 83DF8CC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Cave: @ 83DF8CC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Cave
 	.4byte gTilesetPalettes_Cave
 	.4byte gMetatiles_Cave
@@ -240,130 +240,130 @@ gTileset_Cave: ; 83DF8CC
 
 	.align 2, 0
 
-gTileset_PokemonSchool: ; 83DF8E4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PokemonSchool: @ 83DF8E4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PokemonSchool
 	.4byte gTilesetPalettes_PokemonSchool
 	.4byte gMetatiles_PokemonSchool
 	.4byte gMetatileAttributes_PokemonSchool
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_PokemonFanClub: ; 83DF8FC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PokemonFanClub: @ 83DF8FC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PokemonFanClub
 	.4byte gTilesetPalettes_PokemonFanClub
 	.4byte gMetatiles_PokemonFanClub
 	.4byte gMetatileAttributes_PokemonFanClub
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Unused1: ; 83DF914
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Unused1: @ 83DF914
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Unused1
 	.4byte gTilesetPalettes_Unused1
 	.4byte gMetatiles_Unused1
 	.4byte gMetatileAttributes_Unused1
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MeteorFalls: ; 83DF92C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MeteorFalls: @ 83DF92C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MeteorFalls
 	.4byte gTilesetPalettes_MeteorFalls
 	.4byte gMetatiles_MeteorFalls
 	.4byte gMetatileAttributes_MeteorFalls
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_OceanicMuseum: ; 83DF944
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_OceanicMuseum: @ 83DF944
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_OceanicMuseum
 	.4byte gTilesetPalettes_OceanicMuseum
 	.4byte gMetatiles_OceanicMuseum
 	.4byte gMetatileAttributes_OceanicMuseum
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_CableClub: ; 83DF95C
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_CableClub: @ 83DF95C
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_CableClub
 	.4byte gTilesetPalettes_CableClub
 	.4byte gMetatiles_CableClub
 	.4byte gMetatileAttributes_CableClub
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SeashoreHouse: ; 83DF974
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SeashoreHouse: @ 83DF974
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SeashoreHouse
 	.4byte gTilesetPalettes_SeashoreHouse
 	.4byte gMetatiles_SeashoreHouse
 	.4byte gMetatileAttributes_SeashoreHouse
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_PrettyPetalFlowerShop: ; 83DF98C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PrettyPetalFlowerShop: @ 83DF98C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PrettyPetalFlowerShop
 	.4byte gTilesetPalettes_PrettyPetalFlowerShop
 	.4byte gMetatiles_PrettyPetalFlowerShop
 	.4byte gMetatileAttributes_PrettyPetalFlowerShop
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_PokemonDayCare: ; 83DF9A4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PokemonDayCare: @ 83DF9A4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PokemonDayCare
 	.4byte gTilesetPalettes_PokemonDayCare
 	.4byte gMetatiles_PokemonDayCare
 	.4byte gMetatileAttributes_PokemonDayCare
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Facility: ; 83DF9BC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Facility: @ 83DF9BC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Facility
 	.4byte gTilesetPalettes_Facility
 	.4byte gMetatiles_Facility
 	.4byte gMetatileAttributes_Facility
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BikeShop: ; 83DF9D4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BikeShop: @ 83DF9D4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BikeShop
 	.4byte gTilesetPalettes_BikeShop
 	.4byte gMetatiles_BikeShop
@@ -372,166 +372,166 @@ gTileset_BikeShop: ; 83DF9D4
 
 	.align 2, 0
 
-gTileset_RusturfTunnel: ; 83DF9EC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_RusturfTunnel: @ 83DF9EC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_RusturfTunnel
 	.4byte gTilesetPalettes_RusturfTunnel
 	.4byte gMetatiles_RusturfTunnel
 	.4byte gMetatileAttributes_RusturfTunnel
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseBrownCave: ; 83DFA04
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseBrownCave: @ 83DFA04
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseBrownCave
 	.4byte gTilesetPalettes_SecretBaseBrownCave
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseTree: ; 83DFA1C
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseTree: @ 83DFA1C
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseTree
 	.4byte gTilesetPalettes_SecretBaseTree
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseShrub: ; 83DFA34
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseShrub: @ 83DFA34
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseShrub
 	.4byte gTilesetPalettes_SecretBaseShrub
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseBlueCave: ; 83DFA4C
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseBlueCave: @ 83DFA4C
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseBlueCave
 	.4byte gTilesetPalettes_SecretBaseBlueCave
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseYellowCave: ; 83DFA64
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseYellowCave: @ 83DFA64
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseYellowCave
 	.4byte gTilesetPalettes_SecretBaseYellowCave
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBaseRedCave: ; 83DFA7C
-	.byte FALSE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBaseRedCave: @ 83DFA7C
+	.byte FALSE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBaseRedCave
 	.4byte gTilesetPalettes_SecretBaseRedCave
 	.4byte gMetatiles_SecretBaseSecondary
 	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_InsideOfTruck: ; 83DFA94
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_InsideOfTruck: @ 83DFA94
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_InsideOfTruck
 	.4byte gTilesetPalettes_InsideOfTruck
 	.4byte gMetatiles_InsideOfTruck
 	.4byte gMetatileAttributes_InsideOfTruck
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Unused2: ; 83DFAAC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Unused2: @ 83DFAAC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Unused2
 	.4byte gTilesetPalettes_Unused2
 	.4byte gMetatiles_Unused2
 	.4byte gMetatileAttributes_Unused2
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Contest: ; 83DFAC4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Contest: @ 83DFAC4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Contest
 	.4byte gTilesetPalettes_Contest
 	.4byte gMetatiles_Contest
 	.4byte gMetatileAttributes_Contest
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_LilycoveMuseum: ; 83DFADC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_LilycoveMuseum: @ 83DFADC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_LilycoveMuseum
 	.4byte gTilesetPalettes_LilycoveMuseum
 	.4byte gMetatiles_LilycoveMuseum
 	.4byte gMetatileAttributes_LilycoveMuseum
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BrendansMaysHouse: ; 83DFAF4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BrendansMaysHouse: @ 83DFAF4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BrendansMaysHouse
 	.4byte gTilesetPalettes_BrendansMaysHouse
 	.4byte gMetatiles_BrendansMaysHouse
 	.4byte gMetatileAttributes_BrendansMaysHouse
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Lab: ; 83DFB0C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Lab: @ 83DFB0C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Lab
 	.4byte gTilesetPalettes_Lab
 	.4byte gMetatiles_Lab
 	.4byte gMetatileAttributes_Lab
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_Underwater: ; 83DFB24
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_Underwater: @ 83DFB24
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_Underwater
 	.4byte gTilesetPalettes_Underwater
 	.4byte gMetatiles_Underwater
@@ -540,22 +540,22 @@ gTileset_Underwater: ; 83DFB24
 
 	.align 2, 0
 
-gTileset_PetalburgGym: ; 83DFB3C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_PetalburgGym: @ 83DFB3C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_PetalburgGym
 	.4byte gTilesetPalettes_PetalburgGym
 	.4byte gMetatiles_PetalburgGym
 	.4byte gMetatileAttributes_PetalburgGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SootopolisGym: ; 83DFB54
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SootopolisGym: @ 83DFB54
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SootopolisGym
 	.4byte gTilesetPalettes_SootopolisGym
 	.4byte gMetatiles_SootopolisGym
@@ -564,58 +564,58 @@ gTileset_SootopolisGym: ; 83DFB54
 
 	.align 2, 0
 
-gTileset_GenericBuilding: ; 83DFB6C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_GenericBuilding: @ 83DFB6C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_GenericBuilding
 	.4byte gTilesetPalettes_GenericBuilding
 	.4byte gMetatiles_GenericBuilding
 	.4byte gMetatileAttributes_GenericBuilding
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MauvilleGameCorner: ; 83DFB84
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MauvilleGameCorner: @ 83DFB84
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MauvilleGameCorner
 	.4byte gTilesetPalettes_MauvilleGameCorner
 	.4byte gMetatiles_MauvilleGameCorner
 	.4byte gMetatileAttributes_MauvilleGameCorner
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_RustboroGym: ; 83DFB9C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_RustboroGym: @ 83DFB9C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_RustboroGym
 	.4byte gTilesetPalettes_RustboroGym
 	.4byte gMetatiles_RustboroGym
 	.4byte gMetatileAttributes_RustboroGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_DewfordGym: ; 83DFBB4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_DewfordGym: @ 83DFBB4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_DewfordGym
 	.4byte gTilesetPalettes_DewfordGym
 	.4byte gMetatiles_DewfordGym
 	.4byte gMetatileAttributes_DewfordGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MauvilleGym: ; 83DFBCC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MauvilleGym: @ 83DFBCC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MauvilleGym
 	.4byte gTilesetPalettes_MauvilleGym
 	.4byte gMetatiles_MauvilleGym
@@ -624,92 +624,92 @@ gTileset_MauvilleGym: ; 83DFBCC
 
 	.align 2, 0
 
-gTileset_LavaridgeGym: ; 83DFBE4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_LavaridgeGym: @ 83DFBE4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_LavaridgeGym
 	.4byte gTilesetPalettes_LavaridgeGym
 	.4byte gMetatiles_LavaridgeGym
 	.4byte gMetatileAttributes_LavaridgeGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_TrickHousePuzzle: ; 83DFBFC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_TrickHousePuzzle: @ 83DFBFC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_TrickHousePuzzle
 	.4byte gTilesetPalettes_TrickHousePuzzle
 	.4byte gMetatiles_TrickHousePuzzle
 	.4byte gMetatileAttributes_TrickHousePuzzle
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_FortreeGym: ; 83DFC14
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_FortreeGym: @ 83DFC14
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_FortreeGym
 	.4byte gTilesetPalettes_FortreeGym
 	.4byte gMetatiles_FortreeGym
 	.4byte gMetatileAttributes_FortreeGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MossdeepGym: ; 83DFC2C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MossdeepGym: @ 83DFC2C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MossdeepGym
 	.4byte gTilesetPalettes_MossdeepGym
 	.4byte gMetatiles_MossdeepGym
 	.4byte gMetatileAttributes_MossdeepGym
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_InsideShip: ; 83DFC44
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_InsideShip: @ 83DFC44
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_InsideShip
 	.4byte gTilesetPalettes_InsideShip
 	.4byte gMetatiles_InsideShip
 	.4byte gMetatileAttributes_InsideShip
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_SecretBase: ; 83DFC5C
-	.byte FALSE ; is compressed
-	.byte FALSE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_SecretBase: @ 83DFC5C
+	.byte FALSE @ is compressed
+	.byte FALSE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_SecretBase
 	.4byte gTilesetPalettes_SecretBase
 	.4byte gMetatiles_SecretBasePrimary
 	.4byte gMetatileAttributes_SecretBasePrimary
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTilesetPointer_SecretBase: ; 83DFC74
+gTilesetPointer_SecretBase: @ 83DFC74
 	.4byte gTileset_SecretBase
 
 	.align 2, 0
 
-gTilesetPointer_SecretBaseRedCave: ; 83DFC78
+gTilesetPointer_SecretBaseRedCave: @ 83DFC78
 	.4byte gTileset_SecretBaseRedCave
 
 	.align 2, 0
 
-gTileset_EliteFour: ; 83DFC7C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_EliteFour: @ 83DFC7C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_EliteFour
 	.4byte gTilesetPalettes_EliteFour
 	.4byte gMetatiles_EliteFour
@@ -718,34 +718,34 @@ gTileset_EliteFour: ; 83DFC7C
 
 	.align 2, 0
 
-gTileset_BattleFrontier: ; 83DFC94
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleFrontier: @ 83DFC94
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleFrontier
 	.4byte gTilesetPalettes_BattleFrontier
 	.4byte gMetatiles_BattleFrontier
 	.4byte gMetatileAttributes_BattleFrontier
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattlePalace: ; 83DFCAC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattlePalace: @ 83DFCAC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattlePalace
 	.4byte gTilesetPalettes_BattlePalace
 	.4byte gMetatiles_BattlePalace
 	.4byte gMetatileAttributes_BattlePalace
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattleDome: ; 83DFCC4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleDome: @ 83DFCC4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleDome
 	.4byte gTilesetPalettes_BattleDome
 	.4byte gMetatiles_BattleDome
@@ -754,46 +754,46 @@ gTileset_BattleDome: ; 83DFCC4
 
 	.align 2, 0
 
-gTileset_BattleFactory: ; 83DFCDC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleFactory: @ 83DFCDC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleFactory
 	.4byte gTilesetPalettes_BattleFactory
 	.4byte gMetatiles_BattleFactory
 	.4byte gMetatileAttributes_BattleFactory
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattlePike: ; 83DFCF4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattlePike: @ 83DFCF4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattlePike
 	.4byte gTilesetPalettes_BattlePike
 	.4byte gMetatiles_BattlePike
 	.4byte gMetatileAttributes_BattlePike
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattleArena: ; 83DFD0C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleArena: @ 83DFD0C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleArena
 	.4byte gTilesetPalettes_BattleArena
 	.4byte gMetatiles_BattleArena
 	.4byte gMetatileAttributes_BattleArena
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattlePyramid: ; 83DFD24
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattlePyramid: @ 83DFD24
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattlePyramid
 	.4byte gTilesetPalettes_BattlePyramid
 	.4byte gMetatiles_BattlePyramid
@@ -802,108 +802,108 @@ gTileset_BattlePyramid: ; 83DFD24
 
 	.align 2, 0
 
-gTileset_MirageTower: ; 83DFD3C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MirageTower: @ 83DFD3C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MirageTower
 	.4byte gTilesetPalettes_MirageTower
 	.4byte gMetatiles_MirageTower
 	.4byte gMetatileAttributes_MirageTower
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MossdeepGameCorner: ; 83DFD54
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MossdeepGameCorner: @ 83DFD54
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MossdeepGameCorner
 	.4byte gTilesetPalettes_MossdeepGameCorner
 	.4byte gMetatiles_MossdeepGameCorner
 	.4byte gMetatileAttributes_MossdeepGameCorner
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_IslandHarbor: ; 83DFD6C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_IslandHarbor: @ 83DFD6C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_IslandHarbor
 	.4byte gTilesetPalettes_IslandHarbor
 	.4byte gMetatiles_IslandHarbor
 	.4byte gMetatileAttributes_IslandHarbor
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_TrainerHill: ; 83DFD84
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_TrainerHill: @ 83DFD84
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_TrainerHill
 	.4byte gTilesetPalettes_TrainerHill
 	.4byte gMetatiles_TrainerHill
 	.4byte gMetatileAttributes_TrainerHill
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_NavelRock: ; 83DFD9C
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_NavelRock: @ 83DFD9C
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_NavelRock
 	.4byte gTilesetPalettes_NavelRock
 	.4byte gMetatiles_NavelRock
 	.4byte gMetatileAttributes_NavelRock
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattleFrontierRankingHall: ; 83DFDB4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleFrontierRankingHall: @ 83DFDB4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleFrontierRankingHall
 	.4byte gTilesetPalettes_BattleFrontierRankingHall
 	.4byte gMetatiles_BattleFrontierRankingHall
 	.4byte gMetatileAttributes_BattleFrontierRankingHall
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_BattleTent: ; 83DFDCC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_BattleTent: @ 83DFDCC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_BattleTent
 	.4byte gTilesetPalettes_BattleTent
 	.4byte gMetatiles_BattleTent
 	.4byte gMetatileAttributes_BattleTent
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_MysteryEventsHouse: ; 83DFDE4
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_MysteryEventsHouse: @ 83DFDE4
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_MysteryEventsHouse
 	.4byte gTilesetPalettes_MysteryEventsHouse
 	.4byte gMetatiles_MysteryEventsHouse
 	.4byte gMetatileAttributes_MysteryEventsHouse
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
 
 	.align 2, 0
 
-gTileset_UnionRoom: ; 83DFDFC
-	.byte TRUE ; is compressed
-	.byte TRUE ; is secondary tileset
-	.2byte 0 ; padding
+gTileset_UnionRoom: @ 83DFDFC
+	.byte TRUE @ is compressed
+	.byte TRUE @ is secondary tileset
+	.2byte 0 @ padding
 	.4byte gTilesetTiles_UnionRoom
 	.4byte gTilesetPalettes_UnionRoom
 	.4byte gMetatiles_UnionRoom
 	.4byte gMetatileAttributes_UnionRoom
-	.4byte NULL ; animation callback
+	.4byte NULL @ animation callback
diff --git a/data/graphics/trainers/trainer_back_pic_palette_table.s b/data/graphics/trainers/trainer_back_pic_palette_table.s
index d8dc57c4a..4b5804642 100644
--- a/data/graphics/trainers/trainer_back_pic_palette_table.s
+++ b/data/graphics/trainers/trainer_back_pic_palette_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gTrainerBackPicPaletteTable: ; 8305D8C
+gTrainerBackPicPaletteTable: @ 8305D8C
 	obj_pal gTrainerPalette_Brendan, 0
 	obj_pal gTrainerPalette_May, 1
 	obj_pal gTrainerBackPicPalette_Red, 2
diff --git a/data/graphics/trainers/trainer_back_pic_table.s b/data/graphics/trainers/trainer_back_pic_table.s
index 87799c1e2..d44bdac4d 100644
--- a/data/graphics/trainers/trainer_back_pic_table.s
+++ b/data/graphics/trainers/trainer_back_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gTrainerBackPicTable: ; 8305D4C
+gTrainerBackPicTable: @ 8305D4C
 	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
 	obj_tiles gTrainerBackPic_May, 0x2000, 1
 	obj_tiles gTrainerBackPic_Red, 0x2800, 2
diff --git a/data/graphics/trainers/trainer_front_pic_palette_table.s b/data/graphics/trainers/trainer_front_pic_palette_table.s
index 6703d6fe3..9b7c5206f 100644
--- a/data/graphics/trainers/trainer_front_pic_palette_table.s
+++ b/data/graphics/trainers/trainer_front_pic_palette_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gTrainerFrontPicPaletteTable: ; 830593C
+gTrainerFrontPicPaletteTable: @ 830593C
 	obj_pal gTrainerPalette_Hiker, 0
 	obj_pal gTrainerPalette_AquaGruntM, 1
 	obj_pal gTrainerPalette_PokemonBreederF, 2
diff --git a/data/graphics/trainers/trainer_front_pic_table.s b/data/graphics/trainers/trainer_front_pic_table.s
index 1549d8e1d..1fda4888c 100644
--- a/data/graphics/trainers/trainer_front_pic_table.s
+++ b/data/graphics/trainers/trainer_front_pic_table.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gTrainerFrontPicTable: ; 8305654
+gTrainerFrontPicTable: @ 8305654
 	obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
 	obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
 	obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
diff --git a/data/graphics/trainers/trainer_graphics.s b/data/graphics/trainers/trainer_graphics.s
index f46de64cd..7c73d4358 100644
--- a/data/graphics/trainers/trainer_graphics.s
+++ b/data/graphics/trainers/trainer_graphics.s
@@ -1,979 +1,979 @@
 	.align 2, 0
 
-gTrainerFrontPic_Hiker: ; 8D51DC8
+gTrainerFrontPic_Hiker: @ 8D51DC8
 	.incbin "data/graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Hiker: ; 8D52248
+gTrainerPalette_Hiker: @ 8D52248
 	.incbin "data/graphics/trainers/palettes/hiker.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AquaGruntM: ; 8D52270
+gTrainerFrontPic_AquaGruntM: @ 8D52270
 	.incbin "data/graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AquaGruntM: ; 8D525D0
+gTrainerPalette_AquaGruntM: @ 8D525D0
 	.incbin "data/graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PokemonBreederF: ; 8D525F8
+gTrainerFrontPic_PokemonBreederF: @ 8D525F8
 	.incbin "data/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PokemonBreederF: ; 8D5292C
+gTrainerPalette_PokemonBreederF: @ 8D5292C
 	.incbin "data/graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_CoolTrainerM: ; 8D52954
+gTrainerFrontPic_CoolTrainerM: @ 8D52954
 	.incbin "data/graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_CoolTrainerM: ; 8D52C3C
+gTrainerPalette_CoolTrainerM: @ 8D52C3C
 	.incbin "data/graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_BirdKeeper: ; 8D52C64
+gTrainerFrontPic_BirdKeeper: @ 8D52C64
 	.incbin "data/graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_BirdKeeper: ; 8D52F9C
+gTrainerPalette_BirdKeeper: @ 8D52F9C
 	.incbin "data/graphics/trainers/palettes/bird_keeper.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Collector: ; 8D52FC4
+gTrainerFrontPic_Collector: @ 8D52FC4
 	.incbin "data/graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Collector: ; 8D533C8
+gTrainerPalette_Collector: @ 8D533C8
 	.incbin "data/graphics/trainers/palettes/collector.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AquaGruntF: ; 8D533F0
+gTrainerFrontPic_AquaGruntF: @ 8D533F0
 	.incbin "data/graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AquaGruntF: ; 8D5372C
+gTrainerPalette_AquaGruntF: @ 8D5372C
 	.incbin "data/graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SwimmerM: ; 8D53754
+gTrainerFrontPic_SwimmerM: @ 8D53754
 	.incbin "data/graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SwimmerM: ; 8D53A14
+gTrainerPalette_SwimmerM: @ 8D53A14
 	.incbin "data/graphics/trainers/palettes/swimmer_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_MagmaGruntM: ; 8D53A3C
+gTrainerFrontPic_MagmaGruntM: @ 8D53A3C
 	.incbin "data/graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_MagmaGruntM: ; 8D53DBC
+gTrainerPalette_MagmaGruntM: @ 8D53DBC
 	.incbin "data/graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_ExpertM: ; 8D53DE4
+gTrainerFrontPic_ExpertM: @ 8D53DE4
 	.incbin "data/graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_ExpertM: ; 8D54124
+gTrainerPalette_ExpertM: @ 8D54124
 	.incbin "data/graphics/trainers/palettes/expert_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AquaAdminM: ; 8D5414C
+gTrainerFrontPic_AquaAdminM: @ 8D5414C
 	.incbin "data/graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AquaAdminM: ; 8D54500
+gTrainerPalette_AquaAdminM: @ 8D54500
 	.incbin "data/graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_BlackBelt: ; 8D54528
+gTrainerFrontPic_BlackBelt: @ 8D54528
 	.incbin "data/graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_BlackBelt: ; 8D5488C
+gTrainerPalette_BlackBelt: @ 8D5488C
 	.incbin "data/graphics/trainers/palettes/black_belt.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AquaAdminF: ; 8D548B4
+gTrainerFrontPic_AquaAdminF: @ 8D548B4
 	.incbin "data/graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AquaAdminF: ; 8D54C78
+gTrainerPalette_AquaAdminF: @ 8D54C78
 	.incbin "data/graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AquaLeaderArchie: ; 8D54CA0
+gTrainerFrontPic_AquaLeaderArchie: @ 8D54CA0
 	.incbin "data/graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AquaLeaderArchie: ; 8D54FDC
+gTrainerPalette_AquaLeaderArchie: @ 8D54FDC
 	.incbin "data/graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_HexManiac: ; 8D55004
+gTrainerFrontPic_HexManiac: @ 8D55004
 	.incbin "data/graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_HexManiac: ; 8D55370
+gTrainerPalette_HexManiac: @ 8D55370
 	.incbin "data/graphics/trainers/palettes/hex_maniac.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_AromaLady: ; 8D55398
+gTrainerFrontPic_AromaLady: @ 8D55398
 	.incbin "data/graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_AromaLady: ; 8D5565C
+gTrainerPalette_AromaLady: @ 8D5565C
 	.incbin "data/graphics/trainers/palettes/aroma_lady.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RuinManiac: ; 8D55684
+gTrainerFrontPic_RuinManiac: @ 8D55684
 	.incbin "data/graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RuinManiac: ; 8D55A20
+gTrainerPalette_RuinManiac: @ 8D55A20
 	.incbin "data/graphics/trainers/palettes/ruin_maniac.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Interviewer: ; 8D55A48
+gTrainerFrontPic_Interviewer: @ 8D55A48
 	.incbin "data/graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Interviewer: ; 8D55EEC
+gTrainerPalette_Interviewer: @ 8D55EEC
 	.incbin "data/graphics/trainers/palettes/interviewer.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_TuberF: ; 8D55F14
+gTrainerFrontPic_TuberF: @ 8D55F14
 	.incbin "data/graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_TuberF: ; 8D561B8
+gTrainerPalette_TuberF: @ 8D561B8
 	.incbin "data/graphics/trainers/palettes/tuber_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_TuberM: ; 8D561E0
+gTrainerFrontPic_TuberM: @ 8D561E0
 	.incbin "data/graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_TuberM: ; 8D5646C
+gTrainerPalette_TuberM: @ 8D5646C
 	.incbin "data/graphics/trainers/palettes/tuber_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_CoolTrainerF: ; 8D56494
+gTrainerFrontPic_CoolTrainerF: @ 8D56494
 	.incbin "data/graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_CoolTrainerF: ; 8D567A8
+gTrainerPalette_CoolTrainerF: @ 8D567A8
 	.incbin "data/graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Lady: ; 8D567D0
+gTrainerFrontPic_Lady: @ 8D567D0
 	.incbin "data/graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Lady: ; 8D56B84
+gTrainerPalette_Lady: @ 8D56B84
 	.incbin "data/graphics/trainers/palettes/lady.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Beauty: ; 8D56BAC
+gTrainerFrontPic_Beauty: @ 8D56BAC
 	.incbin "data/graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Beauty: ; 8D56E94
+gTrainerPalette_Beauty: @ 8D56E94
 	.incbin "data/graphics/trainers/palettes/beauty.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RichBoy: ; 8D56EBC
+gTrainerFrontPic_RichBoy: @ 8D56EBC
 	.incbin "data/graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RichBoy: ; 8D57170
+gTrainerPalette_RichBoy: @ 8D57170
 	.incbin "data/graphics/trainers/palettes/rich_boy.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_ExpertF: ; 8D57198
+gTrainerFrontPic_ExpertF: @ 8D57198
 	.incbin "data/graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_ExpertF: ; 8D574B4
+gTrainerPalette_ExpertF: @ 8D574B4
 	.incbin "data/graphics/trainers/palettes/expert_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Pokemaniac: ; 8D574DC
+gTrainerFrontPic_Pokemaniac: @ 8D574DC
 	.incbin "data/graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Pokemaniac: ; 8D5784C
+gTrainerPalette_Pokemaniac: @ 8D5784C
 	.incbin "data/graphics/trainers/palettes/pokemaniac.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_MagmaGruntF: ; 8D57874
+gTrainerFrontPic_MagmaGruntF: @ 8D57874
 	.incbin "data/graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_MagmaGruntF: ; 8D57C00
+gTrainerPalette_MagmaGruntF: @ 8D57C00
 	.incbin "data/graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Guitarist: ; 8D57C28
+gTrainerFrontPic_Guitarist: @ 8D57C28
 	.incbin "data/graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Guitarist: ; 8D57FAC
+gTrainerPalette_Guitarist: @ 8D57FAC
 	.incbin "data/graphics/trainers/palettes/guitarist.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Kindler: ; 8D57FD4
+gTrainerFrontPic_Kindler: @ 8D57FD4
 	.incbin "data/graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Kindler: ; 8D58340
+gTrainerPalette_Kindler: @ 8D58340
 	.incbin "data/graphics/trainers/palettes/kindler.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Camper: ; 8D58368
+gTrainerFrontPic_Camper: @ 8D58368
 	.incbin "data/graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Camper: ; 8D58650
+gTrainerPalette_Camper: @ 8D58650
 	.incbin "data/graphics/trainers/palettes/camper.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Picnicker: ; 8D58678
+gTrainerFrontPic_Picnicker: @ 8D58678
 	.incbin "data/graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Picnicker: ; 8D58958
+gTrainerPalette_Picnicker: @ 8D58958
 	.incbin "data/graphics/trainers/palettes/picnicker.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_BugManiac: ; 8D58980
+gTrainerFrontPic_BugManiac: @ 8D58980
 	.incbin "data/graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_BugManiac: ; 8D58DD0
+gTrainerPalette_BugManiac: @ 8D58DD0
 	.incbin "data/graphics/trainers/palettes/bug_maniac.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PokemonBreederM: ; 8D58DF8
+gTrainerFrontPic_PokemonBreederM: @ 8D58DF8
 	.incbin "data/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PokemonBreederM: ; 8D59128
+gTrainerPalette_PokemonBreederM: @ 8D59128
 	.incbin "data/graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PsychicM: ; 8D59150
+gTrainerFrontPic_PsychicM: @ 8D59150
 	.incbin "data/graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PsychicM: ; 8D5947C
+gTrainerPalette_PsychicM: @ 8D5947C
 	.incbin "data/graphics/trainers/palettes/psychic_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PsychicF: ; 8D594A4
+gTrainerFrontPic_PsychicF: @ 8D594A4
 	.incbin "data/graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PsychicF: ; 8D597CC
+gTrainerPalette_PsychicF: @ 8D597CC
 	.incbin "data/graphics/trainers/palettes/psychic_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Gentleman: ; 8D597F4
+gTrainerFrontPic_Gentleman: @ 8D597F4
 	.incbin "data/graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Gentleman: ; 8D59AF4
+gTrainerPalette_Gentleman: @ 8D59AF4
 	.incbin "data/graphics/trainers/palettes/gentleman.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_EliteFourSidney: ; 8D59B1C
+gTrainerFrontPic_EliteFourSidney: @ 8D59B1C
 	.incbin "data/graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_EliteFourSidney: ; 8D59E50
+gTrainerPalette_EliteFourSidney: @ 8D59E50
 	.incbin "data/graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_EliteFourPhoebe: ; 8D59E78
+gTrainerFrontPic_EliteFourPhoebe: @ 8D59E78
 	.incbin "data/graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_EliteFourPhoebe: ; 8D5A178
+gTrainerPalette_EliteFourPhoebe: @ 8D5A178
 	.incbin "data/graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_EliteFourGlacia: ; 8D5A1A0
+gTrainerFrontPic_EliteFourGlacia: @ 8D5A1A0
 	.incbin "data/graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_EliteFourGlacia: ; 8D5A524
+gTrainerPalette_EliteFourGlacia: @ 8D5A524
 	.incbin "data/graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_EliteFourDrake: ; 8D5A54C
+gTrainerFrontPic_EliteFourDrake: @ 8D5A54C
 	.incbin "data/graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_EliteFourDrake: ; 8D5A8F4
+gTrainerPalette_EliteFourDrake: @ 8D5A8F4
 	.incbin "data/graphics/trainers/palettes/elite_four_drake.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderRoxanne: ; 8D5A91C
+gTrainerFrontPic_LeaderRoxanne: @ 8D5A91C
 	.incbin "data/graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderRoxanne: ; 8D5AC08
+gTrainerPalette_LeaderRoxanne: @ 8D5AC08
 	.incbin "data/graphics/trainers/palettes/leader_roxanne.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderBrawly: ; 8D5AC30
+gTrainerFrontPic_LeaderBrawly: @ 8D5AC30
 	.incbin "data/graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderBrawly: ; 8D5AFC4
+gTrainerPalette_LeaderBrawly: @ 8D5AFC4
 	.incbin "data/graphics/trainers/palettes/leader_brawly.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderWattson: ; 8D5AFEC
+gTrainerFrontPic_LeaderWattson: @ 8D5AFEC
 	.incbin "data/graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderWattson: ; 8D5B334
+gTrainerPalette_LeaderWattson: @ 8D5B334
 	.incbin "data/graphics/trainers/palettes/leader_wattson.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderFlannery: ; 8D5B35C
+gTrainerFrontPic_LeaderFlannery: @ 8D5B35C
 	.incbin "data/graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderFlannery: ; 8D5B6DC
+gTrainerPalette_LeaderFlannery: @ 8D5B6DC
 	.incbin "data/graphics/trainers/palettes/leader_flannery.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderNorman: ; 8D5B704
+gTrainerFrontPic_LeaderNorman: @ 8D5B704
 	.incbin "data/graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderNorman: ; 8D5BA40
+gTrainerPalette_LeaderNorman: @ 8D5BA40
 	.incbin "data/graphics/trainers/palettes/leader_norman.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderWinona: ; 8D5BA68
+gTrainerFrontPic_LeaderWinona: @ 8D5BA68
 	.incbin "data/graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderWinona: ; 8D5BDE8
+gTrainerPalette_LeaderWinona: @ 8D5BDE8
 	.incbin "data/graphics/trainers/palettes/leader_winona.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderTateAndLiza: ; 8D5BE10
+gTrainerFrontPic_LeaderTateAndLiza: @ 8D5BE10
 	.incbin "data/graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderTateAndLiza: ; 8D5C254
+gTrainerPalette_LeaderTateAndLiza: @ 8D5C254
 	.incbin "data/graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_LeaderJuan: ; 8D5C27C
+gTrainerFrontPic_LeaderJuan: @ 8D5C27C
 	.incbin "data/graphics/trainers/front_pics/leader_juan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_LeaderJuan: ; 8D5C624
+gTrainerPalette_LeaderJuan: @ 8D5C624
 	.incbin "data/graphics/trainers/palettes/leader_juan.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SchoolKidM: ; 8D5C64C
+gTrainerFrontPic_SchoolKidM: @ 8D5C64C
 	.incbin "data/graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SchoolKidM: ; 8D5C90C
+gTrainerPalette_SchoolKidM: @ 8D5C90C
 	.incbin "data/graphics/trainers/palettes/school_kid_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SchoolKidF: ; 8D5C934
+gTrainerFrontPic_SchoolKidF: @ 8D5C934
 	.incbin "data/graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SchoolKidF: ; 8D5CBD0
+gTrainerPalette_SchoolKidF: @ 8D5CBD0
 	.incbin "data/graphics/trainers/palettes/school_kid_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SrAndJr: ; 8D5CBF8
+gTrainerFrontPic_SrAndJr: @ 8D5CBF8
 	.incbin "data/graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SrAndJr: ; 8D5D068
+gTrainerPalette_SrAndJr: @ 8D5D068
 	.incbin "data/graphics/trainers/palettes/sr_and_jr.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_WinstrateM: ; 8D5D090
+gTrainerFrontPic_WinstrateM: @ 8D5D090
 	.incbin "data/graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_WinstrateM: ; 8D5D44C
+gTrainerPalette_WinstrateM: @ 8D5D44C
 	.incbin "data/graphics/trainers/palettes/winstrate_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_WinstrateF: ; 8D5D474
+gTrainerFrontPic_WinstrateF: @ 8D5D474
 	.incbin "data/graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_WinstrateF: ; 8D5D840
+gTrainerPalette_WinstrateF: @ 8D5D840
 	.incbin "data/graphics/trainers/palettes/winstrate_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Youngster: ; 8D5D868
+gTrainerFrontPic_Youngster: @ 8D5D868
 	.incbin "data/graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Youngster: ; 8D5DB10
+gTrainerPalette_Youngster: @ 8D5DB10
 	.incbin "data/graphics/trainers/palettes/youngster.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_ChampionWallace: ; 8D5DB38
+gTrainerFrontPic_ChampionWallace: @ 8D5DB38
 	.incbin "data/graphics/trainers/front_pics/champion_wallace_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_ChampionWallace: ; 8D5DF8C
+gTrainerPalette_ChampionWallace: @ 8D5DF8C
 	.incbin "data/graphics/trainers/palettes/champion_wallace.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Fisherman: ; 8D5DFB4
+gTrainerFrontPic_Fisherman: @ 8D5DFB4
 	.incbin "data/graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Fisherman: ; 8D5E398
+gTrainerPalette_Fisherman: @ 8D5E398
 	.incbin "data/graphics/trainers/palettes/fisherman.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_CyclingTriathleteM: ; 8D5E3C0
+gTrainerFrontPic_CyclingTriathleteM: @ 8D5E3C0
 	.incbin "data/graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_CyclingTriathleteM: ; 8D5E7D0
+gTrainerPalette_CyclingTriathleteM: @ 8D5E7D0
 	.incbin "data/graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_CyclingTriathleteF: ; 8D5E7F8
+gTrainerFrontPic_CyclingTriathleteF: @ 8D5E7F8
 	.incbin "data/graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_CyclingTriathleteF: ; 8D5EC04
+gTrainerPalette_CyclingTriathleteF: @ 8D5EC04
 	.incbin "data/graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RunningTriathleteM: ; 8D5EC2C
+gTrainerFrontPic_RunningTriathleteM: @ 8D5EC2C
 	.incbin "data/graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RunningTriathleteM: ; 8D5EEE4
+gTrainerPalette_RunningTriathleteM: @ 8D5EEE4
 	.incbin "data/graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RunningTriathleteF: ; 8D5EF0C
+gTrainerFrontPic_RunningTriathleteF: @ 8D5EF0C
 	.incbin "data/graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RunningTriathleteF: ; 8D5F1B0
+gTrainerPalette_RunningTriathleteF: @ 8D5F1B0
 	.incbin "data/graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SwimmingTriathleteM: ; 8D5F1D8
+gTrainerFrontPic_SwimmingTriathleteM: @ 8D5F1D8
 	.incbin "data/graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SwimmingTriathleteM: ; 8D5F504
+gTrainerPalette_SwimmingTriathleteM: @ 8D5F504
 	.incbin "data/graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SwimmingTriathleteF: ; 8D5F52C
+gTrainerFrontPic_SwimmingTriathleteF: @ 8D5F52C
 	.incbin "data/graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SwimmingTriathleteF: ; 8D5F808
+gTrainerPalette_SwimmingTriathleteF: @ 8D5F808
 	.incbin "data/graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_DragonTamer: ; 8D5F830
+gTrainerFrontPic_DragonTamer: @ 8D5F830
 	.incbin "data/graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_DragonTamer: ; 8D5FB84
+gTrainerPalette_DragonTamer: @ 8D5FB84
 	.incbin "data/graphics/trainers/palettes/dragon_tamer.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_NinjaBoy: ; 8D5FBAC
+gTrainerFrontPic_NinjaBoy: @ 8D5FBAC
 	.incbin "data/graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_NinjaBoy: ; 8D5FE88
+gTrainerPalette_NinjaBoy: @ 8D5FE88
 	.incbin "data/graphics/trainers/palettes/ninja_boy.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_BattleGirl: ; 8D5FEB0
+gTrainerFrontPic_BattleGirl: @ 8D5FEB0
 	.incbin "data/graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_BattleGirl: ; 8D601D0
+gTrainerPalette_BattleGirl: @ 8D601D0
 	.incbin "data/graphics/trainers/palettes/battle_girl.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_ParasolLady: ; 8D601F8
+gTrainerFrontPic_ParasolLady: @ 8D601F8
 	.incbin "data/graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_ParasolLady: ; 8D60530
+gTrainerPalette_ParasolLady: @ 8D60530
 	.incbin "data/graphics/trainers/palettes/parasol_lady.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SwimmerF: ; 8D60558
+gTrainerFrontPic_SwimmerF: @ 8D60558
 	.incbin "data/graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SwimmerF: ; 8D60828
+gTrainerPalette_SwimmerF: @ 8D60828
 	.incbin "data/graphics/trainers/palettes/swimmer_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Twins: ; 8D60850
+gTrainerFrontPic_Twins: @ 8D60850
 	.incbin "data/graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Twins: ; 8D60C14
+gTrainerPalette_Twins: @ 8D60C14
 	.incbin "data/graphics/trainers/palettes/twins.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Sailor: ; 8D60C3C
+gTrainerFrontPic_Sailor: @ 8D60C3C
 	.incbin "data/graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Sailor: ; 8D60FEC
+gTrainerPalette_Sailor: @ 8D60FEC
 	.incbin "data/graphics/trainers/palettes/sailor.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_MagmaAdmin: ; 8D61014
+gTrainerFrontPic_MagmaAdmin: @ 8D61014
 	.incbin "data/graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_MagmaAdmin: ; 8D613EC
+gTrainerPalette_MagmaAdmin: @ 8D613EC
 	.incbin "data/graphics/trainers/palettes/magma_admin.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Wally: ; 8D61414
+gTrainerFrontPic_Wally: @ 8D61414
 	.incbin "data/graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Wally: ; 8D616E4
+gTrainerPalette_Wally: @ 8D616E4
 	.incbin "data/graphics/trainers/palettes/wally.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Brendan: ; 8D6170C
+gTrainerFrontPic_Brendan: @ 8D6170C
 	.incbin "data/graphics/trainers/front_pics/brendan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Brendan: ; 8D61A30
+gTrainerPalette_Brendan: @ 8D61A30
 	.incbin "data/graphics/trainers/palettes/brendan.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_May: ; 8D61A58
+gTrainerFrontPic_May: @ 8D61A58
 	.incbin "data/graphics/trainers/front_pics/may_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_May: ; 8D61D58
+gTrainerPalette_May: @ 8D61D58
 	.incbin "data/graphics/trainers/palettes/may.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_BugCatcher: ; 8D61D80
+gTrainerFrontPic_BugCatcher: @ 8D61D80
 	.incbin "data/graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_BugCatcher: ; 8D620AC
+gTrainerPalette_BugCatcher: @ 8D620AC
 	.incbin "data/graphics/trainers/palettes/bug_catcher.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PokemonRangerM: ; 8D620D4
+gTrainerFrontPic_PokemonRangerM: @ 8D620D4
 	.incbin "data/graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PokemonRangerM: ; 8D6241C
+gTrainerPalette_PokemonRangerM: @ 8D6241C
 	.incbin "data/graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PokemonRangerF: ; 8D62444
+gTrainerFrontPic_PokemonRangerF: @ 8D62444
 	.incbin "data/graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PokemonRangerF: ; 8D62778
+gTrainerPalette_PokemonRangerF: @ 8D62778
 	.incbin "data/graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_MagmaLeaderMaxie: ; 8D627A0
+gTrainerFrontPic_MagmaLeaderMaxie: @ 8D627A0
 	.incbin "data/graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_MagmaLeaderMaxie: ; 8D62A94
+gTrainerPalette_MagmaLeaderMaxie: @ 8D62A94
 	.incbin "data/graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Lass: ; 8D62ABC
+gTrainerFrontPic_Lass: @ 8D62ABC
 	.incbin "data/graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Lass: ; 8D62D94
+gTrainerPalette_Lass: @ 8D62D94
 	.incbin "data/graphics/trainers/palettes/lass.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_YoungCouple: ; 8D62DBC
+gTrainerFrontPic_YoungCouple: @ 8D62DBC
 	.incbin "data/graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_YoungCouple: ; 8D6317C
+gTrainerPalette_YoungCouple: @ 8D6317C
 	.incbin "data/graphics/trainers/palettes/young_couple.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_OldCouple: ; 8D631A4
+gTrainerFrontPic_OldCouple: @ 8D631A4
 	.incbin "data/graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_OldCouple: ; 8D636B4
+gTrainerPalette_OldCouple: @ 8D636B4
 	.incbin "data/graphics/trainers/palettes/old_couple.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SisAndBro: ; 8D636DC
+gTrainerFrontPic_SisAndBro: @ 8D636DC
 	.incbin "data/graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SisAndBro: ; 8D63B28
+gTrainerPalette_SisAndBro: @ 8D63B28
 	.incbin "data/graphics/trainers/palettes/sis_and_bro.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Steven: ; 8D63B50
+gTrainerFrontPic_Steven: @ 8D63B50
 	.incbin "data/graphics/trainers/front_pics/steven_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Steven: ; 8D63E88
+gTrainerPalette_Steven: @ 8D63E88
 	.incbin "data/graphics/trainers/palettes/steven.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_SalonMaidenAnabel: ; 8D63EB0
+gTrainerFrontPic_SalonMaidenAnabel: @ 8D63EB0
 	.incbin "data/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_SalonMaidenAnabel: ; 8D641B8
+gTrainerPalette_SalonMaidenAnabel: @ 8D641B8
 	.incbin "data/graphics/trainers/palettes/salon_maiden_anabel.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_DomeAceTucker: ; 8D641E0
+gTrainerFrontPic_DomeAceTucker: @ 8D641E0
 	.incbin "data/graphics/trainers/front_pics/dome_ace_tucker_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_DomeAceTucker: ; 8D645E4
+gTrainerPalette_DomeAceTucker: @ 8D645E4
 	.incbin "data/graphics/trainers/palettes/dome_ace_tucker.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PalaceMavenSpenser: ; 8D6460C
+gTrainerFrontPic_PalaceMavenSpenser: @ 8D6460C
 	.incbin "data/graphics/trainers/front_pics/palace_maven_spenser_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PalaceMavenSpenser: ; 8D649B0
+gTrainerPalette_PalaceMavenSpenser: @ 8D649B0
 	.incbin "data/graphics/trainers/palettes/palace_maven_spenser.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_ArenaTycoonGreta: ; 8D649D8
+gTrainerFrontPic_ArenaTycoonGreta: @ 8D649D8
 	.incbin "data/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_ArenaTycoonGreta: ; 8D64D08
+gTrainerPalette_ArenaTycoonGreta: @ 8D64D08
 	.incbin "data/graphics/trainers/palettes/arena_tycoon_greta.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_FactoryHeadNoland: ; 8D64D30
+gTrainerFrontPic_FactoryHeadNoland: @ 8D64D30
 	.incbin "data/graphics/trainers/front_pics/factory_head_noland_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_FactoryHeadNoland: ; 8D650AC
+gTrainerPalette_FactoryHeadNoland: @ 8D650AC
 	.incbin "data/graphics/trainers/palettes/factory_head_noland.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PikeQueenLucy: ; 8D650D4
+gTrainerFrontPic_PikeQueenLucy: @ 8D650D4
 	.incbin "data/graphics/trainers/front_pics/pike_queen_lucy_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PikeQueenLucy: ; 8D653C8
+gTrainerPalette_PikeQueenLucy: @ 8D653C8
 	.incbin "data/graphics/trainers/palettes/pike_queen_lucy.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_PyramidKingBrandon: ; 8D653F0
+gTrainerFrontPic_PyramidKingBrandon: @ 8D653F0
 	.incbin "data/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_PyramidKingBrandon: ; 8D6575C
+gTrainerPalette_PyramidKingBrandon: @ 8D6575C
 	.incbin "data/graphics/trainers/palettes/pyramid_king_brandon.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Red: ; 8D65784
+gTrainerFrontPic_Red: @ 8D65784
 	.incbin "data/graphics/trainers/front_pics/red_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Red: ; 8D65A90
+gTrainerPalette_Red: @ 8D65A90
 	.incbin "data/graphics/trainers/palettes/red.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_Leaf: ; 8D65AB8
+gTrainerFrontPic_Leaf: @ 8D65AB8
 	.incbin "data/graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_Leaf: ; 8D65DF4
+gTrainerPalette_Leaf: @ 8D65DF4
 	.incbin "data/graphics/trainers/palettes/leaf.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RubySapphireBrendan: ; 8D65E1C
+gTrainerFrontPic_RubySapphireBrendan: @ 8D65E1C
 	.incbin "data/graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RubySapphireBrendan: ; 8D66130
+gTrainerPalette_RubySapphireBrendan: @ 8D66130
 	.incbin "data/graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerFrontPic_RubySapphireMay: ; 8D66158
+gTrainerFrontPic_RubySapphireMay: @ 8D66158
 	.incbin "data/graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
 
 	.align 2, 0
 
-gTrainerPalette_RubySapphireMay: ; 8D66458
+gTrainerPalette_RubySapphireMay: @ 8D66458
 	.incbin "data/graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerBackPic_Brendan: ; 8D66480
+gTrainerBackPic_Brendan: @ 8D66480
 	.incbin "data/graphics/trainers/back_pics/brendan_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_May: ; 8D68480
+gTrainerBackPic_May: @ 8D68480
 	.incbin "data/graphics/trainers/back_pics/may_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_Red: ; 8D6A480
+gTrainerBackPic_Red: @ 8D6A480
 	.incbin "data/graphics/trainers/back_pics/red_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_Leaf: ; 8D6CC80
+gTrainerBackPic_Leaf: @ 8D6CC80
 	.incbin "data/graphics/trainers/back_pics/leaf_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_RubySapphireBrendan: ; 8D6F480
+gTrainerBackPic_RubySapphireBrendan: @ 8D6F480
 	.incbin "data/graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_RubySapphireMay: ; 8D71480
+gTrainerBackPic_RubySapphireMay: @ 8D71480
 	.incbin "data/graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_Wally: ; 8D73480
+gTrainerBackPic_Wally: @ 8D73480
 	.incbin "data/graphics/trainers/back_pics/wally_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPic_Steven: ; 8D75480
+gTrainerBackPic_Steven: @ 8D75480
 	.incbin "data/graphics/trainers/back_pics/steven_back_pic.4bpp"
 
 	.align 2, 0
 
-gTrainerBackPicPalette_Red: ; 8D77480
+gTrainerBackPicPalette_Red: @ 8D77480
 	.incbin "data/graphics/trainers/palettes/red_back_pic.gbapal.lz"
 
 	.align 2, 0
 
-gTrainerBackPicPalette_Leaf: ; 8D774A8
+gTrainerBackPicPalette_Leaf: @ 8D774A8
 	.incbin "data/graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
diff --git a/data/item_effect_info.s b/data/item_effect_info.s
index 71b42837c..b7851644b 100644
--- a/data/item_effect_info.s
+++ b/data/item_effect_info.s
@@ -1,4 +1,4 @@
-gPotionItemEffectInfo: ; 831E380
+gPotionItemEffectInfo: @ 831E380
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -7,7 +7,7 @@ gPotionItemEffectInfo: ; 831E380
 	.byte 0x00
 	.byte 20
 
-gAntidoteItemEffectInfo: ; 831E387
+gAntidoteItemEffectInfo: @ 831E387
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -15,7 +15,7 @@ gAntidoteItemEffectInfo: ; 831E387
 	.byte 0x00
 	.byte 0x00
 
-gBurnHealItemEffectInfo: ; 831E38D
+gBurnHealItemEffectInfo: @ 831E38D
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -23,7 +23,7 @@ gBurnHealItemEffectInfo: ; 831E38D
 	.byte 0x00
 	.byte 0x00
 
-gIceHealItemEffectInfo: ; 831E393
+gIceHealItemEffectInfo: @ 831E393
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -31,7 +31,7 @@ gIceHealItemEffectInfo: ; 831E393
 	.byte 0x00
 	.byte 0x00
 
-gAwakeningItemEffectInfo: ; 831E399
+gAwakeningItemEffectInfo: @ 831E399
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -39,7 +39,7 @@ gAwakeningItemEffectInfo: ; 831E399
 	.byte 0x00
 	.byte 0x00
 
-gParalyzeHealItemEffectInfo: ; 831E39F
+gParalyzeHealItemEffectInfo: @ 831E39F
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -47,7 +47,7 @@ gParalyzeHealItemEffectInfo: ; 831E39F
 	.byte 0x00
 	.byte 0x00
 
-gFullRestoreItemEffectInfo: ; 831E3A5
+gFullRestoreItemEffectInfo: @ 831E3A5
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -56,7 +56,7 @@ gFullRestoreItemEffectInfo: ; 831E3A5
 	.byte 0x00
 	.byte 0xff
 
-gMaxPotionItemEffectInfo: ; 831E3AC
+gMaxPotionItemEffectInfo: @ 831E3AC
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -65,7 +65,7 @@ gMaxPotionItemEffectInfo: ; 831E3AC
 	.byte 0x00
 	.byte 0xff
 
-gHyperPotionItemEffectInfo: ; 831E3B3
+gHyperPotionItemEffectInfo: @ 831E3B3
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -74,7 +74,7 @@ gHyperPotionItemEffectInfo: ; 831E3B3
 	.byte 0x00
 	.byte 200
 
-gSuperPotionItemEffectInfo: ; 831E3BA
+gSuperPotionItemEffectInfo: @ 831E3BA
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -83,7 +83,7 @@ gSuperPotionItemEffectInfo: ; 831E3BA
 	.byte 0x00
 	.byte 50
 
-gFullHealItemEffectInfo: ; 831E3C1
+gFullHealItemEffectInfo: @ 831E3C1
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -91,7 +91,7 @@ gFullHealItemEffectInfo: ; 831E3C1
 	.byte 0x00
 	.byte 0x00
 
-gReviveItemEffectInfo: ; 831E3C7
+gReviveItemEffectInfo: @ 831E3C7
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -100,7 +100,7 @@ gReviveItemEffectInfo: ; 831E3C7
 	.byte 0x00
 	.byte 0xfe
 
-gMaxReviveItemEffectInfo: ; 831E3CE
+gMaxReviveItemEffectInfo: @ 831E3CE
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -109,7 +109,7 @@ gMaxReviveItemEffectInfo: ; 831E3CE
 	.byte 0x00
 	.byte 0xff
 
-gFreshWaterItemEffectInfo: ; 831E3D5
+gFreshWaterItemEffectInfo: @ 831E3D5
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -118,7 +118,7 @@ gFreshWaterItemEffectInfo: ; 831E3D5
 	.byte 0x00
 	.byte 50
 
-gSodaPopItemEffectInfo: ; 831E3DC
+gSodaPopItemEffectInfo: @ 831E3DC
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -127,7 +127,7 @@ gSodaPopItemEffectInfo: ; 831E3DC
 	.byte 0x00
 	.byte 60
 
-gLemonadeItemEffectInfo: ; 831E3E3
+gLemonadeItemEffectInfo: @ 831E3E3
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -136,7 +136,7 @@ gLemonadeItemEffectInfo: ; 831E3E3
 	.byte 0x00
 	.byte 80
 
-gMoomooMilkItemEffectInfo: ; 831E3EA
+gMoomooMilkItemEffectInfo: @ 831E3EA
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -145,7 +145,7 @@ gMoomooMilkItemEffectInfo: ; 831E3EA
 	.byte 0x00
 	.byte 100
 
-gEnergyPowderItemEffectInfo: ; 831E3F1
+gEnergyPowderItemEffectInfo: @ 831E3F1
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -157,7 +157,7 @@ gEnergyPowderItemEffectInfo: ; 831E3F1
 	.byte 0xfb
 	.byte 0xf6
 
-gEnergyRootItemEffectInfo: ; 831E3FB
+gEnergyRootItemEffectInfo: @ 831E3FB
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -169,7 +169,7 @@ gEnergyRootItemEffectInfo: ; 831E3FB
 	.byte 0xf6
 	.byte 0xf1
 
-gHealPowderItemEffectInfo: ; 831E405
+gHealPowderItemEffectInfo: @ 831E405
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -180,7 +180,7 @@ gHealPowderItemEffectInfo: ; 831E405
 	.byte 0xfb
 	.byte 0xf6
 
-gRevivalHerbItemEffectInfo: ; 831E40E
+gRevivalHerbItemEffectInfo: @ 831E40E
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -192,7 +192,7 @@ gRevivalHerbItemEffectInfo: ; 831E40E
 	.byte 0xf1
 	.byte 0xec
 
-gEtherItemEffectInfo: ; 831E418
+gEtherItemEffectInfo: @ 831E418
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -201,7 +201,7 @@ gEtherItemEffectInfo: ; 831E418
 	.byte 0x00
 	.byte 0x0a
 
-gMaxEtherItemEffectInfo: ; 831E41F
+gMaxEtherItemEffectInfo: @ 831E41F
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -210,7 +210,7 @@ gMaxEtherItemEffectInfo: ; 831E41F
 	.byte 0x00
 	.byte 0x7f
 
-gElixirItemEffectInfo: ; 831E426
+gElixirItemEffectInfo: @ 831E426
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -219,7 +219,7 @@ gElixirItemEffectInfo: ; 831E426
 	.byte 0x00
 	.byte 0x0a
 
-gMaxElixirItemEffectInfo: ; 831E42D
+gMaxElixirItemEffectInfo: @ 831E42D
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -228,7 +228,7 @@ gMaxElixirItemEffectInfo: ; 831E42D
 	.byte 0x00
 	.byte 0x7f
 
-gLavaCookieItemEffectInfo: ; 831E434
+gLavaCookieItemEffectInfo: @ 831E434
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -236,7 +236,7 @@ gLavaCookieItemEffectInfo: ; 831E434
 	.byte 0x00
 	.byte 0x00
 
-gBlueFluteItemEffectInfo: ; 831E43A
+gBlueFluteItemEffectInfo: @ 831E43A
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -244,7 +244,7 @@ gBlueFluteItemEffectInfo: ; 831E43A
 	.byte 0x00
 	.byte 0x00
 
-gYellowFluteItemEffectInfo: ; 831E440
+gYellowFluteItemEffectInfo: @ 831E440
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -252,7 +252,7 @@ gYellowFluteItemEffectInfo: ; 831E440
 	.byte 0x00
 	.byte 0x00
 
-gRedFluteItemEffectInfo: ; 831E446
+gRedFluteItemEffectInfo: @ 831E446
 	.byte 0x80
 	.byte 0x00
 	.byte 0x00
@@ -260,7 +260,7 @@ gRedFluteItemEffectInfo: ; 831E446
 	.byte 0x00
 	.byte 0x00
 
-gBerryJuiceItemEffectInfo: ; 831E44C
+gBerryJuiceItemEffectInfo: @ 831E44C
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -269,7 +269,7 @@ gBerryJuiceItemEffectInfo: ; 831E44C
 	.byte 0x00
 	.byte 20
 
-gSacredAshItemEffectInfo: ; 831E453
+gSacredAshItemEffectInfo: @ 831E453
 	.byte 0x40
 	.byte 0x00
 	.byte 0x00
@@ -278,7 +278,7 @@ gSacredAshItemEffectInfo: ; 831E453
 	.byte 0x00
 	.byte 0xff
 
-gHPUpItemEffectInfo: ; 831E45A
+gHPUpItemEffectInfo: @ 831E45A
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -290,7 +290,7 @@ gHPUpItemEffectInfo: ; 831E45A
 	.byte 0x03
 	.byte 0x02
 
-gProteinItemEffectInfo: ; 831E464
+gProteinItemEffectInfo: @ 831E464
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -302,7 +302,7 @@ gProteinItemEffectInfo: ; 831E464
 	.byte 0x03
 	.byte 0x02
 
-gIronItemEffectInfo: ; 831E46E
+gIronItemEffectInfo: @ 831E46E
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -314,7 +314,7 @@ gIronItemEffectInfo: ; 831E46E
 	.byte 0x03
 	.byte 0x02
 
-gCarbosItemEffectInfo: ; 831E478
+gCarbosItemEffectInfo: @ 831E478
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -326,7 +326,7 @@ gCarbosItemEffectInfo: ; 831E478
 	.byte 0x03
 	.byte 0x02
 
-gCalciumItemEffectInfo: ; 831E482
+gCalciumItemEffectInfo: @ 831E482
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -338,7 +338,7 @@ gCalciumItemEffectInfo: ; 831E482
 	.byte 0x03
 	.byte 0x02
 
-gRareCandyItemEffectInfo: ; 831E48C
+gRareCandyItemEffectInfo: @ 831E48C
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -350,7 +350,7 @@ gRareCandyItemEffectInfo: ; 831E48C
 	.byte 0x03
 	.byte 0x02
 
-gPPUpItemEffectInfo: ; 831E496
+gPPUpItemEffectInfo: @ 831E496
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -361,7 +361,7 @@ gPPUpItemEffectInfo: ; 831E496
 	.byte 0x03
 	.byte 0x02
 
-gZincItemEffectInfo: ; 831E49F
+gZincItemEffectInfo: @ 831E49F
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -373,7 +373,7 @@ gZincItemEffectInfo: ; 831E49F
 	.byte 0x03
 	.byte 0x02
 
-gPPMaxItemEffectInfo: ; 831E4A9
+gPPMaxItemEffectInfo: @ 831E4A9
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -384,7 +384,7 @@ gPPMaxItemEffectInfo: ; 831E4A9
 	.byte 0x03
 	.byte 0x02
 
-gGuardSpecItemEffectInfo: ; 831E4B2
+gGuardSpecItemEffectInfo: @ 831E4B2
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -394,7 +394,7 @@ gGuardSpecItemEffectInfo: ; 831E4B2
 	.byte 0x01
 	.byte 0x01
 
-gDireHitItemEffectInfo: ; 831E4BA
+gDireHitItemEffectInfo: @ 831E4BA
 	.byte 0x20
 	.byte 0x00
 	.byte 0x00
@@ -404,7 +404,7 @@ gDireHitItemEffectInfo: ; 831E4BA
 	.byte 0x01
 	.byte 0x01
 
-gXAttackItemEffectInfo: ; 831E4C2
+gXAttackItemEffectInfo: @ 831E4C2
 	.byte 0x01
 	.byte 0x00
 	.byte 0x00
@@ -414,7 +414,7 @@ gXAttackItemEffectInfo: ; 831E4C2
 	.byte 0x01
 	.byte 0x01
 
-gXDefendItemEffectInfo: ; 831E4CA
+gXDefendItemEffectInfo: @ 831E4CA
 	.byte 0x00
 	.byte 0x10
 	.byte 0x00
@@ -424,7 +424,7 @@ gXDefendItemEffectInfo: ; 831E4CA
 	.byte 0x01
 	.byte 0x01
 
-gXSpeedItemEffectInfo: ; 831E4D2
+gXSpeedItemEffectInfo: @ 831E4D2
 	.byte 0x00
 	.byte 0x01
 	.byte 0x00
@@ -434,7 +434,7 @@ gXSpeedItemEffectInfo: ; 831E4D2
 	.byte 0x01
 	.byte 0x01
 
-gXAccuracyItemEffectInfo: ; 831E4DA
+gXAccuracyItemEffectInfo: @ 831E4DA
 	.byte 0x00
 	.byte 0x00
 	.byte 0x10
@@ -444,7 +444,7 @@ gXAccuracyItemEffectInfo: ; 831E4DA
 	.byte 0x01
 	.byte 0x01
 
-gXSpecialItemEffectInfo: ; 831E4E2
+gXSpecialItemEffectInfo: @ 831E4E2
 	.byte 0x00
 	.byte 0x00
 	.byte 0x01
@@ -454,7 +454,7 @@ gXSpecialItemEffectInfo: ; 831E4E2
 	.byte 0x01
 	.byte 0x01
 
-gSunStoneItemEffectInfo: ; 831E4EA
+gSunStoneItemEffectInfo: @ 831E4EA
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -462,7 +462,7 @@ gSunStoneItemEffectInfo: ; 831E4EA
 	.byte 0x80
 	.byte 0x00
 
-gMoonStoneItemEffectInfo: ; 831E4F0
+gMoonStoneItemEffectInfo: @ 831E4F0
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -470,7 +470,7 @@ gMoonStoneItemEffectInfo: ; 831E4F0
 	.byte 0x80
 	.byte 0x00
 
-gFireStoneItemEffectInfo: ; 831E4F6
+gFireStoneItemEffectInfo: @ 831E4F6
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -478,7 +478,7 @@ gFireStoneItemEffectInfo: ; 831E4F6
 	.byte 0x80
 	.byte 0x00
 
-gThunderStoneItemEffectInfo: ; 831E4FC
+gThunderStoneItemEffectInfo: @ 831E4FC
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -486,7 +486,7 @@ gThunderStoneItemEffectInfo: ; 831E4FC
 	.byte 0x80
 	.byte 0x00
 
-gWaterStoneItemEffectInfo: ; 831E502
+gWaterStoneItemEffectInfo: @ 831E502
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -494,7 +494,7 @@ gWaterStoneItemEffectInfo: ; 831E502
 	.byte 0x80
 	.byte 0x00
 
-gLeafStoneItemEffectInfo: ; 831E508
+gLeafStoneItemEffectInfo: @ 831E508
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -502,7 +502,7 @@ gLeafStoneItemEffectInfo: ; 831E508
 	.byte 0x80
 	.byte 0x00
 
-gCheriBerryItemEffectInfo: ; 831E50E
+gCheriBerryItemEffectInfo: @ 831E50E
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -510,7 +510,7 @@ gCheriBerryItemEffectInfo: ; 831E50E
 	.byte 0x00
 	.byte 0x00
 
-gChestoBerryItemEffectInfo: ; 831E514
+gChestoBerryItemEffectInfo: @ 831E514
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -518,7 +518,7 @@ gChestoBerryItemEffectInfo: ; 831E514
 	.byte 0x00
 	.byte 0x00
 
-gPechaBerryItemEffectInfo: ; 831E51A
+gPechaBerryItemEffectInfo: @ 831E51A
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -526,7 +526,7 @@ gPechaBerryItemEffectInfo: ; 831E51A
 	.byte 0x00
 	.byte 0x00
 
-gRawstBerryItemEffectInfo: ; 831E520
+gRawstBerryItemEffectInfo: @ 831E520
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -534,7 +534,7 @@ gRawstBerryItemEffectInfo: ; 831E520
 	.byte 0x00
 	.byte 0x00
 
-gAspearBerryItemEffectInfo: ; 831E526
+gAspearBerryItemEffectInfo: @ 831E526
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -542,7 +542,7 @@ gAspearBerryItemEffectInfo: ; 831E526
 	.byte 0x00
 	.byte 0x00
 
-gLeppaBerryItemEffectInfo: ; 831E52C
+gLeppaBerryItemEffectInfo: @ 831E52C
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -551,7 +551,7 @@ gLeppaBerryItemEffectInfo: ; 831E52C
 	.byte 0x00
 	.byte 0x0a
 
-gOranBerryItemEffectInfo: ; 831E533
+gOranBerryItemEffectInfo: @ 831E533
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -560,7 +560,7 @@ gOranBerryItemEffectInfo: ; 831E533
 	.byte 0x00
 	.byte 10
 
-gPersimBerryItemEffectInfo: ; 831E53A
+gPersimBerryItemEffectInfo: @ 831E53A
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -568,7 +568,7 @@ gPersimBerryItemEffectInfo: ; 831E53A
 	.byte 0x00
 	.byte 0x00
 
-gLumBerryItemEffectInfo: ; 831E540
+gLumBerryItemEffectInfo: @ 831E540
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -576,7 +576,7 @@ gLumBerryItemEffectInfo: ; 831E540
 	.byte 0x00
 	.byte 0x00
 
-gSitrusBerryItemEffectInfo: ; 831E546
+gSitrusBerryItemEffectInfo: @ 831E546
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -585,7 +585,7 @@ gSitrusBerryItemEffectInfo: ; 831E546
 	.byte 0x00
 	.byte 30
 
-gPomegBerryItemEffectInfo: ; 831E54D
+gPomegBerryItemEffectInfo: @ 831E54D
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -597,7 +597,7 @@ gPomegBerryItemEffectInfo: ; 831E54D
 	.byte 0x05
 	.byte 0x02
 
-gKelpsyBerryItemEffectInfo: ; 831E557
+gKelpsyBerryItemEffectInfo: @ 831E557
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -609,7 +609,7 @@ gKelpsyBerryItemEffectInfo: ; 831E557
 	.byte 0x05
 	.byte 0x02
 
-gQualotBerryItemEffectInfo: ; 831E561
+gQualotBerryItemEffectInfo: @ 831E561
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -621,7 +621,7 @@ gQualotBerryItemEffectInfo: ; 831E561
 	.byte 0x05
 	.byte 0x02
 
-gHondewBerryItemEffectInfo: ; 831E56B
+gHondewBerryItemEffectInfo: @ 831E56B
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -633,7 +633,7 @@ gHondewBerryItemEffectInfo: ; 831E56B
 	.byte 0x05
 	.byte 0x02
 
-gGrepaBerryItemEffectInfo: ; 831E575
+gGrepaBerryItemEffectInfo: @ 831E575
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -645,7 +645,7 @@ gGrepaBerryItemEffectInfo: ; 831E575
 	.byte 0x05
 	.byte 0x02
 
-gTamatoBerryItemEffectInfo: ; 831E57F
+gTamatoBerryItemEffectInfo: @ 831E57F
 	.byte 0x00
 	.byte 0x00
 	.byte 0x00
@@ -659,7 +659,7 @@ gTamatoBerryItemEffectInfo: ; 831E57F
 
 	.align 2, 0
 
-gItemEffectInfoPointers: ; 831E58C
+gItemEffectInfoPointers: @ 831E58C
 	.4byte gPotionItemEffectInfo
 	.4byte gAntidoteItemEffectInfo
 	.4byte gBurnHealItemEffectInfo
diff --git a/data/items.s b/data/items.s
index cb58d75c1..e0a52ecb9 100644
--- a/data/items.s
+++ b/data/items.s
@@ -1,9 +1,9 @@
 	.align 2, 0
 
-gItems: ; 85839A0
+gItems: @ 85839A0
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -18,7 +18,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MASTER BALL$", 14
 	.2byte ITEM_MASTER_BALL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMasterBallItemDescription
@@ -33,7 +33,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ULTRA BALL$", 14
 	.2byte ITEM_ULTRA_BALL
-	.2byte 1200 ; price
+	.2byte 1200 @ price
 	.byte 0
 	.byte 0
 	.4byte gUltraBallItemDescription
@@ -48,7 +48,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GREAT BALL$", 14
 	.2byte ITEM_GREAT_BALL
-	.2byte 600 ; price
+	.2byte 600 @ price
 	.byte 0
 	.byte 0
 	.4byte gGreatBallItemDescription
@@ -63,7 +63,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POKé BALL$", 14
 	.2byte ITEM_POKE_BALL
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gPokeBallItemDescription
@@ -78,7 +78,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SAFARI BALL$", 14
 	.2byte ITEM_SAFARI_BALL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSafariBallItemDescription
@@ -93,7 +93,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NET BALL$", 14
 	.2byte ITEM_NET_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gNetBallItemDescription
@@ -108,7 +108,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DIVE BALL$", 14
 	.2byte ITEM_DIVE_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gDiveBallItemDescription
@@ -123,7 +123,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NEST BALL$", 14
 	.2byte ITEM_NEST_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gNestBallItemDescription
@@ -138,7 +138,7 @@ gItems: ; 85839A0
 
 	.charmapstr "REPEAT BALL$", 14
 	.2byte ITEM_REPEAT_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gRepeatBallItemDescription
@@ -153,7 +153,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TIMER BALL$", 14
 	.2byte ITEM_TIMER_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTimerBallItemDescription
@@ -168,7 +168,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LUXURY BALL$", 14
 	.2byte ITEM_LUXURY_BALL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gLuxuryBallItemDescription
@@ -183,7 +183,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PREMIER BALL$", 14
 	.2byte ITEM_PREMIER_BALL
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gPremierBallItemDescription
@@ -198,7 +198,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POTION$", 14
 	.2byte ITEM_POTION
-	.2byte 300 ; price
+	.2byte 300 @ price
 	.byte 0
 	.byte 20
 	.4byte gPotionItemDescription
@@ -213,7 +213,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ANTIDOTE$", 14
 	.2byte ITEM_ANTIDOTE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gAntidoteItemDescription
@@ -228,7 +228,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BURN HEAL$", 14
 	.2byte ITEM_BURN_HEAL
-	.2byte 250 ; price
+	.2byte 250 @ price
 	.byte 0
 	.byte 0
 	.4byte gBurnHealItemDescription
@@ -243,7 +243,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ICE HEAL$", 14
 	.2byte ITEM_ICE_HEAL
-	.2byte 250 ; price
+	.2byte 250 @ price
 	.byte 0
 	.byte 0
 	.4byte gIceHealItemDescription
@@ -258,7 +258,7 @@ gItems: ; 85839A0
 
 	.charmapstr "AWAKENING$", 14
 	.2byte ITEM_AWAKENING
-	.2byte 250 ; price
+	.2byte 250 @ price
 	.byte 0
 	.byte 0
 	.4byte gAwakeningItemDescription
@@ -273,7 +273,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PARLYZ HEAL$", 14
 	.2byte ITEM_PARALYZE_HEAL
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gParalyzeHealItemDescription
@@ -288,7 +288,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FULL RESTORE$", 14
 	.2byte ITEM_FULL_RESTORE
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 255
 	.4byte gFullRestoreItemDescription
@@ -303,7 +303,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAX POTION$", 14
 	.2byte ITEM_MAX_POTION
-	.2byte 2500 ; price
+	.2byte 2500 @ price
 	.byte 0
 	.byte 255
 	.4byte gMaxPotionItemDescription
@@ -318,7 +318,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HYPER POTION$", 14
 	.2byte ITEM_HYPER_POTION
-	.2byte 1200 ; price
+	.2byte 1200 @ price
 	.byte 0
 	.byte 200
 	.4byte gHyperPotionItemDescription
@@ -333,7 +333,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SUPER POTION$", 14
 	.2byte ITEM_SUPER_POTION
-	.2byte 700 ; price
+	.2byte 700 @ price
 	.byte 0
 	.byte 50
 	.4byte gSuperPotionItemDescription
@@ -348,7 +348,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FULL HEAL$", 14
 	.2byte ITEM_FULL_HEAL
-	.2byte 600 ; price
+	.2byte 600 @ price
 	.byte 0
 	.byte 0
 	.4byte gFullHealItemDescription
@@ -363,7 +363,7 @@ gItems: ; 85839A0
 
 	.charmapstr "REVIVE$", 14
 	.2byte ITEM_REVIVE
-	.2byte 1500 ; price
+	.2byte 1500 @ price
 	.byte 0
 	.byte 0
 	.4byte gReviveItemDescription
@@ -378,7 +378,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAX REVIVE$", 14
 	.2byte ITEM_MAX_REVIVE
-	.2byte 4000 ; price
+	.2byte 4000 @ price
 	.byte 0
 	.byte 0
 	.4byte gMaxReviveItemDescription
@@ -393,7 +393,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FRESH WATER$", 14
 	.2byte ITEM_FRESH_WATER
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 50
 	.4byte gFreshWaterItemDescription
@@ -408,7 +408,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SODA POP$", 14
 	.2byte ITEM_SODA_POP
-	.2byte 300 ; price
+	.2byte 300 @ price
 	.byte 0
 	.byte 60
 	.4byte gSodaPopItemDescription
@@ -423,7 +423,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LEMONADE$", 14
 	.2byte ITEM_LEMONADE
-	.2byte 350 ; price
+	.2byte 350 @ price
 	.byte 0
 	.byte 80
 	.4byte gLemonadeItemDescription
@@ -438,7 +438,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MOOMOO MILK$", 14
 	.2byte ITEM_MOOMOO_MILK
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 100
 	.4byte gMoomooMilkItemDescription
@@ -453,7 +453,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ENERGYPOWDER$", 14
 	.2byte ITEM_ENERGY_POWDER
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 0
 	.4byte gEnergyPowderItemDescription
@@ -468,7 +468,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ENERGY ROOT$", 14
 	.2byte ITEM_ENERGY_ROOT
-	.2byte 800 ; price
+	.2byte 800 @ price
 	.byte 0
 	.byte 0
 	.4byte gEnergyRootItemDescription
@@ -483,7 +483,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HEAL POWDER$", 14
 	.2byte ITEM_HEAL_POWDER
-	.2byte 450 ; price
+	.2byte 450 @ price
 	.byte 0
 	.byte 0
 	.4byte gHealPowderItemDescription
@@ -498,7 +498,7 @@ gItems: ; 85839A0
 
 	.charmapstr "REVIVAL HERB$", 14
 	.2byte ITEM_REVIVAL_HERB
-	.2byte 2800 ; price
+	.2byte 2800 @ price
 	.byte 0
 	.byte 0
 	.4byte gRevivalHerbItemDescription
@@ -513,7 +513,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ETHER$", 14
 	.2byte ITEM_ETHER
-	.2byte 1200 ; price
+	.2byte 1200 @ price
 	.byte 0
 	.byte 10
 	.4byte gEtherItemDescription
@@ -528,7 +528,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAX ETHER$", 14
 	.2byte ITEM_MAX_ETHER
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 255
 	.4byte gMaxEtherItemDescription
@@ -543,7 +543,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ELIXIR$", 14
 	.2byte ITEM_ELIXIR
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 10
 	.4byte gElixirItemDescription
@@ -558,7 +558,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAX ELIXIR$", 14
 	.2byte ITEM_MAX_ELIXIR
-	.2byte 4500 ; price
+	.2byte 4500 @ price
 	.byte 0
 	.byte 255
 	.4byte gMaxElixirItemDescription
@@ -573,7 +573,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LAVA COOKIE$", 14
 	.2byte ITEM_LAVA_COOKIE
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gLavaCookieItemDescription
@@ -588,7 +588,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLUE FLUTE$", 14
 	.2byte ITEM_BLUE_FLUTE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gBlueFluteItemDescription
@@ -603,7 +603,7 @@ gItems: ; 85839A0
 
 	.charmapstr "YELLOW FLUTE$", 14
 	.2byte ITEM_YELLOW_FLUTE
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gYellowFluteItemDescription
@@ -618,7 +618,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RED FLUTE$", 14
 	.2byte ITEM_RED_FLUTE
-	.2byte 300 ; price
+	.2byte 300 @ price
 	.byte 0
 	.byte 0
 	.4byte gRedFluteItemDescription
@@ -633,7 +633,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLACK FLUTE$", 14
 	.2byte ITEM_BLACK_FLUTE
-	.2byte 400 ; price
+	.2byte 400 @ price
 	.byte 0
 	.byte 50
 	.4byte gBlackFluteItemDescription
@@ -648,7 +648,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WHITE FLUTE$", 14
 	.2byte ITEM_WHITE_FLUTE
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 150
 	.4byte gWhiteFluteItemDescription
@@ -663,7 +663,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BERRY JUICE$", 14
 	.2byte ITEM_BERRY_JUICE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 1
 	.byte 20
 	.4byte gBerryJuiceItemDescription
@@ -678,7 +678,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SACRED ASH$", 14
 	.2byte ITEM_SACRED_ASH
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gSacredAshItemDescription
@@ -693,7 +693,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SHOAL SALT$", 14
 	.2byte ITEM_SHOAL_SALT
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gShoalSaltItemDescription
@@ -708,7 +708,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SHOAL SHELL$", 14
 	.2byte ITEM_SHOAL_SHELL
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gShoalShellItemDescription
@@ -723,7 +723,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RED SHARD$", 14
 	.2byte ITEM_RED_SHARD
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gRedShardItemDescription
@@ -738,7 +738,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLUE SHARD$", 14
 	.2byte ITEM_BLUE_SHARD
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gBlueShardItemDescription
@@ -753,7 +753,7 @@ gItems: ; 85839A0
 
 	.charmapstr "YELLOW SHARD$", 14
 	.2byte ITEM_YELLOW_SHARD
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gYellowShardItemDescription
@@ -768,7 +768,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GREEN SHARD$", 14
 	.2byte ITEM_GREEN_SHARD
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 0
 	.byte 0
 	.4byte gGreenShardItemDescription
@@ -783,7 +783,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -798,7 +798,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -813,7 +813,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -828,7 +828,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -843,7 +843,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -858,7 +858,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -873,7 +873,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -888,7 +888,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -903,7 +903,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -918,7 +918,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -933,7 +933,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -948,7 +948,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HP UP$", 14
 	.2byte ITEM_HP_UP
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gHPUpItemDescription
@@ -963,7 +963,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PROTEIN$", 14
 	.2byte ITEM_PROTEIN
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gProteinItemDescription
@@ -978,7 +978,7 @@ gItems: ; 85839A0
 
 	.charmapstr "IRON$", 14
 	.2byte ITEM_IRON
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gIronItemDescription
@@ -993,7 +993,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CARBOS$", 14
 	.2byte ITEM_CARBOS
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gCarbosItemDescription
@@ -1008,7 +1008,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CALCIUM$", 14
 	.2byte ITEM_CALCIUM
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gCalciumItemDescription
@@ -1023,7 +1023,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RARE CANDY$", 14
 	.2byte ITEM_RARE_CANDY
-	.2byte 4800 ; price
+	.2byte 4800 @ price
 	.byte 0
 	.byte 0
 	.4byte gRareCandyItemDescription
@@ -1038,7 +1038,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PP UP$", 14
 	.2byte ITEM_PP_UP
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gPPUpItemDescription
@@ -1053,7 +1053,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ZINC$", 14
 	.2byte ITEM_ZINC
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gZincItemDescription
@@ -1068,7 +1068,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PP MAX$", 14
 	.2byte ITEM_PP_MAX
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gPPMaxItemDescription
@@ -1083,7 +1083,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1098,7 +1098,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GUARD SPEC.$", 14
 	.2byte ITEM_GUARD_SPEC
-	.2byte 700 ; price
+	.2byte 700 @ price
 	.byte 0
 	.byte 0
 	.4byte gGuardSpecItemDescription
@@ -1113,7 +1113,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DIRE HIT$", 14
 	.2byte ITEM_DIRE_HIT
-	.2byte 650 ; price
+	.2byte 650 @ price
 	.byte 0
 	.byte 0
 	.4byte gDireHitItemDescription
@@ -1128,7 +1128,7 @@ gItems: ; 85839A0
 
 	.charmapstr "X ATTACK$", 14
 	.2byte ITEM_X_ATTACK
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 0
 	.4byte gXAttackItemDescription
@@ -1143,7 +1143,7 @@ gItems: ; 85839A0
 
 	.charmapstr "X DEFEND$", 14
 	.2byte ITEM_X_DEFEND
-	.2byte 550 ; price
+	.2byte 550 @ price
 	.byte 0
 	.byte 0
 	.4byte gXDefendItemDescription
@@ -1158,7 +1158,7 @@ gItems: ; 85839A0
 
 	.charmapstr "X SPEED$", 14
 	.2byte ITEM_X_SPEED
-	.2byte 350 ; price
+	.2byte 350 @ price
 	.byte 0
 	.byte 0
 	.4byte gXSpeedItemDescription
@@ -1173,7 +1173,7 @@ gItems: ; 85839A0
 
 	.charmapstr "X ACCURACY$", 14
 	.2byte ITEM_X_ACCURACY
-	.2byte 950 ; price
+	.2byte 950 @ price
 	.byte 0
 	.byte 0
 	.4byte gXAccuracyItemDescription
@@ -1188,7 +1188,7 @@ gItems: ; 85839A0
 
 	.charmapstr "X SPECIAL$", 14
 	.2byte ITEM_X_SPECIAL
-	.2byte 350 ; price
+	.2byte 350 @ price
 	.byte 0
 	.byte 0
 	.4byte gXSpecialItemDescription
@@ -1203,7 +1203,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POKé DOLL$", 14
 	.2byte ITEM_POKE_DOLL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gPokeDollItemDescription
@@ -1218,7 +1218,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FLUFFY TAIL$", 14
 	.2byte ITEM_FLUFFY_TAIL
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gFluffyTailItemDescription
@@ -1233,7 +1233,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1248,7 +1248,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SUPER REPEL$", 14
 	.2byte ITEM_SUPER_REPEL
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 200
 	.4byte gSuperRepelItemDescription
@@ -1263,7 +1263,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAX REPEL$", 14
 	.2byte ITEM_MAX_REPEL
-	.2byte 700 ; price
+	.2byte 700 @ price
 	.byte 0
 	.byte 250
 	.4byte gMaxRepelItemDescription
@@ -1278,7 +1278,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ESCAPE ROPE$", 14
 	.2byte ITEM_ESCAPE_ROPE
-	.2byte 550 ; price
+	.2byte 550 @ price
 	.byte 0
 	.byte 0
 	.4byte gEscapeRopeItemDescription
@@ -1293,7 +1293,7 @@ gItems: ; 85839A0
 
 	.charmapstr "REPEL$", 14
 	.2byte ITEM_REPEL
-	.2byte 350 ; price
+	.2byte 350 @ price
 	.byte 0
 	.byte 100
 	.4byte gRepelItemDescription
@@ -1308,7 +1308,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1323,7 +1323,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1338,7 +1338,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1353,7 +1353,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1368,7 +1368,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1383,7 +1383,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1398,7 +1398,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SUN STONE$", 14
 	.2byte ITEM_SUN_STONE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 0
 	.byte 0
 	.4byte gSunStoneItemDescription
@@ -1413,7 +1413,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MOON STONE$", 14
 	.2byte ITEM_MOON_STONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMoonStoneItemDescription
@@ -1428,7 +1428,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FIRE STONE$", 14
 	.2byte ITEM_FIRE_STONE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 0
 	.byte 0
 	.4byte gFireStoneItemDescription
@@ -1443,7 +1443,7 @@ gItems: ; 85839A0
 
 	.charmapstr "THUNDERSTONE$", 14
 	.2byte ITEM_THUNDER_STONE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 0
 	.byte 0
 	.4byte gThunderStoneItemDescription
@@ -1458,7 +1458,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WATER STONE$", 14
 	.2byte ITEM_WATER_STONE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 0
 	.byte 0
 	.4byte gWaterStoneItemDescription
@@ -1473,7 +1473,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LEAF STONE$", 14
 	.2byte ITEM_LEAF_STONE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 0
 	.byte 0
 	.4byte gLeafStoneItemDescription
@@ -1488,7 +1488,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1503,7 +1503,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1518,7 +1518,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1533,7 +1533,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1548,7 +1548,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TINYMUSHROOM$", 14
 	.2byte ITEM_TINY_MUSHROOM
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 0
 	.byte 0
 	.4byte gTinyMushroomItemDescription
@@ -1563,7 +1563,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BIG MUSHROOM$", 14
 	.2byte ITEM_BIG_MUSHROOM
-	.2byte 5000 ; price
+	.2byte 5000 @ price
 	.byte 0
 	.byte 0
 	.4byte gBigMushroomItemDescription
@@ -1578,7 +1578,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1593,7 +1593,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PEARL$", 14
 	.2byte ITEM_PEARL
-	.2byte 1400 ; price
+	.2byte 1400 @ price
 	.byte 0
 	.byte 0
 	.4byte gPearlItemDescription
@@ -1608,7 +1608,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BIG PEARL$", 14
 	.2byte ITEM_BIG_PEARL
-	.2byte 7500 ; price
+	.2byte 7500 @ price
 	.byte 0
 	.byte 0
 	.4byte gBigPearlItemDescription
@@ -1623,7 +1623,7 @@ gItems: ; 85839A0
 
 	.charmapstr "STARDUST$", 14
 	.2byte ITEM_STARDUST
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gStardustItemDescription
@@ -1638,7 +1638,7 @@ gItems: ; 85839A0
 
 	.charmapstr "STAR PIECE$", 14
 	.2byte ITEM_STAR_PIECE
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 0
 	.byte 0
 	.4byte gStarPieceItemDescription
@@ -1653,7 +1653,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NUGGET$", 14
 	.2byte ITEM_NUGGET
-	.2byte 10000 ; price
+	.2byte 10000 @ price
 	.byte 0
 	.byte 0
 	.4byte gNuggetItemDescription
@@ -1668,7 +1668,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HEART SCALE$", 14
 	.2byte ITEM_HEART_SCALE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gHeartScaleItemDescription
@@ -1683,7 +1683,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1698,7 +1698,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1713,7 +1713,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1728,7 +1728,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1743,7 +1743,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1758,7 +1758,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1773,7 +1773,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1788,7 +1788,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1803,7 +1803,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -1818,7 +1818,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ORANGE MAIL$", 14
 	.2byte ITEM_ORANGE_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gOrangeMailItemDescription
@@ -1833,7 +1833,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HARBOR MAIL$", 14
 	.2byte ITEM_HARBOR_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gHarborMailItemDescription
@@ -1848,7 +1848,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GLITTER MAIL$", 14
 	.2byte ITEM_GLITTER_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gGlitterMailItemDescription
@@ -1863,7 +1863,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MECH MAIL$", 14
 	.2byte ITEM_MECH_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gMechMailItemDescription
@@ -1878,7 +1878,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WOOD MAIL$", 14
 	.2byte ITEM_WOOD_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gWoodMailItemDescription
@@ -1893,7 +1893,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WAVE MAIL$", 14
 	.2byte ITEM_WAVE_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gWaveMailItemDescription
@@ -1908,7 +1908,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BEAD MAIL$", 14
 	.2byte ITEM_BEAD_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gBeadMailItemDescription
@@ -1923,7 +1923,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SHADOW MAIL$", 14
 	.2byte ITEM_SHADOW_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gShadowMailItemDescription
@@ -1938,7 +1938,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TROPIC MAIL$", 14
 	.2byte ITEM_TROPIC_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gTropicMailItemDescription
@@ -1953,7 +1953,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DREAM MAIL$", 14
 	.2byte ITEM_DREAM_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gDreamMailItemDescription
@@ -1968,7 +1968,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FAB MAIL$", 14
 	.2byte ITEM_FAB_MAIL
-	.2byte 50 ; price
+	.2byte 50 @ price
 	.byte 0
 	.byte 0
 	.4byte gFabMailItemDescription
@@ -1983,7 +1983,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RETRO MAIL$", 14
 	.2byte ITEM_RETRO_MAIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRetroMailItemDescription
@@ -1998,7 +1998,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CHERI BERRY$", 14
 	.2byte ITEM_CHERI_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 2
 	.byte 0
 	.4byte gCheriBerryItemDescription
@@ -2013,7 +2013,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CHESTO BERRY$", 14
 	.2byte ITEM_CHESTO_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 3
 	.byte 0
 	.4byte gChestoBerryItemDescription
@@ -2028,7 +2028,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PECHA BERRY$", 14
 	.2byte ITEM_PECHA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 4
 	.byte 0
 	.4byte gPechaBerryItemDescription
@@ -2043,7 +2043,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RAWST BERRY$", 14
 	.2byte ITEM_RAWST_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 5
 	.byte 0
 	.4byte gRawstBerryItemDescription
@@ -2058,7 +2058,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ASPEAR BERRY$", 14
 	.2byte ITEM_ASPEAR_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 6
 	.byte 0
 	.4byte gAspearBerryItemDescription
@@ -2073,7 +2073,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LEPPA BERRY$", 14
 	.2byte ITEM_LEPPA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 7
 	.byte 10
 	.4byte gLeppaBerryItemDescription
@@ -2088,7 +2088,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ORAN BERRY$", 14
 	.2byte ITEM_ORAN_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 1
 	.byte 10
 	.4byte gOranBerryItemDescription
@@ -2103,7 +2103,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PERSIM BERRY$", 14
 	.2byte ITEM_PERSIM_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 8
 	.byte 0
 	.4byte gPersimBerryItemDescription
@@ -2118,7 +2118,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LUM BERRY$", 14
 	.2byte ITEM_LUM_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 9
 	.byte 0
 	.4byte gLumBerryItemDescription
@@ -2133,7 +2133,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SITRUS BERRY$", 14
 	.2byte ITEM_SITRUS_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 1
 	.byte 30
 	.4byte gSitrusBerryItemDescription
@@ -2148,7 +2148,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FIGY BERRY$", 14
 	.2byte ITEM_FIGY_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 10
 	.byte 8
 	.4byte gFigyBerryItemDescription
@@ -2163,7 +2163,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WIKI BERRY$", 14
 	.2byte ITEM_WIKI_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 11
 	.byte 8
 	.4byte gWikiBerryItemDescription
@@ -2178,7 +2178,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAGO BERRY$", 14
 	.2byte ITEM_MAGO_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 12
 	.byte 8
 	.4byte gMagoBerryItemDescription
@@ -2193,7 +2193,7 @@ gItems: ; 85839A0
 
 	.charmapstr "AGUAV BERRY$", 14
 	.2byte ITEM_AGUAV_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 13
 	.byte 8
 	.4byte gAguavBerryItemDescription
@@ -2208,7 +2208,7 @@ gItems: ; 85839A0
 
 	.charmapstr "IAPAPA BERRY$", 14
 	.2byte ITEM_IAPAPA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 14
 	.byte 8
 	.4byte gIapapaBerryItemDescription
@@ -2223,7 +2223,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RAZZ BERRY$", 14
 	.2byte ITEM_RAZZ_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gRazzBerryItemDescription
@@ -2238,7 +2238,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLUK BERRY$", 14
 	.2byte ITEM_BLUK_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gBlukBerryItemDescription
@@ -2253,7 +2253,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NANAB BERRY$", 14
 	.2byte ITEM_NANAB_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gNanabBerryItemDescription
@@ -2268,7 +2268,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WEPEAR BERRY$", 14
 	.2byte ITEM_WEPEAR_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gWepearBerryItemDescription
@@ -2283,7 +2283,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PINAP BERRY$", 14
 	.2byte ITEM_PINAP_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gPinapBerryItemDescription
@@ -2298,7 +2298,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POMEG BERRY$", 14
 	.2byte ITEM_POMEG_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gPomegBerryItemDescription
@@ -2313,7 +2313,7 @@ gItems: ; 85839A0
 
 	.charmapstr "KELPSY BERRY$", 14
 	.2byte ITEM_KELPSY_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gKelpsyBerryItemDescription
@@ -2328,7 +2328,7 @@ gItems: ; 85839A0
 
 	.charmapstr "QUALOT BERRY$", 14
 	.2byte ITEM_QUALOT_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gQualotBerryItemDescription
@@ -2343,7 +2343,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HONDEW BERRY$", 14
 	.2byte ITEM_HONDEW_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gHondewBerryItemDescription
@@ -2358,7 +2358,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GREPA BERRY$", 14
 	.2byte ITEM_GREPA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gGrepaBerryItemDescription
@@ -2373,7 +2373,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TAMATO BERRY$", 14
 	.2byte ITEM_TAMATO_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gTamatoBerryItemDescription
@@ -2388,7 +2388,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CORNN BERRY$", 14
 	.2byte ITEM_CORNN_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gCornnBerryItemDescription
@@ -2403,7 +2403,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAGOST BERRY$", 14
 	.2byte ITEM_MAGOST_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gMagostBerryItemDescription
@@ -2418,7 +2418,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RABUTA BERRY$", 14
 	.2byte ITEM_RABUTA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gRabutaBerryItemDescription
@@ -2433,7 +2433,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NOMEL BERRY$", 14
 	.2byte ITEM_NOMEL_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gNomelBerryItemDescription
@@ -2448,7 +2448,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SPELON BERRY$", 14
 	.2byte ITEM_SPELON_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gSpelonBerryItemDescription
@@ -2463,7 +2463,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PAMTRE BERRY$", 14
 	.2byte ITEM_PAMTRE_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gPamtreBerryItemDescription
@@ -2478,7 +2478,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WATMEL BERRY$", 14
 	.2byte ITEM_WATMEL_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gWatmelBerryItemDescription
@@ -2493,7 +2493,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DURIN BERRY$", 14
 	.2byte ITEM_DURIN_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gDurinBerryItemDescription
@@ -2508,7 +2508,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BELUE BERRY$", 14
 	.2byte ITEM_BELUE_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gBelueBerryItemDescription
@@ -2523,7 +2523,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LIECHI BERRY$", 14
 	.2byte ITEM_LIECHI_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 15
 	.byte 4
 	.4byte gLiechiBerryItemDescription
@@ -2538,7 +2538,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GANLON BERRY$", 14
 	.2byte ITEM_GANLON_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 16
 	.byte 4
 	.4byte gGanlonBerryItemDescription
@@ -2553,7 +2553,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SALAC BERRY$", 14
 	.2byte ITEM_SALAC_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 17
 	.byte 4
 	.4byte gSalacBerryItemDescription
@@ -2568,7 +2568,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PETAYA BERRY$", 14
 	.2byte ITEM_PETAYA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 18
 	.byte 4
 	.4byte gPetayaBerryItemDescription
@@ -2583,7 +2583,7 @@ gItems: ; 85839A0
 
 	.charmapstr "APICOT BERRY$", 14
 	.2byte ITEM_APICOT_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 19
 	.byte 4
 	.4byte gApicotBerryItemDescription
@@ -2598,7 +2598,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LANSAT BERRY$", 14
 	.2byte ITEM_LANSAT_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 20
 	.byte 4
 	.4byte gLansatBerryItemDescription
@@ -2613,7 +2613,7 @@ gItems: ; 85839A0
 
 	.charmapstr "STARF BERRY$", 14
 	.2byte ITEM_STARF_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 21
 	.byte 4
 	.4byte gStarfBerryItemDescription
@@ -2628,7 +2628,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ENIGMA BERRY$", 14
 	.2byte ITEM_ENIGMA_BERRY
-	.2byte 20 ; price
+	.2byte 20 @ price
 	.byte 0
 	.byte 0
 	.4byte gEnigmaBerryItemDescription
@@ -2643,7 +2643,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -2658,7 +2658,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -2673,7 +2673,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -2688,7 +2688,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BRIGHTPOWDER$", 14
 	.2byte ITEM_BRIGHT_POWDER
-	.2byte 10 ; price
+	.2byte 10 @ price
 	.byte 22
 	.byte 10
 	.4byte gBrightPowderItemDescription
@@ -2703,7 +2703,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WHITE HERB$", 14
 	.2byte ITEM_WHITE_HERB
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 23
 	.byte 0
 	.4byte gWhiteHerbItemDescription
@@ -2718,7 +2718,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MACHO BRACE$", 14
 	.2byte ITEM_MACHO_BRACE
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 24
 	.byte 0
 	.4byte gMachoBraceItemDescription
@@ -2733,7 +2733,7 @@ gItems: ; 85839A0
 
 	.charmapstr "EXP. SHARE$", 14
 	.2byte ITEM_EXP_SHARE
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 25
 	.byte 0
 	.4byte gExpShareItemDescription
@@ -2748,7 +2748,7 @@ gItems: ; 85839A0
 
 	.charmapstr "QUICK CLAW$", 14
 	.2byte ITEM_QUICK_CLAW
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 26
 	.byte 20
 	.4byte gQuickClawItemDescription
@@ -2763,7 +2763,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SOOTHE BELL$", 14
 	.2byte ITEM_SOOTHE_BELL
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 27
 	.byte 0
 	.4byte gSootheBellItemDescription
@@ -2778,7 +2778,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MENTAL HERB$", 14
 	.2byte ITEM_MENTAL_HERB
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 28
 	.byte 0
 	.4byte gMentalHerbItemDescription
@@ -2793,7 +2793,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CHOICE BAND$", 14
 	.2byte ITEM_CHOICE_BAND
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 29
 	.byte 0
 	.4byte gChoiceBandItemDescription
@@ -2808,7 +2808,7 @@ gItems: ; 85839A0
 
 	.charmapstr "KING’S ROCK$", 14
 	.2byte ITEM_KINGS_ROCK
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 30
 	.byte 10
 	.4byte gKingsRockItemDescription
@@ -2823,7 +2823,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SILVERPOWDER$", 14
 	.2byte ITEM_SILVER_POWDER
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 31
 	.byte 10
 	.4byte gSilverPowderItemDescription
@@ -2838,7 +2838,7 @@ gItems: ; 85839A0
 
 	.charmapstr "AMULET COIN$", 14
 	.2byte ITEM_AMULET_COIN
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 32
 	.byte 10
 	.4byte gAmuletCoinItemDescription
@@ -2853,7 +2853,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CLEANSE TAG$", 14
 	.2byte ITEM_CLEANSE_TAG
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 33
 	.byte 0
 	.4byte gCleanseTagItemDescription
@@ -2868,7 +2868,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SOUL DEW$", 14
 	.2byte ITEM_SOUL_DEW
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 34
 	.byte 0
 	.4byte gSoulDewItemDescription
@@ -2883,7 +2883,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DEEPSEATOOTH$", 14
 	.2byte ITEM_DEEP_SEA_TOOTH
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 35
 	.byte 0
 	.4byte gDeepSeaToothItemDescription
@@ -2898,7 +2898,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DEEPSEASCALE$", 14
 	.2byte ITEM_DEEP_SEA_SCALE
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 36
 	.byte 0
 	.4byte gDeepSeaScaleItemDescription
@@ -2913,7 +2913,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SMOKE BALL$", 14
 	.2byte ITEM_SMOKE_BALL
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 37
 	.byte 0
 	.4byte gSmokeBallItemDescription
@@ -2928,7 +2928,7 @@ gItems: ; 85839A0
 
 	.charmapstr "EVERSTONE$", 14
 	.2byte ITEM_EVERSTONE
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 38
 	.byte 0
 	.4byte gEverstoneItemDescription
@@ -2943,7 +2943,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FOCUS BAND$", 14
 	.2byte ITEM_FOCUS_BAND
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 39
 	.byte 10
 	.4byte gFocusBandItemDescription
@@ -2958,7 +2958,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LUCKY EGG$", 14
 	.2byte ITEM_LUCKY_EGG
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 40
 	.byte 0
 	.4byte gLuckyEggItemDescription
@@ -2973,7 +2973,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SCOPE LENS$", 14
 	.2byte ITEM_SCOPE_LENS
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 41
 	.byte 0
 	.4byte gScopeLensItemDescription
@@ -2988,7 +2988,7 @@ gItems: ; 85839A0
 
 	.charmapstr "METAL COAT$", 14
 	.2byte ITEM_METAL_COAT
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 42
 	.byte 10
 	.4byte gMetalCoatItemDescription
@@ -3003,7 +3003,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LEFTOVERS$", 14
 	.2byte ITEM_LEFTOVERS
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 43
 	.byte 10
 	.4byte gLeftoversItemDescription
@@ -3018,7 +3018,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DRAGON SCALE$", 14
 	.2byte ITEM_DRAGON_SCALE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 44
 	.byte 10
 	.4byte gDragonScaleItemDescription
@@ -3033,7 +3033,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LIGHT BALL$", 14
 	.2byte ITEM_LIGHT_BALL
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 45
 	.byte 0
 	.4byte gLightBallItemDescription
@@ -3048,7 +3048,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SOFT SAND$", 14
 	.2byte ITEM_SOFT_SAND
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 46
 	.byte 10
 	.4byte gSoftSandItemDescription
@@ -3063,7 +3063,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HARD STONE$", 14
 	.2byte ITEM_HARD_STONE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 47
 	.byte 10
 	.4byte gHardStoneItemDescription
@@ -3078,7 +3078,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MIRACLE SEED$", 14
 	.2byte ITEM_MIRACLE_SEED
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 48
 	.byte 10
 	.4byte gMiracleSeedItemDescription
@@ -3093,7 +3093,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLACKGLASSES$", 14
 	.2byte ITEM_BLACK_GLASSES
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 49
 	.byte 10
 	.4byte gBlackGlassesItemDescription
@@ -3108,7 +3108,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLACK BELT$", 14
 	.2byte ITEM_BLACK_BELT
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 50
 	.byte 10
 	.4byte gBlackBeltItemDescription
@@ -3123,7 +3123,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAGNET$", 14
 	.2byte ITEM_MAGNET
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 51
 	.byte 10
 	.4byte gMagnetItemDescription
@@ -3138,7 +3138,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MYSTIC WATER$", 14
 	.2byte ITEM_MYSTIC_WATER
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 52
 	.byte 10
 	.4byte gMysticWaterItemDescription
@@ -3153,7 +3153,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SHARP BEAK$", 14
 	.2byte ITEM_SHARP_BEAK
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 53
 	.byte 10
 	.4byte gSharpBeakItemDescription
@@ -3168,7 +3168,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POISON BARB$", 14
 	.2byte ITEM_POISON_BARB
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 54
 	.byte 10
 	.4byte gPoisonBarbItemDescription
@@ -3183,7 +3183,7 @@ gItems: ; 85839A0
 
 	.charmapstr "NEVERMELTICE$", 14
 	.2byte ITEM_NEVER_MELT_ICE
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 55
 	.byte 10
 	.4byte gNeverMeltIceItemDescription
@@ -3198,7 +3198,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SPELL TAG$", 14
 	.2byte ITEM_SPELL_TAG
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 56
 	.byte 10
 	.4byte gSpellTagItemDescription
@@ -3213,7 +3213,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TWISTEDSPOON$", 14
 	.2byte ITEM_TWISTED_SPOON
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 57
 	.byte 10
 	.4byte gTwistedSpoonItemDescription
@@ -3228,7 +3228,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CHARCOAL$", 14
 	.2byte ITEM_CHARCOAL
-	.2byte 9800 ; price
+	.2byte 9800 @ price
 	.byte 58
 	.byte 10
 	.4byte gCharcoalItemDescription
@@ -3243,7 +3243,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DRAGON FANG$", 14
 	.2byte ITEM_DRAGON_FANG
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 59
 	.byte 10
 	.4byte gDragonFangItemDescription
@@ -3258,7 +3258,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SILK SCARF$", 14
 	.2byte ITEM_SILK_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 60
 	.byte 10
 	.4byte gSilkScarfItemDescription
@@ -3273,7 +3273,7 @@ gItems: ; 85839A0
 
 	.charmapstr "UP-GRADE$", 14
 	.2byte ITEM_UP_GRADE
-	.2byte 2100 ; price
+	.2byte 2100 @ price
 	.byte 61
 	.byte 0
 	.4byte gUpGradeItemDescription
@@ -3288,7 +3288,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SHELL BELL$", 14
 	.2byte ITEM_SHELL_BELL
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 62
 	.byte 8
 	.4byte gShellBellItemDescription
@@ -3303,7 +3303,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SEA INCENSE$", 14
 	.2byte ITEM_SEA_INCENSE
-	.2byte 9600 ; price
+	.2byte 9600 @ price
 	.byte 52
 	.byte 5
 	.4byte gSeaIncenseItemDescription
@@ -3318,7 +3318,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LAX INCENSE$", 14
 	.2byte ITEM_LAX_INCENSE
-	.2byte 9600 ; price
+	.2byte 9600 @ price
 	.byte 22
 	.byte 5
 	.4byte gLaxIncenseItemDescription
@@ -3333,7 +3333,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LUCKY PUNCH$", 14
 	.2byte ITEM_LUCKY_PUNCH
-	.2byte 10 ; price
+	.2byte 10 @ price
 	.byte 63
 	.byte 0
 	.4byte gLuckyPunchItemDescription
@@ -3348,7 +3348,7 @@ gItems: ; 85839A0
 
 	.charmapstr "METAL POWDER$", 14
 	.2byte ITEM_METAL_POWDER
-	.2byte 10 ; price
+	.2byte 10 @ price
 	.byte 64
 	.byte 0
 	.4byte gMetalPowderItemDescription
@@ -3363,7 +3363,7 @@ gItems: ; 85839A0
 
 	.charmapstr "THICK CLUB$", 14
 	.2byte ITEM_THICK_CLUB
-	.2byte 500 ; price
+	.2byte 500 @ price
 	.byte 65
 	.byte 0
 	.4byte gThickClubItemDescription
@@ -3378,7 +3378,7 @@ gItems: ; 85839A0
 
 	.charmapstr "STICK$", 14
 	.2byte ITEM_STICK
-	.2byte 200 ; price
+	.2byte 200 @ price
 	.byte 66
 	.byte 0
 	.4byte gStickItemDescription
@@ -3393,7 +3393,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3408,7 +3408,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3423,7 +3423,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3438,7 +3438,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3453,7 +3453,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3468,7 +3468,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3483,7 +3483,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3498,7 +3498,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3513,7 +3513,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3528,7 +3528,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3543,7 +3543,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3558,7 +3558,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3573,7 +3573,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3588,7 +3588,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3603,7 +3603,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3618,7 +3618,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3633,7 +3633,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3648,7 +3648,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3663,7 +3663,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3678,7 +3678,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3693,7 +3693,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3708,7 +3708,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3723,7 +3723,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3738,7 +3738,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3753,7 +3753,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3768,7 +3768,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3783,7 +3783,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3798,7 +3798,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -3813,7 +3813,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RED SCARF$", 14
 	.2byte ITEM_RED_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gRedScarfItemDescription
@@ -3828,7 +3828,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLUE SCARF$", 14
 	.2byte ITEM_BLUE_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gBlueScarfItemDescription
@@ -3843,7 +3843,7 @@ gItems: ; 85839A0
 
 	.charmapstr "PINK SCARF$", 14
 	.2byte ITEM_PINK_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gPinkScarfItemDescription
@@ -3858,7 +3858,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GREEN SCARF$", 14
 	.2byte ITEM_GREEN_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gGreenScarfItemDescription
@@ -3873,7 +3873,7 @@ gItems: ; 85839A0
 
 	.charmapstr "YELLOW SCARF$", 14
 	.2byte ITEM_YELLOW_SCARF
-	.2byte 100 ; price
+	.2byte 100 @ price
 	.byte 0
 	.byte 0
 	.4byte gYellowScarfItemDescription
@@ -3888,7 +3888,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MACH BIKE$", 14
 	.2byte ITEM_MACH_BIKE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMachBikeItemDescription
@@ -3903,7 +3903,7 @@ gItems: ; 85839A0
 
 	.charmapstr "COIN CASE$", 14
 	.2byte ITEM_COIN_CASE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gCoinCaseItemDescription
@@ -3918,7 +3918,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ITEMFINDER$", 14
 	.2byte ITEM_ITEMFINDER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gItemfinderItemDescription
@@ -3933,7 +3933,7 @@ gItems: ; 85839A0
 
 	.charmapstr "OLD ROD$", 14
 	.2byte ITEM_OLD_ROD
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gOldRodItemDescription
@@ -3948,7 +3948,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GOOD ROD$", 14
 	.2byte ITEM_GOOD_ROD
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gGoodRodItemDescription
@@ -3963,7 +3963,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SUPER ROD$", 14
 	.2byte ITEM_SUPER_ROD
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSuperRodItemDescription
@@ -3978,7 +3978,7 @@ gItems: ; 85839A0
 
 	.charmapstr "S.S. TICKET$", 14
 	.2byte ITEM_SS_TICKET
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSSTicketItemDescription
@@ -3993,7 +3993,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CONTEST PASS$", 14
 	.2byte ITEM_CONTEST_PASS
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gContestPassItemDescription
@@ -4008,7 +4008,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -4023,7 +4023,7 @@ gItems: ; 85839A0
 
 	.charmapstr "WAILMER PAIL$", 14
 	.2byte ITEM_WAILMER_PAIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gWailmerPailItemDescription
@@ -4038,7 +4038,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DEVON GOODS$", 14
 	.2byte ITEM_DEVON_GOODS
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDevonGoodsItemDescription
@@ -4053,7 +4053,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SOOT SACK$", 14
 	.2byte ITEM_SOOT_SACK
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSootSackItemDescription
@@ -4068,7 +4068,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BASEMENT KEY$", 14
 	.2byte ITEM_BASEMENT_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gBasementKeyItemDescription
@@ -4083,7 +4083,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ACRO BIKE$", 14
 	.2byte ITEM_ACRO_BIKE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gAcroBikeItemDescription
@@ -4098,7 +4098,7 @@ gItems: ; 85839A0
 
 	.charmapstr "{POKEBLOCK} CASE$", 14
 	.2byte ITEM_POKEBLOCK_CASE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gPokeblockCaseItemDescription
@@ -4113,7 +4113,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LETTER$", 14
 	.2byte ITEM_LETTER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gLetterItemDescription
@@ -4128,7 +4128,7 @@ gItems: ; 85839A0
 
 	.charmapstr "EON TICKET$", 14
 	.2byte ITEM_EON_TICKET
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gEonTicketItemDescription
@@ -4143,7 +4143,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RED ORB$", 14
 	.2byte ITEM_RED_ORB
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRedOrbItemDescription
@@ -4158,7 +4158,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BLUE ORB$", 14
 	.2byte ITEM_BLUE_ORB
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gBlueOrbItemDescription
@@ -4173,7 +4173,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SCANNER$", 14
 	.2byte ITEM_SCANNER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gScannerItemDescription
@@ -4188,7 +4188,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GO-GOGGLES$", 14
 	.2byte ITEM_GO_GOGGLES
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gGoGogglesItemDescription
@@ -4203,7 +4203,7 @@ gItems: ; 85839A0
 
 	.charmapstr "METEORITE$", 14
 	.2byte ITEM_METEORITE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMeteoriteItemDescription
@@ -4218,7 +4218,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RM. 1 KEY$", 14
 	.2byte ITEM_ROOM_1_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRoom1KeyItemDescription
@@ -4233,7 +4233,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RM. 2 KEY$", 14
 	.2byte ITEM_ROOM_2_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRoom2KeyItemDescription
@@ -4248,7 +4248,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RM. 4 KEY$", 14
 	.2byte ITEM_ROOM_4_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRoom4KeyItemDescription
@@ -4263,7 +4263,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RM. 6 KEY$", 14
 	.2byte ITEM_ROOM_6_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRoom6KeyItemDescription
@@ -4278,7 +4278,7 @@ gItems: ; 85839A0
 
 	.charmapstr "STORAGE KEY$", 14
 	.2byte ITEM_STORAGE_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gStorageKeyItemDescription
@@ -4293,7 +4293,7 @@ gItems: ; 85839A0
 
 	.charmapstr "ROOT FOSSIL$", 14
 	.2byte ITEM_ROOT_FOSSIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRootFossilItemDescription
@@ -4308,7 +4308,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CLAW FOSSIL$", 14
 	.2byte ITEM_CLAW_FOSSIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gClawFossilItemDescription
@@ -4323,7 +4323,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DEVON SCOPE$", 14
 	.2byte ITEM_DEVON_SCOPE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDevonScopeItemDescription
@@ -4338,7 +4338,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM01$", 14
 	.2byte ITEM_TM01
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM01ItemDescription
@@ -4353,7 +4353,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM02$", 14
 	.2byte ITEM_TM02
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM02ItemDescription
@@ -4368,7 +4368,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM03$", 14
 	.2byte ITEM_TM03
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM03ItemDescription
@@ -4383,7 +4383,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM04$", 14
 	.2byte ITEM_TM04
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM04ItemDescription
@@ -4398,7 +4398,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM05$", 14
 	.2byte ITEM_TM05
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM05ItemDescription
@@ -4413,7 +4413,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM06$", 14
 	.2byte ITEM_TM06
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM06ItemDescription
@@ -4428,7 +4428,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM07$", 14
 	.2byte ITEM_TM07
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM07ItemDescription
@@ -4443,7 +4443,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM08$", 14
 	.2byte ITEM_TM08
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM08ItemDescription
@@ -4458,7 +4458,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM09$", 14
 	.2byte ITEM_TM09
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM09ItemDescription
@@ -4473,7 +4473,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM10$", 14
 	.2byte ITEM_TM10
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM10ItemDescription
@@ -4488,7 +4488,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM11$", 14
 	.2byte ITEM_TM11
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM11ItemDescription
@@ -4503,7 +4503,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM12$", 14
 	.2byte ITEM_TM12
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM12ItemDescription
@@ -4518,7 +4518,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM13$", 14
 	.2byte ITEM_TM13
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM13ItemDescription
@@ -4533,7 +4533,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM14$", 14
 	.2byte ITEM_TM14
-	.2byte 5500 ; price
+	.2byte 5500 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM14ItemDescription
@@ -4548,7 +4548,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM15$", 14
 	.2byte ITEM_TM15
-	.2byte 7500 ; price
+	.2byte 7500 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM15ItemDescription
@@ -4563,7 +4563,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM16$", 14
 	.2byte ITEM_TM16
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM16ItemDescription
@@ -4578,7 +4578,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM17$", 14
 	.2byte ITEM_TM17
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM17ItemDescription
@@ -4593,7 +4593,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM18$", 14
 	.2byte ITEM_TM18
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM18ItemDescription
@@ -4608,7 +4608,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM19$", 14
 	.2byte ITEM_TM19
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM19ItemDescription
@@ -4623,7 +4623,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM20$", 14
 	.2byte ITEM_TM20
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM20ItemDescription
@@ -4638,7 +4638,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM21$", 14
 	.2byte ITEM_TM21
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM21ItemDescription
@@ -4653,7 +4653,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM22$", 14
 	.2byte ITEM_TM22
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM22ItemDescription
@@ -4668,7 +4668,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM23$", 14
 	.2byte ITEM_TM23
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM23ItemDescription
@@ -4683,7 +4683,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM24$", 14
 	.2byte ITEM_TM24
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM24ItemDescription
@@ -4698,7 +4698,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM25$", 14
 	.2byte ITEM_TM25
-	.2byte 5500 ; price
+	.2byte 5500 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM25ItemDescription
@@ -4713,7 +4713,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM26$", 14
 	.2byte ITEM_TM26
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM26ItemDescription
@@ -4728,7 +4728,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM27$", 14
 	.2byte ITEM_TM27
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM27ItemDescription
@@ -4743,7 +4743,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM28$", 14
 	.2byte ITEM_TM28
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM28ItemDescription
@@ -4758,7 +4758,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM29$", 14
 	.2byte ITEM_TM29
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM29ItemDescription
@@ -4773,7 +4773,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM30$", 14
 	.2byte ITEM_TM30
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM30ItemDescription
@@ -4788,7 +4788,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM31$", 14
 	.2byte ITEM_TM31
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM31ItemDescription
@@ -4803,7 +4803,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM32$", 14
 	.2byte ITEM_TM32
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM32ItemDescription
@@ -4818,7 +4818,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM33$", 14
 	.2byte ITEM_TM33
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM33ItemDescription
@@ -4833,7 +4833,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM34$", 14
 	.2byte ITEM_TM34
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM34ItemDescription
@@ -4848,7 +4848,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM35$", 14
 	.2byte ITEM_TM35
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM35ItemDescription
@@ -4863,7 +4863,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM36$", 14
 	.2byte ITEM_TM36
-	.2byte 1000 ; price
+	.2byte 1000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM36ItemDescription
@@ -4878,7 +4878,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM37$", 14
 	.2byte ITEM_TM37
-	.2byte 2000 ; price
+	.2byte 2000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM37ItemDescription
@@ -4893,7 +4893,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM38$", 14
 	.2byte ITEM_TM38
-	.2byte 5500 ; price
+	.2byte 5500 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM38ItemDescription
@@ -4908,7 +4908,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM39$", 14
 	.2byte ITEM_TM39
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM39ItemDescription
@@ -4923,7 +4923,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM40$", 14
 	.2byte ITEM_TM40
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM40ItemDescription
@@ -4938,7 +4938,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM41$", 14
 	.2byte ITEM_TM41
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM41ItemDescription
@@ -4953,7 +4953,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM42$", 14
 	.2byte ITEM_TM42
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM42ItemDescription
@@ -4968,7 +4968,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM43$", 14
 	.2byte ITEM_TM43
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM43ItemDescription
@@ -4983,7 +4983,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM44$", 14
 	.2byte ITEM_TM44
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM44ItemDescription
@@ -4998,7 +4998,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM45$", 14
 	.2byte ITEM_TM45
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM45ItemDescription
@@ -5013,7 +5013,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM46$", 14
 	.2byte ITEM_TM46
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM46ItemDescription
@@ -5028,7 +5028,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM47$", 14
 	.2byte ITEM_TM47
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM47ItemDescription
@@ -5043,7 +5043,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM48$", 14
 	.2byte ITEM_TM48
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM48ItemDescription
@@ -5058,7 +5058,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM49$", 14
 	.2byte ITEM_TM49
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM49ItemDescription
@@ -5073,7 +5073,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM50$", 14
 	.2byte ITEM_TM50
-	.2byte 3000 ; price
+	.2byte 3000 @ price
 	.byte 0
 	.byte 0
 	.4byte gTM50ItemDescription
@@ -5088,7 +5088,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM01$", 14
 	.2byte ITEM_HM01
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM01ItemDescription
@@ -5103,7 +5103,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM02$", 14
 	.2byte ITEM_HM02
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM02ItemDescription
@@ -5118,7 +5118,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM03$", 14
 	.2byte ITEM_HM03
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM03ItemDescription
@@ -5133,7 +5133,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM04$", 14
 	.2byte ITEM_HM04
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM04ItemDescription
@@ -5148,7 +5148,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM05$", 14
 	.2byte ITEM_HM05
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM05ItemDescription
@@ -5163,7 +5163,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM06$", 14
 	.2byte ITEM_HM06
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM06ItemDescription
@@ -5178,7 +5178,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM07$", 14
 	.2byte ITEM_HM07
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM07ItemDescription
@@ -5193,7 +5193,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HM08$", 14
 	.2byte ITEM_HM08
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHM08ItemDescription
@@ -5208,7 +5208,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -5223,7 +5223,7 @@ gItems: ; 85839A0
 
 	.charmapstr "????????$", 14
 	.2byte ITEM_NONE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDummyItemDescription
@@ -5238,7 +5238,7 @@ gItems: ; 85839A0
 
 	.charmapstr "OAK’S PARCEL$", 14
 	.2byte ITEM_OAKS_PARCEL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gOaksParcelItemDescription
@@ -5253,7 +5253,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POKé FLUTE$", 14
 	.2byte ITEM_POKE_FLUTE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gPokeFluteItemDescription
@@ -5268,7 +5268,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SECRET KEY$", 14
 	.2byte ITEM_SECRET_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSecretKeyItemDescription
@@ -5283,7 +5283,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BIKE VOUCHER$", 14
 	.2byte ITEM_BIKE_VOUCHER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gBikeVoucherItemDescription
@@ -5298,7 +5298,7 @@ gItems: ; 85839A0
 
 	.charmapstr "GOLD TEETH$", 14
 	.2byte ITEM_GOLD_TEETH
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gGoldTeethItemDescription
@@ -5313,7 +5313,7 @@ gItems: ; 85839A0
 
 	.charmapstr "OLD AMBER$", 14
 	.2byte ITEM_OLD_AMBER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gOldAmberItemDescription
@@ -5328,7 +5328,7 @@ gItems: ; 85839A0
 
 	.charmapstr "CARD KEY$", 14
 	.2byte ITEM_CARD_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gCardKeyItemDescription
@@ -5343,7 +5343,7 @@ gItems: ; 85839A0
 
 	.charmapstr "LIFT KEY$", 14
 	.2byte ITEM_LIFT_KEY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gLiftKeyItemDescription
@@ -5358,7 +5358,7 @@ gItems: ; 85839A0
 
 	.charmapstr "HELIX FOSSIL$", 14
 	.2byte ITEM_HELIX_FOSSIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gHelixFossilItemDescription
@@ -5373,7 +5373,7 @@ gItems: ; 85839A0
 
 	.charmapstr "DOME FOSSIL$", 14
 	.2byte ITEM_DOME_FOSSIL
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gDomeFossilItemDescription
@@ -5388,7 +5388,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SILPH SCOPE$", 14
 	.2byte ITEM_SILPH_SCOPE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSilphScopeItemDescription
@@ -5403,7 +5403,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BICYCLE$", 14
 	.2byte ITEM_BICYCLE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gBicycleItemDescription
@@ -5418,7 +5418,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TOWN MAP$", 14
 	.2byte ITEM_TOWN_MAP
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gTownMapItemDescription
@@ -5433,7 +5433,7 @@ gItems: ; 85839A0
 
 	.charmapstr "VS SEEKER$", 14
 	.2byte ITEM_VS_SEEKER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gVSSeekerItemDescription
@@ -5448,7 +5448,7 @@ gItems: ; 85839A0
 
 	.charmapstr "FAME CHECKER$", 14
 	.2byte ITEM_FAME_CHECKER
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gFameCheckerItemDescription
@@ -5463,7 +5463,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TM CASE$", 14
 	.2byte ITEM_TM_CASE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gTMCaseItemDescription
@@ -5478,7 +5478,7 @@ gItems: ; 85839A0
 
 	.charmapstr "BERRY POUCH$", 14
 	.2byte ITEM_BERRY_POUCH
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gBerryPouchItemDescription
@@ -5493,7 +5493,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TEACHY TV$", 14
 	.2byte ITEM_TEACHY_TV
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gTeachyTVItemDescription
@@ -5508,7 +5508,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TRI-PASS$", 14
 	.2byte ITEM_TRI_PASS
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gTriPassItemDescription
@@ -5523,7 +5523,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RAINBOW PASS$", 14
 	.2byte ITEM_RAINBOW_PASS
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRainbowPassItemDescription
@@ -5538,7 +5538,7 @@ gItems: ; 85839A0
 
 	.charmapstr "TEA$", 14
 	.2byte ITEM_TEA
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gTeaItemDescription
@@ -5553,7 +5553,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MYSTICTICKET$", 14
 	.2byte ITEM_MYSTIC_TICKET
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMysticTicketItemDescription
@@ -5568,7 +5568,7 @@ gItems: ; 85839A0
 
 	.charmapstr "AURORATICKET$", 14
 	.2byte ITEM_AURORA_TICKET
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gAuroraTicketItemDescription
@@ -5583,7 +5583,7 @@ gItems: ; 85839A0
 
 	.charmapstr "POWDER JAR$", 14
 	.2byte ITEM_POWDER_JAR
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gPowderJarItemDescription
@@ -5598,7 +5598,7 @@ gItems: ; 85839A0
 
 	.charmapstr "RUBY$", 14
 	.2byte ITEM_RUBY
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gRubyItemDescription
@@ -5613,7 +5613,7 @@ gItems: ; 85839A0
 
 	.charmapstr "SAPPHIRE$", 14
 	.2byte ITEM_SAPPHIRE
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gSapphireItemDescription
@@ -5628,7 +5628,7 @@ gItems: ; 85839A0
 
 	.charmapstr "MAGMA EMBLEM$", 14
 	.2byte ITEM_MAGMA_EMBLEM
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gMagmaEmblemItemDescription
@@ -5643,7 +5643,7 @@ gItems: ; 85839A0
 
 	.charmapstr "OLD SEA MAP$", 14
 	.2byte ITEM_OLD_SEA_MAP
-	.2byte 0 ; price
+	.2byte 0 @ price
 	.byte 0
 	.byte 0
 	.4byte gOldSeaMapItemDescription
diff --git a/data/level_up_learnset_pointers.s b/data/level_up_learnset_pointers.s
index 3bb5d8375..492088f11 100644
--- a/data/level_up_learnset_pointers.s
+++ b/data/level_up_learnset_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gLevelUpLearnsetPointers: ; 832937C
+gLevelUpLearnsetPointers: @ 832937C
 	.4byte gBulbasaurLevelUpLearnset
 	.4byte gBulbasaurLevelUpLearnset
 	.4byte gIvysaurLevelUpLearnset
diff --git a/data/level_up_learnsets.s b/data/level_up_learnsets.s
index 377f0ed82..0eea614a7 100644
--- a/data/level_up_learnsets.s
+++ b/data/level_up_learnsets.s
@@ -1,4 +1,4 @@
-gBulbasaurLevelUpLearnset: ; 83230DC
+gBulbasaurLevelUpLearnset: @ 83230DC
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_GROWL
 	level_up_move  7, MOVE_LEECH_SEED
@@ -12,7 +12,7 @@ gBulbasaurLevelUpLearnset: ; 83230DC
 	level_up_move 46, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gIvysaurLevelUpLearnset: ; 83230F4
+gIvysaurLevelUpLearnset: @ 83230F4
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_LEECH_SEED
@@ -28,7 +28,7 @@ gIvysaurLevelUpLearnset: ; 83230F4
 	level_up_move 56, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gVenusaurLevelUpLearnset: ; 8323110
+gVenusaurLevelUpLearnset: @ 8323110
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_LEECH_SEED
@@ -45,7 +45,7 @@ gVenusaurLevelUpLearnset: ; 8323110
 	level_up_move 65, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gCharmanderLevelUpLearnset: ; 832312E
+gCharmanderLevelUpLearnset: @ 832312E
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  7, MOVE_EMBER
@@ -58,7 +58,7 @@ gCharmanderLevelUpLearnset: ; 832312E
 	level_up_move 49, MOVE_FIRE_SPIN
 	.2byte -1
 
-gCharmeleonLevelUpLearnset: ; 8323144
+gCharmeleonLevelUpLearnset: @ 8323144
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_EMBER
@@ -72,7 +72,7 @@ gCharmeleonLevelUpLearnset: ; 8323144
 	level_up_move 55, MOVE_FIRE_SPIN
 	.2byte -1
 
-gCharizardLevelUpLearnset: ; 832315C
+gCharizardLevelUpLearnset: @ 832315C
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_EMBER
@@ -88,7 +88,7 @@ gCharizardLevelUpLearnset: ; 832315C
 	level_up_move 64, MOVE_FIRE_SPIN
 	.2byte -1
 
-gSquirtleLevelUpLearnset: ; 8323178
+gSquirtleLevelUpLearnset: @ 8323178
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_TAIL_WHIP
 	level_up_move  7, MOVE_BUBBLE
@@ -102,7 +102,7 @@ gSquirtleLevelUpLearnset: ; 8323178
 	level_up_move 47, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gWartortleLevelUpLearnset: ; 8323190
+gWartortleLevelUpLearnset: @ 8323190
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_BUBBLE
@@ -118,7 +118,7 @@ gWartortleLevelUpLearnset: ; 8323190
 	level_up_move 53, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gBlastoiseLevelUpLearnset: ; 83231AC
+gBlastoiseLevelUpLearnset: @ 83231AC
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_BUBBLE
@@ -135,17 +135,17 @@ gBlastoiseLevelUpLearnset: ; 83231AC
 	level_up_move 68, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gCaterpieLevelUpLearnset: ; 83231CA
+gCaterpieLevelUpLearnset: @ 83231CA
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_STRING_SHOT
 	.2byte -1
 
-gMetapodLevelUpLearnset: ; 83231D0
+gMetapodLevelUpLearnset: @ 83231D0
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_HARDEN
 	.2byte -1
 
-gButterfreeLevelUpLearnset: ; 83231D6
+gButterfreeLevelUpLearnset: @ 83231D6
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move 10, MOVE_CONFUSION
 	level_up_move 13, MOVE_POISON_POWDER
@@ -159,17 +159,17 @@ gButterfreeLevelUpLearnset: ; 83231D6
 	level_up_move 47, MOVE_SILVER_WIND
 	.2byte -1
 
-gWeedleLevelUpLearnset: ; 83231EE
+gWeedleLevelUpLearnset: @ 83231EE
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_STRING_SHOT
 	.2byte -1
 
-gKakunaLevelUpLearnset: ; 83231F4
+gKakunaLevelUpLearnset: @ 83231F4
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_HARDEN
 	.2byte -1
 
-gBeedrillLevelUpLearnset: ; 83231FA
+gBeedrillLevelUpLearnset: @ 83231FA
 	level_up_move  1, MOVE_FURY_ATTACK
 	level_up_move 10, MOVE_FURY_ATTACK
 	level_up_move 15, MOVE_FOCUS_ENERGY
@@ -181,7 +181,7 @@ gBeedrillLevelUpLearnset: ; 83231FA
 	level_up_move 45, MOVE_ENDEAVOR
 	.2byte -1
 
-gPidgeyLevelUpLearnset: ; 832320E
+gPidgeyLevelUpLearnset: @ 832320E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_SAND_ATTACK
 	level_up_move  9, MOVE_GUST
@@ -193,7 +193,7 @@ gPidgeyLevelUpLearnset: ; 832320E
 	level_up_move 47, MOVE_MIRROR_MOVE
 	.2byte -1
 
-gPidgeottoLevelUpLearnset: ; 8323222
+gPidgeottoLevelUpLearnset: @ 8323222
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SAND_ATTACK
 	level_up_move  1, MOVE_GUST
@@ -207,7 +207,7 @@ gPidgeottoLevelUpLearnset: ; 8323222
 	level_up_move 52, MOVE_MIRROR_MOVE
 	.2byte -1
 
-gPidgeotLevelUpLearnset: ; 832323A
+gPidgeotLevelUpLearnset: @ 832323A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SAND_ATTACK
 	level_up_move  1, MOVE_GUST
@@ -222,7 +222,7 @@ gPidgeotLevelUpLearnset: ; 832323A
 	level_up_move 62, MOVE_MIRROR_MOVE
 	.2byte -1
 
-gRattataLevelUpLearnset: ; 8323254
+gRattataLevelUpLearnset: @ 8323254
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  7, MOVE_QUICK_ATTACK
@@ -233,7 +233,7 @@ gRattataLevelUpLearnset: ; 8323254
 	level_up_move 41, MOVE_ENDEAVOR
 	.2byte -1
 
-gRaticateLevelUpLearnset: ; 8323266
+gRaticateLevelUpLearnset: @ 8323266
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_QUICK_ATTACK
@@ -245,7 +245,7 @@ gRaticateLevelUpLearnset: ; 8323266
 	level_up_move 50, MOVE_ENDEAVOR
 	.2byte -1
 
-gSpearowLevelUpLearnset: ; 832327A
+gSpearowLevelUpLearnset: @ 832327A
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  7, MOVE_LEER
@@ -257,7 +257,7 @@ gSpearowLevelUpLearnset: ; 832327A
 	level_up_move 43, MOVE_AGILITY
 	.2byte -1
 
-gFearowLevelUpLearnset: ; 832328E
+gFearowLevelUpLearnset: @ 832328E
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_LEER
@@ -270,7 +270,7 @@ gFearowLevelUpLearnset: ; 832328E
 	level_up_move 47, MOVE_AGILITY
 	.2byte -1
 
-gEkansLevelUpLearnset: ; 83232A4
+gEkansLevelUpLearnset: @ 83232A4
 	level_up_move  1, MOVE_WRAP
 	level_up_move  1, MOVE_LEER
 	level_up_move  8, MOVE_POISON_STING
@@ -284,7 +284,7 @@ gEkansLevelUpLearnset: ; 83232A4
 	level_up_move 44, MOVE_HAZE
 	.2byte -1
 
-gArbokLevelUpLearnset: ; 83232BC
+gArbokLevelUpLearnset: @ 83232BC
 	level_up_move  1, MOVE_WRAP
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_POISON_STING
@@ -300,7 +300,7 @@ gArbokLevelUpLearnset: ; 83232BC
 	level_up_move 56, MOVE_HAZE
 	.2byte -1
 
-gPikachuLevelUpLearnset: ; 83232D8
+gPikachuLevelUpLearnset: @ 83232D8
 	level_up_move  1, MOVE_THUNDER_SHOCK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  6, MOVE_TAIL_WHIP
@@ -314,14 +314,14 @@ gPikachuLevelUpLearnset: ; 83232D8
 	level_up_move 50, MOVE_LIGHT_SCREEN
 	.2byte -1
 
-gRaichuLevelUpLearnset: ; 83232F0
+gRaichuLevelUpLearnset: @ 83232F0
 	level_up_move  1, MOVE_THUNDER_SHOCK
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_THUNDERBOLT
 	.2byte -1
 
-gSandshrewLevelUpLearnset: ; 83232FA
+gSandshrewLevelUpLearnset: @ 83232FA
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  6, MOVE_DEFENSE_CURL
 	level_up_move 11, MOVE_SAND_ATTACK
@@ -333,7 +333,7 @@ gSandshrewLevelUpLearnset: ; 83232FA
 	level_up_move 53, MOVE_SANDSTORM
 	.2byte -1
 
-gSandslashLevelUpLearnset: ; 832330E
+gSandslashLevelUpLearnset: @ 832330E
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_SAND_ATTACK
@@ -347,7 +347,7 @@ gSandslashLevelUpLearnset: ; 832330E
 	level_up_move 62, MOVE_SANDSTORM
 	.2byte -1
 
-gNidoranFLevelUpLearnset: ; 8323326
+gNidoranFLevelUpLearnset: @ 8323326
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  8, MOVE_TAIL_WHIP
@@ -360,7 +360,7 @@ gNidoranFLevelUpLearnset: ; 8323326
 	level_up_move 47, MOVE_CRUNCH
 	.2byte -1
 
-gNidorinaLevelUpLearnset: ; 832333C
+gNidorinaLevelUpLearnset: @ 832333C
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  8, MOVE_TAIL_WHIP
@@ -373,7 +373,7 @@ gNidorinaLevelUpLearnset: ; 832333C
 	level_up_move 53, MOVE_CRUNCH
 	.2byte -1
 
-gNidoqueenLevelUpLearnset: ; 8323352
+gNidoqueenLevelUpLearnset: @ 8323352
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_DOUBLE_KICK
@@ -381,7 +381,7 @@ gNidoqueenLevelUpLearnset: ; 8323352
 	level_up_move 23, MOVE_BODY_SLAM
 	.2byte -1
 
-gNidoranMLevelUpLearnset: ; 832335E
+gNidoranMLevelUpLearnset: @ 832335E
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_PECK
 	level_up_move  8, MOVE_FOCUS_ENERGY
@@ -394,7 +394,7 @@ gNidoranMLevelUpLearnset: ; 832335E
 	level_up_move 47, MOVE_HORN_DRILL
 	.2byte -1
 
-gNidorinoLevelUpLearnset: ; 8323374
+gNidorinoLevelUpLearnset: @ 8323374
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_PECK
 	level_up_move  8, MOVE_FOCUS_ENERGY
@@ -407,7 +407,7 @@ gNidorinoLevelUpLearnset: ; 8323374
 	level_up_move 53, MOVE_HORN_DRILL
 	.2byte -1
 
-gNidokingLevelUpLearnset: ; 832338A
+gNidokingLevelUpLearnset: @ 832338A
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_FOCUS_ENERGY
 	level_up_move  1, MOVE_DOUBLE_KICK
@@ -415,7 +415,7 @@ gNidokingLevelUpLearnset: ; 832338A
 	level_up_move 23, MOVE_THRASH
 	.2byte -1
 
-gClefairyLevelUpLearnset: ; 8323396
+gClefairyLevelUpLearnset: @ 8323396
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_GROWL
 	level_up_move  5, MOVE_ENCORE
@@ -431,14 +431,14 @@ gClefairyLevelUpLearnset: ; 8323396
 	level_up_move 45, MOVE_METEOR_MASH
 	.2byte -1
 
-gClefableLevelUpLearnset: ; 83233B2
+gClefableLevelUpLearnset: @ 83233B2
 	level_up_move  1, MOVE_SING
 	level_up_move  1, MOVE_DOUBLE_SLAP
 	level_up_move  1, MOVE_MINIMIZE
 	level_up_move  1, MOVE_METRONOME
 	.2byte -1
 
-gVulpixLevelUpLearnset: ; 83233BC
+gVulpixLevelUpLearnset: @ 83233BC
 	level_up_move  1, MOVE_EMBER
 	level_up_move  5, MOVE_TAIL_WHIP
 	level_up_move  9, MOVE_ROAR
@@ -452,7 +452,7 @@ gVulpixLevelUpLearnset: ; 83233BC
 	level_up_move 41, MOVE_FIRE_SPIN
 	.2byte -1
 
-gNinetalesLevelUpLearnset: ; 83233D4
+gNinetalesLevelUpLearnset: @ 83233D4
 	level_up_move  1, MOVE_EMBER
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_CONFUSE_RAY
@@ -460,7 +460,7 @@ gNinetalesLevelUpLearnset: ; 83233D4
 	level_up_move 45, MOVE_FIRE_SPIN
 	.2byte -1
 
-gJigglypuffLevelUpLearnset: ; 83233E0
+gJigglypuffLevelUpLearnset: @ 83233E0
 	level_up_move  1, MOVE_SING
 	level_up_move  4, MOVE_DEFENSE_CURL
 	level_up_move  9, MOVE_POUND
@@ -474,14 +474,14 @@ gJigglypuffLevelUpLearnset: ; 83233E0
 	level_up_move 49, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gWigglytuffLevelUpLearnset: ; 83233F8
+gWigglytuffLevelUpLearnset: @ 83233F8
 	level_up_move  1, MOVE_SING
 	level_up_move  1, MOVE_DISABLE
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_DOUBLE_SLAP
 	.2byte -1
 
-gZubatLevelUpLearnset: ; 8323402
+gZubatLevelUpLearnset: @ 8323402
 	level_up_move  1, MOVE_LEECH_LIFE
 	level_up_move  6, MOVE_SUPERSONIC
 	level_up_move 11, MOVE_ASTONISH
@@ -494,7 +494,7 @@ gZubatLevelUpLearnset: ; 8323402
 	level_up_move 46, MOVE_HAZE
 	.2byte -1
 
-gGolbatLevelUpLearnset: ; 8323418
+gGolbatLevelUpLearnset: @ 8323418
 	level_up_move  1, MOVE_SCREECH
 	level_up_move  1, MOVE_LEECH_LIFE
 	level_up_move  1, MOVE_SUPERSONIC
@@ -510,7 +510,7 @@ gGolbatLevelUpLearnset: ; 8323418
 	level_up_move 56, MOVE_HAZE
 	.2byte -1
 
-gOddishLevelUpLearnset: ; 8323434
+gOddishLevelUpLearnset: @ 8323434
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  7, MOVE_SWEET_SCENT
 	level_up_move 14, MOVE_POISON_POWDER
@@ -521,7 +521,7 @@ gOddishLevelUpLearnset: ; 8323434
 	level_up_move 39, MOVE_PETAL_DANCE
 	.2byte -1
 
-gGloomLevelUpLearnset: ; 8323446
+gGloomLevelUpLearnset: @ 8323446
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_SWEET_SCENT
 	level_up_move  1, MOVE_POISON_POWDER
@@ -534,7 +534,7 @@ gGloomLevelUpLearnset: ; 8323446
 	level_up_move 44, MOVE_PETAL_DANCE
 	.2byte -1
 
-gVileplumeLevelUpLearnset: ; 832345C
+gVileplumeLevelUpLearnset: @ 832345C
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_AROMATHERAPY
 	level_up_move  1, MOVE_STUN_SPORE
@@ -542,7 +542,7 @@ gVileplumeLevelUpLearnset: ; 832345C
 	level_up_move 44, MOVE_PETAL_DANCE
 	.2byte -1
 
-gParasLevelUpLearnset: ; 8323468
+gParasLevelUpLearnset: @ 8323468
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  7, MOVE_STUN_SPORE
 	level_up_move 13, MOVE_POISON_POWDER
@@ -554,7 +554,7 @@ gParasLevelUpLearnset: ; 8323468
 	level_up_move 49, MOVE_AROMATHERAPY
 	.2byte -1
 
-gParasectLevelUpLearnset: ; 832347C
+gParasectLevelUpLearnset: @ 832347C
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_STUN_SPORE
 	level_up_move  1, MOVE_POISON_POWDER
@@ -568,7 +568,7 @@ gParasectLevelUpLearnset: ; 832347C
 	level_up_move 59, MOVE_AROMATHERAPY
 	.2byte -1
 
-gVenonatLevelUpLearnset: ; 8323494
+gVenonatLevelUpLearnset: @ 8323494
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DISABLE
 	level_up_move  1, MOVE_FORESIGHT
@@ -582,7 +582,7 @@ gVenonatLevelUpLearnset: ; 8323494
 	level_up_move 41, MOVE_PSYCHIC
 	.2byte -1
 
-gVenomothLevelUpLearnset: ; 83234AC
+gVenomothLevelUpLearnset: @ 83234AC
 	level_up_move  1, MOVE_SILVER_WIND
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DISABLE
@@ -599,7 +599,7 @@ gVenomothLevelUpLearnset: ; 83234AC
 	level_up_move 52, MOVE_PSYCHIC
 	.2byte -1
 
-gDiglettLevelUpLearnset: ; 83234CA
+gDiglettLevelUpLearnset: @ 83234CA
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_SAND_ATTACK
 	level_up_move  5, MOVE_GROWL
@@ -611,7 +611,7 @@ gDiglettLevelUpLearnset: ; 83234CA
 	level_up_move 49, MOVE_FISSURE
 	.2byte -1
 
-gDugtrioLevelUpLearnset: ; 83234DE
+gDugtrioLevelUpLearnset: @ 83234DE
 	level_up_move  1, MOVE_TRI_ATTACK
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_SAND_ATTACK
@@ -626,7 +626,7 @@ gDugtrioLevelUpLearnset: ; 83234DE
 	level_up_move 64, MOVE_FISSURE
 	.2byte -1
 
-gMeowthLevelUpLearnset: ; 83234F8
+gMeowthLevelUpLearnset: @ 83234F8
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move 11, MOVE_BITE
@@ -638,7 +638,7 @@ gMeowthLevelUpLearnset: ; 83234F8
 	level_up_move 50, MOVE_FAKE_OUT
 	.2byte -1
 
-gPersianLevelUpLearnset: ; 832350C
+gPersianLevelUpLearnset: @ 832350C
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_BITE
@@ -651,7 +651,7 @@ gPersianLevelUpLearnset: ; 832350C
 	level_up_move 59, MOVE_FAKE_OUT
 	.2byte -1
 
-gPsyduckLevelUpLearnset: ; 8323522
+gPsyduckLevelUpLearnset: @ 8323522
 	level_up_move  1, MOVE_WATER_SPORT
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  5, MOVE_TAIL_WHIP
@@ -663,7 +663,7 @@ gPsyduckLevelUpLearnset: ; 8323522
 	level_up_move 50, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gGolduckLevelUpLearnset: ; 8323536
+gGolduckLevelUpLearnset: @ 8323536
 	level_up_move  1, MOVE_WATER_SPORT
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -677,7 +677,7 @@ gGolduckLevelUpLearnset: ; 8323536
 	level_up_move 58, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gMankeyLevelUpLearnset: ; 832354E
+gMankeyLevelUpLearnset: @ 832354E
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  9, MOVE_LOW_KICK
@@ -690,7 +690,7 @@ gMankeyLevelUpLearnset: ; 832354E
 	level_up_move 51, MOVE_THRASH
 	.2byte -1
 
-gPrimeapeLevelUpLearnset: ; 8323564
+gPrimeapeLevelUpLearnset: @ 8323564
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_LOW_KICK
@@ -706,7 +706,7 @@ gPrimeapeLevelUpLearnset: ; 8323564
 	level_up_move 63, MOVE_THRASH
 	.2byte -1
 
-gGrowlitheLevelUpLearnset: ; 8323580
+gGrowlitheLevelUpLearnset: @ 8323580
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_ROAR
 	level_up_move  7, MOVE_EMBER
@@ -719,7 +719,7 @@ gGrowlitheLevelUpLearnset: ; 8323580
 	level_up_move 49, MOVE_FLAMETHROWER
 	.2byte -1
 
-gArcanineLevelUpLearnset: ; 8323596
+gArcanineLevelUpLearnset: @ 8323596
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_ROAR
 	level_up_move  1, MOVE_EMBER
@@ -727,7 +727,7 @@ gArcanineLevelUpLearnset: ; 8323596
 	level_up_move 49, MOVE_EXTREME_SPEED
 	.2byte -1
 
-gPoliwagLevelUpLearnset: ; 83235A2
+gPoliwagLevelUpLearnset: @ 83235A2
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  7, MOVE_HYPNOSIS
 	level_up_move 13, MOVE_WATER_GUN
@@ -738,7 +738,7 @@ gPoliwagLevelUpLearnset: ; 83235A2
 	level_up_move 43, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gPoliwhirlLevelUpLearnset: ; 83235B4
+gPoliwhirlLevelUpLearnset: @ 83235B4
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_WATER_GUN
@@ -751,7 +751,7 @@ gPoliwhirlLevelUpLearnset: ; 83235B4
 	level_up_move 51, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gPoliwrathLevelUpLearnset: ; 83235CA
+gPoliwrathLevelUpLearnset: @ 83235CA
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_DOUBLE_SLAP
@@ -760,11 +760,11 @@ gPoliwrathLevelUpLearnset: ; 83235CA
 	level_up_move 51, MOVE_MIND_READER
 	.2byte -1
 
-gAbraLevelUpLearnset: ; 83235D8
+gAbraLevelUpLearnset: @ 83235D8
 	level_up_move  1, MOVE_TELEPORT
 	.2byte -1
 
-gKadabraLevelUpLearnset: ; 83235DC
+gKadabraLevelUpLearnset: @ 83235DC
 	level_up_move  1, MOVE_TELEPORT
 	level_up_move  1, MOVE_KINESIS
 	level_up_move  1, MOVE_CONFUSION
@@ -779,7 +779,7 @@ gKadabraLevelUpLearnset: ; 83235DC
 	level_up_move 43, MOVE_TRICK
 	.2byte -1
 
-gAlakazamLevelUpLearnset: ; 83235F6
+gAlakazamLevelUpLearnset: @ 83235F6
 	level_up_move  1, MOVE_TELEPORT
 	level_up_move  1, MOVE_KINESIS
 	level_up_move  1, MOVE_CONFUSION
@@ -794,7 +794,7 @@ gAlakazamLevelUpLearnset: ; 83235F6
 	level_up_move 43, MOVE_TRICK
 	.2byte -1
 
-gMachopLevelUpLearnset: ; 8323610
+gMachopLevelUpLearnset: @ 8323610
 	level_up_move  1, MOVE_LOW_KICK
 	level_up_move  1, MOVE_LEER
 	level_up_move  7, MOVE_FOCUS_ENERGY
@@ -809,7 +809,7 @@ gMachopLevelUpLearnset: ; 8323610
 	level_up_move 49, MOVE_DYNAMIC_PUNCH
 	.2byte -1
 
-gMachokeLevelUpLearnset: ; 832362A
+gMachokeLevelUpLearnset: @ 832362A
 	level_up_move  1, MOVE_LOW_KICK
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_FOCUS_ENERGY
@@ -825,7 +825,7 @@ gMachokeLevelUpLearnset: ; 832362A
 	level_up_move 59, MOVE_DYNAMIC_PUNCH
 	.2byte -1
 
-gMachampLevelUpLearnset: ; 8323646
+gMachampLevelUpLearnset: @ 8323646
 	level_up_move  1, MOVE_LOW_KICK
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_FOCUS_ENERGY
@@ -841,7 +841,7 @@ gMachampLevelUpLearnset: ; 8323646
 	level_up_move 59, MOVE_DYNAMIC_PUNCH
 	.2byte -1
 
-gBellsproutLevelUpLearnset: ; 8323662
+gBellsproutLevelUpLearnset: @ 8323662
 	level_up_move  1, MOVE_VINE_WHIP
 	level_up_move  6, MOVE_GROWTH
 	level_up_move 11, MOVE_WRAP
@@ -854,7 +854,7 @@ gBellsproutLevelUpLearnset: ; 8323662
 	level_up_move 45, MOVE_SLAM
 	.2byte -1
 
-gWeepinbellLevelUpLearnset: ; 8323678
+gWeepinbellLevelUpLearnset: @ 8323678
 	level_up_move  1, MOVE_VINE_WHIP
 	level_up_move  1, MOVE_GROWTH
 	level_up_move  1, MOVE_WRAP
@@ -869,14 +869,14 @@ gWeepinbellLevelUpLearnset: ; 8323678
 	level_up_move 54, MOVE_SLAM
 	.2byte -1
 
-gVictreebelLevelUpLearnset: ; 8323692
+gVictreebelLevelUpLearnset: @ 8323692
 	level_up_move  1, MOVE_VINE_WHIP
 	level_up_move  1, MOVE_SLEEP_POWDER
 	level_up_move  1, MOVE_SWEET_SCENT
 	level_up_move  1, MOVE_RAZOR_LEAF
 	.2byte -1
 
-gTentacoolLevelUpLearnset: ; 832369C
+gTentacoolLevelUpLearnset: @ 832369C
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  6, MOVE_SUPERSONIC
 	level_up_move 12, MOVE_CONSTRICT
@@ -888,7 +888,7 @@ gTentacoolLevelUpLearnset: ; 832369C
 	level_up_move 49, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gTentacruelLevelUpLearnset: ; 83236B0
+gTentacruelLevelUpLearnset: @ 83236B0
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_SUPERSONIC
 	level_up_move  1, MOVE_CONSTRICT
@@ -902,7 +902,7 @@ gTentacruelLevelUpLearnset: ; 83236B0
 	level_up_move 55, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gGeodudeLevelUpLearnset: ; 83236C8
+gGeodudeLevelUpLearnset: @ 83236C8
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  6, MOVE_MUD_SPORT
@@ -916,7 +916,7 @@ gGeodudeLevelUpLearnset: ; 83236C8
 	level_up_move 46, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gGravelerLevelUpLearnset: ; 83236E0
+gGravelerLevelUpLearnset: @ 83236E0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_MUD_SPORT
@@ -932,7 +932,7 @@ gGravelerLevelUpLearnset: ; 83236E0
 	level_up_move 62, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gGolemLevelUpLearnset: ; 83236FC
+gGolemLevelUpLearnset: @ 83236FC
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_MUD_SPORT
@@ -948,7 +948,7 @@ gGolemLevelUpLearnset: ; 83236FC
 	level_up_move 62, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gPonytaLevelUpLearnset: ; 8323718
+gPonytaLevelUpLearnset: @ 8323718
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_GROWL
 	level_up_move  9, MOVE_TAIL_WHIP
@@ -961,7 +961,7 @@ gPonytaLevelUpLearnset: ; 8323718
 	level_up_move 53, MOVE_FIRE_BLAST
 	.2byte -1
 
-gRapidashLevelUpLearnset: ; 832372E
+gRapidashLevelUpLearnset: @ 832372E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -978,7 +978,7 @@ gRapidashLevelUpLearnset: ; 832372E
 	level_up_move 63, MOVE_FIRE_BLAST
 	.2byte -1
 
-gSlowpokeLevelUpLearnset: ; 832374C
+gSlowpokeLevelUpLearnset: @ 832374C
 	level_up_move  1, MOVE_CURSE
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_TACKLE
@@ -991,7 +991,7 @@ gSlowpokeLevelUpLearnset: ; 832374C
 	level_up_move 48, MOVE_PSYCHIC
 	.2byte -1
 
-gSlowbroLevelUpLearnset: ; 8323762
+gSlowbroLevelUpLearnset: @ 8323762
 	level_up_move  1, MOVE_CURSE
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_TACKLE
@@ -1006,7 +1006,7 @@ gSlowbroLevelUpLearnset: ; 8323762
 	level_up_move 54, MOVE_PSYCHIC
 	.2byte -1
 
-gMagnemiteLevelUpLearnset: ; 832377C
+gMagnemiteLevelUpLearnset: @ 832377C
 	level_up_move  1, MOVE_METAL_SOUND
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  6, MOVE_THUNDER_SHOCK
@@ -1020,7 +1020,7 @@ gMagnemiteLevelUpLearnset: ; 832377C
 	level_up_move 50, MOVE_ZAP_CANNON
 	.2byte -1
 
-gMagnetonLevelUpLearnset: ; 8323794
+gMagnetonLevelUpLearnset: @ 8323794
 	level_up_move  1, MOVE_METAL_SOUND
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_THUNDER_SHOCK
@@ -1036,7 +1036,7 @@ gMagnetonLevelUpLearnset: ; 8323794
 	level_up_move 62, MOVE_ZAP_CANNON
 	.2byte -1
 
-gFarfetchdLevelUpLearnset: ; 83237B0
+gFarfetchdLevelUpLearnset: @ 83237B0
 	level_up_move  1, MOVE_PECK
 	level_up_move  6, MOVE_SAND_ATTACK
 	level_up_move 11, MOVE_LEER
@@ -1049,7 +1049,7 @@ gFarfetchdLevelUpLearnset: ; 83237B0
 	level_up_move 46, MOVE_FALSE_SWIPE
 	.2byte -1
 
-gDoduoLevelUpLearnset: ; 83237C6
+gDoduoLevelUpLearnset: @ 83237C6
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  9, MOVE_PURSUIT
@@ -1061,7 +1061,7 @@ gDoduoLevelUpLearnset: ; 83237C6
 	level_up_move 45, MOVE_AGILITY
 	.2byte -1
 
-gDodrioLevelUpLearnset: ; 83237DA
+gDodrioLevelUpLearnset: @ 83237DA
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_PURSUIT
@@ -1075,7 +1075,7 @@ gDodrioLevelUpLearnset: ; 83237DA
 	level_up_move 60, MOVE_AGILITY
 	.2byte -1
 
-gSeelLevelUpLearnset: ; 83237F2
+gSeelLevelUpLearnset: @ 83237F2
 	level_up_move  1, MOVE_HEADBUTT
 	level_up_move  9, MOVE_GROWL
 	level_up_move 17, MOVE_ICY_WIND
@@ -1086,7 +1086,7 @@ gSeelLevelUpLearnset: ; 83237F2
 	level_up_move 49, MOVE_SAFEGUARD
 	.2byte -1
 
-gDewgongLevelUpLearnset: ; 8323804
+gDewgongLevelUpLearnset: @ 8323804
 	level_up_move  1, MOVE_HEADBUTT
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_ICY_WIND
@@ -1101,7 +1101,7 @@ gDewgongLevelUpLearnset: ; 8323804
 	level_up_move 64, MOVE_SAFEGUARD
 	.2byte -1
 
-gGrimerLevelUpLearnset: ; 832381E
+gGrimerLevelUpLearnset: @ 832381E
 	level_up_move  1, MOVE_POISON_GAS
 	level_up_move  1, MOVE_POUND
 	level_up_move  4, MOVE_HARDEN
@@ -1114,7 +1114,7 @@ gGrimerLevelUpLearnset: ; 832381E
 	level_up_move 53, MOVE_MEMENTO
 	.2byte -1
 
-gMukLevelUpLearnset: ; 8323834
+gMukLevelUpLearnset: @ 8323834
 	level_up_move  1, MOVE_POISON_GAS
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_HARDEN
@@ -1128,7 +1128,7 @@ gMukLevelUpLearnset: ; 8323834
 	level_up_move 61, MOVE_MEMENTO
 	.2byte -1
 
-gShellderLevelUpLearnset: ; 832384C
+gShellderLevelUpLearnset: @ 832384C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_WITHDRAW
 	level_up_move  9, MOVE_SUPERSONIC
@@ -1139,7 +1139,7 @@ gShellderLevelUpLearnset: ; 832384C
 	level_up_move 49, MOVE_ICE_BEAM
 	.2byte -1
 
-gCloysterLevelUpLearnset: ; 832385E
+gCloysterLevelUpLearnset: @ 832385E
 	level_up_move  1, MOVE_WITHDRAW
 	level_up_move  1, MOVE_SUPERSONIC
 	level_up_move  1, MOVE_AURORA_BEAM
@@ -1148,7 +1148,7 @@ gCloysterLevelUpLearnset: ; 832385E
 	level_up_move 41, MOVE_SPIKE_CANNON
 	.2byte -1
 
-gGastlyLevelUpLearnset: ; 832386C
+gGastlyLevelUpLearnset: @ 832386C
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_LICK
 	level_up_move  8, MOVE_SPITE
@@ -1160,7 +1160,7 @@ gGastlyLevelUpLearnset: ; 832386C
 	level_up_move 36, MOVE_DESTINY_BOND
 	.2byte -1
 
-gHaunterLevelUpLearnset: ; 8323880
+gHaunterLevelUpLearnset: @ 8323880
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_LICK
 	level_up_move  1, MOVE_SPITE
@@ -1174,7 +1174,7 @@ gHaunterLevelUpLearnset: ; 8323880
 	level_up_move 48, MOVE_DESTINY_BOND
 	.2byte -1
 
-gGengarLevelUpLearnset: ; 8323898
+gGengarLevelUpLearnset: @ 8323898
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_LICK
 	level_up_move  1, MOVE_SPITE
@@ -1188,7 +1188,7 @@ gGengarLevelUpLearnset: ; 8323898
 	level_up_move 48, MOVE_DESTINY_BOND
 	.2byte -1
 
-gOnixLevelUpLearnset: ; 83238B0
+gOnixLevelUpLearnset: @ 83238B0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SCREECH
 	level_up_move  9, MOVE_BIND
@@ -1202,7 +1202,7 @@ gOnixLevelUpLearnset: ; 83238B0
 	level_up_move 57, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gDrowzeeLevelUpLearnset: ; 83238C8
+gDrowzeeLevelUpLearnset: @ 83238C8
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move 10, MOVE_DISABLE
@@ -1215,7 +1215,7 @@ gDrowzeeLevelUpLearnset: ; 83238C8
 	level_up_move 45, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gHypnoLevelUpLearnset: ; 83238DE
+gHypnoLevelUpLearnset: @ 83238DE
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_DISABLE
@@ -1230,7 +1230,7 @@ gHypnoLevelUpLearnset: ; 83238DE
 	level_up_move 60, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gKrabbyLevelUpLearnset: ; 83238F8
+gKrabbyLevelUpLearnset: @ 83238F8
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  5, MOVE_LEER
 	level_up_move 12, MOVE_VICE_GRIP
@@ -1242,7 +1242,7 @@ gKrabbyLevelUpLearnset: ; 83238F8
 	level_up_move 45, MOVE_CRABHAMMER
 	.2byte -1
 
-gKinglerLevelUpLearnset: ; 832390C
+gKinglerLevelUpLearnset: @ 832390C
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_VICE_GRIP
@@ -1256,7 +1256,7 @@ gKinglerLevelUpLearnset: ; 832390C
 	level_up_move 57, MOVE_CRABHAMMER
 	.2byte -1
 
-gVoltorbLevelUpLearnset: ; 8323924
+gVoltorbLevelUpLearnset: @ 8323924
 	level_up_move  1, MOVE_CHARGE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  8, MOVE_SCREECH
@@ -1270,7 +1270,7 @@ gVoltorbLevelUpLearnset: ; 8323924
 	level_up_move 49, MOVE_MIRROR_COAT
 	.2byte -1
 
-gElectrodeLevelUpLearnset: ; 832393C
+gElectrodeLevelUpLearnset: @ 832393C
 	level_up_move  1, MOVE_CHARGE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SCREECH
@@ -1286,7 +1286,7 @@ gElectrodeLevelUpLearnset: ; 832393C
 	level_up_move 59, MOVE_MIRROR_COAT
 	.2byte -1
 
-gExeggcuteLevelUpLearnset: ; 8323958
+gExeggcuteLevelUpLearnset: @ 8323958
 	level_up_move  1, MOVE_BARRAGE
 	level_up_move  1, MOVE_UPROAR
 	level_up_move  1, MOVE_HYPNOSIS
@@ -1299,7 +1299,7 @@ gExeggcuteLevelUpLearnset: ; 8323958
 	level_up_move 43, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gExeggutorLevelUpLearnset: ; 832396E
+gExeggutorLevelUpLearnset: @ 832396E
 	level_up_move  1, MOVE_BARRAGE
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_CONFUSION
@@ -1307,7 +1307,7 @@ gExeggutorLevelUpLearnset: ; 832396E
 	level_up_move 31, MOVE_EGG_BOMB
 	.2byte -1
 
-gCuboneLevelUpLearnset: ; 832397A
+gCuboneLevelUpLearnset: @ 832397A
 	level_up_move  1, MOVE_GROWL
 	level_up_move  5, MOVE_TAIL_WHIP
 	level_up_move  9, MOVE_BONE_CLUB
@@ -1322,7 +1322,7 @@ gCuboneLevelUpLearnset: ; 832397A
 	level_up_move 45, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gMarowakLevelUpLearnset: ; 8323994
+gMarowakLevelUpLearnset: @ 8323994
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_BONE_CLUB
@@ -1340,7 +1340,7 @@ gMarowakLevelUpLearnset: ; 8323994
 	level_up_move 61, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gHitmonleeLevelUpLearnset: ; 83239B4
+gHitmonleeLevelUpLearnset: @ 83239B4
 	level_up_move  1, MOVE_REVENGE
 	level_up_move  1, MOVE_DOUBLE_KICK
 	level_up_move  6, MOVE_MEDITATE
@@ -1356,7 +1356,7 @@ gHitmonleeLevelUpLearnset: ; 83239B4
 	level_up_move 51, MOVE_REVERSAL
 	.2byte -1
 
-gHitmonchanLevelUpLearnset: ; 83239D0
+gHitmonchanLevelUpLearnset: @ 83239D0
 	level_up_move  1, MOVE_REVENGE
 	level_up_move  1, MOVE_COMET_PUNCH
 	level_up_move  7, MOVE_AGILITY
@@ -1371,7 +1371,7 @@ gHitmonchanLevelUpLearnset: ; 83239D0
 	level_up_move 50, MOVE_COUNTER
 	.2byte -1
 
-gLickitungLevelUpLearnset: ; 83239EA
+gLickitungLevelUpLearnset: @ 83239EA
 	level_up_move  1, MOVE_LICK
 	level_up_move  7, MOVE_SUPERSONIC
 	level_up_move 12, MOVE_DEFENSE_CURL
@@ -1384,7 +1384,7 @@ gLickitungLevelUpLearnset: ; 83239EA
 	level_up_move 51, MOVE_REFRESH
 	.2byte -1
 
-gKoffingLevelUpLearnset: ; 8323A00
+gKoffingLevelUpLearnset: @ 8323A00
 	level_up_move  1, MOVE_POISON_GAS
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  9, MOVE_SMOG
@@ -1397,7 +1397,7 @@ gKoffingLevelUpLearnset: ; 8323A00
 	level_up_move 49, MOVE_MEMENTO
 	.2byte -1
 
-gWeezingLevelUpLearnset: ; 8323A16
+gWeezingLevelUpLearnset: @ 8323A16
 	level_up_move  1, MOVE_POISON_GAS
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SMOG
@@ -1412,7 +1412,7 @@ gWeezingLevelUpLearnset: ; 8323A16
 	level_up_move 58, MOVE_MEMENTO
 	.2byte -1
 
-gRhyhornLevelUpLearnset: ; 8323A30
+gRhyhornLevelUpLearnset: @ 8323A30
 	level_up_move  1, MOVE_HORN_ATTACK
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move 10, MOVE_STOMP
@@ -1425,7 +1425,7 @@ gRhyhornLevelUpLearnset: ; 8323A30
 	level_up_move 57, MOVE_MEGAHORN
 	.2byte -1
 
-gRhydonLevelUpLearnset: ; 8323A46
+gRhydonLevelUpLearnset: @ 8323A46
 	level_up_move  1, MOVE_HORN_ATTACK
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_STOMP
@@ -1440,7 +1440,7 @@ gRhydonLevelUpLearnset: ; 8323A46
 	level_up_move 66, MOVE_MEGAHORN
 	.2byte -1
 
-gChanseyLevelUpLearnset: ; 8323A60
+gChanseyLevelUpLearnset: @ 8323A60
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_GROWL
 	level_up_move  5, MOVE_TAIL_WHIP
@@ -1455,7 +1455,7 @@ gChanseyLevelUpLearnset: ; 8323A60
 	level_up_move 57, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gTangelaLevelUpLearnset: ; 8323A7A
+gTangelaLevelUpLearnset: @ 8323A7A
 	level_up_move  1, MOVE_INGRAIN
 	level_up_move  1, MOVE_CONSTRICT
 	level_up_move  4, MOVE_SLEEP_POWDER
@@ -1470,7 +1470,7 @@ gTangelaLevelUpLearnset: ; 8323A7A
 	level_up_move 46, MOVE_TICKLE
 	.2byte -1
 
-gKangaskhanLevelUpLearnset: ; 8323A94
+gKangaskhanLevelUpLearnset: @ 8323A94
 	level_up_move  1, MOVE_COMET_PUNCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  7, MOVE_BITE
@@ -1483,7 +1483,7 @@ gKangaskhanLevelUpLearnset: ; 8323A94
 	level_up_move 49, MOVE_REVERSAL
 	.2byte -1
 
-gHorseaLevelUpLearnset: ; 8323AAA
+gHorseaLevelUpLearnset: @ 8323AAA
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  8, MOVE_SMOKESCREEN
 	level_up_move 15, MOVE_LEER
@@ -1494,7 +1494,7 @@ gHorseaLevelUpLearnset: ; 8323AAA
 	level_up_move 50, MOVE_DRAGON_DANCE
 	.2byte -1
 
-gSeadraLevelUpLearnset: ; 8323ABC
+gSeadraLevelUpLearnset: @ 8323ABC
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_SMOKESCREEN
 	level_up_move  1, MOVE_LEER
@@ -1508,7 +1508,7 @@ gSeadraLevelUpLearnset: ; 8323ABC
 	level_up_move 62, MOVE_DRAGON_DANCE
 	.2byte -1
 
-gGoldeenLevelUpLearnset: ; 8323AD4
+gGoldeenLevelUpLearnset: @ 8323AD4
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_WATER_SPORT
@@ -1521,7 +1521,7 @@ gGoldeenLevelUpLearnset: ; 8323AD4
 	level_up_move 52, MOVE_AGILITY
 	.2byte -1
 
-gSeakingLevelUpLearnset: ; 8323AEA
+gSeakingLevelUpLearnset: @ 8323AEA
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_WATER_SPORT
@@ -1535,7 +1535,7 @@ gSeakingLevelUpLearnset: ; 8323AEA
 	level_up_move 61, MOVE_AGILITY
 	.2byte -1
 
-gStaryuLevelUpLearnset: ; 8323B02
+gStaryuLevelUpLearnset: @ 8323B02
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  6, MOVE_WATER_GUN
@@ -1550,7 +1550,7 @@ gStaryuLevelUpLearnset: ; 8323B02
 	level_up_move 46, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gStarmieLevelUpLearnset: ; 8323B1C
+gStarmieLevelUpLearnset: @ 8323B1C
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_RAPID_SPIN
 	level_up_move  1, MOVE_RECOVER
@@ -1558,7 +1558,7 @@ gStarmieLevelUpLearnset: ; 8323B1C
 	level_up_move 33, MOVE_CONFUSE_RAY
 	.2byte -1
 
-gMrmimeLevelUpLearnset: ; 8323B28
+gMrmimeLevelUpLearnset: @ 8323B28
 	level_up_move  1, MOVE_BARRIER
 	level_up_move  5, MOVE_CONFUSION
 	level_up_move  9, MOVE_SUBSTITUTE
@@ -1576,7 +1576,7 @@ gMrmimeLevelUpLearnset: ; 8323B28
 	level_up_move 53, MOVE_SAFEGUARD
 	.2byte -1
 
-gScytherLevelUpLearnset: ; 8323B48
+gScytherLevelUpLearnset: @ 8323B48
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_LEER
 	level_up_move  6, MOVE_FOCUS_ENERGY
@@ -1590,7 +1590,7 @@ gScytherLevelUpLearnset: ; 8323B48
 	level_up_move 46, MOVE_FURY_CUTTER
 	.2byte -1
 
-gJynxLevelUpLearnset: ; 8323B60
+gJynxLevelUpLearnset: @ 8323B60
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_LICK
 	level_up_move  1, MOVE_LOVELY_KISS
@@ -1606,7 +1606,7 @@ gJynxLevelUpLearnset: ; 8323B60
 	level_up_move 67, MOVE_BLIZZARD
 	.2byte -1
 
-gElectabuzzLevelUpLearnset: ; 8323B7C
+gElectabuzzLevelUpLearnset: @ 8323B7C
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_THUNDER_PUNCH
@@ -1618,7 +1618,7 @@ gElectabuzzLevelUpLearnset: ; 8323B7C
 	level_up_move 58, MOVE_THUNDER
 	.2byte -1
 
-gMagmarLevelUpLearnset: ; 8323B90
+gMagmarLevelUpLearnset: @ 8323B90
 	level_up_move  1, MOVE_EMBER
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SMOG
@@ -1633,7 +1633,7 @@ gMagmarLevelUpLearnset: ; 8323B90
 	level_up_move 57, MOVE_FIRE_BLAST
 	.2byte -1
 
-gPinsirLevelUpLearnset: ; 8323BAA
+gPinsirLevelUpLearnset: @ 8323BAA
 	level_up_move  1, MOVE_VICE_GRIP
 	level_up_move  1, MOVE_FOCUS_ENERGY
 	level_up_move  7, MOVE_BIND
@@ -1646,7 +1646,7 @@ gPinsirLevelUpLearnset: ; 8323BAA
 	level_up_move 49, MOVE_SWORDS_DANCE
 	.2byte -1
 
-gTaurosLevelUpLearnset: ; 8323BC0
+gTaurosLevelUpLearnset: @ 8323BC0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_TAIL_WHIP
 	level_up_move  8, MOVE_RAGE
@@ -1658,13 +1658,13 @@ gTaurosLevelUpLearnset: ; 8323BC0
 	level_up_move 53, MOVE_TAKE_DOWN
 	.2byte -1
 
-gMagikarpLevelUpLearnset: ; 8323BD4
+gMagikarpLevelUpLearnset: @ 8323BD4
 	level_up_move  1, MOVE_SPLASH
 	level_up_move 15, MOVE_TACKLE
 	level_up_move 30, MOVE_FLAIL
 	.2byte -1
 
-gGyaradosLevelUpLearnset: ; 8323BDC
+gGyaradosLevelUpLearnset: @ 8323BDC
 	level_up_move  1, MOVE_THRASH
 	level_up_move 20, MOVE_BITE
 	level_up_move 25, MOVE_DRAGON_RAGE
@@ -1676,7 +1676,7 @@ gGyaradosLevelUpLearnset: ; 8323BDC
 	level_up_move 55, MOVE_HYPER_BEAM
 	.2byte -1
 
-gLaprasLevelUpLearnset: ; 8323BF0
+gLaprasLevelUpLearnset: @ 8323BF0
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_SING
@@ -1691,11 +1691,11 @@ gLaprasLevelUpLearnset: ; 8323BF0
 	level_up_move 55, MOVE_SHEER_COLD
 	.2byte -1
 
-gDittoLevelUpLearnset: ; 8323C0A
+gDittoLevelUpLearnset: @ 8323C0A
 	level_up_move  1, MOVE_TRANSFORM
 	.2byte -1
 
-gEeveeLevelUpLearnset: ; 8323C0E
+gEeveeLevelUpLearnset: @ 8323C0E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -1707,7 +1707,7 @@ gEeveeLevelUpLearnset: ; 8323C0E
 	level_up_move 42, MOVE_TAKE_DOWN
 	.2byte -1
 
-gVaporeonLevelUpLearnset: ; 8323C22
+gVaporeonLevelUpLearnset: @ 8323C22
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -1721,7 +1721,7 @@ gVaporeonLevelUpLearnset: ; 8323C22
 	level_up_move 52, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gJolteonLevelUpLearnset: ; 8323C3A
+gJolteonLevelUpLearnset: @ 8323C3A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -1735,7 +1735,7 @@ gJolteonLevelUpLearnset: ; 8323C3A
 	level_up_move 52, MOVE_THUNDER
 	.2byte -1
 
-gFlareonLevelUpLearnset: ; 8323C52
+gFlareonLevelUpLearnset: @ 8323C52
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -1749,7 +1749,7 @@ gFlareonLevelUpLearnset: ; 8323C52
 	level_up_move 52, MOVE_FLAMETHROWER
 	.2byte -1
 
-gPorygonLevelUpLearnset: ; 8323C6A
+gPorygonLevelUpLearnset: @ 8323C6A
 	level_up_move  1, MOVE_CONVERSION_2
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_CONVERSION
@@ -1763,7 +1763,7 @@ gPorygonLevelUpLearnset: ; 8323C6A
 	level_up_move 48, MOVE_ZAP_CANNON
 	.2byte -1
 
-gOmanyteLevelUpLearnset: ; 8323C82
+gOmanyteLevelUpLearnset: @ 8323C82
 	level_up_move  1, MOVE_CONSTRICT
 	level_up_move  1, MOVE_WITHDRAW
 	level_up_move 13, MOVE_BITE
@@ -1776,7 +1776,7 @@ gOmanyteLevelUpLearnset: ; 8323C82
 	level_up_move 55, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gOmastarLevelUpLearnset: ; 8323C98
+gOmastarLevelUpLearnset: @ 8323C98
 	level_up_move  1, MOVE_CONSTRICT
 	level_up_move  1, MOVE_WITHDRAW
 	level_up_move  1, MOVE_BITE
@@ -1791,7 +1791,7 @@ gOmastarLevelUpLearnset: ; 8323C98
 	level_up_move 65, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gKabutoLevelUpLearnset: ; 8323CB2
+gKabutoLevelUpLearnset: @ 8323CB2
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move 13, MOVE_ABSORB
@@ -1804,7 +1804,7 @@ gKabutoLevelUpLearnset: ; 8323CB2
 	level_up_move 55, MOVE_ANCIENT_POWER
 	.2byte -1
 
-gKabutopsLevelUpLearnset: ; 8323CC8
+gKabutopsLevelUpLearnset: @ 8323CC8
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_ABSORB
@@ -1819,7 +1819,7 @@ gKabutopsLevelUpLearnset: ; 8323CC8
 	level_up_move 65, MOVE_ANCIENT_POWER
 	.2byte -1
 
-gAerodactylLevelUpLearnset: ; 8323CE2
+gAerodactylLevelUpLearnset: @ 8323CE2
 	level_up_move  1, MOVE_WING_ATTACK
 	level_up_move  8, MOVE_AGILITY
 	level_up_move 15, MOVE_BITE
@@ -1830,7 +1830,7 @@ gAerodactylLevelUpLearnset: ; 8323CE2
 	level_up_move 50, MOVE_HYPER_BEAM
 	.2byte -1
 
-gSnorlaxLevelUpLearnset: ; 8323CF4
+gSnorlaxLevelUpLearnset: @ 8323CF4
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  6, MOVE_AMNESIA
 	level_up_move 10, MOVE_DEFENSE_CURL
@@ -1846,7 +1846,7 @@ gSnorlaxLevelUpLearnset: ; 8323CF4
 	level_up_move 51, MOVE_HYPER_BEAM
 	.2byte -1
 
-gArticunoLevelUpLearnset: ; 8323D10
+gArticunoLevelUpLearnset: @ 8323D10
 	level_up_move  1, MOVE_GUST
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move 13, MOVE_MIST
@@ -1858,7 +1858,7 @@ gArticunoLevelUpLearnset: ; 8323D10
 	level_up_move 85, MOVE_SHEER_COLD
 	.2byte -1
 
-gZapdosLevelUpLearnset: ; 8323D24
+gZapdosLevelUpLearnset: @ 8323D24
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_THUNDER_SHOCK
 	level_up_move 13, MOVE_THUNDER_WAVE
@@ -1870,7 +1870,7 @@ gZapdosLevelUpLearnset: ; 8323D24
 	level_up_move 85, MOVE_THUNDER
 	.2byte -1
 
-gMoltresLevelUpLearnset: ; 8323D38
+gMoltresLevelUpLearnset: @ 8323D38
 	level_up_move  1, MOVE_WING_ATTACK
 	level_up_move  1, MOVE_EMBER
 	level_up_move 13, MOVE_FIRE_SPIN
@@ -1882,7 +1882,7 @@ gMoltresLevelUpLearnset: ; 8323D38
 	level_up_move 85, MOVE_SKY_ATTACK
 	.2byte -1
 
-gDratiniLevelUpLearnset: ; 8323D4C
+gDratiniLevelUpLearnset: @ 8323D4C
 	level_up_move  1, MOVE_WRAP
 	level_up_move  1, MOVE_LEER
 	level_up_move  8, MOVE_THUNDER_WAVE
@@ -1895,7 +1895,7 @@ gDratiniLevelUpLearnset: ; 8323D4C
 	level_up_move 57, MOVE_HYPER_BEAM
 	.2byte -1
 
-gDragonairLevelUpLearnset: ; 8323D62
+gDragonairLevelUpLearnset: @ 8323D62
 	level_up_move  1, MOVE_WRAP
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_THUNDER_WAVE
@@ -1910,7 +1910,7 @@ gDragonairLevelUpLearnset: ; 8323D62
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gDragoniteLevelUpLearnset: ; 8323D7C
+gDragoniteLevelUpLearnset: @ 8323D7C
 	level_up_move  1, MOVE_WRAP
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_THUNDER_WAVE
@@ -1926,7 +1926,7 @@ gDragoniteLevelUpLearnset: ; 8323D7C
 	level_up_move 75, MOVE_HYPER_BEAM
 	.2byte -1
 
-gMewtwoLevelUpLearnset: ; 8323D98
+gMewtwoLevelUpLearnset: @ 8323D98
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_DISABLE
 	level_up_move 11, MOVE_BARRIER
@@ -1940,7 +1940,7 @@ gMewtwoLevelUpLearnset: ; 8323D98
 	level_up_move 99, MOVE_SAFEGUARD
 	.2byte -1
 
-gMewLevelUpLearnset: ; 8323DB0
+gMewLevelUpLearnset: @ 8323DB0
 	level_up_move  1, MOVE_POUND
 	level_up_move 10, MOVE_TRANSFORM
 	level_up_move 20, MOVE_MEGA_PUNCH
@@ -1949,7 +1949,7 @@ gMewLevelUpLearnset: ; 8323DB0
 	level_up_move 50, MOVE_ANCIENT_POWER
 	.2byte -1
 
-gChikoritaLevelUpLearnset: ; 8323DBE
+gChikoritaLevelUpLearnset: @ 8323DBE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  8, MOVE_RAZOR_LEAF
@@ -1962,7 +1962,7 @@ gChikoritaLevelUpLearnset: ; 8323DBE
 	level_up_move 50, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gBayleefLevelUpLearnset: ; 8323DD4
+gBayleefLevelUpLearnset: @ 8323DD4
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_RAZOR_LEAF
@@ -1977,7 +1977,7 @@ gBayleefLevelUpLearnset: ; 8323DD4
 	level_up_move 55, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gMeganiumLevelUpLearnset: ; 8323DEE
+gMeganiumLevelUpLearnset: @ 8323DEE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_RAZOR_LEAF
@@ -1992,7 +1992,7 @@ gMeganiumLevelUpLearnset: ; 8323DEE
 	level_up_move 61, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gCyndaquilLevelUpLearnset: ; 8323E08
+gCyndaquilLevelUpLearnset: @ 8323E08
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_LEER
 	level_up_move  6, MOVE_SMOKESCREEN
@@ -2003,7 +2003,7 @@ gCyndaquilLevelUpLearnset: ; 8323E08
 	level_up_move 46, MOVE_FLAMETHROWER
 	.2byte -1
 
-gQuilavaLevelUpLearnset: ; 8323E1A
+gQuilavaLevelUpLearnset: @ 8323E1A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SMOKESCREEN
@@ -2015,7 +2015,7 @@ gQuilavaLevelUpLearnset: ; 8323E1A
 	level_up_move 54, MOVE_FLAMETHROWER
 	.2byte -1
 
-gTyphlosionLevelUpLearnset: ; 8323E2E
+gTyphlosionLevelUpLearnset: @ 8323E2E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SMOKESCREEN
@@ -2028,7 +2028,7 @@ gTyphlosionLevelUpLearnset: ; 8323E2E
 	level_up_move 60, MOVE_FLAMETHROWER
 	.2byte -1
 
-gTotodileLevelUpLearnset: ; 8323E44
+gTotodileLevelUpLearnset: @ 8323E44
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  7, MOVE_RAGE
@@ -2040,7 +2040,7 @@ gTotodileLevelUpLearnset: ; 8323E44
 	level_up_move 52, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gCroconawLevelUpLearnset: ; 8323E58
+gCroconawLevelUpLearnset: @ 8323E58
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_RAGE
@@ -2053,7 +2053,7 @@ gCroconawLevelUpLearnset: ; 8323E58
 	level_up_move 55, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gFeraligatrLevelUpLearnset: ; 8323E6E
+gFeraligatrLevelUpLearnset: @ 8323E6E
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_RAGE
@@ -2067,7 +2067,7 @@ gFeraligatrLevelUpLearnset: ; 8323E6E
 	level_up_move 58, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gSentretLevelUpLearnset: ; 8323E86
+gSentretLevelUpLearnset: @ 8323E86
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  4, MOVE_DEFENSE_CURL
 	level_up_move  7, MOVE_QUICK_ATTACK
@@ -2079,7 +2079,7 @@ gSentretLevelUpLearnset: ; 8323E86
 	level_up_move 49, MOVE_AMNESIA
 	.2byte -1
 
-gFurretLevelUpLearnset: ; 8323E9A
+gFurretLevelUpLearnset: @ 8323E9A
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_QUICK_ATTACK
@@ -2093,7 +2093,7 @@ gFurretLevelUpLearnset: ; 8323E9A
 	level_up_move 59, MOVE_AMNESIA
 	.2byte -1
 
-gHoothootLevelUpLearnset: ; 8323EB2
+gHoothootLevelUpLearnset: @ 8323EB2
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  6, MOVE_FORESIGHT
@@ -2105,7 +2105,7 @@ gHoothootLevelUpLearnset: ; 8323EB2
 	level_up_move 48, MOVE_DREAM_EATER
 	.2byte -1
 
-gNoctowlLevelUpLearnset: ; 8323EC6
+gNoctowlLevelUpLearnset: @ 8323EC6
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_FORESIGHT
@@ -2119,7 +2119,7 @@ gNoctowlLevelUpLearnset: ; 8323EC6
 	level_up_move 57, MOVE_DREAM_EATER
 	.2byte -1
 
-gLedybaLevelUpLearnset: ; 8323EDE
+gLedybaLevelUpLearnset: @ 8323EDE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  8, MOVE_SUPERSONIC
 	level_up_move 15, MOVE_COMET_PUNCH
@@ -2132,7 +2132,7 @@ gLedybaLevelUpLearnset: ; 8323EDE
 	level_up_move 50, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gLedianLevelUpLearnset: ; 8323EF4
+gLedianLevelUpLearnset: @ 8323EF4
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SUPERSONIC
 	level_up_move  8, MOVE_SUPERSONIC
@@ -2146,7 +2146,7 @@ gLedianLevelUpLearnset: ; 8323EF4
 	level_up_move 60, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gSpinarakLevelUpLearnset: ; 8323F0C
+gSpinarakLevelUpLearnset: @ 8323F0C
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_STRING_SHOT
 	level_up_move  6, MOVE_SCARY_FACE
@@ -2159,7 +2159,7 @@ gSpinarakLevelUpLearnset: ; 8323F0C
 	level_up_move 53, MOVE_PSYCHIC
 	.2byte -1
 
-gAriadosLevelUpLearnset: ; 8323F22
+gAriadosLevelUpLearnset: @ 8323F22
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_STRING_SHOT
 	level_up_move  1, MOVE_SCARY_FACE
@@ -2174,7 +2174,7 @@ gAriadosLevelUpLearnset: ; 8323F22
 	level_up_move 63, MOVE_PSYCHIC
 	.2byte -1
 
-gCrobatLevelUpLearnset: ; 8323F3C
+gCrobatLevelUpLearnset: @ 8323F3C
 	level_up_move  1, MOVE_SCREECH
 	level_up_move  1, MOVE_LEECH_LIFE
 	level_up_move  1, MOVE_SUPERSONIC
@@ -2190,7 +2190,7 @@ gCrobatLevelUpLearnset: ; 8323F3C
 	level_up_move 56, MOVE_HAZE
 	.2byte -1
 
-gChinchouLevelUpLearnset: ; 8323F58
+gChinchouLevelUpLearnset: @ 8323F58
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_THUNDER_WAVE
 	level_up_move  5, MOVE_SUPERSONIC
@@ -2203,7 +2203,7 @@ gChinchouLevelUpLearnset: ; 8323F58
 	level_up_move 49, MOVE_CHARGE
 	.2byte -1
 
-gLanturnLevelUpLearnset: ; 8323F6E
+gLanturnLevelUpLearnset: @ 8323F6E
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_THUNDER_WAVE
 	level_up_move  1, MOVE_SUPERSONIC
@@ -2217,7 +2217,7 @@ gLanturnLevelUpLearnset: ; 8323F6E
 	level_up_move 61, MOVE_CHARGE
 	.2byte -1
 
-gPichuLevelUpLearnset: ; 8323F86
+gPichuLevelUpLearnset: @ 8323F86
 	level_up_move  1, MOVE_THUNDER_SHOCK
 	level_up_move  1, MOVE_CHARM
 	level_up_move  6, MOVE_TAIL_WHIP
@@ -2225,7 +2225,7 @@ gPichuLevelUpLearnset: ; 8323F86
 	level_up_move 11, MOVE_SWEET_KISS
 	.2byte -1
 
-gCleffaLevelUpLearnset: ; 8323F92
+gCleffaLevelUpLearnset: @ 8323F92
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_CHARM
 	level_up_move  4, MOVE_ENCORE
@@ -2233,7 +2233,7 @@ gCleffaLevelUpLearnset: ; 8323F92
 	level_up_move 13, MOVE_SWEET_KISS
 	.2byte -1
 
-gIgglybuffLevelUpLearnset: ; 8323F9E
+gIgglybuffLevelUpLearnset: @ 8323F9E
 	level_up_move  1, MOVE_SING
 	level_up_move  1, MOVE_CHARM
 	level_up_move  4, MOVE_DEFENSE_CURL
@@ -2241,7 +2241,7 @@ gIgglybuffLevelUpLearnset: ; 8323F9E
 	level_up_move 14, MOVE_SWEET_KISS
 	.2byte -1
 
-gTogepiLevelUpLearnset: ; 8323FAA
+gTogepiLevelUpLearnset: @ 8323FAA
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_CHARM
 	level_up_move  6, MOVE_METRONOME
@@ -2254,7 +2254,7 @@ gTogepiLevelUpLearnset: ; 8323FAA
 	level_up_move 41, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gTogeticLevelUpLearnset: ; 8323FC0
+gTogeticLevelUpLearnset: @ 8323FC0
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_CHARM
 	level_up_move  6, MOVE_METRONOME
@@ -2267,7 +2267,7 @@ gTogeticLevelUpLearnset: ; 8323FC0
 	level_up_move 41, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gNatuLevelUpLearnset: ; 8323FD6
+gNatuLevelUpLearnset: @ 8323FD6
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_LEER
 	level_up_move 10, MOVE_NIGHT_SHADE
@@ -2278,7 +2278,7 @@ gNatuLevelUpLearnset: ; 8323FD6
 	level_up_move 50, MOVE_PSYCHIC
 	.2byte -1
 
-gXatuLevelUpLearnset: ; 8323FE8
+gXatuLevelUpLearnset: @ 8323FE8
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_LEER
 	level_up_move 10, MOVE_NIGHT_SHADE
@@ -2289,7 +2289,7 @@ gXatuLevelUpLearnset: ; 8323FE8
 	level_up_move 65, MOVE_PSYCHIC
 	.2byte -1
 
-gMareepLevelUpLearnset: ; 8323FFA
+gMareepLevelUpLearnset: @ 8323FFA
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  9, MOVE_THUNDER_SHOCK
@@ -2299,7 +2299,7 @@ gMareepLevelUpLearnset: ; 8323FFA
 	level_up_move 37, MOVE_THUNDER
 	.2byte -1
 
-gFlaaffyLevelUpLearnset: ; 832400A
+gFlaaffyLevelUpLearnset: @ 832400A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_THUNDER_SHOCK
@@ -2310,7 +2310,7 @@ gFlaaffyLevelUpLearnset: ; 832400A
 	level_up_move 45, MOVE_THUNDER
 	.2byte -1
 
-gAmpharosLevelUpLearnset: ; 832401C
+gAmpharosLevelUpLearnset: @ 832401C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_THUNDER_SHOCK
@@ -2323,7 +2323,7 @@ gAmpharosLevelUpLearnset: ; 832401C
 	level_up_move 57, MOVE_THUNDER
 	.2byte -1
 
-gBellossomLevelUpLearnset: ; 8324032
+gBellossomLevelUpLearnset: @ 8324032
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_SWEET_SCENT
 	level_up_move  1, MOVE_STUN_SPORE
@@ -2332,7 +2332,7 @@ gBellossomLevelUpLearnset: ; 8324032
 	level_up_move 55, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gMarillLevelUpLearnset: ; 8324040
+gMarillLevelUpLearnset: @ 8324040
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  3, MOVE_DEFENSE_CURL
 	level_up_move  6, MOVE_TAIL_WHIP
@@ -2344,7 +2344,7 @@ gMarillLevelUpLearnset: ; 8324040
 	level_up_move 45, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gAzumarillLevelUpLearnset: ; 8324054
+gAzumarillLevelUpLearnset: @ 8324054
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_DEFENSE_CURL
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -2359,7 +2359,7 @@ gAzumarillLevelUpLearnset: ; 8324054
 	level_up_move 57, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gSudowoodoLevelUpLearnset: ; 832406E
+gSudowoodoLevelUpLearnset: @ 832406E
 	level_up_move  1, MOVE_ROCK_THROW
 	level_up_move  1, MOVE_MIMIC
 	level_up_move  9, MOVE_FLAIL
@@ -2371,7 +2371,7 @@ gSudowoodoLevelUpLearnset: ; 832406E
 	level_up_move 57, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gPolitoedLevelUpLearnset: ; 8324082
+gPolitoedLevelUpLearnset: @ 8324082
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_HYPNOSIS
 	level_up_move  1, MOVE_DOUBLE_SLAP
@@ -2380,7 +2380,7 @@ gPolitoedLevelUpLearnset: ; 8324082
 	level_up_move 51, MOVE_SWAGGER
 	.2byte -1
 
-gHoppipLevelUpLearnset: ; 8324090
+gHoppipLevelUpLearnset: @ 8324090
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  5, MOVE_SYNTHESIS
 	level_up_move  5, MOVE_TAIL_WHIP
@@ -2393,7 +2393,7 @@ gHoppipLevelUpLearnset: ; 8324090
 	level_up_move 30, MOVE_MEGA_DRAIN
 	.2byte -1
 
-gSkiploomLevelUpLearnset: ; 83240A6
+gSkiploomLevelUpLearnset: @ 83240A6
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  1, MOVE_SYNTHESIS
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -2409,7 +2409,7 @@ gSkiploomLevelUpLearnset: ; 83240A6
 	level_up_move 36, MOVE_MEGA_DRAIN
 	.2byte -1
 
-gJumpluffLevelUpLearnset: ; 83240C2
+gJumpluffLevelUpLearnset: @ 83240C2
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  1, MOVE_SYNTHESIS
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -2425,7 +2425,7 @@ gJumpluffLevelUpLearnset: ; 83240C2
 	level_up_move 44, MOVE_MEGA_DRAIN
 	.2byte -1
 
-gAipomLevelUpLearnset: ; 83240DE
+gAipomLevelUpLearnset: @ 83240DE
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  6, MOVE_SAND_ATTACK
@@ -2438,7 +2438,7 @@ gAipomLevelUpLearnset: ; 83240DE
 	level_up_move 50, MOVE_AGILITY
 	.2byte -1
 
-gSunkernLevelUpLearnset: ; 83240F4
+gSunkernLevelUpLearnset: @ 83240F4
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  6, MOVE_GROWTH
 	level_up_move 13, MOVE_MEGA_DRAIN
@@ -2449,7 +2449,7 @@ gSunkernLevelUpLearnset: ; 83240F4
 	level_up_move 42, MOVE_GIGA_DRAIN
 	.2byte -1
 
-gSunfloraLevelUpLearnset: ; 8324106
+gSunfloraLevelUpLearnset: @ 8324106
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_POUND
 	level_up_move  6, MOVE_GROWTH
@@ -2461,7 +2461,7 @@ gSunfloraLevelUpLearnset: ; 8324106
 	level_up_move 42, MOVE_SOLAR_BEAM
 	.2byte -1
 
-gYanmaLevelUpLearnset: ; 832411A
+gYanmaLevelUpLearnset: @ 832411A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_FORESIGHT
 	level_up_move  7, MOVE_QUICK_ATTACK
@@ -2474,7 +2474,7 @@ gYanmaLevelUpLearnset: ; 832411A
 	level_up_move 49, MOVE_SCREECH
 	.2byte -1
 
-gWooperLevelUpLearnset: ; 8324130
+gWooperLevelUpLearnset: @ 8324130
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move 11, MOVE_SLAM
@@ -2487,7 +2487,7 @@ gWooperLevelUpLearnset: ; 8324130
 	level_up_move 51, MOVE_HAZE
 	.2byte -1
 
-gQuagsireLevelUpLearnset: ; 8324146
+gQuagsireLevelUpLearnset: @ 8324146
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move 11, MOVE_SLAM
@@ -2500,7 +2500,7 @@ gQuagsireLevelUpLearnset: ; 8324146
 	level_up_move 61, MOVE_HAZE
 	.2byte -1
 
-gEspeonLevelUpLearnset: ; 832415C
+gEspeonLevelUpLearnset: @ 832415C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -2514,7 +2514,7 @@ gEspeonLevelUpLearnset: ; 832415C
 	level_up_move 52, MOVE_MORNING_SUN
 	.2byte -1
 
-gUmbreonLevelUpLearnset: ; 8324174
+gUmbreonLevelUpLearnset: @ 8324174
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_HELPING_HAND
@@ -2528,7 +2528,7 @@ gUmbreonLevelUpLearnset: ; 8324174
 	level_up_move 52, MOVE_MOONLIGHT
 	.2byte -1
 
-gMurkrowLevelUpLearnset: ; 832418C
+gMurkrowLevelUpLearnset: @ 832418C
 	level_up_move  1, MOVE_PECK
 	level_up_move  9, MOVE_ASTONISH
 	level_up_move 14, MOVE_PURSUIT
@@ -2539,7 +2539,7 @@ gMurkrowLevelUpLearnset: ; 832418C
 	level_up_move 48, MOVE_MEAN_LOOK
 	.2byte -1
 
-gSlowkingLevelUpLearnset: ; 832419E
+gSlowkingLevelUpLearnset: @ 832419E
 	level_up_move  1, MOVE_CURSE
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_TACKLE
@@ -2552,7 +2552,7 @@ gSlowkingLevelUpLearnset: ; 832419E
 	level_up_move 48, MOVE_PSYCHIC
 	.2byte -1
 
-gMisdreavusLevelUpLearnset: ; 83241B4
+gMisdreavusLevelUpLearnset: @ 83241B4
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_PSYWAVE
 	level_up_move  6, MOVE_SPITE
@@ -2565,18 +2565,18 @@ gMisdreavusLevelUpLearnset: ; 83241B4
 	level_up_move 53, MOVE_GRUDGE
 	.2byte -1
 
-gUnownLevelUpLearnset: ; 83241CA
+gUnownLevelUpLearnset: @ 83241CA
 	level_up_move  1, MOVE_HIDDEN_POWER
 	.2byte -1
 
-gWobbuffetLevelUpLearnset: ; 83241CE
+gWobbuffetLevelUpLearnset: @ 83241CE
 	level_up_move  1, MOVE_COUNTER
 	level_up_move  1, MOVE_MIRROR_COAT
 	level_up_move  1, MOVE_SAFEGUARD
 	level_up_move  1, MOVE_DESTINY_BOND
 	.2byte -1
 
-gGirafarigLevelUpLearnset: ; 83241D8
+gGirafarigLevelUpLearnset: @ 83241D8
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  7, MOVE_ASTONISH
@@ -2589,7 +2589,7 @@ gGirafarigLevelUpLearnset: ; 83241D8
 	level_up_move 49, MOVE_CRUNCH
 	.2byte -1
 
-gPinecoLevelUpLearnset: ; 83241EE
+gPinecoLevelUpLearnset: @ 83241EE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_PROTECT
 	level_up_move  8, MOVE_SELF_DESTRUCT
@@ -2601,7 +2601,7 @@ gPinecoLevelUpLearnset: ; 83241EE
 	level_up_move 50, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gForretressLevelUpLearnset: ; 8324202
+gForretressLevelUpLearnset: @ 8324202
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_PROTECT
 	level_up_move  1, MOVE_SELF_DESTRUCT
@@ -2614,7 +2614,7 @@ gForretressLevelUpLearnset: ; 8324202
 	level_up_move 59, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gDunsparceLevelUpLearnset: ; 8324218
+gDunsparceLevelUpLearnset: @ 8324218
 	level_up_move  1, MOVE_RAGE
 	level_up_move  4, MOVE_DEFENSE_CURL
 	level_up_move 11, MOVE_YAWN
@@ -2626,7 +2626,7 @@ gDunsparceLevelUpLearnset: ; 8324218
 	level_up_move 41, MOVE_ENDEAVOR
 	.2byte -1
 
-gGligarLevelUpLearnset: ; 832422C
+gGligarLevelUpLearnset: @ 832422C
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  6, MOVE_SAND_ATTACK
 	level_up_move 13, MOVE_HARDEN
@@ -2637,7 +2637,7 @@ gGligarLevelUpLearnset: ; 832422C
 	level_up_move 52, MOVE_GUILLOTINE
 	.2byte -1
 
-gSteelixLevelUpLearnset: ; 832423E
+gSteelixLevelUpLearnset: @ 832423E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SCREECH
 	level_up_move  9, MOVE_BIND
@@ -2651,7 +2651,7 @@ gSteelixLevelUpLearnset: ; 832423E
 	level_up_move 57, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gSnubbullLevelUpLearnset: ; 8324256
+gSnubbullLevelUpLearnset: @ 8324256
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SCARY_FACE
 	level_up_move  4, MOVE_TAIL_WHIP
@@ -2664,7 +2664,7 @@ gSnubbullLevelUpLearnset: ; 8324256
 	level_up_move 53, MOVE_CRUNCH
 	.2byte -1
 
-gGranbullLevelUpLearnset: ; 832426C
+gGranbullLevelUpLearnset: @ 832426C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_SCARY_FACE
 	level_up_move  4, MOVE_TAIL_WHIP
@@ -2677,7 +2677,7 @@ gGranbullLevelUpLearnset: ; 832426C
 	level_up_move 61, MOVE_CRUNCH
 	.2byte -1
 
-gQwilfishLevelUpLearnset: ; 8324282
+gQwilfishLevelUpLearnset: @ 8324282
 	level_up_move  1, MOVE_SPIKES
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_POISON_STING
@@ -2689,7 +2689,7 @@ gQwilfishLevelUpLearnset: ; 8324282
 	level_up_move 46, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gScizorLevelUpLearnset: ; 8324296
+gScizorLevelUpLearnset: @ 8324296
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_LEER
 	level_up_move  6, MOVE_FOCUS_ENERGY
@@ -2703,7 +2703,7 @@ gScizorLevelUpLearnset: ; 8324296
 	level_up_move 46, MOVE_FURY_CUTTER
 	.2byte -1
 
-gShuckleLevelUpLearnset: ; 83242AE
+gShuckleLevelUpLearnset: @ 83242AE
 	level_up_move  1, MOVE_CONSTRICT
 	level_up_move  1, MOVE_WITHDRAW
 	level_up_move  9, MOVE_WRAP
@@ -2713,7 +2713,7 @@ gShuckleLevelUpLearnset: ; 83242AE
 	level_up_move 37, MOVE_REST
 	.2byte -1
 
-gHeracrossLevelUpLearnset: ; 83242BE
+gHeracrossLevelUpLearnset: @ 83242BE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_LEER
 	level_up_move  6, MOVE_HORN_ATTACK
@@ -2726,7 +2726,7 @@ gHeracrossLevelUpLearnset: ; 83242BE
 	level_up_move 53, MOVE_MEGAHORN
 	.2byte -1
 
-gSneaselLevelUpLearnset: ; 83242D4
+gSneaselLevelUpLearnset: @ 83242D4
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_TAUNT
@@ -2741,7 +2741,7 @@ gSneaselLevelUpLearnset: ; 83242D4
 	level_up_move 64, MOVE_METAL_CLAW
 	.2byte -1
 
-gTeddiursaLevelUpLearnset: ; 83242EE
+gTeddiursaLevelUpLearnset: @ 83242EE
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  7, MOVE_LICK
@@ -2754,7 +2754,7 @@ gTeddiursaLevelUpLearnset: ; 83242EE
 	level_up_move 49, MOVE_THRASH
 	.2byte -1
 
-gUrsaringLevelUpLearnset: ; 8324304
+gUrsaringLevelUpLearnset: @ 8324304
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_LICK
@@ -2769,7 +2769,7 @@ gUrsaringLevelUpLearnset: ; 8324304
 	level_up_move 49, MOVE_THRASH
 	.2byte -1
 
-gSlugmaLevelUpLearnset: ; 832431E
+gSlugmaLevelUpLearnset: @ 832431E
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_SMOG
 	level_up_move  8, MOVE_EMBER
@@ -2781,7 +2781,7 @@ gSlugmaLevelUpLearnset: ; 832431E
 	level_up_move 50, MOVE_BODY_SLAM
 	.2byte -1
 
-gMagcargoLevelUpLearnset: ; 8324332
+gMagcargoLevelUpLearnset: @ 8324332
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_SMOG
 	level_up_move  1, MOVE_EMBER
@@ -2795,7 +2795,7 @@ gMagcargoLevelUpLearnset: ; 8324332
 	level_up_move 60, MOVE_BODY_SLAM
 	.2byte -1
 
-gSwinubLevelUpLearnset: ; 832434A
+gSwinubLevelUpLearnset: @ 832434A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_ODOR_SLEUTH
 	level_up_move 10, MOVE_POWDER_SNOW
@@ -2806,7 +2806,7 @@ gSwinubLevelUpLearnset: ; 832434A
 	level_up_move 55, MOVE_AMNESIA
 	.2byte -1
 
-gPiloswineLevelUpLearnset: ; 832435C
+gPiloswineLevelUpLearnset: @ 832435C
 	level_up_move  1, MOVE_HORN_ATTACK
 	level_up_move  1, MOVE_ODOR_SLEUTH
 	level_up_move  1, MOVE_POWDER_SNOW
@@ -2820,7 +2820,7 @@ gPiloswineLevelUpLearnset: ; 832435C
 	level_up_move 70, MOVE_AMNESIA
 	.2byte -1
 
-gCorsolaLevelUpLearnset: ; 8324374
+gCorsolaLevelUpLearnset: @ 8324374
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  6, MOVE_HARDEN
 	level_up_move 12, MOVE_BUBBLE
@@ -2833,7 +2833,7 @@ gCorsolaLevelUpLearnset: ; 8324374
 	level_up_move 45, MOVE_ANCIENT_POWER
 	.2byte -1
 
-gRemoraidLevelUpLearnset: ; 832438A
+gRemoraidLevelUpLearnset: @ 832438A
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move 11, MOVE_LOCK_ON
 	level_up_move 22, MOVE_PSYBEAM
@@ -2844,7 +2844,7 @@ gRemoraidLevelUpLearnset: ; 832438A
 	level_up_move 55, MOVE_HYPER_BEAM
 	.2byte -1
 
-gOctilleryLevelUpLearnset: ; 832439C
+gOctilleryLevelUpLearnset: @ 832439C
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move 11, MOVE_CONSTRICT
 	level_up_move 22, MOVE_PSYBEAM
@@ -2856,11 +2856,11 @@ gOctilleryLevelUpLearnset: ; 832439C
 	level_up_move 70, MOVE_HYPER_BEAM
 	.2byte -1
 
-gDelibirdLevelUpLearnset: ; 83243B0
+gDelibirdLevelUpLearnset: @ 83243B0
 	level_up_move  1, MOVE_PRESENT
 	.2byte -1
 
-gMantineLevelUpLearnset: ; 83243B4
+gMantineLevelUpLearnset: @ 83243B4
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  8, MOVE_SUPERSONIC
@@ -2872,7 +2872,7 @@ gMantineLevelUpLearnset: ; 83243B4
 	level_up_move 50, MOVE_CONFUSE_RAY
 	.2byte -1
 
-gSkarmoryLevelUpLearnset: ; 83243C8
+gSkarmoryLevelUpLearnset: @ 83243C8
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_PECK
 	level_up_move 10, MOVE_SAND_ATTACK
@@ -2885,7 +2885,7 @@ gSkarmoryLevelUpLearnset: ; 83243C8
 	level_up_move 45, MOVE_METAL_SOUND
 	.2byte -1
 
-gHoundourLevelUpLearnset: ; 83243DE
+gHoundourLevelUpLearnset: @ 83243DE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_EMBER
 	level_up_move  7, MOVE_HOWL
@@ -2898,7 +2898,7 @@ gHoundourLevelUpLearnset: ; 83243DE
 	level_up_move 49, MOVE_CRUNCH
 	.2byte -1
 
-gHoundoomLevelUpLearnset: ; 83243F4
+gHoundoomLevelUpLearnset: @ 83243F4
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_EMBER
 	level_up_move  1, MOVE_HOWL
@@ -2912,7 +2912,7 @@ gHoundoomLevelUpLearnset: ; 83243F4
 	level_up_move 59, MOVE_CRUNCH
 	.2byte -1
 
-gKingdraLevelUpLearnset: ; 832440C
+gKingdraLevelUpLearnset: @ 832440C
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_SMOKESCREEN
 	level_up_move  1, MOVE_LEER
@@ -2926,7 +2926,7 @@ gKingdraLevelUpLearnset: ; 832440C
 	level_up_move 62, MOVE_DRAGON_DANCE
 	.2byte -1
 
-gPhanpyLevelUpLearnset: ; 8324424
+gPhanpyLevelUpLearnset: @ 8324424
 	level_up_move  1, MOVE_ODOR_SLEUTH
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
@@ -2938,7 +2938,7 @@ gPhanpyLevelUpLearnset: ; 8324424
 	level_up_move 49, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gDonphanLevelUpLearnset: ; 8324438
+gDonphanLevelUpLearnset: @ 8324438
 	level_up_move  1, MOVE_ODOR_SLEUTH
 	level_up_move  1, MOVE_HORN_ATTACK
 	level_up_move  1, MOVE_GROWL
@@ -2950,7 +2950,7 @@ gDonphanLevelUpLearnset: ; 8324438
 	level_up_move 49, MOVE_EARTHQUAKE
 	.2byte -1
 
-gPorygon2LevelUpLearnset: ; 832444C
+gPorygon2LevelUpLearnset: @ 832444C
 	level_up_move  1, MOVE_CONVERSION_2
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_CONVERSION
@@ -2964,7 +2964,7 @@ gPorygon2LevelUpLearnset: ; 832444C
 	level_up_move 48, MOVE_ZAP_CANNON
 	.2byte -1
 
-gStantlerLevelUpLearnset: ; 8324464
+gStantlerLevelUpLearnset: @ 8324464
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  7, MOVE_LEER
 	level_up_move 13, MOVE_ASTONISH
@@ -2976,7 +2976,7 @@ gStantlerLevelUpLearnset: ; 8324464
 	level_up_move 49, MOVE_CALM_MIND
 	.2byte -1
 
-gSmeargleLevelUpLearnset: ; 8324478
+gSmeargleLevelUpLearnset: @ 8324478
 	level_up_move  1, MOVE_SKETCH
 	level_up_move 11, MOVE_SKETCH
 	level_up_move 21, MOVE_SKETCH
@@ -2989,11 +2989,11 @@ gSmeargleLevelUpLearnset: ; 8324478
 	level_up_move 91, MOVE_SKETCH
 	.2byte -1
 
-gTyrogueLevelUpLearnset: ; 832448E
+gTyrogueLevelUpLearnset: @ 832448E
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gHitmontopLevelUpLearnset: ; 8324492
+gHitmontopLevelUpLearnset: @ 8324492
 	level_up_move  1, MOVE_REVENGE
 	level_up_move  1, MOVE_ROLLING_KICK
 	level_up_move  7, MOVE_FOCUS_ENERGY
@@ -3007,7 +3007,7 @@ gHitmontopLevelUpLearnset: ; 8324492
 	level_up_move 49, MOVE_ENDEAVOR
 	.2byte -1
 
-gSmoochumLevelUpLearnset: ; 83244AA
+gSmoochumLevelUpLearnset: @ 83244AA
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_LICK
 	level_up_move  9, MOVE_SWEET_KISS
@@ -3021,7 +3021,7 @@ gSmoochumLevelUpLearnset: ; 83244AA
 	level_up_move 57, MOVE_BLIZZARD
 	.2byte -1
 
-gElekidLevelUpLearnset: ; 83244C2
+gElekidLevelUpLearnset: @ 83244C2
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_LEER
 	level_up_move  9, MOVE_THUNDER_PUNCH
@@ -3032,7 +3032,7 @@ gElekidLevelUpLearnset: ; 83244C2
 	level_up_move 49, MOVE_THUNDER
 	.2byte -1
 
-gMagbyLevelUpLearnset: ; 83244D4
+gMagbyLevelUpLearnset: @ 83244D4
 	level_up_move  1, MOVE_EMBER
 	level_up_move  7, MOVE_LEER
 	level_up_move 13, MOVE_SMOG
@@ -3044,7 +3044,7 @@ gMagbyLevelUpLearnset: ; 83244D4
 	level_up_move 49, MOVE_FIRE_BLAST
 	.2byte -1
 
-gMiltankLevelUpLearnset: ; 83244E8
+gMiltankLevelUpLearnset: @ 83244E8
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_GROWL
 	level_up_move  8, MOVE_DEFENSE_CURL
@@ -3056,7 +3056,7 @@ gMiltankLevelUpLearnset: ; 83244E8
 	level_up_move 53, MOVE_HEAL_BELL
 	.2byte -1
 
-gBlisseyLevelUpLearnset: ; 83244FC
+gBlisseyLevelUpLearnset: @ 83244FC
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_GROWL
 	level_up_move  4, MOVE_TAIL_WHIP
@@ -3071,7 +3071,7 @@ gBlisseyLevelUpLearnset: ; 83244FC
 	level_up_move 47, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gRaikouLevelUpLearnset: ; 8324516
+gRaikouLevelUpLearnset: @ 8324516
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move 11, MOVE_THUNDER_SHOCK
@@ -3084,7 +3084,7 @@ gRaikouLevelUpLearnset: ; 8324516
 	level_up_move 81, MOVE_CALM_MIND
 	.2byte -1
 
-gEnteiLevelUpLearnset: ; 832452C
+gEnteiLevelUpLearnset: @ 832452C
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move 11, MOVE_EMBER
@@ -3097,7 +3097,7 @@ gEnteiLevelUpLearnset: ; 832452C
 	level_up_move 81, MOVE_CALM_MIND
 	.2byte -1
 
-gSuicuneLevelUpLearnset: ; 8324542
+gSuicuneLevelUpLearnset: @ 8324542
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move 11, MOVE_BUBBLE_BEAM
@@ -3110,7 +3110,7 @@ gSuicuneLevelUpLearnset: ; 8324542
 	level_up_move 81, MOVE_CALM_MIND
 	.2byte -1
 
-gLarvitarLevelUpLearnset: ; 8324558
+gLarvitarLevelUpLearnset: @ 8324558
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move  8, MOVE_SANDSTORM
@@ -3123,7 +3123,7 @@ gLarvitarLevelUpLearnset: ; 8324558
 	level_up_move 57, MOVE_HYPER_BEAM
 	.2byte -1
 
-gPupitarLevelUpLearnset: ; 832456E
+gPupitarLevelUpLearnset: @ 832456E
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SANDSTORM
@@ -3138,7 +3138,7 @@ gPupitarLevelUpLearnset: ; 832456E
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gTyranitarLevelUpLearnset: ; 8324588
+gTyranitarLevelUpLearnset: @ 8324588
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SANDSTORM
@@ -3153,7 +3153,7 @@ gTyranitarLevelUpLearnset: ; 8324588
 	level_up_move 75, MOVE_HYPER_BEAM
 	.2byte -1
 
-gLugiaLevelUpLearnset: ; 83245A2
+gLugiaLevelUpLearnset: @ 83245A2
 	level_up_move  1, MOVE_WHIRLWIND
 	level_up_move 11, MOVE_SAFEGUARD
 	level_up_move 22, MOVE_GUST
@@ -3166,7 +3166,7 @@ gLugiaLevelUpLearnset: ; 83245A2
 	level_up_move 99, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gHoOhLevelUpLearnset: ; 83245B8
+gHoOhLevelUpLearnset: @ 83245B8
 	level_up_move  1, MOVE_WHIRLWIND
 	level_up_move 11, MOVE_SAFEGUARD
 	level_up_move 22, MOVE_GUST
@@ -3179,7 +3179,7 @@ gHoOhLevelUpLearnset: ; 83245B8
 	level_up_move 99, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gCelebiLevelUpLearnset: ; 83245CE
+gCelebiLevelUpLearnset: @ 83245CE
 	level_up_move  1, MOVE_LEECH_SEED
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_RECOVER
@@ -3191,107 +3191,107 @@ gCelebiLevelUpLearnset: ; 83245CE
 	level_up_move 50, MOVE_PERISH_SONG
 	.2byte -1
 
-gSpecies252LevelUpLearnset: ; 83245E2
+gSpecies252LevelUpLearnset: @ 83245E2
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies253LevelUpLearnset: ; 83245E6
+gSpecies253LevelUpLearnset: @ 83245E6
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies254LevelUpLearnset: ; 83245EA
+gSpecies254LevelUpLearnset: @ 83245EA
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies255LevelUpLearnset: ; 83245EE
+gSpecies255LevelUpLearnset: @ 83245EE
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies256LevelUpLearnset: ; 83245F2
+gSpecies256LevelUpLearnset: @ 83245F2
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies257LevelUpLearnset: ; 83245F6
+gSpecies257LevelUpLearnset: @ 83245F6
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies258LevelUpLearnset: ; 83245FA
+gSpecies258LevelUpLearnset: @ 83245FA
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies259LevelUpLearnset: ; 83245FE
+gSpecies259LevelUpLearnset: @ 83245FE
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies260LevelUpLearnset: ; 8324602
+gSpecies260LevelUpLearnset: @ 8324602
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies261LevelUpLearnset: ; 8324606
+gSpecies261LevelUpLearnset: @ 8324606
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies262LevelUpLearnset: ; 832460A
+gSpecies262LevelUpLearnset: @ 832460A
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies263LevelUpLearnset: ; 832460E
+gSpecies263LevelUpLearnset: @ 832460E
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies264LevelUpLearnset: ; 8324612
+gSpecies264LevelUpLearnset: @ 8324612
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies265LevelUpLearnset: ; 8324616
+gSpecies265LevelUpLearnset: @ 8324616
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies266LevelUpLearnset: ; 832461A
+gSpecies266LevelUpLearnset: @ 832461A
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies267LevelUpLearnset: ; 832461E
+gSpecies267LevelUpLearnset: @ 832461E
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies268LevelUpLearnset: ; 8324622
+gSpecies268LevelUpLearnset: @ 8324622
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies269LevelUpLearnset: ; 8324626
+gSpecies269LevelUpLearnset: @ 8324626
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies270LevelUpLearnset: ; 832462A
+gSpecies270LevelUpLearnset: @ 832462A
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies271LevelUpLearnset: ; 832462E
+gSpecies271LevelUpLearnset: @ 832462E
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies272LevelUpLearnset: ; 8324632
+gSpecies272LevelUpLearnset: @ 8324632
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies273LevelUpLearnset: ; 8324636
+gSpecies273LevelUpLearnset: @ 8324636
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies274LevelUpLearnset: ; 832463A
+gSpecies274LevelUpLearnset: @ 832463A
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies275LevelUpLearnset: ; 832463E
+gSpecies275LevelUpLearnset: @ 832463E
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gSpecies276LevelUpLearnset: ; 8324642
+gSpecies276LevelUpLearnset: @ 8324642
 	level_up_move  1, MOVE_TACKLE
 	.2byte -1
 
-gTreeckoLevelUpLearnset: ; 8324646
+gTreeckoLevelUpLearnset: @ 8324646
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_LEER
 	level_up_move  6, MOVE_ABSORB
@@ -3305,7 +3305,7 @@ gTreeckoLevelUpLearnset: ; 8324646
 	level_up_move 46, MOVE_GIGA_DRAIN
 	.2byte -1
 
-gGrovyleLevelUpLearnset: ; 832465E
+gGrovyleLevelUpLearnset: @ 832465E
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_ABSORB
@@ -3322,7 +3322,7 @@ gGrovyleLevelUpLearnset: ; 832465E
 	level_up_move 53, MOVE_FALSE_SWIPE
 	.2byte -1
 
-gSceptileLevelUpLearnset: ; 832467C
+gSceptileLevelUpLearnset: @ 832467C
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_ABSORB
@@ -3339,7 +3339,7 @@ gSceptileLevelUpLearnset: ; 832467C
 	level_up_move 59, MOVE_FALSE_SWIPE
 	.2byte -1
 
-gTorchicLevelUpLearnset: ; 832469A
+gTorchicLevelUpLearnset: @ 832469A
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  7, MOVE_FOCUS_ENERGY
@@ -3353,7 +3353,7 @@ gTorchicLevelUpLearnset: ; 832469A
 	level_up_move 43, MOVE_FLAMETHROWER
 	.2byte -1
 
-gCombuskenLevelUpLearnset: ; 83246B2
+gCombuskenLevelUpLearnset: @ 83246B2
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_FOCUS_ENERGY
@@ -3370,7 +3370,7 @@ gCombuskenLevelUpLearnset: ; 83246B2
 	level_up_move 50, MOVE_SKY_UPPERCUT
 	.2byte -1
 
-gBlazikenLevelUpLearnset: ; 83246D0
+gBlazikenLevelUpLearnset: @ 83246D0
 	level_up_move  1, MOVE_FIRE_PUNCH
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_GROWL
@@ -3389,7 +3389,7 @@ gBlazikenLevelUpLearnset: ; 83246D0
 	level_up_move 59, MOVE_SKY_UPPERCUT
 	.2byte -1
 
-gMudkipLevelUpLearnset: ; 83246F2
+gMudkipLevelUpLearnset: @ 83246F2
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  6, MOVE_MUD_SLAP
@@ -3404,7 +3404,7 @@ gMudkipLevelUpLearnset: ; 83246F2
 	level_up_move 46, MOVE_ENDEAVOR
 	.2byte -1
 
-gMarshtompLevelUpLearnset: ; 832470C
+gMarshtompLevelUpLearnset: @ 832470C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_MUD_SLAP
@@ -3422,7 +3422,7 @@ gMarshtompLevelUpLearnset: ; 832470C
 	level_up_move 53, MOVE_ENDEAVOR
 	.2byte -1
 
-gSwampertLevelUpLearnset: ; 832472C
+gSwampertLevelUpLearnset: @ 832472C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_MUD_SLAP
@@ -3440,7 +3440,7 @@ gSwampertLevelUpLearnset: ; 832472C
 	level_up_move 61, MOVE_ENDEAVOR
 	.2byte -1
 
-gPoochyenaLevelUpLearnset: ; 832474C
+gPoochyenaLevelUpLearnset: @ 832474C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_HOWL
 	level_up_move  9, MOVE_SAND_ATTACK
@@ -3455,7 +3455,7 @@ gPoochyenaLevelUpLearnset: ; 832474C
 	level_up_move 45, MOVE_THIEF
 	.2byte -1
 
-gMightyenaLevelUpLearnset: ; 8324766
+gMightyenaLevelUpLearnset: @ 8324766
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HOWL
 	level_up_move  1, MOVE_SAND_ATTACK
@@ -3473,7 +3473,7 @@ gMightyenaLevelUpLearnset: ; 8324766
 	level_up_move 52, MOVE_THIEF
 	.2byte -1
 
-gZigzagoonLevelUpLearnset: ; 8324786
+gZigzagoonLevelUpLearnset: @ 8324786
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  5, MOVE_TAIL_WHIP
@@ -3488,7 +3488,7 @@ gZigzagoonLevelUpLearnset: ; 8324786
 	level_up_move 41, MOVE_BELLY_DRUM
 	.2byte -1
 
-gLinooneLevelUpLearnset: ; 83247A0
+gLinooneLevelUpLearnset: @ 83247A0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TAIL_WHIP
@@ -3505,18 +3505,18 @@ gLinooneLevelUpLearnset: ; 83247A0
 	level_up_move 53, MOVE_BELLY_DRUM
 	.2byte -1
 
-gWurmpleLevelUpLearnset: ; 83247BE
+gWurmpleLevelUpLearnset: @ 83247BE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_STRING_SHOT
 	level_up_move  5, MOVE_POISON_STING
 	.2byte -1
 
-gSilcoonLevelUpLearnset: ; 83247C6
+gSilcoonLevelUpLearnset: @ 83247C6
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_HARDEN
 	.2byte -1
 
-gBeautiflyLevelUpLearnset: ; 83247CC
+gBeautiflyLevelUpLearnset: @ 83247CC
 	level_up_move  1, MOVE_ABSORB
 	level_up_move 10, MOVE_ABSORB
 	level_up_move 13, MOVE_GUST
@@ -3529,12 +3529,12 @@ gBeautiflyLevelUpLearnset: ; 83247CC
 	level_up_move 38, MOVE_GIGA_DRAIN
 	.2byte -1
 
-gCascoonLevelUpLearnset: ; 83247E2
+gCascoonLevelUpLearnset: @ 83247E2
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_HARDEN
 	.2byte -1
 
-gDustoxLevelUpLearnset: ; 83247E8
+gDustoxLevelUpLearnset: @ 83247E8
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move 10, MOVE_CONFUSION
 	level_up_move 13, MOVE_GUST
@@ -3547,7 +3547,7 @@ gDustoxLevelUpLearnset: ; 83247E8
 	level_up_move 38, MOVE_TOXIC
 	.2byte -1
 
-gLotadLevelUpLearnset: ; 83247FE
+gLotadLevelUpLearnset: @ 83247FE
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  3, MOVE_GROWL
 	level_up_move  7, MOVE_ABSORB
@@ -3557,7 +3557,7 @@ gLotadLevelUpLearnset: ; 83247FE
 	level_up_move 43, MOVE_MEGA_DRAIN
 	.2byte -1
 
-gLombreLevelUpLearnset: ; 832480E
+gLombreLevelUpLearnset: @ 832480E
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  3, MOVE_GROWL
 	level_up_move  7, MOVE_ABSORB
@@ -3570,14 +3570,14 @@ gLombreLevelUpLearnset: ; 832480E
 	level_up_move 49, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gLudicoloLevelUpLearnset: ; 8324824
+gLudicoloLevelUpLearnset: @ 8324824
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_NATURE_POWER
 	.2byte -1
 
-gSeedotLevelUpLearnset: ; 832482E
+gSeedotLevelUpLearnset: @ 832482E
 	level_up_move  1, MOVE_BIDE
 	level_up_move  3, MOVE_HARDEN
 	level_up_move  7, MOVE_GROWTH
@@ -3587,7 +3587,7 @@ gSeedotLevelUpLearnset: ; 832482E
 	level_up_move 43, MOVE_EXPLOSION
 	.2byte -1
 
-gNuzleafLevelUpLearnset: ; 832483E
+gNuzleafLevelUpLearnset: @ 832483E
 	level_up_move  1, MOVE_POUND
 	level_up_move  3, MOVE_HARDEN
 	level_up_move  7, MOVE_GROWTH
@@ -3600,14 +3600,14 @@ gNuzleafLevelUpLearnset: ; 832483E
 	level_up_move 49, MOVE_EXTRASENSORY
 	.2byte -1
 
-gShiftryLevelUpLearnset: ; 8324854
+gShiftryLevelUpLearnset: @ 8324854
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_GROWTH
 	level_up_move  1, MOVE_NATURE_POWER
 	.2byte -1
 
-gNincadaLevelUpLearnset: ; 832485E
+gNincadaLevelUpLearnset: @ 832485E
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  5, MOVE_LEECH_LIFE
@@ -3620,7 +3620,7 @@ gNincadaLevelUpLearnset: ; 832485E
 	level_up_move 45, MOVE_DIG
 	.2byte -1
 
-gNinjaskLevelUpLearnset: ; 8324874
+gNinjaskLevelUpLearnset: @ 8324874
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_LEECH_LIFE
@@ -3638,7 +3638,7 @@ gNinjaskLevelUpLearnset: ; 8324874
 	level_up_move 45, MOVE_BATON_PASS
 	.2byte -1
 
-gShedinjaLevelUpLearnset: ; 8324894
+gShedinjaLevelUpLearnset: @ 8324894
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  5, MOVE_LEECH_LIFE
@@ -3651,7 +3651,7 @@ gShedinjaLevelUpLearnset: ; 8324894
 	level_up_move 45, MOVE_GRUDGE
 	.2byte -1
 
-gTaillowLevelUpLearnset: ; 83248AA
+gTaillowLevelUpLearnset: @ 83248AA
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  4, MOVE_FOCUS_ENERGY
@@ -3663,7 +3663,7 @@ gTaillowLevelUpLearnset: ; 83248AA
 	level_up_move 43, MOVE_AGILITY
 	.2byte -1
 
-gSwellowLevelUpLearnset: ; 83248BE
+gSwellowLevelUpLearnset: @ 83248BE
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_FOCUS_ENERGY
@@ -3677,7 +3677,7 @@ gSwellowLevelUpLearnset: ; 83248BE
 	level_up_move 49, MOVE_AGILITY
 	.2byte -1
 
-gShroomishLevelUpLearnset: ; 83248D6
+gShroomishLevelUpLearnset: @ 83248D6
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  4, MOVE_TACKLE
 	level_up_move  7, MOVE_STUN_SPORE
@@ -3690,7 +3690,7 @@ gShroomishLevelUpLearnset: ; 83248D6
 	level_up_move 54, MOVE_SPORE
 	.2byte -1
 
-gBreloomLevelUpLearnset: ; 83248EC
+gBreloomLevelUpLearnset: @ 83248EC
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_STUN_SPORE
@@ -3707,7 +3707,7 @@ gBreloomLevelUpLearnset: ; 83248EC
 	level_up_move 54, MOVE_DYNAMIC_PUNCH
 	.2byte -1
 
-gSpindaLevelUpLearnset: ; 832490A
+gSpindaLevelUpLearnset: @ 832490A
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_UPROAR
 	level_up_move 12, MOVE_FAINT_ATTACK
@@ -3721,7 +3721,7 @@ gSpindaLevelUpLearnset: ; 832490A
 	level_up_move 56, MOVE_THRASH
 	.2byte -1
 
-gWingullLevelUpLearnset: ; 8324922
+gWingullLevelUpLearnset: @ 8324922
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  7, MOVE_SUPERSONIC
@@ -3732,7 +3732,7 @@ gWingullLevelUpLearnset: ; 8324922
 	level_up_move 55, MOVE_AGILITY
 	.2byte -1
 
-gPelipperLevelUpLearnset: ; 8324934
+gPelipperLevelUpLearnset: @ 8324934
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_WATER_SPORT
@@ -3748,7 +3748,7 @@ gPelipperLevelUpLearnset: ; 8324934
 	level_up_move 61, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gSurskitLevelUpLearnset: ; 8324950
+gSurskitLevelUpLearnset: @ 8324950
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  7, MOVE_QUICK_ATTACK
 	level_up_move 13, MOVE_SWEET_SCENT
@@ -3759,7 +3759,7 @@ gSurskitLevelUpLearnset: ; 8324950
 	level_up_move 37, MOVE_HAZE
 	.2byte -1
 
-gMasquerainLevelUpLearnset: ; 8324962
+gMasquerainLevelUpLearnset: @ 8324962
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_QUICK_ATTACK
 	level_up_move  1, MOVE_SWEET_SCENT
@@ -3774,7 +3774,7 @@ gMasquerainLevelUpLearnset: ; 8324962
 	level_up_move 53, MOVE_WHIRLWIND
 	.2byte -1
 
-gWailmerLevelUpLearnset: ; 832497C
+gWailmerLevelUpLearnset: @ 832497C
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  5, MOVE_GROWL
 	level_up_move 10, MOVE_WATER_GUN
@@ -3789,7 +3789,7 @@ gWailmerLevelUpLearnset: ; 832497C
 	level_up_move 50, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gWailordLevelUpLearnset: ; 8324996
+gWailordLevelUpLearnset: @ 8324996
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
@@ -3807,7 +3807,7 @@ gWailordLevelUpLearnset: ; 8324996
 	level_up_move 59, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gSkittyLevelUpLearnset: ; 83249B6
+gSkittyLevelUpLearnset: @ 83249B6
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  3, MOVE_TAIL_WHIP
@@ -3822,14 +3822,14 @@ gSkittyLevelUpLearnset: ; 83249B6
 	level_up_move 39, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gDelcattyLevelUpLearnset: ; 83249D0
+gDelcattyLevelUpLearnset: @ 83249D0
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_ATTRACT
 	level_up_move  1, MOVE_SING
 	level_up_move  1, MOVE_DOUBLE_SLAP
 	.2byte -1
 
-gKecleonLevelUpLearnset: ; 83249DA
+gKecleonLevelUpLearnset: @ 83249DA
 	level_up_move  1, MOVE_THIEF
 	level_up_move  1, MOVE_TAIL_WHIP
 	level_up_move  1, MOVE_ASTONISH
@@ -3845,7 +3845,7 @@ gKecleonLevelUpLearnset: ; 83249DA
 	level_up_move 49, MOVE_ANCIENT_POWER
 	.2byte -1
 
-gBaltoyLevelUpLearnset: ; 83249F6
+gBaltoyLevelUpLearnset: @ 83249F6
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  3, MOVE_HARDEN
 	level_up_move  5, MOVE_RAPID_SPIN
@@ -3859,7 +3859,7 @@ gBaltoyLevelUpLearnset: ; 83249F6
 	level_up_move 45, MOVE_EXPLOSION
 	.2byte -1
 
-gClaydolLevelUpLearnset: ; 8324A0E
+gClaydolLevelUpLearnset: @ 8324A0E
 	level_up_move  1, MOVE_TELEPORT
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_HARDEN
@@ -3877,7 +3877,7 @@ gClaydolLevelUpLearnset: ; 8324A0E
 	level_up_move 55, MOVE_EXPLOSION
 	.2byte -1
 
-gNosepassLevelUpLearnset: ; 8324A2E
+gNosepassLevelUpLearnset: @ 8324A2E
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  7, MOVE_HARDEN
 	level_up_move 13, MOVE_ROCK_THROW
@@ -3890,7 +3890,7 @@ gNosepassLevelUpLearnset: ; 8324A2E
 	level_up_move 46, MOVE_LOCK_ON
 	.2byte -1
 
-gTorkoalLevelUpLearnset: ; 8324A44
+gTorkoalLevelUpLearnset: @ 8324A44
 	level_up_move  1, MOVE_EMBER
 	level_up_move  4, MOVE_SMOG
 	level_up_move  7, MOVE_CURSE
@@ -3905,7 +3905,7 @@ gTorkoalLevelUpLearnset: ; 8324A44
 	level_up_move 46, MOVE_HEAT_WAVE
 	.2byte -1
 
-gSableyeLevelUpLearnset: ; 8324A5E
+gSableyeLevelUpLearnset: @ 8324A5E
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  5, MOVE_FORESIGHT
@@ -3921,7 +3921,7 @@ gSableyeLevelUpLearnset: ; 8324A5E
 	level_up_move 45, MOVE_MEAN_LOOK
 	.2byte -1
 
-gBarboachLevelUpLearnset: ; 8324A7A
+gBarboachLevelUpLearnset: @ 8324A7A
 	level_up_move  1, MOVE_MUD_SLAP
 	level_up_move  6, MOVE_MUD_SPORT
 	level_up_move  6, MOVE_WATER_SPORT
@@ -3935,7 +3935,7 @@ gBarboachLevelUpLearnset: ; 8324A7A
 	level_up_move 41, MOVE_FISSURE
 	.2byte -1
 
-gWhiscashLevelUpLearnset: ; 8324A92
+gWhiscashLevelUpLearnset: @ 8324A92
 	level_up_move  1, MOVE_TICKLE
 	level_up_move  1, MOVE_MUD_SLAP
 	level_up_move  1, MOVE_MUD_SPORT
@@ -3952,7 +3952,7 @@ gWhiscashLevelUpLearnset: ; 8324A92
 	level_up_move 56, MOVE_FISSURE
 	.2byte -1
 
-gLuvdiscLevelUpLearnset: ; 8324AB0
+gLuvdiscLevelUpLearnset: @ 8324AB0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_CHARM
 	level_up_move 12, MOVE_WATER_GUN
@@ -3964,7 +3964,7 @@ gLuvdiscLevelUpLearnset: ; 8324AB0
 	level_up_move 48, MOVE_SAFEGUARD
 	.2byte -1
 
-gCorphishLevelUpLearnset: ; 8324AC4
+gCorphishLevelUpLearnset: @ 8324AC4
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  7, MOVE_HARDEN
 	level_up_move 10, MOVE_VICE_GRIP
@@ -3978,7 +3978,7 @@ gCorphishLevelUpLearnset: ; 8324AC4
 	level_up_move 44, MOVE_GUILLOTINE
 	.2byte -1
 
-gCrawdauntLevelUpLearnset: ; 8324ADC
+gCrawdauntLevelUpLearnset: @ 8324ADC
 	level_up_move  1, MOVE_BUBBLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_VICE_GRIP
@@ -3995,13 +3995,13 @@ gCrawdauntLevelUpLearnset: ; 8324ADC
 	level_up_move 52, MOVE_GUILLOTINE
 	.2byte -1
 
-gFeebasLevelUpLearnset: ; 8324AFA
+gFeebasLevelUpLearnset: @ 8324AFA
 	level_up_move  1, MOVE_SPLASH
 	level_up_move 15, MOVE_TACKLE
 	level_up_move 30, MOVE_FLAIL
 	.2byte -1
 
-gMiloticLevelUpLearnset: ; 8324B02
+gMiloticLevelUpLearnset: @ 8324B02
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  5, MOVE_WRAP
 	level_up_move 10, MOVE_WATER_SPORT
@@ -4015,7 +4015,7 @@ gMiloticLevelUpLearnset: ; 8324B02
 	level_up_move 50, MOVE_SAFEGUARD
 	.2byte -1
 
-gCarvanhaLevelUpLearnset: ; 8324B1A
+gCarvanhaLevelUpLearnset: @ 8324B1A
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_BITE
 	level_up_move  7, MOVE_RAGE
@@ -4028,7 +4028,7 @@ gCarvanhaLevelUpLearnset: ; 8324B1A
 	level_up_move 43, MOVE_AGILITY
 	.2byte -1
 
-gSharpedoLevelUpLearnset: ; 8324B30
+gSharpedoLevelUpLearnset: @ 8324B30
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_RAGE
@@ -4045,7 +4045,7 @@ gSharpedoLevelUpLearnset: ; 8324B30
 	level_up_move 53, MOVE_AGILITY
 	.2byte -1
 
-gTrapinchLevelUpLearnset: ; 8324B4E
+gTrapinchLevelUpLearnset: @ 8324B4E
 	level_up_move  1, MOVE_BITE
 	level_up_move  9, MOVE_SAND_ATTACK
 	level_up_move 17, MOVE_FAINT_ATTACK
@@ -4056,7 +4056,7 @@ gTrapinchLevelUpLearnset: ; 8324B4E
 	level_up_move 57, MOVE_HYPER_BEAM
 	.2byte -1
 
-gVibravaLevelUpLearnset: ; 8324B60
+gVibravaLevelUpLearnset: @ 8324B60
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_SAND_ATTACK
 	level_up_move  1, MOVE_FAINT_ATTACK
@@ -4071,7 +4071,7 @@ gVibravaLevelUpLearnset: ; 8324B60
 	level_up_move 57, MOVE_HYPER_BEAM
 	.2byte -1
 
-gFlygonLevelUpLearnset: ; 8324B7A
+gFlygonLevelUpLearnset: @ 8324B7A
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_SAND_ATTACK
 	level_up_move  1, MOVE_FAINT_ATTACK
@@ -4086,7 +4086,7 @@ gFlygonLevelUpLearnset: ; 8324B7A
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gMakuhitaLevelUpLearnset: ; 8324B94
+gMakuhitaLevelUpLearnset: @ 8324B94
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_FOCUS_ENERGY
 	level_up_move  4, MOVE_SAND_ATTACK
@@ -4102,7 +4102,7 @@ gMakuhitaLevelUpLearnset: ; 8324B94
 	level_up_move 49, MOVE_REVERSAL
 	.2byte -1
 
-gHariyamaLevelUpLearnset: ; 8324BB0
+gHariyamaLevelUpLearnset: @ 8324BB0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_FOCUS_ENERGY
 	level_up_move  1, MOVE_SAND_ATTACK
@@ -4120,7 +4120,7 @@ gHariyamaLevelUpLearnset: ; 8324BB0
 	level_up_move 55, MOVE_REVERSAL
 	.2byte -1
 
-gElectrikeLevelUpLearnset: ; 8324BD0
+gElectrikeLevelUpLearnset: @ 8324BD0
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_THUNDER_WAVE
 	level_up_move  9, MOVE_LEER
@@ -4134,7 +4134,7 @@ gElectrikeLevelUpLearnset: ; 8324BD0
 	level_up_move 41, MOVE_CHARGE
 	.2byte -1
 
-gManectricLevelUpLearnset: ; 8324BE8
+gManectricLevelUpLearnset: @ 8324BE8
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_THUNDER_WAVE
 	level_up_move  1, MOVE_LEER
@@ -4151,7 +4151,7 @@ gManectricLevelUpLearnset: ; 8324BE8
 	level_up_move 53, MOVE_CHARGE
 	.2byte -1
 
-gNumelLevelUpLearnset: ; 8324C06
+gNumelLevelUpLearnset: @ 8324C06
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TACKLE
 	level_up_move 11, MOVE_EMBER
@@ -4164,7 +4164,7 @@ gNumelLevelUpLearnset: ; 8324C06
 	level_up_move 49, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gCameruptLevelUpLearnset: ; 8324C1C
+gCameruptLevelUpLearnset: @ 8324C1C
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_EMBER
@@ -4180,7 +4180,7 @@ gCameruptLevelUpLearnset: ; 8324C1C
 	level_up_move 55, MOVE_FISSURE
 	.2byte -1
 
-gSphealLevelUpLearnset: ; 8324C38
+gSphealLevelUpLearnset: @ 8324C38
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
@@ -4195,7 +4195,7 @@ gSphealLevelUpLearnset: ; 8324C38
 	level_up_move 49, MOVE_SHEER_COLD
 	.2byte -1
 
-gSealeoLevelUpLearnset: ; 8324C52
+gSealeoLevelUpLearnset: @ 8324C52
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
@@ -4211,7 +4211,7 @@ gSealeoLevelUpLearnset: ; 8324C52
 	level_up_move 55, MOVE_SHEER_COLD
 	.2byte -1
 
-gWalreinLevelUpLearnset: ; 8324C6E
+gWalreinLevelUpLearnset: @ 8324C6E
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_WATER_GUN
@@ -4227,7 +4227,7 @@ gWalreinLevelUpLearnset: ; 8324C6E
 	level_up_move 61, MOVE_SHEER_COLD
 	.2byte -1
 
-gCacneaLevelUpLearnset: ; 8324C8A
+gCacneaLevelUpLearnset: @ 8324C8A
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_LEER
 	level_up_move  5, MOVE_ABSORB
@@ -4243,7 +4243,7 @@ gCacneaLevelUpLearnset: ; 8324C8A
 	level_up_move 45, MOVE_SANDSTORM
 	.2byte -1
 
-gCacturneLevelUpLearnset: ; 8324CA6
+gCacturneLevelUpLearnset: @ 8324CA6
 	level_up_move  1, MOVE_POISON_STING
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_ABSORB
@@ -4261,7 +4261,7 @@ gCacturneLevelUpLearnset: ; 8324CA6
 	level_up_move 53, MOVE_SANDSTORM
 	.2byte -1
 
-gSnoruntLevelUpLearnset: ; 8324CC6
+gSnoruntLevelUpLearnset: @ 8324CC6
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move  1, MOVE_LEER
 	level_up_move  7, MOVE_DOUBLE_TEAM
@@ -4275,7 +4275,7 @@ gSnoruntLevelUpLearnset: ; 8324CC6
 	level_up_move 43, MOVE_BLIZZARD
 	.2byte -1
 
-gGlalieLevelUpLearnset: ; 8324CDE
+gGlalieLevelUpLearnset: @ 8324CDE
 	level_up_move  1, MOVE_POWDER_SNOW
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_DOUBLE_TEAM
@@ -4292,7 +4292,7 @@ gGlalieLevelUpLearnset: ; 8324CDE
 	level_up_move 61, MOVE_SHEER_COLD
 	.2byte -1
 
-gLunatoneLevelUpLearnset: ; 8324CFC
+gLunatoneLevelUpLearnset: @ 8324CFC
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_CONFUSION
@@ -4305,7 +4305,7 @@ gLunatoneLevelUpLearnset: ; 8324CFC
 	level_up_move 49, MOVE_EXPLOSION
 	.2byte -1
 
-gSolrockLevelUpLearnset: ; 8324D12
+gSolrockLevelUpLearnset: @ 8324D12
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  7, MOVE_CONFUSION
@@ -4318,7 +4318,7 @@ gSolrockLevelUpLearnset: ; 8324D12
 	level_up_move 49, MOVE_EXPLOSION
 	.2byte -1
 
-gAzurillLevelUpLearnset: ; 8324D28
+gAzurillLevelUpLearnset: @ 8324D28
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  3, MOVE_CHARM
 	level_up_move  6, MOVE_TAIL_WHIP
@@ -4327,7 +4327,7 @@ gAzurillLevelUpLearnset: ; 8324D28
 	level_up_move 21, MOVE_WATER_GUN
 	.2byte -1
 
-gSpoinkLevelUpLearnset: ; 8324D36
+gSpoinkLevelUpLearnset: @ 8324D36
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  7, MOVE_PSYWAVE
 	level_up_move 10, MOVE_ODOR_SLEUTH
@@ -4341,7 +4341,7 @@ gSpoinkLevelUpLearnset: ; 8324D36
 	level_up_move 43, MOVE_BOUNCE
 	.2byte -1
 
-gGrumpigLevelUpLearnset: ; 8324D4E
+gGrumpigLevelUpLearnset: @ 8324D4E
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  1, MOVE_PSYWAVE
 	level_up_move  1, MOVE_ODOR_SLEUTH
@@ -4358,7 +4358,7 @@ gGrumpigLevelUpLearnset: ; 8324D4E
 	level_up_move 55, MOVE_BOUNCE
 	.2byte -1
 
-gPlusleLevelUpLearnset: ; 8324D6C
+gPlusleLevelUpLearnset: @ 8324D6C
 	level_up_move  1, MOVE_GROWL
 	level_up_move  4, MOVE_THUNDER_WAVE
 	level_up_move 10, MOVE_QUICK_ATTACK
@@ -4372,7 +4372,7 @@ gPlusleLevelUpLearnset: ; 8324D6C
 	level_up_move 47, MOVE_AGILITY
 	.2byte -1
 
-gMinunLevelUpLearnset: ; 8324D84
+gMinunLevelUpLearnset: @ 8324D84
 	level_up_move  1, MOVE_GROWL
 	level_up_move  4, MOVE_THUNDER_WAVE
 	level_up_move 10, MOVE_QUICK_ATTACK
@@ -4386,7 +4386,7 @@ gMinunLevelUpLearnset: ; 8324D84
 	level_up_move 47, MOVE_AGILITY
 	.2byte -1
 
-gMawileLevelUpLearnset: ; 8324D9C
+gMawileLevelUpLearnset: @ 8324D9C
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  6, MOVE_FAKE_TEARS
 	level_up_move 11, MOVE_BITE
@@ -4401,7 +4401,7 @@ gMawileLevelUpLearnset: ; 8324D9C
 	level_up_move 46, MOVE_SPIT_UP
 	.2byte -1
 
-gMedititeLevelUpLearnset: ; 8324DB6
+gMedititeLevelUpLearnset: @ 8324DB6
 	level_up_move  1, MOVE_BIDE
 	level_up_move  4, MOVE_MEDITATE
 	level_up_move  9, MOVE_CONFUSION
@@ -4415,7 +4415,7 @@ gMedititeLevelUpLearnset: ; 8324DB6
 	level_up_move 48, MOVE_RECOVER
 	.2byte -1
 
-gMedichamLevelUpLearnset: ; 8324DCE
+gMedichamLevelUpLearnset: @ 8324DCE
 	level_up_move  1, MOVE_FIRE_PUNCH
 	level_up_move  1, MOVE_THUNDER_PUNCH
 	level_up_move  1, MOVE_ICE_PUNCH
@@ -4435,7 +4435,7 @@ gMedichamLevelUpLearnset: ; 8324DCE
 	level_up_move 54, MOVE_RECOVER
 	.2byte -1
 
-gSwabluLevelUpLearnset: ; 8324DF2
+gSwabluLevelUpLearnset: @ 8324DF2
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  8, MOVE_ASTONISH
@@ -4449,7 +4449,7 @@ gSwabluLevelUpLearnset: ; 8324DF2
 	level_up_move 48, MOVE_PERISH_SONG
 	.2byte -1
 
-gAltariaLevelUpLearnset: ; 8324E0A
+gAltariaLevelUpLearnset: @ 8324E0A
 	level_up_move  1, MOVE_PECK
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_ASTONISH
@@ -4467,7 +4467,7 @@ gAltariaLevelUpLearnset: ; 8324E0A
 	level_up_move 59, MOVE_SKY_ATTACK
 	.2byte -1
 
-gWynautLevelUpLearnset: ; 8324E2A
+gWynautLevelUpLearnset: @ 8324E2A
 	level_up_move  1, MOVE_SPLASH
 	level_up_move  1, MOVE_CHARM
 	level_up_move  1, MOVE_ENCORE
@@ -4477,7 +4477,7 @@ gWynautLevelUpLearnset: ; 8324E2A
 	level_up_move 15, MOVE_DESTINY_BOND
 	.2byte -1
 
-gDuskullLevelUpLearnset: ; 8324E3A
+gDuskullLevelUpLearnset: @ 8324E3A
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_NIGHT_SHADE
 	level_up_move  5, MOVE_DISABLE
@@ -4491,7 +4491,7 @@ gDuskullLevelUpLearnset: ; 8324E3A
 	level_up_move 49, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gDusclopsLevelUpLearnset: ; 8324E52
+gDusclopsLevelUpLearnset: @ 8324E52
 	level_up_move  1, MOVE_BIND
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_NIGHT_SHADE
@@ -4508,7 +4508,7 @@ gDusclopsLevelUpLearnset: ; 8324E52
 	level_up_move 58, MOVE_FUTURE_SIGHT
 	.2byte -1
 
-gRoseliaLevelUpLearnset: ; 8324E70
+gRoseliaLevelUpLearnset: @ 8324E70
 	level_up_move  1, MOVE_ABSORB
 	level_up_move  5, MOVE_GROWTH
 	level_up_move  9, MOVE_POISON_STING
@@ -4526,7 +4526,7 @@ gRoseliaLevelUpLearnset: ; 8324E70
 	level_up_move 57, MOVE_SYNTHESIS
 	.2byte -1
 
-gSlakothLevelUpLearnset: ; 8324E90
+gSlakothLevelUpLearnset: @ 8324E90
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_YAWN
 	level_up_move  7, MOVE_ENCORE
@@ -4538,7 +4538,7 @@ gSlakothLevelUpLearnset: ; 8324E90
 	level_up_move 43, MOVE_FLAIL
 	.2byte -1
 
-gVigorothLevelUpLearnset: ; 8324EA4
+gVigorothLevelUpLearnset: @ 8324EA4
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_FOCUS_ENERGY
 	level_up_move  1, MOVE_ENCORE
@@ -4553,7 +4553,7 @@ gVigorothLevelUpLearnset: ; 8324EA4
 	level_up_move 49, MOVE_REVERSAL
 	.2byte -1
 
-gSlakingLevelUpLearnset: ; 8324EBE
+gSlakingLevelUpLearnset: @ 8324EBE
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_ENCORE
@@ -4568,7 +4568,7 @@ gSlakingLevelUpLearnset: ; 8324EBE
 	level_up_move 43, MOVE_FLAIL
 	.2byte -1
 
-gGulpinLevelUpLearnset: ; 8324ED8
+gGulpinLevelUpLearnset: @ 8324ED8
 	level_up_move  1, MOVE_POUND
 	level_up_move  6, MOVE_YAWN
 	level_up_move  9, MOVE_POISON_GAS
@@ -4582,7 +4582,7 @@ gGulpinLevelUpLearnset: ; 8324ED8
 	level_up_move 39, MOVE_SLUDGE_BOMB
 	.2byte -1
 
-gSwalotLevelUpLearnset: ; 8324EF0
+gSwalotLevelUpLearnset: @ 8324EF0
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_YAWN
 	level_up_move  1, MOVE_POISON_GAS
@@ -4600,7 +4600,7 @@ gSwalotLevelUpLearnset: ; 8324EF0
 	level_up_move 48, MOVE_SLUDGE_BOMB
 	.2byte -1
 
-gTropiusLevelUpLearnset: ; 8324F10
+gTropiusLevelUpLearnset: @ 8324F10
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_GUST
 	level_up_move  7, MOVE_GROWTH
@@ -4614,7 +4614,7 @@ gTropiusLevelUpLearnset: ; 8324F10
 	level_up_move 47, MOVE_SYNTHESIS
 	.2byte -1
 
-gWhismurLevelUpLearnset: ; 8324F28
+gWhismurLevelUpLearnset: @ 8324F28
 	level_up_move  1, MOVE_POUND
 	level_up_move  5, MOVE_UPROAR
 	level_up_move 11, MOVE_ASTONISH
@@ -4628,7 +4628,7 @@ gWhismurLevelUpLearnset: ; 8324F28
 	level_up_move 45, MOVE_HYPER_VOICE
 	.2byte -1
 
-gLoudredLevelUpLearnset: ; 8324F40
+gLoudredLevelUpLearnset: @ 8324F40
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_UPROAR
 	level_up_move  1, MOVE_ASTONISH
@@ -4645,7 +4645,7 @@ gLoudredLevelUpLearnset: ; 8324F40
 	level_up_move 57, MOVE_HYPER_VOICE
 	.2byte -1
 
-gExploudLevelUpLearnset: ; 8324F5E
+gExploudLevelUpLearnset: @ 8324F5E
 	level_up_move  1, MOVE_POUND
 	level_up_move  1, MOVE_UPROAR
 	level_up_move  1, MOVE_ASTONISH
@@ -4663,14 +4663,14 @@ gExploudLevelUpLearnset: ; 8324F5E
 	level_up_move 63, MOVE_HYPER_VOICE
 	.2byte -1
 
-gClamperlLevelUpLearnset: ; 8324F7E
+gClamperlLevelUpLearnset: @ 8324F7E
 	level_up_move  1, MOVE_CLAMP
 	level_up_move  1, MOVE_WATER_GUN
 	level_up_move  1, MOVE_WHIRLPOOL
 	level_up_move  1, MOVE_IRON_DEFENSE
 	.2byte -1
 
-gHuntailLevelUpLearnset: ; 8324F88
+gHuntailLevelUpLearnset: @ 8324F88
 	level_up_move  1, MOVE_WHIRLPOOL
 	level_up_move  8, MOVE_BITE
 	level_up_move 15, MOVE_SCREECH
@@ -4681,7 +4681,7 @@ gHuntailLevelUpLearnset: ; 8324F88
 	level_up_move 50, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gGorebyssLevelUpLearnset: ; 8324F9A
+gGorebyssLevelUpLearnset: @ 8324F9A
 	level_up_move  1, MOVE_WHIRLPOOL
 	level_up_move  8, MOVE_CONFUSION
 	level_up_move 15, MOVE_AGILITY
@@ -4692,7 +4692,7 @@ gGorebyssLevelUpLearnset: ; 8324F9A
 	level_up_move 50, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gAbsolLevelUpLearnset: ; 8324FAC
+gAbsolLevelUpLearnset: @ 8324FAC
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  5, MOVE_LEER
 	level_up_move  9, MOVE_TAUNT
@@ -4706,7 +4706,7 @@ gAbsolLevelUpLearnset: ; 8324FAC
 	level_up_move 46, MOVE_PERISH_SONG
 	.2byte -1
 
-gShuppetLevelUpLearnset: ; 8324FC4
+gShuppetLevelUpLearnset: @ 8324FC4
 	level_up_move  1, MOVE_KNOCK_OFF
 	level_up_move  8, MOVE_SCREECH
 	level_up_move 13, MOVE_NIGHT_SHADE
@@ -4719,7 +4719,7 @@ gShuppetLevelUpLearnset: ; 8324FC4
 	level_up_move 56, MOVE_GRUDGE
 	.2byte -1
 
-gBanetteLevelUpLearnset: ; 8324FDA
+gBanetteLevelUpLearnset: @ 8324FDA
 	level_up_move  1, MOVE_KNOCK_OFF
 	level_up_move  1, MOVE_SCREECH
 	level_up_move  1, MOVE_NIGHT_SHADE
@@ -4735,7 +4735,7 @@ gBanetteLevelUpLearnset: ; 8324FDA
 	level_up_move 64, MOVE_GRUDGE
 	.2byte -1
 
-gSeviperLevelUpLearnset: ; 8324FF6
+gSeviperLevelUpLearnset: @ 8324FF6
 	level_up_move  1, MOVE_WRAP
 	level_up_move  7, MOVE_LICK
 	level_up_move 10, MOVE_BITE
@@ -4748,7 +4748,7 @@ gSeviperLevelUpLearnset: ; 8324FF6
 	level_up_move 43, MOVE_HAZE
 	.2byte -1
 
-gZangooseLevelUpLearnset: ; 832500C
+gZangooseLevelUpLearnset: @ 832500C
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  4, MOVE_LEER
 	level_up_move  7, MOVE_QUICK_ATTACK
@@ -4762,7 +4762,7 @@ gZangooseLevelUpLearnset: ; 832500C
 	level_up_move 55, MOVE_FALSE_SWIPE
 	.2byte -1
 
-gRelicanthLevelUpLearnset: ; 8325024
+gRelicanthLevelUpLearnset: @ 8325024
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  8, MOVE_WATER_GUN
@@ -4776,7 +4776,7 @@ gRelicanthLevelUpLearnset: ; 8325024
 	level_up_move 64, MOVE_HYDRO_PUMP
 	.2byte -1
 
-gAronLevelUpLearnset: ; 832503C
+gAronLevelUpLearnset: @ 832503C
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  4, MOVE_HARDEN
 	level_up_move  7, MOVE_MUD_SLAP
@@ -4791,7 +4791,7 @@ gAronLevelUpLearnset: ; 832503C
 	level_up_move 44, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gLaironLevelUpLearnset: ; 8325056
+gLaironLevelUpLearnset: @ 8325056
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_MUD_SLAP
@@ -4809,7 +4809,7 @@ gLaironLevelUpLearnset: ; 8325056
 	level_up_move 53, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gAggronLevelUpLearnset: ; 8325076
+gAggronLevelUpLearnset: @ 8325076
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_MUD_SLAP
@@ -4827,7 +4827,7 @@ gAggronLevelUpLearnset: ; 8325076
 	level_up_move 63, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gCastformLevelUpLearnset: ; 8325096
+gCastformLevelUpLearnset: @ 8325096
 	level_up_move  1, MOVE_TACKLE
 	level_up_move 10, MOVE_WATER_GUN
 	level_up_move 10, MOVE_EMBER
@@ -4838,7 +4838,7 @@ gCastformLevelUpLearnset: ; 8325096
 	level_up_move 30, MOVE_WEATHER_BALL
 	.2byte -1
 
-gVolbeatLevelUpLearnset: ; 83250A8
+gVolbeatLevelUpLearnset: @ 83250A8
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_CONFUSE_RAY
 	level_up_move  9, MOVE_DOUBLE_TEAM
@@ -4851,7 +4851,7 @@ gVolbeatLevelUpLearnset: ; 83250A8
 	level_up_move 37, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gIllumiseLevelUpLearnset: ; 83250BE
+gIllumiseLevelUpLearnset: @ 83250BE
 	level_up_move  1, MOVE_TACKLE
 	level_up_move  5, MOVE_SWEET_SCENT
 	level_up_move  9, MOVE_CHARM
@@ -4864,7 +4864,7 @@ gIllumiseLevelUpLearnset: ; 83250BE
 	level_up_move 37, MOVE_COVET
 	.2byte -1
 
-gLileepLevelUpLearnset: ; 83250D4
+gLileepLevelUpLearnset: @ 83250D4
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  8, MOVE_CONSTRICT
 	level_up_move 15, MOVE_ACID
@@ -4877,7 +4877,7 @@ gLileepLevelUpLearnset: ; 83250D4
 	level_up_move 50, MOVE_SWALLOW
 	.2byte -1
 
-gCradilyLevelUpLearnset: ; 83250EA
+gCradilyLevelUpLearnset: @ 83250EA
 	level_up_move  1, MOVE_ASTONISH
 	level_up_move  1, MOVE_CONSTRICT
 	level_up_move  1, MOVE_ACID
@@ -4893,7 +4893,7 @@ gCradilyLevelUpLearnset: ; 83250EA
 	level_up_move 60, MOVE_SWALLOW
 	.2byte -1
 
-gAnorithLevelUpLearnset: ; 8325106
+gAnorithLevelUpLearnset: @ 8325106
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  7, MOVE_HARDEN
 	level_up_move 13, MOVE_MUD_SPORT
@@ -4906,7 +4906,7 @@ gAnorithLevelUpLearnset: ; 8325106
 	level_up_move 55, MOVE_ROCK_BLAST
 	.2byte -1
 
-gArmaldoLevelUpLearnset: ; 832511C
+gArmaldoLevelUpLearnset: @ 832511C
 	level_up_move  1, MOVE_SCRATCH
 	level_up_move  1, MOVE_HARDEN
 	level_up_move  1, MOVE_MUD_SPORT
@@ -4922,7 +4922,7 @@ gArmaldoLevelUpLearnset: ; 832511C
 	level_up_move 64, MOVE_ROCK_BLAST
 	.2byte -1
 
-gRaltsLevelUpLearnset: ; 8325138
+gRaltsLevelUpLearnset: @ 8325138
 	level_up_move  1, MOVE_GROWL
 	level_up_move  6, MOVE_CONFUSION
 	level_up_move 11, MOVE_DOUBLE_TEAM
@@ -4935,7 +4935,7 @@ gRaltsLevelUpLearnset: ; 8325138
 	level_up_move 46, MOVE_DREAM_EATER
 	.2byte -1
 
-gKirliaLevelUpLearnset: ; 832514E
+gKirliaLevelUpLearnset: @ 832514E
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_DOUBLE_TEAM
@@ -4951,7 +4951,7 @@ gKirliaLevelUpLearnset: ; 832514E
 	level_up_move 54, MOVE_DREAM_EATER
 	.2byte -1
 
-gGardevoirLevelUpLearnset: ; 832516A
+gGardevoirLevelUpLearnset: @ 832516A
 	level_up_move  1, MOVE_GROWL
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_DOUBLE_TEAM
@@ -4967,7 +4967,7 @@ gGardevoirLevelUpLearnset: ; 832516A
 	level_up_move 60, MOVE_DREAM_EATER
 	.2byte -1
 
-gBagonLevelUpLearnset: ; 8325186
+gBagonLevelUpLearnset: @ 8325186
 	level_up_move  1, MOVE_RAGE
 	level_up_move  5, MOVE_BITE
 	level_up_move  9, MOVE_LEER
@@ -4981,7 +4981,7 @@ gBagonLevelUpLearnset: ; 8325186
 	level_up_move 53, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gShelgonLevelUpLearnset: ; 832519E
+gShelgonLevelUpLearnset: @ 832519E
 	level_up_move  1, MOVE_RAGE
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
@@ -4999,7 +4999,7 @@ gShelgonLevelUpLearnset: ; 832519E
 	level_up_move 78, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gSalamenceLevelUpLearnset: ; 83251BE
+gSalamenceLevelUpLearnset: @ 83251BE
 	level_up_move  1, MOVE_RAGE
 	level_up_move  1, MOVE_BITE
 	level_up_move  1, MOVE_LEER
@@ -5018,11 +5018,11 @@ gSalamenceLevelUpLearnset: ; 83251BE
 	level_up_move 93, MOVE_DOUBLE_EDGE
 	.2byte -1
 
-gBeldumLevelUpLearnset: ; 83251E0
+gBeldumLevelUpLearnset: @ 83251E0
 	level_up_move  1, MOVE_TAKE_DOWN
 	.2byte -1
 
-gMetangLevelUpLearnset: ; 83251E4
+gMetangLevelUpLearnset: @ 83251E4
 	level_up_move  1, MOVE_TAKE_DOWN
 	level_up_move 20, MOVE_CONFUSION
 	level_up_move 20, MOVE_METAL_CLAW
@@ -5035,7 +5035,7 @@ gMetangLevelUpLearnset: ; 83251E4
 	level_up_move 62, MOVE_HYPER_BEAM
 	.2byte -1
 
-gMetagrossLevelUpLearnset: ; 83251FA
+gMetagrossLevelUpLearnset: @ 83251FA
 	level_up_move  1, MOVE_TAKE_DOWN
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  1, MOVE_METAL_CLAW
@@ -5051,7 +5051,7 @@ gMetagrossLevelUpLearnset: ; 83251FA
 	level_up_move 77, MOVE_HYPER_BEAM
 	.2byte -1
 
-gRegirockLevelUpLearnset: ; 8325216
+gRegirockLevelUpLearnset: @ 8325216
 	level_up_move  1, MOVE_EXPLOSION
 	level_up_move  9, MOVE_ROCK_THROW
 	level_up_move 17, MOVE_CURSE
@@ -5063,7 +5063,7 @@ gRegirockLevelUpLearnset: ; 8325216
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gRegiceLevelUpLearnset: ; 832522A
+gRegiceLevelUpLearnset: @ 832522A
 	level_up_move  1, MOVE_EXPLOSION
 	level_up_move  9, MOVE_ICY_WIND
 	level_up_move 17, MOVE_CURSE
@@ -5075,7 +5075,7 @@ gRegiceLevelUpLearnset: ; 832522A
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gRegisteelLevelUpLearnset: ; 832523E
+gRegisteelLevelUpLearnset: @ 832523E
 	level_up_move  1, MOVE_EXPLOSION
 	level_up_move  9, MOVE_METAL_CLAW
 	level_up_move 17, MOVE_CURSE
@@ -5088,7 +5088,7 @@ gRegisteelLevelUpLearnset: ; 832523E
 	level_up_move 65, MOVE_HYPER_BEAM
 	.2byte -1
 
-gKyogreLevelUpLearnset: ; 8325254
+gKyogreLevelUpLearnset: @ 8325254
 	level_up_move  1, MOVE_WATER_PULSE
 	level_up_move  5, MOVE_SCARY_FACE
 	level_up_move 15, MOVE_ANCIENT_POWER
@@ -5102,7 +5102,7 @@ gKyogreLevelUpLearnset: ; 8325254
 	level_up_move 75, MOVE_WATER_SPOUT
 	.2byte -1
 
-gGroudonLevelUpLearnset: ; 832526C
+gGroudonLevelUpLearnset: @ 832526C
 	level_up_move  1, MOVE_MUD_SHOT
 	level_up_move  5, MOVE_SCARY_FACE
 	level_up_move 15, MOVE_ANCIENT_POWER
@@ -5116,7 +5116,7 @@ gGroudonLevelUpLearnset: ; 832526C
 	level_up_move 75, MOVE_ERUPTION
 	.2byte -1
 
-gRayquazaLevelUpLearnset: ; 8325284
+gRayquazaLevelUpLearnset: @ 8325284
 	level_up_move  1, MOVE_TWISTER
 	level_up_move  5, MOVE_SCARY_FACE
 	level_up_move 15, MOVE_ANCIENT_POWER
@@ -5130,7 +5130,7 @@ gRayquazaLevelUpLearnset: ; 8325284
 	level_up_move 75, MOVE_HYPER_BEAM
 	.2byte -1
 
-gLatiasLevelUpLearnset: ; 832529C
+gLatiasLevelUpLearnset: @ 832529C
 	level_up_move  1, MOVE_PSYWAVE
 	level_up_move  5, MOVE_WISH
 	level_up_move 10, MOVE_HELPING_HAND
@@ -5144,7 +5144,7 @@ gLatiasLevelUpLearnset: ; 832529C
 	level_up_move 50, MOVE_CHARM
 	.2byte -1
 
-gLatiosLevelUpLearnset: ; 83252B4
+gLatiosLevelUpLearnset: @ 83252B4
 	level_up_move  1, MOVE_PSYWAVE
 	level_up_move  5, MOVE_MEMENTO
 	level_up_move 10, MOVE_HELPING_HAND
@@ -5158,7 +5158,7 @@ gLatiosLevelUpLearnset: ; 83252B4
 	level_up_move 50, MOVE_DRAGON_DANCE
 	.2byte -1
 
-gJirachiLevelUpLearnset: ; 83252CC
+gJirachiLevelUpLearnset: @ 83252CC
 	level_up_move  1, MOVE_WISH
 	level_up_move  1, MOVE_CONFUSION
 	level_up_move  5, MOVE_REST
@@ -5173,7 +5173,7 @@ gJirachiLevelUpLearnset: ; 83252CC
 	level_up_move 50, MOVE_DOOM_DESIRE
 	.2byte -1
 
-gDeoxysLevelUpLearnset: ; 83252E6
+gDeoxysLevelUpLearnset: @ 83252E6
 	level_up_move  1, MOVE_LEER
 	level_up_move  1, MOVE_WRAP
 	level_up_move  5, MOVE_NIGHT_SHADE
@@ -5188,7 +5188,7 @@ gDeoxysLevelUpLearnset: ; 83252E6
 	level_up_move 50, MOVE_EXTREME_SPEED
 	.2byte -1
 
-gChimechoLevelUpLearnset: ; 8325300
+gChimechoLevelUpLearnset: @ 8325300
 	level_up_move  1, MOVE_WRAP
 	level_up_move  6, MOVE_GROWL
 	level_up_move  9, MOVE_ASTONISH
diff --git a/data/nature_stat_table.s b/data/nature_stat_table.s
index 9d2375808..ee20458ea 100644
--- a/data/nature_stat_table.s
+++ b/data/nature_stat_table.s
@@ -1,27 +1,27 @@
-gNatureStatTable: ; 831E818
-;	     Atk Def Spd Sp.Atk Sp.Def
-	.byte  0,  0,  0,     0,     0 ; Hardy
-	.byte  1, -1,  0,     0,     0 ; Lonely
-	.byte  1,  0, -1,     0,     0 ; Brave
-	.byte  1,  0,  0,    -1,     0 ; Adamant
-	.byte  1,  0,  0,     0,    -1 ; Naughty
-	.byte -1,  1,  0,     0,     0 ; Bold
-	.byte  0,  0,  0,     0,     0 ; Docile
-	.byte  0,  1, -1,     0,     0 ; Relaxed
-	.byte  0,  1,  0,    -1,     0 ; Impish
-	.byte  0,  1,  0,     0,    -1 ; Lax
-	.byte -1,  0,  1,     0,     0 ; Timid
-	.byte  0, -1,  1,     0,     0 ; Hasty
-	.byte  0,  0,  0,     0,     0 ; Serious
-	.byte  0,  0,  1,    -1,     0 ; Jolly
-	.byte  0,  0,  1,     0,    -1 ; Naive
-	.byte -1,  0,  0,     1,     0 ; Modest
-	.byte  0, -1,  0,     1,     0 ; Mild
-	.byte  0,  0, -1,     1,     0 ; Quiet
-	.byte  0,  0,  0,     0,     0 ; Bashful
-	.byte  0,  0,  0,     1,    -1 ; Rash
-	.byte -1,  0,  0,     0,     1 ; Calm
-	.byte  0, -1,  0,     0,     1 ; Gentle
-	.byte  0,  0, -1,     0,     1 ; Sassy
-	.byte  0,  0,  0,    -1,     1 ; Careful
-	.byte  0,  0,  0,     0,     0 ; Quirky
+gNatureStatTable: @ 831E818
+@	     Atk Def Spd Sp.Atk Sp.Def
+	.byte  0,  0,  0,     0,     0 @ Hardy
+	.byte  1, -1,  0,     0,     0 @ Lonely
+	.byte  1,  0, -1,     0,     0 @ Brave
+	.byte  1,  0,  0,    -1,     0 @ Adamant
+	.byte  1,  0,  0,     0,    -1 @ Naughty
+	.byte -1,  1,  0,     0,     0 @ Bold
+	.byte  0,  0,  0,     0,     0 @ Docile
+	.byte  0,  1, -1,     0,     0 @ Relaxed
+	.byte  0,  1,  0,    -1,     0 @ Impish
+	.byte  0,  1,  0,     0,    -1 @ Lax
+	.byte -1,  0,  1,     0,     0 @ Timid
+	.byte  0, -1,  1,     0,     0 @ Hasty
+	.byte  0,  0,  0,     0,     0 @ Serious
+	.byte  0,  0,  1,    -1,     0 @ Jolly
+	.byte  0,  0,  1,     0,    -1 @ Naive
+	.byte -1,  0,  0,     1,     0 @ Modest
+	.byte  0, -1,  0,     1,     0 @ Mild
+	.byte  0,  0, -1,     1,     0 @ Quiet
+	.byte  0,  0,  0,     0,     0 @ Bashful
+	.byte  0,  0,  0,     1,    -1 @ Rash
+	.byte -1,  0,  0,     0,     1 @ Calm
+	.byte  0, -1,  0,     0,     1 @ Gentle
+	.byte  0,  0, -1,     0,     1 @ Sassy
+	.byte  0,  0,  0,    -1,     1 @ Careful
+	.byte  0,  0,  0,     0,     0 @ Quirky
diff --git a/data/pickup_items.s b/data/pickup_items.s
index 09c040665..837d3f763 100644
--- a/data/pickup_items.s
+++ b/data/pickup_items.s
@@ -1,6 +1,6 @@
 	.align 1, 0
 
-gPickupItems: ; 831C440
+gPickupItems: @ 831C440
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_SUPER_POTION
@@ -22,7 +22,7 @@ gPickupItems: ; 831C440
 
 	.align 1, 0
 
-gRarePickupItems: ; 831C464
+gRarePickupItems: @ 831C464
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_NUGGET
 	.2byte ITEM_KINGS_ROCK
@@ -35,7 +35,7 @@ gRarePickupItems: ; 831C464
 	.2byte ITEM_LEFTOVERS
 	.2byte ITEM_TM26
 
-gPickupProbabilities: ; 831C47A
+gPickupProbabilities: @ 831C47A
 	.byte 30
 	.byte 40
 	.byte 50
diff --git a/data/pokedex_entries.s b/data/pokedex_entries.s
index b801e68f1..0ed71221f 100644
--- a/data/pokedex_entries.s
+++ b/data/pokedex_entries.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gPokedexEntries: ; 856B5B0
+gPokedexEntries: @ 856B5B0
 	pokedex_entry     "UNKNOWN$",   0,    0,      gDummyPokedexText, 256,   0,  256,  0
 	pokedex_entry        "SEED$",   7,   69,  gBulbasaurPokedexText, 356,  17,  256,  0
 	pokedex_entry        "SEED$",  10,  130,    gIvysaurPokedexText, 335,  13,  256,  0
diff --git a/data/pokedex_order.s b/data/pokedex_order.s
index 8d37b959c..9696661b5 100644
--- a/data/pokedex_order.s
+++ b/data/pokedex_order.s
@@ -1,4 +1,4 @@
-gSpeciesToHoennPokedexNum: ; 831D94C
+gSpeciesToHoennPokedexNum: @ 831D94C
 	.2byte 203
 	.2byte 204
 	.2byte 205
@@ -411,7 +411,7 @@ gSpeciesToHoennPokedexNum: ; 831D94C
 	.2byte 202
 	.2byte 151
 
-gSpeciesToNationalPokedexNum: ; 831DC82
+gSpeciesToNationalPokedexNum: @ 831DC82
 	.2byte 1
 	.2byte 2
 	.2byte 3
@@ -824,7 +824,7 @@ gSpeciesToNationalPokedexNum: ; 831DC82
 	.2byte 386
 	.2byte 358
 
-gHoennToNationalOrder: ; 831DFB8
+gHoennToNationalOrder: @ 831DFB8
 	.2byte 252
 	.2byte 253
 	.2byte 254
diff --git a/data/region_map_entries.s b/data/region_map_entries.s
index 717dff83a..1ad31b65e 100644
--- a/data/region_map_entries.s
+++ b/data/region_map_entries.s
@@ -1,600 +1,600 @@
-gMapName_LittlerootTown: ; 85A0B10
+gMapName_LittlerootTown: @ 85A0B10
 	.charmapstr "LITTLEROOT TOWN$"
 
-gMapName_OldaleTown: ; 85A0B20
+gMapName_OldaleTown: @ 85A0B20
 	.charmapstr "OLDALE TOWN$"
 
-gMapName_DewfordTown: ; 85A0B2C
+gMapName_DewfordTown: @ 85A0B2C
 	.charmapstr "DEWFORD TOWN$"
 
-gMapName_LavaridgeTown: ; 85A0B39
+gMapName_LavaridgeTown: @ 85A0B39
 	.charmapstr "LAVARIDGE TOWN$"
 
-gMapName_FallarborTown: ; 85A0B48
+gMapName_FallarborTown: @ 85A0B48
 	.charmapstr "FALLARBOR TOWN$"
 
-gMapName_VerdanturfTown: ; 85A0B57
+gMapName_VerdanturfTown: @ 85A0B57
 	.charmapstr "VERDANTURF TOWN$"
 
-gMapName_PacifidlogTown: ; 85A0B67
+gMapName_PacifidlogTown: @ 85A0B67
 	.charmapstr "PACIFIDLOG TOWN$"
 
-gMapName_PetalburgCity: ; 85A0B77
+gMapName_PetalburgCity: @ 85A0B77
 	.charmapstr "PETALBURG CITY$"
 
-gMapName_SlateportCity: ; 85A0B86
+gMapName_SlateportCity: @ 85A0B86
 	.charmapstr "SLATEPORT CITY$"
 
-gMapName_MauvilleCity: ; 85A0B95
+gMapName_MauvilleCity: @ 85A0B95
 	.charmapstr "MAUVILLE CITY$"
 
-gMapName_RustboroCity: ; 85A0BA3
+gMapName_RustboroCity: @ 85A0BA3
 	.charmapstr "RUSTBORO CITY$"
 
-gMapName_FortreeCity: ; 85A0BB1
+gMapName_FortreeCity: @ 85A0BB1
 	.charmapstr "FORTREE CITY$"
 
-gMapName_LilycoveCity: ; 85A0BBE
+gMapName_LilycoveCity: @ 85A0BBE
 	.charmapstr "LILYCOVE CITY$"
 
-gMapName_MossdeepCity: ; 85A0BCC
+gMapName_MossdeepCity: @ 85A0BCC
 	.charmapstr "MOSSDEEP CITY$"
 
-gMapName_SootopolisCity: ; 85A0BDA
+gMapName_SootopolisCity: @ 85A0BDA
 	.charmapstr "SOOTOPOLIS CITY$"
 
-gMapName_EverGrandeCity: ; 85A0BEA
+gMapName_EverGrandeCity: @ 85A0BEA
 	.charmapstr "EVER GRANDE CITY$"
 
-gMapName_Route101: ; 85A0BFB
+gMapName_Route101: @ 85A0BFB
 	.charmapstr "ROUTE 101$"
 
-gMapName_Route102: ; 85A0C05
+gMapName_Route102: @ 85A0C05
 	.charmapstr "ROUTE 102$"
 
-gMapName_Route103: ; 85A0C0F
+gMapName_Route103: @ 85A0C0F
 	.charmapstr "ROUTE 103$"
 
-gMapName_Route104: ; 85A0C19
+gMapName_Route104: @ 85A0C19
 	.charmapstr "ROUTE 104$"
 
-gMapName_Route105: ; 85A0C23
+gMapName_Route105: @ 85A0C23
 	.charmapstr "ROUTE 105$"
 
-gMapName_Route106: ; 85A0C2D
+gMapName_Route106: @ 85A0C2D
 	.charmapstr "ROUTE 106$"
 
-gMapName_Route107: ; 85A0C37
+gMapName_Route107: @ 85A0C37
 	.charmapstr "ROUTE 107$"
 
-gMapName_Route108: ; 85A0C41
+gMapName_Route108: @ 85A0C41
 	.charmapstr "ROUTE 108$"
 
-gMapName_Route109: ; 85A0C4B
+gMapName_Route109: @ 85A0C4B
 	.charmapstr "ROUTE 109$"
 
-gMapName_Route110: ; 85A0C55
+gMapName_Route110: @ 85A0C55
 	.charmapstr "ROUTE 110$"
 
-gMapName_Route111: ; 85A0C5F
+gMapName_Route111: @ 85A0C5F
 	.charmapstr "ROUTE 111$"
 
-gMapName_Route112: ; 85A0C69
+gMapName_Route112: @ 85A0C69
 	.charmapstr "ROUTE 112$"
 
-gMapName_Route113: ; 85A0C73
+gMapName_Route113: @ 85A0C73
 	.charmapstr "ROUTE 113$"
 
-gMapName_Route114: ; 85A0C7D
+gMapName_Route114: @ 85A0C7D
 	.charmapstr "ROUTE 114$"
 
-gMapName_Route115: ; 85A0C87
+gMapName_Route115: @ 85A0C87
 	.charmapstr "ROUTE 115$"
 
-gMapName_Route116: ; 85A0C91
+gMapName_Route116: @ 85A0C91
 	.charmapstr "ROUTE 116$"
 
-gMapName_Route117: ; 85A0C9B
+gMapName_Route117: @ 85A0C9B
 	.charmapstr "ROUTE 117$"
 
-gMapName_Route118: ; 85A0CA5
+gMapName_Route118: @ 85A0CA5
 	.charmapstr "ROUTE 118$"
 
-gMapName_Route119: ; 85A0CAF
+gMapName_Route119: @ 85A0CAF
 	.charmapstr "ROUTE 119$"
 
-gMapName_Route120: ; 85A0CB9
+gMapName_Route120: @ 85A0CB9
 	.charmapstr "ROUTE 120$"
 
-gMapName_Route121: ; 85A0CC3
+gMapName_Route121: @ 85A0CC3
 	.charmapstr "ROUTE 121$"
 
-gMapName_Route122: ; 85A0CCD
+gMapName_Route122: @ 85A0CCD
 	.charmapstr "ROUTE 122$"
 
-gMapName_Route123: ; 85A0CD7
+gMapName_Route123: @ 85A0CD7
 	.charmapstr "ROUTE 123$"
 
-gMapName_Route124: ; 85A0CE1
+gMapName_Route124: @ 85A0CE1
 	.charmapstr "ROUTE 124$"
 
-gMapName_Route125: ; 85A0CEB
+gMapName_Route125: @ 85A0CEB
 	.charmapstr "ROUTE 125$"
 
-gMapName_Route126: ; 85A0CF5
+gMapName_Route126: @ 85A0CF5
 	.charmapstr "ROUTE 126$"
 
-gMapName_Route127: ; 85A0CFF
+gMapName_Route127: @ 85A0CFF
 	.charmapstr "ROUTE 127$"
 
-gMapName_Route128: ; 85A0D09
+gMapName_Route128: @ 85A0D09
 	.charmapstr "ROUTE 128$"
 
-gMapName_Route129: ; 85A0D13
+gMapName_Route129: @ 85A0D13
 	.charmapstr "ROUTE 129$"
 
-gMapName_Route130: ; 85A0D1D
+gMapName_Route130: @ 85A0D1D
 	.charmapstr "ROUTE 130$"
 
-gMapName_Route131: ; 85A0D27
+gMapName_Route131: @ 85A0D27
 	.charmapstr "ROUTE 131$"
 
-gMapName_Route132: ; 85A0D31
+gMapName_Route132: @ 85A0D31
 	.charmapstr "ROUTE 132$"
 
-gMapName_Route133: ; 85A0D3B
+gMapName_Route133: @ 85A0D3B
 	.charmapstr "ROUTE 133$"
 
-gMapName_Route134: ; 85A0D45
+gMapName_Route134: @ 85A0D45
 	.charmapstr "ROUTE 134$"
 
-gMapName_Underwater: ; 85A0D4F
+gMapName_Underwater: @ 85A0D4F
 	.charmapstr "UNDERWATER$"
 
-gMapName_GraniteCave: ; 85A0D5A
+gMapName_GraniteCave: @ 85A0D5A
 	.charmapstr "GRANITE CAVE$"
 
-gMapName_MtChimney: ; 85A0D67
+gMapName_MtChimney: @ 85A0D67
 	.charmapstr "MT. CHIMNEY$"
 
-gMapName_SafariZone: ; 85A0D73
+gMapName_SafariZone: @ 85A0D73
 	.charmapstr "SAFARI ZONE$"
 
-gMapName_BattleFrontier: ; 85A0D7F
+gMapName_BattleFrontier: @ 85A0D7F
 	.charmapstr "BATTLE FRONTIER$"
 
-gMapName_PetalburgWoods: ; 85A0D8F
+gMapName_PetalburgWoods: @ 85A0D8F
 	.charmapstr "PETALBURG WOODS$"
 
-gMapName_RusturfTunnel: ; 85A0D9F
+gMapName_RusturfTunnel: @ 85A0D9F
 	.charmapstr "RUSTURF TUNNEL$"
 
-gMapName_AbandonedShip: ; 85A0DAE
+gMapName_AbandonedShip: @ 85A0DAE
 	.charmapstr "ABANDONED SHIP$"
 
-gMapName_NewMauville: ; 85A0DBD
+gMapName_NewMauville: @ 85A0DBD
 	.charmapstr "NEW MAUVILLE$"
 
-gMapName_MeteorFalls: ; 85A0DCA
+gMapName_MeteorFalls: @ 85A0DCA
 	.charmapstr "METEOR FALLS$"
 
-gMapName_MtPyre: ; 85A0DD7
+gMapName_MtPyre: @ 85A0DD7
 	.charmapstr "MT. PYRE$"
 
-; This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
-; hideout in Emerald with their own new region map entries, and this name
-; doesn't seem to be used anymore.
-gMapName_AquaHideoutOld: ; 85A0DE0
+@ This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
+@ hideout in Emerald with their own new region map entries, and this name
+@ doesn't seem to be used anymore.
+gMapName_AquaHideoutOld: @ 85A0DE0
 	.charmapstr "{AQUA} HIDEOUT$"
 
-gMapName_ShoalCave: ; 85A0DEB
+gMapName_ShoalCave: @ 85A0DEB
 	.charmapstr "SHOAL CAVE$"
 
-gMapName_SeafloorCavern: ; 85A0DF6
+gMapName_SeafloorCavern: @ 85A0DF6
 	.charmapstr "SEAFLOOR CAVERN$"
 
-gMapName_VictoryRoad: ; 85A0E06
+gMapName_VictoryRoad: @ 85A0E06
 	.charmapstr "VICTORY ROAD$"
 
-gMapName_MirageIsland: ; 85A0E13
+gMapName_MirageIsland: @ 85A0E13
 	.charmapstr "MIRAGE ISLAND$"
 
-gMapName_CaveOfOrigin: ; 85A0E21
+gMapName_CaveOfOrigin: @ 85A0E21
 	.charmapstr "CAVE OF ORIGIN$"
 
-gMapName_SouthernIsland: ; 85A0E30
+gMapName_SouthernIsland: @ 85A0E30
 	.charmapstr "SOUTHERN ISLAND$"
 
-gMapName_FieryPath: ; 85A0E40
+gMapName_FieryPath: @ 85A0E40
 	.charmapstr "FIERY PATH$"
 
-gMapName_JaggedPass: ; 85A0E4B
+gMapName_JaggedPass: @ 85A0E4B
 	.charmapstr "JAGGED PASS$"
 
-gMapName_SealedChamber: ; 85A0E57
+gMapName_SealedChamber: @ 85A0E57
 	.charmapstr "SEALED CHAMBER$"
 
-gMapName_ScorchedSlab: ; 85A0E66
+gMapName_ScorchedSlab: @ 85A0E66
 	.charmapstr "SCORCHED SLAB$"
 
-gMapName_IslandCave: ; 85A0E74
+gMapName_IslandCave: @ 85A0E74
 	.charmapstr "ISLAND CAVE$"
 
-gMapName_DesertRuins: ; 85A0E80
+gMapName_DesertRuins: @ 85A0E80
 	.charmapstr "DESERT RUINS$"
 
-gMapName_AncientTomb: ; 85A0E8D
+gMapName_AncientTomb: @ 85A0E8D
 	.charmapstr "ANCIENT TOMB$"
 
-gMapName_InsideOfTruck: ; 85A0E9A
+gMapName_InsideOfTruck: @ 85A0E9A
 	.charmapstr "INSIDE OF TRUCK$"
 
-gMapName_SkyPillar: ; 85A0EAA
+gMapName_SkyPillar: @ 85A0EAA
 	.charmapstr "SKY PILLAR$"
 
-gMapName_SecretBase: ; 85A0EB5
+gMapName_SecretBase: @ 85A0EB5
 	.charmapstr "SECRET BASE$"
 
-gMapName_None: ; 85A0EC1
+gMapName_None: @ 85A0EC1
 	.charmapstr "$"
 
-gMapName_PalletTown: ; 85A0EC2
+gMapName_PalletTown: @ 85A0EC2
 	.charmapstr "PALLET TOWN$"
 
-gMapName_ViridianCity: ; 85A0ECE
+gMapName_ViridianCity: @ 85A0ECE
 	.charmapstr "VIRIDIAN CITY$"
 
-gMapName_PewterCity: ; 85A0EDC
+gMapName_PewterCity: @ 85A0EDC
 	.charmapstr "PEWTER CITY$"
 
-gMapName_CeruleanCity: ; 85A0EE8
+gMapName_CeruleanCity: @ 85A0EE8
 	.charmapstr "CERULEAN CITY$"
 
-gMapName_LavenderTown: ; 85A0EF6
+gMapName_LavenderTown: @ 85A0EF6
 	.charmapstr "LAVENDER TOWN$"
 
-gMapName_VermilionCity: ; 85A0F04
+gMapName_VermilionCity: @ 85A0F04
 	.charmapstr "VERMILION CITY$"
 
-gMapName_CeladonCity: ; 85A0F13
+gMapName_CeladonCity: @ 85A0F13
 	.charmapstr "CELADON CITY$"
 
-gMapName_FuchsiaCity: ; 85A0F20
+gMapName_FuchsiaCity: @ 85A0F20
 	.charmapstr "FUCHSIA CITY$"
 
-gMapName_CinnabarIsland: ; 85A0F2D
+gMapName_CinnabarIsland: @ 85A0F2D
 	.charmapstr "CINNABAR ISLAND$"
 
-gMapName_IndigoPlateau: ; 85A0F3D
+gMapName_IndigoPlateau: @ 85A0F3D
 	.charmapstr "INDIGO PLATEAU$"
 
-gMapName_SaffronCity: ; 85A0F4C
+gMapName_SaffronCity: @ 85A0F4C
 	.charmapstr "SAFFRON CITY$"
 
-gMapName_Route4: ; 85A0F59
+gMapName_Route4: @ 85A0F59
 	.charmapstr "ROUTE 4$"
 
-gMapName_Route10: ; 85A0F61
+gMapName_Route10: @ 85A0F61
 	.charmapstr "ROUTE 10$"
 
-gMapName_Route1: ; 85A0F6A
+gMapName_Route1: @ 85A0F6A
 	.charmapstr "ROUTE 1$"
 
-gMapName_Route2: ; 85A0F72
+gMapName_Route2: @ 85A0F72
 	.charmapstr "ROUTE 2$"
 
-gMapName_Route3: ; 85A0F7A
+gMapName_Route3: @ 85A0F7A
 	.charmapstr "ROUTE 3$"
 
-gMapName_Route4_2: ; 85A0F82
+gMapName_Route4_2: @ 85A0F82
 	.charmapstr "ROUTE 4$"
 
-gMapName_Route5: ; 85A0F8A
+gMapName_Route5: @ 85A0F8A
 	.charmapstr "ROUTE 5$"
 
-gMapName_Route6: ; 85A0F92
+gMapName_Route6: @ 85A0F92
 	.charmapstr "ROUTE 6$"
 
-gMapName_Route7: ; 85A0F9A
+gMapName_Route7: @ 85A0F9A
 	.charmapstr "ROUTE 7$"
 
-gMapName_Route8: ; 85A0FA2
+gMapName_Route8: @ 85A0FA2
 	.charmapstr "ROUTE 8$"
 
-gMapName_Route9: ; 85A0FAA
+gMapName_Route9: @ 85A0FAA
 	.charmapstr "ROUTE 9$"
 
-gMapName_Route10_2: ; 85A0FB2
+gMapName_Route10_2: @ 85A0FB2
 	.charmapstr "ROUTE 10$"
 
-gMapName_Route11: ; 85A0FBB
+gMapName_Route11: @ 85A0FBB
 	.charmapstr "ROUTE 11$"
 
-gMapName_Route12: ; 85A0FC4
+gMapName_Route12: @ 85A0FC4
 	.charmapstr "ROUTE 12$"
 
-gMapName_Route13: ; 85A0FCD
+gMapName_Route13: @ 85A0FCD
 	.charmapstr "ROUTE 13$"
 
-gMapName_Route14: ; 85A0FD6
+gMapName_Route14: @ 85A0FD6
 	.charmapstr "ROUTE 14$"
 
-gMapName_Route15: ; 85A0FDF
+gMapName_Route15: @ 85A0FDF
 	.charmapstr "ROUTE 15$"
 
-gMapName_Route16: ; 85A0FE8
+gMapName_Route16: @ 85A0FE8
 	.charmapstr "ROUTE 16$"
 
-gMapName_Route17: ; 85A0FF1
+gMapName_Route17: @ 85A0FF1
 	.charmapstr "ROUTE 17$"
 
-gMapName_Route18: ; 85A0FFA
+gMapName_Route18: @ 85A0FFA
 	.charmapstr "ROUTE 18$"
 
-gMapName_Route19: ; 85A1003
+gMapName_Route19: @ 85A1003
 	.charmapstr "ROUTE 19$"
 
-gMapName_Route20: ; 85A100C
+gMapName_Route20: @ 85A100C
 	.charmapstr "ROUTE 20$"
 
-gMapName_Route21: ; 85A1015
+gMapName_Route21: @ 85A1015
 	.charmapstr "ROUTE 21$"
 
-gMapName_Route22: ; 85A101E
+gMapName_Route22: @ 85A101E
 	.charmapstr "ROUTE 22$"
 
-gMapName_Route23: ; 85A1027
+gMapName_Route23: @ 85A1027
 	.charmapstr "ROUTE 23$"
 
-gMapName_Route24: ; 85A1030
+gMapName_Route24: @ 85A1030
 	.charmapstr "ROUTE 24$"
 
-gMapName_Route25: ; 85A1039
+gMapName_Route25: @ 85A1039
 	.charmapstr "ROUTE 25$"
 
-gMapName_ViridianForest: ; 85A1042
+gMapName_ViridianForest: @ 85A1042
 	.charmapstr "VIRIDIAN FOREST$"
 
-gMapName_MtMoon: ; 85A1052
+gMapName_MtMoon: @ 85A1052
 	.charmapstr "MT. MOON$"
 
-gMapName_SSAnne: ; 85A105B
+gMapName_SSAnne: @ 85A105B
 	.charmapstr "S.S. ANNE$"
 
-gMapName_UndergroundPath: ; 85A1065
+gMapName_UndergroundPath: @ 85A1065
 	.charmapstr "UNDERGROUND PATH$"
 
-gMapName_UndergroundPath2: ; 85A1076
+gMapName_UndergroundPath2: @ 85A1076
 	.charmapstr "UNDERGROUND PATH$"
 
-gMapName_DiglettsCave: ; 85A1087
+gMapName_DiglettsCave: @ 85A1087
 	.charmapstr "DIGLETT’S CAVE$"
 
-gMapName_KantoVictoryRoad: ; 85A1096
+gMapName_KantoVictoryRoad: @ 85A1096
 	.charmapstr "VICTORY ROAD$"
 
-gMapName_RocketHideout: ; 85A10A3
+gMapName_RocketHideout: @ 85A10A3
 	.charmapstr "ROCKET HIDEOUT$"
 
-gMapName_SilphCo: ; 85A10B2
+gMapName_SilphCo: @ 85A10B2
 	.charmapstr "SILPH CO.$"
 
-gMapName_PokemonMansion: ; 85A10BC
+gMapName_PokemonMansion: @ 85A10BC
 	.charmapstr "POKéMON MANSION$"
 
-gMapName_KantoSafariZone: ; 85A10CC
+gMapName_KantoSafariZone: @ 85A10CC
 	.charmapstr "SAFARI ZONE$"
 
-gMapName_PokemonLeague: ; 85A10D8
+gMapName_PokemonLeague: @ 85A10D8
 	.charmapstr "POKéMON LEAGUE$"
 
-gMapName_RockTunnel: ; 85A10E7
+gMapName_RockTunnel: @ 85A10E7
 	.charmapstr "ROCK TUNNEL$"
 
-gMapName_SeafoamIslands: ; 85A10F3
+gMapName_SeafoamIslands: @ 85A10F3
 	.charmapstr "SEAFOAM ISLANDS$"
 
-gMapName_PokemonTower: ; 85A1103
+gMapName_PokemonTower: @ 85A1103
 	.charmapstr "POKéMON TOWER$"
 
-gMapName_CeruleanCave: ; 85A1111
+gMapName_CeruleanCave: @ 85A1111
 	.charmapstr "CERULEAN CAVE$"
 
-gMapName_PowerPlant: ; 85A111F
+gMapName_PowerPlant: @ 85A111F
 	.charmapstr "POWER PLANT$"
 
-gMapName_OneIsland: ; 85A112B
+gMapName_OneIsland: @ 85A112B
 	.charmapstr "ONE ISLAND$"
 
-gMapName_TwoIsland: ; 85A1136
+gMapName_TwoIsland: @ 85A1136
 	.charmapstr "TWO ISLAND$"
 
-gMapName_ThreeIsland: ; 85A1141
+gMapName_ThreeIsland: @ 85A1141
 	.charmapstr "THREE ISLAND$"
 
-gMapName_FourIsland: ; 85A114E
+gMapName_FourIsland: @ 85A114E
 	.charmapstr "FOUR ISLAND$"
 
-gMapName_FiveIsland: ; 85A115A
+gMapName_FiveIsland: @ 85A115A
 	.charmapstr "FIVE ISLAND$"
 
-gMapName_SevenIsland: ; 85A1166
+gMapName_SevenIsland: @ 85A1166
 	.charmapstr "SEVEN ISLAND$"
 
-gMapName_SixIsland: ; 85A1173
+gMapName_SixIsland: @ 85A1173
 	.charmapstr "SIX ISLAND$"
 
-gMapName_KindleRoad: ; 85A117E
+gMapName_KindleRoad: @ 85A117E
 	.charmapstr "KINDLE ROAD$"
 
-gMapName_TreasureBeach: ; 85A118A
+gMapName_TreasureBeach: @ 85A118A
 	.charmapstr "TREASURE BEACH$"
 
-gMapName_CapeBrink: ; 85A1199
+gMapName_CapeBrink: @ 85A1199
 	.charmapstr "CAPE BRINK$"
 
-gMapName_BondBridge: ; 85A11A4
+gMapName_BondBridge: @ 85A11A4
 	.charmapstr "BOND BRIDGE$"
 
-gMapName_ThreeIslePort: ; 85A11B0
+gMapName_ThreeIslePort: @ 85A11B0
 	.charmapstr "THREE ISLE PORT$"
 
-gMapName_SeviiIsle6: ; 85A11C0
+gMapName_SeviiIsle6: @ 85A11C0
 	.charmapstr "SEVII ISLE 6$"
 
-gMapName_SeviiIsle7: ; 85A11CD
+gMapName_SeviiIsle7: @ 85A11CD
 	.charmapstr "SEVII ISLE 7$"
 
-gMapName_SeviiIsle8: ; 85A11DA
+gMapName_SeviiIsle8: @ 85A11DA
 	.charmapstr "SEVII ISLE 8$"
 
-gMapName_SeviiIsle9: ; 85A11E7
+gMapName_SeviiIsle9: @ 85A11E7
 	.charmapstr "SEVII ISLE 9$"
 
-gMapName_ResortGorgeous: ; 85A11F4
+gMapName_ResortGorgeous: @ 85A11F4
 	.charmapstr "RESORT GORGEOUS$"
 
-gMapName_WaterLabyrinth: ; 85A1204
+gMapName_WaterLabyrinth: @ 85A1204
 	.charmapstr "WATER LABYRINTH$"
 
-gMapName_FiveIsleMeadow: ; 85A1214
+gMapName_FiveIsleMeadow: @ 85A1214
 	.charmapstr "FIVE ISLE MEADOW$"
 
-gMapName_MemorialPillar: ; 85A1225
+gMapName_MemorialPillar: @ 85A1225
 	.charmapstr "MEMORIAL PILLAR$"
 
-gMapName_OutcastIsland: ; 85A1235
+gMapName_OutcastIsland: @ 85A1235
 	.charmapstr "OUTCAST ISLAND$"
 
-gMapName_GreenPath: ; 85A1244
+gMapName_GreenPath: @ 85A1244
 	.charmapstr "GREEN PATH$"
 
-gMapName_WaterPath: ; 85A124F
+gMapName_WaterPath: @ 85A124F
 	.charmapstr "WATER PATH$"
 
-gMapName_RuinValley: ; 85A125A
+gMapName_RuinValley: @ 85A125A
 	.charmapstr "RUIN VALLEY$"
 
-gMapName_TrainerTower: ; 85A1266
+gMapName_TrainerTower: @ 85A1266
 	.charmapstr "TRAINER TOWER$"
 
-gMapName_CanyonEntrance: ; 85A1274
+gMapName_CanyonEntrance: @ 85A1274
 	.charmapstr "CANYON ENTRANCE$"
 
-gMapName_SevaultCanyon: ; 85A1284
+gMapName_SevaultCanyon: @ 85A1284
 	.charmapstr "SEVAULT CANYON$"
 
-gMapName_TanobyRuins: ; 85A1293
+gMapName_TanobyRuins: @ 85A1293
 	.charmapstr "TANOBY RUINS$"
 
-gMapName_SeviiIsle22: ; 85A12A0
+gMapName_SeviiIsle22: @ 85A12A0
 	.charmapstr "SEVII ISLE 22$"
 
-gMapName_SeviiIsle23: ; 85A12AE
+gMapName_SeviiIsle23: @ 85A12AE
 	.charmapstr "SEVII ISLE 23$"
 
-gMapName_SeviiIsle24: ; 85A12BC
+gMapName_SeviiIsle24: @ 85A12BC
 	.charmapstr "SEVII ISLE 24$"
 
-gMapName_NavelRock: ; 85A12CA
+gMapName_NavelRock: @ 85A12CA
 	.charmapstr "NAVEL ROCK$"
 
-gMapName_MtEmber: ; 85A12D5
+gMapName_MtEmber: @ 85A12D5
 	.charmapstr "MT. EMBER$"
 
-gMapName_BerryForest: ; 85A12DF
+gMapName_BerryForest: @ 85A12DF
 	.charmapstr "BERRY FOREST$"
 
-gMapName_IcefallCave: ; 85A12EC
+gMapName_IcefallCave: @ 85A12EC
 	.charmapstr "ICEFALL CAVE$"
 
-gMapName_RocketWarehouse: ; 85A12F9
+gMapName_RocketWarehouse: @ 85A12F9
 	.charmapstr "ROCKET WAREHOUSE$"
 
-gMapName_TrainerTower2: ; 85A130A
+gMapName_TrainerTower2: @ 85A130A
 	.charmapstr "TRAINER TOWER$"
 
-gMapName_DottedHole: ; 85A1318
+gMapName_DottedHole: @ 85A1318
 	.charmapstr "DOTTED HOLE$"
 
-gMapName_LostCave: ; 85A1324
+gMapName_LostCave: @ 85A1324
 	.charmapstr "LOST CAVE$"
 
-gMapName_PatternBush: ; 85A132E
+gMapName_PatternBush: @ 85A132E
 	.charmapstr "PATTERN BUSH$"
 
-gMapName_AlteringCave: ; 85A133B
+gMapName_AlteringCave: @ 85A133B
 	.charmapstr "ALTERING CAVE$"
 
-gMapName_TanobyChambers: ; 85A1349
+gMapName_TanobyChambers: @ 85A1349
 	.charmapstr "TANOBY CHAMBERS$"
 
-gMapName_ThreeIslePath: ; 85A1359
+gMapName_ThreeIslePath: @ 85A1359
 	.charmapstr "THREE ISLE PATH$"
 
-gMapName_TanobyKey: ; 85A1369
+gMapName_TanobyKey: @ 85A1369
 	.charmapstr "TANOBY KEY$"
 
-gMapName_BirthIsland: ; 85A1374
+gMapName_BirthIsland: @ 85A1374
 	.charmapstr "BIRTH ISLAND$"
 
-gMapName_MoneanChamber: ; 85A1381
+gMapName_MoneanChamber: @ 85A1381
 	.charmapstr "MONEAN CHAMBER$"
 
-gMapName_LiptooChamber: ; 85A1390
+gMapName_LiptooChamber: @ 85A1390
 	.charmapstr "LIPTOO CHAMBER$"
 
-gMapName_WeepthChamber: ; 85A139F
+gMapName_WeepthChamber: @ 85A139F
 	.charmapstr "WEEPTH CHAMBER$"
 
-gMapName_DilfordChamber: ; 85A13AE
+gMapName_DilfordChamber: @ 85A13AE
 	.charmapstr "DILFORD CHAMBER$"
 
-gMapName_ScufibChamber: ; 85A13BE
+gMapName_ScufibChamber: @ 85A13BE
 	.charmapstr "SCUFIB CHAMBER$"
 
-gMapName_RixyChamber: ; 85A13CD
+gMapName_RixyChamber: @ 85A13CD
 	.charmapstr "RIXY CHAMBER$"
 
-gMapName_ViapoisChamber: ; 85A13DA
+gMapName_ViapoisChamber: @ 85A13DA
 	.charmapstr "VIAPOIS CHAMBER$"
 
-gMapName_EmberSpa: ; 85A13EA
+gMapName_EmberSpa: @ 85A13EA
 	.charmapstr "EMBER SPA$"
 
-gMapName_SpecialArea: ; 85A13F4
+gMapName_SpecialArea: @ 85A13F4
 	.charmapstr "SPECIAL AREA$"
 
-gMapName_AquaHideout: ; 85A1401
+gMapName_AquaHideout: @ 85A1401
 	.charmapstr "AQUA HIDEOUT$"
 
-gMapName_MagmaHideout: ; 85A140E
+gMapName_MagmaHideout: @ 85A140E
 	.charmapstr "MAGMA HIDEOUT$"
 
-gMapName_MirageTower: ; 85A141C
+gMapName_MirageTower: @ 85A141C
 	.charmapstr "MIRAGE TOWER$"
 
-gMapName_FarawayIsland: ; 85A1429
+gMapName_FarawayIsland: @ 85A1429
 	.charmapstr "FARAWAY ISLAND$"
 
-gMapName_ArtisanCave: ; 85A1438
+gMapName_ArtisanCave: @ 85A1438
 	.charmapstr "ARTISAN CAVE$"
 
-gMapName_MarineCave: ; 85A1445
+gMapName_MarineCave: @ 85A1445
 	.charmapstr "MARINE CAVE$"
 
-gMapName_TerraCave: ; 85A1451
+gMapName_TerraCave: @ 85A1451
 	.charmapstr "TERRA CAVE$"
 
-gMapName_DesertUnderpass: ; 85A145C
+gMapName_DesertUnderpass: @ 85A145C
 	.charmapstr "DESERT UNDERPASS$"
 
-gMapName_TrainerHill: ; 85A146D
+gMapName_TrainerHill: @ 85A146D
 	.charmapstr "TRAINER HILL$"
 
 	.align 2, 0
 
-gRegionMapEntries: ; 85A147C
+gRegionMapEntries: @ 85A147C
 	region_map_entry  4, 11, 1, 1, LittlerootTown
 	region_map_entry  4,  9, 1, 1, OldaleTown
 	region_map_entry  2, 14, 1, 1, DewfordTown
diff --git a/data/rtc.s b/data/rtc.s
index 2131bc325..742910104 100644
--- a/data/rtc.s
+++ b/data/rtc.s
@@ -1,30 +1,30 @@
 	.align 2, 0
 
-gDefaultRTCInfo: ; 82FECC0
-	.byte 0 ; year
-	.byte 1 ; month
-	.byte 1 ; day of month
-	.byte 0 ; day of week
-	.byte 0 ; hour
-	.byte 0 ; minute
-	.byte 0 ; second
-	.byte 0 ; control register value
-	.byte 0 ; unknown 1
-	.byte 0 ; unknown 2
-	.2byte 0 ; padding
+gDefaultRTCInfo: @ 82FECC0
+	.byte 0 @ year
+	.byte 1 @ month
+	.byte 1 @ day of month
+	.byte 0 @ day of week
+	.byte 0 @ hour
+	.byte 0 @ minute
+	.byte 0 @ second
+	.byte 0 @ control register value
+	.byte 0 @ unknown 1
+	.byte 0 @ unknown 2
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gDaysInEachMonth: ; 82FECCC
-	.4byte 31 ; January
-	.4byte 28 ; February
-	.4byte 31 ; March
-	.4byte 30 ; April
-	.4byte 31 ; May
-	.4byte 30 ; June
-	.4byte 31 ; July
-	.4byte 31 ; August
-	.4byte 30 ; September
-	.4byte 31 ; October
-	.4byte 30 ; November
-	.4byte 31 ; December
+gDaysInEachMonth: @ 82FECCC
+	.4byte 31 @ January
+	.4byte 28 @ February
+	.4byte 31 @ March
+	.4byte 30 @ April
+	.4byte 31 @ May
+	.4byte 30 @ June
+	.4byte 31 @ July
+	.4byte 31 @ August
+	.4byte 30 @ September
+	.4byte 31 @ October
+	.4byte 30 @ November
+	.4byte 31 @ December
diff --git a/data/spinda_spot_graphics.s b/data/spinda_spot_graphics.s
index 5e423081c..c5ceadf52 100644
--- a/data/spinda_spot_graphics.s
+++ b/data/spinda_spot_graphics.s
@@ -1,8 +1,8 @@
 	.align 2, 0
 
-gSpindaSpotGraphics: ; 831E2F0
-	.byte 16 ; X
-	.byte  7 ; Y
+gSpindaSpotGraphics: @ 831E2F0
+	.byte 16 @ X
+	.byte  7 @ Y
 	.2byte 0b0000000001110000
 	.2byte 0b0000000111111100
 	.2byte 0b0000001111111110
@@ -21,8 +21,8 @@ gSpindaSpotGraphics: ; 831E2F0
 	.2byte 0b0000000000000000
 	.2byte 0b0000000000000000
 
-	.byte 40 ; X
-	.byte  8 ; Y
+	.byte 40 @ X
+	.byte  8 @ Y
 	.2byte 0b0000000111100000
 	.2byte 0b0000001111111000
 	.2byte 0b0000011111111100
@@ -41,8 +41,8 @@ gSpindaSpotGraphics: ; 831E2F0
 	.2byte 0b0000000000000000
 	.2byte 0b0000000000000000
 
-	.byte 22 ; X
-	.byte 25 ; Y
+	.byte 22 @ X
+	.byte 25 @ Y
 	.2byte 0b0000000000011100
 	.2byte 0b0000000000111110
 	.2byte 0b0000000001111111
@@ -61,8 +61,8 @@ gSpindaSpotGraphics: ; 831E2F0
 	.2byte 0b0000000000000000
 	.2byte 0b0000000000000000
 
-	.byte 34 ; X
-	.byte 26 ; Y
+	.byte 34 @ X
+	.byte 26 @ Y
 	.2byte 0b0000000000111100
 	.2byte 0b0000000001111110
 	.2byte 0b0000000011111111
diff --git a/data/string_util.s b/data/string_util.s
index e6ee59d12..ee31d9b63 100644
--- a/data/string_util.s
+++ b/data/string_util.s
@@ -1,9 +1,9 @@
-gDigits: ; 82EC7D4
+gDigits: @ 82EC7D4
 	.charmapstr "0123456789ABCDEF"
 
 	.align 2, 0
 
-gPowersOfTen: ; 82EC7E4
+gPowersOfTen: @ 82EC7E4
 	.4byte          1
 	.4byte         10
 	.4byte        100
@@ -15,15 +15,15 @@ gPowersOfTen: ; 82EC7E4
 	.4byte  100000000
 	.4byte 1000000000
 
-gUnknown_082EC80C: ; 82EC80C
+gUnknown_082EC80C: @ 82EC80C
 	.incbin "base_emerald.gba", 0x2ec80c, 0x4
 
-gUnknown_082EC810: ; 82EC810
+gUnknown_082EC810: @ 82EC810
 	.incbin "base_emerald.gba", 0x2ec810, 0x8
 
 	.align 2, 0
 
-gStringRefFunctionTable: ; 82EC818
+gStringRefFunctionTable: @ 82EC818
 	.4byte StringRef_GetPossiblyUnusedStringVar
 	.4byte StringRef_GetPlayerName
 	.4byte StringRef_GetStringVar1
@@ -39,7 +39,7 @@ gStringRefFunctionTable: ; 82EC818
 	.4byte StringRef_GetKyogreString
 	.4byte StringRef_GetGroudonString
 
-gExtendedControlCodeLengths: ; 82EC850
+gExtendedControlCodeLengths: @ 82EC850
 	.byte 1
 	.byte 2
 	.byte 2
diff --git a/data/text/ability_description_pointers.s b/data/text/ability_description_pointers.s
index ac157e18d..d3654870f 100644
--- a/data/text/ability_description_pointers.s
+++ b/data/text/ability_description_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gAbilityDescriptionPointers: ; 831BAD4
+gAbilityDescriptionPointers: @ 831BAD4
 	.4byte gNoneAbilityDescription
 	.4byte gStenchAbilityDescription
 	.4byte gDrizzleAbilityDescription
diff --git a/data/text/ability_descriptions.s b/data/text/ability_descriptions.s
index 9650fa67c..9ba2145d0 100644
--- a/data/text/ability_descriptions.s
+++ b/data/text/ability_descriptions.s
@@ -1,233 +1,233 @@
-gNoneAbilityDescription: ; 831AF98
+gNoneAbilityDescription: @ 831AF98
 	.charmapstr "No special ability.$"
 
-gStenchAbilityDescription: ; 831AFAC
+gStenchAbilityDescription: @ 831AFAC
 	.charmapstr "Helps repel wild POKéMON.$"
 
-gDrizzleAbilityDescription: ; 831AFC6
+gDrizzleAbilityDescription: @ 831AFC6
 	.charmapstr "Summons rain in battle.$"
 
-gSpeedBoostAbilityDescription: ; 831AFDE
+gSpeedBoostAbilityDescription: @ 831AFDE
 	.charmapstr "Gradually boosts SPEED.$"
 
-gBattleArmorAbilityDescription: ; 831AFF6
+gBattleArmorAbilityDescription: @ 831AFF6
 	.charmapstr "Blocks critical hits.$"
 
-gSturdyAbilityDescription: ; 831B00C
+gSturdyAbilityDescription: @ 831B00C
 	.charmapstr "Negates 1-hit KO attacks.$"
 
-gDampAbilityDescription: ; 831B026
+gDampAbilityDescription: @ 831B026
 	.charmapstr "Prevents self-destruction.$"
 
-gLimberAbilityDescription: ; 831B041
+gLimberAbilityDescription: @ 831B041
 	.charmapstr "Prevents paralysis.$"
 
-gSandVeilAbilityDescription: ; 831B055
+gSandVeilAbilityDescription: @ 831B055
 	.charmapstr "Ups evasion in a sandstorm.$"
 
-gStaticAbilityDescription: ; 831B071
+gStaticAbilityDescription: @ 831B071
 	.charmapstr "Paralyzes on contact.$"
 
-gVoltAbsorbAbilityDescription: ; 831B087
+gVoltAbsorbAbilityDescription: @ 831B087
 	.charmapstr "Turns electricity into HP.$"
 
-gWaterAbsorbAbilityDescription: ; 831B0A2
+gWaterAbsorbAbilityDescription: @ 831B0A2
 	.charmapstr "Changes water into HP.$"
 
-gObliviousAbilityDescription: ; 831B0B9
+gObliviousAbilityDescription: @ 831B0B9
 	.charmapstr "Prevents attraction.$"
 
-gCloudNineAbilityDescription: ; 831B0CE
+gCloudNineAbilityDescription: @ 831B0CE
 	.charmapstr "Negates weather effects.$"
 
-gCompoundEyesAbilityDescription: ; 831B0E7
+gCompoundEyesAbilityDescription: @ 831B0E7
 	.charmapstr "Raises accuracy.$"
 
-gInsomniaAbilityDescription: ; 831B0F8
+gInsomniaAbilityDescription: @ 831B0F8
 	.charmapstr "Prevents sleep.$"
 
-gColorChangeAbilityDescription: ; 831B108
+gColorChangeAbilityDescription: @ 831B108
 	.charmapstr "Changes type to foe’s move.$"
 
-gImmunityAbilityDescription: ; 831B124
+gImmunityAbilityDescription: @ 831B124
 	.charmapstr "Prevents poisoning.$"
 
-gFlashFireAbilityDescription: ; 831B138
+gFlashFireAbilityDescription: @ 831B138
 	.charmapstr "Powers up if hit by fire.$"
 
-gShieldDustAbilityDescription: ; 831B152
+gShieldDustAbilityDescription: @ 831B152
 	.charmapstr "Prevents added effects.$"
 
-gOwnTempoAbilityDescription: ; 831B16A
+gOwnTempoAbilityDescription: @ 831B16A
 	.charmapstr "Prevents confusion.$"
 
-gSuctionCupsAbilityDescription: ; 831B17E
+gSuctionCupsAbilityDescription: @ 831B17E
 	.charmapstr "Firmly anchors the body.$"
 
-gIntimidateAbilityDescription: ; 831B197
+gIntimidateAbilityDescription: @ 831B197
 	.charmapstr "Lowers the foe’s ATTACK.$"
 
-gShadowTagAbilityDescription: ; 831B1B0
+gShadowTagAbilityDescription: @ 831B1B0
 	.charmapstr "Prevents the foe’s escape.$"
 
-gRoughSkinAbilityDescription: ; 831B1CB
+gRoughSkinAbilityDescription: @ 831B1CB
 	.charmapstr "Hurts to touch.$"
 
-gWonderGuardAbilityDescription: ; 831B1DB
+gWonderGuardAbilityDescription: @ 831B1DB
 	.charmapstr "“Super effective” hits.$"
 
-gLevitateAbilityDescription: ; 831B1F3
+gLevitateAbilityDescription: @ 831B1F3
 	.charmapstr "Not hit by GROUND attacks.$"
 
-gEffectSporeAbilityDescription: ; 831B20E
+gEffectSporeAbilityDescription: @ 831B20E
 	.charmapstr "Leaves spores on contact.$"
 
-gSynchronizeAbilityDescription: ; 831B228
+gSynchronizeAbilityDescription: @ 831B228
 	.charmapstr "Passes on status problems.$"
 
-gClearBodyAbilityDescription: ; 831B243
+gClearBodyAbilityDescription: @ 831B243
 	.charmapstr "Prevents ability reduction.$"
 
-gNaturalCureAbilityDescription: ; 831B25F
+gNaturalCureAbilityDescription: @ 831B25F
 	.charmapstr "Heals upon switching out.$"
 
-gLightningRodAbilityDescription: ; 831B279
+gLightningRodAbilityDescription: @ 831B279
 	.charmapstr "Draws electrical moves.$"
 
-gSereneGraceAbilityDescription: ; 831B291
+gSereneGraceAbilityDescription: @ 831B291
 	.charmapstr "Promotes added effects.$"
 
-gSwiftSwimAbilityDescription: ; 831B2A9
+gSwiftSwimAbilityDescription: @ 831B2A9
 	.charmapstr "Raises SPEED in rain.$"
 
-gChlorophyllAbilityDescription: ; 831B2BF
+gChlorophyllAbilityDescription: @ 831B2BF
 	.charmapstr "Raises SPEED in sunshine.$"
 
-gIlluminateAbilityDescription: ; 831B2D9
+gIlluminateAbilityDescription: @ 831B2D9
 	.charmapstr "Encounter rate increases.$"
 
-gTraceAbilityDescription: ; 831B2F3
+gTraceAbilityDescription: @ 831B2F3
 	.charmapstr "Copies special ability.$"
 
-gHugePowerAbilityDescription: ; 831B30B
+gHugePowerAbilityDescription: @ 831B30B
 	.charmapstr "Raises ATTACK.$"
 
-gPoisonPointAbilityDescription: ; 831B31A
+gPoisonPointAbilityDescription: @ 831B31A
 	.charmapstr "Poisons foe on contact.$"
 
-gInnerFocusAbilityDescription: ; 831B332
+gInnerFocusAbilityDescription: @ 831B332
 	.charmapstr "Prevents flinching.$"
 
-gMagmaArmorAbilityDescription: ; 831B346
+gMagmaArmorAbilityDescription: @ 831B346
 	.charmapstr "Prevents freezing.$"
 
-gWaterVeilAbilityDescription: ; 831B359
+gWaterVeilAbilityDescription: @ 831B359
 	.charmapstr "Prevents burns.$"
 
-gMagnetPullAbilityDescription: ; 831B369
+gMagnetPullAbilityDescription: @ 831B369
 	.charmapstr "Traps STEEL-type POKéMON.$"
 
-gSoundproofAbilityDescription: ; 831B383
+gSoundproofAbilityDescription: @ 831B383
 	.charmapstr "Avoids sound-based moves.$"
 
-gRainDishAbilityDescription: ; 831B39D
+gRainDishAbilityDescription: @ 831B39D
 	.charmapstr "Slight HP recovery in rain.$"
 
-gSandStreamAbilityDescription: ; 831B3B9
+gSandStreamAbilityDescription: @ 831B3B9
 	.charmapstr "Summons a sandstorm.$"
 
-gPressureAbilityDescription: ; 831B3CE
+gPressureAbilityDescription: @ 831B3CE
 	.charmapstr "Raises foe’s PP usage.$"
 
-gThickFatAbilityDescription: ; 831B3E5
+gThickFatAbilityDescription: @ 831B3E5
 	.charmapstr "Heat-and-cold protection.$"
 
-gEarlyBirdAbilityDescription: ; 831B3FF
+gEarlyBirdAbilityDescription: @ 831B3FF
 	.charmapstr "Awakens quickly from sleep.$"
 
-gFlameBodyAbilityDescription: ; 831B41B
+gFlameBodyAbilityDescription: @ 831B41B
 	.charmapstr "Burns the foe on contact.$"
 
-gRunAwayAbilityDescription: ; 831B435
+gRunAwayAbilityDescription: @ 831B435
 	.charmapstr "Makes escaping easier.$"
 
-gKeenEyeAbilityDescription: ; 831B44C
+gKeenEyeAbilityDescription: @ 831B44C
 	.charmapstr "Prevents loss of accuracy.$"
 
-gHyperCutterAbilityDescription: ; 831B467
+gHyperCutterAbilityDescription: @ 831B467
 	.charmapstr "Prevents ATTACK reduction.$"
 
-gPickupAbilityDescription: ; 831B482
+gPickupAbilityDescription: @ 831B482
 	.charmapstr "May pick up items.$"
 
-gTruantAbilityDescription: ; 831B495
+gTruantAbilityDescription: @ 831B495
 	.charmapstr "Moves only every two turns.$"
 
-gHustleAbilityDescription: ; 831B4B1
+gHustleAbilityDescription: @ 831B4B1
 	.charmapstr "Trades accuracy for power.$"
 
-gCuteCharmAbilityDescription: ; 831B4CC
+gCuteCharmAbilityDescription: @ 831B4CC
 	.charmapstr "Infatuates on contact.$"
 
-gPlusAbilityDescription: ; 831B4E3
+gPlusAbilityDescription: @ 831B4E3
 	.charmapstr "Powers up with MINUS.$"
 
-gMinusAbilityDescription: ; 831B4F9
+gMinusAbilityDescription: @ 831B4F9
 	.charmapstr "Powers up with PLUS.$"
 
-gForecastAbilityDescription: ; 831B50E
+gForecastAbilityDescription: @ 831B50E
 	.charmapstr "Changes with the weather.$"
 
-gStickyHoldAbilityDescription: ; 831B528
+gStickyHoldAbilityDescription: @ 831B528
 	.charmapstr "Prevents item theft.$"
 
-gShedSkinAbilityDescription: ; 831B53D
+gShedSkinAbilityDescription: @ 831B53D
 	.charmapstr "Heals the body by shedding.$"
 
-gGutsAbilityDescription: ; 831B559
+gGutsAbilityDescription: @ 831B559
 	.charmapstr "Ups ATTACK if suffering.$"
 
-gMarvelScaleAbilityDescription: ; 831B572
+gMarvelScaleAbilityDescription: @ 831B572
 	.charmapstr "Ups DEFENSE if suffering.$"
 
-gLiquidOozeAbilityDescription: ; 831B58C
+gLiquidOozeAbilityDescription: @ 831B58C
 	.charmapstr "Draining causes injury.$"
 
-gOvergrowAbilityDescription: ; 831B5A4
+gOvergrowAbilityDescription: @ 831B5A4
 	.charmapstr "Ups GRASS moves in a pinch.$"
 
-gBlazeAbilityDescription: ; 831B5C0
+gBlazeAbilityDescription: @ 831B5C0
 	.charmapstr "Ups FIRE moves in a pinch.$"
 
-gTorrentAbilityDescription: ; 831B5DB
+gTorrentAbilityDescription: @ 831B5DB
 	.charmapstr "Ups WATER moves in a pinch.$"
 
-gSwarmAbilityDescription: ; 831B5F7
+gSwarmAbilityDescription: @ 831B5F7
 	.charmapstr "Ups BUG moves in a pinch.$"
 
-gRockHeadAbilityDescription: ; 831B611
+gRockHeadAbilityDescription: @ 831B611
 	.charmapstr "Prevents recoil damage.$"
 
-gDroughtAbilityDescription: ; 831B629
+gDroughtAbilityDescription: @ 831B629
 	.charmapstr "Summons sunlight in battle.$"
 
-gArenaTrapAbilityDescription: ; 831B645
+gArenaTrapAbilityDescription: @ 831B645
 	.charmapstr "Prevents fleeing.$"
 
-gVitalSpiritAbilityDescription: ; 831B657
+gVitalSpiritAbilityDescription: @ 831B657
 	.charmapstr "Prevents sleep.$"
 
-gWhiteSmokeAbilityDescription: ; 831B667
+gWhiteSmokeAbilityDescription: @ 831B667
 	.charmapstr "Prevents ability reduction.$"
 
-gPurePowerAbilityDescription: ; 831B683
+gPurePowerAbilityDescription: @ 831B683
 	.charmapstr "Raises ATTACK.$"
 
-gShellArmorAbilityDescription: ; 831B692
+gShellArmorAbilityDescription: @ 831B692
 	.charmapstr "Blocks critical hits.$"
 
-gCacophonyAbilityDescription: ; 831B6A8
+gCacophonyAbilityDescription: @ 831B6A8
 	.charmapstr "Avoids sound-based moves.$"
 
-gAirLockAbilityDescription: ; 831B6C2
+gAirLockAbilityDescription: @ 831B6C2
 	.charmapstr "Negates weather effects.$"
diff --git a/data/text/ability_names.s b/data/text/ability_names.s
index df328fbdf..f4fc6e53c 100644
--- a/data/text/ability_names.s
+++ b/data/text/ability_names.s
@@ -1,4 +1,4 @@
-gAbilityNames: ; 831B6DB
+gAbilityNames: @ 831B6DB
 	.charmapstr "-------$", 13
 	.charmapstr "STENCH$", 13
 	.charmapstr "DRIZZLE$", 13
diff --git a/data/text/berry_descriptions.s b/data/text/berry_descriptions.s
index 0b5742869..c839adfa1 100644
--- a/data/text/berry_descriptions.s
+++ b/data/text/berry_descriptions.s
@@ -1,258 +1,258 @@
-gBerryDescriptionPart1_Cheri: ; 8589AE4
+gBerryDescriptionPart1_Cheri: @ 8589AE4
 	.charmapstr "Blooms with delicate pretty flowers.$"
 
-gBerryDescriptionPart2_Cheri: ; 8589B09
+gBerryDescriptionPart2_Cheri: @ 8589B09
 	.charmapstr "The bright red BERRY is very spicy.$"
 
-gBerryDescriptionPart1_Chesto: ; 8589B2D
+gBerryDescriptionPart1_Chesto: @ 8589B2D
 	.charmapstr "The BERRY’s thick skin and fruit are$"
 
-gBerryDescriptionPart2_Chesto: ; 8589B52
+gBerryDescriptionPart2_Chesto: @ 8589B52
 	.charmapstr "very tough. It is dry-tasting all over.$"
 
-gBerryDescriptionPart1_Pecha: ; 8589B7A
+gBerryDescriptionPart1_Pecha: @ 8589B7A
 	.charmapstr "Very sweet and delicious.$"
 
-gBerryDescriptionPart2_Pecha: ; 8589B94
+gBerryDescriptionPart2_Pecha: @ 8589B94
 	.charmapstr "Also very tender - handle with care.$"
 
-gBerryDescriptionPart1_Rawst: ; 8589BB9
+gBerryDescriptionPart1_Rawst: @ 8589BB9
 	.charmapstr "If the leaves grow long and curly,$"
 
-gBerryDescriptionPart2_Rawst: ; 8589BDC
+gBerryDescriptionPart2_Rawst: @ 8589BDC
 	.charmapstr "the BERRY seems to grow very bitter.$"
 
-gBerryDescriptionPart1_Aspear: ; 8589C01
+gBerryDescriptionPart1_Aspear: @ 8589C01
 	.charmapstr "The hard BERRY is dense with a rich$"
 
-gBerryDescriptionPart2_Aspear: ; 8589C25
+gBerryDescriptionPart2_Aspear: @ 8589C25
 	.charmapstr "juice. It is quite sour.$"
 
-gBerryDescriptionPart1_Leppa: ; 8589C3E
+gBerryDescriptionPart1_Leppa: @ 8589C3E
 	.charmapstr "Grows slower than CHERI and others.$"
 
-gBerryDescriptionPart2_Leppa: ; 8589C62
+gBerryDescriptionPart2_Leppa: @ 8589C62
 	.charmapstr "The smaller the BERRY, the tastier.$"
 
-gBerryDescriptionPart1_Oran: ; 8589C86
+gBerryDescriptionPart1_Oran: @ 8589C86
 	.charmapstr "A peculiar BERRY with a mix of flavors.$"
 
-gBerryDescriptionPart2_Oran: ; 8589CAE
+gBerryDescriptionPart2_Oran: @ 8589CAE
 	.charmapstr "BERRIES grow in half a day.$"
 
-gBerryDescriptionPart1_Persim: ; 8589CCA
+gBerryDescriptionPart1_Persim: @ 8589CCA
 	.charmapstr "Loves sunlight. The BERRY’s color$"
 
-gBerryDescriptionPart2_Persim: ; 8589CEC
+gBerryDescriptionPart2_Persim: @ 8589CEC
 	.charmapstr "grows vivid when exposed to the sun.$"
 
-gBerryDescriptionPart1_Lum: ; 8589D11
+gBerryDescriptionPart1_Lum: @ 8589D11
 	.charmapstr "Slow to grow. If raised with loving$"
 
-gBerryDescriptionPart2_Lum: ; 8589D35
+gBerryDescriptionPart2_Lum: @ 8589D35
 	.charmapstr "care, it may grow two BERRIES.$"
 
-gBerryDescriptionPart1_Sitrus: ; 8589D54
+gBerryDescriptionPart1_Sitrus: @ 8589D54
 	.charmapstr "Closely related to ORAN. The large$"
 
-gBerryDescriptionPart2_Sitrus: ; 8589D77
+gBerryDescriptionPart2_Sitrus: @ 8589D77
 	.charmapstr "BERRY has a well-rounded flavor.$"
 
-gBerryDescriptionPart1_Figy: ; 8589D98
+gBerryDescriptionPart1_Figy: @ 8589D98
 	.charmapstr "The BERRY, which looks chewed up,$"
 
-gBerryDescriptionPart2_Figy: ; 8589DBA
+gBerryDescriptionPart2_Figy: @ 8589DBA
 	.charmapstr "brims with spicy substances.$"
 
-gBerryDescriptionPart1_Wiki: ; 8589DD7
+gBerryDescriptionPart1_Wiki: @ 8589DD7
 	.charmapstr "The BERRY is said to have grown lumpy$"
 
-gBerryDescriptionPart2_Wiki: ; 8589DFD
+gBerryDescriptionPart2_Wiki: @ 8589DFD
 	.charmapstr "to help POKéMON grip it.$"
 
-gBerryDescriptionPart1_Mago: ; 8589E16
+gBerryDescriptionPart1_Mago: @ 8589E16
 	.charmapstr "The BERRY turns curvy as it grows.$"
 
-gBerryDescriptionPart2_Mago: ; 8589E39
+gBerryDescriptionPart2_Mago: @ 8589E39
 	.charmapstr "The curvier, the sweeter and tastier.$"
 
-gBerryDescriptionPart1_Aguav: ; 8589E5F
+gBerryDescriptionPart1_Aguav: @ 8589E5F
 	.charmapstr "The flower is dainty. It is rare in its$"
 
-gBerryDescriptionPart2_Aguav: ; 8589E87
+gBerryDescriptionPart2_Aguav: @ 8589E87
 	.charmapstr "ability to grow without light.$"
 
-gBerryDescriptionPart1_Iapapa: ; 8589EA6
+gBerryDescriptionPart1_Iapapa: @ 8589EA6
 	.charmapstr "The BERRY is very big and sour.$"
 
-gBerryDescriptionPart2_Iapapa: ; 8589EC6
+gBerryDescriptionPart2_Iapapa: @ 8589EC6
 	.charmapstr "It takes at least a day to grow.$"
 
-gBerryDescriptionPart1_Razz: ; 8589EE7
+gBerryDescriptionPart1_Razz: @ 8589EE7
 	.charmapstr "The red BERRY tastes slightly spicy.$"
 
-gBerryDescriptionPart2_Razz: ; 8589F0C
+gBerryDescriptionPart2_Razz: @ 8589F0C
 	.charmapstr "It grows quickly in just four hours.$"
 
-gBerryDescriptionPart1_Bluk: ; 8589F31
+gBerryDescriptionPart1_Bluk: @ 8589F31
 	.charmapstr "The BERRY is blue on the outside, but$"
 
-gBerryDescriptionPart2_Bluk: ; 8589F57
+gBerryDescriptionPart2_Bluk: @ 8589F57
 	.charmapstr "it blackens the mouth when eaten.$"
 
-gBerryDescriptionPart1_Nanab: ; 8589F79
+gBerryDescriptionPart1_Nanab: @ 8589F79
 	.charmapstr "This BERRY was the seventh$"
 
-gBerryDescriptionPart2_Nanab: ; 8589F94
+gBerryDescriptionPart2_Nanab: @ 8589F94
 	.charmapstr "discovered in the world. It is sweet.$"
 
-gBerryDescriptionPart1_Wepear: ; 8589FBA
+gBerryDescriptionPart1_Wepear: @ 8589FBA
 	.charmapstr "The flower is small and white. It has a$"
 
-gBerryDescriptionPart2_Wepear: ; 8589FE2
+gBerryDescriptionPart2_Wepear: @ 8589FE2
 	.charmapstr "delicate balance of bitter and sour.$"
 
-gBerryDescriptionPart1_Pinap: ; 858A007
+gBerryDescriptionPart1_Pinap: @ 858A007
 	.charmapstr "Weak against wind and cold.$"
 
-gBerryDescriptionPart2_Pinap: ; 858A023
+gBerryDescriptionPart2_Pinap: @ 858A023
 	.charmapstr "The fruit is spicy and the skin, sour.$"
 
-gBerryDescriptionPart1_Pomeg: ; 858A04A
+gBerryDescriptionPart1_Pomeg: @ 858A04A
 	.charmapstr "However much it is watered,$"
 
-gBerryDescriptionPart2_Pomeg: ; 858A066
+gBerryDescriptionPart2_Pomeg: @ 858A066
 	.charmapstr "it only grows up to six BERRIES.$"
 
-gBerryDescriptionPart1_Kelpsy: ; 858A087
+gBerryDescriptionPart1_Kelpsy: @ 858A087
 	.charmapstr "A rare variety shaped like a root.$"
 
-gBerryDescriptionPart2_Kelpsy: ; 858A0AA
+gBerryDescriptionPart2_Kelpsy: @ 858A0AA
 	.charmapstr "Grows a very large flower.$"
 
-gBerryDescriptionPart1_Qualot: ; 858A0C5
+gBerryDescriptionPart1_Qualot: @ 858A0C5
 	.charmapstr "Loves water. Grows strong even in$"
 
-gBerryDescriptionPart2_Qualot: ; 858A0E7
+gBerryDescriptionPart2_Qualot: @ 858A0E7
 	.charmapstr "locations with constant rainfall.$"
 
-gBerryDescriptionPart1_Hondew: ; 858A109
+gBerryDescriptionPart1_Hondew: @ 858A109
 	.charmapstr "A BERRY that is very valuable and$"
 
-gBerryDescriptionPart2_Hondew: ; 858A12B
+gBerryDescriptionPart2_Hondew: @ 858A12B
 	.charmapstr "rarely seen. It is very delicious.$"
 
-gBerryDescriptionPart1_Grepa: ; 858A14E
+gBerryDescriptionPart1_Grepa: @ 858A14E
 	.charmapstr "Despite its tenderness and round$"
 
-gBerryDescriptionPart2_Grepa: ; 858A16F
+gBerryDescriptionPart2_Grepa: @ 858A16F
 	.charmapstr "shape, the BERRY is unimaginably sour.$"
 
-gBerryDescriptionPart1_Tamato: ; 858A196
+gBerryDescriptionPart1_Tamato: @ 858A196
 	.charmapstr "The BERRY is lip-bendingly spicy.$"
 
-gBerryDescriptionPart2_Tamato: ; 858A1B8
+gBerryDescriptionPart2_Tamato: @ 858A1B8
 	.charmapstr "It takes time to grow.$"
 
-gBerryDescriptionPart1_Cornn: ; 858A1CF
+gBerryDescriptionPart1_Cornn: @ 858A1CF
 	.charmapstr "A BERRY from an ancient era. May not$"
 
-gBerryDescriptionPart2_Cornn: ; 858A1F4
+gBerryDescriptionPart2_Cornn: @ 858A1F4
 	.charmapstr "grow unless planted in quantity.$"
 
-gBerryDescriptionPart1_Magost: ; 858A215
+gBerryDescriptionPart1_Magost: @ 858A215
 	.charmapstr "A BERRY that is widely said to have$"
 
-gBerryDescriptionPart2_Magost: ; 858A239
+gBerryDescriptionPart2_Magost: @ 858A239
 	.charmapstr "a finely balanced flavor.$"
 
-gBerryDescriptionPart1_Rabuta: ; 858A253
+gBerryDescriptionPart1_Rabuta: @ 858A253
 	.charmapstr "A rare variety that is overgrown with$"
 
-gBerryDescriptionPart2_Rabuta: ; 858A279
+gBerryDescriptionPart2_Rabuta: @ 858A279
 	.charmapstr "hair. It is quite bitter.$"
 
-gBerryDescriptionPart1_Nomel: ; 858A293
+gBerryDescriptionPart1_Nomel: @ 858A293
 	.charmapstr "Quite sour. Just one bite makes it$"
 
-gBerryDescriptionPart2_Nomel: ; 858A2B6
+gBerryDescriptionPart2_Nomel: @ 858A2B6
 	.charmapstr "impossible to taste for three days.$"
 
-gBerryDescriptionPart1_Spelon: ; 858A2DA
+gBerryDescriptionPart1_Spelon: @ 858A2DA
 	.charmapstr "The vividly red BERRY is very spicy.$"
 
-gBerryDescriptionPart2_Spelon: ; 858A2FF
+gBerryDescriptionPart2_Spelon: @ 858A2FF
 	.charmapstr "Its warts secrete a spicy substance.$"
 
-gBerryDescriptionPart1_Pamtre: ; 858A324
+gBerryDescriptionPart1_Pamtre: @ 858A324
 	.charmapstr "Drifts on the sea from somewhere.$"
 
-gBerryDescriptionPart2_Pamtre: ; 858A346
+gBerryDescriptionPart2_Pamtre: @ 858A346
 	.charmapstr "It is thought to grow elsewhere.$"
 
-gBerryDescriptionPart1_Watmel: ; 858A367
+gBerryDescriptionPart1_Watmel: @ 858A367
 	.charmapstr "A huge BERRY, with some over 20$"
 
-gBerryDescriptionPart2_Watmel: ; 858A387
+gBerryDescriptionPart2_Watmel: @ 858A387
 	.charmapstr "inches discovered. Exceedingly sweet.$"
 
-gBerryDescriptionPart1_Durin: ; 858A3AD
+gBerryDescriptionPart1_Durin: @ 858A3AD
 	.charmapstr "Bitter to even look at. It is so$"
 
-gBerryDescriptionPart2_Durin: ; 858A3CE
+gBerryDescriptionPart2_Durin: @ 858A3CE
 	.charmapstr "bitter, no one has ever eaten it as is.$"
 
-gBerryDescriptionPart1_Belue: ; 858A3F6
+gBerryDescriptionPart1_Belue: @ 858A3F6
 	.charmapstr "It is glossy and looks delicious, but$"
 
-gBerryDescriptionPart2_Belue: ; 858A41C
+gBerryDescriptionPart2_Belue: @ 858A41C
 	.charmapstr "it is awfully sour. Takes time to grow.$"
 
-gBerryDescriptionPart1_Liechi: ; 858A444
+gBerryDescriptionPart1_Liechi: @ 858A444
 	.charmapstr "A mysterious BERRY. It is rumored to$"
 
-gBerryDescriptionPart2_Liechi: ; 858A469
+gBerryDescriptionPart2_Liechi: @ 858A469
 	.charmapstr "contain the power of the sea.$"
 
-gBerryDescriptionPart1_Ganlon: ; 858A487
+gBerryDescriptionPart1_Ganlon: @ 858A487
 	.charmapstr "A mysterious BERRY. It is rumored to$"
 
-gBerryDescriptionPart2_Ganlon: ; 858A4AC
+gBerryDescriptionPart2_Ganlon: @ 858A4AC
 	.charmapstr "contain the power of the land.$"
 
-gBerryDescriptionPart1_Salac: ; 858A4CB
+gBerryDescriptionPart1_Salac: @ 858A4CB
 	.charmapstr "A mysterious BERRY. It is rumored to$"
 
-gBerryDescriptionPart2_Salac: ; 858A4F0
+gBerryDescriptionPart2_Salac: @ 858A4F0
 	.charmapstr "contain the power of the sky.$"
 
-gBerryDescriptionPart1_Petaya: ; 858A50E
+gBerryDescriptionPart1_Petaya: @ 858A50E
 	.charmapstr "A mysterious BERRY. It is rumored to$"
 
-gBerryDescriptionPart2_Petaya: ; 858A533
+gBerryDescriptionPart2_Petaya: @ 858A533
 	.charmapstr "contain the power of all living things.$"
 
-gBerryDescriptionPart1_Apicot: ; 858A55B
+gBerryDescriptionPart1_Apicot: @ 858A55B
 	.charmapstr "A very mystifying BERRY. No telling$"
 
-gBerryDescriptionPart2_Apicot: ; 858A57F
+gBerryDescriptionPart2_Apicot: @ 858A57F
 	.charmapstr "what may happen or how it can be used.$"
 
-gBerryDescriptionPart1_Lansat: ; 858A5A6
+gBerryDescriptionPart1_Lansat: @ 858A5A6
 	.charmapstr "Said to be a legendary BERRY.$"
 
-gBerryDescriptionPart2_Lansat: ; 858A5C4
+gBerryDescriptionPart2_Lansat: @ 858A5C4
 	.charmapstr "Holding it supposedly brings joy.$"
 
-gBerryDescriptionPart1_Starf: ; 858A5E6
+gBerryDescriptionPart1_Starf: @ 858A5E6
 	.charmapstr "So strong, it was abandoned at the$"
 
-gBerryDescriptionPart2_Starf: ; 858A609
+gBerryDescriptionPart2_Starf: @ 858A609
 	.charmapstr "world’s edge. Considered a mirage.$"
 
-gBerryDescriptionPart1_Enigma: ; 858A62C
+gBerryDescriptionPart1_Enigma: @ 858A62C
 	.charmapstr "A completely enigmatic BERRY.$"
 
-gBerryDescriptionPart2_Enigma: ; 858A64A
+gBerryDescriptionPart2_Enigma: @ 858A64A
 	.charmapstr "Appears to have the power of stars.$"
 
diff --git a/data/text/berry_firmness_strings.s b/data/text/berry_firmness_strings.s
index 179350b44..cf9068edb 100644
--- a/data/text/berry_firmness_strings.s
+++ b/data/text/berry_firmness_strings.s
@@ -1,14 +1,14 @@
-gBerryFirmnessString_VerySoft: ; 85E923A
+gBerryFirmnessString_VerySoft: @ 85E923A
 	.charmapstr "Very soft$"
 
-gBerryFirmnessString_Soft: ; 85E9244
+gBerryFirmnessString_Soft: @ 85E9244
 	.charmapstr "Soft$"
 
-gBerryFirmnessString_Hard: ; 85E9249
+gBerryFirmnessString_Hard: @ 85E9249
 	.charmapstr "Hard$"
 
-gBerryFirmnessString_VeryHard: ; 85E924E
+gBerryFirmnessString_VeryHard: @ 85E924E
 	.charmapstr "Very hard$"
 
-gBerryFirmnessString_SuperHard: ; 85E9258
+gBerryFirmnessString_SuperHard: @ 85E9258
 	.charmapstr "Super hard$"
diff --git a/data/text/contest_text.s b/data/text/contest_text.s
index 310dba2b4..4f9c6192b 100644
--- a/data/text/contest_text.s
+++ b/data/text/contest_text.s
@@ -1,203 +1,203 @@
-; contest move effect descriptions
+@ contest move effect descriptions
 
-gContestEffect00hDescription: ; 827CB82
+gContestEffect00hDescription: @ 827CB82
 	.charmapstr "A highly appealing move.$"
 
-gContestEffect01hDescription: ; 827CB9B
+gContestEffect01hDescription: @ 827CB9B
 	.charmapstr "After this move, the user is{next}more easily startled.$"
 
-gContestEffect02hDescription: ; 827CBCE
+gContestEffect02hDescription: @ 827CBCE
 	.charmapstr "Makes a great appeal, but{next}allows no more to the end.$"
 
-gContestEffect03hDescription: ; 827CC03
+gContestEffect03hDescription: @ 827CC03
 	.charmapstr "Can be repeatedly used{next}without boring the JUDGE.$"
 
-gContestEffect04hDescription: ; 827CC34
+gContestEffect04hDescription: @ 827CC34
 	.charmapstr "Can avoid being startled{next}by others once.$"
 
-gContestEffect05hDescription: ; 827CC5D
+gContestEffect05hDescription: @ 827CC5D
 	.charmapstr "Can avoid being startled{next}by others.$"
 
-gContestEffect06hDescription: ; 827CC81
+gContestEffect06hDescription: @ 827CC81
 	.charmapstr "Can avoid being startled{next}by others a little.$"
 
-gContestEffect07hDescription: ; 827CCAE
+gContestEffect07hDescription: @ 827CCAE
 	.charmapstr "After this move, the user is{next}less likely to be startled.$"
 
-gContestEffect08hDescription: ; 827CCE7
+gContestEffect08hDescription: @ 827CCE7
 	.charmapstr "Slightly startles the{next}POKéMON in front.$"
 
-gContestEffect09hDescription: ; 827CD0F
+gContestEffect09hDescription: @ 827CD0F
 	.charmapstr "Slightly startles those{next}that have made appeals.$"
 
-gContestEffect0AhDescription: ; 827CD3F
+gContestEffect0AhDescription: @ 827CD3F
 	.charmapstr "Startles the POKéMON that{next}appealed before the user.$"
 
-gContestEffect0BhDescription: ; 827CD73
+gContestEffect0BhDescription: @ 827CD73
 	.charmapstr "Startles all POKéMON that{next}have done their appeals.$"
 
-gContestEffect0ChDescription: ; 827CDA6
+gContestEffect0ChDescription: @ 827CDA6
 	.charmapstr "Badly startles the{next}POKéMON in front.$"
 
-gContestEffect0DhDescription: ; 827CDCB
+gContestEffect0DhDescription: @ 827CDCB
 	.charmapstr "Badly startles those that{next}have made appeals.$"
 
-gContestEffect0EhDescription: ; 827CDF8
+gContestEffect0EhDescription: @ 827CDF8
 	.charmapstr "Startles the POKéMON that{next}appealed before the user.$"
 
-gContestEffect0FhDescription: ; 827CE2C
+gContestEffect0FhDescription: @ 827CE2C
 	.charmapstr "Startles all POKéMON that{next}have done their appeals.$"
 
-gContestEffect10hDescription: ; 827CE5F
+gContestEffect10hDescription: @ 827CE5F
 	.charmapstr "Shifts the JUDGE’s{next}attention from others.$"
 
-gContestEffect11hDescription: ; 827CE89
+gContestEffect11hDescription: @ 827CE89
 	.charmapstr "Startles the POKéMON that{next}has the JUDGE’s attention.$"
 
-gContestEffect12hDescription: ; 827CEBE
+gContestEffect12hDescription: @ 827CEBE
 	.charmapstr "Jams the others, and misses{next}one turn of appeals.$"
 
-gContestEffect13hDescription: ; 827CEEF
+gContestEffect13hDescription: @ 827CEEF
 	.charmapstr "Startles POKéMON that{next}made a same-type appeal.$"
 
-gContestEffect14hDescription: ; 827CF1E
+gContestEffect14hDescription: @ 827CF1E
 	.charmapstr "Badly startles POKéMON{next}that made COOL appeals.$"
 
-gContestEffect15hDescription: ; 827CF4D
+gContestEffect15hDescription: @ 827CF4D
 	.charmapstr "Badly startles POKéMON{next}that made BEAUTY appeals.$"
 
-gContestEffect16hDescription: ; 827CF7E
+gContestEffect16hDescription: @ 827CF7E
 	.charmapstr "Badly startles POKéMON{next}that made CUTE appeals.$"
 
-gContestEffect17hDescription: ; 827CFAD
+gContestEffect17hDescription: @ 827CFAD
 	.charmapstr "Badly startles POKéMON{next}that made SMART appeals.$"
 
-gContestEffect18hDescription: ; 827CFDD
+gContestEffect18hDescription: @ 827CFDD
 	.charmapstr "Badly startles POKéMON{next}that made TOUGH appeals.$"
 
-gContestEffect19hDescription: ; 827D00D
+gContestEffect19hDescription: @ 827D00D
 	.charmapstr "Makes one POKéMON after{next}the user nervous.$"
 
-gContestEffect1AhDescription: ; 827D037
+gContestEffect1AhDescription: @ 827D037
 	.charmapstr "Makes all POKéMON after{next}the user nervous.$"
 
-gContestEffect1BhDescription: ; 827D061
+gContestEffect1BhDescription: @ 827D061
 	.charmapstr "Worsens the condition of{next}those that made appeals.$"
 
-gContestEffect1ChDescription: ; 827D093
+gContestEffect1ChDescription: @ 827D093
 	.charmapstr "Badly startles POKéMON in{next}good condition.$"
 
-gContestEffect1DhDescription: ; 827D0BD
+gContestEffect1DhDescription: @ 827D0BD
 	.charmapstr "The appeal works great if{next}performed first.$"
 
-gContestEffect1EhDescription: ; 827D0E8
+gContestEffect1EhDescription: @ 827D0E8
 	.charmapstr "The appeal works great if{next}performed last.$"
 
-gContestEffect1FhDescription: ; 827D112
+gContestEffect1FhDescription: @ 827D112
 	.charmapstr "Makes the appeal as good{next}as those before it.$"
 
-gContestEffect20hDescription: ; 827D13F
+gContestEffect20hDescription: @ 827D13F
 	.charmapstr "Makes the appeal as good{next}as the one before it.$"
 
-gContestEffect21hDescription: ; 827D16E
+gContestEffect21hDescription: @ 827D16E
 	.charmapstr "The appeal works better{next}the later it is performed.$"
 
-gContestEffect22hDescription: ; 827D1A1
+gContestEffect22hDescription: @ 827D1A1
 	.charmapstr "The appeal’s quality varies{next}depending on its timing.$"
 
-gContestEffect23hDescription: ; 827D1D6
+gContestEffect23hDescription: @ 827D1D6
 	.charmapstr "Works well if it’s the same{next}type as the one before.$"
 
-gContestEffect24hDescription: ; 827D20A
+gContestEffect24hDescription: @ 827D20A
 	.charmapstr "Works well if different in{next}type than the one before.$"
 
-gContestEffect25hDescription: ; 827D23F
+gContestEffect25hDescription: @ 827D23F
 	.charmapstr "Affected by how well the{next}appeal in front goes.$"
 
-gContestEffect26hDescription: ; 827D26E
+gContestEffect26hDescription: @ 827D26E
 	.charmapstr "Ups the user’s condition.{next}Helps prevent nervousness.$"
 
-gContestEffect27hDescription: ; 827D2A3
+gContestEffect27hDescription: @ 827D2A3
 	.charmapstr "The appeal works well if the{next}user’s condition is good.$"
 
-gContestEffect28hDescription: ; 827D2DA
+gContestEffect28hDescription: @ 827D2DA
 	.charmapstr "The next appeal can be{next}made earlier next turn.$"
 
-gContestEffect29hDescription: ; 827D309
+gContestEffect29hDescription: @ 827D309
 	.charmapstr "The next appeal can be{next}made later next turn.$"
 
-gContestEffect2AhDescription: ; 827D336
+gContestEffect2AhDescription: @ 827D336
 	.charmapstr "Makes the next turn’s order{next}more easily scrambled.$"
 
-gContestEffect2BhDescription: ; 827D369
+gContestEffect2BhDescription: @ 827D369
 	.charmapstr "Scrambles the order of{next}appeals on the next turn.$"
 
-gContestEffect2ChDescription: ; 827D39A
+gContestEffect2ChDescription: @ 827D39A
 	.charmapstr "An appeal that excites the{next}audience in any CONTEST.$"
 
-gContestEffect2DhDescription: ; 827D3CE
+gContestEffect2DhDescription: @ 827D3CE
 	.charmapstr "Badly startles all POKéMON{next}that made good appeals.$"
 
-gContestEffect2EhDescription: ; 827D401
+gContestEffect2EhDescription: @ 827D401
 	.charmapstr "The appeal works best the{next}more the crowd is excited.$"
 
-gContestEffect2FhDescription: ; 827D436
+gContestEffect2FhDescription: @ 827D436
 	.charmapstr "Temporarily stops the{next}crowd from growing excited.$"
 
-; unused move names
+@ unused move names
 
-gUnusedContestMoveName0: ; 827D468
+gUnusedContestMoveName0: @ 827D468
 	.charmapstr "RAIN DANCE$"
 
-gUnusedContestMoveName1: ; 827D473
+gUnusedContestMoveName1: @ 827D473
 	.charmapstr "RAGE$"
 
-gUnusedContestMoveName2: ; 827D478
+gUnusedContestMoveName2: @ 827D478
 	.charmapstr "FOCUS ENERGY$"
 
-gUnusedContestMoveName3: ; 827D485
+gUnusedContestMoveName3: @ 827D485
 	.charmapstr "HYPNOSIS$"
 
-gUnusedContestMoveName4: ; 827D48E
+gUnusedContestMoveName4: @ 827D48E
 	.charmapstr "SOFTBOILED$"
 
-gUnusedContestMoveName5: ; 827D499
+gUnusedContestMoveName5: @ 827D499
 	.charmapstr "HORN ATTACK$"
 
-gUnusedContestMoveName6: ; 827D4A5
+gUnusedContestMoveName6: @ 827D4A5
 	.charmapstr "SWORDS DANCE$"
 
-gUnusedContestMoveName7: ; 827D4B2
+gUnusedContestMoveName7: @ 827D4B2
 	.charmapstr "CONVERSION$"
 
-gUnusedContestMoveName8: ; 827D4BD
+gUnusedContestMoveName8: @ 827D4BD
 	.charmapstr "SUNNY DAY$"
 
-gUnusedContestMoveName9: ; 827D4C7
+gUnusedContestMoveName9: @ 827D4C7
 	.charmapstr "REST$"
 
-gUnusedContestMoveName10: ; 827D4CC
+gUnusedContestMoveName10: @ 827D4CC
 	.charmapstr "VICEGRIP$"
 
-gUnusedContestMoveName11: ; 827D4D5
+gUnusedContestMoveName11: @ 827D4D5
 	.charmapstr "DEFENSE CURL$"
 
-gUnusedContestMoveName12: ; 827D4E2
+gUnusedContestMoveName12: @ 827D4E2
 	.charmapstr "LOCK-ON$"
 
-; contest type names
+@ contest type names
 
-gContestMoveTypeCoolText: ; 827D4EA
+gContestMoveTypeCoolText: @ 827D4EA
 	.charmapstr "COOL$"
 
-gContestMoveTypeBeautyText: ; 827D4EF
+gContestMoveTypeBeautyText: @ 827D4EF
 	.charmapstr "BEAUTY$"
 
-gContestMoveTypeCuteText: ; 827D4F6
+gContestMoveTypeCuteText: @ 827D4F6
 	.charmapstr "CUTE$"
 
-gContestMoveTypeSmartText: ; 827D4FB
+gContestMoveTypeSmartText: @ 827D4FB
 	.charmapstr "SMART$"
 
-gContestMoveTypeToughText: ; 827D501
+gContestMoveTypeToughText: @ 827D501
 	.charmapstr "TOUGH$"
diff --git a/data/text/contest_text_pointers.s b/data/text/contest_text_pointers.s
index 6e371222b..63d2bd867 100644
--- a/data/text/contest_text_pointers.s
+++ b/data/text/contest_text_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gContestEffectDescriptionPointers: ; 8587C50
+gContestEffectDescriptionPointers: @ 8587C50
 	.4byte gContestEffect00hDescription
 	.4byte gContestEffect01hDescription
 	.4byte gContestEffect02hDescription
@@ -50,10 +50,10 @@ gContestEffectDescriptionPointers: ; 8587C50
 	.4byte gContestEffect2EhDescription
 	.4byte gContestEffect2FhDescription
 
-; 8587D10
-; Unreferenced array of pointers to move names.
-; All of the moves except Conversion are combo starters, so this may have
-; been an early list of combo starters.
+@ 8587D10
+@ Unreferenced array of pointers to move names.
+@ All of the moves except Conversion are combo starters, so this may have
+@ been an early list of combo starters.
 	.align 2, 0
 	.4byte gUnusedContestMoveName0
 	.4byte gUnusedContestMoveName0
@@ -72,7 +72,7 @@ gContestEffectDescriptionPointers: ; 8587C50
 
 	.align 2, 0
 
-gContestMoveTypeTextPointers: ; 8587D48
+gContestMoveTypeTextPointers: @ 8587D48
 	.4byte gContestMoveTypeCoolText
 	.4byte gContestMoveTypeBeautyText
 	.4byte gContestMoveTypeCuteText
diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s
index 06a4dffd4..d2c900058 100644
--- a/data/text/easy_chat/easy_chat_group_actions.s
+++ b/data/text/easy_chat/easy_chat_group_actions.s
@@ -1,548 +1,548 @@
-gEasyChatWord_Meets: ; 859B058
+gEasyChatWord_Meets: @ 859B058
 	.charmapstr "MEETS$"
 
-gEasyChatWord_Concede: ; 859B05E
+gEasyChatWord_Concede: @ 859B05E
 	.charmapstr "CONCEDE$"
 
-gEasyChatWord_Give: ; 859B066
+gEasyChatWord_Give: @ 859B066
 	.charmapstr "GIVE$"
 
-gEasyChatWord_Gives: ; 859B06B
+gEasyChatWord_Gives: @ 859B06B
 	.charmapstr "GIVES$"
 
-gEasyChatWord_Played: ; 859B071
+gEasyChatWord_Played: @ 859B071
 	.charmapstr "PLAYED$"
 
-gEasyChatWord_Plays: ; 859B078
+gEasyChatWord_Plays: @ 859B078
 	.charmapstr "PLAYS$"
 
-gEasyChatWord_Collect: ; 859B07E
+gEasyChatWord_Collect: @ 859B07E
 	.charmapstr "COLLECT$"
 
-gEasyChatWord_Walking: ; 859B086
+gEasyChatWord_Walking: @ 859B086
 	.charmapstr "WALKING$"
 
-gEasyChatWord_Walks: ; 859B08E
+gEasyChatWord_Walks: @ 859B08E
 	.charmapstr "WALKS$"
 
-gEasyChatWord_Says: ; 859B094
+gEasyChatWord_Says: @ 859B094
 	.charmapstr "SAYS$"
 
-gEasyChatWord_Went: ; 859B099
+gEasyChatWord_Went: @ 859B099
 	.charmapstr "WENT$"
 
-gEasyChatWord_Said: ; 859B09E
+gEasyChatWord_Said: @ 859B09E
 	.charmapstr "SAID$"
 
-gEasyChatWord_WakeUp: ; 859B0A3
+gEasyChatWord_WakeUp: @ 859B0A3
 	.charmapstr "WAKE UP$"
 
-gEasyChatWord_WakesUp: ; 859B0AB
+gEasyChatWord_WakesUp: @ 859B0AB
 	.charmapstr "WAKES UP$"
 
-gEasyChatWord_Angers: ; 859B0B4
+gEasyChatWord_Angers: @ 859B0B4
 	.charmapstr "ANGERS$"
 
-gEasyChatWord_Teach: ; 859B0BB
+gEasyChatWord_Teach: @ 859B0BB
 	.charmapstr "TEACH$"
 
-gEasyChatWord_Teaches: ; 859B0C1
+gEasyChatWord_Teaches: @ 859B0C1
 	.charmapstr "TEACHES$"
 
-gEasyChatWord_Please: ; 859B0C9
+gEasyChatWord_Please: @ 859B0C9
 	.charmapstr "PLEASE$"
 
-gEasyChatWord_Learn: ; 859B0D0
+gEasyChatWord_Learn: @ 859B0D0
 	.charmapstr "LEARN$"
 
-gEasyChatWord_Change: ; 859B0D6
+gEasyChatWord_Change: @ 859B0D6
 	.charmapstr "CHANGE$"
 
-gEasyChatWord_Story: ; 859B0DD
+gEasyChatWord_Story: @ 859B0DD
 	.charmapstr "STORY$"
 
-gEasyChatWord_Trust: ; 859B0E3
+gEasyChatWord_Trust: @ 859B0E3
 	.charmapstr "TRUST$"
 
-gEasyChatWord_Lavish: ; 859B0E9
+gEasyChatWord_Lavish: @ 859B0E9
 	.charmapstr "LAVISH$"
 
-gEasyChatWord_Listens: ; 859B0F0
+gEasyChatWord_Listens: @ 859B0F0
 	.charmapstr "LISTENS$"
 
-gEasyChatWord_Hearing: ; 859B0F8
+gEasyChatWord_Hearing: @ 859B0F8
 	.charmapstr "HEARING$"
 
-gEasyChatWord_Trains: ; 859B100
+gEasyChatWord_Trains: @ 859B100
 	.charmapstr "TRAINS$"
 
-gEasyChatWord_Choose: ; 859B107
+gEasyChatWord_Choose: @ 859B107
 	.charmapstr "CHOOSE$"
 
-gEasyChatWord_Come: ; 859B10E
+gEasyChatWord_Come: @ 859B10E
 	.charmapstr "COME$"
 
-gEasyChatWord_Came: ; 859B113
+gEasyChatWord_Came: @ 859B113
 	.charmapstr "CAME$"
 
-gEasyChatWord_Search: ; 859B118
+gEasyChatWord_Search: @ 859B118
 	.charmapstr "SEARCH$"
 
-gEasyChatWord_Make: ; 859B11F
+gEasyChatWord_Make: @ 859B11F
 	.charmapstr "MAKE$"
 
-gEasyChatWord_Cause: ; 859B124
+gEasyChatWord_Cause: @ 859B124
 	.charmapstr "CAUSE$"
 
-gEasyChatWord_Know: ; 859B12A
+gEasyChatWord_Know: @ 859B12A
 	.charmapstr "KNOW$"
 
-gEasyChatWord_Knows: ; 859B12F
+gEasyChatWord_Knows: @ 859B12F
 	.charmapstr "KNOWS$"
 
-gEasyChatWord_Refuse: ; 859B135
+gEasyChatWord_Refuse: @ 859B135
 	.charmapstr "REFUSE$"
 
-gEasyChatWord_Stores: ; 859B13C
+gEasyChatWord_Stores: @ 859B13C
 	.charmapstr "STORES$"
 
-gEasyChatWord_Brag: ; 859B143
+gEasyChatWord_Brag: @ 859B143
 	.charmapstr "BRAG$"
 
-gEasyChatWord_Ignorant: ; 859B148
+gEasyChatWord_Ignorant: @ 859B148
 	.charmapstr "IGNORANT$"
 
-gEasyChatWord_Thinks: ; 859B151
+gEasyChatWord_Thinks: @ 859B151
 	.charmapstr "THINKS$"
 
-gEasyChatWord_Believe: ; 859B158
+gEasyChatWord_Believe: @ 859B158
 	.charmapstr "BELIEVE$"
 
-gEasyChatWord_Slide: ; 859B160
+gEasyChatWord_Slide: @ 859B160
 	.charmapstr "SLIDE$"
 
-gEasyChatWord_Eats: ; 859B166
+gEasyChatWord_Eats: @ 859B166
 	.charmapstr "EATS$"
 
-gEasyChatWord_Use: ; 859B16B
+gEasyChatWord_Use: @ 859B16B
 	.charmapstr "USE$"
 
-gEasyChatWord_Uses: ; 859B16F
+gEasyChatWord_Uses: @ 859B16F
 	.charmapstr "USES$"
 
-gEasyChatWord_Using: ; 859B174
+gEasyChatWord_Using: @ 859B174
 	.charmapstr "USING$"
 
-gEasyChatWord_Couldnt: ; 859B17A
+gEasyChatWord_Couldnt: @ 859B17A
 	.charmapstr "COULDN’T$"
 
-gEasyChatWord_Capable: ; 859B183
+gEasyChatWord_Capable: @ 859B183
 	.charmapstr "CAPABLE$"
 
-gEasyChatWord_Disappear: ; 859B18B
+gEasyChatWord_Disappear: @ 859B18B
 	.charmapstr "DISAPPEAR$"
 
-gEasyChatWord_Appear: ; 859B195
+gEasyChatWord_Appear: @ 859B195
 	.charmapstr "APPEAR$"
 
-gEasyChatWord_Throw: ; 859B19C
+gEasyChatWord_Throw: @ 859B19C
 	.charmapstr "THROW$"
 
-gEasyChatWord_Worry: ; 859B1A2
+gEasyChatWord_Worry: @ 859B1A2
 	.charmapstr "WORRY$"
 
-gEasyChatWord_Slept: ; 859B1A8
+gEasyChatWord_Slept: @ 859B1A8
 	.charmapstr "SLEPT$"
 
-gEasyChatWord_Sleep: ; 859B1AE
+gEasyChatWord_Sleep: @ 859B1AE
 	.charmapstr "SLEEP$"
 
-gEasyChatWord_Release: ; 859B1B4
+gEasyChatWord_Release: @ 859B1B4
 	.charmapstr "RELEASE$"
 
-gEasyChatWord_Drinks: ; 859B1BC
+gEasyChatWord_Drinks: @ 859B1BC
 	.charmapstr "DRINKS$"
 
-gEasyChatWord_Runs: ; 859B1C3
+gEasyChatWord_Runs: @ 859B1C3
 	.charmapstr "RUNS$"
 
-gEasyChatWord_Run: ; 859B1C8
+gEasyChatWord_Run: @ 859B1C8
 	.charmapstr "RUN$"
 
-gEasyChatWord_Works: ; 859B1CC
+gEasyChatWord_Works: @ 859B1CC
 	.charmapstr "WORKS$"
 
-gEasyChatWord_Working: ; 859B1D2
+gEasyChatWord_Working: @ 859B1D2
 	.charmapstr "WORKING$"
 
-gEasyChatWord_Talking: ; 859B1DA
+gEasyChatWord_Talking: @ 859B1DA
 	.charmapstr "TALKING$"
 
-gEasyChatWord_Talk: ; 859B1E2
+gEasyChatWord_Talk: @ 859B1E2
 	.charmapstr "TALK$"
 
-gEasyChatWord_Sink: ; 859B1E7
+gEasyChatWord_Sink: @ 859B1E7
 	.charmapstr "SINK$"
 
-gEasyChatWord_Smack: ; 859B1EC
+gEasyChatWord_Smack: @ 859B1EC
 	.charmapstr "SMACK$"
 
-gEasyChatWord_Pretend: ; 859B1F2
+gEasyChatWord_Pretend: @ 859B1F2
 	.charmapstr "PRETEND$"
 
-gEasyChatWord_Praise: ; 859B1FA
+gEasyChatWord_Praise: @ 859B1FA
 	.charmapstr "PRAISE$"
 
-gEasyChatWord_Overdo: ; 859B201
+gEasyChatWord_Overdo: @ 859B201
 	.charmapstr "OVERDO$"
 
-gEasyChatWord_Show: ; 859B208
+gEasyChatWord_Show: @ 859B208
 	.charmapstr "SHOW$"
 
-gEasyChatWord_Looks: ; 859B20D
+gEasyChatWord_Looks: @ 859B20D
 	.charmapstr "LOOKS$"
 
-gEasyChatWord_Sees: ; 859B213
+gEasyChatWord_Sees: @ 859B213
 	.charmapstr "SEES$"
 
-gEasyChatWord_Seek: ; 859B218
+gEasyChatWord_Seek: @ 859B218
 	.charmapstr "SEEK$"
 
-gEasyChatWord_Own: ; 859B21D
+gEasyChatWord_Own: @ 859B21D
 	.charmapstr "OWN$"
 
-gEasyChatWord_Take: ; 859B221
+gEasyChatWord_Take: @ 859B221
 	.charmapstr "TAKE$"
 
-gEasyChatWord_Allow: ; 859B226
+gEasyChatWord_Allow: @ 859B226
 	.charmapstr "ALLOW$"
 
-gEasyChatWord_Forget: ; 859B22C
+gEasyChatWord_Forget: @ 859B22C
 	.charmapstr "FORGET$"
 
-gEasyChatWord_Forgets: ; 859B233
+gEasyChatWord_Forgets: @ 859B233
 	.charmapstr "FORGETS$"
 
-gEasyChatWord_Appears: ; 859B23B
+gEasyChatWord_Appears: @ 859B23B
 	.charmapstr "APPEARS$"
 
-gEasyChatWord_Faint: ; 859B243
+gEasyChatWord_Faint: @ 859B243
 	.charmapstr "FAINT$"
 
-gEasyChatWord_Fainted: ; 859B249
+gEasyChatWord_Fainted: @ 859B249
 	.charmapstr "FAINTED$"
 
 	.align 2, 0
 
-gEasyChatGroup_Actions: ; 859B254
+gEasyChatGroup_Actions: @ 859B254
 	.4byte gEasyChatWord_Meets
-	.4byte 72 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 72 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Concede
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Give
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gives
-	.4byte 75 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 75 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Played
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Plays
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Collect
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Walking
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Walks
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Says
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Went
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Said
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WakeUp
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WakesUp
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Angers
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Teach
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Teaches
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Please
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Learn
-	.4byte 76 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 76 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Change
-	.4byte 77 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 77 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Story
-	.4byte 73 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 73 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trust
-	.4byte 74 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 74 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lavish
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Listens
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hearing
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trains
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Choose
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Come
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Came
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Search
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Make
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cause
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Know
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Knows
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Refuse
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Stores
-	.4byte 70 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 70 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Brag
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ignorant
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thinks
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Believe
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Slide
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Eats
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Use
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Uses
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Using
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Couldnt
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Capable
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Disappear
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Appear
-	.4byte 69 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 69 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Throw
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Worry
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Slept
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sleep
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Release
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Drinks
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Runs
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Run
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Works
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Working
-	.4byte 71 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 71 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Talking
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Talk
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sink
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smack
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pretend
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Praise
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Overdo
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Show
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Looks
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sees
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Seek
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Own
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Take
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Allow
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Forget
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Forgets
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Appears
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Faint
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fainted
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_adjectives.s b/data/text/easy_chat/easy_chat_group_adjectives.s
index 9b107feaf..7a6db3acf 100644
--- a/data/text/easy_chat/easy_chat_group_adjectives.s
+++ b/data/text/easy_chat/easy_chat_group_adjectives.s
@@ -1,254 +1,254 @@
-gEasyChatWord_Wandering: ; 859C3B8
+gEasyChatWord_Wandering: @ 859C3B8
 	.charmapstr "WANDERING$"
 
-gEasyChatWord_Rickety: ; 859C3C2
+gEasyChatWord_Rickety: @ 859C3C2
 	.charmapstr "RICKETY$"
 
-gEasyChatWord_RockSolid: ; 859C3CA
+gEasyChatWord_RockSolid: @ 859C3CA
 	.charmapstr "ROCK-SOLID$"
 
-gEasyChatWord_Hungry: ; 859C3D5
+gEasyChatWord_Hungry: @ 859C3D5
 	.charmapstr "HUNGRY$"
 
-gEasyChatWord_Tight: ; 859C3DC
+gEasyChatWord_Tight: @ 859C3DC
 	.charmapstr "TIGHT$"
 
-gEasyChatWord_Ticklish: ; 859C3E2
+gEasyChatWord_Ticklish: @ 859C3E2
 	.charmapstr "TICKLISH$"
 
-gEasyChatWord_Twirling: ; 859C3EB
+gEasyChatWord_Twirling: @ 859C3EB
 	.charmapstr "TWIRLING$"
 
-gEasyChatWord_Spiraling: ; 859C3F4
+gEasyChatWord_Spiraling: @ 859C3F4
 	.charmapstr "SPIRALING$"
 
-gEasyChatWord_Thirsty: ; 859C3FE
+gEasyChatWord_Thirsty: @ 859C3FE
 	.charmapstr "THIRSTY$"
 
-gEasyChatWord_Lolling: ; 859C406
+gEasyChatWord_Lolling: @ 859C406
 	.charmapstr "LOLLING$"
 
-gEasyChatWord_Silky: ; 859C40E
+gEasyChatWord_Silky: @ 859C40E
 	.charmapstr "SILKY$"
 
-gEasyChatWord_Sadly: ; 859C414
+gEasyChatWord_Sadly: @ 859C414
 	.charmapstr "SADLY$"
 
-gEasyChatWord_Hopeless: ; 859C41A
+gEasyChatWord_Hopeless: @ 859C41A
 	.charmapstr "HOPELESS$"
 
-gEasyChatWord_Useless: ; 859C423
+gEasyChatWord_Useless: @ 859C423
 	.charmapstr "USELESS$"
 
-gEasyChatWord_Drooling: ; 859C42B
+gEasyChatWord_Drooling: @ 859C42B
 	.charmapstr "DROOLING$"
 
-gEasyChatWord_Exciting: ; 859C434
+gEasyChatWord_Exciting: @ 859C434
 	.charmapstr "EXCITING$"
 
-gEasyChatWord_Thick: ; 859C43D
+gEasyChatWord_Thick: @ 859C43D
 	.charmapstr "THICK$"
 
-gEasyChatWord_Smooth: ; 859C443
+gEasyChatWord_Smooth: @ 859C443
 	.charmapstr "SMOOTH$"
 
-gEasyChatWord_Slimy: ; 859C44A
+gEasyChatWord_Slimy: @ 859C44A
 	.charmapstr "SLIMY$"
 
-gEasyChatWord_Thin: ; 859C450
+gEasyChatWord_Thin: @ 859C450
 	.charmapstr "THIN$"
 
-gEasyChatWord_Break: ; 859C455
+gEasyChatWord_Break: @ 859C455
 	.charmapstr "BREAK$"
 
-gEasyChatWord_Voracious: ; 859C45B
+gEasyChatWord_Voracious: @ 859C45B
 	.charmapstr "VORACIOUS$"
 
-gEasyChatWord_Scatter: ; 859C465
+gEasyChatWord_Scatter: @ 859C465
 	.charmapstr "SCATTER$"
 
-gEasyChatWord_Awesome: ; 859C46D
+gEasyChatWord_Awesome: @ 859C46D
 	.charmapstr "AWESOME$"
 
-gEasyChatWord_Wimpy: ; 859C475
+gEasyChatWord_Wimpy: @ 859C475
 	.charmapstr "WIMPY$"
 
-gEasyChatWord_Wobbly: ; 859C47B
+gEasyChatWord_Wobbly: @ 859C47B
 	.charmapstr "WOBBLY$"
 
-gEasyChatWord_Shaky: ; 859C482
+gEasyChatWord_Shaky: @ 859C482
 	.charmapstr "SHAKY$"
 
-gEasyChatWord_Ripped: ; 859C488
+gEasyChatWord_Ripped: @ 859C488
 	.charmapstr "RIPPED$"
 
-gEasyChatWord_Shredded: ; 859C48F
+gEasyChatWord_Shredded: @ 859C48F
 	.charmapstr "SHREDDED$"
 
-gEasyChatWord_Increasing: ; 859C498
+gEasyChatWord_Increasing: @ 859C498
 	.charmapstr "INCREASING$"
 
-gEasyChatWord_Yet: ; 859C4A3
+gEasyChatWord_Yet: @ 859C4A3
 	.charmapstr "YET$"
 
-gEasyChatWord_Destroyed: ; 859C4A7
+gEasyChatWord_Destroyed: @ 859C4A7
 	.charmapstr "DESTROYED$"
 
-gEasyChatWord_Fiery: ; 859C4B1
+gEasyChatWord_Fiery: @ 859C4B1
 	.charmapstr "FIERY$"
 
-gEasyChatWord_LoveyDovey: ; 859C4B7
+gEasyChatWord_LoveyDovey: @ 859C4B7
 	.charmapstr "LOVEY-DOVEY$"
 
-gEasyChatWord_Happily: ; 859C4C3
+gEasyChatWord_Happily: @ 859C4C3
 	.charmapstr "HAPPILY$"
 
-gEasyChatWord_Anticipation: ; 859C4CB
+gEasyChatWord_Anticipation: @ 859C4CB
 	.charmapstr "ANTICIPATION$"
 
 	.align 2, 0
 
-gEasyChatGroup_Adjectives: ; 859C4D8
+gEasyChatGroup_Adjectives: @ 859C4D8
 	.4byte gEasyChatWord_Wandering
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rickety
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_RockSolid
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hungry
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tight
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ticklish
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Twirling
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Spiraling
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thirsty
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lolling
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Silky
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sadly
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hopeless
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Useless
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Drooling
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Exciting
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thick
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smooth
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Slimy
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thin
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Break
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Voracious
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Scatter
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Awesome
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wimpy
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wobbly
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shaky
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ripped
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shredded
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Increasing
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yet
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Destroyed
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fiery
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_LoveyDovey
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Happily
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Anticipation
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s
index ab5610dce..cb947ff72 100644
--- a/data/text/easy_chat/easy_chat_group_battle.s
+++ b/data/text/easy_chat/easy_chat_group_battle.s
@@ -1,443 +1,443 @@
-gEasyChatWord_MatchUp: ; 8598B3C
+gEasyChatWord_MatchUp: @ 8598B3C
 	.charmapstr "MATCH UP$"
 
-gEasyChatWord_Go: ; 8598B45
+gEasyChatWord_Go: @ 8598B45
 	.charmapstr "GO$"
 
-gEasyChatWord_No1: ; 8598B48
+gEasyChatWord_No1: @ 8598B48
 	.charmapstr "NO. 1$"
 
-gEasyChatWord_Decide: ; 8598B4E
+gEasyChatWord_Decide: @ 8598B4E
 	.charmapstr "DECIDE$"
 
-gEasyChatWord_LetMeWin: ; 8598B55
+gEasyChatWord_LetMeWin: @ 8598B55
 	.charmapstr "LET ME WIN$"
 
-gEasyChatWord_Wins: ; 8598B60
+gEasyChatWord_Wins: @ 8598B60
 	.charmapstr "WINS$"
 
-gEasyChatWord_Win: ; 8598B65
+gEasyChatWord_Win: @ 8598B65
 	.charmapstr "WIN$"
 
-gEasyChatWord_Won: ; 8598B69
+gEasyChatWord_Won: @ 8598B69
 	.charmapstr "WON$"
 
-gEasyChatWord_IfIWin: ; 8598B6D
+gEasyChatWord_IfIWin: @ 8598B6D
 	.charmapstr "IF I WIN$"
 
-gEasyChatWord_WhenIWin: ; 8598B76
+gEasyChatWord_WhenIWin: @ 8598B76
 	.charmapstr "WHEN I WIN$"
 
-gEasyChatWord_CantWin: ; 8598B81
+gEasyChatWord_CantWin: @ 8598B81
 	.charmapstr "CAN’T WIN$"
 
-gEasyChatWord_CanWin: ; 8598B8B
+gEasyChatWord_CanWin: @ 8598B8B
 	.charmapstr "CAN WIN$"
 
-gEasyChatWord_NoMatch: ; 8598B93
+gEasyChatWord_NoMatch: @ 8598B93
 	.charmapstr "NO MATCH$"
 
-gEasyChatWord_Spirit: ; 8598B9C
+gEasyChatWord_Spirit: @ 8598B9C
 	.charmapstr "SPIRIT$"
 
-gEasyChatWord_Decided: ; 8598BA3
+gEasyChatWord_Decided: @ 8598BA3
 	.charmapstr "DECIDED$"
 
-gEasyChatWord_TrumpCard: ; 8598BAB
+gEasyChatWord_TrumpCard: @ 8598BAB
 	.charmapstr "TRUMP CARD$"
 
-gEasyChatWord_TakeThat: ; 8598BB6
+gEasyChatWord_TakeThat: @ 8598BB6
 	.charmapstr "TAKE THAT$"
 
-gEasyChatWord_ComeOn: ; 8598BC0
+gEasyChatWord_ComeOn: @ 8598BC0
 	.charmapstr "COME ON$"
 
-gEasyChatWord_Attack: ; 8598BC8
+gEasyChatWord_Attack: @ 8598BC8
 	.charmapstr "ATTACK$"
 
-gEasyChatWord_Surrender: ; 8598BCF
+gEasyChatWord_Surrender: @ 8598BCF
 	.charmapstr "SURRENDER$"
 
-gEasyChatWord_Gutsy: ; 8598BD9
+gEasyChatWord_Gutsy: @ 8598BD9
 	.charmapstr "GUTSY$"
 
-gEasyChatWord_Talent: ; 8598BDF
+gEasyChatWord_Talent: @ 8598BDF
 	.charmapstr "TALENT$"
 
-gEasyChatWord_Strategy: ; 8598BE6
+gEasyChatWord_Strategy: @ 8598BE6
 	.charmapstr "STRATEGY$"
 
-gEasyChatWord_Smite: ; 8598BEF
+gEasyChatWord_Smite: @ 8598BEF
 	.charmapstr "SMITE$"
 
-gEasyChatWord_Match: ; 8598BF5
+gEasyChatWord_Match: @ 8598BF5
 	.charmapstr "MATCH$"
 
-gEasyChatWord_Victory: ; 8598BFB
+gEasyChatWord_Victory: @ 8598BFB
 	.charmapstr "VICTORY$"
 
-gEasyChatWord_Offensive: ; 8598C03
+gEasyChatWord_Offensive: @ 8598C03
 	.charmapstr "OFFENSIVE$"
 
-gEasyChatWord_Sense: ; 8598C0D
+gEasyChatWord_Sense: @ 8598C0D
 	.charmapstr "SENSE$"
 
-gEasyChatWord_Versus: ; 8598C13
+gEasyChatWord_Versus: @ 8598C13
 	.charmapstr "VERSUS$"
 
-gEasyChatWord_Fights: ; 8598C1A
+gEasyChatWord_Fights: @ 8598C1A
 	.charmapstr "FIGHTS$"
 
-gEasyChatWord_Power: ; 8598C21
+gEasyChatWord_Power: @ 8598C21
 	.charmapstr "POWER$"
 
-gEasyChatWord_Challenge: ; 8598C27
+gEasyChatWord_Challenge: @ 8598C27
 	.charmapstr "CHALLENGE$"
 
-gEasyChatWord_Strong: ; 8598C31
+gEasyChatWord_Strong: @ 8598C31
 	.charmapstr "STRONG$"
 
-gEasyChatWord_TooStrong: ; 8598C38
+gEasyChatWord_TooStrong: @ 8598C38
 	.charmapstr "TOO STRONG$"
 
-gEasyChatWord_GoEasy: ; 8598C43
+gEasyChatWord_GoEasy: @ 8598C43
 	.charmapstr "GO EASY$"
 
-gEasyChatWord_Foe: ; 8598C4B
+gEasyChatWord_Foe: @ 8598C4B
 	.charmapstr "FOE$"
 
-gEasyChatWord_Genius: ; 8598C4F
+gEasyChatWord_Genius: @ 8598C4F
 	.charmapstr "GENIUS$"
 
-gEasyChatWord_Legend: ; 8598C56
+gEasyChatWord_Legend: @ 8598C56
 	.charmapstr "LEGEND$"
 
-gEasyChatWord_Escape: ; 8598C5D
+gEasyChatWord_Escape: @ 8598C5D
 	.charmapstr "ESCAPE$"
 
-gEasyChatWord_Aim: ; 8598C64
+gEasyChatWord_Aim: @ 8598C64
 	.charmapstr "AIM$"
 
-gEasyChatWord_Battle: ; 8598C68
+gEasyChatWord_Battle: @ 8598C68
 	.charmapstr "BATTLE$"
 
-gEasyChatWord_Fight: ; 8598C6F
+gEasyChatWord_Fight: @ 8598C6F
 	.charmapstr "FIGHT$"
 
-gEasyChatWord_Resuscitate: ; 8598C75
+gEasyChatWord_Resuscitate: @ 8598C75
 	.charmapstr "RESUSCITATE$"
 
-gEasyChatWord_Points: ; 8598C81
+gEasyChatWord_Points: @ 8598C81
 	.charmapstr "POINTS$"
 
-gEasyChatWord_Serious: ; 8598C88
+gEasyChatWord_Serious: @ 8598C88
 	.charmapstr "SERIOUS$"
 
-gEasyChatWord_GiveUp: ; 8598C90
+gEasyChatWord_GiveUp: @ 8598C90
 	.charmapstr "GIVE UP$"
 
-gEasyChatWord_Loss: ; 8598C98
+gEasyChatWord_Loss: @ 8598C98
 	.charmapstr "LOSS$"
 
-gEasyChatWord_IfILose: ; 8598C9D
+gEasyChatWord_IfILose: @ 8598C9D
 	.charmapstr "IF I LOSE$"
 
-gEasyChatWord_Lost: ; 8598CA7
+gEasyChatWord_Lost: @ 8598CA7
 	.charmapstr "LOST$"
 
-gEasyChatWord_Lose: ; 8598CAC
+gEasyChatWord_Lose: @ 8598CAC
 	.charmapstr "LOSE$"
 
-gEasyChatWord_Guard: ; 8598CB1
+gEasyChatWord_Guard: @ 8598CB1
 	.charmapstr "GUARD$"
 
-gEasyChatWord_Partner: ; 8598CB7
+gEasyChatWord_Partner: @ 8598CB7
 	.charmapstr "PARTNER$"
 
-gEasyChatWord_Reject: ; 8598CBF
+gEasyChatWord_Reject: @ 8598CBF
 	.charmapstr "REJECT$"
 
-gEasyChatWord_Accept: ; 8598CC6
+gEasyChatWord_Accept: @ 8598CC6
 	.charmapstr "ACCEPT$"
 
-gEasyChatWord_Invincible: ; 8598CCD
+gEasyChatWord_Invincible: @ 8598CCD
 	.charmapstr "INVINCIBLE$"
 
-gEasyChatWord_Received: ; 8598CD8
+gEasyChatWord_Received: @ 8598CD8
 	.charmapstr "RECEIVED$"
 
-gEasyChatWord_Easy: ; 8598CE1
+gEasyChatWord_Easy: @ 8598CE1
 	.charmapstr "EASY$"
 
-gEasyChatWord_Weak: ; 8598CE6
+gEasyChatWord_Weak: @ 8598CE6
 	.charmapstr "WEAK$"
 
-gEasyChatWord_TooWeak: ; 8598CEB
+gEasyChatWord_TooWeak: @ 8598CEB
 	.charmapstr "TOO WEAK$"
 
-gEasyChatWord_Pushover: ; 8598CF4
+gEasyChatWord_Pushover: @ 8598CF4
 	.charmapstr "PUSHOVER$"
 
-gEasyChatWord_Leader: ; 8598CFD
+gEasyChatWord_Leader: @ 8598CFD
 	.charmapstr "LEADER$"
 
-gEasyChatWord_Rule: ; 8598D04
+gEasyChatWord_Rule: @ 8598D04
 	.charmapstr "RULE$"
 
-gEasyChatWord_Move: ; 8598D09
+gEasyChatWord_Move: @ 8598D09
 	.charmapstr "MOVE$"
 
 	.align 2, 0
 
-gEasyChatGroup_Battle: ; 8598D10
+gEasyChatGroup_Battle: @ 8598D10
 	.4byte gEasyChatWord_MatchUp
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Go
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_No1
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Decide
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_LetMeWin
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wins
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Win
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Won
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IfIWin
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WhenIWin
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_CantWin
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_CanWin
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_NoMatch
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Spirit
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Decided
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TrumpCard
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TakeThat
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ComeOn
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Attack
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Surrender
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gutsy
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Talent
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Strategy
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smite
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Match
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Victory
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Offensive
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sense
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Versus
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fights
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Power
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Challenge
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Strong
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TooStrong
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GoEasy
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Foe
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Genius
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Legend
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Escape
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Aim
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Battle
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fight
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Resuscitate
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Points
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Serious
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GiveUp
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Loss
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IfILose
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lost
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lose
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Guard
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Partner
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Reject
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Accept
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Invincible
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Received
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Easy
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Weak
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TooWeak
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pushover
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Leader
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rule
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Move
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_conditions.s b/data/text/easy_chat/easy_chat_group_conditions.s
index a7cbe227a..5931cc760 100644
--- a/data/text/easy_chat/easy_chat_group_conditions.s
+++ b/data/text/easy_chat/easy_chat_group_conditions.s
@@ -1,485 +1,485 @@
-gEasyChatWord_Hot: ; 859AB2C
+gEasyChatWord_Hot: @ 859AB2C
 	.charmapstr "HOT$"
 
-gEasyChatWord_Exists: ; 859AB30
+gEasyChatWord_Exists: @ 859AB30
 	.charmapstr "EXISTS$"
 
-gEasyChatWord_Excess: ; 859AB37
+gEasyChatWord_Excess: @ 859AB37
 	.charmapstr "EXCESS$"
 
-gEasyChatWord_Approved: ; 859AB3E
+gEasyChatWord_Approved: @ 859AB3E
 	.charmapstr "APPROVED$"
 
-gEasyChatWord_Has: ; 859AB47
+gEasyChatWord_Has: @ 859AB47
 	.charmapstr "HAS$"
 
-gEasyChatWord_Good: ; 859AB4B
+gEasyChatWord_Good: @ 859AB4B
 	.charmapstr "GOOD$"
 
-gEasyChatWord_Less: ; 859AB50
+gEasyChatWord_Less: @ 859AB50
 	.charmapstr "LESS$"
 
-gEasyChatWord_Momentum: ; 859AB55
+gEasyChatWord_Momentum: @ 859AB55
 	.charmapstr "MOMENTUM$"
 
-gEasyChatWord_Going: ; 859AB5E
+gEasyChatWord_Going: @ 859AB5E
 	.charmapstr "GOING$"
 
-gEasyChatWord_Weird: ; 859AB64
+gEasyChatWord_Weird: @ 859AB64
 	.charmapstr "WEIRD$"
 
-gEasyChatWord_Busy: ; 859AB6A
+gEasyChatWord_Busy: @ 859AB6A
 	.charmapstr "BUSY$"
 
-gEasyChatWord_Together: ; 859AB6F
+gEasyChatWord_Together: @ 859AB6F
 	.charmapstr "TOGETHER$"
 
-gEasyChatWord_Full: ; 859AB78
+gEasyChatWord_Full: @ 859AB78
 	.charmapstr "FULL$"
 
-gEasyChatWord_Absent: ; 859AB7D
+gEasyChatWord_Absent: @ 859AB7D
 	.charmapstr "ABSENT$"
 
-gEasyChatWord_Being: ; 859AB84
+gEasyChatWord_Being: @ 859AB84
 	.charmapstr "BEING$"
 
-gEasyChatWord_Need: ; 859AB8A
+gEasyChatWord_Need: @ 859AB8A
 	.charmapstr "NEED$"
 
-gEasyChatWord_Tasty: ; 859AB8F
+gEasyChatWord_Tasty: @ 859AB8F
 	.charmapstr "TASTY$"
 
-gEasyChatWord_Skilled: ; 859AB95
+gEasyChatWord_Skilled: @ 859AB95
 	.charmapstr "SKILLED$"
 
-gEasyChatWord_Noisy: ; 859AB9D
+gEasyChatWord_Noisy: @ 859AB9D
 	.charmapstr "NOISY$"
 
-gEasyChatWord_Big: ; 859ABA3
+gEasyChatWord_Big: @ 859ABA3
 	.charmapstr "BIG$"
 
-gEasyChatWord_Late: ; 859ABA7
+gEasyChatWord_Late: @ 859ABA7
 	.charmapstr "LATE$"
 
-gEasyChatWord_Close: ; 859ABAC
+gEasyChatWord_Close: @ 859ABAC
 	.charmapstr "CLOSE$"
 
-gEasyChatWord_Docile: ; 859ABB2
+gEasyChatWord_Docile: @ 859ABB2
 	.charmapstr "DOCILE$"
 
-gEasyChatWord_Amusing: ; 859ABB9
+gEasyChatWord_Amusing: @ 859ABB9
 	.charmapstr "AMUSING$"
 
-gEasyChatWord_Entertaining: ; 859ABC1
+gEasyChatWord_Entertaining: @ 859ABC1
 	.charmapstr "ENTERTAINING$"
 
-gEasyChatWord_Perfection: ; 859ABCE
+gEasyChatWord_Perfection: @ 859ABCE
 	.charmapstr "PERFECTION$"
 
-gEasyChatWord_Pretty: ; 859ABD9
+gEasyChatWord_Pretty: @ 859ABD9
 	.charmapstr "PRETTY$"
 
-gEasyChatWord_Healthy: ; 859ABE0
+gEasyChatWord_Healthy: @ 859ABE0
 	.charmapstr "HEALTHY$"
 
-gEasyChatWord_Excellent: ; 859ABE8
+gEasyChatWord_Excellent: @ 859ABE8
 	.charmapstr "EXCELLENT$"
 
-gEasyChatWord_UpsideDown: ; 859ABF2
+gEasyChatWord_UpsideDown: @ 859ABF2
 	.charmapstr "UPSIDE DOWN$"
 
-gEasyChatWord_Cold: ; 859ABFE
+gEasyChatWord_Cold: @ 859ABFE
 	.charmapstr "COLD$"
 
-gEasyChatWord_Refreshing: ; 859AC03
+gEasyChatWord_Refreshing: @ 859AC03
 	.charmapstr "REFRESHING$"
 
-gEasyChatWord_Unavoidable: ; 859AC0E
+gEasyChatWord_Unavoidable: @ 859AC0E
 	.charmapstr "UNAVOIDABLE$"
 
-gEasyChatWord_Much: ; 859AC1A
+gEasyChatWord_Much: @ 859AC1A
 	.charmapstr "MUCH$"
 
-gEasyChatWord_Overwhelming: ; 859AC1F
+gEasyChatWord_Overwhelming: @ 859AC1F
 	.charmapstr "OVERWHELMING$"
 
-gEasyChatWord_Fabulous: ; 859AC2C
+gEasyChatWord_Fabulous: @ 859AC2C
 	.charmapstr "FABULOUS$"
 
-gEasyChatWord_Else: ; 859AC35
+gEasyChatWord_Else: @ 859AC35
 	.charmapstr "ELSE$"
 
-gEasyChatWord_Expensive: ; 859AC3A
+gEasyChatWord_Expensive: @ 859AC3A
 	.charmapstr "EXPENSIVE$"
 
-gEasyChatWord_Correct: ; 859AC44
+gEasyChatWord_Correct: @ 859AC44
 	.charmapstr "CORRECT$"
 
-gEasyChatWord_Impossible: ; 859AC4C
+gEasyChatWord_Impossible: @ 859AC4C
 	.charmapstr "IMPOSSIBLE$"
 
-gEasyChatWord_Small: ; 859AC57
+gEasyChatWord_Small: @ 859AC57
 	.charmapstr "SMALL$"
 
-gEasyChatWord_Different: ; 859AC5D
+gEasyChatWord_Different: @ 859AC5D
 	.charmapstr "DIFFERENT$"
 
-gEasyChatWord_Tired: ; 859AC67
+gEasyChatWord_Tired: @ 859AC67
 	.charmapstr "TIRED$"
 
-gEasyChatWord_Skill: ; 859AC6D
+gEasyChatWord_Skill: @ 859AC6D
 	.charmapstr "SKILL$"
 
-gEasyChatWord_Top: ; 859AC73
+gEasyChatWord_Top: @ 859AC73
 	.charmapstr "TOP$"
 
-gEasyChatWord_NonStop: ; 859AC77
+gEasyChatWord_NonStop: @ 859AC77
 	.charmapstr "NON-STOP$"
 
-gEasyChatWord_Preposterous: ; 859AC80
+gEasyChatWord_Preposterous: @ 859AC80
 	.charmapstr "PREPOSTEROUS$"
 
-gEasyChatWord_None: ; 859AC8D
+gEasyChatWord_None: @ 859AC8D
 	.charmapstr "NONE$"
 
-gEasyChatWord_Nothing: ; 859AC92
+gEasyChatWord_Nothing: @ 859AC92
 	.charmapstr "NOTHING$"
 
-gEasyChatWord_Natural: ; 859AC9A
+gEasyChatWord_Natural: @ 859AC9A
 	.charmapstr "NATURAL$"
 
-gEasyChatWord_Becomes: ; 859ACA2
+gEasyChatWord_Becomes: @ 859ACA2
 	.charmapstr "BECOMES$"
 
-gEasyChatWord_Lukewarm: ; 859ACAA
+gEasyChatWord_Lukewarm: @ 859ACAA
 	.charmapstr "LUKEWARM$"
 
-gEasyChatWord_Fast: ; 859ACB3
+gEasyChatWord_Fast: @ 859ACB3
 	.charmapstr "FAST$"
 
-gEasyChatWord_Low: ; 859ACB8
+gEasyChatWord_Low: @ 859ACB8
 	.charmapstr "LOW$"
 
-gEasyChatWord_Awful: ; 859ACBC
+gEasyChatWord_Awful: @ 859ACBC
 	.charmapstr "AWFUL$"
 
-gEasyChatWord_Alone: ; 859ACC2
+gEasyChatWord_Alone: @ 859ACC2
 	.charmapstr "ALONE$"
 
-gEasyChatWord_Bored: ; 859ACC8
+gEasyChatWord_Bored: @ 859ACC8
 	.charmapstr "BORED$"
 
-gEasyChatWord_Secret: ; 859ACCE
+gEasyChatWord_Secret: @ 859ACCE
 	.charmapstr "SECRET$"
 
-gEasyChatWord_Mystery: ; 859ACD5
+gEasyChatWord_Mystery: @ 859ACD5
 	.charmapstr "MYSTERY$"
 
-gEasyChatWord_Lacks: ; 859ACDD
+gEasyChatWord_Lacks: @ 859ACDD
 	.charmapstr "LACKS$"
 
-gEasyChatWord_Best: ; 859ACE3
+gEasyChatWord_Best: @ 859ACE3
 	.charmapstr "BEST$"
 
-gEasyChatWord_Lousy: ; 859ACE8
+gEasyChatWord_Lousy: @ 859ACE8
 	.charmapstr "LOUSY$"
 
-gEasyChatWord_Mistake: ; 859ACEE
+gEasyChatWord_Mistake: @ 859ACEE
 	.charmapstr "MISTAKE$"
 
-gEasyChatWord_Kind: ; 859ACF6
+gEasyChatWord_Kind: @ 859ACF6
 	.charmapstr "KIND$"
 
-gEasyChatWord_Well: ; 859ACFB
+gEasyChatWord_Well: @ 859ACFB
 	.charmapstr "WELL$"
 
-gEasyChatWord_Weakened: ; 859AD00
+gEasyChatWord_Weakened: @ 859AD00
 	.charmapstr "WEAKENED$"
 
-gEasyChatWord_Simple: ; 859AD09
+gEasyChatWord_Simple: @ 859AD09
 	.charmapstr "SIMPLE$"
 
-gEasyChatWord_Seems: ; 859AD10
+gEasyChatWord_Seems: @ 859AD10
 	.charmapstr "SEEMS$"
 
-gEasyChatWord_Badly: ; 859AD16
+gEasyChatWord_Badly: @ 859AD16
 	.charmapstr "BADLY$"
 
 	.align 2, 0
 
-gEasyChatGroup_Conditions: ; 859AD1C
+gEasyChatGroup_Conditions: @ 859AD1C
 	.4byte gEasyChatWord_Hot
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Exists
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Excess
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Approved
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Has
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Good
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Less
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Momentum
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Going
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Weird
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Busy
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Together
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Full
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Absent
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Being
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Need
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tasty
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Skilled
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Noisy
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Big
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Late
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Close
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Docile
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Amusing
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Entertaining
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Perfection
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pretty
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Healthy
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Excellent
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_UpsideDown
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cold
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Refreshing
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Unavoidable
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Much
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Overwhelming
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fabulous
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Else
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Expensive
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Correct
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Impossible
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Small
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Different
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tired
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Skill
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Top
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_NonStop
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Preposterous
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_None
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nothing
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Natural
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Becomes
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lukewarm
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fast
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Low
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Awful
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Alone
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bored
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Secret
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mystery
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lacks
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Best
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lousy
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mistake
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Kind
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Well
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Weakened
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Simple
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Seems
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Badly
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s
index d65252221..9ba134498 100644
--- a/data/text/easy_chat/easy_chat_group_endings.s
+++ b/data/text/easy_chat/easy_chat_group_endings.s
@@ -1,485 +1,485 @@
-gEasyChatWord_Will: ; 859A158
+gEasyChatWord_Will: @ 859A158
 	.charmapstr "WILL$"
 
-gEasyChatWord_WillBeHere: ; 859A15D
+gEasyChatWord_WillBeHere: @ 859A15D
 	.charmapstr "WILL BE HERE$"
 
-gEasyChatWord_Or: ; 859A16A
+gEasyChatWord_Or: @ 859A16A
 	.charmapstr "OR$"
 
-gEasyChatWord_Times: ; 859A16D
+gEasyChatWord_Times: @ 859A16D
 	.charmapstr "TIMES$"
 
-gEasyChatWord_Wonder: ; 859A173
+gEasyChatWord_Wonder: @ 859A173
 	.charmapstr "WONDER$"
 
-gEasyChatWord_IsItQues: ; 859A17A
+gEasyChatWord_IsItQues: @ 859A17A
 	.charmapstr "IS IT?$"
 
-gEasyChatWord_Be: ; 859A181
+gEasyChatWord_Be: @ 859A181
 	.charmapstr "BE$"
 
-gEasyChatWord_Gimme: ; 859A184
+gEasyChatWord_Gimme: @ 859A184
 	.charmapstr "GIMME$"
 
-gEasyChatWord_Could: ; 859A18A
+gEasyChatWord_Could: @ 859A18A
 	.charmapstr "COULD$"
 
-gEasyChatWord_LikelyTo: ; 859A190
+gEasyChatWord_LikelyTo: @ 859A190
 	.charmapstr "LIKELY TO$"
 
-gEasyChatWord_Would: ; 859A19A
+gEasyChatWord_Would: @ 859A19A
 	.charmapstr "WOULD$"
 
-gEasyChatWord_Is: ; 859A1A0
+gEasyChatWord_Is: @ 859A1A0
 	.charmapstr "IS$"
 
-gEasyChatWord_IsntItQues: ; 859A1A3
+gEasyChatWord_IsntItQues: @ 859A1A3
 	.charmapstr "ISN’T IT?$"
 
-gEasyChatWord_Lets: ; 859A1AD
+gEasyChatWord_Lets: @ 859A1AD
 	.charmapstr "LET’S$"
 
-gEasyChatWord_Other: ; 859A1B3
+gEasyChatWord_Other: @ 859A1B3
 	.charmapstr "OTHER$"
 
-gEasyChatWord_Are: ; 859A1B9
+gEasyChatWord_Are: @ 859A1B9
 	.charmapstr "ARE$"
 
-gEasyChatWord_Was: ; 859A1BD
+gEasyChatWord_Was: @ 859A1BD
 	.charmapstr "WAS$"
 
-gEasyChatWord_Were: ; 859A1C1
+gEasyChatWord_Were: @ 859A1C1
 	.charmapstr "WERE$"
 
-gEasyChatWord_Those: ; 859A1C6
+gEasyChatWord_Those: @ 859A1C6
 	.charmapstr "THOSE$"
 
-gEasyChatWord_Isnt: ; 859A1CC
+gEasyChatWord_Isnt: @ 859A1CC
 	.charmapstr "ISN’T$"
 
-gEasyChatWord_Wont: ; 859A1D2
+gEasyChatWord_Wont: @ 859A1D2
 	.charmapstr "WON’T$"
 
-gEasyChatWord_Cant: ; 859A1D8
+gEasyChatWord_Cant: @ 859A1D8
 	.charmapstr "CAN’T$"
 
-gEasyChatWord_Can: ; 859A1DE
+gEasyChatWord_Can: @ 859A1DE
 	.charmapstr "CAN$"
 
-gEasyChatWord_Dont: ; 859A1E2
+gEasyChatWord_Dont: @ 859A1E2
 	.charmapstr "DON’T$"
 
-gEasyChatWord_Do: ; 859A1E8
+gEasyChatWord_Do: @ 859A1E8
 	.charmapstr "DO$"
 
-gEasyChatWord_Does: ; 859A1EB
+gEasyChatWord_Does: @ 859A1EB
 	.charmapstr "DOES$"
 
-gEasyChatWord_Whom: ; 859A1F0
+gEasyChatWord_Whom: @ 859A1F0
 	.charmapstr "WHOM$"
 
-gEasyChatWord_Which: ; 859A1F5
+gEasyChatWord_Which: @ 859A1F5
 	.charmapstr "WHICH$"
 
-gEasyChatWord_Wasnt: ; 859A1FB
+gEasyChatWord_Wasnt: @ 859A1FB
 	.charmapstr "WASN’T$"
 
-gEasyChatWord_Werent: ; 859A202
+gEasyChatWord_Werent: @ 859A202
 	.charmapstr "WEREN’T$"
 
-gEasyChatWord_Have: ; 859A20A
+gEasyChatWord_Have: @ 859A20A
 	.charmapstr "HAVE$"
 
-gEasyChatWord_Havent: ; 859A20F
+gEasyChatWord_Havent: @ 859A20F
 	.charmapstr "HAVEN’T$"
 
-gEasyChatWord_A: ; 859A217
+gEasyChatWord_A: @ 859A217
 	.charmapstr "A$"
 
-gEasyChatWord_An: ; 859A219
+gEasyChatWord_An: @ 859A219
 	.charmapstr "AN$"
 
-gEasyChatWord_Not: ; 859A21C
+gEasyChatWord_Not: @ 859A21C
 	.charmapstr "NOT$"
 
-gEasyChatWord_There: ; 859A220
+gEasyChatWord_There: @ 859A220
 	.charmapstr "THERE$"
 
-gEasyChatWord_OkQues: ; 859A226
+gEasyChatWord_OkQues: @ 859A226
 	.charmapstr "OK?$"
 
-gEasyChatWord_So: ; 859A22A
+gEasyChatWord_So: @ 859A22A
 	.charmapstr "SO$"
 
-gEasyChatWord_Maybe: ; 859A22D
+gEasyChatWord_Maybe: @ 859A22D
 	.charmapstr "MAYBE$"
 
-gEasyChatWord_About: ; 859A233
+gEasyChatWord_About: @ 859A233
 	.charmapstr "ABOUT$"
 
-gEasyChatWord_Over: ; 859A239
+gEasyChatWord_Over: @ 859A239
 	.charmapstr "OVER$"
 
-gEasyChatWord_It: ; 859A23E
+gEasyChatWord_It: @ 859A23E
 	.charmapstr "IT$"
 
-gEasyChatWord_All: ; 859A241
+gEasyChatWord_All: @ 859A241
 	.charmapstr "ALL$"
 
-gEasyChatWord_For: ; 859A245
+gEasyChatWord_For: @ 859A245
 	.charmapstr "FOR$"
 
-gEasyChatWord_On: ; 859A249
+gEasyChatWord_On: @ 859A249
 	.charmapstr "ON$"
 
-gEasyChatWord_Off: ; 859A24C
+gEasyChatWord_Off: @ 859A24C
 	.charmapstr "OFF$"
 
-gEasyChatWord_As: ; 859A250
+gEasyChatWord_As: @ 859A250
 	.charmapstr "AS$"
 
-gEasyChatWord_To: ; 859A253
+gEasyChatWord_To: @ 859A253
 	.charmapstr "TO$"
 
-gEasyChatWord_With: ; 859A256
+gEasyChatWord_With: @ 859A256
 	.charmapstr "WITH$"
 
-gEasyChatWord_Better: ; 859A25B
+gEasyChatWord_Better: @ 859A25B
 	.charmapstr "BETTER$"
 
-gEasyChatWord_Ever: ; 859A262
+gEasyChatWord_Ever: @ 859A262
 	.charmapstr "EVER$"
 
-gEasyChatWord_Since: ; 859A267
+gEasyChatWord_Since: @ 859A267
 	.charmapstr "SINCE$"
 
-gEasyChatWord_Of: ; 859A26D
+gEasyChatWord_Of: @ 859A26D
 	.charmapstr "OF$"
 
-gEasyChatWord_BelongsTo: ; 859A270
+gEasyChatWord_BelongsTo: @ 859A270
 	.charmapstr "BELONGS TO$"
 
-gEasyChatWord_At: ; 859A27B
+gEasyChatWord_At: @ 859A27B
 	.charmapstr "AT$"
 
-gEasyChatWord_In: ; 859A27E
+gEasyChatWord_In: @ 859A27E
 	.charmapstr "IN$"
 
-gEasyChatWord_Out: ; 859A281
+gEasyChatWord_Out: @ 859A281
 	.charmapstr "OUT$"
 
-gEasyChatWord_Too: ; 859A285
+gEasyChatWord_Too: @ 859A285
 	.charmapstr "TOO$"
 
-gEasyChatWord_Like: ; 859A289
+gEasyChatWord_Like: @ 859A289
 	.charmapstr "LIKE$"
 
-gEasyChatWord_Did: ; 859A28E
+gEasyChatWord_Did: @ 859A28E
 	.charmapstr "DID$"
 
-gEasyChatWord_Didnt: ; 859A292
+gEasyChatWord_Didnt: @ 859A292
 	.charmapstr "DIDN’T$"
 
-gEasyChatWord_Doesnt: ; 859A299
+gEasyChatWord_Doesnt: @ 859A299
 	.charmapstr "DOESN’T$"
 
-gEasyChatWord_Without: ; 859A2A1
+gEasyChatWord_Without: @ 859A2A1
 	.charmapstr "WITHOUT$"
 
-gEasyChatWord_After: ; 859A2A9
+gEasyChatWord_After: @ 859A2A9
 	.charmapstr "AFTER$"
 
-gEasyChatWord_Before: ; 859A2AF
+gEasyChatWord_Before: @ 859A2AF
 	.charmapstr "BEFORE$"
 
-gEasyChatWord_While: ; 859A2B6
+gEasyChatWord_While: @ 859A2B6
 	.charmapstr "WHILE$"
 
-gEasyChatWord_Than: ; 859A2BC
+gEasyChatWord_Than: @ 859A2BC
 	.charmapstr "THAN$"
 
-gEasyChatWord_Once: ; 859A2C1
+gEasyChatWord_Once: @ 859A2C1
 	.charmapstr "ONCE$"
 
-gEasyChatWord_Anywhere: ; 859A2C6
+gEasyChatWord_Anywhere: @ 859A2C6
 	.charmapstr "ANYWHERE$"
 
 	.align 2, 0
 
-gEasyChatGroup_Endings: ; 859A2D0
+gEasyChatGroup_Endings: @ 859A2D0
 	.4byte gEasyChatWord_Will
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WillBeHere
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Or
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Times
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wonder
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IsItQues
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Be
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gimme
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Could
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_LikelyTo
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Would
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Is
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IsntItQues
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lets
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Other
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Are
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Was
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Were
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Those
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Isnt
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wont
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cant
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Can
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dont
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Do
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Does
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Whom
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Which
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wasnt
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Werent
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Have
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Havent
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_A
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_An
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Not
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_There
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OkQues
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_So
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Maybe
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_About
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Over
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_It
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_All
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_For
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_On
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Off
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_As
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_To
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_With
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Better
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ever
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Since
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Of
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_BelongsTo
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_At
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_In
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Out
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Too
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Like
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Did
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Didnt
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Doesnt
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Without
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_After
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Before
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_While
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Than
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Once
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Anywhere
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_events.s b/data/text/easy_chat/easy_chat_group_events.s
index 36b0149b5..6d7099a09 100644
--- a/data/text/easy_chat/easy_chat_group_events.s
+++ b/data/text/easy_chat/easy_chat_group_events.s
@@ -1,205 +1,205 @@
-gEasyChatWord_Appeal: ; 859C688
+gEasyChatWord_Appeal: @ 859C688
 	.charmapstr "APPEAL$"
 
-gEasyChatWord_Events: ; 859C68F
+gEasyChatWord_Events: @ 859C68F
 	.charmapstr "EVENTS$"
 
-gEasyChatWord_StayAtHome: ; 859C696
+gEasyChatWord_StayAtHome: @ 859C696
 	.charmapstr "STAY-AT-HOME$"
 
-gEasyChatWord_Berry: ; 859C6A3
+gEasyChatWord_Berry: @ 859C6A3
 	.charmapstr "BERRY$"
 
-gEasyChatWord_Contest: ; 859C6A9
+gEasyChatWord_Contest: @ 859C6A9
 	.charmapstr "CONTEST$"
 
-gEasyChatWord_Mc: ; 859C6B1
+gEasyChatWord_Mc: @ 859C6B1
 	.charmapstr "MC$"
 
-gEasyChatWord_Judge: ; 859C6B4
+gEasyChatWord_Judge: @ 859C6B4
 	.charmapstr "JUDGE$"
 
-gEasyChatWord_Super: ; 859C6BA
+gEasyChatWord_Super: @ 859C6BA
 	.charmapstr "SUPER$"
 
-gEasyChatWord_Stage: ; 859C6C0
+gEasyChatWord_Stage: @ 859C6C0
 	.charmapstr "STAGE$"
 
-gEasyChatWord_HallOfFame: ; 859C6C6
+gEasyChatWord_HallOfFame: @ 859C6C6
 	.charmapstr "HALL OF FAME$"
 
-gEasyChatWord_Evolution: ; 859C6D3
+gEasyChatWord_Evolution: @ 859C6D3
 	.charmapstr "EVOLUTION$"
 
-gEasyChatWord_Hyper: ; 859C6DD
+gEasyChatWord_Hyper: @ 859C6DD
 	.charmapstr "HYPER$"
 
-gEasyChatWord_BattleTower: ; 859C6E3
+gEasyChatWord_BattleTower: @ 859C6E3
 	.charmapstr "BATTLE TOWER$"
 
-gEasyChatWord_Leaders: ; 859C6F0
+gEasyChatWord_Leaders: @ 859C6F0
 	.charmapstr "LEADERS$"
 
-gEasyChatWord_BattleRoom: ; 859C6F8
+gEasyChatWord_BattleRoom: @ 859C6F8
 	.charmapstr "BATTLE ROOM$"
 
-gEasyChatWord_Hidden: ; 859C704
+gEasyChatWord_Hidden: @ 859C704
 	.charmapstr "HIDDEN$"
 
-gEasyChatWord_SecretBase: ; 859C70B
+gEasyChatWord_SecretBase: @ 859C70B
 	.charmapstr "SECRET BASE$"
 
-gEasyChatWord_Blend: ; 859C717
+gEasyChatWord_Blend: @ 859C717
 	.charmapstr "BLEND$"
 
-gEasyChatWord_POKEBLOCK: ; 859C71D
+gEasyChatWord_POKEBLOCK: @ 859C71D
 	.charmapstr "{POKEBLOCK}$"
 
-gEasyChatWord_Master: ; 859C723
+gEasyChatWord_Master: @ 859C723
 	.charmapstr "MASTER$"
 
-gEasyChatWord_Rank: ; 859C72A
+gEasyChatWord_Rank: @ 859C72A
 	.charmapstr "RANK$"
 
-gEasyChatWord_Ribbon: ; 859C72F
+gEasyChatWord_Ribbon: @ 859C72F
 	.charmapstr "RIBBON$"
 
-gEasyChatWord_Crush: ; 859C736
+gEasyChatWord_Crush: @ 859C736
 	.charmapstr "CRUSH$"
 
-gEasyChatWord_Direct: ; 859C73C
+gEasyChatWord_Direct: @ 859C73C
 	.charmapstr "DIRECT$"
 
-gEasyChatWord_Tower: ; 859C743
+gEasyChatWord_Tower: @ 859C743
 	.charmapstr "TOWER$"
 
-gEasyChatWord_Union: ; 859C749
+gEasyChatWord_Union: @ 859C749
 	.charmapstr "UNION$"
 
-gEasyChatWord_Room: ; 859C74F
+gEasyChatWord_Room: @ 859C74F
 	.charmapstr "ROOM$"
 
-gEasyChatWord_Wireless: ; 859C754
+gEasyChatWord_Wireless: @ 859C754
 	.charmapstr "WIRELESS$"
 
-gEasyChatWord_Frontier: ; 859C75D
+gEasyChatWord_Frontier: @ 859C75D
 	.charmapstr "FRONTIER$"
 
 	.align 2, 0
 
-gEasyChatGroup_Events: ; 859C768
+gEasyChatGroup_Events: @ 859C768
 	.4byte gEasyChatWord_Appeal
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Events
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_StayAtHome
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Berry
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Contest
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mc
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Judge
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Super
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Stage
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HallOfFame
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Evolution
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hyper
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_BattleTower
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Leaders
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_BattleRoom
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hidden
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SecretBase
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Blend
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_POKEBLOCK
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Master
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rank
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ribbon
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Crush
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Direct
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tower
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Union
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Room
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wireless
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Frontier
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_feelings.s b/data/text/easy_chat/easy_chat_group_feelings.s
index 151c3cd9c..a977e77b8 100644
--- a/data/text/easy_chat/easy_chat_group_feelings.s
+++ b/data/text/easy_chat/easy_chat_group_feelings.s
@@ -1,485 +1,485 @@
-gEasyChatWord_Meet: ; 859A60C
+gEasyChatWord_Meet: @ 859A60C
 	.charmapstr "MEET$"
 
-gEasyChatWord_Play: ; 859A611
+gEasyChatWord_Play: @ 859A611
 	.charmapstr "PLAY$"
 
-gEasyChatWord_Hurried: ; 859A616
+gEasyChatWord_Hurried: @ 859A616
 	.charmapstr "HURRIED$"
 
-gEasyChatWord_Goes: ; 859A61E
+gEasyChatWord_Goes: @ 859A61E
 	.charmapstr "GOES$"
 
-gEasyChatWord_Giddy: ; 859A623
+gEasyChatWord_Giddy: @ 859A623
 	.charmapstr "GIDDY$"
 
-gEasyChatWord_Happy: ; 859A629
+gEasyChatWord_Happy: @ 859A629
 	.charmapstr "HAPPY$"
 
-gEasyChatWord_Happiness: ; 859A62F
+gEasyChatWord_Happiness: @ 859A62F
 	.charmapstr "HAPPINESS$"
 
-gEasyChatWord_Excite: ; 859A639
+gEasyChatWord_Excite: @ 859A639
 	.charmapstr "EXCITE$"
 
-gEasyChatWord_Important: ; 859A640
+gEasyChatWord_Important: @ 859A640
 	.charmapstr "IMPORTANT$"
 
-gEasyChatWord_Funny: ; 859A64A
+gEasyChatWord_Funny: @ 859A64A
 	.charmapstr "FUNNY$"
 
-gEasyChatWord_Got: ; 859A650
+gEasyChatWord_Got: @ 859A650
 	.charmapstr "GOT$"
 
-gEasyChatWord_GoHome: ; 859A654
+gEasyChatWord_GoHome: @ 859A654
 	.charmapstr "GO HOME$"
 
-gEasyChatWord_Disappointed: ; 859A65C
+gEasyChatWord_Disappointed: @ 859A65C
 	.charmapstr "DISAPPOINTED$"
 
-gEasyChatWord_Disappoints: ; 859A669
+gEasyChatWord_Disappoints: @ 859A669
 	.charmapstr "DISAPPOINTS$"
 
-gEasyChatWord_Sad: ; 859A675
+gEasyChatWord_Sad: @ 859A675
 	.charmapstr "SAD$"
 
-gEasyChatWord_Try: ; 859A679
+gEasyChatWord_Try: @ 859A679
 	.charmapstr "TRY$"
 
-gEasyChatWord_Tries: ; 859A67D
+gEasyChatWord_Tries: @ 859A67D
 	.charmapstr "TRIES$"
 
-gEasyChatWord_Hears: ; 859A683
+gEasyChatWord_Hears: @ 859A683
 	.charmapstr "HEARS$"
 
-gEasyChatWord_Think: ; 859A689
+gEasyChatWord_Think: @ 859A689
 	.charmapstr "THINK$"
 
-gEasyChatWord_Hear: ; 859A68F
+gEasyChatWord_Hear: @ 859A68F
 	.charmapstr "HEAR$"
 
-gEasyChatWord_Wants: ; 859A694
+gEasyChatWord_Wants: @ 859A694
 	.charmapstr "WANTS$"
 
-gEasyChatWord_Misheard: ; 859A69A
+gEasyChatWord_Misheard: @ 859A69A
 	.charmapstr "MISHEARD$"
 
-gEasyChatWord_Dislike: ; 859A6A3
+gEasyChatWord_Dislike: @ 859A6A3
 	.charmapstr "DISLIKE$"
 
-gEasyChatWord_Angry: ; 859A6AB
+gEasyChatWord_Angry: @ 859A6AB
 	.charmapstr "ANGRY$"
 
-gEasyChatWord_Anger: ; 859A6B1
+gEasyChatWord_Anger: @ 859A6B1
 	.charmapstr "ANGER$"
 
-gEasyChatWord_Scary: ; 859A6B7
+gEasyChatWord_Scary: @ 859A6B7
 	.charmapstr "SCARY$"
 
-gEasyChatWord_Lonesome: ; 859A6BD
+gEasyChatWord_Lonesome: @ 859A6BD
 	.charmapstr "LONESOME$"
 
-gEasyChatWord_Disappoint: ; 859A6C6
+gEasyChatWord_Disappoint: @ 859A6C6
 	.charmapstr "DISAPPOINT$"
 
-gEasyChatWord_Joy: ; 859A6D1
+gEasyChatWord_Joy: @ 859A6D1
 	.charmapstr "JOY$"
 
-gEasyChatWord_Gets: ; 859A6D5
+gEasyChatWord_Gets: @ 859A6D5
 	.charmapstr "GETS$"
 
-gEasyChatWord_Never: ; 859A6DA
+gEasyChatWord_Never: @ 859A6DA
 	.charmapstr "NEVER$"
 
-gEasyChatWord_Darn: ; 859A6E0
+gEasyChatWord_Darn: @ 859A6E0
 	.charmapstr "DARN$"
 
-gEasyChatWord_Downcast: ; 859A6E5
+gEasyChatWord_Downcast: @ 859A6E5
 	.charmapstr "DOWNCAST$"
 
-gEasyChatWord_Incredible: ; 859A6EE
+gEasyChatWord_Incredible: @ 859A6EE
 	.charmapstr "INCREDIBLE$"
 
-gEasyChatWord_Likes: ; 859A6F9
+gEasyChatWord_Likes: @ 859A6F9
 	.charmapstr "LIKES$"
 
-gEasyChatWord_Dislikes: ; 859A6FF
+gEasyChatWord_Dislikes: @ 859A6FF
 	.charmapstr "DISLIKES$"
 
-gEasyChatWord_Boring: ; 859A708
+gEasyChatWord_Boring: @ 859A708
 	.charmapstr "BORING$"
 
-gEasyChatWord_Care: ; 859A70F
+gEasyChatWord_Care: @ 859A70F
 	.charmapstr "CARE$"
 
-gEasyChatWord_Cares: ; 859A714
+gEasyChatWord_Cares: @ 859A714
 	.charmapstr "CARES$"
 
-gEasyChatWord_AllRight: ; 859A71A
+gEasyChatWord_AllRight: @ 859A71A
 	.charmapstr "ALL RIGHT$"
 
-gEasyChatWord_Adore: ; 859A724
+gEasyChatWord_Adore: @ 859A724
 	.charmapstr "ADORE$"
 
-gEasyChatWord_Disaster: ; 859A72A
+gEasyChatWord_Disaster: @ 859A72A
 	.charmapstr "DISASTER$"
 
-gEasyChatWord_Enjoy: ; 859A733
+gEasyChatWord_Enjoy: @ 859A733
 	.charmapstr "ENJOY$"
 
-gEasyChatWord_Enjoys: ; 859A739
+gEasyChatWord_Enjoys: @ 859A739
 	.charmapstr "ENJOYS$"
 
-gEasyChatWord_Eat: ; 859A740
+gEasyChatWord_Eat: @ 859A740
 	.charmapstr "EAT$"
 
-gEasyChatWord_Lacking: ; 859A744
+gEasyChatWord_Lacking: @ 859A744
 	.charmapstr "LACKING$"
 
-gEasyChatWord_Bad: ; 859A74C
+gEasyChatWord_Bad: @ 859A74C
 	.charmapstr "BAD$"
 
-gEasyChatWord_Hard: ; 859A750
+gEasyChatWord_Hard: @ 859A750
 	.charmapstr "HARD$"
 
-gEasyChatWord_Terrible: ; 859A755
+gEasyChatWord_Terrible: @ 859A755
 	.charmapstr "TERRIBLE$"
 
-gEasyChatWord_Should: ; 859A75E
+gEasyChatWord_Should: @ 859A75E
 	.charmapstr "SHOULD$"
 
-gEasyChatWord_Nice: ; 859A765
+gEasyChatWord_Nice: @ 859A765
 	.charmapstr "NICE$"
 
-gEasyChatWord_Drink: ; 859A76A
+gEasyChatWord_Drink: @ 859A76A
 	.charmapstr "DRINK$"
 
-gEasyChatWord_Surprise: ; 859A770
+gEasyChatWord_Surprise: @ 859A770
 	.charmapstr "SURPRISE$"
 
-gEasyChatWord_Fear: ; 859A779
+gEasyChatWord_Fear: @ 859A779
 	.charmapstr "FEAR$"
 
-gEasyChatWord_Want: ; 859A77E
+gEasyChatWord_Want: @ 859A77E
 	.charmapstr "WANT$"
 
-gEasyChatWord_Wait: ; 859A783
+gEasyChatWord_Wait: @ 859A783
 	.charmapstr "WAIT$"
 
-gEasyChatWord_Satisfied: ; 859A788
+gEasyChatWord_Satisfied: @ 859A788
 	.charmapstr "SATISFIED$"
 
-gEasyChatWord_See: ; 859A792
+gEasyChatWord_See: @ 859A792
 	.charmapstr "SEE$"
 
-gEasyChatWord_Rare: ; 859A796
+gEasyChatWord_Rare: @ 859A796
 	.charmapstr "RARE$"
 
-gEasyChatWord_Negative: ; 859A79B
+gEasyChatWord_Negative: @ 859A79B
 	.charmapstr "NEGATIVE$"
 
-gEasyChatWord_Done: ; 859A7A4
+gEasyChatWord_Done: @ 859A7A4
 	.charmapstr "DONE$"
 
-gEasyChatWord_Danger: ; 859A7A9
+gEasyChatWord_Danger: @ 859A7A9
 	.charmapstr "DANGER$"
 
-gEasyChatWord_Defeated: ; 859A7B0
+gEasyChatWord_Defeated: @ 859A7B0
 	.charmapstr "DEFEATED$"
 
-gEasyChatWord_Beat: ; 859A7B9
+gEasyChatWord_Beat: @ 859A7B9
 	.charmapstr "BEAT$"
 
-gEasyChatWord_Great: ; 859A7BE
+gEasyChatWord_Great: @ 859A7BE
 	.charmapstr "GREAT$"
 
-gEasyChatWord_Romantic: ; 859A7C4
+gEasyChatWord_Romantic: @ 859A7C4
 	.charmapstr "ROMANTIC$"
 
-gEasyChatWord_Question: ; 859A7CD
+gEasyChatWord_Question: @ 859A7CD
 	.charmapstr "QUESTION$"
 
-gEasyChatWord_Understand: ; 859A7D6
+gEasyChatWord_Understand: @ 859A7D6
 	.charmapstr "UNDERSTAND$"
 
-gEasyChatWord_Understands: ; 859A7E1
+gEasyChatWord_Understands: @ 859A7E1
 	.charmapstr "UNDERSTANDS$"
 
 	.align 2, 0
 
-gEasyChatGroup_Feelings: ; 859A7F0
+gEasyChatGroup_Feelings: @ 859A7F0
 	.4byte gEasyChatWord_Meet
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Play
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hurried
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Goes
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Giddy
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Happy
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Happiness
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Excite
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Important
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Funny
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Got
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GoHome
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Disappointed
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Disappoints
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sad
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Try
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tries
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hears
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Think
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hear
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wants
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Misheard
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dislike
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Angry
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Anger
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Scary
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lonesome
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Disappoint
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Joy
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gets
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Never
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Darn
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Downcast
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Incredible
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Likes
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dislikes
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Boring
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Care
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cares
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AllRight
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Adore
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Disaster
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Enjoy
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Enjoys
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Eat
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lacking
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bad
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hard
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Terrible
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Should
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nice
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Drink
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Surprise
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fear
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Want
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wait
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Satisfied
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_See
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rare
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Negative
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Done
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Danger
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Defeated
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Beat
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Great
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Romantic
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Question
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Understand
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Understands
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s
index bbf267047..450fc8393 100644
--- a/data/text/easy_chat/easy_chat_group_greetings.s
+++ b/data/text/easy_chat/easy_chat_group_greetings.s
@@ -1,296 +1,296 @@
-gEasyChatWord_Thanks: ; 8599004
+gEasyChatWord_Thanks: @ 8599004
 	.charmapstr "THANKS$"
 
-gEasyChatWord_Yes: ; 859900B
+gEasyChatWord_Yes: @ 859900B
 	.charmapstr "YES$"
 
-gEasyChatWord_HereGoes: ; 859900F
+gEasyChatWord_HereGoes: @ 859900F
 	.charmapstr "HERE GOES$"
 
-gEasyChatWord_HereICome: ; 8599019
+gEasyChatWord_HereICome: @ 8599019
 	.charmapstr "HERE I COME$"
 
-gEasyChatWord_HereItIs: ; 8599025
+gEasyChatWord_HereItIs: @ 8599025
 	.charmapstr "HERE IT IS$"
 
-gEasyChatWord_Yeah: ; 8599030
+gEasyChatWord_Yeah: @ 8599030
 	.charmapstr "YEAH$"
 
-gEasyChatWord_Welcome: ; 8599035
+gEasyChatWord_Welcome: @ 8599035
 	.charmapstr "WELCOME$"
 
-gEasyChatWord_Oi: ; 859903D
+gEasyChatWord_Oi: @ 859903D
 	.charmapstr "OI$"
 
-gEasyChatWord_HowDo: ; 8599040
+gEasyChatWord_HowDo: @ 8599040
 	.charmapstr "HOW DO$"
 
-gEasyChatWord_Congrats: ; 8599047
+gEasyChatWord_Congrats: @ 8599047
 	.charmapstr "CONGRATS$"
 
-gEasyChatWord_GiveMe: ; 8599050
+gEasyChatWord_GiveMe: @ 8599050
 	.charmapstr "GIVE ME$"
 
-gEasyChatWord_Sorry: ; 8599058
+gEasyChatWord_Sorry: @ 8599058
 	.charmapstr "SORRY$"
 
-gEasyChatWord_Apologize: ; 859905E
+gEasyChatWord_Apologize: @ 859905E
 	.charmapstr "APOLOGIZE$"
 
-gEasyChatWord_Forgive: ; 8599068
+gEasyChatWord_Forgive: @ 8599068
 	.charmapstr "FORGIVE$"
 
-gEasyChatWord_HeyThere: ; 8599070
+gEasyChatWord_HeyThere: @ 8599070
 	.charmapstr "HEY, THERE$"
 
-gEasyChatWord_Hello: ; 859907B
+gEasyChatWord_Hello: @ 859907B
 	.charmapstr "HELLO$"
 
-gEasyChatWord_GoodBye: ; 8599081
+gEasyChatWord_GoodBye: @ 8599081
 	.charmapstr "GOOD-BYE$"
 
-gEasyChatWord_ThankYou: ; 859908A
+gEasyChatWord_ThankYou: @ 859908A
 	.charmapstr "THANK YOU$"
 
-gEasyChatWord_IveArrived: ; 8599094
+gEasyChatWord_IveArrived: @ 8599094
 	.charmapstr "I’VE ARRIVED$"
 
-gEasyChatWord_Pardon: ; 85990A1
+gEasyChatWord_Pardon: @ 85990A1
 	.charmapstr "PARDON$"
 
-gEasyChatWord_Excuse: ; 85990A8
+gEasyChatWord_Excuse: @ 85990A8
 	.charmapstr "EXCUSE$"
 
-gEasyChatWord_SeeYa: ; 85990AF
+gEasyChatWord_SeeYa: @ 85990AF
 	.charmapstr "SEE YA$"
 
-gEasyChatWord_ExcuseMe: ; 85990B6
+gEasyChatWord_ExcuseMe: @ 85990B6
 	.charmapstr "EXCUSE ME$"
 
-gEasyChatWord_WellThen: ; 85990C0
+gEasyChatWord_WellThen: @ 85990C0
 	.charmapstr "WELL, THEN$"
 
-gEasyChatWord_GoAhead: ; 85990CB
+gEasyChatWord_GoAhead: @ 85990CB
 	.charmapstr "GO AHEAD$"
 
-gEasyChatWord_Appreciate: ; 85990D4
+gEasyChatWord_Appreciate: @ 85990D4
 	.charmapstr "APPRECIATE$"
 
-gEasyChatWord_HeyQues: ; 85990DF
+gEasyChatWord_HeyQues: @ 85990DF
 	.charmapstr "HEY?$"
 
-gEasyChatWord_WhatsUpQues: ; 85990E4
+gEasyChatWord_WhatsUpQues: @ 85990E4
 	.charmapstr "WHAT’S UP?$"
 
-gEasyChatWord_HuhQues: ; 85990EF
+gEasyChatWord_HuhQues: @ 85990EF
 	.charmapstr "HUH?$"
 
-gEasyChatWord_No: ; 85990F4
+gEasyChatWord_No: @ 85990F4
 	.charmapstr "NO$"
 
-gEasyChatWord_Hi: ; 85990F7
+gEasyChatWord_Hi: @ 85990F7
 	.charmapstr "HI$"
 
-gEasyChatWord_YeahYeah: ; 85990FA
+gEasyChatWord_YeahYeah: @ 85990FA
 	.charmapstr "YEAH, YEAH$"
 
-gEasyChatWord_ByeBye: ; 8599105
+gEasyChatWord_ByeBye: @ 8599105
 	.charmapstr "BYE-BYE$"
 
-gEasyChatWord_MeetYou: ; 859910D
+gEasyChatWord_MeetYou: @ 859910D
 	.charmapstr "MEET YOU$"
 
-gEasyChatWord_Hey: ; 8599116
+gEasyChatWord_Hey: @ 8599116
 	.charmapstr "HEY$"
 
-gEasyChatWord_Smell: ; 859911A
+gEasyChatWord_Smell: @ 859911A
 	.charmapstr "SMELL$"
 
-gEasyChatWord_Listening: ; 8599120
+gEasyChatWord_Listening: @ 8599120
 	.charmapstr "LISTENING$"
 
-gEasyChatWord_HooHah: ; 859912A
+gEasyChatWord_HooHah: @ 859912A
 	.charmapstr "HOO-HAH$"
 
-gEasyChatWord_Yahoo: ; 8599132
+gEasyChatWord_Yahoo: @ 8599132
 	.charmapstr "YAHOO$"
 
-gEasyChatWord_Yo: ; 8599138
+gEasyChatWord_Yo: @ 8599138
 	.charmapstr "YO$"
 
-gEasyChatWord_ComeOver: ; 859913B
+gEasyChatWord_ComeOver: @ 859913B
 	.charmapstr "COME OVER$"
 
-gEasyChatWord_CountOn: ; 8599145
+gEasyChatWord_CountOn: @ 8599145
 	.charmapstr "COUNT ON$"
 
 	.align 2, 0
 
-gEasyChatGroup_Greetings: ; 8599150
+gEasyChatGroup_Greetings: @ 8599150
 	.4byte gEasyChatWord_Thanks
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yes
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HereGoes
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HereICome
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HereItIs
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yeah
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Welcome
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Oi
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HowDo
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Congrats
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GiveMe
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sorry
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Apologize
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Forgive
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HeyThere
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hello
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GoodBye
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThankYou
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IveArrived
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pardon
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Excuse
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SeeYa
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ExcuseMe
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WellThen
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_GoAhead
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Appreciate
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HeyQues
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WhatsUpQues
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HuhQues
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_No
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hi
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_YeahYeah
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ByeBye
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MeetYou
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hey
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smell
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Listening
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HooHah
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yahoo
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yo
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ComeOver
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_CountOn
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s
index b8d2c3861..c50fbdb5a 100644
--- a/data/text/easy_chat/easy_chat_group_hobbies.s
+++ b/data/text/easy_chat/easy_chat_group_hobbies.s
@@ -1,380 +1,380 @@
-gEasyChatWord_Idol: ; 859B960
+gEasyChatWord_Idol: @ 859B960
 	.charmapstr "IDOL$"
 
-gEasyChatWord_Anime: ; 859B965
+gEasyChatWord_Anime: @ 859B965
 	.charmapstr "ANIME$"
 
-gEasyChatWord_Song: ; 859B96B
+gEasyChatWord_Song: @ 859B96B
 	.charmapstr "SONG$"
 
-gEasyChatWord_Movie: ; 859B970
+gEasyChatWord_Movie: @ 859B970
 	.charmapstr "MOVIE$"
 
-gEasyChatWord_Sweets: ; 859B976
+gEasyChatWord_Sweets: @ 859B976
 	.charmapstr "SWEETS$"
 
-gEasyChatWord_Chat: ; 859B97D
+gEasyChatWord_Chat: @ 859B97D
 	.charmapstr "CHAT$"
 
-gEasyChatWord_ChildsPlay: ; 859B982
+gEasyChatWord_ChildsPlay: @ 859B982
 	.charmapstr "CHILD’S PLAY$"
 
-gEasyChatWord_Toys: ; 859B98F
+gEasyChatWord_Toys: @ 859B98F
 	.charmapstr "TOYS$"
 
-gEasyChatWord_Music: ; 859B994
+gEasyChatWord_Music: @ 859B994
 	.charmapstr "MUSIC$"
 
-gEasyChatWord_Cards: ; 859B99A
+gEasyChatWord_Cards: @ 859B99A
 	.charmapstr "CARDS$"
 
-gEasyChatWord_Shopping: ; 859B9A0
+gEasyChatWord_Shopping: @ 859B9A0
 	.charmapstr "SHOPPING$"
 
-gEasyChatWord_Camera: ; 859B9A9
+gEasyChatWord_Camera: @ 859B9A9
 	.charmapstr "CAMERA$"
 
-gEasyChatWord_Viewing: ; 859B9B0
+gEasyChatWord_Viewing: @ 859B9B0
 	.charmapstr "VIEWING$"
 
-gEasyChatWord_Spectator: ; 859B9B8
+gEasyChatWord_Spectator: @ 859B9B8
 	.charmapstr "SPECTATOR$"
 
-gEasyChatWord_Gourmet: ; 859B9C2
+gEasyChatWord_Gourmet: @ 859B9C2
 	.charmapstr "GOURMET$"
 
-gEasyChatWord_Game: ; 859B9CA
+gEasyChatWord_Game: @ 859B9CA
 	.charmapstr "GAME$"
 
-gEasyChatWord_Rpg: ; 859B9CF
+gEasyChatWord_Rpg: @ 859B9CF
 	.charmapstr "RPG$"
 
-gEasyChatWord_Collection: ; 859B9D3
+gEasyChatWord_Collection: @ 859B9D3
 	.charmapstr "COLLECTION$"
 
-gEasyChatWord_Complete: ; 859B9DE
+gEasyChatWord_Complete: @ 859B9DE
 	.charmapstr "COMPLETE$"
 
-gEasyChatWord_Magazine: ; 859B9E7
+gEasyChatWord_Magazine: @ 859B9E7
 	.charmapstr "MAGAZINE$"
 
-gEasyChatWord_Walk: ; 859B9F0
+gEasyChatWord_Walk: @ 859B9F0
 	.charmapstr "WALK$"
 
-gEasyChatWord_Bike: ; 859B9F5
+gEasyChatWord_Bike: @ 859B9F5
 	.charmapstr "BIKE$"
 
-gEasyChatWord_Hobby: ; 859B9FA
+gEasyChatWord_Hobby: @ 859B9FA
 	.charmapstr "HOBBY$"
 
-gEasyChatWord_Sports: ; 859BA00
+gEasyChatWord_Sports: @ 859BA00
 	.charmapstr "SPORTS$"
 
-gEasyChatWord_Software: ; 859BA07
+gEasyChatWord_Software: @ 859BA07
 	.charmapstr "SOFTWARE$"
 
-gEasyChatWord_Songs: ; 859BA10
+gEasyChatWord_Songs: @ 859BA10
 	.charmapstr "SONGS$"
 
-gEasyChatWord_Diet: ; 859BA16
+gEasyChatWord_Diet: @ 859BA16
 	.charmapstr "DIET$"
 
-gEasyChatWord_Treasure: ; 859BA1B
+gEasyChatWord_Treasure: @ 859BA1B
 	.charmapstr "TREASURE$"
 
-gEasyChatWord_Travel: ; 859BA24
+gEasyChatWord_Travel: @ 859BA24
 	.charmapstr "TRAVEL$"
 
-gEasyChatWord_Dance: ; 859BA2B
+gEasyChatWord_Dance: @ 859BA2B
 	.charmapstr "DANCE$"
 
-gEasyChatWord_Channel: ; 859BA31
+gEasyChatWord_Channel: @ 859BA31
 	.charmapstr "CHANNEL$"
 
-gEasyChatWord_Making: ; 859BA39
+gEasyChatWord_Making: @ 859BA39
 	.charmapstr "MAKING$"
 
-gEasyChatWord_Fishing: ; 859BA40
+gEasyChatWord_Fishing: @ 859BA40
 	.charmapstr "FISHING$"
 
-gEasyChatWord_Date: ; 859BA48
+gEasyChatWord_Date: @ 859BA48
 	.charmapstr "DATE$"
 
-gEasyChatWord_Design: ; 859BA4D
+gEasyChatWord_Design: @ 859BA4D
 	.charmapstr "DESIGN$"
 
-gEasyChatWord_Locomotive: ; 859BA54
+gEasyChatWord_Locomotive: @ 859BA54
 	.charmapstr "LOCOMOTIVE$"
 
-gEasyChatWord_PlushDoll: ; 859BA5F
+gEasyChatWord_PlushDoll: @ 859BA5F
 	.charmapstr "PLUSH DOLL$"
 
-gEasyChatWord_Pc: ; 859BA6A
+gEasyChatWord_Pc: @ 859BA6A
 	.charmapstr "PC$"
 
-gEasyChatWord_Flowers: ; 859BA6D
+gEasyChatWord_Flowers: @ 859BA6D
 	.charmapstr "FLOWERS$"
 
-gEasyChatWord_Hero: ; 859BA75
+gEasyChatWord_Hero: @ 859BA75
 	.charmapstr "HERO$"
 
-gEasyChatWord_Nap: ; 859BA7A
+gEasyChatWord_Nap: @ 859BA7A
 	.charmapstr "NAP$"
 
-gEasyChatWord_Heroine: ; 859BA7E
+gEasyChatWord_Heroine: @ 859BA7E
 	.charmapstr "HEROINE$"
 
-gEasyChatWord_Fashion: ; 859BA86
+gEasyChatWord_Fashion: @ 859BA86
 	.charmapstr "FASHION$"
 
-gEasyChatWord_Adventure: ; 859BA8E
+gEasyChatWord_Adventure: @ 859BA8E
 	.charmapstr "ADVENTURE$"
 
-gEasyChatWord_Board: ; 859BA98
+gEasyChatWord_Board: @ 859BA98
 	.charmapstr "BOARD$"
 
-gEasyChatWord_Ball: ; 859BA9E
+gEasyChatWord_Ball: @ 859BA9E
 	.charmapstr "BALL$"
 
-gEasyChatWord_Book: ; 859BAA3
+gEasyChatWord_Book: @ 859BAA3
 	.charmapstr "BOOK$"
 
-gEasyChatWord_Festival: ; 859BAA8
+gEasyChatWord_Festival: @ 859BAA8
 	.charmapstr "FESTIVAL$"
 
-gEasyChatWord_Comics: ; 859BAB1
+gEasyChatWord_Comics: @ 859BAB1
 	.charmapstr "COMICS$"
 
-gEasyChatWord_Holiday: ; 859BAB8
+gEasyChatWord_Holiday: @ 859BAB8
 	.charmapstr "HOLIDAY$"
 
-gEasyChatWord_Plans: ; 859BAC0
+gEasyChatWord_Plans: @ 859BAC0
 	.charmapstr "PLANS$"
 
-gEasyChatWord_Trendy: ; 859BAC6
+gEasyChatWord_Trendy: @ 859BAC6
 	.charmapstr "TRENDY$"
 
-gEasyChatWord_Vacation: ; 859BACD
+gEasyChatWord_Vacation: @ 859BACD
 	.charmapstr "VACATION$"
 
-gEasyChatWord_Look: ; 859BAD6
+gEasyChatWord_Look: @ 859BAD6
 	.charmapstr "LOOK$"
 
 	.align 2, 0
 
-gEasyChatGroup_Hobbies: ; 859BADC
+gEasyChatGroup_Hobbies: @ 859BADC
 	.4byte gEasyChatWord_Idol
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Anime
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Song
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Movie
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sweets
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Chat
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ChildsPlay
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Toys
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Music
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cards
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shopping
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Camera
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Viewing
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Spectator
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gourmet
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Game
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rpg
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Collection
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Complete
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Magazine
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Walk
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bike
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hobby
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sports
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Software
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Songs
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Diet
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Treasure
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Travel
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dance
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Channel
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Making
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fishing
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Date
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Design
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Locomotive
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_PlushDoll
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pc
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Flowers
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hero
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nap
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Heroine
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fashion
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Adventure
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Board
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ball
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Book
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Festival
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Comics
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Holiday
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Plans
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trendy
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Vacation
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Look
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_lifestyle.s b/data/text/easy_chat/easy_chat_group_lifestyle.s
index d6fb8e516..0657b2f52 100644
--- a/data/text/easy_chat/easy_chat_group_lifestyle.s
+++ b/data/text/easy_chat/easy_chat_group_lifestyle.s
@@ -1,317 +1,317 @@
-gEasyChatWord_Chores: ; 859B5FC
+gEasyChatWord_Chores: @ 859B5FC
 	.charmapstr "CHORES$"
 
-gEasyChatWord_Home: ; 859B603
+gEasyChatWord_Home: @ 859B603
 	.charmapstr "HOME$"
 
-gEasyChatWord_Money: ; 859B608
+gEasyChatWord_Money: @ 859B608
 	.charmapstr "MONEY$"
 
-gEasyChatWord_Allowance: ; 859B60E
+gEasyChatWord_Allowance: @ 859B60E
 	.charmapstr "ALLOWANCE$"
 
-gEasyChatWord_Bath: ; 859B618
+gEasyChatWord_Bath: @ 859B618
 	.charmapstr "BATH$"
 
-gEasyChatWord_Conversation: ; 859B61D
+gEasyChatWord_Conversation: @ 859B61D
 	.charmapstr "CONVERSATION$"
 
-gEasyChatWord_School: ; 859B62A
+gEasyChatWord_School: @ 859B62A
 	.charmapstr "SCHOOL$"
 
-gEasyChatWord_Commemorate: ; 859B631
+gEasyChatWord_Commemorate: @ 859B631
 	.charmapstr "COMMEMORATE$"
 
-gEasyChatWord_Habit: ; 859B63D
+gEasyChatWord_Habit: @ 859B63D
 	.charmapstr "HABIT$"
 
-gEasyChatWord_Group: ; 859B643
+gEasyChatWord_Group: @ 859B643
 	.charmapstr "GROUP$"
 
-gEasyChatWord_Word: ; 859B649
+gEasyChatWord_Word: @ 859B649
 	.charmapstr "WORD$"
 
-gEasyChatWord_Store: ; 859B64E
+gEasyChatWord_Store: @ 859B64E
 	.charmapstr "STORE$"
 
-gEasyChatWord_Service: ; 859B654
+gEasyChatWord_Service: @ 859B654
 	.charmapstr "SERVICE$"
 
-gEasyChatWord_Work: ; 859B65C
+gEasyChatWord_Work: @ 859B65C
 	.charmapstr "WORK$"
 
-gEasyChatWord_System: ; 859B661
+gEasyChatWord_System: @ 859B661
 	.charmapstr "SYSTEM$"
 
-gEasyChatWord_Train: ; 859B668
+gEasyChatWord_Train: @ 859B668
 	.charmapstr "TRAIN$"
 
-gEasyChatWord_Class: ; 859B66E
+gEasyChatWord_Class: @ 859B66E
 	.charmapstr "CLASS$"
 
-gEasyChatWord_Lessons: ; 859B674
+gEasyChatWord_Lessons: @ 859B674
 	.charmapstr "LESSONS$"
 
-gEasyChatWord_Information: ; 859B67C
+gEasyChatWord_Information: @ 859B67C
 	.charmapstr "INFORMATION$"
 
-gEasyChatWord_Living: ; 859B688
+gEasyChatWord_Living: @ 859B688
 	.charmapstr "LIVING$"
 
-gEasyChatWord_Teacher: ; 859B68F
+gEasyChatWord_Teacher: @ 859B68F
 	.charmapstr "TEACHER$"
 
-gEasyChatWord_Tournament: ; 859B697
+gEasyChatWord_Tournament: @ 859B697
 	.charmapstr "TOURNAMENT$"
 
-gEasyChatWord_Letter: ; 859B6A2
+gEasyChatWord_Letter: @ 859B6A2
 	.charmapstr "LETTER$"
 
-gEasyChatWord_Event: ; 859B6A9
+gEasyChatWord_Event: @ 859B6A9
 	.charmapstr "EVENT$"
 
-gEasyChatWord_Digital: ; 859B6AF
+gEasyChatWord_Digital: @ 859B6AF
 	.charmapstr "DIGITAL$"
 
-gEasyChatWord_Test: ; 859B6B7
+gEasyChatWord_Test: @ 859B6B7
 	.charmapstr "TEST$"
 
-gEasyChatWord_DeptStore: ; 859B6BC
+gEasyChatWord_DeptStore: @ 859B6BC
 	.charmapstr "DEPT. STORE$"
 
-gEasyChatWord_Television: ; 859B6C8
+gEasyChatWord_Television: @ 859B6C8
 	.charmapstr "TELEVISION$"
 
-gEasyChatWord_Phone: ; 859B6D3
+gEasyChatWord_Phone: @ 859B6D3
 	.charmapstr "PHONE$"
 
-gEasyChatWord_Item: ; 859B6D9
+gEasyChatWord_Item: @ 859B6D9
 	.charmapstr "ITEM$"
 
-gEasyChatWord_Name: ; 859B6DE
+gEasyChatWord_Name: @ 859B6DE
 	.charmapstr "NAME$"
 
-gEasyChatWord_News: ; 859B6E3
+gEasyChatWord_News: @ 859B6E3
 	.charmapstr "NEWS$"
 
-gEasyChatWord_Popular: ; 859B6E8
+gEasyChatWord_Popular: @ 859B6E8
 	.charmapstr "POPULAR$"
 
-gEasyChatWord_Party: ; 859B6F0
+gEasyChatWord_Party: @ 859B6F0
 	.charmapstr "PARTY$"
 
-gEasyChatWord_Study: ; 859B6F6
+gEasyChatWord_Study: @ 859B6F6
 	.charmapstr "STUDY$"
 
-gEasyChatWord_Machine: ; 859B6FC
+gEasyChatWord_Machine: @ 859B6FC
 	.charmapstr "MACHINE$"
 
-gEasyChatWord_Mail: ; 859B704
+gEasyChatWord_Mail: @ 859B704
 	.charmapstr "MAIL$"
 
-gEasyChatWord_Message: ; 859B709
+gEasyChatWord_Message: @ 859B709
 	.charmapstr "MESSAGE$"
 
-gEasyChatWord_Promise: ; 859B711
+gEasyChatWord_Promise: @ 859B711
 	.charmapstr "PROMISE$"
 
-gEasyChatWord_Dream: ; 859B719
+gEasyChatWord_Dream: @ 859B719
 	.charmapstr "DREAM$"
 
-gEasyChatWord_Kindergarten: ; 859B71F
+gEasyChatWord_Kindergarten: @ 859B71F
 	.charmapstr "KINDERGARTEN$"
 
-gEasyChatWord_Life: ; 859B72C
+gEasyChatWord_Life: @ 859B72C
 	.charmapstr "LIFE$"
 
-gEasyChatWord_Radio: ; 859B731
+gEasyChatWord_Radio: @ 859B731
 	.charmapstr "RADIO$"
 
-gEasyChatWord_Rental: ; 859B737
+gEasyChatWord_Rental: @ 859B737
 	.charmapstr "RENTAL$"
 
-gEasyChatWord_World: ; 859B73E
+gEasyChatWord_World: @ 859B73E
 	.charmapstr "WORLD$"
 
 	.align 2, 0
 
-gEasyChatGroup_Lifestyle: ; 859B744
+gEasyChatGroup_Lifestyle: @ 859B744
 	.4byte gEasyChatWord_Chores
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Home
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Money
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Allowance
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bath
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Conversation
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_School
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Commemorate
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Habit
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Group
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Word
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Store
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Service
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Work
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_System
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Train
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Class
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lessons
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Information
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Living
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Teacher
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tournament
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Letter
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Event
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Digital
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Test
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_DeptStore
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Television
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Phone
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Item
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Name
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_News
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Popular
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Party
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Study
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Machine
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mail
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Message
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Promise
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dream
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Kindergarten
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Life
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Radio
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rental
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_World
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s
index 3cae000f2..63bb17eee 100644
--- a/data/text/easy_chat/easy_chat_group_misc.s
+++ b/data/text/easy_chat/easy_chat_group_misc.s
@@ -1,296 +1,296 @@
-gEasyChatWord_Highs: ; 859C0B4
+gEasyChatWord_Highs: @ 859C0B4
 	.charmapstr "HIGHS$"
 
-gEasyChatWord_Lows: ; 859C0BA
+gEasyChatWord_Lows: @ 859C0BA
 	.charmapstr "LOWS$"
 
-gEasyChatWord_Um: ; 859C0BF
+gEasyChatWord_Um: @ 859C0BF
 	.charmapstr "UM$"
 
-gEasyChatWord_Rear: ; 859C0C2
+gEasyChatWord_Rear: @ 859C0C2
 	.charmapstr "REAR$"
 
-gEasyChatWord_Things: ; 859C0C7
+gEasyChatWord_Things: @ 859C0C7
 	.charmapstr "THINGS$"
 
-gEasyChatWord_Thing: ; 859C0CE
+gEasyChatWord_Thing: @ 859C0CE
 	.charmapstr "THING$"
 
-gEasyChatWord_Below: ; 859C0D4
+gEasyChatWord_Below: @ 859C0D4
 	.charmapstr "BELOW$"
 
-gEasyChatWord_Above: ; 859C0DA
+gEasyChatWord_Above: @ 859C0DA
 	.charmapstr "ABOVE$"
 
-gEasyChatWord_Back: ; 859C0E0
+gEasyChatWord_Back: @ 859C0E0
 	.charmapstr "BACK$"
 
-gEasyChatWord_High: ; 859C0E5
+gEasyChatWord_High: @ 859C0E5
 	.charmapstr "HIGH$"
 
-gEasyChatWord_Here: ; 859C0EA
+gEasyChatWord_Here: @ 859C0EA
 	.charmapstr "HERE$"
 
-gEasyChatWord_Inside: ; 859C0EF
+gEasyChatWord_Inside: @ 859C0EF
 	.charmapstr "INSIDE$"
 
-gEasyChatWord_Outside: ; 859C0F6
+gEasyChatWord_Outside: @ 859C0F6
 	.charmapstr "OUTSIDE$"
 
-gEasyChatWord_Beside: ; 859C0FE
+gEasyChatWord_Beside: @ 859C0FE
 	.charmapstr "BESIDE$"
 
-gEasyChatWord_ThisIsItExcl: ; 859C105
+gEasyChatWord_ThisIsItExcl: @ 859C105
 	.charmapstr "THIS IS IT!$"
 
-gEasyChatWord_This: ; 859C111
+gEasyChatWord_This: @ 859C111
 	.charmapstr "THIS$"
 
-gEasyChatWord_Every: ; 859C116
+gEasyChatWord_Every: @ 859C116
 	.charmapstr "EVERY$"
 
-gEasyChatWord_These: ; 859C11C
+gEasyChatWord_These: @ 859C11C
 	.charmapstr "THESE$"
 
-gEasyChatWord_TheseWere: ; 859C122
+gEasyChatWord_TheseWere: @ 859C122
 	.charmapstr "THESE WERE$"
 
-gEasyChatWord_Down: ; 859C12D
+gEasyChatWord_Down: @ 859C12D
 	.charmapstr "DOWN$"
 
-gEasyChatWord_That: ; 859C132
+gEasyChatWord_That: @ 859C132
 	.charmapstr "THAT$"
 
-gEasyChatWord_ThoseAre: ; 859C137
+gEasyChatWord_ThoseAre: @ 859C137
 	.charmapstr "THOSE ARE$"
 
-gEasyChatWord_ThoseWere: ; 859C141
+gEasyChatWord_ThoseWere: @ 859C141
 	.charmapstr "THOSE WERE$"
 
-gEasyChatWord_ThatsItExcl: ; 859C14C
+gEasyChatWord_ThatsItExcl: @ 859C14C
 	.charmapstr "THAT’S IT!$"
 
-gEasyChatWord_Am: ; 859C157
+gEasyChatWord_Am: @ 859C157
 	.charmapstr "AM$"
 
-gEasyChatWord_ThatWas: ; 859C15A
+gEasyChatWord_ThatWas: @ 859C15A
 	.charmapstr "THAT WAS$"
 
-gEasyChatWord_Front: ; 859C163
+gEasyChatWord_Front: @ 859C163
 	.charmapstr "FRONT$"
 
-gEasyChatWord_Up: ; 859C169
+gEasyChatWord_Up: @ 859C169
 	.charmapstr "UP$"
 
-gEasyChatWord_Choice: ; 859C16C
+gEasyChatWord_Choice: @ 859C16C
 	.charmapstr "CHOICE$"
 
-gEasyChatWord_Far: ; 859C173
+gEasyChatWord_Far: @ 859C173
 	.charmapstr "FAR$"
 
-gEasyChatWord_Away: ; 859C177
+gEasyChatWord_Away: @ 859C177
 	.charmapstr "AWAY$"
 
-gEasyChatWord_Near: ; 859C17C
+gEasyChatWord_Near: @ 859C17C
 	.charmapstr "NEAR$"
 
-gEasyChatWord_Where: ; 859C181
+gEasyChatWord_Where: @ 859C181
 	.charmapstr "WHERE$"
 
-gEasyChatWord_When: ; 859C187
+gEasyChatWord_When: @ 859C187
 	.charmapstr "WHEN$"
 
-gEasyChatWord_What: ; 859C18C
+gEasyChatWord_What: @ 859C18C
 	.charmapstr "WHAT$"
 
-gEasyChatWord_Deep: ; 859C191
+gEasyChatWord_Deep: @ 859C191
 	.charmapstr "DEEP$"
 
-gEasyChatWord_Shallow: ; 859C196
+gEasyChatWord_Shallow: @ 859C196
 	.charmapstr "SHALLOW$"
 
-gEasyChatWord_Why: ; 859C19E
+gEasyChatWord_Why: @ 859C19E
 	.charmapstr "WHY$"
 
-gEasyChatWord_Confused: ; 859C1A2
+gEasyChatWord_Confused: @ 859C1A2
 	.charmapstr "CONFUSED$"
 
-gEasyChatWord_Opposite: ; 859C1AB
+gEasyChatWord_Opposite: @ 859C1AB
 	.charmapstr "OPPOSITE$"
 
-gEasyChatWord_Left: ; 859C1B4
+gEasyChatWord_Left: @ 859C1B4
 	.charmapstr "LEFT$"
 
-gEasyChatWord_Right: ; 859C1B9
+gEasyChatWord_Right: @ 859C1B9
 	.charmapstr "RIGHT$"
 
 	.align 2, 0
 
-gEasyChatGroup_Misc: ; 859C1C0
+gEasyChatGroup_Misc: @ 859C1C0
 	.4byte gEasyChatWord_Highs
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lows
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Um
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rear
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Things
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thing
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Below
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Above
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Back
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_High
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Here
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Inside
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Outside
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Beside
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThisIsItExcl
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_This
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Every
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_These
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TheseWere
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Down
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_That
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThoseAre
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThoseWere
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThatsItExcl
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Am
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThatWas
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Front
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Up
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Choice
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Far
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Away
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Near
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Where
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_When
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_What
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Deep
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shallow
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Why
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Confused
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Opposite
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Left
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Right
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_move_1.s b/data/text/easy_chat/easy_chat_group_move_1.s
index 76923e77d..cfc53b3bc 100644
--- a/data/text/easy_chat/easy_chat_group_move_1.s
+++ b/data/text/easy_chat/easy_chat_group_move_1.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEasyChatGroup_Move1: ; 859C8C4
+gEasyChatGroup_Move1: @ 859C8C4
 	.2byte MOVE_ABSORB
 	.2byte MOVE_AEROBLAST
 	.2byte MOVE_AGILITY
diff --git a/data/text/easy_chat/easy_chat_group_move_2.s b/data/text/easy_chat/easy_chat_group_move_2.s
index af3cf832f..6884dc6a4 100644
--- a/data/text/easy_chat/easy_chat_group_move_2.s
+++ b/data/text/easy_chat/easy_chat_group_move_2.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEasyChatGroup_Move2: ; 859C9F8
+gEasyChatGroup_Move2: @ 859C9F8
 	.2byte MOVE_ACID
 	.2byte MOVE_ACID_ARMOR
 	.2byte MOVE_AERIAL_ACE
diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.s b/data/text/easy_chat/easy_chat_group_name_pointers.s
index 74d1270ba..20e47faf2 100644
--- a/data/text/easy_chat/easy_chat_group_name_pointers.s
+++ b/data/text/easy_chat/easy_chat_group_name_pointers.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEasyChatGroupNamePointers: ; 859E5D4
+gEasyChatGroupNamePointers: @ 859E5D4
 	.4byte gEasyChatGroupName_Pokemon
 	.4byte gEasyChatGroupName_Trainer
 	.4byte gEasyChatGroupName_Status
diff --git a/data/text/easy_chat/easy_chat_group_names.s b/data/text/easy_chat/easy_chat_group_names.s
index 6311a453e..fd05621e2 100644
--- a/data/text/easy_chat/easy_chat_group_names.s
+++ b/data/text/easy_chat/easy_chat_group_names.s
@@ -1,65 +1,65 @@
-gEasyChatGroupName_Pokemon: ; 85EE98D
+gEasyChatGroupName_Pokemon: @ 85EE98D
 	.charmapstr "POKéMON$"
 
-gEasyChatGroupName_Trainer: ; 85EE995
+gEasyChatGroupName_Trainer: @ 85EE995
 	.charmapstr "TRAINER$"
 
-gEasyChatGroupName_Status: ; 85EE99D
+gEasyChatGroupName_Status: @ 85EE99D
 	.charmapstr "STATUS$"
 
-gEasyChatGroupName_Battle: ; 85EE9A4
+gEasyChatGroupName_Battle: @ 85EE9A4
 	.charmapstr "BATTLE$"
 
-gEasyChatGroupName_Greetings: ; 85EE9AB
+gEasyChatGroupName_Greetings: @ 85EE9AB
 	.charmapstr "GREETINGS$"
 
-gEasyChatGroupName_People: ; 85EE9B5
+gEasyChatGroupName_People: @ 85EE9B5
 	.charmapstr "PEOPLE$"
 
-gEasyChatGroupName_Voices: ; 85EE9BC
+gEasyChatGroupName_Voices: @ 85EE9BC
 	.charmapstr "VOICES$"
 
-gEasyChatGroupName_Speech: ; 85EE9C3
+gEasyChatGroupName_Speech: @ 85EE9C3
 	.charmapstr "SPEECH$"
 
-gEasyChatGroupName_Endings: ; 85EE9CA
+gEasyChatGroupName_Endings: @ 85EE9CA
 	.charmapstr "ENDINGS$"
 
-gEasyChatGroupName_Feelings: ; 85EE9D2
+gEasyChatGroupName_Feelings: @ 85EE9D2
 	.charmapstr "FEELINGS$"
 
-gEasyChatGroupName_Conditions: ; 85EE9DB
+gEasyChatGroupName_Conditions: @ 85EE9DB
 	.charmapstr "CONDITIONS$"
 
-gEasyChatGroupName_Actions: ; 85EE9E6
+gEasyChatGroupName_Actions: @ 85EE9E6
 	.charmapstr "ACTIONS$"
 
-gEasyChatGroupName_Lifestyle: ; 85EE9EE
+gEasyChatGroupName_Lifestyle: @ 85EE9EE
 	.charmapstr "LIFESTYLE$"
 
-gEasyChatGroupName_Hobbies: ; 85EE9F8
+gEasyChatGroupName_Hobbies: @ 85EE9F8
 	.charmapstr "HOBBIES$"
 
-gEasyChatGroupName_Time: ; 85EEA00
+gEasyChatGroupName_Time: @ 85EEA00
 	.charmapstr "TIME$"
 
-gEasyChatGroupName_Misc: ; 85EEA05
+gEasyChatGroupName_Misc: @ 85EEA05
 	.charmapstr "MISC.$"
 
-gEasyChatGroupName_Adjectives: ; 85EEA0B
+gEasyChatGroupName_Adjectives: @ 85EEA0B
 	.charmapstr "ADJECTIVES$"
 
-gEasyChatGroupName_Events: ; 85EEA16
+gEasyChatGroupName_Events: @ 85EEA16
 	.charmapstr "EVENTS$"
 
-gEasyChatGroupName_Move1: ; 85EEA1D
+gEasyChatGroupName_Move1: @ 85EEA1D
 	.charmapstr "MOVE 1$"
 
-gEasyChatGroupName_Move2: ; 85EEA24
+gEasyChatGroupName_Move2: @ 85EEA24
 	.charmapstr "MOVE 2$"
 
-gEasyChatGroupName_TrendySaying: ; 85EEA2B
+gEasyChatGroupName_TrendySaying: @ 85EEA2B
 	.charmapstr "TRENDY SAYING$"
 
-gEasyChatGroupName_Pokemon2: ; 85EEA39
+gEasyChatGroupName_Pokemon2: @ 85EEA39
 	.charmapstr "POKéMON2$"
diff --git a/data/text/easy_chat/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s
index 457dfb154..29214bf5a 100644
--- a/data/text/easy_chat/easy_chat_group_people.s
+++ b/data/text/easy_chat/easy_chat_group_people.s
@@ -1,527 +1,527 @@
-gEasyChatWord_Opponent: ; 8599348
+gEasyChatWord_Opponent: @ 8599348
 	.charmapstr "OPPONENT$"
 
-gEasyChatWord_I: ; 8599351
+gEasyChatWord_I: @ 8599351
 	.charmapstr "I$"
 
-gEasyChatWord_You: ; 8599353
+gEasyChatWord_You: @ 8599353
 	.charmapstr "YOU$"
 
-gEasyChatWord_Yours: ; 8599357
+gEasyChatWord_Yours: @ 8599357
 	.charmapstr "YOURS$"
 
-gEasyChatWord_Son: ; 859935D
+gEasyChatWord_Son: @ 859935D
 	.charmapstr "SON$"
 
-gEasyChatWord_Your: ; 8599361
+gEasyChatWord_Your: @ 8599361
 	.charmapstr "YOUR$"
 
-gEasyChatWord_Youre: ; 8599366
+gEasyChatWord_Youre: @ 8599366
 	.charmapstr "YOU’RE$"
 
-gEasyChatWord_Youve: ; 859936D
+gEasyChatWord_Youve: @ 859936D
 	.charmapstr "YOU’VE$"
 
-gEasyChatWord_Mother: ; 8599374
+gEasyChatWord_Mother: @ 8599374
 	.charmapstr "MOTHER$"
 
-gEasyChatWord_Grandfather: ; 859937B
+gEasyChatWord_Grandfather: @ 859937B
 	.charmapstr "GRANDFATHER$"
 
-gEasyChatWord_Uncle: ; 8599387
+gEasyChatWord_Uncle: @ 8599387
 	.charmapstr "UNCLE$"
 
-gEasyChatWord_Father: ; 859938D
+gEasyChatWord_Father: @ 859938D
 	.charmapstr "FATHER$"
 
-gEasyChatWord_Boy: ; 8599394
+gEasyChatWord_Boy: @ 8599394
 	.charmapstr "BOY$"
 
-gEasyChatWord_Adult: ; 8599398
+gEasyChatWord_Adult: @ 8599398
 	.charmapstr "ADULT$"
 
-gEasyChatWord_Brother: ; 859939E
+gEasyChatWord_Brother: @ 859939E
 	.charmapstr "BROTHER$"
 
-gEasyChatWord_Sister: ; 85993A6
+gEasyChatWord_Sister: @ 85993A6
 	.charmapstr "SISTER$"
 
-gEasyChatWord_Grandmother: ; 85993AD
+gEasyChatWord_Grandmother: @ 85993AD
 	.charmapstr "GRANDMOTHER$"
 
-gEasyChatWord_Aunt: ; 85993B9
+gEasyChatWord_Aunt: @ 85993B9
 	.charmapstr "AUNT$"
 
-gEasyChatWord_Parent: ; 85993BE
+gEasyChatWord_Parent: @ 85993BE
 	.charmapstr "PARENT$"
 
-gEasyChatWord_Man: ; 85993C5
+gEasyChatWord_Man: @ 85993C5
 	.charmapstr "MAN$"
 
-gEasyChatWord_Me: ; 85993C9
+gEasyChatWord_Me: @ 85993C9
 	.charmapstr "ME$"
 
-gEasyChatWord_Girl: ; 85993CC
+gEasyChatWord_Girl: @ 85993CC
 	.charmapstr "GIRL$"
 
-gEasyChatWord_Babe: ; 85993D1
+gEasyChatWord_Babe: @ 85993D1
 	.charmapstr "BABE$"
 
-gEasyChatWord_Family: ; 85993D6
+gEasyChatWord_Family: @ 85993D6
 	.charmapstr "FAMILY$"
 
-gEasyChatWord_Her: ; 85993DD
+gEasyChatWord_Her: @ 85993DD
 	.charmapstr "HER$"
 
-gEasyChatWord_Him: ; 85993E1
+gEasyChatWord_Him: @ 85993E1
 	.charmapstr "HIM$"
 
-gEasyChatWord_He: ; 85993E5
+gEasyChatWord_He: @ 85993E5
 	.charmapstr "HE$"
 
-gEasyChatWord_Place: ; 85993E8
+gEasyChatWord_Place: @ 85993E8
 	.charmapstr "PLACE$"
 
-gEasyChatWord_Daughter: ; 85993EE
+gEasyChatWord_Daughter: @ 85993EE
 	.charmapstr "DAUGHTER$"
 
-gEasyChatWord_His: ; 85993F7
+gEasyChatWord_His: @ 85993F7
 	.charmapstr "HIS$"
 
-gEasyChatWord_Hes: ; 85993FB
+gEasyChatWord_Hes: @ 85993FB
 	.charmapstr "HE’S$"
 
-gEasyChatWord_Arent: ; 8599400
+gEasyChatWord_Arent: @ 8599400
 	.charmapstr "AREN’T$"
 
-gEasyChatWord_Siblings: ; 8599407
+gEasyChatWord_Siblings: @ 8599407
 	.charmapstr "SIBLINGS$"
 
-gEasyChatWord_Kid: ; 8599410
+gEasyChatWord_Kid: @ 8599410
 	.charmapstr "KID$"
 
-gEasyChatWord_Children: ; 8599414
+gEasyChatWord_Children: @ 8599414
 	.charmapstr "CHILDREN$"
 
-gEasyChatWord_Mr: ; 859941D
+gEasyChatWord_Mr: @ 859941D
 	.charmapstr "MR.$"
 
-gEasyChatWord_Mrs: ; 8599421
+gEasyChatWord_Mrs: @ 8599421
 	.charmapstr "MRS.$"
 
-gEasyChatWord_Myself: ; 8599426
+gEasyChatWord_Myself: @ 8599426
 	.charmapstr "MYSELF$"
 
-gEasyChatWord_IWas: ; 859942D
+gEasyChatWord_IWas: @ 859942D
 	.charmapstr "I WAS$"
 
-gEasyChatWord_ToMe: ; 8599433
+gEasyChatWord_ToMe: @ 8599433
 	.charmapstr "TO ME$"
 
-gEasyChatWord_My: ; 8599439
+gEasyChatWord_My: @ 8599439
 	.charmapstr "MY$"
 
-gEasyChatWord_IAm: ; 859943C
+gEasyChatWord_IAm: @ 859943C
 	.charmapstr "I AM$"
 
-gEasyChatWord_Ive: ; 8599441
+gEasyChatWord_Ive: @ 8599441
 	.charmapstr "I’VE$"
 
-gEasyChatWord_Who: ; 8599446
+gEasyChatWord_Who: @ 8599446
 	.charmapstr "WHO$"
 
-gEasyChatWord_Someone: ; 859944A
+gEasyChatWord_Someone: @ 859944A
 	.charmapstr "SOMEONE$"
 
-gEasyChatWord_WhoWas: ; 8599452
+gEasyChatWord_WhoWas: @ 8599452
 	.charmapstr "WHO WAS$"
 
-gEasyChatWord_ToWhom: ; 859945A
+gEasyChatWord_ToWhom: @ 859945A
 	.charmapstr "TO WHOM$"
 
-gEasyChatWord_Whose: ; 8599462
+gEasyChatWord_Whose: @ 8599462
 	.charmapstr "WHOSE$"
 
-gEasyChatWord_WhoIs: ; 8599468
+gEasyChatWord_WhoIs: @ 8599468
 	.charmapstr "WHO IS$"
 
-gEasyChatWord_Its: ; 859946F
+gEasyChatWord_Its: @ 859946F
 	.charmapstr "IT’S$"
 
-gEasyChatWord_Lady: ; 8599474
+gEasyChatWord_Lady: @ 8599474
 	.charmapstr "LADY$"
 
-gEasyChatWord_Friend: ; 8599479
+gEasyChatWord_Friend: @ 8599479
 	.charmapstr "FRIEND$"
 
-gEasyChatWord_Ally: ; 8599480
+gEasyChatWord_Ally: @ 8599480
 	.charmapstr "ALLY$"
 
-gEasyChatWord_Person: ; 8599485
+gEasyChatWord_Person: @ 8599485
 	.charmapstr "PERSON$"
 
-gEasyChatWord_Dude: ; 859948C
+gEasyChatWord_Dude: @ 859948C
 	.charmapstr "DUDE$"
 
-gEasyChatWord_They: ; 8599491
+gEasyChatWord_They: @ 8599491
 	.charmapstr "THEY$"
 
-gEasyChatWord_TheyWere: ; 8599496
+gEasyChatWord_TheyWere: @ 8599496
 	.charmapstr "THEY WERE$"
 
-gEasyChatWord_ToThem: ; 85994A0
+gEasyChatWord_ToThem: @ 85994A0
 	.charmapstr "TO THEM$"
 
-gEasyChatWord_Their: ; 85994A8
+gEasyChatWord_Their: @ 85994A8
 	.charmapstr "THEIR$"
 
-gEasyChatWord_Theyre: ; 85994AE
+gEasyChatWord_Theyre: @ 85994AE
 	.charmapstr "THEY’RE$"
 
-gEasyChatWord_Theyve: ; 85994B6
+gEasyChatWord_Theyve: @ 85994B6
 	.charmapstr "THEY’VE$"
 
-gEasyChatWord_We: ; 85994BE
+gEasyChatWord_We: @ 85994BE
 	.charmapstr "WE$"
 
-gEasyChatWord_Been: ; 85994C1
+gEasyChatWord_Been: @ 85994C1
 	.charmapstr "BEEN$"
 
-gEasyChatWord_ToUs: ; 85994C6
+gEasyChatWord_ToUs: @ 85994C6
 	.charmapstr "TO US$"
 
-gEasyChatWord_Our: ; 85994CC
+gEasyChatWord_Our: @ 85994CC
 	.charmapstr "OUR$"
 
-gEasyChatWord_WeAre: ; 85994D0
+gEasyChatWord_WeAre: @ 85994D0
 	.charmapstr "WE’RE$"
 
-gEasyChatWord_Rival: ; 85994D6
+gEasyChatWord_Rival: @ 85994D6
 	.charmapstr "RIVAL$"
 
-gEasyChatWord_Weve: ; 85994DC
+gEasyChatWord_Weve: @ 85994DC
 	.charmapstr "WE’VE$"
 
-gEasyChatWord_Woman: ; 85994E2
+gEasyChatWord_Woman: @ 85994E2
 	.charmapstr "WOMAN$"
 
-gEasyChatWord_She: ; 85994E8
+gEasyChatWord_She: @ 85994E8
 	.charmapstr "SHE$"
 
-gEasyChatWord_SheWas: ; 85994EC
+gEasyChatWord_SheWas: @ 85994EC
 	.charmapstr "SHE WAS$"
 
-gEasyChatWord_ToHer: ; 85994F4
+gEasyChatWord_ToHer: @ 85994F4
 	.charmapstr "TO HER$"
 
-gEasyChatWord_Hers: ; 85994FB
+gEasyChatWord_Hers: @ 85994FB
 	.charmapstr "HERS$"
 
-gEasyChatWord_SheIs: ; 8599500
+gEasyChatWord_SheIs: @ 8599500
 	.charmapstr "SHE IS$"
 
-gEasyChatWord_Some: ; 8599507
+gEasyChatWord_Some: @ 8599507
 	.charmapstr "SOME$"
 
 	.align 2, 0
 
-gEasyChatGroup_People: ; 859950C
+gEasyChatGroup_People: @ 859950C
 	.4byte gEasyChatWord_Opponent
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_I
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_You
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yours
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Son
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Your
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Youre
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Youve
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mother
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Grandfather
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Uncle
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Father
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Boy
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Adult
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Brother
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sister
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Grandmother
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Aunt
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Parent
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Man
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Me
-	.4byte 72 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 72 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Girl
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Babe
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Family
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Her
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Him
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_He
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Place
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Daughter
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_His
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hes
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Arent
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Siblings
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Kid
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Children
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mr
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mrs
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Myself
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IWas
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ToMe
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_My
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_IAm
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ive
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Who
-	.4byte 69 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 69 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Someone
-	.4byte 73 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 73 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WhoWas
-	.4byte 70 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 70 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ToWhom
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Whose
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WhoIs
-	.4byte 74 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 74 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Its
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lady
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Friend
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ally
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Person
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dude
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_They
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TheyWere
-	.4byte 71 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 71 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ToThem
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Their
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Theyre
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Theyve
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_We
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Been
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ToUs
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Our
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WeAre
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rival
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Weve
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Woman
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_She
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SheWas
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ToHer
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hers
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SheIs
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Some
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_pokemon.s b/data/text/easy_chat/easy_chat_group_pokemon.s
index 06b615ea7..3f6403a19 100644
--- a/data/text/easy_chat/easy_chat_group_pokemon.s
+++ b/data/text/easy_chat/easy_chat_group_pokemon.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEasyChatGroup_Pokemon: ; 8597E9C
+gEasyChatGroup_Pokemon: @ 8597E9C
 	.2byte SPECIES_ABRA
 	.2byte SPECIES_ABSOL
 	.2byte SPECIES_AGGRON
diff --git a/data/text/easy_chat/easy_chat_group_pokemon2.s b/data/text/easy_chat/easy_chat_group_pokemon2.s
index b5ee78281..498c20d3c 100644
--- a/data/text/easy_chat/easy_chat_group_pokemon2.s
+++ b/data/text/easy_chat/easy_chat_group_pokemon2.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gEasyChatGroup_Pokemon2: ; 859CE0C
+gEasyChatGroup_Pokemon2: @ 859CE0C
 	.2byte SPECIES_ABRA
 	.2byte SPECIES_AERODACTYL
 	.2byte SPECIES_AIPOM
diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s
index b73d27c6f..6e3e31cec 100644
--- a/data/text/easy_chat/easy_chat_group_speech.s
+++ b/data/text/easy_chat/easy_chat_group_speech.s
@@ -1,422 +1,422 @@
-gEasyChatWord_Listen: ; 8599CE8
+gEasyChatWord_Listen: @ 8599CE8
 	.charmapstr "LISTEN$"
 
-gEasyChatWord_NotVery: ; 8599CEF
+gEasyChatWord_NotVery: @ 8599CEF
 	.charmapstr "NOT VERY$"
 
-gEasyChatWord_Mean: ; 8599CF8
+gEasyChatWord_Mean: @ 8599CF8
 	.charmapstr "MEAN$"
 
-gEasyChatWord_Lie: ; 8599CFD
+gEasyChatWord_Lie: @ 8599CFD
 	.charmapstr "LIE$"
 
-gEasyChatWord_Lay: ; 8599D01
+gEasyChatWord_Lay: @ 8599D01
 	.charmapstr "LAY$"
 
-gEasyChatWord_Recommend: ; 8599D05
+gEasyChatWord_Recommend: @ 8599D05
 	.charmapstr "RECOMMEND$"
 
-gEasyChatWord_Nitwit: ; 8599D0F
+gEasyChatWord_Nitwit: @ 8599D0F
 	.charmapstr "NITWIT$"
 
-gEasyChatWord_Quite: ; 8599D16
+gEasyChatWord_Quite: @ 8599D16
 	.charmapstr "QUITE$"
 
-gEasyChatWord_From: ; 8599D1C
+gEasyChatWord_From: @ 8599D1C
 	.charmapstr "FROM$"
 
-gEasyChatWord_Feeling: ; 8599D21
+gEasyChatWord_Feeling: @ 8599D21
 	.charmapstr "FEELING$"
 
-gEasyChatWord_But: ; 8599D29
+gEasyChatWord_But: @ 8599D29
 	.charmapstr "BUT$"
 
-gEasyChatWord_However: ; 8599D2D
+gEasyChatWord_However: @ 8599D2D
 	.charmapstr "HOWEVER$"
 
-gEasyChatWord_Case: ; 8599D35
+gEasyChatWord_Case: @ 8599D35
 	.charmapstr "CASE$"
 
-gEasyChatWord_The: ; 8599D3A
+gEasyChatWord_The: @ 8599D3A
 	.charmapstr "THE$"
 
-gEasyChatWord_Miss: ; 8599D3E
+gEasyChatWord_Miss: @ 8599D3E
 	.charmapstr "MISS$"
 
-gEasyChatWord_How: ; 8599D43
+gEasyChatWord_How: @ 8599D43
 	.charmapstr "HOW$"
 
-gEasyChatWord_Hit: ; 8599D47
+gEasyChatWord_Hit: @ 8599D47
 	.charmapstr "HIT$"
 
-gEasyChatWord_Enough: ; 8599D4B
+gEasyChatWord_Enough: @ 8599D4B
 	.charmapstr "ENOUGH$"
 
-gEasyChatWord_ALot: ; 8599D52
+gEasyChatWord_ALot: @ 8599D52
 	.charmapstr "A LOT$"
 
-gEasyChatWord_ALittle: ; 8599D58
+gEasyChatWord_ALittle: @ 8599D58
 	.charmapstr "A LITTLE$"
 
-gEasyChatWord_Absolutely: ; 8599D61
+gEasyChatWord_Absolutely: @ 8599D61
 	.charmapstr "ABSOLUTELY$"
 
-gEasyChatWord_And: ; 8599D6C
+gEasyChatWord_And: @ 8599D6C
 	.charmapstr "AND$"
 
-gEasyChatWord_Only: ; 8599D70
+gEasyChatWord_Only: @ 8599D70
 	.charmapstr "ONLY$"
 
-gEasyChatWord_Around: ; 8599D75
+gEasyChatWord_Around: @ 8599D75
 	.charmapstr "AROUND$"
 
-gEasyChatWord_Probably: ; 8599D7C
+gEasyChatWord_Probably: @ 8599D7C
 	.charmapstr "PROBABLY$"
 
-gEasyChatWord_If: ; 8599D85
+gEasyChatWord_If: @ 8599D85
 	.charmapstr "IF$"
 
-gEasyChatWord_Very: ; 8599D88
+gEasyChatWord_Very: @ 8599D88
 	.charmapstr "VERY$"
 
-gEasyChatWord_ATinyBit: ; 8599D8D
+gEasyChatWord_ATinyBit: @ 8599D8D
 	.charmapstr "A TINY BIT$"
 
-gEasyChatWord_Wild: ; 8599D98
+gEasyChatWord_Wild: @ 8599D98
 	.charmapstr "WILD$"
 
-gEasyChatWord_Thats: ; 8599D9D
+gEasyChatWord_Thats: @ 8599D9D
 	.charmapstr "THAT’S$"
 
-gEasyChatWord_Just: ; 8599DA4
+gEasyChatWord_Just: @ 8599DA4
 	.charmapstr "JUST$"
 
-gEasyChatWord_EvenSo: ; 8599DA9
+gEasyChatWord_EvenSo: @ 8599DA9
 	.charmapstr "EVEN SO,$"
 
-gEasyChatWord_MustBe: ; 8599DB2
+gEasyChatWord_MustBe: @ 8599DB2
 	.charmapstr "MUST BE$"
 
-gEasyChatWord_Naturally: ; 8599DBA
+gEasyChatWord_Naturally: @ 8599DBA
 	.charmapstr "NATURALLY$"
 
-gEasyChatWord_ForNow: ; 8599DC4
+gEasyChatWord_ForNow: @ 8599DC4
 	.charmapstr "FOR NOW,$"
 
-gEasyChatWord_Understood: ; 8599DCD
+gEasyChatWord_Understood: @ 8599DCD
 	.charmapstr "UNDERSTOOD$"
 
-gEasyChatWord_Joking: ; 8599DD8
+gEasyChatWord_Joking: @ 8599DD8
 	.charmapstr "JOKING$"
 
-gEasyChatWord_Ready: ; 8599DDF
+gEasyChatWord_Ready: @ 8599DDF
 	.charmapstr "READY$"
 
-gEasyChatWord_Something: ; 8599DE5
+gEasyChatWord_Something: @ 8599DE5
 	.charmapstr "SOMETHING$"
 
-gEasyChatWord_Somehow: ; 8599DEF
+gEasyChatWord_Somehow: @ 8599DEF
 	.charmapstr "SOMEHOW$"
 
-gEasyChatWord_Although: ; 8599DF7
+gEasyChatWord_Although: @ 8599DF7
 	.charmapstr "ALTHOUGH$"
 
-gEasyChatWord_Also: ; 8599E00
+gEasyChatWord_Also: @ 8599E00
 	.charmapstr "ALSO$"
 
-gEasyChatWord_Perfect: ; 8599E05
+gEasyChatWord_Perfect: @ 8599E05
 	.charmapstr "PERFECT$"
 
-gEasyChatWord_AsMuchAs: ; 8599E0D
+gEasyChatWord_AsMuchAs: @ 8599E0D
 	.charmapstr "AS MUCH AS$"
 
-gEasyChatWord_Really: ; 8599E18
+gEasyChatWord_Really: @ 8599E18
 	.charmapstr "REALLY$"
 
-gEasyChatWord_Truly: ; 8599E1F
+gEasyChatWord_Truly: @ 8599E1F
 	.charmapstr "TRULY$"
 
-gEasyChatWord_Seriously: ; 8599E25
+gEasyChatWord_Seriously: @ 8599E25
 	.charmapstr "SERIOUSLY$"
 
-gEasyChatWord_Totally: ; 8599E2F
+gEasyChatWord_Totally: @ 8599E2F
 	.charmapstr "TOTALLY$"
 
-gEasyChatWord_Until: ; 8599E37
+gEasyChatWord_Until: @ 8599E37
 	.charmapstr "UNTIL$"
 
-gEasyChatWord_AsIf: ; 8599E3D
+gEasyChatWord_AsIf: @ 8599E3D
 	.charmapstr "AS IF$"
 
-gEasyChatWord_Mood: ; 8599E43
+gEasyChatWord_Mood: @ 8599E43
 	.charmapstr "MOOD$"
 
-gEasyChatWord_Rather: ; 8599E48
+gEasyChatWord_Rather: @ 8599E48
 	.charmapstr "RATHER$"
 
-gEasyChatWord_Awfully: ; 8599E4F
+gEasyChatWord_Awfully: @ 8599E4F
 	.charmapstr "AWFULLY$"
 
-gEasyChatWord_Mode: ; 8599E57
+gEasyChatWord_Mode: @ 8599E57
 	.charmapstr "MODE$"
 
-gEasyChatWord_More: ; 8599E5C
+gEasyChatWord_More: @ 8599E5C
 	.charmapstr "MORE$"
 
-gEasyChatWord_TooLate: ; 8599E61
+gEasyChatWord_TooLate: @ 8599E61
 	.charmapstr "TOO LATE$"
 
-gEasyChatWord_Finally: ; 8599E6A
+gEasyChatWord_Finally: @ 8599E6A
 	.charmapstr "FINALLY$"
 
-gEasyChatWord_Any: ; 8599E72
+gEasyChatWord_Any: @ 8599E72
 	.charmapstr "ANY$"
 
-gEasyChatWord_Instead: ; 8599E76
+gEasyChatWord_Instead: @ 8599E76
 	.charmapstr "INSTEAD$"
 
-gEasyChatWord_Fantastic: ; 8599E7E
+gEasyChatWord_Fantastic: @ 8599E7E
 	.charmapstr "FANTASTIC$"
 
 	.align 2, 0
 
-gEasyChatGroup_Speech: ; 8599E88
+gEasyChatGroup_Speech: @ 8599E88
 	.4byte gEasyChatWord_Listen
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_NotVery
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mean
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lie
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lay
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Recommend
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nitwit
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Quite
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_From
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Feeling
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_But
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_However
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Case
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_The
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Miss
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_How
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hit
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Enough
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ALot
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ALittle
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Absolutely
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_And
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Only
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Around
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Probably
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_If
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Very
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ATinyBit
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wild
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thats
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Just
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EvenSo
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MustBe
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Naturally
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ForNow
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Understood
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Joking
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ready
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Something
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Somehow
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Although
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Also
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Perfect
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AsMuchAs
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Really
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Truly
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Seriously
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Totally
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Until
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AsIf
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mood
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rather
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Awfully
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mode
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_More
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_TooLate
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Finally
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Any
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Instead
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fantastic
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_status.s b/data/text/easy_chat/easy_chat_group_status.s
index 56f259767..1086e0d79 100644
--- a/data/text/easy_chat/easy_chat_group_status.s
+++ b/data/text/easy_chat/easy_chat_group_status.s
@@ -1,765 +1,765 @@
-gEasyChatWord_Dark: ; 8598234
+gEasyChatWord_Dark: @ 8598234
 	.charmapstr "DARK$"
 
-gEasyChatWord_Stench: ; 8598239
+gEasyChatWord_Stench: @ 8598239
 	.charmapstr "STENCH$"
 
-gEasyChatWord_ThickFat: ; 8598240
+gEasyChatWord_ThickFat: @ 8598240
 	.charmapstr "THICK FAT$"
 
-gEasyChatWord_RainDish: ; 859824A
+gEasyChatWord_RainDish: @ 859824A
 	.charmapstr "RAIN DISH$"
 
-gEasyChatWord_Drizzle: ; 8598254
+gEasyChatWord_Drizzle: @ 8598254
 	.charmapstr "DRIZZLE$"
 
-gEasyChatWord_ArenaTrap: ; 859825C
+gEasyChatWord_ArenaTrap: @ 859825C
 	.charmapstr "ARENA TRAP$"
 
-gEasyChatWord_Intimidate: ; 8598267
+gEasyChatWord_Intimidate: @ 8598267
 	.charmapstr "INTIMIDATE$"
 
-gEasyChatWord_RockHead: ; 8598272
+gEasyChatWord_RockHead: @ 8598272
 	.charmapstr "ROCK HEAD$"
 
-gEasyChatWord_Color: ; 859827C
+gEasyChatWord_Color: @ 859827C
 	.charmapstr "COLOR$"
 
-gEasyChatWord_AltColor: ; 8598282
+gEasyChatWord_AltColor: @ 8598282
 	.charmapstr "ALT. COLOR$"
 
-gEasyChatWord_Rock: ; 859828D
+gEasyChatWord_Rock: @ 859828D
 	.charmapstr "ROCK$"
 
-gEasyChatWord_Beautiful: ; 8598292
+gEasyChatWord_Beautiful: @ 8598292
 	.charmapstr "BEAUTIFUL$"
 
-gEasyChatWord_Beauty: ; 859829C
+gEasyChatWord_Beauty: @ 859829C
 	.charmapstr "BEAUTY$"
 
-gEasyChatWord_AirLock: ; 85982A3
+gEasyChatWord_AirLock: @ 85982A3
 	.charmapstr "AIR LOCK$"
 
-gEasyChatWord_Psychic: ; 85982AC
+gEasyChatWord_Psychic: @ 85982AC
 	.charmapstr "PSYCHIC$"
 
-gEasyChatWord_HyperCutter: ; 85982B4
+gEasyChatWord_HyperCutter: @ 85982B4
 	.charmapstr "HYPER CUTTER$"
 
-gEasyChatWord_Fighting: ; 85982C1
+gEasyChatWord_Fighting: @ 85982C1
 	.charmapstr "FIGHTING$"
 
-gEasyChatWord_ShadowTag: ; 85982CA
+gEasyChatWord_ShadowTag: @ 85982CA
 	.charmapstr "SHADOW TAG$"
 
-gEasyChatWord_Smart: ; 85982D5
+gEasyChatWord_Smart: @ 85982D5
 	.charmapstr "SMART$"
 
-gEasyChatWord_Smartness: ; 85982DB
+gEasyChatWord_Smartness: @ 85982DB
 	.charmapstr "SMARTNESS$"
 
-gEasyChatWord_SpeedBoost: ; 85982E5
+gEasyChatWord_SpeedBoost: @ 85982E5
 	.charmapstr "SPEED BOOST$"
 
-gEasyChatWord_Cool: ; 85982F1
+gEasyChatWord_Cool: @ 85982F1
 	.charmapstr "COOL$"
 
-gEasyChatWord_Coolness: ; 85982F6
+gEasyChatWord_Coolness: @ 85982F6
 	.charmapstr "COOLNESS$"
 
-gEasyChatWord_BattleArmor: ; 85982FF
+gEasyChatWord_BattleArmor: @ 85982FF
 	.charmapstr "BATTLE ARMOR$"
 
-gEasyChatWord_Cute: ; 859830C
+gEasyChatWord_Cute: @ 859830C
 	.charmapstr "CUTE$"
 
-gEasyChatWord_Cuteness: ; 8598311
+gEasyChatWord_Cuteness: @ 8598311
 	.charmapstr "CUTENESS$"
 
-gEasyChatWord_Sturdy: ; 859831A
+gEasyChatWord_Sturdy: @ 859831A
 	.charmapstr "STURDY$"
 
-gEasyChatWord_SuctionCups: ; 8598321
+gEasyChatWord_SuctionCups: @ 8598321
 	.charmapstr "SUCTION CUPS$"
 
-gEasyChatWord_Grass: ; 859832E
+gEasyChatWord_Grass: @ 859832E
 	.charmapstr "GRASS$"
 
-gEasyChatWord_ClearBody: ; 8598334
+gEasyChatWord_ClearBody: @ 8598334
 	.charmapstr "CLEAR BODY$"
 
-gEasyChatWord_Torrent: ; 859833F
+gEasyChatWord_Torrent: @ 859833F
 	.charmapstr "TORRENT$"
 
-gEasyChatWord_Ghost: ; 8598347
+gEasyChatWord_Ghost: @ 8598347
 	.charmapstr "GHOST$"
 
-gEasyChatWord_Ice: ; 859834D
+gEasyChatWord_Ice: @ 859834D
 	.charmapstr "ICE$"
 
-gEasyChatWord_Guts: ; 8598351
+gEasyChatWord_Guts: @ 8598351
 	.charmapstr "GUTS$"
 
-gEasyChatWord_RoughSkin: ; 8598356
+gEasyChatWord_RoughSkin: @ 8598356
 	.charmapstr "ROUGH SKIN$"
 
-gEasyChatWord_ShellArmor: ; 8598361
+gEasyChatWord_ShellArmor: @ 8598361
 	.charmapstr "SHELL ARMOR$"
 
-gEasyChatWord_NaturalCure: ; 859836D
+gEasyChatWord_NaturalCure: @ 859836D
 	.charmapstr "NATURAL CURE$"
 
-gEasyChatWord_Damp: ; 859837A
+gEasyChatWord_Damp: @ 859837A
 	.charmapstr "DAMP$"
 
-gEasyChatWord_Ground: ; 859837F
+gEasyChatWord_Ground: @ 859837F
 	.charmapstr "GROUND$"
 
-gEasyChatWord_Limber: ; 8598386
+gEasyChatWord_Limber: @ 8598386
 	.charmapstr "LIMBER$"
 
-gEasyChatWord_MagnetPull: ; 859838D
+gEasyChatWord_MagnetPull: @ 859838D
 	.charmapstr "MAGNET PULL$"
 
-gEasyChatWord_WhiteSmoke: ; 8598399
+gEasyChatWord_WhiteSmoke: @ 8598399
 	.charmapstr "WHITE SMOKE$"
 
-gEasyChatWord_Synchronize: ; 85983A5
+gEasyChatWord_Synchronize: @ 85983A5
 	.charmapstr "SYNCHRONIZE$"
 
-gEasyChatWord_Overgrow: ; 85983B1
+gEasyChatWord_Overgrow: @ 85983B1
 	.charmapstr "OVERGROW$"
 
-gEasyChatWord_SwiftSwim: ; 85983BA
+gEasyChatWord_SwiftSwim: @ 85983BA
 	.charmapstr "SWIFT SWIM$"
 
-gEasyChatWord_SandStream: ; 85983C5
+gEasyChatWord_SandStream: @ 85983C5
 	.charmapstr "SAND STREAM$"
 
-gEasyChatWord_SandVeil: ; 85983D1
+gEasyChatWord_SandVeil: @ 85983D1
 	.charmapstr "SAND VEIL$"
 
-gEasyChatWord_KeenEye: ; 85983DB
+gEasyChatWord_KeenEye: @ 85983DB
 	.charmapstr "KEEN EYE$"
 
-gEasyChatWord_InnerFocus: ; 85983E4
+gEasyChatWord_InnerFocus: @ 85983E4
 	.charmapstr "INNER FOCUS$"
 
-gEasyChatWord_Static: ; 85983F0
+gEasyChatWord_Static: @ 85983F0
 	.charmapstr "STATIC$"
 
-gEasyChatWord_Type: ; 85983F7
+gEasyChatWord_Type: @ 85983F7
 	.charmapstr "TYPE$"
 
-gEasyChatWord_Tough: ; 85983FC
+gEasyChatWord_Tough: @ 85983FC
 	.charmapstr "TOUGH$"
 
-gEasyChatWord_Toughness: ; 8598402
+gEasyChatWord_Toughness: @ 8598402
 	.charmapstr "TOUGHNESS$"
 
-gEasyChatWord_ShedSkin: ; 859840C
+gEasyChatWord_ShedSkin: @ 859840C
 	.charmapstr "SHED SKIN$"
 
-gEasyChatWord_HugePower: ; 8598416
+gEasyChatWord_HugePower: @ 8598416
 	.charmapstr "HUGE POWER$"
 
-gEasyChatWord_VoltAbsorb: ; 8598421
+gEasyChatWord_VoltAbsorb: @ 8598421
 	.charmapstr "VOLT ABSORB$"
 
-gEasyChatWord_WaterAbsorb: ; 859842D
+gEasyChatWord_WaterAbsorb: @ 859842D
 	.charmapstr "WATER ABSORB$"
 
-gEasyChatWord_Electric: ; 859843A
+gEasyChatWord_Electric: @ 859843A
 	.charmapstr "ELECTRIC$"
 
-gEasyChatWord_Forecast: ; 8598443
+gEasyChatWord_Forecast: @ 8598443
 	.charmapstr "FORECAST$"
 
-gEasyChatWord_SereneGrace: ; 859844C
+gEasyChatWord_SereneGrace: @ 859844C
 	.charmapstr "SERENE GRACE$"
 
-gEasyChatWord_Poison: ; 8598459
+gEasyChatWord_Poison: @ 8598459
 	.charmapstr "POISON$"
 
-gEasyChatWord_PoisonPoint: ; 8598460
+gEasyChatWord_PoisonPoint: @ 8598460
 	.charmapstr "POISON POINT$"
 
-gEasyChatWord_Dragon: ; 859846D
+gEasyChatWord_Dragon: @ 859846D
 	.charmapstr "DRAGON$"
 
-gEasyChatWord_Trace: ; 8598474
+gEasyChatWord_Trace: @ 8598474
 	.charmapstr "TRACE$"
 
-gEasyChatWord_Oblivious: ; 859847A
+gEasyChatWord_Oblivious: @ 859847A
 	.charmapstr "OBLIVIOUS$"
 
-gEasyChatWord_Truant: ; 8598484
+gEasyChatWord_Truant: @ 8598484
 	.charmapstr "TRUANT$"
 
-gEasyChatWord_RunAway: ; 859848B
+gEasyChatWord_RunAway: @ 859848B
 	.charmapstr "RUN AWAY$"
 
-gEasyChatWord_StickyHold: ; 8598494
+gEasyChatWord_StickyHold: @ 8598494
 	.charmapstr "STICKY HOLD$"
 
-gEasyChatWord_CloudNine: ; 85984A0
+gEasyChatWord_CloudNine: @ 85984A0
 	.charmapstr "CLOUD NINE$"
 
-gEasyChatWord_Normal: ; 85984AB
+gEasyChatWord_Normal: @ 85984AB
 	.charmapstr "NORMAL$"
 
-gEasyChatWord_Steel: ; 85984B2
+gEasyChatWord_Steel: @ 85984B2
 	.charmapstr "STEEL$"
 
-gEasyChatWord_Illuminate: ; 85984B8
+gEasyChatWord_Illuminate: @ 85984B8
 	.charmapstr "ILLUMINATE$"
 
-gEasyChatWord_EarlyBird: ; 85984C3
+gEasyChatWord_EarlyBird: @ 85984C3
 	.charmapstr "EARLY BIRD$"
 
-gEasyChatWord_Hustle: ; 85984CE
+gEasyChatWord_Hustle: @ 85984CE
 	.charmapstr "HUSTLE$"
 
-gEasyChatWord_Shine: ; 85984D5
+gEasyChatWord_Shine: @ 85984D5
 	.charmapstr "SHINE$"
 
-gEasyChatWord_Flying: ; 85984DB
+gEasyChatWord_Flying: @ 85984DB
 	.charmapstr "FLYING$"
 
-gEasyChatWord_Drought: ; 85984E2
+gEasyChatWord_Drought: @ 85984E2
 	.charmapstr "DROUGHT$"
 
-gEasyChatWord_Lightningrod: ; 85984EA
+gEasyChatWord_Lightningrod: @ 85984EA
 	.charmapstr "LIGHTNINGROD$"
 
-gEasyChatWord_Compoundeyes: ; 85984F7
+gEasyChatWord_Compoundeyes: @ 85984F7
 	.charmapstr "COMPOUNDEYES$"
 
-gEasyChatWord_MarvelScale: ; 8598504
+gEasyChatWord_MarvelScale: @ 8598504
 	.charmapstr "MARVEL SCALE$"
 
-gEasyChatWord_WonderGuard: ; 8598511
+gEasyChatWord_WonderGuard: @ 8598511
 	.charmapstr "WONDER GUARD$"
 
-gEasyChatWord_Insomnia: ; 859851E
+gEasyChatWord_Insomnia: @ 859851E
 	.charmapstr "INSOMNIA$"
 
-gEasyChatWord_Levitate: ; 8598527
+gEasyChatWord_Levitate: @ 8598527
 	.charmapstr "LEVITATE$"
 
-gEasyChatWord_Plus: ; 8598530
+gEasyChatWord_Plus: @ 8598530
 	.charmapstr "PLUS$"
 
-gEasyChatWord_Pressure: ; 8598535
+gEasyChatWord_Pressure: @ 8598535
 	.charmapstr "PRESSURE$"
 
-gEasyChatWord_LiquidOoze: ; 859853E
+gEasyChatWord_LiquidOoze: @ 859853E
 	.charmapstr "LIQUID OOZE$"
 
-gEasyChatWord_ColorChange: ; 859854A
+gEasyChatWord_ColorChange: @ 859854A
 	.charmapstr "COLOR CHANGE$"
 
-gEasyChatWord_Soundproof: ; 8598557
+gEasyChatWord_Soundproof: @ 8598557
 	.charmapstr "SOUNDPROOF$"
 
-gEasyChatWord_EffectSpore: ; 8598562
+gEasyChatWord_EffectSpore: @ 8598562
 	.charmapstr "EFFECT SPORE$"
 
-gEasyChatWord_Pkrs: ; 859856F
+gEasyChatWord_Pkrs: @ 859856F
 	.charmapstr "{PK}RS$"
 
-gEasyChatWord_Fire: ; 8598573
+gEasyChatWord_Fire: @ 8598573
 	.charmapstr "FIRE$"
 
-gEasyChatWord_FlameBody: ; 8598578
+gEasyChatWord_FlameBody: @ 8598578
 	.charmapstr "FLAME BODY$"
 
-gEasyChatWord_Minus: ; 8598583
+gEasyChatWord_Minus: @ 8598583
 	.charmapstr "MINUS$"
 
-gEasyChatWord_OwnTempo: ; 8598589
+gEasyChatWord_OwnTempo: @ 8598589
 	.charmapstr "OWN TEMPO$"
 
-gEasyChatWord_MagmaArmor: ; 8598593
+gEasyChatWord_MagmaArmor: @ 8598593
 	.charmapstr "MAGMA ARMOR$"
 
-gEasyChatWord_Water: ; 859859F
+gEasyChatWord_Water: @ 859859F
 	.charmapstr "WATER$"
 
-gEasyChatWord_WaterVeil: ; 85985A5
+gEasyChatWord_WaterVeil: @ 85985A5
 	.charmapstr "WATER VEIL$"
 
-gEasyChatWord_Bug: ; 85985B0
+gEasyChatWord_Bug: @ 85985B0
 	.charmapstr "BUG$"
 
-gEasyChatWord_Swarm: ; 85985B4
+gEasyChatWord_Swarm: @ 85985B4
 	.charmapstr "SWARM$"
 
-gEasyChatWord_CuteCharm: ; 85985BA
+gEasyChatWord_CuteCharm: @ 85985BA
 	.charmapstr "CUTE CHARM$"
 
-gEasyChatWord_Immunity: ; 85985C5
+gEasyChatWord_Immunity: @ 85985C5
 	.charmapstr "IMMUNITY$"
 
-gEasyChatWord_Blaze: ; 85985CE
+gEasyChatWord_Blaze: @ 85985CE
 	.charmapstr "BLAZE$"
 
-gEasyChatWord_Pickup: ; 85985D4
+gEasyChatWord_Pickup: @ 85985D4
 	.charmapstr "PICKUP$"
 
-gEasyChatWord_Pattern: ; 85985DB
+gEasyChatWord_Pattern: @ 85985DB
 	.charmapstr "PATTERN$"
 
-gEasyChatWord_FlashFire: ; 85985E3
+gEasyChatWord_FlashFire: @ 85985E3
 	.charmapstr "FLASH FIRE$"
 
-gEasyChatWord_VitalSpirit: ; 85985EE
+gEasyChatWord_VitalSpirit: @ 85985EE
 	.charmapstr "VITAL SPIRIT$"
 
-gEasyChatWord_Chlorophyll: ; 85985FB
+gEasyChatWord_Chlorophyll: @ 85985FB
 	.charmapstr "CHLOROPHYLL$"
 
-gEasyChatWord_PurePower: ; 8598607
+gEasyChatWord_PurePower: @ 8598607
 	.charmapstr "PURE POWER$"
 
-gEasyChatWord_ShieldDust: ; 8598612
+gEasyChatWord_ShieldDust: @ 8598612
 	.charmapstr "SHIELD DUST$"
 
 	.align 2, 0
 
-gEasyChatGroup_Status: ; 8598620
+gEasyChatGroup_Status: @ 8598620
 	.4byte gEasyChatWord_Dark
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Stench
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ThickFat
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_RainDish
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Drizzle
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ArenaTrap
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Intimidate
-	.4byte 101 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 101 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_RockHead
-	.4byte 97 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 97 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Color
-	.4byte 106 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 106 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AltColor
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Rock
-	.4byte 68 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 68 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Beautiful
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Beauty
-	.4byte 86 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 86 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AirLock
-	.4byte 78 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 78 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Psychic
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HyperCutter
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fighting
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ShadowTag
-	.4byte 99 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 99 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smart
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Smartness
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SpeedBoost
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cool
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Coolness
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_BattleArmor
-	.4byte 76 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 76 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cute
-	.4byte 72 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 72 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cuteness
-	.4byte 88 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 88 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sturdy
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SuctionCups
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Grass
-	.4byte 90 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 90 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ClearBody
-	.4byte 91 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 91 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Torrent
-	.4byte 104 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 104 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ghost
-	.4byte 75 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 75 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ice
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Guts
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_RoughSkin
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ShellArmor
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_NaturalCure
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Damp
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ground
-	.4byte 73 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 73 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Limber
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MagnetPull
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WhiteSmoke
-	.4byte 71 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 71 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Synchronize
-	.4byte 100 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 100 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Overgrow
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SwiftSwim
-	.4byte 81 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 81 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SandStream
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SandVeil
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_KeenEye
-	.4byte 82 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 82 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_InnerFocus
-	.4byte 77 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 77 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Static
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Type
-	.4byte 85 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 85 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tough
-	.4byte 94 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 94 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Toughness
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ShedSkin
-	.4byte 79 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 79 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HugePower
-	.4byte 92 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 92 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_VoltAbsorb
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WaterAbsorb
-	.4byte 69 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 69 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Electric
-	.4byte 64 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 64 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Forecast
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SereneGrace
-	.4byte 93 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 93 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Poison
-	.4byte 103 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 103 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_PoisonPoint
-	.4byte 102 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 102 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dragon
-	.4byte 89 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 89 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trace
-	.4byte 83 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 83 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Oblivious
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Truant
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_RunAway
-	.4byte 84 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 84 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_StickyHold
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_CloudNine
-	.4byte 107 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 107 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Normal
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Steel
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Illuminate
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EarlyBird
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hustle
-	.4byte 66 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 66 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shine
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Flying
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Drought
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lightningrod
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Compoundeyes
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MarvelScale
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WonderGuard
-	.4byte 108 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 108 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Insomnia
-	.4byte 74 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 74 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Levitate
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Plus
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pressure
-	.4byte 87 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 87 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_LiquidOoze
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ColorChange
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Soundproof
-	.4byte 70 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 70 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EffectSpore
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pkrs
-	.4byte 67 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 67 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fire
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_FlameBody
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Minus
-	.4byte 98 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 98 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OwnTempo
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MagmaArmor
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Water
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WaterVeil
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bug
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Swarm
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_CuteCharm
-	.4byte 63 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 63 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Immunity
-	.4byte 65 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 65 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Blaze
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pickup
-	.4byte 105 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 105 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pattern
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_FlashFire
-	.4byte 95 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 95 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_VitalSpirit
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Chlorophyll
-	.4byte 96 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 96 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_PurePower
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ShieldDust
-	.4byte 80 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 80 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_time.s b/data/text/easy_chat/easy_chat_group_time.s
index 36487bb6f..e6e1e6849 100644
--- a/data/text/easy_chat/easy_chat_group_time.s
+++ b/data/text/easy_chat/easy_chat_group_time.s
@@ -1,317 +1,317 @@
-gEasyChatWord_Fall: ; 859BD64
+gEasyChatWord_Fall: @ 859BD64
 	.charmapstr "FALL$"
 
-gEasyChatWord_Morning: ; 859BD69
+gEasyChatWord_Morning: @ 859BD69
 	.charmapstr "MORNING$"
 
-gEasyChatWord_Tomorrow: ; 859BD71
+gEasyChatWord_Tomorrow: @ 859BD71
 	.charmapstr "TOMORROW$"
 
-gEasyChatWord_Last: ; 859BD7A
+gEasyChatWord_Last: @ 859BD7A
 	.charmapstr "LAST$"
 
-gEasyChatWord_Day: ; 859BD7F
+gEasyChatWord_Day: @ 859BD7F
 	.charmapstr "DAY$"
 
-gEasyChatWord_Sometime: ; 859BD83
+gEasyChatWord_Sometime: @ 859BD83
 	.charmapstr "SOMETIME$"
 
-gEasyChatWord_Always: ; 859BD8C
+gEasyChatWord_Always: @ 859BD8C
 	.charmapstr "ALWAYS$"
 
-gEasyChatWord_Current: ; 859BD93
+gEasyChatWord_Current: @ 859BD93
 	.charmapstr "CURRENT$"
 
-gEasyChatWord_Forever: ; 859BD9B
+gEasyChatWord_Forever: @ 859BD9B
 	.charmapstr "FOREVER$"
 
-gEasyChatWord_Days: ; 859BDA3
+gEasyChatWord_Days: @ 859BDA3
 	.charmapstr "DAYS$"
 
-gEasyChatWord_End: ; 859BDA8
+gEasyChatWord_End: @ 859BDA8
 	.charmapstr "END$"
 
-gEasyChatWord_Tuesday: ; 859BDAC
+gEasyChatWord_Tuesday: @ 859BDAC
 	.charmapstr "TUESDAY$"
 
-gEasyChatWord_Yesterday: ; 859BDB4
+gEasyChatWord_Yesterday: @ 859BDB4
 	.charmapstr "YESTERDAY$"
 
-gEasyChatWord_Today: ; 859BDBE
+gEasyChatWord_Today: @ 859BDBE
 	.charmapstr "TODAY$"
 
-gEasyChatWord_Friday: ; 859BDC4
+gEasyChatWord_Friday: @ 859BDC4
 	.charmapstr "FRIDAY$"
 
-gEasyChatWord_Monday: ; 859BDCB
+gEasyChatWord_Monday: @ 859BDCB
 	.charmapstr "MONDAY$"
 
-gEasyChatWord_Later: ; 859BDD2
+gEasyChatWord_Later: @ 859BDD2
 	.charmapstr "LATER$"
 
-gEasyChatWord_Earlier: ; 859BDD8
+gEasyChatWord_Earlier: @ 859BDD8
 	.charmapstr "EARLIER$"
 
-gEasyChatWord_Another: ; 859BDE0
+gEasyChatWord_Another: @ 859BDE0
 	.charmapstr "ANOTHER$"
 
-gEasyChatWord_Time: ; 859BDE8
+gEasyChatWord_Time: @ 859BDE8
 	.charmapstr "TIME$"
 
-gEasyChatWord_Finish: ; 859BDED
+gEasyChatWord_Finish: @ 859BDED
 	.charmapstr "FINISH$"
 
-gEasyChatWord_Wednesday: ; 859BDF4
+gEasyChatWord_Wednesday: @ 859BDF4
 	.charmapstr "WEDNESDAY$"
 
-gEasyChatWord_Soon: ; 859BDFE
+gEasyChatWord_Soon: @ 859BDFE
 	.charmapstr "SOON$"
 
-gEasyChatWord_Start: ; 859BE03
+gEasyChatWord_Start: @ 859BE03
 	.charmapstr "START$"
 
-gEasyChatWord_Month: ; 859BE09
+gEasyChatWord_Month: @ 859BE09
 	.charmapstr "MONTH$"
 
-gEasyChatWord_Stop: ; 859BE0F
+gEasyChatWord_Stop: @ 859BE0F
 	.charmapstr "STOP$"
 
-gEasyChatWord_Now: ; 859BE14
+gEasyChatWord_Now: @ 859BE14
 	.charmapstr "NOW$"
 
-gEasyChatWord_Final: ; 859BE18
+gEasyChatWord_Final: @ 859BE18
 	.charmapstr "FINAL$"
 
-gEasyChatWord_Next: ; 859BE1E
+gEasyChatWord_Next: @ 859BE1E
 	.charmapstr "NEXT$"
 
-gEasyChatWord_Age: ; 859BE23
+gEasyChatWord_Age: @ 859BE23
 	.charmapstr "AGE$"
 
-gEasyChatWord_Saturday: ; 859BE27
+gEasyChatWord_Saturday: @ 859BE27
 	.charmapstr "SATURDAY$"
 
-gEasyChatWord_Summer: ; 859BE30
+gEasyChatWord_Summer: @ 859BE30
 	.charmapstr "SUMMER$"
 
-gEasyChatWord_Sunday: ; 859BE37
+gEasyChatWord_Sunday: @ 859BE37
 	.charmapstr "SUNDAY$"
 
-gEasyChatWord_Beginning: ; 859BE3E
+gEasyChatWord_Beginning: @ 859BE3E
 	.charmapstr "BEGINNING$"
 
-gEasyChatWord_Spring: ; 859BE48
+gEasyChatWord_Spring: @ 859BE48
 	.charmapstr "SPRING$"
 
-gEasyChatWord_Daytime: ; 859BE4F
+gEasyChatWord_Daytime: @ 859BE4F
 	.charmapstr "DAYTIME$"
 
-gEasyChatWord_Winter: ; 859BE57
+gEasyChatWord_Winter: @ 859BE57
 	.charmapstr "WINTER$"
 
-gEasyChatWord_Daily: ; 859BE5E
+gEasyChatWord_Daily: @ 859BE5E
 	.charmapstr "DAILY$"
 
-gEasyChatWord_Olden: ; 859BE64
+gEasyChatWord_Olden: @ 859BE64
 	.charmapstr "OLDEN$"
 
-gEasyChatWord_Almost: ; 859BE6A
+gEasyChatWord_Almost: @ 859BE6A
 	.charmapstr "ALMOST$"
 
-gEasyChatWord_Nearly: ; 859BE71
+gEasyChatWord_Nearly: @ 859BE71
 	.charmapstr "NEARLY$"
 
-gEasyChatWord_Thursday: ; 859BE78
+gEasyChatWord_Thursday: @ 859BE78
 	.charmapstr "THURSDAY$"
 
-gEasyChatWord_Nighttime: ; 859BE81
+gEasyChatWord_Nighttime: @ 859BE81
 	.charmapstr "NIGHTTIME$"
 
-gEasyChatWord_Night: ; 859BE8B
+gEasyChatWord_Night: @ 859BE8B
 	.charmapstr "NIGHT$"
 
-gEasyChatWord_Week: ; 859BE91
+gEasyChatWord_Week: @ 859BE91
 	.charmapstr "WEEK$"
 
 	.align 2, 0
 
-gEasyChatGroup_Time: ; 859BE98
+gEasyChatGroup_Time: @ 859BE98
 	.4byte gEasyChatWord_Fall
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Morning
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tomorrow
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Last
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Day
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sometime
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Always
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Current
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Forever
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Days
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_End
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tuesday
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yesterday
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Today
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Friday
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Monday
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Later
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Earlier
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Another
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Time
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Finish
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wednesday
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Soon
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Start
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Month
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Stop
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Now
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Final
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Next
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Age
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Saturday
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Summer
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sunday
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Beginning
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Spring
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Daytime
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Winter
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Daily
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Olden
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Almost
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nearly
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Thursday
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nighttime
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Night
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Week
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_trainer.s b/data/text/easy_chat/easy_chat_group_trainer.s
index d2ec9e357..f6babe003 100644
--- a/data/text/easy_chat/easy_chat_group_trainer.s
+++ b/data/text/easy_chat/easy_chat_group_trainer.s
@@ -1,191 +1,191 @@
-gEasyChatWord_IChooseYou: ; 8598030
+gEasyChatWord_IChooseYou: @ 8598030
 	.charmapstr "I CHOOSE YOU$"
 
-gEasyChatWord_Gotcha: ; 859803D
+gEasyChatWord_Gotcha: @ 859803D
 	.charmapstr "GOTCHA$"
 
-gEasyChatWord_Trade: ; 8598044
+gEasyChatWord_Trade: @ 8598044
 	.charmapstr "TRADE$"
 
-gEasyChatWord_Sapphire: ; 859804A
+gEasyChatWord_Sapphire: @ 859804A
 	.charmapstr "SAPPHIRE$"
 
-gEasyChatWord_Evolve: ; 8598053
+gEasyChatWord_Evolve: @ 8598053
 	.charmapstr "EVOLVE$"
 
-gEasyChatWord_Encyclopedia: ; 859805A
+gEasyChatWord_Encyclopedia: @ 859805A
 	.charmapstr "ENCYCLOPEDIA$"
 
-gEasyChatWord_Nature: ; 8598067
+gEasyChatWord_Nature: @ 8598067
 	.charmapstr "NATURE$"
 
-gEasyChatWord_Center: ; 859806E
+gEasyChatWord_Center: @ 859806E
 	.charmapstr "CENTER$"
 
-gEasyChatWord_Egg: ; 8598075
+gEasyChatWord_Egg: @ 8598075
 	.charmapstr "EGG$"
 
-gEasyChatWord_Link: ; 8598079
+gEasyChatWord_Link: @ 8598079
 	.charmapstr "LINK$"
 
-gEasyChatWord_SpAbility: ; 859807E
+gEasyChatWord_SpAbility: @ 859807E
 	.charmapstr "SP. ABILITY$"
 
-gEasyChatWord_Trainer: ; 859808A
+gEasyChatWord_Trainer: @ 859808A
 	.charmapstr "TRAINER$"
 
-gEasyChatWord_Version: ; 8598092
+gEasyChatWord_Version: @ 8598092
 	.charmapstr "VERSION$"
 
-gEasyChatWord_Pokenav: ; 859809A
+gEasyChatWord_Pokenav: @ 859809A
 	.charmapstr "POKéNAV$"
 
-gEasyChatWord_Pokemon: ; 85980A2
+gEasyChatWord_Pokemon: @ 85980A2
 	.charmapstr "POKéMON$"
 
-gEasyChatWord_Get: ; 85980AA
+gEasyChatWord_Get: @ 85980AA
 	.charmapstr "GET$"
 
-gEasyChatWord_Pokedex: ; 85980AE
+gEasyChatWord_Pokedex: @ 85980AE
 	.charmapstr "POKéDEX$"
 
-gEasyChatWord_Ruby: ; 85980B6
+gEasyChatWord_Ruby: @ 85980B6
 	.charmapstr "RUBY$"
 
-gEasyChatWord_Level: ; 85980BB
+gEasyChatWord_Level: @ 85980BB
 	.charmapstr "LEVEL$"
 
-gEasyChatWord_Red: ; 85980C1
+gEasyChatWord_Red: @ 85980C1
 	.charmapstr "RED$"
 
-gEasyChatWord_Green: ; 85980C5
+gEasyChatWord_Green: @ 85980C5
 	.charmapstr "GREEN$"
 
-gEasyChatWord_Bag: ; 85980CB
+gEasyChatWord_Bag: @ 85980CB
 	.charmapstr "BAG$"
 
-gEasyChatWord_Flame: ; 85980CF
+gEasyChatWord_Flame: @ 85980CF
 	.charmapstr "FLAME$"
 
-gEasyChatWord_Gold: ; 85980D5
+gEasyChatWord_Gold: @ 85980D5
 	.charmapstr "GOLD$"
 
-gEasyChatWord_Leaf: ; 85980DA
+gEasyChatWord_Leaf: @ 85980DA
 	.charmapstr "LEAF$"
 
-gEasyChatWord_Silver: ; 85980DF
+gEasyChatWord_Silver: @ 85980DF
 	.charmapstr "SILVER$"
 
-gEasyChatWord_Emerald: ; 85980E6
+gEasyChatWord_Emerald: @ 85980E6
 	.charmapstr "EMERALD$"
 
 	.align 2, 0
 
-gEasyChatGroup_Trainer: ; 85980F0
+gEasyChatGroup_Trainer: @ 85980F0
 	.4byte gEasyChatWord_IChooseYou
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gotcha
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trade
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sapphire
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Evolve
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Encyclopedia
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nature
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Center
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Egg
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Link
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SpAbility
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Trainer
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Version
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pokenav
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pokemon
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Get
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Pokedex
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ruby
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Level
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Red
-	.4byte 19 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Green
-	.4byte 17 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Bag
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Flame
-	.4byte 25 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Gold
-	.4byte 10 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Leaf
-	.4byte 2 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Silver
-	.4byte 11 ; alphabetical order
-	.4byte FALSE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte FALSE @ enabled
 
 	.4byte gEasyChatWord_Emerald
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_trendy_saying.s b/data/text/easy_chat/easy_chat_group_trendy_saying.s
index 0ab0b888e..74d8feacf 100644
--- a/data/text/easy_chat/easy_chat_group_trendy_saying.s
+++ b/data/text/easy_chat/easy_chat_group_trendy_saying.s
@@ -1,233 +1,233 @@
-gEasyChatWord_KthxBye: ; 859CB88
+gEasyChatWord_KthxBye: @ 859CB88
 	.charmapstr "KTHX, BYE.$"
 
-gEasyChatWord_YesSirExcl: ; 859CB93
+gEasyChatWord_YesSirExcl: @ 859CB93
 	.charmapstr "YES, SIR!$"
 
-gEasyChatWord_AvantGarde: ; 859CB9D
+gEasyChatWord_AvantGarde: @ 859CB9D
 	.charmapstr "AVANT GARDE$"
 
-gEasyChatWord_Couple: ; 859CBA9
+gEasyChatWord_Couple: @ 859CBA9
 	.charmapstr "COUPLE$"
 
-gEasyChatWord_MuchObliged: ; 859CBB0
+gEasyChatWord_MuchObliged: @ 859CBB0
 	.charmapstr "MUCH OBLIGED$"
 
-gEasyChatWord_YeehawExcl: ; 859CBBD
+gEasyChatWord_YeehawExcl: @ 859CBBD
 	.charmapstr "YEEHAW!$"
 
-gEasyChatWord_Mega: ; 859CBC5
+gEasyChatWord_Mega: @ 859CBC5
 	.charmapstr "MEGA$"
 
-gEasyChatWord_1HitKOExcl: ; 859CBCA
+gEasyChatWord_1HitKOExcl: @ 859CBCA
 	.charmapstr "1-HIT KO!$"
 
-gEasyChatWord_Destiny: ; 859CBD4
+gEasyChatWord_Destiny: @ 859CBD4
 	.charmapstr "DESTINY$"
 
-gEasyChatWord_Cancel: ; 859CBDC
+gEasyChatWord_Cancel: @ 859CBDC
 	.charmapstr "CANCEL$"
 
-gEasyChatWord_New: ; 859CBE3
+gEasyChatWord_New: @ 859CBE3
 	.charmapstr "NEW$"
 
-gEasyChatWord_Flatten: ; 859CBE7
+gEasyChatWord_Flatten: @ 859CBE7
 	.charmapstr "FLATTEN$"
 
-gEasyChatWord_Kidding: ; 859CBEF
+gEasyChatWord_Kidding: @ 859CBEF
 	.charmapstr "KIDDING$"
 
-gEasyChatWord_Loser: ; 859CBF7
+gEasyChatWord_Loser: @ 859CBF7
 	.charmapstr "LOSER$"
 
-gEasyChatWord_Losing: ; 859CBFD
+gEasyChatWord_Losing: @ 859CBFD
 	.charmapstr "LOSING$"
 
-gEasyChatWord_Happening: ; 859CC04
+gEasyChatWord_Happening: @ 859CC04
 	.charmapstr "HAPPENING$"
 
-gEasyChatWord_HipAnd: ; 859CC0E
+gEasyChatWord_HipAnd: @ 859CC0E
 	.charmapstr "HIP AND$"
 
-gEasyChatWord_Shake: ; 859CC16
+gEasyChatWord_Shake: @ 859CC16
 	.charmapstr "SHAKE$"
 
-gEasyChatWord_Shady: ; 859CC1C
+gEasyChatWord_Shady: @ 859CC1C
 	.charmapstr "SHADY$"
 
-gEasyChatWord_Upbeat: ; 859CC22
+gEasyChatWord_Upbeat: @ 859CC22
 	.charmapstr "UPBEAT$"
 
-gEasyChatWord_Modern: ; 859CC29
+gEasyChatWord_Modern: @ 859CC29
 	.charmapstr "MODERN$"
 
-gEasyChatWord_SmellYa: ; 859CC30
+gEasyChatWord_SmellYa: @ 859CC30
 	.charmapstr "SMELL YA$"
 
-gEasyChatWord_Bang: ; 859CC39
+gEasyChatWord_Bang: @ 859CC39
 	.charmapstr "BANG$"
 
-gEasyChatWord_Knockout: ; 859CC3E
+gEasyChatWord_Knockout: @ 859CC3E
 	.charmapstr "KNOCKOUT$"
 
-gEasyChatWord_Hassle: ; 859CC47
+gEasyChatWord_Hassle: @ 859CC47
 	.charmapstr "HASSLE$"
 
-gEasyChatWord_Winner: ; 859CC4E
+gEasyChatWord_Winner: @ 859CC4E
 	.charmapstr "WINNER$"
 
-gEasyChatWord_Fever: ; 859CC55
+gEasyChatWord_Fever: @ 859CC55
 	.charmapstr "FEVER$"
 
-gEasyChatWord_Wannabe: ; 859CC5B
+gEasyChatWord_Wannabe: @ 859CC5B
 	.charmapstr "WANNABE$"
 
-gEasyChatWord_Baby: ; 859CC63
+gEasyChatWord_Baby: @ 859CC63
 	.charmapstr "BABY$"
 
-gEasyChatWord_Heart: ; 859CC68
+gEasyChatWord_Heart: @ 859CC68
 	.charmapstr "HEART$"
 
-gEasyChatWord_Old: ; 859CC6E
+gEasyChatWord_Old: @ 859CC6E
 	.charmapstr "OLD$"
 
-gEasyChatWord_Young: ; 859CC72
+gEasyChatWord_Young: @ 859CC72
 	.charmapstr "YOUNG$"
 
-gEasyChatWord_Ugly: ; 859CC78
+gEasyChatWord_Ugly: @ 859CC78
 	.charmapstr "UGLY$"
 
 	.align 2, 0
 
-gEasyChatGroup_TrendySaying: ; 859CC80
+gEasyChatGroup_TrendySaying: @ 859CC80
 	.4byte gEasyChatWord_KthxBye
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_YesSirExcl
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_AvantGarde
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Couple
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_MuchObliged
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_YeehawExcl
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mega
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_1HitKOExcl
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Destiny
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cancel
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_New
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Flatten
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Kidding
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Loser
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Losing
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Happening
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_HipAnd
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shake
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shady
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Upbeat
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Modern
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_SmellYa
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Bang
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Knockout
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hassle
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Winner
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fever
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wannabe
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Baby
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Heart
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Old
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Young
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ugly
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_group_voices.s b/data/text/easy_chat/easy_chat_group_voices.s
index b7d31c785..7ac40e84c 100644
--- a/data/text/easy_chat/easy_chat_group_voices.s
+++ b/data/text/easy_chat/easy_chat_group_voices.s
@@ -1,443 +1,443 @@
-gEasyChatWord_Excl: ; 8599890
+gEasyChatWord_Excl: @ 8599890
 	.charmapstr "!$"
 
-gEasyChatWord_ExclExcl: ; 8599892
+gEasyChatWord_ExclExcl: @ 8599892
 	.charmapstr "!!$"
 
-gEasyChatWord_QuesExcl: ; 8599895
+gEasyChatWord_QuesExcl: @ 8599895
 	.charmapstr "?!$"
 
-gEasyChatWord_Ques: ; 8599898
+gEasyChatWord_Ques: @ 8599898
 	.charmapstr "?$"
 
-gEasyChatWord_Ellipsis: ; 859989A
+gEasyChatWord_Ellipsis: @ 859989A
 	.charmapstr "…$"
 
-gEasyChatWord_EllipsisExcl: ; 859989C
+gEasyChatWord_EllipsisExcl: @ 859989C
 	.charmapstr "…!$"
 
-gEasyChatWord_EllipsisEllipsisEllipsis: ; 859989F
+gEasyChatWord_EllipsisEllipsisEllipsis: @ 859989F
 	.charmapstr "………$"
 
-gEasyChatWord_Dash: ; 85998A3
+gEasyChatWord_Dash: @ 85998A3
 	.charmapstr "-$"
 
-gEasyChatWord_DashDashDash: ; 85998A5
+gEasyChatWord_DashDashDash: @ 85998A5
 	.charmapstr "- - -$"
 
-gEasyChatWord_UhOh: ; 85998AB
+gEasyChatWord_UhOh: @ 85998AB
 	.charmapstr "UH-OH$"
 
-gEasyChatWord_Waaah: ; 85998B1
+gEasyChatWord_Waaah: @ 85998B1
 	.charmapstr "WAAAH$"
 
-gEasyChatWord_Ahaha: ; 85998B7
+gEasyChatWord_Ahaha: @ 85998B7
 	.charmapstr "AHAHA$"
 
-gEasyChatWord_OhQues: ; 85998BD
+gEasyChatWord_OhQues: @ 85998BD
 	.charmapstr "OH?$"
 
-gEasyChatWord_Nope: ; 85998C1
+gEasyChatWord_Nope: @ 85998C1
 	.charmapstr "NOPE$"
 
-gEasyChatWord_Urgh: ; 85998C6
+gEasyChatWord_Urgh: @ 85998C6
 	.charmapstr "URGH$"
 
-gEasyChatWord_Hmm: ; 85998CB
+gEasyChatWord_Hmm: @ 85998CB
 	.charmapstr "HMM$"
 
-gEasyChatWord_Whoah: ; 85998CF
+gEasyChatWord_Whoah: @ 85998CF
 	.charmapstr "WHOAH$"
 
-gEasyChatWord_WroooaarExcl: ; 85998D5
+gEasyChatWord_WroooaarExcl: @ 85998D5
 	.charmapstr "WROOOAAR!$"
 
-gEasyChatWord_Wow: ; 85998DF
+gEasyChatWord_Wow: @ 85998DF
 	.charmapstr "WOW$"
 
-gEasyChatWord_Giggle: ; 85998E3
+gEasyChatWord_Giggle: @ 85998E3
 	.charmapstr "GIGGLE$"
 
-gEasyChatWord_Sigh: ; 85998EA
+gEasyChatWord_Sigh: @ 85998EA
 	.charmapstr "SIGH$"
 
-gEasyChatWord_Unbelievable: ; 85998EF
+gEasyChatWord_Unbelievable: @ 85998EF
 	.charmapstr "UNBELIEVABLE$"
 
-gEasyChatWord_Cries: ; 85998FC
+gEasyChatWord_Cries: @ 85998FC
 	.charmapstr "CRIES$"
 
-gEasyChatWord_Agree: ; 8599902
+gEasyChatWord_Agree: @ 8599902
 	.charmapstr "AGREE$"
 
-gEasyChatWord_EhQues: ; 8599908
+gEasyChatWord_EhQues: @ 8599908
 	.charmapstr "EH?$"
 
-gEasyChatWord_Cry: ; 859990C
+gEasyChatWord_Cry: @ 859990C
 	.charmapstr "CRY$"
 
-gEasyChatWord_Ehehe: ; 8599910
+gEasyChatWord_Ehehe: @ 8599910
 	.charmapstr "EHEHE$"
 
-gEasyChatWord_OiOiOi: ; 8599916
+gEasyChatWord_OiOiOi: @ 8599916
 	.charmapstr "OI, OI, OI$"
 
-gEasyChatWord_OhYeah: ; 8599921
+gEasyChatWord_OhYeah: @ 8599921
 	.charmapstr "OH, YEAH$"
 
-gEasyChatWord_Oh: ; 859992A
+gEasyChatWord_Oh: @ 859992A
 	.charmapstr "OH$"
 
-gEasyChatWord_Oops: ; 859992D
+gEasyChatWord_Oops: @ 859992D
 	.charmapstr "OOPS$"
 
-gEasyChatWord_Shocked: ; 8599932
+gEasyChatWord_Shocked: @ 8599932
 	.charmapstr "SHOCKED$"
 
-gEasyChatWord_Eek: ; 859993A
+gEasyChatWord_Eek: @ 859993A
 	.charmapstr "EEK$"
 
-gEasyChatWord_Graaah: ; 859993E
+gEasyChatWord_Graaah: @ 859993E
 	.charmapstr "GRAAAH$"
 
-gEasyChatWord_Gwahahaha: ; 8599945
+gEasyChatWord_Gwahahaha: @ 8599945
 	.charmapstr "GWAHAHAHA$"
 
-gEasyChatWord_Way: ; 859994F
+gEasyChatWord_Way: @ 859994F
 	.charmapstr "WAY$"
 
-gEasyChatWord_Tch: ; 8599953
+gEasyChatWord_Tch: @ 8599953
 	.charmapstr "TCH$"
 
-gEasyChatWord_Hehe: ; 8599957
+gEasyChatWord_Hehe: @ 8599957
 	.charmapstr "HEHE$"
 
-gEasyChatWord_Hah: ; 859995C
+gEasyChatWord_Hah: @ 859995C
 	.charmapstr "HAH$"
 
-gEasyChatWord_Yup: ; 8599960
+gEasyChatWord_Yup: @ 8599960
 	.charmapstr "YUP$"
 
-gEasyChatWord_Hahaha: ; 8599964
+gEasyChatWord_Hahaha: @ 8599964
 	.charmapstr "HAHAHA$"
 
-gEasyChatWord_Aiyeeh: ; 859996B
+gEasyChatWord_Aiyeeh: @ 859996B
 	.charmapstr "AIYEEH$"
 
-gEasyChatWord_Hiyah: ; 8599972
+gEasyChatWord_Hiyah: @ 8599972
 	.charmapstr "HIYAH$"
 
-gEasyChatWord_Fufufu: ; 8599978
+gEasyChatWord_Fufufu: @ 8599978
 	.charmapstr "FUFUFU$"
 
-gEasyChatWord_Lol: ; 859997F
+gEasyChatWord_Lol: @ 859997F
 	.charmapstr "LOL$"
 
-gEasyChatWord_Snort: ; 8599983
+gEasyChatWord_Snort: @ 8599983
 	.charmapstr "SNORT$"
 
-gEasyChatWord_Humph: ; 8599989
+gEasyChatWord_Humph: @ 8599989
 	.charmapstr "HUMPH$"
 
-gEasyChatWord_Hehehe: ; 859998F
+gEasyChatWord_Hehehe: @ 859998F
 	.charmapstr "HEHEHE$"
 
-gEasyChatWord_Heh: ; 8599996
+gEasyChatWord_Heh: @ 8599996
 	.charmapstr "HEH$"
 
-gEasyChatWord_Hohoho: ; 859999A
+gEasyChatWord_Hohoho: @ 859999A
 	.charmapstr "HOHOHO$"
 
-gEasyChatWord_UhHuh: ; 85999A1
+gEasyChatWord_UhHuh: @ 85999A1
 	.charmapstr "UH-HUH$"
 
-gEasyChatWord_OhDear: ; 85999A8
+gEasyChatWord_OhDear: @ 85999A8
 	.charmapstr "OH, DEAR$"
 
-gEasyChatWord_Arrgh: ; 85999B1
+gEasyChatWord_Arrgh: @ 85999B1
 	.charmapstr "ARRGH$"
 
-gEasyChatWord_Mufufu: ; 85999B7
+gEasyChatWord_Mufufu: @ 85999B7
 	.charmapstr "MUFUFU$"
 
-gEasyChatWord_Mmm: ; 85999BE
+gEasyChatWord_Mmm: @ 85999BE
 	.charmapstr "MMM$"
 
-gEasyChatWord_OhKay: ; 85999C2
+gEasyChatWord_OhKay: @ 85999C2
 	.charmapstr "OH-KAY$"
 
-gEasyChatWord_Okay: ; 85999C9
+gEasyChatWord_Okay: @ 85999C9
 	.charmapstr "OKAY$"
 
-gEasyChatWord_Lalala: ; 85999CE
+gEasyChatWord_Lalala: @ 85999CE
 	.charmapstr "LALALA$"
 
-gEasyChatWord_Yay: ; 85999D5
+gEasyChatWord_Yay: @ 85999D5
 	.charmapstr "YAY$"
 
-gEasyChatWord_Aww: ; 85999D9
+gEasyChatWord_Aww: @ 85999D9
 	.charmapstr "AWW$"
 
-gEasyChatWord_Wowee: ; 85999DD
+gEasyChatWord_Wowee: @ 85999DD
 	.charmapstr "WOWEE$"
 
-gEasyChatWord_Gwah: ; 85999E3
+gEasyChatWord_Gwah: @ 85999E3
 	.charmapstr "GWAH$"
 
-gEasyChatWord_Wahahaha: ; 85999E8
+gEasyChatWord_Wahahaha: @ 85999E8
 	.charmapstr "WAHAHAHA$"
 
 	.align 2, 0
 
-gEasyChatGroup_Voices: ; 85999F4
+gEasyChatGroup_Voices: @ 85999F4
 	.4byte gEasyChatWord_Excl
-	.4byte 0 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 0 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_ExclExcl
-	.4byte 1 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 1 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_QuesExcl
-	.4byte 7 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 7 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ques
-	.4byte 8 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 8 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ellipsis
-	.4byte 4 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 4 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EllipsisExcl
-	.4byte 5 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 5 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EllipsisEllipsisEllipsis
-	.4byte 6 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 6 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Dash
-	.4byte 3 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 3 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_DashDashDash
-	.4byte 2 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 2 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_UhOh
-	.4byte 23 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 23 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Waaah
-	.4byte 11 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 11 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ahaha
-	.4byte 41 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 41 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OhQues
-	.4byte 52 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 52 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Nope
-	.4byte 59 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 59 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Urgh
-	.4byte 22 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 22 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hmm
-	.4byte 25 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 25 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Whoah
-	.4byte 32 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 32 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_WroooaarExcl
-	.4byte 24 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 24 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wow
-	.4byte 26 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 26 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Giggle
-	.4byte 43 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 43 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Sigh
-	.4byte 19 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 19 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Unbelievable
-	.4byte 33 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 33 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cries
-	.4byte 61 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 61 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Agree
-	.4byte 34 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 34 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_EhQues
-	.4byte 38 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 38 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Cry
-	.4byte 40 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 40 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Ehehe
-	.4byte 48 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 48 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OiOiOi
-	.4byte 37 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 37 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OhYeah
-	.4byte 47 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 47 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Oh
-	.4byte 42 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 42 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Oops
-	.4byte 15 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 15 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Shocked
-	.4byte 49 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 49 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Eek
-	.4byte 46 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 46 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Graaah
-	.4byte 57 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 57 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gwahahaha
-	.4byte 44 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 44 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Way
-	.4byte 54 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 54 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Tch
-	.4byte 53 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 53 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hehe
-	.4byte 13 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 13 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hah
-	.4byte 29 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 29 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yup
-	.4byte 51 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 51 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hahaha
-	.4byte 28 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 28 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Aiyeeh
-	.4byte 55 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 55 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hiyah
-	.4byte 12 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 12 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Fufufu
-	.4byte 27 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 27 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lol
-	.4byte 56 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 56 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Snort
-	.4byte 30 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 30 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Humph
-	.4byte 31 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 31 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hehehe
-	.4byte 20 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 20 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Heh
-	.4byte 45 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 45 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Hohoho
-	.4byte 36 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 36 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_UhHuh
-	.4byte 50 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 50 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OhDear
-	.4byte 9 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 9 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Arrgh
-	.4byte 21 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 21 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mufufu
-	.4byte 14 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 14 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Mmm
-	.4byte 10 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 10 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_OhKay
-	.4byte 62 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 62 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Okay
-	.4byte 35 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 35 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Lalala
-	.4byte 16 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 16 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Yay
-	.4byte 18 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 18 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Aww
-	.4byte 60 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 60 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wowee
-	.4byte 17 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 17 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Gwah
-	.4byte 58 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 58 @ alphabetical order
+	.4byte TRUE @ enabled
 
 	.4byte gEasyChatWord_Wahahaha
-	.4byte 39 ; alphabetical order
-	.4byte TRUE ; enabled
+	.4byte 39 @ alphabetical order
+	.4byte TRUE @ enabled
diff --git a/data/text/easy_chat/easy_chat_groups.s b/data/text/easy_chat/easy_chat_groups.s
index b58b369a4..87200885a 100644
--- a/data/text/easy_chat/easy_chat_groups.s
+++ b/data/text/easy_chat/easy_chat_groups.s
@@ -23,91 +23,91 @@
 
 	.align 2, 0
 
-gEasyChatGroups: ; 859D004
+gEasyChatGroups: @ 859D004
 	.4byte gEasyChatGroup_Pokemon
-	.2byte 202 ; total number of entries
-	.2byte 202 ; number of enabled entries
+	.2byte 202 @ total number of entries
+	.2byte 202 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Trainer
-	.2byte 27 ; total number of entries
-	.2byte 21 ; number of enabled entries
+	.2byte 27 @ total number of entries
+	.2byte 21 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Status
-	.2byte 109 ; total number of entries
-	.2byte 109 ; number of enabled entries
+	.2byte 109 @ total number of entries
+	.2byte 109 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Battle
-	.2byte 63 ; total number of entries
-	.2byte 63 ; number of enabled entries
+	.2byte 63 @ total number of entries
+	.2byte 63 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Greetings
-	.2byte 42 ; total number of entries
-	.2byte 42 ; number of enabled entries
+	.2byte 42 @ total number of entries
+	.2byte 42 @ number of enabled entries
 
 	.4byte gEasyChatGroup_People
-	.2byte 75 ; total number of entries
-	.2byte 75 ; number of enabled entries
+	.2byte 75 @ total number of entries
+	.2byte 75 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Voices
-	.2byte 63 ; total number of entries
-	.2byte 63 ; number of enabled entries
+	.2byte 63 @ total number of entries
+	.2byte 63 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Speech
-	.2byte 60 ; total number of entries
-	.2byte 60 ; number of enabled entries
+	.2byte 60 @ total number of entries
+	.2byte 60 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Endings
-	.2byte 69 ; total number of entries
-	.2byte 69 ; number of enabled entries
+	.2byte 69 @ total number of entries
+	.2byte 69 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Feelings
-	.2byte 69 ; total number of entries
-	.2byte 69 ; number of enabled entries
+	.2byte 69 @ total number of entries
+	.2byte 69 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Conditions
-	.2byte 69 ; total number of entries
-	.2byte 69 ; number of enabled entries
+	.2byte 69 @ total number of entries
+	.2byte 69 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Actions
-	.2byte 78 ; total number of entries
-	.2byte 78 ; number of enabled entries
+	.2byte 78 @ total number of entries
+	.2byte 78 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Lifestyle
-	.2byte 45 ; total number of entries
-	.2byte 45 ; number of enabled entries
+	.2byte 45 @ total number of entries
+	.2byte 45 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Hobbies
-	.2byte 54 ; total number of entries
-	.2byte 54 ; number of enabled entries
+	.2byte 54 @ total number of entries
+	.2byte 54 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Time
-	.2byte 45 ; total number of entries
-	.2byte 45 ; number of enabled entries
+	.2byte 45 @ total number of entries
+	.2byte 45 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Misc
-	.2byte 42 ; total number of entries
-	.2byte 42 ; number of enabled entries
+	.2byte 42 @ total number of entries
+	.2byte 42 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Adjectives
-	.2byte 36 ; total number of entries
-	.2byte 36 ; number of enabled entries
+	.2byte 36 @ total number of entries
+	.2byte 36 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Events
-	.2byte 29 ; total number of entries
-	.2byte 29 ; number of enabled entries
+	.2byte 29 @ total number of entries
+	.2byte 29 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Move1
-	.2byte 154 ; total number of entries
-	.2byte 154 ; number of enabled entries
+	.2byte 154 @ total number of entries
+	.2byte 154 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Move2
-	.2byte 200 ; total number of entries
-	.2byte 200 ; number of enabled entries
+	.2byte 200 @ total number of entries
+	.2byte 200 @ number of enabled entries
 
 	.4byte gEasyChatGroup_TrendySaying
-	.2byte 33 ; total number of entries
-	.2byte 33 ; number of enabled entries
+	.2byte 33 @ total number of entries
+	.2byte 33 @ number of enabled entries
 
 	.4byte gEasyChatGroup_Pokemon2
-	.2byte 251 ; total number of entries
-	.2byte 251 ; number of enabled entries
+	.2byte 251 @ total number of entries
+	.2byte 251 @ number of enabled entries
diff --git a/data/text/easy_chat/easy_chat_words_by_letter.s b/data/text/easy_chat/easy_chat_words_by_letter.s
index 0fefb263b..6b6229dbb 100644
--- a/data/text/easy_chat/easy_chat_words_by_letter.s
+++ b/data/text/easy_chat/easy_chat_words_by_letter.s
@@ -1,4 +1,4 @@
-gEasyChatWordsByLetter_Others: ; 859D0B4
+gEasyChatWordsByLetter_Others: @ 859D0B4
 	ec_word EXCL
 	ec_word EXCL_EXCL
 	ec_word DASH
@@ -10,14 +10,14 @@ gEasyChatWordsByLetter_Others: ; 859D0B4
 	ec_word QUES
 	ec_word QUES_EXCL
 
-gEasyChatWordsByLetter_A: ; 859D0C8
+gEasyChatWordsByLetter_A: @ 859D0C8
 	ec_word A
 	ec_word A_LITTLE
 	ec_word A_LOT
 	ec_word A_TINY_BIT
 	ec_word ABOUT
 	ec_word ABOVE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 ABRA
 	ec_pokemon2 ABRA
 	ec_word ABSENT
@@ -44,7 +44,7 @@ gEasyChatWordsByLetter_A: ; 859D0C8
 	ec_move1 AIR_CUTTER
 	ec_word AIR_LOCK
 	ec_word AIYEEH
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 ALAKAZAM
 	ec_pokemon2 ALAKAZAM
 	ec_word ALL
@@ -110,12 +110,12 @@ gEasyChatWordsByLetter_A: ; 859D0C8
 	ec_word AWFUL
 	ec_word AWFULLY
 	ec_word AWW
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 AZUMARILL
 	ec_pokemon2 AZUMARILL
 	ec_pokemon1 AZURILL
 
-gEasyChatWordsByLetter_B: ; 859D19C
+gEasyChatWordsByLetter_B: @ 859D19C
 	ec_word BABE
 	ec_word BABY
 	ec_word BACK
@@ -151,7 +151,7 @@ gEasyChatWordsByLetter_B: ; 859D19C
 	ec_word BEING
 	ec_pokemon1 BELDUM
 	ec_word BELIEVE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 BELLOSSOM
 	ec_pokemon2 BELLOSSOM
 	ec_pokemon2 BELLSPROUT
@@ -202,7 +202,7 @@ gEasyChatWordsByLetter_B: ; 859D19C
 	ec_pokemon2 BUTTERFREE
 	ec_word BYE_BYE
 
-gEasyChatWordsByLetter_C: ; 859D248
+gEasyChatWordsByLetter_C: @ 859D248
 	ec_pokemon1 CACNEA
 	ec_pokemon1 CACTURNE
 	ec_move2 CALM_MIND
@@ -241,7 +241,7 @@ gEasyChatWordsByLetter_C: ; 859D248
 	ec_word CHILD_S_PLAY
 	ec_word CHILDREN
 	ec_pokemon1 CHIMECHO
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 CHINCHOU
 	ec_pokemon2 CHINCHOU
 	ec_word CHLOROPHYLL
@@ -287,7 +287,7 @@ gEasyChatWordsByLetter_C: ; 859D248
 	ec_word COOLNESS
 	ec_pokemon1 CORPHISH
 	ec_word CORRECT
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 CORSOLA
 	ec_pokemon2 CORSOLA
 	ec_move1 COSMIC_POWER
@@ -302,7 +302,7 @@ gEasyChatWordsByLetter_C: ; 859D248
 	ec_pokemon1 CRADILY
 	ec_pokemon1 CRAWDAUNT
 	ec_word CRIES
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 CROBAT
 	ec_pokemon2 CROBAT
 	ec_pokemon2 CROCONAW
@@ -320,7 +320,7 @@ gEasyChatWordsByLetter_C: ; 859D248
 	ec_word CUTENESS
 	ec_pokemon2 CYNDAQUIL
 
-gEasyChatWordsByLetter_D: ; 859D336
+gEasyChatWordsByLetter_D: @ 859D336
 	ec_word DAILY
 	ec_word DAMP
 	ec_word DANCE
@@ -368,17 +368,17 @@ gEasyChatWordsByLetter_D: ; 859D336
 	ec_move2 DIZZY_PUNCH
 	ec_word DO
 	ec_word DOCILE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 DODRIO
 	ec_pokemon2 DODRIO
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 DODUO
 	ec_pokemon2 DODUO
 	ec_word DOES
 	ec_word DOESN_T
 	ec_word DON_T
 	ec_word DONE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 DONPHAN
 	ec_pokemon2 DONPHAN
 	ec_move2 DOOM_DESIRE
@@ -413,7 +413,7 @@ gEasyChatWordsByLetter_D: ; 859D336
 	ec_pokemon1 DUSTOX
 	ec_move2 DYNAMIC_PUNCH
 
-gEasyChatWordsByLetter_E: ; 859D3F2
+gEasyChatWordsByLetter_E: @ 859D3F2
 	ec_word EARLIER
 	ec_word EARLY_BIRD
 	ec_move1 EARTHQUAKE
@@ -431,7 +431,7 @@ gEasyChatWordsByLetter_E: ; 859D3F2
 	ec_pokemon2 ELECTABUZZ
 	ec_word ELECTRIC
 	ec_pokemon1 ELECTRIKE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 ELECTRODE
 	ec_pokemon2 ELECTRODE
 	ec_pokemon2 ELEKID
@@ -473,7 +473,7 @@ gEasyChatWordsByLetter_E: ; 859D3F2
 	ec_move1 EXTRASENSORY
 	ec_move1 EXTREME_SPEED
 
-gEasyChatWordsByLetter_F: ; 859D468
+gEasyChatWordsByLetter_F: @ 859D468
 	ec_word FABULOUS
 	ec_move1 FACADE
 	ec_word FAINT
@@ -555,13 +555,13 @@ gEasyChatWordsByLetter_F: ; 859D468
 	ec_move2 FURY_SWIPES
 	ec_move2 FUTURE_SIGHT
 
-gEasyChatWordsByLetter_G: ; 859D508
+gEasyChatWordsByLetter_G: @ 859D508
 	ec_word GAME
 	ec_pokemon1 GARDEVOIR
 	ec_pokemon2 GASTLY
 	ec_pokemon2 GENGAR
 	ec_word GENIUS
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GEODUDE
 	ec_pokemon2 GEODUDE
 	ec_word GET
@@ -571,7 +571,7 @@ gEasyChatWordsByLetter_G: ; 859D508
 	ec_move1 GIGA_DRAIN
 	ec_word GIGGLE
 	ec_word GIMME
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GIRAFARIG
 	ec_pokemon2 GIRAFARIG
 	ec_word GIRL
@@ -582,7 +582,7 @@ gEasyChatWordsByLetter_G: ; 859D508
 	ec_pokemon1 GLALIE
 	ec_move2 GLARE
 	ec_pokemon2 GLIGAR
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GLOOM
 	ec_pokemon2 GLOOM
 	ec_word GO
@@ -591,17 +591,17 @@ gEasyChatWordsByLetter_G: ; 859D508
 	ec_word GO_HOME
 	ec_word GOES
 	ec_word GOING
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GOLBAT
 	ec_pokemon2 GOLBAT
 	ec_word GOLD
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GOLDEEN
 	ec_pokemon2 GOLDEEN
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GOLDUCK
 	ec_pokemon2 GOLDUCK
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GOLEM
 	ec_pokemon2 GOLEM
 	ec_word GOOD
@@ -616,12 +616,12 @@ gEasyChatWordsByLetter_G: ; 859D508
 	ec_word GRANDMOTHER
 	ec_word GRASS
 	ec_move1 GRASS_WHISTLE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GRAVELER
 	ec_pokemon2 GRAVELER
 	ec_word GREAT
 	ec_word GREEN
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GRIMER
 	ec_pokemon2 GRIMER
 	ec_pokemon1 GROUDON
@@ -641,11 +641,11 @@ gEasyChatWordsByLetter_G: ; 859D508
 	ec_word GUTSY
 	ec_word GWAH
 	ec_word GWAHAHAHA
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 GYARADOS
 	ec_pokemon2 GYARADOS
 
-gEasyChatWordsByLetter_H: ; 859D5CC
+gEasyChatWordsByLetter_H: @ 859D5CC
 	ec_word HABIT
 	ec_word HAH
 	ec_word HAHAHA
@@ -680,7 +680,7 @@ gEasyChatWordsByLetter_H: ; 859D5CC
 	ec_word HELLO
 	ec_move2 HELPING_HAND
 	ec_word HER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 HERACROSS
 	ec_pokemon2 HERACROSS
 	ec_word HERE
@@ -719,7 +719,7 @@ gEasyChatWordsByLetter_H: ; 859D5CC
 	ec_pokemon2 HOPPIP
 	ec_move2 HORN_ATTACK
 	ec_move2 HORN_DRILL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 HORSEA
 	ec_pokemon2 HORSEA
 	ec_word HOT
@@ -746,7 +746,7 @@ gEasyChatWordsByLetter_H: ; 859D5CC
 	ec_pokemon2 HYPNO
 	ec_move1 HYPNOSIS
 
-gEasyChatWordsByLetter_I: ; 859D696
+gEasyChatWordsByLetter_I: @ 859D696
 	ec_word I
 	ec_word I_AM
 	ec_word I_CHOOSE_YOU
@@ -763,7 +763,7 @@ gEasyChatWordsByLetter_I: ; 859D696
 	ec_word IF
 	ec_word IF_I_LOSE
 	ec_word IF_I_WIN
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 IGGLYBUFF
 	ec_pokemon2 IGGLYBUFF
 	ec_word IGNORANT
@@ -795,8 +795,8 @@ gEasyChatWordsByLetter_I: ; 859D696
 	ec_word ITEM
 	ec_pokemon2 IVYSAUR
 
-gEasyChatWordsByLetter_J: ; 859D6F6
-	.2byte -1, 2 ; doubled Pokémon species names
+gEasyChatWordsByLetter_J: @ 859D6F6
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 JIGGLYPUFF
 	ec_pokemon2 JIGGLYPUFF
 	ec_pokemon1 JIRACHI
@@ -809,10 +809,10 @@ gEasyChatWordsByLetter_J: ; 859D6F6
 	ec_word JUST
 	ec_pokemon2 JYNX
 
-gEasyChatWordsByLetter_K: ; 859D710
+gEasyChatWordsByLetter_K: @ 859D710
 	ec_pokemon2 KABUTO
 	ec_pokemon2 KABUTOPS
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 KADABRA
 	ec_pokemon2 KADABRA
 	ec_pokemon2 KAKUNA
@@ -825,7 +825,7 @@ gEasyChatWordsByLetter_K: ; 859D710
 	ec_word KIND
 	ec_word KINDERGARTEN
 	ec_move1 KINESIS
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 KINGDRA
 	ec_pokemon2 KINGDRA
 	ec_pokemon2 KINGLER
@@ -834,20 +834,20 @@ gEasyChatWordsByLetter_K: ; 859D710
 	ec_word KNOCKOUT
 	ec_word KNOW
 	ec_word KNOWS
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 KOFFING
 	ec_pokemon2 KOFFING
 	ec_pokemon2 KRABBY
 	ec_word KTHX_BYE
 	ec_pokemon1 KYOGRE
 
-gEasyChatWordsByLetter_L: ; 859D752
+gEasyChatWordsByLetter_L: @ 859D752
 	ec_word LACKING
 	ec_word LACKS
 	ec_word LADY
 	ec_pokemon1 LAIRON
 	ec_word LALALA
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 LANTURN
 	ec_pokemon2 LANTURN
 	ec_pokemon2 LAPRAS
@@ -924,35 +924,35 @@ gEasyChatWordsByLetter_L: ; 859D752
 	ec_move2 LUSTER_PURGE
 	ec_pokemon1 LUVDISC
 
-gEasyChatWordsByLetter_M: ; 859D7F6
+gEasyChatWordsByLetter_M: @ 859D7F6
 	ec_move2 MACH_PUNCH
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MACHAMP
 	ec_pokemon2 MACHAMP
 	ec_word MACHINE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MACHOKE
 	ec_pokemon2 MACHOKE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MACHOP
 	ec_pokemon2 MACHOP
 	ec_word MAGAZINE
 	ec_pokemon2 MAGBY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MAGCARGO
 	ec_pokemon2 MAGCARGO
 	ec_move2 MAGIC_COAT
 	ec_move2 MAGICAL_LEAF
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MAGIKARP
 	ec_pokemon2 MAGIKARP
 	ec_word MAGMA_ARMOR
 	ec_pokemon2 MAGMAR
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MAGNEMITE
 	ec_pokemon2 MAGNEMITE
 	ec_word MAGNET_PULL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MAGNETON
 	ec_pokemon2 MAGNETON
 	ec_move2 MAGNITUDE
@@ -965,7 +965,7 @@ gEasyChatWordsByLetter_M: ; 859D7F6
 	ec_pokemon2 MANKEY
 	ec_pokemon2 MANTINE
 	ec_pokemon2 MAREEP
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MARILL
 	ec_pokemon2 MARILL
 	ec_pokemon2 MAROWAK
@@ -1049,7 +1049,7 @@ gEasyChatWordsByLetter_M: ; 859D7F6
 	ec_move2 MUDDY_WATER
 	ec_pokemon1 MUDKIP
 	ec_word MUFUFU
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 MUK
 	ec_pokemon2 MUK
 	ec_pokemon2 MURKROW
@@ -1059,10 +1059,10 @@ gEasyChatWordsByLetter_M: ; 859D7F6
 	ec_word MYSELF
 	ec_word MYSTERY
 
-gEasyChatWordsByLetter_N: ; 859D912
+gEasyChatWordsByLetter_N: @ 859D912
 	ec_word NAME
 	ec_word NAP
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 NATU
 	ec_pokemon2 NATU
 	ec_word NATURAL
@@ -1091,7 +1091,7 @@ gEasyChatWordsByLetter_N: ; 859D912
 	ec_move1 NIGHTMARE
 	ec_word NIGHTTIME
 	ec_pokemon1 NINCADA
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 NINETALES
 	ec_pokemon2 NINETALES
 	ec_pokemon1 NINJASK
@@ -1113,11 +1113,11 @@ gEasyChatWordsByLetter_N: ; 859D912
 	ec_pokemon1 NUMEL
 	ec_pokemon1 NUZLEAF
 
-gEasyChatWordsByLetter_O: ; 859D97E
+gEasyChatWordsByLetter_O: @ 859D97E
 	ec_word OBLIVIOUS
 	ec_move1 OCTAZOOKA
 	ec_pokemon2 OCTILLERY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 ODDISH
 	ec_pokemon2 ODDISH
 	ec_move1 ODOR_SLEUTH
@@ -1158,7 +1158,7 @@ gEasyChatWordsByLetter_O: ; 859D97E
 	ec_word OWN
 	ec_word OWN_TEMPO
 
-gEasyChatWordsByLetter_P: ; 859D9D6
+gEasyChatWordsByLetter_P: @ 859D9D6
 	ec_move1 PAIN_SPLIT
 	ec_pokemon2 PARAS
 	ec_pokemon2 PARASECT
@@ -1177,24 +1177,24 @@ gEasyChatWordsByLetter_P: ; 859D9D6
 	ec_pokemon2 PERSIAN
 	ec_word PERSON
 	ec_move2 PETAL_DANCE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 PHANPY
 	ec_pokemon2 PHANPY
 	ec_word PHONE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 PICHU
 	ec_pokemon2 PICHU
 	ec_word PICKUP
 	ec_pokemon2 PIDGEOT
 	ec_pokemon2 PIDGEOTTO
 	ec_pokemon2 PIDGEY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 PIKACHU
 	ec_pokemon2 PIKACHU
 	ec_pokemon2 PILOSWINE
 	ec_move2 PIN_MISSILE
 	ec_pokemon2 PINECO
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 PINSIR
 	ec_pokemon2 PINSIR
 	ec_word PKRS
@@ -1243,11 +1243,11 @@ gEasyChatWordsByLetter_P: ; 859D9D6
 	ec_move2 PROTECT
 	ec_move1 PSYBEAM
 	ec_move1 PSYCH_UP
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_word PSYCHIC
 	ec_move1 PSYCHIC
 	ec_move1 PSYCHO_BOOST
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 PSYDUCK
 	ec_pokemon2 PSYDUCK
 	ec_move1 PSYWAVE
@@ -1256,7 +1256,7 @@ gEasyChatWordsByLetter_P: ; 859D9D6
 	ec_move1 PURSUIT
 	ec_word PUSHOVER
 
-gEasyChatWordsByLetter_Q: ; 859DAA2
+gEasyChatWordsByLetter_Q: @ 859DAA2
 	ec_pokemon2 QUAGSIRE
 	ec_word QUESTION
 	ec_move2 QUICK_ATTACK
@@ -1264,10 +1264,10 @@ gEasyChatWordsByLetter_Q: ; 859DAA2
 	ec_word QUITE
 	ec_pokemon2 QWILFISH
 
-gEasyChatWordsByLetter_R: ; 859DAAE
+gEasyChatWordsByLetter_R: @ 859DAAE
 	ec_word RADIO
 	ec_move1 RAGE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 RAICHU
 	ec_pokemon2 RAICHU
 	ec_pokemon2 RAIKOU
@@ -1309,10 +1309,10 @@ gEasyChatWordsByLetter_R: ; 859DAAE
 	ec_move1 RETURN
 	ec_move2 REVENGE
 	ec_move1 REVERSAL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 RHYDON
 	ec_pokemon2 RHYDON
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 RHYHORN
 	ec_pokemon2 RHYHORN
 	ec_word RIBBON
@@ -1343,7 +1343,7 @@ gEasyChatWordsByLetter_R: ; 859DAAE
 	ec_word RUN_AWAY
 	ec_word RUNS
 
-gEasyChatWordsByLetter_S: ; 859DB4E
+gEasyChatWordsByLetter_S: @ 859DB4E
 	ec_pokemon1 SABLEYE
 	ec_move1 SACRED_FIRE
 	ec_word SAD
@@ -1355,10 +1355,10 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_move1 SAND_TOMB
 	ec_word SAND_VEIL
 	ec_move1 SAND_ATTACK
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SANDSHREW
 	ec_pokemon2 SANDSHREW
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SANDSLASH
 	ec_pokemon2 SANDSLASH
 	ec_move1 SANDSTORM
@@ -1375,10 +1375,10 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_move2 SCRATCH
 	ec_move1 SCREECH
 	ec_pokemon2 SCYTHER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SEADRA
 	ec_pokemon2 SEADRA
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SEAKING
 	ec_pokemon2 SEAKING
 	ec_pokemon1 SEALEO
@@ -1444,7 +1444,7 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_move1 SING
 	ec_word SINK
 	ec_word SISTER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SKARMORY
 	ec_pokemon2 SKARMORY
 	ec_move1 SKETCH
@@ -1472,7 +1472,7 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_pokemon2 SLOWPOKE
 	ec_move2 SLUDGE
 	ec_move2 SLUDGE_BOMB
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 SLUGMA
 	ec_pokemon2 SLUGMA
 	ec_word SMACK
@@ -1535,11 +1535,11 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_pokemon2 SQUIRTLE
 	ec_word STAGE
 	ec_pokemon2 STANTLER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 STARMIE
 	ec_pokemon2 STARMIE
 	ec_word START
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 STARYU
 	ec_pokemon2 STARYU
 	ec_word STATIC
@@ -1599,7 +1599,7 @@ gEasyChatWordsByLetter_S: ; 859DB4E
 	ec_move1 SYNTHESIS
 	ec_word SYSTEM
 
-gEasyChatWordsByLetter_T: ; 859DD5A
+gEasyChatWordsByLetter_T: @ 859DD5A
 	ec_move2 TACKLE
 	ec_move2 TAIL_GLOW
 	ec_move1 TAIL_WHIP
@@ -1622,10 +1622,10 @@ gEasyChatWordsByLetter_T: ; 859DD5A
 	ec_move2 TEETER_DANCE
 	ec_move2 TELEPORT
 	ec_word TELEVISION
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 TENTACOOL
 	ec_pokemon2 TENTACOOL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 TENTACRUEL
 	ec_pokemon2 TENTACRUEL
 	ec_word TERRIBLE
@@ -1732,7 +1732,7 @@ gEasyChatWordsByLetter_T: ; 859DD5A
 	ec_pokemon2 TYRANITAR
 	ec_pokemon2 TYROGUE
 
-gEasyChatWordsByLetter_U: ; 859DE64
+gEasyChatWordsByLetter_U: @ 859DE64
 	ec_word UGLY
 	ec_word UH_HUH
 	ec_word UH_OH
@@ -1758,7 +1758,7 @@ gEasyChatWordsByLetter_U: ; 859DE64
 	ec_word USES
 	ec_word USING
 
-gEasyChatWordsByLetter_V: ; 859DE94
+gEasyChatWordsByLetter_V: @ 859DE94
 	ec_word VACATION
 	ec_pokemon2 VAPOREON
 	ec_pokemon2 VENOMOTH
@@ -1773,7 +1773,7 @@ gEasyChatWordsByLetter_V: ; 859DE94
 	ec_pokemon2 VICTREEBEL
 	ec_word VIEWING
 	ec_pokemon1 VIGOROTH
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 VILEPLUME
 	ec_pokemon2 VILEPLUME
 	ec_move2 VINE_WHIP
@@ -1782,15 +1782,15 @@ gEasyChatWordsByLetter_V: ; 859DE94
 	ec_pokemon1 VOLBEAT
 	ec_word VOLT_ABSORB
 	ec_move2 VOLT_TACKLE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 VOLTORB
 	ec_pokemon2 VOLTORB
 	ec_word VORACIOUS
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 VULPIX
 	ec_pokemon2 VULPIX
 
-gEasyChatWordsByLetter_W: ; 859DED6
+gEasyChatWordsByLetter_W: @ 859DED6
 	ec_word WAAAH
 	ec_word WAHAHAHA
 	ec_pokemon1 WAILMER
@@ -1828,7 +1828,7 @@ gEasyChatWordsByLetter_W: ; 859DED6
 	ec_pokemon2 WEEDLE
 	ec_word WEEK
 	ec_pokemon2 WEEPINBELL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 WEEZING
 	ec_pokemon2 WEEZING
 	ec_word WEIRD
@@ -1857,7 +1857,7 @@ gEasyChatWordsByLetter_W: ; 859DED6
 	ec_word WHOM
 	ec_word WHOSE
 	ec_word WHY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 WIGGLYTUFF
 	ec_pokemon2 WIGGLYTUFF
 	ec_word WILD
@@ -1877,7 +1877,7 @@ gEasyChatWordsByLetter_W: ; 859DED6
 	ec_move1 WITHDRAW
 	ec_word WITHOUT
 	ec_word WOBBLY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 WOBBUFFET
 	ec_pokemon2 WOBBUFFET
 	ec_word WOMAN
@@ -1900,12 +1900,12 @@ gEasyChatWordsByLetter_W: ; 859DED6
 	ec_pokemon1 WURMPLE
 	ec_pokemon1 WYNAUT
 
-gEasyChatWordsByLetter_X: ; 859DFB4
-	.2byte -1, 2 ; doubled Pokémon species names
+gEasyChatWordsByLetter_X: @ 859DFB4
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 XATU
 	ec_pokemon2 XATU
 
-gEasyChatWordsByLetter_Y: ; 859DFBC
+gEasyChatWordsByLetter_Y: @ 859DFBC
 	ec_word YAHOO
 	ec_pokemon2 YANMA
 	ec_move1 YAWN
@@ -1926,21 +1926,21 @@ gEasyChatWordsByLetter_Y: ; 859DFBC
 	ec_word YOURS
 	ec_word YUP
 
-gEasyChatWordsByLetter_Z: ; 859DFE2
+gEasyChatWordsByLetter_Z: @ 859DFE2
 	ec_pokemon1 ZANGOOSE
 	ec_move2 ZAP_CANNON
 	ec_pokemon2 ZAPDOS
 	ec_pokemon1 ZIGZAGOON
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon1 ZUBAT
 	ec_pokemon2 ZUBAT
 
-gEasyChatWordsByLetter_UnusedJapaneseHi: ; 859DFF2
+gEasyChatWordsByLetter_UnusedJapaneseHi: @ 859DFF2
 	ec_pokemon2 CLEFFA
 	ec_word AIYEEH
 	ec_pokemon2 WEEDLE
 	ec_word HERO
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 PIKACHU
 	ec_pokemon1 PIKACHU
 	ec_move2 LIGHT_SCREEN
@@ -1951,7 +1951,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHi: ; 859DFF2
 	ec_pokemon2 PIDGEOT
 	ec_pokemon2 PIDGEOTTO
 	ec_word LEFT
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 PICHU
 	ec_pokemon1 PICHU
 	ec_move2 SCRATCH
@@ -1963,7 +1963,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHi: ; 859DFF2
 	ec_word PERSON
 	ec_word AWFUL
 	ec_pokemon2 CHARMANDER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 STARYU
 	ec_pokemon1 STARYU
 	ec_word ALONE
@@ -1979,7 +1979,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHi: ; 859DFF2
 	ec_word HIYAH
 	ec_move2 DIZZY_PUNCH
 	ec_word LIGHTNINGROD
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 VOLTORB
 	ec_pokemon1 VOLTORB
 	ec_word DAYTIME
@@ -1988,7 +1988,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHi: ; 859DFF2
 	ec_word HEROINE
 	ec_pokemon1 FEEBAS
 
-gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
+gEasyChatWordsByLetter_UnusedJapaneseFu: @ 859E060
 	ec_word FIGHT
 	ec_pokemon2 MOLTRES
 	ec_word FASHION
@@ -1996,7 +1996,7 @@ gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
 	ec_word FEVER
 	ec_move2 IMPRISON
 	ec_pokemon2 FLAREON
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 ALAKAZAM
 	ec_pokemon1 ALAKAZAM
 	ec_pokemon2 MAGMAR
@@ -2005,7 +2005,7 @@ gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
 	ec_pokemon2 FORRETRESS
 	ec_move2 WHIRLWIND
 	ec_word COMPOUNDEYES
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 WIGGLYTUFF
 	ec_pokemon1 WIGGLYTUFF
 	ec_move2 BEAT_UP
@@ -2024,7 +2024,7 @@ gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
 	ec_pokemon2 MAGBY
 	ec_word LOL
 	ec_move2 BLIZZARD
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 IGGLYBUFF
 	ec_pokemon1 IGGLYBUFF
 	ec_word SNORT
@@ -2043,7 +2043,7 @@ gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
 	ec_word PRETEND
 	ec_pokemon2 ARTICUNO
 	ec_word WANNABE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 JIGGLYPUFF
 	ec_pokemon1 JIGGLYPUFF
 	ec_pokemon2 SNUBBULL
@@ -2057,7 +2057,7 @@ gEasyChatWordsByLetter_UnusedJapaneseFu: ; 859E060
 	ec_word HUMPH
 	ec_move2 ERUPTION
 
-gEasyChatWordsByLetter_UnusedJapaneseHe: ; 859E0EE
+gEasyChatWordsByLetter_UnusedJapaneseHe: @ 859E0EE
 	ec_word HEY
 	ec_pokemon1 CORPHISH
 	ec_word BABY
@@ -2065,10 +2065,10 @@ gEasyChatWordsByLetter_UnusedJapaneseHe: ; 859E0EE
 	ec_word BEST
 	ec_word LOUSY
 	ec_word HEHEHE
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 GRIMER
 	ec_pokemon1 GRIMER
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 MUK
 	ec_pokemon1 MUK
 	ec_word LIQUID_OOZE
@@ -2076,7 +2076,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHe: ; 859E0EE
 	ec_move2 SLUDGE_BOMB
 	ec_move2 GLARE
 	ec_word HEH
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 HERACROSS
 	ec_pokemon1 HERACROSS
 	ec_pokemon1 PELIPPER
@@ -2088,7 +2088,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHe: ; 859E0EE
 	ec_word COLOR_CHANGE
 	ec_move2 TRANSFORM
 
-gEasyChatWordsByLetter_UnusedJapaneseHo: ; 859E12E
+gEasyChatWordsByLetter_UnusedJapaneseHo: @ 859E12E
 	ec_move2 POISON_TAIL
 	ec_word POINTS
 	ec_pokemon2 HO_OH
@@ -2145,7 +2145,7 @@ gEasyChatWordsByLetter_UnusedJapaneseHo: ; 859E12E
 	ec_word SERIOUS
 	ec_word REALLY
 
-gEasyChatWordsByLetter_UnusedJapaneseMa: ; 859E19C
+gEasyChatWordsByLetter_UnusedJapaneseMa: @ 859E19C
 	ec_word OH_DEAR
 	ec_word IN
 	ec_word GIVE_UP
@@ -2155,12 +2155,12 @@ gEasyChatWordsByLetter_UnusedJapaneseMa: ; 859E19C
 	ec_word OWN_TEMPO
 	ec_move2 WRAP
 	ec_move2 SPIKES
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 MAGCARGO
 	ec_pokemon1 MAGCARGO
 	ec_move2 MAGNITUDE
 	ec_pokemon1 MAKUHITA
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 SLUGMA
 	ec_pokemon1 SLUGMA
 	ec_word MAGMA_ARMOR
@@ -2181,7 +2181,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMa: ; 859E19C
 	ec_word TOO
 	ec_word LIKE
 	ec_pokemon2 BELLSPROUT
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 WEEZING
 	ec_pokemon1 WEEZING
 	ec_word SMELL
@@ -2197,16 +2197,16 @@ gEasyChatWordsByLetter_UnusedJapaneseMa: ; 859E19C
 	ec_word GUARD
 	ec_move2 PROTECT
 	ec_pokemon1 CASCOON
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 MARILL
 	ec_pokemon1 MARILL
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 AZUMARILL
 	ec_pokemon1 AZUMARILL
 	ec_move2 DEFENSE_CURL
 	ec_word AS_IF
 	ec_pokemon1 SWALOT
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 ELECTRODE
 	ec_pokemon1 ELECTRODE
 	ec_move2 ROLLING_KICK
@@ -2215,7 +2215,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMa: ; 859E19C
 	ec_word SATISFIED
 	ec_pokemon2 MANTINE
 
-gEasyChatWordsByLetter_UnusedJapaneseMi: ; 859E230
+gEasyChatWordsByLetter_UnusedJapaneseMi: @ 859E230
 	ec_word PARTNER
 	ec_move2 SUBSTITUTE
 	ec_word RIGHT
@@ -2254,7 +2254,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMi: ; 859E230
 	ec_word OUR
 	ec_word WE_RE
 
-gEasyChatWordsByLetter_UnusedJapaneseMu: ; 859E27A
+gEasyChatWordsByLetter_UnusedJapaneseMu: @ 859E27A
 	ec_word MOOD
 	ec_pokemon2 MISDREAVUS
 	ec_word OLDEN
@@ -2268,7 +2268,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMu: ; 859E27A
 	ec_word MUFUFU
 	ec_word MMM
 
-gEasyChatWordsByLetter_UnusedJapaneseMe: ; 859E292
+gEasyChatWordsByLetter_UnusedJapaneseMe: @ 859E292
 	ec_move2 CALM_MIND
 	ec_word MAIL
 	ec_move2 MEGA_DRAIN
@@ -2286,7 +2286,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMe: ; 859E292
 	ec_word DESTROYED
 	ec_word MESSAGE
 	ec_word AWFULLY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 TENTACOOL
 	ec_pokemon1 TENTACOOL
 	ec_word FIERY
@@ -2295,7 +2295,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMe: ; 859E292
 	ec_word CUTE_CHARM
 	ec_word IMMUNITY
 
-gEasyChatWordsByLetter_UnusedJapaneseMo: ; 859E2C6
+gEasyChatWordsByLetter_UnusedJapaneseMo: @ 859E2C6
 	ec_word ALMOST
 	ec_word BLAZE
 	ec_word NEARLY
@@ -2317,7 +2317,7 @@ gEasyChatWordsByLetter_UnusedJapaneseMo: ; 859E2C6
 	ec_word DOESN_T
 	ec_pokemon2 TANGELA
 
-gEasyChatWordsByLetter_UnusedJapaneseYa: ; 859E2EE
+gEasyChatWordsByLetter_UnusedJapaneseYa: @ 859E2EE
 	ec_word HOO_HAH
 	ec_word PROMISE
 	ec_word KIND
@@ -2343,7 +2343,7 @@ gEasyChatWordsByLetter_UnusedJapaneseYa: ; 859E2EE
 	ec_word YOUNG
 	ec_pokemon2 YANMA
 
-gEasyChatWordsByLetter_UnusedJapaneseYu: ; 859E31E
+gEasyChatWordsByLetter_UnusedJapaneseYu: @ 859E31E
 	ec_pokemon1 SNORUNT
 	ec_word TAKE
 	ec_word UNION
@@ -2353,11 +2353,11 @@ gEasyChatWordsByLetter_UnusedJapaneseYu: ; 859E31E
 	ec_word ALLOW
 	ec_word FORGET
 	ec_pokemon1 CRADILY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 KADABRA
 	ec_pokemon1 KADABRA
 
-gEasyChatWordsByLetter_UnusedJapaneseYo: ; 859E338
+gEasyChatWordsByLetter_UnusedJapaneseYo: @ 859E338
 	ec_word WITHOUT
 	ec_word YO
 	ec_move2 ACID
@@ -2387,10 +2387,10 @@ gEasyChatWordsByLetter_UnusedJapaneseYo: ; 859E338
 	ec_word TOO_WEAK
 	ec_word WEAKENED
 
-gEasyChatWordsByLetter_UnusedJapaneseRa: ; 859E370
+gEasyChatWordsByLetter_UnusedJapaneseRa: @ 859E370
 	ec_pokemon2 RAIKOU
 	ec_word WEEK
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 RAICHU
 	ec_pokemon1 RAICHU
 	ec_word RIVAL
@@ -2410,7 +2410,7 @@ gEasyChatWordsByLetter_UnusedJapaneseRa: ; 859E370
 	ec_pokemon1 LUVDISC
 	ec_pokemon2 LAPRAS
 	ec_word LOVEY_DOVEY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 VILEPLUME
 	ec_pokemon1 VILEPLUME
 	ec_word LALALA
@@ -2418,11 +2418,11 @@ gEasyChatWordsByLetter_UnusedJapaneseRa: ; 859E370
 	ec_word FORGETS
 	ec_word APPEARS
 	ec_word RANK
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 LANTURN
 	ec_pokemon1 LANTURN
 
-gEasyChatWordsByLetter_UnusedJapaneseRi: ; 859E3B8
+gEasyChatWordsByLetter_UnusedJapaneseRi: @ 859E3B8
 	ec_word LEADER
 	ec_move2 LEAF_BLADE
 	ec_pokemon2 CHARMELEON
@@ -2441,7 +2441,7 @@ gEasyChatWordsByLetter_UnusedJapaneseRi: ; 859E3B8
 	ec_pokemon2 URSARING
 	ec_word SHIELD_DUST
 
-gEasyChatWordsByLetter_UnusedJapaneseRu: ; 859E3DA
+gEasyChatWordsByLetter_UnusedJapaneseRu: @ 859E3DA
 	ec_pokemon2 JYNX
 	ec_word ROOM
 	ec_word RULE
@@ -2454,8 +2454,8 @@ gEasyChatWordsByLetter_UnusedJapaneseRu: ; 859E3DA
 	ec_pokemon1 LUDICOLO
 	ec_word HAPPILY
 
-gEasyChatWordsByLetter_UnusedJapaneseRe: ; 859E3F0
-	.2byte -1, 2 ; doubled Pokémon species names
+gEasyChatWordsByLetter_UnusedJapaneseRe: @ 859E3F0
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 MAGNETON
 	ec_pokemon1 MAGNETON
 	ec_move2 ICE_PUNCH
@@ -2473,9 +2473,9 @@ gEasyChatWordsByLetter_UnusedJapaneseRe: ; 859E3F0
 	ec_move2 COMET_PUNCH
 	ec_word RENTAL
 
-gEasyChatWordsByLetter_UnusedJapaneseRo: ; 859E414
+gEasyChatWordsByLetter_UnusedJapaneseRo: @ 859E414
 	ec_move2 SKULL_BASH
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 VULPIX
 	ec_pokemon1 VULPIX
 	ec_pokemon1 ROSELIA
@@ -2484,7 +2484,7 @@ gEasyChatWordsByLetter_UnusedJapaneseRo: ; 859E414
 	ec_word ROMANTIC
 	ec_word QUESTION
 
-gEasyChatWordsByLetter_UnusedJapaneseWa: ; 859E428
+gEasyChatWordsByLetter_UnusedJapaneseWa: @ 859E428
 	ec_word YAY
 	ec_word WORLD
 	ec_word AWW
@@ -2514,144 +2514,144 @@ gEasyChatWordsByLetter_UnusedJapaneseWa: ; 859E428
 	ec_word ANYWHERE
 	ec_move2 STRUGGLE
 	ec_word BADLY
-	.2byte -1, 2 ; doubled Pokémon species names
+	.2byte -1, 2 @ doubled Pokémon species names
 	ec_pokemon2 MACHOP
 	ec_pokemon1 MACHOP
 
 	.align 2, 0
 
-gEasyChatWordsByLetterPointers: ; 859E46C
+gEasyChatWordsByLetterPointers: @ 859E46C
 	.4byte gEasyChatWordsByLetter_Others
-	.4byte 10 ; number of entries
+	.4byte 10 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_A
-	.4byte 106 ; number of entries
+	.4byte 106 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_B
-	.4byte 86 ; number of entries
+	.4byte 86 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_C
-	.4byte 119 ; number of entries
+	.4byte 119 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_D
-	.4byte 94 ; number of entries
+	.4byte 94 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_E
-	.4byte 59 ; number of entries
+	.4byte 59 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_F
-	.4byte 80 ; number of entries
+	.4byte 80 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_G
-	.4byte 98 ; number of entries
+	.4byte 98 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_H
-	.4byte 101 ; number of entries
+	.4byte 101 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_I
-	.4byte 48 ; number of entries
+	.4byte 48 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_J
-	.4byte 13 ; number of entries
+	.4byte 13 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_K
-	.4byte 33 ; number of entries
+	.4byte 33 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_L
-	.4byte 82 ; number of entries
+	.4byte 82 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_M
-	.4byte 142 ; number of entries
+	.4byte 142 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_N
-	.4byte 54 ; number of entries
+	.4byte 54 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_O
-	.4byte 44 ; number of entries
+	.4byte 44 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_P
-	.4byte 102 ; number of entries
+	.4byte 102 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_Q
-	.4byte 6 ; number of entries
+	.4byte 6 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_R
-	.4byte 80 ; number of entries
+	.4byte 80 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_S
-	.4byte 262 ; number of entries
+	.4byte 262 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_T
-	.4byte 133 ; number of entries
+	.4byte 133 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_U
-	.4byte 24 ; number of entries
+	.4byte 24 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_V
-	.4byte 33 ; number of entries
+	.4byte 33 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_W
-	.4byte 111 ; number of entries
+	.4byte 111 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_X
-	.4byte 4 ; number of entries
+	.4byte 4 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_Y
-	.4byte 19 ; number of entries
+	.4byte 19 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_Z
-	.4byte 8 ; number of entries
+	.4byte 8 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseHi
-	.4byte 55 ; number of entries
+	.4byte 55 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseFu
-	.4byte 71 ; number of entries
+	.4byte 71 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseHe
-	.4byte 32 ; number of entries
+	.4byte 32 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseHo
-	.4byte 55 ; number of entries
+	.4byte 55 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseMa
-	.4byte 74 ; number of entries
+	.4byte 74 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseMi
-	.4byte 37 ; number of entries
+	.4byte 37 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseMu
-	.4byte 12 ; number of entries
+	.4byte 12 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseMe
-	.4byte 26 ; number of entries
+	.4byte 26 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseMo
-	.4byte 20 ; number of entries
+	.4byte 20 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseYa
-	.4byte 24 ; number of entries
+	.4byte 24 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseYu
-	.4byte 13 ; number of entries
+	.4byte 13 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseYo
-	.4byte 28 ; number of entries
+	.4byte 28 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseRa
-	.4byte 36 ; number of entries
+	.4byte 36 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseRi
-	.4byte 17 ; number of entries
+	.4byte 17 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseRu
-	.4byte 11 ; number of entries
+	.4byte 11 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseRe
-	.4byte 18 ; number of entries
+	.4byte 18 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseRo
-	.4byte 10 ; number of entries
+	.4byte 10 @ number of entries
 
 	.4byte gEasyChatWordsByLetter_UnusedJapaneseWa
-	.4byte 33 ; number of entries
+	.4byte 33 @ number of entries
diff --git a/data/text/gift_ribbon_descriptions.s b/data/text/gift_ribbon_descriptions.s
index e58c57a0d..a290d50b2 100644
--- a/data/text/gift_ribbon_descriptions.s
+++ b/data/text/gift_ribbon_descriptions.s
@@ -1,147 +1,147 @@
-gGiftRibbonDescriptionPart1_2003RegionalTourney: ; 8623A74
+gGiftRibbonDescriptionPart1_2003RegionalTourney: @ 8623A74
 	.charmapstr "2003 REGIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart2_Champion: ; 8623A8A
+gGiftRibbonDescriptionPart2_Champion: @ 8623A8A
 	.charmapstr "CHAMPION RIBBON$"
 
-gGiftRibbonDescriptionPart1_2003NationalTourney: ; 8623A9A
+gGiftRibbonDescriptionPart1_2003NationalTourney: @ 8623A9A
 	.charmapstr "2003 NATIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart1_2003GlobalCup: ; 8623AB0
+gGiftRibbonDescriptionPart1_2003GlobalCup: @ 8623AB0
 	.charmapstr "2003 GLOBAL CUP$"
 
-gGiftRibbonDescriptionPart2_RunnerUp: ; 8623AC0
+gGiftRibbonDescriptionPart2_RunnerUp: @ 8623AC0
 	.charmapstr "Runner-up RIBBON$"
 
-gGiftRibbonDescriptionPart2_Semifinalist: ; 8623AD1
+gGiftRibbonDescriptionPart2_Semifinalist: @ 8623AD1
 	.charmapstr "Semifinalist RIBBON$"
 
-gGiftRibbonDescriptionPart1_2004RegionalTourney: ; 8623AE5
+gGiftRibbonDescriptionPart1_2004RegionalTourney: @ 8623AE5
 	.charmapstr "2004 REGIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart1_2004NationalTourney: ; 8623AFB
+gGiftRibbonDescriptionPart1_2004NationalTourney: @ 8623AFB
 	.charmapstr "2004 NATIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart1_2004GlobalCup: ; 8623B11
+gGiftRibbonDescriptionPart1_2004GlobalCup: @ 8623B11
 	.charmapstr "2004 GLOBAL CUP$"
 
-gGiftRibbonDescriptionPart1_2005RegionalTourney: ; 8623B21
+gGiftRibbonDescriptionPart1_2005RegionalTourney: @ 8623B21
 	.charmapstr "2005 REGIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart1_2005NationalTourney: ; 8623B37
+gGiftRibbonDescriptionPart1_2005NationalTourney: @ 8623B37
 	.charmapstr "2005 NATIONAL TOURNEY$"
 
-gGiftRibbonDescriptionPart1_2005GlobalCup: ; 8623B4D
+gGiftRibbonDescriptionPart1_2005GlobalCup: @ 8623B4D
 	.charmapstr "2005 GLOBAL CUP$"
 
-gGiftRibbonDescriptionPart1_PokemonBattleCup: ; 8623B5D
+gGiftRibbonDescriptionPart1_PokemonBattleCup: @ 8623B5D
 	.charmapstr "POKéMON BATTLE CUP$"
 
-gGiftRibbonDescriptionPart2_Participation: ; 8623B70
+gGiftRibbonDescriptionPart2_Participation: @ 8623B70
 	.charmapstr "Participation RIBBON$"
 
-gGiftRibbonDescriptionPart1_PokemonLeague: ; 8623B85
+gGiftRibbonDescriptionPart1_PokemonLeague: @ 8623B85
 	.charmapstr "POKéMON LEAGUE$"
 
-gGiftRibbonDescriptionPart1_AdvanceCup: ; 8623B94
+gGiftRibbonDescriptionPart1_AdvanceCup: @ 8623B94
 	.charmapstr "ADVANCE CUP$"
 
-gGiftRibbonDescriptionPart1_PokemonTournament: ; 8623BA0
+gGiftRibbonDescriptionPart1_PokemonTournament: @ 8623BA0
 	.charmapstr "POKéMON Tournament$"
 
-gGiftRibbonDescriptionPart2_Participation2: ; 8623BB3
+gGiftRibbonDescriptionPart2_Participation2: @ 8623BB3
 	.charmapstr "Participation RIBBON$"
 
-gGiftRibbonDescriptionPart1_PokemonEvent: ; 8623BC8
+gGiftRibbonDescriptionPart1_PokemonEvent: @ 8623BC8
 	.charmapstr "POKéMON Event$"
 
-gGiftRibbonDescriptionPart1_PokemonFestival: ; 8623BD6
+gGiftRibbonDescriptionPart1_PokemonFestival: @ 8623BD6
 	.charmapstr "POKéMON Festival$"
 
-gGiftRibbonDescriptionPart1_DifficultyClearing: ; 8623BE7
+gGiftRibbonDescriptionPart1_DifficultyClearing: @ 8623BE7
 	.charmapstr "Difficulty-clearing$"
 
-gGiftRibbonDescriptionPart2_Commemorative: ; 8623BFB
+gGiftRibbonDescriptionPart2_Commemorative: @ 8623BFB
 	.charmapstr "Commemorative RIBBON$"
 
-gGiftRibbonDescriptionPart1_ClearingAllChallenges: ; 8623C10
+gGiftRibbonDescriptionPart1_ClearingAllChallenges: @ 8623C10
 	.charmapstr "RIBBON awarded for$"
 
-gGiftRibbonDescriptionPart2_ClearingAllChallenges: ; 8623C23
+gGiftRibbonDescriptionPart2_ClearingAllChallenges: @ 8623C23
 	.charmapstr "clearing all challenges.$"
 
-gGiftRibbonDescriptionPart1_100StraightWin: ; 8623C3C
+gGiftRibbonDescriptionPart1_100StraightWin: @ 8623C3C
 	.charmapstr "100-straight Win$"
 
-gGiftRibbonDescriptionPart1_DarknessTower: ; 8623C4D
+gGiftRibbonDescriptionPart1_DarknessTower: @ 8623C4D
 	.charmapstr "DARKNESS TOWER Clear$"
 
-gGiftRibbonDescriptionPart1_RedTower: ; 8623C62
+gGiftRibbonDescriptionPart1_RedTower: @ 8623C62
 	.charmapstr "RED TOWER Clear$"
 
-gGiftRibbonDescriptionPart1_BlackironTower: ; 8623C72
+gGiftRibbonDescriptionPart1_BlackironTower: @ 8623C72
 	.charmapstr "BLACKIRON TOWER Clear$"
 
-gGiftRibbonDescriptionPart1_FinalTower: ; 8623C88
+gGiftRibbonDescriptionPart1_FinalTower: @ 8623C88
 	.charmapstr "FINAL TOWER Clear$"
 
-gGiftRibbonDescriptionPart1_LegendMaking: ; 8623C9A
+gGiftRibbonDescriptionPart1_LegendMaking: @ 8623C9A
 	.charmapstr "Legend-making$"
 
-gGiftRibbonDescriptionPart1_PokemonCenterTokyo: ; 8623CA8
+gGiftRibbonDescriptionPart1_PokemonCenterTokyo: @ 8623CA8
 	.charmapstr "POKéMON CENTER TOKYO$"
 
-gGiftRibbonDescriptionPart1_PokemonCenterOsaka: ; 8623CBD
+gGiftRibbonDescriptionPart1_PokemonCenterOsaka: @ 8623CBD
 	.charmapstr "POKéMON CENTER OSAKA$"
 
-gGiftRibbonDescriptionPart1_PokemonCenterNagoya: ; 8623CD2
+gGiftRibbonDescriptionPart1_PokemonCenterNagoya: @ 8623CD2
 	.charmapstr "POKéMON CENTER NAGOYA$"
 
-gGiftRibbonDescriptionPart1_PokemonCenterNY: ; 8623CE8
+gGiftRibbonDescriptionPart1_PokemonCenterNY: @ 8623CE8
 	.charmapstr "POKéMON CENTER NY$"
 
-gGiftRibbonDescriptionPart1_SummerHolidays: ; 8623CFA
+gGiftRibbonDescriptionPart1_SummerHolidays: @ 8623CFA
 	.charmapstr "Summer Holidays RIBBON$"
 
-gGiftRibbonDescriptionPart2_EmptyString: ; 8623D11
+gGiftRibbonDescriptionPart2_EmptyString: @ 8623D11
 	.charmapstr "$"
 
-gGiftRibbonDescriptionPart1_WinterHolidays: ; 8623D12
+gGiftRibbonDescriptionPart1_WinterHolidays: @ 8623D12
 	.charmapstr "Winter Holidays RIBBON$"
 
-gGiftRibbonDescriptionPart1_SpringHolidays: ; 8623D29
+gGiftRibbonDescriptionPart1_SpringHolidays: @ 8623D29
 	.charmapstr "Spring Holidays RIBBON$"
 
-gGiftRibbonDescriptionPart1_Evergreen: ; 8623D40
+gGiftRibbonDescriptionPart1_Evergreen: @ 8623D40
 	.charmapstr "Evergreen RIBBON$"
 
-gGiftRibbonDescriptionPart1_SpecialHoliday: ; 8623D51
+gGiftRibbonDescriptionPart1_SpecialHoliday: @ 8623D51
 	.charmapstr "Special Holiday RIBBON$"
 
-gGiftRibbonDescriptionPart1_HardWorker: ; 8623D68
+gGiftRibbonDescriptionPart1_HardWorker: @ 8623D68
 	.charmapstr "Hard Worker RIBBON$"
 
-gGiftRibbonDescriptionPart1_LotsOfFriends: ; 8623D7B
+gGiftRibbonDescriptionPart1_LotsOfFriends: @ 8623D7B
 	.charmapstr "Lots of Friends RIBBON$"
 
-gGiftRibbonDescriptionPart1_FullOfEnergy: ; 8623D92
+gGiftRibbonDescriptionPart1_FullOfEnergy: @ 8623D92
 	.charmapstr "Full of Energy RIBBON$"
 
-gGiftRibbonDescriptionPart1_LovedPokemon: ; 8623DA8
+gGiftRibbonDescriptionPart1_LovedPokemon: @ 8623DA8
 	.charmapstr "A commemorative RIBBON$"
 
-gGiftRibbonDescriptionPart2_LovedPokemon: ; 8623DBF
+gGiftRibbonDescriptionPart2_LovedPokemon: @ 8623DBF
 	.charmapstr "for a loved POKéMON.$"
 
-gGiftRibbonDescriptionPart1_LoveForPokemon: ; 8623DD4
+gGiftRibbonDescriptionPart1_LoveForPokemon: @ 8623DD4
 	.charmapstr "RIBBON that shows$"
 
-gGiftRibbonDescriptionPart2_LoveForPokemon: ; 8623DE6
+gGiftRibbonDescriptionPart2_LoveForPokemon: @ 8623DE6
 	.charmapstr "love for POKéMON.$"
 
 	.align 2, 0
 
-gGiftRibbonDescriptionPointers: ; 8623DF8
+gGiftRibbonDescriptionPointers: @ 8623DF8
 	.4byte gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion
 	.4byte gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion
 	.4byte gGiftRibbonDescriptionPart1_2003GlobalCup,         gGiftRibbonDescriptionPart2_Champion
diff --git a/data/text/item_descriptions.s b/data/text/item_descriptions.s
index ce87c22a4..108a3ad87 100644
--- a/data/text/item_descriptions.s
+++ b/data/text/item_descriptions.s
@@ -1,929 +1,929 @@
-gDummyItemDescription: ; 857FEA0
+gDummyItemDescription: @ 857FEA0
 	.charmapstr "?????$"
 
-gMasterBallItemDescription: ; 857FEA6
+gMasterBallItemDescription: @ 857FEA6
 	.charmapstr "The best BALL that{next}catches a POKéMON{next}without fail.$"
 
-gUltraBallItemDescription: ; 857FED9
+gUltraBallItemDescription: @ 857FED9
 	.charmapstr "A better BALL with{next}a higher catch rate{next}than a GREAT BALL.$"
 
-gGreatBallItemDescription: ; 857FF13
+gGreatBallItemDescription: @ 857FF13
 	.charmapstr "A good BALL with a{next}higher catch rate{next}than a POKé BALL.$"
 
-gPokeBallItemDescription: ; 857FF4A
+gPokeBallItemDescription: @ 857FF4A
 	.charmapstr "A tool used for{next}catching wild{next}POKéMON.$"
 
-gSafariBallItemDescription: ; 857FF71
+gSafariBallItemDescription: @ 857FF71
 	.charmapstr "A special BALL that{next}is used only in the{next}SAFARI ZONE.$"
 
-gNetBallItemDescription: ; 857FFA6
+gNetBallItemDescription: @ 857FFA6
 	.charmapstr "A BALL that works{next}well on WATER- and{next}BUG-type POKéMON.$"
 
-gDiveBallItemDescription: ; 857FFDD
+gDiveBallItemDescription: @ 857FFDD
 	.charmapstr "A BALL that works{next}better on POKéMON{next}on the ocean floor.$"
 
-gNestBallItemDescription: ; 8580015
+gNestBallItemDescription: @ 8580015
 	.charmapstr "A BALL that works{next}better on weaker{next}POKéMON.$"
 
-gRepeatBallItemDescription: ; 8580041
+gRepeatBallItemDescription: @ 8580041
 	.charmapstr "A BALL that works{next}better on POKéMON{next}caught before.$"
 
-gTimerBallItemDescription: ; 8580074
+gTimerBallItemDescription: @ 8580074
 	.charmapstr "A BALL that gains{next}power in battles{next}taking many turns.$"
 
-gLuxuryBallItemDescription: ; 85800AA
+gLuxuryBallItemDescription: @ 85800AA
 	.charmapstr "A cozy BALL that{next}makes POKéMON{next}more friendly.$"
 
-gPremierBallItemDescription: ; 85800D8
+gPremierBallItemDescription: @ 85800D8
 	.charmapstr "A rare BALL made{next}in commemoration{next}of some event.$"
 
-gPotionItemDescription: ; 8580109
+gPotionItemDescription: @ 8580109
 	.charmapstr "Restores the HP of{next}a POKéMON by{next}20 points.$"
 
-gAntidoteItemDescription: ; 8580134
+gAntidoteItemDescription: @ 8580134
 	.charmapstr "Heals a poisoned{next}POKéMON.$"
 
-gBurnHealItemDescription: ; 858014E
+gBurnHealItemDescription: @ 858014E
 	.charmapstr "Heals POKéMON{next}of a burn.$"
 
-gIceHealItemDescription: ; 8580167
+gIceHealItemDescription: @ 8580167
 	.charmapstr "Defrosts a frozen{next}POKéMON.$"
 
-gAwakeningItemDescription: ; 8580182
+gAwakeningItemDescription: @ 8580182
 	.charmapstr "Awakens a sleeping{next}POKéMON.$"
 
-gParalyzeHealItemDescription: ; 858019E
+gParalyzeHealItemDescription: @ 858019E
 	.charmapstr "Heals a paralyzed{next}POKéMON.$"
 
-gFullRestoreItemDescription: ; 85801B9
+gFullRestoreItemDescription: @ 85801B9
 	.charmapstr "Fully restores the{next}HP and status of a{next}POKéMON.$"
 
-gMaxPotionItemDescription: ; 85801E8
+gMaxPotionItemDescription: @ 85801E8
 	.charmapstr "Fully restores the{next}HP of a POKéMON.$"
 
-gHyperPotionItemDescription: ; 858020C
+gHyperPotionItemDescription: @ 858020C
 	.charmapstr "Restores the HP of{next}a POKéMON by{next}200 points.$"
 
-gSuperPotionItemDescription: ; 8580238
+gSuperPotionItemDescription: @ 8580238
 	.charmapstr "Restores the HP of{next}a POKéMON by{next}50 points.$"
 
-gFullHealItemDescription: ; 8580263
+gFullHealItemDescription: @ 8580263
 	.charmapstr "Heals all the{next}status problems of{next}one POKéMON.$"
 
-gReviveItemDescription: ; 8580291
+gReviveItemDescription: @ 8580291
 	.charmapstr "Revives a fainted{next}POKéMON with half{next}its HP.$"
 
-gMaxReviveItemDescription: ; 85802BD
+gMaxReviveItemDescription: @ 85802BD
 	.charmapstr "Revives a fainted{next}POKéMON with all{next}its HP.$"
 
-gFreshWaterItemDescription: ; 85802E8
+gFreshWaterItemDescription: @ 85802E8
 	.charmapstr "A mineral water{next}that restores HP{next}by 50 points.$"
 
-gSodaPopItemDescription: ; 8580317
+gSodaPopItemDescription: @ 8580317
 	.charmapstr "A fizzy soda drink{next}that restores HP{next}by 60 points.$"
 
-gLemonadeItemDescription: ; 8580349
+gLemonadeItemDescription: @ 8580349
 	.charmapstr "A very sweet drink{next}that restores HP{next}by 80 points.$"
 
-gMoomooMilkItemDescription: ; 858037B
+gMoomooMilkItemDescription: @ 858037B
 	.charmapstr "A nutritious milk{next}that restores HP{next}by 100 points.$"
 
-gEnergyPowderItemDescription: ; 85803AD
+gEnergyPowderItemDescription: @ 85803AD
 	.charmapstr "A bitter powder{next}that restores HP{next}by 50 points.$"
 
-gEnergyRootItemDescription: ; 85803DC
+gEnergyRootItemDescription: @ 85803DC
 	.charmapstr "A bitter root{next}that restores HP{next}by 200 points.$"
 
-gHealPowderItemDescription: ; 858040A
+gHealPowderItemDescription: @ 858040A
 	.charmapstr "A bitter powder{next}that heals all{next}status problems.$"
 
-gRevivalHerbItemDescription: ; 858043A
+gRevivalHerbItemDescription: @ 858043A
 	.charmapstr "A very bitter herb{next}that revives a{next}fainted POKéMON.$"
 
-gEtherItemDescription: ; 858046D
+gEtherItemDescription: @ 858046D
 	.charmapstr "Restores the PP{next}of a selected move{next}by 10.$"
 
-gMaxEtherItemDescription: ; 8580497
+gMaxEtherItemDescription: @ 8580497
 	.charmapstr "Fully restores the{next}PP of a selected{next}move.$"
 
-gElixirItemDescription: ; 85804C1
+gElixirItemDescription: @ 85804C1
 	.charmapstr "Restores the PP{next}of all moves by 10.$"
 
-gMaxElixirItemDescription: ; 85804E5
+gMaxElixirItemDescription: @ 85804E5
 	.charmapstr "Fully restores the{next}PP of a POKéMON’s{next}moves.$"
 
-gLavaCookieItemDescription: ; 8580511
+gLavaCookieItemDescription: @ 8580511
 	.charmapstr "A local specialty{next}that heals all{next}status problems.$"
 
-gBlueFluteItemDescription: ; 8580543
+gBlueFluteItemDescription: @ 8580543
 	.charmapstr "A glass flute that{next}awakens sleeping{next}POKéMON.$"
 
-gYellowFluteItemDescription: ; 8580570
+gYellowFluteItemDescription: @ 8580570
 	.charmapstr "A glass flute that{next}snaps POKéMON{next}out of confusion.$"
 
-gRedFluteItemDescription: ; 85805A3
+gRedFluteItemDescription: @ 85805A3
 	.charmapstr "A glass flute that{next}snaps POKéMON{next}out of attraction.$"
 
-gBlackFluteItemDescription: ; 85805D7
+gBlackFluteItemDescription: @ 85805D7
 	.charmapstr "A glass flute that{next}keeps away wild{next}POKéMON.$"
 
-gWhiteFluteItemDescription: ; 8580603
+gWhiteFluteItemDescription: @ 8580603
 	.charmapstr "A glass flute that{next}lures wild POKéMON.$"
 
-gBerryJuiceItemDescription: ; 858062A
+gBerryJuiceItemDescription: @ 858062A
 	.charmapstr "A 100% pure juice{next}that restores HP{next}by 20 points.$"
 
-gSacredAshItemDescription: ; 858065B
+gSacredAshItemDescription: @ 858065B
 	.charmapstr "Fully revives and{next}restores all{next}fainted POKéMON.$"
 
-gShoalSaltItemDescription: ; 858068B
+gShoalSaltItemDescription: @ 858068B
 	.charmapstr "Salt obtained from{next}deep inside the{next}SHOAL CAVE.$"
 
-gShoalShellItemDescription: ; 85806BA
+gShoalShellItemDescription: @ 85806BA
 	.charmapstr "A seashell found{next}deep inside the{next}SHOAL CAVE.$"
 
-gRedShardItemDescription: ; 85806E7
+gRedShardItemDescription: @ 85806E7
 	.charmapstr "A shard from an{next}ancient item. Can{next}be sold cheaply.$"
 
-gBlueShardItemDescription: ; 858071A
+gBlueShardItemDescription: @ 858071A
 	.charmapstr "A shard from an{next}ancient item. Can{next}be sold cheaply.$"
 
-gYellowShardItemDescription: ; 858074D
+gYellowShardItemDescription: @ 858074D
 	.charmapstr "A shard from an{next}ancient item. Can{next}be sold cheaply.$"
 
-gGreenShardItemDescription: ; 8580780
+gGreenShardItemDescription: @ 8580780
 	.charmapstr "A shard from an{next}ancient item. Can{next}be sold cheaply.$"
 
-gHPUpItemDescription: ; 85807B3
+gHPUpItemDescription: @ 85807B3
 	.charmapstr "Raises the base HP{next}of one POKéMON.$"
 
-gProteinItemDescription: ; 85807D6
+gProteinItemDescription: @ 85807D6
 	.charmapstr "Raises the base{next}ATTACK stat of one{next}POKéMON.$"
 
-gIronItemDescription: ; 8580802
+gIronItemDescription: @ 8580802
 	.charmapstr "Raises the base{next}DEFENSE stat of{next}one POKéMON.$"
 
-gCarbosItemDescription: ; 858082F
+gCarbosItemDescription: @ 858082F
 	.charmapstr "Raises the base{next}SPEED stat of one{next}POKéMON.$"
 
-gCalciumItemDescription: ; 858085A
+gCalciumItemDescription: @ 858085A
 	.charmapstr "Raises the base{next}SP. ATK stat of one{next}POKéMON.$"
 
-gRareCandyItemDescription: ; 8580887
+gRareCandyItemDescription: @ 8580887
 	.charmapstr "Raises the level{next}of a POKéMON by{next}one.$"
 
-gPPUpItemDescription: ; 85808AD
+gPPUpItemDescription: @ 85808AD
 	.charmapstr "Raises the maximum{next}PP of a selected{next}move.$"
 
-gZincItemDescription: ; 85808D7
+gZincItemDescription: @ 85808D7
 	.charmapstr "Raises the base{next}SP. DEF stat of one{next}POKéMON.$"
 
-gPPMaxItemDescription: ; 8580904
+gPPMaxItemDescription: @ 8580904
 	.charmapstr "Raises the PP of a{next}move to its maximum{next}points.$"
 
-gGuardSpecItemDescription: ; 8580933
+gGuardSpecItemDescription: @ 8580933
 	.charmapstr "Prevents stat{next}reduction when{next}used in battle.$"
 
-gDireHitItemDescription: ; 8580960
+gDireHitItemDescription: @ 8580960
 	.charmapstr "Raises the{next}critical-hit ratio{next}during one battle.$"
 
-gXAttackItemDescription: ; 8580991
+gXAttackItemDescription: @ 8580991
 	.charmapstr "Raises the stat{next}ATTACK during one{next}battle.$"
 
-gXDefendItemDescription: ; 85809BB
+gXDefendItemDescription: @ 85809BB
 	.charmapstr "Raises the stat{next}DEFENSE during one{next}battle.$"
 
-gXSpeedItemDescription: ; 85809E6
+gXSpeedItemDescription: @ 85809E6
 	.charmapstr "Raises the stat{next}SPEED during one{next}battle.$"
 
-gXAccuracyItemDescription: ; 8580A0F
+gXAccuracyItemDescription: @ 8580A0F
 	.charmapstr "Raises accuracy{next}of attack moves{next}during one battle.$"
 
-gXSpecialItemDescription: ; 8580A42
+gXSpecialItemDescription: @ 8580A42
 	.charmapstr "Raises the stat{next}SP. ATK during one{next}battle.$"
 
-gPokeDollItemDescription: ; 8580A6D
+gPokeDollItemDescription: @ 8580A6D
 	.charmapstr "Use to flee from{next}any battle with{next}a wild POKéMON.$"
 
-gFluffyTailItemDescription: ; 8580A9E
+gFluffyTailItemDescription: @ 8580A9E
 	.charmapstr "Use to flee from{next}any battle with{next}a wild POKéMON.$"
 
-gSuperRepelItemDescription: ; 8580ACF
+gSuperRepelItemDescription: @ 8580ACF
 	.charmapstr "Repels weak wild{next}POKéMON for 200{next}steps.$"
 
-gMaxRepelItemDescription: ; 8580AF7
+gMaxRepelItemDescription: @ 8580AF7
 	.charmapstr "Repels weak wild{next}POKéMON for 250{next}steps.$"
 
-gEscapeRopeItemDescription: ; 8580B1F
+gEscapeRopeItemDescription: @ 8580B1F
 	.charmapstr "Use to escape{next}instantly from a{next}cave or a dungeon.$"
 
-gRepelItemDescription: ; 8580B51
+gRepelItemDescription: @ 8580B51
 	.charmapstr "Repels weak wild{next}POKéMON for 100{next}steps.$"
 
-gSunStoneItemDescription: ; 8580B79
+gSunStoneItemDescription: @ 8580B79
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gMoonStoneItemDescription: ; 8580BA2
+gMoonStoneItemDescription: @ 8580BA2
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gFireStoneItemDescription: ; 8580BCB
+gFireStoneItemDescription: @ 8580BCB
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gThunderStoneItemDescription: ; 8580BF4
+gThunderStoneItemDescription: @ 8580BF4
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gWaterStoneItemDescription: ; 8580C1D
+gWaterStoneItemDescription: @ 8580C1D
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gLeafStoneItemDescription: ; 8580C46
+gLeafStoneItemDescription: @ 8580C46
 	.charmapstr "Makes certain{next}species of POKéMON{next}evolve.$"
 
-gTinyMushroomItemDescription: ; 8580C6F
+gTinyMushroomItemDescription: @ 8580C6F
 	.charmapstr "A plain mushroom{next}that would sell{next}at a cheap price.$"
 
-gBigMushroomItemDescription: ; 8580CA2
+gBigMushroomItemDescription: @ 8580CA2
 	.charmapstr "A rare mushroom{next}that would sell at a{next}high price.$"
 
-gPearlItemDescription: ; 8580CD3
+gPearlItemDescription: @ 8580CD3
 	.charmapstr "A pretty pearl{next}that would sell at a{next}cheap price.$"
 
-gBigPearlItemDescription: ; 8580D04
+gBigPearlItemDescription: @ 8580D04
 	.charmapstr "A lovely large pearl{next}that would sell at a{next}high price.$"
 
-gStardustItemDescription: ; 8580D3A
+gStardustItemDescription: @ 8580D3A
 	.charmapstr "Beautiful red sand.{next}Can be sold at a{next}high price.$"
 
-gStarPieceItemDescription: ; 8580D6B
+gStarPieceItemDescription: @ 8580D6B
 	.charmapstr "A red gem shard.{next}It would sell for a{next}very high price.$"
 
-gNuggetItemDescription: ; 8580DA1
+gNuggetItemDescription: @ 8580DA1
 	.charmapstr "A nugget of pure{next}gold. Can be sold at{next}a high price.$"
 
-gHeartScaleItemDescription: ; 8580DD5
+gHeartScaleItemDescription: @ 8580DD5
 	.charmapstr "A lovely scale.{next}It is coveted by{next}collectors.$"
 
-gOrangeMailItemDescription: ; 8580E02
+gOrangeMailItemDescription: @ 8580E02
 	.charmapstr "A ZIGZAGOON-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gHarborMailItemDescription: ; 8580E32
+gHarborMailItemDescription: @ 8580E32
 	.charmapstr "A WINGULL-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gGlitterMailItemDescription: ; 8580E60
+gGlitterMailItemDescription: @ 8580E60
 	.charmapstr "A PIKACHU-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gMechMailItemDescription: ; 8580E8E
+gMechMailItemDescription: @ 8580E8E
 	.charmapstr "A MAGNEMITE-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gWoodMailItemDescription: ; 8580EBE
+gWoodMailItemDescription: @ 8580EBE
 	.charmapstr "A SLAKOTH-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gWaveMailItemDescription: ; 8580EEC
+gWaveMailItemDescription: @ 8580EEC
 	.charmapstr "A WAILMER-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gBeadMailItemDescription: ; 8580F1A
+gBeadMailItemDescription: @ 8580F1A
 	.charmapstr "MAIL featuring a{next}sketch of the{next}holding POKéMON.$"
 
-gShadowMailItemDescription: ; 8580F4A
+gShadowMailItemDescription: @ 8580F4A
 	.charmapstr "A DUSKULL-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gTropicMailItemDescription: ; 8580F78
+gTropicMailItemDescription: @ 8580F78
 	.charmapstr "A BELLOSSOM-print{next}MAIL to be held by{next}a POKéMON.$"
 
-gDreamMailItemDescription: ; 8580FA8
+gDreamMailItemDescription: @ 8580FA8
 	.charmapstr "MAIL featuring a{next}sketch of the{next}holding POKéMON.$"
 
-gFabMailItemDescription: ; 8580FD8
+gFabMailItemDescription: @ 8580FD8
 	.charmapstr "A gorgeous-print{next}MAIL to be held{next}by a POKéMON.$"
 
-gRetroMailItemDescription: ; 8581007
+gRetroMailItemDescription: @ 8581007
 	.charmapstr "MAIL featuring the{next}drawings of three{next}POKéMON.$"
 
-gCheriBerryItemDescription: ; 8581035
+gCheriBerryItemDescription: @ 8581035
 	.charmapstr "A hold item that{next}heals paralysis{next}in battle.$"
 
-gChestoBerryItemDescription: ; 8581061
+gChestoBerryItemDescription: @ 8581061
 	.charmapstr "A hold item that{next}awakens POKéMON{next}in battle.$"
 
-gPechaBerryItemDescription: ; 858108D
+gPechaBerryItemDescription: @ 858108D
 	.charmapstr "A hold item that{next}heals poisoning{next}in battle.$"
 
-gRawstBerryItemDescription: ; 85810B9
+gRawstBerryItemDescription: @ 85810B9
 	.charmapstr "A hold item that{next}heals a burn in{next}battle.$"
 
-gAspearBerryItemDescription: ; 85810E2
+gAspearBerryItemDescription: @ 85810E2
 	.charmapstr "A hold item that{next}defrosts POKéMON{next}in battle.$"
 
-gLeppaBerryItemDescription: ; 858110F
+gLeppaBerryItemDescription: @ 858110F
 	.charmapstr "A hold item that{next}restores 10 PP in{next}battle.$"
 
-gOranBerryItemDescription: ; 858113A
+gOranBerryItemDescription: @ 858113A
 	.charmapstr "A hold item that{next}restores 10 HP in{next}battle.$"
 
-gPersimBerryItemDescription: ; 8581165
+gPersimBerryItemDescription: @ 8581165
 	.charmapstr "A hold item that{next}heals confusion{next}in battle.$"
 
-gLumBerryItemDescription: ; 8581191
+gLumBerryItemDescription: @ 8581191
 	.charmapstr "A hold item that{next}heals any status{next}problem in battle.$"
 
-gSitrusBerryItemDescription: ; 85811C6
+gSitrusBerryItemDescription: @ 85811C6
 	.charmapstr "A hold item that{next}restores 30 HP in{next}battle.$"
 
-gFigyBerryItemDescription: ; 85811F1
+gFigyBerryItemDescription: @ 85811F1
 	.charmapstr "A hold item that{next}restores HP but{next}may confuse.$"
 
-gWikiBerryItemDescription: ; 858121F
+gWikiBerryItemDescription: @ 858121F
 	.charmapstr "A hold item that{next}restores HP but{next}may confuse.$"
 
-gMagoBerryItemDescription: ; 858124D
+gMagoBerryItemDescription: @ 858124D
 	.charmapstr "A hold item that{next}restores HP but{next}may confuse.$"
 
-gAguavBerryItemDescription: ; 858127B
+gAguavBerryItemDescription: @ 858127B
 	.charmapstr "A hold item that{next}restores HP but{next}may confuse.$"
 
-gIapapaBerryItemDescription: ; 85812A9
+gIapapaBerryItemDescription: @ 85812A9
 	.charmapstr "A hold item that{next}restores HP but{next}may confuse.$"
 
-gRazzBerryItemDescription: ; 85812D7
+gRazzBerryItemDescription: @ 85812D7
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow RAZZ.$"
 
-gBlukBerryItemDescription: ; 858130B
+gBlukBerryItemDescription: @ 858130B
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow BLUK.$"
 
-gNanabBerryItemDescription: ; 858133F
+gNanabBerryItemDescription: @ 858133F
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow NANAB.$"
 
-gWepearBerryItemDescription: ; 8581374
+gWepearBerryItemDescription: @ 8581374
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow WEPEAR.$"
 
-gPinapBerryItemDescription: ; 85813AA
+gPinapBerryItemDescription: @ 85813AA
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow PINAP.$"
 
-gPomegBerryItemDescription: ; 85813DF
+gPomegBerryItemDescription: @ 85813DF
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base HP.$"
 
-gKelpsyBerryItemDescription: ; 858140C
+gKelpsyBerryItemDescription: @ 858140C
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base ATTACK.$"
 
-gQualotBerryItemDescription: ; 858143D
+gQualotBerryItemDescription: @ 858143D
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base DEFENSE.$"
 
-gHondewBerryItemDescription: ; 858146F
+gHondewBerryItemDescription: @ 858146F
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base SP. ATK.$"
 
-gGrepaBerryItemDescription: ; 85814A1
+gGrepaBerryItemDescription: @ 85814A1
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base SP. DEF.$"
 
-gTamatoBerryItemDescription: ; 85814D3
+gTamatoBerryItemDescription: @ 85814D3
 	.charmapstr "Makes a POKéMON{next}friendly but lowers{next}base SPEED.$"
 
-gCornnBerryItemDescription: ; 8581503
+gCornnBerryItemDescription: @ 8581503
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow CORNN.$"
 
-gMagostBerryItemDescription: ; 8581538
+gMagostBerryItemDescription: @ 8581538
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow MAGOST.$"
 
-gRabutaBerryItemDescription: ; 858156E
+gRabutaBerryItemDescription: @ 858156E
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow RABUTA.$"
 
-gNomelBerryItemDescription: ; 85815A4
+gNomelBerryItemDescription: @ 85815A4
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow NOMEL.$"
 
-gSpelonBerryItemDescription: ; 85815D9
+gSpelonBerryItemDescription: @ 85815D9
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow SPELON.$"
 
-gPamtreBerryItemDescription: ; 858160F
+gPamtreBerryItemDescription: @ 858160F
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow PAMTRE.$"
 
-gWatmelBerryItemDescription: ; 8581645
+gWatmelBerryItemDescription: @ 8581645
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow WATMEL.$"
 
-gDurinBerryItemDescription: ; 858167B
+gDurinBerryItemDescription: @ 858167B
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow DURIN.$"
 
-gBelueBerryItemDescription: ; 85816B0
+gBelueBerryItemDescription: @ 85816B0
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow BELUE.$"
 
-gLiechiBerryItemDescription: ; 85816E5
+gLiechiBerryItemDescription: @ 85816E5
 	.charmapstr "A hold item that{next}raises ATTACK in{next}a pinch.$"
 
-gGanlonBerryItemDescription: ; 8581710
+gGanlonBerryItemDescription: @ 8581710
 	.charmapstr "A hold item that{next}raises DEFENSE in{next}a pinch.$"
 
-gSalacBerryItemDescription: ; 858173C
+gSalacBerryItemDescription: @ 858173C
 	.charmapstr "A hold item that{next}raises SPEED in{next}a pinch.$"
 
-gPetayaBerryItemDescription: ; 8581766
+gPetayaBerryItemDescription: @ 8581766
 	.charmapstr "A hold item that{next}raises SP. ATK in{next}a pinch.$"
 
-gApicotBerryItemDescription: ; 8581792
+gApicotBerryItemDescription: @ 8581792
 	.charmapstr "A hold item that{next}raises SP. DEF in{next}a pinch.$"
 
-gLansatBerryItemDescription: ; 85817BE
+gLansatBerryItemDescription: @ 85817BE
 	.charmapstr "A hold item that{next}ups the critical-{next}hit rate in a pinch.$"
 
-gStarfBerryItemDescription: ; 85817F6
+gStarfBerryItemDescription: @ 85817F6
 	.charmapstr "A hold item that{next}sharply boosts a{next}stat in a pinch.$"
 
-gEnigmaBerryItemDescription: ; 8581829
+gEnigmaBerryItemDescription: @ 8581829
 	.charmapstr "{POKEBLOCK} ingredient.{next}Plant in loamy soil{next}to grow a mystery.$"
 
-gBrightPowderItemDescription: ; 8581862
+gBrightPowderItemDescription: @ 8581862
 	.charmapstr "A hold item that{next}casts a glare to{next}reduce accuracy.$"
 
-gWhiteHerbItemDescription: ; 8581895
+gWhiteHerbItemDescription: @ 8581895
 	.charmapstr "A hold item that{next}restores any{next}lowered stat.$"
 
-gMachoBraceItemDescription: ; 85818C1
+gMachoBraceItemDescription: @ 85818C1
 	.charmapstr "A hold item that{next}promotes growth,{next}but reduces SPEED.$"
 
-gExpShareItemDescription: ; 85818F6
+gExpShareItemDescription: @ 85818F6
 	.charmapstr "A hold item that{next}gets EXP. points{next}from battles.$"
 
-gQuickClawItemDescription: ; 8581926
+gQuickClawItemDescription: @ 8581926
 	.charmapstr "A hold item that{next}occasionally allows{next}the first strike.$"
 
-gSootheBellItemDescription: ; 858195D
+gSootheBellItemDescription: @ 858195D
 	.charmapstr "A hold item that{next}calms spirits and{next}fosters friendship.$"
 
-gMentalHerbItemDescription: ; 8581994
+gMentalHerbItemDescription: @ 8581994
 	.charmapstr "A hold item that{next}snaps POKéMON out{next}of infatuation.$"
 
-gChoiceBandItemDescription: ; 85819C7
+gChoiceBandItemDescription: @ 85819C7
 	.charmapstr "Raises a move’s{next}power, but permits{next}only that move.$"
 
-gKingsRockItemDescription: ; 85819FA
+gKingsRockItemDescription: @ 85819FA
 	.charmapstr "A hold item that{next}may cause flinching{next}when the foe is hit.$"
 
-gSilverPowderItemDescription: ; 8581A34
+gSilverPowderItemDescription: @ 8581A34
 	.charmapstr "A hold item that{next}raises the power of{next}BUG-type moves.$"
 
-gAmuletCoinItemDescription: ; 8581A69
+gAmuletCoinItemDescription: @ 8581A69
 	.charmapstr "Doubles money in{next}battle if the{next}holder takes part.$"
 
-gCleanseTagItemDescription: ; 8581A9B
+gCleanseTagItemDescription: @ 8581A9B
 	.charmapstr "A hold item that{next}helps repel wild{next}POKéMON.$"
 
-gSoulDewItemDescription: ; 8581AC6
+gSoulDewItemDescription: @ 8581AC6
 	.charmapstr "Hold item: raises{next}SP. ATK & SP. DEF of{next}LATIOS & LATIAS.$"
 
-gDeepSeaToothItemDescription: ; 8581AFE
+gDeepSeaToothItemDescription: @ 8581AFE
 	.charmapstr "A hold item that{next}raises the SP. ATK{next}of CLAMPERL.$"
 
-gDeepSeaScaleItemDescription: ; 8581B2F
+gDeepSeaScaleItemDescription: @ 8581B2F
 	.charmapstr "A hold item that{next}raises the SP. DEF{next}of CLAMPERL.$"
 
-gSmokeBallItemDescription: ; 8581B60
+gSmokeBallItemDescription: @ 8581B60
 	.charmapstr "A hold item that{next}assures fleeing{next}from wild POKéMON.$"
 
-gEverstoneItemDescription: ; 8581B94
+gEverstoneItemDescription: @ 8581B94
 	.charmapstr "A wondrous hold{next}item that prevents{next}evolution.$"
 
-gFocusBandItemDescription: ; 8581BC2
+gFocusBandItemDescription: @ 8581BC2
 	.charmapstr "A hold item that{next}occasionally{next}prevents fainting.$"
 
-gLuckyEggItemDescription: ; 8581BF3
+gLuckyEggItemDescription: @ 8581BF3
 	.charmapstr "A hold item that{next}boosts EXP. points{next}earned in battle.$"
 
-gScopeLensItemDescription: ; 8581C29
+gScopeLensItemDescription: @ 8581C29
 	.charmapstr "A hold item that{next}improves the{next}critical-hit rate.$"
 
-gMetalCoatItemDescription: ; 8581C5A
+gMetalCoatItemDescription: @ 8581C5A
 	.charmapstr "A hold item that{next}raises the power of{next}STEEL-type moves.$"
 
-gLeftoversItemDescription: ; 8581C91
+gLeftoversItemDescription: @ 8581C91
 	.charmapstr "A hold item that{next}gradually restores{next}HP in battle.$"
 
-gDragonScaleItemDescription: ; 8581CC3
+gDragonScaleItemDescription: @ 8581CC3
 	.charmapstr "A strange scale{next}held by DRAGON-{next}type POKéMON.$"
 
-gLightBallItemDescription: ; 8581CF1
+gLightBallItemDescription: @ 8581CF1
 	.charmapstr "A hold item that{next}raises the SP. ATK{next}of PIKACHU.$"
 
-gSoftSandItemDescription: ; 8581D21
+gSoftSandItemDescription: @ 8581D21
 	.charmapstr "A hold item that{next}raises the power of{next}GROUND-type moves.$"
 
-gHardStoneItemDescription: ; 8581D59
+gHardStoneItemDescription: @ 8581D59
 	.charmapstr "A hold item that{next}raises the power of{next}ROCK-type moves.$"
 
-gMiracleSeedItemDescription: ; 8581D8F
+gMiracleSeedItemDescription: @ 8581D8F
 	.charmapstr "A hold item that{next}raises the power of{next}GRASS-type moves.$"
 
-gBlackGlassesItemDescription: ; 8581DC6
+gBlackGlassesItemDescription: @ 8581DC6
 	.charmapstr "A hold item that{next}raises the power of{next}DARK-type moves.$"
 
-gBlackBeltItemDescription: ; 8581DFC
+gBlackBeltItemDescription: @ 8581DFC
 	.charmapstr "A hold item that{next}boosts FIGHTING-{next}type moves.$"
 
-gMagnetItemDescription: ; 8581E2A
+gMagnetItemDescription: @ 8581E2A
 	.charmapstr "A hold item that{next}boosts ELECTRIC-{next}type moves.$"
 
-gMysticWaterItemDescription: ; 8581E58
+gMysticWaterItemDescription: @ 8581E58
 	.charmapstr "A hold item that{next}raises the power of{next}WATER-type moves.$"
 
-gSharpBeakItemDescription: ; 8581E8F
+gSharpBeakItemDescription: @ 8581E8F
 	.charmapstr "A hold item that{next}raises the power of{next}FLYING-type moves.$"
 
-gPoisonBarbItemDescription: ; 8581EC7
+gPoisonBarbItemDescription: @ 8581EC7
 	.charmapstr "A hold item that{next}raises the power of{next}POISON-type moves.$"
 
-gNeverMeltIceItemDescription: ; 8581EFF
+gNeverMeltIceItemDescription: @ 8581EFF
 	.charmapstr "A hold item that{next}raises the power of{next}ICE-type moves.$"
 
-gSpellTagItemDescription: ; 8581F34
+gSpellTagItemDescription: @ 8581F34
 	.charmapstr "A hold item that{next}raises the power of{next}GHOST-type moves.$"
 
-gTwistedSpoonItemDescription: ; 8581F6B
+gTwistedSpoonItemDescription: @ 8581F6B
 	.charmapstr "A hold item that{next}boosts PSYCHIC-{next}type moves.$"
 
-gCharcoalItemDescription: ; 8581F98
+gCharcoalItemDescription: @ 8581F98
 	.charmapstr "A hold item that{next}raises the power of{next}FIRE-type moves.$"
 
-gDragonFangItemDescription: ; 8581FCE
+gDragonFangItemDescription: @ 8581FCE
 	.charmapstr "A hold item that{next}raises the power of{next}DRAGON-type moves.$"
 
-gSilkScarfItemDescription: ; 8582006
+gSilkScarfItemDescription: @ 8582006
 	.charmapstr "A hold item that{next}raises the power of{next}NORMAL-type moves.$"
 
-gUpGradeItemDescription: ; 858203E
+gUpGradeItemDescription: @ 858203E
 	.charmapstr "A peculiar box made{next}by SILPH CO.$"
 
-gShellBellItemDescription: ; 858205F
+gShellBellItemDescription: @ 858205F
 	.charmapstr "A hold item that{next}restores HP upon{next}striking the foe.$"
 
-gSeaIncenseItemDescription: ; 8582093
+gSeaIncenseItemDescription: @ 8582093
 	.charmapstr "A hold item that{next}slightly boosts{next}WATER-type moves.$"
 
-gLaxIncenseItemDescription: ; 85820C6
+gLaxIncenseItemDescription: @ 85820C6
 	.charmapstr "A hold item that{next}slightly lowers the{next}foe’s accuracy.$"
 
-gLuckyPunchItemDescription: ; 85820FB
+gLuckyPunchItemDescription: @ 85820FB
 	.charmapstr "A hold item that{next}raises CHANSEY’s{next}critical-hit rate.$"
 
-gMetalPowderItemDescription: ; 8582130
+gMetalPowderItemDescription: @ 8582130
 	.charmapstr "A hold item that{next}raises DITTO’s{next}DEFENSE.$"
 
-gThickClubItemDescription: ; 8582159
+gThickClubItemDescription: @ 8582159
 	.charmapstr "A hold item that {next}raises CUBONE or{next}MAROWAK’s ATTACK.$"
 
-gStickItemDescription: ; 858218E
+gStickItemDescription: @ 858218E
 	.charmapstr "A hold item that{next}raises FARFETCH’D’s{next}critical-hit ratio.$"
 
-gRedScarfItemDescription: ; 85821C7
+gRedScarfItemDescription: @ 85821C7
 	.charmapstr "A hold item that{next}raises COOL in{next}CONTESTS.$"
 
-gBlueScarfItemDescription: ; 85821F1
+gBlueScarfItemDescription: @ 85821F1
 	.charmapstr "A hold item that{next}raises BEAUTY in{next}CONTESTS.$"
 
-gPinkScarfItemDescription: ; 858221D
+gPinkScarfItemDescription: @ 858221D
 	.charmapstr "A hold item that{next}raises CUTE in{next}CONTESTS.$"
 
-gGreenScarfItemDescription: ; 8582247
+gGreenScarfItemDescription: @ 8582247
 	.charmapstr "A hold item that{next}raises SMART in{next}CONTESTS.$"
 
-gYellowScarfItemDescription: ; 8582272
+gYellowScarfItemDescription: @ 8582272
 	.charmapstr "A hold item that{next}raises TOUGH in{next}CONTESTS.$"
 
-gMachBikeItemDescription: ; 858229D
+gMachBikeItemDescription: @ 858229D
 	.charmapstr "A folding bicycle{next}that doubles your{next}speed or better.$"
 
-gCoinCaseItemDescription: ; 85822D2
+gCoinCaseItemDescription: @ 85822D2
 	.charmapstr "A case that holds{next}up to 9,999 COINS.$"
 
-gItemfinderItemDescription: ; 85822F7
+gItemfinderItemDescription: @ 85822F7
 	.charmapstr "A device that{next}signals an invisible{next}item by sound.$"
 
-gOldRodItemDescription: ; 8582329
+gOldRodItemDescription: @ 8582329
 	.charmapstr "Use by any body of{next}water to fish for{next}wild POKéMON.$"
 
-gGoodRodItemDescription: ; 858235C
+gGoodRodItemDescription: @ 858235C
 	.charmapstr "A decent fishing{next}rod for catching{next}wild POKéMON.$"
 
-gSuperRodItemDescription: ; 858238C
+gSuperRodItemDescription: @ 858238C
 	.charmapstr "The best fishing{next}rod for catching{next}wild POKéMON.$"
 
-gSSTicketItemDescription: ; 85823BC
+gSSTicketItemDescription: @ 85823BC
 	.charmapstr "The ticket required{next}for sailing on a{next}ferry.$"
 
-gContestPassItemDescription: ; 85823E8
+gContestPassItemDescription: @ 85823E8
 	.charmapstr "The pass required{next}for entering{next}POKéMON CONTESTS.$"
 
-gWailmerPailItemDescription: ; 8582419
+gWailmerPailItemDescription: @ 8582419
 	.charmapstr "A tool used for{next}watering BERRIES{next}and plants.$"
 
-gDevonGoodsItemDescription: ; 8582446
+gDevonGoodsItemDescription: @ 8582446
 	.charmapstr "A package that{next}contains DEVON’s{next}machine parts.$"
 
-gSootSackItemDescription: ; 8582475
+gSootSackItemDescription: @ 8582475
 	.charmapstr "A sack used to{next}gather and hold{next}volcanic ash.$"
 
-gBasementKeyItemDescription: ; 85824A2
+gBasementKeyItemDescription: @ 85824A2
 	.charmapstr "The key for NEW{next}MAUVILLE beneath{next}MAUVILLE CITY.$"
 
-gAcroBikeItemDescription: ; 85824D2
+gAcroBikeItemDescription: @ 85824D2
 	.charmapstr "A folding bicycle{next}capable of jumps{next}and wheelies.$"
 
-gPokeblockCaseItemDescription: ; 8582503
+gPokeblockCaseItemDescription: @ 8582503
 	.charmapstr "A case for holding{next}{POKEBLOCK}S made with{next}a BERRY BLENDER.$"
 
-gLetterItemDescription: ; 8582538
+gLetterItemDescription: @ 8582538
 	.charmapstr "A letter to STEVEN{next}from the PRESIDENT{next}of the DEVON CORP.$"
 
-gEonTicketItemDescription: ; 8582571
+gEonTicketItemDescription: @ 8582571
 	.charmapstr "The ticket for a{next}ferry to a distant{next}southern island.$"
 
-gRedOrbItemDescription: ; 85825A6
+gRedOrbItemDescription: @ 85825A6
 	.charmapstr "A red, glowing orb{next}said to contain an{next}ancient power.$"
 
-gBlueOrbItemDescription: ; 85825DB
+gBlueOrbItemDescription: @ 85825DB
 	.charmapstr "A blue, glowing orb{next}said to contain an{next}ancient power.$"
 
-gScannerItemDescription: ; 8582611
+gScannerItemDescription: @ 8582611
 	.charmapstr "A device found{next}inside the{next}ABANDONED SHIP.$"
 
-gGoGogglesItemDescription: ; 858263B
+gGoGogglesItemDescription: @ 858263B
 	.charmapstr "Nifty goggles that{next}protect eyes from{next}desert sandstorms.$"
 
-gMeteoriteItemDescription: ; 8582673
+gMeteoriteItemDescription: @ 8582673
 	.charmapstr "A meteorite found{next}at METEOR FALLS.$"
 
-gRoom1KeyItemDescription: ; 8582696
+gRoom1KeyItemDescription: @ 8582696
 	.charmapstr "A key that opens a{next}door inside the{next}ABANDONED SHIP.$"
 
-gRoom2KeyItemDescription: ; 85826C9
+gRoom2KeyItemDescription: @ 85826C9
 	.charmapstr "A key that opens a{next}door inside the{next}ABANDONED SHIP.$"
 
-gRoom4KeyItemDescription: ; 85826FC
+gRoom4KeyItemDescription: @ 85826FC
 	.charmapstr "A key that opens a{next}door inside the{next}ABANDONED SHIP.$"
 
-gRoom6KeyItemDescription: ; 858272F
+gRoom6KeyItemDescription: @ 858272F
 	.charmapstr "A key that opens a{next}door inside the{next}ABANDONED SHIP.$"
 
-gStorageKeyItemDescription: ; 8582762
+gStorageKeyItemDescription: @ 8582762
 	.charmapstr "The key to the{next}storage inside the{next}ABANDONED SHIP.$"
 
-gRootFossilItemDescription: ; 8582794
+gRootFossilItemDescription: @ 8582794
 	.charmapstr "A fossil of an{next}ancient, seafloor-{next}dwelling POKéMON.$"
 
-gClawFossilItemDescription: ; 85827C8
+gClawFossilItemDescription: @ 85827C8
 	.charmapstr "A fossil of an{next}ancient, seafloor-{next}dwelling POKéMON.$"
 
-gDevonScopeItemDescription: ; 85827FC
+gDevonScopeItemDescription: @ 85827FC
 	.charmapstr "A device by DEVON{next}that signals any{next}unseeable POKéMON.$"
 
-gTM01ItemDescription: ; 8582832
+gTM01ItemDescription: @ 8582832
 	.charmapstr "Powerful, but makes{next}the user flinch if{next}hit by the foe.$"
 
-gTM02ItemDescription: ; 8582869
+gTM02ItemDescription: @ 8582869
 	.charmapstr "Hooks and slashes{next}the foe with long,{next}sharp claws.$"
 
-gTM03ItemDescription: ; 858289B
+gTM03ItemDescription: @ 858289B
 	.charmapstr "Generates an{next}ultrasonic wave{next}that may confuse.$"
 
-gTM04ItemDescription: ; 85828CA
+gTM04ItemDescription: @ 85828CA
 	.charmapstr "Raises SP. ATK and{next}SP. DEF by focusing{next}the mind.$"
 
-gTM05ItemDescription: ; 85828FB
+gTM05ItemDescription: @ 85828FB
 	.charmapstr "A savage roar that{next}makes the foe flee {next}to end the battle.$"
 
-gTM06ItemDescription: ; 8582935
+gTM06ItemDescription: @ 8582935
 	.charmapstr "Poisons the foe{next}with a toxin that{next}gradually worsens.$"
 
-gTM07ItemDescription: ; 858296A
+gTM07ItemDescription: @ 858296A
 	.charmapstr "Creates a hailstorm{next}that damages all{next}types except ICE.$"
 
-gTM08ItemDescription: ; 85829A1
+gTM08ItemDescription: @ 85829A1
 	.charmapstr "Bulks up the body{next}to boost both{next}ATTACK & DEFENSE.$"
 
-gTM09ItemDescription: ; 85829D3
+gTM09ItemDescription: @ 85829D3
 	.charmapstr "Shoots 2 to 5 seeds{next}in a row to strike{next}the foe.$"
 
-gTM10ItemDescription: ; 8582A03
+gTM10ItemDescription: @ 8582A03
 	.charmapstr "The attack power{next}varies among{next}different POKéMON.$"
 
-gTM11ItemDescription: ; 8582A34
+gTM11ItemDescription: @ 8582A34
 	.charmapstr "Raises the power of{next}FIRE-type moves{next}for 5 turns.$"
 
-gTM12ItemDescription: ; 8582A65
+gTM12ItemDescription: @ 8582A65
 	.charmapstr "Enrages the foe so{next}it can only use{next}attack moves.$"
 
-gTM13ItemDescription: ; 8582A96
+gTM13ItemDescription: @ 8582A96
 	.charmapstr "Fires an icy cold{next}beam that may{next}freeze the foe.$"
 
-gTM14ItemDescription: ; 8582AC6
+gTM14ItemDescription: @ 8582AC6
 	.charmapstr "A brutal snow-and-{next}wind attack that{next}may freeze the foe.$"
 
-gTM15ItemDescription: ; 8582AFE
+gTM15ItemDescription: @ 8582AFE
 	.charmapstr "Powerful, but needs{next}recharging the{next}next turn.$"
 
-gTM16ItemDescription: ; 8582B2C
+gTM16ItemDescription: @ 8582B2C
 	.charmapstr "Creates a wall of{next}light that lowers{next}SP. ATK damage.$"
 
-gTM17ItemDescription: ; 8582B60
+gTM17ItemDescription: @ 8582B60
 	.charmapstr "Negates all damage,{next}but may fail if used{next}in succession.$"
 
-gTM18ItemDescription: ; 8582B98
+gTM18ItemDescription: @ 8582B98
 	.charmapstr "Raises the power of{next}WATER-type moves{next}for 5 turns.$"
 
-gTM19ItemDescription: ; 8582BCA
+gTM19ItemDescription: @ 8582BCA
 	.charmapstr "Recovers half the{next}HP of the damage {next}this move inflicts.$"
 
-gTM20ItemDescription: ; 8582C02
+gTM20ItemDescription: @ 8582C02
 	.charmapstr "Prevents status{next}abnormality with a{next}mystical power.$"
 
-gTM21ItemDescription: ; 8582C35
+gTM21ItemDescription: @ 8582C35
 	.charmapstr "The less the user{next}likes you, the more{next}powerful this move.$"
 
-gTM22ItemDescription: ; 8582C6F
+gTM22ItemDescription: @ 8582C6F
 	.charmapstr "Absorbs sunlight in{next}the 1st turn, then{next}attacks next turn.$"
 
-gTM23ItemDescription: ; 8582CA9
+gTM23ItemDescription: @ 8582CA9
 	.charmapstr "Slams the foe with{next}a hard tail. It may{next}lower DEFENSE.$"
 
-gTM24ItemDescription: ; 8582CDF
+gTM24ItemDescription: @ 8582CDF
 	.charmapstr "A powerful electric{next}attack that may{next}cause paralysis.$"
 
-gTM25ItemDescription: ; 8582D14
+gTM25ItemDescription: @ 8582D14
 	.charmapstr "Strikes the foe{next}with a thunderbolt.{next}It may paralyze.$"
 
-gTM26ItemDescription: ; 8582D49
+gTM26ItemDescription: @ 8582D49
 	.charmapstr "Causes a quake{next}that has no effect{next}on flying foes.$"
 
-gTM27ItemDescription: ; 8582D7B
+gTM27ItemDescription: @ 8582D7B
 	.charmapstr "The more the user{next}likes you, the more{next}powerful this move.$"
 
-gTM28ItemDescription: ; 8582DB5
+gTM28ItemDescription: @ 8582DB5
 	.charmapstr "Digs underground{next}the 1st turn, then{next}strikes next turn.$"
 
-gTM29ItemDescription: ; 8582DEC
+gTM29ItemDescription: @ 8582DEC
 	.charmapstr "A powerful psychic{next}attack that may{next}lower SP. DEF.$"
 
-gTM30ItemDescription: ; 8582E1E
+gTM30ItemDescription: @ 8582E1E
 	.charmapstr "Hurls a dark lump{next}at the foe. It may{next}lower SP. DEF.$"
 
-gTM31ItemDescription: ; 8582E52
+gTM31ItemDescription: @ 8582E52
 	.charmapstr "Destroys barriers{next}like LIGHT SCREEN{next}and causes damage.$"
 
-gTM32ItemDescription: ; 8582E89
+gTM32ItemDescription: @ 8582E89
 	.charmapstr "Creates illusory{next}copies to enhance{next}elusiveness.$"
 
-gTM33ItemDescription: ; 8582EB9
+gTM33ItemDescription: @ 8582EB9
 	.charmapstr "Creates a wall of{next}light that weakens{next}physical attacks.$"
 
-gTM34ItemDescription: ; 8582EF0
+gTM34ItemDescription: @ 8582EF0
 	.charmapstr "Zaps the foe with a{next}jolt of electricity{next}that never misses.$"
 
-gTM35ItemDescription: ; 8582F2B
+gTM35ItemDescription: @ 8582F2B
 	.charmapstr "Looses a stream of{next}fire that may burn{next}the foe.$"
 
-gTM36ItemDescription: ; 8582F5A
+gTM36ItemDescription: @ 8582F5A
 	.charmapstr "Hurls sludge at the{next}foe. It may poison{next}the foe.$"
 
-gTM37ItemDescription: ; 8582F8A
+gTM37ItemDescription: @ 8582F8A
 	.charmapstr "Causes a sandstorm{next}that hits the foe{next}over several turns.$"
 
-gTM38ItemDescription: ; 8582FC3
+gTM38ItemDescription: @ 8582FC3
 	.charmapstr "A powerful fire{next}attack that may{next}burn the foe.$"
 
-gTM39ItemDescription: ; 8582FF1
+gTM39ItemDescription: @ 8582FF1
 	.charmapstr "Stops the foe from{next}moving with rocks.{next}May lower SPEED.$"
 
-gTM40ItemDescription: ; 8583028
+gTM40ItemDescription: @ 8583028
 	.charmapstr "An extremely fast{next}attack that can’t{next}be avoided.$"
 
-gTM41ItemDescription: ; 8583058
+gTM41ItemDescription: @ 8583058
 	.charmapstr "Prevents the foe{next}from using the same{next}move in a row.$"
 
-gTM42ItemDescription: ; 858308C
+gTM42ItemDescription: @ 858308C
 	.charmapstr "Raises ATTACK when{next}poisoned, burned,{next}or paralyzed.$"
 
-gTM43ItemDescription: ; 85830BF
+gTM43ItemDescription: @ 85830BF
 	.charmapstr "Adds an effect to{next}attack depending{next}on the location.$"
 
-gTM44ItemDescription: ; 85830F3
+gTM44ItemDescription: @ 85830F3
 	.charmapstr "The user sleeps for{next}2 turns to restore{next}health and status.$"
 
-gTM45ItemDescription: ; 858312D
+gTM45ItemDescription: @ 858312D
 	.charmapstr "Makes it tough to{next}attack a foe of the{next}opposite gender.$"
 
-gTM46ItemDescription: ; 8583164
+gTM46ItemDescription: @ 8583164
 	.charmapstr "While attacking,{next}it may steal the{next}foe’s held item.$"
 
-gTM47ItemDescription: ; 8583197
+gTM47ItemDescription: @ 8583197
 	.charmapstr "Spreads hard-{next}edged wings and{next}slams into the foe.$"
 
-gTM48ItemDescription: ; 85831C9
+gTM48ItemDescription: @ 85831C9
 	.charmapstr "Switches abilities{next}with the foe on the{next}turn this is used.$"
 
-gTM49ItemDescription: ; 8583203
+gTM49ItemDescription: @ 8583203
 	.charmapstr "Steals the effects{next}of the move the foe{next}is trying to use.$"
 
-gTM50ItemDescription: ; 858323C
+gTM50ItemDescription: @ 858323C
 	.charmapstr "Enables full-power{next}attack, but sharply{next}lowers SP. ATK.$"
 
-gHM01ItemDescription: ; 8583273
+gHM01ItemDescription: @ 8583273
 	.charmapstr "Attacks the foe{next}with sharp blades{next}or claws.$"
 
-gHM02ItemDescription: ; 858329F
+gHM02ItemDescription: @ 858329F
 	.charmapstr "Flies up on the{next}first turn, then{next}attacks next turn.$"
 
-gHM03ItemDescription: ; 85832D3
+gHM03ItemDescription: @ 85832D3
 	.charmapstr "Creates a huge{next}wave, then crashes{next}it down on the foe.$"
 
-gHM04ItemDescription: ; 8583309
+gHM04ItemDescription: @ 8583309
 	.charmapstr "Builds enormous{next}power, then slams{next}the foe.$"
 
-gHM05ItemDescription: ; 8583334
+gHM05ItemDescription: @ 8583334
 	.charmapstr "Looses a powerful{next}blast of light that{next}reduces accuracy.$"
 
-gHM06ItemDescription: ; 858336C
+gHM06ItemDescription: @ 858336C
 	.charmapstr "A rock-crushingly{next}tough attack that{next}may lower DEFENSE.$"
 
-gHM07ItemDescription: ; 85833A3
+gHM07ItemDescription: @ 85833A3
 	.charmapstr "Attacks the foe{next}with enough power{next}to climb waterfalls.$"
 
-gHM08ItemDescription: ; 85833DA
+gHM08ItemDescription: @ 85833DA
 	.charmapstr "Dives underwater{next}the 1st turn, then{next}attacks next turn.$"
 
-gOaksParcelItemDescription: ; 8583411
+gOaksParcelItemDescription: @ 8583411
 	.charmapstr "A parcel for PROF.{next}OAK from a POKéMON{next}MART’s clerk.$"
 
-gPokeFluteItemDescription: ; 8583445
+gPokeFluteItemDescription: @ 8583445
 	.charmapstr "A sweet-sounding{next}flute that awakens{next}POKéMON.$"
 
-gSecretKeyItemDescription: ; 8583472
+gSecretKeyItemDescription: @ 8583472
 	.charmapstr "The key to the{next}CINNABAR ISLAND{next}GYM’s entrance.$"
 
-gBikeVoucherItemDescription: ; 85834A1
+gBikeVoucherItemDescription: @ 85834A1
 	.charmapstr "A voucher for{next}obtaining a bicycle{next}from the BIKE SHOP.$"
 
-gGoldTeethItemDescription: ; 85834D7
+gGoldTeethItemDescription: @ 85834D7
 	.charmapstr "Gold dentures lost{next}by the SAFARI{next}ZONE’s WARDEN.$"
 
-gOldAmberItemDescription: ; 8583507
+gOldAmberItemDescription: @ 8583507
 	.charmapstr "A stone containing{next}the genes of an{next}ancient POKéMON.$"
 
-gCardKeyItemDescription: ; 858353B
+gCardKeyItemDescription: @ 858353B
 	.charmapstr "A card-type door{next}key used in SILPH{next}CO’s office.$"
 
-gLiftKeyItemDescription: ; 858356B
+gLiftKeyItemDescription: @ 858356B
 	.charmapstr "An elevator key{next}used in TEAM{next}ROCKET’s HIDEOUT.$"
 
-gHelixFossilItemDescription: ; 858359A
+gHelixFossilItemDescription: @ 858359A
 	.charmapstr "A piece of an{next}ancient marine{next}POKéMON’s seashell.$"
 
-gDomeFossilItemDescription: ; 85835CB
+gDomeFossilItemDescription: @ 85835CB
 	.charmapstr "A piece of an{next}ancient marine{next}POKéMON’s shell.$"
 
-gSilphScopeItemDescription: ; 85835F9
+gSilphScopeItemDescription: @ 85835F9
 	.charmapstr "SILPH CO’s scope{next}makes unseeable{next}POKéMON visible.$"
 
-gBicycleItemDescription: ; 858362B
+gBicycleItemDescription: @ 858362B
 	.charmapstr "A folding bicycle{next}that is faster than{next}the RUNNING SHOES.$"
 
-gTownMapItemDescription: ; 8583664
+gTownMapItemDescription: @ 8583664
 	.charmapstr "Can be viewed{next}anytime. Shows your{next}present location.$"
 
-gVSSeekerItemDescription: ; 8583698
+gVSSeekerItemDescription: @ 8583698
 	.charmapstr "A rechargeable unit{next}that flags battle-{next}ready TRAINERS.$"
 
-gFameCheckerItemDescription: ; 85836CF
+gFameCheckerItemDescription: @ 85836CF
 	.charmapstr "Stores information{next}on famous people{next}for instant recall.$"
 
-gTMCaseItemDescription: ; 8583707
+gTMCaseItemDescription: @ 8583707
 	.charmapstr "A convenient case {next}that holds TMs and{next}HMs.$"
 
-gBerryPouchItemDescription: ; 8583732
+gBerryPouchItemDescription: @ 8583732
 	.charmapstr "A convenient{next}container that{next}holds BERRIES.$"
 
-gTeachyTVItemDescription: ; 858375D
+gTeachyTVItemDescription: @ 858375D
 	.charmapstr "A TV set tuned to{next}an advice program{next}for TRAINERS.$"
 
-gTriPassItemDescription: ; 858378F
+gTriPassItemDescription: @ 858378F
 	.charmapstr "A pass for ferries{next}between ONE, TWO,{next}and THREE ISLAND.$"
 
-gRainbowPassItemDescription: ; 85837C6
+gRainbowPassItemDescription: @ 85837C6
 	.charmapstr "For ferries serving{next}VERMILION and the{next}SEVII ISLANDS.$"
 
-gTeaItemDescription: ; 85837FB
+gTeaItemDescription: @ 85837FB
 	.charmapstr "A thirst-quenching{next}tea prepared by an{next}old lady.$"
 
-gMysticTicketItemDescription: ; 858382B
+gMysticTicketItemDescription: @ 858382B
 	.charmapstr "A ticket required{next}to board the ship{next}to NAVEL ROCK.$"
 
-gAuroraTicketItemDescription: ; 858385E
+gAuroraTicketItemDescription: @ 858385E
 	.charmapstr "A ticket required{next}to board the ship{next}to BIRTH ISLAND.$"
 
-gPowderJarItemDescription: ; 8583893
+gPowderJarItemDescription: @ 8583893
 	.charmapstr "Stores BERRY{next}POWDER made using{next}a BERRY CRUSHER.$"
 
-gRubyItemDescription: ; 85838C3
+gRubyItemDescription: @ 85838C3
 	.charmapstr "An exquisite, red-{next}glowing gem that{next}symbolizes passion.$"
 
-gSapphireItemDescription: ; 85838FB
+gSapphireItemDescription: @ 85838FB
 	.charmapstr "A brilliant blue gem{next}that symbolizes{next}honesty.$"
 
-gMagmaEmblemItemDescription: ; 8583929
+gMagmaEmblemItemDescription: @ 8583929
 	.charmapstr "A medal-like item in{next}the same shape as{next}TEAM MAGMA’s mark.$"
 
-gOldSeaMapItemDescription: ; 8583963
+gOldSeaMapItemDescription: @ 8583963
 	.charmapstr "A faded sea chart{next}that shows the way{next}to a certain island.$"
diff --git a/data/text/move_descriptions.s b/data/text/move_descriptions.s
index b9ac0b2df..1446cc110 100644
--- a/data/text/move_descriptions.s
+++ b/data/text/move_descriptions.s
@@ -1,1068 +1,1068 @@
-gPoundMoveDescription: ; 86181C1
+gPoundMoveDescription: @ 86181C1
 	.charmapstr "Pounds the foe with{next}forelegs or tail.$"
 
-gKarateChopMoveDescription: ; 86181E7
+gKarateChopMoveDescription: @ 86181E7
 	.charmapstr "A chopping attack with a{next}high critical-hit ratio.$"
 
-gDoubleSlapMoveDescription: ; 8618219
+gDoubleSlapMoveDescription: @ 8618219
 	.charmapstr "Repeatedly slaps the foe{next}2 to 5 times.$"
 
-gCometPunchMoveDescription: ; 8618240
+gCometPunchMoveDescription: @ 8618240
 	.charmapstr "Repeatedly punches the foe{next}2 to 5 times.$"
 
-gMegaPunchMoveDescription: ; 8618269
+gMegaPunchMoveDescription: @ 8618269
 	.charmapstr "A strong punch thrown with{next}incredible power.$"
 
-gPayDayMoveDescription: ; 8618296
+gPayDayMoveDescription: @ 8618296
 	.charmapstr "Throws coins at the foe.{next}Money is recovered after.$"
 
-gFirePunchMoveDescription: ; 86182C9
+gFirePunchMoveDescription: @ 86182C9
 	.charmapstr "A fiery punch that may burn{next}the foe.$"
 
-gIcePunchMoveDescription: ; 86182EE
+gIcePunchMoveDescription: @ 86182EE
 	.charmapstr "An icy punch that may{next}freeze the foe.$"
 
-gThunderPunchMoveDescription: ; 8618314
+gThunderPunchMoveDescription: @ 8618314
 	.charmapstr "An electrified punch that{next}may paralyze the foe.$"
 
-gScratchMoveDescription: ; 8618344
+gScratchMoveDescription: @ 8618344
 	.charmapstr "Scratches the foe with{next}sharp claws.$"
 
-gViceGripMoveDescription: ; 8618368
+gViceGripMoveDescription: @ 8618368
 	.charmapstr "Grips the foe with large and{next}powerful pincers.$"
 
-gGuillotineMoveDescription: ; 8618397
+gGuillotineMoveDescription: @ 8618397
 	.charmapstr "A powerful pincer attack{next}that may cause fainting.$"
 
-gRazorWindMoveDescription: ; 86183C9
+gRazorWindMoveDescription: @ 86183C9
 	.charmapstr "A 2-turn move that strikes{next}the foe on the 2nd turn.$"
 
-gSwordsDanceMoveDescription: ; 86183FD
+gSwordsDanceMoveDescription: @ 86183FD
 	.charmapstr "A fighting dance that{next}sharply raises ATTACK.$"
 
-gCutMoveDescription: ; 861842A
+gCutMoveDescription: @ 861842A
 	.charmapstr "Cuts the foe with sharp{next}scythes, claws, etc.$"
 
-gGustMoveDescription: ; 8618457
+gGustMoveDescription: @ 8618457
 	.charmapstr "Strikes the foe with a gust{next}of wind whipped up by wings.$"
 
-gWingAttackMoveDescription: ; 8618490
+gWingAttackMoveDescription: @ 8618490
 	.charmapstr "Strikes the foe with wings{next}spread wide.$"
 
-gWhirlwindMoveDescription: ; 86184B8
+gWhirlwindMoveDescription: @ 86184B8
 	.charmapstr "Blows away the foe with{next}wind and ends the battle.$"
 
-gFlyMoveDescription: ; 86184EA
+gFlyMoveDescription: @ 86184EA
 	.charmapstr "Flies up on the first turn,{next}then strikes the next turn.$"
 
-gBindMoveDescription: ; 8618522
+gBindMoveDescription: @ 8618522
 	.charmapstr "Binds and squeezes the foe{next}for 2 to 5 turns.$"
 
-gSlamMoveDescription: ; 861854F
+gSlamMoveDescription: @ 861854F
 	.charmapstr "Slams the foe with a long{next}tail, vine, etc.$"
 
-gVineWhipMoveDescription: ; 861857A
+gVineWhipMoveDescription: @ 861857A
 	.charmapstr "Strikes the foe with{next}slender, whiplike vines.$"
 
-gStompMoveDescription: ; 86185A8
+gStompMoveDescription: @ 86185A8
 	.charmapstr "Stomps the enemy with a big{next}foot. May cause flinching.$"
 
-gDoubleKickMoveDescription: ; 86185DF
+gDoubleKickMoveDescription: @ 86185DF
 	.charmapstr "A double-kicking attack{next}that strikes the foe twice.$"
 
-gMegaKickMoveDescription: ; 8618613
+gMegaKickMoveDescription: @ 8618613
 	.charmapstr "An extremely powerful kick{next}with intense force.$"
 
-gJumpKickMoveDescription: ; 8618642
+gJumpKickMoveDescription: @ 8618642
 	.charmapstr "A strong jumping kick. May{next}miss and hurt the kicker.$"
 
-gRollingKickMoveDescription: ; 8618677
+gRollingKickMoveDescription: @ 8618677
 	.charmapstr "A fast kick delivered from{next}a rapid spin.$"
 
-gSandAttackMoveDescription: ; 86186A0
+gSandAttackMoveDescription: @ 86186A0
 	.charmapstr "Reduces the foe’s accuracy{next}by hurling sand in its face.$"
 
-gHeadbuttMoveDescription: ; 86186D8
+gHeadbuttMoveDescription: @ 86186D8
 	.charmapstr "A ramming attack that may{next}cause flinching.$"
 
-gHornAttackMoveDescription: ; 8618703
+gHornAttackMoveDescription: @ 8618703
 	.charmapstr "Jabs the foe with sharp{next}horns.$"
 
-gFuryAttackMoveDescription: ; 8618722
+gFuryAttackMoveDescription: @ 8618722
 	.charmapstr "Jabs the foe 2 to 5 times{next}with sharp horns, etc.$"
 
-gHornDrillMoveDescription: ; 8618753
+gHornDrillMoveDescription: @ 8618753
 	.charmapstr "A one-hit KO attack that{next}uses a horn like a drill.$"
 
-gTackleMoveDescription: ; 8618786
+gTackleMoveDescription: @ 8618786
 	.charmapstr "Charges the foe with a full-{next}body tackle.$"
 
-gBodySlamMoveDescription: ; 86187B0
+gBodySlamMoveDescription: @ 86187B0
 	.charmapstr "A full-body slam that may{next}cause paralysis.$"
 
-gWrapMoveDescription: ; 86187DB
+gWrapMoveDescription: @ 86187DB
 	.charmapstr "Wraps and squeezes the foe{next}2 to 5 times with vines, etc.$"
 
-gTakeDownMoveDescription: ; 8618814
+gTakeDownMoveDescription: @ 8618814
 	.charmapstr "A reckless charge attack{next}that also hurts the user.$"
 
-gThrashMoveDescription: ; 8618847
+gThrashMoveDescription: @ 8618847
 	.charmapstr "A rampage of 2 to 3 turns{next}that confuses the user.$"
 
-gDoubleEdgeMoveDescription: ; 8618879
+gDoubleEdgeMoveDescription: @ 8618879
 	.charmapstr "A life-risking tackle that{next}also hurts the user.$"
 
-gTailWhipMoveDescription: ; 86188A9
+gTailWhipMoveDescription: @ 86188A9
 	.charmapstr "Wags the tail to lower the{next}foe’s DEFENSE.$"
 
-gPoisonStingMoveDescription: ; 86188D3
+gPoisonStingMoveDescription: @ 86188D3
 	.charmapstr "A toxic attack with barbs,{next}etc., that may poison.$"
 
-gTwineedleMoveDescription: ; 8618905
+gTwineedleMoveDescription: @ 8618905
 	.charmapstr "Stingers on the forelegs{next}jab the foe twice.$"
 
-gPinMissileMoveDescription: ; 8618931
+gPinMissileMoveDescription: @ 8618931
 	.charmapstr "Sharp pins are fired to{next}strike 2 to 5 times.$"
 
-gLeerMoveDescription: ; 861895E
+gLeerMoveDescription: @ 861895E
 	.charmapstr "Frightens the foe with a{next}leer to lower DEFENSE.$"
 
-gBiteMoveDescription: ; 861898E
+gBiteMoveDescription: @ 861898E
 	.charmapstr "Bites with vicious fangs.{next}May cause flinching.$"
 
-gGrowlMoveDescription: ; 86189BD
+gGrowlMoveDescription: @ 86189BD
 	.charmapstr "Growls cutely to reduce the{next}foe’s ATTACK.$"
 
-gRoarMoveDescription: ; 86189E7
+gRoarMoveDescription: @ 86189E7
 	.charmapstr "Makes the foe flee to end{next}the battle.$"
 
-gSingMoveDescription: ; 8618A0D
+gSingMoveDescription: @ 8618A0D
 	.charmapstr "A soothing song lulls the{next}foe into a deep slumber.$"
 
-gSupersonicMoveDescription: ; 8618A40
+gSupersonicMoveDescription: @ 8618A40
 	.charmapstr "Emits bizarre sound waves{next}that may confuse the foe.$"
 
-gSonicBoomMoveDescription: ; 8618A74
+gSonicBoomMoveDescription: @ 8618A74
 	.charmapstr "Launches shock waves that{next}always inflict 20 HP damage.$"
 
-gDisableMoveDescription: ; 8618AAB
+gDisableMoveDescription: @ 8618AAB
 	.charmapstr "Psychically disables one of{next}the foe’s moves.$"
 
-gAcidMoveDescription: ; 8618AD8
+gAcidMoveDescription: @ 8618AD8
 	.charmapstr "Sprays a hide-melting acid.{next}May lower DEFENSE.$"
 
-gEmberMoveDescription: ; 8618B07
+gEmberMoveDescription: @ 8618B07
 	.charmapstr "A weak fire attack that may{next}inflict a burn.$"
 
-gFlamethrowerMoveDescription: ; 8618B33
+gFlamethrowerMoveDescription: @ 8618B33
 	.charmapstr "A powerful fire attack that{next}may inflict a burn.$"
 
-gMistMoveDescription: ; 8618B63
+gMistMoveDescription: @ 8618B63
 	.charmapstr "Creates a mist that stops{next}reduction of abilities.$"
 
-gWaterGunMoveDescription: ; 8618B95
+gWaterGunMoveDescription: @ 8618B95
 	.charmapstr "Squirts water to attack{next}the foe.$"
 
-gHydroPumpMoveDescription: ; 8618BB6
+gHydroPumpMoveDescription: @ 8618BB6
 	.charmapstr "Blasts water at high power{next}to strike the foe.$"
 
-gSurfMoveDescription: ; 8618BE4
+gSurfMoveDescription: @ 8618BE4
 	.charmapstr "Creates a huge wave, then{next}crashes it down on the foe.$"
 
-gIceBeamMoveDescription: ; 8618C1A
+gIceBeamMoveDescription: @ 8618C1A
 	.charmapstr "Blasts the foe with an icy{next}beam that may freeze it.$"
 
-gBlizzardMoveDescription: ; 8618C4E
+gBlizzardMoveDescription: @ 8618C4E
 	.charmapstr "Hits the foe with an icy{next}storm that may freeze it.$"
 
-gPsybeamMoveDescription: ; 8618C81
+gPsybeamMoveDescription: @ 8618C81
 	.charmapstr "Fires a peculiar ray that{next}may confuse the foe.$"
 
-gBubbleBeamMoveDescription: ; 8618CB0
+gBubbleBeamMoveDescription: @ 8618CB0
 	.charmapstr "Forcefully sprays bubbles{next}that may lower SPEED.$"
 
-gAuroraBeamMoveDescription: ; 8618CE0
+gAuroraBeamMoveDescription: @ 8618CE0
 	.charmapstr "Fires a rainbow-colored{next}beam that may lower ATTACK.$"
 
-gHyperBeamMoveDescription: ; 8618D14
+gHyperBeamMoveDescription: @ 8618D14
 	.charmapstr "Powerful, but leaves the{next}user immobile the next turn.$"
 
-gPeckMoveDescription: ; 8618D4A
+gPeckMoveDescription: @ 8618D4A
 	.charmapstr "Attacks the foe with a{next}jabbing beak, etc.$"
 
-gDrillPeckMoveDescription: ; 8618D74
+gDrillPeckMoveDescription: @ 8618D74
 	.charmapstr "A corkscrewing attack with{next}the beak acting as a drill.$"
 
-gSubmissionMoveDescription: ; 8618DAB
+gSubmissionMoveDescription: @ 8618DAB
 	.charmapstr "A reckless body slam that{next}also hurts the user.$"
 
-gLowKickMoveDescription: ; 8618DDA
+gLowKickMoveDescription: @ 8618DDA
 	.charmapstr "A kick that inflicts more{next}damage on heavier foes.$"
 
-gCounterMoveDescription: ; 8618E0C
+gCounterMoveDescription: @ 8618E0C
 	.charmapstr "Retaliates any physical hit{next}with double the power.$"
 
-gSeismicTossMoveDescription: ; 8618E3F
+gSeismicTossMoveDescription: @ 8618E3F
 	.charmapstr "Inflicts damage identical{next}to the user’s level.$"
 
-gStrengthMoveDescription: ; 8618E6E
+gStrengthMoveDescription: @ 8618E6E
 	.charmapstr "Builds enormous power,{next}then slams the foe.$"
 
-gAbsorbMoveDescription: ; 8618E99
+gAbsorbMoveDescription: @ 8618E99
 	.charmapstr "An attack that absorbs{next}half the damage inflicted.$"
 
-gMegaDrainMoveDescription: ; 8618ECB
+gMegaDrainMoveDescription: @ 8618ECB
 	.charmapstr "An attack that absorbs{next}half the damage inflicted.$"
 
-gLeechSeedMoveDescription: ; 8618EFD
+gLeechSeedMoveDescription: @ 8618EFD
 	.charmapstr "Plants a seed on the foe to{next}steal HP on every turn.$"
 
-gGrowthMoveDescription: ; 8618F31
+gGrowthMoveDescription: @ 8618F31
 	.charmapstr "Forces the body to grow{next}and heightens SP. ATK.$"
 
-gRazorLeafMoveDescription: ; 8618F60
+gRazorLeafMoveDescription: @ 8618F60
 	.charmapstr "Cuts the enemy with leaves.{next}High critical-hit ratio.$"
 
-gSolarBeamMoveDescription: ; 8618F95
+gSolarBeamMoveDescription: @ 8618F95
 	.charmapstr "Absorbs light in one turn,{next}then attacks next turn.$"
 
-gPoisonPowderMoveDescription: ; 8618FC8
+gPoisonPowderMoveDescription: @ 8618FC8
 	.charmapstr "Scatters a toxic powder{next}that may poison the foe.$"
 
-gStunSporeMoveDescription: ; 8618FF9
+gStunSporeMoveDescription: @ 8618FF9
 	.charmapstr "Scatters a powder that may{next}paralyze the foe.$"
 
-gSleepPowderMoveDescription: ; 8619026
+gSleepPowderMoveDescription: @ 8619026
 	.charmapstr "Scatters a powder that may{next}cause the foe to sleep.$"
 
-gPetalDanceMoveDescription: ; 8619059
+gPetalDanceMoveDescription: @ 8619059
 	.charmapstr "A rampage of 2 to 3 turns{next}that confuses the user.$"
 
-gStringShotMoveDescription: ; 861908B
+gStringShotMoveDescription: @ 861908B
 	.charmapstr "Binds the foe with string{next}to reduce its SPEED.$"
 
-gDragonRageMoveDescription: ; 86190BA
+gDragonRageMoveDescription: @ 86190BA
 	.charmapstr "Launches shock waves that{next}always inflict 40 HP damage.$"
 
-gFireSpinMoveDescription: ; 86190F1
+gFireSpinMoveDescription: @ 86190F1
 	.charmapstr "Traps the foe in a ring of{next}fire for 2 to 5 turns.$"
 
-gThunderShockMoveDescription: ; 8619123
+gThunderShockMoveDescription: @ 8619123
 	.charmapstr "An electrical attack that{next}may paralyze the foe.$"
 
-gThunderboltMoveDescription: ; 8619153
+gThunderboltMoveDescription: @ 8619153
 	.charmapstr "A strong electrical attack{next}that may paralyze the foe.$"
 
-gThunderWaveMoveDescription: ; 8619189
+gThunderWaveMoveDescription: @ 8619189
 	.charmapstr "A weak jolt of electricity{next}that paralyzes the foe.$"
 
-gThunderMoveDescription: ; 86191BC
+gThunderMoveDescription: @ 86191BC
 	.charmapstr "A lightning attack that may{next}cause paralysis.$"
 
-gRockThrowMoveDescription: ; 86191E9
+gRockThrowMoveDescription: @ 86191E9
 	.charmapstr "Throws small rocks to{next}strike the foe.$"
 
-gEarthquakeMoveDescription: ; 861920F
+gEarthquakeMoveDescription: @ 861920F
 	.charmapstr "A powerful quake, but has{next}no effect on flying foes.$"
 
-gFissureMoveDescription: ; 8619243
+gFissureMoveDescription: @ 8619243
 	.charmapstr "A one-hit KO move that{next}drops the foe in a fissure.$"
 
-gDigMoveDescription: ; 8619276
+gDigMoveDescription: @ 8619276
 	.charmapstr "Digs underground the first{next}turn and strikes next turn.$"
 
-gToxicMoveDescription: ; 86192AD
+gToxicMoveDescription: @ 86192AD
 	.charmapstr "Poisons the foe with an{next}intensifying toxin.$"
 
-gConfusionMoveDescription: ; 86192D9
+gConfusionMoveDescription: @ 86192D9
 	.charmapstr "A psychic attack that may{next}cause confusion.$"
 
-gPsychicMoveDescription: ; 8619304
+gPsychicMoveDescription: @ 8619304
 	.charmapstr "A powerful psychic attack{next}that may lower SP. DEF.$"
 
-gHypnosisMoveDescription: ; 8619336
+gHypnosisMoveDescription: @ 8619336
 	.charmapstr "A hypnotizing move that{next}may induce sleep.$"
 
-gMeditateMoveDescription: ; 8619360
+gMeditateMoveDescription: @ 8619360
 	.charmapstr "Meditates in a peaceful{next}fashion to raise ATTACK.$"
 
-gAgilityMoveDescription: ; 8619391
+gAgilityMoveDescription: @ 8619391
 	.charmapstr "Relaxes the body to sharply{next}boost SPEED.$"
 
-gQuickAttackMoveDescription: ; 86193BA
+gQuickAttackMoveDescription: @ 86193BA
 	.charmapstr "An extremely fast attack{next}that always strikes first.$"
 
-gRageMoveDescription: ; 86193EE
+gRageMoveDescription: @ 86193EE
 	.charmapstr "Raises the user’s ATTACK{next}every time it is hit.$"
 
-gTeleportMoveDescription: ; 861941D
+gTeleportMoveDescription: @ 861941D
 	.charmapstr "A psychic move for fleeing{next}from battle instantly.$"
 
-gNightShadeMoveDescription: ; 861944F
+gNightShadeMoveDescription: @ 861944F
 	.charmapstr "Inflicts damage identical{next}to the user’s level.$"
 
-gMimicMoveDescription: ; 861947E
+gMimicMoveDescription: @ 861947E
 	.charmapstr "Copies a move used by the{next}foe during one battle.$"
 
-gScreechMoveDescription: ; 86194AF
+gScreechMoveDescription: @ 86194AF
 	.charmapstr "Emits a screech to sharply{next}reduce the foe’s DEFENSE.$"
 
-gDoubleTeamMoveDescription: ; 86194E4
+gDoubleTeamMoveDescription: @ 86194E4
 	.charmapstr "Creates illusory copies to{next}raise evasiveness.$"
 
-gRecoverMoveDescription: ; 8619512
+gRecoverMoveDescription: @ 8619512
 	.charmapstr "Recovers up to half the{next}user’s maximum HP.$"
 
-gHardenMoveDescription: ; 861953D
+gHardenMoveDescription: @ 861953D
 	.charmapstr "Stiffens the body’s {next}muscles to raise DEFENSE.$"
 
-gMinimizeMoveDescription: ; 861956C
+gMinimizeMoveDescription: @ 861956C
 	.charmapstr "Minimizes the user’s size{next}to raise evasiveness.$"
 
-gSmokescreenMoveDescription: ; 861959C
+gSmokescreenMoveDescription: @ 861959C
 	.charmapstr "Lowers the foe’s accuracy{next}using smoke, ink, etc.$"
 
-gConfuseRayMoveDescription: ; 86195CD
+gConfuseRayMoveDescription: @ 86195CD
 	.charmapstr "A sinister ray that{next}confuses the foe.$"
 
-gWithdrawMoveDescription: ; 86195F3
+gWithdrawMoveDescription: @ 86195F3
 	.charmapstr "Withdraws the body into its{next}hard shell to raise DEFENSE.$"
 
-gDefenseCurlMoveDescription: ; 861962C
+gDefenseCurlMoveDescription: @ 861962C
 	.charmapstr "Curls up to conceal weak{next}spots and raise DEFENSE.$"
 
-gBarrierMoveDescription: ; 861965E
+gBarrierMoveDescription: @ 861965E
 	.charmapstr "Creates a barrier that{next}sharply raises DEFENSE.$"
 
-gLightScreenMoveDescription: ; 861968D
+gLightScreenMoveDescription: @ 861968D
 	.charmapstr "Creates a wall of light that{next}lowers SP. ATK damage.$"
 
-gHazeMoveDescription: ; 86196C1
+gHazeMoveDescription: @ 86196C1
 	.charmapstr "Creates a black haze that{next}eliminates all stat changes.$"
 
-gReflectMoveDescription: ; 86196F8
+gReflectMoveDescription: @ 86196F8
 	.charmapstr "Creates a wall of light that{next}weakens physical attacks.$"
 
-gFocusEnergyMoveDescription: ; 861972F
+gFocusEnergyMoveDescription: @ 861972F
 	.charmapstr "Focuses power to raise the{next}critical-hit ratio.$"
 
-gBideMoveDescription: ; 861975E
+gBideMoveDescription: @ 861975E
 	.charmapstr "Endures attack for 2{next}turns to retaliate double.$"
 
-gMetronomeMoveDescription: ; 861978E
+gMetronomeMoveDescription: @ 861978E
 	.charmapstr "Waggles a finger to use any{next}POKéMON move at random.$"
 
-gMirrorMoveMoveDescription: ; 86197C2
+gMirrorMoveMoveDescription: @ 86197C2
 	.charmapstr "Counters the foe’s attack{next}with the same move.$"
 
-gSelfDestructMoveDescription: ; 86197F0
+gSelfDestructMoveDescription: @ 86197F0
 	.charmapstr "Inflicts severe damage but{next}makes the user faint.$"
 
-gEggBombMoveDescription: ; 8619821
+gEggBombMoveDescription: @ 8619821
 	.charmapstr "An egg is forcibly hurled at{next}the foe.$"
 
-gLickMoveDescription: ; 8619847
+gLickMoveDescription: @ 8619847
 	.charmapstr "Licks with a long tongue to{next}injure. May also paralyze.$"
 
-gSmogMoveDescription: ; 861987E
+gSmogMoveDescription: @ 861987E
 	.charmapstr "An exhaust-gas attack{next}that may also poison.$"
 
-gSludgeMoveDescription: ; 86198AA
+gSludgeMoveDescription: @ 86198AA
 	.charmapstr "Sludge is hurled to inflict{next}damage. May also poison.$"
 
-gBoneClubMoveDescription: ; 86198DF
+gBoneClubMoveDescription: @ 86198DF
 	.charmapstr "Clubs the foe with a bone.{next}May cause flinching.$"
 
-gFireBlastMoveDescription: ; 861990F
+gFireBlastMoveDescription: @ 861990F
 	.charmapstr "Incinerates everything it{next}strikes. May cause a burn.$"
 
-gWaterfallMoveDescription: ; 8619944
+gWaterfallMoveDescription: @ 8619944
 	.charmapstr "Charges the foe with speed{next}to climb waterfalls.$"
 
-gClampMoveDescription: ; 8619974
+gClampMoveDescription: @ 8619974
 	.charmapstr "Traps and squeezes the{next}foe for 2 to 5 turns.$"
 
-gSwiftMoveDescription: ; 86199A1
+gSwiftMoveDescription: @ 86199A1
 	.charmapstr "Sprays star-shaped rays{next}that never miss.$"
 
-gSkullBashMoveDescription: ; 86199CA
+gSkullBashMoveDescription: @ 86199CA
 	.charmapstr "Tucks in the head, then{next}attacks on the next turn.$"
 
-gSpikeCannonMoveDescription: ; 86199FC
+gSpikeCannonMoveDescription: @ 86199FC
 	.charmapstr "Launches sharp spikes that{next}strike 2 to 5 times.$"
 
-gConstrictMoveDescription: ; 8619A2C
+gConstrictMoveDescription: @ 8619A2C
 	.charmapstr "Constricts to inflict pain.{next}May lower SPEED.$"
 
-gAmnesiaMoveDescription: ; 8619A59
+gAmnesiaMoveDescription: @ 8619A59
 	.charmapstr "Forgets about something{next}and sharply raises SP. DEF.$"
 
-gKinesisMoveDescription: ; 8619A8D
+gKinesisMoveDescription: @ 8619A8D
 	.charmapstr "Distracts the foe.{next}May lower accuracy.$"
 
-gSoftBoiledMoveDescription: ; 8619AB4
+gSoftBoiledMoveDescription: @ 8619AB4
 	.charmapstr "Recovers up to half the{next}user’s maximum HP.$"
 
-gHiJumpKickMoveDescription: ; 8619ADF
+gHiJumpKickMoveDescription: @ 8619ADF
 	.charmapstr "A jumping knee kick. If it{next}misses, the user is hurt.$"
 
-gGlareMoveDescription: ; 8619B14
+gGlareMoveDescription: @ 8619B14
 	.charmapstr "Intimidates and frightens{next}the foe into paralysis.$"
 
-gDreamEaterMoveDescription: ; 8619B46
+gDreamEaterMoveDescription: @ 8619B46
 	.charmapstr "Takes one half the damage{next}inflicted on a sleeping foe.$"
 
-gPoisonGasMoveDescription: ; 8619B7D
+gPoisonGasMoveDescription: @ 8619B7D
 	.charmapstr "Envelops the foe in a toxic{next}gas that may poison.$"
 
-gBarrageMoveDescription: ; 8619BAE
+gBarrageMoveDescription: @ 8619BAE
 	.charmapstr "Hurls round objects at the{next}foe 2 to 5 times.$"
 
-gLeechLifeMoveDescription: ; 8619BDB
+gLeechLifeMoveDescription: @ 8619BDB
 	.charmapstr "An attack that steals half{next}the damage inflicted.$"
 
-gLovelyKissMoveDescription: ; 8619C0C
+gLovelyKissMoveDescription: @ 8619C0C
 	.charmapstr "Demands a kiss with a scary{next}face that induces sleep.$"
 
-gSkyAttackMoveDescription: ; 8619C41
+gSkyAttackMoveDescription: @ 8619C41
 	.charmapstr "Searches out weak spots,{next}then strikes the next turn.$"
 
-gTransformMoveDescription: ; 8619C76
+gTransformMoveDescription: @ 8619C76
 	.charmapstr "Alters the user’s cells to{next}become a copy of the foe.$"
 
-gBubbleMoveDescription: ; 8619CAB
+gBubbleMoveDescription: @ 8619CAB
 	.charmapstr "An attack using bubbles.{next}May lower the foe’s SPEED.$"
 
-gDizzyPunchMoveDescription: ; 8619CDF
+gDizzyPunchMoveDescription: @ 8619CDF
 	.charmapstr "A rhythmic punch that may{next}confuse the foe.$"
 
-gSporeMoveDescription: ; 8619D0A
+gSporeMoveDescription: @ 8619D0A
 	.charmapstr "Scatters a cloud of spores{next}that always induce sleep.$"
 
-gFlashMoveDescription: ; 8619D3F
+gFlashMoveDescription: @ 8619D3F
 	.charmapstr "Looses a powerful blast of{next}light that cuts accuracy.$"
 
-gPsywaveMoveDescription: ; 8619D74
+gPsywaveMoveDescription: @ 8619D74
 	.charmapstr "Attacks with a psychic{next}wave of varying intensity.$"
 
-gSplashMoveDescription: ; 8619DA6
+gSplashMoveDescription: @ 8619DA6
 	.charmapstr "It’s just a splash...{next}Has no effect whatsoever.$"
 
-gAcidArmorMoveDescription: ; 8619DD6
+gAcidArmorMoveDescription: @ 8619DD6
 	.charmapstr "Liquifies the user’s body{next}to sharply raise DEFENSE.$"
 
-gCrabhammerMoveDescription: ; 8619E0A
+gCrabhammerMoveDescription: @ 8619E0A
 	.charmapstr "Hammers with a pincer. Has a{next}high critical-hit ratio.$"
 
-gExplosionMoveDescription: ; 8619E40
+gExplosionMoveDescription: @ 8619E40
 	.charmapstr "Inflicts severe damage but{next}makes the user faint.$"
 
-gFurySwipesMoveDescription: ; 8619E71
+gFurySwipesMoveDescription: @ 8619E71
 	.charmapstr "Rakes the foe with sharp{next}claws, etc., 2 to 5 times.$"
 
-gBonemerangMoveDescription: ; 8619EA5
+gBonemerangMoveDescription: @ 8619EA5
 	.charmapstr "Throws a bone boomerang{next}that strikes twice.$"
 
-gRestMoveDescription: ; 8619ED1
+gRestMoveDescription: @ 8619ED1
 	.charmapstr "The user sleeps for 2 turns,{next}restoring HP and status.$"
 
-gRockSlideMoveDescription: ; 8619F07
+gRockSlideMoveDescription: @ 8619F07
 	.charmapstr "Large boulders are hurled.{next}May cause flinching.$"
 
-gHyperFangMoveDescription: ; 8619F37
+gHyperFangMoveDescription: @ 8619F37
 	.charmapstr "Attacks with sharp fangs.{next}May cause flinching.$"
 
-gSharpenMoveDescription: ; 8619F66
+gSharpenMoveDescription: @ 8619F66
 	.charmapstr "Reduces the polygon count{next}and raises ATTACK.$"
 
-gConversionMoveDescription: ; 8619F93
+gConversionMoveDescription: @ 8619F93
 	.charmapstr "Changes the user’s type{next}into a known move’s type.$"
 
-gTriAttackMoveDescription: ; 8619FC5
+gTriAttackMoveDescription: @ 8619FC5
 	.charmapstr "Fires three types of beams{next}at the same time.$"
 
-gSuperFangMoveDescription: ; 8619FF2
+gSuperFangMoveDescription: @ 8619FF2
 	.charmapstr "Attacks with sharp fangs{next}and cuts half the foe’s HP.$"
 
-gSlashMoveDescription: ; 861A027
+gSlashMoveDescription: @ 861A027
 	.charmapstr "Slashes with claws, etc. Has{next}a high critical-hit ratio.$"
 
-gSubstituteMoveDescription: ; 861A05F
+gSubstituteMoveDescription: @ 861A05F
 	.charmapstr "Creates a decoy using 1/4{next}of the user’s maximum HP.$"
 
-gStruggleMoveDescription: ; 861A093
+gStruggleMoveDescription: @ 861A093
 	.charmapstr "Used only if all PP are gone.{next}Also hurts the user a little.$"
 
-gSketchMoveDescription: ; 861A0CF
+gSketchMoveDescription: @ 861A0CF
 	.charmapstr "Copies the foe’s last move{next}permanently.$"
 
-gTripleKickMoveDescription: ; 861A0F7
+gTripleKickMoveDescription: @ 861A0F7
 	.charmapstr "Kicks the foe 3 times in a{next}row with rising intensity.$"
 
-gThiefMoveDescription: ; 861A12D
+gThiefMoveDescription: @ 861A12D
 	.charmapstr "While attacking, it may{next}steal the foe’s held item.$"
 
-gSpiderWebMoveDescription: ; 861A160
+gSpiderWebMoveDescription: @ 861A160
 	.charmapstr "Ensnares the foe to stop it{next}from fleeing or switching.$"
 
-gMindReaderMoveDescription: ; 861A197
+gMindReaderMoveDescription: @ 861A197
 	.charmapstr "Senses the foe’s action to{next}ensure the next move’s hit.$"
 
-gNightmareMoveDescription: ; 861A1CE
+gNightmareMoveDescription: @ 861A1CE
 	.charmapstr "Inflicts 1/4 damage on a{next}sleeping foe every turn.$"
 
-gFlameWheelMoveDescription: ; 861A200
+gFlameWheelMoveDescription: @ 861A200
 	.charmapstr "A fiery charge attack that{next}may inflict a burn.$"
 
-gSnoreMoveDescription: ; 861A22F
+gSnoreMoveDescription: @ 861A22F
 	.charmapstr "A loud attack that can be{next}used only while asleep.$"
 
-gCurseMoveDescription: ; 861A261
+gCurseMoveDescription: @ 861A261
 	.charmapstr "A move that functions{next}differently for GHOSTS.$"
 
-gFlailMoveDescription: ; 861A28F
+gFlailMoveDescription: @ 861A28F
 	.charmapstr "Inflicts more damage when{next}the user’s HP is down.$"
 
-gConversion2MoveDescription: ; 861A2C0
+gConversion2MoveDescription: @ 861A2C0
 	.charmapstr "Makes the user resistant{next}to the last attack’s type.$"
 
-gAeroblastMoveDescription: ; 861A2F4
+gAeroblastMoveDescription: @ 861A2F4
 	.charmapstr "Launches a vacuumed blast.{next}High critical-hit ratio.$"
 
-gCottonSporeMoveDescription: ; 861A328
+gCottonSporeMoveDescription: @ 861A328
 	.charmapstr "Spores cling to the foe,{next}sharply reducing SPEED.$"
 
-gReversalMoveDescription: ; 861A359
+gReversalMoveDescription: @ 861A359
 	.charmapstr "Inflicts more damage when{next}the user’s HP is down.$"
 
-gSpiteMoveDescription: ; 861A38A
+gSpiteMoveDescription: @ 861A38A
 	.charmapstr "Spitefully cuts the PP{next}of the foe’s last move.$"
 
-gPowderSnowMoveDescription: ; 861A3B9
+gPowderSnowMoveDescription: @ 861A3B9
 	.charmapstr "Blasts the foe with a snowy{next}gust. May cause freezing.$"
 
-gProtectMoveDescription: ; 861A3EF
+gProtectMoveDescription: @ 861A3EF
 	.charmapstr "Evades attack, but may fail{next}if used in succession.$"
 
-gMachPunchMoveDescription: ; 861A422
+gMachPunchMoveDescription: @ 861A422
 	.charmapstr "A punch is thrown at wicked{next}speed to strike first.$"
 
-gScaryFaceMoveDescription: ; 861A455
+gScaryFaceMoveDescription: @ 861A455
 	.charmapstr "Frightens with a scary face{next}to sharply reduce SPEED.$"
 
-gFaintAttackMoveDescription: ; 861A48A
+gFaintAttackMoveDescription: @ 861A48A
 	.charmapstr "Draws the foe close, then{next}strikes without fail.$"
 
-gSweetKissMoveDescription: ; 861A4BA
+gSweetKissMoveDescription: @ 861A4BA
 	.charmapstr "Demands a kiss with a cute{next}look. May cause confusion.$"
 
-gBellyDrumMoveDescription: ; 861A4F0
+gBellyDrumMoveDescription: @ 861A4F0
 	.charmapstr "Maximizes ATTACK while{next}sacrificing HP.$"
 
-gSludgeBombMoveDescription: ; 861A517
+gSludgeBombMoveDescription: @ 861A517
 	.charmapstr "Sludge is hurled to inflict{next}damage. May also poison.$"
 
-gMudSlapMoveDescription: ; 861A54C
+gMudSlapMoveDescription: @ 861A54C
 	.charmapstr "Hurls mud in the foe’s face{next}to reduce its accuracy.$"
 
-gOctazookaMoveDescription: ; 861A580
+gOctazookaMoveDescription: @ 861A580
 	.charmapstr "Fires a lump of ink to{next}damage and cut accuracy.$"
 
-gSpikesMoveDescription: ; 861A5B0
+gSpikesMoveDescription: @ 861A5B0
 	.charmapstr "Sets spikes that hurt a {next}foe switching in.$"
 
-gZapCannonMoveDescription: ; 861A5DB
+gZapCannonMoveDescription: @ 861A5DB
 	.charmapstr "Powerful and sure to cause{next}paralysis, but inaccurate.$"
 
-gForesightMoveDescription: ; 861A611
+gForesightMoveDescription: @ 861A611
 	.charmapstr "Negates the foe’s efforts{next}to heighten evasiveness.$"
 
-gDestinyBondMoveDescription: ; 861A644
+gDestinyBondMoveDescription: @ 861A644
 	.charmapstr "If the user faints, the foe{next}is also made to faint.$"
 
-gPerishSongMoveDescription: ; 861A677
+gPerishSongMoveDescription: @ 861A677
 	.charmapstr "Any POKéMON hearing this{next}song faints in 3 turns.$"
 
-gIcyWindMoveDescription: ; 861A6A8
+gIcyWindMoveDescription: @ 861A6A8
 	.charmapstr "A chilling attack that{next}lowers the foe’s SPEED.$"
 
-gDetectMoveDescription: ; 861A6D7
+gDetectMoveDescription: @ 861A6D7
 	.charmapstr "Evades attack, but may fail{next}if used in succession.$"
 
-gBoneRushMoveDescription: ; 861A70A
+gBoneRushMoveDescription: @ 861A70A
 	.charmapstr "Strikes the foe with a bone{next}in hand 2 to 5 times.$"
 
-gLockOnMoveDescription: ; 861A73C
+gLockOnMoveDescription: @ 861A73C
 	.charmapstr "Locks on to the foe to{next}ensure the next move hits.$"
 
-gOutrageMoveDescription: ; 861A76E
+gOutrageMoveDescription: @ 861A76E
 	.charmapstr "A rampage of 2 to 3 turns{next}that confuses the user.$"
 
-gSandstormMoveDescription: ; 861A7A0
+gSandstormMoveDescription: @ 861A7A0
 	.charmapstr "Causes a sandstorm that{next}rages for several turns.$"
 
-gGigaDrainMoveDescription: ; 861A7D1
+gGigaDrainMoveDescription: @ 861A7D1
 	.charmapstr "An attack that steals half{next}the damage inflicted.$"
 
-gEndureMoveDescription: ; 861A802
+gEndureMoveDescription: @ 861A802
 	.charmapstr "Endures any attack for{next}1 turn, leaving at least 1HP.$"
 
-gCharmMoveDescription: ; 861A837
+gCharmMoveDescription: @ 861A837
 	.charmapstr "Charms the foe and sharply{next}reduces its ATTACK.$"
 
-gRolloutMoveDescription: ; 861A866
+gRolloutMoveDescription: @ 861A866
 	.charmapstr "An attack lasting 5 turns{next}with rising intensity.$"
 
-gFalseSwipeMoveDescription: ; 861A897
+gFalseSwipeMoveDescription: @ 861A897
 	.charmapstr "An attack that leaves the{next}foe with at least 1 HP.$"
 
-gSwaggerMoveDescription: ; 861A8C9
+gSwaggerMoveDescription: @ 861A8C9
 	.charmapstr "Confuses the foe, but also{next}sharply raises ATTACK.$"
 
-gMilkDrinkMoveDescription: ; 861A8FB
+gMilkDrinkMoveDescription: @ 861A8FB
 	.charmapstr "Recovers up to half the{next}user’s maximum HP.$"
 
-gSparkMoveDescription: ; 861A926
+gSparkMoveDescription: @ 861A926
 	.charmapstr "An electrified tackle that{next}may paralyze the foe.$"
 
-gFuryCutterMoveDescription: ; 861A957
+gFuryCutterMoveDescription: @ 861A957
 	.charmapstr "An attack that intensifies{next}on each successive hit.$"
 
-gSteelWingMoveDescription: ; 861A98A
+gSteelWingMoveDescription: @ 861A98A
 	.charmapstr "Strikes the foe with hard{next}wings spread wide.$"
 
-gMeanLookMoveDescription: ; 861A9B7
+gMeanLookMoveDescription: @ 861A9B7
 	.charmapstr "Fixes the foe with a mean{next}look that prevents escape.$"
 
-gAttractMoveDescription: ; 861A9EC
+gAttractMoveDescription: @ 861A9EC
 	.charmapstr "Makes the opposite gender{next}less likely to attack.$"
 
-gSleepTalkMoveDescription: ; 861AA1D
+gSleepTalkMoveDescription: @ 861AA1D
 	.charmapstr "Uses an available move{next}randomly while asleep.$"
 
-gHealBellMoveDescription: ; 861AA4B
+gHealBellMoveDescription: @ 861AA4B
 	.charmapstr "Chimes soothingly to heal{next}all status abnormalities.$"
 
-gReturnMoveDescription: ; 861AA7F
+gReturnMoveDescription: @ 861AA7F
 	.charmapstr "An attack that increases{next}in power with friendship.$"
 
-gPresentMoveDescription: ; 861AAB2
+gPresentMoveDescription: @ 861AAB2
 	.charmapstr "A gift in the form of a{next}bomb. May restore HP.$"
 
-gFrustrationMoveDescription: ; 861AAE0
+gFrustrationMoveDescription: @ 861AAE0
 	.charmapstr "An attack that is stronger{next}if the TRAINER is disliked.$"
 
-gSafeguardMoveDescription: ; 861AB17
+gSafeguardMoveDescription: @ 861AB17
 	.charmapstr "A mystical force prevents{next}all status problems.$"
 
-gPainSplitMoveDescription: ; 861AB46
+gPainSplitMoveDescription: @ 861AB46
 	.charmapstr "Adds the user and foe’s HP,{next}then shares them equally.$"
 
-gSacredFireMoveDescription: ; 861AB7C
+gSacredFireMoveDescription: @ 861AB7C
 	.charmapstr "A mystical fire attack that{next}may inflict a burn.$"
 
-gMagnitudeMoveDescription: ; 861ABAC
+gMagnitudeMoveDescription: @ 861ABAC
 	.charmapstr "A ground-shaking attack{next}of random intensity.$"
 
-gDynamicPunchMoveDescription: ; 861ABD9
+gDynamicPunchMoveDescription: @ 861ABD9
 	.charmapstr "Powerful and sure to cause{next}confusion, but inaccurate.$"
 
-gMegahornMoveDescription: ; 861AC0F
+gMegahornMoveDescription: @ 861AC0F
 	.charmapstr "A brutal ramming attack{next}using out-thrust horns.$"
 
-gDragonBreathMoveDescription: ; 861AC3F
+gDragonBreathMoveDescription: @ 861AC3F
 	.charmapstr "Strikes the foe with an{next}incredible blast of breath.$"
 
-gBatonPassMoveDescription: ; 861AC73
+gBatonPassMoveDescription: @ 861AC73
 	.charmapstr "Switches out the user while{next}keeping effects in play.$"
 
-gEncoreMoveDescription: ; 861ACA8
+gEncoreMoveDescription: @ 861ACA8
 	.charmapstr "Makes the foe repeat its{next}last move over 2 to 6 turns.$"
 
-gPursuitMoveDescription: ; 861ACDE
+gPursuitMoveDescription: @ 861ACDE
 	.charmapstr "Inflicts bad damage if used{next}on a foe switching out.$"
 
-gRapidSpinMoveDescription: ; 861AD12
+gRapidSpinMoveDescription: @ 861AD12
 	.charmapstr "Spins the body at high{next}speed to strike the foe.$"
 
-gSweetScentMoveDescription: ; 861AD42
+gSweetScentMoveDescription: @ 861AD42
 	.charmapstr "Allures the foe to reduce{next}evasiveness.$"
 
-gIronTailMoveDescription: ; 861AD69
+gIronTailMoveDescription: @ 861AD69
 	.charmapstr "Attacks with a rock-hard{next}tail. May lower DEFENSE.$"
 
-gMetalClawMoveDescription: ; 861AD9B
+gMetalClawMoveDescription: @ 861AD9B
 	.charmapstr "A claw attack that may{next}raise the user’s ATTACK.$"
 
-gVitalThrowMoveDescription: ; 861ADCB
+gVitalThrowMoveDescription: @ 861ADCB
 	.charmapstr "Makes the user’s move last,{next}but it never misses.$"
 
-gMorningSunMoveDescription: ; 861ADFC
+gMorningSunMoveDescription: @ 861ADFC
 	.charmapstr "Restores HP. The amount{next}varies with the weather.$"
 
-gSynthesisMoveDescription: ; 861AE2D
+gSynthesisMoveDescription: @ 861AE2D
 	.charmapstr "Restores HP. The amount{next}varies with the weather.$"
 
-gMoonlightMoveDescription: ; 861AE5E
+gMoonlightMoveDescription: @ 861AE5E
 	.charmapstr "Restores HP. The amount{next}varies with the weather.$"
 
-gHiddenPowerMoveDescription: ; 861AE8F
+gHiddenPowerMoveDescription: @ 861AE8F
 	.charmapstr "The effectiveness varies{next}with the user.$"
 
-gCrossChopMoveDescription: ; 861AEB7
+gCrossChopMoveDescription: @ 861AEB7
 	.charmapstr "A double-chopping attack.{next}High critical-hit ratio.$"
 
-gTwisterMoveDescription: ; 861AEEA
+gTwisterMoveDescription: @ 861AEEA
 	.charmapstr "Whips up a vicious twister{next}to tear at the foe.$"
 
-gRainDanceMoveDescription: ; 861AF19
+gRainDanceMoveDescription: @ 861AF19
 	.charmapstr "Boosts the power of WATER-{next}type moves for 5 turns.$"
 
-gSunnyDayMoveDescription: ; 861AF4C
+gSunnyDayMoveDescription: @ 861AF4C
 	.charmapstr "Boosts the power of FIRE-{next}type moves for 5 turns.$"
 
-gCrunchMoveDescription: ; 861AF7E
+gCrunchMoveDescription: @ 861AF7E
 	.charmapstr "Crunches with sharp fangs.{next}May lower SP. DEF.$"
 
-gMirrorCoatMoveDescription: ; 861AFAC
+gMirrorCoatMoveDescription: @ 861AFAC
 	.charmapstr "Counters the foe’s special{next}attack at double the power.$"
 
-gPsychUpMoveDescription: ; 861AFE3
+gPsychUpMoveDescription: @ 861AFE3
 	.charmapstr "Copies the foe’s effect(s){next}and gives to the user.$"
 
-gExtremeSpeedMoveDescription: ; 861B015
+gExtremeSpeedMoveDescription: @ 861B015
 	.charmapstr "An extremely fast and{next}powerful attack.$"
 
-gAncientPowerMoveDescription: ; 861B03C
+gAncientPowerMoveDescription: @ 861B03C
 	.charmapstr "An attack that may raise{next}all stats.$"
 
-gShadowBallMoveDescription: ; 861B060
+gShadowBallMoveDescription: @ 861B060
 	.charmapstr "Hurls a black blob that may{next}lower the foe’s SP. DEF.$"
 
-gFutureSightMoveDescription: ; 861B095
+gFutureSightMoveDescription: @ 861B095
 	.charmapstr "Heightens inner power to{next}strike 2 turns later.$"
 
-gRockSmashMoveDescription: ; 861B0C4
+gRockSmashMoveDescription: @ 861B0C4
 	.charmapstr "A rock-crushing attack{next}that may lower DEFENSE.$"
 
-gWhirlpoolMoveDescription: ; 861B0F3
+gWhirlpoolMoveDescription: @ 861B0F3
 	.charmapstr "Traps and hurts the foe in{next}a whirlpool for 2 to 5 turns.$"
 
-gBeatUpMoveDescription: ; 861B12C
+gBeatUpMoveDescription: @ 861B12C
 	.charmapstr "Summons party POKéMON to{next}join in the attack.$"
 
-gFakeOutMoveDescription: ; 861B159
+gFakeOutMoveDescription: @ 861B159
 	.charmapstr "A 1st-turn, 1st-strike move{next}that causes flinching.$"
 
-gUproarMoveDescription: ; 861B18C
+gUproarMoveDescription: @ 861B18C
 	.charmapstr "Causes an uproar for 2 to 5{next}turns and prevents sleep.$"
 
-gStockpileMoveDescription: ; 861B1C2
+gStockpileMoveDescription: @ 861B1C2
 	.charmapstr "Charges up power for up to{next}3 turns.$"
 
-gSpitUpMoveDescription: ; 861B1E6
+gSpitUpMoveDescription: @ 861B1E6
 	.charmapstr "Releases stockpiled power{next}(the more the better).$"
 
-gSwallowMoveDescription: ; 861B217
+gSwallowMoveDescription: @ 861B217
 	.charmapstr "Absorbs stockpiled power{next}and restores HP.$"
 
-gHeatWaveMoveDescription: ; 861B241
+gHeatWaveMoveDescription: @ 861B241
 	.charmapstr "Exhales a hot breath on the{next}foe. May inflict a burn.$"
 
-gHailMoveDescription: ; 861B276
+gHailMoveDescription: @ 861B276
 	.charmapstr "Summons a hailstorm that{next}strikes every turn.$"
 
-gTormentMoveDescription: ; 861B2A3
+gTormentMoveDescription: @ 861B2A3
 	.charmapstr "Torments the foe and stops{next}successive use of a move.$"
 
-gFlatterMoveDescription: ; 861B2D8
+gFlatterMoveDescription: @ 861B2D8
 	.charmapstr "Confuses the foe, but{next}raises its SP. ATK.$"
 
-gWillOWispMoveDescription: ; 861B302
+gWillOWispMoveDescription: @ 861B302
 	.charmapstr "Inflicts a burn on the foe{next}with intense fire.$"
 
-gMementoMoveDescription: ; 861B330
+gMementoMoveDescription: @ 861B330
 	.charmapstr "The user faints and lowers{next}the foe’s abilities.$"
 
-gFacadeMoveDescription: ; 861B360
+gFacadeMoveDescription: @ 861B360
 	.charmapstr "Boosts ATTACK when burned,{next}paralyzed, or poisoned.$"
 
-gFocusPunchMoveDescription: ; 861B393
+gFocusPunchMoveDescription: @ 861B393
 	.charmapstr "A powerful loyalty attack.{next}The user flinches if hit.$"
 
-gSmellingSaltMoveDescription: ; 861B3C8
+gSmellingSaltMoveDescription: @ 861B3C8
 	.charmapstr "Powerful against paralyzed{next}foes, but also heals them.$"
 
-gFollowMeMoveDescription: ; 861B3FE
+gFollowMeMoveDescription: @ 861B3FE
 	.charmapstr "Draws attention to make{next}foes attack only the user.$"
 
-gNaturePowerMoveDescription: ; 861B431
+gNaturePowerMoveDescription: @ 861B431
 	.charmapstr "The type of attack varies{next}depending on the location.$"
 
-gChargeMoveDescription: ; 861B466
+gChargeMoveDescription: @ 861B466
 	.charmapstr "Charges power to boost the{next}electric move used next.$"
 
-gTauntMoveDescription: ; 861B49A
+gTauntMoveDescription: @ 861B49A
 	.charmapstr "Taunts the foe into only{next}using attack moves.$"
 
-gHelpingHandMoveDescription: ; 861B4C7
+gHelpingHandMoveDescription: @ 861B4C7
 	.charmapstr "Boosts the power of the{next}recipient’s moves.$"
 
-gTrickMoveDescription: ; 861B4F2
+gTrickMoveDescription: @ 861B4F2
 	.charmapstr "Tricks the foe into trading{next}held items.$"
 
-gRolePlayMoveDescription: ; 861B51A
+gRolePlayMoveDescription: @ 861B51A
 	.charmapstr "Mimics the target and{next}copies its special ability.$"
 
-gWishMoveDescription: ; 861B54C
+gWishMoveDescription: @ 861B54C
 	.charmapstr "A wish that restores HP.{next}It takes time to work.$"
 
-gAssistMoveDescription: ; 861B57C
+gAssistMoveDescription: @ 861B57C
 	.charmapstr "Attacks randomly with one{next}of the partner’s moves.$"
 
-gIngrainMoveDescription: ; 861B5AE
+gIngrainMoveDescription: @ 861B5AE
 	.charmapstr "Lays roots that restore HP.{next}The user can’t switch out.$"
 
-gSuperpowerMoveDescription: ; 861B5E5
+gSuperpowerMoveDescription: @ 861B5E5
 	.charmapstr "Boosts strength sharply,{next}but lowers abilities.$"
 
-gMagicCoatMoveDescription: ; 861B614
+gMagicCoatMoveDescription: @ 861B614
 	.charmapstr "Reflects special effects{next}back to the attacker.$"
 
-gRecycleMoveDescription: ; 861B643
+gRecycleMoveDescription: @ 861B643
 	.charmapstr "Recycles a used item for{next}one more use.$"
 
-gRevengeMoveDescription: ; 861B66A
+gRevengeMoveDescription: @ 861B66A
 	.charmapstr "An attack that gains power{next}if injured by the foe.$"
 
-gBrickBreakMoveDescription: ; 861B69C
+gBrickBreakMoveDescription: @ 861B69C
 	.charmapstr "Destroys barriers such as{next}REFLECT and causes damage.$"
 
-gYawnMoveDescription: ; 861B6D1
+gYawnMoveDescription: @ 861B6D1
 	.charmapstr "Lulls the foe into yawning,{next}then sleeping next turn.$"
 
-gKnockOffMoveDescription: ; 861B706
+gKnockOffMoveDescription: @ 861B706
 	.charmapstr "Knocks down the foe’s held{next}item to prevent its use.$"
 
-gEndeavorMoveDescription: ; 861B73A
+gEndeavorMoveDescription: @ 861B73A
 	.charmapstr "Gains power if the user’s HP{next}is lower than the foe’s HP.$"
 
-gEruptionMoveDescription: ; 861B773
+gEruptionMoveDescription: @ 861B773
 	.charmapstr "The higher the user’s HP,{next}the more damage caused.$"
 
-gSkillSwapMoveDescription: ; 861B7A5
+gSkillSwapMoveDescription: @ 861B7A5
 	.charmapstr "The user swaps special{next}abilities with the target.$"
 
-gImprisonMoveDescription: ; 861B7D7
+gImprisonMoveDescription: @ 861B7D7
 	.charmapstr "Prevents foes from using{next}moves known by the user.$"
 
-gRefreshMoveDescription: ; 861B809
+gRefreshMoveDescription: @ 861B809
 	.charmapstr "Heals poisoning, paralysis,{next}or a burn.$"
 
-gGrudgeMoveDescription: ; 861B830
+gGrudgeMoveDescription: @ 861B830
 	.charmapstr "If the user faints, deletes{next}all PP of foe’s last move.$"
 
-gSnatchMoveDescription: ; 861B867
+gSnatchMoveDescription: @ 861B867
 	.charmapstr "Steals the effects of the{next}move the target uses next.$"
 
-gSecretPowerMoveDescription: ; 861B89C
+gSecretPowerMoveDescription: @ 861B89C
 	.charmapstr "An attack with effects{next}that vary by location.$"
 
-gDiveMoveDescription: ; 861B8CA
+gDiveMoveDescription: @ 861B8CA
 	.charmapstr "Dives underwater the first{next}turn and strikes next turn.$"
 
-gArmThrustMoveDescription: ; 861B901
+gArmThrustMoveDescription: @ 861B901
 	.charmapstr "Straight-arm punches that{next}strike the foe 2 to 5 times.$"
 
-gCamouflageMoveDescription: ; 861B938
+gCamouflageMoveDescription: @ 861B938
 	.charmapstr "Alters the POKéMON’s type{next}depending on the location.$"
 
-gTailGlowMoveDescription: ; 861B96D
+gTailGlowMoveDescription: @ 861B96D
 	.charmapstr "Flashes a light that sharply{next}raises SP. ATK.$"
 
-gLusterPurgeMoveDescription: ; 861B99A
+gLusterPurgeMoveDescription: @ 861B99A
 	.charmapstr "Attacks with a burst of{next}light. May lower SP. DEF.$"
 
-gMistBallMoveDescription: ; 861B9CC
+gMistBallMoveDescription: @ 861B9CC
 	.charmapstr "Attacks with a flurry of{next}down. May lower SP. ATK.$"
 
-gFeatherDanceMoveDescription: ; 861B9FE
+gFeatherDanceMoveDescription: @ 861B9FE
 	.charmapstr "Envelops the foe with down{next}to sharply reduce ATTACK.$"
 
-gTeeterDanceMoveDescription: ; 861BA33
+gTeeterDanceMoveDescription: @ 861BA33
 	.charmapstr "Confuses all POKéMON on{next}the scene.$"
 
-gBlazeKickMoveDescription: ; 861BA56
+gBlazeKickMoveDescription: @ 861BA56
 	.charmapstr "A kick with a high critical-{next}hit ratio. May cause a burn.$"
 
-gMudSportMoveDescription: ; 861BA90
+gMudSportMoveDescription: @ 861BA90
 	.charmapstr "Covers the user in mud to{next}raise electrical resistance.$"
 
-gIceBallMoveDescription: ; 861BAC7
+gIceBallMoveDescription: @ 861BAC7
 	.charmapstr "A 5-turn attack that gains{next}power on successive hits.$"
 
-gNeedleArmMoveDescription: ; 861BAFC
+gNeedleArmMoveDescription: @ 861BAFC
 	.charmapstr "Attacks with thorny arms.{next}May cause flinching.$"
 
-gSlackOffMoveDescription: ; 861BB2B
+gSlackOffMoveDescription: @ 861BB2B
 	.charmapstr "Slacks off and restores{next}half the maximum HP.$"
 
-gHyperVoiceMoveDescription: ; 861BB58
+gHyperVoiceMoveDescription: @ 861BB58
 	.charmapstr "A loud attack that uses{next}sound waves to injure.$"
 
-gPoisonFangMoveDescription: ; 861BB87
+gPoisonFangMoveDescription: @ 861BB87
 	.charmapstr "A sharp-fanged attack.{next}May badly poison the foe.$"
 
-gCrushClawMoveDescription: ; 861BBB8
+gCrushClawMoveDescription: @ 861BBB8
 	.charmapstr "Tears at the foe with sharp{next}claws. May lower DEFENSE.$"
 
-gBlastBurnMoveDescription: ; 861BBEE
+gBlastBurnMoveDescription: @ 861BBEE
 	.charmapstr "Powerful, but leaves the{next}user immobile the next turn.$"
 
-gHydroCannonMoveDescription: ; 861BC24
+gHydroCannonMoveDescription: @ 861BC24
 	.charmapstr "Powerful, but leaves the{next}user immobile the next turn.$"
 
-gMeteorMashMoveDescription: ; 861BC5A
+gMeteorMashMoveDescription: @ 861BC5A
 	.charmapstr "Fires a meteor-like punch.{next}May raise ATTACK.$"
 
-gAstonishMoveDescription: ; 861BC87
+gAstonishMoveDescription: @ 861BC87
 	.charmapstr "An attack that may shock{next}the foe into flinching.$"
 
-gWeatherBallMoveDescription: ; 861BCB8
+gWeatherBallMoveDescription: @ 861BCB8
 	.charmapstr "The move’s type and power{next}change with the weather.$"
 
-gAromatherapyMoveDescription: ; 861BCEB
+gAromatherapyMoveDescription: @ 861BCEB
 	.charmapstr "Heals all status problems{next}with a soothing scent.$"
 
-gFakeTearsMoveDescription: ; 861BD1C
+gFakeTearsMoveDescription: @ 861BD1C
 	.charmapstr "Feigns crying to sharply{next}lower the foe’s SP. DEF.$"
 
-gAirCutterMoveDescription: ; 861BD4E
+gAirCutterMoveDescription: @ 861BD4E
 	.charmapstr "Hacks with razorlike wind.{next}High critical-hit ratio.$"
 
-gOverheatMoveDescription: ; 861BD82
+gOverheatMoveDescription: @ 861BD82
 	.charmapstr "Allows a full-power attack,{next}but sharply lowers SP. ATK.$"
 
-gOdorSleuthMoveDescription: ; 861BDBA
+gOdorSleuthMoveDescription: @ 861BDBA
 	.charmapstr "Negates the foe’s efforts{next}to heighten evasiveness.$"
 
-gRockTombMoveDescription: ; 861BDED
+gRockTombMoveDescription: @ 861BDED
 	.charmapstr "Stops the foe from moving{next}with rocks and cuts SPEED.$"
 
-gSilverWindMoveDescription: ; 861BE22
+gSilverWindMoveDescription: @ 861BE22
 	.charmapstr "A powdery attack that may{next}raise abilities.$"
 
-gMetalSoundMoveDescription: ; 861BE4D
+gMetalSoundMoveDescription: @ 861BE4D
 	.charmapstr "Emits a horrible screech{next}that sharply lowers SP. DEF.$"
 
-gGrassWhistleMoveDescription: ; 861BE83
+gGrassWhistleMoveDescription: @ 861BE83
 	.charmapstr "Lulls the foe into sleep{next}with a pleasant melody.$"
 
-gTickleMoveDescription: ; 861BEB4
+gTickleMoveDescription: @ 861BEB4
 	.charmapstr "Makes the foe laugh to{next}lower ATTACK and DEFENSE.$"
 
-gCosmicPowerMoveDescription: ; 861BEE5
+gCosmicPowerMoveDescription: @ 861BEE5
 	.charmapstr "Raises DEFENSE and SP. DEF{next}with a mystic power.$"
 
-gWaterSpoutMoveDescription: ; 861BF15
+gWaterSpoutMoveDescription: @ 861BF15
 	.charmapstr "Inflicts more damage if the{next}user’s HP is high.$"
 
-gSignalBeamMoveDescription: ; 861BF44
+gSignalBeamMoveDescription: @ 861BF44
 	.charmapstr "A strange beam attack that{next}may confuse the foe.$"
 
-gShadowPunchMoveDescription: ; 861BF74
+gShadowPunchMoveDescription: @ 861BF74
 	.charmapstr "An unavoidable punch that{next}is thrown from shadows.$"
 
-gExtrasensoryMoveDescription: ; 861BFA6
+gExtrasensoryMoveDescription: @ 861BFA6
 	.charmapstr "Attacks with a peculiar{next}power. May cause flinching.$"
 
-gSkyUppercutMoveDescription: ; 861BFDA
+gSkyUppercutMoveDescription: @ 861BFDA
 	.charmapstr "An uppercut thrown as if{next}leaping into the sky.$"
 
-gSandTombMoveDescription: ; 861C009
+gSandTombMoveDescription: @ 861C009
 	.charmapstr "Traps and hurts the foe in{next}quicksand for 2 to 5 turns.$"
 
-gSheerColdMoveDescription: ; 861C040
+gSheerColdMoveDescription: @ 861C040
 	.charmapstr "A chilling attack that{next}causes fainting if it hits.$"
 
-gMuddyWaterMoveDescription: ; 861C073
+gMuddyWaterMoveDescription: @ 861C073
 	.charmapstr "Attacks with muddy water.{next}May lower accuracy.$"
 
-gBulletSeedMoveDescription: ; 861C0A1
+gBulletSeedMoveDescription: @ 861C0A1
 	.charmapstr "Shoots 2 to 5 seeds in a row{next}to strike the foe.$"
 
-gAerialAceMoveDescription: ; 861C0D1
+gAerialAceMoveDescription: @ 861C0D1
 	.charmapstr "An extremely speedy and{next}unavoidable attack.$"
 
-gIcicleSpearMoveDescription: ; 861C0FD
+gIcicleSpearMoveDescription: @ 861C0FD
 	.charmapstr "Attacks the foe by firing{next}2 to 5 icicles in a row.$"
 
-gIronDefenseMoveDescription: ; 861C130
+gIronDefenseMoveDescription: @ 861C130
 	.charmapstr "Hardens the body’s surface{next}to sharply raise DEFENSE.$"
 
-gBlockMoveDescription: ; 861C165
+gBlockMoveDescription: @ 861C165
 	.charmapstr "Blocks the foe’s way to{next}prevent escape.$"
 
-gHowlMoveDescription: ; 861C18D
+gHowlMoveDescription: @ 861C18D
 	.charmapstr "Howls to raise the spirit{next}and boosts ATTACK.$"
 
-gDragonClawMoveDescription: ; 861C1BA
+gDragonClawMoveDescription: @ 861C1BA
 	.charmapstr "Slashes the foe with sharp{next}claws.$"
 
-gFrenzyPlantMoveDescription: ; 861C1DC
+gFrenzyPlantMoveDescription: @ 861C1DC
 	.charmapstr "Powerful, but leaves the{next}user immobile the next turn.$"
 
-gBulkUpMoveDescription: ; 861C212
+gBulkUpMoveDescription: @ 861C212
 	.charmapstr "Bulks up the body to boost{next}both ATTACK and DEFENSE.$"
 
-gBounceMoveDescription: ; 861C246
+gBounceMoveDescription: @ 861C246
 	.charmapstr "Bounces up, then down the{next}next turn. May paralyze.$"
 
-gMudShotMoveDescription: ; 861C279
+gMudShotMoveDescription: @ 861C279
 	.charmapstr "Hurls mud at the foe and{next}reduces SPEED.$"
 
-gPoisonTailMoveDescription: ; 861C2A1
+gPoisonTailMoveDescription: @ 861C2A1
 	.charmapstr "Has a high critical-hit{next}ratio. May also poison.$"
 
-gCovetMoveDescription: ; 861C2D1
+gCovetMoveDescription: @ 861C2D1
 	.charmapstr "Cutely begs to obtain an{next}item held by the foe.$"
 
-gVoltTackleMoveDescription: ; 861C300
+gVoltTackleMoveDescription: @ 861C300
 	.charmapstr "A life-risking tackle that{next}slightly hurts the user.$"
 
-gMagicalLeafMoveDescription: ; 861C334
+gMagicalLeafMoveDescription: @ 861C334
 	.charmapstr "Attacks with a strange leaf{next}that cannot be evaded.$"
 
-gWaterSportMoveDescription: ; 861C367
+gWaterSportMoveDescription: @ 861C367
 	.charmapstr "The user becomes soaked to{next}raise resistance to fire.$"
 
-gCalmMindMoveDescription: ; 861C39C
+gCalmMindMoveDescription: @ 861C39C
 	.charmapstr "Raises SP. ATK and SP. DEF{next}by focusing the mind.$"
 
-gLeafBladeMoveDescription: ; 861C3CD
+gLeafBladeMoveDescription: @ 861C3CD
 	.charmapstr "Slashes with a sharp leaf.{next}High critical-hit ratio.$"
 
-gDragonDanceMoveDescription: ; 861C401
+gDragonDanceMoveDescription: @ 861C401
 	.charmapstr "A mystical dance that ups{next}ATTACK and SPEED.$"
 
-gRockBlastMoveDescription: ; 861C42D
+gRockBlastMoveDescription: @ 861C42D
 	.charmapstr "Hurls boulders at the foe{next}2 to 5 times in a row.$"
 
-gShockWaveMoveDescription: ; 861C45E
+gShockWaveMoveDescription: @ 861C45E
 	.charmapstr "A fast and unavoidable{next}electric attack.$"
 
-gWaterPulseMoveDescription: ; 861C486
+gWaterPulseMoveDescription: @ 861C486
 	.charmapstr "Attacks with ultrasonic{next}waves. May confuse the foe.$"
 
-gDoomDesireMoveDescription: ; 861C4BA
+gDoomDesireMoveDescription: @ 861C4BA
 	.charmapstr "Summons strong sunlight to{next}attack 2 turns later.$"
 
-gPsychoBoostMoveDescription: ; 861C4EB
+gPsychoBoostMoveDescription: @ 861C4EB
 	.charmapstr "Allows a full-power attack,{next}but sharply lowers SP. ATK.$"
 
 	.align 2, 0
 
-gMoveDescriptionPointers: ; 861C524
+gMoveDescriptionPointers: @ 861C524
 	.4byte gPoundMoveDescription
 	.4byte gKarateChopMoveDescription
 	.4byte gDoubleSlapMoveDescription
diff --git a/data/text/move_names.s b/data/text/move_names.s
index d1bfe1766..76e633457 100644
--- a/data/text/move_names.s
+++ b/data/text/move_names.s
@@ -1,4 +1,4 @@
-gMoveNames: ; 831977C
+gMoveNames: @ 831977C
 	.charmapstr "-$", 13
 	.charmapstr "POUND$", 13
 	.charmapstr "KARATE CHOP$", 13
diff --git a/data/text/nature_names.s b/data/text/nature_names.s
index fa5647a8a..6163e8656 100644
--- a/data/text/nature_names.s
+++ b/data/text/nature_names.s
@@ -1,81 +1,81 @@
-gHardyNatureName: ; 861CAAC
+gHardyNatureName: @ 861CAAC
 	.charmapstr "HARDY$"
 
-gLonelyNatureName: ; 861CAB2
+gLonelyNatureName: @ 861CAB2
 	.charmapstr "LONELY$"
 
-gBraveNatureName: ; 861CAB9
+gBraveNatureName: @ 861CAB9
 	.charmapstr "BRAVE$"
 
-gAdamantNatureName: ; 861CABF
+gAdamantNatureName: @ 861CABF
 	.charmapstr "ADAMANT$"
 
-gNaughtyNatureName: ; 861CAC7
+gNaughtyNatureName: @ 861CAC7
 	.charmapstr "NAUGHTY$"
 
-gBoldNatureName: ; 861CACF
+gBoldNatureName: @ 861CACF
 	.charmapstr "BOLD$"
 
-gDocileNatureName: ; 861CAD4
+gDocileNatureName: @ 861CAD4
 	.charmapstr "DOCILE$"
 
-gRelaxedNatureName: ; 861CADB
+gRelaxedNatureName: @ 861CADB
 	.charmapstr "RELAXED$"
 
-gImpishNatureName: ; 861CAE3
+gImpishNatureName: @ 861CAE3
 	.charmapstr "IMPISH$"
 
-gLaxNatureName: ; 861CAEA
+gLaxNatureName: @ 861CAEA
 	.charmapstr "LAX$"
 
-gTimidNatureName: ; 861CAEE
+gTimidNatureName: @ 861CAEE
 	.charmapstr "TIMID$"
 
-gHastyNatureName: ; 861CAF4
+gHastyNatureName: @ 861CAF4
 	.charmapstr "HASTY$"
 
-gSeriousNatureName: ; 861CAFA
+gSeriousNatureName: @ 861CAFA
 	.charmapstr "SERIOUS$"
 
-gJollyNatureName: ; 861CB02
+gJollyNatureName: @ 861CB02
 	.charmapstr "JOLLY$"
 
-gNaiveNatureName: ; 861CB08
+gNaiveNatureName: @ 861CB08
 	.charmapstr "NAIVE$"
 
-gModestNatureName: ; 861CB0E
+gModestNatureName: @ 861CB0E
 	.charmapstr "MODEST$"
 
-gMildNatureName: ; 861CB15
+gMildNatureName: @ 861CB15
 	.charmapstr "MILD$"
 
-gQuietNatureName: ; 861CB1A
+gQuietNatureName: @ 861CB1A
 	.charmapstr "QUIET$"
 
-gBashfulNatureName: ; 861CB20
+gBashfulNatureName: @ 861CB20
 	.charmapstr "BASHFUL$"
 
-gRashNatureName: ; 861CB28
+gRashNatureName: @ 861CB28
 	.charmapstr "RASH$"
 
-gCalmNatureName: ; 861CB2D
+gCalmNatureName: @ 861CB2D
 	.charmapstr "CALM$"
 
-gGentleNatureName: ; 861CB32
+gGentleNatureName: @ 861CB32
 	.charmapstr "GENTLE$"
 
-gSassyNatureName: ; 861CB39
+gSassyNatureName: @ 861CB39
 	.charmapstr "SASSY$"
 
-gCarefulNatureName: ; 861CB3F
+gCarefulNatureName: @ 861CB3F
 	.charmapstr "CAREFUL$"
 
-gQuirkyNatureName: ; 861CB47
+gQuirkyNatureName: @ 861CB47
 	.charmapstr "QUIRKY$"
 
 	.align 2, 0
 
-gNatureNamePointers: ; 861CB50
+gNatureNamePointers: @ 861CB50
 	.4byte gHardyNatureName
 	.4byte gLonelyNatureName
 	.4byte gBraveNatureName
diff --git a/data/text/pokedex_text.s b/data/text/pokedex_text.s
index 3acb0e5cd..5307a1b29 100644
--- a/data/text/pokedex_text.s
+++ b/data/text/pokedex_text.s
@@ -1,2320 +1,2320 @@
-gDummyPokedexText: ; 855D30D
+gDummyPokedexText: @ 855D30D
 	.charmapstr "This is a newly discovered POKéMON.{next}"
 	.charmapstr "It is currently under investigation.{next}"
 	.charmapstr "No detailed information is available{next}"
 	.charmapstr "at this time.$"
 
-gBulbasaurPokedexText: ; 855D389
+gBulbasaurPokedexText: @ 855D389
 	.charmapstr "BULBASAUR can be seen napping in bright{next}"
 	.charmapstr "sunlight. There is a seed on its back.{next}"
 	.charmapstr "By soaking up the sun’s rays, the seed{next}"
 	.charmapstr "grows progressively larger.$"
 
-gIvysaurPokedexText: ; 855D41B
+gIvysaurPokedexText: @ 855D41B
 	.charmapstr "To support its bulb, IVYSAUR’s legs{next}"
 	.charmapstr "grow sturdy. If it spends more time lying in{next}"
 	.charmapstr "the sunlight, the bud will soon bloom into{next}"
 	.charmapstr "a large flower.$"
 
-gVenusaurPokedexText: ; 855D4A7
+gVenusaurPokedexText: @ 855D4A7
 	.charmapstr "VENUSAUR’s flower is said to take on vivid{next}"
 	.charmapstr "colors if it gets plenty of nutrition and{next}"
 	.charmapstr "sunlight. The flower’s aroma soothes the{next}"
 	.charmapstr "emotions of people.$"
 
-gCharmanderPokedexText: ; 855D539
+gCharmanderPokedexText: @ 855D539
 	.charmapstr "The flame that burns at the tip of its{next}"
 	.charmapstr "tail is an indication of its emotions.{next}"
 	.charmapstr "The flame wavers when CHARMANDER is{next}"
 	.charmapstr "happy, and blazes when it is enraged.$"
 
-gCharmeleonPokedexText: ; 855D5D1
+gCharmeleonPokedexText: @ 855D5D1
 	.charmapstr "Without pity, its sharp claws destroy foes.{next}"
 	.charmapstr "If it encounters a strong enemy, it{next}"
 	.charmapstr "becomes agitated, and the flame on its{next}"
 	.charmapstr "tail flares with a bluish white color.$"
 
-gCharizardPokedexText: ; 855D66F
+gCharizardPokedexText: @ 855D66F
 	.charmapstr "A CHARIZARD flies about in search of{next}"
 	.charmapstr "strong opponents. It breathes intense{next}"
 	.charmapstr "flames that can melt any material. However,{next}"
 	.charmapstr "it will never torch a weaker foe.$"
 
-gSquirtlePokedexText: ; 855D708
+gSquirtlePokedexText: @ 855D708
 	.charmapstr "Its shell is not just for protection.{next}"
 	.charmapstr "Its rounded shape and the grooves on its{next}"
 	.charmapstr "surface minimize resistance in water,{next}"
 	.charmapstr "enabling SQUIRTLE to swim at high speeds.$"
 
-gWartortlePokedexText: ; 855D7A7
+gWartortlePokedexText: @ 855D7A7
 	.charmapstr "Its large tail is covered with rich, thick{next}"
 	.charmapstr "fur that deepens in color with age.{next}"
 	.charmapstr "The scratches on its shell are evidence{next}"
 	.charmapstr "of this POKéMON’s toughness in battle.$"
 
-gBlastoisePokedexText: ; 855D845
+gBlastoisePokedexText: @ 855D845
 	.charmapstr "The waterspouts that protrude from its{next}"
 	.charmapstr "shell are highly accurate. Their bullets of{next}"
 	.charmapstr "water can precisely nail tin cans from{next}"
 	.charmapstr "a distance of over 160 feet.$"
 
-gCaterpiePokedexText: ; 855D8DC
+gCaterpiePokedexText: @ 855D8DC
 	.charmapstr "Its voracious appetite compels it to{next}"
 	.charmapstr "devour leaves bigger than itself without{next}"
 	.charmapstr "hesitation. It releases a terribly strong{next}"
 	.charmapstr "odor from its antennae.$"
 
-gMetapodPokedexText: ; 855D96C
+gMetapodPokedexText: @ 855D96C
 	.charmapstr "Its shell is as hard as an iron slab.{next}"
 	.charmapstr "A METAPOD does not move very much{next}"
 	.charmapstr "because it is preparing its soft innards{next}"
 	.charmapstr "for evolution inside the shell.$"
 
-gButterfreePokedexText: ; 855D9FD
+gButterfreePokedexText: @ 855D9FD
 	.charmapstr "It has a superior ability to search for{next}"
 	.charmapstr "delicious honey from flowers. It can seek,{next}"
 	.charmapstr "extract, and carry honey from flowers{next}"
 	.charmapstr "blooming over six miles away.$"
 
-gWeedlePokedexText: ; 855DA94
+gWeedlePokedexText: @ 855DA94
 	.charmapstr "A WEEDLE has an extremely acute sense{next}"
 	.charmapstr "of smell. It distinguishes its favorite{next}"
 	.charmapstr "kinds of leaves from those it dislikes by{next}"
 	.charmapstr "sniffing with its big red proboscis (nose).$"
 
-gKakunaPokedexText: ; 855DB38
+gKakunaPokedexText: @ 855DB38
 	.charmapstr "It remains virtually immobile while it{next}"
 	.charmapstr "clings to a tree. However, on the inside,{next}"
 	.charmapstr "it busily prepares for evolution. This is{next}"
 	.charmapstr "evident from how hot its shell becomes.$"
 
-gBeedrillPokedexText: ; 855DBDB
+gBeedrillPokedexText: @ 855DBDB
 	.charmapstr "A BEEDRILL is extremely territorial.{next}"
 	.charmapstr "For safety reasons, no one should {next}"
 	.charmapstr "ever approach its nest. If angered,{next}"
 	.charmapstr "they will attack in a swarm.$"
 
-gPidgeyPokedexText: ; 855DC64
+gPidgeyPokedexText: @ 855DC64
 	.charmapstr "It has an extremely sharp sense of{next}"
 	.charmapstr "direction. It can unerringly return home to{next}"
 	.charmapstr "its nest, however far it may be removed{next}"
 	.charmapstr "from its familiar surroundings.$"
 
-gPidgeottoPokedexText: ; 855DCFB
+gPidgeottoPokedexText: @ 855DCFB
 	.charmapstr "This POKéMON flies around, patrolling its{next}"
 	.charmapstr "large territory. If its living space is{next}"
 	.charmapstr "violated, it shows no mercy in thoroughly{next}"
 	.charmapstr "punishing the foe with its sharp claws.$"
 
-gPidgeotPokedexText: ; 855DD9F
+gPidgeotPokedexText: @ 855DD9F
 	.charmapstr "This POKéMON has gorgeous, glossy{next}"
 	.charmapstr "feathers. Many TRAINERS are so captivated{next}"
 	.charmapstr "by the beautiful feathers on its head that{next}"
 	.charmapstr "they choose PIDGEOT as their POKéMON.$"
 
-gRattataPokedexText: ; 855DE3C
+gRattataPokedexText: @ 855DE3C
 	.charmapstr "A RATTATA is cautious in the extreme.{next}"
 	.charmapstr "Even while it is asleep, it constantly{next}"
 	.charmapstr "moves its ears and listens for danger.{next}"
 	.charmapstr "It will make its nest anywhere.$"
 
-gRaticatePokedexText: ; 855DED0
+gRaticatePokedexText: @ 855DED0
 	.charmapstr "A RATICATE’s sturdy fangs grow steadily.{next}"
 	.charmapstr "To keep them ground down, it gnaws on{next}"
 	.charmapstr "rocks and logs. It may even chew on the{next}"
 	.charmapstr "walls of houses.$"
 
-gSpearowPokedexText: ; 855DF58
+gSpearowPokedexText: @ 855DF58
 	.charmapstr "Its loud cry can be heard over half a mile{next}"
 	.charmapstr "away. If its high, keening cry is heard{next}"
 	.charmapstr "echoing all around, it is a sign that they{next}"
 	.charmapstr "are warning each other of danger.$"
 
-gFearowPokedexText: ; 855DFF8
+gFearowPokedexText: @ 855DFF8
 	.charmapstr "Its long neck and elongated beak are{next}"
 	.charmapstr "ideal for catching prey in soil or water.{next}"
 	.charmapstr "It deftly moves this extended and skinny{next}"
 	.charmapstr "beak to pluck prey.$"
 
-gEkansPokedexText: ; 855E084
+gEkansPokedexText: @ 855E084
 	.charmapstr "An EKANS curls itself up in a spiral while{next}"
 	.charmapstr "it rests. This position allows it to quickly{next}"
 	.charmapstr "respond to an enemy from any direction{next}"
 	.charmapstr "with a threat from its upraised head.$"
 
-gArbokPokedexText: ; 855E129
+gArbokPokedexText: @ 855E129
 	.charmapstr "This POKéMON has a terrifically strong{next}"
 	.charmapstr "constricting power. It can even flatten{next}"
 	.charmapstr "steel oil drums. Once it wraps its body{next}"
 	.charmapstr "around its foe, escaping is impossible.$"
 
-gPikachuPokedexText: ; 855E1C8
+gPikachuPokedexText: @ 855E1C8
 	.charmapstr "It stores electricity in the electric sacs{next}"
 	.charmapstr "on its cheeks. When it releases pent-up{next}"
 	.charmapstr "energy in a burst, the electric power is{next}"
 	.charmapstr "equal to a lightning bolt.$"
 
-gRaichuPokedexText: ; 855E25F
+gRaichuPokedexText: @ 855E25F
 	.charmapstr "If it stores too much electricity, its{next}"
 	.charmapstr "behavior turns aggressive. To avoid this,{next}"
 	.charmapstr "it occasionally discharges excess energy{next}"
 	.charmapstr "and calms itself down.$"
 
-gSandshrewPokedexText: ; 855E2F0
+gSandshrewPokedexText: @ 855E2F0
 	.charmapstr "When it curls up in a ball, it can make any{next}"
 	.charmapstr "attack bounce off harmlessly. Its hide has{next}"
 	.charmapstr "turned tough and solid as a result of{next}"
 	.charmapstr "living in the desert.$"
 
-gSandslashPokedexText: ; 855E383
+gSandslashPokedexText: @ 855E383
 	.charmapstr "It curls up in a ball to protect itself from{next}"
 	.charmapstr "enemy attacks. It also curls up to prevent{next}"
 	.charmapstr "heatstroke during the daytime when{next}"
 	.charmapstr "temperatures rise sharply.$"
 
-gNidoranFPokedexText: ; 855E419
+gNidoranFPokedexText: @ 855E419
 	.charmapstr "Its highly toxic barbs are thought to have{next}"
 	.charmapstr "developed as protection for this small-{next}"
 	.charmapstr "bodied POKéMON. When enraged, it releases{next}"
 	.charmapstr "a horrible toxin from its horn.$"
 
-gNidorinaPokedexText: ; 855E4B6
+gNidorinaPokedexText: @ 855E4B6
 	.charmapstr "When it is with its friends or{next}"
 	.charmapstr "family, its barbs are tucked away to{next}"
 	.charmapstr "prevent injury. It appears to become{next}"
 	.charmapstr "nervous if separated from the others.$"
 
-gNidoqueenPokedexText: ; 855E545
+gNidoqueenPokedexText: @ 855E545
 	.charmapstr "It is adept at sending foes flying with{next}"
 	.charmapstr "harsh tackles using its tough, scaly body.{next}"
 	.charmapstr "This POKéMON is at its strongest when{next}"
 	.charmapstr "it is defending its young.$"
 
-gNidoranMPokedexText: ; 855E5D9
+gNidoranMPokedexText: @ 855E5D9
 	.charmapstr "The male NIDORAN has developed muscles{next}"
 	.charmapstr "that freely move its ears in any direction.{next}"
 	.charmapstr "Even the slightest sound does not escape{next}"
 	.charmapstr "this POKéMON’s notice.$"
 
-gNidorinoPokedexText: ; 855E66C
+gNidorinoPokedexText: @ 855E66C
 	.charmapstr "Its horn is harder than a diamond.{next}"
 	.charmapstr "If it senses a hostile presence, all the{next}"
 	.charmapstr "barbs on its back bristle up at once, and it{next}"
 	.charmapstr "challenges the foe with all its might.$"
 
-gNidokingPokedexText: ; 855E70C
+gNidokingPokedexText: @ 855E70C
 	.charmapstr "A NIDOKING’s thick tail packs enormously{next}"
 	.charmapstr "destructive power capable of toppling{next}"
 	.charmapstr "a metal transmission tower. Once it goes{next}"
 	.charmapstr "on a rampage, there is no stopping it.$"
 
-gClefairyPokedexText: ; 855E7AB
+gClefairyPokedexText: @ 855E7AB
 	.charmapstr "On every night of a full moon, they come{next}"
 	.charmapstr "out to play. When dawn arrives, the tired{next}"
 	.charmapstr "CLEFAIRY go to sleep nestled up against{next}"
 	.charmapstr "each other in deep and quiet mountains.$"
 
-gClefablePokedexText: ; 855E84E
+gClefablePokedexText: @ 855E84E
 	.charmapstr "A CLEFABLE uses its wings to skip lightly {next}"
 	.charmapstr "as if it were flying. Its bouncy step{next}"
 	.charmapstr "lets it even walk on water. On quiet,{next}"
 	.charmapstr "moonlit nights, it strolls on lakes.$"
 
-gVulpixPokedexText: ; 855E8EA
+gVulpixPokedexText: @ 855E8EA
 	.charmapstr "It can freely control fire, making fiery{next}"
 	.charmapstr "orbs fly like will-o’-the-wisps. Just{next}"
 	.charmapstr "before evolution, its six tails grow hot {next}"
 	.charmapstr "as if on fire.$"
 
-gNinetalesPokedexText: ; 855E972
+gNinetalesPokedexText: @ 855E972
 	.charmapstr "It has long been said that each of the{next}"
 	.charmapstr "nine tails embody an enchanted power.{next}"
 	.charmapstr "A long-lived NINETALES will have fur that{next}"
 	.charmapstr "shines like gold.$"
 
-gJigglypuffPokedexText: ; 855E9FB
+gJigglypuffPokedexText: @ 855E9FB
 	.charmapstr "Nothing can avoid falling asleep hearing a{next}"
 	.charmapstr "JIGGLYPUFF’s song. The sound waves of its{next}"
 	.charmapstr "singing voice match the brain waves of{next}"
 	.charmapstr "someone in a deep sleep.$"
 
-gWigglytuffPokedexText: ; 855EA90
+gWigglytuffPokedexText: @ 855EA90
 	.charmapstr "Its fur is the ultimate in luxuriousness.{next}"
 	.charmapstr "Sleeping alongside a WIGGLYTUFF is simply{next}"
 	.charmapstr "divine. Its body expands seemingly without{next}"
 	.charmapstr "end when it inhales.$"
 
-gZubatPokedexText: ; 855EB24
+gZubatPokedexText: @ 855EB24
 	.charmapstr "While living in pitch-black caverns, their{next}"
 	.charmapstr "eyes gradually grew shut and deprived{next}"
 	.charmapstr "them of vision. They use ultrasonic waves{next}"
 	.charmapstr "to detect obstacles.$"
 
-gGolbatPokedexText: ; 855EBB4
+gGolbatPokedexText: @ 855EBB4
 	.charmapstr "Its fangs easily puncture even thick{next}"
 	.charmapstr "animal hide. It loves to feast on the blood{next}"
 	.charmapstr "of people and POKéMON. It flits about in{next}"
 	.charmapstr "darkness and strikes from behind.$"
 
-gOddishPokedexText: ; 855EC50
+gOddishPokedexText: @ 855EC50
 	.charmapstr "This POKéMON grows by absorbing moonlight.{next}"
 	.charmapstr "During the daytime, it buries itself in the{next}"
 	.charmapstr "ground, leaving only its leaves exposed to{next}"
 	.charmapstr "avoid detection by its enemies.$"
 
-gGloomPokedexText: ; 855ECF2
+gGloomPokedexText: @ 855ECF2
 	.charmapstr "A horribly noxious honey drools from its{next}"
 	.charmapstr "mouth. One whiff of the honey can result{next}"
 	.charmapstr "in memory loss. Some fans are said to{next}"
 	.charmapstr "enjoy this overwhelming stink, however.$"
 
-gVileplumePokedexText: ; 855ED92
+gVileplumePokedexText: @ 855ED92
 	.charmapstr "In seasons when it produces more pollen,{next}"
 	.charmapstr "the air around a VILEPLUME turns yellow{next}"
 	.charmapstr "with the powder as it walks. The pollen is{next}"
 	.charmapstr "highly toxic and causes paralysis.$"
 
-gParasPokedexText: ; 855EE31
+gParasPokedexText: @ 855EE31
 	.charmapstr "A PARAS has parasitic tochukaso{next}"
 	.charmapstr "mushrooms growing on its back. They grow{next}"
 	.charmapstr "by drawing nutrients from the host. They{next}"
 	.charmapstr "are valued as a medicine for long life.$"
 
-gParasectPokedexText: ; 855EECB
+gParasectPokedexText: @ 855EECB
 	.charmapstr "PARASECT are known to infest the roots of{next}"
 	.charmapstr "large trees en masse and drain nutrients.{next}"
 	.charmapstr "When an infested tree dies, they move{next}"
 	.charmapstr "onto another tree all at once.$"
 
-gVenonatPokedexText: ; 855EF64
+gVenonatPokedexText: @ 855EF64
 	.charmapstr "Its coat of thin, stiff hair that covers{next}"
 	.charmapstr "its entire body is said to have evolved{next}"
 	.charmapstr "for protection. Its large eyes never fail{next}"
 	.charmapstr "to spot even miniscule prey.$"
 
-gVenomothPokedexText: ; 855EFFC
+gVenomothPokedexText: @ 855EFFC
 	.charmapstr "VENOMOTH are nocturnal--they only are{next}"
 	.charmapstr "active at night. Their favorite prey are{next}"
 	.charmapstr "insects that gather around streetlights,{next}"
 	.charmapstr "attracted by the light in the darkness.$"
 
-gDiglettPokedexText: ; 855F09C
+gDiglettPokedexText: @ 855F09C
 	.charmapstr "DIGLETT are raised in most farms.{next}"
 	.charmapstr "The reason is simple--wherever they{next}"
 	.charmapstr "burrow, the soil is left perfectly tilled{next}"
 	.charmapstr "for growing delicious crops.$"
 
-gDugtrioPokedexText: ; 855F129
+gDugtrioPokedexText: @ 855F129
 	.charmapstr "Because the triplets originally split from{next}"
 	.charmapstr "one body, they think exactly alike.{next}"
 	.charmapstr "They work cooperatively to burrow{next}"
 	.charmapstr "endlessly through the ground.$"
 
-gMeowthPokedexText: ; 855F1B8
+gMeowthPokedexText: @ 855F1B8
 	.charmapstr "MEOWTH withdraw their sharp claws into{next}"
 	.charmapstr "their paws to silently sneak about.{next}"
 	.charmapstr "For some reason, this POKéMON loves{next}"
 	.charmapstr "shiny coins that glitter with light.$"
 
-gPersianPokedexText: ; 855F24C
+gPersianPokedexText: @ 855F24C
 	.charmapstr "A PERSIAN’s six bold whiskers sense air{next}"
 	.charmapstr "movements to determine what is in its{next}"
 	.charmapstr "vicinity. It becomes docile if grabbed{next}"
 	.charmapstr "by the whiskers.$"
 
-gPsyduckPokedexText: ; 855F2D2
+gPsyduckPokedexText: @ 855F2D2
 	.charmapstr "When its headache intensifies, it starts{next}"
 	.charmapstr "using strange powers. However, it has no{next}"
 	.charmapstr "recollection of its powers, so it always{next}"
 	.charmapstr "looks befuddled and bewildered.$"
 
-gGolduckPokedexText: ; 855F36D
+gGolduckPokedexText: @ 855F36D
 	.charmapstr "A GOLDUCK is an adept swimmer.{next}"
 	.charmapstr "It sometimes joins competitive swimmers{next}"
 	.charmapstr "in training. It uses psychic powers when{next}"
 	.charmapstr "its forehead shimmers with light.$"
 
-gMankeyPokedexText: ; 855F3FF
+gMankeyPokedexText: @ 855F3FF
 	.charmapstr "When it starts shaking and its nasal{next}"
 	.charmapstr "breathing turns rough, it’s a sure sign{next}"
 	.charmapstr "of anger. However, since this happens{next}"
 	.charmapstr "instantly, there is no time to flee.$"
 
-gPrimeapePokedexText: ; 855F497
+gPrimeapePokedexText: @ 855F497
 	.charmapstr "When it becomes furious, its blood{next}"
 	.charmapstr "circulation becomes more robust, and{next}"
 	.charmapstr "its muscles are made stronger. But it{next}"
 	.charmapstr "also becomes much less intelligent.$"
 
-gGrowlithePokedexText: ; 855F529
+gGrowlithePokedexText: @ 855F529
 	.charmapstr "Its superb sense of smell ensures that{next}"
 	.charmapstr "this POKéMON won’t forget any scent,{next}"
 	.charmapstr "no matter what. It uses its sense of smell{next}"
 	.charmapstr "to detect the emotions of others.$"
 
-gArcaninePokedexText: ; 855F5C2
+gArcaninePokedexText: @ 855F5C2
 	.charmapstr "This fleet-footed POKéMON is said to run{next}"
 	.charmapstr "over 6,200 miles in a single day and night.{next}"
 	.charmapstr "The fire that blazes wildly within its body{next}"
 	.charmapstr "is its source of power.$"
 
-gPoliwagPokedexText: ; 855F65B
+gPoliwagPokedexText: @ 855F65B
 	.charmapstr "It is possible to see this POKéMON’s spiral{next}"
 	.charmapstr "innards right through its thin skin.{next}"
 	.charmapstr "However, the skin is also very flexible.{next}"
 	.charmapstr "Even sharp fangs bounce right off it.$"
 
-gPoliwhirlPokedexText: ; 855F6FB
+gPoliwhirlPokedexText: @ 855F6FB
 	.charmapstr "Its body surface is always wet and slick{next}"
 	.charmapstr "with an oily fluid. Because of this greasy{next}"
 	.charmapstr "covering, it can easily slip and slide out{next}"
 	.charmapstr "of the clutches of any enemy in battle.$"
 
-gPoliwrathPokedexText: ; 855F7A2
+gPoliwrathPokedexText: @ 855F7A2
 	.charmapstr "Its highly developed muscles never grow{next}"
 	.charmapstr "fatigued, however much it exercises.{next}"
 	.charmapstr "This POKéMON can swim back and forth{next}"
 	.charmapstr "across the Pacific Ocean without effort.$"
 
-gAbraPokedexText: ; 855F83D
+gAbraPokedexText: @ 855F83D
 	.charmapstr "A POKéMON that sleeps 18 hours a day.{next}"
 	.charmapstr "Observation revealed that it uses{next}"
 	.charmapstr "TELEPORT to change its location once{next}"
 	.charmapstr "every hour.$"
 
-gKadabraPokedexText: ; 855F8B6
+gKadabraPokedexText: @ 855F8B6
 	.charmapstr "It is rumored that a boy with psychic{next}"
 	.charmapstr "abilities suddenly transformed into{next}"
 	.charmapstr "KADABRA while he was assisting research{next}"
 	.charmapstr "into extrasensory powers.$"
 
-gAlakazamPokedexText: ; 855F942
+gAlakazamPokedexText: @ 855F942
 	.charmapstr "While it has strong psychic abilities and{next}"
 	.charmapstr "high intelligence, an ALAKAZAM’s muscles{next}"
 	.charmapstr "are very weak. It uses psychic power to{next}"
 	.charmapstr "move its body.$"
 
-gMachopPokedexText: ; 855F9CC
+gMachopPokedexText: @ 855F9CC
 	.charmapstr "It continually undertakes strenuous{next}"
 	.charmapstr "training to master all forms of martial{next}"
 	.charmapstr "arts. Its strength lets it easily hoist{next}"
 	.charmapstr "a sumo wrestler onto its shoulders.$"
 
-gMachokePokedexText: ; 855FA64
+gMachokePokedexText: @ 855FA64
 	.charmapstr "A belt is worn by a MACHOKE to keep its{next}"
 	.charmapstr "overwhelming power under control.{next}"
 	.charmapstr "Because it is so dangerous, no one has{next}"
 	.charmapstr "ever removed the belt.$"
 
-gMachampPokedexText: ; 855FAEC
+gMachampPokedexText: @ 855FAEC
 	.charmapstr "It is impossible to defend against punches{next}"
 	.charmapstr "and chops doled out by its four arms.{next}"
 	.charmapstr "Its fighting spirit flares up when it faces{next}"
 	.charmapstr "a tough opponent.$"
 
-gBellsproutPokedexText: ; 855FB7B
+gBellsproutPokedexText: @ 855FB7B
 	.charmapstr "A BELLSPROUT’s thin and flexible body lets{next}"
 	.charmapstr "it bend and sway to avoid any attack,{next}"
 	.charmapstr "however strong it may be. From its mouth,{next}"
 	.charmapstr "it leaks a fluid that melts even iron.$"
 
-gWeepinbellPokedexText: ; 855FC1D
+gWeepinbellPokedexText: @ 855FC1D
 	.charmapstr "At night, a WEEPINBELL hangs on to a tree{next}"
 	.charmapstr "branch with its hooked rear and sleeps.{next}"
 	.charmapstr "If it moves around in its sleep, it may{next}"
 	.charmapstr "wake up to find itself on the ground.$"
 
-gVictreebelPokedexText: ; 855FCBD
+gVictreebelPokedexText: @ 855FCBD
 	.charmapstr "The long vine extending from its head is{next}"
 	.charmapstr "waved about as if it were a living thing to{next}"
 	.charmapstr "attract prey. When an unsuspecting victim{next}"
 	.charmapstr "approaches, it is swallowed whole.$"
 
-gTentacoolPokedexText: ; 855FD5F
+gTentacoolPokedexText: @ 855FD5F
 	.charmapstr "Its body is almost entirely composed of{next}"
 	.charmapstr "water. It ensnares its foe with its two{next}"
 	.charmapstr "long tentacles, then stabs with the poison{next}"
 	.charmapstr "stingers at their tips.$"
 
-gTentacruelPokedexText: ; 855FDF2
+gTentacruelPokedexText: @ 855FDF2
 	.charmapstr "It lives in complex rock formations on{next}"
 	.charmapstr "the ocean floor and traps prey using its{next}"
 	.charmapstr "80 tentacles. Its red orbs glow when it{next}"
 	.charmapstr "grows excited or agitated.$"
 
-gGeodudePokedexText: ; 855FE85
+gGeodudePokedexText: @ 855FE85
 	.charmapstr "It climbs mountain paths using only the{next}"
 	.charmapstr "power of its arms. Because they look just{next}"
 	.charmapstr "like boulders lining paths, hikers may step{next}"
 	.charmapstr "on them without noticing.$"
 
-gGravelerPokedexText: ; 855FF1D
+gGravelerPokedexText: @ 855FF1D
 	.charmapstr "They descend from mountains by tumbling{next}"
 	.charmapstr "down steep slopes. They are so brutal,{next}"
 	.charmapstr "they smash aside obstructing trees and{next}"
 	.charmapstr "massive boulders with thunderous tackles.$"
 
-gGolemPokedexText: ; 855FFBD
+gGolemPokedexText: @ 855FFBD
 	.charmapstr "It is said to live in volcanic craters{next}"
 	.charmapstr "on mountain peaks. Once a year, it sheds{next}"
 	.charmapstr "its hide and grows larger. The shed hide{next}"
 	.charmapstr "crumbles and returns to the soil.$"
 
-gPonytaPokedexText: ; 8560058
+gPonytaPokedexText: @ 8560058
 	.charmapstr "A PONYTA is very weak at birth. It can{next}"
 	.charmapstr "barely stand up. Its legs become stronger{next}"
 	.charmapstr "as it stumbles and falls while trying to{next}"
 	.charmapstr "keep up with its parent.$"
 
-gRapidashPokedexText: ; 85600EB
+gRapidashPokedexText: @ 85600EB
 	.charmapstr "It usually canters casually in the fields{next}"
 	.charmapstr "and plains. But once a RAPIDASH turns{next}"
 	.charmapstr "serious, its fiery manes flare and blaze{next}"
 	.charmapstr "as it gallops its way up to 150 mph.$"
 
-gSlowpokePokedexText: ; 8560189
+gSlowpokePokedexText: @ 8560189
 	.charmapstr "It catches prey by dipping its tail in{next}"
 	.charmapstr "water at the side of a river. But it often{next}"
 	.charmapstr "forgets what it is doing and spends entire{next}"
 	.charmapstr "days just loafing at water’s edge.$"
 
-gSlowbroPokedexText: ; 8560229
+gSlowbroPokedexText: @ 8560229
 	.charmapstr "Its tail has a SHELLDER firmly attached{next}"
 	.charmapstr "with a bite. As a result, the tail can’t be{next}"
 	.charmapstr "used for fishing anymore. This forces it{next}"
 	.charmapstr "to reluctantly swim and catch prey.$"
 
-gMagnemitePokedexText: ; 85602CA
+gMagnemitePokedexText: @ 85602CA
 	.charmapstr "The units at its sides are extremely{next}"
 	.charmapstr "powerful magnets. They generate enough{next}"
 	.charmapstr "magnetism to draw in iron objects from{next}"
 	.charmapstr "over 300 feet away.$"
 
-gMagnetonPokedexText: ; 8560351
+gMagnetonPokedexText: @ 8560351
 	.charmapstr "It is actually three MAGNEMITE linked{next}"
 	.charmapstr "by magnetism. It generates powerful radio{next}"
 	.charmapstr "waves that raise temperatures by 3.6{next}"
 	.charmapstr "degrees F within a 3,300-foot radius.$"
 
-gFarfetchdPokedexText: ; 85603EC
+gFarfetchdPokedexText: @ 85603EC
 	.charmapstr "It is always seen with a stick from a plant.{next}"
 	.charmapstr "Apparently, there are good sticks and bad{next}"
 	.charmapstr "sticks. This POKéMON occasionally fights{next}"
 	.charmapstr "with others over choice sticks.$"
 
-gDoduoPokedexText: ; 856048C
+gDoduoPokedexText: @ 856048C
 	.charmapstr "Even while eating or sleeping, one of the{next}"
 	.charmapstr "heads remains always vigilant for any sign{next}"
 	.charmapstr "of danger. When threatened, it flees at{next}"
 	.charmapstr "over 60 miles per hour.$"
 
-gDodrioPokedexText: ; 8560521
+gDodrioPokedexText: @ 8560521
 	.charmapstr "A peculiar POKéMON species with three{next}"
 	.charmapstr "heads. It vigorously races across grassy{next}"
 	.charmapstr "plains even in arid seasons with little{next}"
 	.charmapstr "rainfall.$"
 
-gSeelPokedexText: ; 85605A2
+gSeelPokedexText: @ 85605A2
 	.charmapstr "SEEL hunt for prey in frigid, ice-covered{next}"
 	.charmapstr "seas. When it needs to breathe, it punches{next}"
 	.charmapstr "a hole through the ice with the sharply{next}"
 	.charmapstr "protruding section of its head.$"
 
-gDewgongPokedexText: ; 856063F
+gDewgongPokedexText: @ 856063F
 	.charmapstr "It loves to snooze on bitterly cold ice.{next}"
 	.charmapstr "The sight of this POKéMON sleeping on{next}"
 	.charmapstr "a glacier was mistakenly thought to be{next}"
 	.charmapstr "a mermaid by a mariner long ago.$"
 
-gGrimerPokedexText: ; 85606D6
+gGrimerPokedexText: @ 85606D6
 	.charmapstr "Born from polluted sludge in the sea,{next}"
 	.charmapstr "GRIMER’s favorite food is anything filthy.{next}"
 	.charmapstr "They feed on wastewater pumped out from{next}"
 	.charmapstr "factories.$"
 
-gMukPokedexText: ; 856075A
+gMukPokedexText: @ 856075A
 	.charmapstr "It prefers warm and humid habitats.{next}"
 	.charmapstr "In the summertime, the toxic substances{next}"
 	.charmapstr "in its body intensify, making MUK reek like{next}"
 	.charmapstr "putrid kitchen garbage.$"
 
-gShellderPokedexText: ; 85607EA
+gShellderPokedexText: @ 85607EA
 	.charmapstr "At night, it burrows a hole in the seafloor{next}"
 	.charmapstr "with its broad tongue to make a place to{next}"
 	.charmapstr "sleep. While asleep, it closes its shell,{next}"
 	.charmapstr "but leaves its tongue hanging out.$"
 
-gCloysterPokedexText: ; 856088C
+gCloysterPokedexText: @ 856088C
 	.charmapstr "It swims in the sea by swallowing water,{next}"
 	.charmapstr "then jetting it out toward the rear.{next}"
 	.charmapstr "The CLOYSTER shoots spikes from its{next}"
 	.charmapstr "shell using the same system.$"
 
-gGastlyPokedexText: ; 856091B
+gGastlyPokedexText: @ 856091B
 	.charmapstr "When exposed to a strong wind, a GASTLY’s{next}"
 	.charmapstr "gaseous body quickly dwindles away.{next}"
 	.charmapstr "They cluster under the eaves of houses{next}"
 	.charmapstr "to escape the ravages of wind.$"
 
-gHaunterPokedexText: ; 85609AF
+gHaunterPokedexText: @ 85609AF
 	.charmapstr "If a HAUNTER beckons you while it is{next}"
 	.charmapstr "floating in darkness, don’t approach it.{next}"
 	.charmapstr "This POKéMON will try to lick you with its{next}"
 	.charmapstr "tongue and steal your life away.$"
 
-gGengarPokedexText: ; 8560A49
+gGengarPokedexText: @ 8560A49
 	.charmapstr "Deep in the night, your shadow cast by{next}"
 	.charmapstr "a streetlight may suddenly overtake you.{next}"
 	.charmapstr "It is actually a GENGAR running past{next}"
 	.charmapstr "you, pretending to be your shadow.$"
 
-gOnixPokedexText: ; 8560AE1
+gOnixPokedexText: @ 8560AE1
 	.charmapstr "There is a magnet in its brain that{next}"
 	.charmapstr "prevents an ONIX from losing direction{next}"
 	.charmapstr "while tunneling. As it grows older, its body{next}"
 	.charmapstr "becomes steadily rounder and smoother.$"
 
-gDrowzeePokedexText: ; 8560B80
+gDrowzeePokedexText: @ 8560B80
 	.charmapstr "If your nose becomes itchy while you are{next}"
 	.charmapstr "sleeping, it’s a sure sign that a DROWZEE is{next}"
 	.charmapstr "standing above your pillow and trying to{next}"
 	.charmapstr "eat your dream through your nostrils.$"
 
-gHypnoPokedexText: ; 8560C25
+gHypnoPokedexText: @ 8560C25
 	.charmapstr "The arcing movement and glitter of the{next}"
 	.charmapstr "pendulum in a HYPNO’s hand lull the foe{next}"
 	.charmapstr "into deep hypnosis. While searching for{next}"
 	.charmapstr "prey, it polishes the pendulum.$"
 
-gKrabbyPokedexText: ; 8560CBC
+gKrabbyPokedexText: @ 8560CBC
 	.charmapstr "KRABBY live in holes dug into beaches.{next}"
 	.charmapstr "On sandy shores with little in the way{next}"
 	.charmapstr "of food, they can be seen squabbling with{next}"
 	.charmapstr "each other over territory.$"
 
-gKinglerPokedexText: ; 8560D4F
+gKinglerPokedexText: @ 8560D4F
 	.charmapstr "It waves its huge, oversized claw in the{next}"
 	.charmapstr "air to communicate with others.{next}"
 	.charmapstr "But since the claw is so heavy, this{next}"
 	.charmapstr "POKéMON quickly tires.$"
 
-gVoltorbPokedexText: ; 8560DD4
+gVoltorbPokedexText: @ 8560DD4
 	.charmapstr "It bears an uncanny and unexplained{next}"
 	.charmapstr "resemblance to a POKé BALL. Because it{next}"
 	.charmapstr "explodes at the slightest shock, even{next}"
 	.charmapstr "veteran TRAINERS treat it with caution.$"
 
-gElectrodePokedexText: ; 8560E6D
+gElectrodePokedexText: @ 8560E6D
 	.charmapstr "They appear in great numbers at electric{next}"
 	.charmapstr "power plants. Because they feed on{next}"
 	.charmapstr "electricity, they cause massive and{next}"
 	.charmapstr "chaotic blackouts in nearby cities.$"
 
-gExeggcutePokedexText: ; 8560F01
+gExeggcutePokedexText: @ 8560F01
 	.charmapstr "It consists of six eggs that care for each{next}"
 	.charmapstr "other. The eggs attract each other and{next}"
 	.charmapstr "spin around. When cracks increasingly{next}"
 	.charmapstr "appear, it is close to evolution.$"
 
-gExeggutorPokedexText: ; 8560F9B
+gExeggutorPokedexText: @ 8560F9B
 	.charmapstr "Originally from the tropics, EXEGGUTOR’s{next}"
 	.charmapstr "heads grow larger from exposure to strong{next}"
 	.charmapstr "sunlight. It is said that when the heads{next}"
 	.charmapstr "fall, they group to form an EXEGGCUTE.$"
 
-gCubonePokedexText: ; 856103E
+gCubonePokedexText: @ 856103E
 	.charmapstr "It pines for the mother it will never see{next}"
 	.charmapstr "again. Seeing a likeness of its mother in{next}"
 	.charmapstr "the full moon, it cries. The stains on the{next}"
 	.charmapstr "skull it wears are from its tears.$"
 
-gMarowakPokedexText: ; 85610E0
+gMarowakPokedexText: @ 85610E0
 	.charmapstr "A MAROWAK is the evolved form of a CUBONE{next}"
 	.charmapstr "that has grown tough by overcoming the{next}"
 	.charmapstr "grief of losing its mother. Its tempered{next}"
 	.charmapstr "and hardened spirit is not easily broken.$"
 
-gHitmonleePokedexText: ; 8561184
+gHitmonleePokedexText: @ 8561184
 	.charmapstr "Its legs freely stretch and contract.{next}"
 	.charmapstr "Using these springlike limbs, it bowls over{next}"
 	.charmapstr "foes with devastating kicks. After battle,{next}"
 	.charmapstr "it rubs down its tired legs.$"
 
-gHitmonchanPokedexText: ; 856121E
+gHitmonchanPokedexText: @ 856121E
 	.charmapstr "A HITMONCHAN is said to possess the{next}"
 	.charmapstr "spirit of a boxer who aimed to become the{next}"
 	.charmapstr "world champion. Having an indomitable{next}"
 	.charmapstr "spirit means that it will never give up.$"
 
-gLickitungPokedexText: ; 85612BB
+gLickitungPokedexText: @ 85612BB
 	.charmapstr "Whenever it sees something unfamiliar,{next}"
 	.charmapstr "it always licks the object because it{next}"
 	.charmapstr "memorizes things by texture and taste.{next}"
 	.charmapstr "It is somewhat put off by sour things.$"
 
-gKoffingPokedexText: ; 8561356
+gKoffingPokedexText: @ 8561356
 	.charmapstr "Getting up close to a KOFFING will give{next}"
 	.charmapstr "you a chance to observe, through its thin{next}"
 	.charmapstr "skin, the toxic gases swirling inside. It{next}"
 	.charmapstr "blows up at the slightest stimulation.$"
 
-gWeezingPokedexText: ; 85613F9
+gWeezingPokedexText: @ 85613F9
 	.charmapstr "By diluting its toxic gases with a special{next}"
 	.charmapstr "process, the highest grade of perfume can{next}"
 	.charmapstr "be extracted. To WEEZING, gases emanating{next}"
 	.charmapstr "from garbage are the ultimate feast.$"
 
-gRhyhornPokedexText: ; 856149D
+gRhyhornPokedexText: @ 856149D
 	.charmapstr "Once it starts running, it doesn’t stop.{next}"
 	.charmapstr "Its tiny brain makes it so stupid that it{next}"
 	.charmapstr "can’t remember why it started running in{next}"
 	.charmapstr "the first place.$"
 
-gRhydonPokedexText: ; 856152A
+gRhydonPokedexText: @ 856152A
 	.charmapstr "Its horn, which rotates like a drill,{next}"
 	.charmapstr "destroys tall buildings with one strike.{next}"
 	.charmapstr "It stands on its hind legs, and its brain{next}"
 	.charmapstr "is well developed.$"
 
-gChanseyPokedexText: ; 85615B6
+gChanseyPokedexText: @ 85615B6
 	.charmapstr "CHANSEY lay nutritionally excellent eggs{next}"
 	.charmapstr "every day. The eggs are so delicious, they{next}"
 	.charmapstr "are eagerly devoured by even those people{next}"
 	.charmapstr "who have lost their appetite.$"
 
-gTangelaPokedexText: ; 8561652
+gTangelaPokedexText: @ 8561652
 	.charmapstr "Its vines snap off easily and painlessly{next}"
 	.charmapstr "if they are grabbed, allowing it to make a{next}"
 	.charmapstr "quick getaway. The lost vines are replaced{next}"
 	.charmapstr "by new growth the very next day.$"
 
-gKangaskhanPokedexText: ; 85616F2
+gKangaskhanPokedexText: @ 85616F2
 	.charmapstr "If you come across a young KANGASKHAN{next}"
 	.charmapstr "playing by itself, never try to catch it.{next}"
 	.charmapstr "The baby’s parent is sure to be in the area,{next}"
 	.charmapstr "and it will become violently enraged.$"
 
-gHorseaPokedexText: ; 8561795
+gHorseaPokedexText: @ 8561795
 	.charmapstr "By cleverly flicking the fins on its back{next}"
 	.charmapstr "side to side, it moves in any direction{next}"
 	.charmapstr "while facing forward. It spits ink to{next}"
 	.charmapstr "escape if it senses danger.$"
 
-gSeadraPokedexText: ; 8561829
+gSeadraPokedexText: @ 8561829
 	.charmapstr "The poisonous barbs all over its body are{next}"
 	.charmapstr "highly valued as ingredients for making{next}"
 	.charmapstr "traditional herbal medicine. It shows no{next}"
 	.charmapstr "mercy to anything approaching its nest.$"
 
-gGoldeenPokedexText: ; 85618CC
+gGoldeenPokedexText: @ 85618CC
 	.charmapstr "In the springtime, schools of GOLDEEN{next}"
 	.charmapstr "can be seen swimming up falls and rivers.{next}"
 	.charmapstr "It metes out staggering damage with its{next}"
 	.charmapstr "single horn.$"
 
-gSeakingPokedexText: ; 8561951
+gSeakingPokedexText: @ 8561951
 	.charmapstr "It punches holes in boulders on stream-{next}"
 	.charmapstr "beds. This is a clever innovation that{next}"
 	.charmapstr "prevents its eggs from being attacked or{next}"
 	.charmapstr "washed away by the current.$"
 
-gStaryuPokedexText: ; 85619E5
+gStaryuPokedexText: @ 85619E5
 	.charmapstr "It gathers with others in the night and{next}"
 	.charmapstr "makes its red core glow on and off with{next}"
 	.charmapstr "the twinkling stars. It can regenerate{next}"
 	.charmapstr "limbs if they are severed from its body.$"
 
-gStarmiePokedexText: ; 8561A85
+gStarmiePokedexText: @ 8561A85
 	.charmapstr "People in ancient times imagined that{next}"
 	.charmapstr "STARMIE were transformed from the{next}"
 	.charmapstr "reflections of stars that twinkled on{next}"
 	.charmapstr "gentle waves at night.$"
 
-gMrmimePokedexText: ; 8561B0A
+gMrmimePokedexText: @ 8561B0A
 	.charmapstr "A MR. MIME is a master of pantomime. It can{next}"
 	.charmapstr "convince others that something unseeable{next}"
 	.charmapstr "actually exists. Once believed, the{next}"
 	.charmapstr "imaginary object does become real.$"
 
-gScytherPokedexText: ; 8561BA6
+gScytherPokedexText: @ 8561BA6
 	.charmapstr "Its blindingly fast speed adds to the{next}"
 	.charmapstr "sharpness of its twin forearm scythes.{next}"
 	.charmapstr "The scythes can slice through thick logs{next}"
 	.charmapstr "in one wicked stroke.$"
 
-gJynxPokedexText: ; 8561C32
+gJynxPokedexText: @ 8561C32
 	.charmapstr "A JYNX sashays rhythmically as if it were{next}"
 	.charmapstr "dancing. Its motions are so bouncingly{next}"
 	.charmapstr "alluring, people seeing it are compelled to{next}"
 	.charmapstr "shake their hips without noticing.$"
 
-gElectabuzzPokedexText: ; 8561CD2
+gElectabuzzPokedexText: @ 8561CD2
 	.charmapstr "When a storm approaches, it competes with{next}"
 	.charmapstr "others to scale heights that are likely to{next}"
 	.charmapstr "be stricken by lightning. Some towns use{next}"
 	.charmapstr "ELECTABUZZ in place of lightning rods.$"
 
-gMagmarPokedexText: ; 8561D77
+gMagmarPokedexText: @ 8561D77
 	.charmapstr "In battle, it blows out intense flames from{next}"
 	.charmapstr "all over its body to intimidate its foe.{next}"
 	.charmapstr "These fiery bursts create heat waves that{next}"
 	.charmapstr "ignite grass and trees in the area.$"
 
-gPinsirPokedexText: ; 8561E1A
+gPinsirPokedexText: @ 8561E1A
 	.charmapstr "Their pincers are strong enough to{next}"
 	.charmapstr "shatter thick logs. Because they dislike{next}"
 	.charmapstr "cold, PINSIR burrow and sleep under{next}"
 	.charmapstr "the ground on chilly nights.$"
 
-gTaurosPokedexText: ; 8561EA7
+gTaurosPokedexText: @ 8561EA7
 	.charmapstr "It is not satisfied unless it is rampaging{next}"
 	.charmapstr "at all times. If there is no opponent for{next}"
 	.charmapstr "TAUROS to battle, it will charge at thick{next}"
 	.charmapstr "trees and knock them down to calm itself.$"
 
-gMagikarpPokedexText: ; 8561F50
+gMagikarpPokedexText: @ 8561F50
 	.charmapstr "Its swimming muscles are weak, so it is{next}"
 	.charmapstr "easily washed away by currents. In places{next}"
 	.charmapstr "where water pools, you can see many{next}"
 	.charmapstr "MAGIKARP deposited there by the flow.$"
 
-gGyaradosPokedexText: ; 8561FEC
+gGyaradosPokedexText: @ 8561FEC
 	.charmapstr "It is an extremely vicious and violent{next}"
 	.charmapstr "POKéMON. When humans begin to fight,{next}"
 	.charmapstr "it will appear and burn everything to the{next}"
 	.charmapstr "ground with intensely hot flames.$"
 
-gLaprasPokedexText: ; 8562084
+gLaprasPokedexText: @ 8562084
 	.charmapstr "People have driven LAPRAS almost to the{next}"
 	.charmapstr "point of extinction. In the evenings,{next}"
 	.charmapstr "it is said to sing plaintively as it seeks{next}"
 	.charmapstr "what few others of its kind still remain.$"
 
-gDittoPokedexText: ; 8562127
+gDittoPokedexText: @ 8562127
 	.charmapstr "A DITTO rearranges its cell structure to{next}"
 	.charmapstr "transform itself. However, if it tries to{next}"
 	.charmapstr "change based on its memory, it will get{next}"
 	.charmapstr "details wrong.$"
 
-gEeveePokedexText: ; 85621B1
+gEeveePokedexText: @ 85621B1
 	.charmapstr "An EEVEE has an unstable genetic makeup{next}"
 	.charmapstr "that suddenly mutates due to its{next}"
 	.charmapstr "environment. Radiation from various{next}"
 	.charmapstr "STONES causes this POKéMON to evolve.$"
 
-gVaporeonPokedexText: ; 8562244
+gVaporeonPokedexText: @ 8562244
 	.charmapstr "VAPOREON underwent a spontaneous{next}"
 	.charmapstr "mutation and grew fins and gills that{next}"
 	.charmapstr "allow them to live underwater. They have{next}"
 	.charmapstr "the ability to freely control water.$"
 
-gJolteonPokedexText: ; 85622D9
+gJolteonPokedexText: @ 85622D9
 	.charmapstr "Its cells generate weak power that is{next}"
 	.charmapstr "amplified by its fur’s static electricity{next}"
 	.charmapstr "to drop thunderbolts. The bristling fur is{next}"
 	.charmapstr "made of electrically charged needles.$"
 
-gFlareonPokedexText: ; 856237A
+gFlareonPokedexText: @ 856237A
 	.charmapstr "FLAREON’s fluffy fur releases heat into{next}"
 	.charmapstr "the air so that its body does not get{next}"
 	.charmapstr "excessively hot. Its body temperature can{next}"
 	.charmapstr "rise to a maximum of 1,650 degrees F.$"
 
-gPorygonPokedexText: ; 8562418
+gPorygonPokedexText: @ 8562418
 	.charmapstr "It is capable of reverting itself entirely{next}"
 	.charmapstr "back to program data in order to enter{next}"
 	.charmapstr "cyberspace. A PORYGON is copy-{next}"
 	.charmapstr "protected so it cannot be duplicated.$"
 
-gOmanytePokedexText: ; 85624AF
+gOmanytePokedexText: @ 85624AF
 	.charmapstr "One of the ancient and long-since-extinct{next}"
 	.charmapstr "POKéMON that have been regenerated{next}"
 	.charmapstr "from fossils by humans. If attacked,{next}"
 	.charmapstr "it withdraws into its hard shell.$"
 
-gOmastarPokedexText: ; 8562543
+gOmastarPokedexText: @ 8562543
 	.charmapstr "An OMASTAR uses its tentacles to capture{next}"
 	.charmapstr "its prey. It is believed to have become{next}"
 	.charmapstr "extinct because its shell grew too large,{next}"
 	.charmapstr "making its movements slow and ponderous.$"
 
-gKabutoPokedexText: ; 85625E7
+gKabutoPokedexText: @ 85625E7
 	.charmapstr "It is a POKéMON that has been regenerated{next}"
 	.charmapstr "from a fossil. However, in rare cases, living{next}"
 	.charmapstr "examples have been discovered. KABUTO{next}"
 	.charmapstr "have not changed for 300 million years.$"
 
-gKabutopsPokedexText: ; 856268D
+gKabutopsPokedexText: @ 856268D
 	.charmapstr "KABUTOPS once swam underwater to hunt {next}"
 	.charmapstr "for prey. It was apparently evolving from{next}"
 	.charmapstr "being a water dweller to living on land as{next}"
 	.charmapstr "evident from changes in its gills and legs.$"
 
-gAerodactylPokedexText: ; 8562735
+gAerodactylPokedexText: @ 8562735
 	.charmapstr "AERODACTYL is a POKéMON from the age{next}"
 	.charmapstr "of dinosaurs. It was regenerated from DNA{next}"
 	.charmapstr "extracted from amber. It is imagined to{next}"
 	.charmapstr "have been the king of the skies.$"
 
-gSnorlaxPokedexText: ; 85627CD
+gSnorlaxPokedexText: @ 85627CD
 	.charmapstr "SNORLAX’s typical day consists of nothing{next}"
 	.charmapstr "more than eating and sleeping. It is such{next}"
 	.charmapstr "a docile POKéMON that there are children{next}"
 	.charmapstr "who use its big belly as a place to play.$"
 
-gArticunoPokedexText: ; 8562874
+gArticunoPokedexText: @ 8562874
 	.charmapstr "ARTICUNO is a legendary bird POKéMON that{next}"
 	.charmapstr "can control ice. The flapping of its wings{next}"
 	.charmapstr "chills the air. As a result, it is said that{next}"
 	.charmapstr "when this POKéMON flies, snow will fall.$"
 
-gZapdosPokedexText: ; 856291F
+gZapdosPokedexText: @ 856291F
 	.charmapstr "ZAPDOS is a legendary bird POKéMON that{next}"
 	.charmapstr "has the ability to control electricity.{next}"
 	.charmapstr "It usually lives in thunderclouds. It gains{next}"
 	.charmapstr "power if it is stricken by lightning bolts.$"
 
-gMoltresPokedexText: ; 85629C7
+gMoltresPokedexText: @ 85629C7
 	.charmapstr "MOLTRES is a legendary bird POKéMON{next}"
 	.charmapstr "that can control fire. If injured, it is said{next}"
 	.charmapstr "to dip its body in the molten magma of{next}"
 	.charmapstr "a volcano to burn and heal itself.$"
 
-gDratiniPokedexText: ; 8562A63
+gDratiniPokedexText: @ 8562A63
 	.charmapstr "A DRATINI continually molts and sloughs{next}"
 	.charmapstr "off its old skin. It does so because the{next}"
 	.charmapstr "life energy within its body steadily builds{next}"
 	.charmapstr "to reach uncontrollable levels.$"
 
-gDragonairPokedexText: ; 8562B00
+gDragonairPokedexText: @ 8562B00
 	.charmapstr "A DRAGONAIR stores an enormous amount of{next}"
 	.charmapstr "energy inside its body. It is said to alter{next}"
 	.charmapstr "the weather around it by loosing energy{next}"
 	.charmapstr "from the crystals on its neck and tail.$"
 
-gDragonitePokedexText: ; 8562BA5
+gDragonitePokedexText: @ 8562BA5
 	.charmapstr "It can circle the globe in just 16 hours.{next}"
 	.charmapstr "It is a kindhearted POKéMON that leads{next}"
 	.charmapstr "lost and foundering ships in a storm{next}"
 	.charmapstr "to the safety of land.$"
 
-gMewtwoPokedexText: ; 8562C32
+gMewtwoPokedexText: @ 8562C32
 	.charmapstr "A POKéMON that was created by genetic{next}"
 	.charmapstr "manipulation. However, even though the{next}"
 	.charmapstr "scientific power of humans made its body,{next}"
 	.charmapstr "they failed to give it a warm heart.$"
 
-gMewPokedexText: ; 8562CCE
+gMewPokedexText: @ 8562CCE
 	.charmapstr "A MEW is said to possess the genes of all{next}"
 	.charmapstr "POKéMON. It is capable of making itself{next}"
 	.charmapstr "invisible at will, so it entirely avoids{next}"
 	.charmapstr "notice even if it approaches people.$"
 
-gChikoritaPokedexText: ; 8562D6E
+gChikoritaPokedexText: @ 8562D6E
 	.charmapstr "It waves its leaf around to keep foes{next}"
 	.charmapstr "at bay. However, a sweet fragrance also{next}"
 	.charmapstr "wafts from the leaf, creating a friendly{next}"
 	.charmapstr "atmosphere that becalms the battlers.$"
 
-gBayleefPokedexText: ; 8562E0B
+gBayleefPokedexText: @ 8562E0B
 	.charmapstr "A BAYLEEF’s neck is ringed by curled-up{next}"
 	.charmapstr "leaves. Inside each leaf is a small tree{next}"
 	.charmapstr "shoot. The fragrance of this shoot{next}"
 	.charmapstr "makes people peppy.$"
 
-gMeganiumPokedexText: ; 8562E93
+gMeganiumPokedexText: @ 8562E93
 	.charmapstr "The fragrance of a MEGANIUM’s flower{next}"
 	.charmapstr "soothes and calms emotions. In battle,{next}"
 	.charmapstr "it gives off more of its becalming scent{next}"
 	.charmapstr "to blunt the foe’s fighting spirit.$"
 
-gCyndaquilPokedexText: ; 8562F2C
+gCyndaquilPokedexText: @ 8562F2C
 	.charmapstr "It flares flames from its back to protect{next}"
 	.charmapstr "itself. The fire burns vigorously if the{next}"
 	.charmapstr "POKéMON is angry. When it is tired,{next}"
 	.charmapstr "it sputters with incomplete combustion.$"
 
-gQuilavaPokedexText: ; 8562FCB
+gQuilavaPokedexText: @ 8562FCB
 	.charmapstr "It intimidates foes with intense gusts of{next}"
 	.charmapstr "flames and superheated air. Its quick{next}"
 	.charmapstr "nimbleness lets it dodge attacks even{next}"
 	.charmapstr "while scorching an enemy.$"
 
-gTyphlosionPokedexText: ; 856305B
+gTyphlosionPokedexText: @ 856305B
 	.charmapstr "It can hide behind a shimmering heat haze{next}"
 	.charmapstr "that it creates using its intense flames.{next}"
 	.charmapstr "TYPHLOSION create blazing explosive{next}"
 	.charmapstr "blasts that burn everything to cinders.$"
 
-gTotodilePokedexText: ; 85630FB
+gTotodilePokedexText: @ 85630FB
 	.charmapstr "Despite its small body, TOTODILE’s jaws{next}"
 	.charmapstr "are very powerful. While it may think it is{next}"
 	.charmapstr "just playfully nipping, its bite has enough{next}"
 	.charmapstr "strength to cause serious injury.$"
 
-gCroconawPokedexText: ; 856319D
+gCroconawPokedexText: @ 856319D
 	.charmapstr "Once its jaws clamp down on its foe, it will{next}"
 	.charmapstr "absolutely not let go. Because the tips of{next}"
 	.charmapstr "its fangs are forked back like fishhooks,{next}"
 	.charmapstr "they become irremovably embedded.$"
 
-gFeraligatrPokedexText: ; 8563241
+gFeraligatrPokedexText: @ 8563241
 	.charmapstr "It opens its huge mouth to intimidate{next}"
 	.charmapstr "enemies. In battle, it runs using its thick{next}"
 	.charmapstr "and powerful hind legs to charge the{next}"
 	.charmapstr "foe with incredible speed.$"
 
-gSentretPokedexText: ; 85632D3
+gSentretPokedexText: @ 85632D3
 	.charmapstr "They take turns standing guard when it{next}"
 	.charmapstr "is time to sleep. The sentry awakens the{next}"
 	.charmapstr "others if it senses danger. If one becomes{next}"
 	.charmapstr "separated, it turns sleepless with fear.$"
 
-gFurretPokedexText: ; 8563377
+gFurretPokedexText: @ 8563377
 	.charmapstr "A FURRET has a very slim build. When under{next}"
 	.charmapstr "attack, it can squirm through narrow{next}"
 	.charmapstr "spaces and get away. In spite of its short{next}"
 	.charmapstr "limbs, it is very nimble and fleet.$"
 
-gHoothootPokedexText: ; 8563416
+gHoothootPokedexText: @ 8563416
 	.charmapstr "It has an internal organ that senses{next}"
 	.charmapstr "the earth’s rotation. Using this special{next}"
 	.charmapstr "organ, a HOOTHOOT begins hooting at{next}"
 	.charmapstr "precisely the same time every day.$"
 
-gNoctowlPokedexText: ; 85634AB
+gNoctowlPokedexText: @ 85634AB
 	.charmapstr "It unfailingly catches prey in darkness.{next}"
 	.charmapstr "NOCTOWL owe their success to superior{next}"
 	.charmapstr "vision that allows them to see in minimal{next}"
 	.charmapstr "light, and to their supple and silent wings.$"
 
-gLedybaPokedexText: ; 8563551
+gLedybaPokedexText: @ 8563551
 	.charmapstr "LEDYBA communicate using a fluid that{next}"
 	.charmapstr "they secrete from where the legs join the{next}"
 	.charmapstr "body. They are said to convey feelings to{next}"
 	.charmapstr "others by altering the fluid’s scent.$"
 
-gLedianPokedexText: ; 85635F1
+gLedianPokedexText: @ 85635F1
 	.charmapstr "It is said that in lands with clean air,{next}"
 	.charmapstr "where the stars fill the sky, there live{next}"
 	.charmapstr "many LEDIAN. For good reason, they use{next}"
 	.charmapstr "the light of the stars as energy.$"
 
-gSpinarakPokedexText: ; 856368C
+gSpinarakPokedexText: @ 856368C
 	.charmapstr "The web it spins can be considered its{next}"
 	.charmapstr "second nervous system. It is said that a{next}"
 	.charmapstr "SPINARAK determines its prey by the tiny{next}"
 	.charmapstr "vibrations it feels through the web.$"
 
-gAriadosPokedexText: ; 856372A
+gAriadosPokedexText: @ 856372A
 	.charmapstr "Its feet are tipped with tiny hooked claws{next}"
 	.charmapstr "that enable it to scuttle on ceilings and{next}"
 	.charmapstr "vertical walls. It constricts its foe with{next}"
 	.charmapstr "thin and strong silk webbing.$"
 
-gCrobatPokedexText: ; 85637C8
+gCrobatPokedexText: @ 85637C8
 	.charmapstr "Over the course of evolution, its hind legs{next}"
 	.charmapstr "turned into wings. By alternately resting{next}"
 	.charmapstr "its front and rear wings, it can fly all day{next}"
 	.charmapstr "without having to stop.$"
 
-gChinchouPokedexText: ; 8563863
+gChinchouPokedexText: @ 8563863
 	.charmapstr "When it senses danger, it discharges{next}"
 	.charmapstr "positive and negative electricity from its{next}"
 	.charmapstr "two antennae. It lives in depths beyond{next}"
 	.charmapstr "sunlight’s reach.$"
 
-gLanturnPokedexText: ; 85638ED
+gLanturnPokedexText: @ 85638ED
 	.charmapstr "The light-emitting orbs on its back are{next}"
 	.charmapstr "very bright. They are formed from a part of{next}"
 	.charmapstr "its dorsal fin. This POKéMON illuminates{next}"
 	.charmapstr "the inky darkness of deep seas.$"
 
-gPichuPokedexText: ; 856398A
+gPichuPokedexText: @ 856398A
 	.charmapstr "It is still inept at retaining electricity.{next}"
 	.charmapstr "When it is startled, it discharges power{next}"
 	.charmapstr "accidentally. It gets better at holding{next}"
 	.charmapstr "power as it grows older.$"
 
-gCleffaPokedexText: ; 8563A20
+gCleffaPokedexText: @ 8563A20
 	.charmapstr "On nights with many shooting stars,{next}"
 	.charmapstr "CLEFFA can be seen dancing in a ring.{next}"
 	.charmapstr "They dance until daybreak, when they{next}"
 	.charmapstr "quench their thirst with the morning dew.$"
 
-gIgglybuffPokedexText: ; 8563AB9
+gIgglybuffPokedexText: @ 8563AB9
 	.charmapstr "Its soft and pliable body is very bouncy.{next}"
 	.charmapstr "When it sings continuously with all its{next}"
 	.charmapstr "might, its body steadily turns a deepening{next}"
 	.charmapstr "pink color.$"
 
-gTogepiPokedexText: ; 8563B42
+gTogepiPokedexText: @ 8563B42
 	.charmapstr "As its energy, it uses the feelings of{next}"
 	.charmapstr "compassion and pleasure exuded by{next}"
 	.charmapstr "people and POKéMON. It stores up happy{next}"
 	.charmapstr "feelings in its shell, then shares them out.$"
 
-gTogeticPokedexText: ; 8563BDF
+gTogeticPokedexText: @ 8563BDF
 	.charmapstr "It is said to be a POKéMON that brings good{next}"
 	.charmapstr "fortune. When it spots someone who is pure{next}"
 	.charmapstr "of heart, a TOGETIC appears and shares its{next}"
 	.charmapstr "happiness with that person.$"
 
-gNatuPokedexText: ; 8563C7D
+gNatuPokedexText: @ 8563C7D
 	.charmapstr "It runs up short trees that grow on the{next}"
 	.charmapstr "savanna to peck at new shoots.{next}"
 	.charmapstr "A NATU’s eyes look as if they are{next}"
 	.charmapstr "always observing something.$"
 
-gXatuPokedexText: ; 8563D02
+gXatuPokedexText: @ 8563D02
 	.charmapstr "It has the enigmatic power of foreseeing{next}"
 	.charmapstr "the future. Some people in different lands{next}"
 	.charmapstr "have long believed that XATU are{next}"
 	.charmapstr "emissaries from another world.$"
 
-gMareepPokedexText: ; 8563D96
+gMareepPokedexText: @ 8563D96
 	.charmapstr "Its fluffy wool rubs together and builds{next}"
 	.charmapstr "a static charge. The more energy is{next}"
 	.charmapstr "charged, the more brightly the lightbulb{next}"
 	.charmapstr "at the tip of its tail glows.$"
 
-gFlaaffyPokedexText: ; 8563E2A
+gFlaaffyPokedexText: @ 8563E2A
 	.charmapstr "Its fleece quality changes to generate{next}"
 	.charmapstr "strong static electricity with a small{next}"
 	.charmapstr "amount of wool. The bare, slick parts of its{next}"
 	.charmapstr "hide are shielded against electricity.$"
 
-gAmpharosPokedexText: ; 8563ECC
+gAmpharosPokedexText: @ 8563ECC
 	.charmapstr "It gives off so much light that it can be{next}"
 	.charmapstr "seen even from space. People in the old{next}"
 	.charmapstr "days used its light to send signals back{next}"
 	.charmapstr "and forth with others far away.$"
 
-gBellossomPokedexText: ; 8563F67
+gBellossomPokedexText: @ 8563F67
 	.charmapstr "Its flower petals deepen in color through{next}"
 	.charmapstr "exposure to sunlight. When cloudy weather{next}"
 	.charmapstr "persists, it does a dance that is thought{next}"
 	.charmapstr "to be a ritual for summoning the sun.$"
 
-gMarillPokedexText: ; 856400B
+gMarillPokedexText: @ 856400B
 	.charmapstr "Its body is covered with water-repellent{next}"
 	.charmapstr "fur. Because of the fur, it can swim{next}"
 	.charmapstr "through water at high speed without being{next}"
 	.charmapstr "slowed by the water’s resistance.$"
 
-gAzumarillPokedexText: ; 85640A5
+gAzumarillPokedexText: @ 85640A5
 	.charmapstr "It lives in water virtually all day long.{next}"
 	.charmapstr "Its body color and pattern act as{next}"
 	.charmapstr "camouflage that makes it tough for{next}"
 	.charmapstr "enemies to spot in water.$"
 
-gSudowoodoPokedexText: ; 856412E
+gSudowoodoPokedexText: @ 856412E
 	.charmapstr "It mimics a tree to avoid being attacked{next}"
 	.charmapstr "by enemies. But since its forelegs{next}"
 	.charmapstr "remain green throughout the year, it is{next}"
 	.charmapstr "easily identified as a fake in the winter.$"
 
-gPolitoedPokedexText: ; 85641CD
+gPolitoedPokedexText: @ 85641CD
 	.charmapstr "The curled hair on its head proves its{next}"
 	.charmapstr "status as a king. It is said that the{next}"
 	.charmapstr "longer and curlier the hair, the more{next}"
 	.charmapstr "respect it earns from its peers.$"
 
-gHoppipPokedexText: ; 8564261
+gHoppipPokedexText: @ 8564261
 	.charmapstr "This POKéMON drifts and floats with the{next}"
 	.charmapstr "wind. If it senses the approach of strong{next}"
 	.charmapstr "winds, a HOPPIP links leaves with others{next}"
 	.charmapstr "to prepare against being blown away.$"
 
-gSkiploomPokedexText: ; 8564301
+gSkiploomPokedexText: @ 8564301
 	.charmapstr "It blossoms when the temperature rises{next}"
 	.charmapstr "above 64 degrees F. Because its flower’s{next}"
 	.charmapstr "blooming changes with the temperature,{next}"
 	.charmapstr "it is sometimes used as a thermometer.$"
 
-gJumpluffPokedexText: ; 856439F
+gJumpluffPokedexText: @ 856439F
 	.charmapstr "JUMPLUFF ride warm southern winds to{next}"
 	.charmapstr "cross the sea and fly to foreign lands.{next}"
 	.charmapstr "This POKéMON lands when it encounters{next}"
 	.charmapstr "cold air while it is floating.$"
 
-gAipomPokedexText: ; 8564431
+gAipomPokedexText: @ 8564431
 	.charmapstr "Its tail ends with a dexterous, handlike{next}"
 	.charmapstr "appendage. However, because it uses the{next}"
 	.charmapstr "tail so much, AIPOM’s real hands have{next}"
 	.charmapstr "become rather clumsy.$"
 
-gSunkernPokedexText: ; 85644BE
+gSunkernPokedexText: @ 85644BE
 	.charmapstr "SUNKERN try to minimize movement to{next}"
 	.charmapstr "conserve the nutrients they have stored{next}"
 	.charmapstr "in their bodies for evolution. They will{next}"
 	.charmapstr "not eat, subsisting only on morning dew.$"
 
-gSunfloraPokedexText: ; 856455C
+gSunfloraPokedexText: @ 856455C
 	.charmapstr "SUNFLORA convert solar energy into{next}"
 	.charmapstr "nutrition. They are highly active in the{next}"
 	.charmapstr "warm daytime but suddenly stop moving as{next}"
 	.charmapstr "soon as the sun sets.$"
 
-gYanmaPokedexText: ; 85645E7
+gYanmaPokedexText: @ 85645E7
 	.charmapstr "It can see 360 degrees without moving{next}"
 	.charmapstr "its eyes. It is a great flier capable of{next}"
 	.charmapstr "making sudden stops and turning midair to{next}"
 	.charmapstr "quickly chase down targeted prey.$"
 
-gWooperPokedexText: ; 8564682
+gWooperPokedexText: @ 8564682
 	.charmapstr "WOOPER usually live in water but come{next}"
 	.charmapstr "out onto land seeking food occasionally.{next}"
 	.charmapstr "On land, they coat their bodies with a{next}"
 	.charmapstr "gooey, toxic film.$"
 
-gQuagsirePokedexText: ; 856470B
+gQuagsirePokedexText: @ 856470B
 	.charmapstr "A QUAGSIRE hunts by leaving its mouth wide{next}"
 	.charmapstr "open in water and waiting for its prey to{next}"
 	.charmapstr "blunder in. Because it doesn’t move, it{next}"
 	.charmapstr "does not get very hungry.$"
 
-gEspeonPokedexText: ; 85647A2
+gEspeonPokedexText: @ 85647A2
 	.charmapstr "An ESPEON is extremely loyal to any{next}"
 	.charmapstr "TRAINER it considers to be worthy. It is{next}"
 	.charmapstr "said to have developed precognitive{next}"
 	.charmapstr "powers to protect its TRAINER from harm.$"
 
-gUmbreonPokedexText: ; 856483C
+gUmbreonPokedexText: @ 856483C
 	.charmapstr "UMBREON evolved from exposure to the{next}"
 	.charmapstr "moon’s energy pulses. It lurks in darkness{next}"
 	.charmapstr "and waits for its foes to move. The rings{next}"
 	.charmapstr "on its body glow when it leaps to attack.$"
 
-gMurkrowPokedexText: ; 85648E0
+gMurkrowPokedexText: @ 85648E0
 	.charmapstr "MURKROW were feared as the alleged{next}"
 	.charmapstr "bearers of ill fortune. It shows strong{next}"
 	.charmapstr "interest in anything that sparkles. It will{next}"
 	.charmapstr "even try to steal rings from women.$"
 
-gSlowkingPokedexText: ; 856497B
+gSlowkingPokedexText: @ 856497B
 	.charmapstr "It undertakes research every day to{next}"
 	.charmapstr "solve the mysteries of the world.{next}"
 	.charmapstr "However, it apparently forgets everything{next}"
 	.charmapstr "if the SHELLDER on its head comes off.$"
 
-gMisdreavusPokedexText: ; 8564A12
+gMisdreavusPokedexText: @ 8564A12
 	.charmapstr "A MISDREAVUS frightens people with a{next}"
 	.charmapstr "creepy, sobbing cry. It apparently uses{next}"
 	.charmapstr "its red spheres to absorb the fear of foes{next}"
 	.charmapstr "as its nutrition.$"
 
-gUnownPokedexText: ; 8564A9C
+gUnownPokedexText: @ 8564A9C
 	.charmapstr "This POKéMON is shaped like ancient text{next}"
 	.charmapstr "characters. Although research is ongoing,{next}"
 	.charmapstr "it is a mystery as to which came first,{next}"
 	.charmapstr "the ancient writings or the various UNOWN.$"
 
-gWobbuffetPokedexText: ; 8564B42
+gWobbuffetPokedexText: @ 8564B42
 	.charmapstr "Usually docile, a WOBBUFFET strikes back{next}"
 	.charmapstr "ferociously if its black tail is attacked.{next}"
 	.charmapstr "It makes its lair in caves where it waits{next}"
 	.charmapstr "for nightfall.$"
 
-gGirafarigPokedexText: ; 8564BCF
+gGirafarigPokedexText: @ 8564BCF
 	.charmapstr "A GIRAFARIG is an herbivore--it eats{next}"
 	.charmapstr "grass and tree shoots. While it is eating,{next}"
 	.charmapstr "its tail makes chewing and swallowing{next}"
 	.charmapstr "motions as if it were also eating.$"
 
-gPinecoPokedexText: ; 8564C68
+gPinecoPokedexText: @ 8564C68
 	.charmapstr "A PINECO hangs from a tree branch and{next}"
 	.charmapstr "waits for prey. While eating, if it is{next}"
 	.charmapstr "disturbed by someone shaking its tree, it{next}"
 	.charmapstr "falls on the ground and suddenly explodes.$"
 
-gForretressPokedexText: ; 8564D0A
+gForretressPokedexText: @ 8564D0A
 	.charmapstr "It keeps itself inside its steel shell.{next}"
 	.charmapstr "The shell is opened when it is catching{next}"
 	.charmapstr "prey, but it is so quick that the shell’s{next}"
 	.charmapstr "inside cannot be seen.$"
 
-gDunsparcePokedexText: ; 8564D9B
+gDunsparcePokedexText: @ 8564D9B
 	.charmapstr "Its drill-tipped tail is used to burrow into{next}"
 	.charmapstr "the ground backwards. This POKéMON is{next}"
 	.charmapstr "known to make its nest in complex shapes{next}"
 	.charmapstr "deep under the ground.$"
 
-gGligarPokedexText: ; 8564E2E
+gGligarPokedexText: @ 8564E2E
 	.charmapstr "It glides without making a single sound.{next}"
 	.charmapstr "It grasps the face of its foe using its{next}"
 	.charmapstr "hind and large front claws, then stabs{next}"
 	.charmapstr "with its poison barb.$"
 
-gSteelixPokedexText: ; 8564EBC
+gSteelixPokedexText: @ 8564EBC
 	.charmapstr "STEELIX live even further underground{next}"
 	.charmapstr "than ONIX. This POKéMON is known to dig{next}"
 	.charmapstr "toward the earth’s core, reaching a depth{next}"
 	.charmapstr "of over six-tenths of a mile underground.$"
 
-gSnubbullPokedexText: ; 8564F5E
+gSnubbullPokedexText: @ 8564F5E
 	.charmapstr "By baring its fangs and making a scary{next}"
 	.charmapstr "face, it sends smaller POKéMON scurrying{next}"
 	.charmapstr "in terror. The SNUBBULL does seem a{next}"
 	.charmapstr "little sad at making its foes flee.$"
 
-gGranbullPokedexText: ; 8564FF6
+gGranbullPokedexText: @ 8564FF6
 	.charmapstr "It has a particularly well-developed lower{next}"
 	.charmapstr "jaw. The huge fangs are heavy, causing{next}"
 	.charmapstr "it to tilt its head. Unless it is startled, it{next}"
 	.charmapstr "will not try to bite.$"
 
-gQwilfishPokedexText: ; 856508D
+gQwilfishPokedexText: @ 856508D
 	.charmapstr "A QWILFISH uses the pressure of water{next}"
 	.charmapstr "it swallows to shoot toxic quills all at{next}"
 	.charmapstr "once from all over its body. It finds{next}"
 	.charmapstr "swimming to be somewhat challenging.$"
 
-gScizorPokedexText: ; 8565127
+gScizorPokedexText: @ 8565127
 	.charmapstr "A SCIZOR has a body with the hardness of{next}"
 	.charmapstr "steel. It is not easily fazed by ordinary{next}"
 	.charmapstr "sorts of attacks. It flaps its wings to{next}"
 	.charmapstr "regulate its body temperature.$"
 
-gShucklePokedexText: ; 85651C1
+gShucklePokedexText: @ 85651C1
 	.charmapstr "A SHUCKLE hides under rocks, keeping its{next}"
 	.charmapstr "body concealed inside its shell while{next}"
 	.charmapstr "eating stored berries. The berries mix with{next}"
 	.charmapstr "its body fluids to become a juice.$"
 
-gHeracrossPokedexText: ; 856525F
+gHeracrossPokedexText: @ 856525F
 	.charmapstr "They gather in forests seeking the sweet{next}"
 	.charmapstr "sap of trees. It is completely clad in a{next}"
 	.charmapstr "steel-hard shell. It is proud of its horn,{next}"
 	.charmapstr "which it uses to fling foes.$"
 
-gSneaselPokedexText: ; 85652F9
+gSneaselPokedexText: @ 85652F9
 	.charmapstr "A SNEASEL scales trees by punching its{next}"
 	.charmapstr "hooked claws into the bark. It seeks out{next}"
 	.charmapstr "unguarded nests and steals eggs for food{next}"
 	.charmapstr "while the parents are away.$"
 
-gTeddiursaPokedexText: ; 856538E
+gTeddiursaPokedexText: @ 856538E
 	.charmapstr "It licks its palms that are sweetened by{next}"
 	.charmapstr "being soaked in honey. A TEDDIURSA makes{next}"
 	.charmapstr "its own honey by blending fruits and pollen{next}"
 	.charmapstr "collected by BEEDRILL.$"
 
-gUrsaringPokedexText: ; 8565423
+gUrsaringPokedexText: @ 8565423
 	.charmapstr "In forests, it is said that there are many{next}"
 	.charmapstr "streams and towering trees where an{next}"
 	.charmapstr "URSARING gathers food. It walks through{next}"
 	.charmapstr "its forest collecting food every day.$"
 
-gSlugmaPokedexText: ; 85654C0
+gSlugmaPokedexText: @ 85654C0
 	.charmapstr "It is a species of POKéMON that lives in{next}"
 	.charmapstr "volcanic areas. If its body cools, its skin{next}"
 	.charmapstr "hardens and immobilizes it. To avoid that,{next}"
 	.charmapstr "it sleeps near magma.$"
 
-gMagcargoPokedexText: ; 8565556
+gMagcargoPokedexText: @ 8565556
 	.charmapstr "The shell on its back is made of hardened{next}"
 	.charmapstr "magma. Tens of thousands of years spent{next}"
 	.charmapstr "living in volcanic craters have turned{next}"
 	.charmapstr "MAGCARGO’s bodies into magma.$"
 
-gSwinubPokedexText: ; 85655ED
+gSwinubPokedexText: @ 85655ED
 	.charmapstr "It roots for food by rubbing its snout{next}"
 	.charmapstr "against the ground. Its favorite food is a{next}"
 	.charmapstr "mushroom that grows under dried grass.{next}"
 	.charmapstr "It occasionally roots out hot springs.$"
 
-gPiloswinePokedexText: ; 856568D
+gPiloswinePokedexText: @ 856568D
 	.charmapstr "A PILOSWINE is covered by a thick coat{next}"
 	.charmapstr "of long hair for enduring freezing cold.{next}"
 	.charmapstr "It uses its tusks to dig up food that has{next}"
 	.charmapstr "been buried under ice.$"
 
-gCorsolaPokedexText: ; 856571E
+gCorsolaPokedexText: @ 856571E
 	.charmapstr "CORSOLA live in warm southern seas.{next}"
 	.charmapstr "If the sea becomes polluted, the beautiful{next}"
 	.charmapstr "coral stalks become discolored and crumble{next}"
 	.charmapstr "away in tatters.$"
 
-gRemoraidPokedexText: ; 85657A9
+gRemoraidPokedexText: @ 85657A9
 	.charmapstr "A REMORAID uses its abdominal muscles{next}"
 	.charmapstr "to forcefully expel swallowed water, then{next}"
 	.charmapstr "shoot down flying prey. When evolution{next}"
 	.charmapstr "approaches, it travels down rivers.$"
 
-gOctilleryPokedexText: ; 8565844
+gOctilleryPokedexText: @ 8565844
 	.charmapstr "It ensnares its foe with its suction-{next}"
 	.charmapstr "cupped tentacles before delivering the{next}"
 	.charmapstr "finishing blow. If the foe turns out to be{next}"
 	.charmapstr "too strong, it spews ink to escape.$"
 
-gDelibirdPokedexText: ; 85658E0
+gDelibirdPokedexText: @ 85658E0
 	.charmapstr "It carries food bundled up in its tail.{next}"
 	.charmapstr "There was a famous explorer who{next}"
 	.charmapstr "managed to scale Mt. Everest thanks{next}"
 	.charmapstr "to a DELIBIRD sharing its food.$"
 
-gMantinePokedexText: ; 856596C
+gMantinePokedexText: @ 856596C
 	.charmapstr "On sunny days, schools of MANTINE can be{next}"
 	.charmapstr "seen elegantly leaping over the waves.{next}"
 	.charmapstr "It is not bothered by the REMORAID that{next}"
 	.charmapstr "hitches rides.$"
 
-gSkarmoryPokedexText: ; 85659F3
+gSkarmoryPokedexText: @ 85659F3
 	.charmapstr "A POKéMON that has a body and wings of{next}"
 	.charmapstr "steel. People in the past used feathers{next}"
 	.charmapstr "fallen from SKARMORY to make swords and{next}"
 	.charmapstr "knives.$"
 
-gHoundourPokedexText: ; 8565A72
+gHoundourPokedexText: @ 8565A72
 	.charmapstr "HOUNDOUR communicate with each other{next}"
 	.charmapstr "using a variety of cries to corner their{next}"
 	.charmapstr "prey. This POKéMON’s remarkable teamwork{next}"
 	.charmapstr "is simply unparalleled.$"
 
-gHoundoomPokedexText: ; 8565B01
+gHoundoomPokedexText: @ 8565B01
 	.charmapstr "In a HOUNDOOM pack, the one with its horns{next}"
 	.charmapstr "raked sharply back serves a leadership{next}"
 	.charmapstr "role. They choose their leader by fighting{next}"
 	.charmapstr "among themselves.$"
 
-gKingdraPokedexText: ; 8565B90
+gKingdraPokedexText: @ 8565B90
 	.charmapstr "It sleeps quietly, deep on the seafloor.{next}"
 	.charmapstr "When it comes up to the surface, it{next}"
 	.charmapstr "creates a huge whirlpool that can swallow{next}"
 	.charmapstr "even ships.$"
 
-gPhanpyPokedexText: ; 8565C13
+gPhanpyPokedexText: @ 8565C13
 	.charmapstr "PHANPY’s big ears serve as broad fans.{next}"
 	.charmapstr "When it becomes hot, it flaps the ears{next}"
 	.charmapstr "busily to cool down. Even the young are{next}"
 	.charmapstr "very strong.$"
 
-gDonphanPokedexText: ; 8565C96
+gDonphanPokedexText: @ 8565C96
 	.charmapstr "A DONPHAN is so strong it can easily haul{next}"
 	.charmapstr "a dump truck. Its hide has toughened to a{next}"
 	.charmapstr "rock-hard state. An ordinary sort of{next}"
 	.charmapstr "attack won’t even leave a scratch.$"
 
-gPorygon2PokedexText: ; 8565D32
+gPorygon2PokedexText: @ 8565D32
 	.charmapstr "It was created by humans using the power{next}"
 	.charmapstr "of science. It has been given artificial{next}"
 	.charmapstr "intelligence that enables it to learn new{next}"
 	.charmapstr "gestures and emotions on its own.$"
 
-gStantlerPokedexText: ; 8565DD0
+gStantlerPokedexText: @ 8565DD0
 	.charmapstr "STANTLER’s magnificent antlers were{next}"
 	.charmapstr "once traded at high prices as works of art.{next}"
 	.charmapstr "As a result, this POKéMON was hunted{next}"
 	.charmapstr "close to extinction.$"
 
-gSmearglePokedexText: ; 8565E5A
+gSmearglePokedexText: @ 8565E5A
 	.charmapstr "A SMEARGLE marks its territory using a{next}"
 	.charmapstr "fluid that leaks out from the tip of its{next}"
 	.charmapstr "tail. About 5,000 different marks left by{next}"
 	.charmapstr "this POKéMON have been found.$"
 
-gTyroguePokedexText: ; 8565EF2
+gTyroguePokedexText: @ 8565EF2
 	.charmapstr "TYROGUE become stressed out if they do{next}"
 	.charmapstr "not get to train every day. When raising{next}"
 	.charmapstr "this POKéMON, the TRAINER must establish{next}"
 	.charmapstr "a regular training schedule.$"
 
-gHitmontopPokedexText: ; 8565F88
+gHitmontopPokedexText: @ 8565F88
 	.charmapstr "Its technique of kicking while spinning is{next}"
 	.charmapstr "a remarkable mix of both offense and{next}"
 	.charmapstr "defense. HITMONTOP travel faster{next}"
 	.charmapstr "spinning than they do walking.$"
 
-gSmoochumPokedexText: ; 8566018
+gSmoochumPokedexText: @ 8566018
 	.charmapstr "It actively runs about, but also falls{next}"
 	.charmapstr "often. Whenever it falls, it will check its{next}"
 	.charmapstr "reflection on a lake’s surface to make{next}"
 	.charmapstr "sure its face hasn’t become dirty.$"
 
-gElekidPokedexText: ; 85660B5
+gElekidPokedexText: @ 85660B5
 	.charmapstr "If it touches metal and discharges the{next}"
 	.charmapstr "electricity it has stored in its body, an{next}"
 	.charmapstr "ELEKID begins swinging its arms in circles{next}"
 	.charmapstr "to recharge itself.$"
 
-gMagbyPokedexText: ; 8566145
+gMagbyPokedexText: @ 8566145
 	.charmapstr "If a MAGBY is spouting yellow flames from{next}"
 	.charmapstr "its mouth, it is in good health. When it is{next}"
 	.charmapstr "fatigued, black smoke will be mixed in with{next}"
 	.charmapstr "the flames.$"
 
-gMiltankPokedexText: ; 85661D3
+gMiltankPokedexText: @ 85661D3
 	.charmapstr "It gives over five gallons of milk daily.{next}"
 	.charmapstr "Its sweet milk is enjoyed by children and{next}"
 	.charmapstr "grown-ups alike. People who can’t drink{next}"
 	.charmapstr "milk turn it into yogurt and eat it instead.$"
 
-gBlisseyPokedexText: ; 856627C
+gBlisseyPokedexText: @ 856627C
 	.charmapstr "If it senses sadness with its fluffy fur,{next}"
 	.charmapstr "a BLISSEY will rush over to the sad person,{next}"
 	.charmapstr "however far away, to share an egg of{next}"
 	.charmapstr "happiness that brings a smile to any face.$"
 
-gRaikouPokedexText: ; 8566322
+gRaikouPokedexText: @ 8566322
 	.charmapstr "RAIKOU embodies the speed of lightning.{next}"
 	.charmapstr "Its roars send shock waves shuddering{next}"
 	.charmapstr "through the air and ground as if{next}"
 	.charmapstr "lightning bolts were crashing down.$"
 
-gEnteiPokedexText: ; 85663B5
+gEnteiPokedexText: @ 85663B5
 	.charmapstr "ENTEI embodies the passion of magma.{next}"
 	.charmapstr "It is thought to have been born in the{next}"
 	.charmapstr "eruption of a volcano. It blasts fire that{next}"
 	.charmapstr "consumes all that it touches.$"
 
-gSuicunePokedexText: ; 856644A
+gSuicunePokedexText: @ 856644A
 	.charmapstr "SUICUNE embodies the compassion of{next}"
 	.charmapstr "a pure spring of water. It runs across{next}"
 	.charmapstr "the land with gliding elegance. It has the{next}"
 	.charmapstr "power to purify dirty water.$"
 
-gLarvitarPokedexText: ; 85664DC
+gLarvitarPokedexText: @ 85664DC
 	.charmapstr "A LARVITAR is born deep under the ground.{next}"
 	.charmapstr "It must eat its way through the soil above{next}"
 	.charmapstr "and reach the surface for it to see its{next}"
 	.charmapstr "parents’ faces.$"
 
-gPupitarPokedexText: ; 8566569
+gPupitarPokedexText: @ 8566569
 	.charmapstr "A PUPITAR creates a gas inside its body{next}"
 	.charmapstr "that it ejects under compression to propel{next}"
 	.charmapstr "itself like a jet. Its body can withstand{next}"
 	.charmapstr "a collision with solid steel.$"
 
-gTyranitarPokedexText: ; 8566604
+gTyranitarPokedexText: @ 8566604
 	.charmapstr "A TYRANITAR is so overwhelmingly powerful,{next}"
 	.charmapstr "it can bring down a whole mountain to make{next}"
 	.charmapstr "its nest. It roams in mountains seeking{next}"
 	.charmapstr "new opponents to fight.$"
 
-gLugiaPokedexText: ; 856669A
+gLugiaPokedexText: @ 856669A
 	.charmapstr "LUGIA is so powerful even a light{next}"
 	.charmapstr "fluttering of its wings can blow apart{next}"
 	.charmapstr "houses. As a result, it chooses to live out{next}"
 	.charmapstr "of sight deep under the sea.$"
 
-gHoOhPokedexText: ; 856672C
+gHoOhPokedexText: @ 856672C
 	.charmapstr "Its feathers--which glow in seven colors{next}"
 	.charmapstr "depending on the angle at which they are{next}"
 	.charmapstr "struck by light--are thought to bring joy.{next}"
 	.charmapstr "It is said to live at the foot of a rainbow.$"
 
-gCelebiPokedexText: ; 85667D6
+gCelebiPokedexText: @ 85667D6
 	.charmapstr "This POKéMON came from the future by{next}"
 	.charmapstr "crossing over time. It is thought that so{next}"
 	.charmapstr "long as CELEBI appears, a bright and{next}"
 	.charmapstr "shining future awaits us.$"
 
-gTreeckoPokedexText: ; 8566864
+gTreeckoPokedexText: @ 8566864
 	.charmapstr "It makes its nest in a giant tree in the{next}"
 	.charmapstr "forest. It ferociously guards against{next}"
 	.charmapstr "anything nearing its territory. It is said{next}"
 	.charmapstr "to be the protector of the forest’s trees.$"
 
-gGrovylePokedexText: ; 8566909
+gGrovylePokedexText: @ 8566909
 	.charmapstr "Leaves grow out of this POKéMON’s body.{next}"
 	.charmapstr "They help obscure a GROVYLE from the eyes{next}"
 	.charmapstr "of its enemies while it is in a thickly{next}"
 	.charmapstr "overgrown forest.$"
 
-gSceptilePokedexText: ; 8566995
+gSceptilePokedexText: @ 8566995
 	.charmapstr "In the jungle, its power is without equal.{next}"
 	.charmapstr "This POKéMON carefully grows trees and{next}"
 	.charmapstr "plants. It regulates its body temperature{next}"
 	.charmapstr "by basking in sunlight.$"
 
-gTorchicPokedexText: ; 8566A29
+gTorchicPokedexText: @ 8566A29
 	.charmapstr "If attacked, it strikes back by spitting{next}"
 	.charmapstr "balls of fire it forms in its stomach.{next}"
 	.charmapstr "A TORCHIC dislikes darkness because it{next}"
 	.charmapstr "can’t see its surroundings.$"
 
-gCombuskenPokedexText: ; 8566ABC
+gCombuskenPokedexText: @ 8566ABC
 	.charmapstr "It lashes out with 10 kicks per second.{next}"
 	.charmapstr "Its strong fighting instinct compels it{next}"
 	.charmapstr "to keep up its offensive until the{next}"
 	.charmapstr "opponent gives up.$"
 
-gBlazikenPokedexText: ; 8566B42
+gBlazikenPokedexText: @ 8566B42
 	.charmapstr "It learns martial arts that use punches{next}"
 	.charmapstr "and kicks. Every several years, its old{next}"
 	.charmapstr "feathers burn off, and new, supple{next}"
 	.charmapstr "feathers grow back in their place.$"
 
-gMudkipPokedexText: ; 8566BD8
+gMudkipPokedexText: @ 8566BD8
 	.charmapstr "On land, it can powerfully lift large{next}"
 	.charmapstr "boulders by planting its four feet and{next}"
 	.charmapstr "heaving. It sleeps by burying itself in soil{next}"
 	.charmapstr "at the water’s edge.$"
 
-gMarshtompPokedexText: ; 8566C67
+gMarshtompPokedexText: @ 8566C67
 	.charmapstr "Its toughened hind legs enable it to stand{next}"
 	.charmapstr "upright. Because it weakens if its skin{next}"
 	.charmapstr "dries out, it replenishes fluids by playing{next}"
 	.charmapstr "in mud.$"
 
-gSwampertPokedexText: ; 8566CEE
+gSwampertPokedexText: @ 8566CEE
 	.charmapstr "If it senses the approach of a storm and{next}"
 	.charmapstr "a tidal wave, it protects its seaside nest{next}"
 	.charmapstr "by piling up boulders. It swims as fast as{next}"
 	.charmapstr "a jet ski.$"
 
-gPoochyenaPokedexText: ; 8566D78
+gPoochyenaPokedexText: @ 8566D78
 	.charmapstr "It savagely threatens foes with bared{next}"
 	.charmapstr "fangs. It chases after fleeing targets{next}"
 	.charmapstr "tenaciously. It turns tail and runs,{next}"
 	.charmapstr "however, if the foe strikes back.$"
 
-gMightyenaPokedexText: ; 8566E0C
+gMightyenaPokedexText: @ 8566E0C
 	.charmapstr "In the wild, MIGHTYENA live in a pack.{next}"
 	.charmapstr "They never defy their leader’s orders.{next}"
 	.charmapstr "They defeat foes with perfectly{next}"
 	.charmapstr "coordinated teamwork.$"
 
-gZigzagoonPokedexText: ; 8566E90
+gZigzagoonPokedexText: @ 8566E90
 	.charmapstr "Rubbing its nose against the ground, it{next}"
 	.charmapstr "always wanders about back and forth in{next}"
 	.charmapstr "search of something. It is distinguished{next}"
 	.charmapstr "by the zigzag footprints it leaves.$"
 
-gLinoonePokedexText: ; 8566F2C
+gLinoonePokedexText: @ 8566F2C
 	.charmapstr "It is exceedingly fast if it only has to run{next}"
 	.charmapstr "in a straight line. When it spots pond-{next}"
 	.charmapstr "dwelling prey underwater, it quickly leaps{next}"
 	.charmapstr "in and catches it with its sharp claws.$"
 
-gWurmplePokedexText: ; 8566FD4
+gWurmplePokedexText: @ 8566FD4
 	.charmapstr "It sticks to tree branches and eats{next}"
 	.charmapstr "leaves. The thread it spits from its mouth,{next}"
 	.charmapstr "which becomes gooey when it touches{next}"
 	.charmapstr "air, slows the movement of its foes.$"
 
-gSilcoonPokedexText: ; 856706D
+gSilcoonPokedexText: @ 856706D
 	.charmapstr "It prepares for evolution using the{next}"
 	.charmapstr "energy it stored while it was a WURMPLE.{next}"
 	.charmapstr "It keeps watch over the surroundings with{next}"
 	.charmapstr "its two eyes.$"
 
-gBeautiflyPokedexText: ; 85670F2
+gBeautiflyPokedexText: @ 85670F2
 	.charmapstr "Its colorfully patterned wings are its{next}"
 	.charmapstr "most prominent feature. It flies through{next}"
 	.charmapstr "flower-covered fields collecting pollen.{next}"
 	.charmapstr "It attacks ferociously when angered.$"
 
-gCascoonPokedexText: ; 8567190
+gCascoonPokedexText: @ 8567190
 	.charmapstr "To avoid detection by its enemies, it hides{next}"
 	.charmapstr "motionlessly beneath large leaves and in{next}"
 	.charmapstr "the gaps of branches. It also attaches{next}"
 	.charmapstr "dead leaves to its body for camouflage.$"
 
-gDustoxPokedexText: ; 8567234
+gDustoxPokedexText: @ 8567234
 	.charmapstr "It is a nocturnal POKéMON that flies from{next}"
 	.charmapstr "fields and mountains to the attraction of{next}"
 	.charmapstr "streetlights at night. It looses highly{next}"
 	.charmapstr "toxic powder from its wings.$"
 
-gLotadPokedexText: ; 85672CD
+gLotadPokedexText: @ 85672CD
 	.charmapstr "This POKéMON lives in ponds with clean{next}"
 	.charmapstr "water. It is known to ferry small POKéMON{next}"
 	.charmapstr "across ponds by carrying them on the{next}"
 	.charmapstr "broad leaf on its head.$"
 
-gLombrePokedexText: ; 856735B
+gLombrePokedexText: @ 856735B
 	.charmapstr "In the evening, it takes great delight in{next}"
 	.charmapstr "popping out of rivers and startling people.{next}"
 	.charmapstr "It feeds on aquatic moss that grows on{next}"
 	.charmapstr "rocks in the riverbed.$"
 
-gLudicoloPokedexText: ; 85673EF
+gLudicoloPokedexText: @ 85673EF
 	.charmapstr "When it hears festive music, all the cells{next}"
 	.charmapstr "in its body become stimulated, and it{next}"
 	.charmapstr "begins moving in rhythm. It does not{next}"
 	.charmapstr "quail even when it faces a tough opponent.$"
 
-gSeedotPokedexText: ; 8567490
+gSeedotPokedexText: @ 8567490
 	.charmapstr "It hangs off branches and absorbs{next}"
 	.charmapstr "nutrients. When it finishes eating, its{next}"
 	.charmapstr "body becomes so heavy that it drops to{next}"
 	.charmapstr "the ground with a thump.$"
 
-gNuzleafPokedexText: ; 856751A
+gNuzleafPokedexText: @ 856751A
 	.charmapstr "A forest-dwelling POKéMON that is skilled{next}"
 	.charmapstr "at climbing trees. Its long and pointed{next}"
 	.charmapstr "nose is its weak point. It loses power if{next}"
 	.charmapstr "the nose is gripped.$"
 
-gShiftryPokedexText: ; 85675AB
+gShiftryPokedexText: @ 85675AB
 	.charmapstr "It is said to arrive on chilly, wintry winds.{next}"
 	.charmapstr "Feared from long ago as the guardian of{next}"
 	.charmapstr "forests, this POKéMON lives in a deep{next}"
 	.charmapstr "forest where people do not venture.$"
 
-gTaillowPokedexText: ; 856764B
+gTaillowPokedexText: @ 856764B
 	.charmapstr "Although it is small, it is very courageous.{next}"
 	.charmapstr "It will take on a larger SKARMORY on an{next}"
 	.charmapstr "equal footing. However, its will weakens if{next}"
 	.charmapstr "it becomes hungry.$"
 
-gSwellowPokedexText: ; 85676DF
+gSwellowPokedexText: @ 85676DF
 	.charmapstr "A SWELLOW dives upon prey from far above.{next}"
 	.charmapstr "It never misses its targets. It takes to{next}"
 	.charmapstr "the skies in search of lands with a warm{next}"
 	.charmapstr "climate.$"
 
-gWingullPokedexText: ; 8567764
+gWingullPokedexText: @ 8567764
 	.charmapstr "It makes its nest on a sheer cliff at the{next}"
 	.charmapstr "edge of the sea. It has trouble keeping{next}"
 	.charmapstr "its wings flapping in flight. Instead, it{next}"
 	.charmapstr "soars on updrafts.$"
 
-gPelipperPokedexText: ; 85677F3
+gPelipperPokedexText: @ 85677F3
 	.charmapstr "It skims the tops of waves as it flies.{next}"
 	.charmapstr "When it spots prey, it uses its large beak{next}"
 	.charmapstr "to scoop up the victim with water.{next}"
 	.charmapstr "It protects its eggs in its beak.$"
 
-gRaltsPokedexText: ; 856788B
+gRaltsPokedexText: @ 856788B
 	.charmapstr "A RALTS has the power to sense the{next}"
 	.charmapstr "emotions of people and POKéMON with the{next}"
 	.charmapstr "horns on its head. It takes cover if it{next}"
 	.charmapstr "senses any hostility.$"
 
-gKirliaPokedexText: ; 8567914
+gKirliaPokedexText: @ 8567914
 	.charmapstr "A KIRLIA has the psychic power to create {next}"
 	.charmapstr "a rip in the dimensions and see into the{next}"
 	.charmapstr "future. It is said to dance with pleasure{next}"
 	.charmapstr "on sunny mornings.$"
 
-gGardevoirPokedexText: ; 85679A4
+gGardevoirPokedexText: @ 85679A4
 	.charmapstr "It apparently does not feel the pull of{next}"
 	.charmapstr "gravity because it supports itself with{next}"
 	.charmapstr "psychic power. It will give its life to{next}"
 	.charmapstr "protect its TRAINER.$"
 
-gSurskitPokedexText: ; 8567A31
+gSurskitPokedexText: @ 8567A31
 	.charmapstr "They gather on puddles after evening{next}"
 	.charmapstr "downpours, gliding across the surface{next}"
 	.charmapstr "of water as if sliding. It secretes honey{next}"
 	.charmapstr "with a sweet aroma from its head.$"
 
-gMasquerainPokedexText: ; 8567AC8
+gMasquerainPokedexText: @ 8567AC8
 	.charmapstr "It intimidates foes with the large eyelike{next}"
 	.charmapstr "patterns on its antennae. Because it can’t{next}"
 	.charmapstr "fly if its wings get wet, it shelters itself{next}"
 	.charmapstr "from rain under large trees and eaves.$"
 
-gShroomishPokedexText: ; 8567B72
+gShroomishPokedexText: @ 8567B72
 	.charmapstr "It loves to eat damp, composted soil in{next}"
 	.charmapstr "forests. If you enter a forest after a{next}"
 	.charmapstr "long rain, you can see many SHROOMISH{next}"
 	.charmapstr "feasting on composted soil.$"
 
-gBreloomPokedexText: ; 8567C03
+gBreloomPokedexText: @ 8567C03
 	.charmapstr "It scatters spores from holes in the cap{next}"
 	.charmapstr "on its head. It loves warm and humid{next}"
 	.charmapstr "climates. It feeds on trees and plants in{next}"
 	.charmapstr "fields and forests.$"
 
-gSlakothPokedexText: ; 8567C8F
+gSlakothPokedexText: @ 8567C8F
 	.charmapstr "It sleeps virtually all day and night long.{next}"
 	.charmapstr "It doesn’t change its nest its entire life,{next}"
 	.charmapstr "but it sometimes travels great distances{next}"
 	.charmapstr "by swimming in rivers.$"
 
-gVigorothPokedexText: ; 8567D27
+gVigorothPokedexText: @ 8567D27
 	.charmapstr "It can’t keep still because its blood boils{next}"
 	.charmapstr "with energy. It runs through the fields{next}"
 	.charmapstr "and mountains all day to calm itself. If it{next}"
 	.charmapstr "doesn’t, it can’t sleep at night.$"
 
-gSlakingPokedexText: ; 8567DC9
+gSlakingPokedexText: @ 8567DC9
 	.charmapstr "Hordes of SLAKING gather around trees{next}"
 	.charmapstr "when fruits come into season. They wait{next}"
 	.charmapstr "around patiently for ripened fruits to fall{next}"
 	.charmapstr "out of the trees.$"
 
-gNincadaPokedexText: ; 8567E55
+gNincadaPokedexText: @ 8567E55
 	.charmapstr "It makes its nest at the roots of a mighty{next}"
 	.charmapstr "tree. Using its whiskerlike antennae, it{next}"
 	.charmapstr "probes its surroundings in the{next}"
 	.charmapstr "pitch-black darkness of soil.$"
 
-gNinjaskPokedexText: ; 8567EE6
+gNinjaskPokedexText: @ 8567EE6
 	.charmapstr "Because it darts about vigorously at high{next}"
 	.charmapstr "speed, it is very difficult to see. Hearing{next}"
 	.charmapstr "its distinctive cries for too long induces{next}"
 	.charmapstr "a headache.$"
 
-gShedinjaPokedexText: ; 8567F73
+gShedinjaPokedexText: @ 8567F73
 	.charmapstr "A peculiar POKéMON that floats in air even{next}"
 	.charmapstr "though its wings remain completely still.{next}"
 	.charmapstr "The inside of its body is hollow and{next}"
 	.charmapstr "utterly dark.$"
 
-gWhismurPokedexText: ; 8567FFB
+gWhismurPokedexText: @ 8567FFB
 	.charmapstr "Its cries equal a jet plane in volume.{next}"
 	.charmapstr "It inhales through its ear canals. Because{next}"
 	.charmapstr "of this system, it can cry continually{next}"
 	.charmapstr "without having to catch its breath.$"
 
-gLoudredPokedexText: ; 8568098
+gLoudredPokedexText: @ 8568098
 	.charmapstr "It positions the round speakers on its{next}"
 	.charmapstr "head to assail foes with ultrasonic waves{next}"
 	.charmapstr "at massive volume. It builds power by{next}"
 	.charmapstr "stomping the ground.$"
 
-gExploudPokedexText: ; 8568124
+gExploudPokedexText: @ 8568124
 	.charmapstr "It has sound-generating organs all over{next}"
 	.charmapstr "its body. It communicates with others by{next}"
 	.charmapstr "adjusting the tone and volume of the cries{next}"
 	.charmapstr "it emits.$"
 
-gMakuhitaPokedexText: ; 85681AA
+gMakuhitaPokedexText: @ 85681AA
 	.charmapstr "It loves to toughen up its body above all{next}"
 	.charmapstr "else. If you hear quaking rumbles in a cave,{next}"
 	.charmapstr "it is the sound of MAKUHITA undertaking{next}"
 	.charmapstr "strenuous training.$"
 
-gHariyamaPokedexText: ; 856823D
+gHariyamaPokedexText: @ 856823D
 	.charmapstr "It has the habit of challenging others{next}"
 	.charmapstr "without hesitation to tests of strength.{next}"
 	.charmapstr "It’s been known to stand on train tracks{next}"
 	.charmapstr "and stop trains using forearm thrusts.$"
 
-gAzurillPokedexText: ; 85682DD
+gAzurillPokedexText: @ 85682DD
 	.charmapstr "Its tail, which is packed with nutrition,{next}"
 	.charmapstr "is very bouncy like a rubber ball. On sunny{next}"
 	.charmapstr "days they gather at the edge of water and{next}"
 	.charmapstr "splash about for fun.$"
 
-gNosepassPokedexText: ; 8568373
+gNosepassPokedexText: @ 8568373
 	.charmapstr "Its body emits a powerful magnetism.{next}"
 	.charmapstr "It feeds on prey that is pulled in by the{next}"
 	.charmapstr "force. Its magnetism is stronger in cold{next}"
 	.charmapstr "seasons.$"
 
-gSkittyPokedexText: ; 85683F4
+gSkittyPokedexText: @ 85683F4
 	.charmapstr "A SKITTY’s adorably cute behavior makes it{next}"
 	.charmapstr "highly popular. In battle, it makes its tail{next}"
 	.charmapstr "puff out. It threatens foes with a sharp{next}"
 	.charmapstr "growl.$"
 
-gDelcattyPokedexText: ; 856847C
+gDelcattyPokedexText: @ 856847C
 	.charmapstr "Rather than keeping a permanent lair,{next}"
 	.charmapstr "it habitually seeks comfortable spots and{next}"
 	.charmapstr "sleeps there. It is nocturnal and becomes{next}"
 	.charmapstr "active at dusk.$"
 
-gSableyePokedexText: ; 8568506
+gSableyePokedexText: @ 8568506
 	.charmapstr "It digs branching holes in caves using its{next}"
 	.charmapstr "sharp claws in search of food--raw gems.{next}"
 	.charmapstr "A SABLEYE lurks in darkness and is seen{next}"
 	.charmapstr "only rarely.$"
 
-gMawilePokedexText: ; 856858F
+gMawilePokedexText: @ 856858F
 	.charmapstr "Its giant jaws are actually steel horns{next}"
 	.charmapstr "that transformed. It fools foes into{next}"
 	.charmapstr "complacency with its adorable gestures,{next}"
 	.charmapstr "then chomps them with its huge jaws.$"
 
-gAronPokedexText: ; 8568629
+gAronPokedexText: @ 8568629
 	.charmapstr "A POKéMON that is clad in steel armor.{next}"
 	.charmapstr "A new suit of armor is made when it evolves.{next}"
 	.charmapstr "The old, discarded armor is salvaged as{next}"
 	.charmapstr "metal for making iron products.$"
 
-gLaironPokedexText: ; 85686C5
+gLaironPokedexText: @ 85686C5
 	.charmapstr "When two LAIRON meet in the wild, they{next}"
 	.charmapstr "fight for territory by bashing into each{next}"
 	.charmapstr "other with their steel bodies. The sound{next}"
 	.charmapstr "of their collision carries for miles.$"
 
-gAggronPokedexText: ; 8568764
+gAggronPokedexText: @ 8568764
 	.charmapstr "Its iron horns grow longer a little at{next}"
 	.charmapstr "a time. They are used to determine the{next}"
 	.charmapstr "AGGRON’s age. The gouges in its armor are{next}"
 	.charmapstr "worn with pride as mementos from battles.$"
 
-gMedititePokedexText: ; 8568806
+gMedititePokedexText: @ 8568806
 	.charmapstr "It continually meditates for hours every{next}"
 	.charmapstr "day. As a result of rigorous and dedicated{next}"
 	.charmapstr "yoga training, it has tempered its{next}"
 	.charmapstr "spiritual power so much it can fly.$"
 
-gMedichamPokedexText: ; 85688A1
+gMedichamPokedexText: @ 85688A1
 	.charmapstr "Through crushingly harsh yoga training, it{next}"
 	.charmapstr "gained the power to foretell its foe’s{next}"
 	.charmapstr "actions. It battles with elegant, dance-{next}"
 	.charmapstr "like movement.$"
 
-gElectrikePokedexText: ; 856892B
+gElectrikePokedexText: @ 856892B
 	.charmapstr "It generates electricity using friction{next}"
 	.charmapstr "from the atmosphere. In seasons with{next}"
 	.charmapstr "especially arid air, its entire body blazes{next}"
 	.charmapstr "with violent showers of sparks.$"
 
-gManectricPokedexText: ; 85689C4
+gManectricPokedexText: @ 85689C4
 	.charmapstr "Because lightning falls in their vicinities,{next}"
 	.charmapstr "MANECTRIC were thought to have been born{next}"
 	.charmapstr "from lightning. In battle, they create{next}"
 	.charmapstr "thunderclouds.$"
 
-gPluslePokedexText: ; 8568A50
+gPluslePokedexText: @ 8568A50
 	.charmapstr "It has the trait of cheering on its fellow{next}"
 	.charmapstr "POKéMON. By shorting out the electricity{next}"
 	.charmapstr "it releases from its paws, it creates{next}"
 	.charmapstr "pom-poms for cheering.$"
 
-gMinunPokedexText: ; 8568AE1
+gMinunPokedexText: @ 8568AE1
 	.charmapstr "At a meeting of POKéMON academics, it was{next}"
 	.charmapstr "announced that simultaneous exposure to{next}"
 	.charmapstr "electricity from a PLUSLE and MINUN will{next}"
 	.charmapstr "promote circulation and boost vitality.$"
 
-gVolbeatPokedexText: ; 8568B84
+gVolbeatPokedexText: @ 8568B84
 	.charmapstr "With their taillights lit, VOLBEAT fly in{next}"
 	.charmapstr "a swarm, drawing geometric designs in the{next}"
 	.charmapstr "night sky. They move their nests if their{next}"
 	.charmapstr "pond water becomes dirty.$"
 
-gIllumisePokedexText: ; 8568C1C
+gIllumisePokedexText: @ 8568C1C
 	.charmapstr "A nocturnal POKéMON that becomes active{next}"
 	.charmapstr "upon nightfall. It leads a VOLBEAT swarm{next}"
 	.charmapstr "to draw patterns in the night sky. Over 200{next}"
 	.charmapstr "different patterns have been confirmed.$"
 
-gRoseliaPokedexText: ; 8568CC1
+gRoseliaPokedexText: @ 8568CC1
 	.charmapstr "A ROSELIA that drinks nutritionally rich{next}"
 	.charmapstr "springwater blooms with lovely flowers.{next}"
 	.charmapstr "The fragrance of its flowers has the{next}"
 	.charmapstr "effect of making its foes careless.$"
 
-gGulpinPokedexText: ; 8568D5B
+gGulpinPokedexText: @ 8568D5B
 	.charmapstr "This POKéMON’s stomach fluid can even{next}"
 	.charmapstr "digest scrap iron. In one gulp, it can{next}"
 	.charmapstr "swallow something that is as large as{next}"
 	.charmapstr "itself.$"
 
-gSwalotPokedexText: ; 8568DD6
+gSwalotPokedexText: @ 8568DD6
 	.charmapstr "Its powerful stomach acid is capable of{next}"
 	.charmapstr "digesting almost anything. The one thing{next}"
 	.charmapstr "in the whole world a SWALOT can’t digest is{next}"
 	.charmapstr "its own stomach.$"
 
-gCarvanhaPokedexText: ; 8568E64
+gCarvanhaPokedexText: @ 8568E64
 	.charmapstr "CARVANHA attack ships in swarms, making{next}"
 	.charmapstr "them sink. Although it is said to be a very{next}"
 	.charmapstr "vicious POKéMON, it timidly flees as soon{next}"
 	.charmapstr "as it finds itself alone.$"
 
-gSharpedoPokedexText: ; 8568EFC
+gSharpedoPokedexText: @ 8568EFC
 	.charmapstr "The vicious and sly gangster of the sea.{next}"
 	.charmapstr "Its skin is specially textured to minimize{next}"
 	.charmapstr "drag in water. Its speed tops out at over{next}"
 	.charmapstr "75 miles per hour.$"
 
-gWailmerPokedexText: ; 8568F8D
+gWailmerPokedexText: @ 8568F8D
 	.charmapstr "While this POKéMON usually lives in the sea,{next}"
 	.charmapstr "it can survive on land, although not too{next}"
 	.charmapstr "long. It loses vitality if its body becomes{next}"
 	.charmapstr "dried out.$"
 
-gWailordPokedexText: ; 856901A
+gWailordPokedexText: @ 856901A
 	.charmapstr "It breathes through nostrils that it{next}"
 	.charmapstr "raises above the sea. By inhaling to its{next}"
 	.charmapstr "maximum capacity, a WAILORD can dive close{next}"
 	.charmapstr "to 10,000 feet beneath the waves.$"
 
-gNumelPokedexText: ; 85690B5
+gNumelPokedexText: @ 85690B5
 	.charmapstr "A NUMEL stores boiling magma in the hump{next}"
 	.charmapstr "on its back. It is a hardy POKéMON that can{next}"
 	.charmapstr "transport a 220-pound load. It has served{next}"
 	.charmapstr "humans at work since long ago.$"
 
-gCameruptPokedexText: ; 8569153
+gCameruptPokedexText: @ 8569153
 	.charmapstr "A POKéMON that lives in the crater of{next}"
 	.charmapstr "a volcano. Every 10 years, the volcanoes{next}"
 	.charmapstr "on its back erupt violently. Research is{next}"
 	.charmapstr "under way on the cause of eruption.$"
 
-gTorkoalPokedexText: ; 85691EF
+gTorkoalPokedexText: @ 85691EF
 	.charmapstr "It battles using energy it gets from{next}"
 	.charmapstr "burning coal. When loosing smoke from its{next}"
 	.charmapstr "nostrils, it lets off a sound that is{next}"
 	.charmapstr "similar to a locomotive’s horn.$"
 
-gSpoinkPokedexText: ; 8569284
+gSpoinkPokedexText: @ 8569284
 	.charmapstr "A POKéMON that manipulates psychic power{next}"
 	.charmapstr "at will. It doesn’t stop bouncing even when{next}"
 	.charmapstr "it is asleep. It loves eating mushrooms{next}"
 	.charmapstr "that grow underground.$"
 
-gGrumpigPokedexText: ; 8569318
+gGrumpigPokedexText: @ 8569318
 	.charmapstr "It stores power in the black pearls on its{next}"
 	.charmapstr "forehead. When it uses psychic power, it{next}"
 	.charmapstr "performs an odd dance step. Its style of{next}"
 	.charmapstr "dancing became hugely popular overseas.$"
 
-gSpindaPokedexText: ; 85693BD
+gSpindaPokedexText: @ 85693BD
 	.charmapstr "It is distinguished by a pattern of{next}"
 	.charmapstr "spots that is always different. Its{next}"
 	.charmapstr "unsteady, tottering walk has the{next}"
 	.charmapstr "effect of fouling its foe’s aim.$"
 
-gTrapinchPokedexText: ; 8569447
+gTrapinchPokedexText: @ 8569447
 	.charmapstr "Its big jaws crunch through boulders.{next}"
 	.charmapstr "Because its head is so big, it has a hard{next}"
 	.charmapstr "time getting back upright if it tips over{next}"
 	.charmapstr "onto its back.$"
 
-gVibravaPokedexText: ; 85694D0
+gVibravaPokedexText: @ 85694D0
 	.charmapstr "It looses ultrasonic waves by rubbing its{next}"
 	.charmapstr "wings together. Since a VIBRAVA’s wings{next}"
 	.charmapstr "are still in the process of growing, it can{next}"
 	.charmapstr "only fly short distances.$"
 
-gFlygonPokedexText: ; 8569568
+gFlygonPokedexText: @ 8569568
 	.charmapstr "The flapping of its wings sounds like{next}"
 	.charmapstr "singing. To prevent detection by enemies,{next}"
 	.charmapstr "it hides itself by flapping up a cloud of{next}"
 	.charmapstr "desert sand.$"
 
-gCacneaPokedexText: ; 85695EF
+gCacneaPokedexText: @ 85695EF
 	.charmapstr "CACNEA live in deserts with virtually no{next}"
 	.charmapstr "rainfall. It battles by swinging its thick,{next}"
 	.charmapstr "spiked arms. Once a year, a yellow flower{next}"
 	.charmapstr "blooms.$"
 
-gCacturnePokedexText: ; 8569676
+gCacturnePokedexText: @ 8569676
 	.charmapstr "After spending thousands of years in{next}"
 	.charmapstr "harsh deserts, its blood transformed into{next}"
 	.charmapstr "the same substances as sand. It is{next}"
 	.charmapstr "nocturnal, so it hunts at night.$"
 
-gSwabluPokedexText: ; 8569709
+gSwabluPokedexText: @ 8569709
 	.charmapstr "A POKéMON that has wings like cottony{next}"
 	.charmapstr "clouds. After enduring winter, in which{next}"
 	.charmapstr "little food is available, SWABLU flocks{next}"
 	.charmapstr "move closer to towns in the spring.$"
 
-gAltariaPokedexText: ; 85697A3
+gAltariaPokedexText: @ 85697A3
 	.charmapstr "It hums in a beautiful soprano voice.{next}"
 	.charmapstr "It flies among white clouds in the blue{next}"
 	.charmapstr "sky. It launches intensely hot fireballs{next}"
 	.charmapstr "from its mouth.$"
 
-gZangoosePokedexText: ; 856982A
+gZangoosePokedexText: @ 856982A
 	.charmapstr "When it battles, it stands on its hind legs{next}"
 	.charmapstr "and attacks with its sharply clawed{next}"
 	.charmapstr "forelegs. Its fur bristles if it encounters{next}"
 	.charmapstr "any SEVIPER.$"
 
-gSeviperPokedexText: ; 85698B3
+gSeviperPokedexText: @ 85698B3
 	.charmapstr "SEVIPER and ZANGOOSE are eternal rivals.{next}"
 	.charmapstr "It counters a ZANGOOSE’s dazzling agility{next}"
 	.charmapstr "with its swordlike tail, which also oozes{next}"
 	.charmapstr "a horrible poison.$"
 
-gLunatonePokedexText: ; 8569943
+gLunatonePokedexText: @ 8569943
 	.charmapstr "It becomes very active on the night of{next}"
 	.charmapstr "a full moon. This POKéMON was first{next}"
 	.charmapstr "discovered 40 years ago at the site of{next}"
 	.charmapstr "a meteor strike.$"
 
-gSolrockPokedexText: ; 85699C6
+gSolrockPokedexText: @ 85699C6
 	.charmapstr "Solar energy is the source of this {next}"
 	.charmapstr "POKéMON’s power. On sunny days, groups of{next}"
 	.charmapstr "SOLROCK line up facing the sun and absorb{next}"
 	.charmapstr "its light.$"
 
-gBarboachPokedexText: ; 8569A49
+gBarboachPokedexText: @ 8569A49
 	.charmapstr "Its body is covered with a slimy film.{next}"
 	.charmapstr "The film acts as a barrier to prevent germs{next}"
 	.charmapstr "in muddy water from entering the{next}"
 	.charmapstr "BARBOACH’s body.$"
 
-gWhiscashPokedexText: ; 8569ACE
+gWhiscashPokedexText: @ 8569ACE
 	.charmapstr "Mysteriously, it can foretell earthquakes.{next}"
 	.charmapstr "In the daytime, it sleeps in mud at the{next}"
 	.charmapstr "bottom of a pond. When it awakens, it{next}"
 	.charmapstr "continually feeds throughout the night.$"
 
-gCorphishPokedexText: ; 8569B6F
+gCorphishPokedexText: @ 8569B6F
 	.charmapstr "Once it grips prey with its large pincers,{next}"
 	.charmapstr "it will never let go, no matter what.{next}"
 	.charmapstr "It is a hardy POKéMON that can thrive{next}"
 	.charmapstr "in any environment.$"
 
-gCrawdauntPokedexText: ; 8569BFA
+gCrawdauntPokedexText: @ 8569BFA
 	.charmapstr "A brutish POKéMON that loves to battle.{next}"
 	.charmapstr "A veteran CRAWDAUNT that has prevailed in{next}"
 	.charmapstr "hundreds of battles has giant pincers{next}"
 	.charmapstr "marked with countless scars.$"
 
-gBaltoyPokedexText: ; 8569C8F
+gBaltoyPokedexText: @ 8569C8F
 	.charmapstr "A BALTOY moves by spinning on its single{next}"
 	.charmapstr "foot. It has been depicted in murals {next}"
 	.charmapstr "adorning the walls of a once-bustling city{next}"
 	.charmapstr "in an ancient age.$"
 
-gClaydolPokedexText: ; 8569D1C
+gClaydolPokedexText: @ 8569D1C
 	.charmapstr "A CLAYDOL sleeps while hovering in midair.{next}"
 	.charmapstr "Its arms are separate from its body.{next}"
 	.charmapstr "They are kept floating by the POKéMON’s{next}"
 	.charmapstr "manipulation of psychic power.$"
 
-gLileepPokedexText: ; 8569DB3
+gLileepPokedexText: @ 8569DB3
 	.charmapstr "It disguises itself as seaweed by making{next}"
 	.charmapstr "its tentacles sway. Unsuspecting prey{next}"
 	.charmapstr "that come too close are swallowed whole.{next}"
 	.charmapstr "It became extinct 100 million years ago.$"
 
-gCradilyPokedexText: ; 8569E54
+gCradilyPokedexText: @ 8569E54
 	.charmapstr "It drags its heavy body along the{next}"
 	.charmapstr "seafloor. It makes its nest in the shallows{next}"
 	.charmapstr "of warm seas. CRADILY can be seen on{next}"
 	.charmapstr "beaches when the tide goes out.$"
 
-gAnorithPokedexText: ; 8569EE7
+gAnorithPokedexText: @ 8569EE7
 	.charmapstr "It was resurrected from a fossil using the{next}"
 	.charmapstr "power of science. It swims by undulating{next}"
 	.charmapstr "the eight wings at its sides. They were{next}"
 	.charmapstr "feet that adapted to life in the sea.$"
 
-gArmaldoPokedexText: ; 8569F89
+gArmaldoPokedexText: @ 8569F89
 	.charmapstr "ARMALDO usually lives on land. However,{next}"
 	.charmapstr "when it hunts for prey, it dives beneath{next}"
 	.charmapstr "the ocean. It swims around using its two{next}"
 	.charmapstr "large wings.$"
 
-gFeebasPokedexText: ; 856A010
+gFeebasPokedexText: @ 856A010
 	.charmapstr "FEEBAS live in ponds that are heavily{next}"
 	.charmapstr "infested with weeds. Because of its{next}"
 	.charmapstr "hopelessly shabby appearance, it{next}"
 	.charmapstr "seems as if few TRAINERS raise it.$"
 
-gMiloticPokedexText: ; 856A09E
+gMiloticPokedexText: @ 856A09E
 	.charmapstr "It is said to live at the bottom of{next}"
 	.charmapstr "large lakes. Considered to be the most{next}"
 	.charmapstr "beautiful of all POKéMON, it has been{next}"
 	.charmapstr "depicted in paintings and statues.$"
 
-gCastformPokedexText: ; 856A132
+gCastformPokedexText: @ 856A132
 	.charmapstr "It alters its form depending on the{next}"
 	.charmapstr "weather. Changes in the climate such as{next}"
 	.charmapstr "the temperature and humidity appear to{next}"
 	.charmapstr "affect its cellular structure.$"
 
-gKecleonPokedexText: ; 856A1C4
+gKecleonPokedexText: @ 856A1C4
 	.charmapstr "A POKéMON that has the ability to alter its{next}"
 	.charmapstr "body colors to match its surroundings.{next}"
 	.charmapstr "A KECLEON reverts to its original colors if{next}"
 	.charmapstr "it is startled.$"
 
-gShuppetPokedexText: ; 856A253
+gShuppetPokedexText: @ 856A253
 	.charmapstr "This POKéMON roams about deep in the{next}"
 	.charmapstr "night seeking such negative emotions as{next}"
 	.charmapstr "grudges and envy. It retreats to its nest{next}"
 	.charmapstr "when the sun begins to rise.$"
 
-gBanettePokedexText: ; 856A2E7
+gBanettePokedexText: @ 856A2E7
 	.charmapstr "An abandoned plush doll became this{next}"
 	.charmapstr "POKéMON. They are said to live in garbage{next}"
 	.charmapstr "dumps and wander about in search of the{next}"
 	.charmapstr "children that threw them away.$"
 
-gDuskullPokedexText: ; 856A37C
+gDuskullPokedexText: @ 856A37C
 	.charmapstr "A glare from its single scarlet eye makes{next}"
 	.charmapstr "even burly grown-ups freeze in utter fear.{next}"
 	.charmapstr "It is a nocturnal POKéMON that roams{next}"
 	.charmapstr "about under the cloak of darkness.$"
 
-gDusclopsPokedexText: ; 856A419
+gDusclopsPokedexText: @ 856A419
 	.charmapstr "It is thought that its body is hollow with{next}"
 	.charmapstr "only a spectral ball of fire burning inside.{next}"
 	.charmapstr "However, no one has been able to{next}"
 	.charmapstr "confirm this theory as fact.$"
 
-gTropiusPokedexText: ; 856A4AF
+gTropiusPokedexText: @ 856A4AF
 	.charmapstr "It flies by flapping its broad leaves.{next}"
 	.charmapstr "The bunch of fruit that grows around its{next}"
 	.charmapstr "neck is deliciously sweet. In the spring,{next}"
 	.charmapstr "it scatters pollen from its neck.$"
 
-gChimechoPokedexText: ; 856A54B
+gChimechoPokedexText: @ 856A54B
 	.charmapstr "They fly about very actively when the hot{next}"
 	.charmapstr "season arrives. They communicate among{next}"
 	.charmapstr "themselves using seven different and{next}"
 	.charmapstr "distinguishing cries.$"
 
-gAbsolPokedexText: ; 856A5D7
+gAbsolPokedexText: @ 856A5D7
 	.charmapstr "It sharply senses even subtle changes in{next}"
 	.charmapstr "the sky and the land to predict natural{next}"
 	.charmapstr "disasters. It is a long-lived POKéMON that{next}"
 	.charmapstr "has a life-span of 100 years.$"
 
-gWynautPokedexText: ; 856A671
+gWynautPokedexText: @ 856A671
 	.charmapstr "A WYNAUT loves to eat sweet fruits.{next}"
 	.charmapstr "It cleverly picks fruits using its earlike{next}"
 	.charmapstr "arms. They gather in fruit gardens, drawn{next}"
 	.charmapstr "by the fragrance.$"
 
-gSnoruntPokedexText: ; 856A6FC
+gSnoruntPokedexText: @ 856A6FC
 	.charmapstr "They tend to move about in groups of{next}"
 	.charmapstr "around five SNORUNT. In snowy regions,{next}"
 	.charmapstr "it is said that when they are seen late at{next}"
 	.charmapstr "night, snowfall will arrive by morning.$"
 
-gGlaliePokedexText: ; 856A79B
+gGlaliePokedexText: @ 856A79B
 	.charmapstr "A GLALIE has the power to instantaneously{next}"
 	.charmapstr "freeze moisture in the atmosphere.{next}"
 	.charmapstr "A dazzling cloud of diamondlike ice{next}"
 	.charmapstr "crystals forms around its body.$"
 
-gSphealPokedexText: ; 856A82C
+gSphealPokedexText: @ 856A82C
 	.charmapstr "It is completely covered with plushy fur.{next}"
 	.charmapstr "As a result, it never feels the cold even{next}"
 	.charmapstr "when it is rolling about on ice floes or{next}"
 	.charmapstr "diving in the sea.$"
 
-gSealeoPokedexText: ; 856A8BC
+gSealeoPokedexText: @ 856A8BC
 	.charmapstr "SEALEO live in herds on ice floes. Using its{next}"
 	.charmapstr "powerful flippers, it shatters ice.{next}"
 	.charmapstr "It dives into the sea to hunt prey five{next}"
 	.charmapstr "times a day.$"
 
-gWalreinPokedexText: ; 856A942
+gWalreinPokedexText: @ 856A942
 	.charmapstr "To protect its herd, the leader battles{next}"
 	.charmapstr "anything that invades its territory, even{next}"
 	.charmapstr "at the cost of its life. Its tusks may snap{next}"
 	.charmapstr "off in battle.$"
 
-gClamperlPokedexText: ; 856A9CF
+gClamperlPokedexText: @ 856A9CF
 	.charmapstr "A CLAMPERL slams its shell closed on prey{next}"
 	.charmapstr "to prevent escape. The pearl it creates{next}"
 	.charmapstr "upon evolution is said to be infused with{next}"
 	.charmapstr "a mysterious energy.$"
 
-gHuntailPokedexText: ; 856AA60
+gHuntailPokedexText: @ 856AA60
 	.charmapstr "To withstand the crushing pressure of{next}"
 	.charmapstr "water deep under the sea, its spine is very{next}"
 	.charmapstr "thick and sturdy. Its tail, which is shaped{next}"
 	.charmapstr "like a small fish, has eyes that light up.$"
 
-gGorebyssPokedexText: ; 856AB09
+gGorebyssPokedexText: @ 856AB09
 	.charmapstr "A GOREBYSS siphons the body fluids of prey{next}"
 	.charmapstr "through its thin, tubular mouth. Its light{next}"
 	.charmapstr "pink body color turns vivid when it{next}"
 	.charmapstr "finishes feeding.$"
 
-gRelicanthPokedexText: ; 856AB95
+gRelicanthPokedexText: @ 856AB95
 	.charmapstr "A POKéMON that was once believed to have{next}"
 	.charmapstr "been extinct. The species has not changed{next}"
 	.charmapstr "its form for 100 million years. It walks on{next}"
 	.charmapstr "the seafloor using its pectoral fins.$"
 
-gLuvdiscPokedexText: ; 856AC3A
+gLuvdiscPokedexText: @ 856AC3A
 	.charmapstr "LUVDISC make the branches of CORSOLA{next}"
 	.charmapstr "their nests. There is a custom from long{next}"
 	.charmapstr "ago of giving a LUVDISC as a gift to{next}"
 	.charmapstr "express one’s feelings of love.$"
 
-gBagonPokedexText: ; 856ACCD
+gBagonPokedexText: @ 856ACCD
 	.charmapstr "Although it is small, this POKéMON is very{next}"
 	.charmapstr "powerful because its body is a bundle of{next}"
 	.charmapstr "muscles. It launches head-butts with its{next}"
 	.charmapstr "ironlike skull.$"
 
-gShelgonPokedexText: ; 856AD5A
+gShelgonPokedexText: @ 856AD5A
 	.charmapstr "It hardly eats while it awaits evolution.{next}"
 	.charmapstr "It becomes hardier by enduring hunger.{next}"
 	.charmapstr "Its shell peels off the instant it begins{next}"
 	.charmapstr "to evolve.$"
 
-gSalamencePokedexText: ; 856ADE0
+gSalamencePokedexText: @ 856ADE0
 	.charmapstr "After many long years, its cellular{next}"
 	.charmapstr "structure underwent a sudden mutation to{next}"
 	.charmapstr "grow wings. When angered, it loses all{next}"
 	.charmapstr "thought and rampages out of control.$"
 
-gBeldumPokedexText: ; 856AE79
+gBeldumPokedexText: @ 856AE79
 	.charmapstr "When BELDUM gather in a swarm, they move{next}"
 	.charmapstr "in perfect unison as if they were but one{next}"
 	.charmapstr "POKéMON. They communicate with each other{next}"
 	.charmapstr "using brain waves.$"
 
-gMetangPokedexText: ; 856AF09
+gMetangPokedexText: @ 856AF09
 	.charmapstr "The claws tipping its arms pack the{next}"
 	.charmapstr "destructive power to tear through thick{next}"
 	.charmapstr "iron sheets as if they were silk. It flies{next}"
 	.charmapstr "at over 60 miles per hour.$"
 
-gMetagrossPokedexText: ; 856AF9B
+gMetagrossPokedexText: @ 856AF9B
 	.charmapstr "METAGROSS has four brains that are joined{next}"
 	.charmapstr "by a complex neural network. As a result of{next}"
 	.charmapstr "integration, this POKéMON is smarter than{next}"
 	.charmapstr "a supercomputer.$"
 
-gRegirockPokedexText: ; 856B02C
+gRegirockPokedexText: @ 856B02C
 	.charmapstr "A POKéMON that is made entirely of rocks{next}"
 	.charmapstr "and boulders. If parts of its body chip off{next}"
 	.charmapstr "in battle, REGIROCK repairs itself by{next}"
 	.charmapstr "adding new rocks.$"
 
-gRegicePokedexText: ; 856B0B9
+gRegicePokedexText: @ 856B0B9
 	.charmapstr "Its entire body is made of Antarctic ice.{next}"
 	.charmapstr "After extensive studies, researchers{next}"
 	.charmapstr "believe the ice was formed during an{next}"
 	.charmapstr "ice age.$"
 
-gRegisteelPokedexText: ; 856B136
+gRegisteelPokedexText: @ 856B136
 	.charmapstr "Its body is harder than any other kind of{next}"
 	.charmapstr "metal. The body metal is composed of a{next}"
 	.charmapstr "mysterious substance. Not only is it hard,{next}"
 	.charmapstr "it shrinks and stretches flexibly.$"
 
-gLatiasPokedexText: ; 856B1D5
+gLatiasPokedexText: @ 856B1D5
 	.charmapstr "They make a small herd of only several{next}"
 	.charmapstr "members. They rarely make contact with{next}"
 	.charmapstr "people or other POKéMON. They disappear{next}"
 	.charmapstr "if they sense enemies.$"
 
-gLatiosPokedexText: ; 856B262
+gLatiosPokedexText: @ 856B262
 	.charmapstr "Even in hiding, it can detect the locations{next}"
 	.charmapstr "of others and sense their emotions since{next}"
 	.charmapstr "it has telepathy. Its intelligence allows{next}"
 	.charmapstr "it to understand human languages.$"
 
-gKyogrePokedexText: ; 856B303
+gKyogrePokedexText: @ 856B303
 	.charmapstr "KYOGRE has appeared in mythology as the{next}"
 	.charmapstr "creator of the sea. After long years of{next}"
 	.charmapstr "feuding with GROUDON, it took to sleep at{next}"
 	.charmapstr "the bottom of the sea.$"
 
-gGroudonPokedexText: ; 856B394
+gGroudonPokedexText: @ 856B394
 	.charmapstr "GROUDON has appeared in mythology as the{next}"
 	.charmapstr "creator of the land. It sleeps in magma{next}"
 	.charmapstr "underground and is said to make volcanoes{next}"
 	.charmapstr "erupt on awakening.$"
 
-gRayquazaPokedexText: ; 856B423
+gRayquazaPokedexText: @ 856B423
 	.charmapstr "A POKéMON that flies endlessly in the{next}"
 	.charmapstr "ozone layer. It is said it would descend{next}"
 	.charmapstr "to the ground if KYOGRE and GROUDON{next}"
 	.charmapstr "were to fight.$"
 
-gJirachiPokedexText: ; 856B4A5
+gJirachiPokedexText: @ 856B4A5
 	.charmapstr "JIRACHI is said to make wishes come true.{next}"
 	.charmapstr "While it sleeps, a tough crystalline shell{next}"
 	.charmapstr "envelops the body to protect it from{next}"
 	.charmapstr "enemies.$"
 
-gDeoxysPokedexText: ; 856B528
+gDeoxysPokedexText: @ 856B528
 	.charmapstr "A POKéMON that mutated from an{next}"
 	.charmapstr "extraterrestrial virus exposed to a laser{next}"
 	.charmapstr "beam. Its body is configured for superior{next}"
diff --git a/data/text/ribbon_descriptions.s b/data/text/ribbon_descriptions.s
index 473ce37e5..7451440fb 100644
--- a/data/text/ribbon_descriptions.s
+++ b/data/text/ribbon_descriptions.s
@@ -1,63 +1,63 @@
-gRibbonDescriptionPart1_Champion: ; 862383C
+gRibbonDescriptionPart1_Champion: @ 862383C
 	.charmapstr "CHAMPION-beating, HALL$"
 
-gRibbonDescriptionPart2_Champion: ; 8623853
+gRibbonDescriptionPart2_Champion: @ 8623853
 	.charmapstr "OF FAME Member RIBBON$"
 
-gRibbonDescriptionPart1_CoolContest: ; 8623869
+gRibbonDescriptionPart1_CoolContest: @ 8623869
 	.charmapstr "COOL CONTEST$"
 
-gRibbonDescriptionPart1_BeautyContest: ; 8623876
+gRibbonDescriptionPart1_BeautyContest: @ 8623876
 	.charmapstr "BEAUTY CONTEST$"
 
-gRibbonDescriptionPart1_CuteContest: ; 8623885
+gRibbonDescriptionPart1_CuteContest: @ 8623885
 	.charmapstr "CUTE CONTEST$"
 
-gRibbonDescriptionPart1_SmartContest: ; 8623892
+gRibbonDescriptionPart1_SmartContest: @ 8623892
 	.charmapstr "SMART CONTEST$"
 
-gRibbonDescriptionPart1_ToughContest: ; 86238A0
+gRibbonDescriptionPart1_ToughContest: @ 86238A0
 	.charmapstr "TOUGH CONTEST$"
 
-gRibbonDescriptionPart2_NormalRank: ; 86238AE
+gRibbonDescriptionPart2_NormalRank: @ 86238AE
 	.charmapstr "Normal Rank winner!$"
 
-gRibbonDescriptionPart2_SuperRank: ; 86238C2
+gRibbonDescriptionPart2_SuperRank: @ 86238C2
 	.charmapstr "Super Rank winner!$"
 
-gRibbonDescriptionPart2_HyperRank: ; 86238D5
+gRibbonDescriptionPart2_HyperRank: @ 86238D5
 	.charmapstr "Hyper Rank winner!$"
 
-gRibbonDescriptionPart2_MasterRank: ; 86238E8
+gRibbonDescriptionPart2_MasterRank: @ 86238E8
 	.charmapstr "Master Rank winner!$"
 
-gRibbonDescriptionPart1_Winning: ; 86238FC
+gRibbonDescriptionPart1_Winning: @ 86238FC
 	.charmapstr "For clearing LV50$"
 
-gRibbonDescriptionPart2_Winning: ; 862390E
+gRibbonDescriptionPart2_Winning: @ 862390E
 	.charmapstr "at the BATTLE TOWER.$"
 
-gRibbonDescriptionPart1_Victory: ; 8623923
+gRibbonDescriptionPart1_Victory: @ 8623923
 	.charmapstr "For clearing Open Level$"
 
-gRibbonDescriptionPart2_Victory: ; 862393B
+gRibbonDescriptionPart2_Victory: @ 862393B
 	.charmapstr "at the BATTLE TOWER.$"
 
-gRibbonDescriptionPart1_Artist: ; 8623950
+gRibbonDescriptionPart1_Artist: @ 8623950
 	.charmapstr "RIBBON for being chosen$"
 
-gRibbonDescriptionPart2_Artist: ; 8623968
+gRibbonDescriptionPart2_Artist: @ 8623968
 	.charmapstr "as a super sketch model.$"
 
-gRibbonDescriptionPart1_Effort: ; 8623981
+gRibbonDescriptionPart1_Effort: @ 8623981
 	.charmapstr "RIBBON awarded for$"
 
-gRibbonDescriptionPart2_Effort: ; 8623994
+gRibbonDescriptionPart2_Effort: @ 8623994
 	.charmapstr "being a hard worker.$"
 
 	.align 2, 0
 
-gRibbonDescriptionPointers: ; 86239AC
+gRibbonDescriptionPointers: @ 86239AC
 	.4byte gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion
 	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank
 	.4byte gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_SuperRank
diff --git a/data/text/species_names.s b/data/text/species_names.s
index 1347be003..20c593292 100644
--- a/data/text/species_names.s
+++ b/data/text/species_names.s
@@ -1,4 +1,4 @@
-gSpeciesNames: ; 83185C8
+gSpeciesNames: @ 83185C8
 	.charmapstr "??????????$", 11
 	.charmapstr "BULBASAUR$", 11
 	.charmapstr "IVYSAUR$", 11
diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.s
index c0cca7d6e..9182c2775 100644
--- a/data/text/trainer_class_names.s
+++ b/data/text/trainer_class_names.s
@@ -1,4 +1,4 @@
-gTrainerClassNames: ; 830FCD4
+gTrainerClassNames: @ 830FCD4
 	.charmapstr "{PKMN} TRAINER$", 13
 	.charmapstr "{PKMN} TRAINER$", 13
 	.charmapstr "HIKER$", 13
diff --git a/data/text/type_names.s b/data/text/type_names.s
index ff7e8e2c7..e867edd99 100644
--- a/data/text/type_names.s
+++ b/data/text/type_names.s
@@ -1,4 +1,4 @@
-gTypeNames: ; 831AE38
+gTypeNames: @ 831AE38
 	.charmapstr "NORMAL$", 7
 	.charmapstr "FIGHT$", 7
 	.charmapstr "FLYING$", 7
diff --git a/data/tm_hm_learnsets.s b/data/tm_hm_learnsets.s
index db813a827..bd4f6e318 100644
--- a/data/tm_hm_learnsets.s
+++ b/data/tm_hm_learnsets.s
@@ -1,415 +1,415 @@
 	.align 2, 0
 
-gTMHMLearnsets: ; 831E898
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ??????????
-	.8byte 0b0011100100000111100000100010000100001101010000011100100000 ; Bulbasaur
-	.8byte 0b0011100100000111100000100010000100001101010000011100100000 ; Ivysaur
-	.8byte 0b0011100100000111100000100010000110001101010100011100110000 ; Venusaur
-	.8byte 0b0010100110000111101010010011001100010100010000011000100011 ; Charmander
-	.8byte 0b0010100110000111101010010011001100010100010000011000100011 ; Charmeleon
-	.8byte 0b0010101110010111101010010011001110010100010100011000110011 ; Charizard
-	.8byte 0b1110110000000111100000000011001100010100110011001001100101 ; Squirtle
-	.8byte 0b1110110000000111100000000011001100010100110011001001100101 ; Wartortle
-	.8byte 0b1110110000000111100000000011001110010100110111001001110101 ; Blastoise
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Caterpie
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Metapod
-	.8byte 0b0001000000101111101000000010110100001111110100011000100000 ; Butterfree
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Weedle
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Kakuna
-	.8byte 0b0010000100001111101000100011000100001101010100011000100000 ; Beedrill
-	.8byte 0b0000001000011111101000000010000100000100110000011000100000 ; Pidgey
-	.8byte 0b0000001000011111101000000010000100000100110000011000100000 ; Pidgeotto
-	.8byte 0b0000001000011111101000000010000100000100110100011000100000 ; Pidgeot
-	.8byte 0b0010000100001111100000001010101101110100110011111000100000 ; Rattata
-	.8byte 0b0010100100001111100000001010101101110100110111111000110000 ; Raticate
-	.8byte 0b0000001000011111101000000010000100000100110000011000100000 ; Spearow
-	.8byte 0b0000001000011111101000000010000100000100110100011000100000 ; Fearow
-	.8byte 0b0000100001001111110000100010001110010101110000011000100000 ; Ekans
-	.8byte 0b0000100001001111110000100010001110010101110100011000100000 ; Arbok
-	.8byte 0b0011100000000111100000001011001101110100111000001000100001 ; Pikachu
-	.8byte 0b0011100000001111100000001011001101110100111100001000100001 ; Raichu
-	.8byte 0b0010100100001111101101000011001110010100010000011000100001 ; Sandshrew
-	.8byte 0b0010100100001111101101000011001110010100010100011000100001 ; Sandslash
-	.8byte 0b0010100100001111101000101010001101110100110011011000100100 ; Nidoran♀
-	.8byte 0b0010100100001111101000101010001101110100110011011000100100 ; Nidorina
-	.8byte 0b0010110100001111111111111011101111110100110111111000110101 ; Nidoqueen
-	.8byte 0b0010100100001111100000101010001101110100110011011000100100 ; Nidoran♂
-	.8byte 0b0010100100001111100000101010001101110100110011011000100100 ; Nidorino
-	.8byte 0b0010110100001111110111111011101111110100110111111000110101 ; Nidoking
-	.8byte 0b0001100001000111100010011111111101111110111011011000101101 ; Clefairy
-	.8byte 0b0001100001000111100010011111111101111110111111011000101101 ; Clefable
-	.8byte 0b0000000010000111100010010010001100010110010000011000110000 ; Vulpix
-	.8byte 0b0000000010000111100010010010001100010110010100011000110000 ; Ninetales
-	.8byte 0b0001100001000111100010011111111101101110111011011000100101 ; Jigglypuff
-	.8byte 0b0001100001000111100010011111111101101110111111011000100101 ; Wigglytuff
-	.8byte 0b0000000001011111111000100010100100000101110000111000100000 ; Zubat
-	.8byte 0b0000000001011111111000100010100100000101110100111000100000 ; Golbat
-	.8byte 0b0001000100000111100000100010000100001101010000011100100000 ; Oddish
-	.8byte 0b0001000100000111100000100010000100001101010000011100100000 ; Gloom
-	.8byte 0b0001000100000111100000100010000100001101010100011100100000 ; Vileplume
-	.8byte 0b0011000100001111101000100010001100001101010000011100100000 ; Paras
-	.8byte 0b0011000100001111101000100010001100001101010100011100100000 ; Parasect
-	.8byte 0b0001000000101111100000100010010100001101010000011000100000 ; Venonat
-	.8byte 0b0001000000101111101000100010010100001101010100011000100000 ; Venomoth
-	.8byte 0b0010000100001111101100100010001110000100010000011000100000 ; Diglett
-	.8byte 0b0010000100001111101100100010001110000100010100011000100000 ; Dugtrio
-	.8byte 0b0001000101001111111000001010101101110100110000111000100100 ; Meowth
-	.8byte 0b0001000101001111111000001010101101110100110100111000110100 ; Persian
-	.8byte 0b1111110000000111101000000011001100010100110011001001101101 ; Psyduck
-	.8byte 0b1111110000000111101000000011001100010100110111001001101101 ; Golduck
-	.8byte 0b0010100010001111101100000011001111110100110000111010100001 ; Mankey
-	.8byte 0b0010100010001111101100000011001111110100110100111010100001 ; Primeape
-	.8byte 0b0010100010001111101010010010001100010100010000011000110000 ; Growlithe
-	.8byte 0b0010100010001111101010010010001100010100010100011000110000 ; Arcanine
-	.8byte 0b1100010000001111100000000010011100000100110011001001100100 ; Poliwag
-	.8byte 0b1110110000001111100000000011011110000100110011001001100101 ; Poliwhirl
-	.8byte 0b1110110000001111100100000011011110000100110111001011100101 ; Poliwrath
-	.8byte 0b0001000001101111110000001110110100010110111000111000101001 ; Abra
-	.8byte 0b0001000001101111110000001110110100010110111000111000101001 ; Kadabra
-	.8byte 0b0001000001101111110000001110110100010110111100111000101001 ; Alakazam
-	.8byte 0b0010100000001111100110010011001110000100110000011010100001 ; Machop
-	.8byte 0b0010100000001111100110010011001110000100110000011010100001 ; Machoke
-	.8byte 0b0010100000001111100110010011001110000100110100011010100001 ; Machamp
-	.8byte 0b0001000100001111100000100010000100001101010000011100100000 ; Bellsprout
-	.8byte 0b0001000100001111100000100010000100001101010000011100100000 ; Weepinbell
-	.8byte 0b0001000100001111100000100010000100001101010100011100100000 ; Victreebel
-	.8byte 0b1100010100001111100000100010000100000101110011001001100100 ; Tentacool
-	.8byte 0b1100010100001111100000100010000100000101110111001001100100 ; Tentacruel
-	.8byte 0b0010100000000111100111010011001110000100010000011000100001 ; Geodude
-	.8byte 0b0010100000000111100111010011001110000100010000011000100001 ; Graveler
-	.8byte 0b0010100000000111100111010011001110000100010100011000110001 ; Golem
-	.8byte 0b0000100010000111100010010010000100011100010000011000100000 ; Ponyta
-	.8byte 0b0000100010000111100010010010000100011100010100011000100000 ; Rapidash
-	.8byte 0b1001110000100111100010010010111110010110110011011001101100 ; Slowpoke
-	.8byte 0b1011110000100111100010010011111110010110110111011001101101 ; Slowbro
-	.8byte 0b0001000000000011100000001110000101100100110000011000100000 ; Magnemite
-	.8byte 0b0001000000000011100000001110000101100100110100011000100000 ; Magneton
-	.8byte 0b0000001100011111101000000010000100010100010000011000100000 ; Farfetch'd
-	.8byte 0b0000001000011111101000000010000100000100010000011000100000 ; Doduo
-	.8byte 0b0000001000011111111000000010000100000100010100111000100000 ; Dodrio
-	.8byte 0b1100010000001111100000000010000100000110110011001001100100 ; Seel
-	.8byte 0b1100010000001111100000000010000100000110110111001001100100 ; Dewgong
-	.8byte 0b0000000000001111110110111010001101100101110000111000100000 ; Grimer
-	.8byte 0b0010100000001111110110111011001101100101110100111000100001 ; Muk
-	.8byte 0b1000010000000111100000000010000100000100110011001001100100 ; Shellder
-	.8byte 0b1000010000000111110000000010000100000100110111001001100100 ; Cloyster
-	.8byte 0b0000000001101111110000100010110100100101110000111000100000 ; Gastly
-	.8byte 0b0000000001101111110000100010110100100101110000111000100000 ; Haunter
-	.8byte 0b0010100001101111110000100011110101100101110100111000100001 ; Gengar
-	.8byte 0b0010100000000111110101000010001110010100010000111000110000 ; Onix
-	.8byte 0b0001000001101111110000000111110100000110111000111000101001 ; Drowzee
-	.8byte 0b0001000001101111110000000111110100000110111100111000101001 ; Hypno
-	.8byte 0b1010110100001111100100000010001100000100110011001001100100 ; Krabby
-	.8byte 0b1010110100001111100100000010001100000100110111001001100100 ; Kingler
-	.8byte 0b0001000000001011110000001010000101100100111000101000100000 ; Voltorb
-	.8byte 0b0001000000001011110000001010000101100100111100101000100000 ; Electrode
-	.8byte 0b0001100000101111100000100110010100001101011000011100100000 ; Exeggcute
-	.8byte 0b0001100000101111100000100110010100001101011100011100100000 ; Exeggutor
-	.8byte 0b0010100000001111101111010011001110010100010011011000100001 ; Cubone
-	.8byte 0b0010100000001111101111010011001110010100010111011000100001 ; Marowak
-	.8byte 0b0010100000001111100100000011000110000100110000011010100001 ; Hitmonlee
-	.8byte 0b0010100000001111100100000011000110000100110000011010100001 ; Hitmonchan
-	.8byte 0b0010110100001111100111011011101111111100110111011000100101 ; Lickitung
-	.8byte 0b0001000000001111110010111010100101100100110000111000100000 ; Koffing
-	.8byte 0b0001000000001111110010111010100101100100110100111000100000 ; Weezing
-	.8byte 0b0010100000001111100111011010001111110100110011011000110000 ; Rhyhorn
-	.8byte 0b0010110100001111100111011011001111110100110111011000110001 ; Rhydon
-	.8byte 0b0011100001100111100111011011110111111110111111011001101101 ; Chansey
-	.8byte 0b0011000100001111100000100010000100001101010100011100100000 ; Tangela
-	.8byte 0b0010110100001111101111011011101111111100110111011001110101 ; Kangaskhan
-	.8byte 0b1100010000000111100000000010000100000100110011001001100100 ; Horsea
-	.8byte 0b1100010000000111100000000010000100000100110111001001100100 ; Seadra
-	.8byte 0b1100010000000111100000000010000100000100110011001001100100 ; Goldeen
-	.8byte 0b1100010000000111100000000010000100000100110111001001100100 ; Seaking
-	.8byte 0b1101010000000011100000000110010101100100111011001001100100 ; Staryu
-	.8byte 0b1101010000100011100000000110010101100100111111001001100100 ; Starmie
-	.8byte 0b0001000001101111110000001111110101101110111100111000101001 ; Mr. mime
-	.8byte 0b0010000100011111101000000010000100000100110100011000100000 ; Scyther
-	.8byte 0b0001000000101111110000000111110100000100111111101001101101 ; Jynx
-	.8byte 0b0011100000001111100000001011010101110100111100001000100001 ; Electabuzz
-	.8byte 0b0010100000001111100010010011010100010100010100011000100001 ; Magmar
-	.8byte 0b0010100100001111100100000011001110000100110100011010100001 ; Pinsir
-	.8byte 0b0010110000000111100111011010000111111100110111011000100100 ; Tauros
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Magikarp
-	.8byte 0b1110110000000111110011010010000111100100110111101001110100 ; Gyarados
-	.8byte 0b1110110000000111100000001010010101110110110111001001110100 ; Lapras
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Ditto
-	.8byte 0b0000000000000111100000000010101100010100110000011000100000 ; Eevee
-	.8byte 0b1100010000000111100000000010101100010100110111011001110100 ; Vaporeon
-	.8byte 0b0001000000000111100000001010101101110100110100011000110000 ; Jolteon
-	.8byte 0b0000000010000111100010010010101100010100110100011000110000 ; Flareon
-	.8byte 0b0001000000001011101000001010110101111100110111011000100000 ; Porygon
-	.8byte 0b1110010000001111100101000010000100000100110011001001100100 ; Omanyte
-	.8byte 0b1110010000001111100101000010000100000100110111001001100100 ; Omastar
-	.8byte 0b0110010000001111101101000010001100000101110011001001100100 ; Kabuto
-	.8byte 0b1110010100001111101101000011001100000101110111001001100100 ; Kabutops
-	.8byte 0b0010101000011111111111010010000110010100110100111000110010 ; Aerodactyl
-	.8byte 0b0000110000000111100111011011110111101100110111011000100101 ; Snorlax
-	.8byte 0b0010001000010011101001000110000100000100110111011001110100 ; Articuno
-	.8byte 0b0011001000010011101001001010000101100100111100011000110000 ; Zapdos
-	.8byte 0b0010001010010011101011010010000100000110110100011000110000 ; Moltres
-	.8byte 0b0100010000000111100010011010000101110110110111011001100100 ; Dratini
-	.8byte 0b0100010000000111100010011010000101110110110111011001100100 ; Dragonair
-	.8byte 0b1110111100010111101111011011000111110110110111011001110111 ; Dragonite
-	.8byte 0b0011100001100011111111011111110111111110111111111011101101 ; Mewtwo
-	.8byte 0b1111111111111111111111111111111111111111111111111111111111 ; Mew
-	.8byte 0b0001000100000111100000000110000100011111011000011100100000 ; Chikorita
-	.8byte 0b0011100100000111100000000110000100011111011000011100100000 ; Bayleef
-	.8byte 0b0011100100000111100000000110000110011111011100011100100000 ; Meganium
-	.8byte 0b0000000110000111101010010010001100000100010000011000100000 ; Cyndaquil
-	.8byte 0b0010100110000111101010010011001100000100010000011000110001 ; Quilava
-	.8byte 0b0010100110000111101010010011001110000100010100011000110001 ; Typhlosion
-	.8byte 0b1100010100000111101000000011001100010100110011001001100101 ; Totodile
-	.8byte 0b1110110100000111101000000011001100010100110011001001110101 ; Croconaw
-	.8byte 0b1110110100000111101000000011001110010100110111001001110111 ; Feraligatr
-	.8byte 0b0000010100001111100000011011101100111100110001011000100101 ; Sentret
-	.8byte 0b0010110100001111100000011011101101111100110111011000100101 ; Furret
-	.8byte 0b0001001000011111101000000110110100000100110000011000100000 ; Hoothoot
-	.8byte 0b0001001000011111101000000110110100000100110100011000100000 ; Noctowl
-	.8byte 0b0001000000001111101000000111001100001111011000011000100001 ; Ledyba
-	.8byte 0b0001000000001111101000000111001100001111011100011000100001 ; Ledian
-	.8byte 0b0001000000001111100000100010011100001101010000011000100000 ; Spinarak
-	.8byte 0b0001000000001111100000100010011100001101010100011000100000 ; Ariados
-	.8byte 0b0000001001011111111000100010100100000101110100111000100000 ; Crobat
-	.8byte 0b1101010000000111100000001010000101100100110011001001100100 ; Chinchou
-	.8byte 0b1101010000000111100000001010000101100100110111001001100100 ; Lanturn
-	.8byte 0b0001000000000111100000001010000101110100111000001000100000 ; Pichu
-	.8byte 0b0001000000000111100010011110111100011110111000011000100100 ; Cleffa
-	.8byte 0b0001000000000111100010011110111100001110111000011000100100 ; Igglybuff
-	.8byte 0b0011000000000111100010011110110100001110111000011000100100 ; Togepi
-	.8byte 0b0011001000010111101010011111110100001110111100011000100101 ; Togetic
-	.8byte 0b0001000000111111101000000110110100001101111000011000101000 ; Natu
-	.8byte 0b0001001000111111101000000110110100001101111100011000101000 ; Xatu
-	.8byte 0b0001000000000111100000001010000101110100111000001000100000 ; Mareep
-	.8byte 0b0011100000000111100000001011000101110100111000001000100001 ; Flaaffy
-	.8byte 0b0011100000000111100000001011000101110100111100001000100001 ; Ampharos
-	.8byte 0b0001000100000111100000100010000100001111010100011100100000 ; Bellossom
-	.8byte 0b1110110000000111100000000011001100010100110011001001100101 ; Marill
-	.8byte 0b1110110000000111100000000011001100010100110111001001100101 ; Azumarill
-	.8byte 0b0010100000001111100101000011001110000100010000111000101001 ; Sudowoodo
-	.8byte 0b1110110000001111100000000011011110000100110111001001100101 ; Politoed
-	.8byte 0b0001000000000111101000000010000100001101010000011100100000 ; Hoppip
-	.8byte 0b0001000000000111101000000010000100001101010000011100100000 ; Skiploom
-	.8byte 0b0001000000000111101000000010000100001101010100011100100000 ; Jumpluff
-	.8byte 0b0010100101001111101000001011101101111100110000111000100101 ; Aipom
-	.8byte 0b0001000100000111100000100010000100001111011000011100100000 ; Sunkern
-	.8byte 0b0001000100000111100000100010000100001111011100011100100000 ; Sunflora
-	.8byte 0b0001000000011111101000000010110100001101010000011000100000 ; Yanma
-	.8byte 0b1111010000000111100001100010001110010100110011001001100100 ; Wooper
-	.8byte 0b1111110000000111100101100011001110010100110111001001100101 ; Quagsire
-	.8byte 0b0001000100100111100000000110111100010100111100011000101000 ; Espeon
-	.8byte 0b0001000101000111110000000010111100010100110100111000100000 ; Umbreon
-	.8byte 0b0000001001011111111000000010100100000100110000111000101000 ; Murkrow
-	.8byte 0b1011110000100111100010010011111110010110110111011001101101 ; Slowking
-	.8byte 0b0001000001101111111000001010110101100100110000111000101000 ; Misdreavus
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Unown
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Wobbuffet
-	.8byte 0b0011100000101111100000001110110111110100111000011000101000 ; Girafarig
-	.8byte 0b0010100000000111100001000110001110001101011000011000100000 ; Pineco
-	.8byte 0b0010100000000111100001000110001110001101011100011000100000 ; Forretress
-	.8byte 0b0010100000001111100110011010101111111100110011011000101100 ; Dunsparce
-	.8byte 0b0010100100011111101101100010001110010100110000011000100000 ; Gligar
-	.8byte 0b0010100100000111110101000010001110010100010100111000110000 ; Steelix
-	.8byte 0b0010100010001111110010111011101111101100110000111010110101 ; Snubbull
-	.8byte 0b0010100010001111110110111011101111111100110100111010110101 ; Granbull
-	.8byte 0b1100010000000111100000101010100100000100110011001001100100 ; Qwilfish
-	.8byte 0b0010100100011111101001000010000100000100110100011000100000 ; Scizor
-	.8byte 0b0011100000000111100101100010001110000110010000011000100000 ; Shuckle
-	.8byte 0b0010100100001111100100000011001110000100110100011010100001 ; Heracross
-	.8byte 0b0010110101001111111000000011101100010100110011111001101001 ; Sneasel
-	.8byte 0b0010100100001111111000000011001110000100110000111010110001 ; Teddiursa
-	.8byte 0b0010100100001111111100000011001110000100110100111010110001 ; Ursaring
-	.8byte 0b0010000010000111100010010110000100000100011000011000100000 ; Slugma
-	.8byte 0b0010100010000111100111010110000110000100011100011000100000 ; Magcargo
-	.8byte 0b0010100000000111100101000110001110000100111011001001110000 ; Swinub
-	.8byte 0b0010100000000111100101000110001110000100111111001001110000 ; Piloswine
-	.8byte 0b0010110000000111100101000110111110000110111011011001101100 ; Corsola
-	.8byte 0b1100010000001111100010010010010100000100110111011000100100 ; Remoraid
-	.8byte 0b1100010000001111100010110010010100000100110111011100100100 ; Octillery
-	.8byte 0b0000001000001111101000000010000100000100110011001001100101 ; Delibird
-	.8byte 0b1100010000000111101000000010000110000100110011001001100100 ; Mantine
-	.8byte 0b0010001100011111111001000010000100000100010000111000110000 ; Skarmory
-	.8byte 0b0010000011001111110010110010100100011100010000111000110000 ; Houndour
-	.8byte 0b0010100011001111110010110010100100011100010100111000110000 ; Houndoom
-	.8byte 0b1100010000000111100000000010000100000100110111001001100100 ; Kingdra
-	.8byte 0b0010100000000111100101000010000110010100010000011000110000 ; Phanpy
-	.8byte 0b0010100000000111100101000010000110010100010100011000110000 ; Donphan
-	.8byte 0b0001000000001011101000001010110101111100110111011000100000 ; Porygon2
-	.8byte 0b0001000000101111100000001110110111111100111000011000111000 ; Stantler
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Smeargle
-	.8byte 0b0010100000001111100000000011000110000100110000011010100000 ; Tyrogue
-	.8byte 0b0010100000001111100001000011001110000100110000011010100000 ; Hitmontop
-	.8byte 0b0001000000101111100000000110110100000100111011001001101100 ; Smoochum
-	.8byte 0b0011000000001111100000001011010101100100111000001000100001 ; Elekid
-	.8byte 0b0010000000001111100010010011010100010100010000011000100001 ; Magby
-	.8byte 0b0010110000000111100101001011100111111100110111011000100101 ; Miltank
-	.8byte 0b0011100001100111100111011011110111111110111111011001101101 ; Blissey
-	.8byte 0b0011100100000011100001001110001101110100110100011000111000 ; Raikou
-	.8byte 0b0011100100000011100011010110001100011100110100011000111000 ; Entei
-	.8byte 0b1110010100000011100001000110001100010100110111011001111100 ; Suicune
-	.8byte 0b0010000000000111110001000011001110000100110100111000100000 ; Larvitar
-	.8byte 0b0010000000000111110001000011001110000100110100111000100000 ; Pupitar
-	.8byte 0b0010110100000111111111011011001111110100110111111000110111 ; Tyranitar
-	.8byte 0b1110111000110011101001001110110111110111111111011001111100 ; Lugia
-	.8byte 0b0011101010010011101011011110110111101111111100011000111000 ; Ho-Oh
-	.8byte 0b0001000100100011101001001110110100001111111100011000101100 ; Celebi
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; ?
-	.8byte 0b0011100100000111101100000011001100011111010000011100100001 ; Treecko
-	.8byte 0b0011100100000111101100000011001100011111010000011100100001 ; Grovyle
-	.8byte 0b0011100100000111101100000011001110011111010100011100110011 ; Sceptile
-	.8byte 0b0010100110000111101110010010001100000100010000011000100000 ; Torchic
-	.8byte 0b0010100110000111101110010011001100000100010000011010100001 ; Combusken
-	.8byte 0b0010100110000111101110010011001110000100010100011010110001 ; Blaziken
-	.8byte 0b1110110000000111100100000010001100010100110011001001100100 ; Mudkip
-	.8byte 0b1110110000000111100100000010001110010100110011001001100100 ; Marshtomp
-	.8byte 0b1110110000000111100100000011001110010100110111001001110101 ; Swampert
-	.8byte 0b0010000001001111110000000010101100010100110000111000110000 ; Poochyena
-	.8byte 0b0010100001001111110000000010101100010100110100111000110000 ; Mightyena
-	.8byte 0b0010010100001111100000001010101101110100110011011000100100 ; Zigzagoon
-	.8byte 0b0010110100001111100000001010101101110100110111011000110100 ; Linoone
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Wurmple
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Silcoon
-	.8byte 0b0001000000001111101000000010110100001111010100011000100000 ; Beautifly
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Cascoon
-	.8byte 0b0001000000001111101000100010110100001101011100011000100000 ; Dustox
-	.8byte 0b0001010000001111100000000010000100001101110011011101100100 ; Lotad
-	.8byte 0b1111110000001111100000000011000100001101110011011101100100 ; Lombre
-	.8byte 0b1111110000001111100000000011000100001101110111011101100101 ; Ludicolo
-	.8byte 0b0011000000000111100000000010101100001101010000011100100000 ; Seedot
-	.8byte 0b0011100100001111110100000011101100001101010100011100100000 ; Nuzleaf
-	.8byte 0b0011100100001111111100000011101100001101010100011100100000 ; Shiftry
-	.8byte 0b0001000100000011101001000010101100001101010000011000100000 ; Nincada
-	.8byte 0b0001000100001111101001000010101100001101010100011000100000 ; Ninjask
-	.8byte 0b0001000100001011101001000010101100001101010100011000100000 ; Shedinja
-	.8byte 0b0000001000011111101000000010000100000100110000011000100000 ; Taillow
-	.8byte 0b0000001000011111101000000010000100000100110100011000100000 ; Swellow
-	.8byte 0b0001000001000111100000100010000100001111010000011100100000 ; Shroomish
-	.8byte 0b0011100101000111100000100011000100011111010100011110100001 ; Breloom
-	.8byte 0b0011100001101111100100001011111100000110110000011000101101 ; Spinda
-	.8byte 0b0000001000011111101000001010000100000100110011001001100100 ; Wingull
-	.8byte 0b0000011000011111101000001010000100000100110111001001100100 ; Pelipper
-	.8byte 0b0001000000001111100000000010100100001101110011011000100100 ; Surskit
-	.8byte 0b0001000000001111101000000010100100001101110111011000100100 ; Masquerain
-	.8byte 0b1110110000000111100100000010000110000100110011001001110100 ; Wailmer
-	.8byte 0b1110110000000111100100000010000110000100110111001001110100 ; Wailord
-	.8byte 0b0001000000000111100000001010101101111110110011011000101100 ; Skitty
-	.8byte 0b0011100000000111100000001010101101111110110111011000101100 ; Delcatty
-	.8byte 0b0011100101101111101110011011101101111100110011011000100101 ; Kecleon
-	.8byte 0b0001000000100011100101000110111110001100111001011000100000 ; Baltoy
-	.8byte 0b0011100000100011100101000110111110001100111101011000100000 ; Claydol
-	.8byte 0b0010100000000111110101001010000111100100010000111000100000 ; Nosepass
-	.8byte 0b0010100010000111100010110010000100010100010000011000100000 ; Torkoal
-	.8byte 0b0011000101001111111100001011111100000100110000111000101101 ; Sableye
-	.8byte 0b1100010000000111100101000010000110000100110011001001100100 ; Barboach
-	.8byte 0b1110110000000111100101000010000110000100110111001001100100 ; Whiscash
-	.8byte 0b1100010000000111100000000010000100000110110011001001100100 ; Luvdisc
-	.8byte 0b0110110100000111101100100011001100000100110011101001100100 ; Corphish
-	.8byte 0b1110110100000111101100100011001100000100110111101001100100 ; Crawdaunt
-	.8byte 0b1100010000000111100000000010000100000100110011001001100100 ; Feebas
-	.8byte 0b1100010000000111100000000010000100010110110111001001100100 ; Milotic
-	.8byte 0b1100010000001111110000000010000100000100110011101001100100 ; Carvanha
-	.8byte 0b1110110000001111110100000010000110000100110111101001110100 ; Sharpedo
-	.8byte 0b0010100000000111100101000010001110001101010100011000100000 ; Trapinch
-	.8byte 0b0010101000010111100101000010001110001101010100011000100000 ; Vibrava
-	.8byte 0b0010101000010111100111010010001110011101010100011000100010 ; Flygon
-	.8byte 0b0010110000000111100100000011001110000100110000011010100001 ; Makuhita
-	.8byte 0b0010110000000111100100000011001110000100110100011010100001 ; Hariyama
-	.8byte 0b0001100000001111100000001010000101110100110000001000110000 ; Electrike
-	.8byte 0b0001100000001111100000001010000101110100110100001000110000 ; Manectric
-	.8byte 0b0010100010000111100111010010001110000100010000011000100000 ; Numel
-	.8byte 0b0010100010000111100111010010001110000100010100011000110000 ; Camerupt
-	.8byte 0b1110110000000111100100000010000110010100110011001001100100 ; Spheal
-	.8byte 0b1110110000000111100100000010000110010100110011001001110100 ; Sealeo
-	.8byte 0b1110110000000111100100000010000110010100110111001001110100 ; Walrein
-	.8byte 0b0001000100000111100001000010000100001101010000011100100001 ; Cacnea
-	.8byte 0b0001100100000111100001000010000100001101010100011100100001 ; Cacturne
-	.8byte 0b0001000000000111100000000010100100000110111011001001100100 ; Snorunt
-	.8byte 0b0001000000000111110000000010100110000110111111101001100100 ; Glalie
-	.8byte 0b0001000000100011100101000110110110000110111101001000101000 ; Lunatone
-	.8byte 0b0001000010100011100111010110110110001110011100011000101000 ; Solrock
-	.8byte 0b0100010000000111100000000010000100010100110011001001100100 ; Azurill
-	.8byte 0b0001000001101111110000001110110100010100111000111000101000 ; Spoink
-	.8byte 0b0001000001101111110000001110110100010100111100111000101001 ; Grumpig
-	.8byte 0b0001000000000111100000001010000101110100111000001000100000 ; Plusle
-	.8byte 0b0001000000000111100000001010000101110100111000001000100000 ; Minun
-	.8byte 0b0010100000000111110111110011000100001100110101111000100001 ; Mawile
-	.8byte 0b0011100000000111100100000111110100000100111000011010101001 ; Meditite
-	.8byte 0b0011100000000111100100000111110100000100111100011010101001 ; Medicham
-	.8byte 0b0000001000011111101000000010000100001110110001011000100000 ; Swablu
-	.8byte 0b0010001000011111101010010010000110011110110101011000110010 ; Altaria
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Wynaut
-	.8byte 0b0001000001101111110000000010110100000100110011111000101000 ; Duskull
-	.8byte 0b0011100001101111110100000010110110000100110111111000101001 ; Dusclops
-	.8byte 0b0001000100000111100000100010100100001101010000011100100000 ; Roselia
-	.8byte 0b0010100100000111101010011011100101101100110011011010100101 ; Slakoth
-	.8byte 0b0010100100000111101010011011100111101100110011111010110101 ; Vigoroth
-	.8byte 0b0010100100000111101010011011100111101100110111111010110101 ; Slaking
-	.8byte 0b0010100001000111100000101010100100001101110001011100100100 ; Gulpin
-	.8byte 0b0010100001000111100000101010100100001101110101011100100100 ; Swalot
-	.8byte 0b0011101100010111101000000010000110001111010100011100110000 ; Tropius
-	.8byte 0b0000000000000111100010011010100100001100110011011000110100 ; Whismur
-	.8byte 0b0010100010000111110010011011100110001100110011111000110100 ; Loudred
-	.8byte 0b0010100010000111110010011011100110001100110111111000110100 ; Exploud
-	.8byte 0b1100010000000111100000000010000100000100110011001001100100 ; Clamperl
-	.8byte 0b1100010001000111100100000010000100000100110111001001100100 ; Huntail
-	.8byte 0b1100010000000111100000000010110100000110110111001001100100 ; Gorebyss
-	.8byte 0b0011100101001111111011011010100101110100110111111001101100 ; Absol
-	.8byte 0b0001000001101111110000001010110101100100110000111000101000 ; Shuppet
-	.8byte 0b0001000001101111110000001010110101100100110100111000101000 ; Banette
-	.8byte 0b0010100001001111100000110010001110010101110000111000100000 ; Seviper
-	.8byte 0b0010100000001111101010011011101101111101110011111000110101 ; Zangoose
-	.8byte 0b1110010000000111100101000010000110000110110111001001101100 ; Relicanth
-	.8byte 0b0010100100000111101101001010001110010100110000011000110100 ; Aron
-	.8byte 0b0010100100000111101101001010001110010100110000011000110100 ; Lairon
-	.8byte 0b0010110100000111101111011011001111111100110111111000110111 ; Aggron
-	.8byte 0b0001000000001111100011011010100101101100110011011001100100 ; Castform
-	.8byte 0b0001000000001111101000001011100101101101111000011000100101 ; Volbeat
-	.8byte 0b0001000000001111101000001011100101101101111000011000100101 ; Illumise
-	.8byte 0b0000000000000111100001100010000100001101010000011100100000 ; Lileep
-	.8byte 0b0010100000000111100101100010000110001101010100011100100000 ; Cradily
-	.8byte 0b0010000100000111101101000011001100000100010000011000100100 ; Anorith
-	.8byte 0b0010100100000111101101000011001110010100010100011000100100 ; Armaldo
-	.8byte 0b0001000001101111110000001110110100100110111000111000101000 ; Ralts
-	.8byte 0b0001000001101111110000001110110100100110111000111000101000 ; Kirlia
-	.8byte 0b0001000001101111110000001110110100100110111100111000101000 ; Gardevoir
-	.8byte 0b0010100100000111101110010011000100000100110000011000110010 ; Bagon
-	.8byte 0b0010100100000111101110010011000100000100110000011000110010 ; Shelgon
-	.8byte 0b0010101100010111101110010011000110010100110100011000110010 ; Salamence
-	.8byte 0b0000000000000000000000000000000000000000000000000000000000 ; Beldum
-	.8byte 0b0011100100000011101101100111110110000100111100011000100000 ; Metang
-	.8byte 0b0011100100000011101101100111110110000100111100011000100000 ; Metagross
-	.8byte 0b0010100000000011100101001011001111100110010100011000100001 ; Regirock
-	.8byte 0b0010100000000011100000001011000111100110110111001001100001 ; Regice
-	.8byte 0b0010100000000011101101001011000111100110110100011000100001 ; Registeel
-	.8byte 0b1110110000000011100100001011000111100110110111001001111100 ; Kyogre
-	.8byte 0b0010100110000011101111011011001111111110010100011010110010 ; Groudon
-	.8byte 0b1110111010000011101011011011000111111100110111011010110110 ; Rayquaza
-	.8byte 0b1101011100010111101001001110110111101110111101011000111110 ; Latias
-	.8byte 0b1101011100010111101001001110110111101110111101011000111110 ; Latios
-	.8byte 0b0001000000100011101001001110110101100110111100011000101100 ; Jirachi
-	.8byte 0b0011100101100011111100001111110101101110111101111000101101 ; Deoxys
-	.8byte 0b0001000001100111110000001110110100000110111000111000101000 ; Chimecho
+gTMHMLearnsets: @ 831E898
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ??????????
+	.8byte 0b0011100100000111100000100010000100001101010000011100100000 @ Bulbasaur
+	.8byte 0b0011100100000111100000100010000100001101010000011100100000 @ Ivysaur
+	.8byte 0b0011100100000111100000100010000110001101010100011100110000 @ Venusaur
+	.8byte 0b0010100110000111101010010011001100010100010000011000100011 @ Charmander
+	.8byte 0b0010100110000111101010010011001100010100010000011000100011 @ Charmeleon
+	.8byte 0b0010101110010111101010010011001110010100010100011000110011 @ Charizard
+	.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Squirtle
+	.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Wartortle
+	.8byte 0b1110110000000111100000000011001110010100110111001001110101 @ Blastoise
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Caterpie
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Metapod
+	.8byte 0b0001000000101111101000000010110100001111110100011000100000 @ Butterfree
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Weedle
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Kakuna
+	.8byte 0b0010000100001111101000100011000100001101010100011000100000 @ Beedrill
+	.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Pidgey
+	.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Pidgeotto
+	.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Pidgeot
+	.8byte 0b0010000100001111100000001010101101110100110011111000100000 @ Rattata
+	.8byte 0b0010100100001111100000001010101101110100110111111000110000 @ Raticate
+	.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Spearow
+	.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Fearow
+	.8byte 0b0000100001001111110000100010001110010101110000011000100000 @ Ekans
+	.8byte 0b0000100001001111110000100010001110010101110100011000100000 @ Arbok
+	.8byte 0b0011100000000111100000001011001101110100111000001000100001 @ Pikachu
+	.8byte 0b0011100000001111100000001011001101110100111100001000100001 @ Raichu
+	.8byte 0b0010100100001111101101000011001110010100010000011000100001 @ Sandshrew
+	.8byte 0b0010100100001111101101000011001110010100010100011000100001 @ Sandslash
+	.8byte 0b0010100100001111101000101010001101110100110011011000100100 @ Nidoran♀
+	.8byte 0b0010100100001111101000101010001101110100110011011000100100 @ Nidorina
+	.8byte 0b0010110100001111111111111011101111110100110111111000110101 @ Nidoqueen
+	.8byte 0b0010100100001111100000101010001101110100110011011000100100 @ Nidoran♂
+	.8byte 0b0010100100001111100000101010001101110100110011011000100100 @ Nidorino
+	.8byte 0b0010110100001111110111111011101111110100110111111000110101 @ Nidoking
+	.8byte 0b0001100001000111100010011111111101111110111011011000101101 @ Clefairy
+	.8byte 0b0001100001000111100010011111111101111110111111011000101101 @ Clefable
+	.8byte 0b0000000010000111100010010010001100010110010000011000110000 @ Vulpix
+	.8byte 0b0000000010000111100010010010001100010110010100011000110000 @ Ninetales
+	.8byte 0b0001100001000111100010011111111101101110111011011000100101 @ Jigglypuff
+	.8byte 0b0001100001000111100010011111111101101110111111011000100101 @ Wigglytuff
+	.8byte 0b0000000001011111111000100010100100000101110000111000100000 @ Zubat
+	.8byte 0b0000000001011111111000100010100100000101110100111000100000 @ Golbat
+	.8byte 0b0001000100000111100000100010000100001101010000011100100000 @ Oddish
+	.8byte 0b0001000100000111100000100010000100001101010000011100100000 @ Gloom
+	.8byte 0b0001000100000111100000100010000100001101010100011100100000 @ Vileplume
+	.8byte 0b0011000100001111101000100010001100001101010000011100100000 @ Paras
+	.8byte 0b0011000100001111101000100010001100001101010100011100100000 @ Parasect
+	.8byte 0b0001000000101111100000100010010100001101010000011000100000 @ Venonat
+	.8byte 0b0001000000101111101000100010010100001101010100011000100000 @ Venomoth
+	.8byte 0b0010000100001111101100100010001110000100010000011000100000 @ Diglett
+	.8byte 0b0010000100001111101100100010001110000100010100011000100000 @ Dugtrio
+	.8byte 0b0001000101001111111000001010101101110100110000111000100100 @ Meowth
+	.8byte 0b0001000101001111111000001010101101110100110100111000110100 @ Persian
+	.8byte 0b1111110000000111101000000011001100010100110011001001101101 @ Psyduck
+	.8byte 0b1111110000000111101000000011001100010100110111001001101101 @ Golduck
+	.8byte 0b0010100010001111101100000011001111110100110000111010100001 @ Mankey
+	.8byte 0b0010100010001111101100000011001111110100110100111010100001 @ Primeape
+	.8byte 0b0010100010001111101010010010001100010100010000011000110000 @ Growlithe
+	.8byte 0b0010100010001111101010010010001100010100010100011000110000 @ Arcanine
+	.8byte 0b1100010000001111100000000010011100000100110011001001100100 @ Poliwag
+	.8byte 0b1110110000001111100000000011011110000100110011001001100101 @ Poliwhirl
+	.8byte 0b1110110000001111100100000011011110000100110111001011100101 @ Poliwrath
+	.8byte 0b0001000001101111110000001110110100010110111000111000101001 @ Abra
+	.8byte 0b0001000001101111110000001110110100010110111000111000101001 @ Kadabra
+	.8byte 0b0001000001101111110000001110110100010110111100111000101001 @ Alakazam
+	.8byte 0b0010100000001111100110010011001110000100110000011010100001 @ Machop
+	.8byte 0b0010100000001111100110010011001110000100110000011010100001 @ Machoke
+	.8byte 0b0010100000001111100110010011001110000100110100011010100001 @ Machamp
+	.8byte 0b0001000100001111100000100010000100001101010000011100100000 @ Bellsprout
+	.8byte 0b0001000100001111100000100010000100001101010000011100100000 @ Weepinbell
+	.8byte 0b0001000100001111100000100010000100001101010100011100100000 @ Victreebel
+	.8byte 0b1100010100001111100000100010000100000101110011001001100100 @ Tentacool
+	.8byte 0b1100010100001111100000100010000100000101110111001001100100 @ Tentacruel
+	.8byte 0b0010100000000111100111010011001110000100010000011000100001 @ Geodude
+	.8byte 0b0010100000000111100111010011001110000100010000011000100001 @ Graveler
+	.8byte 0b0010100000000111100111010011001110000100010100011000110001 @ Golem
+	.8byte 0b0000100010000111100010010010000100011100010000011000100000 @ Ponyta
+	.8byte 0b0000100010000111100010010010000100011100010100011000100000 @ Rapidash
+	.8byte 0b1001110000100111100010010010111110010110110011011001101100 @ Slowpoke
+	.8byte 0b1011110000100111100010010011111110010110110111011001101101 @ Slowbro
+	.8byte 0b0001000000000011100000001110000101100100110000011000100000 @ Magnemite
+	.8byte 0b0001000000000011100000001110000101100100110100011000100000 @ Magneton
+	.8byte 0b0000001100011111101000000010000100010100010000011000100000 @ Farfetch'd
+	.8byte 0b0000001000011111101000000010000100000100010000011000100000 @ Doduo
+	.8byte 0b0000001000011111111000000010000100000100010100111000100000 @ Dodrio
+	.8byte 0b1100010000001111100000000010000100000110110011001001100100 @ Seel
+	.8byte 0b1100010000001111100000000010000100000110110111001001100100 @ Dewgong
+	.8byte 0b0000000000001111110110111010001101100101110000111000100000 @ Grimer
+	.8byte 0b0010100000001111110110111011001101100101110100111000100001 @ Muk
+	.8byte 0b1000010000000111100000000010000100000100110011001001100100 @ Shellder
+	.8byte 0b1000010000000111110000000010000100000100110111001001100100 @ Cloyster
+	.8byte 0b0000000001101111110000100010110100100101110000111000100000 @ Gastly
+	.8byte 0b0000000001101111110000100010110100100101110000111000100000 @ Haunter
+	.8byte 0b0010100001101111110000100011110101100101110100111000100001 @ Gengar
+	.8byte 0b0010100000000111110101000010001110010100010000111000110000 @ Onix
+	.8byte 0b0001000001101111110000000111110100000110111000111000101001 @ Drowzee
+	.8byte 0b0001000001101111110000000111110100000110111100111000101001 @ Hypno
+	.8byte 0b1010110100001111100100000010001100000100110011001001100100 @ Krabby
+	.8byte 0b1010110100001111100100000010001100000100110111001001100100 @ Kingler
+	.8byte 0b0001000000001011110000001010000101100100111000101000100000 @ Voltorb
+	.8byte 0b0001000000001011110000001010000101100100111100101000100000 @ Electrode
+	.8byte 0b0001100000101111100000100110010100001101011000011100100000 @ Exeggcute
+	.8byte 0b0001100000101111100000100110010100001101011100011100100000 @ Exeggutor
+	.8byte 0b0010100000001111101111010011001110010100010011011000100001 @ Cubone
+	.8byte 0b0010100000001111101111010011001110010100010111011000100001 @ Marowak
+	.8byte 0b0010100000001111100100000011000110000100110000011010100001 @ Hitmonlee
+	.8byte 0b0010100000001111100100000011000110000100110000011010100001 @ Hitmonchan
+	.8byte 0b0010110100001111100111011011101111111100110111011000100101 @ Lickitung
+	.8byte 0b0001000000001111110010111010100101100100110000111000100000 @ Koffing
+	.8byte 0b0001000000001111110010111010100101100100110100111000100000 @ Weezing
+	.8byte 0b0010100000001111100111011010001111110100110011011000110000 @ Rhyhorn
+	.8byte 0b0010110100001111100111011011001111110100110111011000110001 @ Rhydon
+	.8byte 0b0011100001100111100111011011110111111110111111011001101101 @ Chansey
+	.8byte 0b0011000100001111100000100010000100001101010100011100100000 @ Tangela
+	.8byte 0b0010110100001111101111011011101111111100110111011001110101 @ Kangaskhan
+	.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Horsea
+	.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Seadra
+	.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Goldeen
+	.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Seaking
+	.8byte 0b1101010000000011100000000110010101100100111011001001100100 @ Staryu
+	.8byte 0b1101010000100011100000000110010101100100111111001001100100 @ Starmie
+	.8byte 0b0001000001101111110000001111110101101110111100111000101001 @ Mr. mime
+	.8byte 0b0010000100011111101000000010000100000100110100011000100000 @ Scyther
+	.8byte 0b0001000000101111110000000111110100000100111111101001101101 @ Jynx
+	.8byte 0b0011100000001111100000001011010101110100111100001000100001 @ Electabuzz
+	.8byte 0b0010100000001111100010010011010100010100010100011000100001 @ Magmar
+	.8byte 0b0010100100001111100100000011001110000100110100011010100001 @ Pinsir
+	.8byte 0b0010110000000111100111011010000111111100110111011000100100 @ Tauros
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Magikarp
+	.8byte 0b1110110000000111110011010010000111100100110111101001110100 @ Gyarados
+	.8byte 0b1110110000000111100000001010010101110110110111001001110100 @ Lapras
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Ditto
+	.8byte 0b0000000000000111100000000010101100010100110000011000100000 @ Eevee
+	.8byte 0b1100010000000111100000000010101100010100110111011001110100 @ Vaporeon
+	.8byte 0b0001000000000111100000001010101101110100110100011000110000 @ Jolteon
+	.8byte 0b0000000010000111100010010010101100010100110100011000110000 @ Flareon
+	.8byte 0b0001000000001011101000001010110101111100110111011000100000 @ Porygon
+	.8byte 0b1110010000001111100101000010000100000100110011001001100100 @ Omanyte
+	.8byte 0b1110010000001111100101000010000100000100110111001001100100 @ Omastar
+	.8byte 0b0110010000001111101101000010001100000101110011001001100100 @ Kabuto
+	.8byte 0b1110010100001111101101000011001100000101110111001001100100 @ Kabutops
+	.8byte 0b0010101000011111111111010010000110010100110100111000110010 @ Aerodactyl
+	.8byte 0b0000110000000111100111011011110111101100110111011000100101 @ Snorlax
+	.8byte 0b0010001000010011101001000110000100000100110111011001110100 @ Articuno
+	.8byte 0b0011001000010011101001001010000101100100111100011000110000 @ Zapdos
+	.8byte 0b0010001010010011101011010010000100000110110100011000110000 @ Moltres
+	.8byte 0b0100010000000111100010011010000101110110110111011001100100 @ Dratini
+	.8byte 0b0100010000000111100010011010000101110110110111011001100100 @ Dragonair
+	.8byte 0b1110111100010111101111011011000111110110110111011001110111 @ Dragonite
+	.8byte 0b0011100001100011111111011111110111111110111111111011101101 @ Mewtwo
+	.8byte 0b1111111111111111111111111111111111111111111111111111111111 @ Mew
+	.8byte 0b0001000100000111100000000110000100011111011000011100100000 @ Chikorita
+	.8byte 0b0011100100000111100000000110000100011111011000011100100000 @ Bayleef
+	.8byte 0b0011100100000111100000000110000110011111011100011100100000 @ Meganium
+	.8byte 0b0000000110000111101010010010001100000100010000011000100000 @ Cyndaquil
+	.8byte 0b0010100110000111101010010011001100000100010000011000110001 @ Quilava
+	.8byte 0b0010100110000111101010010011001110000100010100011000110001 @ Typhlosion
+	.8byte 0b1100010100000111101000000011001100010100110011001001100101 @ Totodile
+	.8byte 0b1110110100000111101000000011001100010100110011001001110101 @ Croconaw
+	.8byte 0b1110110100000111101000000011001110010100110111001001110111 @ Feraligatr
+	.8byte 0b0000010100001111100000011011101100111100110001011000100101 @ Sentret
+	.8byte 0b0010110100001111100000011011101101111100110111011000100101 @ Furret
+	.8byte 0b0001001000011111101000000110110100000100110000011000100000 @ Hoothoot
+	.8byte 0b0001001000011111101000000110110100000100110100011000100000 @ Noctowl
+	.8byte 0b0001000000001111101000000111001100001111011000011000100001 @ Ledyba
+	.8byte 0b0001000000001111101000000111001100001111011100011000100001 @ Ledian
+	.8byte 0b0001000000001111100000100010011100001101010000011000100000 @ Spinarak
+	.8byte 0b0001000000001111100000100010011100001101010100011000100000 @ Ariados
+	.8byte 0b0000001001011111111000100010100100000101110100111000100000 @ Crobat
+	.8byte 0b1101010000000111100000001010000101100100110011001001100100 @ Chinchou
+	.8byte 0b1101010000000111100000001010000101100100110111001001100100 @ Lanturn
+	.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Pichu
+	.8byte 0b0001000000000111100010011110111100011110111000011000100100 @ Cleffa
+	.8byte 0b0001000000000111100010011110111100001110111000011000100100 @ Igglybuff
+	.8byte 0b0011000000000111100010011110110100001110111000011000100100 @ Togepi
+	.8byte 0b0011001000010111101010011111110100001110111100011000100101 @ Togetic
+	.8byte 0b0001000000111111101000000110110100001101111000011000101000 @ Natu
+	.8byte 0b0001001000111111101000000110110100001101111100011000101000 @ Xatu
+	.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Mareep
+	.8byte 0b0011100000000111100000001011000101110100111000001000100001 @ Flaaffy
+	.8byte 0b0011100000000111100000001011000101110100111100001000100001 @ Ampharos
+	.8byte 0b0001000100000111100000100010000100001111010100011100100000 @ Bellossom
+	.8byte 0b1110110000000111100000000011001100010100110011001001100101 @ Marill
+	.8byte 0b1110110000000111100000000011001100010100110111001001100101 @ Azumarill
+	.8byte 0b0010100000001111100101000011001110000100010000111000101001 @ Sudowoodo
+	.8byte 0b1110110000001111100000000011011110000100110111001001100101 @ Politoed
+	.8byte 0b0001000000000111101000000010000100001101010000011100100000 @ Hoppip
+	.8byte 0b0001000000000111101000000010000100001101010000011100100000 @ Skiploom
+	.8byte 0b0001000000000111101000000010000100001101010100011100100000 @ Jumpluff
+	.8byte 0b0010100101001111101000001011101101111100110000111000100101 @ Aipom
+	.8byte 0b0001000100000111100000100010000100001111011000011100100000 @ Sunkern
+	.8byte 0b0001000100000111100000100010000100001111011100011100100000 @ Sunflora
+	.8byte 0b0001000000011111101000000010110100001101010000011000100000 @ Yanma
+	.8byte 0b1111010000000111100001100010001110010100110011001001100100 @ Wooper
+	.8byte 0b1111110000000111100101100011001110010100110111001001100101 @ Quagsire
+	.8byte 0b0001000100100111100000000110111100010100111100011000101000 @ Espeon
+	.8byte 0b0001000101000111110000000010111100010100110100111000100000 @ Umbreon
+	.8byte 0b0000001001011111111000000010100100000100110000111000101000 @ Murkrow
+	.8byte 0b1011110000100111100010010011111110010110110111011001101101 @ Slowking
+	.8byte 0b0001000001101111111000001010110101100100110000111000101000 @ Misdreavus
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Unown
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wobbuffet
+	.8byte 0b0011100000101111100000001110110111110100111000011000101000 @ Girafarig
+	.8byte 0b0010100000000111100001000110001110001101011000011000100000 @ Pineco
+	.8byte 0b0010100000000111100001000110001110001101011100011000100000 @ Forretress
+	.8byte 0b0010100000001111100110011010101111111100110011011000101100 @ Dunsparce
+	.8byte 0b0010100100011111101101100010001110010100110000011000100000 @ Gligar
+	.8byte 0b0010100100000111110101000010001110010100010100111000110000 @ Steelix
+	.8byte 0b0010100010001111110010111011101111101100110000111010110101 @ Snubbull
+	.8byte 0b0010100010001111110110111011101111111100110100111010110101 @ Granbull
+	.8byte 0b1100010000000111100000101010100100000100110011001001100100 @ Qwilfish
+	.8byte 0b0010100100011111101001000010000100000100110100011000100000 @ Scizor
+	.8byte 0b0011100000000111100101100010001110000110010000011000100000 @ Shuckle
+	.8byte 0b0010100100001111100100000011001110000100110100011010100001 @ Heracross
+	.8byte 0b0010110101001111111000000011101100010100110011111001101001 @ Sneasel
+	.8byte 0b0010100100001111111000000011001110000100110000111010110001 @ Teddiursa
+	.8byte 0b0010100100001111111100000011001110000100110100111010110001 @ Ursaring
+	.8byte 0b0010000010000111100010010110000100000100011000011000100000 @ Slugma
+	.8byte 0b0010100010000111100111010110000110000100011100011000100000 @ Magcargo
+	.8byte 0b0010100000000111100101000110001110000100111011001001110000 @ Swinub
+	.8byte 0b0010100000000111100101000110001110000100111111001001110000 @ Piloswine
+	.8byte 0b0010110000000111100101000110111110000110111011011001101100 @ Corsola
+	.8byte 0b1100010000001111100010010010010100000100110111011000100100 @ Remoraid
+	.8byte 0b1100010000001111100010110010010100000100110111011100100100 @ Octillery
+	.8byte 0b0000001000001111101000000010000100000100110011001001100101 @ Delibird
+	.8byte 0b1100010000000111101000000010000110000100110011001001100100 @ Mantine
+	.8byte 0b0010001100011111111001000010000100000100010000111000110000 @ Skarmory
+	.8byte 0b0010000011001111110010110010100100011100010000111000110000 @ Houndour
+	.8byte 0b0010100011001111110010110010100100011100010100111000110000 @ Houndoom
+	.8byte 0b1100010000000111100000000010000100000100110111001001100100 @ Kingdra
+	.8byte 0b0010100000000111100101000010000110010100010000011000110000 @ Phanpy
+	.8byte 0b0010100000000111100101000010000110010100010100011000110000 @ Donphan
+	.8byte 0b0001000000001011101000001010110101111100110111011000100000 @ Porygon2
+	.8byte 0b0001000000101111100000001110110111111100111000011000111000 @ Stantler
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Smeargle
+	.8byte 0b0010100000001111100000000011000110000100110000011010100000 @ Tyrogue
+	.8byte 0b0010100000001111100001000011001110000100110000011010100000 @ Hitmontop
+	.8byte 0b0001000000101111100000000110110100000100111011001001101100 @ Smoochum
+	.8byte 0b0011000000001111100000001011010101100100111000001000100001 @ Elekid
+	.8byte 0b0010000000001111100010010011010100010100010000011000100001 @ Magby
+	.8byte 0b0010110000000111100101001011100111111100110111011000100101 @ Miltank
+	.8byte 0b0011100001100111100111011011110111111110111111011001101101 @ Blissey
+	.8byte 0b0011100100000011100001001110001101110100110100011000111000 @ Raikou
+	.8byte 0b0011100100000011100011010110001100011100110100011000111000 @ Entei
+	.8byte 0b1110010100000011100001000110001100010100110111011001111100 @ Suicune
+	.8byte 0b0010000000000111110001000011001110000100110100111000100000 @ Larvitar
+	.8byte 0b0010000000000111110001000011001110000100110100111000100000 @ Pupitar
+	.8byte 0b0010110100000111111111011011001111110100110111111000110111 @ Tyranitar
+	.8byte 0b1110111000110011101001001110110111110111111111011001111100 @ Lugia
+	.8byte 0b0011101010010011101011011110110111101111111100011000111000 @ Ho-Oh
+	.8byte 0b0001000100100011101001001110110100001111111100011000101100 @ Celebi
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ ?
+	.8byte 0b0011100100000111101100000011001100011111010000011100100001 @ Treecko
+	.8byte 0b0011100100000111101100000011001100011111010000011100100001 @ Grovyle
+	.8byte 0b0011100100000111101100000011001110011111010100011100110011 @ Sceptile
+	.8byte 0b0010100110000111101110010010001100000100010000011000100000 @ Torchic
+	.8byte 0b0010100110000111101110010011001100000100010000011010100001 @ Combusken
+	.8byte 0b0010100110000111101110010011001110000100010100011010110001 @ Blaziken
+	.8byte 0b1110110000000111100100000010001100010100110011001001100100 @ Mudkip
+	.8byte 0b1110110000000111100100000010001110010100110011001001100100 @ Marshtomp
+	.8byte 0b1110110000000111100100000011001110010100110111001001110101 @ Swampert
+	.8byte 0b0010000001001111110000000010101100010100110000111000110000 @ Poochyena
+	.8byte 0b0010100001001111110000000010101100010100110100111000110000 @ Mightyena
+	.8byte 0b0010010100001111100000001010101101110100110011011000100100 @ Zigzagoon
+	.8byte 0b0010110100001111100000001010101101110100110111011000110100 @ Linoone
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wurmple
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Silcoon
+	.8byte 0b0001000000001111101000000010110100001111010100011000100000 @ Beautifly
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Cascoon
+	.8byte 0b0001000000001111101000100010110100001101011100011000100000 @ Dustox
+	.8byte 0b0001010000001111100000000010000100001101110011011101100100 @ Lotad
+	.8byte 0b1111110000001111100000000011000100001101110011011101100100 @ Lombre
+	.8byte 0b1111110000001111100000000011000100001101110111011101100101 @ Ludicolo
+	.8byte 0b0011000000000111100000000010101100001101010000011100100000 @ Seedot
+	.8byte 0b0011100100001111110100000011101100001101010100011100100000 @ Nuzleaf
+	.8byte 0b0011100100001111111100000011101100001101010100011100100000 @ Shiftry
+	.8byte 0b0001000100000011101001000010101100001101010000011000100000 @ Nincada
+	.8byte 0b0001000100001111101001000010101100001101010100011000100000 @ Ninjask
+	.8byte 0b0001000100001011101001000010101100001101010100011000100000 @ Shedinja
+	.8byte 0b0000001000011111101000000010000100000100110000011000100000 @ Taillow
+	.8byte 0b0000001000011111101000000010000100000100110100011000100000 @ Swellow
+	.8byte 0b0001000001000111100000100010000100001111010000011100100000 @ Shroomish
+	.8byte 0b0011100101000111100000100011000100011111010100011110100001 @ Breloom
+	.8byte 0b0011100001101111100100001011111100000110110000011000101101 @ Spinda
+	.8byte 0b0000001000011111101000001010000100000100110011001001100100 @ Wingull
+	.8byte 0b0000011000011111101000001010000100000100110111001001100100 @ Pelipper
+	.8byte 0b0001000000001111100000000010100100001101110011011000100100 @ Surskit
+	.8byte 0b0001000000001111101000000010100100001101110111011000100100 @ Masquerain
+	.8byte 0b1110110000000111100100000010000110000100110011001001110100 @ Wailmer
+	.8byte 0b1110110000000111100100000010000110000100110111001001110100 @ Wailord
+	.8byte 0b0001000000000111100000001010101101111110110011011000101100 @ Skitty
+	.8byte 0b0011100000000111100000001010101101111110110111011000101100 @ Delcatty
+	.8byte 0b0011100101101111101110011011101101111100110011011000100101 @ Kecleon
+	.8byte 0b0001000000100011100101000110111110001100111001011000100000 @ Baltoy
+	.8byte 0b0011100000100011100101000110111110001100111101011000100000 @ Claydol
+	.8byte 0b0010100000000111110101001010000111100100010000111000100000 @ Nosepass
+	.8byte 0b0010100010000111100010110010000100010100010000011000100000 @ Torkoal
+	.8byte 0b0011000101001111111100001011111100000100110000111000101101 @ Sableye
+	.8byte 0b1100010000000111100101000010000110000100110011001001100100 @ Barboach
+	.8byte 0b1110110000000111100101000010000110000100110111001001100100 @ Whiscash
+	.8byte 0b1100010000000111100000000010000100000110110011001001100100 @ Luvdisc
+	.8byte 0b0110110100000111101100100011001100000100110011101001100100 @ Corphish
+	.8byte 0b1110110100000111101100100011001100000100110111101001100100 @ Crawdaunt
+	.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Feebas
+	.8byte 0b1100010000000111100000000010000100010110110111001001100100 @ Milotic
+	.8byte 0b1100010000001111110000000010000100000100110011101001100100 @ Carvanha
+	.8byte 0b1110110000001111110100000010000110000100110111101001110100 @ Sharpedo
+	.8byte 0b0010100000000111100101000010001110001101010100011000100000 @ Trapinch
+	.8byte 0b0010101000010111100101000010001110001101010100011000100000 @ Vibrava
+	.8byte 0b0010101000010111100111010010001110011101010100011000100010 @ Flygon
+	.8byte 0b0010110000000111100100000011001110000100110000011010100001 @ Makuhita
+	.8byte 0b0010110000000111100100000011001110000100110100011010100001 @ Hariyama
+	.8byte 0b0001100000001111100000001010000101110100110000001000110000 @ Electrike
+	.8byte 0b0001100000001111100000001010000101110100110100001000110000 @ Manectric
+	.8byte 0b0010100010000111100111010010001110000100010000011000100000 @ Numel
+	.8byte 0b0010100010000111100111010010001110000100010100011000110000 @ Camerupt
+	.8byte 0b1110110000000111100100000010000110010100110011001001100100 @ Spheal
+	.8byte 0b1110110000000111100100000010000110010100110011001001110100 @ Sealeo
+	.8byte 0b1110110000000111100100000010000110010100110111001001110100 @ Walrein
+	.8byte 0b0001000100000111100001000010000100001101010000011100100001 @ Cacnea
+	.8byte 0b0001100100000111100001000010000100001101010100011100100001 @ Cacturne
+	.8byte 0b0001000000000111100000000010100100000110111011001001100100 @ Snorunt
+	.8byte 0b0001000000000111110000000010100110000110111111101001100100 @ Glalie
+	.8byte 0b0001000000100011100101000110110110000110111101001000101000 @ Lunatone
+	.8byte 0b0001000010100011100111010110110110001110011100011000101000 @ Solrock
+	.8byte 0b0100010000000111100000000010000100010100110011001001100100 @ Azurill
+	.8byte 0b0001000001101111110000001110110100010100111000111000101000 @ Spoink
+	.8byte 0b0001000001101111110000001110110100010100111100111000101001 @ Grumpig
+	.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Plusle
+	.8byte 0b0001000000000111100000001010000101110100111000001000100000 @ Minun
+	.8byte 0b0010100000000111110111110011000100001100110101111000100001 @ Mawile
+	.8byte 0b0011100000000111100100000111110100000100111000011010101001 @ Meditite
+	.8byte 0b0011100000000111100100000111110100000100111100011010101001 @ Medicham
+	.8byte 0b0000001000011111101000000010000100001110110001011000100000 @ Swablu
+	.8byte 0b0010001000011111101010010010000110011110110101011000110010 @ Altaria
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Wynaut
+	.8byte 0b0001000001101111110000000010110100000100110011111000101000 @ Duskull
+	.8byte 0b0011100001101111110100000010110110000100110111111000101001 @ Dusclops
+	.8byte 0b0001000100000111100000100010100100001101010000011100100000 @ Roselia
+	.8byte 0b0010100100000111101010011011100101101100110011011010100101 @ Slakoth
+	.8byte 0b0010100100000111101010011011100111101100110011111010110101 @ Vigoroth
+	.8byte 0b0010100100000111101010011011100111101100110111111010110101 @ Slaking
+	.8byte 0b0010100001000111100000101010100100001101110001011100100100 @ Gulpin
+	.8byte 0b0010100001000111100000101010100100001101110101011100100100 @ Swalot
+	.8byte 0b0011101100010111101000000010000110001111010100011100110000 @ Tropius
+	.8byte 0b0000000000000111100010011010100100001100110011011000110100 @ Whismur
+	.8byte 0b0010100010000111110010011011100110001100110011111000110100 @ Loudred
+	.8byte 0b0010100010000111110010011011100110001100110111111000110100 @ Exploud
+	.8byte 0b1100010000000111100000000010000100000100110011001001100100 @ Clamperl
+	.8byte 0b1100010001000111100100000010000100000100110111001001100100 @ Huntail
+	.8byte 0b1100010000000111100000000010110100000110110111001001100100 @ Gorebyss
+	.8byte 0b0011100101001111111011011010100101110100110111111001101100 @ Absol
+	.8byte 0b0001000001101111110000001010110101100100110000111000101000 @ Shuppet
+	.8byte 0b0001000001101111110000001010110101100100110100111000101000 @ Banette
+	.8byte 0b0010100001001111100000110010001110010101110000111000100000 @ Seviper
+	.8byte 0b0010100000001111101010011011101101111101110011111000110101 @ Zangoose
+	.8byte 0b1110010000000111100101000010000110000110110111001001101100 @ Relicanth
+	.8byte 0b0010100100000111101101001010001110010100110000011000110100 @ Aron
+	.8byte 0b0010100100000111101101001010001110010100110000011000110100 @ Lairon
+	.8byte 0b0010110100000111101111011011001111111100110111111000110111 @ Aggron
+	.8byte 0b0001000000001111100011011010100101101100110011011001100100 @ Castform
+	.8byte 0b0001000000001111101000001011100101101101111000011000100101 @ Volbeat
+	.8byte 0b0001000000001111101000001011100101101101111000011000100101 @ Illumise
+	.8byte 0b0000000000000111100001100010000100001101010000011100100000 @ Lileep
+	.8byte 0b0010100000000111100101100010000110001101010100011100100000 @ Cradily
+	.8byte 0b0010000100000111101101000011001100000100010000011000100100 @ Anorith
+	.8byte 0b0010100100000111101101000011001110010100010100011000100100 @ Armaldo
+	.8byte 0b0001000001101111110000001110110100100110111000111000101000 @ Ralts
+	.8byte 0b0001000001101111110000001110110100100110111000111000101000 @ Kirlia
+	.8byte 0b0001000001101111110000001110110100100110111100111000101000 @ Gardevoir
+	.8byte 0b0010100100000111101110010011000100000100110000011000110010 @ Bagon
+	.8byte 0b0010100100000111101110010011000100000100110000011000110010 @ Shelgon
+	.8byte 0b0010101100010111101110010011000110010100110100011000110010 @ Salamence
+	.8byte 0b0000000000000000000000000000000000000000000000000000000000 @ Beldum
+	.8byte 0b0011100100000011101101100111110110000100111100011000100000 @ Metang
+	.8byte 0b0011100100000011101101100111110110000100111100011000100000 @ Metagross
+	.8byte 0b0010100000000011100101001011001111100110010100011000100001 @ Regirock
+	.8byte 0b0010100000000011100000001011000111100110110111001001100001 @ Regice
+	.8byte 0b0010100000000011101101001011000111100110110100011000100001 @ Registeel
+	.8byte 0b1110110000000011100100001011000111100110110111001001111100 @ Kyogre
+	.8byte 0b0010100110000011101111011011001111111110010100011010110010 @ Groudon
+	.8byte 0b1110111010000011101011011011000111111100110111011010110110 @ Rayquaza
+	.8byte 0b1101011100010111101001001110110111101110111101011000111110 @ Latias
+	.8byte 0b1101011100010111101001001110110111101110111101011000111110 @ Latios
+	.8byte 0b0001000000100011101001001110110101100110111100011000101100 @ Jirachi
+	.8byte 0b0011100101100011111100001111110101101110111101111000101101 @ Deoxys
+	.8byte 0b0001000001100111110000001110110100000110111000111000101000 @ Chimecho
diff --git a/data/trainer_class_name_indices.s b/data/trainer_class_name_indices.s
index e0e858b85..2ba515849 100644
--- a/data/trainer_class_name_indices.s
+++ b/data/trainer_class_name_indices.s
@@ -1,4 +1,4 @@
-gTrainerClassNameIndices: ; 831F5CA
+gTrainerClassNameIndices: @ 831F5CA
 	.byte TRAINER_CLASS_NAME_HIKER
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
diff --git a/data/trainer_parties.s b/data/trainer_parties.s
index bfd13f24a..042b91fcc 100644
--- a/data/trainer_parties.s
+++ b/data/trainer_parties.s
@@ -1,12122 +1,12122 @@
 	.align 2, 0
 
-gTrainerParty_Sawyer1: ; 830B62C
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Sawyer1: @ 830B62C
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt1: ; 830B634
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt1: @ 830B634
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt2: ; 830B63C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Grunt2: @ 830B63C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt3: ; 830B64C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt3: @ 830B64C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt4: ; 830B654
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt4: @ 830B654
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt5: ; 830B65C
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Grunt5: @ 830B65C
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt6: ; 830B664
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Grunt6: @ 830B664
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt7: ; 830B66C
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Grunt7: @ 830B66C
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gabrielle1: ; 830B674
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Gabrielle1: @ 830B674
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SEEDOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt8: ; 830B6A4
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Grunt8: @ 830B6A4
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Marcel: ; 830B6AC
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Marcel: @ 830B6AC
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SHIFTRY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alberto: ; 830B6BC
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Alberto: @ 830B6BC
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ed: ; 830B6CC
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Ed: @ 830B6CC
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ZANGOOSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SEVIPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt9: ; 830B6DC
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Grunt9: @ 830B6DC
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Declan: ; 830B6E4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Declan: @ 830B6E4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt10: ; 830B6EC
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Grunt10: @ 830B6EC
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt11: ; 830B6F4
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Grunt11: @ 830B6F4
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt12: ; 830B704
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Grunt12: @ 830B704
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt13: ; 830B714
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Grunt13: @ 830B714
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt14: ; 830B72C
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Grunt14: @ 830B72C
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt15: ; 830B734
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Grunt15: @ 830B734
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt16: ; 830B744
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt16: @ 830B744
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt17: ; 830B74C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt17: @ 830B74C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt18: ; 830B754
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt18: @ 830B754
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt19: ; 830B75C
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Grunt19: @ 830B75C
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt20: ; 830B76C
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Grunt20: @ 830B76C
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt21: ; 830B774
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt21: @ 830B774
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt22: ; 830B77C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt22: @ 830B77C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fredrick: ; 830B784
-	.2byte 100 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Fredrick: @ 830B784
+	.2byte 100 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Matt: ; 830B794
-	.2byte 50 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Matt: @ 830B794
+	.2byte 50 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GOLBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Zander: ; 830B7A4
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Zander: @ 830B7A4
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelly1: ; 830B7AC
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Shelly1: @ 830B7AC
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelly2: ; 830B7BC
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Shelly2: @ 830B7BC
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Archie: ; 830B7CC
-	.2byte 150 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Archie: @ 830B7CC
+	.2byte 150 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_CROBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leah: ; 830B7E4
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Leah: @ 830B7E4
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Daisy: ; 830B7EC
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Daisy: @ 830B7EC
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rose1: ; 830B7FC
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Rose1: @ 830B7FC
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Felix: ; 830B814
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Felix: @ 830B814
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Violet: ; 830B834
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Violet: @ 830B834
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rose2: ; 830B844
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Rose2: @ 830B844
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rose3: ; 830B854
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Rose3: @ 830B854
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rose4: ; 830B86C
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Rose4: @ 830B86C
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rose5: ; 830B884
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Rose5: @ 830B884
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dusty1: ; 830B89C
-	.2byte 50 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Dusty1: @ 830B89C
+	.2byte 50 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chip: ; 830B8AC
-	.2byte 50 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Chip: @ 830B8AC
+	.2byte 50 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Foster: ; 830B8DC
-	.2byte 100 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Foster: @ 830B8DC
+	.2byte 100 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dusty2: ; 830B8FC
-	.2byte 60 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Dusty2: @ 830B8FC
+	.2byte 60 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dusty3: ; 830B90C
-	.2byte 70 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Dusty3: @ 830B90C
+	.2byte 70 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dusty4: ; 830B91C
-	.2byte 80 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Dusty4: @ 830B91C
+	.2byte 80 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dusty5: ; 830B92C
-	.2byte 90 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Dusty5: @ 830B92C
+	.2byte 90 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SANDSLASH
 	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy1: ; 830B93C
-	.2byte 50 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_GabbyAndTy1: @ 830B93C
+	.2byte 50 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_WHISMUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy2: ; 830B94C
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_GabbyAndTy2: @ 830B94C
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy3: ; 830B95C
-	.2byte 150 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_GabbyAndTy3: @ 830B95C
+	.2byte 150 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy4: ; 830B96C
-	.2byte 200 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_GabbyAndTy4: @ 830B96C
+	.2byte 200 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy5: ; 830B97C
-	.2byte 250 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_GabbyAndTy5: @ 830B97C
+	.2byte 250 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GabbyAndTy6: ; 830B98C
-	.2byte 250 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_GabbyAndTy6: @ 830B98C
+	.2byte 250 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_EXPLOUD
 	.2byte MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lola1: ; 830B9AC
-	.2byte 10 ; IV (0-255)
-	.2byte 12 ; level
+gTrainerParty_Lola1: @ 830B9AC
+	.2byte 10 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_AZURILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_AZURILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Austina: ; 830B9BC
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Austina: @ 830B9BC
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gwen: ; 830B9C4
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Gwen: @ 830B9C4
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lola2: ; 830B9CC
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Lola2: @ 830B9CC
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lola3: ; 830B9DC
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Lola3: @ 830B9DC
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lola4: ; 830B9EC
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Lola4: @ 830B9EC
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lola5: ; 830B9FC
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Lola5: @ 830B9FC
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ricky1: ; 830BA0C
-	.2byte 10 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Ricky1: @ 830BA0C
+	.2byte 10 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Simon: ; 830BA1C
-	.2byte 0 ; IV (0-255)
-	.2byte 12 ; level
+gTrainerParty_Simon: @ 830BA1C
+	.2byte 0 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_AZURILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Charlie: ; 830BA2C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Charlie: @ 830BA2C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ricky2: ; 830BA34
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Ricky2: @ 830BA34
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ricky3: ; 830BA44
-	.2byte 20 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Ricky3: @ 830BA44
+	.2byte 20 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ricky4: ; 830BA54
-	.2byte 30 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Ricky4: @ 830BA54
+	.2byte 30 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ricky5: ; 830BA64
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Ricky5: @ 830BA64
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Randall: ; 830BA74
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Randall: @ 830BA74
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SWELLOW
 	.2byte ITEM_NONE
 	.2byte MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Parker: ; 830BA84
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Parker: @ 830BA84
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_George: ; 830BA94
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_George: @ 830BA94
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SLAKOTH
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Berke: ; 830BAA4
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Berke: @ 830BAA4
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_VIGOROTH
 	.2byte ITEM_NONE
 	.2byte MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Braxton: ; 830BAB4
-	.2byte 100 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Braxton: @ 830BAB4
+	.2byte 100 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SWELLOW
 	.2byte MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_TRAPINCH
 	.2byte MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SHIFTRY
 	.2byte MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Vincent: ; 830BB04
-	.2byte 100 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Vincent: @ 830BB04
+	.2byte 100 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leroy: ; 830BB1C
-	.2byte 100 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Leroy: @ 830BB1C
+	.2byte 100 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_MAWILE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wilton1: ; 830BB2C
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Wilton1: @ 830BB2C
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edgar: ; 830BB44
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Edgar: @ 830BB44
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CACTURNE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Albert: ; 830BB54
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Albert: @ 830BB54
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MUK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Samuel: ; 830BB64
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Samuel: @ 830BB64
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_MAWILE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Vito: ; 830BB7C
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Vito: @ 830BB7C
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_ELECTRODE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SHIFTRY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Owen: ; 830BB9C
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Owen: @ 830BB9C
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_KECLEON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_WAILORD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wilton2: ; 830BBB4
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Wilton2: @ 830BBB4
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wilton3: ; 830BBCC
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Wilton3: @ 830BBCC
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wilton4: ; 830BBE4
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Wilton4: @ 830BBE4
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wilton5: ; 830BBFC
-	.2byte 140 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Wilton5: @ 830BBFC
+	.2byte 140 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Warren: ; 830BC14
-	.2byte 100 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Warren: @ 830BC14
+	.2byte 100 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mary: ; 830BC24
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Mary: @ 830BC24
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte ITEM_NONE
 	.2byte MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Alexia: ; 830BC34
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Alexia: @ 830BC34
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WIGGLYTUFF
 	.2byte ITEM_NONE
 	.2byte MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Jody: ; 830BC44
-	.2byte 255 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Jody: @ 830BC44
+	.2byte 255 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ZANGOOSE
 	.2byte ITEM_NONE
 	.2byte MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Wendy: ; 830BC54
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Wendy: @ 830BC54
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MAWILE
 	.2byte MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Keira: ; 830BC84
-	.2byte 100 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Keira: @ 830BC84
+	.2byte 100 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_LAIRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brooke1: ; 830BC94
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Brooke1: @ 830BC94
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jennifer: ; 830BCAC
-	.2byte 200 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Jennifer: @ 830BCAC
+	.2byte 200 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hope: ; 830BCB4
-	.2byte 100 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Hope: @ 830BCB4
+	.2byte 100 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shannon: ; 830BCBC
-	.2byte 100 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Shannon: @ 830BCBC
+	.2byte 100 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_CLAYDOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Michelle: ; 830BCC4
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Michelle: @ 830BCC4
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_TORKOAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Caroline: ; 830BCDC
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Caroline: @ 830BCDC
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Julie: ; 830BCEC
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Julie: @ 830BCEC
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_NINETALES
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brooke2: ; 830BD04
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Brooke2: @ 830BD04
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brooke3: ; 830BD1C
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Brooke3: @ 830BD1C
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brooke4: ; 830BD34
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Brooke4: @ 830BD34
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brooke5: ; 830BD4C
-	.2byte 140 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Brooke5: @ 830BD4C
+	.2byte 140 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Patricia: ; 830BD64
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Patricia: @ 830BD64
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_BANETTE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kindra: ; 830BD74
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Kindra: @ 830BD74
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_DUSKULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SHUPPET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tammy: ; 830BD84
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Tammy: @ 830BD84
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_DUSKULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SHUPPET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Valerie1: ; 830BD94
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Valerie1: @ 830BD94
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tasha: ; 830BD9C
-	.2byte 50 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Tasha: @ 830BD9C
+	.2byte 50 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SHUPPET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Valerie2: ; 830BDA4
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Valerie2: @ 830BDA4
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Valerie3: ; 830BDB4
-	.2byte 20 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Valerie3: @ 830BDB4
+	.2byte 20 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Valerie4: ; 830BDC4
-	.2byte 30 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Valerie4: @ 830BDC4
+	.2byte 30 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Valerie5: ; 830BDD4
-	.2byte 40 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Valerie5: @ 830BDD4
+	.2byte 40 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_DUSKULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_GRUMPIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cindy1: ; 830BDEC
-	.2byte 0 ; IV (0-255)
-	.2byte 7 ; level
+gTrainerParty_Cindy1: @ 830BDEC
+	.2byte 0 @ IV (0-255)
+	.2byte 7 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Daphne: ; 830BDF4
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Daphne: @ 830BDF4
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LUVDISC
 	.2byte ITEM_NUGGET
 	.2byte MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LUVDISC
 	.2byte ITEM_NUGGET
 	.2byte MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE
 
 	.align 2, 0
 
-gTrainerParty_Grunt23: ; 830BE14
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Grunt23: @ 830BE14
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cindy2: ; 830BE2C
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Cindy2: @ 830BE2C
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_NUGGET
 	.2byte MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Brianna: ; 830BE3C
-	.2byte 150 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Brianna: @ 830BE3C
+	.2byte 150 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_SEAKING
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Naomi: ; 830BE44
-	.2byte 100 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Naomi: @ 830BE44
+	.2byte 100 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Cindy3: ; 830BE4C
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Cindy3: @ 830BE4C
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Cindy4: ; 830BE54
-	.2byte 20 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Cindy4: @ 830BE54
+	.2byte 20 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Cindy5: ; 830BE5C
-	.2byte 30 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Cindy5: @ 830BE5C
+	.2byte 30 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Cindy6: ; 830BE64
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Cindy6: @ 830BE64
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 	.2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
 
 	.align 2, 0
 
-gTrainerParty_Melissa: ; 830BE74
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Melissa: @ 830BE74
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sheila: ; 830BE7C
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Sheila: @ 830BE7C
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shirley: ; 830BE84
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Shirley: @ 830BE84
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jessica1: ; 830BE8C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Jessica1: @ 830BE8C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Connie: ; 830BEAC
-	.2byte 100 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Connie: @ 830BEAC
+	.2byte 100 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bridget: ; 830BEB4
-	.2byte 150 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Bridget: @ 830BEB4
+	.2byte 150 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Olivia: ; 830BEBC
-	.2byte 100 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Olivia: @ 830BEBC
+	.2byte 100 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_CLAMPERL
 	.2byte MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_CORPHISH
 	.2byte MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LOMBRE
 	.2byte MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tiffany: ; 830BEEC
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Tiffany: @ 830BEEC
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jessica2: ; 830BEFC
-	.2byte 10 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Jessica2: @ 830BEFC
+	.2byte 10 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jessica3: ; 830BF1C
-	.2byte 20 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Jessica3: @ 830BF1C
+	.2byte 20 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jessica4: ; 830BF3C
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Jessica4: @ 830BF3C
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jessica5: ; 830BF5C
-	.2byte 40 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Jessica5: @ 830BF5C
+	.2byte 40 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_SEVIPER
 	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Winston1: ; 830BF7C
-	.2byte 0 ; IV (0-255)
-	.2byte 7 ; level
+gTrainerParty_Winston1: @ 830BF7C
+	.2byte 0 @ IV (0-255)
+	.2byte 7 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Mollie: ; 830BF84
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Mollie: @ 830BF84
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WHISCASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Garret: ; 830BF94
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Garret: @ 830BF94
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_AZUMARILL
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Winston2: ; 830BF9C
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Winston2: @ 830BF9C
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Winston3: ; 830BFA4
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Winston3: @ 830BFA4
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Winston4: ; 830BFAC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Winston4: @ 830BFAC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Winston5: ; 830BFB4
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Winston5: @ 830BFB4
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NUGGET
 	.2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
 
 	.align 2, 0
 
-gTrainerParty_Steve1: ; 830BFC4
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Steve1: @ 830BFC4
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thalia1: ; 830BFCC
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Thalia1: @ 830BFCC
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_HORSEA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mark: ; 830BFDC
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Mark: @ 830BFDC
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_RHYHORN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt24: ; 830BFE4
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+gTrainerParty_Grunt24: @ 830BFE4
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Steve2: ; 830BFEC
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Steve2: @ 830BFEC
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_LAIRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Steve3: ; 830BFF4
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Steve3: @ 830BFF4
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LAIRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_RHYHORN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Steve4: ; 830C004
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Steve4: @ 830C004
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LAIRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_RHYHORN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Steve5: ; 830C014
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Steve5: @ 830C014
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_AGGRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_RHYDON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Luis: ; 830C024
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Luis: @ 830C024
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dominik: ; 830C02C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Dominik: @ 830C02C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Douglas: ; 830C034
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Douglas: @ 830C034
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Darrin: ; 830C044
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Darrin: @ 830C044
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tony1: ; 830C05C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Tony1: @ 830C05C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jerome: ; 830C064
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Jerome: @ 830C064
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Matthew: ; 830C06C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Matthew: @ 830C06C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_David: ; 830C074
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_David: @ 830C074
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Spencer: ; 830C084
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Spencer: @ 830C084
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Roland: ; 830C094
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Roland: @ 830C094
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nolen: ; 830C09C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Nolen: @ 830C09C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Stan: ; 830C0A4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Stan: @ 830C0A4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_HORSEA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Barry: ; 830C0AC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Barry: @ 830C0AC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dean: ; 830C0B4
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Dean: @ 830C0B4
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rodney: ; 830C0CC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Rodney: @ 830C0CC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Richard: ; 830C0D4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Richard: @ 830C0D4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Herman: ; 830C0DC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Herman: @ 830C0DC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Santiago: ; 830C0EC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Santiago: @ 830C0EC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gilbert: ; 830C0FC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Gilbert: @ 830C0FC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Franklin: ; 830C104
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Franklin: @ 830C104
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SEALEO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kevin: ; 830C10C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Kevin: @ 830C10C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jack: ; 830C114
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jack: @ 830C114
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dudley: ; 830C11C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Dudley: @ 830C11C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chad: ; 830C134
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Chad: @ 830C134
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tony2: ; 830C144
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Tony2: @ 830C144
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tony3: ; 830C14C
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Tony3: @ 830C14C
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tony4: ; 830C154
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Tony4: @ 830C154
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tony5: ; 830C164
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Tony5: @ 830C164
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Takao: ; 830C174
-	.2byte 127 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Takao: @ 830C174
+	.2byte 127 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hitoshi: ; 830C17C
-	.2byte 50 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Hitoshi: @ 830C17C
+	.2byte 50 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kiyo: ; 830C18C
-	.2byte 100 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Kiyo: @ 830C18C
+	.2byte 100 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koichi: ; 830C194
-	.2byte 100 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Koichi: @ 830C194
+	.2byte 100 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nob1: ; 830C1A4
-	.2byte 100 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Nob1: @ 830C1A4
+	.2byte 100 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nob2: ; 830C1AC
-	.2byte 110 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Nob2: @ 830C1AC
+	.2byte 110 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nob3: ; 830C1B4
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Nob3: @ 830C1B4
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nob4: ; 830C1C4
-	.2byte 130 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Nob4: @ 830C1C4
+	.2byte 130 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nob5: ; 830C1DC
-	.2byte 140 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Nob5: @ 830C1DC
+	.2byte 140 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOP
 	.2byte ITEM_NONE
 
-	.2byte 140 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOKE
 	.2byte ITEM_NONE
 
-	.2byte 140 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOKE
 	.2byte ITEM_NONE
 
-	.2byte 140 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHAMP
 	.2byte ITEM_BLACK_BELT
 
 	.align 2, 0
 
-gTrainerParty_Yuji: ; 830C1FC
-	.2byte 100 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Yuji: @ 830C1FC
+	.2byte 100 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Daisuke: ; 830C20C
-	.2byte 100 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Daisuke: @ 830C20C
+	.2byte 100 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Atsushi: ; 830C214
-	.2byte 100 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Atsushi: @ 830C214
+	.2byte 100 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kirk: ; 830C21C
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Kirk: @ 830C21C
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ELECTRIKE
 	.2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_VOLTORB
 	.2byte MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt25: ; 830C23C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Grunt25: @ 830C23C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt26: ; 830C24C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt26: @ 830C24C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shawn: ; 830C254
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Shawn: @ 830C254
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fernando1: ; 830C264
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Fernando1: @ 830C264
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dalton1: ; 830C274
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Dalton1: @ 830C274
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_WHISMUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dalton2: ; 830C284
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Dalton2: @ 830C284
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WHISMUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dalton3: ; 830C29C
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Dalton3: @ 830C29C
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dalton4: ; 830C2B4
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Dalton4: @ 830C2B4
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dalton5: ; 830C2CC
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Dalton5: @ 830C2CC
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_EXPLOUD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cole: ; 830C2E4
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Cole: @ 830C2E4
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeff: ; 830C2EC
-	.2byte 100 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Jeff: @ 830C2EC
+	.2byte 100 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Axle: ; 830C2FC
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Axle: @ 830C2FC
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jace: ; 830C304
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Jace: @ 830C304
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Keegan: ; 830C30C
-	.2byte 120 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Keegan: @ 830C30C
+	.2byte 120 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bernie1: ; 830C314
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Bernie1: @ 830C314
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bernie2: ; 830C324
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Bernie2: @ 830C324
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bernie3: ; 830C334
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Bernie3: @ 830C334
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bernie4: ; 830C344
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Bernie4: @ 830C344
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bernie5: ; 830C354
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Bernie5: @ 830C354
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MAGCARGO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Drew: ; 830C364
-	.2byte 0 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Drew: @ 830C364
+	.2byte 0 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Beau: ; 830C374
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Beau: @ 830C374
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Larry: ; 830C3A4
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Larry: @ 830C3A4
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shane: ; 830C3AC
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Shane: @ 830C3AC
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Justin: ; 830C3BC
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Justin: @ 830C3BC
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_KECLEON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ethan1: ; 830C3C4
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+gTrainerParty_Ethan1: @ 830C3C4
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Autumn: ; 830C3D4
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Autumn: @ 830C3D4
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Travis: ; 830C3DC
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Travis: @ 830C3DC
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ethan2: ; 830C3E4
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Ethan2: @ 830C3E4
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ethan3: ; 830C3F4
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Ethan3: @ 830C3F4
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ethan4: ; 830C404
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Ethan4: @ 830C404
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ethan5: ; 830C41C
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Ethan5: @ 830C41C
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brent: ; 830C434
-	.2byte 100 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Brent: @ 830C434
+	.2byte 100 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Donald: ; 830C43C
-	.2byte 100 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Donald: @ 830C43C
+	.2byte 100 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_SILCOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Taylor: ; 830C454
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Taylor: @ 830C454
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_CASCOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeffrey1: ; 830C46C
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Jeffrey1: @ 830C46C
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Derek: ; 830C484
-	.2byte 150 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Derek: @ 830C484
+	.2byte 150 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeffrey2: ; 830C494
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Jeffrey2: @ 830C494
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeffrey3: ; 830C4AC
-	.2byte 20 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jeffrey3: @ 830C4AC
+	.2byte 20 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MASQUERAIN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeffrey4: ; 830C4C4
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Jeffrey4: @ 830C4C4
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MASQUERAIN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jeffrey5: ; 830C4E4
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Jeffrey5: @ 830C4E4
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SURSKIT
 	.2byte ITEM_NONE
 
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_DUSTOX
 	.2byte ITEM_NONE
 
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SURSKIT
 	.2byte ITEM_NONE
 
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MASQUERAIN
 	.2byte ITEM_SILVER_POWDER
 
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_BEAUTIFLY
 	.2byte ITEM_NONE
 
 	.align 2, 0
 
-gTrainerParty_Edward: ; 830C50C
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Edward: @ 830C50C
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_ABRA
 	.2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Preston: ; 830C51C
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Preston: @ 830C51C
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Virgil: ; 830C524
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Virgil: @ 830C524
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Blake: ; 830C52C
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Blake: @ 830C52C
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_GIRAFARIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_William: ; 830C534
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_William: @ 830C534
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Joshua: ; 830C54C
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Joshua: @ 830C54C
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cameron1: ; 830C55C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Cameron1: @ 830C55C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cameron2: ; 830C564
-	.2byte 10 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Cameron2: @ 830C564
+	.2byte 10 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cameron3: ; 830C574
-	.2byte 20 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Cameron3: @ 830C574
+	.2byte 20 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cameron4: ; 830C584
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Cameron4: @ 830C584
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cameron5: ; 830C594
-	.2byte 40 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Cameron5: @ 830C594
+	.2byte 40 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_SOLROCK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ALAKAZAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jaclyn: ; 830C5A4
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Jaclyn: @ 830C5A4
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_ABRA
 	.2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hannah: ; 830C5B4
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Hannah: @ 830C5B4
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Samantha: ; 830C5BC
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Samantha: @ 830C5BC
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maura: ; 830C5C4
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Maura: @ 830C5C4
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kayla: ; 830C5CC
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Kayla: @ 830C5CC
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WOBBUFFET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alexis: ; 830C5E4
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Alexis: @ 830C5E4
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacki1: ; 830C5F4
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Jacki1: @ 830C5F4
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacki2: ; 830C604
-	.2byte 10 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jacki2: @ 830C604
+	.2byte 10 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacki3: ; 830C614
-	.2byte 20 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Jacki3: @ 830C614
+	.2byte 20 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacki4: ; 830C624
-	.2byte 30 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Jacki4: @ 830C624
+	.2byte 30 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacki5: ; 830C634
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Jacki5: @ 830C634
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_LUNATONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_ALAKAZAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Walter1: ; 830C644
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Walter1: @ 830C644
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Micah: ; 830C64C
-	.2byte 0 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Micah: @ 830C64C
+	.2byte 0 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thomas: ; 830C65C
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Thomas: @ 830C65C
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ZANGOOSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Walter2: ; 830C664
-	.2byte 10 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Walter2: @ 830C664
+	.2byte 10 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Walter3: ; 830C66C
-	.2byte 20 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Walter3: @ 830C66C
+	.2byte 20 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Walter4: ; 830C68C
-	.2byte 30 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Walter4: @ 830C68C
+	.2byte 30 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Walter5: ; 830C6AC
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Walter5: @ 830C6AC
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_GOLDUCK
 	.2byte MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sidney: ; 830C6DC
-	.2byte 250 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Sidney: @ 830C6DC
+	.2byte 250 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_MIGHTYENA
 	.2byte ITEM_NONE
 	.2byte MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH
 
-	.2byte 250 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_SHIFTRY
 	.2byte ITEM_NONE
 	.2byte MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY
 
-	.2byte 250 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_CACTURNE
 	.2byte ITEM_NONE
 	.2byte MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE
 
-	.2byte 250 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_ABSOL
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH
 
 	.align 2, 0
 
-gTrainerParty_Phoebe: ; 830C72C
-	.2byte 250 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_Phoebe: @ 830C72C
+	.2byte 250 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_DUSCLOPS
 	.2byte ITEM_NONE
 	.2byte MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT
 
-	.2byte 250 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_BANETTE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK
 
-	.2byte 250 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_SABLEYE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK
 
-	.2byte 250 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_BANETTE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_DUSCLOPS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Glacia: ; 830C77C
-	.2byte 250 ; IV (0-255)
-	.2byte 50 ; level
+gTrainerParty_Glacia: @ 830C77C
+	.2byte 250 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_SEALEO
 	.2byte ITEM_NONE
 	.2byte MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL
 
-	.2byte 250 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_GLALIE
 	.2byte ITEM_NONE
 	.2byte MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM
 
-	.2byte 250 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_SEALEO
 	.2byte ITEM_NONE
 	.2byte MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD
 
-	.2byte 250 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_GLALIE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_WALREIN
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD
 
 	.align 2, 0
 
-gTrainerParty_Drake: ; 830C7CC
-	.2byte 250 ; IV (0-255)
-	.2byte 52 ; level
+gTrainerParty_Drake: @ 830C7CC
+	.2byte 250 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_SHELGON
 	.2byte ITEM_NONE
 	.2byte MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE
 
-	.2byte 250 ; IV (0-255)
-	.2byte 54 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 54 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_NONE
 	.2byte MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
 
-	.2byte 250 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_NONE
 	.2byte MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM
 
-	.2byte 250 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_FLYGON
 	.2byte ITEM_NONE
 	.2byte MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_SALAMENCE
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH
 
 	.align 2, 0
 
-gTrainerParty_Roxanne1: ; 830C81C
-	.2byte 100 ; IV (0-255)
-	.2byte 12 ; level
+gTrainerParty_Roxanne1: @ 830C81C
+	.2byte 100 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_GEODUDE
 	.2byte ITEM_NONE
 	.2byte MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
 
-	.2byte 100 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_GEODUDE
 	.2byte ITEM_NONE
 	.2byte MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
 
-	.2byte 200 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_NOSEPASS
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB
 
 	.align 2, 0
 
-gTrainerParty_Brawly1: ; 830C84C
-	.2byte 100 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Brawly1: @ 830C84C
+	.2byte 100 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MACHOP
 	.2byte ITEM_NONE
 	.2byte MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP
 
-	.2byte 100 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte ITEM_NONE
 	.2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP
 
-	.2byte 200 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_MAKUHITA
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP
 
 	.align 2, 0
 
-gTrainerParty_Wattson1: ; 830C87C
-	.2byte 200 ; IV (0-255)
-	.2byte 20 ; level
+gTrainerParty_Wattson1: @ 830C87C
+	.2byte 200 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_VOLTORB
 	.2byte ITEM_NONE
 	.2byte MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE
 
-	.2byte 200 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_ELECTRIKE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL
 
-	.2byte 220 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 220 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte ITEM_NONE
 	.2byte MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
 
-	.2byte 250 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL
 
 	.align 2, 0
 
-gTrainerParty_Flannery1: ; 830C8BC
-	.2byte 200 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Flannery1: @ 830C8BC
+	.2byte 200 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_NUMEL
 	.2byte ITEM_NONE
 	.2byte MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
 
-	.2byte 200 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_SLUGMA
 	.2byte ITEM_NONE
 	.2byte MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
 
-	.2byte 250 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte ITEM_NONE
 	.2byte MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT
 
-	.2byte 250 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_TORKOAL
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Norman1: ; 830C8FC
-	.2byte 200 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Norman1: @ 830C8FC
+	.2byte 200 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE
 
-	.2byte 200 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_VIGOROTH
 	.2byte ITEM_NONE
 	.2byte MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK
 
-	.2byte 200 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NONE
 	.2byte MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT
 
-	.2byte 250 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK
 
 	.align 2, 0
 
-gTrainerParty_Winona1: ; 830C93C
-	.2byte 210 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Winona1: @ 830C93C
+	.2byte 210 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SWABLU
 	.2byte ITEM_NONE
 	.2byte MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
 
-	.2byte 210 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 210 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_TROPIUS
 	.2byte ITEM_NONE
 	.2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS
 
-	.2byte 210 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 210 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
 
-	.2byte 220 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 220 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
 
 	.align 2, 0
 
-gTrainerParty_TateAndLiza1: ; 830C98C
-	.2byte 250 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_TateAndLiza1: @ 830C98C
+	.2byte 250 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
 
-	.2byte 250 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_XATU
 	.2byte ITEM_NONE
 	.2byte MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
 
-	.2byte 250 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND
 
-	.2byte 250 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
 
 	.align 2, 0
 
-gTrainerParty_Juan1: ; 830C9CC
-	.2byte 200 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Juan1: @ 830C9CC
+	.2byte 200 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_LUVDISC
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL
 
-	.2byte 200 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE
 
-	.2byte 200 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SEALEO
 	.2byte ITEM_NONE
 	.2byte MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE
 
-	.2byte 200 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER
 
-	.2byte 250 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
 
 	.align 2, 0
 
-gTrainerParty_Jerry1: ; 830CA1C
-	.2byte 10 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Jerry1: @ 830CA1C
+	.2byte 10 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ted: ; 830CA24
-	.2byte 10 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Ted: @ 830CA24
+	.2byte 10 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Paul: ; 830CA2C
-	.2byte 10 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Paul: @ 830CA2C
+	.2byte 10 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_ODDISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jerry2: ; 830CA44
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Jerry2: @ 830CA44
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jerry3: ; 830CA54
-	.2byte 30 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Jerry3: @ 830CA54
+	.2byte 30 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jerry4: ; 830CA64
-	.2byte 40 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Jerry4: @ 830CA64
+	.2byte 40 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jerry5: ; 830CA74
-	.2byte 50 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jerry5: @ 830CA74
+	.2byte 50 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_BANETTE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Karen1: ; 830CA8C
-	.2byte 10 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Karen1: @ 830CA8C
+	.2byte 10 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Georgia: ; 830CA94
-	.2byte 10 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Georgia: @ 830CA94
+	.2byte 10 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Karen2: ; 830CAA4
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Karen2: @ 830CAA4
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WHISMUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Karen3: ; 830CAB4
-	.2byte 30 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Karen3: @ 830CAB4
+	.2byte 30 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Karen4: ; 830CAC4
-	.2byte 40 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Karen4: @ 830CAC4
+	.2byte 40 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Karen5: ; 830CAD4
-	.2byte 50 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Karen5: @ 830CAD4
+	.2byte 50 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_EXPLOUD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KateAndJoy: ; 830CAE4
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_KateAndJoy: @ 830CAE4
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SPINDA
 	.2byte MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AnnaAndMeg1: ; 830CB04
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_AnnaAndMeg1: @ 830CB04
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AnnaAndMeg2: ; 830CB24
-	.2byte 10 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_AnnaAndMeg2: @ 830CB24
+	.2byte 10 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AnnaAndMeg3: ; 830CB44
-	.2byte 20 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_AnnaAndMeg3: @ 830CB44
+	.2byte 20 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AnnaAndMeg4: ; 830CB64
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_AnnaAndMeg4: @ 830CB64
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MAKUHITA
 	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AnnaAndMeg5: ; 830CB84
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_AnnaAndMeg5: @ 830CB84
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LINOONE
 	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Victor: ; 830CBA4
-	.2byte 25 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Victor: @ 830CBA4
+	.2byte 25 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_TAILLOW
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 25 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 25 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Miguel1: ; 830CBB4
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Miguel1: @ 830CBB4
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Colton: ; 830CBBC
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Colton: @ 830CBBC
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
-	.2byte 0 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
-	.2byte 0 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
-	.2byte 0 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
 
 	.align 2, 0
 
-gTrainerParty_Miguel2: ; 830CC1C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Miguel2: @ 830CC1C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Miguel3: ; 830CC24
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Miguel3: @ 830CC24
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SKITTY
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Miguel4: ; 830CC2C
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Miguel4: @ 830CC2C
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Miguel5: ; 830CC34
-	.2byte 0 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Miguel5: @ 830CC34
+	.2byte 0 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte ITEM_SITRUS_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Victoria: ; 830CC3C
-	.2byte 50 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Victoria: @ 830CC3C
+	.2byte 50 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Vanessa: ; 830CC44
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Vanessa: @ 830CC44
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_PIKACHU
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Bethany: ; 830CC4C
-	.2byte 100 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Bethany: @ 830CC4C
+	.2byte 100 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_AZURILL
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MARILL
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_AZUMARILL
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Isabel1: ; 830CC64
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Isabel1: @ 830CC64
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Isabel2: ; 830CC74
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Isabel2: @ 830CC74
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Isabel3: ; 830CC84
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Isabel3: @ 830CC84
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Isabel4: ; 830CC94
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Isabel4: @ 830CC94
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Isabel5: ; 830CCA4
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Isabel5: @ 830CCA4
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_SITRUS_BERRY
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_SITRUS_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Timothy1: ; 830CCB4
-	.2byte 200 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Timothy1: @ 830CCB4
+	.2byte 200 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Timothy2: ; 830CCBC
-	.2byte 210 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Timothy2: @ 830CCBC
+	.2byte 210 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Timothy3: ; 830CCCC
-	.2byte 220 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Timothy3: @ 830CCCC
+	.2byte 220 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Timothy4: ; 830CCDC
-	.2byte 230 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Timothy4: @ 830CCDC
+	.2byte 230 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Timothy5: ; 830CCEC
-	.2byte 240 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Timothy5: @ 830CCEC
+	.2byte 240 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Vicky: ; 830CCFC
-	.2byte 200 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Vicky: @ 830CCFC
+	.2byte 200 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelby1: ; 830CD0C
-	.2byte 200 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Shelby1: @ 830CD0C
+	.2byte 200 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 21 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelby2: ; 830CD1C
-	.2byte 210 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Shelby2: @ 830CD1C
+	.2byte 210 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 210 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 210 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelby3: ; 830CD2C
-	.2byte 220 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Shelby3: @ 830CD2C
+	.2byte 220 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 220 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 220 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelby4: ; 830CD3C
-	.2byte 230 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Shelby4: @ 830CD3C
+	.2byte 230 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 230 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 230 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shelby5: ; 830CD4C
-	.2byte 240 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Shelby5: @ 830CD4C
+	.2byte 240 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 240 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 240 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Calvin1: ; 830CD5C
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Calvin1: @ 830CD5C
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Billy: ; 830CD64
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Billy: @ 830CD64
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 7 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 7 @ level
 	.2byte SPECIES_SEEDOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Josh: ; 830CD74
-	.2byte 100 ; IV (0-255)
-	.2byte 10 ; level
+gTrainerParty_Josh: @ 830CD74
+	.2byte 100 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_GEODUDE
 	.2byte MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tommy: ; 830CD84
-	.2byte 110 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Tommy: @ 830CD84
+	.2byte 110 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Joey: ; 830CD94
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Joey: @ 830CD94
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ben: ; 830CD9C
-	.2byte 150 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Ben: @ 830CD9C
+	.2byte 150 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_GULPIN
 	.2byte MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Quincy: ; 830CDBC
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Quincy: @ 830CDBC
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_DUSCLOPS
 	.2byte MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelynn: ; 830CDDC
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Katelynn: @ 830CDDC
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SLAKING
 	.2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jaylen: ; 830CDFC
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Jaylen: @ 830CDFC
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_TRAPINCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dillon: ; 830CE04
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Dillon: @ 830CE04
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Calvin2: ; 830CE0C
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Calvin2: @ 830CE0C
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Calvin3: ; 830CE14
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Calvin3: @ 830CE14
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Calvin4: ; 830CE24
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Calvin4: @ 830CE24
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Calvin5: ; 830CE3C
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Calvin5: @ 830CE3C
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Eddie: ; 830CE54
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Eddie: @ 830CE54
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Allen: ; 830CE64
-	.2byte 0 ; IV (0-255)
-	.2byte 4 ; level
+gTrainerParty_Allen: @ 830CE64
+	.2byte 0 @ IV (0-255)
+	.2byte 4 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 3 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 3 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Timmy: ; 830CE74
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Timmy: @ 830CE74
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 13 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wallace: ; 830CE84
-	.2byte 255 ; IV (0-255)
-	.2byte 57 ; level
+gTrainerParty_Wallace: @ 830CE84
+	.2byte 255 @ IV (0-255)
+	.2byte 57 @ level
 	.2byte SPECIES_WAILORD
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_TENTACRUEL
 	.2byte ITEM_NONE
 	.2byte MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_LUDICOLO
 	.2byte ITEM_NONE
 	.2byte MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_GYARADOS
 	.2byte ITEM_NONE
 	.2byte MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_MILOTIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC
 
 	.align 2, 0
 
-gTrainerParty_Andrew: ; 830CEE4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Andrew: @ 830CEE4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ivan: ; 830CEFC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Ivan: @ 830CEFC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 7 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 7 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Claude: ; 830CF14
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Claude: @ 830CF14
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_BARBOACH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elliot1: ; 830CF2C
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+gTrainerParty_Elliot1: @ 830CF2C
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 7 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 7 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ned: ; 830CF44
-	.2byte 10 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Ned: @ 830CF44
+	.2byte 10 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dale: ; 830CF4C
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Dale: @ 830CF4C
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nolan: ; 830CF6C
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Nolan: @ 830CF6C
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_BARBOACH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Barny: ; 830CF74
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Barny: @ 830CF74
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wade: ; 830CF84
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Wade: @ 830CF84
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Carter: ; 830CF8C
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Carter: @ 830CF8C
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elliot2: ; 830CF9C
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Elliot2: @ 830CF9C
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elliot3: ; 830CFB4
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Elliot3: @ 830CFB4
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elliot4: ; 830CFD4
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Elliot4: @ 830CFD4
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 31 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 31 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elliot5: ; 830CFF4
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Elliot5: @ 830CFF4
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ronald: ; 830D014
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Ronald: @ 830D014
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 23 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jacob: ; 830D044
-	.2byte 20 ; IV (0-255)
-	.2byte 6 ; level
+gTrainerParty_Jacob: @ 830D044
+	.2byte 20 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Anthony: ; 830D05C
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Anthony: @ 830D05C
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benjamin1: ; 830D06C
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Benjamin1: @ 830D06C
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benjamin2: ; 830D074
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Benjamin2: @ 830D074
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benjamin3: ; 830D07C
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Benjamin3: @ 830D07C
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benjamin4: ; 830D084
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Benjamin4: @ 830D084
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benjamin5: ; 830D08C
-	.2byte 40 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Benjamin5: @ 830D08C
+	.2byte 40 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Abigail1: ; 830D094
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Abigail1: @ 830D094
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jasmine: ; 830D09C
-	.2byte 80 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Jasmine: @ 830D09C
+	.2byte 80 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 80 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 80 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Abigail2: ; 830D0B4
-	.2byte 10 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Abigail2: @ 830D0B4
+	.2byte 10 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Abigail3: ; 830D0BC
-	.2byte 20 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Abigail3: @ 830D0BC
+	.2byte 20 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Abigail4: ; 830D0C4
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Abigail4: @ 830D0C4
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Abigail5: ; 830D0CC
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Abigail5: @ 830D0CC
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MAGNETON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dylan1: ; 830D0D4
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Dylan1: @ 830D0D4
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dylan2: ; 830D0DC
-	.2byte 10 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Dylan2: @ 830D0DC
+	.2byte 10 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dylan3: ; 830D0E4
-	.2byte 20 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Dylan3: @ 830D0E4
+	.2byte 20 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dylan4: ; 830D0EC
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Dylan4: @ 830D0EC
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dylan5: ; 830D0F4
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Dylan5: @ 830D0F4
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maria1: ; 830D0FC
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Maria1: @ 830D0FC
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maria2: ; 830D104
-	.2byte 10 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Maria2: @ 830D104
+	.2byte 10 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maria3: ; 830D10C
-	.2byte 20 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Maria3: @ 830D10C
+	.2byte 20 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maria4: ; 830D114
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Maria4: @ 830D114
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maria5: ; 830D11C
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Maria5: @ 830D11C
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Camden: ; 830D124
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Camden: @ 830D124
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Demetrius: ; 830D134
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Demetrius: @ 830D134
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaiah1: ; 830D144
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Isaiah1: @ 830D144
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pablo1: ; 830D14C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Pablo1: @ 830D14C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chase: ; 830D15C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Chase: @ 830D15C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 80 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 80 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaiah2: ; 830D16C
-	.2byte 10 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Isaiah2: @ 830D16C
+	.2byte 10 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaiah3: ; 830D174
-	.2byte 20 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Isaiah3: @ 830D174
+	.2byte 20 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaiah4: ; 830D17C
-	.2byte 30 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Isaiah4: @ 830D17C
+	.2byte 30 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaiah5: ; 830D184
-	.2byte 40 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_Isaiah5: @ 830D184
+	.2byte 40 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isobel: ; 830D18C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Isobel: @ 830D18C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Donny: ; 830D194
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Donny: @ 830D194
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 160 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 160 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Talia: ; 830D1A4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Talia: @ 830D1A4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelyn1: ; 830D1AC
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Katelyn1: @ 830D1AC
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Allison: ; 830D1B4
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Allison: @ 830D1B4
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 240 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 240 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelyn2: ; 830D1C4
-	.2byte 10 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Katelyn2: @ 830D1C4
+	.2byte 10 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelyn3: ; 830D1CC
-	.2byte 20 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Katelyn3: @ 830D1CC
+	.2byte 20 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelyn4: ; 830D1D4
-	.2byte 30 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Katelyn4: @ 830D1D4
+	.2byte 30 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katelyn5: ; 830D1DC
-	.2byte 40 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_Katelyn5: @ 830D1DC
+	.2byte 40 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicolas1: ; 830D1E4
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Nicolas1: @ 830D1E4
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicolas2: ; 830D1F4
-	.2byte 110 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Nicolas2: @ 830D1F4
+	.2byte 110 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicolas3: ; 830D204
-	.2byte 120 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Nicolas3: @ 830D204
+	.2byte 120 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicolas4: ; 830D214
-	.2byte 130 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Nicolas4: @ 830D214
+	.2byte 130 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_BAGON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicolas5: ; 830D22C
-	.2byte 140 ; IV (0-255)
-	.2byte 49 ; level
+gTrainerParty_Nicolas5: @ 830D22C
+	.2byte 140 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_NONE
 
-	.2byte 140 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_NONE
 
-	.2byte 140 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_SHELGON
 	.2byte ITEM_DRAGON_FANG
 
 	.align 2, 0
 
-gTrainerParty_Aaron: ; 830D244
-	.2byte 255 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Aaron: @ 830D244
+	.2byte 255 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_BAGON
 	.2byte MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Perry: ; 830D254
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Perry: @ 830D254
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hugh: ; 830D25C
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Hugh: @ 830D25C
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Phil: ; 830D26C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Phil: @ 830D26C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jared: ; 830D274
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Jared: @ 830D274
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Humberto: ; 830D28C
-	.2byte 250 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Humberto: @ 830D28C
+	.2byte 250 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Presley: ; 830D294
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Presley: @ 830D294
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwardo: ; 830D2A4
-	.2byte 150 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Edwardo: @ 830D2A4
+	.2byte 150 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Colin: ; 830D2B4
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Colin: @ 830D2B4
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robert1: ; 830D2C4
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Robert1: @ 830D2C4
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Benny: ; 830D2CC
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Benny: @ 830D2CC
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chester: ; 830D2E4
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Chester: @ 830D2E4
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robert2: ; 830D2F4
-	.2byte 10 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Robert2: @ 830D2F4
+	.2byte 10 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robert3: ; 830D304
-	.2byte 20 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Robert3: @ 830D304
+	.2byte 20 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robert4: ; 830D314
-	.2byte 30 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Robert4: @ 830D314
+	.2byte 30 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robert5: ; 830D324
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Robert5: @ 830D324
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alex: ; 830D334
-	.2byte 150 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Alex: @ 830D334
+	.2byte 150 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Beck: ; 830D344
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Beck: @ 830D344
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Yasu: ; 830D34C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Yasu: @ 830D34C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Takashi: ; 830D354
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Takashi: @ 830D354
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_KOFFING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dianne: ; 830D364
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Dianne: @ 830D364
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_LANTURN
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Jani: ; 830D384
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Jani: @ 830D384
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lao1: ; 830D38C
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Lao1: @ 830D38C
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lung: ; 830D3BC
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Lung: @ 830D3BC
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_KOFFING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lao2: ; 830D3CC
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Lao2: @ 830D3CC
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lao3: ; 830D40C
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Lao3: @ 830D40C
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lao4: ; 830D44C
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Lao4: @ 830D44C
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lao5: ; 830D48C
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Lao5: @ 830D48C
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_KOFFING
 	.2byte ITEM_NONE
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_KOFFING
 	.2byte ITEM_NONE
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_KOFFING
 	.2byte ITEM_NONE
 	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
 
-	.2byte 40 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_WEEZING
 	.2byte ITEM_SMOKE_BALL
 	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Jocelyn: ; 830D4CC
-	.2byte 127 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Jocelyn: @ 830D4CC
+	.2byte 127 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Laura: ; 830D4D4
-	.2byte 150 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Laura: @ 830D4D4
+	.2byte 150 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cyndy1: ; 830D4DC
-	.2byte 100 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Cyndy1: @ 830D4DC
+	.2byte 100 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cora: ; 830D4EC
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Cora: @ 830D4EC
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Paula: ; 830D4F4
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Paula: @ 830D4F4
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cyndy2: ; 830D4FC
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Cyndy2: @ 830D4FC
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cyndy3: ; 830D50C
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Cyndy3: @ 830D50C
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cyndy4: ; 830D51C
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Cyndy4: @ 830D51C
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cyndy5: ; 830D52C
-	.2byte 140 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Cyndy5: @ 830D52C
+	.2byte 140 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Madeline1: ; 830D53C
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Madeline1: @ 830D53C
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Clarissa: ; 830D54C
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Clarissa: @ 830D54C
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Angelica: ; 830D55C
-	.2byte 50 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Angelica: @ 830D55C
+	.2byte 50 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_CASTFORM
 	.2byte MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Madeline2: ; 830D56C
-	.2byte 10 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Madeline2: @ 830D56C
+	.2byte 10 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Madeline3: ; 830D57C
-	.2byte 20 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Madeline3: @ 830D57C
+	.2byte 20 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Madeline4: ; 830D58C
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Madeline4: @ 830D58C
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Madeline5: ; 830D5AC
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Madeline5: @ 830D5AC
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Beverly: ; 830D5CC
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Beverly: @ 830D5CC
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Imani: ; 830D5DC
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Imani: @ 830D5DC
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kyla: ; 830D5E4
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Kyla: @ 830D5E4
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Denise: ; 830D5EC
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Denise: @ 830D5EC
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Beth: ; 830D5FC
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Beth: @ 830D5FC
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tara: ; 830D604
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Tara: @ 830D604
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_HORSEA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Missy: ; 830D614
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Missy: @ 830D614
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alice: ; 830D61C
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Alice: @ 830D61C
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenny1: ; 830D634
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jenny1: @ 830D634
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grace: ; 830D63C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Grace: @ 830D63C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tanya: ; 830D644
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Tanya: @ 830D644
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sharon: ; 830D64C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Sharon: @ 830D64C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SEAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nikki: ; 830D654
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Nikki: @ 830D654
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brenda: ; 830D664
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Brenda: @ 830D664
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Katie: ; 830D66C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Katie: @ 830D66C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Susie: ; 830D67C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Susie: @ 830D67C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kara: ; 830D684
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Kara: @ 830D684
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SEAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dana: ; 830D68C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Dana: @ 830D68C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sienna: ; 830D694
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Sienna: @ 830D694
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Debra: ; 830D6A4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Debra: @ 830D6A4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SEAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Linda: ; 830D6AC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Linda: @ 830D6AC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_HORSEA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SEADRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kaylee: ; 830D6BC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Kaylee: @ 830D6BC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LANTURN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Laurel: ; 830D6CC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Laurel: @ 830D6CC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Carlee: ; 830D6DC
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Carlee: @ 830D6DC
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SEAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenny2: ; 830D6E4
-	.2byte 0 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Jenny2: @ 830D6E4
+	.2byte 0 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenny3: ; 830D6EC
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Jenny3: @ 830D6EC
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenny4: ; 830D6F4
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Jenny4: @ 830D6F4
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenny5: ; 830D704
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Jenny5: @ 830D704
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Heidi: ; 830D71C
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Heidi: @ 830D71C
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_BALTOY
 	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Becky: ; 830D73C
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Becky: @ 830D73C
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SANDSHREW
 	.2byte MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MARILL
 	.2byte MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Carol: ; 830D75C
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Carol: @ 830D75C
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nancy: ; 830D76C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Nancy: @ 830D76C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Martha: ; 830D77C
-	.2byte 0 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Martha: @ 830D77C
+	.2byte 0 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 23 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Diana1: ; 830D78C
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Diana1: @ 830D78C
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_ODDISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cedric: ; 830D7A4
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Cedric: @ 830D7A4
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_WOBBUFFET
 	.2byte MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Irene: ; 830D7B4
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Irene: @ 830D7B4
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Diana2: ; 830D7C4
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Diana2: @ 830D7C4
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Diana3: ; 830D7DC
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Diana3: @ 830D7DC
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Diana4: ; 830D7F4
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Diana4: @ 830D7F4
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Diana5: ; 830D80C
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Diana5: @ 830D80C
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_VILEPLUME
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_ALTARIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv1: ; 830D824
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_AmyAndLiv1: @ 830D824
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_PLUSLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MINUN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv2: ; 830D834
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_AmyAndLiv2: @ 830D834
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_PLUSLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_MINUN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GinaAndMia1: ; 830D844
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+gTrainerParty_GinaAndMia1: @ 830D844
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_SEEDOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_MiuAndYuki: ; 830D854
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_MiuAndYuki: @ 830D854
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv3: ; 830D864
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_AmyAndLiv3: @ 830D864
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_PLUSLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_MINUN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_GinaAndMia2: ; 830D874
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+gTrainerParty_GinaAndMia2: @ 830D874
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_DUSKULL
 	.2byte MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_SHROOMISH
 	.2byte MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv4: ; 830D894
-	.2byte 20 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_AmyAndLiv4: @ 830D894
+	.2byte 20 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_PLUSLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MINUN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv5: ; 830D8A4
-	.2byte 30 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_AmyAndLiv5: @ 830D8A4
+	.2byte 30 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MINUN
 	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_AmyAndLiv6: ; 830D8C4
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_AmyAndLiv6: @ 830D8C4
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MINUN
 	.2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Huey: ; 830D8E4
-	.2byte 10 ; IV (0-255)
-	.2byte 12 ; level
+gTrainerParty_Huey: @ 830D8E4
+	.2byte 10 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edmond: ; 830D8F4
-	.2byte 0 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Edmond: @ 830D8F4
+	.2byte 0 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ernest1: ; 830D8FC
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Ernest1: @ 830D8FC
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dwayne: ; 830D90C
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Dwayne: @ 830D90C
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Phillip: ; 830D924
-	.2byte 0 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Phillip: @ 830D924
+	.2byte 0 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leonard: ; 830D934
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Leonard: @ 830D934
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Duncan: ; 830D94C
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Duncan: @ 830D94C
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ernest2: ; 830D95C
-	.2byte 10 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Ernest2: @ 830D95C
+	.2byte 10 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ernest3: ; 830D974
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Ernest3: @ 830D974
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ernest4: ; 830D98C
-	.2byte 30 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Ernest4: @ 830D98C
+	.2byte 30 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ernest5: ; 830D9A4
-	.2byte 40 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_Ernest5: @ 830D9A4
+	.2byte 40 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Eli: ; 830D9BC
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Eli: @ 830D9BC
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Annika: ; 830D9C4
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Annika: @ 830D9C4
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_FEEBAS
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_FEEBAS
 	.2byte ITEM_ORAN_BERRY
 	.2byte MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Jazmyn: ; 830D9E4
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Jazmyn: @ 830D9E4
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_ABSOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jonas: ; 830D9EC
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Jonas: @ 830D9EC
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kayley: ; 830D9FC
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Kayley: @ 830D9FC
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_CASTFORM
 	.2byte MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Auron: ; 830DA0C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Auron: @ 830DA0C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHAMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kelvin: ; 830DA1C
-	.2byte 150 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Kelvin: @ 830DA1C
+	.2byte 150 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Marley: ; 830DA2C
-	.2byte 255 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Marley: @ 830DA2C
+	.2byte 255 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_NONE
 	.2byte MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT
 
 	.align 2, 0
 
-gTrainerParty_Reyna: ; 830DA3C
-	.2byte 50 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Reyna: @ 830DA3C
+	.2byte 50 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hudson: ; 830DA4C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Hudson: @ 830DA4C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Conor: ; 830DA54
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Conor: @ 830DA54
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_CHINCHOU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwin1: ; 830DA64
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Edwin1: @ 830DA64
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hector: ; 830DA74
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Hector: @ 830DA74
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ZANGOOSE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SEVIPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tabitha1: ; 830DA84
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Tabitha1: @ 830DA84
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_GOLBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwin2: ; 830DA9C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Edwin2: @ 830DA9C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwin3: ; 830DAAC
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Edwin3: @ 830DAAC
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwin4: ; 830DABC
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Edwin4: @ 830DABC
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Edwin5: ; 830DACC
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Edwin5: @ 830DACC
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SHIFTRY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally1: ; 830DADC
-	.2byte 150 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Wally1: @ 830DADC
+	.2byte 150 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan1: ; 830DB2C
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Brendan1: @ 830DB2C
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_TREECKO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan2: ; 830DB34
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Brendan2: @ 830DB34
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan3: ; 830DB4C
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Brendan3: @ 830DB4C
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan4: ; 830DB64
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Brendan4: @ 830DB64
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_TORCHIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan5: ; 830DB6C
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Brendan5: @ 830DB6C
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan6: ; 830DB84
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Brendan6: @ 830DB84
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan7: ; 830DB9C
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Brendan7: @ 830DB9C
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_MUDKIP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan8: ; 830DBA4
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Brendan8: @ 830DBA4
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan9: ; 830DBBC
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Brendan9: @ 830DBBC
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May1: ; 830DBD4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_May1: @ 830DBD4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_TREECKO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May2: ; 830DBDC
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_May2: @ 830DBDC
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May3: ; 830DBF4
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_May3: @ 830DBF4
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May4: ; 830DC0C
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_May4: @ 830DC0C
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_TORCHIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May5: ; 830DC14
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_May5: @ 830DC14
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May6: ; 830DC2C
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_May6: @ 830DC2C
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May7: ; 830DC44
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_May7: @ 830DC44
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_MUDKIP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May8: ; 830DC4C
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_May8: @ 830DC4C
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May9: ; 830DC64
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_May9: @ 830DC64
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaac1: ; 830DC7C
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Isaac1: @ 830DC7C
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_WHISMUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Davis: ; 830DCAC
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Davis: @ 830DCAC
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_PINSIR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mitchell: ; 830DCB4
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Mitchell: @ 830DCB4
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaac2: ; 830DCD4
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Isaac2: @ 830DCD4
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaac3: ; 830DD04
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Isaac3: @ 830DD04
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaac4: ; 830DD34
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Isaac4: @ 830DD34
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isaac5: ; 830DD64
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Isaac5: @ 830DD64
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LAIRON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lydia1: ; 830DD94
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+gTrainerParty_Lydia1: @ 830DD94
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 11 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 11 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Halle: ; 830DDC4
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Halle: @ 830DDC4
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SABLEYE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_ABSOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Garrison: ; 830DDD4
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Garrison: @ 830DDD4
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lydia2: ; 830DDDC
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Lydia2: @ 830DDDC
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lydia3: ; 830DE0C
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Lydia3: @ 830DE0C
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lydia4: ; 830DE3C
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Lydia4: @ 830DE3C
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lydia5: ; 830DE6C
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Lydia5: @ 830DE6C
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SEAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jackson1: ; 830DE9C
-	.2byte 50 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Jackson1: @ 830DE9C
+	.2byte 50 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lorenzo: ; 830DEA4
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Lorenzo: @ 830DEA4
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_SEEDOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sebastian: ; 830DEBC
-	.2byte 50 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Sebastian: @ 830DEBC
+	.2byte 50 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_CACTURNE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jackson2: ; 830DEC4
-	.2byte 60 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Jackson2: @ 830DEC4
+	.2byte 60 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jackson3: ; 830DECC
-	.2byte 70 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Jackson3: @ 830DECC
+	.2byte 70 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jackson4: ; 830DED4
-	.2byte 80 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Jackson4: @ 830DED4
+	.2byte 80 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jackson5: ; 830DEDC
-	.2byte 90 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Jackson5: @ 830DEDC
+	.2byte 90 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_KECLEON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 90 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 90 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Catherine1: ; 830DEEC
-	.2byte 50 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Catherine1: @ 830DEEC
+	.2byte 50 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jenna: ; 830DEFC
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Jenna: @ 830DEFC
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sophia: ; 830DF14
-	.2byte 50 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Sophia: @ 830DF14
+	.2byte 50 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Catherine2: ; 830DF24
-	.2byte 60 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Catherine2: @ 830DF24
+	.2byte 60 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 60 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 60 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Catherine3: ; 830DF34
-	.2byte 70 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Catherine3: @ 830DF34
+	.2byte 70 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 70 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 70 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Catherine4: ; 830DF44
-	.2byte 80 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Catherine4: @ 830DF44
+	.2byte 80 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 80 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 80 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Catherine5: ; 830DF54
-	.2byte 90 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Catherine5: @ 830DF54
+	.2byte 90 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_BELLOSSOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 90 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 90 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Julio: ; 830DF64
-	.2byte 0 ; IV (0-255)
-	.2byte 21 ; level
+gTrainerParty_Julio: @ 830DF64
+	.2byte 0 @ IV (0-255)
+	.2byte 21 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt27: ; 830DF6C
-	.2byte 50 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Grunt27: @ 830DF6C
+	.2byte 50 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_GOLBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt28: ; 830DF7C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Grunt28: @ 830DF7C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt29: ; 830DF8C
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Grunt29: @ 830DF8C
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt30: ; 830DF9C
-	.2byte 50 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Grunt30: @ 830DF9C
+	.2byte 50 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Marc: ; 830DFAC
-	.2byte 120 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Marc: @ 830DFAC
+	.2byte 120 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brenden: ; 830DFBC
-	.2byte 100 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Brenden: @ 830DFBC
+	.2byte 100 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lilith: ; 830DFC4
-	.2byte 150 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Lilith: @ 830DFC4
+	.2byte 150 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristian: ; 830DFCC
-	.2byte 200 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Cristian: @ 830DFCC
+	.2byte 200 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sylvia: ; 830DFD4
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Sylvia: @ 830DFD4
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leonardo: ; 830DFDC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Leonardo: @ 830DFDC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Athena: ; 830DFE4
-	.2byte 100 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Athena: @ 830DFE4
+	.2byte 100 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE
 
-	.2byte 100 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LINOONE
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Harrison: ; 830E004
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Harrison: @ 830E004
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt31: ; 830E00C
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+gTrainerParty_Grunt31: @ 830E00C
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Clarence: ; 830E014
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Clarence: @ 830E014
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Terry: ; 830E01C
-	.2byte 0 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Terry: @ 830E01C
+	.2byte 0 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_GIRAFARIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nate: ; 830E024
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Nate: @ 830E024
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kathleen: ; 830E02C
-	.2byte 100 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Kathleen: @ 830E02C
+	.2byte 100 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Clifford: ; 830E034
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Clifford: @ 830E034
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_GIRAFARIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Nicholas: ; 830E03C
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Nicholas: @ 830E03C
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_WOBBUFFET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt32: ; 830E044
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Grunt32: @ 830E044
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt33: ; 830E054
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt33: @ 830E054
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt34: ; 830E05C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt34: @ 830E05C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt35: ; 830E064
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt35: @ 830E064
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt36: ; 830E06C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Grunt36: @ 830E06C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Macey: ; 830E074
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Macey: @ 830E074
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_NATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan10: ; 830E07C
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Brendan10: @ 830E07C
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_TORCHIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan11: ; 830E08C
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Brendan11: @ 830E08C
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_TREECKO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Paxton: ; 830E09C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Paxton: @ 830E09C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isabella: ; 830E0AC
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Isabella: @ 830E0AC
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt37: ; 830E0B4
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Grunt37: @ 830E0B4
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tabitha2: ; 830E0C4
-	.2byte 50 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Tabitha2: @ 830E0C4
+	.2byte 50 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jonathan: ; 830E0E4
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Jonathan: @ 830E0E4
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_KECLEON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan12: ; 830E0F4
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Brendan12: @ 830E0F4
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MUDKIP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May10: ; 830E104
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_May10: @ 830E104
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_TREECKO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maxie1: ; 830E114
-	.2byte 150 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Maxie1: @ 830E114
+	.2byte 150 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_CROBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maxie2: ; 830E12C
-	.2byte 150 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Maxie2: @ 830E12C
+	.2byte 150 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tiana: ; 830E144
-	.2byte 0 ; IV (0-255)
-	.2byte 4 ; level
+gTrainerParty_Tiana: @ 830E144
+	.2byte 0 @ IV (0-255)
+	.2byte 4 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 4 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 4 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Haley1: ; 830E154
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+gTrainerParty_Haley1: @ 830E154
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Janice: ; 830E164
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Janice: @ 830E164
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Vivi: ; 830E16C
-	.2byte 100 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Vivi: @ 830E16C
+	.2byte 100 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Haley2: ; 830E184
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Haley2: @ 830E184
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Haley3: ; 830E194
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Haley3: @ 830E194
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Haley4: ; 830E1A4
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Haley4: @ 830E1A4
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Haley5: ; 830E1B4
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Haley5: @ 830E1B4
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_BRELOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sally: ; 830E1CC
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Sally: @ 830E1CC
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_ODDISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Robin: ; 830E1D4
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Robin: @ 830E1D4
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andrea: ; 830E1EC
-	.2byte 100 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Andrea: @ 830E1EC
+	.2byte 100 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Crissy: ; 830E1F4
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Crissy: @ 830E1F4
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rick: ; 830E204
-	.2byte 0 ; IV (0-255)
-	.2byte 4 ; level
+gTrainerParty_Rick: @ 830E204
+	.2byte 0 @ IV (0-255)
+	.2byte 4 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 4 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 4 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lyle: ; 830E214
-	.2byte 0 ; IV (0-255)
-	.2byte 3 ; level
+gTrainerParty_Lyle: @ 830E214
+	.2byte 0 @ IV (0-255)
+	.2byte 3 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 3 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 3 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 3 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 3 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 3 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 3 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jose: ; 830E234
-	.2byte 50 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Jose: @ 830E234
+	.2byte 50 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_WURMPLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_NINCADA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Doug: ; 830E244
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Doug: @ 830E244
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NINCADA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Greg: ; 830E254
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Greg: @ 830E254
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kent: ; 830E264
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Kent: @ 830E264
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_James1: ; 830E26C
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+gTrainerParty_James1: @ 830E26C
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_NINCADA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 6 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 6 @ level
 	.2byte SPECIES_NINCADA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_James2: ; 830E27C
-	.2byte 10 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_James2: @ 830E27C
+	.2byte 10 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_James3: ; 830E284
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_James3: @ 830E284
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_James4: ; 830E294
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_James4: @ 830E294
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_James5: ; 830E2AC
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_James5: @ 830E2AC
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SURSKIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brice: ; 830E2CC
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Brice: @ 830E2CC
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Trent1: ; 830E2DC
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Trent1: @ 830E2DC
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lenny: ; 830E2F4
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Lenny: @ 830E2F4
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lucas1: ; 830E304
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Lucas1: @ 830E304
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alan: ; 830E314
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Alan: @ 830E314
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_NOSEPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Clark: ; 830E32C
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Clark: @ 830E32C
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Eric: ; 830E334
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+gTrainerParty_Eric: @ 830E334
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lucas2: ; 830E344
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Lucas2: @ 830E344
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_WAILMER
 	.2byte MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mike1: ; 830E354
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+gTrainerParty_Mike1: @ 830E354
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 10 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 10 @ level
 	.2byte SPECIES_POOCHYENA
 	.2byte MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mike2: ; 830E374
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Mike2: @ 830E374
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 16 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Trent2: ; 830E38C
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Trent2: @ 830E38C
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Trent3: ; 830E3AC
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Trent3: @ 830E3AC
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Trent4: ; 830E3CC
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Trent4: @ 830E3CC
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Trent5: ; 830E3EC
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Trent5: @ 830E3EC
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GOLEM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_DezAndLuke: ; 830E40C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_DezAndLuke: @ 830E40C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LeaAndJed: ; 830E41C
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_LeaAndJed: @ 830E41C
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KiraAndDan1: ; 830E42C
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_KiraAndDan1: @ 830E42C
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KiraAndDan2: ; 830E43C
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_KiraAndDan2: @ 830E43C
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KiraAndDan3: ; 830E44C
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_KiraAndDan3: @ 830E44C
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KiraAndDan4: ; 830E45C
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_KiraAndDan4: @ 830E45C
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KiraAndDan5: ; 830E46C
-	.2byte 40 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_KiraAndDan5: @ 830E46C
+	.2byte 40 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_VOLBEAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_ILLUMISE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Johanna: ; 830E47C
-	.2byte 0 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Johanna: @ 830E47C
+	.2byte 0 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gerald: ; 830E484
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Gerald: @ 830E484
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_KECLEON
 	.2byte MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Vivian: ; 830E494
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Vivian: @ 830E494
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Danielle: ; 830E4B4
-	.2byte 100 ; IV (0-255)
-	.2byte 23 ; level
+gTrainerParty_Danielle: @ 830E4B4
+	.2byte 100 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hideo: ; 830E4C4
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Hideo: @ 830E4C4
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Keigo: ; 830E4E4
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Keigo: @ 830E4E4
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NINJASK
 	.2byte MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Riley: ; 830E504
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Riley: @ 830E504
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NINCADA
 	.2byte MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_KOFFING
 	.2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Flint: ; 830E524
-	.2byte 150 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Flint: @ 830E524
+	.2byte 150 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_XATU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ashley: ; 830E534
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_Ashley: @ 830E534
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_SWABLU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally2: ; 830E54C
-	.2byte 30 ; IV (0-255)
-	.2byte 16 ; level
+gTrainerParty_Wally2: @ 830E54C
+	.2byte 30 @ IV (0-255)
+	.2byte 16 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally3: ; 830E554
-	.2byte 150 ; IV (0-255)
-	.2byte 47 ; level
+gTrainerParty_Wally3: @ 830E554
+	.2byte 150 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally4: ; 830E5A4
-	.2byte 150 ; IV (0-255)
-	.2byte 50 ; level
+gTrainerParty_Wally4: @ 830E5A4
+	.2byte 150 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally5: ; 830E5F4
-	.2byte 150 ; IV (0-255)
-	.2byte 53 ; level
+gTrainerParty_Wally5: @ 830E5F4
+	.2byte 150 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 54 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 54 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wally6: ; 830E644
-	.2byte 150 ; IV (0-255)
-	.2byte 56 ; level
+gTrainerParty_Wally6: @ 830E644
+	.2byte 150 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_DELCATTY
 	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 250 ; IV (0-255)
-	.2byte 57 ; level
+	.2byte 250 @ IV (0-255)
+	.2byte 57 @ level
 	.2byte SPECIES_GARDEVOIR
 	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan13: ; 830E694
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Brendan13: @ 830E694
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan14: ; 830E6B4
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Brendan14: @ 830E6B4
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan15: ; 830E6D4
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Brendan15: @ 830E6D4
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May11: ; 830E6F4
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_May11: @ 830E6F4
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GROVYLE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May12: ; 830E714
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_May12: @ 830E714
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_COMBUSKEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May13: ; 830E734
-	.2byte 150 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_May13: @ 830E734
+	.2byte 150 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MARSHTOMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jonah: ; 830E754
-	.2byte 0 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Jonah: @ 830E754
+	.2byte 0 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Henry: ; 830E76C
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Henry: @ 830E76C
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Roger: ; 830E77C
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Roger: @ 830E77C
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_GYARADOS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alexa: ; 830E794
-	.2byte 100 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Alexa: @ 830E794
+	.2byte 100 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_GLOOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Ruben: ; 830E7A4
-	.2byte 100 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Ruben: @ 830E7A4
+	.2byte 100 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_SHIFTRY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_NOSEPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koji1: ; 830E7B4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Koji1: @ 830E7B4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wayne: ; 830E7BC
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Wayne: @ 830E7BC
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Aidan: ; 830E7D4
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Aidan: @ 830E7D4
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Reed: ; 830E7E4
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Reed: @ 830E7E4
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SPHEAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tisha: ; 830E7F4
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Tisha: @ 830E7F4
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_CHINCHOU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_ToriAndTia: ; 830E7FC
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_ToriAndTia: @ 830E7FC
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SPINDA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SPINDA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_KimAndIris: ; 830E80C
-	.2byte 0 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_KimAndIris: @ 830E80C
+	.2byte 0 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_SWABLU
 	.2byte MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_NUMEL
 	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_TyraAndIvy: ; 830E82C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_TyraAndIvy: @ 830E82C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ROSELIA
 	.2byte MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_GRAVELER
 	.2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_MelAndPaul: ; 830E84C
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_MelAndPaul: @ 830E84C
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_DUSTOX
 	.2byte MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_BEAUTIFLY
 	.2byte MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_JohnAndJay1: ; 830E86C
-	.2byte 200 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_JohnAndJay1: @ 830E86C
+	.2byte 200 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 200 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 200 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_JohnAndJay2: ; 830E88C
-	.2byte 210 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_JohnAndJay2: @ 830E88C
+	.2byte 210 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 210 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 210 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_JohnAndJay3: ; 830E8AC
-	.2byte 220 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_JohnAndJay3: @ 830E8AC
+	.2byte 220 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 220 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 220 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_JohnAndJay4: ; 830E8CC
-	.2byte 230 ; IV (0-255)
-	.2byte 49 ; level
+gTrainerParty_JohnAndJay4: @ 830E8CC
+	.2byte 230 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 230 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 230 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_JohnAndJay5: ; 830E8EC
-	.2byte 240 ; IV (0-255)
-	.2byte 52 ; level
+gTrainerParty_JohnAndJay5: @ 830E8EC
+	.2byte 240 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 240 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 240 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_ReliAndIan: ; 830E90C
-	.2byte 0 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_ReliAndIan: @ 830E90C
+	.2byte 0 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_AZUMARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LilaAndRoy1: ; 830E91C
-	.2byte 0 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_LilaAndRoy1: @ 830E91C
+	.2byte 0 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_CHINCHOU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LilaAndRoy2: ; 830E92C
-	.2byte 0 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_LilaAndRoy2: @ 830E92C
+	.2byte 0 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_CHINCHOU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LilaAndRoy3: ; 830E93C
-	.2byte 0 ; IV (0-255)
-	.2byte 45 ; level
+gTrainerParty_LilaAndRoy3: @ 830E93C
+	.2byte 0 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_LANTURN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LilaAndRoy4: ; 830E94C
-	.2byte 0 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_LilaAndRoy4: @ 830E94C
+	.2byte 0 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_LANTURN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LilaAndRoy5: ; 830E95C
-	.2byte 0 ; IV (0-255)
-	.2byte 51 ; level
+gTrainerParty_LilaAndRoy5: @ 830E95C
+	.2byte 0 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_LANTURN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_SHARPEDO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_LisaAndRay: ; 830E96C
-	.2byte 0 ; IV (0-255)
-	.2byte 27 ; level
+gTrainerParty_LisaAndRay: @ 830E96C
+	.2byte 0 @ IV (0-255)
+	.2byte 27 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chris: ; 830E97C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Chris: @ 830E97C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 20 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 20 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_FEEBAS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 23 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 23 @ level
 	.2byte SPECIES_CARVANHA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dawson: ; 830E99C
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Dawson: @ 830E99C
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_NUGGET
 
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_POOCHYENA
 	.2byte ITEM_NONE
 
 	.align 2, 0
 
-gTrainerParty_Sarah: ; 830E9AC
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Sarah: @ 830E9AC
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_LOTAD
 	.2byte ITEM_NONE
 
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_ZIGZAGOON
 	.2byte ITEM_NUGGET
 
 	.align 2, 0
 
-gTrainerParty_Darian: ; 830E9BC
-	.2byte 0 ; IV (0-255)
-	.2byte 9 ; level
+gTrainerParty_Darian: @ 830E9BC
+	.2byte 0 @ IV (0-255)
+	.2byte 9 @ level
 	.2byte SPECIES_MAGIKARP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hailey: ; 830E9C4
-	.2byte 0 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_Hailey: @ 830E9C4
+	.2byte 0 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Chandler: ; 830E9CC
-	.2byte 0 ; IV (0-255)
-	.2byte 12 ; level
+gTrainerParty_Chandler: @ 830E9CC
+	.2byte 0 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 12 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 12 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kaleb: ; 830E9DC
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Kaleb: @ 830E9DC
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_MINUN
 	.2byte ITEM_ORAN_BERRY
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_PLUSLE
 	.2byte ITEM_ORAN_BERRY
 
 	.align 2, 0
 
-gTrainerParty_Joseph: ; 830E9EC
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Joseph: @ 830E9EC
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alyssa: ; 830E9FC
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Alyssa: @ 830E9FC
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MAGNEMITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Marcos: ; 830EA04
-	.2byte 100 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Marcos: @ 830EA04
+	.2byte 100 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_VOLTORB
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rhett: ; 830EA0C
-	.2byte 100 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Rhett: @ 830EA0C
+	.2byte 100 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tyron: ; 830EA14
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Tyron: @ 830EA14
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Celina: ; 830EA1C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Celina: @ 830EA1C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bianca: ; 830EA24
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Bianca: @ 830EA24
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Hayden: ; 830EA2C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Hayden: @ 830EA2C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sophie: ; 830EA34
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Sophie: @ 830EA34
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Coby: ; 830EA44
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Coby: @ 830EA44
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lawrence: ; 830EA54
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Lawrence: @ 830EA54
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Wyatt: ; 830EA64
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Wyatt: @ 830EA64
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Angelina: ; 830EA74
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Angelina: @ 830EA74
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kai: ; 830EA84
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Kai: @ 830EA84
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_BARBOACH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Charlotte: ; 830EA8C
-	.2byte 0 ; IV (0-255)
-	.2byte 19 ; level
+gTrainerParty_Charlotte: @ 830EA8C
+	.2byte 0 @ IV (0-255)
+	.2byte 19 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Deandre: ; 830EA94
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+gTrainerParty_Deandre: @ 830EA94
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ARON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 14 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 14 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt38: ; 830EAAC
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt38: @ 830EAAC
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt39: ; 830EAB4
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt39: @ 830EAB4
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt40: ; 830EABC
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt40: @ 830EABC
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt41: ; 830EAC4
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Grunt41: @ 830EAC4
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt42: ; 830EAD4
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Grunt42: @ 830EAD4
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt43: ; 830EAE4
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt43: @ 830EAE4
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt44: ; 830EAEC
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt44: @ 830EAEC
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt45: ; 830EAF4
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt45: @ 830EAF4
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt46: ; 830EAFC
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt46: @ 830EAFC
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt47: ; 830EB04
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt47: @ 830EB04
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt48: ; 830EB0C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt48: @ 830EB0C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt49: ; 830EB14
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt49: @ 830EB14
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt50: ; 830EB1C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt50: @ 830EB1C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt51: ; 830EB24
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt51: @ 830EB24
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt52: ; 830EB2C
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt52: @ 830EB2C
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Grunt53: ; 830EB34
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Grunt53: @ 830EB34
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_BALTOY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tabitha3: ; 830EB3C
-	.2byte 75 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Tabitha3: @ 830EB3C
+	.2byte 75 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 75 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 75 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 75 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 75 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_ZUBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 75 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 75 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Darcy: ; 830EB5C
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Darcy: @ 830EB5C
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Maxie3: ; 830EB6C
-	.2byte 150 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Maxie3: @ 830EB6C
+	.2byte 150 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CROBAT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 150 ; IV (0-255)
-	.2byte 44 ; level
+	.2byte 150 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pete: ; 830EB84
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Pete: @ 830EB84
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Isabelle: ; 830EB8C
-	.2byte 0 ; IV (0-255)
-	.2byte 15 ; level
+gTrainerParty_Isabelle: @ 830EB8C
+	.2byte 0 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andres1: ; 830EB94
-	.2byte 50 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Andres1: @ 830EB94
+	.2byte 50 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Josue: ; 830EBA4
-	.2byte 50 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Josue: @ 830EBA4
+	.2byte 50 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Camron: ; 830EBB4
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Camron: @ 830EBB4
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cory1: ; 830EBBC
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Cory1: @ 830EBBC
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Carolina: ; 830EBD4
-	.2byte 50 ; IV (0-255)
-	.2byte 24 ; level
+gTrainerParty_Carolina: @ 830EBD4
+	.2byte 50 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 24 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 24 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Elijah: ; 830EBEC
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Elijah: @ 830EBEC
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SKARMORY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Celia: ; 830EBFC
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Celia: @ 830EBFC
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bryan: ; 830EC0C
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Bryan: @ 830EC0C
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Branden: ; 830EC1C
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+gTrainerParty_Branden: @ 830EC1C
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 22 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 22 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Bryant: ; 830EC2C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Bryant: @ 830EC2C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Shayla: ; 830EC3C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Shayla: @ 830EC3C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Kyra: ; 830EC4C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Kyra: @ 830EC4C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_DODRIO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Jaiden: ; 830EC5C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Jaiden: @ 830EC5C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NINJASK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GULPIN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alix: ; 830EC6C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Alix: @ 830EC6C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_KIRLIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Helene: ; 830EC7C
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Helene: @ 830EC7C
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Marlene: ; 830EC8C
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+gTrainerParty_Marlene: @ 830EC8C
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 18 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 18 @ level
 	.2byte SPECIES_SPOINK
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Devan: ; 830EC9C
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Devan: @ 830EC9C
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Johnson: ; 830ECAC
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+gTrainerParty_Johnson: @ 830ECAC
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 8 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 8 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Melina: ; 830ECBC
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Melina: @ 830ECBC
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_DODUO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brandi: ; 830ECC4
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Brandi: @ 830ECC4
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_RALTS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Aisha: ; 830ECCC
-	.2byte 0 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Aisha: @ 830ECCC
+	.2byte 0 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Makayla: ; 830ECD4
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Makayla: @ 830ECD4
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_ROSELIA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MEDICHAM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fabian: ; 830ECE4
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Fabian: @ 830ECE4
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Dayton: ; 830ECEC
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Dayton: @ 830ECEC
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SLUGMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Rachel: ; 830ECFC
-	.2byte 0 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Rachel: @ 830ECFC
+	.2byte 0 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GOLDEEN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leonel: ; 830ED04
-	.2byte 100 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Leonel: @ 830ED04
+	.2byte 100 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Callie: ; 830ED14
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Callie: @ 830ED14
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MEDITITE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cale: ; 830ED24
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Cale: @ 830ED24
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_DUSTOX
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Myles: ; 830ED34
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Myles: @ 830ED34
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pat: ; 830ED64
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+gTrainerParty_Pat: @ 830ED64
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_POOCHYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SHROOMISH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_MARILL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 25 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 25 @ level
 	.2byte SPECIES_GULPIN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristin1: ; 830ED94
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+gTrainerParty_Cristin1: @ 830ED94
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 29 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 29 @ level
 	.2byte SPECIES_VIGOROTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May14: ; 830EDA4
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_May14: @ 830EDA4
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_TORCHIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May15: ; 830EDB4
-	.2byte 25 ; IV (0-255)
-	.2byte 13 ; level
+gTrainerParty_May15: @ 830EDB4
+	.2byte 25 @ IV (0-255)
+	.2byte 13 @ level
 	.2byte SPECIES_TORKOAL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 50 ; IV (0-255)
-	.2byte 15 ; level
+	.2byte 50 @ IV (0-255)
+	.2byte 15 @ level
 	.2byte SPECIES_MUDKIP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Roxanne2: ; 830EDC4
-	.2byte 255 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Roxanne2: @ 830EDC4
+	.2byte 255 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_GOLEM
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
 
-	.2byte 255 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_KABUTO
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_ONIX
 	.2byte ITEM_NONE
 	.2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_NOSEPASS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
 
 	.align 2, 0
 
-gTrainerParty_Roxanne3: ; 830EE04
-	.2byte 255 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Roxanne3: @ 830EE04
+	.2byte 255 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_OMANYTE
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
 
-	.2byte 255 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_GOLEM
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
 
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_KABUTOPS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_ONIX
 	.2byte ITEM_NONE
 	.2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_NOSEPASS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
 
 	.align 2, 0
 
-gTrainerParty_Roxanne4: ; 830EE54
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Roxanne4: @ 830EE54
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_OMASTAR
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
 
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_GOLEM
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_KABUTOPS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ONIX
 	.2byte ITEM_NONE
 	.2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_NOSEPASS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
 
 	.align 2, 0
 
-gTrainerParty_Roxanne5: ; 830EEA4
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+gTrainerParty_Roxanne5: @ 830EEA4
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_AERODACTYL
 	.2byte ITEM_NONE
 	.2byte MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_GOLEM
 	.2byte ITEM_NONE
 	.2byte MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
 
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_OMASTAR
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_KABUTOPS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_STEELIX
 	.2byte ITEM_NONE
 	.2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_NOSEPASS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
 
 	.align 2, 0
 
-gTrainerParty_Brawly2: ; 830EF04
-	.2byte 255 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Brawly2: @ 830EF04
+	.2byte 255 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHAMP
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MEDITITE
 	.2byte ITEM_NONE
 	.2byte MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_HITMONTOP
 	.2byte ITEM_NONE
 	.2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
 
-	.2byte 255 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Brawly3: ; 830EF44
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Brawly3: @ 830EF44
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MACHAMP
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte ITEM_NONE
 	.2byte MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_HITMONTOP
 	.2byte ITEM_NONE
 	.2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
 
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Brawly4: ; 830EF84
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Brawly4: @ 830EF84
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_HITMONCHAN
 	.2byte ITEM_NONE
 	.2byte MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MACHAMP
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte ITEM_NONE
 	.2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_HITMONTOP
 	.2byte ITEM_NONE
 	.2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
 
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Brawly5: ; 830EFD4
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Brawly5: @ 830EFD4
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_HITMONLEE
 	.2byte ITEM_NONE
 	.2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_HITMONCHAN
 	.2byte ITEM_NONE
 	.2byte MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_MACHAMP
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_MEDICHAM
 	.2byte ITEM_NONE
 	.2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_HITMONTOP
 	.2byte ITEM_NONE
 	.2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
 
-	.2byte 255 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_HARIYAMA
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Wattson2: ; 830F034
-	.2byte 255 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Wattson2: @ 830F034
+	.2byte 255 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MAREEP
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_ELECTRODE
 	.2byte ITEM_NONE
 	.2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
 
 	.align 2, 0
 
-gTrainerParty_Wattson3: ; 830F074
-	.2byte 255 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Wattson3: @ 830F074
+	.2byte 255 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_PIKACHU
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_FLAAFFY
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_ELECTRODE
 	.2byte ITEM_NONE
 	.2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
 
 	.align 2, 0
 
-gTrainerParty_Wattson4: ; 830F0C4
-	.2byte 255 ; IV (0-255)
-	.2byte 44 ; level
+gTrainerParty_Wattson4: @ 830F0C4
+	.2byte 255 @ IV (0-255)
+	.2byte 44 @ level
 	.2byte SPECIES_RAICHU
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_AMPHAROS
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_ELECTRODE
 	.2byte ITEM_NONE
 	.2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
 
 	.align 2, 0
 
-gTrainerParty_Wattson5: ; 830F114
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+gTrainerParty_Wattson5: @ 830F114
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_ELECTABUZZ
 	.2byte ITEM_NONE
 	.2byte MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_RAICHU
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_AMPHAROS
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_ELECTRODE
 	.2byte ITEM_NONE
 	.2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_MAGNETON
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_MANECTRIC
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
 
 	.align 2, 0
 
-gTrainerParty_Flannery2: ; 830F174
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Flannery2: @ 830F174
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_MAGCARGO
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_PONYTA
 	.2byte ITEM_NONE
 	.2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_TORKOAL
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Flannery3: ; 830F1B4
-	.2byte 255 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Flannery3: @ 830F1B4
+	.2byte 255 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_GROWLITHE
 	.2byte ITEM_NONE
 	.2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MAGCARGO
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_PONYTA
 	.2byte ITEM_NONE
 	.2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_TORKOAL
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Flannery4: ; 830F204
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Flannery4: @ 830F204
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_HOUNDOUR
 	.2byte ITEM_NONE
 	.2byte MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_GROWLITHE
 	.2byte ITEM_NONE
 	.2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_MAGCARGO
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_RAPIDASH
 	.2byte ITEM_NONE
 	.2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_TORKOAL
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Flannery5: ; 830F264
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+gTrainerParty_Flannery5: @ 830F264
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_ARCANINE
 	.2byte ITEM_NONE
 	.2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_MAGCARGO
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_HOUNDOOM
 	.2byte ITEM_NONE
 	.2byte MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_RAPIDASH
 	.2byte ITEM_NONE
 	.2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_CAMERUPT
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_TORKOAL
 	.2byte ITEM_WHITE_HERB
 	.2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
 
 	.align 2, 0
 
-gTrainerParty_Norman2: ; 830F2C4
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+gTrainerParty_Norman2: @ 830F2C4
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_CHANSEY
 	.2byte ITEM_NONE
 	.2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 42 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 42 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
 
 	.align 2, 0
 
-gTrainerParty_Norman3: ; 830F304
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+gTrainerParty_Norman3: @ 830F304
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
 
-	.2byte 255 ; IV (0-255)
-	.2byte 47 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 47 @ level
 	.2byte SPECIES_CHANSEY
 	.2byte ITEM_NONE
 	.2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_KANGASKHAN
 	.2byte ITEM_NONE
 	.2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
 
 	.align 2, 0
 
-gTrainerParty_Norman4: ; 830F354
-	.2byte 255 ; IV (0-255)
-	.2byte 52 ; level
+gTrainerParty_Norman4: @ 830F354
+	.2byte 255 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
 
-	.2byte 255 ; IV (0-255)
-	.2byte 52 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 52 @ level
 	.2byte SPECIES_BLISSEY
 	.2byte ITEM_NONE
 	.2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_KANGASKHAN
 	.2byte ITEM_NONE
 	.2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
 
 	.align 2, 0
 
-gTrainerParty_Norman5: ; 830F3A4
-	.2byte 255 ; IV (0-255)
-	.2byte 57 ; level
+gTrainerParty_Norman5: @ 830F3A4
+	.2byte 255 @ IV (0-255)
+	.2byte 57 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
 
-	.2byte 255 ; IV (0-255)
-	.2byte 57 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 57 @ level
 	.2byte SPECIES_BLISSEY
 	.2byte ITEM_NONE
 	.2byte MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_KANGASKHAN
 	.2byte ITEM_NONE
 	.2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
 
-	.2byte 255 ; IV (0-255)
-	.2byte 57 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 57 @ level
 	.2byte SPECIES_TAUROS
 	.2byte ITEM_NONE
 	.2byte MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_SPINDA
 	.2byte ITEM_NONE
 	.2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
 
-	.2byte 255 ; IV (0-255)
-	.2byte 60 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 60 @ level
 	.2byte SPECIES_SLAKING
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
 
 	.align 2, 0
 
-gTrainerParty_Winona2: ; 830F404
-	.2byte 255 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Winona2: @ 830F404
+	.2byte 255 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_DRATINI
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_TROPIUS
 	.2byte ITEM_NONE
 	.2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Winona3: ; 830F454
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Winona3: @ 830F454
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_HOOTHOOT
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
 
-	.2byte 255 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_TROPIUS
 	.2byte ITEM_NONE
 	.2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 45 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 45 @ level
 	.2byte SPECIES_DRAGONAIR
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Winona4: ; 830F4B4
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_Winona4: @ 830F4B4
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_NOCTOWL
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
 
-	.2byte 255 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_TROPIUS
 	.2byte ITEM_NONE
 	.2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_DRAGONAIR
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_Winona5: ; 830F514
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+gTrainerParty_Winona5: @ 830F514
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_NOCTOWL
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
 
-	.2byte 255 ; IV (0-255)
-	.2byte 54 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 54 @ level
 	.2byte SPECIES_TROPIUS
 	.2byte ITEM_NONE
 	.2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_PELIPPER
 	.2byte ITEM_NONE
 	.2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_DRAGONITE
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 60 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 60 @ level
 	.2byte SPECIES_ALTARIA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
 
 	.align 2, 0
 
-gTrainerParty_TateAndLiza2: ; 830F574
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+gTrainerParty_TateAndLiza2: @ 830F574
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_SLOWPOKE
 	.2byte ITEM_NONE
 	.2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 49 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 49 @ level
 	.2byte SPECIES_XATU
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
 
 	.align 2, 0
 
-gTrainerParty_TateAndLiza3: ; 830F5C4
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+gTrainerParty_TateAndLiza3: @ 830F5C4
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_DROWZEE
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_SLOWPOKE
 	.2byte ITEM_NONE
 	.2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 54 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 54 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 54 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 54 @ level
 	.2byte SPECIES_XATU
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 55 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 55 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
 
 	.align 2, 0
 
-gTrainerParty_TateAndLiza4: ; 830F624
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+gTrainerParty_TateAndLiza4: @ 830F624
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_HYPNO
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 59 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 59 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_SLOWPOKE
 	.2byte ITEM_NONE
 	.2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 59 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 59 @ level
 	.2byte SPECIES_XATU
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 60 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 60 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 60 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 60 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
 
 	.align 2, 0
 
-gTrainerParty_TateAndLiza5: ; 830F684
-	.2byte 255 ; IV (0-255)
-	.2byte 63 ; level
+gTrainerParty_TateAndLiza5: @ 830F684
+	.2byte 255 @ IV (0-255)
+	.2byte 63 @ level
 	.2byte SPECIES_HYPNO
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 64 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 64 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
 
-	.2byte 255 ; IV (0-255)
-	.2byte 63 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 63 @ level
 	.2byte SPECIES_SLOWKING
 	.2byte ITEM_NONE
 	.2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
 
-	.2byte 255 ; IV (0-255)
-	.2byte 64 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 64 @ level
 	.2byte SPECIES_XATU
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 65 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 65 @ level
 	.2byte SPECIES_LUNATONE
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
 
-	.2byte 255 ; IV (0-255)
-	.2byte 65 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 65 @ level
 	.2byte SPECIES_SOLROCK
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
 
 	.align 2, 0
 
-gTrainerParty_Juan2: ; 830F6E4
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+gTrainerParty_Juan2: @ 830F6E4
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_POLIWAG
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 46 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 46 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_WALREIN
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 48 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 48 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
 
 	.align 2, 0
 
-gTrainerParty_Juan3: ; 830F734
-	.2byte 255 ; IV (0-255)
-	.2byte 50 ; level
+gTrainerParty_Juan3: @ 830F734
+	.2byte 255 @ IV (0-255)
+	.2byte 50 @ level
 	.2byte SPECIES_POLIWHIRL
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 51 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 51 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_WALREIN
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 53 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 53 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
 
 	.align 2, 0
 
-gTrainerParty_Juan4: ; 830F784
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+gTrainerParty_Juan4: @ 830F784
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_LAPRAS
 	.2byte ITEM_NONE
 	.2byte MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 56 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 56 @ level
 	.2byte SPECIES_POLIWHIRL
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_WALREIN
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 58 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 58 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 61 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 61 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
 
 	.align 2, 0
 
-gTrainerParty_Juan5: ; 830F7E4
-	.2byte 255 ; IV (0-255)
-	.2byte 61 ; level
+gTrainerParty_Juan5: @ 830F7E4
+	.2byte 255 @ IV (0-255)
+	.2byte 61 @ level
 	.2byte SPECIES_LAPRAS
 	.2byte ITEM_NONE
 	.2byte MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 63 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 63 @ level
 	.2byte SPECIES_WHISCASH
 	.2byte ITEM_NONE
 	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 61 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 61 @ level
 	.2byte SPECIES_POLITOED
 	.2byte ITEM_NONE
 	.2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG
 
-	.2byte 255 ; IV (0-255)
-	.2byte 63 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 63 @ level
 	.2byte SPECIES_WALREIN
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD
 
-	.2byte 255 ; IV (0-255)
-	.2byte 63 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 63 @ level
 	.2byte SPECIES_CRAWDAUNT
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
 
-	.2byte 255 ; IV (0-255)
-	.2byte 66 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 66 @ level
 	.2byte SPECIES_KINGDRA
 	.2byte ITEM_CHESTO_BERRY
 	.2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
 
 	.align 2, 0
 
-gTrainerParty_Angelo: ; 830F844
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+gTrainerParty_Angelo: @ 830F844
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_ILLUMISE
 	.2byte ITEM_NONE
 	.2byte MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE
 
-	.2byte 100 ; IV (0-255)
-	.2byte 17 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 17 @ level
 	.2byte SPECIES_VOLBEAT
 	.2byte ITEM_NONE
 	.2byte MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE
 
 	.align 2, 0
 
-gTrainerParty_Darius: ; 830F864
-	.2byte 200 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Darius: @ 830F864
+	.2byte 200 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_TROPIUS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Steven: ; 830F86C
-	.2byte 255 ; IV (0-255)
-	.2byte 77 ; level
+gTrainerParty_Steven: @ 830F86C
+	.2byte 255 @ IV (0-255)
+	.2byte 77 @ level
 	.2byte SPECIES_SKARMORY
 	.2byte ITEM_NONE
 	.2byte MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING
 
-	.2byte 255 ; IV (0-255)
-	.2byte 75 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 75 @ level
 	.2byte SPECIES_CLAYDOL
 	.2byte ITEM_NONE
 	.2byte MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE
 
-	.2byte 255 ; IV (0-255)
-	.2byte 76 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 76 @ level
 	.2byte SPECIES_AGGRON
 	.2byte ITEM_NONE
 	.2byte MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW
 
-	.2byte 255 ; IV (0-255)
-	.2byte 76 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 76 @ level
 	.2byte SPECIES_CRADILY
 	.2byte ITEM_NONE
 	.2byte MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY
 
-	.2byte 255 ; IV (0-255)
-	.2byte 76 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 76 @ level
 	.2byte SPECIES_ARMALDO
 	.2byte ITEM_NONE
 	.2byte MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH
 
-	.2byte 255 ; IV (0-255)
-	.2byte 78 ; level
+	.2byte 255 @ IV (0-255)
+	.2byte 78 @ level
 	.2byte SPECIES_METAGROSS
 	.2byte ITEM_SITRUS_BERRY
 	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL
 
 	.align 2, 0
 
-gTrainerParty_Anabel: ; 830F8CC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Anabel: @ 830F8CC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Tucker: ; 830F8D4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Tucker: @ 830F8D4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Spenser: ; 830F8DC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Spenser: @ 830F8DC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Greta: ; 830F8E4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Greta: @ 830F8E4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Noland: ; 830F8EC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Noland: @ 830F8EC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Lucy: ; 830F8F4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Lucy: @ 830F8F4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brandon: ; 830F8FC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Brandon: @ 830F8FC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BELDUM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andres2: ; 830F904
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Andres2: @ 830F904
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andres3: ; 830F914
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Andres3: @ 830F914
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_NOSEPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andres4: ; 830F92C
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Andres4: @ 830F92C
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_NOSEPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SANDSHREW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Andres5: ; 830F944
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Andres5: @ 830F944
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_NOSEPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SANDSLASH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cory2: ; 830F95C
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Cory2: @ 830F95C
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cory3: ; 830F974
-	.2byte 20 ; IV (0-255)
-	.2byte 32 ; level
+gTrainerParty_Cory3: @ 830F974
+	.2byte 20 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 32 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 32 @ level
 	.2byte SPECIES_TENTACOOL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cory4: ; 830F98C
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Cory4: @ 830F98C
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cory5: ; 830F9A4
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Cory5: @ 830F9A4
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_TENTACRUEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pablo2: ; 830F9BC
-	.2byte 10 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Pablo2: @ 830F9BC
+	.2byte 10 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pablo3: ; 830F9CC
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Pablo3: @ 830F9CC
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_WINGULL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pablo4: ; 830F9E4
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Pablo4: @ 830F9E4
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_STARYU
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Pablo5: ; 830F9FC
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Pablo5: @ 830F9FC
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_PELIPPER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_STARMIE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koji2: ; 830FA14
-	.2byte 10 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Koji2: @ 830FA14
+	.2byte 10 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koji3: ; 830FA24
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Koji3: @ 830FA24
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MAKUHITA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koji4: ; 830FA3C
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Koji4: @ 830FA3C
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Koji5: ; 830FA54
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+gTrainerParty_Koji5: @ 830FA54
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_HARIYAMA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MACHAMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 43 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 43 @ level
 	.2byte SPECIES_MACHAMP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristin2: ; 830FA6C
-	.2byte 110 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Cristin2: @ 830FA6C
+	.2byte 110 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 110 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 110 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_VIGOROTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristin3: ; 830FA7C
-	.2byte 120 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Cristin3: @ 830FA7C
+	.2byte 120 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SPINDA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 120 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 120 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_VIGOROTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristin4: ; 830FA94
-	.2byte 130 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Cristin4: @ 830FA94
+	.2byte 130 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_SPINDA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 130 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 130 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 100 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 100 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_VIGOROTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Cristin5: ; 830FAAC
-	.2byte 140 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Cristin5: @ 830FAAC
+	.2byte 140 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_SPINDA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_EXPLOUD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 140 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 140 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_SLAKING
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fernando2: ; 830FAC4
-	.2byte 10 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Fernando2: @ 830FAC4
+	.2byte 10 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fernando3: ; 830FADC
-	.2byte 20 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Fernando3: @ 830FADC
+	.2byte 20 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_ELECTRIKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fernando4: ; 830FAF4
-	.2byte 30 ; IV (0-255)
-	.2byte 39 ; level
+gTrainerParty_Fernando4: @ 830FAF4
+	.2byte 30 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 39 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 39 @ level
 	.2byte SPECIES_LOUDRED
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Fernando5: ; 830FB0C
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Fernando5: @ 830FB0C
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_MANECTRIC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_EXPLOUD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sawyer2: ; 830FB24
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+gTrainerParty_Sawyer2: @ 830FB24
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_GEODUDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 26 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 26 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sawyer3: ; 830FB34
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+gTrainerParty_Sawyer3: @ 830FB34
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 28 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 28 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sawyer4: ; 830FB4C
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+gTrainerParty_Sawyer4: @ 830FB4C
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_MACHOP
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_NUMEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 30 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 30 @ level
 	.2byte SPECIES_GRAVELER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Sawyer5: ; 830FB64
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Sawyer5: @ 830FB64
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MACHOKE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_CAMERUPT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_GOLEM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gabrielle2: ; 830FB7C
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+gTrainerParty_Gabrielle2: @ 830FB7C
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_LOTAD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_SEEDOT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 31 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 31 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gabrielle3: ; 830FBAC
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+gTrainerParty_Gabrielle3: @ 830FBAC
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_SKITTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 33 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 33 @ level
 	.2byte SPECIES_TAILLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gabrielle4: ; 830FBDC
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+gTrainerParty_Gabrielle4: @ 830FBDC
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_LOMBRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_NUZLEAF
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 35 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 35 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Gabrielle5: ; 830FC0C
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+gTrainerParty_Gabrielle5: @ 830FC0C
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_DELCATTY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_MIGHTYENA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_LINOONE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_LUDICOLO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SHIFTRY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 37 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 37 @ level
 	.2byte SPECIES_SWELLOW
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thalia2: ; 830FC3C
-	.2byte 10 ; IV (0-255)
-	.2byte 34 ; level
+gTrainerParty_Thalia2: @ 830FC3C
+	.2byte 10 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 10 ; IV (0-255)
-	.2byte 34 ; level
+	.2byte 10 @ IV (0-255)
+	.2byte 34 @ level
 	.2byte SPECIES_HORSEA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thalia3: ; 830FC4C
-	.2byte 20 ; IV (0-255)
-	.2byte 36 ; level
+gTrainerParty_Thalia3: @ 830FC4C
+	.2byte 20 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 20 ; IV (0-255)
-	.2byte 36 ; level
+	.2byte 20 @ IV (0-255)
+	.2byte 36 @ level
 	.2byte SPECIES_SEADRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thalia4: ; 830FC64
-	.2byte 30 ; IV (0-255)
-	.2byte 38 ; level
+gTrainerParty_Thalia4: @ 830FC64
+	.2byte 30 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_WAILMER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 30 ; IV (0-255)
-	.2byte 38 ; level
+	.2byte 30 @ IV (0-255)
+	.2byte 38 @ level
 	.2byte SPECIES_SEADRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Thalia5: ; 830FC7C
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+gTrainerParty_Thalia5: @ 830FC7C
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_LUVDISC
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_WAILORD
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 40 ; IV (0-255)
-	.2byte 40 ; level
+	.2byte 40 @ IV (0-255)
+	.2byte 40 @ level
 	.2byte SPECIES_KINGDRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Mariela: ; 830FC94
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Mariela: @ 830FC94
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_CHIMECHO
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Alvaro: ; 830FC9C
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Alvaro: @ 830FC9C
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_BANETTE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_KADABRA
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Everett: ; 830FCAC
-	.2byte 0 ; IV (0-255)
-	.2byte 41 ; level
+gTrainerParty_Everett: @ 830FCAC
+	.2byte 0 @ IV (0-255)
+	.2byte 41 @ level
 	.2byte SPECIES_WOBBUFFET
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Red: ; 830FCB4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Red: @ 830FCB4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_CHARMANDER
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Leaf: ; 830FCBC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Leaf: @ 830FCBC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_BULBASAUR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_Brendan16: ; 830FCC4
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_Brendan16: @ 830FCC4
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_GROUDON
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 
 	.align 2, 0
 
-gTrainerParty_May16: ; 830FCCC
-	.2byte 0 ; IV (0-255)
-	.2byte 5 ; level
+gTrainerParty_May16: @ 830FCCC
+	.2byte 0 @ IV (0-255)
+	.2byte 5 @ level
 	.2byte SPECIES_KYOGRE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
diff --git a/data/trainer_pic_indices.s b/data/trainer_pic_indices.s
index 9cef7e5e8..01046cf0a 100644
--- a/data/trainer_pic_indices.s
+++ b/data/trainer_pic_indices.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gTrainerPicIndices: ; 831F578
+gTrainerPicIndices: @ 831F578
 	.byte TRAINER_PIC_HIKER
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
diff --git a/data/trainers.s b/data/trainers.s
index 230972be7..e71498b18 100644
--- a/data/trainers.s
+++ b/data/trainers.s
@@ -1,10262 +1,10262 @@
 	.align 2, 0
 
-gTrainers: ; 8310030
-; NONE
-	.byte 0 ; party type flags
+gTrainers: @ 8310030
+@ NONE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 0 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 0 @ party size
 	.4byte NULL
 
-; SAWYER_1
-	.byte 0 ; party type flags
+@ SAWYER_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "SAWYER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sawyer1
 
-; GRUNT_1
-	.byte 0 ; party type flags
+@ GRUNT_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt1
 
-; GRUNT_2
-	.byte 0 ; party type flags
+@ GRUNT_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt2
 
-; GRUNT_3
-	.byte 0 ; party type flags
+@ GRUNT_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt3
 
-; GRUNT_4
-	.byte 0 ; party type flags
+@ GRUNT_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt4
 
-; GRUNT_5
-	.byte 0 ; party type flags
+@ GRUNT_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt5
 
-; GRUNT_6
-	.byte 0 ; party type flags
+@ GRUNT_6
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt6
 
-; GRUNT_7
-	.byte 0 ; party type flags
+@ GRUNT_7
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt7
 
-; GABRIELLE_1
-	.byte 0 ; party type flags
+@ GABRIELLE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "GABRIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Gabrielle1
 
-; GRUNT_8
-	.byte 0 ; party type flags
+@ GRUNT_8
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt8
 
-; MARCEL
-	.byte 0 ; party type flags
+@ MARCEL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "MARCEL$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Marcel
 
-; ALBERTO
-	.byte 0 ; party type flags
+@ ALBERTO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ALBERTO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alberto
 
-; ED
-	.byte 0 ; party type flags
+@ ED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "ED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ed
 
-; GRUNT_9
-	.byte 0 ; party type flags
+@ GRUNT_9
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt9
 
-; DECLAN
-	.byte 0 ; party type flags
+@ DECLAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DECLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Declan
 
-; GRUNT_10
-	.byte 0 ; party type flags
+@ GRUNT_10
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt10
 
-; GRUNT_11
-	.byte 0 ; party type flags
+@ GRUNT_11
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt11
 
-; GRUNT_12
-	.byte 0 ; party type flags
+@ GRUNT_12
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt12
 
-; GRUNT_13
-	.byte 0 ; party type flags
+@ GRUNT_13
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Grunt13
 
-; GRUNT_14
-	.byte 0 ; party type flags
+@ GRUNT_14
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt14
 
-; GRUNT_15
-	.byte 0 ; party type flags
+@ GRUNT_15
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt15
 
-; GRUNT_16
-	.byte 0 ; party type flags
+@ GRUNT_16
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt16
 
-; GRUNT_17
-	.byte 0 ; party type flags
+@ GRUNT_17
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt17
 
-; GRUNT_18
-	.byte 0 ; party type flags
+@ GRUNT_18
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt18
 
-; GRUNT_19
-	.byte 0 ; party type flags
+@ GRUNT_19
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt19
 
-; GRUNT_20
-	.byte 0 ; party type flags
+@ GRUNT_20
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt20
 
-; GRUNT_21
-	.byte 0 ; party type flags
+@ GRUNT_21
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt21
 
-; GRUNT_22
-	.byte 0 ; party type flags
+@ GRUNT_22
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt22
 
-; FREDRICK
-	.byte 0 ; party type flags
+@ FREDRICK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "FREDRICK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Fredrick
 
-; MATT
-	.byte 0 ; party type flags
+@ MATT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_M
 	.charmapstr "MATT$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Matt
 
-; ZANDER
-	.byte 0 ; party type flags
+@ ZANDER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "ZANDER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Zander
 
-; SHELLY_1
-	.byte 0 ; party type flags
+@ SHELLY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.charmapstr "SHELLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelly1
 
-; SHELLY_2
-	.byte 0 ; party type flags
+@ SHELLY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AQUA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_ADMIN_F
 	.charmapstr "SHELLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelly2
 
-; ARCHIE
-	.byte 0 ; party type flags
+@ ARCHIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AQUA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_LEADER_ARCHIE
 	.charmapstr "ARCHIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Archie
 
-; LEAH
-	.byte 0 ; party type flags
+@ LEAH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "LEAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Leah
 
-; DAISY
-	.byte 0 ; party type flags
+@ DAISY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "DAISY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Daisy
 
-; ROSE_1
-	.byte 0 ; party type flags
+@ ROSE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Rose1
 
-; FELIX
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FELIX
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "FELIX$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Felix
 
-; VIOLET
-	.byte 0 ; party type flags
+@ VIOLET
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "VIOLET$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Violet
 
-; ROSE_2
-	.byte 0 ; party type flags
+@ ROSE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Rose2
 
-; ROSE_3
-	.byte 0 ; party type flags
+@ ROSE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Rose3
 
-; ROSE_4
-	.byte 0 ; party type flags
+@ ROSE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Rose4
 
-; ROSE_5
-	.byte 0 ; party type flags
+@ ROSE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Rose5
 
-; DUSTY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DUSTY_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dusty1
 
-; CHIP
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ CHIP
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "CHIP$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Chip
 
-; FOSTER
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FOSTER
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "FOSTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Foster
 
-; DUSTY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DUSTY_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dusty2
 
-; DUSTY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DUSTY_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dusty3
 
-; DUSTY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DUSTY_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dusty4
 
-; DUSTY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DUSTY_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dusty5
 
-; GABBY_AND_TY_1
-	.byte 0 ; party type flags
+@ GABBY_AND_TY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy1
 
-; GABBY_AND_TY_2
-	.byte 0 ; party type flags
+@ GABBY_AND_TY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy2
 
-; GABBY_AND_TY_3
-	.byte 0 ; party type flags
+@ GABBY_AND_TY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy3
 
-; GABBY_AND_TY_4
-	.byte 0 ; party type flags
+@ GABBY_AND_TY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy4
 
-; GABBY_AND_TY_5
-	.byte 0 ; party type flags
+@ GABBY_AND_TY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy5
 
-; GABBY_AND_TY_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ GABBY_AND_TY_6
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
 	.byte TRAINER_PIC_INTERVIEWER
 	.charmapstr "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GabbyAndTy6
 
-; LOLA_1
-	.byte 0 ; party type flags
+@ LOLA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lola1
 
-; AUSTINA
-	.byte 0 ; party type flags
+@ AUSTINA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "AUSTINA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Austina
 
-; GWEN
-	.byte 0 ; party type flags
+@ GWEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "GWEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Gwen
 
-; LOLA_2
-	.byte 0 ; party type flags
+@ LOLA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lola2
 
-; LOLA_3
-	.byte 0 ; party type flags
+@ LOLA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lola3
 
-; LOLA_4
-	.byte 0 ; party type flags
+@ LOLA_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lola4
 
-; LOLA_5
-	.byte 0 ; party type flags
+@ LOLA_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lola5
 
-; RICKY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RICKY_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ricky1
 
-; SIMON
-	.byte 0 ; party type flags
+@ SIMON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "SIMON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Simon
 
-; CHARLIE
-	.byte 0 ; party type flags
+@ CHARLIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "CHARLIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Charlie
 
-; RICKY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RICKY_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ricky2
 
-; RICKY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RICKY_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ricky3
 
-; RICKY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RICKY_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ricky4
 
-; RICKY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RICKY_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ricky5
 
-; RANDALL
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RANDALL
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "RANDALL$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Randall
 
-; PARKER
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ PARKER
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "PARKER$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Parker
 
-; GEORGE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ GEORGE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "GEORGE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_George
 
-; BERKE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BERKE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "BERKE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Berke
 
-; BRAXTON
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAXTON
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "BRAXTON$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Braxton
 
-; VINCENT
-	.byte 0 ; party type flags
+@ VINCENT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "VINCENT$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Vincent
 
-; LEROY
-	.byte 0 ; party type flags
+@ LEROY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "LEROY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Leroy
 
-; WILTON_1
-	.byte 0 ; party type flags
+@ WILTON_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WILTON$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wilton1
 
-; EDGAR
-	.byte 0 ; party type flags
+@ EDGAR
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "EDGAR$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edgar
 
-; ALBERT
-	.byte 0 ; party type flags
+@ ALBERT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "ALBERT$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Albert
 
-; SAMUEL
-	.byte 0 ; party type flags
+@ SAMUEL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "SAMUEL$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Samuel
 
-; VITO
-	.byte 0 ; party type flags
+@ VITO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "VITO$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Vito
 
-; OWEN
-	.byte 0 ; party type flags
+@ OWEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "OWEN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Owen
 
-; WILTON_2
-	.byte 0 ; party type flags
+@ WILTON_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WILTON$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wilton2
 
-; WILTON_3
-	.byte 0 ; party type flags
+@ WILTON_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WILTON$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wilton3
 
-; WILTON_4
-	.byte 0 ; party type flags
+@ WILTON_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WILTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wilton4
 
-; WILTON_5
-	.byte 0 ; party type flags
+@ WILTON_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WILTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wilton5
 
-; WARREN
-	.byte 0 ; party type flags
+@ WARREN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "WARREN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Warren
 
-; MARY
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MARY
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "MARY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Mary
 
-; ALEXIA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ALEXIA
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "ALEXIA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Alexia
 
-; JODY
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JODY
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "JODY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jody
 
-; WENDY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WENDY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "WENDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wendy
 
-; KEIRA
-	.byte 0 ; party type flags
+@ KEIRA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "KEIRA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Keira
 
-; BROOKE_1
-	.byte 0 ; party type flags
+@ BROOKE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "BROOKE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brooke1
 
-; JENNIFER
-	.byte 0 ; party type flags
+@ JENNIFER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "JENNIFER$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jennifer
 
-; HOPE
-	.byte 0 ; party type flags
+@ HOPE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "HOPE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Hope
 
-; SHANNON
-	.byte 0 ; party type flags
+@ SHANNON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "SHANNON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Shannon
 
-; MICHELLE
-	.byte 0 ; party type flags
+@ MICHELLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "MICHELLE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Michelle
 
-; CAROLINE
-	.byte 0 ; party type flags
+@ CAROLINE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CAROLINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Caroline
 
-; JULIE
-	.byte 0 ; party type flags
+@ JULIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "JULIE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Julie
 
-; BROOKE_2
-	.byte 0 ; party type flags
+@ BROOKE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "BROOKE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brooke2
 
-; BROOKE_3
-	.byte 0 ; party type flags
+@ BROOKE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "BROOKE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brooke3
 
-; BROOKE_4
-	.byte 0 ; party type flags
+@ BROOKE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "BROOKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brooke4
 
-; BROOKE_5
-	.byte 0 ; party type flags
+@ BROOKE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "BROOKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brooke5
 
-; PATRICIA
-	.byte 0 ; party type flags
+@ PATRICIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "PATRICIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Patricia
 
-; KINDRA
-	.byte 0 ; party type flags
+@ KINDRA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "KINDRA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kindra
 
-; TAMMY
-	.byte 0 ; party type flags
+@ TAMMY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "TAMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tammy
 
-; VALERIE_1
-	.byte 0 ; party type flags
+@ VALERIE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Valerie1
 
-; TASHA
-	.byte 0 ; party type flags
+@ TASHA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "TASHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tasha
 
-; VALERIE_2
-	.byte 0 ; party type flags
+@ VALERIE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Valerie2
 
-; VALERIE_3
-	.byte 0 ; party type flags
+@ VALERIE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Valerie3
 
-; VALERIE_4
-	.byte 0 ; party type flags
+@ VALERIE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Valerie4
 
-; VALERIE_5
-	.byte 0 ; party type flags
+@ VALERIE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Valerie5
 
-; CINDY_1
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ CINDY_1
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy1
 
-; DAPHNE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DAPHNE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "DAPHNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Daphne
 
-; GRUNT_23
-	.byte 0 ; party type flags
+@ GRUNT_23
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Grunt23
 
-; CINDY_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ CINDY_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy2
 
-; BRIANNA
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ BRIANNA
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "BRIANNA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brianna
 
-; NAOMI
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ NAOMI
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "NAOMI$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Naomi
 
-; CINDY_3
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ CINDY_3
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy3
 
-; CINDY_4
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ CINDY_4
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy4
 
-; CINDY_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ CINDY_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy5
 
-; CINDY_6
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ CINDY_6
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cindy6
 
-; MELISSA
-	.byte 0 ; party type flags
+@ MELISSA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "MELISSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Melissa
 
-; SHEILA
-	.byte 0 ; party type flags
+@ SHEILA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "SHEILA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sheila
 
-; SHIRLEY
-	.byte 0 ; party type flags
+@ SHIRLEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "SHIRLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Shirley
 
-; JESSICA_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JESSICA_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jessica1
 
-; CONNIE
-	.byte 0 ; party type flags
+@ CONNIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "CONNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Connie
 
-; BRIDGET
-	.byte 0 ; party type flags
+@ BRIDGET
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "BRIDGET$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Bridget
 
-; OLIVIA
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ OLIVIA
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "OLIVIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Olivia
 
-; TIFFANY
-	.byte 0 ; party type flags
+@ TIFFANY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "TIFFANY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tiffany
 
-; JESSICA_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JESSICA_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jessica2
 
-; JESSICA_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JESSICA_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jessica3
 
-; JESSICA_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JESSICA_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jessica4
 
-; JESSICA_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JESSICA_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jessica5
 
-; WINSTON_1
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ WINSTON_1
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Winston1
 
-; MOLLIE
-	.byte 0 ; party type flags
+@ MOLLIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "MOLLIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Mollie
 
-; GARRET
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ GARRET
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "GARRET$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Garret
 
-; WINSTON_2
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ WINSTON_2
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Winston2
 
-; WINSTON_3
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ WINSTON_3
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Winston3
 
-; WINSTON_4
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ WINSTON_4
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Winston4
 
-; WINSTON_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINSTON_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Winston5
 
-; STEVE_1
-	.byte 0 ; party type flags
+@ STEVE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Steve1
 
-; THALIA_1
-	.byte 0 ; party type flags
+@ THALIA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "THALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Thalia1
 
-; MARK
-	.byte 0 ; party type flags
+@ MARK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "MARK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Mark
 
-; GRUNT_24
-	.byte 0 ; party type flags
+@ GRUNT_24
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt24
 
-; STEVE_2
-	.byte 0 ; party type flags
+@ STEVE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Steve2
 
-; STEVE_3
-	.byte 0 ; party type flags
+@ STEVE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Steve3
 
-; STEVE_4
-	.byte 0 ; party type flags
+@ STEVE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Steve4
 
-; STEVE_5
-	.byte 0 ; party type flags
+@ STEVE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Steve5
 
-; LUIS
-	.byte 0 ; party type flags
+@ LUIS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "LUIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Luis
 
-; DOMINIK
-	.byte 0 ; party type flags
+@ DOMINIK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DOMINIK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dominik
 
-; DOUGLAS
-	.byte 0 ; party type flags
+@ DOUGLAS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DOUGLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Douglas
 
-; DARRIN
-	.byte 0 ; party type flags
+@ DARRIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DARRIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Darrin
 
-; TONY_1
-	.byte 0 ; party type flags
+@ TONY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tony1
 
-; JEROME
-	.byte 0 ; party type flags
+@ JEROME
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "JEROME$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jerome
 
-; MATTHEW
-	.byte 0 ; party type flags
+@ MATTHEW
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "MATTHEW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Matthew
 
-; DAVID
-	.byte 0 ; party type flags
+@ DAVID
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DAVID$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_David
 
-; SPENCER
-	.byte 0 ; party type flags
+@ SPENCER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "SPENCER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Spencer
 
-; ROLAND
-	.byte 0 ; party type flags
+@ ROLAND
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "ROLAND$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Roland
 
-; NOLEN
-	.byte 0 ; party type flags
+@ NOLEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "NOLEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nolen
 
-; STAN
-	.byte 0 ; party type flags
+@ STAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "STAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Stan
 
-; BARRY
-	.byte 0 ; party type flags
+@ BARRY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "BARRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Barry
 
-; DEAN
-	.byte 0 ; party type flags
+@ DEAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DEAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dean
 
-; RODNEY
-	.byte 0 ; party type flags
+@ RODNEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "RODNEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Rodney
 
-; RICHARD
-	.byte 0 ; party type flags
+@ RICHARD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "RICHARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Richard
 
-; HERMAN
-	.byte 0 ; party type flags
+@ HERMAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "HERMAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Herman
 
-; SANTIAGO
-	.byte 0 ; party type flags
+@ SANTIAGO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "SANTIAGO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Santiago
 
-; GILBERT
-	.byte 0 ; party type flags
+@ GILBERT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "GILBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Gilbert
 
-; FRANKLIN
-	.byte 0 ; party type flags
+@ FRANKLIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "FRANKLIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Franklin
 
-; KEVIN
-	.byte 0 ; party type flags
+@ KEVIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "KEVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kevin
 
-; JACK
-	.byte 0 ; party type flags
+@ JACK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "JACK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jack
 
-; DUDLEY
-	.byte 0 ; party type flags
+@ DUDLEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "DUDLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dudley
 
-; CHAD
-	.byte 0 ; party type flags
+@ CHAD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "CHAD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Chad
 
-; TONY_2
-	.byte 0 ; party type flags
+@ TONY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tony2
 
-; TONY_3
-	.byte 0 ; party type flags
+@ TONY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tony3
 
-; TONY_4
-	.byte 0 ; party type flags
+@ TONY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tony4
 
-; TONY_5
-	.byte 0 ; party type flags
+@ TONY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tony5
 
-; TAKAO
-	.byte 0 ; party type flags
+@ TAKAO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "TAKAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Takao
 
-; HITOSHI
-	.byte 0 ; party type flags
+@ HITOSHI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "HITOSHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Hitoshi
 
-; KIYO
-	.byte 0 ; party type flags
+@ KIYO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KIYO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kiyo
 
-; KOICHI
-	.byte 0 ; party type flags
+@ KOICHI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOICHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Koichi
 
-; NOB_1
-	.byte 0 ; party type flags
+@ NOB_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nob1
 
-; NOB_2
-	.byte 0 ; party type flags
+@ NOB_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nob2
 
-; NOB_3
-	.byte 0 ; party type flags
+@ NOB_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nob3
 
-; NOB_4
-	.byte 0 ; party type flags
+@ NOB_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Nob4
 
-; NOB_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ NOB_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Nob5
 
-; YUJI
-	.byte 0 ; party type flags
+@ YUJI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "YUJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Yuji
 
-; DAISUKE
-	.byte 0 ; party type flags
+@ DAISUKE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "DAISUKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Daisuke
 
-; ATSUSHI
-	.byte 0 ; party type flags
+@ ATSUSHI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "ATSUSHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Atsushi
 
-; KIRK
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KIRK
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "KIRK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kirk
 
-; GRUNT_25
-	.byte 0 ; party type flags
+@ GRUNT_25
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt25
 
-; GRUNT_26
-	.byte 0 ; party type flags
+@ GRUNT_26
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt26
 
-; SHAWN
-	.byte 0 ; party type flags
+@ SHAWN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "SHAWN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shawn
 
-; FERNANDO_1
-	.byte 0 ; party type flags
+@ FERNANDO_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FERNANDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Fernando1
 
-; DALTON_1
-	.byte 0 ; party type flags
+@ DALTON_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Dalton1
 
-; DALTON_2
-	.byte 0 ; party type flags
+@ DALTON_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dalton2
 
-; DALTON_3
-	.byte 0 ; party type flags
+@ DALTON_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dalton3
 
-; DALTON_4
-	.byte 0 ; party type flags
+@ DALTON_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dalton4
 
-; DALTON_5
-	.byte 0 ; party type flags
+@ DALTON_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dalton5
 
-; COLE
-	.byte 0 ; party type flags
+@ COLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "COLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cole
 
-; JEFF
-	.byte 0 ; party type flags
+@ JEFF
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "JEFF$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jeff
 
-; AXLE
-	.byte 0 ; party type flags
+@ AXLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "AXLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Axle
 
-; JACE
-	.byte 0 ; party type flags
+@ JACE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "JACE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jace
 
-; KEEGAN
-	.byte 0 ; party type flags
+@ KEEGAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "KEEGAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Keegan
 
-; BERNIE_1
-	.byte 0 ; party type flags
+@ BERNIE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bernie1
 
-; BERNIE_2
-	.byte 0 ; party type flags
+@ BERNIE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bernie2
 
-; BERNIE_3
-	.byte 0 ; party type flags
+@ BERNIE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bernie3
 
-; BERNIE_4
-	.byte 0 ; party type flags
+@ BERNIE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bernie4
 
-; BERNIE_5
-	.byte 0 ; party type flags
+@ BERNIE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bernie5
 
-; DREW
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DREW
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "DREW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Drew
 
-; BEAU
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BEAU
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "BEAU$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Beau
 
-; LARRY
-	.byte 0 ; party type flags
+@ LARRY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "LARRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Larry
 
-; SHANE
-	.byte 0 ; party type flags
+@ SHANE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "SHANE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shane
 
-; JUSTIN
-	.byte 0 ; party type flags
+@ JUSTIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "JUSTIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Justin
 
-; ETHAN_1
-	.byte 0 ; party type flags
+@ ETHAN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ethan1
 
-; AUTUMN
-	.byte 0 ; party type flags
+@ AUTUMN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "AUTUMN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Autumn
 
-; TRAVIS
-	.byte 0 ; party type flags
+@ TRAVIS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "TRAVIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Travis
 
-; ETHAN_2
-	.byte 0 ; party type flags
+@ ETHAN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ethan2
 
-; ETHAN_3
-	.byte 0 ; party type flags
+@ ETHAN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ethan3
 
-; ETHAN_4
-	.byte 0 ; party type flags
+@ ETHAN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ethan4
 
-; ETHAN_5
-	.byte 0 ; party type flags
+@ ETHAN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ethan5
 
-; BRENT
-	.byte 0 ; party type flags
+@ BRENT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "BRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brent
 
-; DONALD
-	.byte 0 ; party type flags
+@ DONALD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "DONALD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Donald
 
-; TAYLOR
-	.byte 0 ; party type flags
+@ TAYLOR
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "TAYLOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Taylor
 
-; JEFFREY_1
-	.byte 0 ; party type flags
+@ JEFFREY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "JEFFREY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jeffrey1
 
-; DEREK
-	.byte 0 ; party type flags
+@ DEREK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "DEREK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Derek
 
-; JEFFREY_2
-	.byte 0 ; party type flags
+@ JEFFREY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "JEFFREY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jeffrey2
 
-; JEFFREY_3
-	.byte 0 ; party type flags
+@ JEFFREY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "JEFFREY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jeffrey3
 
-; JEFFREY_4
-	.byte 0 ; party type flags
+@ JEFFREY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "JEFFREY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Jeffrey4
 
-; JEFFREY_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ JEFFREY_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "JEFFREY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Jeffrey5
 
-; EDWARD
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ EDWARD
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "EDWARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Edward
 
-; PRESTON
-	.byte 0 ; party type flags
+@ PRESTON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "PRESTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Preston
 
-; VIRGIL
-	.byte 0 ; party type flags
+@ VIRGIL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "VIRGIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Virgil
 
-; BLAKE
-	.byte 0 ; party type flags
+@ BLAKE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "BLAKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Blake
 
-; WILLIAM
-	.byte 0 ; party type flags
+@ WILLIAM
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "WILLIAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_William
 
-; JOSHUA
-	.byte 0 ; party type flags
+@ JOSHUA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "JOSHUA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Joshua
 
-; CAMERON_1
-	.byte 0 ; party type flags
+@ CAMERON_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cameron1
 
-; CAMERON_2
-	.byte 0 ; party type flags
+@ CAMERON_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cameron2
 
-; CAMERON_3
-	.byte 0 ; party type flags
+@ CAMERON_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cameron3
 
-; CAMERON_4
-	.byte 0 ; party type flags
+@ CAMERON_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cameron4
 
-; CAMERON_5
-	.byte 0 ; party type flags
+@ CAMERON_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cameron5
 
-; JACLYN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JACLYN
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACLYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jaclyn
 
-; HANNAH
-	.byte 0 ; party type flags
+@ HANNAH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "HANNAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Hannah
 
-; SAMANTHA
-	.byte 0 ; party type flags
+@ SAMANTHA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "SAMANTHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Samantha
 
-; MAURA
-	.byte 0 ; party type flags
+@ MAURA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "MAURA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maura
 
-; KAYLA
-	.byte 0 ; party type flags
+@ KAYLA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "KAYLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Kayla
 
-; ALEXIS
-	.byte 0 ; party type flags
+@ ALEXIS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "ALEXIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alexis
 
-; JACKI_1
-	.byte 0 ; party type flags
+@ JACKI_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jacki1
 
-; JACKI_2
-	.byte 0 ; party type flags
+@ JACKI_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jacki2
 
-; JACKI_3
-	.byte 0 ; party type flags
+@ JACKI_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jacki3
 
-; JACKI_4
-	.byte 0 ; party type flags
+@ JACKI_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jacki4
 
-; JACKI_5
-	.byte 0 ; party type flags
+@ JACKI_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jacki5
 
-; WALTER_1
-	.byte 0 ; party type flags
+@ WALTER_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Walter1
 
-; MICAH
-	.byte 0 ; party type flags
+@ MICAH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "MICAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Micah
 
-; THOMAS
-	.byte 0 ; party type flags
+@ THOMAS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "THOMAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Thomas
 
-; WALTER_2
-	.byte 0 ; party type flags
+@ WALTER_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Walter2
 
-; WALTER_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALTER_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Walter3
 
-; WALTER_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALTER_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Walter4
 
-; WALTER_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALTER_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Walter5
 
-; SIDNEY
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ SIDNEY
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_ELITE_FOUR
-	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_ELITE_FOUR_SIDNEY
 	.charmapstr "SIDNEY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xf ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xf @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Sidney
 
-; PHOEBE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ PHOEBE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_ELITE_FOUR
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_ELITE_FOUR_PHOEBE
 	.charmapstr "PHOEBE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Phoebe
 
-; GLACIA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ GLACIA
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_ELITE_FOUR
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_ELITE_FOUR_GLACIA
 	.charmapstr "GLACIA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Glacia
 
-; DRAKE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DRAKE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_ELITE_FOUR
-	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
 	.byte TRAINER_PIC_ELITE_FOUR_DRAKE
 	.charmapstr "DRAKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Drake
 
-; ROXANNE_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ROXANNE_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_ROXANNE
 	.charmapstr "ROXANNE$", 12
-	.2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Roxanne1
 
-; BRAWLY_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAWLY_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_BRAWLY
 	.charmapstr "BRAWLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brawly1
 
-; WATTSON_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WATTSON_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WATTSON
 	.charmapstr "WATTSON$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Wattson1
 
-; FLANNERY_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FLANNERY_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_FLANNERY
 	.charmapstr "FLANNERY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Flannery1
 
-; NORMAN_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ NORMAN_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_NORMAN
 	.charmapstr "NORMAN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Norman1
 
-; WINONA_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINONA_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WINONA
 	.charmapstr "WINONA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x17 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x17 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Winona1
 
-; TATE_AND_LIZA_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TATE_AND_LIZA_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
 	.charmapstr "TATE&LIZA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_TateAndLiza1
 
-; JUAN_1
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JUAN_1
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_JUAN
 	.charmapstr "JUAN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Juan1
 
-; JERRY_1
-	.byte 0 ; party type flags
+@ JERRY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jerry1
 
-; TED
-	.byte 0 ; party type flags
+@ TED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "TED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ted
 
-; PAUL
-	.byte 0 ; party type flags
+@ PAUL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "PAUL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Paul
 
-; JERRY_2
-	.byte 0 ; party type flags
+@ JERRY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jerry2
 
-; JERRY_3
-	.byte 0 ; party type flags
+@ JERRY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jerry3
 
-; JERRY_4
-	.byte 0 ; party type flags
+@ JERRY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jerry4
 
-; JERRY_5
-	.byte 0 ; party type flags
+@ JERRY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_M
 	.charmapstr "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jerry5
 
-; KAREN_1
-	.byte 0 ; party type flags
+@ KAREN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Karen1
 
-; GEORGIA
-	.byte 0 ; party type flags
+@ GEORGIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "GEORGIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Georgia
 
-; KAREN_2
-	.byte 0 ; party type flags
+@ KAREN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Karen2
 
-; KAREN_3
-	.byte 0 ; party type flags
+@ KAREN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Karen3
 
-; KAREN_4
-	.byte 0 ; party type flags
+@ KAREN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Karen4
 
-; KAREN_5
-	.byte 0 ; party type flags
+@ KAREN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_SCHOOL_KID_F
 	.charmapstr "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Karen5
 
-; KATE_AND_JOY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KATE_AND_JOY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "KATE & JOY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KateAndJoy
 
-; ANNA_AND_MEG_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNA_AND_MEG_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AnnaAndMeg1
 
-; ANNA_AND_MEG_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNA_AND_MEG_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AnnaAndMeg2
 
-; ANNA_AND_MEG_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNA_AND_MEG_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AnnaAndMeg3
 
-; ANNA_AND_MEG_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNA_AND_MEG_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AnnaAndMeg4
 
-; ANNA_AND_MEG_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNA_AND_MEG_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AnnaAndMeg5
 
-; VICTOR
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ VICTOR
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_WINSTRATE
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "VICTOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Victor
 
-; MIGUEL_1
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ MIGUEL_1
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Miguel1
 
-; COLTON
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ COLTON
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "COLTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Colton
 
-; MIGUEL_2
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ MIGUEL_2
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Miguel2
 
-; MIGUEL_3
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ MIGUEL_3
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Miguel3
 
-; MIGUEL_4
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ MIGUEL_4
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Miguel4
 
-; MIGUEL_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ MIGUEL_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Miguel5
 
-; VICTORIA
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ VICTORIA
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "VICTORIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Victoria
 
-; VANESSA
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ VANESSA
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "VANESSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Vanessa
 
-; BETHANY
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ BETHANY
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "BETHANY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Bethany
 
-; ISABEL_1
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ ISABEL_1
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Isabel1
 
-; ISABEL_2
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ ISABEL_2
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Isabel2
 
-; ISABEL_3
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ ISABEL_3
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Isabel3
 
-; ISABEL_4
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ ISABEL_4
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Isabel4
 
-; ISABEL_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ ISABEL_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Isabel5
 
-; TIMOTHY_1
-	.byte 0 ; party type flags
+@ TIMOTHY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Timothy1
 
-; TIMOTHY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TIMOTHY_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Timothy2
 
-; TIMOTHY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TIMOTHY_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Timothy3
 
-; TIMOTHY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TIMOTHY_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Timothy4
 
-; TIMOTHY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TIMOTHY_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Timothy5
 
-; VICKY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ VICKY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "VICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Vicky
 
-; SHELBY_1
-	.byte 0 ; party type flags
+@ SHELBY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelby1
 
-; SHELBY_2
-	.byte 0 ; party type flags
+@ SHELBY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelby2
 
-; SHELBY_3
-	.byte 0 ; party type flags
+@ SHELBY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelby3
 
-; SHELBY_4
-	.byte 0 ; party type flags
+@ SHELBY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelby4
 
-; SHELBY_5
-	.byte 0 ; party type flags
+@ SHELBY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shelby5
 
-; CALVIN_1
-	.byte 0 ; party type flags
+@ CALVIN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Calvin1
 
-; BILLY
-	.byte 0 ; party type flags
+@ BILLY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "BILLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Billy
 
-; JOSH
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOSH
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "JOSH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Josh
 
-; TOMMY
-	.byte 0 ; party type flags
+@ TOMMY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "TOMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tommy
 
-; JOEY
-	.byte 0 ; party type flags
+@ JOEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "JOEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Joey
 
-; BEN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BEN
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "BEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ben
 
-; QUINCY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ QUINCY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "QUINCY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Quincy
 
-; KATELYNN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KATELYNN
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "KATELYNN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Katelynn
 
-; JAYLEN
-	.byte 0 ; party type flags
+@ JAYLEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "JAYLEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jaylen
 
-; DILLON
-	.byte 0 ; party type flags
+@ DILLON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "DILLON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dillon
 
-; CALVIN_2
-	.byte 0 ; party type flags
+@ CALVIN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Calvin2
 
-; CALVIN_3
-	.byte 0 ; party type flags
+@ CALVIN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Calvin3
 
-; CALVIN_4
-	.byte 0 ; party type flags
+@ CALVIN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Calvin4
 
-; CALVIN_5
-	.byte 0 ; party type flags
+@ CALVIN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Calvin5
 
-; EDDIE
-	.byte 0 ; party type flags
+@ EDDIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "EDDIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Eddie
 
-; ALLEN
-	.byte 0 ; party type flags
+@ ALLEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "ALLEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Allen
 
-; TIMMY
-	.byte 0 ; party type flags
+@ TIMMY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "TIMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Timmy
 
-; WALLACE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLACE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_CHAMPION
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CHAMPION_WALLACE
 	.charmapstr "WALLACE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Wallace
 
-; ANDREW
-	.byte 0 ; party type flags
+@ ANDREW
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ANDREW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Andrew
 
-; IVAN
-	.byte 0 ; party type flags
+@ IVAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "IVAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ivan
 
-; CLAUDE
-	.byte 0 ; party type flags
+@ CLAUDE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "CLAUDE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Claude
 
-; ELLIOT_1
-	.byte 0 ; party type flags
+@ ELLIOT_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Elliot1
 
-; NED
-	.byte 0 ; party type flags
+@ NED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "NED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Ned
 
-; DALE
-	.byte 0 ; party type flags
+@ DALE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "DALE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Dale
 
-; NOLAN
-	.byte 0 ; party type flags
+@ NOLAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "NOLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nolan
 
-; BARNY
-	.byte 0 ; party type flags
+@ BARNY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "BARNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Barny
 
-; WADE
-	.byte 0 ; party type flags
+@ WADE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "WADE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Wade
 
-; CARTER
-	.byte 0 ; party type flags
+@ CARTER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "CARTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Carter
 
-; ELLIOT_2
-	.byte 0 ; party type flags
+@ ELLIOT_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Elliot2
 
-; ELLIOT_3
-	.byte 0 ; party type flags
+@ ELLIOT_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Elliot3
 
-; ELLIOT_4
-	.byte 0 ; party type flags
+@ ELLIOT_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Elliot4
 
-; ELLIOT_5
-	.byte 0 ; party type flags
+@ ELLIOT_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Elliot5
 
-; RONALD
-	.byte 0 ; party type flags
+@ RONALD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "RONALD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Ronald
 
-; JACOB
-	.byte 0 ; party type flags
+@ JACOB
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "JACOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jacob
 
-; ANTHONY
-	.byte 0 ; party type flags
+@ ANTHONY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "ANTHONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Anthony
 
-; BENJAMIN_1
-	.byte 0 ; party type flags
+@ BENJAMIN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Benjamin1
 
-; BENJAMIN_2
-	.byte 0 ; party type flags
+@ BENJAMIN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Benjamin2
 
-; BENJAMIN_3
-	.byte 0 ; party type flags
+@ BENJAMIN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Benjamin3
 
-; BENJAMIN_4
-	.byte 0 ; party type flags
+@ BENJAMIN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Benjamin4
 
-; BENJAMIN_5
-	.byte 0 ; party type flags
+@ BENJAMIN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Benjamin5
 
-; ABIGAIL_1
-	.byte 0 ; party type flags
+@ ABIGAIL_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Abigail1
 
-; JASMINE
-	.byte 0 ; party type flags
+@ JASMINE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "JASMINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jasmine
 
-; ABIGAIL_2
-	.byte 0 ; party type flags
+@ ABIGAIL_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Abigail2
 
-; ABIGAIL_3
-	.byte 0 ; party type flags
+@ ABIGAIL_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Abigail3
 
-; ABIGAIL_4
-	.byte 0 ; party type flags
+@ ABIGAIL_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Abigail4
 
-; ABIGAIL_5
-	.byte 0 ; party type flags
+@ ABIGAIL_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Abigail5
 
-; DYLAN_1
-	.byte 0 ; party type flags
+@ DYLAN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.charmapstr "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dylan1
 
-; DYLAN_2
-	.byte 0 ; party type flags
+@ DYLAN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.charmapstr "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dylan2
 
-; DYLAN_3
-	.byte 0 ; party type flags
+@ DYLAN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.charmapstr "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dylan3
 
-; DYLAN_4
-	.byte 0 ; party type flags
+@ DYLAN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.charmapstr "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dylan4
 
-; DYLAN_5
-	.byte 0 ; party type flags
+@ DYLAN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
 	.charmapstr "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dylan5
 
-; MARIA_1
-	.byte 0 ; party type flags
+@ MARIA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maria1
 
-; MARIA_2
-	.byte 0 ; party type flags
+@ MARIA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maria2
 
-; MARIA_3
-	.byte 0 ; party type flags
+@ MARIA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maria3
 
-; MARIA_4
-	.byte 0 ; party type flags
+@ MARIA_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maria4
 
-; MARIA_5
-	.byte 0 ; party type flags
+@ MARIA_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Maria5
 
-; CAMDEN
-	.byte 0 ; party type flags
+@ CAMDEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "CAMDEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Camden
 
-; DEMETRIUS
-	.byte 0 ; party type flags
+@ DEMETRIUS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "DEMETRIUS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Demetrius
 
-; ISAIAH_1
-	.byte 0 ; party type flags
+@ ISAIAH_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isaiah1
 
-; PABLO_1
-	.byte 0 ; party type flags
+@ PABLO_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Pablo1
 
-; CHASE
-	.byte 0 ; party type flags
+@ CHASE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "CHASE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Chase
 
-; ISAIAH_2
-	.byte 0 ; party type flags
+@ ISAIAH_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isaiah2
 
-; ISAIAH_3
-	.byte 0 ; party type flags
+@ ISAIAH_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isaiah3
 
-; ISAIAH_4
-	.byte 0 ; party type flags
+@ ISAIAH_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isaiah4
 
-; ISAIAH_5
-	.byte 0 ; party type flags
+@ ISAIAH_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isaiah5
 
-; ISOBEL
-	.byte 0 ; party type flags
+@ ISOBEL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "ISOBEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isobel
 
-; DONNY
-	.byte 0 ; party type flags
+@ DONNY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "DONNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Donny
 
-; TALIA
-	.byte 0 ; party type flags
+@ TALIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "TALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Talia
 
-; KATELYN_1
-	.byte 0 ; party type flags
+@ KATELYN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Katelyn1
 
-; ALLISON
-	.byte 0 ; party type flags
+@ ALLISON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "ALLISON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Allison
 
-; KATELYN_2
-	.byte 0 ; party type flags
+@ KATELYN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Katelyn2
 
-; KATELYN_3
-	.byte 0 ; party type flags
+@ KATELYN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Katelyn3
 
-; KATELYN_4
-	.byte 0 ; party type flags
+@ KATELYN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Katelyn4
 
-; KATELYN_5
-	.byte 0 ; party type flags
+@ KATELYN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Katelyn5
 
-; NICOLAS_1
-	.byte 0 ; party type flags
+@ NICOLAS_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nicolas1
 
-; NICOLAS_2
-	.byte 0 ; party type flags
+@ NICOLAS_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nicolas2
 
-; NICOLAS_3
-	.byte 0 ; party type flags
+@ NICOLAS_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nicolas3
 
-; NICOLAS_4
-	.byte 0 ; party type flags
+@ NICOLAS_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Nicolas4
 
-; NICOLAS_5
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ NICOLAS_5
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Nicolas5
 
-; AARON
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ AARON
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_DRAGON_TAMER
 	.charmapstr "AARON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Aaron
 
-; PERRY
-	.byte 0 ; party type flags
+@ PERRY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "PERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Perry
 
-; HUGH
-	.byte 0 ; party type flags
+@ HUGH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "HUGH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Hugh
 
-; PHIL
-	.byte 0 ; party type flags
+@ PHIL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "PHIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Phil
 
-; JARED
-	.byte 0 ; party type flags
+@ JARED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "JARED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jared
 
-; HUMBERTO
-	.byte 0 ; party type flags
+@ HUMBERTO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "HUMBERTO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Humberto
 
-; PRESLEY
-	.byte 0 ; party type flags
+@ PRESLEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "PRESLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Presley
 
-; EDWARDO
-	.byte 0 ; party type flags
+@ EDWARDO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "EDWARDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwardo
 
-; COLIN
-	.byte 0 ; party type flags
+@ COLIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "COLIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Colin
 
-; ROBERT_1
-	.byte 0 ; party type flags
+@ ROBERT_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Robert1
 
-; BENNY
-	.byte 0 ; party type flags
+@ BENNY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "BENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Benny
 
-; CHESTER
-	.byte 0 ; party type flags
+@ CHESTER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "CHESTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Chester
 
-; ROBERT_2
-	.byte 0 ; party type flags
+@ ROBERT_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Robert2
 
-; ROBERT_3
-	.byte 0 ; party type flags
+@ ROBERT_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Robert3
 
-; ROBERT_4
-	.byte 0 ; party type flags
+@ ROBERT_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Robert4
 
-; ROBERT_5
-	.byte 0 ; party type flags
+@ ROBERT_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Robert5
 
-; ALEX
-	.byte 0 ; party type flags
+@ ALEX
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ALEX$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alex
 
-; BECK
-	.byte 0 ; party type flags
+@ BECK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "BECK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Beck
 
-; YASU
-	.byte 0 ; party type flags
+@ YASU
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "YASU$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Yasu
 
-; TAKASHI
-	.byte 0 ; party type flags
+@ TAKASHI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "TAKASHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Takashi
 
-; DIANNE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DIANNE
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "DIANNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Dianne
 
-; JANI
-	.byte 0 ; party type flags
+@ JANI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "JANI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jani
 
-; LAO_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LAO_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Lao1
 
-; LUNG
-	.byte 0 ; party type flags
+@ LUNG
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LUNG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lung
 
-; LAO_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LAO_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Lao2
 
-; LAO_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LAO_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Lao3
 
-; LAO_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LAO_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Lao4
 
-; LAO_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LAO_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Lao5
 
-; JOCELYN
-	.byte 0 ; party type flags
+@ JOCELYN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "JOCELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jocelyn
 
-; LAURA
-	.byte 0 ; party type flags
+@ LAURA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "LAURA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Laura
 
-; CYNDY_1
-	.byte 0 ; party type flags
+@ CYNDY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cyndy1
 
-; CORA
-	.byte 0 ; party type flags
+@ CORA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CORA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cora
 
-; PAULA
-	.byte 0 ; party type flags
+@ PAULA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "PAULA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Paula
 
-; CYNDY_2
-	.byte 0 ; party type flags
+@ CYNDY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cyndy2
 
-; CYNDY_3
-	.byte 0 ; party type flags
+@ CYNDY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cyndy3
 
-; CYNDY_4
-	.byte 0 ; party type flags
+@ CYNDY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cyndy4
 
-; CYNDY_5
-	.byte 0 ; party type flags
+@ CYNDY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cyndy5
 
-; MADELINE_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MADELINE_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Madeline1
 
-; CLARISSA
-	.byte 0 ; party type flags
+@ CLARISSA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "CLARISSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Clarissa
 
-; ANGELICA
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANGELICA
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "ANGELICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Angelica
 
-; MADELINE_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MADELINE_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Madeline2
 
-; MADELINE_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MADELINE_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Madeline3
 
-; MADELINE_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MADELINE_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Madeline4
 
-; MADELINE_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MADELINE_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Madeline5
 
-; BEVERLY
-	.byte 0 ; party type flags
+@ BEVERLY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "BEVERLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Beverly
 
-; IMANI
-	.byte 0 ; party type flags
+@ IMANI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "IMANI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Imani
 
-; KYLA
-	.byte 0 ; party type flags
+@ KYLA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "KYLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kyla
 
-; DENISE
-	.byte 0 ; party type flags
+@ DENISE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "DENISE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Denise
 
-; BETH
-	.byte 0 ; party type flags
+@ BETH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "BETH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Beth
 
-; TARA
-	.byte 0 ; party type flags
+@ TARA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "TARA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tara
 
-; MISSY
-	.byte 0 ; party type flags
+@ MISSY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "MISSY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Missy
 
-; ALICE
-	.byte 0 ; party type flags
+@ ALICE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "ALICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Alice
 
-; JENNY_1
-	.byte 0 ; party type flags
+@ JENNY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jenny1
 
-; GRACE
-	.byte 0 ; party type flags
+@ GRACE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "GRACE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grace
 
-; TANYA
-	.byte 0 ; party type flags
+@ TANYA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "TANYA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tanya
 
-; SHARON
-	.byte 0 ; party type flags
+@ SHARON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "SHARON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sharon
 
-; NIKKI
-	.byte 0 ; party type flags
+@ NIKKI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "NIKKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nikki
 
-; BRENDA
-	.byte 0 ; party type flags
+@ BRENDA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "BRENDA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brenda
 
-; KATIE
-	.byte 0 ; party type flags
+@ KATIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "KATIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Katie
 
-; SUSIE
-	.byte 0 ; party type flags
+@ SUSIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "SUSIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Susie
 
-; KARA
-	.byte 0 ; party type flags
+@ KARA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "KARA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kara
 
-; DANA
-	.byte 0 ; party type flags
+@ DANA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "DANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Dana
 
-; SIENNA
-	.byte 0 ; party type flags
+@ SIENNA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "SIENNA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Sienna
 
-; DEBRA
-	.byte 0 ; party type flags
+@ DEBRA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "DEBRA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Debra
 
-; LINDA
-	.byte 0 ; party type flags
+@ LINDA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "LINDA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Linda
 
-; KAYLEE
-	.byte 0 ; party type flags
+@ KAYLEE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "KAYLEE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kaylee
 
-; LAUREL
-	.byte 0 ; party type flags
+@ LAUREL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "LAUREL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Laurel
 
-; CARLEE
-	.byte 0 ; party type flags
+@ CARLEE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "CARLEE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Carlee
 
-; JENNY_2
-	.byte 0 ; party type flags
+@ JENNY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jenny2
 
-; JENNY_3
-	.byte 0 ; party type flags
+@ JENNY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jenny3
 
-; JENNY_4
-	.byte 0 ; party type flags
+@ JENNY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jenny4
 
-; JENNY_5
-	.byte 0 ; party type flags
+@ JENNY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jenny5
 
-; HEIDI
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ HEIDI
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "HEIDI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Heidi
 
-; BECKY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BECKY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "BECKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Becky
 
-; CAROL
-	.byte 0 ; party type flags
+@ CAROL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "CAROL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Carol
 
-; NANCY
-	.byte 0 ; party type flags
+@ NANCY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "NANCY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Nancy
 
-; MARTHA
-	.byte 0 ; party type flags
+@ MARTHA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "MARTHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Martha
 
-; DIANA_1
-	.byte 0 ; party type flags
+@ DIANA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Diana1
 
-; CEDRIC
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ CEDRIC
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "CEDRIC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cedric
 
-; IRENE
-	.byte 0 ; party type flags
+@ IRENE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "IRENE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Irene
 
-; DIANA_2
-	.byte 0 ; party type flags
+@ DIANA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Diana2
 
-; DIANA_3
-	.byte 0 ; party type flags
+@ DIANA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Diana3
 
-; DIANA_4
-	.byte 0 ; party type flags
+@ DIANA_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Diana4
 
-; DIANA_5
-	.byte 0 ; party type flags
+@ DIANA_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Diana5
 
-; AMY_AND_LIV_1
-	.byte 0 ; party type flags
+@ AMY_AND_LIV_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv1
 
-; AMY_AND_LIV_2
-	.byte 0 ; party type flags
+@ AMY_AND_LIV_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv2
 
-; GINA_AND_MIA_1
-	.byte 0 ; party type flags
+@ GINA_AND_MIA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "GINA & MIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GinaAndMia1
 
-; MIU_AND_YUKI
-	.byte 0 ; party type flags
+@ MIU_AND_YUKI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "MIU & YUKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_MiuAndYuki
 
-; AMY_AND_LIV_3
-	.byte 0 ; party type flags
+@ AMY_AND_LIV_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv3
 
-; GINA_AND_MIA_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ GINA_AND_MIA_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "GINA & MIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_GinaAndMia2
 
-; AMY_AND_LIV_4
-	.byte 0 ; party type flags
+@ AMY_AND_LIV_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv4
 
-; AMY_AND_LIV_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ AMY_AND_LIV_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv5
 
-; AMY_AND_LIV_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ AMY_AND_LIV_6
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_AmyAndLiv6
 
-; HUEY
-	.byte 0 ; party type flags
+@ HUEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "HUEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Huey
 
-; EDMOND
-	.byte 0 ; party type flags
+@ EDMOND
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "EDMOND$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Edmond
 
-; ERNEST_1
-	.byte 0 ; party type flags
+@ ERNEST_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ernest1
 
-; DWAYNE
-	.byte 0 ; party type flags
+@ DWAYNE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "DWAYNE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Dwayne
 
-; PHILLIP
-	.byte 0 ; party type flags
+@ PHILLIP
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "PHILLIP$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Phillip
 
-; LEONARD
-	.byte 0 ; party type flags
+@ LEONARD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "LEONARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Leonard
 
-; DUNCAN
-	.byte 0 ; party type flags
+@ DUNCAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "DUNCAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Duncan
 
-; ERNEST_2
-	.byte 0 ; party type flags
+@ ERNEST_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ernest2
 
-; ERNEST_3
-	.byte 0 ; party type flags
+@ ERNEST_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ernest3
 
-; ERNEST_4
-	.byte 0 ; party type flags
+@ ERNEST_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ernest4
 
-; ERNEST_5
-	.byte 0 ; party type flags
+@ ERNEST_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ernest5
 
-; ELI
-	.byte 0 ; party type flags
+@ ELI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "ELI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Eli
 
-; ANNIKA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANNIKA
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_F
 	.charmapstr "ANNIKA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Annika
 
-; JAZMYN
-	.byte 0 ; party type flags
+@ JAZMYN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_2
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "JAZMYN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jazmyn
 
-; JONAS
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JONAS
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "JONAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jonas
 
-; KAYLEY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KAYLEY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "KAYLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kayley
 
-; AURON
-	.byte 0 ; party type flags
+@ AURON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "AURON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Auron
 
-; KELVIN
-	.byte 0 ; party type flags
+@ KELVIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "KELVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kelvin
 
-; MARLEY
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MARLEY
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "MARLEY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Marley
 
-; REYNA
-	.byte 0 ; party type flags
+@ REYNA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "REYNA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Reyna
 
-; HUDSON
-	.byte 0 ; party type flags
+@ HUDSON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "HUDSON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Hudson
 
-; CONOR
-	.byte 0 ; party type flags
+@ CONOR
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "CONOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Conor
 
-; EDWIN_1
-	.byte 0 ; party type flags
+@ EDWIN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwin1
 
-; HECTOR
-	.byte 0 ; party type flags
+@ HECTOR
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "HECTOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Hector
 
-; TABITHA_1
-	.byte 0 ; party type flags
+@ TABITHA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN
 	.charmapstr "TABITHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Tabitha1
 
-; EDWIN_2
-	.byte 0 ; party type flags
+@ EDWIN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwin2
 
-; EDWIN_3
-	.byte 0 ; party type flags
+@ EDWIN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwin3
 
-; EDWIN_4
-	.byte 0 ; party type flags
+@ EDWIN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwin4
 
-; EDWIN_5
-	.byte 0 ; party type flags
+@ EDWIN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_COLLECTOR
 	.charmapstr "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Edwin5
 
-; WALLY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLY_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wally1
 
-; BRENDAN_1
-	.byte 0 ; party type flags
+@ BRENDAN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brendan1
 
-; BRENDAN_2
-	.byte 0 ; party type flags
+@ BRENDAN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan2
 
-; BRENDAN_3
-	.byte 0 ; party type flags
+@ BRENDAN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan3
 
-; BRENDAN_4
-	.byte 0 ; party type flags
+@ BRENDAN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brendan4
 
-; BRENDAN_5
-	.byte 0 ; party type flags
+@ BRENDAN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan5
 
-; BRENDAN_6
-	.byte 0 ; party type flags
+@ BRENDAN_6
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan6
 
-; BRENDAN_7
-	.byte 0 ; party type flags
+@ BRENDAN_7
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brendan7
 
-; BRENDAN_8
-	.byte 0 ; party type flags
+@ BRENDAN_8
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan8
 
-; BRENDAN_9
-	.byte 0 ; party type flags
+@ BRENDAN_9
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Brendan9
 
-; MAY_1
-	.byte 0 ; party type flags
+@ MAY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_May1
 
-; MAY_2
-	.byte 0 ; party type flags
+@ MAY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May2
 
-; MAY_3
-	.byte 0 ; party type flags
+@ MAY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May3
 
-; MAY_4
-	.byte 0 ; party type flags
+@ MAY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_May4
 
-; MAY_5
-	.byte 0 ; party type flags
+@ MAY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May5
 
-; MAY_6
-	.byte 0 ; party type flags
+@ MAY_6
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May6
 
-; MAY_7
-	.byte 0 ; party type flags
+@ MAY_7
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_May7
 
-; MAY_8
-	.byte 0 ; party type flags
+@ MAY_8
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May8
 
-; MAY_9
-	.byte 0 ; party type flags
+@ MAY_9
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_May9
 
-; ISAAC_1
-	.byte 0 ; party type flags
+@ ISAAC_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Isaac1
 
-; DAVIS
-	.byte 0 ; party type flags
+@ DAVIS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "DAVIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Davis
 
-; MITCHELL
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MITCHELL
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "MITCHELL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Mitchell
 
-; ISAAC_2
-	.byte 0 ; party type flags
+@ ISAAC_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Isaac2
 
-; ISAAC_3
-	.byte 0 ; party type flags
+@ ISAAC_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Isaac3
 
-; ISAAC_4
-	.byte 0 ; party type flags
+@ ISAAC_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Isaac4
 
-; ISAAC_5
-	.byte 0 ; party type flags
+@ ISAAC_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Isaac5
 
-; LYDIA_1
-	.byte 0 ; party type flags
+@ LYDIA_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Lydia1
 
-; HALLE
-	.byte 0 ; party type flags
+@ HALLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "HALLE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Halle
 
-; GARRISON
-	.byte 0 ; party type flags
+@ GARRISON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "GARRISON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Garrison
 
-; LYDIA_2
-	.byte 0 ; party type flags
+@ LYDIA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Lydia2
 
-; LYDIA_3
-	.byte 0 ; party type flags
+@ LYDIA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Lydia3
 
-; LYDIA_4
-	.byte 0 ; party type flags
+@ LYDIA_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Lydia4
 
-; LYDIA_5
-	.byte 0 ; party type flags
+@ LYDIA_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Lydia5
 
-; JACKSON_1
-	.byte 0 ; party type flags
+@ JACKSON_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jackson1
 
-; LORENZO
-	.byte 0 ; party type flags
+@ LORENZO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "LORENZO$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Lorenzo
 
-; SEBASTIAN
-	.byte 0 ; party type flags
+@ SEBASTIAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "SEBASTIAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sebastian
 
-; JACKSON_2
-	.byte 0 ; party type flags
+@ JACKSON_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jackson2
 
-; JACKSON_3
-	.byte 0 ; party type flags
+@ JACKSON_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jackson3
 
-; JACKSON_4
-	.byte 0 ; party type flags
+@ JACKSON_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Jackson4
 
-; JACKSON_5
-	.byte 0 ; party type flags
+@ JACKSON_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_M
 	.charmapstr "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jackson5
 
-; CATHERINE_1
-	.byte 0 ; party type flags
+@ CATHERINE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Catherine1
 
-; JENNA
-	.byte 0 ; party type flags
+@ JENNA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "JENNA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jenna
 
-; SOPHIA
-	.byte 0 ; party type flags
+@ SOPHIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "SOPHIA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Sophia
 
-; CATHERINE_2
-	.byte 0 ; party type flags
+@ CATHERINE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Catherine2
 
-; CATHERINE_3
-	.byte 0 ; party type flags
+@ CATHERINE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Catherine3
 
-; CATHERINE_4
-	.byte 0 ; party type flags
+@ CATHERINE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Catherine4
 
-; CATHERINE_5
-	.byte 0 ; party type flags
+@ CATHERINE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_RANGER_F
 	.charmapstr "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Catherine5
 
-; JULIO
-	.byte 0 ; party type flags
+@ JULIO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
 	.charmapstr "JULIO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Julio
 
-; GRUNT_27
-	.byte 0 ; party type flags
+@ GRUNT_27
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt27
 
-; GRUNT_28
-	.byte 0 ; party type flags
+@ GRUNT_28
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt28
 
-; GRUNT_29
-	.byte 0 ; party type flags
+@ GRUNT_29
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt29
 
-; GRUNT_30
-	.byte 0 ; party type flags
+@ GRUNT_30
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt30
 
-; MARC
-	.byte 0 ; party type flags
+@ MARC
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "MARC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Marc
 
-; BRENDEN
-	.byte 0 ; party type flags
+@ BRENDEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "BRENDEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brenden
 
-; LILITH
-	.byte 0 ; party type flags
+@ LILITH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "LILITH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Lilith
 
-; CRISTIAN
-	.byte 0 ; party type flags
+@ CRISTIAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "CRISTIAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Cristian
 
-; SYLVIA
-	.byte 0 ; party type flags
+@ SYLVIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "SYLVIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sylvia
 
-; LEONARDO
-	.byte 0 ; party type flags
+@ LEONARDO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "LEONARDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Leonardo
 
-; ATHENA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ATHENA
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "ATHENA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Athena
 
-; HARRISON
-	.byte 0 ; party type flags
+@ HARRISON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "HARRISON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Harrison
 
-; GRUNT_31
-	.byte 0 ; party type flags
+@ GRUNT_31
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt31
 
-; CLARENCE
-	.byte 0 ; party type flags
+@ CLARENCE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "CLARENCE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Clarence
 
-; TERRY
-	.byte 0 ; party type flags
+@ TERRY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "TERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Terry
 
-; NATE
-	.byte 0 ; party type flags
+@ NATE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "NATE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nate
 
-; KATHLEEN
-	.byte 0 ; party type flags
+@ KATHLEEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_HEX_MANIAC
 	.charmapstr "KATHLEEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kathleen
 
-; CLIFFORD
-	.byte 0 ; party type flags
+@ CLIFFORD
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "CLIFFORD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Clifford
 
-; NICHOLAS
-	.byte 0 ; party type flags
+@ NICHOLAS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "NICHOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Nicholas
 
-; GRUNT_32
-	.byte 0 ; party type flags
+@ GRUNT_32
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt32
 
-; GRUNT_33
-	.byte 0 ; party type flags
+@ GRUNT_33
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt33
 
-; GRUNT_34
-	.byte 0 ; party type flags
+@ GRUNT_34
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt34
 
-; GRUNT_35
-	.byte 0 ; party type flags
+@ GRUNT_35
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt35
 
-; GRUNT_36
-	.byte 0 ; party type flags
+@ GRUNT_36
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt36
 
-; MACEY
-	.byte 0 ; party type flags
+@ MACEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "MACEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Macey
 
-; BRENDAN_10
-	.byte 0 ; party type flags
+@ BRENDAN_10
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Brendan10
 
-; BRENDAN_11
-	.byte 0 ; party type flags
+@ BRENDAN_11
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Brendan11
 
-; PAXTON
-	.byte 0 ; party type flags
+@ PAXTON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_M
 	.charmapstr "PAXTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Paxton
 
-; ISABELLA
-	.byte 0 ; party type flags
+@ ISABELLA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
 	.charmapstr "ISABELLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isabella
 
-; GRUNT_37
-	.byte 0 ; party type flags
+@ GRUNT_37
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
 	.byte TRAINER_PIC_AQUA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt37
 
-; TABITHA_2
-	.byte 0 ; party type flags
+@ TABITHA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN
 	.charmapstr "TABITHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Tabitha2
 
-; JONATHAN
-	.byte 0 ; party type flags
+@ JONATHAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "JONATHAN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jonathan
 
-; BRENDAN_12
-	.byte 0 ; party type flags
+@ BRENDAN_12
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Brendan12
 
-; MAY_10
-	.byte 0 ; party type flags
+@ MAY_10
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_May10
 
-; MAXIE_1
-	.byte 0 ; party type flags
+@ MAXIE_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_LEADER_MAXIE
 	.charmapstr "MAXIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Maxie1
 
-; MAXIE_2
-	.byte 0 ; party type flags
+@ MAXIE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_LEADER_MAXIE
 	.charmapstr "MAXIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Maxie2
 
-; TIANA
-	.byte 0 ; party type flags
+@ TIANA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "TIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Tiana
 
-; HALEY_1
-	.byte 0 ; party type flags
+@ HALEY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Haley1
 
-; JANICE
-	.byte 0 ; party type flags
+@ JANICE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "JANICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Janice
 
-; VIVI
-	.byte 0 ; party type flags
+@ VIVI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "VIVI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Vivi
 
-; HALEY_2
-	.byte 0 ; party type flags
+@ HALEY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Haley2
 
-; HALEY_3
-	.byte 0 ; party type flags
+@ HALEY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Haley3
 
-; HALEY_4
-	.byte 0 ; party type flags
+@ HALEY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Haley4
 
-; HALEY_5
-	.byte 0 ; party type flags
+@ HALEY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Haley5
 
-; SALLY
-	.byte 0 ; party type flags
+@ SALLY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "SALLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Sally
 
-; ROBIN
-	.byte 0 ; party type flags
+@ ROBIN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "ROBIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Robin
 
-; ANDREA
-	.byte 0 ; party type flags
+@ ANDREA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "ANDREA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Andrea
 
-; CRISSY
-	.byte 0 ; party type flags
+@ CRISSY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LASS
 	.charmapstr "CRISSY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Crissy
 
-; RICK
-	.byte 0 ; party type flags
+@ RICK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "RICK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Rick
 
-; LYLE
-	.byte 0 ; party type flags
+@ LYLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "LYLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Lyle
 
-; JOSE
-	.byte 0 ; party type flags
+@ JOSE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JOSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jose
 
-; DOUG
-	.byte 0 ; party type flags
+@ DOUG
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "DOUG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Doug
 
-; GREG
-	.byte 0 ; party type flags
+@ GREG
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "GREG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Greg
 
-; KENT
-	.byte 0 ; party type flags
+@ KENT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "KENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kent
 
-; JAMES_1
-	.byte 0 ; party type flags
+@ JAMES_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_James1
 
-; JAMES_2
-	.byte 0 ; party type flags
+@ JAMES_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_James2
 
-; JAMES_3
-	.byte 0 ; party type flags
+@ JAMES_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_James3
 
-; JAMES_4
-	.byte 0 ; party type flags
+@ JAMES_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_James4
 
-; JAMES_5
-	.byte 0 ; party type flags
+@ JAMES_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_CATCHER
 	.charmapstr "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_James5
 
-; BRICE
-	.byte 0 ; party type flags
+@ BRICE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "BRICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Brice
 
-; TRENT_1
-	.byte 0 ; party type flags
+@ TRENT_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Trent1
 
-; LENNY
-	.byte 0 ; party type flags
+@ LENNY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "LENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lenny
 
-; LUCAS_1
-	.byte 0 ; party type flags
+@ LUCAS_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "LUCAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lucas1
 
-; ALAN
-	.byte 0 ; party type flags
+@ ALAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "ALAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Alan
 
-; CLARK
-	.byte 0 ; party type flags
+@ CLARK
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "CLARK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Clark
 
-; ERIC
-	.byte 0 ; party type flags
+@ ERIC
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "ERIC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Eric
 
-; LUCAS_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LUCAS_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "LUCAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Lucas2
 
-; MIKE_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MIKE_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "MIKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Mike1
 
-; MIKE_2
-	.byte 0 ; party type flags
+@ MIKE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "MIKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Mike2
 
-; TRENT_2
-	.byte 0 ; party type flags
+@ TRENT_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Trent2
 
-; TRENT_3
-	.byte 0 ; party type flags
+@ TRENT_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Trent3
 
-; TRENT_4
-	.byte 0 ; party type flags
+@ TRENT_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Trent4
 
-; TRENT_5
-	.byte 0 ; party type flags
+@ TRENT_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Trent5
 
-; DEZ_AND_LUKE
-	.byte 0 ; party type flags
+@ DEZ_AND_LUKE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "DEZ & LUKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_DezAndLuke
 
-; LEA_AND_JED
-	.byte 0 ; party type flags
+@ LEA_AND_JED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "LEA & JED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LeaAndJed
 
-; KIRA_AND_DAN_1
-	.byte 0 ; party type flags
+@ KIRA_AND_DAN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "KIRA & DAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KiraAndDan1
 
-; KIRA_AND_DAN_2
-	.byte 0 ; party type flags
+@ KIRA_AND_DAN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "KIRA & DAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KiraAndDan2
 
-; KIRA_AND_DAN_3
-	.byte 0 ; party type flags
+@ KIRA_AND_DAN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "KIRA & DAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KiraAndDan3
 
-; KIRA_AND_DAN_4
-	.byte 0 ; party type flags
+@ KIRA_AND_DAN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "KIRA & DAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KiraAndDan4
 
-; KIRA_AND_DAN_5
-	.byte 0 ; party type flags
+@ KIRA_AND_DAN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "KIRA & DAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KiraAndDan5
 
-; JOHANNA
-	.byte 0 ; party type flags
+@ JOHANNA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "JOHANNA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Johanna
 
-; GERALD
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ GERALD
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "GERALD$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Gerald
 
-; VIVIAN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ VIVIAN
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "VIVIAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Vivian
 
-; DANIELLE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ DANIELLE
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "DANIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Danielle
 
-; HIDEO
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ HIDEO
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "HIDEO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Hideo
 
-; KEIGO
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KEIGO
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "KEIGO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Keigo
 
-; RILEY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ RILEY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "RILEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x3 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x3 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Riley
 
-; FLINT
-	.byte 0 ; party type flags
+@ FLINT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "FLINT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Flint
 
-; ASHLEY
-	.byte 0 ; party type flags
+@ ASHLEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "ASHLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Ashley
 
-; WALLY_2
-	.byte 0 ; party type flags
+@ WALLY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Wally2
 
-; WALLY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLY_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wally3
 
-; WALLY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLY_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wally4
 
-; WALLY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLY_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wally5
 
-; WALLY_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WALLY_6
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_WALLY
 	.charmapstr "WALLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wally6
 
-; BRENDAN_13
-	.byte 0 ; party type flags
+@ BRENDAN_13
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Brendan13
 
-; BRENDAN_14
-	.byte 0 ; party type flags
+@ BRENDAN_14
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Brendan14
 
-; BRENDAN_15
-	.byte 0 ; party type flags
+@ BRENDAN_15
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Brendan15
 
-; MAY_11
-	.byte 0 ; party type flags
+@ MAY_11
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_May11
 
-; MAY_12
-	.byte 0 ; party type flags
+@ MAY_12
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_May12
 
-; MAY_13
-	.byte 0 ; party type flags
+@ MAY_13
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_May13
 
-; JONAH
-	.byte 0 ; party type flags
+@ JONAH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "JONAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Jonah
 
-; HENRY
-	.byte 0 ; party type flags
+@ HENRY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "HENRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Henry
 
-; ROGER
-	.byte 0 ; party type flags
+@ ROGER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "ROGER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Roger
 
-; ALEXA
-	.byte 0 ; party type flags
+@ ALEXA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "ALEXA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alexa
 
-; RUBEN
-	.byte 0 ; party type flags
+@ RUBEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "RUBEN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Ruben
 
-; KOJI_1
-	.byte 0 ; party type flags
+@ KOJI_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Koji1
 
-; WAYNE
-	.byte 0 ; party type flags
+@ WAYNE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "WAYNE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Wayne
 
-; AIDAN
-	.byte 0 ; party type flags
+@ AIDAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "AIDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Aidan
 
-; REED
-	.byte 0 ; party type flags
+@ REED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "REED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Reed
 
-; TISHA
-	.byte 0 ; party type flags
+@ TISHA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "TISHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tisha
 
-; TORI_AND_TIA
-	.byte 0 ; party type flags
+@ TORI_AND_TIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_TWINS
 	.charmapstr "TORI & TIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_ToriAndTia
 
-; KIM_AND_IRIS
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ KIM_AND_IRIS
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "KIM & IRIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_KimAndIris
 
-; TYRA_AND_IVY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TYRA_AND_IVY
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_SR_AND_JR
 	.charmapstr "TYRA & IVY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_TyraAndIvy
 
-; MEL_AND_PAUL
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ MEL_AND_PAUL
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNG_COUPLE
 	.charmapstr "MEL & PAUL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_MelAndPaul
 
-; JOHN_AND_JAY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOHN_AND_JAY_1
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.charmapstr "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_JohnAndJay1
 
-; JOHN_AND_JAY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOHN_AND_JAY_2
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.charmapstr "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_JohnAndJay2
 
-; JOHN_AND_JAY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOHN_AND_JAY_3
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.charmapstr "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_JohnAndJay3
 
-; JOHN_AND_JAY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOHN_AND_JAY_4
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.charmapstr "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0xb ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0xb @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_JohnAndJay4
 
-; JOHN_AND_JAY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JOHN_AND_JAY_5
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_OLD_COUPLE
 	.charmapstr "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_JohnAndJay5
 
-; RELI_AND_IAN
-	.byte 0 ; party type flags
+@ RELI_AND_IAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "RELI & IAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_ReliAndIan
 
-; LILA_AND_ROY_1
-	.byte 0 ; party type flags
+@ LILA_AND_ROY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LILA & ROY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LilaAndRoy1
 
-; LILA_AND_ROY_2
-	.byte 0 ; party type flags
+@ LILA_AND_ROY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LILA & ROY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LilaAndRoy2
 
-; LILA_AND_ROY_3
-	.byte 0 ; party type flags
+@ LILA_AND_ROY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LILA & ROY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LilaAndRoy3
 
-; LILA_AND_ROY_4
-	.byte 0 ; party type flags
+@ LILA_AND_ROY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LILA & ROY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LilaAndRoy4
 
-; LILA_AND_ROY_5
-	.byte 0 ; party type flags
+@ LILA_AND_ROY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LILA & ROY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LilaAndRoy5
 
-; LISA_AND_RAY
-	.byte 0 ; party type flags
+@ LISA_AND_RAY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SIS_AND_BRO
 	.charmapstr "LISA & RAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_LisaAndRay
 
-; CHRIS
-	.byte 0 ; party type flags
+@ CHRIS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "CHRIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Chris
 
-; DAWSON
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ DAWSON
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_RICH_BOY
 	.charmapstr "DAWSON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Dawson
 
-; SARAH
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ SARAH
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LADY
 	.charmapstr "SARAH$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Sarah
 
-; DARIAN
-	.byte 0 ; party type flags
+@ DARIAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "DARIAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Darian
 
-; HAILEY
-	.byte 0 ; party type flags
+@ HAILEY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_F
 	.charmapstr "HAILEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Hailey
 
-; CHANDLER
-	.byte 0 ; party type flags
+@ CHANDLER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TUBER_2
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_TUBER_M
 	.charmapstr "CHANDLER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Chandler
 
-; KALEB
-	.byte F_TRAINER_PARTY_HELD_ITEM ; party type flags
+@ KALEB
+	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
 	.byte TRAINER_PIC_WINSTRATE_M
 	.charmapstr "KALEB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kaleb
 
-; JOSEPH
-	.byte 0 ; party type flags
+@ JOSEPH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "JOSEPH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Joseph
 
-; ALYSSA
-	.byte 0 ; party type flags
+@ ALYSSA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
 	.charmapstr "ALYSSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Alyssa
 
-; MARCOS
-	.byte 0 ; party type flags
+@ MARCOS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "MARCOS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Marcos
 
-; RHETT
-	.byte 0 ; party type flags
+@ RHETT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "RHETT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Rhett
 
-; TYRON
-	.byte 0 ; party type flags
+@ TYRON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "TYRON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tyron
 
-; CELINA
-	.byte 0 ; party type flags
+@ CELINA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "CELINA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Celina
 
-; BIANCA
-	.byte 0 ; party type flags
+@ BIANCA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "BIANCA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Bianca
 
-; HAYDEN
-	.byte 0 ; party type flags
+@ HAYDEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "HAYDEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Hayden
 
-; SOPHIE
-	.byte 0 ; party type flags
+@ SOPHIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "SOPHIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Sophie
 
-; COBY
-	.byte 0 ; party type flags
+@ COBY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "COBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Coby
 
-; LAWRENCE
-	.byte 0 ; party type flags
+@ LAWRENCE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "LAWRENCE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Lawrence
 
-; WYATT
-	.byte 0 ; party type flags
+@ WYATT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMANIAC
 	.charmapstr "WYATT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Wyatt
 
-; ANGELINA
-	.byte 0 ; party type flags
+@ ANGELINA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "ANGELINA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Angelina
 
-; KAI
-	.byte 0 ; party type flags
+@ KAI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_FISHERMAN
 	.charmapstr "KAI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Kai
 
-; CHARLOTTE
-	.byte 0 ; party type flags
+@ CHARLOTTE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "CHARLOTTE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Charlotte
 
-; DEANDRE
-	.byte 0 ; party type flags
+@ DEANDRE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "DEANDRE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Deandre
 
-; GRUNT_38
-	.byte 0 ; party type flags
+@ GRUNT_38
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt38
 
-; GRUNT_39
-	.byte 0 ; party type flags
+@ GRUNT_39
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt39
 
-; GRUNT_40
-	.byte 0 ; party type flags
+@ GRUNT_40
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt40
 
-; GRUNT_41
-	.byte 0 ; party type flags
+@ GRUNT_41
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt41
 
-; GRUNT_42
-	.byte 0 ; party type flags
+@ GRUNT_42
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Grunt42
 
-; GRUNT_43
-	.byte 0 ; party type flags
+@ GRUNT_43
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt43
 
-; GRUNT_44
-	.byte 0 ; party type flags
+@ GRUNT_44
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt44
 
-; GRUNT_45
-	.byte 0 ; party type flags
+@ GRUNT_45
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt45
 
-; GRUNT_46
-	.byte 0 ; party type flags
+@ GRUNT_46
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt46
 
-; GRUNT_47
-	.byte 0 ; party type flags
+@ GRUNT_47
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt47
 
-; GRUNT_48
-	.byte 0 ; party type flags
+@ GRUNT_48
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt48
 
-; GRUNT_49
-	.byte 0 ; party type flags
+@ GRUNT_49
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt49
 
-; GRUNT_50
-	.byte 0 ; party type flags
+@ GRUNT_50
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_M
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt50
 
-; GRUNT_51
-	.byte 0 ; party type flags
+@ GRUNT_51
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt51
 
-; GRUNT_52
-	.byte 0 ; party type flags
+@ GRUNT_52
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt52
 
-; GRUNT_53
-	.byte 0 ; party type flags
+@ GRUNT_53
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_GRUNT_F
 	.charmapstr "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Grunt53
 
-; TABITHA_3
-	.byte 0 ; party type flags
+@ TABITHA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_ADMIN
 	.charmapstr "TABITHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Tabitha3
 
-; DARCY
-	.byte 0 ; party type flags
+@ DARCY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "DARCY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Darcy
 
-; MAXIE_3
-	.byte 0 ; party type flags
+@ MAXIE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
 	.byte TRAINER_PIC_MAGMA_LEADER_MAXIE
 	.charmapstr "MAXIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Maxie3
 
-; PETE
-	.byte 0 ; party type flags
+@ PETE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_M
 	.charmapstr "PETE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Pete
 
-; ISABELLE
-	.byte 0 ; party type flags
+@ ISABELLE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMER_F
 	.charmapstr "ISABELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Isabelle
 
-; ANDRES_1
-	.byte 0 ; party type flags
+@ ANDRES_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "ANDRES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Andres1
 
-; JOSUE
-	.byte 0 ; party type flags
+@ JOSUE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "JOSUE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Josue
 
-; CAMRON
-	.byte 0 ; party type flags
+@ CAMRON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "CAMRON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Camron
 
-; CORY_1
-	.byte 0 ; party type flags
+@ CORY_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "CORY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cory1
 
-; CAROLINA
-	.byte 0 ; party type flags
+@ CAROLINA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CAROLINA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Carolina
 
-; ELIJAH
-	.byte 0 ; party type flags
+@ ELIJAH
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "ELIJAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Elijah
 
-; CELIA
-	.byte 0 ; party type flags
+@ CELIA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
 	.byte TRAINER_PIC_PICNICKER
 	.charmapstr "CELIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Celia
 
-; BRYAN
-	.byte 0 ; party type flags
+@ BRYAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "BRYAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bryan
 
-; BRANDEN
-	.byte 0 ; party type flags
+@ BRANDEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_CAMPER
 	.charmapstr "BRANDEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Branden
 
-; BRYANT
-	.byte 0 ; party type flags
+@ BRYANT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "BRYANT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Bryant
 
-; SHAYLA
-	.byte 0 ; party type flags
+@ SHAYLA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_AROMA_LADY
 	.charmapstr "SHAYLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Shayla
 
-; KYRA
-	.byte 0 ; party type flags
+@ KYRA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "KYRA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Kyra
 
-; JAIDEN
-	.byte 0 ; party type flags
+@ JAIDEN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_NINJA_BOY
 	.charmapstr "JAIDEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Jaiden
 
-; ALIX
-	.byte 0 ; party type flags
+@ ALIX
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "ALIX$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alix
 
-; HELENE
-	.byte 0 ; party type flags
+@ HELENE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "HELENE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Helene
 
-; MARLENE
-	.byte 0 ; party type flags
+@ MARLENE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "MARLENE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Marlene
 
-; DEVAN
-	.byte 0 ; party type flags
+@ DEVAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "DEVAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Devan
 
-; JOHNSON
-	.byte 0 ; party type flags
+@ JOHNSON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_YOUNGSTER
 	.charmapstr "JOHNSON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Johnson
 
-; MELINA
-	.byte 0 ; party type flags
+@ MELINA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
 	.charmapstr "MELINA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Melina
 
-; BRANDI
-	.byte 0 ; party type flags
+@ BRANDI
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "BRANDI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brandi
 
-; AISHA
-	.byte 0 ; party type flags
+@ AISHA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "AISHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Aisha
 
-; MAKAYLA
-	.byte 0 ; party type flags
+@ MAKAYLA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_EXPERT_F
 	.charmapstr "MAKAYLA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Makayla
 
-; FABIAN
-	.byte 0 ; party type flags
+@ FABIAN
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FABIAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Fabian
 
-; DAYTON
-	.byte 0 ; party type flags
+@ DAYTON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_KINDLER
 	.charmapstr "DAYTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Dayton
 
-; RACHEL
-	.byte 0 ; party type flags
+@ RACHEL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PARASOL_LADY
 	.charmapstr "RACHEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Rachel
 
-; LEONEL
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ LEONEL
+	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_M
 	.charmapstr "LEONEL$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Leonel
 
-; CALLIE
-	.byte 0 ; party type flags
+@ CALLIE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BATTLE_GIRL
 	.charmapstr "CALLIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Callie
 
-; CALE
-	.byte 0 ; party type flags
+@ CALE
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "CALE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cale
 
-; MYLES
-	.byte 0 ; party type flags
+@ MYLES
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_M
 	.charmapstr "MYLES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Myles
 
-; PAT
-	.byte 0 ; party type flags
+@ PAT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "PAT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Pat
 
-; CRISTIN_1
-	.byte 0 ; party type flags
+@ CRISTIN_1
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CRISTIN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cristin1
 
-; MAY_14
-	.byte 0 ; party type flags
+@ MAY_14
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_May14
 
-; MAY_15
-	.byte 0 ; party type flags
+@ MAY_15
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_May15
 
-; ROXANNE_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ROXANNE_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_ROXANNE
 	.charmapstr "ROXANNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Roxanne2
 
-; ROXANNE_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ROXANNE_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_ROXANNE
 	.charmapstr "ROXANNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Roxanne3
 
-; ROXANNE_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ROXANNE_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_ROXANNE
 	.charmapstr "ROXANNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Roxanne4
 
-; ROXANNE_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ROXANNE_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_ROXANNE
 	.charmapstr "ROXANNE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Roxanne5
 
-; BRAWLY_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAWLY_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_BRAWLY
 	.charmapstr "BRAWLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Brawly2
 
-; BRAWLY_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAWLY_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_BRAWLY
 	.charmapstr "BRAWLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Brawly3
 
-; BRAWLY_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAWLY_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_BRAWLY
 	.charmapstr "BRAWLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Brawly4
 
-; BRAWLY_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ BRAWLY_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_BRAWLY
 	.charmapstr "BRAWLY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Brawly5
 
-; WATTSON_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WATTSON_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WATTSON
 	.charmapstr "WATTSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Wattson2
 
-; WATTSON_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WATTSON_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WATTSON
 	.charmapstr "WATTSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wattson3
 
-; WATTSON_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WATTSON_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WATTSON
 	.charmapstr "WATTSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Wattson4
 
-; WATTSON_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WATTSON_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WATTSON
 	.charmapstr "WATTSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Wattson5
 
-; FLANNERY_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FLANNERY_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_FLANNERY
 	.charmapstr "FLANNERY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Flannery2
 
-; FLANNERY_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FLANNERY_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_FLANNERY
 	.charmapstr "FLANNERY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Flannery3
 
-; FLANNERY_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FLANNERY_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_FLANNERY
 	.charmapstr "FLANNERY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Flannery4
 
-; FLANNERY_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ FLANNERY_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_FLANNERY
 	.charmapstr "FLANNERY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Flannery5
 
-; NORMAN_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ NORMAN_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_NORMAN
 	.charmapstr "NORMAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 4 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 4 @ party size
 	.4byte gTrainerParty_Norman2
 
-; NORMAN_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ NORMAN_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_NORMAN
 	.charmapstr "NORMAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Norman3
 
-; NORMAN_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ NORMAN_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_NORMAN
 	.charmapstr "NORMAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Norman4
 
-; NORMAN_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ NORMAN_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_NORMAN
 	.charmapstr "NORMAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Norman5
 
-; WINONA_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINONA_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WINONA
 	.charmapstr "WINONA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x17 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x17 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Winona2
 
-; WINONA_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINONA_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WINONA
 	.charmapstr "WINONA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x17 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x17 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Winona3
 
-; WINONA_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINONA_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WINONA
 	.charmapstr "WINONA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x17 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x17 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Winona4
 
-; WINONA_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ WINONA_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_WINONA
 	.charmapstr "WINONA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x17 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x17 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Winona5
 
-; TATE_AND_LIZA_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TATE_AND_LIZA_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
 	.charmapstr "TATE&LIZA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_TateAndLiza2
 
-; TATE_AND_LIZA_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TATE_AND_LIZA_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
 	.charmapstr "TATE&LIZA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_TateAndLiza3
 
-; TATE_AND_LIZA_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TATE_AND_LIZA_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
 	.charmapstr "TATE&LIZA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_TateAndLiza4
 
-; TATE_AND_LIZA_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ TATE_AND_LIZA_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_TATE_AND_LIZA
 	.charmapstr "TATE&LIZA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_TateAndLiza5
 
-; JUAN_2
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JUAN_2
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_JUAN
 	.charmapstr "JUAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Juan2
 
-; JUAN_3
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JUAN_3
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_JUAN
 	.charmapstr "JUAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 5 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 5 @ party size
 	.4byte gTrainerParty_Juan3
 
-; JUAN_4
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JUAN_4
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_JUAN
 	.charmapstr "JUAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Juan4
 
-; JUAN_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ JUAN_5
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEADER_JUAN
 	.charmapstr "JUAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE ; items
-	.4byte TRUE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items
+	.4byte TRUE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Juan5
 
-; ANGELO
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ ANGELO
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
 	.byte TRAINER_PIC_BUG_MANIAC
 	.charmapstr "ANGELO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Angelo
 
-; DARIUS
-	.byte 0 ; party type flags
+@ DARIUS
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_BIRD_KEEPER
 	.charmapstr "DARIUS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Darius
 
-; STEVEN
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET ; party type flags
+@ STEVEN
+	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_STEVEN
 	.charmapstr "STEVEN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Steven
 
-; ANABEL
-	.byte 0 ; party type flags
+@ ANABEL
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SALON_MAIDEN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SALON_MAIDEN_ANABEL
 	.charmapstr "ANABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Anabel
 
-; TUCKER
-	.byte 0 ; party type flags
+@ TUCKER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_DOME_ACE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_DOME_ACE_TUCKER
 	.charmapstr "TUCKER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Tucker
 
-; SPENSER
-	.byte 0 ; party type flags
+@ SPENSER
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PALACE_MAVEN
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PALACE_MAVEN_SPENSER
 	.charmapstr "SPENSER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Spenser
 
-; GRETA
-	.byte 0 ; party type flags
+@ GRETA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_ARENA_TYCOON
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_ARENA_TYCOON_GRETA
 	.charmapstr "GRETA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Greta
 
-; NOLAND
-	.byte 0 ; party type flags
+@ NOLAND
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_FACTORY_HEAD
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_FACTORY_HEAD_NOLAND
 	.charmapstr "NOLAND$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Noland
 
-; LUCY
-	.byte 0 ; party type flags
+@ LUCY
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PIKE_QUEEN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PIKE_QUEEN_LUCY
 	.charmapstr "LUCY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Lucy
 
-; BRANDON
-	.byte 0 ; party type flags
+@ BRANDON
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PYRAMID_KING
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_PYRAMID_KING_BRANDON
 	.charmapstr "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brandon
 
-; ANDRES_2
-	.byte 0 ; party type flags
+@ ANDRES_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "ANDRES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Andres2
 
-; ANDRES_3
-	.byte 0 ; party type flags
+@ ANDRES_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "ANDRES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Andres3
 
-; ANDRES_4
-	.byte 0 ; party type flags
+@ ANDRES_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "ANDRES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Andres4
 
-; ANDRES_5
-	.byte 0 ; party type flags
+@ ANDRES_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_RUIN_MANIAC
 	.charmapstr "ANDRES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Andres5
 
-; CORY_2
-	.byte 0 ; party type flags
+@ CORY_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "CORY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cory2
 
-; CORY_3
-	.byte 0 ; party type flags
+@ CORY_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "CORY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cory3
 
-; CORY_4
-	.byte 0 ; party type flags
+@ CORY_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "CORY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cory4
 
-; CORY_5
-	.byte 0 ; party type flags
+@ CORY_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_SAILOR
 	.charmapstr "CORY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cory5
 
-; PABLO_2
-	.byte 0 ; party type flags
+@ PABLO_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Pablo2
 
-; PABLO_3
-	.byte 0 ; party type flags
+@ PABLO_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Pablo3
 
-; PABLO_4
-	.byte 0 ; party type flags
+@ PABLO_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Pablo4
 
-; PABLO_5
-	.byte 0 ; party type flags
+@ PABLO_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
 	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
 	.charmapstr "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Pablo5
 
-; KOJI_2
-	.byte 0 ; party type flags
+@ KOJI_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Koji2
 
-; KOJI_3
-	.byte 0 ; party type flags
+@ KOJI_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Koji3
 
-; KOJI_4
-	.byte 0 ; party type flags
+@ KOJI_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Koji4
 
-; KOJI_5
-	.byte 0 ; party type flags
+@ KOJI_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_BLACK_BELT
 	.charmapstr "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Koji5
 
-; CRISTIN_2
-	.byte 0 ; party type flags
+@ CRISTIN_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CRISTIN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Cristin2
 
-; CRISTIN_3
-	.byte 0 ; party type flags
+@ CRISTIN_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CRISTIN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cristin3
 
-; CRISTIN_4
-	.byte 0 ; party type flags
+@ CRISTIN_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CRISTIN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cristin4
 
-; CRISTIN_5
-	.byte 0 ; party type flags
+@ CRISTIN_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_COOLTRAINER_1
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
 	.byte TRAINER_PIC_COOL_TRAINER_F
 	.charmapstr "CRISTIN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Cristin5
 
-; FERNANDO_2
-	.byte 0 ; party type flags
+@ FERNANDO_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FERNANDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Fernando2
 
-; FERNANDO_3
-	.byte 0 ; party type flags
+@ FERNANDO_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FERNANDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Fernando3
 
-; FERNANDO_4
-	.byte 0 ; party type flags
+@ FERNANDO_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FERNANDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Fernando4
 
-; FERNANDO_5
-	.byte 0 ; party type flags
+@ FERNANDO_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_GUITARIST
 	.charmapstr "FERNANDO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Fernando5
 
-; SAWYER_2
-	.byte 0 ; party type flags
+@ SAWYER_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "SAWYER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Sawyer2
 
-; SAWYER_3
-	.byte 0 ; party type flags
+@ SAWYER_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "SAWYER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Sawyer3
 
-; SAWYER_4
-	.byte 0 ; party type flags
+@ SAWYER_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "SAWYER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Sawyer4
 
-; SAWYER_5
-	.byte 0 ; party type flags
+@ SAWYER_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
 	.byte TRAINER_PIC_HIKER
 	.charmapstr "SAWYER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x7 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x7 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Sawyer5
 
-; GABRIELLE_2
-	.byte 0 ; party type flags
+@ GABRIELLE_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "GABRIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Gabrielle2
 
-; GABRIELLE_3
-	.byte 0 ; party type flags
+@ GABRIELLE_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "GABRIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Gabrielle3
 
-; GABRIELLE_4
-	.byte 0 ; party type flags
+@ GABRIELLE_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "GABRIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Gabrielle4
 
-; GABRIELLE_5
-	.byte 0 ; party type flags
+@ GABRIELLE_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_POKEMON_BREEDER_F
 	.charmapstr "GABRIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 6 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 6 @ party size
 	.4byte gTrainerParty_Gabrielle5
 
-; THALIA_2
-	.byte 0 ; party type flags
+@ THALIA_2
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "THALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Thalia2
 
-; THALIA_3
-	.byte 0 ; party type flags
+@ THALIA_3
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "THALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Thalia3
 
-; THALIA_4
-	.byte 0 ; party type flags
+@ THALIA_4
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "THALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Thalia4
 
-; THALIA_5
-	.byte 0 ; party type flags
+@ THALIA_5
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
 	.byte TRAINER_PIC_BEAUTY
 	.charmapstr "THALIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x1 ; AI flags
-	.4byte 3 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x1 @ AI flags
+	.4byte 3 @ party size
 	.4byte gTrainerParty_Thalia5
 
-; MARIELA
-	.byte 0 ; party type flags
+@ MARIELA
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_F
 	.charmapstr "MARIELA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Mariela
 
-; ALVARO
-	.byte 0 ; party type flags
+@ ALVARO
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
 	.byte TRAINER_PIC_PSYCHIC_M
 	.charmapstr "ALVARO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 2 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 2 @ party size
 	.4byte gTrainerParty_Alvaro
 
-; EVERETT
-	.byte 0 ; party type flags
+@ EVERETT
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
 	.byte TRAINER_PIC_GENTLEMAN
 	.charmapstr "EVERETT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Everett
 
-; RED
-	.byte 0 ; party type flags
+@ RED
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RED
 	.charmapstr "RED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Red
 
-; LEAF
-	.byte 0 ; party type flags
+@ LEAF
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_LEAF
 	.charmapstr "LEAF$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Leaf
 
-; BRENDAN_16
-	.byte 0 ; party type flags
+@ BRENDAN_16
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
 	.charmapstr "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_Brendan16
 
-; MAY_16
-	.byte 0 ; party type flags
+@ MAY_16
+	.byte 0 @ party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
+	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
 	.byte TRAINER_PIC_RUBY_SAPPHIRE_MAY
 	.charmapstr "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
-	.4byte FALSE ; is double battle
-	.4byte 0x0 ; AI flags
-	.4byte 1 ; party size
+	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
+	.4byte FALSE @ is double battle
+	.4byte 0x0 @ AI flags
+	.4byte 1 @ party size
 	.4byte gTrainerParty_May16
diff --git a/data/wild_mons.s b/data/wild_mons.s
index ab7db4ca5..78db8b345 100644
--- a/data/wild_mons.s
+++ b/data/wild_mons.s
@@ -1,6 +1,6 @@
 	.align 2, 0
 
-gRoute101_LandMons: ; 85507E4
+gRoute101_LandMons: @ 85507E4
 	wild_mon WURMPLE, 2
 	wild_mon POOCHYENA, 2
 	wild_mon WURMPLE, 2
@@ -16,13 +16,13 @@ gRoute101_LandMons: ; 85507E4
 
 	.align 2, 0
 
-gRoute101_LandMonsInfo: ; 8550814
-	.4byte 20 ; encounter rate
+gRoute101_LandMonsInfo: @ 8550814
+	.4byte 20 @ encounter rate
 	.4byte gRoute101_LandMons
 
 	.align 2, 0
 
-gRoute102_LandMons: ; 855081C
+gRoute102_LandMons: @ 855081C
 	wild_mon POOCHYENA, 3
 	wild_mon WURMPLE, 3
 	wild_mon POOCHYENA, 4
@@ -38,13 +38,13 @@ gRoute102_LandMons: ; 855081C
 
 	.align 2, 0
 
-gRoute102_LandMonsInfo: ; 855084C
-	.4byte 20 ; encounter rate
+gRoute102_LandMonsInfo: @ 855084C
+	.4byte 20 @ encounter rate
 	.4byte gRoute102_LandMons
 
 	.align 2, 0
 
-gRoute102_WaterMons: ; 8550854
+gRoute102_WaterMons: @ 8550854
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -53,13 +53,13 @@ gRoute102_WaterMons: ; 8550854
 
 	.align 2, 0
 
-gRoute102_WaterMonsInfo: ; 8550868
-	.4byte 4 ; encounter rate
+gRoute102_WaterMonsInfo: @ 8550868
+	.4byte 4 @ encounter rate
 	.4byte gRoute102_WaterMons
 
 	.align 2, 0
 
-gRoute102_FishingMons: ; 8550870
+gRoute102_FishingMons: @ 8550870
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -73,13 +73,13 @@ gRoute102_FishingMons: ; 8550870
 
 	.align 2, 0
 
-gRoute102_FishingMonsInfo: ; 8550898
-	.4byte 30 ; encounter rate
+gRoute102_FishingMonsInfo: @ 8550898
+	.4byte 30 @ encounter rate
 	.4byte gRoute102_FishingMons
 
 	.align 2, 0
 
-gRoute103_LandMons: ; 85508A0
+gRoute103_LandMons: @ 85508A0
 	wild_mon POOCHYENA, 2
 	wild_mon POOCHYENA, 3
 	wild_mon POOCHYENA, 3
@@ -95,13 +95,13 @@ gRoute103_LandMons: ; 85508A0
 
 	.align 2, 0
 
-gRoute103_LandMonsInfo: ; 85508D0
-	.4byte 20 ; encounter rate
+gRoute103_LandMonsInfo: @ 85508D0
+	.4byte 20 @ encounter rate
 	.4byte gRoute103_LandMons
 
 	.align 2, 0
 
-gRoute103_WaterMons: ; 85508D8
+gRoute103_WaterMons: @ 85508D8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -110,13 +110,13 @@ gRoute103_WaterMons: ; 85508D8
 
 	.align 2, 0
 
-gRoute103_WaterMonsInfo: ; 85508EC
-	.4byte 4 ; encounter rate
+gRoute103_WaterMonsInfo: @ 85508EC
+	.4byte 4 @ encounter rate
 	.4byte gRoute103_WaterMons
 
 	.align 2, 0
 
-gRoute103_FishingMons: ; 85508F4
+gRoute103_FishingMons: @ 85508F4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -130,13 +130,13 @@ gRoute103_FishingMons: ; 85508F4
 
 	.align 2, 0
 
-gRoute103_FishingMonsInfo: ; 855091C
-	.4byte 30 ; encounter rate
+gRoute103_FishingMonsInfo: @ 855091C
+	.4byte 30 @ encounter rate
 	.4byte gRoute103_FishingMons
 
 	.align 2, 0
 
-gRoute104_LandMons: ; 8550924
+gRoute104_LandMons: @ 8550924
 	wild_mon POOCHYENA, 4
 	wild_mon WURMPLE, 4
 	wild_mon POOCHYENA, 5
@@ -152,13 +152,13 @@ gRoute104_LandMons: ; 8550924
 
 	.align 2, 0
 
-gRoute104_LandMonsInfo: ; 8550954
-	.4byte 20 ; encounter rate
+gRoute104_LandMonsInfo: @ 8550954
+	.4byte 20 @ encounter rate
 	.4byte gRoute104_LandMons
 
 	.align 2, 0
 
-gRoute104_WaterMons: ; 855095C
+gRoute104_WaterMons: @ 855095C
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
 	wild_mon WINGULL, 15, 25
@@ -167,13 +167,13 @@ gRoute104_WaterMons: ; 855095C
 
 	.align 2, 0
 
-gRoute104_WaterMonsInfo: ; 8550970
-	.4byte 4 ; encounter rate
+gRoute104_WaterMonsInfo: @ 8550970
+	.4byte 4 @ encounter rate
 	.4byte gRoute104_WaterMons
 
 	.align 2, 0
 
-gRoute104_FishingMons: ; 8550978
+gRoute104_FishingMons: @ 8550978
 	wild_mon MAGIKARP, 5, 10
 	wild_mon MAGIKARP, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -187,13 +187,13 @@ gRoute104_FishingMons: ; 8550978
 
 	.align 2, 0
 
-gRoute104_FishingMonsInfo: ; 85509A0
-	.4byte 30 ; encounter rate
+gRoute104_FishingMonsInfo: @ 85509A0
+	.4byte 30 @ encounter rate
 	.4byte gRoute104_FishingMons
 
 	.align 2, 0
 
-gRoute105_WaterMons: ; 85509A8
+gRoute105_WaterMons: @ 85509A8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -202,13 +202,13 @@ gRoute105_WaterMons: ; 85509A8
 
 	.align 2, 0
 
-gRoute105_WaterMonsInfo: ; 85509BC
-	.4byte 4 ; encounter rate
+gRoute105_WaterMonsInfo: @ 85509BC
+	.4byte 4 @ encounter rate
 	.4byte gRoute105_WaterMons
 
 	.align 2, 0
 
-gRoute105_FishingMons: ; 85509C4
+gRoute105_FishingMons: @ 85509C4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -222,13 +222,13 @@ gRoute105_FishingMons: ; 85509C4
 
 	.align 2, 0
 
-gRoute105_FishingMonsInfo: ; 85509EC
-	.4byte 30 ; encounter rate
+gRoute105_FishingMonsInfo: @ 85509EC
+	.4byte 30 @ encounter rate
 	.4byte gRoute105_FishingMons
 
 	.align 2, 0
 
-gRoute110_LandMons: ; 85509F4
+gRoute110_LandMons: @ 85509F4
 	wild_mon POOCHYENA, 12
 	wild_mon ELECTRIKE, 12
 	wild_mon GULPIN, 12
@@ -244,13 +244,13 @@ gRoute110_LandMons: ; 85509F4
 
 	.align 2, 0
 
-gRoute110_LandMonsInfo: ; 8550A24
-	.4byte 20 ; encounter rate
+gRoute110_LandMonsInfo: @ 8550A24
+	.4byte 20 @ encounter rate
 	.4byte gRoute110_LandMons
 
 	.align 2, 0
 
-gRoute110_WaterMons: ; 8550A2C
+gRoute110_WaterMons: @ 8550A2C
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -259,13 +259,13 @@ gRoute110_WaterMons: ; 8550A2C
 
 	.align 2, 0
 
-gRoute110_WaterMonsInfo: ; 8550A40
-	.4byte 4 ; encounter rate
+gRoute110_WaterMonsInfo: @ 8550A40
+	.4byte 4 @ encounter rate
 	.4byte gRoute110_WaterMons
 
 	.align 2, 0
 
-gRoute110_FishingMons: ; 8550A48
+gRoute110_FishingMons: @ 8550A48
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -279,13 +279,13 @@ gRoute110_FishingMons: ; 8550A48
 
 	.align 2, 0
 
-gRoute110_FishingMonsInfo: ; 8550A70
-	.4byte 30 ; encounter rate
+gRoute110_FishingMonsInfo: @ 8550A70
+	.4byte 30 @ encounter rate
 	.4byte gRoute110_FishingMons
 
 	.align 2, 0
 
-gRoute111_LandMons: ; 8550A78
+gRoute111_LandMons: @ 8550A78
 	wild_mon SANDSHREW, 20
 	wild_mon TRAPINCH, 20
 	wild_mon SANDSHREW, 21
@@ -301,13 +301,13 @@ gRoute111_LandMons: ; 8550A78
 
 	.align 2, 0
 
-gRoute111_LandMonsInfo: ; 8550AA8
-	.4byte 10 ; encounter rate
+gRoute111_LandMonsInfo: @ 8550AA8
+	.4byte 10 @ encounter rate
 	.4byte gRoute111_LandMons
 
 	.align 2, 0
 
-gRoute111_WaterMons: ; 8550AB0
+gRoute111_WaterMons: @ 8550AB0
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -316,13 +316,13 @@ gRoute111_WaterMons: ; 8550AB0
 
 	.align 2, 0
 
-gRoute111_WaterMonsInfo: ; 8550AC4
-	.4byte 4 ; encounter rate
+gRoute111_WaterMonsInfo: @ 8550AC4
+	.4byte 4 @ encounter rate
 	.4byte gRoute111_WaterMons
 
 	.align 2, 0
 
-gRoute111_RockSmashMons: ; 8550ACC
+gRoute111_RockSmashMons: @ 8550ACC
 	wild_mon GEODUDE, 10, 15
 	wild_mon GEODUDE, 5, 10
 	wild_mon GEODUDE, 15, 20
@@ -331,13 +331,13 @@ gRoute111_RockSmashMons: ; 8550ACC
 
 	.align 2, 0
 
-gRoute111_RockSmashMonsInfo: ; 8550AE0
-	.4byte 20 ; encounter rate
+gRoute111_RockSmashMonsInfo: @ 8550AE0
+	.4byte 20 @ encounter rate
 	.4byte gRoute111_RockSmashMons
 
 	.align 2, 0
 
-gRoute111_FishingMons: ; 8550AE8
+gRoute111_FishingMons: @ 8550AE8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -351,13 +351,13 @@ gRoute111_FishingMons: ; 8550AE8
 
 	.align 2, 0
 
-gRoute111_FishingMonsInfo: ; 8550B10
-	.4byte 30 ; encounter rate
+gRoute111_FishingMonsInfo: @ 8550B10
+	.4byte 30 @ encounter rate
 	.4byte gRoute111_FishingMons
 
 	.align 2, 0
 
-gRoute112_LandMons: ; 8550B18
+gRoute112_LandMons: @ 8550B18
 	wild_mon NUMEL, 15
 	wild_mon NUMEL, 15
 	wild_mon MARILL, 15
@@ -373,13 +373,13 @@ gRoute112_LandMons: ; 8550B18
 
 	.align 2, 0
 
-gRoute112_LandMonsInfo: ; 8550B48
-	.4byte 20 ; encounter rate
+gRoute112_LandMonsInfo: @ 8550B48
+	.4byte 20 @ encounter rate
 	.4byte gRoute112_LandMons
 
 	.align 2, 0
 
-gRoute113_LandMons: ; 8550B50
+gRoute113_LandMons: @ 8550B50
 	wild_mon SPINDA, 15
 	wild_mon SPINDA, 15
 	wild_mon SLUGMA, 15
@@ -395,13 +395,13 @@ gRoute113_LandMons: ; 8550B50
 
 	.align 2, 0
 
-gRoute113_LandMonsInfo: ; 8550B80
-	.4byte 20 ; encounter rate
+gRoute113_LandMonsInfo: @ 8550B80
+	.4byte 20 @ encounter rate
 	.4byte gRoute113_LandMons
 
 	.align 2, 0
 
-gRoute114_LandMons: ; 8550B88
+gRoute114_LandMons: @ 8550B88
 	wild_mon SWABLU, 16
 	wild_mon LOTAD, 16
 	wild_mon SWABLU, 17
@@ -417,13 +417,13 @@ gRoute114_LandMons: ; 8550B88
 
 	.align 2, 0
 
-gRoute114_LandMonsInfo: ; 8550BB8
-	.4byte 20 ; encounter rate
+gRoute114_LandMonsInfo: @ 8550BB8
+	.4byte 20 @ encounter rate
 	.4byte gRoute114_LandMons
 
 	.align 2, 0
 
-gRoute114_WaterMons: ; 8550BC0
+gRoute114_WaterMons: @ 8550BC0
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -432,13 +432,13 @@ gRoute114_WaterMons: ; 8550BC0
 
 	.align 2, 0
 
-gRoute114_WaterMonsInfo: ; 8550BD4
-	.4byte 4 ; encounter rate
+gRoute114_WaterMonsInfo: @ 8550BD4
+	.4byte 4 @ encounter rate
 	.4byte gRoute114_WaterMons
 
 	.align 2, 0
 
-gRoute114_RockSmashMons: ; 8550BDC
+gRoute114_RockSmashMons: @ 8550BDC
 	wild_mon GEODUDE, 10, 15
 	wild_mon GEODUDE, 5, 10
 	wild_mon GEODUDE, 15, 20
@@ -447,13 +447,13 @@ gRoute114_RockSmashMons: ; 8550BDC
 
 	.align 2, 0
 
-gRoute114_RockSmashMonsInfo: ; 8550BF0
-	.4byte 20 ; encounter rate
+gRoute114_RockSmashMonsInfo: @ 8550BF0
+	.4byte 20 @ encounter rate
 	.4byte gRoute114_RockSmashMons
 
 	.align 2, 0
 
-gRoute114_FishingMons: ; 8550BF8
+gRoute114_FishingMons: @ 8550BF8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -467,13 +467,13 @@ gRoute114_FishingMons: ; 8550BF8
 
 	.align 2, 0
 
-gRoute114_FishingMonsInfo: ; 8550C20
-	.4byte 30 ; encounter rate
+gRoute114_FishingMonsInfo: @ 8550C20
+	.4byte 30 @ encounter rate
 	.4byte gRoute114_FishingMons
 
 	.align 2, 0
 
-gRoute116_LandMons: ; 8550C28
+gRoute116_LandMons: @ 8550C28
 	wild_mon POOCHYENA, 6
 	wild_mon WHISMUR, 6
 	wild_mon NINCADA, 6
@@ -489,13 +489,13 @@ gRoute116_LandMons: ; 8550C28
 
 	.align 2, 0
 
-gRoute116_LandMonsInfo: ; 8550C58
-	.4byte 20 ; encounter rate
+gRoute116_LandMonsInfo: @ 8550C58
+	.4byte 20 @ encounter rate
 	.4byte gRoute116_LandMons
 
 	.align 2, 0
 
-gRoute117_LandMons: ; 8550C60
+gRoute117_LandMons: @ 8550C60
 	wild_mon POOCHYENA, 13
 	wild_mon ODDISH, 13
 	wild_mon POOCHYENA, 14
@@ -511,13 +511,13 @@ gRoute117_LandMons: ; 8550C60
 
 	.align 2, 0
 
-gRoute117_LandMonsInfo: ; 8550C90
-	.4byte 20 ; encounter rate
+gRoute117_LandMonsInfo: @ 8550C90
+	.4byte 20 @ encounter rate
 	.4byte gRoute117_LandMons
 
 	.align 2, 0
 
-gRoute117_WaterMons: ; 8550C98
+gRoute117_WaterMons: @ 8550C98
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -526,13 +526,13 @@ gRoute117_WaterMons: ; 8550C98
 
 	.align 2, 0
 
-gRoute117_WaterMonsInfo: ; 8550CAC
-	.4byte 4 ; encounter rate
+gRoute117_WaterMonsInfo: @ 8550CAC
+	.4byte 4 @ encounter rate
 	.4byte gRoute117_WaterMons
 
 	.align 2, 0
 
-gRoute117_FishingMons: ; 8550CB4
+gRoute117_FishingMons: @ 8550CB4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -546,13 +546,13 @@ gRoute117_FishingMons: ; 8550CB4
 
 	.align 2, 0
 
-gRoute117_FishingMonsInfo: ; 8550CDC
-	.4byte 30 ; encounter rate
+gRoute117_FishingMonsInfo: @ 8550CDC
+	.4byte 30 @ encounter rate
 	.4byte gRoute117_FishingMons
 
 	.align 2, 0
 
-gRoute118_LandMons: ; 8550CE4
+gRoute118_LandMons: @ 8550CE4
 	wild_mon ZIGZAGOON, 24
 	wild_mon ELECTRIKE, 24
 	wild_mon ZIGZAGOON, 26
@@ -568,13 +568,13 @@ gRoute118_LandMons: ; 8550CE4
 
 	.align 2, 0
 
-gRoute118_LandMonsInfo: ; 8550D14
-	.4byte 20 ; encounter rate
+gRoute118_LandMonsInfo: @ 8550D14
+	.4byte 20 @ encounter rate
 	.4byte gRoute118_LandMons
 
 	.align 2, 0
 
-gRoute118_WaterMons: ; 8550D1C
+gRoute118_WaterMons: @ 8550D1C
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -583,13 +583,13 @@ gRoute118_WaterMons: ; 8550D1C
 
 	.align 2, 0
 
-gRoute118_WaterMonsInfo: ; 8550D30
-	.4byte 4 ; encounter rate
+gRoute118_WaterMonsInfo: @ 8550D30
+	.4byte 4 @ encounter rate
 	.4byte gRoute118_WaterMons
 
 	.align 2, 0
 
-gRoute118_FishingMons: ; 8550D38
+gRoute118_FishingMons: @ 8550D38
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -603,13 +603,13 @@ gRoute118_FishingMons: ; 8550D38
 
 	.align 2, 0
 
-gRoute118_FishingMonsInfo: ; 8550D60
-	.4byte 30 ; encounter rate
+gRoute118_FishingMonsInfo: @ 8550D60
+	.4byte 30 @ encounter rate
 	.4byte gRoute118_FishingMons
 
 	.align 2, 0
 
-gRoute124_WaterMons: ; 8550D68
+gRoute124_WaterMons: @ 8550D68
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -618,13 +618,13 @@ gRoute124_WaterMons: ; 8550D68
 
 	.align 2, 0
 
-gRoute124_WaterMonsInfo: ; 8550D7C
-	.4byte 4 ; encounter rate
+gRoute124_WaterMonsInfo: @ 8550D7C
+	.4byte 4 @ encounter rate
 	.4byte gRoute124_WaterMons
 
 	.align 2, 0
 
-gRoute124_FishingMons: ; 8550D84
+gRoute124_FishingMons: @ 8550D84
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -638,13 +638,13 @@ gRoute124_FishingMons: ; 8550D84
 
 	.align 2, 0
 
-gRoute124_FishingMonsInfo: ; 8550DAC
-	.4byte 30 ; encounter rate
+gRoute124_FishingMonsInfo: @ 8550DAC
+	.4byte 30 @ encounter rate
 	.4byte gRoute124_FishingMons
 
 	.align 2, 0
 
-gPetalburgWoods_LandMons: ; 8550DB4
+gPetalburgWoods_LandMons: @ 8550DB4
 	wild_mon POOCHYENA, 5
 	wild_mon WURMPLE, 5
 	wild_mon SHROOMISH, 5
@@ -660,13 +660,13 @@ gPetalburgWoods_LandMons: ; 8550DB4
 
 	.align 2, 0
 
-gPetalburgWoods_LandMonsInfo: ; 8550DE4
-	.4byte 20 ; encounter rate
+gPetalburgWoods_LandMonsInfo: @ 8550DE4
+	.4byte 20 @ encounter rate
 	.4byte gPetalburgWoods_LandMons
 
 	.align 2, 0
 
-gRusturfTunnel_LandMons: ; 8550DEC
+gRusturfTunnel_LandMons: @ 8550DEC
 	wild_mon WHISMUR, 6
 	wild_mon WHISMUR, 7
 	wild_mon WHISMUR, 6
@@ -682,13 +682,13 @@ gRusturfTunnel_LandMons: ; 8550DEC
 
 	.align 2, 0
 
-gRusturfTunnel_LandMonsInfo: ; 8550E1C
-	.4byte 10 ; encounter rate
+gRusturfTunnel_LandMonsInfo: @ 8550E1C
+	.4byte 10 @ encounter rate
 	.4byte gRusturfTunnel_LandMons
 
 	.align 2, 0
 
-gGraniteCave_1F_LandMons: ; 8550E24
+gGraniteCave_1F_LandMons: @ 8550E24
 	wild_mon ZUBAT, 7
 	wild_mon MAKUHITA, 8
 	wild_mon MAKUHITA, 7
@@ -704,13 +704,13 @@ gGraniteCave_1F_LandMons: ; 8550E24
 
 	.align 2, 0
 
-gGraniteCave_1F_LandMonsInfo: ; 8550E54
-	.4byte 10 ; encounter rate
+gGraniteCave_1F_LandMonsInfo: @ 8550E54
+	.4byte 10 @ encounter rate
 	.4byte gGraniteCave_1F_LandMons
 
 	.align 2, 0
 
-gGraniteCave_B1F_LandMons: ; 8550E5C
+gGraniteCave_B1F_LandMons: @ 8550E5C
 	wild_mon ZUBAT, 9
 	wild_mon ARON, 10
 	wild_mon ARON, 9
@@ -726,13 +726,13 @@ gGraniteCave_B1F_LandMons: ; 8550E5C
 
 	.align 2, 0
 
-gGraniteCave_B1F_LandMonsInfo: ; 8550E8C
-	.4byte 10 ; encounter rate
+gGraniteCave_B1F_LandMonsInfo: @ 8550E8C
+	.4byte 10 @ encounter rate
 	.4byte gGraniteCave_B1F_LandMons
 
 	.align 2, 0
 
-gMtPyre_1F_LandMons: ; 8550E94
+gMtPyre_1F_LandMons: @ 8550E94
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -748,13 +748,13 @@ gMtPyre_1F_LandMons: ; 8550E94
 
 	.align 2, 0
 
-gMtPyre_1F_LandMonsInfo: ; 8550EC4
-	.4byte 10 ; encounter rate
+gMtPyre_1F_LandMonsInfo: @ 8550EC4
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_1F_LandMons
 
 	.align 2, 0
 
-gVictoryRoad_1F_LandMons: ; 8550ECC
+gVictoryRoad_1F_LandMons: @ 8550ECC
 	wild_mon GOLBAT, 40
 	wild_mon HARIYAMA, 40
 	wild_mon LAIRON, 40
@@ -770,13 +770,13 @@ gVictoryRoad_1F_LandMons: ; 8550ECC
 
 	.align 2, 0
 
-gVictoryRoad_1F_LandMonsInfo: ; 8550EFC
-	.4byte 10 ; encounter rate
+gVictoryRoad_1F_LandMonsInfo: @ 8550EFC
+	.4byte 10 @ encounter rate
 	.4byte gVictoryRoad_1F_LandMons
 
 	.align 2, 0
 
-gSafariZone_South_LandMons: ; 8550F04
+gSafariZone_South_LandMons: @ 8550F04
 	wild_mon ODDISH, 25
 	wild_mon ODDISH, 27
 	wild_mon GIRAFARIG, 25
@@ -792,13 +792,13 @@ gSafariZone_South_LandMons: ; 8550F04
 
 	.align 2, 0
 
-gSafariZone_South_LandMonsInfo: ; 8550F34
-	.4byte 25 ; encounter rate
+gSafariZone_South_LandMonsInfo: @ 8550F34
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_South_LandMons
 
 	.align 2, 0
 
-gUnderwater2_WaterMons: ; 8550F3C
+gUnderwater2_WaterMons: @ 8550F3C
 	wild_mon CLAMPERL, 20, 30
 	wild_mon CHINCHOU, 20, 30
 	wild_mon CLAMPERL, 30, 35
@@ -807,13 +807,13 @@ gUnderwater2_WaterMons: ; 8550F3C
 
 	.align 2, 0
 
-gUnderwater2_WaterMonsInfo: ; 8550F50
-	.4byte 4 ; encounter rate
+gUnderwater2_WaterMonsInfo: @ 8550F50
+	.4byte 4 @ encounter rate
 	.4byte gUnderwater2_WaterMons
 
 	.align 2, 0
 
-gAbandonedShip_Rooms_B1F_WaterMons: ; 8550F58
+gAbandonedShip_Rooms_B1F_WaterMons: @ 8550F58
 	wild_mon TENTACOOL, 5, 35
 	wild_mon TENTACOOL, 5, 35
 	wild_mon TENTACOOL, 5, 35
@@ -822,13 +822,13 @@ gAbandonedShip_Rooms_B1F_WaterMons: ; 8550F58
 
 	.align 2, 0
 
-gAbandonedShip_Rooms_B1F_WaterMonsInfo: ; 8550F6C
-	.4byte 4 ; encounter rate
+gAbandonedShip_Rooms_B1F_WaterMonsInfo: @ 8550F6C
+	.4byte 4 @ encounter rate
 	.4byte gAbandonedShip_Rooms_B1F_WaterMons
 
 	.align 2, 0
 
-gAbandonedShip_Rooms_B1F_FishingMons: ; 8550F74
+gAbandonedShip_Rooms_B1F_FishingMons: @ 8550F74
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -842,13 +842,13 @@ gAbandonedShip_Rooms_B1F_FishingMons: ; 8550F74
 
 	.align 2, 0
 
-gAbandonedShip_Rooms_B1F_FishingMonsInfo: ; 8550F9C
-	.4byte 20 ; encounter rate
+gAbandonedShip_Rooms_B1F_FishingMonsInfo: @ 8550F9C
+	.4byte 20 @ encounter rate
 	.4byte gAbandonedShip_Rooms_B1F_FishingMons
 
 	.align 2, 0
 
-gGraniteCave_B2F_LandMons: ; 8550FA4
+gGraniteCave_B2F_LandMons: @ 8550FA4
 	wild_mon ZUBAT, 10
 	wild_mon ARON, 11
 	wild_mon ARON, 10
@@ -864,13 +864,13 @@ gGraniteCave_B2F_LandMons: ; 8550FA4
 
 	.align 2, 0
 
-gGraniteCave_B2F_LandMonsInfo: ; 8550FD4
-	.4byte 10 ; encounter rate
+gGraniteCave_B2F_LandMonsInfo: @ 8550FD4
+	.4byte 10 @ encounter rate
 	.4byte gGraniteCave_B2F_LandMons
 
 	.align 2, 0
 
-gGraniteCave_B2F_RockSmashMons: ; 8550FDC
+gGraniteCave_B2F_RockSmashMons: @ 8550FDC
 	wild_mon GEODUDE, 10, 15
 	wild_mon NOSEPASS, 10, 20
 	wild_mon GEODUDE, 5, 10
@@ -879,13 +879,13 @@ gGraniteCave_B2F_RockSmashMons: ; 8550FDC
 
 	.align 2, 0
 
-gGraniteCave_B2F_RockSmashMonsInfo: ; 8550FF0
-	.4byte 20 ; encounter rate
+gGraniteCave_B2F_RockSmashMonsInfo: @ 8550FF0
+	.4byte 20 @ encounter rate
 	.4byte gGraniteCave_B2F_RockSmashMons
 
 	.align 2, 0
 
-gFieryPath_LandMons: ; 8550FF8
+gFieryPath_LandMons: @ 8550FF8
 	wild_mon NUMEL, 15
 	wild_mon KOFFING, 15
 	wild_mon NUMEL, 16
@@ -901,13 +901,13 @@ gFieryPath_LandMons: ; 8550FF8
 
 	.align 2, 0
 
-gFieryPath_LandMonsInfo: ; 8551028
-	.4byte 10 ; encounter rate
+gFieryPath_LandMonsInfo: @ 8551028
+	.4byte 10 @ encounter rate
 	.4byte gFieryPath_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_LandMons: ; 8551030
+gMeteorFalls_B1F_2R_LandMons: @ 8551030
 	wild_mon GOLBAT, 33
 	wild_mon GOLBAT, 35
 	wild_mon BAGON, 30
@@ -923,13 +923,13 @@ gMeteorFalls_B1F_2R_LandMons: ; 8551030
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_LandMonsInfo: ; 8551060
-	.4byte 10 ; encounter rate
+gMeteorFalls_B1F_2R_LandMonsInfo: @ 8551060
+	.4byte 10 @ encounter rate
 	.4byte gMeteorFalls_B1F_2R_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_WaterMons: ; 8551068
+gMeteorFalls_B1F_2R_WaterMons: @ 8551068
 	wild_mon GOLBAT, 30, 35
 	wild_mon GOLBAT, 30, 35
 	wild_mon SOLROCK, 25, 35
@@ -938,13 +938,13 @@ gMeteorFalls_B1F_2R_WaterMons: ; 8551068
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_WaterMonsInfo: ; 855107C
-	.4byte 4 ; encounter rate
+gMeteorFalls_B1F_2R_WaterMonsInfo: @ 855107C
+	.4byte 4 @ encounter rate
 	.4byte gMeteorFalls_B1F_2R_WaterMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_FishingMons: ; 8551084
+gMeteorFalls_B1F_2R_FishingMons: @ 8551084
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -958,13 +958,13 @@ gMeteorFalls_B1F_2R_FishingMons: ; 8551084
 
 	.align 2, 0
 
-gMeteorFalls_B1F_2R_FishingMonsInfo: ; 85510AC
-	.4byte 30 ; encounter rate
+gMeteorFalls_B1F_2R_FishingMonsInfo: @ 85510AC
+	.4byte 30 @ encounter rate
 	.4byte gMeteorFalls_B1F_2R_FishingMons
 
 	.align 2, 0
 
-gJaggedPass_LandMons: ; 85510B4
+gJaggedPass_LandMons: @ 85510B4
 	wild_mon NUMEL, 21
 	wild_mon NUMEL, 21
 	wild_mon MACHOP, 21
@@ -980,13 +980,13 @@ gJaggedPass_LandMons: ; 85510B4
 
 	.align 2, 0
 
-gJaggedPass_LandMonsInfo: ; 85510E4
-	.4byte 20 ; encounter rate
+gJaggedPass_LandMonsInfo: @ 85510E4
+	.4byte 20 @ encounter rate
 	.4byte gJaggedPass_LandMons
 
 	.align 2, 0
 
-gRoute106_WaterMons: ; 85510EC
+gRoute106_WaterMons: @ 85510EC
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -995,13 +995,13 @@ gRoute106_WaterMons: ; 85510EC
 
 	.align 2, 0
 
-gRoute106_WaterMonsInfo: ; 8551100
-	.4byte 4 ; encounter rate
+gRoute106_WaterMonsInfo: @ 8551100
+	.4byte 4 @ encounter rate
 	.4byte gRoute106_WaterMons
 
 	.align 2, 0
 
-gRoute106_FishingMons: ; 8551108
+gRoute106_FishingMons: @ 8551108
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1015,13 +1015,13 @@ gRoute106_FishingMons: ; 8551108
 
 	.align 2, 0
 
-gRoute106_FishingMonsInfo: ; 8551130
-	.4byte 30 ; encounter rate
+gRoute106_FishingMonsInfo: @ 8551130
+	.4byte 30 @ encounter rate
 	.4byte gRoute106_FishingMons
 
 	.align 2, 0
 
-gRoute107_WaterMons: ; 8551138
+gRoute107_WaterMons: @ 8551138
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1030,13 +1030,13 @@ gRoute107_WaterMons: ; 8551138
 
 	.align 2, 0
 
-gRoute107_WaterMonsInfo: ; 855114C
-	.4byte 4 ; encounter rate
+gRoute107_WaterMonsInfo: @ 855114C
+	.4byte 4 @ encounter rate
 	.4byte gRoute107_WaterMons
 
 	.align 2, 0
 
-gRoute107_FishingMons: ; 8551154
+gRoute107_FishingMons: @ 8551154
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1050,13 +1050,13 @@ gRoute107_FishingMons: ; 8551154
 
 	.align 2, 0
 
-gRoute107_FishingMonsInfo: ; 855117C
-	.4byte 30 ; encounter rate
+gRoute107_FishingMonsInfo: @ 855117C
+	.4byte 30 @ encounter rate
 	.4byte gRoute107_FishingMons
 
 	.align 2, 0
 
-gRoute108_WaterMons: ; 8551184
+gRoute108_WaterMons: @ 8551184
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1065,13 +1065,13 @@ gRoute108_WaterMons: ; 8551184
 
 	.align 2, 0
 
-gRoute108_WaterMonsInfo: ; 8551198
-	.4byte 4 ; encounter rate
+gRoute108_WaterMonsInfo: @ 8551198
+	.4byte 4 @ encounter rate
 	.4byte gRoute108_WaterMons
 
 	.align 2, 0
 
-gRoute108_FishingMons: ; 85511A0
+gRoute108_FishingMons: @ 85511A0
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1085,13 +1085,13 @@ gRoute108_FishingMons: ; 85511A0
 
 	.align 2, 0
 
-gRoute108_FishingMonsInfo: ; 85511C8
-	.4byte 30 ; encounter rate
+gRoute108_FishingMonsInfo: @ 85511C8
+	.4byte 30 @ encounter rate
 	.4byte gRoute108_FishingMons
 
 	.align 2, 0
 
-gRoute109_WaterMons: ; 85511D0
+gRoute109_WaterMons: @ 85511D0
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1100,13 +1100,13 @@ gRoute109_WaterMons: ; 85511D0
 
 	.align 2, 0
 
-gRoute109_WaterMonsInfo: ; 85511E4
-	.4byte 4 ; encounter rate
+gRoute109_WaterMonsInfo: @ 85511E4
+	.4byte 4 @ encounter rate
 	.4byte gRoute109_WaterMons
 
 	.align 2, 0
 
-gRoute109_FishingMons: ; 85511EC
+gRoute109_FishingMons: @ 85511EC
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1120,13 +1120,13 @@ gRoute109_FishingMons: ; 85511EC
 
 	.align 2, 0
 
-gRoute109_FishingMonsInfo: ; 8551214
-	.4byte 30 ; encounter rate
+gRoute109_FishingMonsInfo: @ 8551214
+	.4byte 30 @ encounter rate
 	.4byte gRoute109_FishingMons
 
 	.align 2, 0
 
-gRoute115_LandMons: ; 855121C
+gRoute115_LandMons: @ 855121C
 	wild_mon SWABLU, 23
 	wild_mon TAILLOW, 23
 	wild_mon SWABLU, 25
@@ -1142,13 +1142,13 @@ gRoute115_LandMons: ; 855121C
 
 	.align 2, 0
 
-gRoute115_LandMonsInfo: ; 855124C
-	.4byte 20 ; encounter rate
+gRoute115_LandMonsInfo: @ 855124C
+	.4byte 20 @ encounter rate
 	.4byte gRoute115_LandMons
 
 	.align 2, 0
 
-gRoute115_WaterMons: ; 8551254
+gRoute115_WaterMons: @ 8551254
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1157,13 +1157,13 @@ gRoute115_WaterMons: ; 8551254
 
 	.align 2, 0
 
-gRoute115_WaterMonsInfo: ; 8551268
-	.4byte 4 ; encounter rate
+gRoute115_WaterMonsInfo: @ 8551268
+	.4byte 4 @ encounter rate
 	.4byte gRoute115_WaterMons
 
 	.align 2, 0
 
-gRoute115_FishingMons: ; 8551270
+gRoute115_FishingMons: @ 8551270
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1177,13 +1177,13 @@ gRoute115_FishingMons: ; 8551270
 
 	.align 2, 0
 
-gRoute115_FishingMonsInfo: ; 8551298
-	.4byte 30 ; encounter rate
+gRoute115_FishingMonsInfo: @ 8551298
+	.4byte 30 @ encounter rate
 	.4byte gRoute115_FishingMons
 
 	.align 2, 0
 
-gNewMauville_Inside_LandMons: ; 85512A0
+gNewMauville_Inside_LandMons: @ 85512A0
 	wild_mon VOLTORB, 24
 	wild_mon MAGNEMITE, 24
 	wild_mon VOLTORB, 25
@@ -1199,13 +1199,13 @@ gNewMauville_Inside_LandMons: ; 85512A0
 
 	.align 2, 0
 
-gNewMauville_Inside_LandMonsInfo: ; 85512D0
-	.4byte 10 ; encounter rate
+gNewMauville_Inside_LandMonsInfo: @ 85512D0
+	.4byte 10 @ encounter rate
 	.4byte gNewMauville_Inside_LandMons
 
 	.align 2, 0
 
-gRoute119_LandMons: ; 85512D8
+gRoute119_LandMons: @ 85512D8
 	wild_mon ZIGZAGOON, 25
 	wild_mon LINOONE, 25
 	wild_mon ZIGZAGOON, 27
@@ -1221,13 +1221,13 @@ gRoute119_LandMons: ; 85512D8
 
 	.align 2, 0
 
-gRoute119_LandMonsInfo: ; 8551308
-	.4byte 15 ; encounter rate
+gRoute119_LandMonsInfo: @ 8551308
+	.4byte 15 @ encounter rate
 	.4byte gRoute119_LandMons
 
 	.align 2, 0
 
-gRoute119_WaterMons: ; 8551310
+gRoute119_WaterMons: @ 8551310
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1236,13 +1236,13 @@ gRoute119_WaterMons: ; 8551310
 
 	.align 2, 0
 
-gRoute119_WaterMonsInfo: ; 8551324
-	.4byte 4 ; encounter rate
+gRoute119_WaterMonsInfo: @ 8551324
+	.4byte 4 @ encounter rate
 	.4byte gRoute119_WaterMons
 
 	.align 2, 0
 
-gRoute119_FishingMons: ; 855132C
+gRoute119_FishingMons: @ 855132C
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1256,13 +1256,13 @@ gRoute119_FishingMons: ; 855132C
 
 	.align 2, 0
 
-gRoute119_FishingMonsInfo: ; 8551354
-	.4byte 30 ; encounter rate
+gRoute119_FishingMonsInfo: @ 8551354
+	.4byte 30 @ encounter rate
 	.4byte gRoute119_FishingMons
 
 	.align 2, 0
 
-gRoute120_LandMons: ; 855135C
+gRoute120_LandMons: @ 855135C
 	wild_mon POOCHYENA, 25
 	wild_mon MIGHTYENA, 25
 	wild_mon MIGHTYENA, 27
@@ -1278,13 +1278,13 @@ gRoute120_LandMons: ; 855135C
 
 	.align 2, 0
 
-gRoute120_LandMonsInfo: ; 855138C
-	.4byte 20 ; encounter rate
+gRoute120_LandMonsInfo: @ 855138C
+	.4byte 20 @ encounter rate
 	.4byte gRoute120_LandMons
 
 	.align 2, 0
 
-gRoute120_WaterMons: ; 8551394
+gRoute120_WaterMons: @ 8551394
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -1293,13 +1293,13 @@ gRoute120_WaterMons: ; 8551394
 
 	.align 2, 0
 
-gRoute120_WaterMonsInfo: ; 85513A8
-	.4byte 4 ; encounter rate
+gRoute120_WaterMonsInfo: @ 85513A8
+	.4byte 4 @ encounter rate
 	.4byte gRoute120_WaterMons
 
 	.align 2, 0
 
-gRoute120_FishingMons: ; 85513B0
+gRoute120_FishingMons: @ 85513B0
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1313,13 +1313,13 @@ gRoute120_FishingMons: ; 85513B0
 
 	.align 2, 0
 
-gRoute120_FishingMonsInfo: ; 85513D8
-	.4byte 30 ; encounter rate
+gRoute120_FishingMonsInfo: @ 85513D8
+	.4byte 30 @ encounter rate
 	.4byte gRoute120_FishingMons
 
 	.align 2, 0
 
-gRoute121_LandMons: ; 85513E0
+gRoute121_LandMons: @ 85513E0
 	wild_mon POOCHYENA, 26
 	wild_mon SHUPPET, 26
 	wild_mon MIGHTYENA, 26
@@ -1335,13 +1335,13 @@ gRoute121_LandMons: ; 85513E0
 
 	.align 2, 0
 
-gRoute121_LandMonsInfo: ; 8551410
-	.4byte 20 ; encounter rate
+gRoute121_LandMonsInfo: @ 8551410
+	.4byte 20 @ encounter rate
 	.4byte gRoute121_LandMons
 
 	.align 2, 0
 
-gRoute121_WaterMons: ; 8551418
+gRoute121_WaterMons: @ 8551418
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1350,13 +1350,13 @@ gRoute121_WaterMons: ; 8551418
 
 	.align 2, 0
 
-gRoute121_WaterMonsInfo: ; 855142C
-	.4byte 4 ; encounter rate
+gRoute121_WaterMonsInfo: @ 855142C
+	.4byte 4 @ encounter rate
 	.4byte gRoute121_WaterMons
 
 	.align 2, 0
 
-gRoute121_FishingMons: ; 8551434
+gRoute121_FishingMons: @ 8551434
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1370,13 +1370,13 @@ gRoute121_FishingMons: ; 8551434
 
 	.align 2, 0
 
-gRoute121_FishingMonsInfo: ; 855145C
-	.4byte 30 ; encounter rate
+gRoute121_FishingMonsInfo: @ 855145C
+	.4byte 30 @ encounter rate
 	.4byte gRoute121_FishingMons
 
 	.align 2, 0
 
-gRoute122_WaterMons: ; 8551464
+gRoute122_WaterMons: @ 8551464
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1385,13 +1385,13 @@ gRoute122_WaterMons: ; 8551464
 
 	.align 2, 0
 
-gRoute122_WaterMonsInfo: ; 8551478
-	.4byte 4 ; encounter rate
+gRoute122_WaterMonsInfo: @ 8551478
+	.4byte 4 @ encounter rate
 	.4byte gRoute122_WaterMons
 
 	.align 2, 0
 
-gRoute122_FishingMons: ; 8551480
+gRoute122_FishingMons: @ 8551480
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1405,13 +1405,13 @@ gRoute122_FishingMons: ; 8551480
 
 	.align 2, 0
 
-gRoute122_FishingMonsInfo: ; 85514A8
-	.4byte 30 ; encounter rate
+gRoute122_FishingMonsInfo: @ 85514A8
+	.4byte 30 @ encounter rate
 	.4byte gRoute122_FishingMons
 
 	.align 2, 0
 
-gRoute123_LandMons: ; 85514B0
+gRoute123_LandMons: @ 85514B0
 	wild_mon POOCHYENA, 26
 	wild_mon SHUPPET, 26
 	wild_mon MIGHTYENA, 26
@@ -1427,13 +1427,13 @@ gRoute123_LandMons: ; 85514B0
 
 	.align 2, 0
 
-gRoute123_LandMonsInfo: ; 85514E0
-	.4byte 20 ; encounter rate
+gRoute123_LandMonsInfo: @ 85514E0
+	.4byte 20 @ encounter rate
 	.4byte gRoute123_LandMons
 
 	.align 2, 0
 
-gRoute123_WaterMons: ; 85514E8
+gRoute123_WaterMons: @ 85514E8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1442,13 +1442,13 @@ gRoute123_WaterMons: ; 85514E8
 
 	.align 2, 0
 
-gRoute123_WaterMonsInfo: ; 85514FC
-	.4byte 4 ; encounter rate
+gRoute123_WaterMonsInfo: @ 85514FC
+	.4byte 4 @ encounter rate
 	.4byte gRoute123_WaterMons
 
 	.align 2, 0
 
-gRoute123_FishingMons: ; 8551504
+gRoute123_FishingMons: @ 8551504
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1462,13 +1462,13 @@ gRoute123_FishingMons: ; 8551504
 
 	.align 2, 0
 
-gRoute123_FishingMonsInfo: ; 855152C
-	.4byte 30 ; encounter rate
+gRoute123_FishingMonsInfo: @ 855152C
+	.4byte 30 @ encounter rate
 	.4byte gRoute123_FishingMons
 
 	.align 2, 0
 
-gMtPyre_2F_LandMons: ; 8551534
+gMtPyre_2F_LandMons: @ 8551534
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -1484,13 +1484,13 @@ gMtPyre_2F_LandMons: ; 8551534
 
 	.align 2, 0
 
-gMtPyre_2F_LandMonsInfo: ; 8551564
-	.4byte 10 ; encounter rate
+gMtPyre_2F_LandMonsInfo: @ 8551564
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_2F_LandMons
 
 	.align 2, 0
 
-gMtPyre_3F_LandMons: ; 855156C
+gMtPyre_3F_LandMons: @ 855156C
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -1506,13 +1506,13 @@ gMtPyre_3F_LandMons: ; 855156C
 
 	.align 2, 0
 
-gMtPyre_3F_LandMonsInfo: ; 855159C
-	.4byte 10 ; encounter rate
+gMtPyre_3F_LandMonsInfo: @ 855159C
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_3F_LandMons
 
 	.align 2, 0
 
-gMtPyre_4F_LandMons: ; 85515A4
+gMtPyre_4F_LandMons: @ 85515A4
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -1528,13 +1528,13 @@ gMtPyre_4F_LandMons: ; 85515A4
 
 	.align 2, 0
 
-gMtPyre_4F_LandMonsInfo: ; 85515D4
-	.4byte 10 ; encounter rate
+gMtPyre_4F_LandMonsInfo: @ 85515D4
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_4F_LandMons
 
 	.align 2, 0
 
-gMtPyre_5F_LandMons: ; 85515DC
+gMtPyre_5F_LandMons: @ 85515DC
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -1550,13 +1550,13 @@ gMtPyre_5F_LandMons: ; 85515DC
 
 	.align 2, 0
 
-gMtPyre_5F_LandMonsInfo: ; 855160C
-	.4byte 10 ; encounter rate
+gMtPyre_5F_LandMonsInfo: @ 855160C
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_5F_LandMons
 
 	.align 2, 0
 
-gMtPyre_6F_LandMons: ; 8551614
+gMtPyre_6F_LandMons: @ 8551614
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 26
@@ -1572,13 +1572,13 @@ gMtPyre_6F_LandMons: ; 8551614
 
 	.align 2, 0
 
-gMtPyre_6F_LandMonsInfo: ; 8551644
-	.4byte 10 ; encounter rate
+gMtPyre_6F_LandMonsInfo: @ 8551644
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_6F_LandMons
 
 	.align 2, 0
 
-gMtPyre_Exterior_LandMons: ; 855164C
+gMtPyre_Exterior_LandMons: @ 855164C
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 27
 	wild_mon SHUPPET, 28
@@ -1594,13 +1594,13 @@ gMtPyre_Exterior_LandMons: ; 855164C
 
 	.align 2, 0
 
-gMtPyre_Exterior_LandMonsInfo: ; 855167C
-	.4byte 10 ; encounter rate
+gMtPyre_Exterior_LandMonsInfo: @ 855167C
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_Exterior_LandMons
 
 	.align 2, 0
 
-gMtPyre_Summit_LandMons: ; 8551684
+gMtPyre_Summit_LandMons: @ 8551684
 	wild_mon SHUPPET, 28
 	wild_mon SHUPPET, 29
 	wild_mon SHUPPET, 27
@@ -1616,13 +1616,13 @@ gMtPyre_Summit_LandMons: ; 8551684
 
 	.align 2, 0
 
-gMtPyre_Summit_LandMonsInfo: ; 85516B4
-	.4byte 10 ; encounter rate
+gMtPyre_Summit_LandMonsInfo: @ 85516B4
+	.4byte 10 @ encounter rate
 	.4byte gMtPyre_Summit_LandMons
 
 	.align 2, 0
 
-gGraniteCave_StevensRoom_LandMons: ; 85516BC
+gGraniteCave_StevensRoom_LandMons: @ 85516BC
 	wild_mon ZUBAT, 7
 	wild_mon MAKUHITA, 8
 	wild_mon MAKUHITA, 7
@@ -1638,13 +1638,13 @@ gGraniteCave_StevensRoom_LandMons: ; 85516BC
 
 	.align 2, 0
 
-gGraniteCave_StevensRoom_LandMonsInfo: ; 85516EC
-	.4byte 10 ; encounter rate
+gGraniteCave_StevensRoom_LandMonsInfo: @ 85516EC
+	.4byte 10 @ encounter rate
 	.4byte gGraniteCave_StevensRoom_LandMons
 
 	.align 2, 0
 
-gRoute125_WaterMons: ; 85516F4
+gRoute125_WaterMons: @ 85516F4
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1653,13 +1653,13 @@ gRoute125_WaterMons: ; 85516F4
 
 	.align 2, 0
 
-gRoute125_WaterMonsInfo: ; 8551708
-	.4byte 4 ; encounter rate
+gRoute125_WaterMonsInfo: @ 8551708
+	.4byte 4 @ encounter rate
 	.4byte gRoute125_WaterMons
 
 	.align 2, 0
 
-gRoute125_FishingMons: ; 8551710
+gRoute125_FishingMons: @ 8551710
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1673,13 +1673,13 @@ gRoute125_FishingMons: ; 8551710
 
 	.align 2, 0
 
-gRoute125_FishingMonsInfo: ; 8551738
-	.4byte 30 ; encounter rate
+gRoute125_FishingMonsInfo: @ 8551738
+	.4byte 30 @ encounter rate
 	.4byte gRoute125_FishingMons
 
 	.align 2, 0
 
-gRoute126_WaterMons: ; 8551740
+gRoute126_WaterMons: @ 8551740
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1688,13 +1688,13 @@ gRoute126_WaterMons: ; 8551740
 
 	.align 2, 0
 
-gRoute126_WaterMonsInfo: ; 8551754
-	.4byte 4 ; encounter rate
+gRoute126_WaterMonsInfo: @ 8551754
+	.4byte 4 @ encounter rate
 	.4byte gRoute126_WaterMons
 
 	.align 2, 0
 
-gRoute126_FishingMons: ; 855175C
+gRoute126_FishingMons: @ 855175C
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1708,13 +1708,13 @@ gRoute126_FishingMons: ; 855175C
 
 	.align 2, 0
 
-gRoute126_FishingMonsInfo: ; 8551784
-	.4byte 30 ; encounter rate
+gRoute126_FishingMonsInfo: @ 8551784
+	.4byte 30 @ encounter rate
 	.4byte gRoute126_FishingMons
 
 	.align 2, 0
 
-gRoute127_WaterMons: ; 855178C
+gRoute127_WaterMons: @ 855178C
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1723,13 +1723,13 @@ gRoute127_WaterMons: ; 855178C
 
 	.align 2, 0
 
-gRoute127_WaterMonsInfo: ; 85517A0
-	.4byte 4 ; encounter rate
+gRoute127_WaterMonsInfo: @ 85517A0
+	.4byte 4 @ encounter rate
 	.4byte gRoute127_WaterMons
 
 	.align 2, 0
 
-gRoute127_FishingMons: ; 85517A8
+gRoute127_FishingMons: @ 85517A8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1743,13 +1743,13 @@ gRoute127_FishingMons: ; 85517A8
 
 	.align 2, 0
 
-gRoute127_FishingMonsInfo: ; 85517D0
-	.4byte 30 ; encounter rate
+gRoute127_FishingMonsInfo: @ 85517D0
+	.4byte 30 @ encounter rate
 	.4byte gRoute127_FishingMons
 
 	.align 2, 0
 
-gRoute128_WaterMons: ; 85517D8
+gRoute128_WaterMons: @ 85517D8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1758,13 +1758,13 @@ gRoute128_WaterMons: ; 85517D8
 
 	.align 2, 0
 
-gRoute128_WaterMonsInfo: ; 85517EC
-	.4byte 4 ; encounter rate
+gRoute128_WaterMonsInfo: @ 85517EC
+	.4byte 4 @ encounter rate
 	.4byte gRoute128_WaterMons
 
 	.align 2, 0
 
-gRoute128_FishingMons: ; 85517F4
+gRoute128_FishingMons: @ 85517F4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1778,13 +1778,13 @@ gRoute128_FishingMons: ; 85517F4
 
 	.align 2, 0
 
-gRoute128_FishingMonsInfo: ; 855181C
-	.4byte 30 ; encounter rate
+gRoute128_FishingMonsInfo: @ 855181C
+	.4byte 30 @ encounter rate
 	.4byte gRoute128_FishingMons
 
 	.align 2, 0
 
-gRoute129_WaterMons: ; 8551824
+gRoute129_WaterMons: @ 8551824
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1793,13 +1793,13 @@ gRoute129_WaterMons: ; 8551824
 
 	.align 2, 0
 
-gRoute129_WaterMonsInfo: ; 8551838
-	.4byte 4 ; encounter rate
+gRoute129_WaterMonsInfo: @ 8551838
+	.4byte 4 @ encounter rate
 	.4byte gRoute129_WaterMons
 
 	.align 2, 0
 
-gRoute129_FishingMons: ; 8551840
+gRoute129_FishingMons: @ 8551840
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1813,13 +1813,13 @@ gRoute129_FishingMons: ; 8551840
 
 	.align 2, 0
 
-gRoute129_FishingMonsInfo: ; 8551868
-	.4byte 30 ; encounter rate
+gRoute129_FishingMonsInfo: @ 8551868
+	.4byte 30 @ encounter rate
 	.4byte gRoute129_FishingMons
 
 	.align 2, 0
 
-gRoute130_LandMons: ; 8551870
+gRoute130_LandMons: @ 8551870
 	wild_mon WYNAUT, 30
 	wild_mon WYNAUT, 35
 	wild_mon WYNAUT, 25
@@ -1835,13 +1835,13 @@ gRoute130_LandMons: ; 8551870
 
 	.align 2, 0
 
-gRoute130_LandMonsInfo: ; 85518A0
-	.4byte 20 ; encounter rate
+gRoute130_LandMonsInfo: @ 85518A0
+	.4byte 20 @ encounter rate
 	.4byte gRoute130_LandMons
 
 	.align 2, 0
 
-gRoute130_WaterMons: ; 85518A8
+gRoute130_WaterMons: @ 85518A8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1850,13 +1850,13 @@ gRoute130_WaterMons: ; 85518A8
 
 	.align 2, 0
 
-gRoute130_WaterMonsInfo: ; 85518BC
-	.4byte 4 ; encounter rate
+gRoute130_WaterMonsInfo: @ 85518BC
+	.4byte 4 @ encounter rate
 	.4byte gRoute130_WaterMons
 
 	.align 2, 0
 
-gRoute130_FishingMons: ; 85518C4
+gRoute130_FishingMons: @ 85518C4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1870,13 +1870,13 @@ gRoute130_FishingMons: ; 85518C4
 
 	.align 2, 0
 
-gRoute130_FishingMonsInfo: ; 85518EC
-	.4byte 30 ; encounter rate
+gRoute130_FishingMonsInfo: @ 85518EC
+	.4byte 30 @ encounter rate
 	.4byte gRoute130_FishingMons
 
 	.align 2, 0
 
-gRoute131_WaterMons: ; 85518F4
+gRoute131_WaterMons: @ 85518F4
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1885,13 +1885,13 @@ gRoute131_WaterMons: ; 85518F4
 
 	.align 2, 0
 
-gRoute131_WaterMonsInfo: ; 8551908
-	.4byte 4 ; encounter rate
+gRoute131_WaterMonsInfo: @ 8551908
+	.4byte 4 @ encounter rate
 	.4byte gRoute131_WaterMons
 
 	.align 2, 0
 
-gRoute131_FishingMons: ; 8551910
+gRoute131_FishingMons: @ 8551910
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1905,13 +1905,13 @@ gRoute131_FishingMons: ; 8551910
 
 	.align 2, 0
 
-gRoute131_FishingMonsInfo: ; 8551938
-	.4byte 30 ; encounter rate
+gRoute131_FishingMonsInfo: @ 8551938
+	.4byte 30 @ encounter rate
 	.4byte gRoute131_FishingMons
 
 	.align 2, 0
 
-gRoute132_WaterMons: ; 8551940
+gRoute132_WaterMons: @ 8551940
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1920,13 +1920,13 @@ gRoute132_WaterMons: ; 8551940
 
 	.align 2, 0
 
-gRoute132_WaterMonsInfo: ; 8551954
-	.4byte 4 ; encounter rate
+gRoute132_WaterMonsInfo: @ 8551954
+	.4byte 4 @ encounter rate
 	.4byte gRoute132_WaterMons
 
 	.align 2, 0
 
-gRoute132_FishingMons: ; 855195C
+gRoute132_FishingMons: @ 855195C
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1940,13 +1940,13 @@ gRoute132_FishingMons: ; 855195C
 
 	.align 2, 0
 
-gRoute132_FishingMonsInfo: ; 8551984
-	.4byte 30 ; encounter rate
+gRoute132_FishingMonsInfo: @ 8551984
+	.4byte 30 @ encounter rate
 	.4byte gRoute132_FishingMons
 
 	.align 2, 0
 
-gRoute133_WaterMons: ; 855198C
+gRoute133_WaterMons: @ 855198C
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1955,13 +1955,13 @@ gRoute133_WaterMons: ; 855198C
 
 	.align 2, 0
 
-gRoute133_WaterMonsInfo: ; 85519A0
-	.4byte 4 ; encounter rate
+gRoute133_WaterMonsInfo: @ 85519A0
+	.4byte 4 @ encounter rate
 	.4byte gRoute133_WaterMons
 
 	.align 2, 0
 
-gRoute133_FishingMons: ; 85519A8
+gRoute133_FishingMons: @ 85519A8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -1975,13 +1975,13 @@ gRoute133_FishingMons: ; 85519A8
 
 	.align 2, 0
 
-gRoute133_FishingMonsInfo: ; 85519D0
-	.4byte 30 ; encounter rate
+gRoute133_FishingMonsInfo: @ 85519D0
+	.4byte 30 @ encounter rate
 	.4byte gRoute133_FishingMons
 
 	.align 2, 0
 
-gRoute134_WaterMons: ; 85519D8
+gRoute134_WaterMons: @ 85519D8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -1990,13 +1990,13 @@ gRoute134_WaterMons: ; 85519D8
 
 	.align 2, 0
 
-gRoute134_WaterMonsInfo: ; 85519EC
-	.4byte 4 ; encounter rate
+gRoute134_WaterMonsInfo: @ 85519EC
+	.4byte 4 @ encounter rate
 	.4byte gRoute134_WaterMons
 
 	.align 2, 0
 
-gRoute134_FishingMons: ; 85519F4
+gRoute134_FishingMons: @ 85519F4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2010,13 +2010,13 @@ gRoute134_FishingMons: ; 85519F4
 
 	.align 2, 0
 
-gRoute134_FishingMonsInfo: ; 8551A1C
-	.4byte 30 ; encounter rate
+gRoute134_FishingMonsInfo: @ 8551A1C
+	.4byte 30 @ encounter rate
 	.4byte gRoute134_FishingMons
 
 	.align 2, 0
 
-gAbandonedShip_HiddenFloorCorridors_WaterMons: ; 8551A24
+gAbandonedShip_HiddenFloorCorridors_WaterMons: @ 8551A24
 	wild_mon TENTACOOL, 5, 35
 	wild_mon TENTACOOL, 5, 35
 	wild_mon TENTACOOL, 5, 35
@@ -2025,13 +2025,13 @@ gAbandonedShip_HiddenFloorCorridors_WaterMons: ; 8551A24
 
 	.align 2, 0
 
-gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo: ; 8551A38
-	.4byte 4 ; encounter rate
+gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo: @ 8551A38
+	.4byte 4 @ encounter rate
 	.4byte gAbandonedShip_HiddenFloorCorridors_WaterMons
 
 	.align 2, 0
 
-gAbandonedShip_HiddenFloorCorridors_FishingMons: ; 8551A40
+gAbandonedShip_HiddenFloorCorridors_FishingMons: @ 8551A40
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2045,13 +2045,13 @@ gAbandonedShip_HiddenFloorCorridors_FishingMons: ; 8551A40
 
 	.align 2, 0
 
-gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo: ; 8551A68
-	.4byte 20 ; encounter rate
+gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo: @ 8551A68
+	.4byte 20 @ encounter rate
 	.4byte gAbandonedShip_HiddenFloorCorridors_FishingMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room1_LandMons: ; 8551A70
+gSeafloorCavern_Room1_LandMons: @ 8551A70
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2067,13 +2067,13 @@ gSeafloorCavern_Room1_LandMons: ; 8551A70
 
 	.align 2, 0
 
-gSeafloorCavern_Room1_LandMonsInfo: ; 8551AA0
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room1_LandMonsInfo: @ 8551AA0
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room1_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room2_LandMons: ; 8551AA8
+gSeafloorCavern_Room2_LandMons: @ 8551AA8
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2089,13 +2089,13 @@ gSeafloorCavern_Room2_LandMons: ; 8551AA8
 
 	.align 2, 0
 
-gSeafloorCavern_Room2_LandMonsInfo: ; 8551AD8
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room2_LandMonsInfo: @ 8551AD8
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room2_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room3_LandMons: ; 8551AE0
+gSeafloorCavern_Room3_LandMons: @ 8551AE0
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2111,13 +2111,13 @@ gSeafloorCavern_Room3_LandMons: ; 8551AE0
 
 	.align 2, 0
 
-gSeafloorCavern_Room3_LandMonsInfo: ; 8551B10
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room3_LandMonsInfo: @ 8551B10
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room3_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room4_LandMons: ; 8551B18
+gSeafloorCavern_Room4_LandMons: @ 8551B18
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2133,13 +2133,13 @@ gSeafloorCavern_Room4_LandMons: ; 8551B18
 
 	.align 2, 0
 
-gSeafloorCavern_Room4_LandMonsInfo: ; 8551B48
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room4_LandMonsInfo: @ 8551B48
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room4_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room5_LandMons: ; 8551B50
+gSeafloorCavern_Room5_LandMons: @ 8551B50
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2155,13 +2155,13 @@ gSeafloorCavern_Room5_LandMons: ; 8551B50
 
 	.align 2, 0
 
-gSeafloorCavern_Room5_LandMonsInfo: ; 8551B80
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room5_LandMonsInfo: @ 8551B80
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room5_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_LandMons: ; 8551B88
+gSeafloorCavern_Room6_LandMons: @ 8551B88
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2177,13 +2177,13 @@ gSeafloorCavern_Room6_LandMons: ; 8551B88
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_LandMonsInfo: ; 8551BB8
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room6_LandMonsInfo: @ 8551BB8
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room6_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_WaterMons: ; 8551BC0
+gSeafloorCavern_Room6_WaterMons: @ 8551BC0
 	wild_mon TENTACOOL, 5, 35
 	wild_mon ZUBAT, 5, 35
 	wild_mon ZUBAT, 30, 35
@@ -2192,13 +2192,13 @@ gSeafloorCavern_Room6_WaterMons: ; 8551BC0
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_WaterMonsInfo: ; 8551BD4
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room6_WaterMonsInfo: @ 8551BD4
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room6_WaterMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_FishingMons: ; 8551BDC
+gSeafloorCavern_Room6_FishingMons: @ 8551BDC
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2212,13 +2212,13 @@ gSeafloorCavern_Room6_FishingMons: ; 8551BDC
 
 	.align 2, 0
 
-gSeafloorCavern_Room6_FishingMonsInfo: ; 8551C04
-	.4byte 10 ; encounter rate
+gSeafloorCavern_Room6_FishingMonsInfo: @ 8551C04
+	.4byte 10 @ encounter rate
 	.4byte gSeafloorCavern_Room6_FishingMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_LandMons: ; 8551C0C
+gSeafloorCavern_Room7_LandMons: @ 8551C0C
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2234,13 +2234,13 @@ gSeafloorCavern_Room7_LandMons: ; 8551C0C
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_LandMonsInfo: ; 8551C3C
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room7_LandMonsInfo: @ 8551C3C
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room7_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_WaterMons: ; 8551C44
+gSeafloorCavern_Room7_WaterMons: @ 8551C44
 	wild_mon TENTACOOL, 5, 35
 	wild_mon ZUBAT, 5, 35
 	wild_mon ZUBAT, 30, 35
@@ -2249,13 +2249,13 @@ gSeafloorCavern_Room7_WaterMons: ; 8551C44
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_WaterMonsInfo: ; 8551C58
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room7_WaterMonsInfo: @ 8551C58
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room7_WaterMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_FishingMons: ; 8551C60
+gSeafloorCavern_Room7_FishingMons: @ 8551C60
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2269,13 +2269,13 @@ gSeafloorCavern_Room7_FishingMons: ; 8551C60
 
 	.align 2, 0
 
-gSeafloorCavern_Room7_FishingMonsInfo: ; 8551C88
-	.4byte 10 ; encounter rate
+gSeafloorCavern_Room7_FishingMonsInfo: @ 8551C88
+	.4byte 10 @ encounter rate
 	.4byte gSeafloorCavern_Room7_FishingMons
 
 	.align 2, 0
 
-gSeafloorCavern_Room8_LandMons: ; 8551C90
+gSeafloorCavern_Room8_LandMons: @ 8551C90
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2291,13 +2291,13 @@ gSeafloorCavern_Room8_LandMons: ; 8551C90
 
 	.align 2, 0
 
-gSeafloorCavern_Room8_LandMonsInfo: ; 8551CC0
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Room8_LandMonsInfo: @ 8551CC0
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Room8_LandMons
 
 	.align 2, 0
 
-gSeafloorCavern_Entrance_WaterMons: ; 8551CC8
+gSeafloorCavern_Entrance_WaterMons: @ 8551CC8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon ZUBAT, 5, 35
 	wild_mon ZUBAT, 30, 35
@@ -2306,13 +2306,13 @@ gSeafloorCavern_Entrance_WaterMons: ; 8551CC8
 
 	.align 2, 0
 
-gSeafloorCavern_Entrance_WaterMonsInfo: ; 8551CDC
-	.4byte 4 ; encounter rate
+gSeafloorCavern_Entrance_WaterMonsInfo: @ 8551CDC
+	.4byte 4 @ encounter rate
 	.4byte gSeafloorCavern_Entrance_WaterMons
 
 	.align 2, 0
 
-gSeafloorCavern_Entrance_FishingMons: ; 8551CE4
+gSeafloorCavern_Entrance_FishingMons: @ 8551CE4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2326,13 +2326,13 @@ gSeafloorCavern_Entrance_FishingMons: ; 8551CE4
 
 	.align 2, 0
 
-gSeafloorCavern_Entrance_FishingMonsInfo: ; 8551D0C
-	.4byte 10 ; encounter rate
+gSeafloorCavern_Entrance_FishingMonsInfo: @ 8551D0C
+	.4byte 10 @ encounter rate
 	.4byte gSeafloorCavern_Entrance_FishingMons
 
 	.align 2, 0
 
-gCaveOfOrigin_Entrance_LandMons: ; 8551D14
+gCaveOfOrigin_Entrance_LandMons: @ 8551D14
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2348,13 +2348,13 @@ gCaveOfOrigin_Entrance_LandMons: ; 8551D14
 
 	.align 2, 0
 
-gCaveOfOrigin_Entrance_LandMonsInfo: ; 8551D44
-	.4byte 4 ; encounter rate
+gCaveOfOrigin_Entrance_LandMonsInfo: @ 8551D44
+	.4byte 4 @ encounter rate
 	.4byte gCaveOfOrigin_Entrance_LandMons
 
 	.align 2, 0
 
-gCaveOfOrigin_1F_LandMons: ; 8551D4C
+gCaveOfOrigin_1F_LandMons: @ 8551D4C
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2370,13 +2370,13 @@ gCaveOfOrigin_1F_LandMons: ; 8551D4C
 
 	.align 2, 0
 
-gCaveOfOrigin_1F_LandMonsInfo: ; 8551D7C
-	.4byte 4 ; encounter rate
+gCaveOfOrigin_1F_LandMonsInfo: @ 8551D7C
+	.4byte 4 @ encounter rate
 	.4byte gCaveOfOrigin_1F_LandMons
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap1_LandMons: ; 8551D84
+gCaveOfOrigin_UnusedRubySapphireMap1_LandMons: @ 8551D84
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2392,13 +2392,13 @@ gCaveOfOrigin_UnusedRubySapphireMap1_LandMons: ; 8551D84
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo: ; 8551DB4
-	.4byte 4 ; encounter rate
+gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo: @ 8551DB4
+	.4byte 4 @ encounter rate
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap1_LandMons
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap2_LandMons: ; 8551DBC
+gCaveOfOrigin_UnusedRubySapphireMap2_LandMons: @ 8551DBC
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2414,13 +2414,13 @@ gCaveOfOrigin_UnusedRubySapphireMap2_LandMons: ; 8551DBC
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo: ; 8551DEC
-	.4byte 4 ; encounter rate
+gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo: @ 8551DEC
+	.4byte 4 @ encounter rate
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap2_LandMons
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap3_LandMons: ; 8551DF4
+gCaveOfOrigin_UnusedRubySapphireMap3_LandMons: @ 8551DF4
 	wild_mon ZUBAT, 30
 	wild_mon ZUBAT, 31
 	wild_mon ZUBAT, 32
@@ -2436,13 +2436,13 @@ gCaveOfOrigin_UnusedRubySapphireMap3_LandMons: ; 8551DF4
 
 	.align 2, 0
 
-gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo: ; 8551E24
-	.4byte 4 ; encounter rate
+gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo: @ 8551E24
+	.4byte 4 @ encounter rate
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap3_LandMons
 
 	.align 2, 0
 
-gNewMauville_Entrance_LandMons: ; 8551E2C
+gNewMauville_Entrance_LandMons: @ 8551E2C
 	wild_mon VOLTORB, 24
 	wild_mon MAGNEMITE, 24
 	wild_mon VOLTORB, 25
@@ -2458,13 +2458,13 @@ gNewMauville_Entrance_LandMons: ; 8551E2C
 
 	.align 2, 0
 
-gNewMauville_Entrance_LandMonsInfo: ; 8551E5C
-	.4byte 10 ; encounter rate
+gNewMauville_Entrance_LandMonsInfo: @ 8551E5C
+	.4byte 10 @ encounter rate
 	.4byte gNewMauville_Entrance_LandMons
 
 	.align 2, 0
 
-gSafariZone_Southwest_LandMons: ; 8551E64
+gSafariZone_Southwest_LandMons: @ 8551E64
 	wild_mon ODDISH, 25
 	wild_mon ODDISH, 27
 	wild_mon GIRAFARIG, 25
@@ -2480,13 +2480,13 @@ gSafariZone_Southwest_LandMons: ; 8551E64
 
 	.align 2, 0
 
-gSafariZone_Southwest_LandMonsInfo: ; 8551E94
-	.4byte 25 ; encounter rate
+gSafariZone_Southwest_LandMonsInfo: @ 8551E94
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_Southwest_LandMons
 
 	.align 2, 0
 
-gSafariZone_Southwest_WaterMons: ; 8551E9C
+gSafariZone_Southwest_WaterMons: @ 8551E9C
 	wild_mon PSYDUCK, 20, 30
 	wild_mon PSYDUCK, 20, 30
 	wild_mon PSYDUCK, 30, 35
@@ -2495,13 +2495,13 @@ gSafariZone_Southwest_WaterMons: ; 8551E9C
 
 	.align 2, 0
 
-gSafariZone_Southwest_WaterMonsInfo: ; 8551EB0
-	.4byte 9 ; encounter rate
+gSafariZone_Southwest_WaterMonsInfo: @ 8551EB0
+	.4byte 9 @ encounter rate
 	.4byte gSafariZone_Southwest_WaterMons
 
 	.align 2, 0
 
-gSafariZone_Southwest_FishingMons: ; 8551EB8
+gSafariZone_Southwest_FishingMons: @ 8551EB8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2515,13 +2515,13 @@ gSafariZone_Southwest_FishingMons: ; 8551EB8
 
 	.align 2, 0
 
-gSafariZone_Southwest_FishingMonsInfo: ; 8551EE0
-	.4byte 35 ; encounter rate
+gSafariZone_Southwest_FishingMonsInfo: @ 8551EE0
+	.4byte 35 @ encounter rate
 	.4byte gSafariZone_Southwest_FishingMons
 
 	.align 2, 0
 
-gSafariZone_North_LandMons: ; 8551EE8
+gSafariZone_North_LandMons: @ 8551EE8
 	wild_mon PHANPY, 27
 	wild_mon ODDISH, 27
 	wild_mon PHANPY, 29
@@ -2537,13 +2537,13 @@ gSafariZone_North_LandMons: ; 8551EE8
 
 	.align 2, 0
 
-gSafariZone_North_LandMonsInfo: ; 8551F18
-	.4byte 25 ; encounter rate
+gSafariZone_North_LandMonsInfo: @ 8551F18
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_North_LandMons
 
 	.align 2, 0
 
-gSafariZone_North_RockSmashMons: ; 8551F20
+gSafariZone_North_RockSmashMons: @ 8551F20
 	wild_mon GEODUDE, 10, 15
 	wild_mon GEODUDE, 5, 10
 	wild_mon GEODUDE, 15, 20
@@ -2552,13 +2552,13 @@ gSafariZone_North_RockSmashMons: ; 8551F20
 
 	.align 2, 0
 
-gSafariZone_North_RockSmashMonsInfo: ; 8551F34
-	.4byte 25 ; encounter rate
+gSafariZone_North_RockSmashMonsInfo: @ 8551F34
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_North_RockSmashMons
 
 	.align 2, 0
 
-gSafariZone_Northwest_LandMons: ; 8551F3C
+gSafariZone_Northwest_LandMons: @ 8551F3C
 	wild_mon RHYHORN, 27
 	wild_mon ODDISH, 27
 	wild_mon RHYHORN, 29
@@ -2574,13 +2574,13 @@ gSafariZone_Northwest_LandMons: ; 8551F3C
 
 	.align 2, 0
 
-gSafariZone_Northwest_LandMonsInfo: ; 8551F6C
-	.4byte 25 ; encounter rate
+gSafariZone_Northwest_LandMonsInfo: @ 8551F6C
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_Northwest_LandMons
 
 	.align 2, 0
 
-gSafariZone_Northwest_WaterMons: ; 8551F74
+gSafariZone_Northwest_WaterMons: @ 8551F74
 	wild_mon PSYDUCK, 20, 30
 	wild_mon PSYDUCK, 20, 30
 	wild_mon PSYDUCK, 30, 35
@@ -2589,13 +2589,13 @@ gSafariZone_Northwest_WaterMons: ; 8551F74
 
 	.align 2, 0
 
-gSafariZone_Northwest_WaterMonsInfo: ; 8551F88
-	.4byte 9 ; encounter rate
+gSafariZone_Northwest_WaterMonsInfo: @ 8551F88
+	.4byte 9 @ encounter rate
 	.4byte gSafariZone_Northwest_WaterMons
 
 	.align 2, 0
 
-gSafariZone_Northwest_FishingMons: ; 8551F90
+gSafariZone_Northwest_FishingMons: @ 8551F90
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2609,13 +2609,13 @@ gSafariZone_Northwest_FishingMons: ; 8551F90
 
 	.align 2, 0
 
-gSafariZone_Northwest_FishingMonsInfo: ; 8551FB8
-	.4byte 35 ; encounter rate
+gSafariZone_Northwest_FishingMonsInfo: @ 8551FB8
+	.4byte 35 @ encounter rate
 	.4byte gSafariZone_Northwest_FishingMons
 
 	.align 2, 0
 
-gVictoryRoad_B1F_LandMons: ; 8551FC0
+gVictoryRoad_B1F_LandMons: @ 8551FC0
 	wild_mon GOLBAT, 40
 	wild_mon HARIYAMA, 40
 	wild_mon LAIRON, 40
@@ -2631,13 +2631,13 @@ gVictoryRoad_B1F_LandMons: ; 8551FC0
 
 	.align 2, 0
 
-gVictoryRoad_B1F_LandMonsInfo: ; 8551FF0
-	.4byte 10 ; encounter rate
+gVictoryRoad_B1F_LandMonsInfo: @ 8551FF0
+	.4byte 10 @ encounter rate
 	.4byte gVictoryRoad_B1F_LandMons
 
 	.align 2, 0
 
-gVictoryRoad_B1F_RockSmashMons: ; 8551FF8
+gVictoryRoad_B1F_RockSmashMons: @ 8551FF8
 	wild_mon GRAVELER, 30, 40
 	wild_mon GEODUDE, 30, 40
 	wild_mon GRAVELER, 35, 40
@@ -2646,13 +2646,13 @@ gVictoryRoad_B1F_RockSmashMons: ; 8551FF8
 
 	.align 2, 0
 
-gVictoryRoad_B1F_RockSmashMonsInfo: ; 855200C
-	.4byte 20 ; encounter rate
+gVictoryRoad_B1F_RockSmashMonsInfo: @ 855200C
+	.4byte 20 @ encounter rate
 	.4byte gVictoryRoad_B1F_RockSmashMons
 
 	.align 2, 0
 
-gVictoryRoad_B2F_LandMons: ; 8552014
+gVictoryRoad_B2F_LandMons: @ 8552014
 	wild_mon GOLBAT, 40
 	wild_mon SABLEYE, 40
 	wild_mon LAIRON, 40
@@ -2668,13 +2668,13 @@ gVictoryRoad_B2F_LandMons: ; 8552014
 
 	.align 2, 0
 
-gVictoryRoad_B2F_LandMonsInfo: ; 8552044
-	.4byte 10 ; encounter rate
+gVictoryRoad_B2F_LandMonsInfo: @ 8552044
+	.4byte 10 @ encounter rate
 	.4byte gVictoryRoad_B2F_LandMons
 
 	.align 2, 0
 
-gVictoryRoad_B2F_WaterMons: ; 855204C
+gVictoryRoad_B2F_WaterMons: @ 855204C
 	wild_mon GOLBAT, 30, 35
 	wild_mon GOLBAT, 25, 30
 	wild_mon GOLBAT, 35, 40
@@ -2683,13 +2683,13 @@ gVictoryRoad_B2F_WaterMons: ; 855204C
 
 	.align 2, 0
 
-gVictoryRoad_B2F_WaterMonsInfo: ; 8552060
-	.4byte 4 ; encounter rate
+gVictoryRoad_B2F_WaterMonsInfo: @ 8552060
+	.4byte 4 @ encounter rate
 	.4byte gVictoryRoad_B2F_WaterMons
 
 	.align 2, 0
 
-gVictoryRoad_B2F_FishingMons: ; 8552068
+gVictoryRoad_B2F_FishingMons: @ 8552068
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2703,13 +2703,13 @@ gVictoryRoad_B2F_FishingMons: ; 8552068
 
 	.align 2, 0
 
-gVictoryRoad_B2F_FishingMonsInfo: ; 8552090
-	.4byte 30 ; encounter rate
+gVictoryRoad_B2F_FishingMonsInfo: @ 8552090
+	.4byte 30 @ encounter rate
 	.4byte gVictoryRoad_B2F_FishingMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_LandMons: ; 8552098
+gMeteorFalls_1F_1R_LandMons: @ 8552098
 	wild_mon ZUBAT, 16
 	wild_mon ZUBAT, 17
 	wild_mon ZUBAT, 18
@@ -2725,13 +2725,13 @@ gMeteorFalls_1F_1R_LandMons: ; 8552098
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_LandMonsInfo: ; 85520C8
-	.4byte 10 ; encounter rate
+gMeteorFalls_1F_1R_LandMonsInfo: @ 85520C8
+	.4byte 10 @ encounter rate
 	.4byte gMeteorFalls_1F_1R_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_WaterMons: ; 85520D0
+gMeteorFalls_1F_1R_WaterMons: @ 85520D0
 	wild_mon ZUBAT, 5, 35
 	wild_mon ZUBAT, 30, 35
 	wild_mon SOLROCK, 25, 35
@@ -2740,13 +2740,13 @@ gMeteorFalls_1F_1R_WaterMons: ; 85520D0
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_WaterMonsInfo: ; 85520E4
-	.4byte 4 ; encounter rate
+gMeteorFalls_1F_1R_WaterMonsInfo: @ 85520E4
+	.4byte 4 @ encounter rate
 	.4byte gMeteorFalls_1F_1R_WaterMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_FishingMons: ; 85520EC
+gMeteorFalls_1F_1R_FishingMons: @ 85520EC
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2760,13 +2760,13 @@ gMeteorFalls_1F_1R_FishingMons: ; 85520EC
 
 	.align 2, 0
 
-gMeteorFalls_1F_1R_FishingMonsInfo: ; 8552114
-	.4byte 30 ; encounter rate
+gMeteorFalls_1F_1R_FishingMonsInfo: @ 8552114
+	.4byte 30 @ encounter rate
 	.4byte gMeteorFalls_1F_1R_FishingMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_LandMons: ; 855211C
+gMeteorFalls_1F_2R_LandMons: @ 855211C
 	wild_mon GOLBAT, 33
 	wild_mon GOLBAT, 35
 	wild_mon GOLBAT, 33
@@ -2782,13 +2782,13 @@ gMeteorFalls_1F_2R_LandMons: ; 855211C
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_LandMonsInfo: ; 855214C
-	.4byte 10 ; encounter rate
+gMeteorFalls_1F_2R_LandMonsInfo: @ 855214C
+	.4byte 10 @ encounter rate
 	.4byte gMeteorFalls_1F_2R_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_WaterMons: ; 8552154
+gMeteorFalls_1F_2R_WaterMons: @ 8552154
 	wild_mon GOLBAT, 30, 35
 	wild_mon GOLBAT, 30, 35
 	wild_mon SOLROCK, 25, 35
@@ -2797,13 +2797,13 @@ gMeteorFalls_1F_2R_WaterMons: ; 8552154
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_WaterMonsInfo: ; 8552168
-	.4byte 4 ; encounter rate
+gMeteorFalls_1F_2R_WaterMonsInfo: @ 8552168
+	.4byte 4 @ encounter rate
 	.4byte gMeteorFalls_1F_2R_WaterMons
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_FishingMons: ; 8552170
+gMeteorFalls_1F_2R_FishingMons: @ 8552170
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2817,13 +2817,13 @@ gMeteorFalls_1F_2R_FishingMons: ; 8552170
 
 	.align 2, 0
 
-gMeteorFalls_1F_2R_FishingMonsInfo: ; 8552198
-	.4byte 30 ; encounter rate
+gMeteorFalls_1F_2R_FishingMonsInfo: @ 8552198
+	.4byte 30 @ encounter rate
 	.4byte gMeteorFalls_1F_2R_FishingMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_LandMons: ; 85521A0
+gMeteorFalls_B1F_1R_LandMons: @ 85521A0
 	wild_mon GOLBAT, 33
 	wild_mon GOLBAT, 35
 	wild_mon GOLBAT, 33
@@ -2839,13 +2839,13 @@ gMeteorFalls_B1F_1R_LandMons: ; 85521A0
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_LandMonsInfo: ; 85521D0
-	.4byte 10 ; encounter rate
+gMeteorFalls_B1F_1R_LandMonsInfo: @ 85521D0
+	.4byte 10 @ encounter rate
 	.4byte gMeteorFalls_B1F_1R_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_WaterMons: ; 85521D8
+gMeteorFalls_B1F_1R_WaterMons: @ 85521D8
 	wild_mon GOLBAT, 30, 35
 	wild_mon GOLBAT, 30, 35
 	wild_mon SOLROCK, 25, 35
@@ -2854,13 +2854,13 @@ gMeteorFalls_B1F_1R_WaterMons: ; 85521D8
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_WaterMonsInfo: ; 85521EC
-	.4byte 4 ; encounter rate
+gMeteorFalls_B1F_1R_WaterMonsInfo: @ 85521EC
+	.4byte 4 @ encounter rate
 	.4byte gMeteorFalls_B1F_1R_WaterMons
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_FishingMons: ; 85521F4
+gMeteorFalls_B1F_1R_FishingMons: @ 85521F4
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2874,13 +2874,13 @@ gMeteorFalls_B1F_1R_FishingMons: ; 85521F4
 
 	.align 2, 0
 
-gMeteorFalls_B1F_1R_FishingMonsInfo: ; 855221C
-	.4byte 30 ; encounter rate
+gMeteorFalls_B1F_1R_FishingMonsInfo: @ 855221C
+	.4byte 30 @ encounter rate
 	.4byte gMeteorFalls_B1F_1R_FishingMons
 
 	.align 2, 0
 
-gShoalCave_LowTideStairsRoom_LandMons: ; 8552224
+gShoalCave_LowTideStairsRoom_LandMons: @ 8552224
 	wild_mon ZUBAT, 26
 	wild_mon SPHEAL, 26
 	wild_mon ZUBAT, 28
@@ -2896,13 +2896,13 @@ gShoalCave_LowTideStairsRoom_LandMons: ; 8552224
 
 	.align 2, 0
 
-gShoalCave_LowTideStairsRoom_LandMonsInfo: ; 8552254
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideStairsRoom_LandMonsInfo: @ 8552254
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideStairsRoom_LandMons
 
 	.align 2, 0
 
-gShoalCave_LowTideLowerRoom_LandMons: ; 855225C
+gShoalCave_LowTideLowerRoom_LandMons: @ 855225C
 	wild_mon ZUBAT, 26
 	wild_mon SPHEAL, 26
 	wild_mon ZUBAT, 28
@@ -2918,13 +2918,13 @@ gShoalCave_LowTideLowerRoom_LandMons: ; 855225C
 
 	.align 2, 0
 
-gShoalCave_LowTideLowerRoom_LandMonsInfo: ; 855228C
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideLowerRoom_LandMonsInfo: @ 855228C
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideLowerRoom_LandMons
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_LandMons: ; 8552294
+gShoalCave_LowTideInnerRoom_LandMons: @ 8552294
 	wild_mon ZUBAT, 26
 	wild_mon SPHEAL, 26
 	wild_mon ZUBAT, 28
@@ -2940,13 +2940,13 @@ gShoalCave_LowTideInnerRoom_LandMons: ; 8552294
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_LandMonsInfo: ; 85522C4
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideInnerRoom_LandMonsInfo: @ 85522C4
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideInnerRoom_LandMons
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_WaterMons: ; 85522CC
+gShoalCave_LowTideInnerRoom_WaterMons: @ 85522CC
 	wild_mon TENTACOOL, 5, 35
 	wild_mon ZUBAT, 5, 35
 	wild_mon SPHEAL, 25, 30
@@ -2955,13 +2955,13 @@ gShoalCave_LowTideInnerRoom_WaterMons: ; 85522CC
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_WaterMonsInfo: ; 85522E0
-	.4byte 4 ; encounter rate
+gShoalCave_LowTideInnerRoom_WaterMonsInfo: @ 85522E0
+	.4byte 4 @ encounter rate
 	.4byte gShoalCave_LowTideInnerRoom_WaterMons
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_FishingMons: ; 85522E8
+gShoalCave_LowTideInnerRoom_FishingMons: @ 85522E8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -2975,13 +2975,13 @@ gShoalCave_LowTideInnerRoom_FishingMons: ; 85522E8
 
 	.align 2, 0
 
-gShoalCave_LowTideInnerRoom_FishingMonsInfo: ; 8552310
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideInnerRoom_FishingMonsInfo: @ 8552310
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideInnerRoom_FishingMons
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_LandMons: ; 8552318
+gShoalCave_LowTideEntranceRoom_LandMons: @ 8552318
 	wild_mon ZUBAT, 26
 	wild_mon SPHEAL, 26
 	wild_mon ZUBAT, 28
@@ -2997,13 +2997,13 @@ gShoalCave_LowTideEntranceRoom_LandMons: ; 8552318
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_LandMonsInfo: ; 8552348
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideEntranceRoom_LandMonsInfo: @ 8552348
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideEntranceRoom_LandMons
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_WaterMons: ; 8552350
+gShoalCave_LowTideEntranceRoom_WaterMons: @ 8552350
 	wild_mon TENTACOOL, 5, 35
 	wild_mon ZUBAT, 5, 35
 	wild_mon SPHEAL, 25, 30
@@ -3012,13 +3012,13 @@ gShoalCave_LowTideEntranceRoom_WaterMons: ; 8552350
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_WaterMonsInfo: ; 8552364
-	.4byte 4 ; encounter rate
+gShoalCave_LowTideEntranceRoom_WaterMonsInfo: @ 8552364
+	.4byte 4 @ encounter rate
 	.4byte gShoalCave_LowTideEntranceRoom_WaterMons
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_FishingMons: ; 855236C
+gShoalCave_LowTideEntranceRoom_FishingMons: @ 855236C
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3032,13 +3032,13 @@ gShoalCave_LowTideEntranceRoom_FishingMons: ; 855236C
 
 	.align 2, 0
 
-gShoalCave_LowTideEntranceRoom_FishingMonsInfo: ; 8552394
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideEntranceRoom_FishingMonsInfo: @ 8552394
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideEntranceRoom_FishingMons
 
 	.align 2, 0
 
-gLilycoveCity_WaterMons: ; 855239C
+gLilycoveCity_WaterMons: @ 855239C
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3047,13 +3047,13 @@ gLilycoveCity_WaterMons: ; 855239C
 
 	.align 2, 0
 
-gLilycoveCity_WaterMonsInfo: ; 85523B0
-	.4byte 4 ; encounter rate
+gLilycoveCity_WaterMonsInfo: @ 85523B0
+	.4byte 4 @ encounter rate
 	.4byte gLilycoveCity_WaterMons
 
 	.align 2, 0
 
-gLilycoveCity_FishingMons: ; 85523B8
+gLilycoveCity_FishingMons: @ 85523B8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3067,13 +3067,13 @@ gLilycoveCity_FishingMons: ; 85523B8
 
 	.align 2, 0
 
-gLilycoveCity_FishingMonsInfo: ; 85523E0
-	.4byte 10 ; encounter rate
+gLilycoveCity_FishingMonsInfo: @ 85523E0
+	.4byte 10 @ encounter rate
 	.4byte gLilycoveCity_FishingMons
 
 	.align 2, 0
 
-gDewfordTown_WaterMons: ; 85523E8
+gDewfordTown_WaterMons: @ 85523E8
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3082,13 +3082,13 @@ gDewfordTown_WaterMons: ; 85523E8
 
 	.align 2, 0
 
-gDewfordTown_WaterMonsInfo: ; 85523FC
-	.4byte 4 ; encounter rate
+gDewfordTown_WaterMonsInfo: @ 85523FC
+	.4byte 4 @ encounter rate
 	.4byte gDewfordTown_WaterMons
 
 	.align 2, 0
 
-gDewfordTown_FishingMons: ; 8552404
+gDewfordTown_FishingMons: @ 8552404
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3102,13 +3102,13 @@ gDewfordTown_FishingMons: ; 8552404
 
 	.align 2, 0
 
-gDewfordTown_FishingMonsInfo: ; 855242C
-	.4byte 10 ; encounter rate
+gDewfordTown_FishingMonsInfo: @ 855242C
+	.4byte 10 @ encounter rate
 	.4byte gDewfordTown_FishingMons
 
 	.align 2, 0
 
-gSlateportCity_WaterMons: ; 8552434
+gSlateportCity_WaterMons: @ 8552434
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3117,13 +3117,13 @@ gSlateportCity_WaterMons: ; 8552434
 
 	.align 2, 0
 
-gSlateportCity_WaterMonsInfo: ; 8552448
-	.4byte 4 ; encounter rate
+gSlateportCity_WaterMonsInfo: @ 8552448
+	.4byte 4 @ encounter rate
 	.4byte gSlateportCity_WaterMons
 
 	.align 2, 0
 
-gSlateportCity_FishingMons: ; 8552450
+gSlateportCity_FishingMons: @ 8552450
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3137,13 +3137,13 @@ gSlateportCity_FishingMons: ; 8552450
 
 	.align 2, 0
 
-gSlateportCity_FishingMonsInfo: ; 8552478
-	.4byte 10 ; encounter rate
+gSlateportCity_FishingMonsInfo: @ 8552478
+	.4byte 10 @ encounter rate
 	.4byte gSlateportCity_FishingMons
 
 	.align 2, 0
 
-gMossdeepCity_WaterMons: ; 8552480
+gMossdeepCity_WaterMons: @ 8552480
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3152,13 +3152,13 @@ gMossdeepCity_WaterMons: ; 8552480
 
 	.align 2, 0
 
-gMossdeepCity_WaterMonsInfo: ; 8552494
-	.4byte 4 ; encounter rate
+gMossdeepCity_WaterMonsInfo: @ 8552494
+	.4byte 4 @ encounter rate
 	.4byte gMossdeepCity_WaterMons
 
 	.align 2, 0
 
-gMossdeepCity_FishingMons: ; 855249C
+gMossdeepCity_FishingMons: @ 855249C
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3172,13 +3172,13 @@ gMossdeepCity_FishingMons: ; 855249C
 
 	.align 2, 0
 
-gMossdeepCity_FishingMonsInfo: ; 85524C4
-	.4byte 10 ; encounter rate
+gMossdeepCity_FishingMonsInfo: @ 85524C4
+	.4byte 10 @ encounter rate
 	.4byte gMossdeepCity_FishingMons
 
 	.align 2, 0
 
-gPacifidlogTown_WaterMons: ; 85524CC
+gPacifidlogTown_WaterMons: @ 85524CC
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3187,13 +3187,13 @@ gPacifidlogTown_WaterMons: ; 85524CC
 
 	.align 2, 0
 
-gPacifidlogTown_WaterMonsInfo: ; 85524E0
-	.4byte 4 ; encounter rate
+gPacifidlogTown_WaterMonsInfo: @ 85524E0
+	.4byte 4 @ encounter rate
 	.4byte gPacifidlogTown_WaterMons
 
 	.align 2, 0
 
-gPacifidlogTown_FishingMons: ; 85524E8
+gPacifidlogTown_FishingMons: @ 85524E8
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3207,13 +3207,13 @@ gPacifidlogTown_FishingMons: ; 85524E8
 
 	.align 2, 0
 
-gPacifidlogTown_FishingMonsInfo: ; 8552510
-	.4byte 10 ; encounter rate
+gPacifidlogTown_FishingMonsInfo: @ 8552510
+	.4byte 10 @ encounter rate
 	.4byte gPacifidlogTown_FishingMons
 
 	.align 2, 0
 
-gEverGrandeCity_WaterMons: ; 8552518
+gEverGrandeCity_WaterMons: @ 8552518
 	wild_mon TENTACOOL, 5, 35
 	wild_mon WINGULL, 10, 30
 	wild_mon WINGULL, 15, 25
@@ -3222,13 +3222,13 @@ gEverGrandeCity_WaterMons: ; 8552518
 
 	.align 2, 0
 
-gEverGrandeCity_WaterMonsInfo: ; 855252C
-	.4byte 4 ; encounter rate
+gEverGrandeCity_WaterMonsInfo: @ 855252C
+	.4byte 4 @ encounter rate
 	.4byte gEverGrandeCity_WaterMons
 
 	.align 2, 0
 
-gEverGrandeCity_FishingMons: ; 8552534
+gEverGrandeCity_FishingMons: @ 8552534
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3242,13 +3242,13 @@ gEverGrandeCity_FishingMons: ; 8552534
 
 	.align 2, 0
 
-gEverGrandeCity_FishingMonsInfo: ; 855255C
-	.4byte 10 ; encounter rate
+gEverGrandeCity_FishingMonsInfo: @ 855255C
+	.4byte 10 @ encounter rate
 	.4byte gEverGrandeCity_FishingMons
 
 	.align 2, 0
 
-gPetalburgCity_WaterMons: ; 8552564
+gPetalburgCity_WaterMons: @ 8552564
 	wild_mon MARILL, 20, 30
 	wild_mon MARILL, 10, 20
 	wild_mon MARILL, 30, 35
@@ -3257,13 +3257,13 @@ gPetalburgCity_WaterMons: ; 8552564
 
 	.align 2, 0
 
-gPetalburgCity_WaterMonsInfo: ; 8552578
-	.4byte 1 ; encounter rate
+gPetalburgCity_WaterMonsInfo: @ 8552578
+	.4byte 1 @ encounter rate
 	.4byte gPetalburgCity_WaterMons
 
 	.align 2, 0
 
-gPetalburgCity_FishingMons: ; 8552580
+gPetalburgCity_FishingMons: @ 8552580
 	wild_mon MAGIKARP, 5, 10
 	wild_mon GOLDEEN, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3277,13 +3277,13 @@ gPetalburgCity_FishingMons: ; 8552580
 
 	.align 2, 0
 
-gPetalburgCity_FishingMonsInfo: ; 85525A8
-	.4byte 10 ; encounter rate
+gPetalburgCity_FishingMonsInfo: @ 85525A8
+	.4byte 10 @ encounter rate
 	.4byte gPetalburgCity_FishingMons
 
 	.align 2, 0
 
-gUnderwater1_WaterMons: ; 85525B0
+gUnderwater1_WaterMons: @ 85525B0
 	wild_mon CLAMPERL, 20, 30
 	wild_mon CHINCHOU, 20, 30
 	wild_mon CLAMPERL, 30, 35
@@ -3292,13 +3292,13 @@ gUnderwater1_WaterMons: ; 85525B0
 
 	.align 2, 0
 
-gUnderwater1_WaterMonsInfo: ; 85525C4
-	.4byte 4 ; encounter rate
+gUnderwater1_WaterMonsInfo: @ 85525C4
+	.4byte 4 @ encounter rate
 	.4byte gUnderwater1_WaterMons
 
 	.align 2, 0
 
-gShoalCave_LowTideIceRoom_LandMons: ; 85525CC
+gShoalCave_LowTideIceRoom_LandMons: @ 85525CC
 	wild_mon ZUBAT, 26
 	wild_mon SPHEAL, 26
 	wild_mon ZUBAT, 28
@@ -3314,13 +3314,13 @@ gShoalCave_LowTideIceRoom_LandMons: ; 85525CC
 
 	.align 2, 0
 
-gShoalCave_LowTideIceRoom_LandMonsInfo: ; 85525FC
-	.4byte 10 ; encounter rate
+gShoalCave_LowTideIceRoom_LandMonsInfo: @ 85525FC
+	.4byte 10 @ encounter rate
 	.4byte gShoalCave_LowTideIceRoom_LandMons
 
 	.align 2, 0
 
-gSkyPillar_1F_LandMons: ; 8552604
+gSkyPillar_1F_LandMons: @ 8552604
 	wild_mon SABLEYE, 33
 	wild_mon GOLBAT, 34
 	wild_mon GOLBAT, 35
@@ -3336,13 +3336,13 @@ gSkyPillar_1F_LandMons: ; 8552604
 
 	.align 2, 0
 
-gSkyPillar_1F_LandMonsInfo: ; 8552634
-	.4byte 10 ; encounter rate
+gSkyPillar_1F_LandMonsInfo: @ 8552634
+	.4byte 10 @ encounter rate
 	.4byte gSkyPillar_1F_LandMons
 
 	.align 2, 0
 
-gSootopolisCity_WaterMons: ; 855263C
+gSootopolisCity_WaterMons: @ 855263C
 	wild_mon MAGIKARP, 5, 35
 	wild_mon MAGIKARP, 10, 30
 	wild_mon MAGIKARP, 15, 25
@@ -3351,13 +3351,13 @@ gSootopolisCity_WaterMons: ; 855263C
 
 	.align 2, 0
 
-gSootopolisCity_WaterMonsInfo: ; 8552650
-	.4byte 1 ; encounter rate
+gSootopolisCity_WaterMonsInfo: @ 8552650
+	.4byte 1 @ encounter rate
 	.4byte gSootopolisCity_WaterMons
 
 	.align 2, 0
 
-gSootopolisCity_FishingMons: ; 8552658
+gSootopolisCity_FishingMons: @ 8552658
 	wild_mon MAGIKARP, 5, 10
 	wild_mon TENTACOOL, 5, 10
 	wild_mon MAGIKARP, 10, 30
@@ -3371,13 +3371,13 @@ gSootopolisCity_FishingMons: ; 8552658
 
 	.align 2, 0
 
-gSootopolisCity_FishingMonsInfo: ; 8552680
-	.4byte 10 ; encounter rate
+gSootopolisCity_FishingMonsInfo: @ 8552680
+	.4byte 10 @ encounter rate
 	.4byte gSootopolisCity_FishingMons
 
 	.align 2, 0
 
-gSkyPillar_3F_LandMons: ; 8552688
+gSkyPillar_3F_LandMons: @ 8552688
 	wild_mon SABLEYE, 33
 	wild_mon GOLBAT, 34
 	wild_mon GOLBAT, 35
@@ -3393,13 +3393,13 @@ gSkyPillar_3F_LandMons: ; 8552688
 
 	.align 2, 0
 
-gSkyPillar_3F_LandMonsInfo: ; 85526B8
-	.4byte 10 ; encounter rate
+gSkyPillar_3F_LandMonsInfo: @ 85526B8
+	.4byte 10 @ encounter rate
 	.4byte gSkyPillar_3F_LandMons
 
 	.align 2, 0
 
-gSkyPillar_5F_LandMons: ; 85526C0
+gSkyPillar_5F_LandMons: @ 85526C0
 	wild_mon SABLEYE, 33
 	wild_mon GOLBAT, 34
 	wild_mon GOLBAT, 35
@@ -3415,13 +3415,13 @@ gSkyPillar_5F_LandMons: ; 85526C0
 
 	.align 2, 0
 
-gSkyPillar_5F_LandMonsInfo: ; 85526F0
-	.4byte 10 ; encounter rate
+gSkyPillar_5F_LandMonsInfo: @ 85526F0
+	.4byte 10 @ encounter rate
 	.4byte gSkyPillar_5F_LandMons
 
 	.align 2, 0
 
-gSafariZone_Southeast_LandMons: ; 85526F8
+gSafariZone_Southeast_LandMons: @ 85526F8
 	wild_mon SUNKERN, 33
 	wild_mon MAREEP, 34
 	wild_mon SUNKERN, 35
@@ -3437,13 +3437,13 @@ gSafariZone_Southeast_LandMons: ; 85526F8
 
 	.align 2, 0
 
-gSafariZone_Southeast_LandMonsInfo: ; 8552728
-	.4byte 25 ; encounter rate
+gSafariZone_Southeast_LandMonsInfo: @ 8552728
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_Southeast_LandMons
 
 	.align 2, 0
 
-gSafariZone_Southeast_WaterMons: ; 8552730
+gSafariZone_Southeast_WaterMons: @ 8552730
 	wild_mon WOOPER, 25, 30
 	wild_mon MARILL, 25, 30
 	wild_mon MARILL, 25, 30
@@ -3452,13 +3452,13 @@ gSafariZone_Southeast_WaterMons: ; 8552730
 
 	.align 2, 0
 
-gSafariZone_Southeast_WaterMonsInfo: ; 8552744
-	.4byte 9 ; encounter rate
+gSafariZone_Southeast_WaterMonsInfo: @ 8552744
+	.4byte 9 @ encounter rate
 	.4byte gSafariZone_Southeast_WaterMons
 
 	.align 2, 0
 
-gSafariZone_Southeast_FishingMons: ; 855274C
+gSafariZone_Southeast_FishingMons: @ 855274C
 	wild_mon MAGIKARP, 25, 30
 	wild_mon GOLDEEN, 25, 30
 	wild_mon MAGIKARP, 25, 30
@@ -3472,13 +3472,13 @@ gSafariZone_Southeast_FishingMons: ; 855274C
 
 	.align 2, 0
 
-gSafariZone_Southeast_FishingMonsInfo: ; 8552774
-	.4byte 35 ; encounter rate
+gSafariZone_Southeast_FishingMonsInfo: @ 8552774
+	.4byte 35 @ encounter rate
 	.4byte gSafariZone_Southeast_FishingMons
 
 	.align 2, 0
 
-gSafariZone_Northeast_LandMons: ; 855277C
+gSafariZone_Northeast_LandMons: @ 855277C
 	wild_mon AIPOM, 33
 	wild_mon TEDDIURSA, 34
 	wild_mon AIPOM, 35
@@ -3494,13 +3494,13 @@ gSafariZone_Northeast_LandMons: ; 855277C
 
 	.align 2, 0
 
-gSafariZone_Northeast_LandMonsInfo: ; 85527AC
-	.4byte 25 ; encounter rate
+gSafariZone_Northeast_LandMonsInfo: @ 85527AC
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_Northeast_LandMons
 
 	.align 2, 0
 
-gSafariZone_Northeast_RockSmashMons: ; 85527B4
+gSafariZone_Northeast_RockSmashMons: @ 85527B4
 	wild_mon SHUCKLE, 25, 30
 	wild_mon SHUCKLE, 20, 25
 	wild_mon SHUCKLE, 30, 35
@@ -3509,13 +3509,13 @@ gSafariZone_Northeast_RockSmashMons: ; 85527B4
 
 	.align 2, 0
 
-gSafariZone_Northeast_RockSmashMonsInfo: ; 85527C8
-	.4byte 25 ; encounter rate
+gSafariZone_Northeast_RockSmashMonsInfo: @ 85527C8
+	.4byte 25 @ encounter rate
 	.4byte gSafariZone_Northeast_RockSmashMons
 
 	.align 2, 0
 
-gMagmaHideout_1F_LandMons: ; 85527D0
+gMagmaHideout_1F_LandMons: @ 85527D0
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3531,13 +3531,13 @@ gMagmaHideout_1F_LandMons: ; 85527D0
 
 	.align 2, 0
 
-gMagmaHideout_1F_LandMonsInfo: ; 8552800
-	.4byte 10 ; encounter rate
+gMagmaHideout_1F_LandMonsInfo: @ 8552800
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_1F_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_2F_1R_LandMons: ; 8552808
+gMagmaHideout_2F_1R_LandMons: @ 8552808
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3553,13 +3553,13 @@ gMagmaHideout_2F_1R_LandMons: ; 8552808
 
 	.align 2, 0
 
-gMagmaHideout_2F_1R_LandMonsInfo: ; 8552838
-	.4byte 10 ; encounter rate
+gMagmaHideout_2F_1R_LandMonsInfo: @ 8552838
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_2F_1R_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_2F_2R_LandMons: ; 8552840
+gMagmaHideout_2F_2R_LandMons: @ 8552840
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3575,13 +3575,13 @@ gMagmaHideout_2F_2R_LandMons: ; 8552840
 
 	.align 2, 0
 
-gMagmaHideout_2F_2R_LandMonsInfo: ; 8552870
-	.4byte 10 ; encounter rate
+gMagmaHideout_2F_2R_LandMonsInfo: @ 8552870
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_2F_2R_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_3F_1R_LandMons: ; 8552878
+gMagmaHideout_3F_1R_LandMons: @ 8552878
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3597,13 +3597,13 @@ gMagmaHideout_3F_1R_LandMons: ; 8552878
 
 	.align 2, 0
 
-gMagmaHideout_3F_1R_LandMonsInfo: ; 85528A8
-	.4byte 10 ; encounter rate
+gMagmaHideout_3F_1R_LandMonsInfo: @ 85528A8
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_3F_1R_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_3F_2R_LandMons: ; 85528B0
+gMagmaHideout_3F_2R_LandMons: @ 85528B0
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3619,13 +3619,13 @@ gMagmaHideout_3F_2R_LandMons: ; 85528B0
 
 	.align 2, 0
 
-gMagmaHideout_3F_2R_LandMonsInfo: ; 85528E0
-	.4byte 10 ; encounter rate
+gMagmaHideout_3F_2R_LandMonsInfo: @ 85528E0
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_3F_2R_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_4F_LandMons: ; 85528E8
+gMagmaHideout_4F_LandMons: @ 85528E8
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3641,13 +3641,13 @@ gMagmaHideout_4F_LandMons: ; 85528E8
 
 	.align 2, 0
 
-gMagmaHideout_4F_LandMonsInfo: ; 8552918
-	.4byte 10 ; encounter rate
+gMagmaHideout_4F_LandMonsInfo: @ 8552918
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_4F_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_3F_3R_LandMons: ; 8552920
+gMagmaHideout_3F_3R_LandMons: @ 8552920
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3663,13 +3663,13 @@ gMagmaHideout_3F_3R_LandMons: ; 8552920
 
 	.align 2, 0
 
-gMagmaHideout_3F_3R_LandMonsInfo: ; 8552950
-	.4byte 10 ; encounter rate
+gMagmaHideout_3F_3R_LandMonsInfo: @ 8552950
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_3F_3R_LandMons
 
 	.align 2, 0
 
-gMagmaHideout_2F_3R_LandMons: ; 8552958
+gMagmaHideout_2F_3R_LandMons: @ 8552958
 	wild_mon GEODUDE, 27
 	wild_mon TORKOAL, 28
 	wild_mon GEODUDE, 28
@@ -3685,13 +3685,13 @@ gMagmaHideout_2F_3R_LandMons: ; 8552958
 
 	.align 2, 0
 
-gMagmaHideout_2F_3R_LandMonsInfo: ; 8552988
-	.4byte 10 ; encounter rate
+gMagmaHideout_2F_3R_LandMonsInfo: @ 8552988
+	.4byte 10 @ encounter rate
 	.4byte gMagmaHideout_2F_3R_LandMons
 
 	.align 2, 0
 
-gMirageTower_1F_LandMons: ; 8552990
+gMirageTower_1F_LandMons: @ 8552990
 	wild_mon SANDSHREW, 21
 	wild_mon TRAPINCH, 21
 	wild_mon SANDSHREW, 20
@@ -3707,13 +3707,13 @@ gMirageTower_1F_LandMons: ; 8552990
 
 	.align 2, 0
 
-gMirageTower_1F_LandMonsInfo: ; 85529C0
-	.4byte 10 ; encounter rate
+gMirageTower_1F_LandMonsInfo: @ 85529C0
+	.4byte 10 @ encounter rate
 	.4byte gMirageTower_1F_LandMons
 
 	.align 2, 0
 
-gMirageTower_2F_LandMons: ; 85529C8
+gMirageTower_2F_LandMons: @ 85529C8
 	wild_mon SANDSHREW, 21
 	wild_mon TRAPINCH, 21
 	wild_mon SANDSHREW, 20
@@ -3729,13 +3729,13 @@ gMirageTower_2F_LandMons: ; 85529C8
 
 	.align 2, 0
 
-gMirageTower_2F_LandMonsInfo: ; 85529F8
-	.4byte 10 ; encounter rate
+gMirageTower_2F_LandMonsInfo: @ 85529F8
+	.4byte 10 @ encounter rate
 	.4byte gMirageTower_2F_LandMons
 
 	.align 2, 0
 
-gMirageTower_3F_LandMons: ; 8552A00
+gMirageTower_3F_LandMons: @ 8552A00
 	wild_mon SANDSHREW, 21
 	wild_mon TRAPINCH, 21
 	wild_mon SANDSHREW, 20
@@ -3751,13 +3751,13 @@ gMirageTower_3F_LandMons: ; 8552A00
 
 	.align 2, 0
 
-gMirageTower_3F_LandMonsInfo: ; 8552A30
-	.4byte 10 ; encounter rate
+gMirageTower_3F_LandMonsInfo: @ 8552A30
+	.4byte 10 @ encounter rate
 	.4byte gMirageTower_3F_LandMons
 
 	.align 2, 0
 
-gMirageTower_4F_LandMons: ; 8552A38
+gMirageTower_4F_LandMons: @ 8552A38
 	wild_mon SANDSHREW, 21
 	wild_mon TRAPINCH, 21
 	wild_mon SANDSHREW, 20
@@ -3773,13 +3773,13 @@ gMirageTower_4F_LandMons: ; 8552A38
 
 	.align 2, 0
 
-gMirageTower_4F_LandMonsInfo: ; 8552A68
-	.4byte 10 ; encounter rate
+gMirageTower_4F_LandMonsInfo: @ 8552A68
+	.4byte 10 @ encounter rate
 	.4byte gMirageTower_4F_LandMons
 
 	.align 2, 0
 
-gDesertUnderpass_LandMons: ; 8552A70
+gDesertUnderpass_LandMons: @ 8552A70
 	wild_mon DITTO, 38
 	wild_mon WHISMUR, 35
 	wild_mon DITTO, 40
@@ -3795,13 +3795,13 @@ gDesertUnderpass_LandMons: ; 8552A70
 
 	.align 2, 0
 
-gDesertUnderpass_LandMonsInfo: ; 8552AA0
-	.4byte 10 ; encounter rate
+gDesertUnderpass_LandMonsInfo: @ 8552AA0
+	.4byte 10 @ encounter rate
 	.4byte gDesertUnderpass_LandMons
 
 	.align 2, 0
 
-gArtisanCave_B1F_LandMons: ; 8552AA8
+gArtisanCave_B1F_LandMons: @ 8552AA8
 	wild_mon SMEARGLE, 40
 	wild_mon SMEARGLE, 41
 	wild_mon SMEARGLE, 42
@@ -3817,13 +3817,13 @@ gArtisanCave_B1F_LandMons: ; 8552AA8
 
 	.align 2, 0
 
-gArtisanCave_B1F_LandMonsInfo: ; 8552AD8
-	.4byte 10 ; encounter rate
+gArtisanCave_B1F_LandMonsInfo: @ 8552AD8
+	.4byte 10 @ encounter rate
 	.4byte gArtisanCave_B1F_LandMons
 
 	.align 2, 0
 
-gArtisanCave_1F_LandMons: ; 8552AE0
+gArtisanCave_1F_LandMons: @ 8552AE0
 	wild_mon SMEARGLE, 40
 	wild_mon SMEARGLE, 41
 	wild_mon SMEARGLE, 42
@@ -3839,13 +3839,13 @@ gArtisanCave_1F_LandMons: ; 8552AE0
 
 	.align 2, 0
 
-gArtisanCave_1F_LandMonsInfo: ; 8552B10
-	.4byte 10 ; encounter rate
+gArtisanCave_1F_LandMonsInfo: @ 8552B10
+	.4byte 10 @ encounter rate
 	.4byte gArtisanCave_1F_LandMons
 
 	.align 2, 0
 
-gAlteringCave1_LandMons: ; 8552B18
+gAlteringCave1_LandMons: @ 8552B18
 	wild_mon ZUBAT, 10
 	wild_mon ZUBAT, 12
 	wild_mon ZUBAT, 8
@@ -3861,13 +3861,13 @@ gAlteringCave1_LandMons: ; 8552B18
 
 	.align 2, 0
 
-gAlteringCave1_LandMonsInfo: ; 8552B48
-	.4byte 7 ; encounter rate
+gAlteringCave1_LandMonsInfo: @ 8552B48
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave1_LandMons
 
 	.align 2, 0
 
-gAlteringCave2_LandMons: ; 8552B50
+gAlteringCave2_LandMons: @ 8552B50
 	wild_mon MAREEP, 7
 	wild_mon MAREEP, 9
 	wild_mon MAREEP, 5
@@ -3883,13 +3883,13 @@ gAlteringCave2_LandMons: ; 8552B50
 
 	.align 2, 0
 
-gAlteringCave2_LandMonsInfo: ; 8552B80
-	.4byte 7 ; encounter rate
+gAlteringCave2_LandMonsInfo: @ 8552B80
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave2_LandMons
 
 	.align 2, 0
 
-gAlteringCave3_LandMons: ; 8552B88
+gAlteringCave3_LandMons: @ 8552B88
 	wild_mon PINECO, 23
 	wild_mon PINECO, 25
 	wild_mon PINECO, 22
@@ -3905,13 +3905,13 @@ gAlteringCave3_LandMons: ; 8552B88
 
 	.align 2, 0
 
-gAlteringCave3_LandMonsInfo: ; 8552BB8
-	.4byte 7 ; encounter rate
+gAlteringCave3_LandMonsInfo: @ 8552BB8
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave3_LandMons
 
 	.align 2, 0
 
-gAlteringCave4_LandMons: ; 8552BC0
+gAlteringCave4_LandMons: @ 8552BC0
 	wild_mon HOUNDOUR, 16
 	wild_mon HOUNDOUR, 18
 	wild_mon HOUNDOUR, 14
@@ -3927,13 +3927,13 @@ gAlteringCave4_LandMons: ; 8552BC0
 
 	.align 2, 0
 
-gAlteringCave4_LandMonsInfo: ; 8552BF0
-	.4byte 7 ; encounter rate
+gAlteringCave4_LandMonsInfo: @ 8552BF0
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave4_LandMons
 
 	.align 2, 0
 
-gAlteringCave5_LandMons: ; 8552BF8
+gAlteringCave5_LandMons: @ 8552BF8
 	wild_mon TEDDIURSA, 10
 	wild_mon TEDDIURSA, 12
 	wild_mon TEDDIURSA, 8
@@ -3949,13 +3949,13 @@ gAlteringCave5_LandMons: ; 8552BF8
 
 	.align 2, 0
 
-gAlteringCave5_LandMonsInfo: ; 8552C28
-	.4byte 7 ; encounter rate
+gAlteringCave5_LandMonsInfo: @ 8552C28
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave5_LandMons
 
 	.align 2, 0
 
-gAlteringCave6_LandMons: ; 8552C30
+gAlteringCave6_LandMons: @ 8552C30
 	wild_mon AIPOM, 22
 	wild_mon AIPOM, 24
 	wild_mon AIPOM, 20
@@ -3971,13 +3971,13 @@ gAlteringCave6_LandMons: ; 8552C30
 
 	.align 2, 0
 
-gAlteringCave6_LandMonsInfo: ; 8552C60
-	.4byte 7 ; encounter rate
+gAlteringCave6_LandMonsInfo: @ 8552C60
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave6_LandMons
 
 	.align 2, 0
 
-gAlteringCave7_LandMons: ; 8552C68
+gAlteringCave7_LandMons: @ 8552C68
 	wild_mon SHUCKLE, 22
 	wild_mon SHUCKLE, 24
 	wild_mon SHUCKLE, 20
@@ -3993,13 +3993,13 @@ gAlteringCave7_LandMons: ; 8552C68
 
 	.align 2, 0
 
-gAlteringCave7_LandMonsInfo: ; 8552C98
-	.4byte 7 ; encounter rate
+gAlteringCave7_LandMonsInfo: @ 8552C98
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave7_LandMons
 
 	.align 2, 0
 
-gAlteringCave8_LandMons: ; 8552CA0
+gAlteringCave8_LandMons: @ 8552CA0
 	wild_mon STANTLER, 22
 	wild_mon STANTLER, 24
 	wild_mon STANTLER, 20
@@ -4015,13 +4015,13 @@ gAlteringCave8_LandMons: ; 8552CA0
 
 	.align 2, 0
 
-gAlteringCave8_LandMonsInfo: ; 8552CD0
-	.4byte 7 ; encounter rate
+gAlteringCave8_LandMonsInfo: @ 8552CD0
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave8_LandMons
 
 	.align 2, 0
 
-gAlteringCave9_LandMons: ; 8552CD8
+gAlteringCave9_LandMons: @ 8552CD8
 	wild_mon SMEARGLE, 22
 	wild_mon SMEARGLE, 24
 	wild_mon SMEARGLE, 20
@@ -4037,13 +4037,13 @@ gAlteringCave9_LandMons: ; 8552CD8
 
 	.align 2, 0
 
-gAlteringCave9_LandMonsInfo: ; 8552D08
-	.4byte 7 ; encounter rate
+gAlteringCave9_LandMonsInfo: @ 8552D08
+	.4byte 7 @ encounter rate
 	.4byte gAlteringCave9_LandMons
 
 	.align 2, 0
 
-gMeteorFalls_StevensCave_LandMons: ; 8552D10
+gMeteorFalls_StevensCave_LandMons: @ 8552D10
 	wild_mon GOLBAT, 33
 	wild_mon GOLBAT, 35
 	wild_mon GOLBAT, 33
@@ -4059,876 +4059,876 @@ gMeteorFalls_StevensCave_LandMons: ; 8552D10
 
 	.align 2, 0
 
-gMeteorFalls_StevensCave_LandMonsInfo: ; 8552D40
-	.4byte 10 ; encounter rate
+gMeteorFalls_StevensCave_LandMonsInfo: @ 8552D40
+	.4byte 10 @ encounter rate
 	.4byte gMeteorFalls_StevensCave_LandMons
 
 	.align 2, 0
 
-gWildMonHeaders: ; 8552D48
+gWildMonHeaders: @ 8552D48
 	map ROUTE_101
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute101_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_102
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute102_LandMonsInfo
 	.4byte gRoute102_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute102_FishingMonsInfo
 
 	map ROUTE_103
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute103_LandMonsInfo
 	.4byte gRoute103_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute103_FishingMonsInfo
 
 	map ROUTE_104
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute104_LandMonsInfo
 	.4byte gRoute104_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute104_FishingMonsInfo
 
 	map ROUTE_105
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute105_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute105_FishingMonsInfo
 
 	map ROUTE_110
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute110_LandMonsInfo
 	.4byte gRoute110_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute110_FishingMonsInfo
 
 	map ROUTE_111
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute111_LandMonsInfo
 	.4byte gRoute111_WaterMonsInfo
 	.4byte gRoute111_RockSmashMonsInfo
 	.4byte gRoute111_FishingMonsInfo
 
 	map ROUTE_112
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute112_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_113
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute113_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_114
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute114_LandMonsInfo
 	.4byte gRoute114_WaterMonsInfo
 	.4byte gRoute114_RockSmashMonsInfo
 	.4byte gRoute114_FishingMonsInfo
 
 	map ROUTE_116
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute116_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_117
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute117_LandMonsInfo
 	.4byte gRoute117_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute117_FishingMonsInfo
 
 	map ROUTE_118
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute118_LandMonsInfo
 	.4byte gRoute118_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute118_FishingMonsInfo
 
 	map ROUTE_124
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute124_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute124_FishingMonsInfo
 
 	map PETALBURG_WOODS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gPetalburgWoods_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map RUSTURF_TUNNEL
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRusturfTunnel_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map GRANITE_CAVE_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gGraniteCave_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map GRANITE_CAVE_B1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gGraniteCave_B1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map VICTORY_ROAD_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gVictoryRoad_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SAFARI_ZONE_SOUTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_South_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map UNDERWATER_2
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gUnderwater2_WaterMonsInfo
 	.4byte NULL
 	.4byte NULL
 
 	map ABANDONED_SHIP_ROOMS_B1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gAbandonedShip_Rooms_B1F_WaterMonsInfo
 	.4byte NULL
 	.4byte gAbandonedShip_Rooms_B1F_FishingMonsInfo
 
 	map GRANITE_CAVE_B2F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gGraniteCave_B2F_LandMonsInfo
 	.4byte NULL
 	.4byte gGraniteCave_B2F_RockSmashMonsInfo
 	.4byte NULL
 
 	map FIERY_PATH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gFieryPath_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map METEOR_FALLS_B1F_2R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMeteorFalls_B1F_2R_LandMonsInfo
 	.4byte gMeteorFalls_B1F_2R_WaterMonsInfo
 	.4byte NULL
 	.4byte gMeteorFalls_B1F_2R_FishingMonsInfo
 
 	map JAGGED_PASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gJaggedPass_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_106
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute106_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute106_FishingMonsInfo
 
 	map ROUTE_107
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute107_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute107_FishingMonsInfo
 
 	map ROUTE_108
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute108_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute108_FishingMonsInfo
 
 	map ROUTE_109
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute109_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute109_FishingMonsInfo
 
 	map ROUTE_115
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute115_LandMonsInfo
 	.4byte gRoute115_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute115_FishingMonsInfo
 
 	map NEW_MAUVILLE_INSIDE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gNewMauville_Inside_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_119
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute119_LandMonsInfo
 	.4byte gRoute119_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute119_FishingMonsInfo
 
 	map ROUTE_120
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute120_LandMonsInfo
 	.4byte gRoute120_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute120_FishingMonsInfo
 
 	map ROUTE_121
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute121_LandMonsInfo
 	.4byte gRoute121_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute121_FishingMonsInfo
 
 	map ROUTE_122
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute122_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute122_FishingMonsInfo
 
 	map ROUTE_123
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute123_LandMonsInfo
 	.4byte gRoute123_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute123_FishingMonsInfo
 
 	map MT_PYRE_2F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_2F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_3F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_3F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_4F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_4F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_5F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_5F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_6F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_6F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_EXTERIOR
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_Exterior_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MT_PYRE_SUMMIT
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMtPyre_Summit_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map GRANITE_CAVE_STEVENS_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gGraniteCave_StevensRoom_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ROUTE_125
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute125_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute125_FishingMonsInfo
 
 	map ROUTE_126
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute126_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute126_FishingMonsInfo
 
 	map ROUTE_127
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute127_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute127_FishingMonsInfo
 
 	map ROUTE_128
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute128_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute128_FishingMonsInfo
 
 	map ROUTE_129
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute129_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute129_FishingMonsInfo
 
 	map ROUTE_130
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gRoute130_LandMonsInfo
 	.4byte gRoute130_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute130_FishingMonsInfo
 
 	map ROUTE_131
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute131_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute131_FishingMonsInfo
 
 	map ROUTE_132
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute132_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute132_FishingMonsInfo
 
 	map ROUTE_133
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute133_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute133_FishingMonsInfo
 
 	map ROUTE_134
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gRoute134_WaterMonsInfo
 	.4byte NULL
 	.4byte gRoute134_FishingMonsInfo
 
 	map ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo
 	.4byte NULL
 	.4byte gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo
 
 	map SEAFLOOR_CAVERN_ROOM_1
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room1_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ROOM_2
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room2_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ROOM_3
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room3_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ROOM_4
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room4_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ROOM_5
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room5_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ROOM_6
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room6_LandMonsInfo
 	.4byte gSeafloorCavern_Room6_WaterMonsInfo
 	.4byte NULL
 	.4byte gSeafloorCavern_Room6_FishingMonsInfo
 
 	map SEAFLOOR_CAVERN_ROOM_7
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room7_LandMonsInfo
 	.4byte gSeafloorCavern_Room7_WaterMonsInfo
 	.4byte NULL
 	.4byte gSeafloorCavern_Room7_FishingMonsInfo
 
 	map SEAFLOOR_CAVERN_ROOM_8
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSeafloorCavern_Room8_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SEAFLOOR_CAVERN_ENTRANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gSeafloorCavern_Entrance_WaterMonsInfo
 	.4byte NULL
 	.4byte gSeafloorCavern_Entrance_FishingMonsInfo
 
 	map CAVE_OF_ORIGIN_ENTRANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gCaveOfOrigin_Entrance_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map CAVE_OF_ORIGIN_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gCaveOfOrigin_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map NEW_MAUVILLE_ENTRANCE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gNewMauville_Entrance_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SAFARI_ZONE_SOUTHWEST
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_Southwest_LandMonsInfo
 	.4byte gSafariZone_Southwest_WaterMonsInfo
 	.4byte NULL
 	.4byte gSafariZone_Southwest_FishingMonsInfo
 
 	map SAFARI_ZONE_NORTH
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_North_LandMonsInfo
 	.4byte NULL
 	.4byte gSafariZone_North_RockSmashMonsInfo
 	.4byte NULL
 
 	map SAFARI_ZONE_NORTHWEST
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_Northwest_LandMonsInfo
 	.4byte gSafariZone_Northwest_WaterMonsInfo
 	.4byte NULL
 	.4byte gSafariZone_Northwest_FishingMonsInfo
 
 	map VICTORY_ROAD_B1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gVictoryRoad_B1F_LandMonsInfo
 	.4byte NULL
 	.4byte gVictoryRoad_B1F_RockSmashMonsInfo
 	.4byte NULL
 
 	map VICTORY_ROAD_B2F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gVictoryRoad_B2F_LandMonsInfo
 	.4byte gVictoryRoad_B2F_WaterMonsInfo
 	.4byte NULL
 	.4byte gVictoryRoad_B2F_FishingMonsInfo
 
 	map METEOR_FALLS_1F_1R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMeteorFalls_1F_1R_LandMonsInfo
 	.4byte gMeteorFalls_1F_1R_WaterMonsInfo
 	.4byte NULL
 	.4byte gMeteorFalls_1F_1R_FishingMonsInfo
 
 	map METEOR_FALLS_1F_2R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMeteorFalls_1F_2R_LandMonsInfo
 	.4byte gMeteorFalls_1F_2R_WaterMonsInfo
 	.4byte NULL
 	.4byte gMeteorFalls_1F_2R_FishingMonsInfo
 
 	map METEOR_FALLS_B1F_1R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMeteorFalls_B1F_1R_LandMonsInfo
 	.4byte gMeteorFalls_B1F_1R_WaterMonsInfo
 	.4byte NULL
 	.4byte gMeteorFalls_B1F_1R_FishingMonsInfo
 
 	map SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gShoalCave_LowTideStairsRoom_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gShoalCave_LowTideLowerRoom_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gShoalCave_LowTideInnerRoom_LandMonsInfo
 	.4byte gShoalCave_LowTideInnerRoom_WaterMonsInfo
 	.4byte NULL
 	.4byte gShoalCave_LowTideInnerRoom_FishingMonsInfo
 
 	map SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gShoalCave_LowTideEntranceRoom_LandMonsInfo
 	.4byte gShoalCave_LowTideEntranceRoom_WaterMonsInfo
 	.4byte NULL
 	.4byte gShoalCave_LowTideEntranceRoom_FishingMonsInfo
 
 	map LILYCOVE_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gLilycoveCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gLilycoveCity_FishingMonsInfo
 
 	map DEWFORD_TOWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gDewfordTown_WaterMonsInfo
 	.4byte NULL
 	.4byte gDewfordTown_FishingMonsInfo
 
 	map SLATEPORT_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gSlateportCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gSlateportCity_FishingMonsInfo
 
 	map MOSSDEEP_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gMossdeepCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gMossdeepCity_FishingMonsInfo
 
 	map PACIFIDLOG_TOWN
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gPacifidlogTown_WaterMonsInfo
 	.4byte NULL
 	.4byte gPacifidlogTown_FishingMonsInfo
 
 	map EVER_GRANDE_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gEverGrandeCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gEverGrandeCity_FishingMonsInfo
 
 	map PETALBURG_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gPetalburgCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gPetalburgCity_FishingMonsInfo
 
 	map UNDERWATER_1
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gUnderwater1_WaterMonsInfo
 	.4byte NULL
 	.4byte NULL
 
 	map SHOAL_CAVE_LOW_TIDE_ICE_ROOM
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gShoalCave_LowTideIceRoom_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SKY_PILLAR_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSkyPillar_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SOOTOPOLIS_CITY
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte gSootopolisCity_WaterMonsInfo
 	.4byte NULL
 	.4byte gSootopolisCity_FishingMonsInfo
 
 	map SKY_PILLAR_3F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSkyPillar_3F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SKY_PILLAR_5F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSkyPillar_5F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map SAFARI_ZONE_SOUTHEAST
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_Southeast_LandMonsInfo
 	.4byte gSafariZone_Southeast_WaterMonsInfo
 	.4byte NULL
 	.4byte gSafariZone_Southeast_FishingMonsInfo
 
 	map SAFARI_ZONE_NORTHEAST
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gSafariZone_Northeast_LandMonsInfo
 	.4byte NULL
 	.4byte gSafariZone_Northeast_RockSmashMonsInfo
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_2F_1R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_2F_1R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_2F_2R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_2F_2R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_3F_1R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_3F_1R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_3F_2R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_3F_2R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_4F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_4F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_3F_3R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_3F_3R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MAGMA_HIDEOUT_2F_3R
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMagmaHideout_2F_3R_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MIRAGE_TOWER_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMirageTower_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MIRAGE_TOWER_2F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMirageTower_2F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MIRAGE_TOWER_3F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMirageTower_3F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map MIRAGE_TOWER_4F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMirageTower_4F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map DESERT_UNDERPASS
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gDesertUnderpass_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ARTISAN_CAVE_B1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gArtisanCave_B1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ARTISAN_CAVE_1F
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gArtisanCave_1F_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave1_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave2_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave3_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave4_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave5_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave6_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave7_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave8_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map ALTERING_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gAlteringCave9_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
 
 	map METEOR_FALLS_STEVENS_CAVE
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte gMeteorFalls_StevensCave_LandMonsInfo
 	.4byte NULL
 	.4byte NULL
@@ -4936,7 +4936,7 @@ gWildMonHeaders: ; 8552D48
 
 	.byte -1
 	.byte -1
-	.2byte 0 ; padding
+	.2byte 0 @ padding
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL